Revision 15267

View differences:

import/ext3D/trunk/ext3D/src/com/iver/ai2/gvsig3d/gui/NavigationMenu3D.java
57 57
			return;
58 58
		// Casting to View3D
59 59
		View3D vista3D = (View3D) view;
60
		IProjectView model = vista3D.getModel();
61
		// MapContext mapa = model.getMapContext();
60
		
61
		navMode = vista3D.getNavMode();
62 62

  
63
		if (navMode == null) {
64
			navMode = new NavigationMode(vista3D);
65
		}
66
		Behavior a;
67

  
68 63
		// Action for ZOOM_SELECT
69 64
		if (actionCommand.equals("PAN_SELECT")) {
70 65
			if (navMode != null)
import/ext3D/trunk/ext3D/src/com/iver/ai2/gvsig3d/gui/View3D.java
17 17

  
18 18
import com.iver.ai2.gvsig3d.ProjectView3D;
19 19
import com.iver.ai2.gvsig3d.map3d.layers.FLayers3D;
20
import com.iver.ai2.gvsig3d.navigation.NavigationMode;
20 21
import com.iver.andami.PluginServices;
21 22
import com.iver.andami.ui.mdiManager.WindowInfo;
22 23
import com.iver.cit.gvsig.fmap.ColorEvent;
......
51 52
	private FLayers m_layers;
52 53

  
53 54
	private UpdateView3D updateViewThread;
55
	
56
	private NavigationMode navMode = null;
54 57

  
55 58
	public View3D() {
56 59
		this.setName("View3D");
......
385 388

  
386 389
	}
387 390

  
391
	public NavigationMode getNavMode() {
392
		return navMode;
393
	}
394

  
395
	public void setNavMode(NavigationMode navMode) {
396
		this.navMode = navMode;
397
	}
398

  
388 399
}
import/ext3D/trunk/ext3D/src/com/iver/ai2/gvsig3d/ProjectView3D.java
58 58
import com.iver.ai2.gvsig3d.map3d.MapContext3D;
59 59
import com.iver.ai2.gvsig3d.map3d.layers.FLayers3D;
60 60
import com.iver.ai2.gvsig3d.map3d.layers.Layer3DProps;
61
import com.iver.ai2.gvsig3d.navigation.NavigationMode;
61 62
import com.iver.andami.PluginServices;
62 63
import com.iver.andami.ui.mdiManager.IWindow;
63 64
import com.iver.cit.gvsig.fmap.DriverException;
......
428 429
			m_canvas3d.getOSGViewer().setEnabledLighting(true);
429 430
		}
430 431
		m_view = new View3D();
432
		
431 433
		m_view.setCanvas3d(m_canvas3d);
432 434
		
433 435
		m_view.setPlanet(m_planet);
434 436
		m_view.setModel(this);
435 437
		
438
		m_view.setNavMode(new NavigationMode(m_view));
439
		
436 440
		((MapContext3D)getMapContext()).setVerticalEx(verticalExaggeration);
437 441
		setVerticalEx(verticalExaggeration);
438 442

  

Also available in: Unified diff