diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-04-08 22:38:11 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-04-08 22:40:06 -0300 |
| commit | 4286aef69313e048fa91710c35456c08a252fd3c (patch) | |
| tree | 866ecba1e556f587aed886166afea79a47487248 /servers | |
| parent | 6075dfe511728ab3fb59915a18ca99e5b8789d8b (diff) | |
Particle system is complete. Rejoice!
Diffstat (limited to 'servers')
| -rw-r--r-- | servers/visual/rasterizer.h | 2 | ||||
| -rw-r--r-- | servers/visual/shader_types.cpp | 2 | ||||
| -rw-r--r-- | servers/visual/visual_server_raster.h | 2 | ||||
| -rw-r--r-- | servers/visual_server.h | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/servers/visual/rasterizer.h b/servers/visual/rasterizer.h index 3a8126f300..a420f7a081 100644 --- a/servers/visual/rasterizer.h +++ b/servers/visual/rasterizer.h @@ -441,7 +441,7 @@ public: virtual void particles_set_explosiveness_ratio(RID p_particles, float p_ratio) = 0; virtual void particles_set_randomness_ratio(RID p_particles, float p_ratio) = 0; virtual void particles_set_custom_aabb(RID p_particles, const Rect3 &p_aabb) = 0; - virtual void particles_set_gravity(RID p_particles, const Vector3 &p_gravity) = 0; + virtual void particles_set_speed_scale(RID p_particles, float p_scale) = 0; virtual void particles_set_use_local_coordinates(RID p_particles, bool p_enable) = 0; virtual void particles_set_process_material(RID p_particles, RID p_material) = 0; virtual void particles_set_fixed_fps(RID p_particles, int p_fps) = 0; diff --git a/servers/visual/shader_types.cpp b/servers/visual/shader_types.cpp index cbde41427c..8d72ee3f34 100644 --- a/servers/visual/shader_types.cpp +++ b/servers/visual/shader_types.cpp @@ -203,8 +203,6 @@ ShaderTypes::ShaderTypes() { shader_modes[VS::SHADER_PARTICLES].functions["vertex"]["DELTA"] = ShaderLanguage::TYPE_FLOAT; shader_modes[VS::SHADER_PARTICLES].functions["vertex"]["NUMBER"] = ShaderLanguage::TYPE_UINT; shader_modes[VS::SHADER_PARTICLES].functions["vertex"]["INDEX"] = ShaderLanguage::TYPE_INT; - shader_modes[VS::SHADER_PARTICLES].functions["vertex"]["SEED"] = ShaderLanguage::TYPE_UINT; - shader_modes[VS::SHADER_PARTICLES].functions["vertex"]["GRAVITY"] = ShaderLanguage::TYPE_VEC3; shader_modes[VS::SHADER_PARTICLES].functions["vertex"]["EMISSION_TRANSFORM"] = ShaderLanguage::TYPE_MAT4; shader_modes[VS::SHADER_PARTICLES].modes.insert("billboard"); diff --git a/servers/visual/visual_server_raster.h b/servers/visual/visual_server_raster.h index 11f6d58f95..7de497d529 100644 --- a/servers/visual/visual_server_raster.h +++ b/servers/visual/visual_server_raster.h @@ -852,7 +852,7 @@ public: BIND2(particles_set_explosiveness_ratio, RID, float) BIND2(particles_set_randomness_ratio, RID, float) BIND2(particles_set_custom_aabb, RID, const Rect3 &) - BIND2(particles_set_gravity, RID, const Vector3 &) + BIND2(particles_set_speed_scale, RID, float) BIND2(particles_set_use_local_coordinates, RID, bool) BIND2(particles_set_process_material, RID, RID) BIND2(particles_set_fixed_fps, RID, int) diff --git a/servers/visual_server.h b/servers/visual_server.h index 04afc6dfaf..7accc7d904 100644 --- a/servers/visual_server.h +++ b/servers/visual_server.h @@ -480,7 +480,7 @@ public: virtual void particles_set_explosiveness_ratio(RID p_particles, float p_ratio) = 0; virtual void particles_set_randomness_ratio(RID p_particles, float p_ratio) = 0; virtual void particles_set_custom_aabb(RID p_particles, const Rect3 &p_aabb) = 0; - virtual void particles_set_gravity(RID p_particles, const Vector3 &p_gravity) = 0; + virtual void particles_set_speed_scale(RID p_particles, float p_scale) = 0; virtual void particles_set_use_local_coordinates(RID p_particles, bool p_enable) = 0; virtual void particles_set_process_material(RID p_particles, RID p_material) = 0; virtual void particles_set_fixed_fps(RID p_particles, int p_fps) = 0; |