Revision 17569

View differences:

trunk/extensions/ext3Dgui/src/com/iver/ai2/gvsig3dgui/navigation/NavigationMenu3D.java
20 20
import com.iver.andami.plugins.Extension;
21 21
import com.iver.andami.ui.mdiFrame.JMenuItem;
22 22
import com.iver.andami.ui.mdiFrame.JToolBarButton;
23
import com.iver.andami.ui.mdiFrame.NewStatusBar;
24 23
import com.iver.cit.gvsig.fmap.layers.FLayers;
25 24
import com.iver.cit.gvsig.project.documents.view.gui.FPanelLocConfig;
26 25

  
27 26
import es.upv.ai2.libjosg.planets.CustomTerrainManipulator;
28 27
import es.upv.ai2.libjosg.planets.Planet;
29 28
import es.upv.ai2.libjosg.planets.PlanetViewer;
29
import es.upv.ai2.libjosg.viewer.Camera;
30 30
import es.upv.ai2.libjosg.viewer.OSGViewer;
31 31

  
32 32
public class NavigationMenu3D extends Extension {
......
112 112
					.getMapContext();
113 113
			FLayers layers = map3D.getLayers();
114 114
			Rectangle2D ext = layers.getFullExtent();
115
			map3D.zoomToExtent(ext);
115
			if (ext == null) {
116
				// ext = new Rectangle2D.Double(-90,-180,90,180);
117
				Camera cam;
118
				cam = vista3D.getCamera();
119

  
120
				if (vista3D.getPlanet().getCoordinateSystemType() != Planet.CoordinateSystemType.PROJECTED) {
121
					cam.setViewByLookAt(vista3D.getPlanet()
122
							.getRadiusEquatorial() * 8.0, 0, 0, 0, 0, 0, 0, 0,
123
							1);
124

  
125
				} else {
126
					cam.setViewByLookAt(0, 0, 5000000 * 4.6, 0, 0, 0, 0, 1, 0);
127
				}
128
				vista3D.getCanvas3d().getOSGViewer().setCamera(cam);
129
			} else {
130
				map3D.zoomToExtent(ext);
131
			}
116 132
			vista3D.repaint();
117 133

  
118
			// Camera cam;
119
			// cam = vista3D.getCamera();
120
			//
121
			// if (vista3D.getPlanet().getType() != PlanetType.PLANE_MODE) {
122
			// cam.setViewByLookAt(
123
			// vista3D.getPlanet().getRadiusEquatorial() * 3.0, 0, 0,
124
			// 0, 0, 0, 0, 0, 1);
125
			//				
126
			// } else {
127
			// // cam.setViewByLookAt(0, 0, 5000000 * 4.6, 0, 0, 0, 0, 1, 0);
128
			// }
129
			// UtilCoord.imprimeCamara(cam);
130
			// vista3D.getCanvas3d().getOSGViewer().setCamera(cam);
131 134

  
132 135
			// UtilCoord.imprimeCamara(vista3D.getCamera());
133 136
			// System.out.println("CAMBIANDO CAMARAAAAAAAAA!!!!!!!!!");s

Also available in: Unified diff