Merge remote-tracking branch 'refs/remotes/origin/master' into culling

2016-10-12 16:51:18 +02:00
parent 8ec377e72f d59fd12824
commit 561c0cf51f
95 changed files with 2139 additions and 348 deletions
--- a/SDK/src/NDK/Systems/RenderSystem.cpp
+++ b/SDK/src/NDK/Systems/RenderSystem.cpp
@@ -216,6 +216,13 @@ namespace Ndk
 				m_forceRenderQueueInvalidation = false;
 			}

+			for (const Ndk::EntityHandle& particleGroup : m_particleGroups)
+			{
+				ParticleGroupComponent& groupComponent = particleGroup->GetComponent<ParticleGroupComponent>();
+
+				groupComponent.AddToRenderQueue(renderQueue, Nz::Matrix4f::Identity()); //< ParticleGroup doesn't use Matrix4f
+			}
+
 			camComponent.ApplyView();

 			Nz::SceneData sceneData;