Changeset 5819 in orxonox.OLD for trunk/src/world_entities/weapons/turret.cc

Timestamp:

Nov 29, 2005, 11:07:43 AM (20 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)

File:

• trunk/src/world_entities/weapons/turret.cc (modified) (4 diffs)

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();
+  }
 }
-