Changeset 9052 in orxonox.OLD for branches

Timestamp:

Jul 3, 2006, 5:32:34 PM (18 years ago)

Author:

bensch

Message:

some crappy spacecraft work… maybe i will start again :/

Location:

branches/single_player_map/src

Files:

• lib/event/event_handler.cc (modified) (1 diff)
• world_entities/playable.cc (modified) (1 diff)
• world_entities/space_ships/spacecraft_2d.cc (modified) (14 diffs)
• world_entities/space_ships/spacecraft_2d.h (modified) (3 diffs)

branches/single_player_map/src/lib/event/event_handler.cc

@@ -357 +357 @@
   else
   {
-//      SDL_WM_GrabInput(SDL_GRAB_ON);
-//      SDL_ShowCursor(SDL_DISABLE);
+     SDL_WM_GrabInput(SDL_GRAB_ON);
+     SDL_ShowCursor(SDL_DISABLE);
   }
 }

branches/single_player_map/src/world_entities/playable.cc

@@ -95 +95 @@
 
   LoadParam(root, "abs-dir", this, Playable, setPlayDirection);
+  LoadParam(root, "enter-radius", this, Playable, setEnterRadius)
+      .describe("The Distance one can enter the ship from.");
 }
 

branches/single_player_map/src/world_entities/space_ships/spacecraft_2d.cc

@@ -36 +36 @@
 CREATE_FACTORY(Spacecraft2D, CL_SPACECRAFT_2D);
 
-/**
- *  destructs the spacecraft_2d, deletes alocated memory
- */
-Spacecraft2D::~Spacecraft2D ()
-{
-  this->setPlayer(NULL);
-}
 
 /**
@@ -93 +86 @@
 
 /**
+ *  destructs the spacecraft_2d, deletes alocated memory
+ */
+Spacecraft2D::~Spacecraft2D ()
+{
+  this->setPlayer(NULL);
+}
+
+/**
  * @brief initializes a Spacecraft2D
  */
@@ -106 +107 @@
   mouseSensitivity = 0.005;
 
-  this->rotorSpeed = 1000.0f;
-  this->rotorCycle = 0.0f;
   this->cameraLook = 0.0f;
   this->rotation = 0.0f;
   this->acceleration = 10.0f;
-  this->airFriction = 2.0f;
+  this->altitude = 0.0f;
 
   this->setHealthMax(100);
@@ -118 +117 @@
 
   // camera - issue
-  this->cameraNode.addNodeFlags(PNODE_PROHIBIT_CHILD_DELETE);
+  this->travelNode.addNodeFlags(PNODE_PROHIBIT_CHILD_DELETE);
   //this->cameraNode.setParentMode(PNODE_ROTATE_MOVEMENT);
   //this->cameraNode.setParent(this);
@@ -179 +178 @@
   this->getWeaponManager().setSlotDirection(4, Quaternion(24/180 * M_PI, Vector(1,0,0)));
 
-  this->cameraNode.setRelCoor(1,5,0);
-  this->getWeaponManager().getFixedTarget()->setParent(&this->cameraNode);
-  this->getWeaponManager().getFixedTarget()->setRelCoor(1000,0,0);
+  this->travelNode.setRelCoor(0,0,0);
+  //this->getWeaponManager().getFixedTarget()->setParent(&this->cameraNode);
+  //this->getWeaponManager().getFixedTarget()->setRelCoor(1000,0,0);
 
   registerVar( new SynchronizeableBool( &bForward, &bForward, "bForward", PERMISSION_OWNER ) );
@@ -206 +205 @@
 }
 
+void Spacecraft2D::setTravelDirecton(const Quaternion& rot, float speed)
+{
+  this->setPlayDirection(rot, speed);
+}
+
+void Spacecraft2D::setTravelSpeed(float travelSpeed)
+{
+  this->travelSpeed = travelSpeed;
+}
+
+
+
 void Spacecraft2D::enter()
 {
@@ -212 +223 @@
   if (State::getCameraNode != NULL)
   {
-    State::getCameraNode()->setParentSoft(&this->cameraNode);
-    State::getCameraNode()->setRelCoorSoft(-10, 0,0);
-    State::getCameraTargetNode()->setParentSoft(&this->cameraNode);
+    State::getCameraNode()->setParentSoft(&this->travelNode);
+    State::getCameraNode()->setRelCoorSoft(-10, 50,0);
+    State::getCameraTargetNode()->setParentSoft(&this->travelNode);
   }
 }
@@ -264 +275 @@
   // spaceship controlled movement
   this->movement(dt);
-  this->rotorCycle += this->rotorSpeed * dt;
 
   // TRYING TO FIX PNode.
-  this->cameraNode.setAbsCoorSoft(this->getAbsCoor() + Vector(0.0f, 5.0f, 0.0f), 30.0f);
-  this->cameraNode.setRelDirSoft(this->getAbsDir(), 30.0f);
+  //this->travelNode.setAbsCoorSoft(this->getAbsCoor() + Vector(0.0f, 5.0f, 0.0f), 30.0f);
+  //this->travelNode.setRelDirSoft(this->getAbsDir(), 30.0f);
 }
 
@@ -297 +307 @@
     accel += Vector(0, 0, this->acceleration);
   }
+
 
   switch(this->getPlaymode())
@@ -305 +316 @@
 
         // this is the air friction (necessary for a smooth control)
-        Vector damping = (this->velocity * this->airFriction);
-
-
-        this->velocity += (accelerationDir - damping)* dt;
+
+        this->velocity += (accelerationDir)* dt;
         this->shiftCoor (this->velocity * dt);
 
@@ -334 +343 @@
 
         // this is the air friction (necessary for a smooth control)
-        Vector damping = (this->velocity * this->airFriction);
-
-
-        this->velocity += (accelerationDir - damping)* dt;
+
+
+        this->velocity += (accelerationDir )* dt;
         this->shiftCoor (this->velocity * dt);
 
@@ -344 +352 @@
         {
           float maxRot = 10.0 * dt;
-          if (unlikely(this->rotation > maxRot)) this->rotation = maxRot;
-          if (unlikely(this->rotation < -maxRot)) this->rotation = -maxRot;
+          if (unlikely(this->rotation > 0.01 || this->rotation < 0.01)) this->rotation /=1.5;
           this->direction *= Quaternion(-M_PI/4.0*this->rotation, Vector(0,1,0));
 
@@ -355 +362 @@
       break;
 
-    case Playable::Vertical:
-    {
-      accel.z = 0;
-      Vector accelerationDir = this->getAbsDir().apply(accel * this->acceleration);
-      accelerationDir.z=0;
-
-        // this is the air friction (necessary for a smooth control)
-      Vector damping = (this->velocity * this->airFriction);
-
-      this->velocity += (accelerationDir - damping)* dt;
-      this->shiftCoor (this->velocity * dt);
-
-      this->setRelDirSoft(this->direction * Quaternion(-cameraLook, Vector(0,0,1)), 5);
-    }
-    break;
     default:
       PRINTF(2)("Playmode %s Not Implemented\n", Playable::playmodeToString(this->getPlaymode()).c_str());
@@ -403 +395 @@
 
     // rotate the Player around the y-axis
-    this->rotation += xMouse;
+    if (this->getPlaymode() == Playable::Full3D)
+      this->rotation += xMouse;
 
     this->cameraLook += yMouse;

branches/single_player_map/src/world_entities/space_ships/spacecraft_2d.h

@@ -23 +23 @@
     virtual void loadParams(const TiXmlElement* root);
     virtual void setPlayDirection(const Quaternion& rot, float speed = 0.0f);
+    void setTravelDirecton(const Quaternion& rot, float speed = 0.0);
+    void setTravelSpeed(float travelSpeed);
+
     virtual void enter();
     virtual void leave();
+
+
 
     virtual void postSpawn();
@@ -48 +53 @@
     float                 mouseSensitivity;   //!< the mouse sensitivity
 
-    PNode                 cameraNode;
+
+
+    PNode                 travelNode;
+    float                 travelSpeed;
+
     float                 cameraLook;
     float                 rotation;
@@ -54 +63 @@
    // Vector                velocity;           //!< the velocity of the Spacecraft2D.
     Quaternion            direction;          //!< the direction of the Spacecraft2D.
-    float                 travelSpeed;        //!< the current speed of the Hove (to make soft movement)
     float                 acceleration;       //!< the acceleration of the Spacecraft2D.
-    float                 airFriction;        //!< AirFriction.
+    float                 maxSpeed;           //!< The Maximal speed of the Spacecraft2D.
 
-    float                 rotorSpeed;         //!< the speed of the rotor.
-    float                 rotorCycle;         //!< The Cycle the rotor is in.
-
-    float                 airViscosity;
+    float                 altitude;           //!< The height in the Entity.
 
     ParticleEmitter*      burstEmitter;