Revision 324 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
75 75
import org.gvsig.gvsig3d.impl.symbology3d.Symbol3DFactory;
76 76
import org.gvsig.gvsig3d.impl.symbology3d.fill.impl.SimpleFill3DSymbol;
77 77
import org.gvsig.gvsig3d.impl.symbology3d.line.impl.SimpleLine3DSymbol;
78
import org.gvsig.gvsig3d.impl.symbology3d.marker.impl.NodeMarker3DSymbol;
78 79
import org.gvsig.gvsig3d.impl.symbology3d.marker.impl.SimpleMarker3DSymbol;
79 80
import org.gvsig.gvsig3d.map3d.Layer3DProps;
80 81
import org.gvsig.gvsig3d.map3d.MapContext3D;
......
89 90
import org.gvsig.osgvp.exceptions.image.ImageConversionException;
90 91
import org.gvsig.osgvp.exceptions.node.ChildIndexOutOfBoundsExceptions;
91 92
import org.gvsig.osgvp.exceptions.node.NodeException;
93
import org.gvsig.osgvp.geometry.GeoPointArray3D;
92 94
import org.gvsig.osgvp.symbology.ISymbol3D;
93
import org.gvsig.osgvp.symbology.marker.FireMarker;
94 95
import org.gvsig.osgvp.symbology.marker.SimpleMarker;
95 96
import org.gvsig.osgvp.symbology.fill.SimpleFill;
96 97
import org.gvsig.osgvp.symbology.line.SimpleLine;
......
1065 1066
			ude = loadRasterData(layer, envelope, rde);
1066 1067

  
1067 1068
		if (rde.getLayer().getLayerType() == Layer.LayerType.VECTORLAYER)
1068
			ude = loadVectorData(layer, envelope, rde);
1069

  
1069
			{
1070
//			NodeMarker3DSymbol n = new NodeMarker3DSymbol();
1071
//			n.setNodeFileURL("/home/jtorres/.depman/share/osgVP/resources/fire.osg");
1072
			ude = loadVectorData(layer, envelope, rde, null);
1073
			}
1070 1074
		if (rde.getLayer().getLayerType() == Layer.LayerType.HEIGHTFIELDLAYER)
1071 1075
			ude = loadElevationData(layer, envelope, rde);
1072 1076

  
......
1236 1240
	}
1237 1241

  
1238 1242
	private UpdateDataEvent loadVectorData(FLayer layer, Envelope envelope,
1239
			RequestDataEvent rde) {
1243
			RequestDataEvent rde, I3DSymbol sy) {
1240 1244
		
1241 1245
		System.out.println("vector data");
1242 1246
		UpdateDataEvent ude = new UpdateDataEvent();
1243 1247
		ude.copyDataFromRequest(rde);
1244 1248

  
1245 1249
		
1246
		// Convenience casting
1247
		I3DSymbol sy = (I3DSymbol) ((FLyrVect) layer).getLegend()
1248
				.getDefaultSymbol();
1249
		//Hack for polylines and polygons only rendered rasterized by now
1250
		// Convenience casting, create a default 3D symbol
1251
		IVectorLegend legend = (IVectorLegend) ((FLyrVect) layer).getLegend();
1252
		if(sy==null) sy = (I3DSymbol) legend.getDefaultSymbol();
1253
		else legend.setDefaultSymbol(sy);
1254
		
1255
		
1256
		//Hack for polylines and polygons to only render them rasterized
1257
		//till gvSIG architects solve geometries problem
1250 1258
		if (sy instanceof IFillSymbol || sy instanceof ILineSymbol)
1251 1259
		{
1252 1260
			removeLayerToTerrain(layer);
......
1297 1305
				e.printStackTrace();
1298 1306
			}
1299 1307
			//sm.setPointSize((float) sy.getSize());
1300
			
1301
			Color color = sy.getColor();
1302
			sym.setColor(color);
1303 1308
			n = sym.buildSceneGraph(sy.getGeometry());
1304 1309
		}
1305 1310

  

Also available in: Unified diff