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

cleanup

Browse Source
This commit is contained in:
Hannes Janetzek 2013-02-22 08:29:56 +01:00
parent d64988a56a
commit 8aab183d1a
4 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/org/oscim/renderer/GLState.java
View File

@ -17,9 +17,6 @@ package org.oscim.renderer;
import android.opengl.GLES20; import android.opengl.GLES20;
import android.util.Log; import android.util.Log;
/**
* @author Hannes Janetzek
*/
public class GLState { public class GLState {
private final static String TAG = GLState.class.getName(); private final static String TAG = GLState.class.getName();

6
src/org/oscim/renderer/LineRenderer.java
View File

@ -111,9 +111,6 @@ public final class LineRenderer {
public static Layer draw(Layers layers, Layer curLayer, MapPosition pos, public static Layer draw(Layers layers, Layer curLayer, MapPosition pos,
float[] matrix, float div, int mode) { float[] matrix, float div, int mode) {
int zoom = pos.zoomLevel;
float scale = pos.scale;
if (curLayer == null) if (curLayer == null)
return null; return null;
@ -133,6 +130,9 @@ public final class LineRenderer {
glUniformMatrix4fv(hLineMatrix[mode], 1, false, matrix, 0); glUniformMatrix4fv(hLineMatrix[mode], 1, false, matrix, 0);
int zoom = pos.zoomLevel;
float scale = pos.scale;
// Line scale factor for non fixed lines: Within a zoom- // Line scale factor for non fixed lines: Within a zoom-
// level lines would be scaled by the factor 2 by view-matrix. // level lines would be scaled by the factor 2 by view-matrix.
// Though lines should only scale by sqrt(2). This is achieved // Though lines should only scale by sqrt(2). This is achieved

4
src/org/oscim/renderer/MapTile.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012, 2013 OpenScienceMap * Copyright 2012, 2013 Hannes Janetzek
* *
* This program is free software: you can redistribute it and/or modify it under the * This program is free software: you can redistribute it and/or modify it under the
* terms of the GNU Lesser General License as published by the Free Software * terms of the GNU Lesser General License as published by the Free Software
@ -21,8 +21,6 @@ import org.oscim.renderer.layer.TextItem;
/** /**
* Extends Tile class for concurrent use in TileManager, * Extends Tile class for concurrent use in TileManager,
* TileGenerator and GLRenderer threads. * TileGenerator and GLRenderer threads.
*
* @author Hannes Janetzek
*/ */
public final class MapTile extends JobTile { public final class MapTile extends JobTile {

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

@ -229,10 +229,6 @@ public final class Line extends RenderInstruction {
this.fade = fade; this.fade = fade;
this.stipple = stipple; this.stipple = stipple;
this.min = min; this.min = min;
if (stipple != 0){
System.out.println("a");
}
} }