Move deferred renderer components to dagon.render.deferred

gecko0307 · Dec 23, 2024 · 2708f0f · 2708f0f
1 parent ad52cf9
commit 2708f0f
Show file tree

Hide file tree

Showing 40 changed files with 152 additions and 124 deletions.
diff --git a/src/dagon/extra/water.d b/src/dagon/extra/water.d
@@ -45,7 +45,7 @@ import dagon.graphics.texture;
 import dagon.graphics.shader;
 import dagon.graphics.state;
 import dagon.graphics.csm;
-import dagon.render.gbuffer;
+import dagon.render.deferred.gbuffer;
 import dagon.resource.asset;
 import dagon.resource.texture;
 

diff --git a/src/dagon/game/game.d b/src/dagon/game/game.d
@@ -42,7 +42,7 @@ import dagon.graphics.state;
 import dagon.graphics.entity;
 import dagon.resource.scene;
 import dagon.render.renderer;
-import dagon.render.deferredrenderer;
+import dagon.render.deferred;
 import dagon.render.postprocrenderer;
 import dagon.render.presentrenderer;
 import dagon.render.hudrenderer;

diff --git a/src/dagon/game/loadingscreen.d b/src/dagon/game/loadingscreen.d
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2019-2022 Timur Gafarov
+Copyright (c) 2019-2024 Timur Gafarov
 
 Boost Software License - Version 1.0 - August 17th, 2003
 Permission is hereby granted, free of charge, to any person or organization

diff --git a/src/dagon/postproc/shaders/dof.d b/src/dagon/postproc/shaders/dof.d
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2021-2022 Timur Gafarov
+Copyright (c) 2021-2024 Timur Gafarov
 
 Boost Software License - Version 1.0 - August 17th, 2003
 Permission is hereby granted, free of charge, to any person or organization
@@ -41,7 +41,7 @@ import dlib.text.str;
 import dagon.core.bindings;
 import dagon.graphics.shader;
 import dagon.graphics.state;
-import dagon.render.gbuffer;
+import dagon.render.deferred.gbuffer;
 
 class DepthOfFieldShader: Shader
 {

diff --git a/src/dagon/postproc/shaders/motionblur.d b/src/dagon/postproc/shaders/motionblur.d
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2019-2022 Timur Gafarov
+Copyright (c) 2019-2024 Timur Gafarov
 
 Boost Software License - Version 1.0 - August 17th, 2003
 Permission is hereby granted, free of charge, to any person or organization
@@ -41,7 +41,7 @@ import dlib.text.str;
 import dagon.core.bindings;
 import dagon.graphics.shader;
 import dagon.graphics.state;
-import dagon.render.gbuffer;
+import dagon.render.deferred.gbuffer;
 
 class MotionBlurShader: Shader
 {

diff --git a/src/dagon/render/gbuffer.d → src/dagon/render/deferred/gbuffer.d b/src/dagon/render/gbuffer.d → src/dagon/render/deferred/gbuffer.d
@@ -25,7 +25,7 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 */
 
-module dagon.render.gbuffer;
+module dagon.render.deferred.gbuffer;
 
 import std.stdio;
 

diff --git a/src/dagon/render/deferredrenderer.d → src/dagon/render/deferred/package.d b/src/dagon/render/deferredrenderer.d → src/dagon/render/deferred/package.d
@@ -25,7 +25,7 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 */
 
-module dagon.render.deferredrenderer;
+module dagon.render.deferred;
 
 import dlib.core.memory;
 import dlib.core.ownership;
@@ -34,10 +34,11 @@ import dagon.core.event;
 import dagon.core.time;
 import dagon.resource.scene;
 import dagon.render.renderer;
-import dagon.render.passes;
-import dagon.render.gbuffer;
 import dagon.render.view;
 import dagon.render.framebuffer;
+public import dagon.render.deferred.passes;
+public import dagon.render.deferred.shaders;
+public import dagon.render.deferred.gbuffer;
 import dagon.postproc.filterpass;
 import dagon.postproc.shaders.denoise;
 

diff --git a/src/dagon/render/passes/background.d → ...dagon/render/deferred/passes/background.d b/src/dagon/render/passes/background.d → ...dagon/render/deferred/passes/background.d
@@ -25,7 +25,7 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 */
 
-module dagon.render.passes.background;
+module dagon.render.deferred.passes.background;
 
 import std.stdio;
 
@@ -38,8 +38,8 @@ import dagon.graphics.entity;
 import dagon.graphics.shader;
 import dagon.render.pipeline;
 import dagon.render.pass;
-import dagon.render.gbuffer;
-import dagon.render.shaders.sky;
+import dagon.render.deferred.gbuffer;
+import dagon.render.deferred.shaders.sky;
 
 class PassBackground: RenderPass
 {

diff --git a/src/dagon/render/passes/debugoutput.d → ...agon/render/deferred/passes/debugoutput.d b/src/dagon/render/passes/debugoutput.d → ...agon/render/deferred/passes/debugoutput.d
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2019-2022 Timur Gafarov
+Copyright (c) 2019-2024 Timur Gafarov
 
 Boost Software License - Version 1.0 - August 17th, 2003
 Permission is hereby granted, free of charge, to any person or organization
@@ -25,7 +25,7 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 */
 
-module dagon.render.passes.debugoutput;
+module dagon.render.deferred.passes.debugoutput;
 
 import std.stdio;
 
@@ -38,8 +38,8 @@ import dagon.graphics.screensurface;
 import dagon.render.pipeline;
 import dagon.render.pass;
 import dagon.render.framebuffer;
-import dagon.render.gbuffer;
-import dagon.render.shaders.debugoutput;
+import dagon.render.deferred.gbuffer;
+import dagon.render.deferred.shaders.debugoutput;
 
 enum DebugOutputMode: int
 {

diff --git a/src/dagon/render/passes/decal.d → src/dagon/render/deferred/passes/decal.d b/src/dagon/render/passes/decal.d → src/dagon/render/deferred/passes/decal.d
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2019-2022 Timur Gafarov
+Copyright (c) 2019-2024 Timur Gafarov
 
 Boost Software License - Version 1.0 - August 17th, 2003
 Permission is hereby granted, free of charge, to any person or organization
@@ -25,7 +25,7 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 */
 
-module dagon.render.passes.decal;
+module dagon.render.deferred.passes.decal;
 
 import std.stdio;
 
@@ -38,8 +38,8 @@ import dagon.graphics.entity;
 import dagon.graphics.shader;
 import dagon.render.pipeline;
 import dagon.render.pass;
-import dagon.render.gbuffer;
-import dagon.render.shaders.decal;
+import dagon.render.deferred.gbuffer;
+import dagon.render.deferred.shaders.decal;
 
 class PassDecal: RenderPass
 {

diff --git a/src/dagon/render/passes/emission.d → src/dagon/render/deferred/passes/emission.d b/src/dagon/render/passes/emission.d → src/dagon/render/deferred/passes/emission.d
@@ -25,7 +25,7 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 */
 
-module dagon.render.passes.emission;
+module dagon.render.deferred.passes.emission;
 
 import std.stdio;
 
@@ -38,8 +38,8 @@ import dagon.graphics.screensurface;
 import dagon.render.pipeline;
 import dagon.render.pass;
 import dagon.render.framebuffer;
-import dagon.render.gbuffer;
-import dagon.render.shaders.emission;
+import dagon.render.deferred.gbuffer;
+import dagon.render.deferred.shaders.emission;
 
 class PassEmission: RenderPass
 {

diff --git a/src/dagon/render/passes/environment.d → ...agon/render/deferred/passes/environment.d b/src/dagon/render/passes/environment.d → ...agon/render/deferred/passes/environment.d
@@ -25,7 +25,7 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 */
 
-module dagon.render.passes.environment;
+module dagon.render.deferred.passes.environment;
 
 import std.stdio;
 
@@ -38,8 +38,8 @@ import dagon.graphics.screensurface;
 import dagon.render.pipeline;
 import dagon.render.pass;
 import dagon.render.framebuffer;
-import dagon.render.gbuffer;
-import dagon.render.shaders.environment;
+import dagon.render.deferred.gbuffer;
+import dagon.render.deferred.shaders.environment;
 
 class PassEnvironment: RenderPass
 {

diff --git a/src/dagon/render/passes/forward.d → src/dagon/render/deferred/passes/forward.d b/src/dagon/render/passes/forward.d → src/dagon/render/deferred/passes/forward.d
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2020-2022 Timur Gafarov
+Copyright (c) 2020-2024 Timur Gafarov
 
 Boost Software License - Version 1.0 - August 17th, 2003
 Permission is hereby granted, free of charge, to any person or organization
@@ -25,7 +25,7 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 */
 
-module dagon.render.passes.forward;
+module dagon.render.deferred.passes.forward;
 
 import std.stdio;
 
@@ -41,8 +41,8 @@ import dagon.graphics.particles;
 import dagon.render.pipeline;
 import dagon.render.pass;
 import dagon.render.framebuffer;
-import dagon.render.gbuffer;
-import dagon.render.shaders.forward;
+import dagon.render.deferred.gbuffer;
+import dagon.render.deferred.shaders.forward;
 
 class PassForward: RenderPass
 {

diff --git a/src/dagon/render/passes/geometry.d → src/dagon/render/deferred/passes/geometry.d b/src/dagon/render/passes/geometry.d → src/dagon/render/deferred/passes/geometry.d
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2019-2022 Timur Gafarov
+Copyright (c) 2019-2024 Timur Gafarov
 
 Boost Software License - Version 1.0 - August 17th, 2003
 Permission is hereby granted, free of charge, to any person or organization
@@ -25,7 +25,7 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 */
 
-module dagon.render.passes.geometry;
+module dagon.render.deferred.passes.geometry;
 
 import std.stdio;
 
@@ -41,10 +41,10 @@ import dagon.graphics.particles;
 import dagon.graphics.shader;
 import dagon.render.pipeline;
 import dagon.render.pass;
-import dagon.render.gbuffer;
 import dagon.render.framebuffer;
-import dagon.render.shaders.geometry;
-import dagon.render.shaders.terrain;
+import dagon.render.deferred.gbuffer;
+import dagon.render.deferred.shaders.geometry;
+import dagon.render.deferred.shaders.terrain;
 
 class PassGeometry: RenderPass
 {

diff --git a/src/dagon/render/passes/light.d → src/dagon/render/deferred/passes/light.d b/src/dagon/render/passes/light.d → src/dagon/render/deferred/passes/light.d
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2019-2022 Timur Gafarov
+Copyright (c) 2019-2024 Timur Gafarov
 
 Boost Software License - Version 1.0 - August 17th, 2003
 Permission is hereby granted, free of charge, to any person or organization
@@ -25,7 +25,7 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 */
 
-module dagon.render.passes.light;
+module dagon.render.deferred.passes.light;
 
 import std.stdio;
 
@@ -43,9 +43,9 @@ import dagon.graphics.shapes;
 import dagon.render.pipeline;
 import dagon.render.pass;
 import dagon.render.framebuffer;
-import dagon.render.gbuffer;
-import dagon.render.shaders.sunlight;
-import dagon.render.shaders.arealight;
+import dagon.render.deferred.gbuffer;
+import dagon.render.deferred.shaders.sunlight;
+import dagon.render.deferred.shaders.arealight;
 
 class PassLight: RenderPass
 {

diff --git a/src/dagon/render/passes/occlusion.d → src/dagon/render/deferred/passes/occlusion.d b/src/dagon/render/passes/occlusion.d → src/dagon/render/deferred/passes/occlusion.d
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2019-2022 Timur Gafarov
+Copyright (c) 2019-2024 Timur Gafarov
 
 Boost Software License - Version 1.0 - August 17th, 2003
 Permission is hereby granted, free of charge, to any person or organization
@@ -25,7 +25,7 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 */
 
-module dagon.render.passes.occlusion;
+module dagon.render.deferred.passes.occlusion;
 
 import std.stdio;
 
@@ -38,8 +38,8 @@ import dagon.graphics.screensurface;
 import dagon.render.pipeline;
 import dagon.render.pass;
 import dagon.render.framebuffer;
-import dagon.render.gbuffer;
-import dagon.render.shaders.ssao;
+import dagon.render.deferred.gbuffer;
+import dagon.render.deferred.shaders.ssao;
 
 class PassOcclusion: RenderPass
 {

diff --git a/src/dagon/render/passes/package.d → src/dagon/render/deferred/passes/package.d b/src/dagon/render/passes/package.d → src/dagon/render/deferred/passes/package.d
@@ -25,21 +25,21 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 */
 
-module dagon.render.passes;
+module dagon.render.deferred.passes;
 
 public
 {
-    import dagon.render.passes.background;
-    import dagon.render.passes.debugoutput;
-    import dagon.render.passes.decal;
-    import dagon.render.passes.emission;
-    import dagon.render.passes.environment;
-    import dagon.render.passes.forward;
-    import dagon.render.passes.geometry;
-    import dagon.render.passes.light;
-    import dagon.render.passes.occlusion;
-    import dagon.render.passes.particles;
-    import dagon.render.passes.probe;
-    import dagon.render.passes.shadow;
-    import dagon.render.passes.terrain;
+    import dagon.render.deferred.passes.background;
+    import dagon.render.deferred.passes.debugoutput;
+    import dagon.render.deferred.passes.decal;
+    import dagon.render.deferred.passes.emission;
+    import dagon.render.deferred.passes.environment;
+    import dagon.render.deferred.passes.forward;
+    import dagon.render.deferred.passes.geometry;
+    import dagon.render.deferred.passes.light;
+    import dagon.render.deferred.passes.occlusion;
+    import dagon.render.deferred.passes.particles;
+    import dagon.render.deferred.passes.probe;
+    import dagon.render.deferred.passes.shadow;
+    import dagon.render.deferred.passes.terrain;
 }
diff --git a/src/dagon/render/passes/particles.d → src/dagon/render/deferred/passes/particles.d b/src/dagon/render/passes/particles.d → src/dagon/render/deferred/passes/particles.d
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2019-2022 Timur Gafarov
+Copyright (c) 2019-2024 Timur Gafarov
 
 Boost Software License - Version 1.0 - August 17th, 2003
 Permission is hereby granted, free of charge, to any person or organization
@@ -25,7 +25,7 @@ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 */
 
-module dagon.render.passes.particles;
+module dagon.render.deferred.passes.particles;
 
 import std.stdio;
 
@@ -40,8 +40,8 @@ import dagon.graphics.particles;
 import dagon.render.pipeline;
 import dagon.render.pass;
 import dagon.render.framebuffer;
-import dagon.render.gbuffer;
-import dagon.render.shaders.particle;
+import dagon.render.deferred.gbuffer;
+import dagon.render.deferred.shaders.particle;
 
 class PassParticles: RenderPass
 {