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

Added skeleton for trigger loading. Added comments to identify closing brackets.

Browse Source
This commit is contained in:
Steffen Fündgens 2014-12-12 18:02:31 +01:00
parent 85c6132c3e
commit 3504a2d209
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
level.cc
View File

@ -225,10 +225,13 @@ void Level::load() {
if(compositionType == 20){
cameraCenter = object;
}
}
}
}//objectData found
}//finding the objectData
objectNum = objectNum + 1;
}
}//iterating over all objects of the composition
//iterate over all lights of the composition
XMLElement* light = composition->FirstChildElement("light");
for(; light; light=light->NextSiblingElement("light")){
glm::vec3 compRot, lightOffset, lightColour;
@ -259,13 +262,25 @@ void Level::load() {
glm::vec3 lightPosition = compPos + glm::vec3(rotatedLightOffset.x,rotatedLightOffset.y,rotatedLightOffset.z);
Light light = Light(lightPosition, lightColour, lightIntensity);
lights.push_back(light);
}
}
}//iterating over all lights of the composition
}//corect composition found
}//iterating over all compositions in Compositions.xml
}//iterating over all compositions in Level.xml
//load triggers
XMLElement* trigger = doc->FirstChildElement("trigger");
for(; trigger; trigger=trigger->NextSiblingElement("trigger")){
const char* charName = trigger->FirstChildElement("name")->GetText();
if(charName == NULL){
printf("XMLError: No name found for a trigger.\n");
}
std::string name = charName;
if (name.compare("-") != 0){
//TODO add triggers
}
}
//add player
//add player (//TODO remove this as soon as we have a levelSetup with a player)
Model marbleModel = Model("marbleSmooth.obj", 0.75f);
Material marbleMaterial = Material("Marbletexture.png", 0.1f, 0.5f, 0.5f, 3.0f);
Object* object = new Object(marbleModel, marbleMaterial, glm::vec3(2.0f, 10.0f, 2.0f),