From 277793439ab026476fbdccd5d3f0070284d732ea Mon Sep 17 00:00:00 2001 From: Max Hilbrunner Date: Tue, 17 Jul 2018 16:52:13 +0200 Subject: Revert "Fix #19507 Not emitted particles affects performance" --- drivers/dummy/rasterizer_dummy.h | 1 - drivers/gles2/rasterizer_storage_gles2.cpp | 4 ---- drivers/gles2/rasterizer_storage_gles2.h | 1 - drivers/gles3/rasterizer_scene_gles3.cpp | 3 --- drivers/gles3/rasterizer_storage_gles3.cpp | 7 ------- drivers/gles3/rasterizer_storage_gles3.h | 1 - 6 files changed, 17 deletions(-) (limited to 'drivers') diff --git a/drivers/dummy/rasterizer_dummy.h b/drivers/dummy/rasterizer_dummy.h index 2cab7c0133..bab89f649a 100644 --- a/drivers/dummy/rasterizer_dummy.h +++ b/drivers/dummy/rasterizer_dummy.h @@ -682,7 +682,6 @@ public: void particles_set_emission_transform(RID p_particles, const Transform &p_transform) {} bool particles_get_emitting(RID p_particles) { return false; } - bool particles_get_inactive(RID p_particles) { return false; } int particles_get_draw_passes(RID p_particles) const { return 0; } RID particles_get_draw_pass_mesh(RID p_particles, int p_pass) const { return RID(); } diff --git a/drivers/gles2/rasterizer_storage_gles2.cpp b/drivers/gles2/rasterizer_storage_gles2.cpp index e3611029fe..b268d4c723 100644 --- a/drivers/gles2/rasterizer_storage_gles2.cpp +++ b/drivers/gles2/rasterizer_storage_gles2.cpp @@ -1637,10 +1637,6 @@ bool RasterizerStorageGLES2::particles_get_emitting(RID p_particles) { return false; } -bool RasterizerStorageGLES2::particles_get_inactive(RID p_particles) { - return false; -} - void RasterizerStorageGLES2::particles_set_amount(RID p_particles, int p_amount) { } diff --git a/drivers/gles2/rasterizer_storage_gles2.h b/drivers/gles2/rasterizer_storage_gles2.h index 3171ff53d7..b2c8b620a6 100644 --- a/drivers/gles2/rasterizer_storage_gles2.h +++ b/drivers/gles2/rasterizer_storage_gles2.h @@ -693,7 +693,6 @@ public: virtual void particles_set_emitting(RID p_particles, bool p_emitting); virtual bool particles_get_emitting(RID p_particles); - virtual bool particles_get_inactive(RID p_particles); virtual void particles_set_amount(RID p_particles, int p_amount); virtual void particles_set_lifetime(RID p_particles, float p_lifetime); diff --git a/drivers/gles3/rasterizer_scene_gles3.cpp b/drivers/gles3/rasterizer_scene_gles3.cpp index 50dc4f5bf2..9d0fb462f4 100644 --- a/drivers/gles3/rasterizer_scene_gles3.cpp +++ b/drivers/gles3/rasterizer_scene_gles3.cpp @@ -1679,9 +1679,6 @@ void RasterizerSceneGLES3::_render_geometry(RenderList::Element *e) { RasterizerStorageGLES3::Particles *particles = static_cast(e->owner); RasterizerStorageGLES3::Surface *s = static_cast(e->geometry); - if (!particles->emitting && particles->inactive) - break; - if (!particles->use_local_coords) //not using local coordinates? then clear transform.. state.scene_shader.set_uniform(SceneShaderGLES3::WORLD_TRANSFORM, Transform()); diff --git a/drivers/gles3/rasterizer_storage_gles3.cpp b/drivers/gles3/rasterizer_storage_gles3.cpp index f201673a2b..eb25d6c7a1 100644 --- a/drivers/gles3/rasterizer_storage_gles3.cpp +++ b/drivers/gles3/rasterizer_storage_gles3.cpp @@ -5574,13 +5574,6 @@ bool RasterizerStorageGLES3::particles_get_emitting(RID p_particles) { return particles->emitting; } -bool RasterizerStorageGLES3::particles_get_inactive(RID p_particles) { - Particles *particles = particles_owner.getornull(p_particles); - ERR_FAIL_COND_V(!particles, false); - - return particles->inactive; -} - void RasterizerStorageGLES3::particles_set_amount(RID p_particles, int p_amount) { Particles *particles = particles_owner.getornull(p_particles); diff --git a/drivers/gles3/rasterizer_storage_gles3.h b/drivers/gles3/rasterizer_storage_gles3.h index e3cfe6d457..80df21941b 100644 --- a/drivers/gles3/rasterizer_storage_gles3.h +++ b/drivers/gles3/rasterizer_storage_gles3.h @@ -1224,7 +1224,6 @@ public: virtual void particles_set_emitting(RID p_particles, bool p_emitting); virtual bool particles_get_emitting(RID p_particles); - virtual bool particles_get_inactive(RID p_particles); virtual void particles_set_amount(RID p_particles, int p_amount); virtual void particles_set_lifetime(RID p_particles, float p_lifetime); virtual void particles_set_one_shot(RID p_particles, bool p_one_shot); -- cgit v1.2.3