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

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

File:

• trunk/src/lib/graphics/importer/vertex_array_model.h (modified) (2 diffs)

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: