Changeset 7337 in orxonox.OLD for trunk/src/world_entities/space_ships

Timestamp:

Apr 19, 2006, 12:24:20 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: simple useless stuff

Location:

trunk/src/world_entities/space_ships

Files:

• helicopter.cc (modified) (3 diffs)
• helicopter.h (modified) (1 diff)
• hover.cc (modified) (5 diffs)
• hover.h (modified) (1 diff)
• space_ship.cc (modified) (6 diffs)
• space_ship.h (modified) (1 diff)
• turbine_hover.cc (modified) (4 diffs)
• turbine_hover.h (modified) (1 diff)

trunk/src/world_entities/space_ships/helicopter.cc

@@ -94 +94 @@
   this->addWeapon(cannon, 0, 6);
 
-  this->getWeaponManager()->changeWeaponConfig(1);
-  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
+  this->getWeaponManager().changeWeaponConfig(1);
+  dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);
 }
 
@@ -161 +161 @@
   registerEvent(EV_MOUSE_MOTION);
 
-  this->getWeaponManager()->setSlotCount(7);
-
-  this->getWeaponManager()->setSlotPosition(0, Vector(0.0, .1, -1.0));
-  this->getWeaponManager()->setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-
-  this->getWeaponManager()->setSlotPosition(1, Vector(0.0, .1, 1.0));
-  this->getWeaponManager()->setSlotCapability(1, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-
-  this->getWeaponManager()->setSlotPosition(2, Vector(-1.5, .5, -.5));
-  this->getWeaponManager()->setSlotDirection(2, Quaternion(-M_PI_4*.5, Vector(1,0,0)));
-
-  this->getWeaponManager()->setSlotPosition(3, Vector(-1.5, .5, .5));
-  this->getWeaponManager()->setSlotDirection(3, Quaternion(M_PI_4*.5, Vector(1,0,0)));
-
-  this->getWeaponManager()->setSlotPosition(4, Vector(-1.5, -.5, .5));
-  this->getWeaponManager()->setSlotDirection(4, Quaternion(-M_PI_4*.5+M_PI, Vector(1,0,0)));
-
-  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()->getFixedTarget()->setParent(&(this->cameraNode));
-  this->getWeaponManager()->getFixedTarget()->setRelCoor(0,0,0);
-
-  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
+  this->getWeaponManager().setSlotCount(7);
+
+  this->getWeaponManager().setSlotPosition(0, Vector(0.0, .1, -1.0));
+  this->getWeaponManager().setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+
+  this->getWeaponManager().setSlotPosition(1, Vector(0.0, .1, 1.0));
+  this->getWeaponManager().setSlotCapability(1, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+
+  this->getWeaponManager().setSlotPosition(2, Vector(-1.5, .5, -.5));
+  this->getWeaponManager().setSlotDirection(2, Quaternion(-M_PI_4*.5, Vector(1,0,0)));
+
+  this->getWeaponManager().setSlotPosition(3, Vector(-1.5, .5, .5));
+  this->getWeaponManager().setSlotDirection(3, Quaternion(M_PI_4*.5, Vector(1,0,0)));
+
+  this->getWeaponManager().setSlotPosition(4, Vector(-1.5, -.5, .5));
+  this->getWeaponManager().setSlotDirection(4, Quaternion(-M_PI_4*.5+M_PI, Vector(1,0,0)));
+
+  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().getFixedTarget()->setParent(&(this->cameraNode));
+  this->getWeaponManager().getFixedTarget()->setRelCoor(0,0,0);
+
+  dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);
 
 }
@@ -202 +202 @@
 void Helicopter::enter()
 {
-  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( true);
-  State::getCameraNode()->setParentSoft(this->getWeaponManager()->getFixedTarget());
-  State::getCameraTargetNode()->setParentSoft(this->getWeaponManager()->getFixedTarget());
+  dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( true);
+  State::getCameraNode()->setParentSoft(this->getWeaponManager().getFixedTarget());
+  State::getCameraTargetNode()->setParentSoft(this->getWeaponManager().getFixedTarget());
 }
 
 void Helicopter::leave()
 {
-  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
+  dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);
   this->detachCamera();
 

trunk/src/world_entities/space_ships/helicopter.h

@@ -22 +22 @@
 
     virtual void loadParams(const TiXmlElement* root);
-    virtual void setAbsDirPlay(const Quaternion& rot){/* FIXME */};
+    virtual void setStartDirection(const Quaternion& rot){/* FIXME */};
 
     virtual void enter();

trunk/src/world_entities/space_ships/hover.cc

@@ -86 +86 @@
   this->addWeapon(cannon, 0, 2);
 
-  this->getWeaponManager()->changeWeaponConfig(1);
-  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
+  this->getWeaponManager().changeWeaponConfig(1);
+  dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);
 
   this->loadModel("models/ships/hoverglider_mainbody.obj");
@@ -138 +138 @@
   this->rotorNodeRight.setRelCoor(0, 1.0, 2.3);
 
-  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
+  dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);
 
 
@@ -155 +155 @@
 
   // WEAPON_MANAGER configuration
-  this->getWeaponManager()->setSlotCount(5);
-
-  this->getWeaponManager()->setSlotPosition(0, Vector(-0.28, 1.186, -2.750), &this->wingNodeLeft);
-  this->getWeaponManager()->setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-
-  this->getWeaponManager()->setSlotPosition(1, Vector(-0.28, 1.186, 2.750), &this->wingNodeRight);
-  this->getWeaponManager()->setSlotCapability(1, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-
-  this->getWeaponManager()->setSlotPosition(2, Vector(-1.63, .809, -.003));
-  this->getWeaponManager()->setSlotCapability(2, WTYPE_HEAVY);
+  this->getWeaponManager().setSlotCount(5);
+
+  this->getWeaponManager().setSlotPosition(0, Vector(-0.28, 1.186, -2.750), &this->wingNodeLeft);
+  this->getWeaponManager().setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+
+  this->getWeaponManager().setSlotPosition(1, Vector(-0.28, 1.186, 2.750), &this->wingNodeRight);
+  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(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->cameraNode.setRelCoor(1,5,0);
-  this->getWeaponManager()->getFixedTarget()->setParent(&this->cameraNode);
-  this->getWeaponManager()->getFixedTarget()->setRelCoor(1000,0,0);
+  this->getWeaponManager().getFixedTarget()->setParent(&this->cameraNode);
+  this->getWeaponManager().getFixedTarget()->setRelCoor(1000,0,0);
 }
 
@@ -190 +190 @@
 void Hover::enter()
 {
-  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( true);
+  dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( true);
 
   State::getCameraNode()->setParentSoft(&this->cameraNode);
@@ -199 +199 @@
 void Hover::leave()
 {
-  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
+  dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);
   this->detachCamera();
 

trunk/src/world_entities/space_ships/hover.h

@@ -19 +19 @@
 
     virtual void loadParams(const TiXmlElement* root);
-    virtual void setAbsDirPlay(const Quaternion& rot) {/* FIXME */};
+    virtual void setStartDirection(const Quaternion& rot) {/* FIXME */};
 
     virtual void enter();

trunk/src/world_entities/space_ships/space_ship.cc

@@ -136 +136 @@
   //this->addWeapon(cannon, 0, 6);
 
-  this->getWeaponManager()->changeWeaponConfig(1);
+  this->getWeaponManager().changeWeaponConfig(1);
 
   bUp = bDown = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = false;
@@ -183 +183 @@
   registerEvent(EV_MOUSE_MOTION);
 
-  this->getWeaponManager()->setSlotCount(7);
-
-  this->getWeaponManager()->setSlotPosition(0, Vector(-2.6, .1, -3.0));
-  this->getWeaponManager()->setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-
-  this->getWeaponManager()->setSlotPosition(1, Vector(-2.6, .1, 3.0));
-  this->getWeaponManager()->setSlotCapability(1, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-
-  this->getWeaponManager()->setSlotPosition(2, Vector(-1.5, .5, -.5));
-  this->getWeaponManager()->setSlotDirection(2, Quaternion(-M_PI_4*.5, Vector(1,0,0)));
-
-  this->getWeaponManager()->setSlotPosition(3, Vector(-1.5, .5, .5));
-  this->getWeaponManager()->setSlotDirection(3, Quaternion(M_PI_4*.5, Vector(1,0,0)));
-
-  this->getWeaponManager()->setSlotPosition(4, Vector(-1.5, -.5, .5));
-  this->getWeaponManager()->setSlotDirection(4, Quaternion(-M_PI_4*.5+M_PI, Vector(1,0,0)));
-
-  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().setSlotCount(7);
+
+  this->getWeaponManager().setSlotPosition(0, Vector(-2.6, .1, -3.0));
+  this->getWeaponManager().setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+
+  this->getWeaponManager().setSlotPosition(1, Vector(-2.6, .1, 3.0));
+  this->getWeaponManager().setSlotCapability(1, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+
+  this->getWeaponManager().setSlotPosition(2, Vector(-1.5, .5, -.5));
+  this->getWeaponManager().setSlotDirection(2, Quaternion(-M_PI_4*.5, Vector(1,0,0)));
+
+  this->getWeaponManager().setSlotPosition(3, Vector(-1.5, .5, .5));
+  this->getWeaponManager().setSlotDirection(3, Quaternion(M_PI_4*.5, Vector(1,0,0)));
+
+  this->getWeaponManager().setSlotPosition(4, Vector(-1.5, -.5, .5));
+  this->getWeaponManager().setSlotDirection(4, Quaternion(-M_PI_4*.5+M_PI, Vector(1,0,0)));
+
+  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(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(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);
-  this->getWeaponManager()->getFixedTarget()->setRelCoor(100000,0,0);
-
-  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
+//   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);
+  this->getWeaponManager().getFixedTarget()->setRelCoor(100000,0,0);
+
+  dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);
 
   this->burstEmitter = new DotEmitter(200, 0.0, .01);
@@ -248 +248 @@
 }
 
-void SpaceShip::setAbsDirPlay(const Quaternion& quat)
+void SpaceShip::setStartDirection(const Quaternion& quat)
 {
   this->mouseDir = quat;
@@ -267 +267 @@
 void SpaceShip::enter()
 {
-  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( true);
+  dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( true);
   this->attachCamera();
 }
@@ -273 +273 @@
 void SpaceShip::leave()
 {
-  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
+  dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);
   this->detachCamera();
 }
@@ -320 +320 @@
 {
   WorldEntity::draw();
-  this->getWeaponManager()->draw();
 
   //this->debug(0);

trunk/src/world_entities/space_ships/space_ship.h

@@ -27 +27 @@
     virtual void loadParams(const TiXmlElement* root);
 
-    virtual void setAbsDirPlay(const Quaternion& rot);
+    virtual void setStartDirection(const Quaternion& rot);
 
     virtual void enter();

trunk/src/world_entities/space_ships/turbine_hover.cc

@@ -88 +88 @@
   //this->addWeapon(cannon, 0, 2);
 
-  this->getWeaponManager()->changeWeaponConfig(1);
-  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
+  this->getWeaponManager().changeWeaponConfig(1);
+  dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);
 
   this->loadModel("models/ships/hoverglider_mainbody.obj");
@@ -186 +186 @@
   registerEvent(EV_MOUSE_MOTION);
 
-  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
+  dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);
 
   // WEAPON_MANAGER configuration
-  this->getWeaponManager()->setSlotCount(5);
-
-  this->getWeaponManager()->setSlotPosition(0, Vector(-0.28, 1.186, -2.750), &this->wingNodeLeft);
-  this->getWeaponManager()->setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-
-  this->getWeaponManager()->setSlotPosition(1, Vector(-0.28, 1.186, 2.750), &this->wingNodeRight);
-  this->getWeaponManager()->setSlotCapability(1, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-
-  this->getWeaponManager()->setSlotPosition(2, Vector(-1.63, .809, -.003));
-  this->getWeaponManager()->setSlotCapability(2, WTYPE_HEAVY);
+  this->getWeaponManager().setSlotCount(5);
+
+  this->getWeaponManager().setSlotPosition(0, Vector(-0.28, 1.186, -2.750), &this->wingNodeLeft);
+  this->getWeaponManager().setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+
+  this->getWeaponManager().setSlotPosition(1, Vector(-0.28, 1.186, 2.750), &this->wingNodeRight);
+  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(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->cameraNode.setRelCoor(1,5,0);
-  this->getWeaponManager()->getFixedTarget()->setParent(&this->cameraNode);
-  this->getWeaponManager()->getFixedTarget()->setRelCoor(1000,0,0);
+  this->getWeaponManager().getFixedTarget()->setParent(&this->cameraNode);
+  this->getWeaponManager().getFixedTarget()->setRelCoor(1000,0,0);
 }
 
@@ -224 +224 @@
 void TurbineHover::enter()
 {
-  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( true);
+  dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( true);
 
   if (State::getCameraNode != NULL)
@@ -236 +236 @@
 void TurbineHover::leave()
 {
-  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
+  dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);
   this->detachCamera();
 

trunk/src/world_entities/space_ships/turbine_hover.h

@@ -23 +23 @@
 
     virtual void loadParams(const TiXmlElement* root);
-    virtual void setAbsDirPlay(const Quaternion& rot) {/* FIXME */};
+    virtual void setStartDirection(const Quaternion& rot) {/* FIXME */};
     virtual void enter();
     virtual void leave();