Kalakoi/GDevelop
1
0
Fork 0
mirror of https://github.com/4ian/GDevelop.git synced 2025-10-15 10:19:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Get/SetConeSprayAngle in ParticleEmitterObject

Browse Source
This commit is contained in:
Florian Rival
2018-05-26 21:46:59 -07:00
parent a7dab8faa1
commit 0e0c49c11b
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Extensions/ParticleSystem/ParticleEmitterObject.cpp
View File

@@ -42,11 +42,11 @@ ParticleEmitterBase::ParticleEmitterBase()
: rendererType(Point),
rendererParam1(3.0f),
rendererParam2(1.0f),
additive(true),
additive(false),
tank(-1),
flow(300),
emitterForceMin(25.0f),
emitterForceMax(65.0f),
flow(45),
emitterForceMin(45.0f),
emitterForceMax(85.0f),
emitterXDirection(0.0f),
emitterYDirection(1.0f),
emitterZDirection(0.0f),
@@ -54,7 +54,7 @@ ParticleEmitterBase::ParticleEmitterBase()
emitterAngleB(90),
zoneRadius(3.0f),
particleGravityX(0.0f),
particleGravityY(-100.0f),
particleGravityY(0.0f),
particleGravityZ(0.0f),
friction(2.0f),
particleLifeTimeMin(0.5f),
@@ -83,7 +83,7 @@ ParticleEmitterBase::ParticleEmitterBase()
particleSizeRandomness2(0),
particleAngleRandomness1(0),
particleAngleRandomness2(0),
maxParticleNb(5000),
maxParticleNb(300),
destroyWhenNoParticles(true),
particleSystem(NULL) {}

4
Extensions/ParticleSystem/ParticleEmitterObject.h
View File

@@ -90,7 +90,7 @@ class GD_EXTENSION_API ParticleEmitterBase {
void SetEmitterAngleA(float newValue);
void SetEmitterAngleB(float newValue);
void SetConeSprayAngle(float newValue) {
SetEmitterAngleB(newValue / 180.0f * 3.14159f);
SetEmitterAngleB(newValue);
};
void SetZoneRadius(float newValue);
void SetParticleGravityX(float newValue);
@@ -208,7 +208,7 @@ class GD_EXTENSION_API ParticleEmitterBase {
float GetEmitterAngleA() const { return emitterAngleA; };
float GetEmitterAngleB() const { return emitterAngleB; };
float GetConeSprayAngle() const {
return GetEmitterAngleB() * 180.0f / 3.14159f;
return GetEmitterAngleB();
};
float GetZoneRadius() const { return zoneRadius; };
float GetParticleGravityX() const { return particleGravityX; };