Changeset 7123 in orxonox.OLD for trunk

Timestamp:

Feb 11, 2006, 8:57:26 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: some cleanup before the new tag

1. BaseObject isA was wrong… every subclass was detected as any other subclass
2. Classes get unloaded again as they should
3. some minor fixes (Material* → Material) and some other cleanups

Location:

trunk/src

Files:

• defs/class_id.h (modified) (3 diffs)
• lib/graphics/importer/md2Model.cc (modified) (5 diffs)
• lib/graphics/importer/md2Model.h (modified) (2 diffs)
• lib/graphics/importer/model.h (modified) (2 diffs)
• lib/lang/base_object.cc (modified) (1 diff)
• lib/lang/class_list.cc (modified) (1 diff)
• orxonox.cc (modified) (1 diff)
• world_entities/skybox.cc (modified) (3 diffs)
• world_entities/world_entity.cc (modified) (1 diff)

trunk/src/defs/class_id.h

@@ -242 +242 @@
   CL_COLLISION                  =    0x00000711,
   CL_BV_TREE                    =    0x00701000,
-  CL_BV_TREE_NODE               =    0x00002000,
+  CL_BV_TREE_NODE               =    0x00702000,
   CL_OBB_TREE                   =    0x00000714,
   CL_OBB_TREE_NODE              =    0x00000715,
@@ -270 +270 @@
 
   CL_PRIMITIVE_MODEL            =    0x00000908,
-  CL_MD2Model                   =    0x00000909,
+  CL_MD2_MODEL                  =    0x00000909,
   CL_HEIGHT_MAP                 =    0x0000090a,
   CL_GRID                       =    0x0000090b,
-
-  // Particles
-  CL_PARTICLE_SYSTEM            =    0x00a01000,
-  CL_SPRITE_PARTICLES           =    0x00002000,
-  CL_SPARK_PARTICLES            =    0x00004000,
-  CL_PNODE_PARTICLES            =    0x00008000,
-  CL_DOT_PARTICLES              =    0x00010000,
-  CL_MODEL_PARTICLES            =    0x00020000,
-
-  CL_PARTICLE_EMITTER           =    0x00a02000,
-  CL_DOT_EMITTER                =    0x00000a21,
-  CL_PLANE_EMITTER              =    0x00000a22,
-  CL_BOX_EMITTER                =    0x00000a23,
-  CL_SPHERE_EMITTER             =    0x00000a24,
-  CL_MODEL_EMITTER              =    0x00000a25,
-
 
   CL_MATERIAL                   =    0x00000810,
@@ -298 +282 @@
   CL_LIGHTNING_BOLT             =    0x00000851,
 
+    // Particles
+  CL_PARTICLE_SYSTEM            =    0x00a01000,
+  CL_DOT_PARTICLES              =    0x00a02000,
+  CL_SPARK_PARTICLES            =    0x00a04000,
+  CL_SPRITE_PARTICLES           =    0x00a08000,
+  CL_MODEL_PARTICLES            =    0x00a10000,
+  //  CL_PNODE_PARTICLES            =    0x00a20000,
+
+
+  CL_PARTICLE_EMITTER           =    0x00a40000,
+  CL_DOT_EMITTER                =    0x00000a21,
+  CL_PLANE_EMITTER              =    0x00000a22,
+  CL_BOX_EMITTER                =    0x00000a23,
+  CL_SPHERE_EMITTER             =    0x00000a24,
+  //  CL_MODEL_EMITTER              =    0x00000a25,
+
   // Element2D's  (range from 0x00000b00 to 0x00000bff)
   /// GL-GUI
-  CL_GLGUI_WIDGET               =    0x00b00000,
-  CL_GLGUI_BUTTON               =    0x00b01000,
+  CL_GLGUI_WIDGET               =    0x00b01000,
+  CL_GLGUI_BUTTON               =    0x00b02000,
   CL_GLGUI_PUSHBUTTON           =    0x00000b03,
   CL_GLGUI_CHECKBUTTON          =    0x00000b04,
   CL_GLGUI_RADIOBUTTON          =    0x00000b05,
-  CL_GLGUI_CONTAINER            =    0x00b02000,
+  CL_GLGUI_CONTAINER            =    0x00b04000,
   CL_GLGUI_BOX                  =    0x00000b07,
   CL_GLGUI_FRAME                =    0x00000b08,

trunk/src/lib/graphics/importer/md2Model.cc

@@ -77 +77 @@
 MD2Model::MD2Model(const char* modelFileName, const char* skinFileName, float scale)
 {
+  this->setClassID(CL_MD2_MODEL, "MD2Model");
   /* this creates the data container via ressource manager */
   this->data = (MD2Data*)ResourceManager::getInstance()->load(modelFileName, MD2, RP_GAME, skinFileName, scale);
@@ -222 +223 @@
   glCullFace(GL_BACK);
 
-  this->data->material->select();
+  this->data->material.select();
 
   /* draw the triangles */
@@ -263 +264 @@
 //   this->processLighting();
 //   this->interpolate(/*this->verticesList*/);
-  this->data->material->select();
+  this->data->material.select();
 
   /* draw the triangles */
@@ -409 +410 @@
   delete [] this->pTexCoor;
 
-  delete this->material;
 }
 
@@ -518 +518 @@
   strcpy(this->skinFileName, fileName);
 
-  this->material = new Material("md2ModelTest");
-  this->material->setDiffuseMap(fileName);
-  this->material->setIllum(3);
-  this->material->setAmbient(1.0, 1.0, 1.0);
-}
+  this->material.setName("md2ModelMaterial");
+  this->material.setDiffuseMap(fileName);
+  this->material.setIllum(3);
+  this->material.setAmbient(1.0, 1.0, 1.0);
+}

trunk/src/lib/graphics/importer/md2Model.h

@@ -19 +19 @@
 #define _MD2MODEL_H
 
+#include "base_object.h"
+
 #include "model.h"
-#include "base_object.h"
-#include "stdincl.h"
-
+#include "material.h"
 
 //! These are the needed defines for the max values when loading .MD2 files
@@ -212 +212 @@
   int*               pLightNormals;         //!< pointer to the light normals
 
-  Material*          material;              //!< pointer to the material
+  Material           material;              //!< pointer to the material
   float              scaleFactor;           //!< the scale factor of the model, (global)
 };

trunk/src/lib/graphics/importer/model.h

@@ -58 +58 @@
 
   public:
-    Model();
     virtual ~Model();
 
@@ -85 +84 @@
     inline unsigned int getTriangleCount() const { return this->pModelInfo.numTriangles; };
 
+  protected:
+    Model();
+
 
   protected:

trunk/src/lib/lang/base_object.cc

@@ -140 +140 @@
   else if (classID & CL_MASK_SUBSUPER_CLASS)
   {
-    if (likely(((this->classID & CL_MASK_SUBSUPER_CLASS_IDA) == (this->classID & CL_MASK_SUBSUPER_CLASS_IDA)) &&
+    if (likely(((this->classID & CL_MASK_SUBSUPER_CLASS_IDA) == (classID & CL_MASK_SUBSUPER_CLASS_IDA)) &&
         this->classID & classID & CL_MASK_SUBSUPER_CLASS_IDB))
       return true;

trunk/src/lib/lang/class_list.cc

@@ -276 +276 @@
     if (object->isA((*cl).classID))
   {
-    PRINT(0)("=%s=-", (*cl).className);
+    PRINT(0)("=%s::0x%.8X=-", (*cl).className, (*cl).classID);
   }
 }

trunk/src/orxonox.cc

@@ -120 +120 @@
 
   SDL_QuitSubSystem(SDL_INIT_TIMER);
-  ClassList::debug();
+  ClassList::debug(3);
 
   PRINT(3)

trunk/src/world_entities/skybox.cc

@@ -27 +27 @@
 #include "network_game_manager.h"
 #include "converter.h"
+#include "resource_manager.h"
+
 
 using namespace std;
@@ -107 +109 @@
     if( this->material[i])
       delete this->material[i];
-//     if( this->cubeTexture[i])
-//       delete this->cubeTexture[i];
+    if( this->cubeTexture[i])
+      ResourceManager::getInstance()->unload(this->cubeTexture[i]);
   }
 }
@@ -169 +171 @@
     this->loadCubeMapTextures(top, bottom, left, right, front, back);
 }
-
-
-#include "resource_manager.h"
 
 void SkyBox::loadCubeMapTextures(const char* top, const char* bottom, const char* left,

trunk/src/world_entities/world_entity.cc

@@ -190 +190 @@
   {
     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
+    {
+      PRINTF(4)("Forcing model deletion\n");
+      delete this->models[modelNumber];
+    }
+  }
 
   this->models[modelNumber] = model;