Changeset 6717 in orxonox.OLD for branches

Timestamp:

Jan 25, 2006, 4:48:26 PM (19 years ago)

Author:

bknecht

Message:

Control: Helicopter cameranode

Location:

branches/spaceshipcontrol/src/world_entities/space_ships

Files:

• helicopter.cc (modified) (5 diffs)
• helicopter.h (modified) (2 diffs)
• hover.cc (modified) (1 diff)

branches/spaceshipcontrol/src/world_entities/space_ships/helicopter.cc

@@ -124 +124 @@
 
   //cycle = 0.0;
+  
+  // cameraissue
+  this->cameraNode.setParent(this);
+  this->cameraNode.setParentMode(PNODE_ALL);
   
   
@@ -193 +197 @@
 //   this->getWeaponManager()->setSlotDirection(9, Quaternion(+M_PI, Vector(1,0,0)));:
 
-  this->getWeaponManager()->getFixedTarget()->setParent(this);
-  this->getWeaponManager()->getFixedTarget()->setRelCoor(100000,0,0);
+  this->getWeaponManager()->getFixedTarget()->setParent(&(this->cameraNode));
+  this->getWeaponManager()->getFixedTarget()->setRelCoor(0,0,0);
 
   dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
@@ -209 +213 @@
 }
 
-
+void  Helicopter::attachCamera()
+{
+  State::getCamera()->setParentSoft(this->getWeaponManager()->getFixedTarget());
+  State::getCameraTarget()->setParentSoft(this->getWeaponManager()->getFixedTarget());
+
+}
 
 
@@ -272 +281 @@
     else if (yMouse < -controlVelocityY) yMouse = -controlVelocityY;
   }
+  
   // rotorrotation
   this->topRotor.shiftDir(Quaternion(time*10, Vector(0,1,0)));
@@ -506 +516 @@
     this->yMouse = event.yRel*mouseSensitivity;
 
-    this->shiftDir(Quaternion(-M_PI/4*xMouse*mouseSensitivity, Vector(0,1,0))/*Quaternion(-M_PI/4*yMouse*mouseSensitivity, Vector(0,0,1))*/);
-  }
+    this->shiftDir(Quaternion(-M_PI/4*xMouse*mouseSensitivity, Vector(0,1,0)));
+    
+    Quaternion yDir = Quaternion(-M_PI/4*yMouse*mouseSensitivity, Vector(0,0,1));
+
+    
+    if ((this->cameraNode.getAbsDirY()).y < 0.8)
+    {
+     if((this->cameraNode.getAbsDirX()).y > 0)
+     {
+        if(yMouse > 0) this->cameraNode.shiftDir(yDir);;
+     }
+     else
+     {
+         if(yMouse < 0) this->cameraNode.shiftDir(yDir);;
+     }
+    }
+    else this->cameraNode.shiftDir(yDir);;
+    }
 }
 

branches/spaceshipcontrol/src/world_entities/space_ships/helicopter.h

@@ -26 +26 @@
     virtual void enter();
     virtual void leave();
+    virtual void attachCamera();
 
     virtual void postSpawn();
@@ -63 +64 @@
     //float                 cycle;              //!< hovercycle
     
-    PNode                   topRotor;
-    PNode                   tailRotor;
+    PNode                 topRotor;
+    PNode                 tailRotor;
+    
+    PNode                 cameraNode;
 
     Vector                velocity;           //!< the velocity of the player.

branches/spaceshipcontrol/src/world_entities/space_ships/hover.cc

@@ -110 +110 @@
   PRINTF(4)("HOVER INIT\n");
 
-  this->loadModel("models/ships/nimrod_#.obj", 1.0);
+  this->loadModel("models/ships/nimrod#.obj", 1.0);
 
   EventHandler::getInstance()->grabEvents(true);