faerbit/Saxum
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 2 Wiki Activity

Removed hardcoded obj file name from skydome.

Browse Source
This commit is contained in:
Faerbit 2015-03-04 21:05:24 +01:00
parent 6af54ab02f
commit 2c333773b2
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/levels/Level1.xml
View File

@ -12115,6 +12115,7 @@
</terrain> </terrain>
<skydome> <skydome>
<model>skydome.obj</model>
<texture>skydomeNew.png</texture> <texture>skydomeNew.png</texture>
</skydome> </skydome>

7
loader.cc
View File

@ -71,18 +71,19 @@ void Loader::load(std::string filePath, Level* level, std::string compositionsPa
//load the skydome //load the skydome
XMLElement* skydomeElement = doc->FirstChildElement("skydome"); XMLElement* skydomeElement = doc->FirstChildElement("skydome");
std::string skydomeTexture = queryString(skydomeElement, "texture"); std::string skydomeTexture = queryString(skydomeElement, "texture");
std::string skydomePath = "../" + globalGeometryPath + "skydome.obj"; std::string skydomeModelFileName = queryString(skydomeElement, "model");
std::string skydomePath = "../" + globalGeometryPath + skydomeModelFileName;
if(stat(skydomePath.c_str(), &buf) != 0){ if(stat(skydomePath.c_str(), &buf) != 0){
std::cout << "The object file " << skydomePath << " does not exist." << std::endl; std::cout << "The object file " << skydomePath << " does not exist." << std::endl;
exit(-1); exit(-1);
} }
Model skydomeModel = Model("skydome.obj", level->getSkydomeSize()); Model skydomeModel = Model(skydomeModelFileName, level->getSkydomeSize());
std::string skydomeTexturePath = "../" + globalTexturePath + skydomeTexture; std::string skydomeTexturePath = "../" + globalTexturePath + skydomeTexture;
if(stat(skydomeTexturePath.c_str(), &buf) != 0){ if(stat(skydomeTexturePath.c_str(), &buf) != 0){
std::cout << "The texture file " << skydomeTexturePath << " does not exist." << std::endl; std::cout << "The texture file " << skydomeTexturePath << " does not exist." << std::endl;
exit(-1); exit(-1);
} }
Material skydomeMaterial = Material(skydomeTexture, 0.7f, 0.0f, 0.0f, 0.0f); Material skydomeMaterial = Material(skydomeTexture, 1.0f, 0.0f, 0.0f, 0.0f);
Object* skydomeObject = new Object(skydomeModel, skydomeMaterial, glm::vec3(0.0f, 0.0f, 0.0f), Object* skydomeObject = new Object(skydomeModel, skydomeMaterial, glm::vec3(0.0f, 0.0f, 0.0f),
glm::vec3(0.0f, 0.0f, 0.0f), true); glm::vec3(0.0f, 0.0f, 0.0f), true);
level->setSkydomeObject(skydomeObject); level->setSkydomeObject(skydomeObject);