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

move near plane back, fixes clipping issue with most large buildings

Browse Source
This commit is contained in:
Hannes Janetzek
2013-01-12 13:37:34 +01:00
parent c462793b99
commit b8287f9ecf
2 changed files with 18 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/org/oscim/view/MapViewPosition.java
View File

@@ -26,7 +26,6 @@ import org.oscim.core.MapPosition;
import org.oscim.core.MercatorProjection;
import org.oscim.core.Tile;
import org.oscim.utils.FastMath;
import org.oscim.utils.GeometryUtils;
import org.oscim.utils.GeometryUtils.Point2D;
import org.oscim.utils.GlUtils;
@@ -98,8 +97,8 @@ public class MapViewPosition {
private float mHeight, mWidth;
public final static float VIEW_DISTANCE = 3.0f;
public final static float VIEW_NEAR = 2;
public final static float VIEW_FAR = 7;
public final static float VIEW_NEAR = 1;
public final static float VIEW_FAR = 6;
// scale map plane at VIEW_DISTANCE to near plane
public final static float VIEW_SCALE = (VIEW_NEAR / VIEW_DISTANCE) * 0.5f;
@@ -163,22 +162,6 @@ public class MapViewPosition {
return true;
}
public static byte calcLinesIntersect(
double ax2, double ay2,
double bx1, double by1,
double bx2, double by2,
GeometryUtils.Point2D point)
{
double ua_numr = (bx2 - bx1) * (-by1) - (by2 - by1) * (-bx1);
double denr = (by2 - by1) * (ax2) - (bx2 - bx1) * (ay2);
double ua = ua_numr / denr;
point.x = ua * ax2;
point.y = ua * ay2;
return 1;
}
// get the z-value of the map-plane for a point on screen
private float getZ(float y) {
// calculate the intersection of a ray from