Changeset 10702 in orxonox.OLD for branches/presentation/src/world_entities/weapons/disruptor.cc

Timestamp:

Jun 14, 2007, 11:23:51 PM (17 years ago)

Author:

nicolasc

Message:

minor improvements, some cleanup

File:

• branches/presentation/src/world_entities/weapons/disruptor.cc (modified) (4 diffs)

branches/presentation/src/world_entities/weapons/disruptor.cc

@@ -38 +38 @@
  : Weapon()
 {
-//     this->registerObject(this, Disruptor::_objectList);
-
     this->init();
 }
@@ -46 +44 @@
  : Weapon()
 {
-//     this->registerObject(this, Disruptor::_objectList);
-
     // TODO add leftRight to params
     this->init();
@@ -68 +64 @@
    delete [] this->shootAnim;
    delete [] this->objComp;
-/*
-    for(int j = 0; j < this->getSegs(); j++)
-    {
-      delete this->shootAnim[i][j];
-      delete this->objComp[i][j];
-    }
-    delete this->shootAnim[i];
-    delete this->objComp[i];
-    delete this->emissionPoint[i];
-  }*/
-
-//  this->deconstr();
-     // model will be deleted from WorldEntity-destructor
+
 }
 
@@ -198 +182 @@
 void Disruptor::draw() const
 {
-  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 );
-
-  //Base
-  static_cast<StaticModel*>(this->getModel())->draw(1);
-
-  // Barrel  glPushMatrix();
-  glTranslatef 
-    (this->objComp[0][0]->getAbsCoor().x, this->objComp[0][0]->getAbsCoor().y, this->objComp[0][0]->getAbsCoor().z);
-    static_cast<StaticModel*>(this->getModel())->draw(0);
+    glMatrixMode(GL_MODELVIEW);
+    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 );
+
+    //Base
+    static_cast<StaticModel*>(this->getModel())->draw(1);
+
+    // Barrel
+    glPushMatrix();
+      glTranslatef(this->objComp[0][0]->getAbsCoor().x, this->objComp[0][0]->getAbsCoor().y, this->objComp[0][0]->getAbsCoor().z);
+      static_cast<StaticModel*>(this->getModel())->draw(0);
+    glPopMatrix();
   glPopMatrix();
 }