Ver Fonte

game functions removed from C context

mikymod há 12 anos atrás
pai
commit
0ed151ff00
2 ficheiros alterados com 17 adições e 17 exclusões
  1. 6 3
      samples/terrain/CMakeLists.txt
  2. 11 14
      samples/terrain/terrain_main.cpp

+ 6 - 3
samples/terrain/CMakeLists.txt

@@ -9,8 +9,11 @@ set (HEADERS
 	Terrain.h
 	Terrain.h
 )
 )
 
 
-add_executable(${CROWN_EXECUTABLE_NAME} ${CROWN_MAIN_SRC} ${SRC} ${HEADERS})
-target_link_libraries(${CROWN_EXECUTABLE_NAME} crown)
+add_library (terrain STATIC ${SRC} ${HEADERS})
+add_executable (game-terrain ${CROWN_MAIN_SRC})
+target_link_libraries (terrain crown)
+target_link_libraries (game-terrain terrain)
+set_target_properties (game-terrain PROPERTIES OUTPUT_NAME game)
 
 
 install (DIRECTORY terrain DESTINATION samples)
 install (DIRECTORY terrain DESTINATION samples)
-install (TARGETS ${CROWN_EXECUTABLE_NAME} DESTINATION samples/terrain)
+install (TARGETS game-terrain DESTINATION samples/terrain)

+ 11 - 14
samples/terrain/terrain_main.cpp

@@ -133,7 +133,6 @@ public:
 		}
 		}
 		system->update(dt);
 		system->update(dt);
 
 
-		renderer->set_lighting(false);
 		renderer->set_texturing(0, false);
 		renderer->set_texturing(0, false);
 
 
 		ray.set_origin(cam->position());
 		ray.set_origin(cam->position());
@@ -210,20 +209,18 @@ private:
 MainScene m_scene;
 MainScene m_scene;
 WndCtrl m_ctrl;
 WndCtrl m_ctrl;
 
 
-extern "C"
+void init()
 {
 {
-	void init()
-	{
-		m_scene.on_load();
-	}
+	m_scene.on_load();
+}
 
 
-	void shutdown()
-	{
-		m_scene.on_unload();
-	}
+void shutdown()
+{
+	m_scene.on_unload();
+}
 
 
-	void frame(float dt)
-	{
-		m_scene.update(dt);
-	}
+void frame(float dt)
+{
+	m_scene.update(dt);
 }
 }
+