Changeset 9124 in orxonox.OLD for branches/presentation/src/world_entities/space_ships

Timestamp:

Jul 4, 2006, 2:17:17 PM (18 years ago)

Author:

bensch

Message:

limited controls

Location:

branches/presentation/src/world_entities/space_ships

Files:

• spacecraft_2d.cc (modified) (4 diffs)
• spacecraft_2d.h (modified) (1 diff)

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

@@ -35 +35 @@
 #include "debug.h"
 
+#include "script_class.h"
+
+
 CREATE_FACTORY(Spacecraft2D, CL_SPACECRAFT_2D);
+
+
+CREATE_SCRIPTABLE_CLASS(Spacecraft2D, CL_SPACECRAFT_2D,
+                        addMethod("hasPlayer", ExecutorLua0ret<Playable,bool>(&Playable::hasPlayer))
+                        //Coordinates
+                        ->addMethod("setAbsCoor", ExecutorLua3<PNode,float,float,float>(&PNode::setAbsCoor))
+                        ->addMethod("getAbsCoorX", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorX))
+                        ->addMethod("getAbsCoorY", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorY))
+                        ->addMethod("getAbsCoorZ", ExecutorLua0ret<PNode, float>(&PNode::getAbsCoorZ))
+                        ->addMethod("setAirFriction", ExecutorLua1<Spacecraft2D, float>(&Spacecraft2D::setAirFriction))
+                       );
 
 /**
@@ -110 +124 @@
   this->rotation = 0.0f;
   this->acceleration = 10.0f;
-  this->airFriction = 2.0f;
+  this->airFriction = 0.0f;
 
 
@@ -416 +430 @@
 
         accel.y = 0.0;
+
+
         Vector accelerationDir = this->getAbsDir().apply(accel * this->acceleration);
         accelerationDir.y = 0.0;
 
+
+        /*
+                if (this->getRelCoor().z > this->travelDistance.y && accel.z > 0.0)
+                accel.z = 0.0f;
+                if (this->getRelCoor().z < -this->travelDistance.y && accel.z < 0.0)
+                accel.z = 0.0f;
+
+                if (this->getRelCoor().x > this->travelDistance.x && accel.x > 0.0)
+                accel.x = 0.0f;
+                if (this->getRelCoor().x < -this->travelDistance.x && accel.x < 0.0)
+                accel.x = 0.0f;*/
+
+
         // this is the air friction (necessary for a smooth control)
         Vector damping = (this->velocity * this->airFriction);
@@ -424 +453 @@
 
         this->velocity += (accelerationDir - damping)* dt;
+
+        if (this->getRelCoor().z > this->travelDistance.y && accel.z > 0.0)
+          this->velocity.z = 0.0f;
+        if (this->getRelCoor().z < -this->travelDistance.y && accel.z < 0.0)
+          this->velocity.z = 0.0f;
+
+        if (this->getRelCoor().x > this->travelDistance.x && accel.x > 0.0)
+          this->velocity.x = 0.0f;
+        if (this->getRelCoor().x < -this->travelDistance.x && accel.x < 0.0)
+          this->velocity.x = 0.0f;
+
+
         this->shiftCoor (this->velocity * dt);
-        this->setRelDirSoft(Quaternion(0, Vector(0,0,0)) * Quaternion(this->velocity.z * .01, Vector(1,0,0)), 2.0f);
+        if (accel.z == 0)
+          this->setRelDirSoft(Quaternion(0, Vector(0,0,0)), 3.0f);
+        else
+          this->setRelDirSoft(Quaternion(this->velocity.z * .01, Vector(1,0,0)), 2.0f);
       }
       break;

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

@@ -27 +27 @@
     void setTravelDistance(const Vector2D& distance);
     void setTravelDistance(float x, float y);
+
+    void setAirFriction(float friction) { this->airFriction = friction; };