Changeset 9097 in orxonox.OLD for branches

Timestamp:

Jul 4, 2006, 3:31:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: TravelNode functionality (height and speed)

Location:

branches/presentation/src

Files:

• lib/math/quaternion.h (modified) (1 diff)
• world_entities/space_ships/spacecraft_2d.cc (modified) (7 diffs)
• world_entities/space_ships/spacecraft_2d.h (modified) (1 diff)

branches/presentation/src/lib/math/quaternion.h

@@ -25 +25 @@
 
 #include "compiler.h"
-//! PI the circle-constant
-#define PI 3.14159265359f
 #include "vector.h"
 

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

@@ -25 +25 @@
 
 #include "util/loading/factory.h"
+#include "util/loading/load_param.h"
 #include "key_mapper.h"
 #include "state.h"
@@ -42 +43 @@
 {
   this->setPlayer(NULL);
+  delete this->toTravelHeight;
 }
 
@@ -116 +118 @@
 
   /// 2D-MODE
-  this->travelHeight = 0.0f;
   this->toTravelHeight = NULL;
   this->travelSpeed = 0.0f;
@@ -201 +202 @@
 {
   Playable::loadParams(root);
+
+  LoadParam(root, "travel-speed", this, Spacecraft2D, setTravelSpeed);
+  LoadParam(root, "travel-height", this, Spacecraft2D, setTravelHeight);
 }
 
@@ -208 +212 @@
 }
 
+void Spacecraft2D::setTravelSpeed(float travelSpeed)
+{
+  this->travelSpeed = travelSpeed;
+}
+
+
+void Spacecraft2D::setTravelHeight(float travelHeight)
+{
+  if (this->toTravelHeight == NULL)
+    this->toTravelHeight = new float;
+  *this->toTravelHeight = travelHeight;
+}
+
+
+
+
 void Spacecraft2D::enter()
 {
   dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( true);
-  this->setPlaymode(Playable::Full3D /*this->getPlaymode()*/);
+  this->setPlaymode(this->getPlaymode());
 }
 
@@ -252 +272 @@
 
         State::getCameraNode()->setParentSoft(this->travelNode);
-        State::getCameraNode()->setRelCoorSoft(-10, 50,0);
+        State::getCameraNode()->setRelCoorSoft(-3, 50,0);
         State::getCameraTargetNode()->setParentSoft(this->travelNode);
 
@@ -369 +389 @@
     case Playable::Horizontal:
       {
+
+        if (this->toTravelHeight != NULL)
+        {
+          this->travelNode->shiftCoor(Vector(0, (*toTravelHeight - this->travelNode->getAbsCoor().y) * dt, 0));
+          if (fabsf(this->travelNode->getAbsCoor().y - *this->toTravelHeight) < .1)
+          {
+            delete this->toTravelHeight;
+            this->toTravelHeight = NULL;
+          }
+        }
+        this->travelNode->shiftCoor(Vector(this->travelSpeed * dt, 0, 0));
 
         accel.y = 0.0;

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

@@ -67 +67 @@
     /// 2D-traveling
     PNode*                travelNode;
-    float                 travelHeight;
     float*                toTravelHeight;
     float                 travelSpeed;        //!< the current speed of the Hove (to make soft movement)