Changeset 4806 in orxonox.OLD

Timestamp:

Jul 7, 2005, 11:44:59 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: the important interface functions are now implemented directly in abstract model.

Location:

orxonox/trunk/src/lib/graphics/importer

Files:

• abstract_model.h (modified) (1 diff)
• model.cc (modified) (1 diff)
• model.h (modified) (3 diffs)

orxonox/trunk/src/lib/graphics/importer/abstract_model.h

@@ -137 +137 @@
 class AbstractModel : public BaseObject {
 
- public:
-  AbstractModel() {}
-  virtual ~AbstractModel() {}
+  public:
+    AbstractModel() {}
+    virtual ~AbstractModel() {}
+
+    inline modelInfo* getModelInfo() const { return this->pModelInfo; }
+
+
+  protected:
+    modelInfo*     pModelInfo;      //!< Reference to the modelInfo defined in abstract_model.h
 };
 

orxonox/trunk/src/lib/graphics/importer/model.cc

@@ -198 +198 @@
   delete tmpIt;
   delete materialList;
+  delete this->pModelInfo;
 }
 

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

@@ -97 +97 @@
 
 //! Class that handles 3D-Models. it can also read them in and display them.
-class Model : public BaseObject
+class Model : public AbstractModel
 {
  public:
@@ -128 +128 @@
   inline unsigned int getFaceCount() const { return this->faceCount; };
 
-  inline modelInfo* getModelInfo() const { return this->pModelInfo; }
 
   Material* addMaterial(Material* material);
@@ -181 +180 @@
   Array<GLfloat>*  vTexture;        //!< The Array that handles the VertexTextureCoordinates.
   sTriangleExt*    triangles;       //!< The Array of triangles in the abstract_model.h style
-  modelInfo*       pModelInfo;      //!< Reference to the modelInfo defined in abstract_model.h
 
   ModelGroup*      firstGroup;      //!< The first of all groups.