Fixed VS project files, and a bug where ParticleSystem::setSprite did not retain the new Image.

This commit is contained in:
rude
2010-05-04 18:06:10 +02:00
parent d15e2241b0
commit ea38442770
3 changed files with 36 additions and 9 deletions
+20
View File
@@ -208,6 +208,14 @@
<File <File
RelativePath="..\..\..\src\modules\image\EncodedImageData.cpp" RelativePath="..\..\..\src\modules\image\EncodedImageData.cpp"
> >
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\image\"
/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="..\..\..\src\modules\image\EncodedImageData.h" RelativePath="..\..\..\src\modules\image\EncodedImageData.h"
@@ -233,6 +241,18 @@
RelativePath="..\..\..\src\modules\image\ImageData.h" RelativePath="..\..\..\src\modules\image\ImageData.h"
> >
</File> </File>
<File
RelativePath="..\..\..\src\modules\image\wrap_EncodedImageData.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\image\"
/>
</FileConfiguration>
</File>
<File <File
RelativePath="..\..\..\src\modules\image\wrap_Image.cpp" RelativePath="..\..\..\src\modules\image\wrap_Image.cpp"
> >
+12
View File
@@ -1176,6 +1176,18 @@
RelativePath="..\..\src\modules\image\ImageData.h" RelativePath="..\..\src\modules\image\ImageData.h"
> >
</File> </File>
<File
RelativePath="..\..\src\modules\image\wrap_EncodedImageData.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
ObjectFile="$(IntDir)\image\"
/>
</FileConfiguration>
</File>
<File <File
RelativePath="..\..\src\modules\image\wrap_Image.cpp" RelativePath="..\..\src\modules\image\wrap_Image.cpp"
> >
@@ -62,10 +62,7 @@ namespace opengl
ParticleSystem::~ParticleSystem() ParticleSystem::~ParticleSystem()
{ {
if(this->sprite != 0) if(this->sprite != 0)
{
this->sprite->release(); this->sprite->release();
this->sprite = 0;
}
if(pStart != 0) if(pStart != 0)
delete [] pStart; delete [] pStart;
@@ -138,13 +135,11 @@ namespace opengl
void ParticleSystem::setSprite(Image * image) void ParticleSystem::setSprite(Image * image)
{ {
if(this->sprite != 0) if(sprite != 0)
{ sprite->release();
this->sprite->release();
this->sprite = 0;
}
this->sprite = image; sprite = image;
sprite->retain();
} }
void ParticleSystem::setBufferSize(unsigned int size) void ParticleSystem::setBufferSize(unsigned int size)