]> gitweb.fperrin.net Git - GpsPrune.git/blobdiff - tim/prune/threedee/Java3DWindow.java
Version 19, May 2018
[GpsPrune.git] / tim / prune / threedee / Java3DWindow.java
index e65d53de50c2f70f1aca7492e5489dad343f4e11..579245db62eb2d07a08d005529f234ea13fa4bb4 100644 (file)
@@ -7,6 +7,8 @@ import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsEnvironment;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
 import java.awt.geom.GeneralPath;
 
 import javax.media.j3d.AmbientLight;
@@ -16,12 +18,16 @@ import javax.media.j3d.BranchGroup;
 import javax.media.j3d.Canvas3D;
 import javax.media.j3d.Font3D;
 import javax.media.j3d.FontExtrusion;
+import javax.media.j3d.GeometryArray;
 import javax.media.j3d.GraphicsConfigTemplate3D;
 import javax.media.j3d.Group;
 import javax.media.j3d.Material;
 import javax.media.j3d.PointLight;
+import javax.media.j3d.QuadArray;
 import javax.media.j3d.Shape3D;
 import javax.media.j3d.Text3D;
+import javax.media.j3d.Texture;
+import javax.media.j3d.TextureAttributes;
 import javax.media.j3d.Transform3D;
 import javax.media.j3d.TransformGroup;
 import javax.swing.JButton;
@@ -32,31 +38,44 @@ import javax.vecmath.Color3f;
 import javax.vecmath.Matrix3d;
 import javax.vecmath.Point3d;
 import javax.vecmath.Point3f;
+import javax.vecmath.TexCoord2f;
 import javax.vecmath.Vector3d;
 
+import tim.prune.DataStatus;
+import tim.prune.FunctionLibrary;
+import tim.prune.I18nManager;
+import tim.prune.data.Track;
+import tim.prune.function.Export3dFunction;
+import tim.prune.function.srtm.LookupSrtmFunction;
+import tim.prune.gui.map.MapSourceLibrary;
+import tim.prune.save.GroutedImage;
+import tim.prune.save.MapGrouter;
+
 import com.sun.j3d.utils.behaviors.vp.OrbitBehavior;
 import com.sun.j3d.utils.geometry.Box;
 import com.sun.j3d.utils.geometry.Cylinder;
+import com.sun.j3d.utils.geometry.GeometryInfo;
+import com.sun.j3d.utils.geometry.NormalGenerator;
 import com.sun.j3d.utils.geometry.Sphere;
+import com.sun.j3d.utils.image.TextureLoader;
 import com.sun.j3d.utils.universe.SimpleUniverse;
 
-import tim.prune.App;
-import tim.prune.I18nManager;
-import tim.prune.data.Altitude;
-import tim.prune.data.Track;
-
 
 /**
  * Class to hold main window for java3d view of data
  */
 public class Java3DWindow implements ThreeDWindow
 {
-       private App _app = null;
        private Track _track = null;
        private JFrame _parentFrame = null;
        private JFrame _frame = null;
+       private ThreeDModel _model = null;
        private OrbitBehavior _orbit = null;
-       private int _altitudeCap = ThreeDModel.MINIMUM_ALTITUDE_CAP;
+       private double _altFactor = -1.0;
+       private ImageDefinition _imageDefinition = null;
+       private GroutedImage _baseImage = null;
+       private TerrainDefinition _terrainDefinition = null;
+       private DataStatus _dataStatus = null;
 
        /** only prompt about big track size once */
        private static boolean TRACK_SIZE_WARNING_GIVEN = false;
@@ -64,19 +83,17 @@ public class Java3DWindow implements ThreeDWindow
        // Constants
        private static final double INITIAL_Y_ROTATION = -25.0;
        private static final double INITIAL_X_ROTATION = 15.0;
-       private static final int INITIAL_ALTITUDE_CAP = 500;
        private static final String CARDINALS_FONT = "Arial";
        private static final int MAX_TRACK_SIZE = 2500; // threshold for warning
+       private static final double MODEL_SCALE_FACTOR = 20.0;
 
 
        /**
         * Constructor
-        * @param inApp App object to use for callbacks
         * @param inFrame parent frame
         */
-       public Java3DWindow(App inApp, JFrame inFrame)
+       public Java3DWindow(JFrame inFrame)
        {
-               _app = inApp;
                _parentFrame = inFrame;
        }
 
@@ -90,24 +107,52 @@ public class Java3DWindow implements ThreeDWindow
                _track = inTrack;
        }
 
+       /**
+        * @param inFactor altitude factor to use
+        */
+       public void setAltitudeFactor(double inFactor)
+       {
+               _altFactor = inFactor;
+       }
 
        /**
-        * Show the window
+        * Set the parameters for the base image and do the grouting already
+        * (setTrack should already be called by now)
         */
-       public void show() throws ThreeDException
+       public void setBaseImageParameters(ImageDefinition inDefinition)
        {
-               // Get the altitude cap to use
-               String altitudeUnits = getAltitudeUnitsLabel(_track);
-               Object altCapString = JOptionPane.showInputDialog(_parentFrame,
-                       I18nManager.getText("dialog.3d.altitudecap") + " (" + altitudeUnits + ")",
-                       I18nManager.getText("dialog.3d.title"),
-                       JOptionPane.QUESTION_MESSAGE, null, null, "" + _altitudeCap);
-               if (altCapString == null) return;
-               try
+               _imageDefinition = inDefinition;
+               if (inDefinition != null && inDefinition.getUseImage())
                {
-                       _altitudeCap = Integer.parseInt(altCapString.toString());
+                       _baseImage = new MapGrouter().createMapImage(_track, MapSourceLibrary.getSource(inDefinition.getSourceIndex()),
+                               inDefinition.getZoom());
                }
-               catch (Exception e) {} // Ignore parse errors
+               else _baseImage = null;
+       }
+
+       /**
+        * Set the terrain parameters
+        */
+       public void setTerrainParameters(TerrainDefinition inDefinition)
+       {
+               _terrainDefinition = inDefinition;
+       }
+
+       /**
+        * Set the current data status
+        */
+       public void setDataStatus(DataStatus inStatus)
+       {
+               _dataStatus = inStatus;
+       }
+
+       /**
+        * Show the window
+        */
+       public void show() throws ThreeDException
+       {
+               // Make sure altitude exaggeration is positive
+               if (_altFactor < 0.0) {_altFactor = 1.0;}
 
                // Set up the graphics config
                GraphicsConfiguration config = SimpleUniverse.getPreferredConfiguration();
@@ -129,17 +174,16 @@ public class Java3DWindow implements ThreeDWindow
                Object[] buttonTexts = {I18nManager.getText("button.continue"), I18nManager.getText("button.cancel")};
                if (_track.getNumPoints() > MAX_TRACK_SIZE && !TRACK_SIZE_WARNING_GIVEN)
                {
-                       if (JOptionPane.showOptionDialog(_frame,
-                                       I18nManager.getText("dialog.exportpov.warningtracksize"),
-                                       I18nManager.getText("dialog.exportpov.title"), JOptionPane.OK_CANCEL_OPTION,
+                       if (JOptionPane.showOptionDialog(_parentFrame,
+                                       I18nManager.getText("dialog.3d.warningtracksize"),
+                                       I18nManager.getText("function.show3d"), JOptionPane.OK_CANCEL_OPTION,
                                        JOptionPane.WARNING_MESSAGE, null, buttonTexts, buttonTexts[1])
                                == JOptionPane.OK_OPTION)
                        {
                                // opted to continue, don't show warning again
                                TRACK_SIZE_WARNING_GIVEN = true;
                        }
-                       else
-                       {
+                       else {
                                // opted to cancel - show warning again next time
                                return;
                        }
@@ -157,8 +201,7 @@ public class Java3DWindow implements ThreeDWindow
                u.getViewingPlatform().setNominalViewingTransform();
 
                // Add behaviour to rotate using mouse
-               _orbit = new OrbitBehavior(canvas, OrbitBehavior.REVERSE_ALL |
-                                                                 OrbitBehavior.STOP_ZOOM);
+               _orbit = new OrbitBehavior(canvas, OrbitBehavior.REVERSE_ALL | OrbitBehavior.STOP_ZOOM);
                BoundingSphere bounds = new BoundingSphere(new Point3d(0.0,0.0,0.0), 100.0);
                _orbit.setSchedulingBounds(bounds);
                u.getViewingPlatform().setViewPlatformBehavior(_orbit);
@@ -169,45 +212,59 @@ public class Java3DWindow implements ThreeDWindow
                _frame = new JFrame(I18nManager.getText("dialog.3d.title"));
                _frame.getContentPane().setLayout(new BorderLayout());
                _frame.getContentPane().add(canvas, BorderLayout.CENTER);
+               _frame.setIconImage(_parentFrame.getIconImage());
                // Make panel for render, close buttons
                JPanel panel = new JPanel();
                panel.setLayout(new FlowLayout(FlowLayout.RIGHT));
-               // Add callback button for render
-               JButton renderButton = new JButton(I18nManager.getText("menu.file.exportpov"));
-               renderButton.addActionListener(new ActionListener()
-               {
-                       /** Render button pressed */
+               // Add button for exporting pov
+               JButton povButton = new JButton(I18nManager.getText("function.exportpov"));
+               povButton.addActionListener(new ActionListener() {
+                       /** Export pov button pressed */
                        public void actionPerformed(ActionEvent e)
                        {
-                               if (_orbit != null)
-                               {
-                                       callbackRender();
+                               if (_orbit != null) {
+                                       callbackRender(FunctionLibrary.FUNCTION_POVEXPORT);
                                }
                        }});
-               panel.add(renderButton);
+               panel.add(povButton);
+               // Close button
                JButton closeButton = new JButton(I18nManager.getText("button.close"));
                closeButton.addActionListener(new ActionListener()
                {
                        /** Close button pressed - clean up */
-                       public void actionPerformed(ActionEvent e)
-                       {
-                               _frame.dispose();
-                               _frame = null;
+                       public void actionPerformed(ActionEvent e) {
+                               dispose();
                                _orbit = null;
-                       }});
+                       }
+               });
                panel.add(closeButton);
                _frame.getContentPane().add(panel, BorderLayout.SOUTH);
                _frame.setSize(500, 350);
                _frame.pack();
+               // Add a listener to clean up when window closed
+               _frame.addWindowListener(new WindowAdapter() {
+                       public void windowClosing(WindowEvent e) {
+                               dispose();
+                       }
+               });
 
                // show frame
-               _frame.show();
-               if (_frame.getState() == JFrame.ICONIFIED)
-               {
+               _frame.setVisible(true);
+               if (_frame.getState() == JFrame.ICONIFIED) {
                        _frame.setState(JFrame.NORMAL);
                }
        }
 
+       /**
+        * Dispose of the frame and its resources
+        */
+       public void dispose()
+       {
+               if (_frame != null) {
+                       _frame.dispose();
+                       _frame = null;
+               }
+       }
 
        /**
         * Create the whole scenery from the given track
@@ -241,24 +298,89 @@ public class Java3DWindow implements ThreeDWindow
                // Base plane
                Appearance planeAppearance = null;
                Box plane = null;
-               Transform3D planeShift = null;
-               TransformGroup planeTrans = null;
                planeAppearance = new Appearance();
                planeAppearance.setMaterial(new Material(new Color3f(0.1f, 0.2f, 0.2f),
-                new Color3f(0.0f, 0.0f, 0.0f), new Color3f(0.3f, 0.4f, 0.4f),
-                new Color3f(0.3f, 0.3f, 0.3f), 0.0f));
+                       new Color3f(0.0f, 0.0f, 0.0f), new Color3f(0.3f, 0.4f, 0.4f),
+                       new Color3f(0.3f, 0.3f, 0.3f), 0.0f));
                plane = new Box(10f, 0.04f, 10f, planeAppearance);
                objTrans.addChild(plane);
 
+               // Image on top of base plane, if specified
+               final boolean showTerrain = _terrainDefinition != null && _terrainDefinition.getUseTerrain();
+               if (_baseImage != null && !showTerrain)
+               {
+                       QuadArray baseSquare = new QuadArray (4, QuadArray.COORDINATES | GeometryArray.TEXTURE_COORDINATE_2);
+                       baseSquare.setCoordinate(0, new Point3f(-10f, 0.05f, -10f));
+                       baseSquare.setCoordinate(1, new Point3f(-10f, 0.05f, 10f));
+                       baseSquare.setCoordinate(2, new Point3f( 10f, 0.05f, 10f));
+                       baseSquare.setCoordinate(3, new Point3f( 10f, 0.05f, -10f));
+                       // and set anchor points for the texture
+                       baseSquare.setTextureCoordinate(0, 0, new TexCoord2f(0.0f, 1.0f));
+                       baseSquare.setTextureCoordinate(0, 1, new TexCoord2f(0.0f, 0.0f));
+                       baseSquare.setTextureCoordinate(0, 2, new TexCoord2f(1.0f, 0.0f));
+                       baseSquare.setTextureCoordinate(0, 3, new TexCoord2f(1.0f, 1.0f));
+                       // Set appearance including image
+                       Appearance baseAppearance = new Appearance();
+                       Texture mapImage = new TextureLoader(_baseImage.getImage(), _frame).getTexture();
+                       baseAppearance.setTexture(mapImage);
+                       objTrans.addChild(new Shape3D(baseSquare, baseAppearance));
+               }
+
+               // Create model containing track information
+               _model = new ThreeDModel(_track);
+               _model.setAltitudeFactor(_altFactor);
+
+               if (showTerrain)
+               {
+                       TerrainHelper terrainHelper = new TerrainHelper(_terrainDefinition.getGridSize());
+                       // See if there's a previously saved terrain track we can reuse
+                       Track terrainTrack = TerrainCache.getTerrainTrack(_dataStatus, _terrainDefinition);
+                       if (terrainTrack == null)
+                       {
+                               // Construct the terrain track according to these extents and the grid size
+                               terrainTrack = terrainHelper.createGridTrack(_track);
+                               // Get the altitudes from SRTM for all the points in the track
+                               LookupSrtmFunction srtmLookup = (LookupSrtmFunction) FunctionLibrary.FUNCTION_LOOKUP_SRTM;
+                               srtmLookup.begin(terrainTrack);
+                               while (srtmLookup.isRunning())
+                               {
+                                       try {
+                                               Thread.sleep(750);  // just polling in a wait loop isn't ideal but simple
+                                       }
+                                       catch (InterruptedException e) {}
+                               }
+
+                               // Fix the voids
+                               terrainHelper.fixVoids(terrainTrack);
+
+                               // Store this back in the cache, maybe we'll need it again
+                               TerrainCache.storeTerrainTrack(terrainTrack, _dataStatus, _terrainDefinition);
+                       }
+                       // else System.out.println("Yay - reusing the cached track!");
+
+                       // Give the terrain definition to the _model as well
+                       _model.setTerrain(terrainTrack);
+                       _model.scale();
+
+                       objTrans.addChild(createTerrain(_model, terrainHelper, _baseImage));
+               }
+               else
+               {
+                       // No terrain, so just scale the model as it is
+                       _model.scale();
+               }
+
                // N, S, E, W
                GeneralPath bevelPath = new GeneralPath();
                bevelPath.moveTo(0.0f, 0.0f);
-               for (int i=0; i<91; i+= 5)
+               for (int i=0; i<91; i+= 5) {
                        bevelPath.lineTo((float) (0.1 - 0.1 * Math.cos(Math.toRadians(i))),
                          (float) (0.1 * Math.sin(Math.toRadians(i))));
-               for (int i=90; i>0; i-=5)
+               }
+               for (int i=90; i>0; i-=5) {
                        bevelPath.lineTo((float) (0.3 + 0.1 * Math.cos(Math.toRadians(i))),
                          (float) (0.1 * Math.sin(Math.toRadians(i))));
+               }
                Font3D compassFont = new Font3D(
                        new Font(CARDINALS_FONT, Font.PLAIN, 1),
                        new FontExtrusion(bevelPath));
@@ -267,39 +389,27 @@ public class Java3DWindow implements ThreeDWindow
                objTrans.addChild(createCompassPoint(I18nManager.getText("cardinal.w"), new Point3f(-11f, 0f, 0f), compassFont));
                objTrans.addChild(createCompassPoint(I18nManager.getText("cardinal.e"), new Point3f(10f, 0f, 0f), compassFont));
 
-               // create and scale model
-               ThreeDModel model = new ThreeDModel(_track);
-               model.setAltitudeCap(_altitudeCap);
-               model.scale();
-
-               // Lat/Long lines
-               objTrans.addChild(createLatLongs(model));
-
                // Add points to model
-               objTrans.addChild(createDataPoints(model));
+               objTrans.addChild(createDataPoints(_model));
 
                // Create lights
-               BoundingSphere bounds =
-                 new BoundingSphere(new Point3d(0.0,0.0,0.0), 100.0);
+               BoundingSphere bounds = new BoundingSphere(new Point3d(0.0,0.0,0.0), 100.0);
                AmbientLight aLgt = new AmbientLight(new Color3f(1.0f, 1.0f, 1.0f));
                aLgt.setInfluencingBounds(bounds);
                objTrans.addChild(aLgt);
 
                PointLight pLgt = new PointLight(new Color3f(1.0f, 1.0f, 1.0f),
-                new Point3f(0f, 0f, 2f),
-                new Point3f(0.25f, 0.05f, 0.0f) );
+                       new Point3f(0f, 0f, 2f), new Point3f(0.25f, 0.05f, 0.0f) );
                pLgt.setInfluencingBounds(bounds);
                objTrans.addChild(pLgt);
 
                PointLight pl2 = new PointLight(new Color3f(0.8f, 0.9f, 0.4f),
-                new Point3f(6f, 1f, 6f),
-                new Point3f(0.2f, 0.1f, 0.05f) );
+                       new Point3f(6f, 1f, 6f), new Point3f(0.2f, 0.1f, 0.05f) );
                pl2.setInfluencingBounds(bounds);
                objTrans.addChild(pl2);
 
                PointLight pl3 = new PointLight(new Color3f(0.7f, 0.7f, 0.7f),
-                new Point3f(0.0f, 12f, -2f),
-                new Point3f(0.1f, 0.1f, 0.0f) );
+                       new Point3f(0.0f, 12f, -2f), new Point3f(0.1f, 0.1f, 0.0f) );
                pl3.setInfluencingBounds(bounds);
                objTrans.addChild(pl3);
 
@@ -321,8 +431,8 @@ public class Java3DWindow implements ThreeDWindow
        {
                Text3D txt = new Text3D(inFont, inText, inLocn, Text3D.ALIGN_FIRST, Text3D.PATH_RIGHT);
                Material mat = new Material(new Color3f(0.5f, 0.5f, 0.55f),
-                new Color3f(0.05f, 0.05f, 0.1f), new Color3f(0.3f, 0.4f, 0.5f),
-                new Color3f(0.4f, 0.5f, 0.7f), 70.0f);
+                       new Color3f(0.05f, 0.05f, 0.1f), new Color3f(0.3f, 0.4f, 0.5f),
+                       new Color3f(0.4f, 0.5f, 0.7f), 70.0f);
                mat.setLightingEnable(true);
                Appearance app = new Appearance();
                app.setMaterial(mat);
@@ -331,70 +441,6 @@ public class Java3DWindow implements ThreeDWindow
        }
 
 
-       /**
-        * Create all the latitude and longitude lines on the base plane
-        * @param inModel model containing data
-        * @return Group object containing cylinders for lat and long lines
-        */
-       private static Group createLatLongs(ThreeDModel inModel)
-       {
-               Group group = new Group();
-               int numlines = inModel.getNumLatitudeLines();
-               for (int i=0; i<numlines; i++)
-               {
-                       group.addChild(createLatLine(inModel.getScaledLatitudeLine(i), inModel.getModelSize()));
-               }
-               numlines = inModel.getNumLongitudeLines();
-               for (int i=0; i<numlines; i++)
-               {
-                       group.addChild(createLonLine(inModel.getScaledLongitudeLine(i), inModel.getModelSize()));
-               }
-               return group;
-       }
-
-
-       /**
-        * Make a single latitude line for the specified latitude
-        * @param inLatitude latitude in scaled units
-        * @param inSize size of model, for length of line
-        * @return Group object containing cylinder for latitude line
-        */
-       private static Group createLatLine(double inLatitude, double inSize)
-       {
-               Cylinder latline = new Cylinder(0.1f, (float) (inSize*2));
-               Transform3D horizShift = new Transform3D();
-               horizShift.setTranslation(new Vector3d(0.0, 0.0, inLatitude));
-               TransformGroup horizTrans = new TransformGroup(horizShift);
-               Transform3D zRot = new Transform3D();
-               zRot.rotZ(Math.toRadians(90.0));
-               TransformGroup zTrans = new TransformGroup(zRot);
-               horizTrans.addChild(zTrans);
-               zTrans.addChild(latline);
-               return horizTrans;
-       }
-
-
-       /**
-        * Make a single longitude line for the specified longitude
-        * @param inLongitude longitude in scaled units
-        * @param inSize size of model, for length of line
-        * @return Group object containing cylinder for longitude line
-        */
-       private static Group createLonLine(double inLongitude, double inSize)
-       {
-               Cylinder lonline = new Cylinder(0.1f, (float) (inSize*2));
-               Transform3D horizShift = new Transform3D();
-               horizShift.setTranslation(new Vector3d(inLongitude, 0.0, 0.0));
-               TransformGroup horizTrans = new TransformGroup(horizShift);
-               Transform3D xRot = new Transform3D();
-               xRot.rotX(Math.toRadians(90.0));
-               TransformGroup xTrans = new TransformGroup(xRot);
-               horizTrans.addChild(xTrans);
-               xTrans.addChild(lonline);
-               return horizTrans;
-       }
-
-
        /**
         * Make a Group of the data points to be added
         * @param inModel model containing data
@@ -413,15 +459,18 @@ public class Java3DWindow implements ThreeDWindow
                                // Add waypoint
                                // Note that x, y and z are horiz, altitude, -vert
                                group.addChild(createWaypoint(new Point3d(
-                                       inModel.getScaledHorizValue(i), inModel.getScaledAltValue(i), -inModel.getScaledVertValue(i))));
+                                       inModel.getScaledHorizValue(i) * MODEL_SCALE_FACTOR,
+                                       inModel.getScaledAltValue(i)   * MODEL_SCALE_FACTOR,
+                                       -inModel.getScaledVertValue(i) * MODEL_SCALE_FACTOR)));
                        }
                        else
                        {
                                // Add colour-coded track point
                                // Note that x, y and z are horiz, altitude, -vert
                                group.addChild(createTrackpoint(new Point3d(
-                                       inModel.getScaledHorizValue(i), inModel.getScaledAltValue(i), -inModel.getScaledVertValue(i)),
-                                       inModel.getPointHeightCode(i)));
+                                       inModel.getScaledHorizValue(i) * MODEL_SCALE_FACTOR,
+                                       inModel.getScaledAltValue(i)   * MODEL_SCALE_FACTOR,
+                                       -inModel.getScaledVertValue(i) * MODEL_SCALE_FACTOR), inModel.getPointHeightCode(i)));
                        }
                }
                return group;
@@ -436,7 +485,7 @@ public class Java3DWindow implements ThreeDWindow
        private static Group createWaypoint(Point3d inPointPos)
        {
                Material mat = getWaypointMaterial();
-               // TODO: sort symbol scaling
+               // MAYBE: sort symbol scaling
                Sphere dot = new Sphere(0.35f); // * symbolScaling / 100f);
                return createBall(inPointPos, dot, mat);
        }
@@ -453,15 +502,21 @@ public class Java3DWindow implements ThreeDWindow
        }
 
 
+       /**
+        * @return track point object
+        */
        private static Group createTrackpoint(Point3d inPointPos, byte inHeightCode)
        {
                Material mat = getTrackpointMaterial(inHeightCode);
-               // TODO: sort symbol scaling
-               Sphere dot = new Sphere(0.2f); // * symbolScaling / 100f);
+               // MAYBE: sort symbol scaling
+               Sphere dot = new Sphere(0.2f);
                return createBall(inPointPos, dot, mat);
        }
 
 
+       /**
+        * @return Material object for track points with the appropriate colour for the height
+        */
        private static Material getTrackpointMaterial(byte inHeightCode)
        {
                // create default material
@@ -470,10 +525,10 @@ public class Java3DWindow implements ThreeDWindow
                        new Color3f(1.0f, 0.6f, 0.6f), 70.0f);
                // change colour according to height code
                if (inHeightCode == 1) mat.setDiffuseColor(new Color3f(0.4f, 0.9f, 0.2f));
-               if (inHeightCode == 2) mat.setDiffuseColor(new Color3f(0.7f, 0.8f, 0.2f));
-               if (inHeightCode == 3) mat.setDiffuseColor(new Color3f(0.5f, 0.85f, 0.95f));
-               if (inHeightCode == 4) mat.setDiffuseColor(new Color3f(0.1f, 0.9f, 0.9f));
-               if (inHeightCode >= 5) mat.setDiffuseColor(new Color3f(1.0f, 1.0f, 1.0f));
+               else if (inHeightCode == 2) mat.setDiffuseColor(new Color3f(0.7f, 0.8f, 0.2f));
+               else if (inHeightCode == 3) mat.setDiffuseColor(new Color3f(0.3f, 0.6f, 0.4f));
+               else if (inHeightCode == 4) mat.setDiffuseColor(new Color3f(0.1f, 0.9f, 0.9f));
+               else if (inHeightCode >= 5) mat.setDiffuseColor(new Color3f(1.0f, 1.0f, 1.0f));
                // return object
                return mat;
        }
@@ -502,15 +557,14 @@ public class Java3DWindow implements ThreeDWindow
                // Also create rod for ball to sit on
                Cylinder rod = new Cylinder(0.1f, (float) inPosition.y);
                Material rodMat = new Material(new Color3f(0.2f, 0.2f, 0.2f),
-                new Color3f(0.0f, 0.0f, 0.0f), new Color3f(0.2f, 0.2f, 0.2f),
-                new Color3f(0.05f, 0.05f, 0.05f), 0.4f);
+                       new Color3f(0.0f, 0.0f, 0.0f), new Color3f(0.2f, 0.2f, 0.2f),
+                       new Color3f(0.05f, 0.05f, 0.05f), 0.4f);
                rodMat.setLightingEnable(true);
                Appearance rodApp = new Appearance();
                rodApp.setMaterial(rodMat);
                rod.setAppearance(rodApp);
                Transform3D rodShift = new Transform3D();
-               rodShift.setTranslation(new Vector3d(inPosition.x,
-                inPosition.y/2.0, inPosition.z));
+               rodShift.setTranslation(new Vector3d(inPosition.x, inPosition.y/2.0, inPosition.z));
                TransformGroup rodShiftTrans = new TransformGroup(rodShift);
                rodShiftTrans.addChild(rod);
                group.addChild(rodShiftTrans);
@@ -518,11 +572,67 @@ public class Java3DWindow implements ThreeDWindow
                return group;
        }
 
+       /**
+        * Create a java3d Shape for the terrain
+        * @param inModel threedModel
+        * @param inHelper terrain helper
+        * @param inBaseImage base image for shape, or null for no image
+        * @return Shape3D object
+        */
+       private static Shape3D createTerrain(ThreeDModel inModel, TerrainHelper inHelper, GroutedImage inBaseImage)
+       {
+               final int numNodes = inHelper.getGridSize();
+               final int RESULT_SIZE = numNodes * (numNodes * 2 - 2);
+               int[] stripData = inHelper.getStripLengths();
+
+               // Get the scaled terrainTrack coordinates (or just heights) from the model
+               final int nSquared = numNodes * numNodes;
+               Point3d[] rawPoints = new Point3d[nSquared];
+               for (int i=0; i<nSquared; i++)
+               {
+                       double height = inModel.getScaledTerrainValue(i) * MODEL_SCALE_FACTOR;
+                       rawPoints[i] = new Point3d(inModel.getScaledTerrainHorizValue(i) * MODEL_SCALE_FACTOR,
+                               Math.max(height, 0.05), // make sure it's above the box
+                               -inModel.getScaledTerrainVertValue(i) * MODEL_SCALE_FACTOR);
+               }
+
+               GeometryInfo gi = new GeometryInfo(GeometryInfo.TRIANGLE_STRIP_ARRAY);
+               gi.setCoordinates(inHelper.getTerrainCoordinates(rawPoints));
+               gi.setStripCounts(stripData);
+
+               Appearance tAppearance = new Appearance();
+               if (inBaseImage != null)
+               {
+                       gi.setTextureCoordinateParams(1, 2); // one coord set of two dimensions
+                       gi.setTextureCoordinates(0, inHelper.getTextureCoordinates());
+                       Texture mapImage = new TextureLoader(inBaseImage.getImage()).getTexture();
+                       tAppearance.setTexture(mapImage);
+                       TextureAttributes texAttr = new TextureAttributes();
+                       texAttr.setTextureMode(TextureAttributes.MODULATE);
+                       tAppearance.setTextureAttributes(texAttr);
+               }
+               else
+               {
+                       Color3f[] colours = new Color3f[RESULT_SIZE];
+                       Color3f terrainColour = new Color3f(0.1f, 0.2f, 0.2f);
+                       for (int i=0; i<RESULT_SIZE; i++) {colours[i] = terrainColour;}
+                       gi.setColors(colours);
+               }
+               new NormalGenerator().generateNormals(gi);
+               Material terrnMat = new Material(new Color3f(0.4f, 0.4f, 0.4f), // ambient colour
+                       new Color3f(0f, 0f, 0f), // emissive (none)
+                       new Color3f(0.8f, 0.8f, 0.8f), // diffuse
+                       new Color3f(0.2f, 0.2f, 0.2f), //specular
+                       30f); // shinyness
+               tAppearance.setMaterial(terrnMat);
+               return new Shape3D(gi.getGeometryArray(), tAppearance);
+       }
 
        /**
         * Calculate the angles and call them back to the app
+        * @param inFunction function to call for export
         */
-       private void callbackRender()
+       private void callbackRender(Export3dFunction inFunction)
        {
                Transform3D trans3d = new Transform3D();
                _orbit.getViewingPlatform().getViewPlatformTransform().getTransform(trans3d);
@@ -535,26 +645,17 @@ public class Java3DWindow implements ThreeDWindow
                firstTran.rotY(Math.toRadians(-INITIAL_Y_ROTATION));
                Transform3D secondTran = new Transform3D();
                secondTran.rotX(Math.toRadians(-INITIAL_X_ROTATION));
-               // Apply inverse rotations in reverse order to test point
+               // Apply inverse rotations in reverse order to the test point
                Point3d result = new Point3d();
                secondTran.transform(point, result);
                firstTran.transform(result);
-               // Callback settings to App
-               _app.exportPov(result.x, result.y, result.z, _altitudeCap);
-       }
 
+               // Give the settings to the rendering function
+               inFunction.setCameraCoordinates(result.x, result.y, result.z);
+               inFunction.setAltitudeExaggeration(_altFactor);
+               inFunction.setTerrainDefinition(_terrainDefinition);
+               inFunction.setImageDefinition(_imageDefinition);
 
-       /**
-        * Get a units label for the altitudes in the given Track
-        * @param inTrack Track object
-        * @return units label for altitude used in Track
-        */
-       private static String getAltitudeUnitsLabel(Track inTrack)
-       {
-               int altitudeFormat = inTrack.getAltitudeRange().getFormat();
-               if (altitudeFormat == Altitude.FORMAT_METRES)
-                       return I18nManager.getText("units.metres.short");
-               return I18nManager.getText("units.feet.short");
+               inFunction.begin();
        }
-
 }