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

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 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.cc (modified) (3 diffs)

trunk/src/lib/graphics/importer/height_map.cc

@@ -22 +22 @@
 #include "p_node.h"
 #include "state.h"
-#include "util/loading/resource_manager.h"
 #include "debug.h"
 
@@ -327 +326 @@
 
 
+ObjectListDefinition(HeightMap);
 
 
@@ -413 +413 @@
 void HeightMap::init(const std::string& heightMapName)
 {
-  this->setClassID(CL_HEIGHT_MAP, "HeightMap");
+  this->registerObject(this, HeightMap::_objectList);
 
   this->shiftX = 0;