From df884666b52774ad62ec39e6cd081fd4cca5221c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steffen=20F=C3=BCndgens?= <steffen.fuendgens@rwth-aachen.de>
Date: Tue, 3 Feb 2015 12:36:42 +0100
Subject: [PATCH] Scaling of the player ball is now possible.

---
 Levels/ObjectSetups/Compositions.xml | 4 ++--
 level.cc                             | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Levels/ObjectSetups/Compositions.xml b/Levels/ObjectSetups/Compositions.xml
index 21e0804..061c788 100644
--- a/Levels/ObjectSetups/Compositions.xml
+++ b/Levels/ObjectSetups/Compositions.xml
@@ -355,7 +355,7 @@
 
 
 
-
+<!-- Do not change the radius, it has to match the .obj -->
 <objectData>
     <modelPath>marbleSmooth.obj</modelPath>
     <texturePath>Marbletexture.png</texturePath>
@@ -364,7 +364,7 @@
     <specularFactor>0.5</specularFactor>
     <shininess>3.0</shininess>
     <physicType>Player</physicType>
-    <radius>1</radius>
+    <radius>1.0</radius>
     <dampningL>0.15 </dampningL>
     <dampningA>0.7</dampningA>
 </objectData>
diff --git a/level.cc b/level.cc
index a5c8a41..60d1967 100644
--- a/level.cc
+++ b/level.cc
@@ -267,6 +267,7 @@ void Level::load() {
                             if (physicType.compare("Player") == 0){
                                 float radius;
                                 errorCheck(objectData->FirstChildElement("radius")->QueryFloatText(&radius));
+                                radius *= objectScale*compScale;
                                 this->physics.addPlayer(friction, radius, *object, mass, dampningL, dampningA, physicObjects.size());
                             }else if (physicType.compare("Box") == 0){
                                 float width, height, length;