Changeset 10008 for code/branches/turretFS14

Timestamp:

Mar 27, 2014, 3:52:59 PM (10 years ago)

Author:

muemart

Message:

Start a new controller and investigate rotations

Location:

code/branches/turretFS14

Files:

• data/levels/templates/spaceshipTurretTest.oxt (modified) (1 diff)
• data/levels/turretTest.oxw (modified) (1 diff)
• src/modules/objects/CMakeLists.txt (modified) (1 diff)
• src/modules/objects/Turret.cc (modified) (4 diffs)
• src/modules/objects/Turret.h (modified) (1 diff)
• src/modules/objects/controllers (added)
• src/modules/objects/controllers/CMakeLists.txt (added)
• src/modules/objects/controllers/TurretController.cc (added)
• src/modules/objects/controllers/TurretController.h (added)

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

@@ -39 +39 @@
   >
     <attached>
-        <Model position="0,0,0" yaw="90" roll="-90" mesh="turretHead.mesh" scale3D="10,10,10"/>
+        <Model position="0,0,0" pitch="0" roll="0" mesh="turretHead.mesh" scale3D="10,10,10"/>
     </attached>
     <collisionShapes>

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

@@ -41 +41 @@
         <Model position="0,0,0" mesh="turretSocketLeft.mesh" scale3D="10,10,10" />
         <Model position="0,0,0" mesh="turretSocketRight.mesh" scale3D="10,10,10" />
+
+        <Turret position="0,10,0" pitch="0" yaw="90" roll="0">
+            <templates>
+              <Template link=spaceshipturrettest />
+            </templates>
+            <controller>
+              <TurretController team=10 />
+            </controller>
+        </Turret>
+
+        <Model mesh="sphere.mesh" position="25,0,0" scale=1 />
+
+        <Model mesh="sphere.mesh" position="0,25,0" scale=1 />
+
+        <Model mesh="sphere.mesh" position="0,0,25" scale=1 />
+
     </attached>
 </StaticEntity>
 
-
-
-<Turret position="0,10,0" pitch="90" yaw="0" roll="0">
-    <templates>
-        <Template link=spaceshipturrettest />
-    </templates>
-    <controller>
-        <WaypointPatrolController alertnessradius=100 team=10>
-        </WaypointPatrolController>
-     </controller>
-</Turret>
 
 

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

@@ -11 +11 @@
 ADD_SUBDIRECTORY(eventsystem)
 ADD_SUBDIRECTORY(triggers)
+ADD_SUBDIRECTORY(controllers)
 
 ORXONOX_ADD_LIBRARY(objects

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

@@ -78 +78 @@
            currentPitch < lowerBoundary && value.x < 0)
         {
-            return;
+            //return;
         }
         
-        //SpaceShip::rotatePitch(value);
+        SpaceShip::rotatePitch(value);
     }
 
@@ -92 +92 @@
         Radian upperBoundary = startYaw + limit;
         Radian lowerBoundary = startYaw - limit;
-        orxout() << currentYaw << " " << this->getOrientation().getRoll() << endl;
         /*if(upperBoundary >= Radian(Degree(180)));
         {
@@ -117 +116 @@
     void Turret::rotateRoll(const Vector2& value)
     {
-        return;
+        SpaceShip::rotateRoll(value);
     }
 
@@ -137 +136 @@
     void Turret::tick(float dt)
     {
+        orxout() << "Pitch: " << this->getOrientation().getPitch() << "\tYaw: " << this->getOrientation().getYaw() << "\tRoll: " << this->getOrientation().getRoll() << endl;
         if(!gotOrient_)
         {

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

@@ -65 +65 @@
             bool gotOrient_;
             Quaternion startOrient_;
-            Quaternion firstOrient_;
     };
 }