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

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

@@ -64 +64 @@
 #endif
 
-
+ObjectListDefinition(Texture);
 
 /**
@@ -86 +86 @@
     : data(texture.data)
 {
-  this->setClassID(CL_TEXTURE, "Texture");
+  this->registerObject(this, Texture::_objectList);
   this->priority = 0.5;
 }
@@ -149 +149 @@
 void Texture::init()
 {
-  this->setClassID(CL_TEXTURE, "Texture");
-
-  this->data = TextureDataPointer(new TextureData());
+  this->registerObject(this, Texture::_objectList);
+
+  this->data = TextureData::Pointer(new TextureData());
 
   this->priority = 0.5;
@@ -176 +176 @@
 }
 
-Texture& Texture::operator=(const TextureDataPointer& textureDataPointer)
+Texture& Texture::operator=(const TextureData::Pointer& textureDataPointer)
 {
   this->data = textureDataPointer;