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

rename COORD_MULTIPLIER to COORD_SCALE

Browse Source
This commit is contained in:
Hannes Janetzek
2013-03-09 12:25:09 +01:00
parent b3b392bdb8
commit c0a08c11c8
11 changed files with 62 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,7 +36,7 @@ import android.util.Log;
*/
public class ExtrusionLayer extends Layer {
private final static String TAG = ExtrusionLayer.class.getName();
private static final float S = GLRenderer.COORD_MULTIPLIER;
private static final float S = GLRenderer.COORD_SCALE;
private int mNumVertices = 0;
private final VertexPoolItem mVertices;
private VertexPoolItem mCurVertices;

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

@@ -28,7 +28,7 @@ import android.graphics.Paint.Cap;
* @author Hannes Janetzek
*/
public final class LineLayer extends Layer {
private static final float COORD_SCALE = GLRenderer.COORD_MULTIPLIER;
private static final float COORD_SCALE = GLRenderer.COORD_SCALE;
// scale factor mapping extrusion vector to short values
public static final float DIR_SCALE = 2048;
// mask for packing last two bits of extrusion vector with texture

2
src/org/oscim/renderer/layer/LineTexLayer.java
View File

@@ -65,7 +65,7 @@ public final class LineTexLayer extends Layer {
// - in our case there is always the polygon fill array at start
// - see addLine hack otherwise.
private static final float COORD_SCALE = GLRenderer.COORD_MULTIPLIER;
private static final float COORD_SCALE = GLRenderer.COORD_SCALE;
// scale factor mapping extrusion vector to short values
public static final float DIR_SCALE = 2048;

2
src/org/oscim/renderer/layer/PolygonLayer.java
View File

@@ -21,7 +21,7 @@ import org.oscim.renderer.GLRenderer;
import org.oscim.theme.renderinstruction.Area;
public final class PolygonLayer extends Layer {
private static final float S = GLRenderer.COORD_MULTIPLIER;
private static final float S = GLRenderer.COORD_SCALE;
public Area area;