projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
whole
[carveJwlIkooP6JGAAIwe30JlM.git]
/
shaders
/
scoretext.h
diff --git
a/shaders/scoretext.h
b/shaders/scoretext.h
index 3e499bb3ba6de382cab2904eba526c18c6e49332..99b702c088c0f418bcbac3a54ad68ad8e190a205 100644
(file)
--- a/
shaders/scoretext.h
+++ b/
shaders/scoretext.h
@@
-11,8
+11,10
@@
static struct vg_shader _shader_scoretext = {
.static_src =
"layout (location=0) in vec3 a_co;\n"
"layout (location=1) in vec3 a_norm;\n"
.static_src =
"layout (location=0) in vec3 a_co;\n"
"layout (location=1) in vec3 a_norm;\n"
-"layout (location=2) in vec4 a_colour;\n"
-"layout (location=3) in vec2 a_uv;\n"
+"layout (location=2) in vec2 a_uv;\n"
+"layout (location=3) in vec4 a_colour;\n"
+"layout (location=4) in vec4 a_weights;\n"
+"layout (location=5) in ivec4 a_groups;\n"
"\n"
"#line 2 0 \n"
"\n"
"\n"
"#line 2 0 \n"
"\n"
@@
-29,7
+31,7
@@
static struct vg_shader _shader_scoretext = {
"\n"
"void main()\n"
"{\n"
"\n"
"void main()\n"
"{\n"
-" float w =
a_colour.g + fract(uInfo.z+0.5)-0.75
;\n"
+" float w =
(a_colour.g * 8.0)-5.5 + fract(uInfo.z+0.5)
;\n"
" float c = -cos(w*0.2);\n"
" float s = -sin(w*0.2);\n"
" float r = 0.2;\n"
" float c = -cos(w*0.2);\n"
" float s = -sin(w*0.2);\n"
" float r = 0.2;\n"