Changeset 5994 in orxonox.OLD for trunk/src/lib

Timestamp:

Dec 9, 2005, 10:43:31 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: much cleaner Model Loading unloading, model is now private to WorldEntity (not protected)

Location:

trunk/src/lib

Files:

• particles/particle_system.cc (modified) (3 diffs)
• sound/sound_engine.cc (modified) (1 diff)

trunk/src/lib/particles/particle_system.cc

@@ -383 +383 @@
       break;
     case PARTICLE_MODEL:
-      if (this->model)
-        return this->count * this->model->getFaceCount();
+      if (this->getModel(0))
+        return this->count * this->getModel()->getFaceCount();
       break;
   }
@@ -483 +483 @@
         GLfloat matrix[4][4];
 
-        if (likely(this->model != NULL))
+        if (likely(this->getModel() != NULL))
           while (likely(drawPart != NULL))
         {
@@ -496 +496 @@
           glMultMatrixf((float*)matrix);
 
-          this->model->draw();
+          this->getModel()->draw();
 
           glPopMatrix();

trunk/src/lib/sound/sound_engine.cc

@@ -289 +289 @@
   }
   // INITIALIZING THE DEVICE:
-#ifndef AL_VERSION_1_1
+#ifdef AL_VERSION_1_1
   ALubyte deviceName[] =
 #else