Skip to content

Commit 4375493

Browse files
authored
[GEN] Add future_start argument to constructor of WW3D2's ParticleEmitterClass for W3DView compatibility (#722)
1 parent 86e72b4 commit 4375493

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ ParticleEmitterClass::ParticleEmitterClass(float emit_rate, unsigned int burst_s
7474
ParticlePropertyStruct<float> &rotation, float orient_rnd,
7575
ParticlePropertyStruct<float> &frames,
7676
ParticlePropertyStruct<float> &blur_times,
77-
Vector3 accel, float max_age, TextureClass *tex, ShaderClass shader, int max_particles,
77+
Vector3 accel, float max_age, float future_start, TextureClass *tex, ShaderClass shader, int max_particles,
7878
int max_buffer_size, bool pingpong,int render_mode,int frame_mode,
7979
const W3dEmitterLinePropertiesStruct * line_props
8080
) :
@@ -267,6 +267,7 @@ ParticleEmitterClass::Create_From_Definition (const ParticleEmitterDefClass &def
267267
blur_time_keys,
268268
definition.Get_Acceleration (),
269269
definition.Get_Lifetime (),
270+
0.0f,
270271
ptexture,
271272
shader,
272273
definition.Get_Max_Emissions (),

Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class ParticleEmitterClass : public RenderObjClass
116116
ParticlePropertyStruct<float> &rotation, float orient_rnd,
117117
ParticlePropertyStruct<float> &frames,
118118
ParticlePropertyStruct<float> &blur_times,
119-
Vector3 accel, float max_age, TextureClass *tex,
119+
Vector3 accel, float max_age, float future_start, TextureClass *tex,
120120
ShaderClass shader = ShaderClass::_PresetAdditiveSpriteShader,
121121
int max_particles = 0, int max_buffer_size = -1, bool pingpong = false,
122122
int render_mode = W3D_EMITTER_RENDER_MODE_TRI_PARTICLES,

0 commit comments

Comments
 (0)