Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9789 in orxonox.OLD for branches/new_class_id/src/lib/graphics


Ignore:
Timestamp:
Sep 22, 2006, 10:20:14 PM (18 years ago)
Author:
bensch
Message:

nicer definition of the StorePointer

Location:
branches/new_class_id/src/lib/graphics/importer
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/new_class_id/src/lib/graphics/importer/resource_texture.cc

    r9788 r9789  
    88    : NewResource(&ResourceTexture::type)
    99{
    10   NewResource::Pointer* ptr = this->acquireResource(imageName + ',' + "TEST");
     10  NewResource::StorePointer* ptr = this->acquireResource(imageName + ',' + "TEST");
    1111
    1212  if (ptr)
     
    2020    std::string fileName = this->NewResource::locateFile(imageName);
    2121    this->Texture::loadImage(fileName, target);
    22     this->NewResource::addResource(new ResourceTexture::TextureResourcePointer(imageName + ',' + "TEST", KeepLevel(), this->Texture::dataPointer()));
     22    this->NewResource::addResource(new ResourceTexture::TextureResourcePointer(imageName + ',' + "TEST", KeepLevel(0), this->Texture::dataPointer()));
    2323  }
    2424}
     
    3232
    3333ResourceTexture::TextureResourcePointer::TextureResourcePointer(const std::string& loadString, const NewResource::KeepLevel& keepLevel, const TextureData::Pointer& data)
    34     : NewResource::Pointer(loadString, keepLevel) , pointer(data)
     34    : NewResource::StorePointer(loadString, keepLevel) , pointer(data)
    3535{}
    3636
  • branches/new_class_id/src/lib/graphics/importer/resource_texture.h

    r9788 r9789  
    1919
    2020private:
    21 class TextureResourcePointer : public NewResource::Pointer
     21class TextureResourcePointer : public NewResource::StorePointer
    2222  {
    2323  public:
Note: See TracChangeset for help on using the changeset viewer.