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

Rotate parameter for physics.add should now be false if the object has a positionConstraint.

Browse Source
This commit is contained in:
Steffen Fündgens 2015-01-23 16:51:09 +01:00
parent 5eb3aed1ce
commit c1c0cc2881
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
level.cc
View File

@ -254,7 +254,8 @@ void Level::load() {
float mass;
errorCheck(xmlObject->FirstChildElement("mass")->QueryFloatText(&mass));
float dampningL, dampningA;
bool rotate = true;
XMLElement* constraint = thisComposition->FirstChildElement("positionConstraint");
bool rotate = (constraint == NULL);
errorCheck(objectData->FirstChildElement("dampningL")->QueryFloatText(&dampningL));
errorCheck(objectData->FirstChildElement("dampningA")->QueryFloatText(&dampningA));
if (physicType.compare("Player") == 0){
@ -417,7 +418,7 @@ void Level::load() {
XMLElement* positionConstraint = composition->FirstChildElement("positionConstraint");
for(; positionConstraint; positionConstraint=positionConstraint->NextSiblingElement("positionConstraint")){
float xPos, yPos, zPos, strength;
int objectNum, idGreen, idBlue, objectIndex;
int objectNum=0, idGreen=0, idBlue=0, objectIndex=0;
errorCheck(positionConstraint->FirstChildElement("xPosition")->QueryFloatText(&xPos));
errorCheck(positionConstraint->FirstChildElement("yPosition")->QueryFloatText(&yPos));
errorCheck(positionConstraint->FirstChildElement("zPosition")->QueryFloatText(&zPos));