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

Merge remote-tracking branch 'origin/deffered_rendering' into render_queue

Browse Source 
Conflicts:
	src/Renderer.cpp
	src/Renderer.h
This commit is contained in:
sippeangelo
2014-05-27 07:10:50 +02:00
parent d4b28a2228 2db52ded2f
commit 98167a806d
11 changed files with 213 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vs11/Returngeance/Returngeance.vcxproj
+2
View File
@@ -229,6 +229,8 @@
<None Include="..\..\src\Shaders\ShadowMap.vert.glsl" />
<None Include="..\..\src\Shaders\Skybox.frag.glsl" />
<None Include="..\..\src\Shaders\Skybox.vert.glsl" />
<None Include="..\..\src\Shaders\SunPass.frag.glsl" />
<None Include="..\..\src\Shaders\SunPass.vert.glsl" />
<None Include="..\..\src\Shaders\Vertex.glsl" />
<None Include="..\..\src\Shaders\Vertex2.glsl" />
<None Include="..\..\src\Shaders\VisualizeDepth.frag.glsl" />
vs11/Returngeance/Returngeance.vcxproj.filters
+6
View File
@@ -468,5 +468,11 @@
<None Include="..\..\src\Shaders\ForwardRendering.vert.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\SunPass.frag.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\SunPass.vert.glsl">
<Filter>Shaders</Filter>
</None>
</ItemGroup>
</Project>