From 7d411110a64eacc939b592b710b41d340da8bf62 Mon Sep 17 00:00:00 2001
From: Vladislav Khorev <vladislav.khorev@fishrungames.com>
Date: Sat, 14 Jul 2018 15:49:31 +0500
Subject: [PATCH] Prepare for Android

---
 assets/galax_menu/matte_screen.png | Bin 10748 -> 10699 bytes
 game/galaxy_menu.cpp               |   6 +++---
 game/main_code.cpp                 |  32 +++++++++++++++++------------
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/assets/galax_menu/matte_screen.png b/assets/galax_menu/matte_screen.png
index 56bfa62e77c0188e0d842e6c00d2d4b3974b2cc8..749a5c2a4767254e47e4c8cc6771ecc9f9e2480d 100755
GIT binary patch
literal 10699
zcmeAS@N?(olHy`uVBq!ia0y~y-~cjN7&zE~R4MyT7a+x09OUlAu<o49OORB$qpu?a
z!^VE@KZ&eBK4*bPWHAE+w-5+3Ub<WN2Pnv1;_2(k{)knML&xOji^4FVkYtH#L`iUd
zT1k0gQ7S`0VrE{6US4X6f{C7io{`~4h0Li844N9AE{-7;ac^!J3Nk40Fc?lz;O)M9
zp`Gua(Gk~cH_L&>fI!23P6&g6K|le<a%h0D7#NvgOcs!5z+hA%EF?yQXEaej)52(;
z87(QGNnx~n94#NAAuw8L!ji&h`8ZlWj+T$$5E#u0qgi1zD~x6ZPza3nuc0|%boikG
z780Y0VsuminifWz3ZqR0Xi^v*RTwQFp&>9jssKw0qvhjh`8ZlWf<s_5D~x7^(X23<
z6+j^{I;sH838SM54X}_HO%$V}3edDL+Ef^ADnOIM=%~VI`3Mbx5j3ihzqmrA|52dL
claJfJGEDg2#ut#aQWX>op00i_>zopr0IY*N^8f$<

literal 10748
zcmeAS@N?(olHy`uVBq!ia0y~y-~cjN7&zE~R4MyT7a+x!<n8Xl@E-&h>|H(?D8gCb
z5n0T@z%2~Ij105pNB{-dOFVsD*&ngWap;)*d{G$2z@Wh3>EaktaqG=3N5KOM3<owC
zDta7Nvj4KMIZkQe`##h2|A5*+pkeu6Aqb1%z;7NXi$Nd(#%f?-hA~+{R)K-S0Vsok
zff3|dFyJtNu^bv0VN9k`BS*uMVKfl|Gxlii87($O%S&LzFj`SCjMk7045Lkh(PkE~
z{W;pc9Bmo^`zr@vJ%-U9#b^x)Obeqm<Y)~EOa`N!=g}Gxm<&cc&!aUYFd4uG8y{@S
zW;X)z8JhpBeg9F^o#8+OhzADDOfVJ?Xgn1R3>2V@QH7(y14{~{i2@c945Ntx78Ik2
z0u~aZiDI<+fTo4f+I6%|0Zj^{<>OE)A1!Uo(t%3`YC&rOM$7Zj@_e*BhlIdrdly!U
zjh5%IkQgl=N6W|2@^Q3$1cd+vBZm&stcw#wdYS?axZDnENB~zyE-mGJcyam7M3BLr
Lu6{1-oD!M<o)FJs

diff --git a/game/galaxy_menu.cpp b/game/galaxy_menu.cpp
index 69dcb57..c19cb54 100755
--- a/game/galaxy_menu.cpp
+++ b/game/galaxy_menu.cpp
@@ -20,9 +20,9 @@ bool GalaxyMenu::InitGalaxyMenu(std::string config_json, float scale) {
 		menuScale = scale;
 
 	/*...Read ptree from config...*/
-	std::string res_path = "../../../assets/";
-	boost::property_tree::ptree config_pt;
-	boost::property_tree::json_parser::read_json(res_path + config_json, config_pt);
+
+	boost::property_tree::ptree config_pt = SE::ReadJsonFile(ST::PathToResources + config_json);
+	//boost::property_tree::json_parser::read_json(res_path + config_json, config_pt);
 
 	/*..error ptree..*/
 	boost::property_tree::ptree error_pt;
diff --git a/game/main_code.cpp b/game/main_code.cpp
index 71d85b8..146ac34 100755
--- a/game/main_code.cpp
+++ b/game/main_code.cpp
@@ -72,6 +72,8 @@ void TMyApplication::InnerInit()
     ST::PathToResources = "assets/";
 #endif
 
+    ST::PathToResources = "";
+
     if (Console != NULL)
     {
         *Console<<"APP INIT\n";
@@ -257,8 +259,9 @@ void TMyApplication::LoadResources()
 	// :::::::::::::::::::::::::::::::::::::
 	// :::::::::::::PTREE LOAD::::::::::::::
     
-	boost::property_tree::ptree Textures_pt;
-	boost::property_tree::json_parser::read_json(ST::PathToResources + "bg_textures_config.json", Textures_pt);
+	boost::property_tree::ptree Textures_pt = SE::ReadJsonFile(ST::PathToResources + "bg_textures_config.json");
+	//boost::property_tree::json_parser::read_json(ST::PathToResources + "bg_textures_config.json", Textures_pt);
+
 	std::string bg_ext = ".jpeg";
 
 	// :::::::::::::::::::::::::::::::::::::
@@ -307,12 +310,12 @@ void TMyApplication::LoadResources()
 	std::vector<int> galaxies;
 	galaxies.resize(1);
 	galaxies[0] = 3;
-	TextureNamesToLoad.push_back(std::pair<std::string, std::string>("/galax_menu/matte_screen.png", "matte_screen"));
+	TextureNamesToLoad.push_back(std::pair<std::string, std::string>("galax_menu/matte_screen.png", "matte_screen"));
 	for (int i = 0; i < galaxies.size(); i++) {
-		TextureNamesToLoad.push_back(std::pair<std::string, std::string>("/galax_menu/galaxies/galaxy_" + std::to_string(i) + ".png", "galaxy_" + std::to_string(i)));
+		TextureNamesToLoad.push_back(std::pair<std::string, std::string>("galax_menu/galaxies/galaxy_" + std::to_string(i) + ".png", "galaxy_" + std::to_string(i)));
 		for (int j = 0; j < galaxies[i]; j++) {
-			TextureNamesToLoad.push_back(std::pair<std::string, std::string>("/galax_menu/planets/star_" + std::to_string(i) + "_" + std::to_string(j) + ".png", "star_" + std::to_string(i) + "_" + std::to_string(j)));
-			TextureNamesToLoad.push_back(std::pair<std::string, std::string>("/galax_menu/planets/star_" + std::to_string(i) + "_" + std::to_string(j) + "_hover" + ".png", "star_" + std::to_string(i) + "_" + std::to_string(j) + "_hover"));
+			TextureNamesToLoad.push_back(std::pair<std::string, std::string>("galax_menu/planets/star_" + std::to_string(i) + "_" + std::to_string(j) + ".png", "star_" + std::to_string(i) + "_" + std::to_string(j)));
+			TextureNamesToLoad.push_back(std::pair<std::string, std::string>("galax_menu/planets/star_" + std::to_string(i) + "_" + std::to_string(j) + "_hover" + ".png", "star_" + std::to_string(i) + "_" + std::to_string(j) + "_hover"));
 		}
 	}
 
@@ -438,8 +441,11 @@ void TMyApplication::InnerUpdate(size_t dt)
         
         if (TextureNamesToLoad.size() != 0)
         {
+            *SE::Console << "LOADING: " + TextureNamesToLoad.begin()->first;
             ResourceManager->TexList.AddTexture(TextureNamesToLoad.begin()->first, TextureNamesToLoad.begin()->second);
+
             TextureNamesToLoad.erase(TextureNamesToLoad.begin());
+
         }
         else
         {
@@ -640,33 +646,33 @@ void TMyApplication::InnerOnMouseMove(TMouseState& mouseState) {
 void TMyApplication::EffectsInit() {
 
 	boost::property_tree::ptree JSONsource;
-	boost::property_tree::ptree JSONconfig;
+	boost::property_tree::ptree JSONconfig = SE::ReadJsonFile("config.json");
 	std::string effectJSON;
-	boost::property_tree::json_parser::read_json(ST::PathToResources + "config.json", JSONconfig);
 
 	// LEFT
 	effectJSON = JSONconfig.get<std::string>("lefteffect");
-	boost::property_tree::json_parser::read_json(ST::PathToResources + effectJSON, JSONsource);
+	//boost::property_tree::json_parser::read_json(ST::PathToResources + effectJSON, JSONsource);
+    JSONsource = SE::ReadJsonFile(ST::PathToResources + effectJSON);
 	lsparkler.parse(JSONsource); // parse JSON
 	lsparkler.load(); // load textures
 	// RIGHT
 	effectJSON = JSONconfig.get<std::string>("righteffect");
-	boost::property_tree::json_parser::read_json(ST::PathToResources + effectJSON, JSONsource);
+    JSONsource = SE::ReadJsonFile(ST::PathToResources + effectJSON);
 	rsparkler.parse(JSONsource);
 	rsparkler.load();
 	// TOP
 	effectJSON = JSONconfig.get<std::string>("topeffect");
-	boost::property_tree::json_parser::read_json(ST::PathToResources + effectJSON, JSONsource);
+    JSONsource = SE::ReadJsonFile(ST::PathToResources + effectJSON);
 	tsparkler.parse(JSONsource);
 	tsparkler.load();
 	// BOTTOM
 	effectJSON = JSONconfig.get<std::string>("boteffect");
-	boost::property_tree::json_parser::read_json(ST::PathToResources + effectJSON, JSONsource);
+    JSONsource = SE::ReadJsonFile(ST::PathToResources + effectJSON);
 	bsparkler.parse(JSONsource);
 	bsparkler.load();
 	// Level finish
 	effectJSON = JSONconfig.get<std::string>("lvlFinish");
-	boost::property_tree::json_parser::read_json(ST::PathToResources + effectJSON, JSONsource);
+    JSONsource = SE::ReadJsonFile(ST::PathToResources + effectJSON);
 	lvlFirework.parse(JSONsource);
 	lvlFirework.load();