Revision 15264

View differences:

import/ext3D/trunk/ext3D/src/com/iver/ai2/gvsig3d/ProjectView3D.java
433 433
		m_view.setPlanet(m_planet);
434 434
		m_view.setModel(this);
435 435
		
436
		((MapContext3D)getMapContext()).setVerticalEx(verticalExaggeration);
436 437
		setVerticalEx(verticalExaggeration);
437 438

  
438 439
		return m_view;
import/ext3D/trunk/ext3D/src/com/iver/ai2/gvsig3d/map3d/MapContext3D.java
3 3
import java.awt.geom.Rectangle2D;
4 4

  
5 5
import com.iver.ai2.gvsig3d.map3d.layers.FLayers3D;
6
import com.iver.ai2.gvsig3d.map3d.layers.Layer3DProps;
6 7
import com.iver.cit.gvsig.fmap.MapContext;
7 8
import com.iver.cit.gvsig.fmap.ViewPort;
9
import com.iver.cit.gvsig.fmap.layers.FLayer;
8 10
import com.iver.cit.gvsig.fmap.layers.FLayers;
9 11
import com.iver.cit.gvsig.fmap.layers.GraphicLayer;
12
import com.iver.cit.gvsig.fmap.layers.SingleLayerIterator;
10 13
import com.iver.cit.gvsig.fmap.layers.XMLException;
11 14
import com.iver.utiles.XMLEntity;
12 15

  
13 16
public class MapContext3D extends MapContext {
14 17

  
18
	private float verticalExageration;
19

  
15 20
	public MapContext3D(ViewPort vp) {
16 21
		super(vp);
17 22
		// TODO Auto-generated constructor stub
......
21 26
		super(fLayers, vp);
22 27
		// TODO Auto-generated constructor stub
23 28
	}
24
	
29

  
25 30
	/**
26 31
	 * Sets the given zoom extent to the view
27
	 *
32
	 * 
28 33
	 * @param extent
29 34
	 *            The extent to zoom to.
30 35
	 */
31 36
	public void zoomToExtent(Rectangle2D extent) {
32
		FLayers3D layers3D = (FLayers3D)getLayers();
37
		FLayers3D layers3D = (FLayers3D) getLayers();
33 38
		layers3D.zoomToExtent(extent, 0.0);
34 39
	}
35 40

  
36 41
	/**
37 42
	 * Crea un nuevo MapContext(3D) a partir del XMLEntity.
38
	 *
43
	 * 
39 44
	 * @param xml
40 45
	 *            XMLEntity
41
	 *
46
	 * 
42 47
	 * @return Nuevo MapContext3D.
43
	 *
48
	 * 
44 49
	 * @throws XMLException
45 50
	 */
46 51
	public static MapContext createFromXML(XMLEntity xml) throws XMLException {
......
49 54
		FLayers layers = new FLayers3D(null, null, vp);
50 55
		layers.setXMLEntity(xml.getChild(1));
51 56

  
52
        MapContext fmap = layers.getMapContext();
57
		MapContext fmap = layers.getMapContext();
53 58

  
54 59
		return fmap;
55 60
	}
......
60 65
		FLayers layers = new FLayers3D(null, null, vp);
61 66
		layers.setXMLEntity03(xml.getChild(1));
62 67

  
63
        MapContext fmap = layers.getMapContext();
68
		MapContext fmap = layers.getMapContext();
64 69

  
65 70
		return fmap;
66 71
	}
67
	
72

  
68 73
	public GraphicLayer getGraphicsLayer() {
69
		FLayers3D f = (FLayers3D)layers;
70
		GraphicLayer3D gra3D = new GraphicLayer3D(f.getCanvas3d(),f.getPlanet());
74
		FLayers3D f = (FLayers3D) layers;
75
		GraphicLayer3D gra3D = new GraphicLayer3D(f.getCanvas3d(), f
76
				.getPlanet());
71 77
		return gra3D;
72 78
	}
73
	
74 79

  
80
	public void setVerticalEx(float exa) {
81

  
82
		verticalExageration = exa;
83
		((FLayers3D)this.layers).setVerticalExageration(exa);
84
	}
85

  
75 86
}
import/ext3D/trunk/ext3D/src/com/iver/ai2/gvsig3d/map3d/layers/FLayers3D.java
81 81
	private ArrayList m_layerLists = new ArrayList();
82 82

  
83 83
	private boolean m_bEmptyView = true;
84
	
85
	private float verticalExageration;
84 86

  
85 87
	// protected static Logger logger =
86 88
	// Logger.getLogger(FLayers.class.getName());
......
417 419
			props3D.initCacheName(m_planet.getType(), m_viewProjection);
418 420
			FLyrDefault baseLayer = (FLyrDefault) layer;
419 421
			baseLayer.setProperty("3DLayerExtension", props3D);
422
			props3D.setVerticalEx(this.getVerticalExageration());
420 423
		} else {
421 424
			if (m_bLoading)
422 425
				props3D.setChooseType(false);
......
844 847
		// REPAINTING VIEWWER
845 848
		if (m_canvas3d != null)
846 849
			m_canvas3d.repaint();
847

  
848
		/** ************************************************ */
850
	
849 851
	}
850 852

  
851 853
	public void requestTextureLayer(TileEvent evt) {
......
1214 1216
		this.m_canvas3d = m_canvas3d;
1215 1217
	}
1216 1218

  
1219
	public float getVerticalExageration() {
1220
		return verticalExageration;
1221
	}
1222

  
1223
	public void setVerticalExageration(float verticalExageration) {
1224
		this.verticalExageration = verticalExageration;
1225
	}
1226

  
1217 1227
}

Also available in: Unified diff