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

Added blendmap component

Browse Source 
Added renderque for models with a blendmap component
Added shaders for blendmaps
This commit is contained in:
Tleety
2014-05-28 20:24:31 +02:00
parent a5f4c9daa0
commit 761b8e21e1
13 changed files with 260 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vs11/Returngeance/Returngeance.vcxproj
+3
View File
@@ -130,6 +130,7 @@
<ClInclude Include="..\..\src\Color.h" />
<ClInclude Include="..\..\src\Component.h" />
<ClInclude Include="..\..\src\Components\BarrelSteering.h" />
<ClInclude Include="..\..\src\Components\BlendMap.h" />
<ClInclude Include="..\..\src\Components\BoxShape.h" />
<ClInclude Include="..\..\src\Components\Camera.h" />
<ClInclude Include="..\..\src\Components\DirectionalLight.h" />
@@ -233,6 +234,8 @@
</ItemGroup>
<ItemGroup>
<None Include="..\..\src\Shaders\AABB.frag.glsl" />
<None Include="..\..\src\Shaders\BlendMap.frag.glsl" />
<None Include="..\..\src\Shaders\BlendMap.vert.glsl" />
<None Include="..\..\src\Shaders\FinalPass.frag.glsl" />
<None Include="..\..\src\Shaders\FinalPass.vert.glsl" />
<None Include="..\..\src\Shaders\ForwardRendering.frag.glsl" />
vs11/Returngeance/Returngeance.vcxproj.filters
+10 -2
View File
@@ -169,8 +169,7 @@
</Filter>
<Filter Include="Gameplay\Systems">
<UniqueIdentifier>{3c2ea0e5-41a1-4b11-a891-1d59ead7223c}</UniqueIdentifier>
</Filter>
</Filter>
<Filter Include="Rendering\Events">
<UniqueIdentifier>{a025d51e-594d-4844-983b-f683726bf1bf}</UniqueIdentifier>
</Filter>
@@ -473,6 +472,9 @@
<ClInclude Include="..\..\src\GUI\GameFrame.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="..\..\src\Components\BlendMap.h">
<Filter>Rendering\Components</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\src\Shaders\Fragment2.glsl">
@@ -535,5 +537,11 @@
<None Include="..\..\src\Shaders\SunPass.vert.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\BlendMap.frag.glsl">
<Filter>Shaders</Filter>
</None>
<None Include="..\..\src\Shaders\BlendMap.vert.glsl">
<Filter>Shaders</Filter>
</None>
</ItemGroup>
</Project>