Changeset 6169 in orxonox.OLD for branches/christmas_branche/src/world_entities

Timestamp:

Dec 20, 2005, 12:22:17 AM (19 years ago)

Author:

patrick

Message:

christmas: model loading progress

Location:

branches/christmas_branche/src/world_entities

Files:

• space_ships/space_ship.cc (modified) (2 diffs)
• world_entity.cc (modified) (6 diffs)
• world_entity.h (modified) (1 diff)

branches/christmas_branche/src/world_entities/space_ships/space_ship.cc

@@ -267 +267 @@
   velocity += ((this->getAbsDirX())*travelSpeed-velocity)*airViscosity;
   velocity = (velocity.getNormalized())*travelSpeed;
-  
+
   //orient the spaceship in direction of the mouse
    rotQuat = Quaternion::quatSlerp( this->getAbsDir(),mouseDir,fabsf(time)*3);
-   if (this->getAbsDir().distance(rotQuat) > 0.001)  
+   if (this->getAbsDir().distance(rotQuat) > 0.001)
     this->setAbsDir( rotQuat);
    //this->setAbsDirSoft(mouseDir,5);
-   
+
   // this is the air friction (necessary for a smooth control)
   if(velocity.len() != 0) velocity -= velocity*0.01;
@@ -312 +312 @@
      //this->shiftCoor(this->getAbsDirX());
       accel += (this->getAbsDirX())*2;
-      
+
       /* Heli-Steuerung
          accel += (this->getAbsDirX()*2;

branches/christmas_branche/src/world_entities/world_entity.cc

@@ -21 +21 @@
 
 #include "model.h"
+#include "md2Model.h"
 #include "resource_manager.h"
 #include "load_param.h"
@@ -56 +57 @@
   this->objectListNumber = OM_INIT;
   this->objectListIterator = NULL;
+  this->supportsLOD = false;
 
   this->toList(OM_NULL);
@@ -117 +119 @@
               this->loadModel(lodFile, scaling, i);
           }
+          this->supportsLOD = true;
         return;
       }
@@ -134 +137 @@
       {
         PRINTF(4)("fetching MD2 file: %s\n", fileName);
-        this->setModel((Model*)ResourceManager::getInstance()->load(fileName, MD2, RP_CAMPAIGN), 0);
+//         MD2Model* m = (MD2Model*)ResourceManager::getInstance()->load(fileName, MD2, RP_CAMPAIGN);
+        MD2Model* m = new MD2Model(fileName, "/home/boenzlip/orxonox/data/maps/santa_claus.pcx");
+        m->debug();
+        //this->setModel((Model*)ResourceManager::getInstance()->load(fileName, MD2, RP_CAMPAIGN), 0);
+        this->setModel((Model*)m, 0);
       }
   }
@@ -154 +161 @@
   {
     Resource* resource = ResourceManager::getInstance()->locateResourceByPointer(this->models[modelNumber]);
-    if (resource != NULL)
-      ResourceManager::getInstance()->unload(resource, RP_LEVEL);
-    else
-      delete this->models[modelNumber];
-  }
+//     if (resource != NULL)
+    ResourceManager::getInstance()->unload(resource, RP_LEVEL);
+  }
+  else
+    delete this->models[modelNumber];
+
   this->models[modelNumber] = model;
+
 
 //   if (this->model != NULL)
@@ -281 +290 @@
 }
 
+
+/**
+ *  this functions draws the model automaticaly in multiple LOD
+ */
 void WorldEntity::drawLODsafe() const
 {
-  if (!this->models.empty())
-  {
-    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 );
+  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 );
 
 
     // This Draws the LOD's
-    float cameraDistance = (State::getCamera()->getAbsCoor() - this->getAbsCoor()).len();
-    if (cameraDistance > 30 && this->models.size() >= 3 && this->models[2] != NULL)
+      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
     {
-       this->models[2]->draw();
+      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->models[0]->draw();
+
+      glPopMatrix();
     }
-    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();
-  }
+  }
+
 }
 

branches/christmas_branche/src/world_entities/world_entity.h

@@ -77 +77 @@
  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