-ui cleanup

neuroprod · Dec 11, 2023 · 72d2e09 · 72d2e09
1 parent c1ad9a7
commit 72d2e09
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 12 deletions.
diff --git a/frontend/public/textures/pineLeaves_AC_Color.png b/frontend/public/textures/pineLeaves_AC_Color.png
diff --git a/frontend/public/textures/pineLeaves_AC_MRA.png b/frontend/public/textures/pineLeaves_AC_MRA.png
diff --git a/frontend/public/textures/pineLeaves_AC_Normal.png b/frontend/public/textures/pineLeaves_AC_Normal.png
diff --git a/frontend/src/Main.ts b/frontend/src/Main.ts
@@ -317,18 +317,23 @@ export default class Main {
 
 
 
-        UI.pushWindow("Performance")
+       /* UI.pushWindow("Performance")
         if (!this.renderer.useTimeStampQuery) UI.LText("Enable by running Chrome with: --enable-dawn-features=allow_unsafe_apis", "", true)
         this.timeStampQuery.onUI();
-        UI.popWindow()
-
+        UI.popWindow()*/
+        UI.pushWindow("Light")
             this.lightRoomPass.onUI();
             this.lightOutsidePass.onUI(this.shadowPass.camera.viewProjection);
             this.shadowPass.onUI()
-
+        UI.popWindow()
 
 
         UI.pushWindow("Render Setting")
+        UI.pushGroup("Performance");
+        if (!this.renderer.useTimeStampQuery) UI.LText("Enable by running Chrome with: --enable-dawn-features=allow_unsafe_apis", "", true)
+        this.timeStampQuery.onUI();
+        UI.popGroup()
+
         this.canvasRenderPass.onUI();
         UI.pushGroup("AO");
         this.aoPass.onUI();

diff --git a/frontend/src/renderPasses/LightOutsideRenderPass.ts b/frontend/src/renderPasses/LightOutsideRenderPass.ts
@@ -120,7 +120,7 @@ export default class LightOutsideRenderPass extends RenderPass  {
 
 
     onUI(matrix:Matrix4) {
-        UI.pushWindow("Light Outside")
+        UI.pushGroup("Light Outside")
 
         UI.separator("Sun Light")
         UI.LVector("dir",this.sunDir,true);
@@ -166,7 +166,7 @@ export default class LightOutsideRenderPass extends RenderPass  {
         this.globalLightMaterial.uniforms.setUniform("pointlightColor",this.lightColor);
         this.globalLightMaterial.uniforms.setUniform("pointlightPos",this.lightGrave.getWorldPos());
 
-        UI.popWindow()
+        UI.popGroup()
     }
 
     onSettingsChange() {

diff --git a/frontend/src/renderPasses/LightRoomRenderPass.ts b/frontend/src/renderPasses/LightRoomRenderPass.ts
@@ -124,7 +124,7 @@ export default class LightRoomRenderPass extends RenderPass {
 
 
     onUI() {
-        UI.pushWindow("Light Room")
+        UI.pushGroup("Light Inside")
         for (let p of this.lights) {
             p.update()
         }
@@ -194,8 +194,8 @@ export default class LightRoomRenderPass extends RenderPass {
             }
 
         }
+UI.popGroup()
 
-        UI.popWindow()
     }
 
     draw() {

diff --git a/frontend/src/renderPasses/ShadowPass.ts b/frontend/src/renderPasses/ShadowPass.ts
@@ -82,9 +82,9 @@ export default class ShadowPass extends RenderPass {
     }
     onUI()
     {
-        UI.pushWindow("shadowCam");
+        UI.pushGroup("shadowCam");
 this.camera.onUI();
-        UI.popWindow();
+        UI.popGroup();
     }
     draw() {
 

diff --git a/frontend/src/shaders/GBufferShader.ts b/frontend/src/shaders/GBufferShader.ts
@@ -70,7 +70,7 @@ fn mainFragment(@location(0) uv0: vec2f,@location(1) normal: vec3f,@location(2)
 {
   var output : GBufferOutput;
     output.color = textureSample(colorTexture, mySampler,  uv0);
-    if(output.color.w<0.9){discard;}
+    if(output.color.w<0.5){discard;}
   
  
     var normalText = textureSample(normalTexture, mySampler,  uv0).xyz* 2. - 1.;

diff --git a/frontend/src/shaders/GlobalLightOutsideShader.ts b/frontend/src/shaders/GlobalLightOutsideShader.ts
@@ -159,7 +159,7 @@ fn mainFragment(@location(0)  uv0: vec2f) -> @location(0) vec4f
   for (var y = -1; y <= 1; y++) {
     for (var x = -1; x <= 1; x++) {
       let offset = vec2<f32>(vec2i(x, y)) * oneOverShadowDepthTextureSize;
-    shadowVal += textureSampleCompare(shadow, mySamplerComp, shadowUV+offset, shadowProjN.z-0.007);
+    shadowVal += textureSampleCompare(shadow, mySamplerComp, shadowUV+offset, shadowProjN.z-0.004);
   }
   }
   shadowVal/=9.0;