Revision 317 2.0/trunk/org.gvsig.gvsig3d/org.gvsig.gvsig3d.lib/org.gvsig.gvsig3d.lib.impl/src/main/java/org/gvsig/gvsig3d/impl/map3d/MapContext3DImpl.java

View differences:

MapContext3DImpl.java
71 71 
import org.gvsig.fmap.mapcontext.rendering.legend.events.LegendClearEvent;
72 72 
import org.gvsig.fmap.mapcontext.rendering.legend.events.SymbolLegendEvent;
73 73 
import org.gvsig.fmap.mapcontext.rendering.legend.events.listeners.LegendListener;
74 
import org.gvsig.fmap.mapcontext.rendering.symbols.ISymbol;
75 
import org.gvsig.gvsig3d.impl.symbology3d.Symbol3DFactory;
74 76 
import org.gvsig.gvsig3d.impl.symbology3d.fill.impl.SimpleFill3DSymbol;
77 
import org.gvsig.gvsig3d.impl.symbology3d.line.impl.SimpleLine3DSymbol;
75 78 
import org.gvsig.gvsig3d.impl.symbology3d.marker.impl.SimpleMarker3DSymbol;
76 79 
import org.gvsig.gvsig3d.map3d.Layer3DProps;
77 80 
import org.gvsig.gvsig3d.map3d.MapContext3D;
78 81 
import org.gvsig.gvsig3d.map3d.layers.FLayers3D;
82 
import org.gvsig.gvsig3d.symbology3d.I3DSymbol;
79 83 
import org.gvsig.osgvp.core.osg.Matrix;
80 84 
import org.gvsig.osgvp.core.osg.Node;
81 85 
import org.gvsig.osgvp.core.osg.Vec2;
......
84 88 
import org.gvsig.osgvp.exceptions.image.ImageConversionException;
85 89 
import org.gvsig.osgvp.exceptions.node.ChildIndexOutOfBoundsExceptions;
86 90 
import org.gvsig.osgvp.exceptions.node.NodeException;
87 
import org.gvsig.osgvp.symbology.FireMarker;
88 
import org.gvsig.osgvp.symbology.SimpleMarker;
91 
import org.gvsig.osgvp.symbology.ISymbol3D;
92 
import org.gvsig.osgvp.symbology.marker.FireMarker;
93 
import org.gvsig.osgvp.symbology.marker.SimpleMarker;
94 
import org.gvsig.osgvp.symbology.fill.SimpleFill;
95 
import org.gvsig.osgvp.symbology.line.SimpleLine;
89 96 
import org.gvsig.osgvp.terrain.Extent;
90 97 
import org.gvsig.osgvp.terrain.HeightfieldLayer;
91 98 
import org.gvsig.osgvp.terrain.JavaDataDriver;
......
461 468 
			vlayer.setEnabled(layer.isVisible());
462 469 
			vlayer.setExtent(extent);
463 470 
			vlayer.setDataDriver(_terrainDataManager);
464 
			System.out.println("Vectorial torpedo");
465 471 
			try {
466 472 
				_terrainLayerManager.addLayer(vlayer);
467 473 
			} catch (LayerManagementException e) {
......
1270 1276 
		System.out.println("vector data");
1271 1277 
		UpdateDataEvent ude = new UpdateDataEvent();
1272 1278 
		ude.copyDataFromRequest(rde);
1273
1274 
		SimpleFill3DSymbol sy = (SimpleFill3DSymbol) ((FLyrVect) layer)
1275 
		.getLegend().getDefaultSymbol();
1276
1277 
//		SimpleMarker3DSymbol sy = (SimpleMarker3DSymbol) ((FLyrVect) layer)
1278 
//				.getLegend().getDefaultSymbol();
1279 1279 

  		




  
  1280
  
    
		// Convenience casting


  		




  
  1281
  
    
		I3DSymbol sy = (I3DSymbol) ((FLyrVect) layer).getLegend()


  		




  
  1282
  
    
				.getDefaultSymbol();


  		




  
  1283
  
    

  		




  1280
  1284
  
    
		ViewPort vp = new ViewPort(_viewProjection);


  		




  1281
  1285
  
    
		vp.setEnvelope(envelope); // the real extent of the tile


  		




  1282
  1286
  
    
		vp.setAdjustable(false);


  		




  ......




  1303
  1307
  
    
				e.printStackTrace();


  		




  1304
  1308
  
    
			}


  		




  1305
  1309
  
    
			System.out.println("OSG Layer added");


  		




  1306
  
  
    

  		




  1307
  1310
  
    
		}


  		




  1308
  
  
    
		/// Vectorial layers


  		




  1309
  
  
    
//		else {


  		




  1310
  
  
    
//			// HACK: TODO create a SymbolFactory


  		




  1311
  
  
    
//			SimpleMarker sm = null;


  		




  1312
  
  
    
//


  		




  1313
  
  
    
//			try {


  		




  1314
  
  
    
//				sm = new SimpleMarker();


  		




  1315
  
  
    
//			} catch (NodeException e) {


  		




  1316
  
  
    
//				// TODO Auto-generated catch block


  		




  1317
  
  
    
//				e.printStackTrace();


  		




  1318
  
  
    
//			}


  		




  1319
  
  
    
//			sm.setPointSize((float) sy.getSize());


  		




  1320
  
  
    
//			Color color = sy.getColor();


  		




  1321
  
  
    
//			sm.setColor(color);


  		




  1322
  
  
    
//			n = sm.buildSceneGraph(sy.getGeometry());


  		




  1323
  
  
    
//			//n = sm.buildSceneGraph(sy.getGeometry());


  		




  1324
  
  
    
//		}


  		




  
  1311
  
    
		// Vectorial layers


  		




  
  1312
  
    
		else {		


  		




  
  1313
  
    
			ISymbol3D sym = null;


  		




  
  1314
  
    
			try {


  		




  
  1315
  
    
				sym = Symbol3DFactory.getSymbol3D(sy);


  		




  
  1316
  
    
			} catch (NodeException e) {


  		




  
  1317
  
    
				// TODO Auto-generated catch block


  		




  
  1318
  
    
				e.printStackTrace();


  		




  
  1319
  
    
			}


  		




  
  1320
  
    
			//sm.setPointSize((float) sy.getSize());


  		




  
  1321
  
    
			Color color = sy.getColor();


  		




  
  1322
  
    
			sym.setColor(color);


  		




  
  1323
  
    
			n = sym.buildSceneGraph(sy.getGeometry());


  		




  
  1324
  
    
		}


  		




  1325
  1325
  
    

  		




  1326
  1326
  
    
		ude.setVectorData(n);


  		




  1327
  1327
  
    

  		












Also available in:  Unified diff