remove debugging renderstate

diff --git a/shaders/fbo_frag.glsl b/shaders/fbo_frag.glsl
index f92483e3b55227d27f277a63edf9770e69e8d605..8ffc0ce64cd5565fc5d4911cecaa7f55e5e76416 100644 (file)
--- a/shaders/fbo_frag.glsl
+++ b/shaders/fbo_frag.glsl
@@ -13,24 +13,16 @@ uniform vec3 sampleWeights[13];
 \r
 void main()\r
 {\r
 \r
 void main()\r
 {\r

-    if (renderState == 0) {\r
-        FragColor = texture(shadowmapTexture, TexCoords);\r
-    }\r
-    else if (renderState == 1) {\r
-        FragColor = texture(irradianceTexture, TexCoords);\r
-    }\r
-    else if (renderState == 2) {\r
-        // sample calculated irradiance\r
-        // using Gaussian kernel to approximate light spread\r
-        vec4 result = vec4(0, 0, 0, 1);\r
-        for (int i = 0; i < 13; i++) {\r
-            vec2 sampleCoords = TexCoords + samplePositions[i] * vec2(1.0/screenWidth, 1.0/screenHeight);\r
-            //vec4 sample = texture(irradianceTexture, sampleCoords)\r
-            //            * texture(shadowmapTexture, sampleCoords);\r
-            vec4 sample = texture(irradianceTexture, sampleCoords);\r
-            vec4 weight = vec4(sampleWeights[i], 1);\r
-            result += sample * weight;\r
-        }\r
-        FragColor = result;\r
+    // sample calculated irradiance\r
+    // using Gaussian kernel to approximate light spread\r
+    vec4 result = vec4(0, 0, 0, 1);\r
+    for (int i = 0; i < 13; i++) {\r
+        vec2 sampleCoords = TexCoords + samplePositions[i] * vec2(1.0/screenWidth, 1.0/screenHeight);\r
+        //vec4 sample = texture(irradianceTexture, sampleCoords)\r
+        //            * texture(shadowmapTexture, sampleCoords);\r
+        vec4 sample = texture(irradianceTexture, sampleCoords);\r
+        vec4 weight = vec4(sampleWeights[i], 1);\r
+        result += sample * weight;\r

     }\r
     }\r

+    FragColor = result;\r

 }\r
 }\r

diff --git a/shaders/frag_irradiance.glsl b/shaders/frag_irradiance.glsl
index b985acfcb50c21bf7bb33feacf06bd934f5d4f25..2a7edec2f333696d2227f8f5a11458f2087e9de9 100644 (file)
--- a/shaders/frag_irradiance.glsl
+++ b/shaders/frag_irradiance.glsl
@@ -40,14 +40,12 @@ void main()
   // thickness\r
   float distanceToBackside = length(FragPos - Backside);\r
 \r
   // thickness\r
   float distanceToBackside = length(FragPos - Backside);\r
 \r

-  if (renderState == 2) {\r
-    if (distanceToBackside != 0) {\r
-      // add translucency by amplifying color inverse to the thickness\r
-      // (1 - diff) is part of the irradiance term,\r
-      // if the light hits the object straight at 90°\r
-      // most light is received\r
-      result += objectColor * pow(powBase, powFactor / pow(distanceToBackside, 0.6)) * transmittanceScale * (1 - diff);\r
-    }\r
+  if (distanceToBackside != 0) {\r
+    // add translucency by amplifying color inverse to the thickness\r
+    // (1 - diff) is part of the irradiance term,\r
+    // if the light hits the object straight at 90°\r
+    // most light is received\r
+    result += objectColor * pow(powBase, powFactor / pow(distanceToBackside, 0.6)) * transmittanceScale * (1 - diff);\r

   }\r
     \r
   FragColor = vec4(result, 1.0f);\r
   }\r
     \r
   FragColor = vec4(result, 1.0f);\r

diff --git a/src/main.cpp b/src/main.cpp
index 168d01d3b42fc66280504c93cf42de742c155fb8..4f18e104f3e63e803f2584b47093776bfa807201 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -616,7 +616,6 @@ int main() {
     ImGui::Begin("Options");\r
     ImGui::Checkbox("Wireframe", &options.wireframe);\r
     ImGui::Checkbox("Free Cam", &options.freecam);\r
     ImGui::Begin("Options");\r
     ImGui::Checkbox("Wireframe", &options.wireframe);\r
     ImGui::Checkbox("Free Cam", &options.freecam);\r

-    ImGui::InputInt("Render State", &options.renderState);\r

     ImGui::DragFloat3("Color", options.color, 0.01, 0, 1);\r
     ImGui::DragFloat("Transmittance Scale", &options.transmittanceScale, 0.0001f, 0, 0.3);\r
     ImGui::DragFloat3("Light Pos", glm::value_ptr(options.lightPos), 0.01, -5, 5);\r
     ImGui::DragFloat3("Color", options.color, 0.01, 0, 1);\r
     ImGui::DragFloat("Transmittance Scale", &options.transmittanceScale, 0.0001f, 0, 0.3);\r
     ImGui::DragFloat3("Light Pos", glm::value_ptr(options.lightPos), 0.01, -5, 5);\r

diff --git a/src/main2.cpp b/src/main2.cpp
index 5d717e66990821c981347cb5f5ea152c19cffa57..c30fb9e1ef2e6ee722a682ea10bb715c599ec9b6 100644 (file)
--- a/src/main2.cpp
+++ b/src/main2.cpp
@@ -579,7 +579,6 @@ int main() {
     ImGui::Begin("Options");\r
     ImGui::Checkbox("Wireframe", &options.wireframe);\r
     ImGui::Checkbox("Free Cam", &options.freecam);\r
     ImGui::Begin("Options");\r
     ImGui::Checkbox("Wireframe", &options.wireframe);\r
     ImGui::Checkbox("Free Cam", &options.freecam);\r

-    ImGui::InputInt("Render State", &options.renderState);\r

     ImGui::DragFloat3("Color", options.color, 0.01, 0, 1);\r
     ImGui::DragFloat("Transmittance Scale", &options.transmittanceScale, 0.0001f, 0, 0.3);\r
     ImGui::DragFloat("Pow Base", &options.powBase, 0.01f, 0, 4);\r
     ImGui::DragFloat3("Color", options.color, 0.01, 0, 1);\r
     ImGui::DragFloat("Transmittance Scale", &options.transmittanceScale, 0.0001f, 0, 0.3);\r
     ImGui::DragFloat("Pow Base", &options.powBase, 0.01f, 0, 4);\r