/ - Diff - | gvSIG desktop 1 - gvSIG

Revision 23304

+    			}
+    		}
+    	}
     	public static void restoreAllNavigationModes() {
     		if (CTM !=null){
     			// Setting left button for roll mode
     			for (Iterator iter = manRollList.iterator(); iter.hasNext();) {
     				// Get the mask element
     				NavigationMask mask = (NavigationMask) iter.next();
     				// Settin mode
     				CTM.addRollButtonMask(mask.getBtnMask(), mask.getKeyMask());
+    			}
     			// Setting left button for roll mode
     			for (Iterator iter = manZoomList.iterator(); iter.hasNext();) {
     				// Get the mask element
     				NavigationMask mask = (NavigationMask) iter.next();
     				// Settin mode
     				CTM.addZoomButtonMask(mask.getBtnMask(), mask.getKeyMask());
+    			}
     			// Setting left button for roll mode
     			for (Iterator iter = manAzimutList.iterator(); iter.hasNext();) {
     				// Get the mask element
     				NavigationMask mask = (NavigationMask) iter.next();
     				// Settin mode
     				CTM.addAzimButtonMask(mask.getBtnMask(), mask.getKeyMask());
+    			}
+    		}
+    	}
+    }

     import java.awt.geom.Rectangle2D;
     import java.io.File;
     import java.io.FileNotFoundException;
     import javax.swing.JOptionPane;
     import org.apache.log4j.Logger;
     import org.cresques.cts.IProjection;
     import org.gvsig.cacheservice.CacheService;
-...
     import org.gvsig.geometries3D.MultiGeometry;
     import org.gvsig.geometries3D.MultiSolid;
     import org.gvsig.gvsig3d.drivers.GvsigDriverOSG;
     import org.gvsig.gvsig3d.listener.EditorListener;
     import org.gvsig.operations3D.Draw3DMultiSolid;
     import org.gvsig.operations3D.context.Draw3DContext;
     import org.gvsig.osgvp.Group;
     import org.gvsig.osgvp.Node;
     import org.gvsig.osgvp.PositionAttitudeTransform;
     import org.gvsig.osgvp.Vec3;
     import org.gvsig.osgvp.osgDB;
     import org.gvsig.osgvp.exceptions.node.NodeException;
     import org.gvsig.osgvp.manipulator.EditionManager;
     import org.gvsig.osgvp.manipulator.ManipulatorHandler;
     import org.gvsig.osgvp.manipulator.RemoveAllSelectionCommand;
     import org.gvsig.osgvp.manipulator.Manipulator.DraggerType;
     import org.gvsig.osgvp.planets.Planet;
     import org.gvsig.osgvp.planets.PlanetViewer;
     import org.gvsig.osgvp.viewer.IViewerContainer;
-...
     	// vector caching for libJOSG
     	private Group _layerNode;
     	private boolean newLayerOSG = false;
     	private EditionManager editionManager;
     	private RemoveAllSelectionCommand command;
     	private static Logger logger = Logger.getLogger(OSGCacheService.class
     			.getName());
-...
     		_layer = layer;
     		_layerNode = new Group();
     		_layerNode.setNodeName("layer3DOSG");
     		try {
     			_planetViewer.addSpecialNode(_layerNode);
     		} catch (NodeException e1) {
-...
+    		}
+    	}
     	public Group getLayerNode() {
     		return _layerNode;
+    	}
     	// uses a strategy to get all features from layer and their symbols
     	// and add them to the planet
-...
     	public void AddFeaturesToPlanet() {
     		boolean newLayer = Layer3DProps.getLayer3DProps(_layer).isNewLayerOSG();
     		if(!newLayer)
+    		{
     			GvsigDriverOSG osgD = (GvsigDriverOSG) ((FLyrVect) _layer).getSource()
     			.getDriver();
     		if (!newLayer) {
     			GvsigDriverOSG osgD = (GvsigDriverOSG) ((FLyrVect) _layer)
     					.getSource().getDriver();
     			try {
     				File file = osgD.getFile();
     				Node n = null;
     				try {
     					n = osgDB.readNodeFile(file.getAbsolutePath());
     				} catch (FileNotFoundException e) {
     					// TODO Auto-generated catch block
     					e.printStackTrace();
+    				}
     				Node n = null;
     				// try {
     				// n = osgDB.readNodeFile(file.getAbsolutePath());
     				// } catch (FileNotFoundException e) {
     				// // TODO Auto-generated catch block
     				// e.printStackTrace();
     				// }
     				MultiGeometry root = osgD.getOSGDriver().getRootFeature();
     				// Insert the geometry in the root node of the graph.
     				Group g = new Group();
     //				buildGeometry(root, g);
     				g.addChild(n);
     				buildGeometry(root, g);
     				// g.addChild(n);
     				_layerNode.addChild(g);
     			} catch (NodeException e) {
     				// TODO Auto-generated catch block
-...
     			posAttTrasn = new PositionAttitudeTransform();
     			posAttTrasn.setPosition(position);
     			posAttTrasn.setScale(scale);
     			posAttTrasn.setAttitude((float) rotation.x(), new Vec3(1,0,0));
     			posAttTrasn.setAttitude((float) rotation.y(), new Vec3(0,1,0));
     			posAttTrasn.setAttitude((float) rotation.z(), new Vec3(0,0,1));
     			// posAttTrasn.setAttitude((float) rotation.x(), new Vec3(1,0,0));
     			// posAttTrasn.setAttitude((float) rotation.y(), new Vec3(0,1,0));
     			// posAttTrasn.setAttitude((float) rotation.z(), new Vec3(0,0,1));
     			buildGeometry(multiGeometry, group);
     			posAttTrasn.addChild(group);
     			_layerNode.addChild(posAttTrasn);
     			// _layerNode.addChild(group);
     		} catch (NodeException e1) {
     			// TODO Auto-generated catch block
     			e1.printStackTrace();
+    		}
+    	}
     	private void buildGeometry(AbstractPrimitive geom, Group group)
-...
+    	}
     	public void startEditing() {
     		try {
     			Layer3DProps props3D = Layer3DProps.getLayer3DProps(this._layer);
     			if ((props3D.getType() == Layer3DProps.layer3DOSG)
     					&& (!props3D.isEditing())) {
     				props3D.setEditing(true);
     				JOptionPane.showMessageDialog(null,
     						"la capa ha sido puesta en edicion automaticamente");
     				editionManager = new EditionManager();
     				editionManager.setScene(_layerNode);
     				Group parent = _layerNode.getParent(0);
     				parent.removeChild(_layerNode);
     				parent.addChild(editionManager);
     				ManipulatorHandler manipulatorHandler = new ManipulatorHandler();
     				manipulatorHandler.setActive(true);
     				EditorListener editionListener = new EditorListener(
     						editionManager, manipulatorHandler, _canvas3D);
     				_canvas3D.getOSGViewer().addEventHandler(manipulatorHandler);
     				// public void changeDragger(String draggerType)
     				//editionManager.changeDragger(DraggerType.ROTATE_SPHERE_DRAGGER
     				// );
     				// editionManager.changeDragger(DraggerType.TABBOX_DRAGGER);
     				//editionManager.changeDragger(DraggerType.TRANSLATE_AXIS_DRAGGER
     				// );
+    			}
     		} catch (NodeException e) {
     			// TODO Auto-generated catch block
     			e.printStackTrace();
+    		}
+    	}
     	public void endEditing() {
     		try {
     			Layer3DProps props3D = Layer3DProps.getLayer3DProps(this._layer);
     			if ((props3D.getType() == Layer3DProps.layer3DOSG)
     					&& (props3D.isEditing())) {
     				props3D.setEditing(false);
     				 command = new RemoveAllSelectionCommand(editionManager);
     				 command.execute();
     				 Group scene = editionManager.getTransformedScene();
     				 Group parent = _layerNode.getParent(0);
     				 parent.removeChild(_layerNode);
     				 parent.addChild(scene);
     				// public void changeDragger(String draggerType)
     				//editionManager.changeDragger(DraggerType.ROTATE_SPHERE_DRAGGER
     				// );
     				// editionManager.changeDragger(DraggerType.TABBOX_DRAGGER);
     				//editionManager.changeDragger(DraggerType.TRANSLATE_AXIS_DRAGGER
     				// );
+    			}
     		} catch (NodeException e) {
     			// TODO Auto-generated catch block
     			e.printStackTrace();
+    		}
+    	}
     	public EditionManager getEditionManager() {
     		return editionManager;
+    	}
     	public void setEditionManager(EditionManager editionManager) {
     		this.editionManager = editionManager;
+    	}
+    }

     import com.iver.cit.gvsig.fmap.core.symbols.ISymbol;
     import com.sun.java_cup.internal.sym;
     public class ObjectPoint3DSymbol extends Abstract3DSymbol{
     public class ObjectPoint3DSymbol extends Abstract3DSymbol {
     	private Object3DMarkerSymbol object3DMarketSymbol;
     	private static Node object3D = null;
     	private static String oldPath = "";
     	public ObjectPoint3DSymbol(ISymbol symbol) {
     		super(symbol);
-...
     	@Override
     	public Node generateSymbol(List<Vec3> position) {
     		Group group = new Group();
     		PositionAttitudeTransform posAttTrasn = null;
     		Vec3 scale = object3DMarketSymbol.getScale();
     		Vec3 rotation = object3DMarketSymbol.getRotationObject();
     		try {
     //			Node object3D = osgDB.readNodeFile("D:/modelos3d/cow.ive");
     			Node object3D = osgDB.readNodeFile(object3DMarketSymbol
     					.getObject3DPath());
     			// Node object3D = osgDB.readNodeFile("D:/modelos3d/cow.ive");
     			if (!(oldPath.equals(object3DMarketSymbol.getObject3DPath()))){
     				oldPath = object3DMarketSymbol.getObject3DPath();
     				object3D = osgDB.readNodeFile(oldPath);
+    			}
     			for (Iterator iterator = position.iterator(); iterator.hasNext();) {
     				Vec3 pos = (Vec3) iterator.next();
     //				System.err.println("position " + pos.x() + " " + pos.y() + " "
     //						+ pos.z());
     				System.err.println("position " + pos.x() + " " + pos.y() + " "
     						+ pos.z());
     				posAttTrasn = new PositionAttitudeTransform();
     				posAttTrasn.setPosition(pos);
     				posAttTrasn.setScale(scale);
     				if (object3DMarketSymbol.isAutoRotate()){
     					AutoTransform autoRotateTrasn = null;
     					autoRotateTrasn = new AutoTransform();
     				if (object3DMarketSymbol.isAutoRotate()) {
     					AutoTransform autoRotateTrasn = null;
     					autoRotateTrasn = new AutoTransform();
     					autoRotateTrasn.setPosition(pos);
     					autoRotateTrasn.addChild(posAttTrasn);
     					autoRotateTrasn.setAutoRotateMode(AutoTransform.AutoRotateMode.ROTATE_TO_CAMERA);
     //					autoRotateTrasn.setAutoScaleToScreen(true);
     					autoRotateTrasn
     							.setAutoRotateMode(AutoTransform.AutoRotateMode.ROTATE_TO_CAMERA);
     					// autoRotateTrasn.setAutoScaleToScreen(true);
     					group.addChild(autoRotateTrasn);
     				}else{
     				} else {
     					group.addChild(posAttTrasn);
+    				}
     				posAttTrasn.addChild(object3D);
+    			}
     		} catch (NodeException e1) {
     			// TODO Auto-generated catch block

     		<dependency>
     			<groupId>org.gvsig.osgvp.libosgvp</groupId>
     			<artifactId>libosgvp-ephemeris</artifactId>
     			<version>2.1.5</version>
     			<version>2.1.6.1</version>
     		</dependency>
     		<dependency>
     			<groupId>org.gvsig.osgvp.libosgvp</groupId>
     			<artifactId>libosgvp-features</artifactId>
     			<version>2.1.5</version>
     			<version>2.1.6.1</version>
     		</dependency>
     		<dependency>
     			<groupId>org.gvsig.osgvp.libosgvp</groupId>
     			<artifactId>libosgvp-manipulator</artifactId>
     			<version>2.1.5</version>
     			<version>2.1.6.1</version>
     		</dependency>
     		<dependency>
     			<groupId>org.gvsig</groupId>

Also available in: Unified diff