Changeset 9869 in orxonox.OLD for trunk/src/lib/graphics/importer/texture_sequence.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/texture_sequence.cc (modified) (3 diffs)

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

@@ -28 +28 @@
 #endif
 
+ObjectListDefinition(TextureSequence);
+
 /**
  * @brief Constructor for a Texture
@@ -33 +35 @@
 TextureSequence::TextureSequence(unsigned int count, ...)
 {
-  this->setClassID(CL_TEXTURE_SEQUENCE, "TextureSequence");
+  this->registerObject(this, TextureSequence::_objectList);
 
   va_list textureNameList;
@@ -54 +56 @@
 TextureSequence::TextureSequence(const std::vector<std::string>& textureNames, const std::string& prependFolder)
 {
-  this->setClassID(CL_TEXTURE_SEQUENCE, "TextureSequence");
+  this->registerObject(this, TextureSequence::_objectList);
   this->loadImageSeries(textureNames, prependFolder);
 }