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

Made None an available physicsType for objects without physics.

Browse Source
This commit is contained in:
Steffen 2015-02-07 19:23:27 +01:00
parent 7647c5f1c0
commit d132cdd233
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Levels/ObjectSetups/Compositions.xml
View File

@ -445,7 +445,7 @@
<!-- Available physicTypes are Player, Box, Button and TriangleMesh.
<!-- Available physicTypes are Player, Box, Button, TriangleMesh and None(no physics).
dampningL should be below 1, objects that can not move are enabled by setting their mass to 0. -->
<!-- Do not change the radius, it has to match the .obj -->

35
loader.cc
View File

@ -180,19 +180,6 @@ void Loader::load(std::string filePath, Level* level, std::string compositionsPa
objectRot *= 0.0174532925; //transform degrees to radians
Object* object = new Object(model, material, objectPosition, compRot+objectRot, renderable);
level->addObject(object);
level->addPhysicsObject(object);
//create an identifier for this object
std::vector<int> objectIdentifier = std::vector<int>(5);
objectIdentifier[0] = level->getObjectsVectorSize()-1;
objectIdentifier[1] = level->getPhysicsObjectsVectorSize()-1;
int idGreen, idBlue;
errorCheck(thisComposition->FirstChildElement("idGreen")->QueryIntText(&idGreen));
errorCheck(thisComposition->FirstChildElement("idBlue")->QueryIntText(&idBlue));
objectIdentifier[2] = idGreen;
objectIdentifier[3] = idBlue;
objectIdentifier[4] = objectNum;
objectIdentifiers.push_back(objectIdentifier);
//add object to physics
const char* charPhysicType = objectData->FirstChildElement("physicType")->GetText();
@ -212,6 +199,7 @@ void Loader::load(std::string filePath, Level* level, std::string compositionsPa
float radius;
errorCheck(objectData->FirstChildElement("radius")->QueryFloatText(&radius));
radius *= objectScale*compScale;
level->addPhysicsObject(object);
level->getPhysics()->addPlayer(friction, radius, *object, mass, dampningL, dampningA, level->getPhysicsObjectsVectorSize());
}else if (physicType.compare("Box") == 0){
float width, height, length;
@ -221,6 +209,7 @@ void Loader::load(std::string filePath, Level* level, std::string compositionsPa
width *= objectScale*compScale;
height *= objectScale*compScale;
length *= objectScale*compScale;
level->addPhysicsObject(object);
level->getPhysics()->addBox(width, height, length, *object, mass, dampningL, dampningA, level->getPhysicsObjectsVectorSize(), rotate);
}else if (physicType.compare("Button") == 0){
float width, height, length;
@ -230,14 +219,34 @@ void Loader::load(std::string filePath, Level* level, std::string compositionsPa
width *= objectScale*compScale;
height *= objectScale*compScale;
length *= objectScale*compScale;
level->addPhysicsObject(object);
level->getPhysics()->addButton(width, height, length, *object, mass, dampningL, dampningA, level->getPhysicsObjectsVectorSize(), rotate);
}else if (physicType.compare("TriangleMesh") == 0){
level->addPhysicsObject(object);
level->getPhysics()->addTriangleMeshBody(*object, modelPath, mass, dampningL, dampningA, level->getPhysicsObjectsVectorSize(), objectScale*compScale, rotate);
}else if (physicType.compare("None") == 0){
} else{
printf("XMLError: Not a valid physicType.\n");
exit(-1);
}
//create an identifier for this object
std::vector<int> objectIdentifier = std::vector<int>(5);
objectIdentifier[0] = level->getObjectsVectorSize()-1;
if (physicType.compare("None") == 0){
objectIdentifier[1] = 0;
}else{
objectIdentifier[1] = level->getPhysicsObjectsVectorSize()-1;
}
int idGreen, idBlue;
errorCheck(thisComposition->FirstChildElement("idGreen")->QueryIntText(&idGreen));
errorCheck(thisComposition->FirstChildElement("idBlue")->QueryIntText(&idBlue));
objectIdentifier[2] = idGreen;
objectIdentifier[3] = idBlue;
objectIdentifier[4] = objectNum;
objectIdentifiers.push_back(objectIdentifier);
if(compositionType == 20){
level->setCameraCenter(object);
}