Changeset 9869 in orxonox.OLD for trunk/src/world_entities/space_ships/space_ship.cc

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/world_entities/space_ships/space_ship.cc (modified) (15 diffs)

trunk/src/world_entities/space_ships/space_ship.cc

@@ -26 +26 @@
 #include "weapons/cannon.h"
 
-#include "dot_emitter.h"
-#include "sprite_particles.h"
+#include "particles/dot_emitter.h"
+#include "particles/sprite_particles.h"
 
 #include "util/loading/factory.h"
@@ -53 +53 @@
 
 
-
-CREATE_FACTORY(SpaceShip, CL_SPACE_SHIP);
+#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(SpaceShip, CL_SPACE_SHIP);
+CREATE_FACTORY(SpaceShip);
+
 #include "script_class.h"
-CREATE_SCRIPTABLE_CLASS(SpaceShip, CL_SPACE_SHIP,
-                        addMethod("hasPlayer", ExecutorLua0ret<Playable,bool>(&Playable::hasPlayer))
-                        ->addMethod("fire", ExecutorLua1<Playable, bool>(&Playable::fire))
-                        ->addMethod("loadModel", ExecutorLua2<WorldEntity,const std::string& ,float>(&WorldEntity::loadModel2))
-                        ->addMethod("setName", ExecutorLua1<BaseObject,const std::string&>(&BaseObject::setName))
-                        ->addMethod("hide", ExecutorLua0<WorldEntity>(&WorldEntity::hide))
-                        ->addMethod("unhide", ExecutorLua0<WorldEntity>(&WorldEntity::unhide))
-                       //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))
+CREATE_SCRIPTABLE_CLASS(SpaceShip,
+                        addMethod("hasPlayer", Executor0ret<Playable, lua_State*,bool>(&Playable::hasPlayer))
+                        ->addMethod("fire", Executor1<Playable, lua_State*, bool>(&Playable::fire))
+                        ->addMethod("loadModel", Executor2<WorldEntity, lua_State*,const std::string& ,float>(&WorldEntity::loadModel2))
+                        ->addMethod("setName", Executor1<BaseObject, lua_State*,const std::string&>(&BaseObject::setName))
+                        ->addMethod("hide", Executor0<WorldEntity, lua_State*>(&WorldEntity::hide))
+                        ->addMethod("unhide", Executor0<WorldEntity, lua_State*>(&WorldEntity::unhide))
+                        //Coordinates
+                        ->addMethod("setAbsCoor", Executor3<PNode, lua_State*,float,float,float>(&PNode::setAbsCoor))
+                        ->addMethod("getAbsCoorX", Executor0ret<PNode, lua_State*, float>(&PNode::getAbsCoorX))
+                        ->addMethod("getAbsCoorY", Executor0ret<PNode, lua_State*, float>(&PNode::getAbsCoorY))
+                        ->addMethod("getAbsCoorZ", Executor0ret<PNode, lua_State*, float>(&PNode::getAbsCoorZ))
                        );
 
@@ -116 +118 @@
 void SpaceShip::init()
 {
-//  this->setRelDir(Quaternion(M_PI, Vector(1,0,0)));
-  this->setClassID(CL_SPACE_SHIP, "SpaceShip");
+  //  this->setRelDir(Quaternion(M_PI, Vector(1,0,0)));
+  this->registerObject(this, SpaceShip::_objectList);
 
   PRINTF(4)("SPACESHIP INIT\n");
@@ -145 +147 @@
   controlVelocityY = 150;
   shipInertia = 1.5;
-//  cycle = 0.0;
+  //  cycle = 0.0;
 
   this->setHealthMax(100);
@@ -156 +158 @@
   this->pitchDir = this->getAbsDir();
 
-//   GLGuiButton* button = new GLGuiPushButton();
-//    button->show();
-//    button->setLabel("orxonox");
-//    button->setBindNode(this);
-//     GLGuiBar* bar = new GLGuiBar();
-//     bar->show();
-//     bar->setValue(7.0);
-//     bar->setMaximum(10);
-//     bar->setSize2D( 20, 100);
-//     bar->setAbsCoor2D( 10, 200);
+  //   GLGuiButton* button = new GLGuiPushButton();
+  //    button->show();
+  //    button->setLabel("orxonox");
+  //    button->setBindNode(this);
+  //     GLGuiBar* bar = new GLGuiBar();
+  //     bar->show();
+  //     bar->setValue(7.0);
+  //     bar->setMaximum(10);
+  //     bar->setSize2D( 20, 100);
+  //     bar->setAbsCoor2D( 10, 200);
 
   //add events to the eventlist
@@ -200 +202 @@
   this->getWeaponManager().setSlotPosition(5, Vector(-1.5, -.5, -.5));
   this->getWeaponManager().setSlotDirection(5, Quaternion(+M_PI_4*.5-M_PI, Vector(1,0,0)));
-//
-   this->getWeaponManager().setSlotPosition(6, Vector(-1, 0.0, 0));
-   this->getWeaponManager().setSlotCapability(6, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-   //
-//   this->getWeaponManager().setSlotPosition(8, Vector(-2.5, -0.3, -2.0));
-//   this->getWeaponManager().setSlotDirection(8, Quaternion(-M_PI, Vector(1,0,0)));
-//
-//   this->getWeaponManager().setSlotPosition(9, Vector(-2.5, -0.3, 2.0));
-//   this->getWeaponManager().setSlotDirection(9, Quaternion(+M_PI, Vector(1,0,0)));:
+  //
+  this->getWeaponManager().setSlotPosition(6, Vector(-1, 0.0, 0));
+  this->getWeaponManager().setSlotCapability(6, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+  //
+  //   this->getWeaponManager().setSlotPosition(8, Vector(-2.5, -0.3, -2.0));
+  //   this->getWeaponManager().setSlotDirection(8, Quaternion(-M_PI, Vector(1,0,0)));
+  //
+  //   this->getWeaponManager().setSlotPosition(9, Vector(-2.5, -0.3, 2.0));
+  //   this->getWeaponManager().setSlotDirection(9, Quaternion(+M_PI, Vector(1,0,0)));:
 
   this->getWeaponManager().getFixedTarget()->setParent(this);
@@ -310 +312 @@
 void SpaceShip::collidesWith(WorldEntity* entity, const Vector& location)
 {
-
 }
 
@@ -332 +333 @@
 
   if( ( xMouse != 0 || yMouse != 0 ) && this->getOwner() == SharedNetworkData::getInstance()->getHostID() )
-   {
+  {
     if (xMouse > controlVelocityX) xMouse = controlVelocityX;
     else if (xMouse < -controlVelocityX) xMouse = -controlVelocityX;
@@ -342 +343 @@
     mouseDir *= (Quaternion(-M_PI/4*xMouse*mouseSensitivity, Vector(0,1,0))*Quaternion(-M_PI/4*yMouse*mouseSensitivity*yInvert, Vector(0,0,1))*pitchDir);
     xMouse = yMouse = 0;
-   }
-
-
-//   if( this != State::getPlayer()->getControllable())
-//     return;
+  }
+
+
+  //   if( this != State::getPlayer()->getControllable())
+  //     return;
 
   // spaceship controlled movement fire(bool bF){ this->bFire = bF;}
   //if (this->getOwner() == this->getHostID())
-    this->calculateVelocity(time);
+  this->calculateVelocity(time);
 
 
@@ -363 +364 @@
 
   //orient the spaceship in direction of the mouse
-   rotQuat = Quaternion::quatSlerp( this->getAbsDir(), mouseDir, 0.5);//fabsf(time)*shipInertia);
-   if (this->getAbsDir().distance(rotQuat) > 0.00000000000001)
+  rotQuat = Quaternion::quatSlerp( this->getAbsDir(), mouseDir, 0.5);//fabsf(time)*shipInertia);
+  if (this->getAbsDir().distance(rotQuat) > 0.00000000000001)
     this->setAbsDir( rotQuat);
-   //this->setAbsDirSoft(mouseDir,5);
+  //this->setAbsDirSoft(mouseDir,5);
 
   // this is the air friction (necessary for a smooth control)
@@ -388 +389 @@
   this->shiftCoor(move);
 
-//   PRINTF(0)("id of %s is: %i\n", this->getName(), this->getOMListNumber());
+  //   PRINTF(0)("id of %s is: %i\n", this->getName(), this->getOMListNumber());
 
 }
@@ -409 +410 @@
 
   if( this->bUp )
-   {
-     //this->shiftCoor(this->getAbsDirX());
-      //accel += (this->getAbsDirX())*2;
-      accel += (this->getAbsDirX())*acceleration;
-
-   }
+  {
+    //this->shiftCoor(this->getAbsDirX());
+    //accel += (this->getAbsDirX())*2;
+    accel += (this->getAbsDirX())*acceleration;
+
+  }
 
   if( this->bDown )
-   {
-     //this->shiftCoor((this->getAbsDirX())*-1);
-     //accel -= (this->getAbsDirX())*2;
+  {
+    //this->shiftCoor((this->getAbsDirX())*-1);
+    //accel -= (this->getAbsDirX())*2;
     //if(velocity.len() > 50)
-     accel -= (this->getAbsDirX())*0.5*acceleration;
-
-
-
-   }
+    accel -= (this->getAbsDirX())*0.5*acceleration;
+
+
+
+  }
 
   if( this->bLeft/* > -this->getRelCoor().z*2*/)
   {
     this->shiftDir(Quaternion(time, Vector(0,1,0)));
-//    accel -= rightDirection;
+    //    accel -= rightDirection;
     //velocityDir.normalize();
     //rot +=Vector(1,0,0);
@@ -449 +450 @@
   {
     mouseDir *= Quaternion(-time*2, Vector(1,0,0));
-//    accel -= rightDirection;
+    //    accel -= rightDirection;
     //velocityDir.normalize();
     //rot +=Vector(1,0,0);
@@ -467 +468 @@
     this->shiftDir(Quaternion(time, Vector(0,0,1)));
 
-//    accel += upDirection;
+    //    accel += upDirection;
     //velocityDir.normalize();
     //rot += Vector(0,0,1);
@@ -495 +496 @@
 
   if( event.type == KeyMapper::PEV_LEFT)
-      this->bRollL = event.bPressed;
+    this->bRollL = event.bPressed;
   else if( event.type == KeyMapper::PEV_RIGHT)
-      this->bRollR = event.bPressed;
+    this->bRollR = event.bPressed;
   else if( event.type == KeyMapper::PEV_FORWARD)
     this->bUp = event.bPressed; //this->shiftCoor(0,.1,0);