Changeset 6021 in orxonox.OLD for branches/newModel/src/lib/graphics/importer

Timestamp:

Dec 10, 2005, 7:52:50 PM (18 years ago)

Author:

bensch

Message:

newModel new static_model class added

Location:

branches/newModel/src/lib/graphics/importer

Files:

• Makefile.am (modified) (2 diffs)
• md2Model.cc (modified) (1 diff)
• md2Model.h (modified) (2 diffs)
• model.cc (moved) (moved from branches/newModel/src/lib/graphics/importer/abstract_model.cc) (3 diffs)
• model.h (moved) (moved from branches/newModel/src/lib/graphics/importer/abstract_model.h) (3 diffs)
• objModel.cc (modified) (1 diff)
• objModel.h (modified) (1 diff)
• primitive_model.h (modified) (2 diffs)
• static_model.cc (modified) (30 diffs)
• static_model.h (modified) (3 diffs)
• vertex_array_model.h (modified) (2 diffs)

branches/newModel/src/lib/graphics/importer/Makefile.am

@@ -4 +4 @@
 noinst_LIBRARIES = libORXimporter.a
 
-libORXimporter_a_SOURCES = abstract_model.cc \
+libORXimporter_a_SOURCES = model.cc \
                            vertex_array_model.cc \
-                           model.cc \
+                           static_model.cc \
                            objModel.cc \
                            primitive_model.cc \
@@ -16 +16 @@
 
 
-noinst_HEADERS = abstract_model.h \
+noinst_HEADERS = model.h \
                  vertex_array_model.h \
-                 model.h \
+                 static_model.h \
                  objModel.h \
                  primitive_model.h \

branches/newModel/src/lib/graphics/importer/md2Model.cc

@@ -160 +160 @@
 
 /**
-  \brief draws the model: interface for all other classes out in the world
-*/
+ * @brief draws the model: interface for all other classes out in the world
+ * @todo make it const and virtual
+ * FIXME
+ */
 void MD2Model::draw()
 {

branches/newModel/src/lib/graphics/importer/md2Model.h

@@ -19 +19 @@
 #define _MD2MODEL_H
 
-#include "abstract_model.h"
+#include "model.h"
 #include "base_object.h"
 #include "stdincl.h"
@@ -137 +137 @@
 
 //! This is a MD2 Model class
-class MD2Model : public AbstractModel {
+class MD2Model : public Model {
 
 public:

branches/newModel/src/lib/graphics/importer/model.cc

@@ -16 +16 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_MODEL
 
-#include "abstract_model.h"
+#include "model.h"
 
 using namespace std;
-
 
 /**
@@ -25 +24 @@
  * @todo this constructor is not jet implemented - do it
 */
-AbstractModel::AbstractModel()
+Model::Model()
 {
 //   this->setClassID(CL_PROTO_ID, "ProtoClass");
@@ -42 +41 @@
  * standard deconstructor
 */
-AbstractModel::~AbstractModel()
+Model::~Model()
 {
   // delete what has to be deleted here

branches/newModel/src/lib/graphics/importer/model.h

@@ -15 +15 @@
 
 /*!
- * @file abstract_model.h
- *  Definition of an abstract model. containing all needed for other model
+ * @file model.h
+ *  Definition of an abstract model.
+ *  containing all needed for other models
  */
 
-#ifndef _ABSTRACT_MODEL_H
-#define _ABSTRACT_MODEL_H
+#ifndef _MODEL_H
+#define _MODEL_H
 
 #include "base_object.h"
@@ -125 +126 @@
 
 //! This class defines the basic components of a model
-class AbstractModel : public BaseObject {
+class Model : public BaseObject {
 
   public:
-    AbstractModel();
-    virtual ~AbstractModel();
+    Model();
+    virtual ~Model();
+
+    virtual void draw() const {  }
 
     inline const modelInfo* getModelInfo() const { return &this->pModelInfo; }
@@ -158 +161 @@
 };
 
-#endif /* _ABSTRACT_MODEL_H */
+#endif /* _MODEL_H */

branches/newModel/src/lib/graphics/importer/objModel.cc

@@ -32 +32 @@
  * @param scaling The factor that the model will be scaled with.
 */
-OBJModel::OBJModel(const char* fileName, float scaling) : Model(fileName)
+OBJModel::OBJModel(const char* fileName, float scaling) : StaticModel(fileName)
 {
   this->objPath = "./";

branches/newModel/src/lib/graphics/importer/objModel.h

@@ -7 +7 @@
 #define _OBJMODEL_H
 
-#include "model.h"
+#include "static_model.h"
 
 //! A Class, that handles the parsing of an obj-file, and inclusion as a Model.
-class OBJModel : public Model
+class OBJModel : public StaticModel
 {
  public:

branches/newModel/src/lib/graphics/importer/primitive_model.h

@@ -8 +8 @@
 #define _PRIMITIVE_MODEL_H
 
-#include "model.h"
+#include "static_model.h"
 
 //! Specification of different primitives the Model knows
@@ -18 +18 @@
 
 //! A Class to create some default Models
-class PrimitiveModel : public Model {
+class PrimitiveModel : public StaticModel {
 
  public:

branches/newModel/src/lib/graphics/importer/static_model.cc

@@ -18 +18 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_IMPORTER
 
-#include "model.h"
+#include "static_model.h"
 
 #include "stdlibincl.h"
@@ -141 +141 @@
    assigns it a Name and a Type
 */
-Model::Model(const char* modelName, MODEL_TYPE type)
+StaticModel::StaticModel(const char* modelName, MODEL_TYPE type)
 {
   this->setClassID(CL_MODEL, "Model");
@@ -174 +174 @@
    Looks if any from model allocated space is still in use, and if so deleted it.
 */
-Model::~Model()
+StaticModel::~StaticModel()
 {
   PRINTF(4)("Deleting Model ");
@@ -209 +209 @@
  *  Finalizes an Object. This can be done outside of the Class.
 */
-void Model::finalize()
+void StaticModel::finalize()
 {
   // this creates the display List.
@@ -236 +236 @@
  * rebuild the Model from the Information we got.
  */
-void Model::rebuild()
+void StaticModel::rebuild()
 {
   PRINTF(3)("Rebuilding Model '%s'\n", this->getName());
@@ -250 +250 @@
    It does this by just calling the Lists that must have been created earlier.
 */
-void Model::draw () const
+void StaticModel::draw () const
 {
 
@@ -295 +295 @@
    It does this by just calling the List that must have been created earlier.
 */
-void Model::draw (int groupNumber) const
+void StaticModel::draw (int groupNumber) const
 {
   if (groupNumber >= this->groupCount)
@@ -327 +327 @@
    It does this by just calling the List that must have been created earlier.
 */
-void Model::draw (char* groupName) const
+void StaticModel::draw (char* groupName) const
 {
   PRINTF(4)("drawing the requested 3D-Models if found.\n");
@@ -351 +351 @@
  *  deletes all the arrays
 */
-bool Model::deleteArrays()
+bool StaticModel::deleteArrays()
 {
   if (this->vertices)
@@ -375 +375 @@
  * This will be applied at the end of the importing Process.
 */
-bool Model::cleanup()
+bool StaticModel::cleanup()
 {
   PRINTF(4)("cleaning up the 3D-Model to save Memory.\n");
@@ -393 +393 @@
  * with this option set the Materials will not be deleted with the Model.
  */
-Material* Model::addMaterial(Material* material)
+Material* StaticModel::addMaterial(Material* material)
 {
   if (material == NULL)
@@ -409 +409 @@
  * @returns the added material
 */
-Material* Model::addMaterial(const char* materialName)
+Material* StaticModel::addMaterial(const char* materialName)
 {
   ModelMaterial* modMat = new ModelMaterial;
@@ -425 +425 @@
  * @returns the Material if found, NULL otherwise
 */
-Material* Model::findMaterialByName(const char* materialName)
+Material* StaticModel::findMaterialByName(const char* materialName)
 {
   list<ModelMaterial*>::iterator modMat;
@@ -441 +441 @@
    With it you should be able to create Models with more than one SubModel inside
 */
-bool Model::addGroup(const char* groupString)
+bool StaticModel::addGroup(const char* groupString)
 {
   PRINTF(5)("Read Group: %s.\n", groupString);
@@ -464 +464 @@
    If a vertex line is found this function will inject it into the vertex-Array
 */
-bool Model::addVertex (const char* vertexString)
+bool StaticModel::addVertex (const char* vertexString)
 {
   float subbuffer1;
@@ -482 +482 @@
 
 */
-bool Model::addVertex(float x, float y, float z)
+bool StaticModel::addVertex(float x, float y, float z)
 {
   PRINTF(5)("reading in a vertex: %f %f %f\n", x, y, z);
@@ -496 +496 @@
    If a vertexNormal line is found this function will inject it into the vertexNormal-Array
 */
-bool Model::addVertexNormal (const char* normalString)
+bool StaticModel::addVertexNormal (const char* normalString)
 {
   float subbuffer1;
@@ -515 +515 @@
    If a vertexNormal line is found this function will inject it into the vertexNormal-Array
 */
-bool Model::addVertexNormal(float x, float y, float z)
+bool StaticModel::addVertexNormal(float x, float y, float z)
 {
   PRINTF(5)("found vertex-Normal %f, %f, %f\n", x, y, z);
@@ -532 +532 @@
    !! WARNING THIS IS DIFFERNT FROM addVervexTexture(float, float); because it changes the second entry to 1-v !!
 */
-bool Model::addVertexTexture (const char* vTextureString)
+bool StaticModel::addVertexTexture (const char* vTextureString)
 {
   float subbuffer1;
@@ -550 +550 @@
    If a TextureCoordinate line is found this function will inject it into the TextureCoordinate-Array
 */
-bool Model::addVertexTexture(float u, float v)
+bool StaticModel::addVertexTexture(float u, float v)
 {
   PRINTF(5)("found vertex-Texture %f, %f\n", u, v);
@@ -567 +567 @@
    String is different from the argument addFace, in this that the first Vertex/Normal/Texcoord is 1 instead of 0
 */
-bool Model::addFace (const char* faceString)
+bool StaticModel::addFace (const char* faceString)
 {
   if (this->currentGroup->faceCount >0)
@@ -623 +623 @@
  * @param type The information Passed with each Vertex
 */
-bool Model::addFace(int faceElemCount, VERTEX_FORMAT type, ...)
+bool StaticModel::addFace(int faceElemCount, VERTEX_FORMAT type, ...)
 {
   if (this->currentGroup->faceCount > 0)
@@ -655 +655 @@
  * @param matString the Material that will be set.
 */
-bool Model::setMaterial(const char* matString)
+bool StaticModel::setMaterial(const char* matString)
 {
   if (this->currentGroup->faceCount > 0)
@@ -670 +670 @@
  * @param mtl the Material that will be set.
 */
-bool Model::setMaterial(Material* mtl)
+bool StaticModel::setMaterial(Material* mtl)
 {
   if (this->currentGroup->faceCount > 0)
@@ -690 +690 @@
    4. It goes through all the normale-Points and calculates the VertexNormale and includes it in the normals-Array.
 */
-bool Model::buildVertexNormals ()
+bool StaticModel::buildVertexNormals ()
 {
   PRINTF(4)("Normals are being calculated.\n");
@@ -763 +763 @@
  *  reads and includes the Faces/Materials into the openGL state Machine
 */
-bool Model::importToDisplayList()
+bool StaticModel::importToDisplayList()
 {
   // finalize the Arrays
@@ -855 +855 @@
  *  reads and includes the Faces/Materials into the openGL state Machine
 */
-bool Model::importToVertexArray()
+bool StaticModel::importToVertexArray()
 {
   // finalize the Arrays
@@ -875 +875 @@
  *  builds an array of triangles, that can later on be used for obb separation and octree separation
  */
-bool Model::buildTriangleList()
+bool StaticModel::buildTriangleList()
 {
   if( unlikely(this->triangles != NULL))
@@ -1007 +1007 @@
    merging this information, the face will be drawn.
 */
-bool Model::addGLElement (ModelFaceElement* elem)
+bool StaticModel::addGLElement (ModelFaceElement* elem)
 {
   PRINTF(5)("importing grafical Element to openGL.\n");
@@ -1043 +1043 @@
    This will inject a Cube, because this is the most basic model.
 */
-void Model::cubeModel()
+void StaticModel::cubeModel()
 {
   this->addVertex (-0.5, -0.5, 0.5);

branches/newModel/src/lib/graphics/importer/static_model.h

@@ -1 +1 @@
 /*!
-  \file model.h
-  \brief Contains the Model Class that handles 3D-Models
-*/
-
-#ifndef _MODEL_H
-#define _MODEL_H
-
-#include "abstract_model.h"
+ * @file static_model.h
+ * @brief Contains the Model Class that handles Static 3D-Models rendered with glList's
+ */
+
+#ifndef _STATIC_MODEL_H
+#define _STATIC_MODEL_H
+
+#include "model.h"
 
 #include "material.h"
@@ -103 +103 @@
 /// MODEL ///
 /////////////
-//! Class that handles 3D-Models. it can also read them in and display them.
-class Model : public AbstractModel
-{
- public:
-  Model(const char* modelName = NULL, MODEL_TYPE type = MODEL_DISPLAY_LIST);
-  virtual ~Model();
-
-  void draw() const;
+//! Class that handles static 3D-Models.
+/**
+ * it can also read them in and display them.
+ * All the objects are rendered with glLists
+ */
+class StaticModel : public Model
+{
+ public:
+  StaticModel(const char* modelName = NULL, MODEL_TYPE type = MODEL_DISPLAY_LIST);
+  virtual ~StaticModel();
+
+  virtual void draw() const;
   void draw(int groupNumber) const;
   void draw(char* groupName) const;
@@ -188 +192 @@
   tArray<GLfloat>*           normals;         //!< The Array that handles the Normals.
   tArray<GLfloat>*           vTexture;        //!< The Array that handles the VertexTextureCoordinates.
-  sTriangleExt*              triangles;       //!< The Array of triangles in the abstract_model.h style
+  sTriangleExt*              triangles;       //!< The Array of triangles in the model.h style
 
   ModelGroup*                firstGroup;      //!< The first of all groups.

branches/newModel/src/lib/graphics/importer/vertex_array_model.h

@@ -7 +7 @@
 #define _VERTEX_ARRAY_MODEL_H
 
-#include "abstract_model.h"
+#include "model.h"
 
 #include "glincl.h"
@@ -22 +22 @@
 /////////////
 //! Class that handles 3D-Models. it can also read them in and display them.
-class VertexArrayModel : public AbstractModel
+class VertexArrayModel : public Model
 {
  public: