From 8523d07ea658db881c704a9058a3d59209e29c21 Mon Sep 17 00:00:00 2001 From: Nikita Krupitskas Date: Fri, 22 Nov 2024 13:33:02 +0100 Subject: [PATCH] Added images --- Docs/Docs.md | 4 -- Docs/Images/Pathtracing.png | 3 ++ Docs/Images/Raster.png | 3 ++ Docs/Task_Indirect_Draw.md | 5 --- Docs/Task_Reference_PT.md | 5 --- Docs/Tasks.md | 75 -------------------------------- README.md | 5 +++ Yasno/Renderer/ShaderStorage.cpp | 2 +- Yasno/Yasno.vcxproj | 1 + Yasno/Yasno.vcxproj.filters | 6 +++ Yasno/Yasno/Yasno.cpp | 14 +++--- 11 files changed, 26 insertions(+), 97 deletions(-) delete mode 100644 Docs/Docs.md create mode 100644 Docs/Images/Pathtracing.png create mode 100644 Docs/Images/Raster.png delete mode 100644 Docs/Task_Indirect_Draw.md delete mode 100644 Docs/Task_Reference_PT.md delete mode 100644 Docs/Tasks.md diff --git a/Docs/Docs.md b/Docs/Docs.md deleted file mode 100644 index 86d652b..0000000 --- a/Docs/Docs.md +++ /dev/null @@ -1,4 +0,0 @@ -# Documentation - -## Math - diff --git a/Docs/Images/Pathtracing.png b/Docs/Images/Pathtracing.png new file mode 100644 index 0000000..f7e61a2 --- /dev/null +++ b/Docs/Images/Pathtracing.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b4c57902cb2942b62127dc2ffec31fa10eb933a5ad605fb8a07925826be1762 +size 3555028 diff --git a/Docs/Images/Raster.png b/Docs/Images/Raster.png new file mode 100644 index 0000000..975b5f8 --- /dev/null +++ b/Docs/Images/Raster.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a96c77be3086bbebaf59f5f99fd0648e552cfea2ab55a1ee39f7865d99150595 +size 3125644 diff --git a/Docs/Task_Indirect_Draw.md b/Docs/Task_Indirect_Draw.md deleted file mode 100644 index 6e6d5a3..0000000 --- a/Docs/Task_Indirect_Draw.md +++ /dev/null @@ -1,5 +0,0 @@ -# Indirect Draw - -1. Provide vertex attributes -2. Provide index attributes -2. Provide materials for raytracer via materialID \ No newline at end of file diff --git a/Docs/Task_Reference_PT.md b/Docs/Task_Reference_PT.md deleted file mode 100644 index c136ffa..0000000 --- a/Docs/Task_Reference_PT.md +++ /dev/null @@ -1,5 +0,0 @@ -# Reference PT - -1. Provide vertex attributes -2. Provide index attributes -3. Provide materials for raytracer via material_id \ No newline at end of file diff --git a/Docs/Tasks.md b/Docs/Tasks.md deleted file mode 100644 index 07af5e5..0000000 --- a/Docs/Tasks.md +++ /dev/null @@ -1,75 +0,0 @@ -# Tasks - -## Working note - -Should I split in streams, probably - more storage while not optimized but faster access anyway - -## To-Do - -* Finish vertex pulling <- -* Shader reflection -* Reverse Z -* Provide material indices in path tracing -* Output albedo/normals with RTX mode -* Add indirect draw for forward pipeline -* Add console commands - * UI input func -* Add GPU frustum culling -* Finish shader hot reload -* Invest in robustness - * Add, delete gltf objects - * Resize window / fullscreen / vsync - * Output all stats - textures, vertex, index buffer - * Improve camera - * Remove wil::com_ptr and shared ptr as much as possible - * Dispatch rays SRV issue -* Invest into better abstraction -* Add GPU occlusion culling - HZB -* Finish path tracing -* Add VBuffer and GBuffer -* Add more lights - spot and point -* Add gizmos and scene description to actually manipulate it -* Add loading saving of the scene - -Clean up and open source it - -## Visual fancy stuff - -* ACES -* Bloom -* SSAO -* SSR -* TAA -* Motion Blur -* Depth Of Field -* DDGI -* Area lights -* OIT -* Magnify pixels (steal from AMD) -* GPU Particles - -## Animation - -* Skeletal -* Morph - -## Particles - -* Spawn GPU particles - - -## Volumetric rendering - -* Cloud - -## Hardware fancy stuff - -* Sampler feedback -* Work Graph -* Direct SR - - -## Known issues which I don't care: - - - diff --git a/README.md b/README.md index 5b6715a..283a188 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,11 @@ +

+ + +

+ ## Current research goal idea Yasno has two modes - raster and pathtracing for reference image. diff --git a/Yasno/Renderer/ShaderStorage.cpp b/Yasno/Renderer/ShaderStorage.cpp index e71027a..6d49db0 100644 --- a/Yasno/Renderer/ShaderStorage.cpp +++ b/Yasno/Renderer/ShaderStorage.cpp @@ -109,7 +109,7 @@ namespace ysn return false; } - dxc_include_handler->LoadSource(L"", m_include_blob.get()); + //dxc_include_handler->LoadSource(L"", m_include_blob.get()); return true; } diff --git a/Yasno/Yasno.vcxproj b/Yasno/Yasno.vcxproj index c44d7b2..ca74196 100644 --- a/Yasno/Yasno.vcxproj +++ b/Yasno/Yasno.vcxproj @@ -253,6 +253,7 @@ + diff --git a/Yasno/Yasno.vcxproj.filters b/Yasno/Yasno.vcxproj.filters index d57b956..2d4b4cf 100644 --- a/Yasno/Yasno.vcxproj.filters +++ b/Yasno/Yasno.vcxproj.filters @@ -188,6 +188,9 @@ Source\Graphics + + Source + @@ -466,6 +469,9 @@ Docs + + Shaders + diff --git a/Yasno/Yasno/Yasno.cpp b/Yasno/Yasno/Yasno.cpp index 1d598a6..df86aea 100644 --- a/Yasno/Yasno/Yasno.cpp +++ b/Yasno/Yasno/Yasno.cpp @@ -259,17 +259,17 @@ namespace ysn bool load_result = false; - //{ - // LoadingParameters loading_parameters; - // loading_parameters.model_modifier = XMMatrixScaling(0.01f, 0.01f, 0.01f); - // load_result = LoadGltfFromFile(m_render_scene, GetVirtualFilesystemPath(L"Assets/Sponza/Sponza.gltf"), loading_parameters); - //} - { LoadingParameters loading_parameters; - load_result = LoadGltfFromFile(m_render_scene, GetVirtualFilesystemPath(L"Assets/DamagedHelmet/DamagedHelmet.gltf"), loading_parameters); + loading_parameters.model_modifier = XMMatrixScaling(0.01f, 0.01f, 0.01f); + load_result = LoadGltfFromFile(m_render_scene, GetVirtualFilesystemPath(L"Assets/Sponza/Sponza.gltf"), loading_parameters); } + //{ + // LoadingParameters loading_parameters; + // load_result = LoadGltfFromFile(m_render_scene, GetVirtualFilesystemPath(L"Assets/DamagedHelmet/DamagedHelmet.gltf"), loading_parameters); + //} + //{ // LoadingParameters loading_parameters; // loading_parameters.model_modifier = XMMatrixScaling(0.01f, 0.01f, 0.01f);