Merge branch 'main' into ImGui-V2

enginecustom/enginecustom.vcxproj

@@ -20,6 +20,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="alphamapshaderclass.cpp" />
     <ClCompile Include="applicationclass.cpp" />
     <ClCompile Include="bitmapclass.cpp" />
     <ClCompile Include="Cameraclass.cpp" />
@@ -33,24 +34,38 @@
     <ClCompile Include="include\imgui_draw.cpp" />
     <ClCompile Include="include\imgui_tables.cpp" />
     <ClCompile Include="include\imgui_widgets.cpp" />
+    <ClCompile Include="displayplaneclass.cpp" />
     <ClCompile Include="fontclass.cpp" />
     <ClCompile Include="fontshaderclass.cpp" />
     <ClCompile Include="fpsclass.cpp" />
+    <ClCompile Include="frustumclass.cpp" />
     <ClCompile Include="inputclass.cpp" />
     <ClCompile Include="Lightclass.cpp" />
+    <ClCompile Include="lightmapshaderclass.cpp" />
     <ClCompile Include="Lightshaderclass.cpp" />
     <ClCompile Include="Main.cpp" />
     <ClCompile Include="modelclass.cpp" />
     <ClCompile Include="object.cpp" />
+    <ClCompile Include="modellistclass.cpp" />
     <ClCompile Include="Multitextureshaderclass.cpp" />
+    <ClCompile Include="normalmapshaderclass.cpp" />
+    <ClCompile Include="positionclass.cpp" />
+    <ClCompile Include="rendertextureclass.cpp" />
+    <ClCompile Include="specmapshaderclass.cpp" />
     <ClCompile Include="Spriteclass.cpp" />
     <ClCompile Include="Systemclass.cpp" />
     <ClCompile Include="textclass.cpp" />
     <ClCompile Include="textureclass.cpp" />
     <ClCompile Include="textureshaderclass.cpp" />
     <ClCompile Include="Timerclass.cpp" />
+    <ClCompile Include="translate.cpp">
+      <DependentUpon>translate.vs</DependentUpon>
+      <SubType>Code</SubType>
+    </ClCompile>
+    <ClCompile Include="translateshaderclass.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="alphamapshaderclass.h" />
     <ClInclude Include="applicationclass.h" />
     <ClInclude Include="bitmapclass.h" />
     <ClInclude Include="Cameraclass.h" />
@@ -65,30 +80,51 @@
     <ClInclude Include="include\imstb_rectpack.h" />
     <ClInclude Include="include\imstb_textedit.h" />
     <ClInclude Include="include\imstb_truetype.h" />
+    <ClInclude Include="displayplaneclass.h" />
     <ClInclude Include="fontclass.h" />
     <ClInclude Include="fontshaderclass.h" />
     <ClInclude Include="fpsclass.h" />
+    <ClInclude Include="frustumclass.h" />
     <ClInclude Include="inputclass.h" />
     <ClInclude Include="lightclass.h" />
+    <ClInclude Include="lightmapshaderclass.h" />
     <ClInclude Include="lightshaderclass.h" />
     <ClInclude Include="modelclass.h" />
     <ClInclude Include="object.h" />
+    <ClInclude Include="modellistclass.h" />
     <ClInclude Include="Multitextureshaderclass.h" />
+    <ClInclude Include="normalmapshaderclass.h" />
+    <ClInclude Include="positionclass.h" />
+    <ClInclude Include="rendertextureclass.h" />
+    <ClInclude Include="specmapshaderclass.h" />
     <ClInclude Include="Spriteclass.h" />
     <ClInclude Include="systemclass.h" />
     <ClInclude Include="textclass.h" />
     <ClInclude Include="textureclass.h" />
     <ClInclude Include="textureshaderclass.h" />
     <ClInclude Include="Timerclass.h" />
+    <ClInclude Include="translate.h">
+      <DependentUpon>translate.vs</DependentUpon>
+      <SubType>Code</SubType>
+    </ClInclude>
+    <ClInclude Include="translateshaderclass.h" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="alphamap.ps" />
+    <None Include="alphamap.vs" />
     <None Include="font.ps" />
     <None Include="font.vs" />
     <None Include="light.ps" />
     <None Include="light.vs" />
+    <None Include="lightmap.ps" />
+    <None Include="lightmap.vs" />
     <None Include="Multitexture.ps" />
     <None Include="Multitexture.vs" />
+    <None Include="normalmap.ps" />
+    <None Include="normalmap.vs" />
     <None Include="packages.config" />
+    <None Include="specmap.ps" />
+    <None Include="specmap.vs" />
     <None Include="texture.ps" />
     <None Include="texture.vs" />
   </ItemGroup>
@@ -112,8 +148,12 @@
   </ItemGroup>
   <ItemGroup>
     <Image Include="..\..\..\..\Downloads\grass.tga" />
+    <Image Include="alpha01.tga" />
+    <Image Include="dirt01.tga" />
     <Image Include="font01.tga" />
+    <Image Include="light01.tga" />
     <Image Include="moss01.tga" />
+    <Image Include="normal01.tga" />
     <Image Include="papier.tga" />
     <Image Include="stone01.tga" />
     <Image Include="wall.tga" />
@@ -124,6 +164,17 @@
     <Text Include="font01.txt" />
     <Text Include="plane.txt" />
     <Text Include="sphere.txt" />
+    <Text Include="square.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="translate.ps">
+      <SubType>Designer</SubType>
+      <FileType>Document</FileType>
+    </None>
+    <None Include="translate.vs">
+      <SubType>Designer</SubType>
+      <FileType>Document</FileType>
+    </None>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>17.0</VCProjectVersion>