diff --git a/Levels/ObjectSetups/Compositions.xml b/Levels/ObjectSetups/Compositions.xml
index 0f450f4..21e0804 100644
--- a/Levels/ObjectSetups/Compositions.xml
+++ b/Levels/ObjectSetups/Compositions.xml
@@ -369,6 +369,7 @@
0.7
+
block.obj
blockTexture_small.png
@@ -377,9 +378,9 @@
0.4
2.0
Box
- 6
- 3
- 3
+ 4
+ 1.88
+ 1.99
0.8
0.9
@@ -409,6 +410,7 @@
1.0
+
switch_inner.obj
switchTextureInner.png
@@ -424,6 +426,7 @@
1.0
+
switch_outer.obj
switchTextureOuter.png
@@ -439,6 +442,7 @@
0.5
+
simpleWall.obj
simpleWallTexture.png
@@ -446,10 +450,10 @@
0.6
0.4
2.0
- Box
- 6
+ TriangleMesh
+ 1.5
10
- 3
+ 6
0.555
0.5
diff --git a/level.cc b/level.cc
index 0bb82f5..a5c8a41 100644
--- a/level.cc
+++ b/level.cc
@@ -273,15 +273,21 @@ void Level::load() {
errorCheck(objectData->FirstChildElement("width")->QueryFloatText(&width));
errorCheck(objectData->FirstChildElement("height")->QueryFloatText(&height));
errorCheck(objectData->FirstChildElement("length")->QueryFloatText(&length));
+ width *= objectScale*compScale;
+ height *= objectScale*compScale;
+ length *= objectScale*compScale;
this->physics.addBox(width, height, length, *object, mass, dampningL, dampningA, physicObjects.size(), rotate);
}else if (physicType.compare("Button") == 0){
float width, height, length;
errorCheck(objectData->FirstChildElement("width")->QueryFloatText(&width));
errorCheck(objectData->FirstChildElement("height")->QueryFloatText(&height));
errorCheck(objectData->FirstChildElement("length")->QueryFloatText(&length));
+ width *= objectScale*compScale;
+ height *= objectScale*compScale;
+ length *= objectScale*compScale;
this->physics.addButton(width, height, length, *object, mass, dampningL, dampningA, physicObjects.size(), rotate);
}else if (physicType.compare("TriangleMesh") == 0){
- this->physics.addTriangleMeshBody(*object, modelPath, mass, dampningL, dampningA, physicObjects.size(), objectScale, rotate);
+ this->physics.addTriangleMeshBody(*object, modelPath, mass, dampningL, dampningA, physicObjects.size(), objectScale*compScale, rotate);
} else{
printf("XMLError: Not a valid physicType.\n");
exit(-1);