setup testScene_simple; fixed proper skipping of probe manager suppor…

…t; removed unused files from content
steaklive · Mar 6, 2022 · 738e1eb · 738e1eb
1 parent bd27bf3
commit 738e1eb
Show file tree

Hide file tree

Showing 18 changed files with 397 additions and 877 deletions.
diff --git a/bin/x64/Release/EveryRay - Rendering Engine.exe b/bin/x64/Release/EveryRay - Rendering Engine.exe
diff --git a/bin/x64/Release/EveryRay - Rendering Engine.pdb b/bin/x64/Release/EveryRay - Rendering Engine.pdb
diff --git a/bin/x64/Release/imgui.ini b/bin/x64/Release/imgui.ini
@@ -74,8 +74,8 @@ Size=239,95
 Collapsed=0
 
 [Window][EveryRay - Rendering Engine: Configuration]
-Pos=1,3
-Size=422,209
+Pos=2,4
+Size=423,216
 Collapsed=0
 
 [Window][Physically Based Rendering - Demo]
@@ -239,7 +239,7 @@ Size=454,191
 Collapsed=0
 
 [Window][Scene Editor]
-Pos=8,622
+Pos=8,621
 Size=424,433
 Collapsed=0
 
@@ -339,7 +339,7 @@ Size=170,100
 Collapsed=0
 
 [Window][Illumination System]
-Pos=7,243
+Pos=3,223
 Size=425,375
 Collapsed=0
 
diff --git a/content/levels/global_scenes_config.json b/content/levels/global_scenes_config.json
@@ -9,10 +9,14 @@
 			"scene_name" : "testScene_simple",
 			"scene_path" : "content\\levels\\testScene_simple\\"
 		},
+		{
+			"scene_name" : "sponzaScene",
+			"scene_path" : "content\\levels\\sponzaScene\\"
+		},
 		{
 			"scene_name" : "terrainScene",
 			"scene_path" : "content\\levels\\terrainScene\\"
 		}
 	],
-	"startup_scene" : "testScene"
+	"startup_scene" : "testScene_simple"
 }
diff --git a/content/levels/sponzaScene/diffuse_probes/empty.file b/content/levels/sponzaScene/diffuse_probes/empty.file
@@ -0,0 +1 @@
+TEST
diff --git a/content/levels/sponzaScene/specular_probes/empty.file b/content/levels/sponzaScene/specular_probes/empty.file
@@ -0,0 +1 @@
+TEST
diff --git a/content/levels/sponzaScene/sponzaScene.json b/content/levels/sponzaScene/sponzaScene.json
@@ -0,0 +1,302 @@
+{
+	"ambient_color" : 
+	[
+		0.67000000000000004,
+		0.66000000000000003,
+		0.57999999999999996
+	],
+	"camera_direction" : 
+	[
+		0.0,
+		0.0,
+		-1.0
+	],
+	"camera_position" : 
+	[
+		0.0,
+		10.0,
+		35.0
+	],
+	"rendering_objects" : 
+	[
+		{
+			"instanced" : false,
+			"materials" : 
+			[
+				{
+					"effect" : "content\\effects\\DepthMap.fx",
+					"name" : "DepthMapMaterial",
+					"technique" : "create_depthmap_w_render_target"
+				},
+				{
+					"effect" : "content\\effects\\DeferredPrepass.fx",
+					"name" : "DeferredMaterial",
+					"technique" : "deferred"
+				}
+			],
+			"model_path" : "content\\models\\default_plane\\default_plane.fbx",
+			"name" : "Ground Plane",
+			"transform" : 
+			[
+				1.0,
+				0.0,
+				0.0,
+				0.0,
+				0.0,
+				1.0,
+				0.0,
+				0.0,
+				0.0,
+				0.0,
+				1.0,
+				0.0,
+				0.0,
+				0.0,
+				0.0,
+				1.0
+			]
+		},
+		{
+			"instanced" : false,
+			"materials" : 
+			[
+				{
+					"effect" : "content\\effects\\DepthMap.fx",
+					"name" : "DepthMapMaterial",
+					"technique" : "create_depthmap_w_render_target"
+				},
+				{
+					"effect" : "content\\effects\\DeferredPrepass.fx",
+					"name" : "DeferredMaterial",
+					"technique" : "deferred"
+				},
+				{
+					"effect" : "content\\effects\\VoxelizationGI.fx",
+					"name" : "VoxelizationGIMaterial",
+					"technique" : "voxelizationGI"
+				}
+			],
+			"model_path" : "content\\models\\bunny\\bunny.fbx",
+			"name" : "Bunny Blue",
+			"textures" : 
+			[
+				{
+					"albedo" : "content\\textures\\colors\\blue.png"
+				}
+			],
+			"transform" : 
+			[
+				11.437989234924316,
+				0.0,
+				4.9632878303527832,
+				-8.6595258712768555,
+				0.0,
+				12.468400001525879,
+				0.0,
+				7.688323974609375,
+				-4.9632878303527832,
+				0.0,
+				11.437989234924316,
+				-13.816640853881836,
+				0.0,
+				0.0,
+				0.0,
+				1.0
+			]
+		},
+		{
+			"instanced" : false,
+			"materials" : 
+			[
+				{
+					"effect" : "content\\effects\\DepthMap.fx",
+					"name" : "DepthMapMaterial",
+					"technique" : "create_depthmap_w_render_target"
+				},
+				{
+					"effect" : "content\\effects\\DeferredPrepass.fx",
+					"name" : "DeferredMaterial",
+					"technique" : "deferred"
+				},
+				{
+					"effect" : "content\\effects\\VoxelizationGI.fx",
+					"name" : "VoxelizationGIMaterial",
+					"technique" : "voxelizationGI"
+				}
+			],
+			"model_path" : "content\\models\\cube.fbx",
+			"name" : "Simple cube Orange",
+			"textures" : 
+			[
+				{
+					"albedo" : "content\\textures\\colors\\orange.png"
+				}
+			],
+			"transform" : 
+			[
+				2.0185890197753906,
+				0.016205744817852974,
+				12.246352195739746,
+				16.146291732788086,
+				-1.451682448387146,
+				0.022534362971782684,
+				17.02876091003418,
+				4.5598549842834473,
+				0.0,
+				-2.486248254776001,
+				0.23416547477245331,
+				-0.14806365966796875,
+				0.0,
+				0.0,
+				0.0,
+				1.0
+			]
+		},
+		{
+			"instanced" : false,
+			"materials" : 
+			[
+				{
+					"effect" : "content\\effects\\DepthMap.fx",
+					"name" : "DepthMapMaterial",
+					"technique" : "create_depthmap_w_render_target"
+				},
+				{
+					"effect" : "content\\effects\\DeferredPrepass.fx",
+					"name" : "DeferredMaterial",
+					"technique" : "deferred"
+				},
+				{
+					"effect" : "content\\effects\\VoxelizationGI.fx",
+					"name" : "VoxelizationGIMaterial",
+					"technique" : "voxelizationGI"
+				}
+			],
+			"model_path" : "content\\models\\sphere.fbx",
+			"name" : "Simple sphere Green",
+			"textures" : 
+			[
+				{
+					"albedo" : "content\\textures\\colors\\green.png"
+				}
+			],
+			"transform" : 
+			[
+				1.5,
+				0.0,
+				0.0,
+				-21.070217132568359,
+				0.0,
+				1.5,
+				0.0,
+				-1.0466251373291016,
+				0.0,
+				0.0,
+				1.5,
+				7.2084488868713379,
+				0.0,
+				0.0,
+				0.0,
+				1.0
+			]
+		},
+		{
+			"instanced" : false,
+			"materials" : 
+			[
+				{
+					"effect" : "content\\effects\\DepthMap.fx",
+					"name" : "DepthMapMaterial",
+					"technique" : "create_depthmap_w_render_target"
+				},
+				{
+					"effect" : "content\\effects\\DeferredPrepass.fx",
+					"name" : "DeferredMaterial",
+					"technique" : "deferred"
+				},
+				{
+					"effect" : "content\\effects\\VoxelizationGI.fx",
+					"name" : "VoxelizationGIMaterial",
+					"technique" : "voxelizationGI"
+				}
+			],
+			"model_path" : "content\\models\\sphere.fbx",
+			"name" : "Simple sphere Pink",
+			"transform" : 
+			[
+				1.4175000190734863,
+				0.0,
+				0.0,
+				11.084320068359375,
+				0.0,
+				1.4175000190734863,
+				0.0,
+				4.429649829864502,
+				0.0,
+				0.0,
+				1.4175000190734863,
+				-14.302750587463379,
+				0.0,
+				0.0,
+				0.0,
+				1.0
+			]
+		},
+		{
+			"instanced" : false,
+			"materials" : 
+			[
+				{
+					"effect" : "content\\effects\\DepthMap.fx",
+					"name" : "DepthMapMaterial",
+					"technique" : "create_depthmap_w_render_target"
+				},
+				{
+					"effect" : "content\\effects\\DeferredPrepass.fx",
+					"name" : "DeferredMaterial",
+					"technique" : "deferred"
+				},
+				{
+					"effect" : "content\\effects\\VoxelizationGI.fx",
+					"name" : "VoxelizationGIMaterial",
+					"technique" : "voxelizationGI"
+				}
+			],
+			"model_path" : "content\\models\\sphere.fbx",
+			"name" : "Dynamic sphere",
+			"textures" : 
+			[
+				{
+					"albedo" : "content\\textures\\colors\\white.png"
+				}
+			],
+			"transform" : 
+			[
+				0.65205007791519165,
+				0.0,
+				0.0,
+				24.622383117675781,
+				0.0,
+				0.65205007791519165,
+				0.0,
+				0.78330302238464355,
+				0.0,
+				0.0,
+				0.65205007791519165,
+				6.8373608589172363,
+				0.0,
+				0.0,
+				0.0,
+				1.0
+			]
+		}
+	],
+	"skybox_path" : "content\\textures\\skyboxes\\Sky_5\\textureEnvHDR.dds",
+	"sun_color" : 
+	[
+		1.0,
+		0.94999999999999996,
+		0.94999999999999996
+	],
+	"sun_direction" : []
+}
diff --git a/content/levels/testScene/testScene.json b/content/levels/testScene/testScene.json
@@ -47,11 +47,6 @@
 					"name" : "DeferredMaterial",
 					"technique" : "deferred"
 				},
-				{
-					"effect" : "content\\effects\\VoxelizationGI.fx",
-					"name" : "VoxelizationGIMaterial",
-					"technique" : "voxelizationGI"
-				},
 				{
 					"effect" : "content\\effects\\StandardLighting.fx",
 					"name" : "StandardLightingForProbeMaterial",