diff options
Diffstat (limited to 'src/example/04_bloom')
| -rw-r--r-- | src/example/04_bloom/04_bloom.c | 4 | ||||
| -rw-r--r-- | src/example/04_bloom/postprocess.c | 6 | ||||
| -rw-r--r-- | src/example/04_bloom/preprocess.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/example/04_bloom/04_bloom.c b/src/example/04_bloom/04_bloom.c index 037a9e1..8115fcf 100644 --- a/src/example/04_bloom/04_bloom.c +++ b/src/example/04_bloom/04_bloom.c @@ -10,7 +10,7 @@ static int cube[] = { 2, 6, 3, 3, 6, 7 }; -static Vert verts[] = { +static Vertex verts[] = { {0, {1, 1, 1}, {1, 1, 1}, zerovec4, {1, 1}, 0xffff0000}, {1, {-1, 1, 1}, {-1, 1, 1}, zerovec4, {0, 1},0xff00ff00}, {2, {-1, -1, 1}, {-1, -1, 1}, zerovec4, {0, 0}, 0xff0000ff}, @@ -79,7 +79,7 @@ void onupdatebloom(void*data) { static void renderquad() { /*È«ÆÁÌØЧ*/ - static Vert verts[] = { + static Vertex verts[] = { {0, {1, 1, 0}, zerovec3, zerovec3, {1, 1}, 0}, {1, {-1, 1, 0}, zerovec3, zerovec3, {0, 1},0}, {2, {-1, -1, 0}, zerovec3, zerovec3, {0, 0}, 0}, diff --git a/src/example/04_bloom/postprocess.c b/src/example/04_bloom/postprocess.c index c305726..fe58b96 100644 --- a/src/example/04_bloom/postprocess.c +++ b/src/example/04_bloom/postprocess.c @@ -9,10 +9,10 @@ static float weight[5] = { 0.2270270270, 0.1945945946, 0.1216216216, 0.0540540541, 0.0162162162 }; -static void vert(UniformCollection* uniforms, VertexShaderIn* in, Vec4* clipcoord) { - clipcoord->xyz = in->vertex->position; +static void vert(UniformCollection* uniforms, Vertex* in, Vec4* clipcoord) { + clipcoord->xyz = in->position; clipcoord->w = 1; - *_texcoord = in->vertex->texcoord; + *_texcoord = in->texcoord; } static bool frag(UniformCollection* uniforms, Color32* color) { diff --git a/src/example/04_bloom/preprocess.c b/src/example/04_bloom/preprocess.c index 8dd2170..f02195f 100644 --- a/src/example/04_bloom/preprocess.c +++ b/src/example/04_bloom/preprocess.c @@ -5,10 +5,10 @@ /*varyings*/ #define _color reg_v4_00 -static void vert(UniformCollection* uniforms, VertexShaderIn* in, Vec4* clipcoord) { - static Vec4 p; p.xyz = in->vertex->position; p.w = 1; +static void vert(UniformCollection* uniforms, Vertex* in, Vec4* clipcoord) { + static Vec4 p; p.xyz = in->position; p.w = 1; internal_mat4_mulvec4(uniforms->mvp, &p, clipcoord); - color_tocolor32(in->vertex->color, _color); + color_tocolor32(in->color, _color); } /*multi target*/ |