import javax.media.j3d.AmbientLight;
import javax.media.j3d.Appearance;
+import javax.media.j3d.Billboard;
import javax.media.j3d.BoundingSphere;
import javax.media.j3d.BranchGroup;
import javax.media.j3d.Canvas3D;
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.media.j3d.TriangleStripArray;
import javax.swing.JButton;
import javax.swing.JFrame;
import javax.swing.JOptionPane;
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 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;
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;
_terrainDefinition = inDefinition;
}
+ /**
+ * Set the current data status
+ */
+ public void setDataStatus(DataStatus inStatus)
+ {
+ _dataStatus = inStatus;
+ }
+
/**
* Show the window
*/
}
}});
panel.add(povButton);
- // Add button for exporting svg
- JButton svgButton = new JButton(I18nManager.getText("function.exportsvg"));
- svgButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e)
- {
- if (_orbit != null) {
- callbackRender(FunctionLibrary.FUNCTION_SVGEXPORT);
- }
- }});
- panel.add(svgButton);
-
// Close button
JButton closeButton = new JButton(I18nManager.getText("button.close"));
closeButton.addActionListener(new ActionListener()
if (showTerrain)
{
- // TODO: Is it maybe possible to cache the last terrainTrack?
- // (if the dataTrack and the resolution haven't changed)
- // Construct the terrain track according to these extents and the grid size
TerrainHelper terrainHelper = new TerrainHelper(_terrainDefinition.getGridSize());
- Track 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())
+ // See if there's a previously saved terrain track we can reuse
+ Track terrainTrack = TerrainCache.getTerrainTrack(_dataStatus, _terrainDefinition);
+ if (terrainTrack == null)
{
- try {
- Thread.sleep(750); // just polling in a wait loop isn't ideal but simple
+ // 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) {}
}
- catch (InterruptedException e) {}
- }
- // Fix the voids
- terrainHelper.fixVoids(terrainTrack);
+ // 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);
Font3D compassFont = new Font3D(
new Font(CARDINALS_FONT, Font.PLAIN, 1),
new FontExtrusion(bevelPath));
- objTrans.addChild(createCompassPoint(I18nManager.getText("cardinal.n"), new Point3f(0f, 0f, -10f), compassFont));
- objTrans.addChild(createCompassPoint(I18nManager.getText("cardinal.s"), new Point3f(0f, 0f, 10f), compassFont));
- 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));
+ objTrans.addChild(createCompassPoint(I18nManager.getText("cardinal.n"), new Point3f(0f, 0f, -11.5f), compassFont));
+ objTrans.addChild(createCompassPoint(I18nManager.getText("cardinal.s"), new Point3f(0f, 0f, 11.5f), compassFont));
+ objTrans.addChild(createCompassPoint(I18nManager.getText("cardinal.w"), new Point3f(-11.5f, 0f, 0f), compassFont));
+ objTrans.addChild(createCompassPoint(I18nManager.getText("cardinal.e"), new Point3f(11.5f, 0f, 0f), compassFont));
// Add points to model
objTrans.addChild(createDataPoints(_model));
/**
* Create a text object for compass point, N S E or W
- * @param text text to display
- * @param locn position at which to display
- * @param font 3d font to use
- * @return Shape3D object
+ * @param inText text to display
+ * @param inLocn position at which to display
+ * @param inFont 3d font to use
+ * @return compound object
*/
- private Shape3D createCompassPoint(String inText, Point3f inLocn, Font3D inFont)
+ private TransformGroup createCompassPoint(String inText, Point3f inLocn, Font3D inFont)
{
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),
Appearance app = new Appearance();
app.setMaterial(mat);
Shape3D shape = new Shape3D(txt, app);
- return shape;
+
+ // Make transform group with billboard behaviour
+ TransformGroup subGroup = new TransformGroup();
+ subGroup.setCapability(TransformGroup.ALLOW_TRANSFORM_WRITE);
+ subGroup.addChild(shape);
+ Billboard billboard = new Billboard(subGroup, Billboard.ROTATE_ABOUT_POINT, inLocn);
+ BoundingSphere bounds = new BoundingSphere(new Point3d(0.0, 0.0, 0.0), 100.0);
+ billboard.setSchedulingBounds(bounds);
+ subGroup.addChild(billboard);
+ return subGroup;
}
{
final int numNodes = inHelper.getGridSize();
final int RESULT_SIZE = numNodes * (numNodes * 2 - 2);
- final int GEOMETRY_COLOURING_TYPE = (inBaseImage == null ? GeometryArray.COLOR_3 : GeometryArray.TEXTURE_COORDINATE_2);
-
int[] stripData = inHelper.getStripLengths();
- TriangleStripArray tsa = new TriangleStripArray(RESULT_SIZE, GeometryArray.COORDINATES | GEOMETRY_COLOURING_TYPE,
- stripData);
+
// Get the scaled terrainTrack coordinates (or just heights) from the model
final int nSquared = numNodes * numNodes;
Point3d[] rawPoints = new Point3d[nSquared];
Math.max(height, 0.05), // make sure it's above the box
-inModel.getScaledTerrainVertValue(i) * MODEL_SCALE_FACTOR);
}
- tsa.setCoordinates(0, inHelper.getTerrainCoordinates(rawPoints));
+
+ GeometryInfo gi = new GeometryInfo(GeometryInfo.TRIANGLE_STRIP_ARRAY);
+ gi.setCoordinates(inHelper.getTerrainCoordinates(rawPoints));
+ gi.setStripCounts(stripData);
Appearance tAppearance = new Appearance();
if (inBaseImage != null)
{
- tsa.setTextureCoordinates(0, 0, inHelper.getTextureCoordinates());
+ 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;}
- tsa.setColors(0, colours);
+ gi.setColors(colours);
}
- return new Shape3D(tsa, tAppearance);
+ 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 (either pov or svg)
+ * @param inFunction function to call for export
*/
private void callbackRender(Export3dFunction inFunction)
{
// Give the settings to the rendering function
inFunction.setCameraCoordinates(result.x, result.y, result.z);
inFunction.setAltitudeExaggeration(_altFactor);
- inFunction.setTerrainDefinition(_terrainDefinition); // ignored by svg, used by pov
- inFunction.setImageDefinition(_imageDefinition); // ignored by svg, used by pov
+ inFunction.setTerrainDefinition(_terrainDefinition);
+ inFunction.setImageDefinition(_imageDefinition);
inFunction.begin();
}
projects / GpsPrune.git / blobdiff