BlackMATov/enduro2d
1
0
Fork 0
mirror of https://github.com/enduro2d/enduro2d.git synced 2025-12-14 16:09:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix spine shaders after merge

Browse Source
This commit is contained in:
Matvey Cherevko
2019-08-23 01:09:51 +07:00
parent 2a26b08cf5
commit 87584e493a
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
samples/bin/library/spine_shader.frag
View File

@@ -1,10 +1,8 @@
#version 120
uniform sampler2D u_texture;
varying vec4 v_tint;
varying vec2 v_st;
varying vec2 v_st0;
varying vec4 v_color0;
void main() {
gl_FragColor = texture2D(u_texture, v_st) * v_tint;
gl_FragColor = texture2D(u_texture, v_st0) * v_color0;
}

20
samples/bin/library/spine_shader.vert
View File

@@ -1,16 +1,18 @@
#version 120
uniform mat4 u_matrix_vp;
attribute vec3 a_vertex;
attribute vec4 a_tint;
attribute vec2 a_st;
attribute vec2 a_st0;
attribute vec4 a_color0;
varying vec4 v_tint;
varying vec2 v_st;
varying vec2 v_st0;
varying vec4 v_color0;
vec4 vertex_to_homo(vec3 pos) {
return vec4(pos, 1.0) * u_matrix_vp;
}
void main() {
v_st = a_st;
v_tint = a_tint;
gl_Position = vec4(a_vertex, 1.0) * u_matrix_vp;
v_st0 = a_st0;
v_color0 = a_color0;
gl_Position = vertex_to_homo(a_vertex);
}

4
samples/sources/sample_07/sample_07.cpp
View File

@@ -112,8 +112,8 @@ namespace
.set_animation(0, "animation", true));
node_iptr coin_n = coin_i->get_component<actor>().get().node();
coin_n->scale(v3f(0.125f));
coin_n->translation(v3f{200.0f, 200.0f, 0.0f});
coin_n->scale(v3f(0.25f));
coin_n->translation(v3f{200.0f, 180.0f, 0.0f});
raptor_gobj_ = the<world>().instantiate();
raptor_gobj_->entity_filler()