some fixes for working with engine master branch

This commit is contained in:
alexander.biryukov committed 2018-03-30 16:16:49 +05:00
1 parent 4673422314
commit 2b875dfc2d
36 files changed
+2774 -11

No files matched your search

+8
View File
@@ -0,0 +1,8 @@
precision mediump float;
uniform vec4 Color;
void main()
{
gl_FragColor = Color;
}
+8
View File
@@ -0,0 +1,8 @@
attribute vec3 vPosition;
uniform mat4 ProjectionMatrix;
void main()
{
gl_Position = ProjectionMatrix * vec4(vPosition.xyz, 1.0);
}
+11
View File
@@ -0,0 +1,11 @@
precision mediump float;
in vec2 texCoord;
flat in vec4 color;
uniform sampler2D Texture;
void main()
{
gl_FragColor = texture2D(Texture,texCoord) * color;
}
+15
View File
@@ -0,0 +1,15 @@
attribute vec3 vPosition;
attribute vec2 vTexCoord;
attribute vec4 vColor;
out vec2 texCoord;
flat out vec4 color;
uniform mat4 ProjectionMatrix;
void main()
{
gl_Position = ProjectionMatrix * vec4(vPosition.xyz, 1.0);
texCoord = vTexCoord;
color = vColor;
}
+10
View File
@@ -0,0 +1,10 @@
precision mediump float;
varying vec2 texCoord;
uniform sampler2D Texture;
void main()
{
gl_FragColor = texture2D(Texture,texCoord);
}
+12
View File
@@ -0,0 +1,12 @@
attribute vec3 vPosition;
attribute vec2 vTexCoord;
varying vec2 texCoord;
uniform mat4 ProjectionMatrix;
void main()
{
gl_Position = ProjectionMatrix * vec4(vPosition.xyz, 1.0);
texCoord = vTexCoord;
}