fix post process output for deferred & update screenshots

vilbeyli · May 31, 2019 · 0801a40 · 0801a40
1 parent b655c7a
commit 0801a40
Show file tree

Hide file tree

Showing 15 changed files with 40 additions and 36 deletions.
diff --git a/Data/EngineSettings.ini b/Data/EngineSettings.ini
@@ -2,8 +2,8 @@
 log true    true
 
 // widt, height,  fullscreen? vsync?
-window 1920 1080      0       0
-//window 2560 1440      0       0
+//window 1920 1080      0       0
+window 2560 1440      0       0
 
 
 // GRAPHICS SETTINGS (TODO: Presets)

diff --git a/Data/ScenesFiles/Sponza.scn b/Data/ScenesFiles/Sponza.scn
@@ -52,7 +52,7 @@ light begin
 	color sun
 	brightness 6.2
 	shadows true 0.001  1 2000 
-	directional 1024 1200
+	directional 768 1200
 light end
 
 // POINT LIGHTS
@@ -90,16 +90,16 @@ light end
 //	range 125
 //light end
 
-//light begin
-//	type point
-////	transform 115.43  114.62  5.28    0 0 0   0.1
-//	transform -124.63  30.66  40.12    0 0 0   0.1
-//
-//	color white
-//	brightness 2800
-//	shadows true 0.0005
-//	range 350
-//light end
+light begin
+	type point
+//	transform 115.43  114.62  5.28    0 0 0   0.1
+	transform -124.63  30.66  40.12    0 0 0   0.1
+
+	color white
+	brightness 2800
+	shadows true 0.0005
+	range 350
+light end
 //
 //light begin
 //	type point
@@ -112,15 +112,15 @@ light end
 //light end
 // 
 // 
-//light begin
-//	type point
-//	transform 94.62  29.57  -25.91     0 0 0   0.2
-//	
-//	color sun
-//	brightness 3800
-//	shadows true 0.0005
-//	range 350
-//light end
+light begin
+	type point
+	transform 94.62  29.57  -25.91     0 0 0   0.2
+
+	color sun
+	brightness 3800
+	shadows true 0.0005
+	range 350
+light end
 //
 //light begin
 //	type point
@@ -135,15 +135,15 @@ light end
 
 
 
-//light begin
-//	type spot
-//	transform -138.39  150.60  2.75    0 -90 50    0
-//	color white
-//	brightness 2850
-//	shadows true 0.00000009 0.01
-//	spot 80 1
-//	range 500
-//light end
+light begin
+	type spot
+	transform -138.39  150.60  2.75    0 -90 50    0
+	color white
+	brightness 2850
+	shadows true 0.00000009 0.01
+	spot 80 1
+	range 500
+light end
 
 light begin
 	type spot

diff --git a/Data/ScenesFiles/StressTestScene.scn b/Data/ScenesFiles/StressTestScene.scn
@@ -148,12 +148,15 @@ light end
 
 object begin
 	mesh cube
-	transform 0 -10 0 0 0 0 1200 5 700
+	transform 0 -5 0 0 0 0 1200 5 700
+	//pbr cgbookcase/blue-green-hexagonal-tiles-01
 	brdf
-		diffuse 0.4 0.35 0.4
-		tiling 10
-		roughness 0.6
+		//diffuse 1 1 1
+		diffuse 0.02 0.02 0.05
+		tiling 1.4
+		roughness 0.8
 		metalness 0
+		emissiveMap Black_herringbone_tiles_01_2K_Emissive.png
 	brdf
 object end
 

diff --git a/Screenshots/9.PNG b/Screenshots/9.PNG
diff --git a/Screenshots/archive.zip b/Screenshots/archive.zip
diff --git a/Screenshots/debug.PNG b/Screenshots/debug.PNG
diff --git a/Screenshots/lod1.PNG b/Screenshots/lod1.PNG
diff --git a/Screenshots/matballs4.PNG b/Screenshots/matballs4.PNG
diff --git a/Screenshots/matballs5.PNG b/Screenshots/matballs5.PNG
diff --git a/Screenshots/models.PNG b/Screenshots/models.PNG
diff --git a/Screenshots/nanosuit.PNG b/Screenshots/nanosuit.PNG
diff --git a/Screenshots/pbr0.PNG b/Screenshots/pbr0.PNG
diff --git a/Screenshots/pbr1.PNG b/Screenshots/pbr1.PNG
diff --git a/Source/Engine/GameObject.h b/Source/Engine/GameObject.h
@@ -43,6 +43,7 @@ class GameObject
 // the members are references to data either in Scene or Renderer.
 //
 public:
+	~GameObject() { mpScene = nullptr; }
 	void RenderTransparent(Renderer* pRenderer, const SceneView& sceneView, bool UploadMaterialDataToGPU, const MaterialPool& materialBuffer) const;
 	void Clear();
 

diff --git a/Source/RenderPasses/Source/RenderPasses.cpp b/Source/RenderPasses/Source/RenderPasses.cpp
@@ -126,7 +126,7 @@ void PostProcessPass::Render(Renderer* pRenderer, bool bBloomOn, TextureID input
 	pRenderer->SetTexture("ColorTexture", toneMappingInputTex);
 
 	// quick hack for outputting white texture for fullscreen AO debugging
-	pRenderer->SetConstant1i("isSingleChannel", toneMappingInputTex != -1 ? 1 : 0);
+	pRenderer->SetConstant1i("isSingleChannel", toneMappingInputTex == -1 ? 1 : 0);
 	// quick hack for outputting white texture for fullscreen AO debugging
 
 	pRenderer->Apply();