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

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.h (modified) (4 diffs)

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

@@ -1 +1 @@
 /*!
  * @file texture.h
- * @brief Contains the texture class, that handles the reading of Images into Texutre-files.
+ * @brief Contains the texture class, that handles the reading of Images into Texture-files.
  */
 
@@ -20 +20 @@
 class Texture : public BaseObject
 {
+  ObjectListDeclaration(Texture);
 public:
   Texture();
@@ -28 +29 @@
 
   Texture& operator=(const Texture& texture);
-  Texture& operator=(const TextureDataPointer& textureDataPointer);
+  Texture& operator=(const TextureData::Pointer& textureDataPointer);
+  void acquireData(const TextureData::Pointer& textureDataPointer) { this->data = textureDataPointer; };
+  const TextureData::Pointer& dataPointer() const { return data; }
 
   virtual ~Texture();
@@ -62 +65 @@
 
 private:
-  TextureDataPointer            data;               //!< The TextureData
+  TextureData::Pointer          data;               //!< The TextureData
   GLclampf                      priority;           //!< the priority of the current texture (used for garphics cards with limited mem)