BTH/fishtanks
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/deffered_rendering'

Browse Source 
Conflicts:
	assets
	src/Components/PointLight.h
	src/GameWorld.cpp
	src/Renderer.cpp
	src/Renderer.h
	vs11/Returngeance/Returngeance.vcxproj.filters
This commit is contained in:
sippeangelo
2014-05-13 04:07:24 +02:00
parent ab58cbc08d ccd1393dac
commit bafa8d0a5d
22 changed files with 920 additions and 488 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vs11/Returngeance/Returngeance.vcxproj
+6
View File
@@ -195,6 +195,7 @@
<ClInclude Include="..\..\src\Systems\TankSteeringSystem.h" />
<ClInclude Include="..\..\src\Systems\TransformSystem.h" />
<ClInclude Include="..\..\src\Texture.h" />
<ClInclude Include="..\..\src\Util\defferedUtil.h" />
<ClInclude Include="..\..\src\Util\GLError.h" />
<ClInclude Include="..\..\src\Util\Rectangle.h" />
<ClInclude Include="..\..\src\Util\Logging.h" />
@@ -203,7 +204,11 @@
</ItemGroup>
<ItemGroup>
<None Include="..\..\src\Shaders\AABB.frag.glsl" />
<None Include="..\..\src\Shaders\FinalPass.frag.glsl" />
<None Include="..\..\src\Shaders\FinalPass.vert.glsl" />
<None Include="..\..\src\Shaders\Fragment.glsl" />
<None Include="..\..\src\Shaders\Fragment2-Debug.glsl" />
<None Include="..\..\src\Shaders\Fragment2.glsl" />
<None Include="..\..\src\Shaders\Normals.frag.glsl" />
<None Include="..\..\src\Shaders\Normals.geo.glsl" />
<None Include="..\..\src\Shaders\ShadowMap.frag.glsl" />
@@ -211,6 +216,7 @@
<None Include="..\..\src\Shaders\Skybox.frag.glsl" />
<None Include="..\..\src\Shaders\Skybox.vert.glsl" />
<None Include="..\..\src\Shaders\Vertex.glsl" />
<None Include="..\..\src\Shaders\Vertex2.glsl" />
<None Include="..\..\src\Shaders\VisualizeDepth.frag.glsl" />
<None Include="..\..\src\Shaders\VisualizeDepth.vert.glsl" />
</ItemGroup>
vs11/Returngeance/Returngeance.vcxproj.filters
+20 -4
View File
@@ -352,12 +352,10 @@
<ClInclude Include="..\..\src\Events\BindGamepadButton.h">
<Filter>Input\Events</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Util\defferedUtil.h" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\src\Shaders\AABB.frag.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\Fragment.glsl">
<None Include="..\..\src\Shaders\Fragment2.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\Normals.frag.glsl">
@@ -381,11 +379,29 @@
<None Include="..\..\src\Shaders\Vertex.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\Vertex2.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\VisualizeDepth.frag.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\VisualizeDepth.vert.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\AABB.frag.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\Fragment.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\Fragment2-Debug.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\FinalPass.vert.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\FinalPass.frag.glsl">
<Filter>Shaders</Filter>
</None>
</ItemGroup>
</Project>