Changeset 10198 for code/branches/presentationFS14

Timestamp:

Jan 25, 2015, 3:39:30 PM (9 years ago)

Author:

landauf

Message:

disabled physics for turret → removed attachment-hack in WorldEntity

Location:

code/branches/presentationFS14

Files:

• data/levels/templates/standardTurret.oxt (modified) (2 diffs)
• src/orxonox/worldentities/WorldEntity.cc (modified) (1 diff)

code/branches/presentationFS14/data/levels/templates/standardTurret.oxt

@@ -1 +1 @@
 <Template name=standardturret>
-  <Turret collisionType="dynamic">
+  <Turret>
     <attached>
       <Model position="0,0,0" mesh="turretSocketFront.mesh" scale3D="10,10,10" pitch=-90/>
@@ -8 +8 @@
       <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"/>

code/branches/presentationFS14/src/orxonox/worldentities/WorldEntity.cc

@@ -415 +415 @@
             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())