Przeglądaj źródła

terrain sample restored to the original state

mikymod 12 lat temu
rodzic
commit
677b05ad35

+ 2 - 1
samples/terrain/CMakeLists.txt

@@ -1,12 +1,13 @@
 cmake_minimum_required(VERSION 2.8)
 cmake_minimum_required(VERSION 2.8)
 
 
 set (SRC
 set (SRC
-	terrain_main.cpp
 	Terrain.cpp
 	Terrain.cpp
+	terrain_main.cpp
 )
 )
 
 
 set (HEADERS
 set (HEADERS
 	Terrain.h
 	Terrain.h
+	../../game/Game.h
 )
 )
 
 
 add_library (game-terrain SHARED ${SRC} ${HEADERS})
 add_library (game-terrain SHARED ${SRC} ${HEADERS})

+ 9 - 7
samples/terrain/terrain_main.cpp

@@ -209,17 +209,19 @@ private:
 MainScene m_scene;
 MainScene m_scene;
 WndCtrl m_ctrl;
 WndCtrl m_ctrl;
 
 
-void init_1()
+} // namespace crown
+
+void init()
 {
 {
-	m_scene.on_load();
+	crown::m_scene.on_load();
 }
 }
-void shutdown_1()
+void shutdown()
 {
 {
-	m_scene.on_unload();
+	crown::m_scene.on_unload();
 }
 }
 
 
-void frame_1(float dt)
+void frame(float dt)
 {
 {
-	m_scene.update(dt);
-}
+	crown::m_scene.update(dt);
 }
 }
+