Move renderable object initialization into their appropriate nodes

Source/RenderBeast/Source/BsRenderBeast.cpp

@@ -368,84 +368,8 @@ namespace bs { namespace ct
 		SPtr<GpuParamBlockBuffer> perCameraBuffer = viewInfo->getPerViewBuffer();
 		perCameraBuffer->flushToGPU();
 
-		Matrix4 viewProj = viewProps.viewProjTransform;
-		UINT32 numSamples = viewProps.numSamples;
-
-		bool allowShadows = !viewProps.noShadows;
-		if(allowShadows)
-		{
-			if(sceneCamera == nullptr)
-			{
-				// Note: In order to support shadows on non-scene views I'd need to be aware of what those views are before
-				// rendering, in order to properly generate shadow maps. 
-				LOGWRN("Shadows are currently not supported on non-scene views. Disabling shadow rendering.");
-				allowShadows = false;
-			}
-		}
-
 		viewInfo->beginFrame();
 
-		const VisibleLightData& visibleLightData = viewGroup.getVisibleLightData();
-		const VisibleReflProbeData& visibleReflProbeData = viewGroup.getVisibleReflProbeData();
-
-		const LightGrid& lightGrid = viewInfo->getLightGrid();
-
-		SPtr<GpuParamBlockBuffer> gridParams;
-		SPtr<GpuBuffer> gridLightOffsetsAndSize, gridLightIndices;
-		SPtr<GpuBuffer> gridProbeOffsetsAndSize, gridProbeIndices;
-		lightGrid.getOutputs(gridLightOffsetsAndSize, gridLightIndices, gridProbeOffsetsAndSize, gridProbeIndices, 
-			gridParams);
-
-		// Prepare refl. probe param buffer
-		ReflProbeParamBuffer reflProbeParamBuffer;
-		reflProbeParamBuffer.populate(sceneInfo.sky, visibleReflProbeData, sceneInfo.reflProbeCubemapsTex, 
-			viewProps.renderingReflections);
-
-		// Assign camera and per-call data to all relevant renderables
-		const VisibilityInfo& visibility = viewInfo->getVisibilityMasks();
-		UINT32 numRenderables = (UINT32)sceneInfo.renderables.size();
-		for (UINT32 i = 0; i < numRenderables; i++)
-		{
-			if (!visibility.renderables[i])
-				continue;
-
-			RendererObject* rendererObject = sceneInfo.renderables[i];
-			rendererObject->updatePerCallBuffer(viewProj);
-
-			for (auto& element : sceneInfo.renderables[i]->elements)
-			{
-				if (element.perCameraBindingIdx != -1)
-					element.params->setParamBlockBuffer(element.perCameraBindingIdx, perCameraBuffer, true);
-
-				// Everything below is required only for forward rendering (ATM only used for transparent objects)
-				// Note: It would be nice to be able to set this once and keep it, only updating if the buffers actually
-				// change (e.g. when growing). Although technically the internal systems should be smart enough to
-				// avoid updates unless objects actually changed.
-				if (element.gridParamsBindingIdx != -1)
-					element.params->setParamBlockBuffer(element.gridParamsBindingIdx, gridParams, true);
-
-				element.gridLightOffsetsAndSizeParam.set(gridLightOffsetsAndSize);
-				element.gridLightIndicesParam.set(gridLightIndices);
-				element.lightsBufferParam.set(visibleLightData.getLightBuffer());
-
-				// Image based lighting params
-				ImageBasedLightingParams& iblParams = element.imageBasedParams;
-				if (iblParams.reflProbeParamsBindingIdx != -1)
-					element.params->setParamBlockBuffer(iblParams.reflProbeParamsBindingIdx, reflProbeParamBuffer.buffer);
-
-				element.gridProbeOffsetsAndSizeParam.set(gridProbeOffsetsAndSize);
-
-				iblParams.reflectionProbeIndicesParam.set(gridProbeIndices);
-				iblParams.reflectionProbesParam.set(visibleReflProbeData.getProbeBuffer());
-
-				iblParams.skyReflectionsTexParam.set(sceneInfo.sky.filteredReflections);
-				iblParams.skyIrradianceTexParam.set(sceneInfo.sky.irradiance);
-
-				iblParams.reflectionProbeCubemapsTexParam.set(sceneInfo.reflProbeCubemapsTex);
-				iblParams.preintegratedEnvBRDFParam.set(RendererTextures::preintegratedEnvGF);
-			}
-		}
-
 		// Trigger pre-base-pass callbacks
 		auto iterRenderCallback = mCallbacks.begin();
 

Source/RenderBeast/Source/BsRenderCompositor.cpp

@@ -14,6 +14,8 @@
 #include "BsRenderBeast.h"
 #include "BsBitwise.h"
 #include "BsRendererTextures.h"
+#include "BsObjectRendering.h"
+#include "BsGpuParamsSet.h"
 
 namespace bs { namespace ct
 {
@@ -253,6 +255,24 @@ namespace bs { namespace ct
 			renderTarget = RenderTexture::create(gbufferDesc);
 		}
 
+		// Prepare all visible objects. Note that this also prepares non-opaque objects.
+		const VisibilityInfo& visibility = inputs.view.getVisibilityMasks();
+		UINT32 numRenderables = (UINT32)inputs.scene.renderables.size();
+		for (UINT32 i = 0; i < numRenderables; i++)
+		{
+			if (!visibility.renderables[i])
+				continue;
+
+			RendererObject* rendererObject = inputs.scene.renderables[i];
+			rendererObject->updatePerCallBuffer(viewProps.viewProjTransform);
+
+			for (auto& element : inputs.scene.renderables[i]->elements)
+			{
+				if (element.perCameraBindingIdx != -1)
+					element.params->setParamBlockBuffer(element.perCameraBindingIdx, inputs.view.getPerViewBuffer(), true);
+			}
+		}
+
 		// Render base pass
 		RenderAPI& rapi = RenderAPI::instance();
 		rapi.setRenderTarget(renderTarget);
@@ -671,6 +691,67 @@ namespace bs { namespace ct
 
 	void RCNodeClusteredForward::render(const RenderCompositorNodeInputs& inputs)
 	{
+		const SceneInfo& sceneInfo = inputs.scene;
+		const RendererViewProperties& viewProps = inputs.view.getProperties();
+
+		const VisibleLightData& visibleLightData = inputs.viewGroup.getVisibleLightData();
+		const VisibleReflProbeData& visibleReflProbeData = inputs.viewGroup.getVisibleReflProbeData();
+
+		const LightGrid& lightGrid = inputs.view.getLightGrid();
+
+		SPtr<GpuParamBlockBuffer> gridParams;
+		SPtr<GpuBuffer> gridLightOffsetsAndSize, gridLightIndices;
+		SPtr<GpuBuffer> gridProbeOffsetsAndSize, gridProbeIndices;
+		lightGrid.getOutputs(gridLightOffsetsAndSize, gridLightIndices, gridProbeOffsetsAndSize, gridProbeIndices, 
+			gridParams);
+
+		// Prepare refl. probe param buffer
+		ReflProbeParamBuffer reflProbeParamBuffer;
+		reflProbeParamBuffer.populate(sceneInfo.sky, visibleReflProbeData, sceneInfo.reflProbeCubemapsTex, 
+			viewProps.renderingReflections);
+
+		// Prepare objects for rendering
+		const VisibilityInfo& visibility = inputs.view.getVisibilityMasks();
+		UINT32 numRenderables = (UINT32)sceneInfo.renderables.size();
+		for (UINT32 i = 0; i < numRenderables; i++)
+		{
+			if (!visibility.renderables[i])
+				continue;
+
+			for (auto& element : sceneInfo.renderables[i]->elements)
+			{
+				bool isTransparent = (element.material->getShader()->getFlags() & (UINT32)ShaderFlags::Transparent) != 0;
+				if (!isTransparent)
+					continue;
+
+				// Note: It would be nice to be able to set this once and keep it, only updating if the buffers actually
+				// change (e.g. when growing). Although technically the internal systems should be smart enough to
+				// avoid updates unless objects actually changed.
+				if (element.gridParamsBindingIdx != -1)
+					element.params->setParamBlockBuffer(element.gridParamsBindingIdx, gridParams, true);
+
+				element.gridLightOffsetsAndSizeParam.set(gridLightOffsetsAndSize);
+				element.gridLightIndicesParam.set(gridLightIndices);
+				element.lightsBufferParam.set(visibleLightData.getLightBuffer());
+
+				// Image based lighting params
+				ImageBasedLightingParams& iblParams = element.imageBasedParams;
+				if (iblParams.reflProbeParamsBindingIdx != -1)
+					element.params->setParamBlockBuffer(iblParams.reflProbeParamsBindingIdx, reflProbeParamBuffer.buffer);
+
+				element.gridProbeOffsetsAndSizeParam.set(gridProbeOffsetsAndSize);
+
+				iblParams.reflectionProbeIndicesParam.set(gridProbeIndices);
+				iblParams.reflectionProbesParam.set(visibleReflProbeData.getProbeBuffer());
+
+				iblParams.skyReflectionsTexParam.set(sceneInfo.sky.filteredReflections);
+				iblParams.skyIrradianceTexParam.set(sceneInfo.sky.irradiance);
+
+				iblParams.reflectionProbeCubemapsTexParam.set(sceneInfo.reflProbeCubemapsTex);
+				iblParams.preintegratedEnvBRDFParam.set(RendererTextures::preintegratedEnvGF);
+			}
+		}
+
 		// TODO: Transparent objects cannot receive shadows. In order to support this I'd have to render the light occlusion
 		// for all lights affecting this object into a single (or a few) textures. I can likely use texture arrays for this,
 		// or to avoid sampling many textures, perhaps just jam it all in one or few texture channels.