Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6022 in orxonox.OLD for trunk


Ignore:
Timestamp:
Dec 10, 2005, 8:33:08 PM (19 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:
2 deleted
22 edited
4 copied

Legend:

Unmodified
Added
Removed

  • trunk/src/lib/collision_detection/bounding_volume.h

    r5688 r6022  
    99
    1010#include "base_object.h"
    11 #include "abstract_model.h"
     11#include "model.h"
    1212
    1313class Vector;

  • trunk/src/lib/collision_detection/bv_tree.h

    r5684 r6022  
    1010
    1111#include "base_object.h"
    12 #include "abstract_model.h"
     12#include "model.h"
    1313
    1414// FORWARD DECLARATION

  • trunk/src/lib/collision_detection/bv_tree_node.h

    r5688 r6022  
    99
    1010#include "base_object.h"
    11 #include "abstract_model.h"
     11#include "model.h"
    1212#include "vector.h"
    1313

  • trunk/src/lib/collision_detection/cd_engine.cc

    r5915 r6022  
    2121#include "list.h"
    2222
    23 #include "abstract_model.h"
     23#include "model.h"
    2424#include "world_entity.h"
    2525#include "terrain.h"

  • trunk/src/lib/collision_detection/cd_engine.h

    r5915 r6022  
    1010#include "base_object.h"
    1111#include "collision_defs.h"
    12 #include "abstract_model.h"
     12#include "model.h"
    1313
    1414

  • trunk/src/lib/collision_detection/obb_tree.h

    r5684 r6022  
    99
    1010#include "bv_tree.h"
    11 #include "abstract_model.h"
     11#include "model.h"
    1212#include "material.h"
    1313

  • trunk/src/lib/collision_detection/obb_tree_node.cc

    r5694 r6022  
    2121#include "obb_tree.h"
    2222#include "matrix.h"
    23 #include "abstract_model.h"
     23#include "model.h"
    2424#include "world_entity.h"
    2525

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

    r6010 r6022  
    44noinst_LIBRARIES = libORXimporter.a
    55
    6 libORXimporter_a_SOURCES = abstract_model.cc \
     6libORXimporter_a_SOURCES = model.cc \
    77                           vertex_array_model.cc \
    8                            model.cc \
     8                           static_model.cc \
    99                           objModel.cc \
    1010                           primitive_model.cc \
    … …  
    1616
    1717
    18 noinst_HEADERS = abstract_model.h \
     18noinst_HEADERS = model.h \
    1919                 vertex_array_model.h \
    20                  model.h \
     20                 static_model.h \
    2121                 objModel.h \
    2222                 primitive_model.h \

  • trunk/src/lib/graphics/importer/md2Model.cc

    r5284 r6022  
    160160
    161161/**
    162   \brief draws the model: interface for all other classes out in the world
    163 */
     162 * @brief draws the model: interface for all other classes out in the world
     163 * @todo make it const and virtual
     164 * FIXME
     165 */
    164166void MD2Model::draw()
    165167{

  • trunk/src/lib/graphics/importer/md2Model.h

    r5304 r6022  
    1919#define _MD2MODEL_H
    2020
    21 #include "abstract_model.h"
     21#include "model.h"
    2222#include "base_object.h"
    2323#include "stdincl.h"
    … …  
    137137
    138138//! This is a MD2 Model class
    139 class MD2Model : public AbstractModel {
     139class MD2Model : public Model {
    140140
    141141public:

  • trunk/src/lib/graphics/importer/objModel.cc

    r5319 r6022  
    3232 * @param scaling The factor that the model will be scaled with.
    3333*/
    34 OBJModel::OBJModel(const char* fileName, float scaling) : Model(fileName)
     34OBJModel::OBJModel(const char* fileName, float scaling) : StaticModel(fileName)
    3535{
    3636  this->objPath = "./";

  • trunk/src/lib/graphics/importer/objModel.h

    r4468 r6022  
    77#define _OBJMODEL_H
    88
    9 #include "model.h"
     9#include "static_model.h"
    1010
    1111//! A Class, that handles the parsing of an obj-file, and inclusion as a Model.
    12 class OBJModel : public Model
     12class OBJModel : public StaticModel
    1313{
    1414 public:

  • trunk/src/lib/graphics/importer/primitive_model.h

    r5039 r6022  
    88#define _PRIMITIVE_MODEL_H
    99
    10 #include "model.h"
     10#include "static_model.h"
    1111
    1212//! Specification of different primitives the Model knows
    … …  
    1818
    1919//! A Class to create some default Models
    20 class PrimitiveModel : public Model {
     20class PrimitiveModel : public StaticModel {
    2121
    2222 public:

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

    r6012 r6022  
    77#define _VERTEX_ARRAY_MODEL_H
    88
    9 #include "abstract_model.h"
     9#include "model.h"
    1010
    1111#include "glincl.h"
    … …  
    2222/////////////
    2323//! Class that handles 3D-Models. it can also read them in and display them.
    24 class VertexArrayModel : public AbstractModel
     24class VertexArrayModel : public Model
    2525{
    2626 public:

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

    r5430 r6022  
    1212
    1313#include "base_object.h"
    14 #include "abstract_model.h"
     14#include "model.h"
    1515
    1616

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

    r5819 r6022  
    2121#include "quadtree.h"
    2222#include "material.h"
    23 #include "abstract_model.h"
     23#include "model.h"
    2424#include "debug.h"
    2525
    … …  
    346346/**
    347347 *  gets the maximal dimension of a model
    348  * @return the dimension of the AbstractModel as a Rectangle
     348 * @return the dimension of the Model as a Rectangle
    349349
    350350   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

    r5819 r6022  
    1717#include "base_object.h"
    1818
    19 #include "abstract_model.h"
     19#include "model.h"
    2020
    2121// FORWARD DECLARATION

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

    r5427 r6022  
    1818#include "spatial_separation.h"
    1919
    20 #include "abstract_model.h"
     20#include "model.h"
    2121#include "quadtree.h"
    2222#include "debug.h"
    … …  
    3434
    3535 */
    36 SpatialSeparation::SpatialSeparation (AbstractModel* model, float overlapSize)
     36SpatialSeparation::SpatialSeparation (Model* model, float overlapSize)
    3737{
    3838  PRINT(3)("+---------Debug Information SpatialSeparation----------\n");
    … …  
    5252   The boxes are overlaping because this makes collision detection a lot simpler
    5353 */
    54 SpatialSeparation::SpatialSeparation (AbstractModel* model, AbstractModel* playerModel)
     54SpatialSeparation::SpatialSeparation (Model* model, Model* playerModel)
    5555{
    5656  this->setClassID(CL_SPATIAL_SEPARATION, "SpatialSeparation");
    … …  
    7575 * @return the new quadtree
    7676 */
    77 Quadtree* SpatialSeparation::createQuadtree(AbstractModel* model, float minLength)
     77Quadtree* SpatialSeparation::createQuadtree(Model* model, float minLength)
    7878{
    7979  this->minLength = minLength;
    … …  
    8888 * @return the new quadtree
    8989 */
    90 Quadtree* SpatialSeparation::createQuadtree(AbstractModel* model, int treeDepth)
     90Quadtree* SpatialSeparation::createQuadtree(Model* model, int treeDepth)
    9191{
    9292  this->treeDepth = treeDepth;
    … …  
    100100 * @return the new quadtree
    101101 */
    102 Quadtree* SpatialSeparation::createQuadtree(AbstractModel* model)
     102Quadtree* SpatialSeparation::createQuadtree(Model* model)
    103103{
    104104  this->quadtree = new Quadtree(model->getModelInfo(), 4);

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

    r5356 r6022  
    99
    1010
    11 class AbstractModel;
     11class Model;
    1212class Quadtree;
    1313
    … …  
    2121
    2222  public:
    23     SpatialSeparation(AbstractModel* model, float overlapSize);
    24     SpatialSeparation(AbstractModel* model, AbstractModel* playerModel);
     23    SpatialSeparation(Model* model, float overlapSize);
     24    SpatialSeparation(Model* model, Model* playerModel);
    2525    virtual ~SpatialSeparation();
    2626
    … …  
    2828    void setMinLength(int minLength) { this->minLength = minLength; }
    2929
    30     Quadtree* createQuadtree(AbstractModel* model, float minLength);
    31     Quadtree* createQuadtree(AbstractModel* model, int treeDepth);
    32     Quadtree* createQuadtree(AbstractModel* model);
     30    Quadtree* createQuadtree(Model* model, float minLength);
     31    Quadtree* createQuadtree(Model* model, int treeDepth);
     32    Quadtree* createQuadtree(Model* model);
    3333
    3434    inline Quadtree* getQuadtree() { return this->quadtree; }
    … …  
    4141
    4242  private:
    43     AbstractModel*             model;        //!< the reference to the model that has to be handled
     43    Model*             model;        //!< the reference to the model that has to be handled
    4444    Quadtree*                  quadtree;     //!< the reference to the created quadtree
    4545
    46     AbstractModel*             playerModel;  //!< referece to the player model, if needed for overlap calculations
     46    Model*             playerModel;  //!< referece to the player model, if needed for overlap calculations
    4747    float                      overlapSize;  //!< the size of overlaping
    4848

  • trunk/src/world_entities/skybox.cc

    r5994 r6022  
    2020#include "load_param.h"
    2121#include "factory.h"
    22 #include "model.h"
    23 
     22#include "static_model.h"
     23#include "material.h"
    2424
    2525using namespace std;
    … …  
    170170void SkyBox::rebuild()
    171171{
    172   Model* model = new Model();
     172  StaticModel* model = new StaticModel();
    173173
    174174  model->addVertex (-0.5*size, -0.5*size, 0.5*size);

  • trunk/src/world_entities/terrain.cc

    r5994 r6022  
    4040
    4141//  if (this->model != NULL)
    42     //this->ssp = new SpatialSeparation((AbstractModel*)this->model, 10.0f);
     42    //this->ssp = new SpatialSeparation((Model*)this->model, 10.0f);
    4343}
    4444

  • trunk/src/world_entities/weapons/test_gun.cc

    r5994 r6022  
    2424
    2525#include "world_entity.h"
    26 #include "model.h"
     26#include "static_model.h"
    2727#include "test_bullet.h"
    2828#include "weapon_manager.h"
    … …  
    219219  if( this->leftRight == W_RIGHT)
    220220    glScalef(1.0, 1.0, -1.0);
    221   this->getModel()->draw(1);
     221  static_cast<StaticModel*>(this->getModel())->draw(1);
    222222  glPopMatrix();
    223223
    … …  
    230230  tmpRot = this->objectComponent1->getAbsDir().getSpacialAxis();
    231231  glRotatef (this->objectComponent1->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
    232   this->getModel()->draw(0);
     232  static_cast<StaticModel*>(this->getModel())->draw(0);
    233233  glPopMatrix();
    234234}
Note: See TracChangeset for help on using the changeset viewer.