Changeset 5801 in orxonox.OLD

Timestamp:

Nov 27, 2005, 7:10:01 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: ground-turret loadability

Location:

branches/world_entities/src

Files:

• lib/graphics/spatial_separation/quadtree_node.h (modified) (1 diff)
• util/loading/game_loader.cc (modified) (1 diff)
• world_entities/weapons/ground_turret.cc (modified) (2 diffs)
• world_entities/weapons/ground_turret.h (modified) (1 diff)
• world_entities/weapons/turret.cc (modified) (4 diffs)

branches/world_entities/src/lib/graphics/spatial_separation/quadtree_node.h

@@ -16 +16 @@
 
 #include "base_object.h"
-#include "vector.h"
+
 #include "abstract_model.h"
 

branches/world_entities/src/util/loading/game_loader.cc

@@ -357 +357 @@
     }
 
-  PRINTF(2)("Fabricate failed, TiXmlElement did not contain a value\n");
+  PRINTF(2)("Fabricate failed, TiElement did not contain a value\n");
 
   return NULL;

branches/world_entities/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();
 }
 

branches/world_entities/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 ();

branches/world_entities/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);
@@ -138 +138 @@
     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();
+  }
 }
-