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

cleanups

Browse Source
This commit is contained in:
Hannes Janetzek 2013-02-24 10:20:58 +01:00
parent aaafe0cddc
commit 54d3fe332b
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/oscim/jni/TriangleJNI.java
View File

@ -53,7 +53,7 @@ public class TriangleJNI {
* !!! NOT for general use!!! - this is specifically for ExtrusionLayer * !!! NOT for general use!!! - this is specifically for ExtrusionLayer
* . * .
* *
* @param points points to use: array of x,y coordinates * @param points an array of x,y coordinates
* @param numRings number of rings in polygon == outer(1) + inner rings * @param numRings number of rings in polygon == outer(1) + inner rings
* @param io input: 1. number of all points, 2.. number of points in rings - * @param io input: 1. number of all points, 2.. number of points in rings -
* times 2! * times 2!

2
src/org/oscim/renderer/overlays/TestLineOverlay.java
View File

@ -150,7 +150,7 @@ public class TestLineOverlay extends RenderOverlay {
testProgram = GlUtils.createProgram(testVertexShader, testProgram = GlUtils.createProgram(testVertexShader,
testFragmentShader); testFragmentShader);
if (testProgram == 0) { if (testProgram == 0) {
Log.e("blah", "Could not create test program."); Log.e("...", "Could not create test program.");
return; return;
} }
htestMatrix = GLES20.glGetUniformLocation(testProgram, "u_mvp"); htestMatrix = GLES20.glGetUniformLocation(testProgram, "u_mvp");

11
src/org/oscim/theme/renderinstruction/Line.java
View File

@ -172,7 +172,9 @@ public final class Line extends RenderInstruction {
public final float[] stippleColor; public final float[] stippleColor;
public final float stippleWidth; public final float stippleWidth;
private Line(int level, String style, float[] stroke, float width,
private Line(int level, String style, float[] color, float width,
Cap cap, boolean fixed, Cap cap, boolean fixed,
int stipple, float[] stippleColor, float stippleWidth, int stipple, float[] stippleColor, float stippleWidth,
int fade, float blur, boolean isOutline, float min) { int fade, float blur, boolean isOutline, float min) {
@ -194,8 +196,10 @@ public final class Line extends RenderInstruction {
// paint.setPathEffect(new DashPathEffect(strokeDasharray, 0)); // paint.setPathEffect(new DashPathEffect(strokeDasharray, 0));
// } // }
//GlUtils.changeSaturation(color, 1.02f);
this.cap = cap; this.cap = cap;
this.color = stroke; this.color = color;
this.width = width; this.width = width;
this.fixed = fixed; this.fixed = fixed;
@ -235,7 +239,7 @@ public final class Line extends RenderInstruction {
this.fade = -1; this.fade = -1;
this.stipple = stipple; this.stipple = stipple;
this.stippleColor = null; this.stippleColor = null;
this.stippleWidth = 0; this.stippleWidth = 0.6f;
this.min = 0; this.min = 0;
color = GlUtils.colorToFloatP(stroke); color = GlUtils.colorToFloatP(stroke);
} }
@ -250,5 +254,4 @@ public final class Line extends RenderInstruction {
// paint.setStrokeWidth(strokeWidth * scaleFactor); // paint.setStrokeWidth(strokeWidth * scaleFactor);
// } // }
} }

2
src/org/oscim/view/MapView.java
View File

@ -193,7 +193,9 @@ public class MapView extends RelativeLayout {
mOverlayManager.add(new BuildingOverlay(this)); mOverlayManager.add(new BuildingOverlay(this));
mOverlayManager.add(new LabelingOverlay(this)); mOverlayManager.add(new LabelingOverlay(this));
//mOverlayManager.add(new GenericOverlay(this, new TestLineOverlay(this)));
//mOverlayManager.add(new GenericOverlay(this, new TestOverlay(this))); //mOverlayManager.add(new GenericOverlay(this, new TestOverlay(this)));
// if (testRegionZoom) // if (testRegionZoom)
// mRegionLookup = new RegionLookup(this); // mRegionLookup = new RegionLookup(this);