Revision 20892

View differences:

trunk/libraries/lib3DMap/src/com/iver/ai2/gvsig3d/simbology3D/geometry3D/Abstract3DGeometry.java
1 1
package com.iver.ai2.gvsig3d.simbology3D.geometry3D;
2 2

  
3

  
3 4
import java.awt.geom.PathIterator;
4 5
import java.util.ArrayList;
5 6
import java.util.List;
6 7

  
8
import org.apache.log4j.Logger;
9
import org.gvsig.osgvp.Group;
10
import org.gvsig.osgvp.Node;
11
import org.gvsig.osgvp.Vec3;
12
import org.gvsig.osgvp.exceptions.node.NodeException;
13
import org.gvsig.osgvp.planets.Planet;
14

  
15
import com.iver.ai2.gvsig3d.gui.Hud;
7 16
import com.iver.ai2.gvsig3d.simbology3D.symbol3D.I3DSymbol;
8 17
import com.iver.cit.gvsig.fmap.core.FGeometry;
9 18
import com.iver.cit.gvsig.fmap.core.FShape;
10 19
import com.iver.cit.gvsig.fmap.core.IGeometry;
11 20

  
12
import es.upv.ai2.osgvp.Group;
13
import es.upv.ai2.osgvp.Node;
14
import es.upv.ai2.osgvp.Vec3;
15
import es.upv.ai2.osgvp.planets.Planet;
16

  
17 21
public abstract class Abstract3DGeometry implements I3DGeometry {
18 22

  
19 23
	private int geomType;
......
23 27
	private float vertEx = 1;
24 28
	private float heigth;
25 29
	private Planet planet;
30
	
31
	private static Logger logger = Logger.getLogger(Abstract3DGeometry.class.getName());
26 32

  
27 33
	public Abstract3DGeometry(IGeometry geometry) {
28 34
		this.geometry = geometry;
......
54 60
				// System.out.println("SEG_MOVETO");
55 61
				node = symbol3D.generateSymbol(posi);
56 62
				if (node != null) {
57
					groupAux.addChild(node);
63
					try {
64
						groupAux.addChild(node);
65
					} catch (NodeException e) {
66
						logger.error("Command:" + "Error setting new child.",e);
67
					}
58 68
					posi.clear();
59 69
					posi = new ArrayList<Vec3>();
60 70
				}
......
89 99
			// }
90 100
			node = symbol3D.generateSymbol(posi);
91 101
			if (node != null)
92
				groupAux.addChild(node);
102
				try {
103
					groupAux.addChild(node);
104
				} catch (NodeException e) {
105
					logger.error("Command:" + "Error adding new child.",e);
106
				}
93 107
		}
94 108
		return groupAux;
95 109

  
trunk/libraries/lib3DMap/src/com/iver/ai2/gvsig3d/simbology3D/geometry3D/I3DGeometry.java
1 1
package com.iver.ai2.gvsig3d.simbology3D.geometry3D;
2 2

  
3
import org.gvsig.osgvp.Group;
4
import org.gvsig.osgvp.Vec3;
5

  
3 6
import com.iver.ai2.gvsig3d.simbology3D.symbol3D.I3DSymbol;
4 7
import com.iver.cit.gvsig.fmap.core.IGeometry;
5 8

  
6
import es.upv.ai2.osgvp.Group;
7
import es.upv.ai2.osgvp.Vec3;
8

  
9 9
public interface I3DGeometry {
10 10

  
11 11
	Group generateGeometry(I3DSymbol symbol3D);
trunk/libraries/lib3DMap/src/com/iver/ai2/gvsig3d/simbology3D/geometry3D/Point3DGeometry.java
5 5
import java.util.List;
6 6
import java.util.Map;
7 7

  
8
import org.apache.log4j.Logger;
9
import org.gvsig.osgvp.Group;
10
import org.gvsig.osgvp.Node;
11
import org.gvsig.osgvp.Vec3;
12
import org.gvsig.osgvp.exceptions.node.NodeException;
13
import org.gvsig.osgvp.features.PixelPoint;
14

  
8 15
import com.iver.ai2.gvsig3d.simbology3D.symbol3D.I3DSymbol;
9 16
import com.iver.cit.gvsig.fmap.core.IGeometry;
10 17

  
11
import es.upv.ai2.osgvp.Group;
12
import es.upv.ai2.osgvp.Node;
13
import es.upv.ai2.osgvp.Vec3;
14

  
15 18
public class Point3DGeometry extends Abstract3DGeometry {
16 19

  
17
	protected Map<Double, List> pointsMap;
20
	protected Map<Double, PixelPoint> pointsMap;
21
	
22
	private static Logger logger = Logger.getLogger(Point3DGeometry.class.getName());
18 23

  
19 24
	public Point3DGeometry(IGeometry geometry) {
20 25
		super(geometry);
21 26

  
22 27
	}
28
	
29
	private Node getPointNode(double key) {
30
		PixelPoint pixelPoint= null;
23 31

  
32
		if (pointsMap.containsKey(new Double(key))) {
33
			// System.out.println("ya contiene esa key");
34
			pixelPoint = pointsMap.get(new Double(key));
35
		} else {
36
			pixelPoint = new PixelPoint();
37
			pointsMap.put(new Double(key), pixelPoint);
38
		}
39

  
40
		return pixelPoint;
41
	}
42

  
43

  
24 44
	public Group generateGeometry(I3DSymbol symbol3D) {
25 45
		Group groupAux = new Group();
26 46
		Node node = null;
......
54 74
				List<Vec3> posit = new ArrayList<Vec3>();
55 75
				posit.add(position);
56 76
				node = symbol3D.generateSymbol(posit);
57
				groupAux.addChild(node);
77
				try {
78
						groupAux.addChild(node);
79
					} catch (NodeException e) {
80
						logger.equals("command: " + "Error adding new child" + e);
81
					}
58 82
				// group.addChild(generateFeature(posit,new
59 83
				// Vec4(1.0,0.0,0.0,1.0),sym));
60 84
				// group.addChild();
trunk/libraries/lib3DMap/src/com/iver/ai2/gvsig3d/simbology3D/Line3DFeature.java
1 1
package com.iver.ai2.gvsig3d.simbology3D;
2 2

  
3
import org.apache.log4j.Logger;
4
import org.gvsig.osgvp.Group;
5
import org.gvsig.osgvp.exceptions.node.NodeException;
6
import org.gvsig.osgvp.planets.Planet;
7

  
8
import com.iver.ai2.gvsig3d.simbology3D.geometry3D.Abstract3DGeometry;
3 9
import com.iver.ai2.gvsig3d.simbology3D.geometry3D.Line3DGeometry;
4 10
import com.iver.ai2.gvsig3d.simbology3D.symbol3D.polyline.SimpleLine3DSymbol;
5 11
import com.iver.cit.gvsig.fmap.core.IGeometry;
6 12
import com.iver.cit.gvsig.fmap.core.symbols.ISymbol;
7 13

  
8
import es.upv.ai2.osgvp.Group;
9
import es.upv.ai2.osgvp.planets.Planet;
10

  
11 14
public class Line3DFeature extends AbstractFeature3D {
12 15

  
13 16
	private Line3DGeometry l3DGeometry;
14 17
	private SimpleLine3DSymbol l3DSymbol;
18
	
19
	private static Logger logger = Logger.getLogger(Line3DFeature.class.getName());
15 20

  
16 21
	public Line3DFeature(ISymbol symbol, IGeometry geometry) {
17 22
		super(symbol, geometry);
......
22 27
	}
23 28

  
24 29
	public Group Draw(Group group) {
25
		group.addChild(l3DGeometry.generateGeometry(l3DSymbol));
30
		try {
31
			group.addChild(l3DGeometry.generateGeometry(l3DSymbol));
32
		} catch (NodeException e) {
33
			logger.error("Command:" + "Error adding new child.",e);
34
		}
26 35
		return group;
27 36
	}
28 37

  
trunk/libraries/lib3DMap/src/com/iver/ai2/gvsig3d/simbology3D/Polygon3DFeature.java
1 1
package com.iver.ai2.gvsig3d.simbology3D;
2 2

  
3
import org.apache.log4j.Logger;
4
import org.gvsig.osgvp.Group;
5
import org.gvsig.osgvp.exceptions.node.NodeException;
6
import org.gvsig.osgvp.planets.Planet;
7

  
8
import com.iver.ai2.gvsig3d.simbology3D.geometry3D.Abstract3DGeometry;
3 9
import com.iver.ai2.gvsig3d.simbology3D.geometry3D.Polygon3DGeometry;
4 10
import com.iver.ai2.gvsig3d.simbology3D.symbol3D.polygon.SimplePolygon3DSymbol;
5 11
import com.iver.cit.gvsig.fmap.core.IGeometry;
6 12
import com.iver.cit.gvsig.fmap.core.symbols.ISymbol;
7 13

  
8
import es.upv.ai2.osgvp.Group;
9
import es.upv.ai2.osgvp.planets.Planet;
10

  
11 14
public class Polygon3DFeature extends AbstractFeature3D {
12 15

  
13 16
	Polygon3DGeometry p3DGeometry;
14 17
	SimplePolygon3DSymbol pp3DSymbol;
18
	private static Logger logger = Logger.getLogger(Abstract3DGeometry.class
19
			.getName());
15 20

  
16 21
	public Polygon3DFeature(ISymbol symbol, IGeometry geometry) {
17 22
		super(symbol, geometry);
......
24 29

  
25 30
	public Group Draw(Group group) {
26 31
		// TODO Auto-generated method stub
27
		group.addChild(p3DGeometry.generateGeometry(pp3DSymbol));
32
		try {
33
			group.addChild(p3DGeometry.generateGeometry(pp3DSymbol));
34
		} catch (NodeException e) {
35
			logger.error("Command: " + "Error adding new child.", e);
36
		}
28 37
		return group;
29 38
	}
30 39

  
trunk/libraries/lib3DMap/src/com/iver/ai2/gvsig3d/simbology3D/I3DFeature.java
1 1
package com.iver.ai2.gvsig3d.simbology3D;
2 2

  
3
import es.upv.ai2.osgvp.Group;
3
import org.gvsig.osgvp.Group;
4 4

  
5 5
public interface I3DFeature {
6 6

  
trunk/libraries/lib3DMap/src/com/iver/ai2/gvsig3d/simbology3D/Point3DFeature.java
1 1
package com.iver.ai2.gvsig3d.simbology3D;
2 2

  
3
import org.apache.log4j.Logger;
4
import org.gvsig.osgvp.Group;
5
import org.gvsig.osgvp.exceptions.node.NodeException;
6
import org.gvsig.osgvp.planets.Planet;
3 7
import org.gvsig.symbology.fmap.symbols.CharacterMarkerSymbol;
4 8
import org.gvsig.symbology.fmap.symbols.PictureMarkerSymbol;
5 9

  
10
import com.iver.ai2.gvsig3d.simbology3D.geometry3D.Abstract3DGeometry;
6 11
import com.iver.ai2.gvsig3d.simbology3D.geometry3D.Point3DGeometry;
7 12
import com.iver.ai2.gvsig3d.simbology3D.symbol3D.I3DSymbol;
8 13
import com.iver.ai2.gvsig3d.simbology3D.symbol3D.point.CharacterPoint3DSymbol;
......
14 19
import com.iver.cit.gvsig.fmap.core.symbols.MultiLayerMarkerSymbol;
15 20
import com.iver.cit.gvsig.fmap.core.symbols.SimpleMarkerSymbol;
16 21

  
17
import es.upv.ai2.osgvp.Group;
18
import es.upv.ai2.osgvp.planets.Planet;
19

  
20 22
public class Point3DFeature extends AbstractFeature3D {
21 23

  
22 24
	private Point3DGeometry p3DGeometry;
23 25
	private I3DSymbol p3DSymbol;
26
	
27
	private static Logger logger = Logger.getLogger(Point3DFeature.class.getName());
24 28

  
25 29
	public Point3DFeature(ISymbol symbol, IGeometry geometry) {
26 30
		super(symbol, geometry);
......
50 54
	}
51 55

  
52 56
	public Group Draw(Group group) {
53
		group.addChild(p3DGeometry.generateGeometry(p3DSymbol));
57
		try {
58
			group.addChild(p3DGeometry.generateGeometry(p3DSymbol));
59
		} catch (NodeException e) {
60
		logger.error("Command: "+ "Error adding new child.", e);
61
		}
54 62
		return group;
55 63
	}
56 64

  
trunk/libraries/lib3DMap/src/com/iver/ai2/gvsig3d/simbology3D/symbol3D/polyline/SimpleLine3DSymbol.java
3 3
import java.awt.Color;
4 4
import java.util.List;
5 5

  
6
import org.gvsig.osgvp.Node;
7
import org.gvsig.osgvp.Vec3;
8
import org.gvsig.osgvp.Vec4;
9

  
6 10
import com.iver.ai2.gvsig3d.gui.FeatureFactory;
7 11
import com.iver.ai2.gvsig3d.simbology3D.symbol3D.Abstract3DSymbol;
8 12
import com.iver.cit.gvsig.fmap.core.symbols.ILineSymbol;
9 13
import com.iver.cit.gvsig.fmap.core.symbols.ISymbol;
10 14

  
11
import es.upv.ai2.osgvp.Node;
12
import es.upv.ai2.osgvp.Vec3;
13
import es.upv.ai2.osgvp.Vec4;
14

  
15 15
public class SimpleLine3DSymbol extends Abstract3DSymbol {
16 16

  
17 17
	private Vec4 rgba;
trunk/libraries/lib3DMap/src/com/iver/ai2/gvsig3d/simbology3D/symbol3D/Abstract3DSymbol.java
3 3
import java.util.ArrayList;
4 4
import java.util.List;
5 5

  
6
import org.gvsig.osgvp.Node;
7
import org.gvsig.osgvp.Vec3;
8

  
6 9
import com.iver.cit.gvsig.fmap.core.symbols.ISymbol;
7 10

  
8
import es.upv.ai2.osgvp.Node;
9
import es.upv.ai2.osgvp.Vec3;
10

  
11 11
public abstract class Abstract3DSymbol implements I3DSymbol {
12 12

  
13 13
	ISymbol symbol = null;
trunk/libraries/lib3DMap/src/com/iver/ai2/gvsig3d/simbology3D/symbol3D/I3DSymbol.java
2 2

  
3 3
import java.util.List;
4 4

  
5
import es.upv.ai2.osgvp.Node;
6
import es.upv.ai2.osgvp.Vec3;
5
import org.gvsig.osgvp.Node;
6
import org.gvsig.osgvp.Vec3;
7 7

  
8 8

  
9 9
public interface I3DSymbol {
trunk/libraries/lib3DMap/src/com/iver/ai2/gvsig3d/simbology3D/symbol3D/polygon/SimplePolygon3DSymbol.java
3 3
import java.awt.Color;
4 4
import java.util.List;
5 5

  
6
import org.gvsig.osgvp.Node;
7
import org.gvsig.osgvp.Vec3;
8
import org.gvsig.osgvp.Vec4;
9

  
6 10
import com.iver.ai2.gvsig3d.gui.FeatureFactory;
7 11
import com.iver.ai2.gvsig3d.simbology3D.symbol3D.Abstract3DSymbol;
8 12
import com.iver.cit.gvsig.fmap.core.symbols.IFillSymbol;
9 13
import com.iver.cit.gvsig.fmap.core.symbols.ISymbol;
10 14

  
11
import es.upv.ai2.osgvp.Node;
12
import es.upv.ai2.osgvp.Vec3;
13
import es.upv.ai2.osgvp.Vec4;
14

  
15 15
public class SimplePolygon3DSymbol extends Abstract3DSymbol {
16 16

  
17 17
	private Vec4 rgba;
......
32 32
	@Override
33 33
	public Node generateSymbol(List<Vec3> position) {
34 34
		// TODO Auto-generated method stub
35
		return FeatureFactory.insertPolygon(position, rgba, null);
35
//		return FeatureFactory.insertPolygon(position, rgba, null);
36
		return FeatureFactory.insertPolygonExtruded(position, rgba, null,1000);
36 37
	}
37 38

  
38 39
}
trunk/libraries/lib3DMap/src/com/iver/ai2/gvsig3d/simbology3D/symbol3D/point/MultiLayerPoint3DSymbol.java
12 12
import java.io.IOException;
13 13
import java.util.List;
14 14

  
15
import org.gvsig.osgvp.Node;
16
import org.gvsig.osgvp.Vec3;
17
import org.gvsig.osgvp.Vec4;
18

  
15 19
import com.iver.ai2.gvsig3d.gui.FeatureFactory;
16 20
import com.iver.ai2.gvsig3d.simbology3D.symbol3D.Abstract3DSymbol;
17 21
import com.iver.cit.gvsig.fmap.core.SymbologyFactory;
......
23 27
import com.sun.media.jai.codec.PNGEncodeParam;
24 28
import com.sun.media.jai.codec.TIFFEncodeParam;
25 29

  
26
import es.upv.ai2.osgvp.Node;
27
import es.upv.ai2.osgvp.Vec3;
28
import es.upv.ai2.osgvp.Vec4;
29

  
30 30
public class MultiLayerPoint3DSymbol extends Abstract3DSymbol{
31 31

  
32 32
	private MultiLayerMarkerSymbol multiLayerMarketSymbol;
trunk/libraries/lib3DMap/src/com/iver/ai2/gvsig3d/simbology3D/symbol3D/point/SimplePoint3DSymbol.java
4 4
import java.util.List;
5 5
import java.util.Map;
6 6

  
7
import org.gvsig.osgvp.Node;
8
import org.gvsig.osgvp.Vec3;
9
import org.gvsig.osgvp.Vec4;
10
import org.gvsig.osgvp.features.PixelPoint;
11

  
7 12
import com.iver.ai2.gvsig3d.gui.FeatureFactory;
8 13
import com.iver.ai2.gvsig3d.simbology3D.symbol3D.Abstract3DSymbol;
9 14
import com.iver.cit.gvsig.fmap.core.symbols.IMarkerSymbol;
10 15
import com.iver.cit.gvsig.fmap.core.symbols.ISymbol;
11 16

  
12
import es.upv.ai2.osgvp.Node;
13
import es.upv.ai2.osgvp.Vec3;
14
import es.upv.ai2.osgvp.Vec4;
15
import es.upv.ai2.osgvp.features.PixelPoint;
16

  
17 17
public class SimplePoint3DSymbol extends Abstract3DSymbol {
18 18

  
19 19
	// Los tipo puntos tienen q tener una unica instancia de pixel point.
trunk/libraries/lib3DMap/src/com/iver/ai2/gvsig3d/simbology3D/symbol3D/point/PicturePoint3DSymbol.java
2 2

  
3 3
import java.util.List;
4 4

  
5
import org.gvsig.osgvp.Node;
6
import org.gvsig.osgvp.Vec3;
7
import org.gvsig.osgvp.Vec4;
5 8
import org.gvsig.symbology.fmap.symbols.PictureMarkerSymbol;
6 9

  
7 10
import com.iver.ai2.gvsig3d.gui.FeatureFactory;
8 11
import com.iver.ai2.gvsig3d.simbology3D.symbol3D.Abstract3DSymbol;
9 12
import com.iver.cit.gvsig.fmap.core.symbols.ISymbol;
10 13

  
11
import es.upv.ai2.osgvp.Node;
12
import es.upv.ai2.osgvp.Vec3;
13
import es.upv.ai2.osgvp.Vec4;
14

  
15 14
public class PicturePoint3DSymbol extends Abstract3DSymbol{
16 15

  
17 16
	private PictureMarkerSymbol pictureMarketSymbol;
trunk/libraries/lib3DMap/src/com/iver/ai2/gvsig3d/simbology3D/symbol3D/point/CharacterPoint3DSymbol.java
12 12
import java.io.IOException;
13 13
import java.util.List;
14 14

  
15
import org.gvsig.osgvp.Node;
16
import org.gvsig.osgvp.Vec3;
17
import org.gvsig.osgvp.Vec4;
15 18
import org.gvsig.symbology.fmap.symbols.CharacterMarkerSymbol;
16 19

  
17 20
import com.iver.ai2.gvsig3d.gui.FeatureFactory;
......
24 27
import com.sun.media.jai.codec.PNGEncodeParam;
25 28
import com.sun.media.jai.codec.TIFFEncodeParam;
26 29

  
27
import es.upv.ai2.osgvp.Node;
28
import es.upv.ai2.osgvp.Vec3;
29
import es.upv.ai2.osgvp.Vec4;
30

  
31 30
public class CharacterPoint3DSymbol extends Abstract3DSymbol{
32 31

  
33 32
	private CharacterMarkerSymbol characterMarketSymbol;

Also available in: Unified diff