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

- start to extract android graphics dependency

Browse Source 
- make IRenderThemeCallback more consistent
This commit is contained in:
Hannes Janetzek
2013-04-11 17:38:38 +02:00
parent 18a8b292d2
commit eb6778a907
19 changed files with 265 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/org/oscim/renderer/layer/LineLayer.java
View File

@@ -17,15 +17,14 @@ package org.oscim.renderer.layer;
import java.nio.ShortBuffer;
import org.oscim.core.Tile;
import org.oscim.graphics.Paint.Cap;
import org.oscim.renderer.GLRenderer;
import org.oscim.theme.renderinstruction.Line;
import org.oscim.utils.FastMath;
import org.oscim.view.MapView;
import android.graphics.Paint.Cap;
/**
* @author Hannes Janetzek
*/
public final class LineLayer extends Layer {
private static final float COORD_SCALE = GLRenderer.COORD_SCALE;

23
src/org/oscim/renderer/layer/TextLayer.java
View File

@@ -14,10 +14,10 @@
*/
package org.oscim.renderer.layer;
import org.oscim.graphics.Canvas;
import org.oscim.graphics.Graphics;
import org.oscim.renderer.TextureRenderer;
import android.graphics.Canvas;
public final class TextLayer extends TextureLayer {
//private static String TAG = TextureLayer.class.getName();
@@ -39,7 +39,7 @@ public final class TextLayer extends TextureLayer {
public TextLayer() {
type = Layer.SYMBOL;
mCanvas = new Canvas();
mCanvas = Graphics.res.getCanvas();
fixed = true;
}
@@ -139,13 +139,15 @@ public final class TextLayer extends TextureLayer {
float hw = width / 2.0f;
float hh = height / 2.0f;
float hh2 = 0;
if (!it.text.caption) {
// displace by baseline
float desc = it.text.fontDescent / 2;
hh2 = hh + desc;
hh = hh - desc;
}
float hh2 = hh;
//if (!it.text.caption) {
// // displace by baseline
// float desc = 0; //(hh - (height - it.text.fontDescent) / 2);
//
// //float desc = it.text.fontDescent / 2;
// hh2 = hh + desc;
// hh = hh - desc;
//}
// texture coordinates
short u1 = (short) (SCALE * x);
@@ -240,7 +242,6 @@ public final class TextLayer extends TextureLayer {
buf[pos++] = u2;
buf[pos++] = v1;
// six indices to draw the four vertices
numIndices += TextureRenderer.INDICES_PER_SPRITE;
verticesCnt += 4;

4
src/org/oscim/renderer/overlays/GridOverlay.java
View File

@@ -16,6 +16,8 @@ package org.oscim.renderer.overlays;
import org.oscim.core.MapPosition;
import org.oscim.core.Tile;
import org.oscim.graphics.Color;
import org.oscim.graphics.Paint.Cap;
import org.oscim.renderer.GLRenderer.Matrices;
import org.oscim.renderer.layer.Layer;
import org.oscim.renderer.layer.LineLayer;
@@ -25,8 +27,6 @@ import org.oscim.theme.renderinstruction.Line;
import org.oscim.theme.renderinstruction.Text;
import org.oscim.view.MapView;
import android.graphics.Color;
import android.graphics.Paint.Cap;
public class GridOverlay extends BasicOverlay {

4
src/org/oscim/renderer/overlays/TextOverlay.java
View File

@@ -33,6 +33,8 @@ import java.util.HashMap;
import org.oscim.core.MapPosition;
import org.oscim.core.Tile;
import org.oscim.generator.JobTile;
import org.oscim.graphics.Color;
import org.oscim.graphics.Paint.Cap;
import org.oscim.renderer.BufferObject;
import org.oscim.renderer.GLRenderer;
import org.oscim.renderer.GLRenderer.Matrices;
@@ -56,8 +58,6 @@ import org.oscim.utils.pool.Pool;
import org.oscim.view.MapView;
import org.oscim.view.MapViewPosition;
import android.graphics.Color;
import android.graphics.Paint.Cap;
import android.opengl.GLES20;
import android.os.SystemClock;