salmon-engine-projects/double-hit-balls
9
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Prepare for Android

Browse Source
This commit is contained in:
Vladislav Khorev 2018-07-14 15:49:31 +05:00
parent 2c8440db52
commit 7d411110a6
3 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/galax_menu/matte_screen.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

6
game/galaxy_menu.cpp
View File

@ -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;

32
game/main_code.cpp
View File

@ -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();