moving templates around

joeld42 · Jun 30, 2016 · c0e7f8c · c0e7f8c
1 parent 2318b17
commit c0e7f8c
Show file tree

Hide file tree

Showing 18 changed files with 26 additions and 21 deletions.
diff --git a/ld13_Crossroads/trunk/GLee.h b/ld13_Crossroads/trunk/GLee.h
@@ -757,8 +757,8 @@ GLEE_EXTERN GLboolean _GLEE_SGIX_texture_range;
 #endif
 
 #ifndef GL_ARB_vertex_buffer_object
-	typedef ptrdiff_t GLintptrARB;
-	typedef ptrdiff_t GLsizeiptrARB;
+//	typedef ptrdiff_t GLintptrARB;
+//	typedef ptrdiff_t GLsizeiptrARB;
 #endif
 
 #ifndef GL_ARB_shader_objects

diff --git a/ld13_Crossroads/trunk/Mesh.cpp b/ld13_Crossroads/trunk/Mesh.cpp
@@ -68,6 +68,7 @@ GLuint LoadObjFile( const char *objfile )
 				glNormal3f( norms[nndx].x, norms[nndx].y, norms[nndx].z );
 				glTexCoord2f( sts[stndx].x, sts[stndx].y );
 				glVertex3f( verts[vndx].x, verts[vndx].y, verts[vndx].z );
+//                printf("%s : %f %f %f\n",objfile, verts[vndx].x, verts[vndx].y, verts[vndx].z );
 
 				ch = strtok( NULL, " " );
 			}

diff --git a/ld13_Crossroads/trunk/ResourceFile.cpp b/ld13_Crossroads/trunk/ResourceFile.cpp
@@ -14,20 +14,20 @@
 
 std::string getResourceDir()
 {
-#ifdef __APPLE__
-    CFBundleRef mainBundle = CFBundleGetMainBundle();
-    CFURLRef resourcesURL = CFBundleCopyResourcesDirectoryURL(mainBundle);
-    char path[PATH_MAX];
-    if (!CFURLGetFileSystemRepresentation(resourcesURL, TRUE, (UInt8 *)path, PATH_MAX))
-    {
-        // error!
-    }
-    CFRelease(resourcesURL);
+// #ifdef __APPLE__
+//     CFBundleRef mainBundle = CFBundleGetMainBundle();
+//     CFURLRef resourcesURL = CFBundleCopyResourcesDirectoryURL(mainBundle);
+//     char path[PATH_MAX];
+//     if (!CFURLGetFileSystemRepresentation(resourcesURL, TRUE, (UInt8 *)path, PATH_MAX))
+//     {
+//         // error!
+//     }
+//     CFRelease(resourcesURL);
 
-    return std::string(path);
-#else
+//     return std::string(path);
+//#else
     return std::string("./gamedata");
-#endif
+//#endif
 }
 
 std::string gameDataFile( std::string subdir, std::string filename )

diff --git a/ld13_Crossroads/trunk/gamedata/tilefont.png b/ld13_Crossroads/trunk/gamedata/tilefont.png
diff --git a/ld19_discovery/bonsai.cpp b/ld19_discovery/bonsai.cpp
@@ -1,4 +1,4 @@
-#include <luddite/GLee.h>
+//#include <luddite/GLee.h>
 
 #ifndef __APPLE__
 #  include <GL/gl.h>

diff --git a/ld19_discovery/discovery_main.cpp b/ld19_discovery/discovery_main.cpp
@@ -10,10 +10,14 @@
 # include <crtdbg.h>
 #endif
 
-#include <luddite/GLee.h>
-#include <GL/gl.h>
-#include <GL/glu.h>
-
+// #include <luddite/GLee.h>
+#ifndef __APPLE__
+#  include <GL/gl.h>
+#  include <GL/glu.h>
+#else
+#  include <OpenGL/gl.h>
+#  include <OpenGL/glu.h>
+#endif 
 // Luddite tools
 #include <luddite/luddite.h>
 #include <luddite/debug.h>

diff --git a/ld33_urmonster/src/SceneRender.hx b/ld33_urmonster/src/SceneRender.hx
@@ -98,7 +98,7 @@ class SceneRender
 
 	public var shadowTexture_ : RenderTexture;
 
-	public var matcapTexture_ : Texture;
+	//public var matcapTexture_ : Texture;
 
 	public var texShadDepth_ : TextureID;
 	public var texShadDepthWrap : Texture;	
@@ -413,7 +413,7 @@ class SceneRender
 
 		//SHAD
 		worldShader_.set_texture("tex1", texShadDepthWrap );
-		worldShader_.set_texture("tex2", matcapTexture_ );
+		//worldShader_.set_texture("tex2", matcapTexture_ );
 		Luxe.renderer.target = null;
 
 		drawScenePass( sceneCamera_, false );

diff --git a/ld_template/CMakeLists.txt → ld_templates/ld_template2012/CMakeLists.txt b/ld_template/CMakeLists.txt → ld_templates/ld_template2012/CMakeLists.txt
diff --git a/ld_template/gamedata/nesfont.png → ...ates/ld_template2012/gamedata/nesfont.png b/ld_template/gamedata/nesfont.png → ...ates/ld_template2012/gamedata/nesfont.png
diff --git a/ld_template/gamedata/simpletex.png → ...es/ld_template2012/gamedata/simpletex.png b/ld_template/gamedata/simpletex.png → ...es/ld_template2012/gamedata/simpletex.png
diff --git a/ld_template/gamedata/template.glsl → ...es/ld_template2012/gamedata/template.glsl b/ld_template/gamedata/template.glsl → ...es/ld_template2012/gamedata/template.glsl
diff --git a/ld_template/mk_project.py → ld_templates/ld_template2012/mk_project.py b/ld_template/mk_project.py → ld_templates/ld_template2012/mk_project.py
diff --git a/ld_template/nesfont.cpp → ld_templates/ld_template2012/nesfont.cpp b/ld_template/nesfont.cpp → ld_templates/ld_template2012/nesfont.cpp
diff --git a/ld_template/template_game.cpp → ...mplates/ld_template2012/template_game.cpp b/ld_template/template_game.cpp → ...mplates/ld_template2012/template_game.cpp
diff --git a/ld_template/template_game.h → ld_templates/ld_template2012/template_game.h b/ld_template/template_game.h → ld_templates/ld_template2012/template_game.h
diff --git a/ld_template/template_main.cpp → ...mplates/ld_template2012/template_main.cpp b/ld_template/template_main.cpp → ...mplates/ld_template2012/template_main.cpp
diff --git a/simplejam_safetynet/simplejam2016_soup/assets/soup-assets.blend b/simplejam_safetynet/simplejam2016_soup/assets/soup-assets.blend
diff --git a/simplejam_safetynet/simplejam2016_soup/assets/soup-assets.blend1 b/simplejam_safetynet/simplejam2016_soup/assets/soup-assets.blend1