Added images

krupitskas · Nov 22, 2024 · 8523d07 · 8523d07
1 parent 246c5d9
commit 8523d07
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 97 deletions.
diff --git a/Docs/Docs.md b/Docs/Docs.md
diff --git a/Docs/Images/Pathtracing.png b/Docs/Images/Pathtracing.png
diff --git a/Docs/Images/Raster.png b/Docs/Images/Raster.png
diff --git a/Docs/Task_Indirect_Draw.md b/Docs/Task_Indirect_Draw.md
diff --git a/Docs/Task_Reference_PT.md b/Docs/Task_Reference_PT.md
diff --git a/Docs/Tasks.md b/Docs/Tasks.md
diff --git a/README.md b/README.md
@@ -6,6 +6,11 @@
 
 </div>
 
+<p align="center">
+    <img src="Docs/Images/Raster.png" style="width: 40%; height: 40%">
+    <img src="Docs/Images/Pathtracing.png" style="width: 40%; height: 40%">
+</p>
+
 ## 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
@@ -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
@@ -253,6 +253,7 @@
     <None Include="..\Docs\Tasks.md" />
     <None Include="..\Docs\Task_Indirect_Draw.md" />
     <None Include="..\Docs\Task_Reference_PT.md" />
+    <None Include="..\Shaders\CommonStructures.hlsl" />
     <None Include="..\Shaders\ConvertEquirectangularMap_VS.hlsl" />
     <None Include="..\Shaders\Skybox_PS.hlsl" />
     <None Include="..\Shaders\Skybox_VS.hlsl" />

diff --git a/Yasno/Yasno.vcxproj.filters b/Yasno/Yasno.vcxproj.filters
@@ -188,6 +188,9 @@
     <ClCompile Include="Graphics\RtxMaterial.cpp">
       <Filter>Source\Graphics</Filter>
     </ClCompile>
+    <ClCompile Include="Renderer\GpuBuffer.cpp">
+      <Filter>Source</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Yasno\Camera.hpp">
@@ -466,6 +469,9 @@
     <None Include="..\Docs\Task_Reference_PT.md">
       <Filter>Docs</Filter>
     </None>
+    <None Include="..\Shaders\CommonStructures.hlsl">
+      <Filter>Shaders</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Resource.rc">

diff --git 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);