Changeset 9235 in orxonox.OLD for trunk/src/world_entities/space_ships/spacecraft_2d.cc

Timestamp:

Jul 5, 2006, 4:39:02 PM (19 years ago)

Author:

bensch

Message:

merged the presentation back

File:

• trunk/src/world_entities/space_ships/spacecraft_2d.cc (modified) (12 diffs)

trunk/src/world_entities/space_ships/spacecraft_2d.cc

@@ -35 +35 @@
 #include "debug.h"
 
+#include "script_class.h"
+
+
 CREATE_FACTORY(Spacecraft2D, CL_SPACECRAFT_2D);
 
-/**
- *  destructs the spacecraft_2d, deletes alocated memory
- */
-Spacecraft2D::~Spacecraft2D ()
-{
-  this->setPlayer(NULL);
-  delete this->toTravelHeight;
-}
+
+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))
+                       );
+
 
 /**
@@ -76 +82 @@
     this->loadParams(root);
 
+
+
   //weapons:
-  Weapon* wpRight = new TestGun(0);
-  wpRight->setName("testGun Right");
-  Weapon* wpLeft = new TestGun(1);
-  wpLeft->setName("testGun Left");
-  //Weapon* cannon = dynamic_cast<Weapon*>(Factory::fabricate(CL_HYPERBLASTER));
+  Weapon* wpRight = dynamic_cast<Weapon*>(Factory::fabricate(CL_LASER_CANNON));
+  wpRight->setName("Cannon_Right");
+  Weapon* wpLeft = dynamic_cast<Weapon*>(Factory::fabricate(CL_LASER_CANNON));
+  wpLeft->setName("Cannon_Left");
+
+  Weapon* turretLeft = dynamic_cast<Weapon*>(Factory::fabricate(CL_BOOMERANG_GUN));
+  wpRight->setName("Turret_Left");
+  Weapon* turretRight = dynamic_cast<Weapon*>(Factory::fabricate(CL_BOOMERANG_GUN));
+  wpLeft->setName("Turret_Right");
 
   //  cannon->setName("BFG");
@@ -87 +99 @@
   this->addWeapon(wpLeft, 1, 0);
   this->addWeapon(wpRight,1 ,1);
+  this->addWeapon(turretLeft, 1, 2);
+  this->addWeapon(turretRight, 1, 3);
+
   //this->addWeapon(cannon, 0, 2);
 
   this->getWeaponManager().changeWeaponConfig(1);
   dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);
+}
+
+
+/**
+ * @brief destructs the spacecraft_2d, deletes alocated memory
+ */
+Spacecraft2D::~Spacecraft2D ()
+{
+  this->setPlayer(NULL);
+  delete this->toTravelHeight;
 }
 
@@ -109 +134 @@
   this->cameraLook = 0.0f;
   this->rotation = 0.0f;
-  this->acceleration = 10.0f;
-  this->airFriction = 2.0f;
-
-
-  this->setHealthMax(100);
-  this->setHealth(100);
+  this->acceleration = 20.0f;
+  this->airFriction = 0.0f;
+
+
+  this->setHealthMax(1000);
+  this->setHealth(1000);
+  this->setDamage(100.0f);
+
 
 
@@ -122 +149 @@
   this->travelNode = new PNode();
 
+  this->loadModel("models/ships/mantawing.obj", 5.0f);
 
   // camera - issue
@@ -166 +194 @@
   this->getWeaponManager().setSlotCount(5);
 
-  this->getWeaponManager().setSlotPosition(0, Vector(-0.28, 1.186, -2.750));
+  this->getWeaponManager().setSlotPosition(0, Vector(1.843, -0.335, 2.029) * 5.0);
   this->getWeaponManager().setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
 
-  this->getWeaponManager().setSlotPosition(1, Vector(-0.28, 1.186, 2.750));
+  this->getWeaponManager().setSlotPosition(1, Vector(1.843, -0.335, -2.029) * 5.0);
   this->getWeaponManager().setSlotCapability(1, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
 
-  this->getWeaponManager().setSlotPosition(2, Vector(-1.63, .809, -.003));
-  this->getWeaponManager().setSlotCapability(2, WTYPE_HEAVY);
-
   /// TODO: THESE ARE TOO MUCH
-  this->getWeaponManager().setSlotPosition(3, Vector(-1.63, .678, -.652));
-  this->getWeaponManager().setSlotDirection(3, Quaternion(-24/180 * M_PI, Vector(1,0,0)));
-
-  this->getWeaponManager().setSlotPosition(4, Vector(-1.63, .678, .652));
-  this->getWeaponManager().setSlotDirection(4, Quaternion(24/180 * M_PI, Vector(1,0,0)));
+  this->getWeaponManager().setSlotPosition(2, Vector(-0.351, -.238, 1.406) * 5.0);
+  this->getWeaponManager().setSlotDirection(2, Quaternion(-1.7, Vector(0,1,0)));
+
+  this->getWeaponManager().setSlotPosition(3, Vector(-0.351, -.238, -1.406) * 5.0);
+  this->getWeaponManager().setSlotDirection(3, Quaternion(1.7, Vector(0,1,0)));
 
   this->cameraNode.setRelCoor(1,5,0);
@@ -193 +218 @@
   registerVar( new SynchronizeableFloat( &cameraLook, &cameraLook, "cameraLook", PERMISSION_OWNER ) );
   registerVar( new SynchronizeableFloat( &rotation, &rotation, "rotation", PERMISSION_OWNER ) );
+
+
+
 }
 
@@ -285 +313 @@
 
         State::getCameraNode()->setParentSoft(this->travelNode);
-        State::getCameraNode()->setRelCoorSoft(-3, 50,0);
+        State::getCameraNode()->setRelCoorSoft(-3, 100,0);
         State::getCameraTargetNode()->setParentSoft(this->travelNode);
-        State::getCameraTargetNode()->setRelCoorSoft(0,0,0);
+        State::getCameraTargetNode()->setRelCoorSoft(5,0,1);
 
 
@@ -406 +434 @@
         if (this->toTravelHeight != NULL)
         {
-          this->travelNode->shiftCoor(Vector(0, (*toTravelHeight - this->travelNode->getAbsCoor().y) * dt, 0));
+          this->travelNode->shiftCoor(Vector(0, (*toTravelHeight - this->travelNode->getAbsCoor().y) * dt * 10.0, 0));
           if (fabsf(this->travelNode->getAbsCoor().y - *this->toTravelHeight) < .1)
           {
@@ -416 +444 @@
 
         accel.y = 0.0;
+
         Vector accelerationDir = this->getAbsDir().apply(accel * this->acceleration);
         accelerationDir.y = 0.0;
@@ -424 +453 @@
 
         this->velocity += (accelerationDir - damping)* dt;
+
+        if (this->getRelCoor().z > this->travelDistance.y && velocity.z > 0.0)
+          this->velocity.z = 0.0f;
+        if (this->getRelCoor().z < -this->travelDistance.y && velocity.z < 0.0)
+          this->velocity.z = 0.0f;
+
+        if (this->getRelCoor().x > this->travelDistance.x && velocity.x > 0.0)
+          this->velocity.x = 0.0f;
+        if (this->getRelCoor().x < -this->travelDistance.x && velocity.x < 0.0)
+          this->velocity.x = 0.0f;
+
+
         this->shiftCoor (this->velocity * dt);
-        this->setRelDirSoft(Quaternion(0, Vector(0,0,0)), 1.0f);
+        if (accel.z == 0)
+          this->setRelDirSoft(Quaternion(0, Vector(0,0,0)), 5.0f);
+        else
+          this->setRelDirSoft(Quaternion(this->velocity.z * .004, Vector(1,0,0)), 4.5f);
       }
       break;
@@ -475 +519 @@
       else if (cameraLook < -M_PI_4)
         cameraLook = -M_PI_4;
-      //this->cameraNode.setRelDirSoft(this->direction,10);
     }
   }