From d132cdd233c9b18082439098b606fe42a2918aaf Mon Sep 17 00:00:00 2001
From: Steffen <Steffen-1710@web.de>
Date: Sat, 7 Feb 2015 19:23:27 +0100
Subject: [PATCH] Made None an available physicsType for objects without
 physics.

---
 Levels/ObjectSetups/Compositions.xml |  2 +-
 loader.cc                            | 37 +++++++++++++++++-----------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/Levels/ObjectSetups/Compositions.xml b/Levels/ObjectSetups/Compositions.xml
index cbba8a3..d94a01c 100644
--- a/Levels/ObjectSetups/Compositions.xml
+++ b/Levels/ObjectSetups/Compositions.xml
@@ -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 -->
diff --git a/loader.cc b/loader.cc
index 1f8b15a..c1f58dc 100644
--- a/loader.cc
+++ b/loader.cc
@@ -180,20 +180,7 @@ 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();
                             if(charPhysicType == NULL){
@@ -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);
                             }