Moved gameplay-resources into gameplay project directly.

Fixes support for Visual Studio 2010 C++ Express.

gameplay-resources/.project

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>gameplay-resources</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>

gameplay.sln

@@ -3,34 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gameplay", "gameplay\gameplay.vcxproj", "{1032BA4B-57EB-4348-9E03-29DD63E80E4A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gameplay-resources", "gameplay-resources", "{366E7E40-BED1-458F-B21E-265FCA8F1D10}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "res", "res", "{923056FA-5AFB-4DB5-9984-C2D72DB5FE6F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shaders", "shaders", "{A2CB369B-1D5B-4A0D-BA9E-96D61A2EAB4C}"
-	ProjectSection(SolutionItems) = preProject
-		gameplay-resources\res\shaders\bumped-specular.fsh = gameplay-resources\res\shaders\bumped-specular.fsh
-		gameplay-resources\res\shaders\bumped-specular.vsh = gameplay-resources\res\shaders\bumped-specular.vsh
-		gameplay-resources\res\shaders\bumped.fsh = gameplay-resources\res\shaders\bumped.fsh
-		gameplay-resources\res\shaders\bumped.vsh = gameplay-resources\res\shaders\bumped.vsh
-		gameplay-resources\res\shaders\colored-specular.fsh = gameplay-resources\res\shaders\colored-specular.fsh
-		gameplay-resources\res\shaders\colored-specular.vsh = gameplay-resources\res\shaders\colored-specular.vsh
-		gameplay-resources\res\shaders\colored.fsh = gameplay-resources\res\shaders\colored.fsh
-		gameplay-resources\res\shaders\colored.vsh = gameplay-resources\res\shaders\colored.vsh
-		gameplay-resources\res\shaders\diffuse-specular.fsh = gameplay-resources\res\shaders\diffuse-specular.fsh
-		gameplay-resources\res\shaders\diffuse-specular.vsh = gameplay-resources\res\shaders\diffuse-specular.vsh
-		gameplay-resources\res\shaders\diffuse.fsh = gameplay-resources\res\shaders\diffuse.fsh
-		gameplay-resources\res\shaders\diffuse.vsh = gameplay-resources\res\shaders\diffuse.vsh
-		gameplay-resources\res\shaders\parallax-specular.fsh = gameplay-resources\res\shaders\parallax-specular.fsh
-		gameplay-resources\res\shaders\parallax-specular.vsh = gameplay-resources\res\shaders\parallax-specular.vsh
-		gameplay-resources\res\shaders\parallax.fsh = gameplay-resources\res\shaders\parallax.fsh
-		gameplay-resources\res\shaders\parallax.vsh = gameplay-resources\res\shaders\parallax.vsh
-		gameplay-resources\res\shaders\solid.fsh = gameplay-resources\res\shaders\solid.fsh
-		gameplay-resources\res\shaders\solid.vsh = gameplay-resources\res\shaders\solid.vsh
-		gameplay-resources\res\shaders\textured.fsh = gameplay-resources\res\shaders\textured.fsh
-		gameplay-resources\res\shaders\textured.vsh = gameplay-resources\res\shaders\textured.vsh
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample00-mesh", "gameplay-samples\sample00-mesh\sample00-mesh.vcxproj", "{D672DC66-3CE0-4878-B0D2-813CA731012F}"
 	ProjectSection(ProjectDependencies) = postProject
 		{1032BA4B-57EB-4348-9E03-29DD63E80E4A} = {1032BA4B-57EB-4348-9E03-29DD63E80E4A}
@@ -87,8 +59,4 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{923056FA-5AFB-4DB5-9984-C2D72DB5FE6F} = {366E7E40-BED1-458F-B21E-265FCA8F1D10}
-		{A2CB369B-1D5B-4A0D-BA9E-96D61A2EAB4C} = {923056FA-5AFB-4DB5-9984-C2D72DB5FE6F}
-	EndGlobalSection
 EndGlobal

gameplay/gameplay.vcxproj

@@ -122,6 +122,28 @@
     <ClInclude Include="src\VertexFormat.h" />
     <ClInclude Include="src\Viewport.h" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="res\shaders\bumped-specular.fsh" />
+    <None Include="res\shaders\bumped-specular.vsh" />
+    <None Include="res\shaders\bumped.fsh" />
+    <None Include="res\shaders\bumped.vsh" />
+    <None Include="res\shaders\colored-specular.fsh" />
+    <None Include="res\shaders\colored-specular.vsh" />
+    <None Include="res\shaders\colored.fsh" />
+    <None Include="res\shaders\colored.vsh" />
+    <None Include="res\shaders\diffuse-specular.fsh" />
+    <None Include="res\shaders\diffuse-specular.vsh" />
+    <None Include="res\shaders\diffuse.fsh" />
+    <None Include="res\shaders\diffuse.vsh" />
+    <None Include="res\shaders\parallax-specular.fsh" />
+    <None Include="res\shaders\parallax-specular.vsh" />
+    <None Include="res\shaders\parallax.fsh" />
+    <None Include="res\shaders\parallax.vsh" />
+    <None Include="res\shaders\solid.fsh" />
+    <None Include="res\shaders\solid.vsh" />
+    <None Include="res\shaders\textured.fsh" />
+    <None Include="res\shaders\textured.vsh" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{1032BA4B-57EB-4348-9E03-29DD63E80E4A}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>

gameplay/gameplay.vcxproj.filters

@@ -4,6 +4,12 @@
     <Filter Include="src">
       <UniqueIdentifier>{c4d4da1c-81e2-4944-901c-200e1c4d80e5}</UniqueIdentifier>
     </Filter>
+    <Filter Include="res">
+      <UniqueIdentifier>{4a30ac71-e135-47d3-9f56-baac7cffe64c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="res\shaders">
+      <UniqueIdentifier>{be0b36f1-49ed-4a06-9f1f-57c654a554fe}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\Animation.cpp">
@@ -332,8 +338,67 @@
     <ClInclude Include="src\RenderState.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="src\Tree.h">
-      <Filter>src</Filter>
-    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="res\shaders\bumped-specular.vsh">
+      <Filter>res\shaders</Filter>
+    </None>
+    <None Include="res\shaders\colored.fsh">
+      <Filter>res\shaders</Filter>
+    </None>
+    <None Include="res\shaders\colored.vsh">
+      <Filter>res\shaders</Filter>
+    </None>
+    <None Include="res\shaders\colored-specular.fsh">
+      <Filter>res\shaders</Filter>
+    </None>
+    <None Include="res\shaders\colored-specular.vsh">
+      <Filter>res\shaders</Filter>
+    </None>
+    <None Include="res\shaders\diffuse.fsh">
+      <Filter>res\shaders</Filter>
+    </None>
+    <None Include="res\shaders\diffuse.vsh">
+      <Filter>res\shaders</Filter>
+    </None>
+    <None Include="res\shaders\diffuse-specular.fsh">
+      <Filter>res\shaders</Filter>
+    </None>
+    <None Include="res\shaders\diffuse-specular.vsh">
+      <Filter>res\shaders</Filter>
+    </None>
+    <None Include="res\shaders\parallax.fsh">
+      <Filter>res\shaders</Filter>
+    </None>
+    <None Include="res\shaders\parallax.vsh">
+      <Filter>res\shaders</Filter>
+    </None>
+    <None Include="res\shaders\parallax-specular.fsh">
+      <Filter>res\shaders</Filter>
+    </None>
+    <None Include="res\shaders\parallax-specular.vsh">
+      <Filter>res\shaders</Filter>
+    </None>
+    <None Include="res\shaders\solid.fsh">
+      <Filter>res\shaders</Filter>
+    </None>
+    <None Include="res\shaders\solid.vsh">
+      <Filter>res\shaders</Filter>
+    </None>
+    <None Include="res\shaders\textured.fsh">
+      <Filter>res\shaders</Filter>
+    </None>
+    <None Include="res\shaders\textured.vsh">
+      <Filter>res\shaders</Filter>
+    </None>
+    <None Include="res\shaders\bumped.fsh">
+      <Filter>res\shaders</Filter>
+    </None>
+    <None Include="res\shaders\bumped.vsh">
+      <Filter>res\shaders</Filter>
+    </None>
+    <None Include="res\shaders\bumped-specular.fsh">
+      <Filter>res\shaders</Filter>
+    </None>
   </ItemGroup>
 </Project>