projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shaders updated
[carveJwlIkooP6JGAAIwe30JlM.git]
/
shaders
/
gate.h
diff --git
a/shaders/gate.h
b/shaders/gate.h
index 58e80bc5aea9af734f86afaf7668b2382af1d7fc..7b5b31f4dd2d31a0a44bf1e55a64db6b55ceb8ce 100644
(file)
--- a/
shaders/gate.h
+++ b/
shaders/gate.h
@@
-7,12
+7,13
@@
static struct vg_shader _shader_gate = {
.link = shader_gate_link,
.vs =
{
.link = shader_gate_link,
.vs =
{
-.orig_file = "../shaders/gate.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"
"uniform mat4 uPv;\n"
"\n"
"#line 2 0 \n"
"uniform mat4 uPv;\n"
@@
-34,7
+35,6
@@
static struct vg_shader _shader_gate = {
""},
.fs =
{
""},
.fs =
{
-.orig_file = "../shaders/gate.fs",
.static_src =
"out vec4 FragColor;\n"
"\n"
.static_src =
"out vec4 FragColor;\n"
"\n"
@@
-74,25
+74,25
@@
static GLuint _uniform_gate_uInvRes;
static GLuint _uniform_gate_uTime;
static GLuint _uniform_gate_uCam;
static void shader_gate_uPv(m4x4f m){
static GLuint _uniform_gate_uTime;
static GLuint _uniform_gate_uCam;
static void shader_gate_uPv(m4x4f m){
- glUniformMatrix4fv(
_uniform_gate_uPv, 1, GL_FALSE, (float *)m
);
+ glUniformMatrix4fv(
_uniform_gate_uPv,1,GL_FALSE,(float*)m
);
}
static void shader_gate_uMdl(m4x3f m){
}
static void shader_gate_uMdl(m4x3f m){
- glUniformMatrix4x3fv(
_uniform_gate_uMdl, 1, GL_FALSE, (float *)m
);
+ glUniformMatrix4x3fv(
_uniform_gate_uMdl,1,GL_FALSE,(float*)m
);
}
static void shader_gate_uTexMain(int i){
}
static void shader_gate_uTexMain(int i){
- glUniform1i(
_uniform_gate_uTexMain, i
);
+ glUniform1i(
_uniform_gate_uTexMain,i
);
}
static void shader_gate_uTexWater(int i){
}
static void shader_gate_uTexWater(int i){
- glUniform1i(
_uniform_gate_uTexWater, i
);
+ glUniform1i(
_uniform_gate_uTexWater,i
);
}
static void shader_gate_uInvRes(v2f v){
}
static void shader_gate_uInvRes(v2f v){
- glUniform2fv(
_uniform_gate_uInvRes, 1, v
);
+ glUniform2fv(
_uniform_gate_uInvRes,1,v
);
}
static void shader_gate_uTime(float f){
}
static void shader_gate_uTime(float f){
- glUniform1f(
_uniform_gate_uTime, f
);
+ glUniform1f(
_uniform_gate_uTime,f
);
}
static void shader_gate_uCam(v3f v){
}
static void shader_gate_uCam(v3f v){
- glUniform3fv(
_uniform_gate_uCam, 1, v
);
+ glUniform3fv(
_uniform_gate_uCam,1,v
);
}
static void shader_gate_register(void){
vg_shader_register( &_shader_gate );
}
static void shader_gate_register(void){
vg_shader_register( &_shader_gate );