Changeset 6004 in orxonox.OLD for trunk/src/world_entities/world_entity.cc

Timestamp:

Dec 9, 2005, 11:12:04 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: new algorithm to rotate entities for drawing works (shifcoor ONLY takes normalized Vectors…)

File:

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

trunk/src/world_entities/world_entity.cc

@@ -118 +118 @@
 
   if (this->models[modelNumber] != NULL)
-  { 
+  {
     Resource* resource = ResourceManager::getInstance()->locateResourceByPointer(this->models[modelNumber]);
     if (resource != NULL)
@@ -127 +127 @@
   this->models[modelNumber] = model;
 
-//   if (this->model != NULL)  
+//   if (this->model != NULL)
 //     this->buildObbTree(4);
 }
@@ -233 +233 @@
     glMatrixMode(GL_MODELVIEW);
     glPushMatrix();
-    float matrix[4][4];
 
     /* translate */
@@ -239 +238 @@
                   this->getAbsCoor ().y,
                   this->getAbsCoor ().z);
-   /* rotate */ // FIXME: devise a new Way to rotate this
-    this->getAbsDir ().matrix (matrix);
-    glMultMatrixf((float*)matrix);
-
+    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 (this->isA(CL_HELICOPTER))
-        printf("Test %f %d\n", cameraDistance, this->models.size());
-    if (cameraDistance > 100 && this->models.size() >= 3 && this->models[2] != NULL)
+    if (cameraDistance > 30 && this->models.size() >= 3 && this->models[2] != NULL)
     {
-      if (this->isA(CL_HELICOPTER))printf("====== 2 ===\n");
        this->models[2]->draw();
-    } 
-    else if (cameraDistance > 50 && this->models.size() >= 2 && this->models[1] != NULL)
+    }
+    else if (cameraDistance > 10 && this->models.size() >= 2 && this->models[1] != NULL)
     {
-      if (this->isA(CL_HELICOPTER))printf("====== 1 ===\n");
       this->models[1]->draw();
-    } 
-    else if (this->models.size() >= 1 && this->models[0] != NULL) 
+    }
+    else if (this->models.size() >= 1 && this->models[0] != NULL)
     {
-      if (this->isA(CL_HELICOPTER))printf("====== 0 ===\n");
       this->models[0]->draw();
     }