Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Mar 27, 2014, 3:52:59 PM (11 years ago)
Author:
muemart
Message:

Start a new controller and investigate rotations

Location:
code/branches/turretFS14
Files:
4 added
5 edited

Legend:

Unmodified
Added
Removed

  • code/branches/turretFS14/data/levels/templates/spaceshipTurretTest.oxt

    r10004 r10008  
    3939  >
    4040    <attached>
    41         <Model position="0,0,0" yaw="90" roll="-90" mesh="turretHead.mesh" scale3D="10,10,10"/>
     41        <Model position="0,0,0" pitch="0" roll="0" mesh="turretHead.mesh" scale3D="10,10,10"/>
    4242    </attached>
    4343    <collisionShapes>

  • code/branches/turretFS14/data/levels/turretTest.oxw

    r10004 r10008  
    4141        <Model position="0,0,0" mesh="turretSocketLeft.mesh" scale3D="10,10,10" />
    4242        <Model position="0,0,0" mesh="turretSocketRight.mesh" scale3D="10,10,10" />
     43
     44        <Turret position="0,10,0" pitch="0" yaw="90" roll="0">
     45            <templates>
     46              <Template link=spaceshipturrettest />
     47            </templates>
     48            <controller>
     49              <TurretController team=10 />
     50            </controller>
     51        </Turret>
     52
     53        <Model mesh="sphere.mesh" position="25,0,0" scale=1 />
     54
     55        <Model mesh="sphere.mesh" position="0,25,0" scale=1 />
     56
     57        <Model mesh="sphere.mesh" position="0,0,25" scale=1 />
     58
    4359    </attached>
    4460</StaticEntity>
    4561
    46 
    47 
    48 <Turret position="0,10,0" pitch="90" yaw="0" roll="0">
    49     <templates>
    50         <Template link=spaceshipturrettest />
    51     </templates>
    52     <controller>
    53         <WaypointPatrolController alertnessradius=100 team=10>
    54         </WaypointPatrolController>
    55      </controller>
    56 </Turret>
    5762
    5863

  • code/branches/turretFS14/src/modules/objects/CMakeLists.txt

    r9526 r10008  
    1111ADD_SUBDIRECTORY(eventsystem)
    1212ADD_SUBDIRECTORY(triggers)
     13ADD_SUBDIRECTORY(controllers)
    1314
    1415ORXONOX_ADD_LIBRARY(objects

  • code/branches/turretFS14/src/modules/objects/Turret.cc

    r10004 r10008  
    7878           currentPitch < lowerBoundary && value.x < 0)
    7979        {
    80             return;
     80            //return;
    8181        }
    8282       
    83         //SpaceShip::rotatePitch(value);
     83        SpaceShip::rotatePitch(value);
    8484    }
    8585
    … …  
    9292        Radian upperBoundary = startYaw + limit;
    9393        Radian lowerBoundary = startYaw - limit;
    94         orxout() << currentYaw << " " << this->getOrientation().getRoll() << endl;
    9594        /*if(upperBoundary >= Radian(Degree(180)));
    9695        {
    … …  
    117116    void Turret::rotateRoll(const Vector2& value)
    118117    {
    119         return;
     118        SpaceShip::rotateRoll(value);
    120119    }
    121120
    … …  
    137136    void Turret::tick(float dt)
    138137    {
     138        orxout() << "Pitch: " << this->getOrientation().getPitch() << "\tYaw: " << this->getOrientation().getYaw() << "\tRoll: " << this->getOrientation().getRoll() << endl;
    139139        if(!gotOrient_)
    140140        {

  • code/branches/turretFS14/src/modules/objects/Turret.h

    r10004 r10008  
    6565            bool gotOrient_;
    6666            Quaternion startOrient_;
    67             Quaternion firstOrient_;
    6867    };
    6968}
Note: See TracChangeset for help on using the changeset viewer.