Avans/CrystalPoint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix image direction / load from JSON

Browse Source
This commit is contained in:
kennyboy55
2016-06-09 12:22:40 +02:00
parent 69561794d8
commit a4373adc25
7 changed files with 37 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
World.cpp
+11 -13
View File
@@ -25,24 +25,18 @@ World::World(const std::string &fileName)
file.close();
//Check file
if(v["world"].isNull() || v["world"]["heightmap"].isNull())
if(v["world"].isNull() || v["world"]["heightmap"].isNull() || v["world"]["skybox"].isNull())
std::cout << "Invalid world file: world - " << fileName << "\n";
if (v["world"]["object-templates"].isNull())
std::cout << "Invalid world file: object templates - " << fileName << "\n";
if (v["player"].isNull() || v["player"]["startposition"].isNull())
std::cout << "Invalid world file: player - " << fileName << "\n";
if (v["objects"].isNull())
std::cout << "Invalid world file: objects - " << fileName << "\n";
if (v["world"]["object-templates"].isNull())
std::cout << "Invalid world file: object templates - " << fileName << "\n";
/*if(crystals)
if(skybox)
if(enemies)
*/
skybox = new Skybox(15000.0f);
skybox->init();
if (v["enemies"].isNull())
std::cout << "Invalid world file: enemies - " << fileName << "\n";
if (v["crystals"].isNull())
std::cout << "Invalid world file: crystals - " << fileName << "\n";
//Load object templates
for (auto objt : v["world"]["object-templates"])
@@ -58,6 +52,10 @@ World::World(const std::string &fileName)
//Generate heightmap for this world
heightmap = new HeightMap(v["world"]["heightmap"].asString(), this);
//Load skybox
skybox = new Skybox(15000.0f, v["world"]["skybox"].asString());
skybox->init();
//Map different texture to heightmap if available
if(!v["world"]["texture"].isNull())
heightmap->SetTexture(v["world"]["texture"].asString());