[Orxonox-commit 5535] r10198 - in code/branches/presentationFS14: data/levels/templates src/orxonox/worldentities

[landauf at orxonox.net]

Author: landauf
Date: 2015-01-25 15:39:30 +0100 (Sun, 25 Jan 2015)
New Revision: 10198

Modified:
   code/branches/presentationFS14/data/levels/templates/standardTurret.oxt
   code/branches/presentationFS14/src/orxonox/worldentities/WorldEntity.cc
Log:
disabled physics for turret -> removed attachment-hack in WorldEntity

Modified: code/branches/presentationFS14/data/levels/templates/standardTurret.oxt
===================================================================
--- code/branches/presentationFS14/data/levels/templates/standardTurret.oxt	2015-01-17 17:43:35 UTC (rev 10197)
+++ code/branches/presentationFS14/data/levels/templates/standardTurret.oxt	2015-01-25 14:39:30 UTC (rev 10198)
@@ -1,5 +1,5 @@
 <Template name=standardturret>
-  <Turret collisionType="dynamic">
+  <Turret>
     <attached>
       <Model position="0,0,0" mesh="turretSocketFront.mesh" scale3D="10,10,10" pitch=-90/>
       <Model position="0,0,0" mesh="turretSocketIn.mesh" scale3D="10,10,10" pitch=-90/>
@@ -7,7 +7,7 @@
       <Model position="0,0,0" mesh="turretSocketLeft.mesh" scale3D="10,10,10" pitch=-90/>
       <Model position="0,0,0" mesh="turretSocketRight.mesh" scale3D="10,10,10" pitch=-90/>
 
-      <Turret position="0,0,-10" collisionType="dynamic" angularDamping=0.999999 mass=100 maxPitch=90 maxYaw=90 maxAttackRadius=2000 minAttackRadius=30>
+      <Turret position="0,0,-10" mass=100 maxPitch=90 maxYaw=90 maxAttackRadius=2000 minAttackRadius=30>
         <attached>
           <Model position="0,0,0" pitch="-90" roll="0" mesh="turretHead.mesh" scale3D="10,10,10"/>
         </attached>

Modified: code/branches/presentationFS14/src/orxonox/worldentities/WorldEntity.cc
===================================================================
--- code/branches/presentationFS14/src/orxonox/worldentities/WorldEntity.cc	2015-01-17 17:43:35 UTC (rev 10197)
+++ code/branches/presentationFS14/src/orxonox/worldentities/WorldEntity.cc	2015-01-25 14:39:30 UTC (rev 10198)
@@ -414,9 +414,8 @@
             }
             else if (this->isDynamic())
             {
-                //***HACKY HACK (to allow turrets to be attached)***
-                //orxout(internal_warning) << "Cannot attach a dynamic object to a WorldEntity." << endl;
-                //return false;
+                orxout(internal_warning) << "Cannot attach a dynamic object to a WorldEntity." << endl;
+                return false;
             }
             else if (this->isKinematic() && newParent->isDynamic())
             {