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

Merge branch 'developer' into johan

Browse Source 
# Conflicts:
#	World.cpp
#	worlds/world1.json
This commit is contained in:
Remco
2016-05-23 10:34:21 +02:00
parent d01efecb0e 47c228205a
commit 9d3cfa7e2a
13 changed files with 776 additions and 801 deletions
Download Patch File Download Diff File Expand all files Collapse all files
World.cpp
+10 -9
View File
@@ -4,20 +4,21 @@
#include "LevelObject.h"
#include "json.h"
#include <fstream>
#include <string>
#include <iostream>
World::World() : player(Player::getInstance())
{
json::Value v = json::readJson(std::ifstream("worlds/world1.json"));
if (!v["player"]["startposition"].isNull())
{
player.position.x = v["player"]["startposition"][0];
player.position.y = v["player"]["startposition"][1];
player.position.z = v["player"]["startposition"][2];
}
std::ifstream file("worlds/world1.json");
if(!file.is_open())
std::cout<<"Uhoh, can't open file\n";
json::Value v = json::readJson(file);
std::cout<<v;
file.close();
player.position.x = v["player"]["startposition"][0];
player.position.y = v["player"]["startposition"][1];
player.position.z = v["player"]["startposition"][2];
for (auto object : v["objects"])
{