Merge branch 'Sprites'
This commit is contained in:
@@ -21,20 +21,25 @@
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="applicationclass.cpp" />
|
||||
<ClCompile Include="bitmapclass.cpp" />
|
||||
<ClCompile Include="Cameraclass.cpp" />
|
||||
<ClCompile Include="Colorshaderclass.cpp" />
|
||||
<ClCompile Include="d3dclass.cpp" />
|
||||
<ClCompile Include="inputclass.cpp" />
|
||||
<ClCompile Include="lightclass.cpp" />
|
||||
<ClCompile Include="lightshaderclass.cpp" />
|
||||
<ClCompile Include="Lightclass.cpp" />
|
||||
<ClCompile Include="Lightshaderclass.cpp" />
|
||||
<ClCompile Include="Main.cpp" />
|
||||
<ClCompile Include="modelclass.cpp" />
|
||||
<ClCompile Include="Multitextureshaderclass.cpp" />
|
||||
<ClCompile Include="Spriteclass.cpp" />
|
||||
<ClCompile Include="Systemclass.cpp" />
|
||||
<ClCompile Include="textureclass.cpp" />
|
||||
<ClCompile Include="textureshaderclass.cpp" />
|
||||
<ClCompile Include="Timerclass.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="applicationclass.h" />
|
||||
<ClInclude Include="bitmapclass.h" />
|
||||
<ClInclude Include="Cameraclass.h" />
|
||||
<ClInclude Include="Colorshaderclass.h" />
|
||||
<ClInclude Include="d3dclass.h" />
|
||||
@@ -43,8 +48,11 @@
|
||||
<ClInclude Include="lightshaderclass.h" />
|
||||
<ClInclude Include="modelclass.h" />
|
||||
<ClInclude Include="Multitextureshaderclass.h" />
|
||||
<ClInclude Include="Spriteclass.h" />
|
||||
<ClInclude Include="systemclass.h" />
|
||||
<ClInclude Include="textureclass.h" />
|
||||
<ClInclude Include="textureshaderclass.h" />
|
||||
<ClInclude Include="Timerclass.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="light.ps" />
|
||||
@@ -52,6 +60,8 @@
|
||||
<None Include="Multitexture.ps" />
|
||||
<None Include="Multitexture.vs" />
|
||||
<None Include="packages.config" />
|
||||
<None Include="texture.ps" />
|
||||
<None Include="texture.vs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="Color.ps">
|
||||
@@ -75,10 +85,16 @@
|
||||
<Image Include="moss01.tga" />
|
||||
<Image Include="papier.tga" />
|
||||
<Image Include="stone01.tga" />
|
||||
<Image Include="wall.tga" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Text Include="cube.txt" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="sphere.obj">
|
||||
<FileType>Document</FileType>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<VCProjectVersion>17.0</VCProjectVersion>
|
||||
<Keyword>Win32Proj</Keyword>
|
||||
|
Reference in New Issue
Block a user