Changeset 9869 in orxonox.OLD for trunk/src/lib/graphics/importer/height_map.h

Timestamp:

Oct 3, 2006, 12:19:30 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

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

trunk/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
 {
+  ObjectListDeclaration(HeightMap);
   friend class Tile;