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

Timestamp:

Feb 11, 2006, 8:57:26 PM (18 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/lib

Files:

• graphics/importer/md2Model.cc (modified) (5 diffs)
• graphics/importer/md2Model.h (modified) (2 diffs)
• graphics/importer/model.h (modified) (2 diffs)
• lang/base_object.cc (modified) (1 diff)
• lang/class_list.cc (modified) (1 diff)

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);
   }
 }