Removed the Resource and ResourcePtr classes
This commit is contained in:
parent
46b2c096c4
commit
017ef652f9
15 changed files with 18 additions and 518 deletions
|
@ -33,7 +33,8 @@
|
|||
namespace sf
|
||||
{
|
||||
////////////////////////////////////////////////////////////
|
||||
Sound::Sound()
|
||||
Sound::Sound() :
|
||||
myBuffer(NULL)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
@ -50,11 +50,10 @@ myDuration(0)
|
|||
|
||||
////////////////////////////////////////////////////////////
|
||||
SoundBuffer::SoundBuffer(const SoundBuffer& copy) :
|
||||
Resource<SoundBuffer>(),
|
||||
myBuffer (0),
|
||||
mySamples (copy.mySamples),
|
||||
myDuration (copy.myDuration),
|
||||
mySounds () // don't copy the attached sounds
|
||||
myBuffer (0),
|
||||
mySamples (copy.mySamples),
|
||||
myDuration(copy.myDuration),
|
||||
mySounds () // don't copy the attached sounds
|
||||
{
|
||||
// Create the buffer
|
||||
ALCheck(alGenBuffers(1, &myBuffer));
|
||||
|
|
|
@ -77,7 +77,6 @@ myRefCount (NULL)
|
|||
|
||||
////////////////////////////////////////////////////////////
|
||||
Font::Font(const Font& copy) :
|
||||
Resource<Font>(),
|
||||
myLibrary (copy.myLibrary),
|
||||
myFace (copy.myFace),
|
||||
myStreamRec (copy.myStreamRec),
|
||||
|
|
|
@ -36,6 +36,7 @@ namespace sf
|
|||
////////////////////////////////////////////////////////////
|
||||
Sprite::Sprite() :
|
||||
Drawable (),
|
||||
myTexture (NULL),
|
||||
mySubRect (0, 0, 1, 1),
|
||||
myIsFlippedX(false),
|
||||
myIsFlippedY(false)
|
||||
|
@ -47,6 +48,7 @@ myIsFlippedY(false)
|
|||
////////////////////////////////////////////////////////////
|
||||
Sprite::Sprite(const Texture& texture) :
|
||||
Drawable (),
|
||||
myTexture (NULL),
|
||||
mySubRect (0, 0, 1, 1),
|
||||
myIsFlippedX(false),
|
||||
myIsFlippedY(false)
|
||||
|
|
|
@ -52,7 +52,6 @@ myPixelsFlipped(false)
|
|||
|
||||
////////////////////////////////////////////////////////////
|
||||
Texture::Texture(const Texture& copy) :
|
||||
Resource<Texture>(),
|
||||
myWidth (0),
|
||||
myHeight (0),
|
||||
myTextureWidth (0),
|
||||
|
|
|
@ -14,9 +14,6 @@ set(SRC
|
|||
${INCROOT}/Mutex.hpp
|
||||
${INCROOT}/NonCopyable.hpp
|
||||
${SRCROOT}/Platform.hpp
|
||||
${INCROOT}/Resource.hpp
|
||||
${INCROOT}/Resource.inl
|
||||
${INCROOT}/ResourcePtr.inl
|
||||
${SRCROOT}/Sleep.cpp
|
||||
${INCROOT}/Sleep.hpp
|
||||
${SRCROOT}/String.cpp
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue