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

Render themes: Cap modes, fix #417

Browse Source
This commit is contained in:
Emux 2017-09-28 12:55:44 +03:00
parent 67195bbc0c
commit 3d92807d26
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
vtm/src/org/oscim/renderer/bucket/LineBucket.java
View File

@ -306,10 +306,10 @@ public class LineBucket extends RenderBucket {
float tx = vPrevX;
float ty = vPrevY;
if (squared) {
if (!rounded && !squared) {
tx = 0;
ty = 0;
} else if (!outside) {
} else if (rounded) {
tx *= 0.5;
ty *= 0.5;
}
@ -475,10 +475,10 @@ public class LineBucket extends RenderBucket {
dy = (short) (0 | ddy & DIR_MASK);
} else {
if (squared) {
if (!rounded && !squared) {
vPrevX = 0;
vPrevY = 0;
} else if (!outside) {
} else if (rounded) {
vPrevX *= 0.5;
vPrevY *= 0.5;
}
@ -679,13 +679,12 @@ public class LineBucket extends RenderBucket {
}
/* Cap mode */
//if (line.width < 1.5/* || line.fixed*/) {
// if (capMode != CAP_THIN) {
// capMode = CAP_THIN;
// gl.uniform1f(uLineMode, capMode);
// }
//} else
if (lb.roundCap) {
if (lb.scale < 1.5/* || lb.line.fixed*/) {
if (capMode != CAP_THIN) {
capMode = CAP_THIN;
gl.uniform1f(uLineMode, capMode);
}
} else if (lb.roundCap) {
if (capMode != CAP_ROUND) {
capMode = CAP_ROUND;
gl.uniform1f(uLineMode, capMode);