Changeset 6009 in orxonox.OLD for trunk

Timestamp:

Dec 10, 2005, 4:07:04 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: abstract model implementation in .cc

@patrick: do you aprove?

Location:

trunk/src/lib/graphics/importer

Files:

• Makefile.am (modified) (1 diff)
• abstract_model.cc (copied) (copied from trunk/src/proto/proto_class.cc) (3 diffs)
• abstract_model.h (modified) (2 diffs)
• vertex_array_model.cc (moved) (moved from trunk/src/lib/graphics/importer/vertex_list_model.cc) (2 diffs)
• vertex_array_model.h (moved) (moved from trunk/src/lib/graphics/importer/vertex_list_model.h) (3 diffs)

trunk/src/lib/graphics/importer/Makefile.am

@@ -4 +4 @@
 noinst_LIBRARIES = libORXimporter.a
 
-libORXimporter_a_SOURCES = model.cc \
+libORXimporter_a_SOURCES = abstract_model.cc \
+                           model.cc \
                            objModel.cc \
                            primitive_model.cc \

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

@@ -10 +10 @@
 
    ### File Specific:
-   main-programmer: ...
+   main-programmer: Patrick Boenzli
    co-programmer: ...
 */
 
-//#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_MODEL
 
-#include "proto_class.h"
+#include "abstract_model.h"
 
 using namespace std;
@@ -25 +25 @@
  * @todo this constructor is not jet implemented - do it
 */
-ProtoClass::ProtoClass ()
+AbstractModel::AbstractModel()
 {
-   this->setClassID(CL_PROTO_ID, "ProtoClass");
+//   this->setClassID(CL_PROTO_ID, "ProtoClass");
+  this->pModelInfo.numVertices = 0;
+  this->pModelInfo.numTriangles = 0;
+  this->pModelInfo.numTexCoor = 0;
 
-   /* If you make a new class, what is most probably the case when you write this file
-      don't forget to:
-       1. Add the new file new_class.cc to the ./src/Makefile.am
-       2. Add the class identifier to ./src/class_id.h eg. CL_NEW_CLASS
-
-      Advanced Topics:
-      - if you want to let your object be managed via the ObjectManager make sure to read
-        the object_manager.h header comments. You will use this most certanly only if you
-        make many objects of your class, like a weapon bullet.
-   */
+  this->pModelInfo.pVertices = NULL;
+  this->pModelInfo.pTriangles = NULL;
+  this->pModelInfo.pNormals = NULL;
+  this->pModelInfo.pTexCoor = NULL;
 }
 
@@ -45 +42 @@
  * standard deconstructor
 */
-ProtoClass::~ProtoClass ()
+AbstractModel::~AbstractModel()
 {
   // delete what has to be deleted here

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

@@ -128 +128 @@
 
   public:
-    AbstractModel() { }
-    virtual ~AbstractModel() { }
+    AbstractModel();
+    virtual ~AbstractModel();
 
     inline const modelInfo* getModelInfo() const { return &this->pModelInfo; }
@@ -153 +153 @@
     inline unsigned int getFaceCount() const { return this->pModelInfo.numTriangles; };
 
+
   protected:
     modelInfo      pModelInfo;      //!< Reference to the modelInfo

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

@@ -27 +27 @@
 using namespace std;
 
-/**
- *  cleans up a ModelGroup
-
-   actually does the same as the delete Operator, but does not delete the predecessing group
-*/
-void ModelGroup::cleanup()
-{
-  PRINTF(5)("Cleaning up group\n");
-  if (this->firstFace)
-    delete this->firstFace;
-  this->firstFace = NULL;
-  if (this->next)
-    this->next->cleanup();
-}
-
-
 /////////////
 /// MODEL ///
@@ -60 +44 @@
   this->finalized = false;
   // setting the start group;
-  this->currentGroup = this->firstGroup = new ModelGroup;
-  this->groupCount = 0;
-  this->vertexCount = 0;
-  this->normalCount = 0;
-  this->texCoordCount = 0;
-  this->faceCount = 0;
-  this->triangleCount = 0;
-  this->triangles = NULL;
-  this->pModelInfo = NULL;
 
   this->scaleFactor = 1;

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

@@ -1 +1 @@
 /*!
-  \file model.h
-  \brief Contains the Model Class that handles 3D-Models
+  \file vertex_list_model.h
+  \brief Contains the VertexListModel Class that handles 3D-Models rendered out of VertexArrays
 */
 
@@ -9 +9 @@
 #include "abstract_model.h"
 
-#include "material.h"
 #include "glincl.h"
+
 #include "array.h"
 #include <list>
@@ -24 +24 @@
 {
  public:
-  Model(const char* modelName = NULL, MODEL_TYPE type = MODEL_DISPLAY_LIST);
+  Model();
   virtual ~Model();
 
   void draw() const;
 
-  /** @returns a Pointer to the Vertex-Array, if it was deleted it returns NULL */
-  inline const GLfloat* getVertexArray() const { return this->vertices->getArray(); };
-  /** @returns the VertexCount of this Model */
-  inline unsigned int getVertexCount() const { return this->vertexCount; };
-
-  /** @returns a Pointer to the Normals-Array, if it was deleted it returns NULL */
-  inline const GLfloat* getNormalsArray() const { return this->normals->getArray(); };
-  /** @returns the NormalsCount of this Model */
-  inline unsigned int getNormalsCount() const { return this->normalCount; };
-
-  /** @returns a Pointer to the TexCoord-Array, if it was deleted it returns NULL */
-  inline const GLfloat* getTexCoordArray() const { return this->vTexture->getArray(); };
-  /** @returns the TexCoord-Count of this Model */
-  inline unsigned int getTexCoordCount() const { return this->texCoordCount; };
-
-  /** @returns the Count of Faces of this Model */
-  inline unsigned int getFaceCount() const { return this->faceCount; };
-
-
   Material* addMaterial(Material* material);
   Material* addMaterial(const char* materialName);
-
 
   bool addVertex(float x, float y, float z);