Fixed rendering black lines + made executable folder independent

fifengine · Oct 3, 2016 · 9eec588 · 9eec588
1 parent cac2475
commit 9eec588
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 11 deletions.
diff --git a/assets/maps/shrine.xml b/assets/maps/shrine.xml
@@ -6059,8 +6059,8 @@
 			<i x="-19.0" o="beach_bar" z="0.0" y="2.0" r="180"></i>
 		</instances>
 	</layer>
-	<camera ref_cell_width="64" zoom="1.0" tilt="-41.409622109270856" id="main" ref_layer_id="TechdemoMapGroundObjectLayer" ref_cell_height="48" rotation="45.0">
+	<camera ref_cell_width="62" zoom="1.0" tilt="-41.9" id="main" ref_layer_id="TechdemoMapGroundObjectLayer" ref_cell_height="47" rotation="45.0">
 	</camera>
-	<camera ref_cell_width="128" zoom="1.0" tilt="-41.409622109270856" viewport="10,10,400,250" id="small" ref_layer_id="TechdemoMapTileLayer" ref_cell_height="96" rotation="45.0">
+	<camera ref_cell_width="126" zoom="1.0" tilt="-41.9" viewport="10,10,400,250" id="small" ref_layer_id="TechdemoMapTileLayer" ref_cell_height="96" rotation="45.0">
 	</camera>
 </map>
diff --git a/assets/objects/ground1.png b/assets/objects/ground1.png
diff --git a/assets/objects/ground1.xml b/assets/objects/ground1.xml
@@ -1,12 +1,12 @@
 <?fife type="atlas"?>
 <atlas name="ground1.png" namespace="http://www.fifengine.net/xml/rio_de_hola" width="1008" height="480">
-	<image source="beach/06/135.png" xpos="0" ypos="0" width="127" height="96"/>
-	<image source="beach/01/045.png" xpos="127" ypos="0" width="126" height="96"/>
-	<image source="beach/01/135.png" xpos="253" ypos="0" width="126" height="96"/>
-	<image source="beach/01/225.png" xpos="379" ypos="0" width="126" height="96"/>
-	<image source="beach/01/315.png" xpos="505" ypos="0" width="126" height="96"/>
-	<image source="beach/02/045.png" xpos="631" ypos="0" width="126" height="96"/>
-	<image source="beach/02/135.png" xpos="757" ypos="0" width="126" height="96"/>
+	<image source="beach/06/135.png" xpos="0" ypos="0" width="126" height="96"/>
+	<image source="beach/01/045.png" xpos="126" ypos="0" width="126" height="96"/>
+	<image source="beach/01/135.png" xpos="252" ypos="0" width="126" height="96"/>
+	<image source="beach/01/225.png" xpos="378" ypos="0" width="126" height="96"/>
+	<image source="beach/01/315.png" xpos="504" ypos="0" width="126" height="96"/>
+	<image source="beach/02/045.png" xpos="630" ypos="0" width="126" height="96"/>
+	<image source="beach/02/135.png" xpos="756" ypos="0" width="126" height="96"/>
 	<image source="beach/02/225.png" xpos="0" ypos="96" width="126" height="96"/>
 	<image source="beach/02/315.png" xpos="126" ypos="96" width="126" height="96"/>
 	<image source="beach/03/045.png" xpos="252" ypos="96" width="126" height="96"/>

diff --git a/src/tutorial_1/CMakeLists.txt b/src/tutorial_1/CMakeLists.txt
@@ -100,3 +100,11 @@ if(WIN32)
     )
 
 endif()
+
+#------------------------------------------------------------------------------
+#                        Copy assets
+#------------------------------------------------------------------------------
+
+add_custom_command(TARGET Tutorial1 POST_BUILD
+                   COMMAND ${CMAKE_COMMAND} -E copy_directory
+                       ${CMAKE_SOURCE_DIR}/../assets $<TARGET_FILE_DIR:Tutorial1>/assets)
diff --git a/src/tutorial_1/Game.cpp b/src/tutorial_1/Game.cpp
@@ -216,7 +216,7 @@ void Game::InitSettings()
 	FIFE::EngineSettings& settings = m_engine->getSettings();
 
 	// get the path to the font we are going to use
-	fs::path defaultFontPath("../../assets/fonts/FreeSans.ttf");
+	fs::path defaultFontPath("assets/fonts/FreeSans.ttf");
 
 	// change the engine settings to suite our game
 	settings.setRenderBackend("OpenGL");
@@ -258,7 +258,7 @@ void Game::CreateMap()
 		FIFE::MapLoader* mapLoader = new FIFE::MapLoader(m_engine->getModel(), m_engine->getVFS(), 
 			m_engine->getImageManager(), m_engine->getRenderBackend());
 
-		fs::path mapPath("../../assets/maps/shrine.xml");
+		fs::path mapPath("assets/maps/shrine.xml");
 
 		if (mapLoader) {
 			// load the map