Changeset 5819 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Nov 29, 2005, 11:07:43 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches world_entities to trunk again
merged with command
svn merge -r5795:HEAD branches/world_entities/ trunk/
no conflicts (what a wonder)

Location:

trunk/src/world_entities/weapons

Files:

• aiming_turret.cc (modified) (1 diff)
• cannon.cc (modified) (1 diff)
• ground_turret.cc (modified) (2 diffs)
• ground_turret.h (modified) (1 diff)
• rocket.cc (modified) (1 diff)
• test_gun.cc (modified) (1 diff)
• turret.cc (modified) (4 diffs)

trunk/src/world_entities/weapons/aiming_turret.cc

@@ -49 +49 @@
 
   this->setActionSound(WA_SHOOT, "sound/shot1.wav");
-  this->setActionSound(WA_ACTIVATE, "sound/vocals/missiles.wav");
+  this->setActionSound(WA_ACTIVATE, "sound/voices/rockets.wav");
   this->setActionSound(WA_RELOAD, "sound/vocals/reload.wav");
 }

trunk/src/world_entities/weapons/cannon.cc

@@ -87 +87 @@
   //this->minCharge = 2;
 
-  this->setActionSound(WA_SHOOT, "sound/shot1.wav");
+  this->setActionSound(WA_SHOOT, "sound/explo.wav");
+  this->setActionSound(WA_ACTIVATE, "sound/voices/cannon.wav");
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);

trunk/src/world_entities/weapons/ground_turret.cc

@@ -81 +81 @@
    * @todo: make the class Loadable
    */
-//  LoadParamXML(root, "Weapons", this, GroundTurret, loadWeapon);
+  const TiXmlElement* element;
+
+  element = root->FirstChildElement("weapon-left");
+  if (element != NULL) element = element->FirstChildElement();
+  this->left = dynamic_cast<Weapon*>( Factory::getFirst()->fabricate( element) );
+  if (this->left)
+  {
+    this->left->setParent(this);
+    this->left->setRelCoor(0,10,-5);
+  }
+
+  element = root->FirstChildElement("weapon-right");
+  if (element != NULL)  if (element != NULL) element = element->FirstChildElement();
+  this->right = dynamic_cast<Weapon*>( Factory::getFirst()->fabricate( element) );
+  if (this->right)
+  {
+    this->right->setParent(this);
+    this->right->setRelCoor(0,10,5);
+  }
 }
-
 
 /**
@@ -113 +130 @@
   if (this->model)
     this->model->draw();
-  if (left != NULL)
+
+  glPopMatrix();
+  if (this->left != NULL)
     this->left->draw();
   if (this->right != NULL)
     this->right->draw();
-
-  glPopMatrix();
 }
 

trunk/src/world_entities/weapons/ground_turret.h

@@ -22 +22 @@
   void loadParams(const TiXmlElement* root);
 
-  void loadWeapons(const TiXmlElement* root);
-
   virtual void postSpawn ();
   virtual void leftWorld ();

trunk/src/world_entities/weapons/rocket.cc

@@ -46 +46 @@
   this->energyMin = 1;
   this->energyMax = 10;
-  this->lifeSpan = 2;
+  this->lifeSpan = 5;
 
   this->emitter = new ParticleEmitter(Vector(0,1,0), M_2_PI, 100, 5);

trunk/src/world_entities/weapons/test_gun.cc

@@ -131 +131 @@
   //this->minCharge = 2;
 
-  this->setActionSound(WA_SHOOT, "sound/shot1.wav");
+  this->setActionSound(WA_SHOOT, "sound/laser.wav");
+  this->setActionSound(WA_ACTIVATE, "sound/voices/lasers.wav");
+
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);

trunk/src/world_entities/weapons/turret.cc

@@ -44 +44 @@
   this->init();
 
-  this->loadModel("models/guns/turret1.obj");
-
-
   this->setActionSound(WA_SHOOT, "sound/shot1.wav");
   this->setActionSound(WA_ACTIVATE, "sound/vocals/missiles.wav");
   this->setActionSound(WA_RELOAD, "sound/vocals/reload.wav");
+
+  this->loadModel("models/guns/turret1.obj");
 }
 
@@ -72 +71 @@
 {
   this->setClassID(CL_TURRET, "Turret");
+
 
   Animation3D* animation1 = this->getAnimation(WS_ACTIVATING, this);
@@ -136 +136 @@
     return;
 
-    pj->setVelocity(this->getVelocity()+(this->getAbsDir().apply(Vector(1,0,0))*100.0 + VECTOR_RAND(13)
+  pj->setVelocity(this->getVelocity()+(this->getAbsDir().apply(Vector(1,0,0))*100.0 /*+ VECTOR_RAND(13) */
             /*target->getAbsCoor() - this->getAbsCoor()*/)*.5);//this->getVelocity());
-  
+
 
   pj->setParent(NullParent::getInstance());
@@ -154 +154 @@
 void Turret::draw () const
 {
-  /* draw gun body */
-  glMatrixMode(GL_MODELVIEW);
-  glPushMatrix();
-  glTranslatef (this->getAbsCoor ().x,
-                this->getAbsCoor ().y,
-                this->getAbsCoor ().z);
-  Vector tmpRot = this->getAbsDir().getSpacialAxis();
-  glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
+  if (this->model != NULL)
+  {
+    /* draw gun body */
+    glMatrixMode(GL_MODELVIEW);
+    glPushMatrix();
+    glTranslatef (this->getAbsCoor ().x,
+                  this->getAbsCoor ().y,
+                  this->getAbsCoor ().z);
+    Vector tmpRot = this->getAbsDir().getSpacialAxis();
+    glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
 
-  this->model->draw();
-  glPopMatrix();
+    this->model->draw();
+    glPopMatrix();
+  }
 }
-