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

Timestamp:

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

Author:

bensch

Message:

orxonox/trunk: simple useless stuff

Location:

trunk/src/world_entities/creatures

Files:

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

trunk/src/world_entities/creatures/md2_creature.cc

@@ -88 +88 @@
   cannon->setName("BFG");
 
-   this->getWeaponManager()->addWeapon(wpLeft, 1, 0);
-   this->getWeaponManager()->addWeapon(wpRight,1 ,1);
-//   this->getWeaponManager()->addWeapon(cannon, 0, 6);
-
-  //this->getWeaponManager()->addWeapon(turret, 3, 0);
-
-  this->getWeaponManager()->changeWeaponConfig(0);
+   this->getWeaponManager().addWeapon(wpLeft, 1, 0);
+   this->getWeaponManager().addWeapon(wpRight,1 ,1);
+//   this->getWeaponManager().addWeapon(cannon, 0, 6);
+
+  //this->getWeaponManager().addWeapon(turret, 3, 0);
+
+  this->getWeaponManager().changeWeaponConfig(0);
 }
 
@@ -147 +147 @@
 
 
-  this->getWeaponManager()->setSlotCount(7);
-
-  this->getWeaponManager()->setSlotPosition(0, Vector(-0.5, .2, -1.9));
-  this->getWeaponManager()->setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-
-  this->getWeaponManager()->setSlotPosition(1, Vector(-0.5, .2, 1.9));
-  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(-0.5, .2, -1.9));
+  this->getWeaponManager().setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+
+  this->getWeaponManager().setSlotPosition(1, Vector(-0.5, .2, 1.9));
+  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->cameraConnNode.addChild(this->getWeaponManager()->getFixedTarget());
-  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
-
-  this->getWeaponManager()->getFixedTarget()->setRelCoor(10,0,0);
+   this->cameraConnNode.addChild(this->getWeaponManager().getFixedTarget());
+  dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);
+
+  this->getWeaponManager().getFixedTarget()->setRelCoor(10,0,0);
 
 }
@@ -181 +181 @@
 void MD2Creature::enter()
 {
-  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( true);
+  dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( true);
   this->attachCamera();
 
@@ -188 +188 @@
 void MD2Creature::leave()
 {
-  dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
+  dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);
 
 

trunk/src/world_entities/creatures/md2_creature.h

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