projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix major overstep with last commit
[carveJwlIkooP6JGAAIwe30JlM.git]
/
shaders
/
character.h
diff --git
a/shaders/character.h
b/shaders/character.h
index e592a94cddb753285badc6a66d3906bee818150d..8265c37ba44489da271579bcb814a364aba59408 100644
(file)
--- a/
shaders/character.h
+++ b/
shaders/character.h
@@
-7,12
+7,14
@@
static struct vg_shader _shader_character = {
.link = shader_character_link,
.vs =
{
.link = shader_character_link,
.vs =
{
-.orig_file = "../shaders/character.vs",
+.orig_file = "../
../
shaders/character.vs",
.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"
@@
-43,7
+45,7
@@
static struct vg_shader _shader_character = {
""},
.fs =
{
""},
.fs =
{
-.orig_file = "../shaders/character.fs",
+.orig_file = "../
../
shaders/character.fs",
.static_src =
"out vec4 FragColor;\n"
"\n"
.static_src =
"out vec4 FragColor;\n"
"\n"