Changeset 6005 in orxonox.OLD

Timestamp:

Dec 10, 2005, 12:21:31 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: automatic LOD-loading

Location:

trunk/src/world_entities

Files:

• space_ships/helicopter.cc (modified) (3 diffs)
• space_ships/helicopter.h (modified) (1 diff)
• space_ships/space_ship.cc (modified) (1 diff)
• world_entity.cc (modified) (3 diffs)
• world_entity.h (modified) (1 diff)

trunk/src/world_entities/space_ships/helicopter.cc

@@ -18 +18 @@
 
 #include "helicopter.h"
-
-#include "objModel.h"
-#include "resource_manager.h"
 
 #include "weapons/weapon_manager.h"
@@ -111 +108 @@
   PRINTF(4)("SPACESHIP INIT\n");
 
-  this->loadModel("models/ships/helicopter_high.obj", 1.0, 0);
-  this->loadModel("models/ships/helicopter_medium.obj", 1.0, 1);
-  this->loadModel("models/ships/helicopter_low.obj", 1.0, 2);
+  this->loadModel("models/ships/helicopter_#.obj", 1.0);
 
   EventHandler::getInstance()->grabEvents(true);
@@ -350 +345 @@
 }
 
+
+void Helicopter::draw() const
+{
+  this->drawLODsafe();
+
+  this->getWeaponManager()->draw();
+}
+
+
 /**
  * weapon manipulation by the player

trunk/src/world_entities/space_ships/helicopter.h

@@ -32 +32 @@
     virtual void collidesWith(WorldEntity* entity, const Vector& location);
     virtual void tick(float time);
+    virtual void draw() const;
 
     virtual void process(const Event &event);

trunk/src/world_entities/space_ships/space_ship.cc

@@ -240 +240 @@
 void SpaceShip::draw () const
 {
-  glMatrixMode(GL_MODELVIEW);
-  glPushMatrix();
-  /* translate */
-  glTranslatef (this->getAbsCoor ().x,
-                this->getAbsCoor ().y,
-                this->getAbsCoor ().z);
-  /* rotate */
-  Vector tmpRot = this->getAbsDir().getSpacialAxis();
-  glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
-  this->getModel()->draw();
-  glPopMatrix();
+  this->drawLODsafe();
 
   this->getWeaponManager()->draw();

trunk/src/world_entities/world_entity.cc

@@ -65 +65 @@
 
   // Delete the model (unregister it with the ResourceManager)
-  this->setModel(NULL);
+  for (unsigned int i = 0; i < this->models.size(); i++)
+    this->setModel(NULL, i);
 }
 
@@ -94 +95 @@
 {
   if (fileName != NULL)
-  {
+  { 
+    // search for the special character # in the LoadParam
+    if (strchr(fileName, '#') != NULL)
+      {
+        PRINTF(4)("Found # in %s... searching for LOD's\n", fileName);
+        char* lodFile = new char[strlen(fileName)+1];
+        strcpy(lodFile, fileName);
+        char* depth = strchr(lodFile, '#');
+        for (unsigned int i = 0; i < 5; i++)
+          {
+            *depth = 48+(int)i;
+            printf("-------%s\n", lodFile);
+            if (ResourceManager::isInDataDir(lodFile))
+              this->loadModel(lodFile, scaling, i);
+          }
+        return;
+      }
+
     PRINTF(4)("fetching %s\n", fileName);
     if (scaling == 1.0)
@@ -228 +246 @@
 */
 void WorldEntity::draw() const
+{
+  this->drawLODsafe();
+}
+
+void WorldEntity::drawLODsafe() const
 {
   if (!this->models.empty())

trunk/src/world_entities/world_entity.h

@@ -51 +51 @@
 
   virtual void tick (float time);
+
   virtual void draw () const;
+  void drawLODsafe() const;
+
   virtual void collidesWith (WorldEntity* entity, const Vector& location);
-
   void drawBVTree(unsigned int depth, int drawMode) const;