Patch update - merge end
This commit is contained in:
@@ -126,9 +126,6 @@
|
||||
<ClCompile Include="alphamapshaderclass.cpp">
|
||||
<Filter>Fichiers sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="normalmapshaderclass.cpp">
|
||||
<Filter>Fichiers sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="specmapshaderclass.cpp">
|
||||
<Filter>Fichiers sources</Filter>
|
||||
</ClCompile>
|
||||
@@ -168,6 +165,12 @@
|
||||
<ClCompile Include="refractionshaderclass.cpp">
|
||||
<Filter>Fichiers sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="physics.cpp">
|
||||
<Filter>Fichiers sources</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="normalmapshaderclass.cpp">
|
||||
<Filter>Fichiers sources</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="systemclass.h">
|
||||
@@ -311,6 +314,9 @@
|
||||
<ClInclude Include="refractionshaderclass.h">
|
||||
<Filter>Fichiers d%27en-tête</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="physics.h">
|
||||
<Filter>Fichiers d%27en-tête</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Image Include="wall.tga">
|
||||
@@ -331,10 +337,18 @@
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="packages.config" />
|
||||
<None Include="water.vs" />
|
||||
<None Include="..\KhaoticDemo\water.ps" />
|
||||
<None Include="refraction.vs" />
|
||||
<None Include="refraction.ps" />
|
||||
<None Include="refraction.ps">
|
||||
<Filter>shader</Filter>
|
||||
</None>
|
||||
<None Include="refraction.vs">
|
||||
<Filter>shader</Filter>
|
||||
</None>
|
||||
<None Include="..\KhaoticDemo\water.ps">
|
||||
<Filter>shader</Filter>
|
||||
</None>
|
||||
<None Include="water.vs">
|
||||
<Filter>shader</Filter>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Text Include="sphere.txt">
|
||||
@@ -380,26 +394,6 @@
|
||||
<CopyFileToFolders Include="plane.txt">
|
||||
<Filter>Assets</Filter>
|
||||
</CopyFileToFolders>
|
||||
<CopyFileToFolders Include="alphamap.ps" />
|
||||
<CopyFileToFolders Include="alphamap.vs" />
|
||||
<CopyFileToFolders Include="light.vs" />
|
||||
<CopyFileToFolders Include="lightmap.ps" />
|
||||
<CopyFileToFolders Include="lightmap.vs" />
|
||||
<CopyFileToFolders Include="Multitexture.ps" />
|
||||
<CopyFileToFolders Include="Multitexture.vs" />
|
||||
<CopyFileToFolders Include="normalmap.ps" />
|
||||
<CopyFileToFolders Include="normalmap.vs" />
|
||||
<CopyFileToFolders Include="reflection.ps" />
|
||||
<CopyFileToFolders Include="reflection.vs" />
|
||||
<CopyFileToFolders Include="specmap.ps" />
|
||||
<CopyFileToFolders Include="specmap.vs" />
|
||||
<CopyFileToFolders Include="texture.ps" />
|
||||
<CopyFileToFolders Include="texture.vs" />
|
||||
<CopyFileToFolders Include="transparent.ps" />
|
||||
<CopyFileToFolders Include="transparent.vs" />
|
||||
<CopyFileToFolders Include="Color.ps" />
|
||||
<CopyFileToFolders Include="translate.ps" />
|
||||
<CopyFileToFolders Include="translate.vs" />
|
||||
<CopyFileToFolders Include="alpha01.tga">
|
||||
<Filter>Assets</Filter>
|
||||
</CopyFileToFolders>
|
||||
@@ -430,5 +424,65 @@
|
||||
<CopyFileToFolders Include="sprite04.tga">
|
||||
<Filter>Assets</Filter>
|
||||
</CopyFileToFolders>
|
||||
<CopyFileToFolders Include="Color.ps">
|
||||
<Filter>shader</Filter>
|
||||
</CopyFileToFolders>
|
||||
<CopyFileToFolders Include="light.vs">
|
||||
<Filter>shader</Filter>
|
||||
</CopyFileToFolders>
|
||||
<CopyFileToFolders Include="lightmap.ps">
|
||||
<Filter>shader</Filter>
|
||||
</CopyFileToFolders>
|
||||
<CopyFileToFolders Include="lightmap.vs">
|
||||
<Filter>shader</Filter>
|
||||
</CopyFileToFolders>
|
||||
<CopyFileToFolders Include="reflection.ps">
|
||||
<Filter>shader</Filter>
|
||||
</CopyFileToFolders>
|
||||
<CopyFileToFolders Include="reflection.vs">
|
||||
<Filter>shader</Filter>
|
||||
</CopyFileToFolders>
|
||||
<CopyFileToFolders Include="translate.ps">
|
||||
<Filter>shader</Filter>
|
||||
</CopyFileToFolders>
|
||||
<CopyFileToFolders Include="translate.vs">
|
||||
<Filter>shader</Filter>
|
||||
</CopyFileToFolders>
|
||||
<CopyFileToFolders Include="transparent.ps">
|
||||
<Filter>shader</Filter>
|
||||
</CopyFileToFolders>
|
||||
<CopyFileToFolders Include="transparent.vs">
|
||||
<Filter>shader</Filter>
|
||||
</CopyFileToFolders>
|
||||
<CopyFileToFolders Include="Multitexture.ps">
|
||||
<Filter>Texture</Filter>
|
||||
</CopyFileToFolders>
|
||||
<CopyFileToFolders Include="Multitexture.vs">
|
||||
<Filter>Texture</Filter>
|
||||
</CopyFileToFolders>
|
||||
<CopyFileToFolders Include="normalmap.ps">
|
||||
<Filter>Texture</Filter>
|
||||
</CopyFileToFolders>
|
||||
<CopyFileToFolders Include="normalmap.vs">
|
||||
<Filter>Texture</Filter>
|
||||
</CopyFileToFolders>
|
||||
<CopyFileToFolders Include="specmap.ps">
|
||||
<Filter>Texture</Filter>
|
||||
</CopyFileToFolders>
|
||||
<CopyFileToFolders Include="specmap.vs">
|
||||
<Filter>Texture</Filter>
|
||||
</CopyFileToFolders>
|
||||
<CopyFileToFolders Include="texture.ps">
|
||||
<Filter>Texture</Filter>
|
||||
</CopyFileToFolders>
|
||||
<CopyFileToFolders Include="texture.vs">
|
||||
<Filter>Texture</Filter>
|
||||
</CopyFileToFolders>
|
||||
<CopyFileToFolders Include="alphamap.vs">
|
||||
<Filter>Texture</Filter>
|
||||
</CopyFileToFolders>
|
||||
<CopyFileToFolders Include="alphamap.ps">
|
||||
<Filter>Texture</Filter>
|
||||
</CopyFileToFolders>
|
||||
</ItemGroup>
|
||||
</Project>
|
Reference in New Issue
Block a user