Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10198


Ignore:
Timestamp:
Jan 25, 2015, 3:39:30 PM (5 years ago)
Author:
landauf
Message:

disabled physics for turret → removed attachment-hack in WorldEntity

Location:
code/branches/presentationFS14
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/presentationFS14/data/levels/templates/standardTurret.oxt

    r10072 r10198  
    11<Template name=standardturret>
    2   <Turret collisionType="dynamic">
     2  <Turret>
    33    <attached>
    44      <Model position="0,0,0" mesh="turretSocketFront.mesh" scale3D="10,10,10" pitch=-90/>
     
    88      <Model position="0,0,0" mesh="turretSocketRight.mesh" scale3D="10,10,10" pitch=-90/>
    99
    10       <Turret position="0,0,-10" collisionType="dynamic" angularDamping=0.999999 mass=100 maxPitch=90 maxYaw=90 maxAttackRadius=2000 minAttackRadius=30>
     10      <Turret position="0,0,-10" mass=100 maxPitch=90 maxYaw=90 maxAttackRadius=2000 minAttackRadius=30>
    1111        <attached>
    1212          <Model position="0,0,0" pitch="-90" roll="0" mesh="turretHead.mesh" scale3D="10,10,10"/>
  • code/branches/presentationFS14/src/orxonox/worldentities/WorldEntity.cc

    r10073 r10198  
    415415            else if (this->isDynamic())
    416416            {
    417                 //***HACKY HACK (to allow turrets to be attached)***
    418                 //orxout(internal_warning) << "Cannot attach a dynamic object to a WorldEntity." << endl;
    419                 //return false;
     417                orxout(internal_warning) << "Cannot attach a dynamic object to a WorldEntity." << endl;
     418                return false;
    420419            }
    421420            else if (this->isKinematic() && newParent->isDynamic())
Note: See TracChangeset for help on using the changeset viewer.