Changeset 6022 in orxonox.OLD

Timestamp:

Dec 10, 2005, 8:33:08 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the NewModel branche back to the trunk.
merged with command
svn merge branches/newModel/ trunk/ -r 6016:HEAD
no conflicts

Location:

trunk/src

Files:

• lib/collision_detection/bounding_volume.h (modified) (1 diff)
• lib/collision_detection/bv_tree.h (modified) (1 diff)
• lib/collision_detection/bv_tree_node.h (modified) (1 diff)
• lib/collision_detection/cd_engine.cc (modified) (1 diff)
• lib/collision_detection/cd_engine.h (modified) (1 diff)
• lib/collision_detection/obb_tree.h (modified) (1 diff)
• lib/collision_detection/obb_tree_node.cc (modified) (1 diff)
• lib/graphics/importer/Makefile.am (modified) (2 diffs)
• lib/graphics/importer/abstract_model.cc (deleted)
• lib/graphics/importer/abstract_model.h (deleted)
• lib/graphics/importer/md2Model.cc (modified) (1 diff)
• lib/graphics/importer/md2Model.h (modified) (2 diffs)
• lib/graphics/importer/model.cc (copied) (copied from branches/newModel/src/lib/graphics/importer/model.cc)
• lib/graphics/importer/model.h (copied) (copied from branches/newModel/src/lib/graphics/importer/model.h)
• lib/graphics/importer/objModel.cc (modified) (1 diff)
• lib/graphics/importer/objModel.h (modified) (1 diff)
• lib/graphics/importer/primitive_model.h (modified) (2 diffs)
• lib/graphics/importer/static_model.cc (copied) (copied from branches/newModel/src/lib/graphics/importer/static_model.cc)
• lib/graphics/importer/static_model.h (copied) (copied from branches/newModel/src/lib/graphics/importer/static_model.h)
• lib/graphics/importer/vertex_array_model.h (modified) (2 diffs)
• lib/graphics/spatial_separation/quadtree.h (modified) (1 diff)
• lib/graphics/spatial_separation/quadtree_node.cc (modified) (2 diffs)
• lib/graphics/spatial_separation/quadtree_node.h (modified) (1 diff)
• lib/graphics/spatial_separation/spatial_separation.cc (modified) (6 diffs)
• lib/graphics/spatial_separation/spatial_separation.h (modified) (4 diffs)
• world_entities/skybox.cc (modified) (2 diffs)
• world_entities/terrain.cc (modified) (1 diff)
• world_entities/weapons/test_gun.cc (modified) (3 diffs)

trunk/src/lib/collision_detection/bounding_volume.h

@@ -9 +9 @@
 
 #include "base_object.h"
-#include "abstract_model.h"
+#include "model.h"
 
 class Vector;

trunk/src/lib/collision_detection/bv_tree.h

@@ -10 +10 @@
 
 #include "base_object.h"
-#include "abstract_model.h"
+#include "model.h"
 
 // FORWARD DECLARATION

trunk/src/lib/collision_detection/bv_tree_node.h

@@ -9 +9 @@
 
 #include "base_object.h"
-#include "abstract_model.h"
+#include "model.h"
 #include "vector.h"
 

trunk/src/lib/collision_detection/cd_engine.cc

@@ -21 +21 @@
 #include "list.h"
 
-#include "abstract_model.h"
+#include "model.h"
 #include "world_entity.h"
 #include "terrain.h"

trunk/src/lib/collision_detection/cd_engine.h

@@ -10 +10 @@
 #include "base_object.h"
 #include "collision_defs.h"
-#include "abstract_model.h"
+#include "model.h"
 
 

trunk/src/lib/collision_detection/obb_tree.h

@@ -9 +9 @@
 
 #include "bv_tree.h"
-#include "abstract_model.h"
+#include "model.h"
 #include "material.h"
 

trunk/src/lib/collision_detection/obb_tree_node.cc

@@ -21 +21 @@
 #include "obb_tree.h"
 #include "matrix.h"
-#include "abstract_model.h"
+#include "model.h"
 #include "world_entity.h"
 

trunk/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 \

trunk/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()
 {

trunk/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:

trunk/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 = "./";

trunk/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:

trunk/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:

trunk/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:

trunk/src/lib/graphics/spatial_separation/quadtree.h

@@ -12 +12 @@
 
 #include "base_object.h"
-#include "abstract_model.h"
+#include "model.h"
 
 

trunk/src/lib/graphics/spatial_separation/quadtree_node.cc

@@ -21 +21 @@
 #include "quadtree.h"
 #include "material.h"
-#include "abstract_model.h"
+#include "model.h"
 #include "debug.h"
 
@@ -346 +346 @@
 /**
  *  gets the maximal dimension of a model
- * @return the dimension of the AbstractModel as a Rectangle
+ * @return the dimension of the Model as a Rectangle
 
    The rectangle is x-z axis aligned. ATTENTION: if there are any vertices in the model, that exceed the

trunk/src/lib/graphics/spatial_separation/quadtree_node.h

@@ -17 +17 @@
 #include "base_object.h"
 
-#include "abstract_model.h"
+#include "model.h"
 
 // FORWARD DECLARATION

trunk/src/lib/graphics/spatial_separation/spatial_separation.cc

@@ -18 +18 @@
 #include "spatial_separation.h"
 
-#include "abstract_model.h"
+#include "model.h"
 #include "quadtree.h"
 #include "debug.h"
@@ -34 +34 @@
 
  */
-SpatialSeparation::SpatialSeparation (AbstractModel* model, float overlapSize)
+SpatialSeparation::SpatialSeparation (Model* model, float overlapSize)
 {
   PRINT(3)("+---------Debug Information SpatialSeparation----------\n");
@@ -52 +52 @@
    The boxes are overlaping because this makes collision detection a lot simpler
  */
-SpatialSeparation::SpatialSeparation (AbstractModel* model, AbstractModel* playerModel)
+SpatialSeparation::SpatialSeparation (Model* model, Model* playerModel)
 {
   this->setClassID(CL_SPATIAL_SEPARATION, "SpatialSeparation");
@@ -75 +75 @@
  * @return the new quadtree
  */
-Quadtree* SpatialSeparation::createQuadtree(AbstractModel* model, float minLength)
+Quadtree* SpatialSeparation::createQuadtree(Model* model, float minLength)
 {
   this->minLength = minLength;
@@ -88 +88 @@
  * @return the new quadtree
  */
-Quadtree* SpatialSeparation::createQuadtree(AbstractModel* model, int treeDepth)
+Quadtree* SpatialSeparation::createQuadtree(Model* model, int treeDepth)
 {
   this->treeDepth = treeDepth;
@@ -100 +100 @@
  * @return the new quadtree
  */
-Quadtree* SpatialSeparation::createQuadtree(AbstractModel* model)
+Quadtree* SpatialSeparation::createQuadtree(Model* model)
 {
   this->quadtree = new Quadtree(model->getModelInfo(), 4);

trunk/src/lib/graphics/spatial_separation/spatial_separation.h

@@ -9 +9 @@
 
 
-class AbstractModel;
+class Model;
 class Quadtree;
 
@@ -21 +21 @@
 
   public:
-    SpatialSeparation(AbstractModel* model, float overlapSize);
-    SpatialSeparation(AbstractModel* model, AbstractModel* playerModel);
+    SpatialSeparation(Model* model, float overlapSize);
+    SpatialSeparation(Model* model, Model* playerModel);
     virtual ~SpatialSeparation();
 
@@ -28 +28 @@
     void setMinLength(int minLength) { this->minLength = minLength; }
 
-    Quadtree* createQuadtree(AbstractModel* model, float minLength);
-    Quadtree* createQuadtree(AbstractModel* model, int treeDepth);
-    Quadtree* createQuadtree(AbstractModel* model);
+    Quadtree* createQuadtree(Model* model, float minLength);
+    Quadtree* createQuadtree(Model* model, int treeDepth);
+    Quadtree* createQuadtree(Model* model);
 
     inline Quadtree* getQuadtree() { return this->quadtree; }
@@ -41 +41 @@
 
   private:
-    AbstractModel*             model;        //!< the reference to the model that has to be handled
+    Model*             model;        //!< the reference to the model that has to be handled
     Quadtree*                  quadtree;     //!< the reference to the created quadtree
 
-    AbstractModel*             playerModel;  //!< referece to the player model, if needed for overlap calculations
+    Model*             playerModel;  //!< referece to the player model, if needed for overlap calculations
     float                      overlapSize;  //!< the size of overlaping
 

trunk/src/world_entities/skybox.cc

@@ -20 +20 @@
 #include "load_param.h"
 #include "factory.h"
-#include "model.h"
-
+#include "static_model.h"
+#include "material.h"
 
 using namespace std;
@@ -170 +170 @@
 void SkyBox::rebuild()
 {
-  Model* model = new Model();
+  StaticModel* model = new StaticModel();
 
   model->addVertex (-0.5*size, -0.5*size, 0.5*size);

trunk/src/world_entities/terrain.cc

@@ -40 +40 @@
 
 //  if (this->model != NULL)
-    //this->ssp = new SpatialSeparation((AbstractModel*)this->model, 10.0f);
+    //this->ssp = new SpatialSeparation((Model*)this->model, 10.0f);
 }
 

trunk/src/world_entities/weapons/test_gun.cc

@@ -24 +24 @@
 
 #include "world_entity.h"
-#include "model.h"
+#include "static_model.h"
 #include "test_bullet.h"
 #include "weapon_manager.h"
@@ -219 +219 @@
   if( this->leftRight == W_RIGHT)
     glScalef(1.0, 1.0, -1.0);
-  this->getModel()->draw(1);
+  static_cast<StaticModel*>(this->getModel())->draw(1);
   glPopMatrix();
 
@@ -230 +230 @@
   tmpRot = this->objectComponent1->getAbsDir().getSpacialAxis();
   glRotatef (this->objectComponent1->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
-  this->getModel()->draw(0);
+  static_cast<StaticModel*>(this->getModel())->draw(0);
   glPopMatrix();
 }