xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Location renderer improvements #321

Browse Source
This commit is contained in:
Emux 2017-03-29 13:28:04 +03:00
parent c6be08a903
commit 347c1d31bb
4 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vtm/resources/assets/shaders/location_1.glsl
View File

@ -7,8 +7,8 @@ uniform float u_scale;
attribute vec2 a_pos;
varying vec2 v_tex;
void main() {
gl_Position = u_mvp * vec4(a_pos * u_scale * u_phase, 0.0, 1.0);
v_tex = a_pos;
gl_Position = u_mvp * vec4(a_pos * u_scale * u_phase, 0.0, 1.0);
v_tex = a_pos;
}
$$
@ -23,7 +23,7 @@ uniform vec2 u_dir;
uniform int u_mode;
void main() {
float len = 1.0 - length(v_tex);
if (u_mode == 1) {
if (u_mode == -1) {
gl_FragColor = vec4(0.2, 0.2, 0.8, 1.0) * len;
} else {
// outer ring

6
vtm/resources/assets/shaders/location_1_reverse.glsl
View File

@ -7,8 +7,8 @@ uniform float u_scale;
attribute vec2 a_pos;
varying vec2 v_tex;
void main() {
gl_Position = u_mvp * vec4(a_pos * u_scale * u_phase, 0.0, 1.0);
v_tex = a_pos;
gl_Position = u_mvp * vec4(a_pos * u_scale * u_phase, 0.0, 1.0);
v_tex = a_pos;
}
$$
@ -23,7 +23,7 @@ uniform vec2 u_dir;
uniform int u_mode;
void main() {
float len = 1.0 - length(v_tex);
if (u_mode == 1) {
if (u_mode == -1) {
gl_FragColor = vec4(0.2, 0.2, 0.8, 1.0) * len;
} else {
// outer ring

6
vtm/resources/assets/shaders/location_2.glsl
View File

@ -7,8 +7,8 @@ uniform float u_scale;
attribute vec2 a_pos;
varying vec2 v_tex;
void main() {
gl_Position = u_mvp * vec4(a_pos * u_scale * u_phase, 0.0, 1.0);
v_tex = a_pos;
gl_Position = u_mvp * vec4(a_pos * u_scale * u_phase, 0.0, 1.0);
v_tex = a_pos;
}
$$
@ -23,7 +23,7 @@ uniform vec2 u_dir;
uniform int u_mode;
void main() {
float len = 1.0 - length(v_tex);
if (u_mode == 1) {
if (u_mode == -1) {
gl_FragColor = vec4(0.2, 0.2, 0.8, 1.0) * len;
} else {
// outer ring

10
vtm/src/org/oscim/renderer/LocationRenderer.java
View File

@ -234,11 +234,13 @@ public class LocationRenderer extends LayerRenderer {
gl.uniform2f(hDirection,
(float) Math.cos(Math.toRadians(rotation)),
(float) Math.sin(Math.toRadians(rotation)));
gl.uniform1i(uMode, 3); // With bearing
} else
gl.uniform1i(uMode, 2); // Without bearing
gl.uniform1i(uMode, 1); // With bearing
} else {
gl.uniform2f(hDirection, 0, 0);
gl.uniform1i(uMode, 0); // Without bearing
}
} else
gl.uniform1i(uMode, 1); // Outside screen
gl.uniform1i(uMode, -1); // Outside screen
gl.drawArrays(GL.TRIANGLE_STRIP, 0, 4);
}