提交: a8bbae9f53cd0f4c0e0a1c227428495e40956f80 - HotshotIOS (hg)

Commit MetaInfo

• 修訂: a8bbae9f53cd0f4c0e0a1c227428495e40956f80 (tree)
• 時間: 2024-12-09 00:17:37
• 作者: sebastian_bugiu
• Commiter: sebastian_bugiu

Log Message

Backed out changeset: f7ee3b0f8ad7

Change Summary

• modified: desktop/raw/hotshot_gamedata/skybox_postprocess.compositor

差異

diff -r f7ee3b0f8ad7 -r a8bbae9f53cd desktop/raw/hotshot_gamedata/skybox_postprocess.compositor
--- a/desktop/raw/hotshot_gamedata/skybox_postprocess.compositor	Sun Dec 08 15:12:34 2024 +0100
+++ b/desktop/raw/hotshot_gamedata/skybox_postprocess.compositor	Sun Dec 08 16:17:37 2024 +0100
@@ -1,23 +1,3 @@
-compositor_node SkyboxSMAA_RenderingNode
-{
-	//in 0 rt0
-	texture rt1 target_width target_height PF_R8G8B8A8
-
-	//Play nice with Multi-GPU setups. See Postprocessing sample.
-	target rt1
-	{
-		pass clear
-		{
-			colour_value	0 1 0 1
-			buffers			colour
-			discard_only	true
-		}
-	}
-
-	//out 0 rt0
-	out 1 rt1
-}
-
 compositor_node DefaultFinalComposition
 {
 	in 0 rtN
@@ -39,10 +19,10 @@
 		}
 
 		pass render_quad
-	        {
+	    {
 			//Ignore the alpha channel
 			material Ogre/Copy/4xFP32
-	    	        input 0 rtN
+	    	input 0 rtN
 		}
 		
 		pass render_scene
@@ -108,7 +88,7 @@
 	pass render_scene
 	{
 		//Filter stuff that shouldn't be reflected (vampires?)
-		visibility_mask		0x00000005
+		visibility_mask		0xFFFFFFFF
 		overlays			off
 		camera_cubemap_reorient true
 	}
@@ -132,7 +112,7 @@
 	pass render_scene
 	{
 		//Filter stuff that shouldn't be reflected (vampires?)
-		visibility_mask		0x00000005
+		visibility_mask		0xFFFFFFFF
 		overlays			off
 		camera_cubemap_reorient true
 	}
@@ -156,7 +136,7 @@
 	pass render_scene
 	{
 		//Filter stuff that shouldn't be reflected (vampires?)
-		visibility_mask		0x00000005
+		visibility_mask		0xFFFFFFFF
 		overlays			off
 		camera_cubemap_reorient true
 	}
@@ -180,7 +160,7 @@
 	pass render_scene
 	{
 		//Filter stuff that shouldn't be reflected (vampires?)
-		visibility_mask		0x00000005
+		visibility_mask		0xFFFFFFFF
 		overlays			off
 		camera_cubemap_reorient true
 	}
@@ -204,7 +184,7 @@
 	pass render_scene
 	{
 		//Filter stuff that shouldn't be reflected (vampires?)
-		visibility_mask		0x00000005
+		visibility_mask		0xFFFFFFFF
 		overlays			off
 		camera_cubemap_reorient true
 	}
@@ -228,7 +208,7 @@
 	pass render_scene
 	{
 		//Filter stuff that shouldn't be reflected (vampires?)
-		visibility_mask		0x00000005
+		visibility_mask		0xFFFFFFFF
 		overlays			off
 		camera_cubemap_reorient true
 	}
@@ -252,7 +232,7 @@
 	pass render_scene
 	{
 		//Filter stuff that shouldn't be reflected (vampires?)
-		visibility_mask		0x00000005
+		visibility_mask		0xFFFFFFFF
 		overlays			off
 		camera_cubemap_reorient true
 	}
@@ -276,7 +256,7 @@
 	pass render_scene
 	{
 		//Filter stuff that shouldn't be reflected (vampires?)
-		visibility_mask		0x00000005
+		visibility_mask		0xFFFFFFFF
 		overlays			off
 		camera_cubemap_reorient true
 	}
@@ -300,7 +280,7 @@
 	pass render_scene
 	{
 		//Filter stuff that shouldn't be reflected (vampires?)
-		visibility_mask		0x00000005
+		visibility_mask		0xFFFFFFFF
 		overlays			off
 		camera_cubemap_reorient true
 	}
@@ -467,13 +447,90 @@
 	}
 }
 
+abstract target cubemap_target_shadow_skybox
+{
+	pass clear { colour_value 1 1 1 1 }
+	pass render_scene
+	{
+		camera_cubemap_reorient true
+	}
+}
+
+compositor_node_shadow DynamicCubemapShadowNode
+{
+	technique pssm
+
+	texture atlas 2048 7168 PF_D32_FLOAT no_fsaa
+	texture tmpCubemap 1024 1024 PF_FLOAT32_R cubemap no_fsaa
+
+	num_splits		3
+	pssm_lambda		0.95
+	shadow_map 0 atlas uv 0.0 0.000000000000000 1.0 0.285714285714286 light 0 split 0
+	shadow_map 1 atlas uv 0.0 0.285714285714286 0.5 0.142857142857143 light 0 split 1
+	shadow_map 2 atlas uv 0.5 0.285714285714286 0.5 0.142857142857143 light 0 split 2
+
+	technique focused
+	shadow_map 3 atlas uv 0.0 0.428571428571429 1.0 0.285714285714286 light 1
+	shadow_map 4 atlas uv 0.0 0.714285714285714 1.0 0.285714285714286 light 2
+
+	target atlas
+	{
+		pass clear
+		{
+			colour_value 1 1 1 1
+		}
+	}
+
+	shadow_map_target_type directional
+	{
+		shadow_map 0 1 2
+		{
+			pass render_scene
+			{
+			}
+		}
+	}
+
+	shadow_map_target_type directional spot
+	{
+		shadow_map 3 4
+		{
+			pass render_scene
+			{
+			}
+		}
+	}
+
+	shadow_map_target_type point
+	{
+		shadow_map_repeat 3 4
+		{
+			target tmpCubemap +X : cubemap_target_shadow_skybox {}
+			target tmpCubemap -X : cubemap_target_shadow_skybox {}
+			target tmpCubemap +Y : cubemap_target_shadow_skybox {}
+			target tmpCubemap -Y : cubemap_target_shadow_skybox {}
+			target tmpCubemap +Z : cubemap_target_shadow_skybox {}
+			target tmpCubemap -Z : cubemap_target_shadow_skybox {}
+
+			shadow_map
+			{
+				pass render_quad
+				{
+					material Ogre/DPSM/CubeToDpsm
+					input 0 tmpCubemap
+				}
+			}
+		}
+	}
+}
+
 compositor_node DynamicCubemapRenderingSkyboxNode0
 {
-	texture rt0 target_width target_height PF_R8G8B8
-	//in 0 rt_renderwindow
-	in 0 demo_dynamic_cubemap
+	//texture rt0 target_width target_height PF_R8G8B8
+	in 0 rt_renderwindow
+	in 1 demo_dynamic_cubemap
 
-	target rt0
+	target rt_renderwindow
 	{
 		pass clear
 		{
@@ -488,7 +545,7 @@
 			//exposing is to ensure compatibility with Vulkan & D3D12.
 			expose demo_dynamic_cubemap
 
-		//	shadows		Tutorial_DynamicCubemapShadowNode
+			shadows		DynamicCubemapShadowNode
 			overlays	off
 			rq_first	0
 			rq_last		2
@@ -508,7 +565,7 @@
 			rq_first	2
 		}
 	}
-	out 0 rt0
+//	out 0 rt0
 }
 
 compositor_node DynamicCubemapRenderingSkyboxNode1
@@ -532,7 +589,7 @@
 			//exposing is to ensure compatibility with Vulkan & D3D12.
 			expose demo_dynamic_cubemap
 
-		//	shadows		Tutorial_DynamicCubemapShadowNode
+			shadows		DynamicCubemapShadowNode
 			overlays	off
 			rq_first	0
 			rq_last		2
@@ -557,11 +614,11 @@
 
 compositor_node DynamicCubemapRenderingSkyboxNode2
 {
-	texture rt0 target_width target_height PF_R8G8B8
-	//in 0 rt_renderwindow
-	in 0 demo_dynamic_cubemap
+	//texture rt0 target_width target_height PF_R8G8B8
+	in 0 rt_renderwindow
+	in 1 demo_dynamic_cubemap
 
-	target rt0
+	target rt_renderwindow
 	{
 		pass clear
 		{
@@ -576,7 +633,7 @@
 			//exposing is to ensure compatibility with Vulkan & D3D12.
 			expose demo_dynamic_cubemap
 
-		//	shadows		Tutorial_DynamicCubemapShadowNode
+			shadows		DynamicCubemapShadowNode
 			overlays	off
 			rq_first	0
 			rq_last		2
@@ -596,16 +653,16 @@
 			rq_first	2
 		}
 	}
-	out 0 rt0
+//	out 0 rt0
 }
 
 compositor_node DynamicCubemapRenderingSkyboxNode3
 {
-	texture rt0 target_width target_height PF_R8G8B8
-	//in 0 rt_renderwindow
-	in 0 demo_dynamic_cubemap
+	//texture rt0 target_width target_height PF_R8G8B8
+	in 0 rt_renderwindow
+	in 1 demo_dynamic_cubemap
 
-	target rt0
+	target rt_renderwindow
 	{
 		pass clear
 		{
@@ -620,7 +677,7 @@
 			//exposing is to ensure compatibility with Vulkan & D3D12.
 			expose demo_dynamic_cubemap
 
-		//	shadows		Tutorial_DynamicCubemapShadowNode
+			shadows		DynamicCubemapShadowNode
 			overlays	off
 			rq_first	0
 			rq_last		2
@@ -640,16 +697,16 @@
 			rq_first	2
 		}
 	}
-	out 0 rt0
+//	out 0 rt0
 }
 
 compositor_node DynamicCubemapRenderingSkyboxNode4
 {
-	texture rt0 target_width target_height PF_R8G8B8
-	//in 0 rt_renderwindow
-	in 0 demo_dynamic_cubemap
+	//texture rt0 target_width target_height PF_R8G8B8
+	in 0 rt_renderwindow
+	in 1 demo_dynamic_cubemap
 
-	target rt0
+	target rt_renderwindow
 	{
 		pass clear
 		{
@@ -664,7 +721,7 @@
 			//exposing is to ensure compatibility with Vulkan & D3D12.
 			expose demo_dynamic_cubemap
 
-		//	shadows		Tutorial_DynamicCubemapShadowNode
+			shadows		DynamicCubemapShadowNode
 			overlays	off
 			rq_first	0
 			rq_last		2
@@ -684,16 +741,16 @@
 			rq_first	2
 		}
 	}
-	out 0 rt0
+//	out 0 rt0
 }
 
 compositor_node DynamicCubemapRenderingSkyboxNode5
 {
-	texture rt0 target_width target_height PF_R8G8B8
-	//in 0 rt_renderwindow
-	in 0 demo_dynamic_cubemap
+	//texture rt0 target_width target_height PF_R8G8B8
+	in 0 rt_renderwindow
+	in 1 demo_dynamic_cubemap
 
-	target rt0
+	target rt_renderwindow
 	{
 		pass clear
 		{
@@ -708,7 +765,7 @@
 			//exposing is to ensure compatibility with Vulkan & D3D12.
 			expose demo_dynamic_cubemap
 
-		//	shadows		Tutorial_DynamicCubemapShadowNode
+			shadows		DynamicCubemapShadowNode
 			overlays	off
 			rq_first	0
 			rq_last		2
@@ -728,16 +785,16 @@
 			rq_first	2
 		}
 	}
-	out 0 rt0
+//	out 0 rt0
 }
 
 compositor_node DynamicCubemapRenderingSkyboxNode6
 {
-	texture rt0 target_width target_height PF_R8G8B8
-	//in 0 rt_renderwindow
-	in 0 demo_dynamic_cubemap
+	//texture rt0 target_width target_height PF_R8G8B8
+	in 0 rt_renderwindow
+	in 1 demo_dynamic_cubemap
 
-	target rt0
+	target rt_renderwindow
 	{
 		pass clear
 		{
@@ -752,7 +809,7 @@
 			//exposing is to ensure compatibility with Vulkan & D3D12.
 			expose demo_dynamic_cubemap
 
-		//	shadows		Tutorial_DynamicCubemapShadowNode
+			shadows		DynamicCubemapShadowNode
 			overlays	off
 			rq_first	0
 			rq_last		2
@@ -772,16 +829,16 @@
 			rq_first	2
 		}
 	}
-	out 0 rt0
+//	out 0 rt0
 }
 
 compositor_node DynamicCubemapRenderingSkyboxNode7
 {
-	texture rt0 target_width target_height PF_R8G8B8
-	//in 0 rt_renderwindow
-	in 0 demo_dynamic_cubemap
+	//texture rt0 target_width target_height PF_R8G8B8
+	in 0 rt_renderwindow
+	in 1 demo_dynamic_cubemap
 
-	target rt0
+	target rt_renderwindow
 	{
 		pass clear
 		{
@@ -796,7 +853,7 @@
 			//exposing is to ensure compatibility with Vulkan & D3D12.
 			expose demo_dynamic_cubemap
 
-		//	shadows		Tutorial_DynamicCubemapShadowNode
+			shadows		DynamicCubemapShadowNode
 			overlays	off
 			rq_first	0
 			rq_last		2
@@ -816,16 +873,16 @@
 			rq_first	2
 		}
 	}
-	out 0 rt0
+//	out 0 rt0
 }
 
 compositor_node DynamicCubemapRenderingSkyboxNode8
 {
-	texture rt0 target_width target_height PF_R8G8B8
-	//in 0 rt_renderwindow
-	in 0 demo_dynamic_cubemap
+	//texture rt0 target_width target_height PF_R8G8B8
+	in 0 rt_renderwindow
+	in 1 demo_dynamic_cubemap
 
-	target rt0
+	target rt_renderwindow
 	{
 		pass clear
 		{
@@ -840,7 +897,7 @@
 			//exposing is to ensure compatibility with Vulkan & D3D12.
 			expose demo_dynamic_cubemap
 
-		//	shadows		Tutorial_DynamicCubemapShadowNode
+			shadows		DynamicCubemapShadowNode
 			overlays	off
 			rq_first	0
 			rq_last		2
@@ -860,7 +917,7 @@
 			rq_first	2
 		}
 	}
-	out 0 rt0
+//	out 0 rt0
 }
 
 compositor_node SkyboxNode0
@@ -1229,16 +1286,12 @@
 //	connect_output DefaultFinalComposition 1
 //	connect_output SkyboxNode0 0
 
+	//Render Window on channel #0
 	connect_external 0 DynamicCubemapRenderingSkyboxNode0 0
-
-        connect DynamicCubemapRenderingSkyboxNode0 0 SmaaNode 0
-	connect SkyboxSMAA_RenderingNode 1 SmaaNode 1
-
-	connect SmaaNode 0 DefaultFinalComposition 0
-	connect_output DefaultFinalComposition 1
-
-
-	//connect SmaaNode 0 FinalComposition 1
+	//Cubemap on channel #1
+	connect_external 1 DynamicCubemapRenderingSkyboxNode0 1
+//	connect DynamicCubemapRenderingSkyboxNode0 0 DefaultFinalComposition 0
+//	connect_output DefaultFinalComposition 1
 }
 
 workspace SkyboxWorkspace1
@@ -1250,18 +1303,18 @@
 	connect_external 0 DynamicCubemapRenderingSkyboxNode1 0
 	//Cubemap on channel #1
 	connect_external 1 DynamicCubemapRenderingSkyboxNode1 1
-	//connect DynamicCubemapRenderingSkyboxNode1 0 DefaultFinalComposition 0
-	//connect_output DefaultFinalComposition 1
+//	connect DynamicCubemapRenderingSkyboxNode1 0 DefaultFinalComposition 0
+//	connect_output DefaultFinalComposition 1
 }
 
 workspace SkyboxWorkspace2
 {
 	//Render Window on channel #0
-	//connect_external 0 DynamicCubemapRenderingSkyboxNode2 0
+	connect_external 0 DynamicCubemapRenderingSkyboxNode2 0
 	//Cubemap on channel #1
-	connect_external 0 DynamicCubemapRenderingSkyboxNode2 0
-	connect DynamicCubemapRenderingSkyboxNode2 0 DefaultFinalComposition 0
-	connect_output DefaultFinalComposition 1
+	connect_external 1 DynamicCubemapRenderingSkyboxNode2 1
+//	connect DynamicCubemapRenderingSkyboxNode2 0 DefaultFinalComposition 0
+//	connect_output DefaultFinalComposition 1
 }
 
 workspace SkyboxWorkspace3
@@ -1269,9 +1322,12 @@
 //	connect SkyboxNode3 0 DefaultFinalComposition 0
 //	connect_output DefaultFinalComposition 1
 
+	//Render Window on channel #0
 	connect_external 0 DynamicCubemapRenderingSkyboxNode3 0
-	connect DynamicCubemapRenderingSkyboxNode3 0 DefaultFinalComposition 0
-	connect_output DefaultFinalComposition 1
+	//Cubemap on channel #1
+	connect_external 1 DynamicCubemapRenderingSkyboxNode3 1
+//	connect DynamicCubemapRenderingSkyboxNode3 0 DefaultFinalComposition 0
+//	connect_output DefaultFinalComposition 1
 }
 
 workspace SkyboxWorkspace4
@@ -1279,9 +1335,12 @@
 //	connect SkyboxNode4 0 DefaultFinalComposition 0
 //	connect_output DefaultFinalComposition 1
 
+	//Render Window on channel #0
 	connect_external 0 DynamicCubemapRenderingSkyboxNode4 0
-	connect DynamicCubemapRenderingSkyboxNode4 0 DefaultFinalComposition 0
-	connect_output DefaultFinalComposition 1
+	//Cubemap on channel #1
+	connect_external 1 DynamicCubemapRenderingSkyboxNode4 1
+//	connect DynamicCubemapRenderingSkyboxNode4 0 DefaultFinalComposition 0
+//	connect_output DefaultFinalComposition 1
 }
 
 workspace SkyboxWorkspace5
@@ -1289,9 +1348,12 @@
 //	connect SkyboxNode5 0 DefaultFinalComposition 0
 //	connect_output DefaultFinalComposition 1
 
+	//Render Window on channel #0
 	connect_external 0 DynamicCubemapRenderingSkyboxNode5 0
-	connect DynamicCubemapRenderingSkyboxNode5 0 DefaultFinalComposition 0
-	connect_output DefaultFinalComposition 1
+	//Cubemap on channel #1
+	connect_external 1 DynamicCubemapRenderingSkyboxNode5 1
+//	connect DynamicCubemapRenderingSkyboxNode5 0 DefaultFinalComposition 0
+//	connect_output DefaultFinalComposition 1
 }
 
 workspace SkyboxWorkspace6
@@ -1299,9 +1361,12 @@
 //	connect SkyboxNode6 0 DefaultFinalComposition 0
 //	connect_output DefaultFinalComposition 1
 
+	//Render Window on channel #0
 	connect_external 0 DynamicCubemapRenderingSkyboxNode6 0
-	connect DynamicCubemapRenderingSkyboxNode6 0 DefaultFinalComposition 0
-	connect_output DefaultFinalComposition 1
+	//Cubemap on channel #1
+	connect_external 1 DynamicCubemapRenderingSkyboxNode6 1
+//	connect DynamicCubemapRenderingSkyboxNode6 0 DefaultFinalComposition 0
+//	connect_output DefaultFinalComposition 1
 }
 
 workspace SkyboxWorkspace7
@@ -1309,9 +1374,12 @@
 //	connect SkyboxNode7 0 DefaultFinalComposition 0
 //	connect_output DefaultFinalComposition 1
 
+	//Render Window on channel #0
 	connect_external 0 DynamicCubemapRenderingSkyboxNode7 0
-	connect DynamicCubemapRenderingSkyboxNode7 0 DefaultFinalComposition 0
-	connect_output DefaultFinalComposition 1
+	//Cubemap on channel #1
+	connect_external 1 DynamicCubemapRenderingSkyboxNode7 1
+//	connect DynamicCubemapRenderingSkyboxNode7 0 DefaultFinalComposition 0
+//	connect_output DefaultFinalComposition 1
 }
 
 workspace SkyboxWorkspace8
@@ -1319,7 +1387,10 @@
 //	connect SkyboxNode8 0 DefaultFinalComposition 0
 //	connect_output DefaultFinalComposition 1
 
+	//Render Window on channel #0
 	connect_external 0 DynamicCubemapRenderingSkyboxNode8 0
-	connect DynamicCubemapRenderingSkyboxNode8 0 DefaultFinalComposition 0
-	connect_output DefaultFinalComposition 1
+	//Cubemap on channel #1
+	connect_external 1 DynamicCubemapRenderingSkyboxNode8 1
+//	connect DynamicCubemapRenderingSkyboxNode8 0 DefaultFinalComposition 0
+//	connect_output DefaultFinalComposition 1
 }