Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6022 in orxonox.OLD for trunk/src/lib/graphics/importer


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/lib/graphics/importer
Files:
2 deleted
7 edited
4 copied

Legend:

Unmodified
Added
Removed

  • 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:
Note: See TracChangeset for help on using the changeset viewer.