Changeset 4637 in orxonox.OLD for orxonox/trunk/src/util

Timestamp:

Jun 16, 2005, 1:31:24 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: particles_fun compiles again

Location:

orxonox/trunk/src/util

Files:

• loading/load_param.cc (modified) (2 diffs)
• resource_manager.cc (modified) (5 diffs)
• resource_manager.h (modified) (1 diff)

orxonox/trunk/src/util/loading/load_param.cc

@@ -33 +33 @@
 {
   this->setClassID(CL_LOAD_PARAM, "LoadParam");
+
   this->loadString = NULL;
   this->pointerToParam = pointerToParam;
@@ -216 +217 @@
   if (this->paramCount > 0)
   {
-      PRINT(3)(" (Default: ");
+    PRINT(3)(" (Default: ");
     for (int i = 0; i < this->paramCount; i++)
     {

orxonox/trunk/src/util/resource_manager.cc

@@ -181 +181 @@
   ResourceType tmpType;
 #ifndef NO_MODEL
+#define __IF_OK
   if (!strncmp(fileName+(strlen(fileName)-4), ".obj", 4))
     tmpType = OBJ;
@@ -193 +194 @@
 #endif /* NO_MODEL */
 #ifndef NO_AUDIO
-  else if (!strncmp(fileName+(strlen(fileName)-4), ".wav", 4))
+#ifdef __IF_OK
+  else
+#endif
+#define __IF_OK
+  if (!strncmp(fileName+(strlen(fileName)-4), ".wav", 4))
     tmpType = WAV;
   else if (!strncmp(fileName+(strlen(fileName)-4), ".mp3", 4))
@@ -201 +206 @@
 #endif /* NO_AUDIO */
 #ifndef NO_TEXT
-  else if (!strncmp(fileName+(strlen(fileName)-4), ".ttf", 4))
+#ifdef __IF_OK
+  else
+#endif
+#define __IF_OK
+ if (!strncmp(fileName+(strlen(fileName)-4), ".ttf", 4))
     tmpType = TTF;
 #endif /* NO_TEXT */
 #ifndef NO_TEXTURES
-  else
-    tmpType = IMAGE;
+#ifdef __IF_OK
+  else
+#else
+  if
+#endif
+   tmpType = IMAGE;
 #endif /* NO_TEXTURES */
 
@@ -793 +806 @@
       switch (enumRes->type)
         {
-        case OBJ:
+#ifndef NO_MODEL
+          case OBJ:
           PRINT(0)("ObjectModel\n");
           break;
@@ -799 +813 @@
           PRINT(0)("PrimitiveModel\n");
           break;
+#endif
+#ifndef NO_TEXTURES
         case IMAGE:
           PRINT(0)("ImageFile (Texture)\n");
           break;
+#endif
         default:
           PRINT(0)("SoundFile\n");

orxonox/trunk/src/util/resource_manager.h

@@ -73 +73 @@
 
   // more specific
+  float             modelSize;         //!< the size of the model (OBJ/PRIM)
 #ifndef NO_MODEL
-  float             modelSize;         //!< the size of the model (OBJ/PRIM)
   char*             skinFileName;      //!< skinFileName (MD2)
 #endif /* NO_MODEL */