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

Merge remote-tracking branch 'origin/master' into Shadows

Browse Source 
# Conflicts:
#	include/Engine/Rendering/DrawFinalPass.h
#	include/Engine/Rendering/Renderer.h
#	resources/Shaders/ForwardPlus.vert.glsl
#	resources/Shaders/ForwardPlusSkinned.vert.glsl
#	src/Engine/Rendering/Renderer.cpp
This commit is contained in:
FakeShemp
2016-03-09 19:38:55 +01:00
parent e494f6a495 fce6e90f3c
commit e25c9ee690
158 changed files with 29178 additions and 8731 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/Shaders/ForwardPlusSkinned.vert.glsl
+3 -1
View File
@@ -2,6 +2,8 @@
#define MAX_SPLITS 4
uniform mat4 PVM;
uniform mat4 TIM;
uniform mat4 M;
uniform mat4 V;
uniform mat4 P;
@@ -39,7 +41,7 @@ void main()
+ BoneWeights[3] * Bones[int(BoneIndices[3])];
}
gl_Position = P*V*M*boneTransform * vec4(Position, 1.0);
gl_Position = PVM*boneTransform * vec4(Position, 1.0);
Output.Position = (boneTransform * vec4(Position, 1.0)).xyz;
Output.TextureCoordinate = TextureCoords;