diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-04-30 23:52:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-30 23:52:15 +0200 |
| commit | 4a7679e4dd9f68270b3d27797146f88491f182b8 (patch) | |
| tree | 50aa413acf36ca1803642eeca81c4274b8515a94 /servers/rendering/renderer_scene_cull.cpp | |
| parent | d12e0b6ef172fe6831df46efaf2046438f0e1340 (diff) | |
| parent | 90056460ad8e22d9166523dcb2defebb0581f95c (diff) | |
| download | redot-engine-4a7679e4dd9f68270b3d27797146f88491f182b8.tar.gz | |
Merge pull request #48242 from reduz/particle-trails
Implement Particle Trails
Diffstat (limited to 'servers/rendering/renderer_scene_cull.cpp')
| -rw-r--r-- | servers/rendering/renderer_scene_cull.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/servers/rendering/renderer_scene_cull.cpp b/servers/rendering/renderer_scene_cull.cpp index 5417695ad3..f34727fd0a 100644 --- a/servers/rendering/renderer_scene_cull.cpp +++ b/servers/rendering/renderer_scene_cull.cpp @@ -1427,6 +1427,9 @@ void RendererSceneCull::_update_instance(Instance *p_instance) { pair.pair_mask |= 1 << RS::INSTANCE_LIGHT; pair.pair_mask |= 1 << RS::INSTANCE_GI_PROBE; pair.pair_mask |= 1 << RS::INSTANCE_LIGHTMAP; + if (p_instance->base_type == RS::INSTANCE_PARTICLES) { + pair.pair_mask |= 1 << RS::INSTANCE_PARTICLES_COLLISION; + } pair.pair_mask |= geometry_instance_pair_mask; @@ -2410,7 +2413,7 @@ void RendererSceneCull::_frustum_cull(CullData &cull_data, FrustumCullResult &cu cull_data.cull->lock.lock(); RSG::storage->particles_request_process(idata.base_rid); cull_data.cull->lock.unlock(); - RSG::storage->particles_set_view_axis(idata.base_rid, -cull_data.cam_transform.basis.get_axis(2).normalized()); + RSG::storage->particles_set_view_axis(idata.base_rid, -cull_data.cam_transform.basis.get_axis(2).normalized(), cull_data.cam_transform.basis.get_axis(1).normalized()); //particles visible? request redraw RenderingServerDefault::redraw_request(); } |