Changeset 9684 in orxonox.OLD for branches/new_class_id/src/lib/graphics

Timestamp:

Aug 22, 2006, 1:34:31 AM (18 years ago)

Author:

bensch

Message:

orxonox/branches/new_class_id: slowly but surely reimplementing to the new groove… way to go

Location:

branches/new_class_id/src/lib/graphics/importer

Files:

• height_map.cc (modified) (2 diffs)
• height_map.h (modified) (2 diffs)
• interactive_model.cc (modified) (2 diffs)
• interactive_model.h (modified) (1 diff)
• model.cc (modified) (2 diffs)
• model.h (modified) (1 diff)
• objModel.cc (modified) (2 diffs)
• objModel.h (modified) (1 diff)
• static_model.cc (modified) (2 diffs)
• static_model.h (modified) (1 diff)
• vertex_array_model.cc (modified) (3 diffs)
• vertex_array_model.h (modified) (1 diff)

branches/new_class_id/src/lib/graphics/importer/height_map.cc

@@ -327 +327 @@
 
 
+NewObjectListDefinition(HeightMap);
 
 
@@ -413 +414 @@
 void HeightMap::init(const std::string& heightMapName)
 {
-  this->setClassID(CL_HEIGHT_MAP, "HeightMap");
+  this->registerObject(this, HeightMap::_objectList);
 
   this->shiftX = 0;

branches/new_class_id/src/lib/graphics/importer/height_map.h

@@ -29 +29 @@
 
 class SDL_Surface;
-class Vector;
 class Material;
-class PNode;
 class Texture;
 class HeightMap;
@@ -70 +68 @@
 
 
+
 //!< the height map representation itself
 class HeightMap : public VertexArrayModel
 {
+  NewObjectListDeclaration(HeightMap);
   friend class Tile;
 

branches/new_class_id/src/lib/graphics/importer/interactive_model.cc

@@ -22 +22 @@
 
 
+NewObjectListDefinition(InteractiveModel);
+
 /**
  * standard constructor
@@ -28 +30 @@
 InteractiveModel::InteractiveModel()
 {
-  this->setClassID(CL_INTERACTIVE_MODEL, "InteractiveModel");
+  this->registerObject(this, InteractiveModel::_objectList);
 }
 

branches/new_class_id/src/lib/graphics/importer/interactive_model.h

@@ -30 +30 @@
 class InteractiveModel : public Model
 {
+  NewObjectListDeclaration(InteractiveModel);
   public:
     InteractiveModel();

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

@@ -20 +20 @@
 #include "glincl.h"
 
-
+NewObjectListDefinition(Model);
 
 /**
@@ -28 +28 @@
 Model::Model()
 {
-  this->setClassID(CL_MODEL, "Model");
+  this->registerObject(this, Model::_objectList);
   this->pModelInfo.numVertices = 0;
   this->pModelInfo.numTriangles = 0;

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

@@ -54 +54 @@
 //! This class defines the basic components of a model
 class Model : virtual public BaseObject {
+  NewObjectListDeclaration(Model);
 
   public:

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

@@ -27 +27 @@
 #include "compiler.h"
 
+NewObjectListDefinition(OBJModel);
 /**
  * @brief Crates a 3D-Model, loads in a File and scales it.
@@ -35 +36 @@
   : StaticModel(fileName)
 {
-  this->setClassID(CL_OBJ_MODEL, "OBJModel");
+  this->registerObject(this, OBJModel::_objectList);
 
   this->objPath = "./";

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

@@ -12 +12 @@
 class OBJModel : public StaticModel
 {
- public:
+  NewObjectListDeclaration(OBJModel);
+  public:
    OBJModel(const std::string& fileName, float scaling = 1.0);
   virtual ~OBJModel();

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

@@ -129 +129 @@
 
 
+
+
 /////////////
 /// MODEL ///
 /////////////
+NewObjectListDefinition(StaticModel);
+
 /**
  * @brief Creates a 3D-Model.
@@ -139 +143 @@
 StaticModel::StaticModel(const std::string& modelName)
 {
-  this->setClassID(CL_STATIC_MODEL, "StaticModel");
+  this->registerObject(this, StaticModel::_objectList);
   PRINTF(4)("new 3D-Model is being created\n");
   this->setName(modelName);

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

@@ -94 +94 @@
 class StaticModel : public Model
 {
- public:
+  NewObjectListDeclaration(StaticModel);
+  public:
   StaticModel(const std::string& modelName = "");
   virtual ~StaticModel();

branches/new_class_id/src/lib/graphics/importer/vertex_array_model.cc

@@ -24 +24 @@
 
 
+NewObjectListDefinition(VertexArrayModel);
 
 /////////////
@@ -35 +36 @@
 VertexArrayModel::VertexArrayModel()
 {
-  this->setClassID(CL_MODEL, "VertexArrayModel");
+  this->registerObject(this, VertexArrayModel::_objectList);
 
   this->newStripe();
@@ -49 +50 @@
 VertexArrayModel::VertexArrayModel(const Model& model)
 {
-  this->setClassID(CL_MODEL, "VertexArrayModel");
+  this->registerObject(this, VertexArrayModel::_objectList);
 
   // importing the data to the new Model.

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

@@ -27 +27 @@
 class VertexArrayModel : public Model
 {
- public:
+  NewObjectListDeclaration(VertexArrayModel);
+  public:
   VertexArrayModel();
   VertexArrayModel(const Model& model);