Skip to content

Commit

Permalink
Removes mesh, lua and particles samples
Browse files Browse the repository at this point in the history
  • Loading branch information
@seanpaultaylor
seanpaultaylor committed Nov 28, 2014
1 parent cb4f9a0 commit 2692d25
Show file tree
Hide file tree
Showing 135 changed files with 318 additions and 6,955 deletions.
35 changes: 1 addition & 34 deletions gameplay.sln
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,15 @@


Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Express 2013 for Windows Desktop
VisualStudioVersion = 12.0.21005.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample-mesh", "samples\mesh\sample-mesh.vcxproj", "{D672DC66-3CE0-4878-B0D2-813CA731012F}"
ProjectSection(ProjectDependencies) = postProject
{1032BA4B-57EB-4348-9E03-29DD63E80E4A} = {1032BA4B-57EB-4348-9E03-29DD63E80E4A}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gameplay", "gameplay\gameplay.vcxproj", "{1032BA4B-57EB-4348-9E03-29DD63E80E4A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample-browser", "samples\browser\sample-browser.vcxproj", "{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}"
ProjectSection(ProjectDependencies) = postProject
{1032BA4B-57EB-4348-9E03-29DD63E80E4A} = {1032BA4B-57EB-4348-9E03-29DD63E80E4A}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample-lua", "samples\lua\sample-lua.vcxproj", "{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}"
ProjectSection(ProjectDependencies) = postProject
{1032BA4B-57EB-4348-9E03-29DD63E80E4A} = {1032BA4B-57EB-4348-9E03-29DD63E80E4A}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample-spaceship", "samples\spaceship\sample-spaceship.vcxproj", "{CC37B8E9-6402-4841-8D6A-5D908A5909B3}"
ProjectSection(ProjectDependencies) = postProject
{1032BA4B-57EB-4348-9E03-29DD63E80E4A} = {1032BA4B-57EB-4348-9E03-29DD63E80E4A}
Expand All @@ -30,11 +20,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample-character", "samples
{1032BA4B-57EB-4348-9E03-29DD63E80E4A} = {1032BA4B-57EB-4348-9E03-29DD63E80E4A}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample-particles", "samples\particles\sample-particles.vcxproj", "{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}"
ProjectSection(ProjectDependencies) = postProject
{1032BA4B-57EB-4348-9E03-29DD63E80E4A} = {1032BA4B-57EB-4348-9E03-29DD63E80E4A}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample-racer", "samples\racer\sample-racer.vcxproj", "{82522888-E09A-ED48-AD7D-247237B37B3A}"
ProjectSection(ProjectDependencies) = postProject
{1032BA4B-57EB-4348-9E03-29DD63E80E4A} = {1032BA4B-57EB-4348-9E03-29DD63E80E4A}
Expand All @@ -47,12 +32,6 @@ Global
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{D672DC66-3CE0-4878-B0D2-813CA731012F}.Debug|x64.ActiveCfg = Debug|x64
{D672DC66-3CE0-4878-B0D2-813CA731012F}.Debug|x64.Build.0 = Debug|x64
{D672DC66-3CE0-4878-B0D2-813CA731012F}.DebugMem|x64.ActiveCfg = DebugMem|x64
{D672DC66-3CE0-4878-B0D2-813CA731012F}.DebugMem|x64.Build.0 = DebugMem|x64
{D672DC66-3CE0-4878-B0D2-813CA731012F}.Release|x64.ActiveCfg = Release|x64
{D672DC66-3CE0-4878-B0D2-813CA731012F}.Release|x64.Build.0 = Release|x64
{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.Debug|x64.ActiveCfg = Debug|x64
{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.Debug|x64.Build.0 = Debug|x64
{1032BA4B-57EB-4348-9E03-29DD63E80E4A}.DebugMem|x64.ActiveCfg = DebugMem|x64
Expand All @@ -65,12 +44,6 @@ Global
{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}.DebugMem|x64.Build.0 = DebugMem|x64
{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}.Release|x64.ActiveCfg = Release|x64
{0F27C8C4-58B2-E367-8D1F-01B714FDBF1B}.Release|x64.Build.0 = Release|x64
{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.Debug|x64.ActiveCfg = Debug|x64
{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.Debug|x64.Build.0 = Debug|x64
{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.DebugMem|x64.ActiveCfg = DebugMem|x64
{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.DebugMem|x64.Build.0 = DebugMem|x64
{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.Release|x64.ActiveCfg = Release|x64
{04EAF3E5-0F9E-AF4D-53F9-269CE114211F}.Release|x64.Build.0 = Release|x64
{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.Debug|x64.ActiveCfg = Debug|x64
{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.Debug|x64.Build.0 = Debug|x64
{CC37B8E9-6402-4841-8D6A-5D908A5909B3}.DebugMem|x64.ActiveCfg = DebugMem|x64
Expand All @@ -83,12 +56,6 @@ Global
{87388E8B-F3CF-428F-BC2C-C1886248C111}.DebugMem|x64.Build.0 = DebugMem|x64
{87388E8B-F3CF-428F-BC2C-C1886248C111}.Release|x64.ActiveCfg = Release|x64
{87388E8B-F3CF-428F-BC2C-C1886248C111}.Release|x64.Build.0 = Release|x64
{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.Debug|x64.ActiveCfg = Debug|x64
{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.Debug|x64.Build.0 = Debug|x64
{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.DebugMem|x64.ActiveCfg = DebugMem|x64
{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.DebugMem|x64.Build.0 = DebugMem|x64
{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.Release|x64.ActiveCfg = Release|x64
{CB5ABFAA-EA69-E439-5A4D-3B9359916C71}.Release|x64.Build.0 = Release|x64
{82522888-E09A-ED48-AD7D-247237B37B3A}.Debug|x64.ActiveCfg = Debug|x64
{82522888-E09A-ED48-AD7D-247237B37B3A}.Debug|x64.Build.0 = Debug|x64
{82522888-E09A-ED48-AD7D-247237B37B3A}.DebugMem|x64.ActiveCfg = DebugMem|x64
Expand Down
9 changes: 0 additions & 9 deletions gameplay.xcworkspace/contents.xcworkspacedata
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions gameplay/gameplay.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,8 @@
420BBD831817416F00C7B720 /* lua_NodeType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 420BBB5E1817416E00C7B720 /* lua_NodeType.cpp */; };
420BBD861817416F00C7B720 /* lua_ParticleEmitter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 420BBB601817416E00C7B720 /* lua_ParticleEmitter.cpp */; };
420BBD871817416F00C7B720 /* lua_ParticleEmitter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 420BBB601817416E00C7B720 /* lua_ParticleEmitter.cpp */; };
420BBD8A1817416F00C7B720 /* lua_ParticleEmitterTextureBlending.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 420BBB621817416E00C7B720 /* lua_ParticleEmitterTextureBlending.cpp */; };
420BBD8B1817416F00C7B720 /* lua_ParticleEmitterTextureBlending.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 420BBB621817416E00C7B720 /* lua_ParticleEmitterTextureBlending.cpp */; };
420BBD8A1817416F00C7B720 /* lua_ParticleEmitterBlendMode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 420BBB621817416E00C7B720 /* lua_ParticleEmitterBlendMode.cpp */; };
420BBD8B1817416F00C7B720 /* lua_ParticleEmitterBlendMode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 420BBB621817416E00C7B720 /* lua_ParticleEmitterBlendMode.cpp */; };
420BBD8E1817416F00C7B720 /* lua_Pass.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 420BBB641817416E00C7B720 /* lua_Pass.cpp */; };
420BBD8F1817416F00C7B720 /* lua_Pass.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 420BBB641817416E00C7B720 /* lua_Pass.cpp */; };
420BBD921817416F00C7B720 /* lua_PhysicsCharacter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 420BBB661817416E00C7B720 /* lua_PhysicsCharacter.cpp */; };
Expand Down Expand Up @@ -789,8 +789,8 @@
420BBB5F1817416E00C7B720 /* lua_NodeType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_NodeType.h; sourceTree = "<group>"; };
420BBB601817416E00C7B720 /* lua_ParticleEmitter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_ParticleEmitter.cpp; sourceTree = "<group>"; };
420BBB611817416E00C7B720 /* lua_ParticleEmitter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_ParticleEmitter.h; sourceTree = "<group>"; };
420BBB621817416E00C7B720 /* lua_ParticleEmitterTextureBlending.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_ParticleEmitterTextureBlending.cpp; sourceTree = "<group>"; };
420BBB631817416E00C7B720 /* lua_ParticleEmitterTextureBlending.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_ParticleEmitterTextureBlending.h; sourceTree = "<group>"; };
420BBB621817416E00C7B720 /* lua_ParticleEmitterBlendMode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_ParticleEmitterBlendMode.cpp; sourceTree = "<group>"; };
420BBB631817416E00C7B720 /* lua_ParticleEmitterBlendMode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_ParticleEmitterBlendMode.h; sourceTree = "<group>"; };
420BBB641817416E00C7B720 /* lua_Pass.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_Pass.cpp; sourceTree = "<group>"; };
420BBB651817416E00C7B720 /* lua_Pass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lua_Pass.h; sourceTree = "<group>"; };
420BBB661817416E00C7B720 /* lua_PhysicsCharacter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lua_PhysicsCharacter.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1461,8 +1461,8 @@
420BBB5F1817416E00C7B720 /* lua_NodeType.h */,
420BBB601817416E00C7B720 /* lua_ParticleEmitter.cpp */,
420BBB611817416E00C7B720 /* lua_ParticleEmitter.h */,
420BBB621817416E00C7B720 /* lua_ParticleEmitterTextureBlending.cpp */,
420BBB631817416E00C7B720 /* lua_ParticleEmitterTextureBlending.h */,
420BBB621817416E00C7B720 /* lua_ParticleEmitterBlendMode.cpp */,
420BBB631817416E00C7B720 /* lua_ParticleEmitterBlendMode.h */,
420BBB641817416E00C7B720 /* lua_Pass.cpp */,
420BBB651817416E00C7B720 /* lua_Pass.h */,
420BBB661817416E00C7B720 /* lua_PhysicsCharacter.cpp */,
Expand Down Expand Up @@ -2221,7 +2221,7 @@
420BBED61817416F00C7B720 /* lua_VerticalLayout.cpp in Sources */,
42CC55CE1809A4EF00AAD8AD /* DebugNew.cpp in Sources */,
420BBE7A1817416F00C7B720 /* lua_TextBoxInputMode.cpp in Sources */,
420BBD8A1817416F00C7B720 /* lua_ParticleEmitterTextureBlending.cpp in Sources */,
420BBD8A1817416F00C7B720 /* lua_ParticleEmitterBlendMode.cpp in Sources */,
420BBDEA1817416F00C7B720 /* lua_PhysicsSpringConstraint.cpp in Sources */,
42CC59141809A4EF00AAD8AD /* MeshBatch.cpp in Sources */,
42CC55701809A4EF00AAD8AD /* AIAgent.cpp in Sources */,
Expand Down Expand Up @@ -2518,7 +2518,7 @@
420BBED71817416F00C7B720 /* lua_VerticalLayout.cpp in Sources */,
42CC55CF1809A4EF00AAD8AD /* DebugNew.cpp in Sources */,
420BBE7B1817416F00C7B720 /* lua_TextBoxInputMode.cpp in Sources */,
420BBD8B1817416F00C7B720 /* lua_ParticleEmitterTextureBlending.cpp in Sources */,
420BBD8B1817416F00C7B720 /* lua_ParticleEmitterBlendMode.cpp in Sources */,
420BBDEB1817416F00C7B720 /* lua_PhysicsSpringConstraint.cpp in Sources */,
42CC59151809A4EF00AAD8AD /* MeshBatch.cpp in Sources */,
42CC55711809A4EF00AAD8AD /* AIAgent.cpp in Sources */,
Expand Down
58 changes: 31 additions & 27 deletions gameplay/src/ParticleEmitter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ ParticleEmitter::ParticleEmitter(unsigned int particleCountMax) :
_rotationPerParticleSpeedMin(0.0f), _rotationPerParticleSpeedMax(0.0f),
_rotationSpeedMin(0.0f), _rotationSpeedMax(0.0f),
_rotationAxis(Vector3::zero()), _rotation(Matrix::identity()),
_spriteBatch(NULL), _spriteTextureBlending(BLEND_TRANSPARENT), _spriteTextureWidth(0), _spriteTextureHeight(0), _spriteTextureWidthRatio(0), _spriteTextureHeightRatio(0), _spriteTextureCoords(NULL),
_spriteBatch(NULL), _spriteBlendMode(BLEND_ALPHA), _spriteTextureWidth(0), _spriteTextureHeight(0), _spriteTextureWidthRatio(0), _spriteTextureHeightRatio(0), _spriteTextureCoords(NULL),
_spriteAnimated(false), _spriteLooped(false), _spriteFrameCount(1), _spriteFrameRandomOffset(0),_spriteFrameDuration(0L), _spriteFrameDurationSecs(0.0f), _spritePercentPerFrame(0.0f),
_node(NULL), _orbitPosition(false), _orbitVelocity(false), _orbitAcceleration(false),
_timePerEmission(PARTICLE_EMISSION_RATE_TIME_INTERVAL), _emitTime(0), _lastUpdated(0)
Expand All @@ -42,7 +42,7 @@ ParticleEmitter::~ParticleEmitter()
SAFE_DELETE_ARRAY(_spriteTextureCoords);
}

ParticleEmitter* ParticleEmitter::create(const char* textureFile, TextureBlending textureBlending, unsigned int particleCountMax)
ParticleEmitter* ParticleEmitter::create(const char* textureFile, BlendMode blendMode, unsigned int particleCountMax)
{
Texture* texture = Texture::create(textureFile, true);

Expand All @@ -54,17 +54,17 @@ ParticleEmitter* ParticleEmitter::create(const char* textureFile, TextureBlendin
GP_ASSERT(texture->getWidth());
GP_ASSERT(texture->getHeight());

ParticleEmitter* emitter = ParticleEmitter::create(texture, textureBlending, particleCountMax);
ParticleEmitter* emitter = ParticleEmitter::create(texture, blendMode, particleCountMax);
SAFE_RELEASE(texture);
return emitter;
}

ParticleEmitter* ParticleEmitter::create(Texture* texture, TextureBlending textureBlending, unsigned int particleCountMax)
ParticleEmitter* ParticleEmitter::create(Texture* texture, BlendMode blendMode, unsigned int particleCountMax)
{
ParticleEmitter* emitter = new ParticleEmitter(particleCountMax);
GP_ASSERT(emitter);

emitter->setTexture(texture, textureBlending);
emitter->setTexture(texture, blendMode);

return emitter;
}
Expand Down Expand Up @@ -108,8 +108,11 @@ ParticleEmitter* ParticleEmitter::create(Properties* properties)
return NULL;
}

const char* blendingString = sprite->getString("blending");
TextureBlending textureBlending = getTextureBlendingFromString(blendingString);
const char* blendModeString = sprite->getString("blendMode");
// Check for the old naming
if (blendModeString == NULL)
blendModeString = sprite->getString("blending");
BlendMode blendMode = getBlendModeFromString(blendModeString);
int spriteWidth = sprite->getInt("width");
int spriteHeight = sprite->getInt("height");
bool spriteAnimated = sprite->getBool("animated");
Expand Down Expand Up @@ -174,7 +177,7 @@ ParticleEmitter* ParticleEmitter::create(Properties* properties)
bool orbitAcceleration = properties->getBool("orbitAcceleration");

// Apply all properties to a newly created ParticleEmitter.
ParticleEmitter* emitter = ParticleEmitter::create(texturePath.c_str(), textureBlending, particleCountMax);
ParticleEmitter* emitter = ParticleEmitter::create(texturePath.c_str(), blendMode, particleCountMax);
if (!emitter)
{
GP_ERROR("Failed to create particle emitter.");
Expand Down Expand Up @@ -202,12 +205,12 @@ ParticleEmitter* ParticleEmitter::create(Properties* properties)
return emitter;
}

void ParticleEmitter::setTexture(const char* texturePath, TextureBlending textureBlending)
void ParticleEmitter::setTexture(const char* texturePath, BlendMode blendMode)
{
Texture* texture = Texture::create(texturePath, true);
if (texture)
{
setTexture(texture, textureBlending);
setTexture(texture, blendMode);
texture->release();
}
else
Expand All @@ -216,7 +219,7 @@ void ParticleEmitter::setTexture(const char* texturePath, TextureBlending textur
}
}

void ParticleEmitter::setTexture(Texture* texture, TextureBlending textureBlending)
void ParticleEmitter::setTexture(Texture* texture, BlendMode blendMode)
{
// Create new batch before releasing old one, in case the same texture
// is used for both (so it's not released before passing to the new batch).
Expand All @@ -230,7 +233,7 @@ void ParticleEmitter::setTexture(Texture* texture, TextureBlending textureBlendi
_spriteBatch->getStateBlock()->setDepthWrite(false);
_spriteBatch->getStateBlock()->setDepthTest(true);

setTextureBlending(textureBlending);
setBlendMode(blendMode);
_spriteTextureWidth = texture->getWidth();
_spriteTextureHeight = texture->getHeight();
_spriteTextureWidthRatio = 1.0f / (float)texture->getWidth();
Expand Down Expand Up @@ -558,17 +561,17 @@ const Vector3& ParticleEmitter::getRotationAxisVariance() const
return _rotationAxisVar;
}

void ParticleEmitter::setTextureBlending(TextureBlending textureBlending)
void ParticleEmitter::setBlendMode(BlendMode blendMode)
{
GP_ASSERT(_spriteBatch);
GP_ASSERT(_spriteBatch->getStateBlock());

switch (textureBlending)
switch (blendMode)
{
case BLEND_OPAQUE:
case BLEND_NONE:
_spriteBatch->getStateBlock()->setBlend(false);
break;
case BLEND_TRANSPARENT:
case BLEND_ALPHA:
_spriteBatch->getStateBlock()->setBlend(true);
_spriteBatch->getStateBlock()->setBlendSrc(RenderState::BLEND_SRC_ALPHA);
_spriteBatch->getStateBlock()->setBlendDst(RenderState::BLEND_ONE_MINUS_SRC_ALPHA);
Expand All @@ -584,16 +587,16 @@ void ParticleEmitter::setTextureBlending(TextureBlending textureBlending)
_spriteBatch->getStateBlock()->setBlendDst(RenderState::BLEND_SRC_COLOR);
break;
default:
GP_ERROR("Unsupported texture blending mode (%d).", textureBlending);
GP_ERROR("Unsupported blend mode (%d).", blendMode);
break;
}

_spriteTextureBlending = textureBlending;
_spriteBlendMode = blendMode;
}

ParticleEmitter::TextureBlending ParticleEmitter::getTextureBlending() const
ParticleEmitter::BlendMode ParticleEmitter::getBlendMode() const
{
return _spriteTextureBlending;
return _spriteBlendMode;
}

void ParticleEmitter::setSpriteAnimated(bool animated)
Expand Down Expand Up @@ -832,17 +835,17 @@ void ParticleEmitter::generateColor(const Vector4& base, const Vector4& variance
dst->w = base.w + variance.w * MATH_RANDOM_MINUS1_1();
}

ParticleEmitter::TextureBlending ParticleEmitter::getTextureBlendingFromString(const char* str)
ParticleEmitter::BlendMode ParticleEmitter::getBlendModeFromString(const char* str)
{
GP_ASSERT(str);

if (strcmp(str, "BLEND_OPAQUE") == 0 || strcmp(str, "OPAQUE") == 0)
if (strcmp(str, "BLEND_NONE") == 0 || strcmp(str, "NONE") == 0 )
{
return BLEND_OPAQUE;
return BLEND_NONE;
}
else if (strcmp(str, "BLEND_TRANSPARENT") == 0 || strcmp(str, "TRANSPARENT") == 0)
else if (strcmp(str, "BLEND_ALPHA") == 0 || strcmp(str, "ALPHA") == 0 )
{
return BLEND_TRANSPARENT;
return BLEND_ALPHA;
}
else if (strcmp(str, "BLEND_ADDITIVE") == 0 || strcmp(str, "ADDITIVE") == 0)
{
Expand All @@ -854,7 +857,7 @@ ParticleEmitter::TextureBlending ParticleEmitter::getTextureBlendingFromString(c
}
else
{
return BLEND_TRANSPARENT;
return BLEND_ALPHA;
}
}

Expand Down Expand Up @@ -1031,7 +1034,8 @@ unsigned int ParticleEmitter::draw()
ParticleEmitter* ParticleEmitter::clone()
{
// Create a clone of this emitter
ParticleEmitter* emitter = ParticleEmitter::create(_spriteBatch->getSampler()->getTexture(), _spriteTextureBlending, _particleCountMax);
ParticleEmitter* emitter = ParticleEmitter::create(_spriteBatch->getSampler()->getTexture(),
_spriteBlendMode, _particleCountMax);

// Copy all properties to the clone
emitter->setEmissionRate(_emissionRate);
Expand Down
Loading

0 comments on commit 2692d25

Please sign in to comment.