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

refactor: use getColor()

Browse Source
This commit is contained in:
Hannes Janetzek 2013-01-05 21:53:41 +01:00
parent ed39f9fe34
commit a61d2d4804
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/org/oscim/renderer/layer/ExtrusionLayer.java
View File

@ -182,6 +182,12 @@ public class ExtrusionLayer extends Layer {
} }
} }
private static short getColor(float vx, float vy) {
float a = (float) Math.sqrt(vx * vx + vy * vy);
float vlight = vx > 0 ? (vx / a) : -(vx / a);
return (short) (220 + (35 * vlight));
}
private boolean addOutline(float[] points, int pos, int len, float height, boolean convex) { private boolean addOutline(float[] points, int pos, int len, float height, boolean convex) {
// add two vertices for last face to make zigzag indices work // add two vertices for last face to make zigzag indices work
@ -201,11 +207,7 @@ public class ExtrusionLayer extends Layer {
// vector from previous point // vector from previous point
float ux, uy; float ux, uy;
float ca = (float) Math.sqrt(vx * vx + vy * vy); short color1 = getColor(vx, vy);
float vlight = vx > 0 ? (vx / ca) : -(vx / ca) - 0.1f;
//float vlight = vx / ca;
short color1 = (short) (230 + (25 * vlight));
short fcolor = color1; short fcolor = color1;
short color2 = 0; short color2 = 0;
@ -261,10 +263,7 @@ public class ExtrusionLayer extends Layer {
vx = nx - cx; vx = nx - cx;
vy = ny - cy; vy = ny - cy;
ca = (float) Math.sqrt(vx * vx + vy * vy); color2 = getColor(vx, vy);
vlight = vx > 0 ? (vx / ca) : -(vx / ca) - 0.1f;
//vlight = vx / ca;
color2 = (short) (230 + (25 * vlight));
short c; short c;
if (even == 0) if (even == 0)