Gloom: Cleanup

Reorganized/named shaders.
skyjake · Sep 1, 2019 · 264d0a3 · 264d0a3
1 parent 61b0da6
commit 264d0a3
Show file tree

Hide file tree

Showing 18 changed files with 44 additions and 37 deletions.
diff --git a/doomsday/tests/test_gloom/gloom/render/entityrender.cpp b/doomsday/tests/test_gloom/gloom/render/entityrender.cpp
@@ -91,16 +91,16 @@ DENG2_PIMPL(EntityRender)
             idx++;
         }
 
-        GloomApp::shaders().build(program, "gloom.entity")
+        GloomApp::shaders().build(program, "gloom.entity.material")
             << context.view.uMvpMatrix
             << context.view.uWorldToViewRotate
             << context.uAtlas;
 
-        GloomApp::shaders().build(dirShadowProgram, "gloom.shadow.entity")
+        GloomApp::shaders().build(dirShadowProgram, "gloom.entity.shadow.dir")
             << context.uLightMatrix
             << context.uAtlas;
 
-        GloomApp::shaders().build(omniShadowProgram, "gloom.shadow_cube.entity")
+        GloomApp::shaders().build(omniShadowProgram, "gloom.entity.shadow.omni")
             << context.uLightOrigin
             << context.uLightFarPlane
             << context.uLightCubeMatrices

diff --git a/doomsday/tests/test_gloom/gloom/render/lightrender.cpp b/doomsday/tests/test_gloom/gloom/render/lightrender.cpp
@@ -116,12 +116,12 @@ DENG2_PIMPL(LightRender)
 
         auto &ctx = self().context();
 
-        ctx.shaders->build(stencilPassProgram, "gloom.lighting.stencil")
+        ctx.shaders->build(stencilPassProgram, "gloom.light.stencil")
                 << ctx.view.uMvpMatrix
                 << ctx.view.uModelViewMatrix
                 << ctx.view.uWorldToViewRotate;
 
-        ctx.shaders->build(shadingProgram, "gloom.lighting.sources")
+        ctx.shaders->build(shadingProgram, "gloom.light.sources")
                 << ctx.view.uMvpMatrix
                 << ctx.view.uModelViewMatrix
                 << ctx.view.uWorldToViewRotate
@@ -139,7 +139,7 @@ DENG2_PIMPL(LightRender)
                 << ctx.view.uViewToWorldRotate;
 
         giQuad.glInit(self().context());
-        ctx.shaders->build(giQuad.program(), "gloom.lighting.global")
+        ctx.shaders->build(giQuad.program(), "gloom.light.global")
                 << ctx.view.uInverseProjMatrix
                 << ctx.gbuffer->uGBufferAlbedo()
                 << ctx.gbuffer->uGBufferEmissive()

diff --git a/doomsday/tests/test_gloom/gloom/render/mapbuild.cpp b/doomsday/tests/test_gloom/gloom/render/mapbuild.cpp
@@ -163,13 +163,13 @@ DENG2_PIMPL_NOREF(MapBuild)
 
                 auto makeQuad = [this, &indices, &verts](const String &  frontTextureName,
                                                          const String &  backTextureName,
-                                                         const Vec3f &normal,
+                                                         const Vec3f &   normal,
                                                          const uint32_t *planeIndex,
                                                          uint32_t        flags,
-                                                         const Vec3f &p1,
-                                                         const Vec3f &p2,
-                                                         const Vec3f &p3,
-                                                         const Vec3f &p4,
+                                                         const Vec3f &   p1,
+                                                         const Vec3f &   p2,
+                                                         const Vec3f &   p3,
+                                                         const Vec3f &   p4,
                                                          float           length,
                                                          float           rotation) {
                     const Buffer::Index baseIndex = Buffer::Index(verts.size());
@@ -220,7 +220,7 @@ DENG2_PIMPL_NOREF(MapBuild)
                     const int      dir    = line.sectors[0] == sectorId? 1 : 0;
                     const ID       start  = line.points[dir^1];
                     const ID       end    = line.points[dir];
-                    const Vec3f normal = worldNormalVector(line);
+                    const Vec3f    normal = worldNormalVector(line);
                     const float    length = float((floor[end] - floor[start]).length());
                     const uint32_t planeIndex[2] = {planeMapper[map.floorPlaneId(sectorId)],
                                                     planeMapper[map.ceilingPlaneId(sectorId)]};

diff --git a/doomsday/tests/test_gloom/gloom/render/maprender.cpp b/doomsday/tests/test_gloom/gloom/render/maprender.cpp
@@ -122,18 +122,18 @@ DENG2_PIMPL(MapRender)
 
         surfaces.addBuffer(buf);
 
-        context.shaders->build(surfaces.program(), "gloom.surface")
+        context.shaders->build(surfaces.program(), "gloom.surface.material")
             << planes.var
             << uTexelsPerMeter
             << textureMetrics.var
             << texOffsets.var;
 
-        context.shaders->build(dirShadowProgram, "gloom.shadow.surface")
+        context.shaders->build(dirShadowProgram, "gloom.surface.shadow.dir")
             << planes.var
             << context.uLightMatrix
             << context.lights->uLightDir();
 
-        context.shaders->build(omniShadowProgram, "gloom.shadow_cube.surface")
+        context.shaders->build(omniShadowProgram, "gloom.surface.shadow.omni")
             << planes.var
             << context.uLightOrigin
             << context.uLightFarPlane

diff --git a/doomsday/tests/test_gloom/net.dengine.gloom.pack/shaders/entity.dei b/doomsday/tests/test_gloom/net.dengine.gloom.pack/shaders/entity.dei
@@ -1,4 +1,4 @@
-shader gloom.entity {
+shader gloom.entity.material {
     vertex = "
         #include 'common/bones.glsl'
 
@@ -41,7 +41,7 @@ shader gloom.entity {
         }"
 }
 
-shader gloom.shadow.entity {
+shader gloom.entity.shadow.dir {
     vertex = "
         #include 'common/bones.glsl'
 
@@ -71,7 +71,7 @@ shader gloom.shadow.entity {
         }"
 }
 
-shader gloom.shadow_cube.entity {
+shader gloom.entity.shadow.omni {
     vertex = "
         #include 'common/bones.glsl'
 

diff --git a/doomsday/tests/test_gloom/net.dengine.gloom.pack/shaders/gloom.dei b/doomsday/tests/test_gloom/net.dengine.gloom.pack/shaders/gloom.dei
@@ -1,38 +1,45 @@
 group gloom {
     shader sky            { path = "sky" }
-    shader surface        { path = "surface" }
-    shader shadow.surface { path = "shadow" }
 
-    shader shadow_cube.surface {
-        path.vertex   = "shadow_cube.vsh"
-        path.geometry = "common/cube_faces.gsh"
-        path.fragment = "shadow_cube.fsh"
+    group surface {
+        shader material { path = "surface_material" }
+        shader shadow.dir { path = "surface_shadow_dir" }
+        shader shadow.omni {
+            path.vertex   = "surface_shadow_omni.vsh"
+            path.geometry = "common/cube_faces.gsh"
+            path.fragment = "surface_shadow_omni.fsh"
+        }
+    }
+
+    group light {
+        shader global { path = "light_gi" }
+        shader stencil {
+            path.vertex = "light_sources.vsh"
+            fragment = "void main(void) {}"
+        }
+        shader sources {
+            path.vertex = "light_sources.vsh"
+            path.fragment = "light_sources.fsh"
+        }
     }
 
     group ssao {
-        shader sample { path = "ssao" }
+        shader sample {
+            path.vertex = "ssao.vsh"
+            path.fragment = "ssao_sample.fsh"
+        }
         shader denoise {
             path.vertex   = "ssao.vsh"
             path.fragment = "ssao_denoise.fsh"
         }
     }
 
-    group lighting {
-        shader global { path = "gi" }
-        shader stencil {
-            path.vertex = "lighting.vsh"
-            fragment = "void main(void) {}"
-        }
-        shader sources { path = "lighting" }
-    }
-
     group tonemap {
         shader exposure {
             path.vertex = "common/mvp_vertex_uv.vsh"
-            path.fragment = "tonemap.fsh"
+            path.fragment = "tonemap_exposure.fsh"
         }
-        shader sample {
-            path.vertex = "common/mvp_vertex_uv.vsh"
+        shader sample inherits exposure {
             path.fragment = "tonemap_sample.fsh"
         }
     }

diff --git a/...oom/net.dengine.gloom.pack/shaders/gi.fsh → ...t.dengine.gloom.pack/shaders/light_gi.fsh b/...oom/net.dengine.gloom.pack/shaders/gi.fsh → ...t.dengine.gloom.pack/shaders/light_gi.fsh
diff --git a/...oom/net.dengine.gloom.pack/shaders/gi.vsh → ...t.dengine.gloom.pack/shaders/light_gi.vsh b/...oom/net.dengine.gloom.pack/shaders/gi.vsh → ...t.dengine.gloom.pack/shaders/light_gi.vsh
diff --git a/...t.dengine.gloom.pack/shaders/lighting.fsh → ...gine.gloom.pack/shaders/light_sources.fsh b/...t.dengine.gloom.pack/shaders/lighting.fsh → ...gine.gloom.pack/shaders/light_sources.fsh
diff --git a/...t.dengine.gloom.pack/shaders/lighting.vsh → ...gine.gloom.pack/shaders/light_sources.vsh b/...t.dengine.gloom.pack/shaders/lighting.vsh → ...gine.gloom.pack/shaders/light_sources.vsh
diff --git a/...m/net.dengine.gloom.pack/shaders/ssao.fsh → ...engine.gloom.pack/shaders/ssao_sample.fsh b/...m/net.dengine.gloom.pack/shaders/ssao.fsh → ...engine.gloom.pack/shaders/ssao_sample.fsh
diff --git a/...et.dengine.gloom.pack/shaders/surface.fsh → ...e.gloom.pack/shaders/surface_material.fsh b/...et.dengine.gloom.pack/shaders/surface.fsh → ...e.gloom.pack/shaders/surface_material.fsh
diff --git a/...et.dengine.gloom.pack/shaders/surface.vsh → ...e.gloom.pack/shaders/surface_material.vsh b/...et.dengine.gloom.pack/shaders/surface.vsh → ...e.gloom.pack/shaders/surface_material.vsh
diff --git a/...net.dengine.gloom.pack/shaders/shadow.fsh → ...gloom.pack/shaders/surface_shadow_dir.fsh b/...net.dengine.gloom.pack/shaders/shadow.fsh → ...gloom.pack/shaders/surface_shadow_dir.fsh
diff --git a/...net.dengine.gloom.pack/shaders/shadow.vsh → ...gloom.pack/shaders/surface_shadow_dir.vsh b/...net.dengine.gloom.pack/shaders/shadow.vsh → ...gloom.pack/shaders/surface_shadow_dir.vsh
diff --git a/...engine.gloom.pack/shaders/shadow_cube.fsh → ...loom.pack/shaders/surface_shadow_omni.fsh b/...engine.gloom.pack/shaders/shadow_cube.fsh → ...loom.pack/shaders/surface_shadow_omni.fsh
diff --git a/...engine.gloom.pack/shaders/shadow_cube.vsh → ...loom.pack/shaders/surface_shadow_omni.vsh b/...engine.gloom.pack/shaders/shadow_cube.vsh → ...loom.pack/shaders/surface_shadow_omni.vsh
diff --git a/...et.dengine.gloom.pack/shaders/tonemap.fsh → ...e.gloom.pack/shaders/tonemap_exposure.fsh b/...et.dengine.gloom.pack/shaders/tonemap.fsh → ...e.gloom.pack/shaders/tonemap_exposure.fsh