textures almost work?
This commit is contained in:
@@ -3,11 +3,12 @@ $input v_normal
|
||||
$input v_uv0
|
||||
$input v_wpos
|
||||
|
||||
#include "common.sh"
|
||||
|
||||
SAMPLER2D(s_texColor, 0);
|
||||
uniform vec4 u_time;
|
||||
uniform vec4 u_testColor;
|
||||
|
||||
#include "common.sh"
|
||||
|
||||
float circle(vec2 uv, float radius)
|
||||
{
|
||||
float distSq = uv.x * uv.x + uv.y * uv.y;
|
||||
@@ -86,4 +87,5 @@ void main()
|
||||
// gl_FragColor = brightness;
|
||||
// gl_FragColor = dither;
|
||||
// gl_FragColor = u_testColor;
|
||||
gl_FragColor = texture2D(s_texColor, v_uv0);
|
||||
}
|
||||
|
||||
@@ -10,5 +10,5 @@ void main()
|
||||
v_uv0 = a_texcoord0;
|
||||
v_wpos = mul(u_model[0], vec4(a_position, 1.0)).xyz;
|
||||
|
||||
v_normal = normalize(mul((mat3)u_model[0], a_normal));
|
||||
v_normal = normalize(mul(mat3(u_model[0]), a_normal));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user