Merge branch 'NDK' into NDK-ShadowMapping

Former-commit-id: b07de3853987ffc91946b307208c0ec26eda280a
This commit is contained in:
Lynix
2015-08-17 14:26:42 +02:00
17 changed files with 280 additions and 21 deletions

View File

@@ -69,6 +69,7 @@ void main()
gl_Position = ViewProjMatrix * vec4(vertexPos, 1.0);
texCoords = VertexTexCoord;
#endif
texCoords.y = 1.0 - texCoords.y;
#else
#if FLAG_INSTANCING
#if TRANSFORM

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -78,6 +78,7 @@ void main()
gl_Position = ViewProjMatrix * vec4(vertexPos, 1.0);
texCoords = VertexTexCoord;
#endif
texCoords.y = 1.0 - texCoords.y;
#else
#if FLAG_INSTANCING
#if TRANSFORM

File diff suppressed because one or more lines are too long