X-Git-Url: http://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=tim%2Fprune%2Fthreedee%2FThreeDModel.java;h=abe166c837f88d5c65def6dd947eeedd9b4209f7;hp=ddf91623b717309daf1bb3bfcd82dadefe850097;hb=326f489e36aa7f235bc19409a57bf4955cd50f24;hpb=8c8868ae29b3252f02e094c02307384cf61ba667

diff --git a/tim/prune/threedee/ThreeDModel.java b/tim/prune/threedee/ThreeDModel.java
index ddf9162..abe166c 100644
--- a/tim/prune/threedee/ThreeDModel.java
+++ b/tim/prune/threedee/ThreeDModel.java
@@ -12,6 +12,7 @@ import tim.prune.data.Track;
 public class ThreeDModel
 {
 	private Track _track = null;
+	private Track _terrainTrack = null;
 	private PointScaler _scaler = null;
 	private double _scaleFactor = 1.0;
 	private double _altFactor = 1.0;
@@ -36,6 +37,14 @@ public class ThreeDModel
 	}
 
 
+	/**
+	 * @param inTrack terrain track to set
+	 */
+	public void setTerrain(Track inTrack)
+	{
+		_terrainTrack = inTrack;
+	}
+
 	/**
 	 * @return the number of points in the model
 	 */
@@ -50,9 +59,7 @@ public class ThreeDModel
 	 */
 	public void setAltitudeFactor(double inFactor)
 	{
-		if (inFactor >= 1.0) {
-			_altFactor = inFactor;
-		}
+		_altFactor = inFactor;
 	}
 
 	/**
@@ -70,6 +77,7 @@ public class ThreeDModel
 	{
 		// Use PointScaler to sort out x and y values
 		_scaler = new PointScaler(_track);
+		_scaler.addTerrain(_terrainTrack);
 		_scaler.scale(); // Add 10% border
 
 		// cap altitude scale factor if it's too big
@@ -77,7 +85,7 @@ public class ThreeDModel
 		if (maxAlt > 0.5)
 		{
 			// capped
-			//System.out.println("Capped alt factor from " + _altFactor + " to " + (_altFactor * 0.5 / maxAlt));
+			// System.out.println("Capped alt factor from " + _altFactor + " to " + (_altFactor * 0.5 / maxAlt));
 			_altFactor = _altFactor * 0.5 / maxAlt;
 		}
 
@@ -134,12 +142,47 @@ public class ThreeDModel
 	{
 		// if no altitude, just return 0
 		double altVal = _scaler.getAltValue(inIndex);
-		if (altVal < 0) return 0;
+		if (altVal <= 0.0) return 0.0;
 		// scale according to exaggeration factor
 		return altVal * _altFactor * _externalScaleFactor;
 	}
 
 
+	/**
+	 * Get the scaled horizontal value for the specified terrain point
+	 * @param inIndex index of point
+	 * @return scaled horizontal value
+	 */
+	public double getScaledTerrainHorizValue(int inIndex)
+	{
+		return _scaler.getTerrainHorizValue(inIndex) * _scaleFactor * _externalScaleFactor;
+	}
+
+	/**
+	 * Get the scaled vertical value for the specified terrain point
+	 * @param inIndex index of point
+	 * @return scaled vertical value
+	 */
+	public double getScaledTerrainVertValue(int inIndex)
+	{
+		return _scaler.getTerrainVertValue(inIndex) * _scaleFactor * _externalScaleFactor;
+	}
+
+	/**
+	 * Get the scaled altitude value for the specified terrain point
+	 * @param inIndex index of point
+	 * @return scaled altitude value
+	 */
+	public double getScaledTerrainValue(int inIndex)
+	{
+		// if no altitude, just return 0
+		double altVal = _scaler.getTerrainAltValue(inIndex);
+		if (altVal <= 0.0) return 0.0;
+		// don't scale by scale factor, needs to be unscaled
+		return altVal * _altFactor;
+	}
+
+
 	/**
 	 * @param inIndex index of point, starting at 0
 	 * @return point type, either POINT_TYPE_WAYPOINT or POINT_TYPE_NORMAL_POINT