diff --git a/Levels/ObjectSetups/Compositions.xml b/Levels/ObjectSetups/Compositions.xml
index 9bf6deb..e133071 100644
--- a/Levels/ObjectSetups/Compositions.xml
+++ b/Levels/ObjectSetups/Compositions.xml
@@ -7,6 +7,9 @@
0.0
0.0
0.0
+ 0.0
+ 0.0
+ 0.0
1.0
8.0
@@ -21,6 +24,9 @@
0.0
1.0
0.0
+ 0.0
+ 0.0
+ 0.0
1.5
25.0
@@ -35,6 +41,9 @@
0.0
0.0
0.0
+ 0.0
+ 0.0
+ 0.0
1.0
0.0
@@ -49,6 +58,9 @@
0.0
0.0
0.0
+ 0.0
+ 0.0
+ 0.0
1.0
0.0
@@ -87,6 +99,9 @@
0.0
0.0
0.0
+ 0.0
+ 0.0
+ 0.0
1.5
0.0
@@ -95,6 +110,9 @@
2.0
0.0
0.0
+ 0.0
+ 0.0
+ 0.0
1.5
0.0
@@ -103,6 +121,9 @@
1.0
3.0
0.0
+ 0.0
+ 0.0
+ 0.0
1.5
0.0
@@ -117,6 +138,9 @@
0.0
0.0
0.0
+ 0.0
+ 0.0
+ 0.0
1.0
1.0
@@ -125,6 +149,9 @@
0.0
0.0
0.0
+ 0.0
+ 0.0
+ 0.0
1.0
0.0
@@ -139,6 +166,9 @@
0.0
20.0
0.0
+ 0.0
+ 0.0
+ 0.0
1.5
0.0
@@ -153,6 +183,9 @@
0.0
20.0
0.0
+ 0.0
+ 0.0
+ 0.0
1.5
0.0
@@ -161,6 +194,9 @@
0.0
18.0
0.0
+ 0.0
+ 0.0
+ 0.0
1.5
0.0
@@ -169,6 +205,9 @@
0.0
15.0
0.0
+ 0.0
+ 0.0
+ 0.0
1.5
0.0
@@ -177,6 +216,9 @@
0.0
12.0
0.0
+ 0.0
+ 0.0
+ 0.0
1.5
0.0
diff --git a/level.cc b/level.cc
index 97e1ad7..d6b90ca 100644
--- a/level.cc
+++ b/level.cc
@@ -221,7 +221,11 @@ void Level::load() {
* glm::rotate(compRot.z, glm::vec3(0.0f, 0.0f, 1.0f))
* glm::vec4(objectOffset, 0);
glm::vec3 objectPosition = compPos + glm::vec3(rotatedObjectOffset.x,rotatedObjectOffset.y,rotatedObjectOffset.z);
- Object* object = new Object(model, material, objectPosition, compRot);
+ glm::vec3 objectRot;
+ errorCheck(xmlObject->FirstChildElement("xRot")->QueryFloatText(&objectRot[0]));
+ errorCheck(xmlObject->FirstChildElement("yRot")->QueryFloatText(&objectRot[1]));
+ errorCheck(xmlObject->FirstChildElement("zRot")->QueryFloatText(&objectRot[2]));
+ Object* object = new Object(model, material, objectPosition, compRot+objectRot);
objects.push_back(object);
//create an identifier for this object
std::vector objectIdentifier = std::vector(4);