Changeset 6179 in orxonox.OLD for branches

Timestamp:

Dec 20, 2005, 2:57:34 AM (19 years ago)

Author:

patrick

Message:

christmas: the draw funciton now is original again

Location:

branches/christmas_branche/src/world_entities

Files:

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

branches/christmas_branche/src/world_entities/world_entity.cc

@@ -57 +57 @@
   this->objectListNumber = OM_INIT;
   this->objectListIterator = NULL;
-  this->supportsLOD = false;
 
   this->toList(OM_NULL);
@@ -119 +118 @@
           this->loadModel(lodFile, scaling, i);
       }
-      this->supportsLOD = true;
       return;
     }
@@ -140 +138 @@
       MD2Model* m = new MD2Model(fileName, "");
       m->debug();
-      this->supportsLOD = false;
         //this->setModel((Model*)ResourceManager::getInstance()->load(fileName, MD2, RP_CAMPAIGN), 0);
       this->setModel((Model*)m, 0);
@@ -299 +296 @@
   if (!unlikely(this->models.empty()))
   {
-    if( likely(this->supportsLOD))
-    {
-      glMatrixMode(GL_MODELVIEW);
-      glPushMatrix();
-
-      /* translate */
-      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 );
+    glMatrixMode(GL_MODELVIEW);
+    glPushMatrix();
+
+    /* translate */
+    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 Draws the LOD's
-      float cameraDistance = (State::getCamera()->getAbsCoor() - this->getAbsCoor()).len();
-      if (cameraDistance > 30 && this->models.size() >= 3 && this->models[2] != NULL)
-      {
-        this->models[2]->draw();
-      }
-      else if (cameraDistance > 10 && this->models.size() >= 2 && this->models[1] != NULL)
-      {
-        this->models[1]->draw();
-      }
-      else if (this->models.size() >= 1 && this->models[0] != NULL)
-      {
-        this->models[0]->draw();
-      }
-      glPopMatrix();
-    }
-    else // no LOD
-    {
-      glMatrixMode(GL_MODELVIEW);
-      glPushMatrix();
-
-      /* translate */
-      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 );
-
+    float cameraDistance = (State::getCamera()->getAbsCoor() - this->getAbsCoor()).len();
+    if (cameraDistance > 30 && this->models.size() >= 3 && this->models[2] != NULL)
+    {
+      this->models[2]->draw();
+    }
+    else if (cameraDistance > 10 && this->models.size() >= 2 && this->models[1] != NULL)
+    {
+      this->models[1]->draw();
+    }
+    else if (this->models.size() >= 1 && this->models[0] != NULL)
+    {
       this->models[0]->draw();
-
-      glPopMatrix();
-    }
-  }
-
+    }
+    glPopMatrix();
+  }
 }
 

branches/christmas_branche/src/world_entities/world_entity.h

@@ -79 +79 @@
  private:
   std::vector<Model*>     models;             //!< The model that should be loaded for this entity.
-  bool                    supportsLOD;        //!< If this model format supports LOD (level of detail) this is true
   BVTree*                 obbTree;            //!< this is the obb tree reference needed for collision detection