Changeset 10008 for code/branches/turretFS14/src/modules

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/src/modules/objects

Files:

• CMakeLists.txt (modified) (1 diff)
• Turret.cc (modified) (4 diffs)
• Turret.h (modified) (1 diff)
• controllers (added)
• controllers/CMakeLists.txt (added)
• controllers/TurretController.cc (added)
• controllers/TurretController.h (added)

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_;
     };
 }