Changeset 6241 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Dec 21, 2005, 3:36:25 PM (19 years ago)

Author:

bensch

Message:

trunk: merged the spaceshipcontrol back to the trunk

Location:

trunk/src/world_entities

Files:

• playable.cc (modified) (4 diffs)
• playable.h (modified) (2 diffs)
• player.cc (modified) (1 diff)
• space_ships/space_ship.cc (modified) (5 diffs)
• weapons/guided_missile.cc (modified) (3 diffs)

trunk/src/world_entities/playable.cc

@@ -20 +20 @@
 #include "event_handler.h"
 #include "player.h"
+#include "state.h"
 
 
@@ -72 +73 @@
     for (ev = this->events.begin(); ev != events.end(); ev++)
       evh->subscribe(player, ES_GAME, (*ev));
-
+    this->enter();
     return true;
   }
@@ -97 +98 @@
       evh->unsubscribe( ES_GAME, (*ev));
 
+    this->leave();
     this->currentPlayer = NULL;
     return true;
@@ -127 +129 @@
 
 
+void  Playable::attachCamera()
+{
+       State::getCamera()->setParentSoft(this);
+       State::getCameraTarget()->setParentSoft(this);
+
+}
+
+
+void  Playable::detachCamera()
+{
+
+
+}

trunk/src/world_entities/playable.h

@@ -25 +25 @@
     virtual ~Playable();
 
-    virtual void enter() {};
-    virtual void leave() {};
+    virtual void enter()=0;
+    virtual void leave()=0;
 
     virtual void addWeapon(Weapon* weapon )  {}//= 0;
@@ -34 +34 @@
     bool subscribePlayer(Player* player);
     bool unsubscribePlayer(Player* player);
+
+    void attachCamera();
+    void detachCamera();
 
     virtual void process(const Event &event) = 0;

trunk/src/world_entities/player.cc

@@ -95 +95 @@
          if (this->controllable != (*node) && (dynamic_cast<PNode*>(*node)->getAbsCoor() - this->controllable->getAbsCoor()).len() < 10.0)
        {
-         this->controllable->leave();
+ 
          this->disconnectControllable();
          this->setControllable(dynamic_cast<Playable*>(*node));
-         this->controllable->enter();
-         State::getCamera()->setParentSoft(this->controllable);
-         State::getCameraTarget()->setParentSoft(this->controllable);
 
          break;

trunk/src/world_entities/space_ships/space_ship.cc

@@ -112 +112 @@
   PRINTF(4)("SPACESHIP INIT\n");
 
-//   EventHandler::getInstance()->grabEvents(true);
+  EventHandler::getInstance()->grabEvents(true);
 
   bUp = bDown = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = false;
@@ -193 +193 @@
 {
   dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( true);
+  this->attachCamera();
 
 
@@ -200 +201 @@
 {
   dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
+  this->detachCamera();
 
 
@@ -284 +286 @@
 
   //orient the spaceship in direction of the mouse
-   rotQuat = Quaternion::quatSlerp( this->getAbsDir(),mouseDir,fabsf(time)*3);
-   if (this->getAbsDir().distance(rotQuat) > 0.001)
+   rotQuat = Quaternion::quatSlerp( this->getAbsDir(), mouseDir, fabsf(time)*3.0);
+   if (this->getAbsDir().distance(rotQuat) > 0.00000000000001)
     this->setAbsDir( rotQuat);
    //this->setAbsDirSoft(mouseDir,5);
@@ -440 +442 @@
     this->yMouse = event.yRel;
     mouseDir *= (Quaternion(-M_PI/4*xMouse*mouseSensitivity, Vector(0,1,0))*Quaternion(-M_PI/4*yMouse*mouseSensitivity, Vector(0,0,1)));
-    if( xMouse*xMouse + yMouse*yMouse < 0.9)
-     this->setAbsDir(mouseDir);
+   // if( xMouse*xMouse + yMouse*yMouse < 0.9)
+     //this->setAbsDir(mouseDir);
   }
 }

trunk/src/world_entities/weapons/guided_missile.cc

@@ -146 +146 @@
 {
 
-  if (this->target != NULL && this->target->getParent() != PNode::getNullParent())
+  
+if (this->target != NULL && this->target->getParent() != PNode::getNullParent())
    {
     speed = velocity.len();
@@ -152 +153 @@
 
     if(velocity.dot(diffVector) != 0)
-    {
+     {
      correctionVector = (( ( diffVector *  (speed * speed/( velocity.dot(diffVector ) ) )) - velocity).getNormalized()) * agility;
 
@@ -159 +160 @@
       else if (velocity.dot(diffVector) < 0)
         velocity -= correctionVector;
-    }
+     }
     else
       velocity += diffVector * agility;