Merge branch 'main' into Imgui

2024-03-22 17:19:06 +01:00
parent 77adeb2872 5c9ee0180f
commit a6ea730dc3
15 changed files with 1119 additions and 55 deletions
--- a/enginecustom/enginecustom.vcxproj.filters
+++ b/enginecustom/enginecustom.vcxproj.filters
@@ -125,5 +125,16 @@
    <None Include="Color.vs">
      <Filter>shader</Filter>
    </None>
+    <None Include="light.vs">
+      <Filter>texture</Filter>
+    </None>
+    <None Include="light.ps">
+      <Filter>texture</Filter>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="stone01.tga">
+      <Filter>assets</Filter>
+    </Image>
  </ItemGroup>
 </Project>