Revision 26999

View differences:

branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/operations3D/context/Draw3DContext.java
1 1
package org.gvsig.operations3D.context;
2 2

  
3 3
import org.gvsig.fmap.geom.operation.GeometryOperationContext;
4
import org.gvsig.osgvp.Group;
4
import org.gvsig.osgvp.core.osg.Group;
5 5
import org.gvsig.osgvp.planets.Planet;
6 6

  
7 7
public class Draw3DContext extends GeometryOperationContext {
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/operations3D/Draw3DMultiSolid.java
9 9
import org.gvsig.geometries3D.MultiSolid;
10 10
import org.gvsig.geometries3D.Solid;
11 11
import org.gvsig.operations3D.context.Draw3DContext;
12
import org.gvsig.osgvp.Group;
12
import org.gvsig.osgvp.core.osg.Group;
13 13

  
14

  
14 15
public class Draw3DMultiSolid extends GeometryOperation {
15 16

  
16 17
	// Check GeometryManager for alternative methods to register an operation
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/operations3D/Draw3DMultiGeometry.java
5 5
import org.gvsig.fmap.geom.operation.GeometryOperation;
6 6
import org.gvsig.fmap.geom.operation.GeometryOperationContext;
7 7
import org.gvsig.fmap.geom.operation.GeometryOperationException;
8
import org.gvsig.fmap.geom.operation.GeometryOperationNotSupportedException;
9
import org.gvsig.fmap.geom.primitive.AbstractPrimitive;
10 8
import org.gvsig.geometries3D.MultiGeometry;
11
import org.gvsig.operations3D.context.Draw3DContext;
12
import org.gvsig.osgvp.Group;
13
import org.gvsig.osgvp.exceptions.node.NodeException;
9
import org.gvsig.osgvp.core.osg.Group;
14 10

  
15 11
public class Draw3DMultiGeometry extends GeometryOperation {
16 12

  
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/operations3D/Draw3DSolid.java
11 11
import org.gvsig.fmap.geom.operation.GeometryOperationContext;
12 12
import org.gvsig.geometries3D.Solid;
13 13
import org.gvsig.operations3D.context.Draw3DContext;
14
import org.gvsig.osgvp.DrawElementsUInt;
15
import org.gvsig.osgvp.Geode;
16
import org.gvsig.osgvp.Group;
17
import org.gvsig.osgvp.Material;
18
import org.gvsig.osgvp.Node;
19
import org.gvsig.osgvp.Texture2D;
20
import org.gvsig.osgvp.Vec2;
21
import org.gvsig.osgvp.Vec3;
22
import org.gvsig.osgvp.Vec4;
14
import org.gvsig.osgvp.core.osg.DrawElementsUInt;
15
import org.gvsig.osgvp.core.osg.Geode;
16
import org.gvsig.osgvp.core.osg.Group;
17
import org.gvsig.osgvp.core.osg.Material;
18
import org.gvsig.osgvp.core.osg.Node;
19
import org.gvsig.osgvp.core.osg.Texture2D;
20
import org.gvsig.osgvp.core.osg.Vec2;
21
import org.gvsig.osgvp.core.osg.Vec3;
22
import org.gvsig.osgvp.core.osg.Vec4;
23 23
import org.gvsig.osgvp.exceptions.InvalidValueException;
24 24
import org.gvsig.osgvp.exceptions.image.ImageException;
25 25
import org.gvsig.osgvp.exceptions.node.NodeException;
......
46 46
		
47 47
		int i;
48 48
		Geode geode = new Geode();
49
		org.gvsig.osgvp.Geometry geometry = new org.gvsig.osgvp.Geometry();
49
		org.gvsig.osgvp.core.osg.Geometry geometry = new org.gvsig.osgvp.core.osg.Geometry();
50 50

  
51 51
		try {
52 52
			group.addChild(geode);
......
142 142

  
143 143
				BufferedImage image = (BufferedImage) solid.getTextures()
144 144
						.get(j);
145
				org.gvsig.osgvp.Image osgImage = new org.gvsig.osgvp.Image();
145
				org.gvsig.osgvp.core.osg.Image osgImage = new org.gvsig.osgvp.core.osg.Image();
146 146

  
147 147
				osgImage.setBufferedImage(image);
148 148

  
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/gvsig3d/listener/EditorListener.java
32 32
import java.awt.event.MouseEvent;
33 33
import java.awt.event.MouseListener;
34 34
import java.util.logging.Level;
35

  
35 36
import org.apache.log4j.Logger;
36
import org.geotools.data.wms.xml.WMSDescribeLayerTypes._LayerDescription;
37
import org.gvsig.gvsig3d.cacheservices.OSGCacheService;
38 37
import org.gvsig.gvsig3d.navigation.NavigationMode;
39
import org.gvsig.osgvp.ActionCommand;
40
import org.gvsig.osgvp.Group;
41
import org.gvsig.osgvp.Node;
42
import org.gvsig.osgvp.exceptions.node.ChildIndexOutOfBoundsExceptions;
38
import org.gvsig.osgvp.core.osg.Group;
39
import org.gvsig.osgvp.core.osg.Node;
43 40
import org.gvsig.osgvp.exceptions.node.NodeException;
44 41
import org.gvsig.osgvp.manipulator.AddSelectionCommand;
45 42
import org.gvsig.osgvp.manipulator.EditionManager;
46 43
import org.gvsig.osgvp.manipulator.Manipulator;
47 44
import org.gvsig.osgvp.manipulator.ManipulatorHandler;
48 45
import org.gvsig.osgvp.manipulator.RemoveAllSelectionCommand;
49
import org.gvsig.osgvp.manipulator.UngroupCommand;
50
import org.gvsig.osgvp.planets.CustomTerrainManipulator;
51 46
import org.gvsig.osgvp.planets.PlanetViewer;
52
import org.gvsig.osgvp.planets.PlanetViewer;
47
import org.gvsig.osgvp.util.ActionCommand;
53 48
import org.gvsig.osgvp.util.Util;
54 49
import org.gvsig.osgvp.viewer.Camera;
55 50
import org.gvsig.osgvp.viewer.IViewerContainer;
56 51
import org.gvsig.osgvp.viewer.Intersection;
57 52
import org.gvsig.osgvp.viewer.Intersections;
58
import org.gvsig.osgvp.viewer.manipulator.CameraManipulator;
53

  
59 54
import com.iver.ai2.gvsig3d.map3d.layers.Layer3DProps;
60 55
import com.iver.cit.gvsig.fmap.layers.FLayer;
61 56

  
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/gvsig3d/listener/canvasListener.java
5 5
import java.awt.event.MouseEvent;
6 6
import java.awt.event.MouseListener;
7 7

  
8
import org.gvsig.osgvp.Vec3;
8
import org.gvsig.osgvp.core.osg.Vec3;
9 9
import org.gvsig.osgvp.planets.Planet;
10 10
import org.gvsig.osgvp.planets.PlanetViewer;
11 11
import org.gvsig.osgvp.viewer.Camera;
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/gvsig3d/cacheservices/VectorCacheService.java
1 1
package org.gvsig.gvsig3d.cacheservices;
2 2

  
3
import java.awt.Font;
4 3
import java.awt.geom.Rectangle2D;
5 4
import java.util.ArrayList;
6 5
import java.util.List;
......
15 14
import org.gvsig.gvsig3d.simbology3D.Line3DFeature;
16 15
import org.gvsig.gvsig3d.simbology3D.Point3DFeature;
17 16
import org.gvsig.gvsig3d.simbology3D.Polygon3DFeature;
18
import org.gvsig.osgvp.Group;
19
import org.gvsig.osgvp.Node;
20
import org.gvsig.osgvp.Vec3;
21
import org.gvsig.osgvp.Vec4;
17
import org.gvsig.osgvp.core.osg.Group;
18
import org.gvsig.osgvp.core.osg.Node;
19
import org.gvsig.osgvp.core.osg.Vec3;
20
import org.gvsig.osgvp.core.osg.Vec4;
22 21
import org.gvsig.osgvp.exceptions.node.NodeException;
23 22
import org.gvsig.osgvp.features.PixelPoint;
24 23
import org.gvsig.osgvp.planets.Planet;
......
34 33
import com.iver.cit.gvsig.fmap.core.IFeature;
35 34
import com.iver.cit.gvsig.fmap.core.IGeometry;
36 35
import com.iver.cit.gvsig.fmap.core.ILabelable;
37
import com.iver.cit.gvsig.fmap.core.SymbologyFactory;
38 36
import com.iver.cit.gvsig.fmap.core.symbols.ISymbol;
39 37
import com.iver.cit.gvsig.fmap.drivers.IFeatureIterator;
40 38
import com.iver.cit.gvsig.fmap.layers.FLayer;
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/gvsig3d/cacheservices/OSGCacheService.java
18 18
import org.gvsig.gvsig3d.listener.EditorListener;
19 19
import org.gvsig.operations3D.Draw3DMultiSolid;
20 20
import org.gvsig.operations3D.context.Draw3DContext;
21
import org.gvsig.osgvp.Group;
22
import org.gvsig.osgvp.Node;
23
import org.gvsig.osgvp.PositionAttitudeTransform;
24
import org.gvsig.osgvp.Vec3;
25
import org.gvsig.osgvp.osgDB;
21

  
22
import org.gvsig.osgvp.core.osg.Group;
23
import org.gvsig.osgvp.core.osg.Node;
24
import org.gvsig.osgvp.core.osg.PositionAttitudeTransform;
25
import org.gvsig.osgvp.core.osg.Vec3;
26
import org.gvsig.osgvp.core.osgdb.osgDB;
26 27
import org.gvsig.osgvp.exceptions.node.NodeException;
27 28
import org.gvsig.osgvp.manipulator.EditionManager;
28 29
import org.gvsig.osgvp.manipulator.ManipulatorHandler;
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/gvsig3d/labels3D/ILabel3D.java
1 1
package org.gvsig.gvsig3d.labels3D;
2 2

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

  
4

  
5
import org.gvsig.osgvp.core.osg.Vec3;
6

  
5 7
import com.iver.cit.gvsig.fmap.core.v02.FLabel;
6 8

  
7 9
public interface ILabel3D {
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/gvsig3d/labels3D/AbstractLabel3D.java
1 1
package org.gvsig.gvsig3d.labels3D;
2 2

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

  
4

  
5
import org.gvsig.osgvp.core.osg.Vec3;
6

  
5 7
import com.iver.cit.gvsig.fmap.core.v02.FLabel;
6 8

  
7 9
public class AbstractLabel3D implements ILabel3D {
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/gvsig3d/simbology3D/Line3DFeature.java
5 5
import org.gvsig.gvsig3d.simbology3D.symbol3D.Abstract3DSymbol;
6 6
import org.gvsig.gvsig3d.simbology3D.symbol3D.polyline.ExtrusionLine3DSymbol;
7 7
import org.gvsig.gvsig3d.simbology3D.symbol3D.polyline.SimpleLine3DSymbol;
8
import org.gvsig.osgvp.Group;
8
import org.gvsig.osgvp.core.osg.Group;
9 9
import org.gvsig.osgvp.exceptions.node.NodeException;
10 10
import org.gvsig.osgvp.planets.Planet;
11 11

  
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/gvsig3d/simbology3D/Polygon3DFeature.java
6 6
import org.gvsig.gvsig3d.simbology3D.symbol3D.Abstract3DSymbol;
7 7
import org.gvsig.gvsig3d.simbology3D.symbol3D.polygon.ExtrusionPolygon3DSymbol;
8 8
import org.gvsig.gvsig3d.simbology3D.symbol3D.polygon.SimplePolygon3DSymbol;
9
import org.gvsig.osgvp.Group;
9
import org.gvsig.osgvp.core.osg.Group;
10 10
import org.gvsig.osgvp.exceptions.node.NodeException;
11 11
import org.gvsig.osgvp.planets.Planet;
12 12

  
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/gvsig3d/simbology3D/I3DFeature.java
1 1
package org.gvsig.gvsig3d.simbology3D;
2 2

  
3
import org.gvsig.osgvp.Group;
3
import org.gvsig.osgvp.core.osg.Group;
4 4

  
5

  
6

  
5 7
public interface I3DFeature {
6 8

  
7 9
	/**
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/gvsig3d/simbology3D/Point3DFeature.java
9 9
import org.gvsig.gvsig3d.simbology3D.symbol3D.point.ObjectPoint3DSymbol;
10 10
import org.gvsig.gvsig3d.simbology3D.symbol3D.point.PicturePoint3DSymbol;
11 11
import org.gvsig.gvsig3d.simbology3D.symbol3D.point.SimplePoint3DSymbol;
12
import org.gvsig.osgvp.Group;
12
import org.gvsig.osgvp.core.osg.Group;
13 13
import org.gvsig.osgvp.exceptions.node.NodeException;
14 14
import org.gvsig.osgvp.planets.Planet;
15 15
import org.gvsig.symbology.fmap.symbols.CharacterMarkerSymbol;
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/gvsig3d/simbology3D/symbol3D/polyline/ExtrusionLine3DSymbol.java
23 23

  
24 24
import org.gvsig.gvsig3d.gui.FeatureFactory;
25 25
import org.gvsig.gvsig3d.simbology3D.symbol3D.Abstract3DSymbol;
26
import org.gvsig.osgvp.Node;
27
import org.gvsig.osgvp.Vec3;
28
import org.gvsig.osgvp.Vec4;
26
import org.gvsig.osgvp.core.osg.Node;
27
import org.gvsig.osgvp.core.osg.Vec3;
28
import org.gvsig.osgvp.core.osg.Vec4;
29 29

  
30 30
import com.iver.ai2.gvsig3d.legend.symbols.BaseExtrusionSymbol;
31 31
import com.iver.cit.gvsig.fmap.core.symbols.ISymbol;
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/gvsig3d/simbology3D/symbol3D/polyline/SimpleLine3DSymbol.java
5 5

  
6 6
import org.gvsig.gvsig3d.gui.FeatureFactory;
7 7
import org.gvsig.gvsig3d.simbology3D.symbol3D.Abstract3DSymbol;
8
import org.gvsig.osgvp.Node;
9
import org.gvsig.osgvp.Vec3;
10
import org.gvsig.osgvp.Vec4;
8
import org.gvsig.osgvp.core.osg.Node;
9
import org.gvsig.osgvp.core.osg.Vec3;
10
import org.gvsig.osgvp.core.osg.Vec4;
11 11

  
12 12
import com.iver.cit.gvsig.fmap.core.symbols.ILineSymbol;
13 13
import com.iver.cit.gvsig.fmap.core.symbols.ISymbol;
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/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;
6
import org.gvsig.osgvp.core.osg.Node;
7
import org.gvsig.osgvp.core.osg.Vec3;
8 8

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

  
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/gvsig3d/simbology3D/symbol3D/I3DSymbol.java
2 2

  
3 3
import java.util.List;
4 4

  
5
import org.gvsig.osgvp.Node;
6
import org.gvsig.osgvp.Vec3;
5
import org.gvsig.osgvp.core.osg.Node;
6
import org.gvsig.osgvp.core.osg.Vec3;
7 7

  
8 8

  
9

  
10

  
9 11
public interface I3DSymbol {
10 12
	public Node generateSymbol(List<Vec3> position);
11 13

  
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/gvsig3d/simbology3D/symbol3D/polygon/ExtrusionPolygon3DSymbol.java
5 5

  
6 6
import org.gvsig.gvsig3d.gui.FeatureFactory;
7 7
import org.gvsig.gvsig3d.simbology3D.symbol3D.Abstract3DSymbol;
8
import org.gvsig.osgvp.Node;
9
import org.gvsig.osgvp.Vec3;
10
import org.gvsig.osgvp.Vec4;
8
import org.gvsig.osgvp.core.osg.Node;
9
import org.gvsig.osgvp.core.osg.Vec3;
10
import org.gvsig.osgvp.core.osg.Vec4;
11 11

  
12 12
import com.iver.ai2.gvsig3d.legend.symbols.BaseExtrusionSymbol;
13 13
import com.iver.cit.gvsig.fmap.core.symbols.IFillSymbol;
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/gvsig3d/simbology3D/symbol3D/polygon/SimplePolygon3DSymbol.java
5 5

  
6 6
import org.gvsig.gvsig3d.gui.FeatureFactory;
7 7
import org.gvsig.gvsig3d.simbology3D.symbol3D.Abstract3DSymbol;
8
import org.gvsig.osgvp.Node;
9
import org.gvsig.osgvp.Vec3;
10
import org.gvsig.osgvp.Vec4;
8
import org.gvsig.osgvp.core.osg.Node;
9
import org.gvsig.osgvp.core.osg.Vec3;
10
import org.gvsig.osgvp.core.osg.Vec4;
11 11

  
12 12
import com.iver.cit.gvsig.fmap.core.symbols.IFillSymbol;
13 13
import com.iver.cit.gvsig.fmap.core.symbols.ISymbol;
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/gvsig3d/simbology3D/symbol3D/point/MultiLayerPoint3DSymbol.java
14 14

  
15 15
import org.gvsig.gvsig3d.gui.FeatureFactory;
16 16
import org.gvsig.gvsig3d.simbology3D.symbol3D.Abstract3DSymbol;
17
import org.gvsig.osgvp.Node;
18
import org.gvsig.osgvp.Vec3;
19
import org.gvsig.osgvp.Vec4;
17
import org.gvsig.osgvp.core.osg.Node;
18
import org.gvsig.osgvp.core.osg.Vec3;
19
import org.gvsig.osgvp.core.osg.Vec4;
20 20

  
21 21
import com.iver.cit.gvsig.fmap.core.SymbologyFactory;
22 22
import com.iver.cit.gvsig.fmap.core.symbols.ISymbol;
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/gvsig3d/simbology3D/symbol3D/point/SimplePoint3DSymbol.java
7 7

  
8 8
import org.gvsig.gvsig3d.gui.FeatureFactory;
9 9
import org.gvsig.gvsig3d.simbology3D.symbol3D.Abstract3DSymbol;
10
import org.gvsig.osgvp.Node;
11
import org.gvsig.osgvp.Vec3;
12
import org.gvsig.osgvp.Vec4;
13
import org.gvsig.osgvp.osgDB;
10
import org.gvsig.osgvp.core.osg.Node;
11
import org.gvsig.osgvp.core.osg.Vec3;
12
import org.gvsig.osgvp.core.osg.Vec4;
13
import org.gvsig.osgvp.core.osgdb.osgDB;
14 14
import org.gvsig.osgvp.exceptions.node.LoadNodeException;
15 15
import org.gvsig.osgvp.exceptions.node.NodeException;
16 16
import org.gvsig.osgvp.features.PixelPoint;
17
import org.gvsig.osgvp.features.Sphere;
18 17

  
19 18
import com.iver.cit.gvsig.fmap.core.symbols.IMarkerSymbol;
20 19
import com.iver.cit.gvsig.fmap.core.symbols.ISymbol;
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/gvsig3d/simbology3D/symbol3D/point/PicturePoint3DSymbol.java
4 4

  
5 5
import org.gvsig.gvsig3d.gui.FeatureFactory;
6 6
import org.gvsig.gvsig3d.simbology3D.symbol3D.Abstract3DSymbol;
7
import org.gvsig.osgvp.Node;
8
import org.gvsig.osgvp.Vec3;
9
import org.gvsig.osgvp.Vec4;
7
import org.gvsig.osgvp.core.osg.Node;
8
import org.gvsig.osgvp.core.osg.Vec3;
9
import org.gvsig.osgvp.core.osg.Vec4;
10 10
import org.gvsig.symbology.fmap.symbols.PictureMarkerSymbol;
11 11

  
12 12
import com.iver.cit.gvsig.fmap.core.symbols.ISymbol;
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/gvsig3d/simbology3D/symbol3D/point/CharacterPoint3DSymbol.java
14 14

  
15 15
import org.gvsig.gvsig3d.gui.FeatureFactory;
16 16
import org.gvsig.gvsig3d.simbology3D.symbol3D.Abstract3DSymbol;
17
import org.gvsig.osgvp.Node;
18
import org.gvsig.osgvp.Vec3;
19
import org.gvsig.osgvp.Vec4;
17
import org.gvsig.osgvp.core.osg.Node;
18
import org.gvsig.osgvp.core.osg.Vec3;
19
import org.gvsig.osgvp.core.osg.Vec4;
20 20
import org.gvsig.symbology.fmap.symbols.CharacterMarkerSymbol;
21 21

  
22 22
import com.iver.cit.gvsig.fmap.core.SymbologyFactory;
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/gvsig3d/simbology3D/symbol3D/point/ExtrusionPoint3DSymbol.java
23 23

  
24 24
import org.gvsig.gvsig3d.gui.FeatureFactory;
25 25
import org.gvsig.gvsig3d.simbology3D.symbol3D.Abstract3DSymbol;
26
import org.gvsig.osgvp.Node;
27
import org.gvsig.osgvp.Vec3;
28
import org.gvsig.osgvp.Vec4;
26
import org.gvsig.osgvp.core.osg.Node;
27
import org.gvsig.osgvp.core.osg.Vec3;
28
import org.gvsig.osgvp.core.osg.Vec4;
29 29

  
30 30
import com.iver.ai2.gvsig3d.legend.symbols.BaseExtrusionSymbol;
31
import com.iver.cit.gvsig.fmap.core.symbols.ILineSymbol;
32 31
import com.iver.cit.gvsig.fmap.core.symbols.ISymbol;
33 32

  
34 33
public class ExtrusionPoint3DSymbol extends Abstract3DSymbol{
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/gvsig3d/simbology3D/symbol3D/point/ObjectPoint3DSymbol.java
4 4
import java.util.Iterator;
5 5
import java.util.List;
6 6

  
7
import org.gvsig.gvsig3d.gui.FeatureFactory;
8 7
import org.gvsig.gvsig3d.simbology3D.symbol3D.Abstract3DSymbol;
9
import org.gvsig.osgvp.AutoTransform;
10
import org.gvsig.osgvp.Group;
11
import org.gvsig.osgvp.Node;
12
import org.gvsig.osgvp.PositionAttitudeTransform;
13
import org.gvsig.osgvp.Vec3;
14
import org.gvsig.osgvp.Vec4;
15
import org.gvsig.osgvp.osgDB;
16
import org.gvsig.osgvp.AutoTransform.AutoRotateMode;
8
import org.gvsig.osgvp.core.osg.AutoTransform;
9
import org.gvsig.osgvp.core.osg.Group;
10
import org.gvsig.osgvp.core.osg.Node;
11
import org.gvsig.osgvp.core.osg.PositionAttitudeTransform;
12
import org.gvsig.osgvp.core.osg.Vec3;
13
import org.gvsig.osgvp.core.osgdb.osgDB;
17 14
import org.gvsig.osgvp.exceptions.node.NodeException;
18
import org.gvsig.symbology.fmap.symbols.PictureMarkerSymbol;
19 15

  
20 16
import com.iver.ai2.gvsig3d.legend.symbols.Object3DMarkerSymbol;
21 17
import com.iver.cit.gvsig.fmap.core.symbols.ISymbol;
22
import com.sun.java_cup.internal.sym;
23 18

  
24 19
public class ObjectPoint3DSymbol extends Abstract3DSymbol {
25 20

  
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/gvsig3d/simbology3D/geometry3D/Abstract3DGeometry.java
7 7

  
8 8
import org.apache.log4j.Logger;
9 9
import org.gvsig.gvsig3d.simbology3D.symbol3D.I3DSymbol;
10
import org.gvsig.osgvp.Group;
11
import org.gvsig.osgvp.Node;
12
import org.gvsig.osgvp.Vec3;
10
import org.gvsig.osgvp.core.osg.Group;
11
import org.gvsig.osgvp.core.osg.Node;
12
import org.gvsig.osgvp.core.osg.Vec3;
13 13
import org.gvsig.osgvp.exceptions.node.NodeException;
14 14
import org.gvsig.osgvp.planets.Planet;
15 15

  
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/gvsig3d/simbology3D/geometry3D/Line3DGeometry.java
1 1
package org.gvsig.gvsig3d.simbology3D.geometry3D;
2 2

  
3
import org.gvsig.gvsig3d.simbology3D.symbol3D.I3DSymbol;
4
import org.gvsig.osgvp.Group;
5

  
6 3
import com.iver.cit.gvsig.fmap.core.IGeometry;
7 4

  
8 5
public class Line3DGeometry extends Abstract3DGeometry {
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/gvsig3d/simbology3D/geometry3D/I3DGeometry.java
1 1
package org.gvsig.gvsig3d.simbology3D.geometry3D;
2 2

  
3 3
import org.gvsig.gvsig3d.simbology3D.symbol3D.I3DSymbol;
4
import org.gvsig.osgvp.Group;
5
import org.gvsig.osgvp.Vec3;
4
import org.gvsig.osgvp.core.osg.Group;
5
import org.gvsig.osgvp.core.osg.Vec3;
6 6

  
7 7
import com.iver.cit.gvsig.fmap.core.IGeometry;
8 8

  
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/gvsig3d/simbology3D/geometry3D/Point3DGeometry.java
7 7

  
8 8
import org.apache.log4j.Logger;
9 9
import org.gvsig.gvsig3d.simbology3D.symbol3D.I3DSymbol;
10
import org.gvsig.osgvp.Group;
11
import org.gvsig.osgvp.Node;
12
import org.gvsig.osgvp.Vec3;
10
import org.gvsig.osgvp.core.osg.Group;
11
import org.gvsig.osgvp.core.osg.Node;
12
import org.gvsig.osgvp.core.osg.Vec3;
13 13
import org.gvsig.osgvp.exceptions.node.NodeException;
14 14
import org.gvsig.osgvp.features.PixelPoint;
15 15

  
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/gvsig3d/drivers/GvsigDriverOSG.java
1 1
package org.gvsig.gvsig3d.drivers;
2 2

  
3 3
import java.io.File;
4
import java.io.FileInputStream;
5
import java.io.FileNotFoundException;
6
import org.gvsig.osgvp.Group;
7 4

  
8 5
import org.gvsig.driver.OSGDriver;
9 6
import org.gvsig.fmap.geom.operation.GeometryOperationException;
......
14 11
import org.gvsig.gpe.osg.OSGParser;
15 12
import org.gvsig.operations3D.Draw3DMultiSolid;
16 13
import org.gvsig.operations3D.context.Draw3DContext;
14
import org.gvsig.osgvp.core.osg.Group;
17 15
import org.gvsig.osgvp.exceptions.node.NodeException;
18 16

  
19 17
import com.hardcode.gdbms.driver.exceptions.CloseDriverException;
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/gvsig3d/utils/Punto3D.java
1 1
package org.gvsig.gvsig3d.utils;
2 2

  
3
import org.gvsig.osgvp.Vec3;
4
import org.gvsig.osgvp.Vec4;
3
import org.gvsig.osgvp.core.osg.Vec3;
4
import org.gvsig.osgvp.core.osg.Vec4;
5 5

  
6

  
7

  
6 8
public class Punto3D {
7 9

  
8 10
	private Vec3 position;
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/gvsig3d/utils/UtilCoord.java
2 2

  
3 3
import java.awt.geom.Rectangle2D;
4 4

  
5
import org.gvsig.osgvp.Vec3;
5
import org.gvsig.osgvp.core.osg.Vec3;
6 6
import org.gvsig.osgvp.viewer.Camera;
7 7

  
8 8
public class UtilCoord {
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/gvsig3d/gui/Hud.java
6 6

  
7 7
import org.apache.log4j.Logger;
8 8
import org.gvsig.gui.beans.Messages;
9
import org.gvsig.osgvp.Group;
10
import org.gvsig.osgvp.Node;
11
import org.gvsig.osgvp.UpdateNodeListener;
12
import org.gvsig.osgvp.Vec3;
13
import org.gvsig.osgvp.Vec4;
9
import org.gvsig.osgvp.core.osg.Group;
10
import org.gvsig.osgvp.core.osg.Node;
11
import org.gvsig.osgvp.core.osg.Vec3;
12
import org.gvsig.osgvp.core.osg.Vec4;
14 13
import org.gvsig.osgvp.exceptions.InvalidValueException;
15 14
import org.gvsig.osgvp.exceptions.node.NodeException;
16 15
import org.gvsig.osgvp.features.Text;
17 16
import org.gvsig.osgvp.planets.Planet;
17
import org.gvsig.osgvp.util.UpdateNodeListener;
18 18
import org.gvsig.osgvp.viewer.IViewerContainer;
19 19

  
20 20
import com.iver.ai2.gvsig3d.resources.ResourcesFactory;
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/gvsig3d/gui/FeatureFactory.java
7 7
import java.util.List;
8 8

  
9 9
import org.apache.log4j.Logger;
10
import org.gvsig.geometries3D.PrimitiveSet.Mode;
10 11
import org.gvsig.gvsig3d.labels3D.ILabel3D;
11 12
import org.gvsig.gvsig3d.labels3D.SimpleLabel3D;
12 13
import org.gvsig.gvsig3d.utils.Punto3D;
13
import org.gvsig.osgvp.AutoTransform;
14
import org.gvsig.osgvp.Geode;
15
import org.gvsig.osgvp.Group;
16
import org.gvsig.osgvp.Node;
17
import org.gvsig.osgvp.Optimizer;
18
import org.gvsig.osgvp.Vec3;
19
import org.gvsig.osgvp.Vec4;
20
import org.gvsig.osgvp.Optimizer.OptimizationOptions;
14
import org.gvsig.osgvp.core.osg.AutoTransform;
15
import org.gvsig.osgvp.core.osg.Geode;
16
import org.gvsig.osgvp.core.osg.Group;
17
import org.gvsig.osgvp.core.osg.Node;
18
import org.gvsig.osgvp.core.osg.Vec3;
19
import org.gvsig.osgvp.core.osg.Vec4;
20
import org.gvsig.osgvp.core.osgutil.Optimizer;
21
import org.gvsig.osgvp.core.osgutil.Optimizer.OptimizationOptions;
21 22
import org.gvsig.osgvp.exceptions.InvalidValueException;
22 23
import org.gvsig.osgvp.exceptions.node.NodeException;
23 24
import org.gvsig.osgvp.features.PixelPoint;
......
493 494
		Group group = new Group();
494 495
		Geode geode = new Geode();
495 496
		
496
		geode.getOrCreateStateSet().setTwoSidedLighting(true);
497
		geode.getOrCreateStateSet().setTwoSidedLighting(true, Node.Mode.OVERRIDE|Node.Mode.ON);
497 498
		try {
498 499
			geode.addDrawable(pe.getGeometry());
499 500
			group.addChild(geode);
......
800 801
		Group group = new Group();
801 802
		Geode geode = new Geode();
802 803
		
803
		geode.getOrCreateStateSet().setTwoSidedLighting(true);
804
		geode.getOrCreateStateSet().setTwoSidedLighting(true, Node.Mode.ON| Node.Mode.OVERRIDE);
804 805
		try {
805 806
			geode.addDrawable(pe.getGeometry());
806 807
			group.addChild(geode);
......
909 910
		Group group = new Group();
910 911
		Geode geode = new Geode();
911 912
		
912
		geode.getOrCreateStateSet().setTwoSidedLighting(true);
913
		geode.getOrCreateStateSet().setTwoSidedLighting(true, Node.Mode.ON| Node.Mode.OVERRIDE);
913 914
		try {
914 915
			geode.addDrawable(pe.getGeometry());
915 916
			group.addChild(geode);
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/gvsig3d/gui/Compass.java
27 27

  
28 28
package org.gvsig.gvsig3d.gui;
29 29

  
30
import java.io.FileNotFoundException;
31

  
32
import org.gvsig.osgvp.Image;
33
import org.gvsig.osgvp.Matrix;
34
import org.gvsig.osgvp.MatrixTransform;
35
import org.gvsig.osgvp.PositionAttitudeTransform;
36
import org.gvsig.osgvp.Quat;
37
import org.gvsig.osgvp.Texture2D;
38
import org.gvsig.osgvp.Vec3;
39
import org.gvsig.osgvp.Vec4;
40
import org.gvsig.osgvp.exceptions.image.ImageException;
41
import org.gvsig.osgvp.exceptions.image.LoadImageException;
30
import org.gvsig.osgvp.core.osg.Matrix;
31
import org.gvsig.osgvp.core.osg.MatrixTransform;
32
import org.gvsig.osgvp.core.osg.PositionAttitudeTransform;
33
import org.gvsig.osgvp.core.osg.Quat;
34
import org.gvsig.osgvp.core.osg.Texture2D;
35
import org.gvsig.osgvp.core.osg.Vec3;
36
import org.gvsig.osgvp.core.osg.Vec4;
42 37
import org.gvsig.osgvp.exceptions.node.NodeException;
43 38
import org.gvsig.osgvp.features.Polygon;
44 39
import org.gvsig.osgvp.features.Quad;
45 40
import org.gvsig.osgvp.planets.Planet;
46
import org.gvsig.osgvp.util.Util;
47 41
import org.gvsig.osgvp.viewer.Camera;
48 42

  
49 43
import com.iver.ai2.gvsig3d.resources.ResourcesFactory;
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/gvsig3d/map3d/GraphicLayer3D.java
2 2

  
3 3
import java.awt.geom.Point2D;
4 4
import java.io.FileNotFoundException;
5
import java.io.InputStream;
6
import java.net.URL;
7 5

  
8 6
import org.apache.log4j.Logger;
9 7
import org.gvsig.gvsig3d.gui.FeatureFactory;
10
import org.gvsig.osgvp.AutoTransform;
11
import org.gvsig.osgvp.Group;
12
import org.gvsig.osgvp.Node;
13
import org.gvsig.osgvp.PositionAttitudeTransform;
14
import org.gvsig.osgvp.Vec3;
15
import org.gvsig.osgvp.Vec4;
16
import org.gvsig.osgvp.osgDB;
8
import org.gvsig.osgvp.core.osg.AutoTransform;
9
import org.gvsig.osgvp.core.osg.Group;
10
import org.gvsig.osgvp.core.osg.Node;
11
import org.gvsig.osgvp.core.osg.PositionAttitudeTransform;
12
import org.gvsig.osgvp.core.osg.Vec3;
13
import org.gvsig.osgvp.core.osg.Vec4;
14
import org.gvsig.osgvp.core.osgdb.osgDB;
17 15
import org.gvsig.osgvp.exceptions.InvalidValueException;
18 16
import org.gvsig.osgvp.exceptions.node.ChildIndexOutOfBoundsExceptions;
19 17
import org.gvsig.osgvp.exceptions.node.LoadNodeException;
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/gvsig3d/map3d/ViewPort3D.java
7 7
import java.awt.geom.Rectangle2D;
8 8

  
9 9
import org.cresques.cts.IProjection;
10
import org.gvsig.osgvp.Vec3;
10
import org.gvsig.osgvp.core.osg.Vec3;
11 11
import org.gvsig.osgvp.planets.Planet;
12 12
import org.gvsig.osgvp.viewer.IViewerContainer;
13 13
import org.gvsig.osgvp.viewer.Intersections;
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/src/org/gvsig/gvsig3d/map3d/MapContext3D.java
24 24
import org.gvsig.gvsig3d.cacheservices.VectorCacheService;
25 25
import org.gvsig.gvsig3d.drivers.GvsigDriverOSG;
26 26
import org.gvsig.gvsig3d.map3d.layers.FLayers3D;
27
import org.gvsig.osgvp.Image;
28
import org.gvsig.osgvp.Matrix;
29
import org.gvsig.osgvp.Node;
30
import org.gvsig.osgvp.Vec3;
31
import org.gvsig.osgvp.Vec4;
27
import org.gvsig.osgvp.core.osg.Image;
28
import org.gvsig.osgvp.core.osg.Matrix;
29
import org.gvsig.osgvp.core.osg.Node;
30
import org.gvsig.osgvp.core.osg.Vec3;
31
import org.gvsig.osgvp.core.osg.Vec4;
32 32
import org.gvsig.osgvp.exceptions.image.ImageConversionException;
33 33
import org.gvsig.osgvp.exceptions.node.ChildIndexOutOfBoundsExceptions;
34 34
import org.gvsig.osgvp.exceptions.node.NodeException;
branches/3D_Animation_prepto_osgvp_2_2_0/libraries/lib3DMap/pom.xml
5 5
	<groupId>org.gvsig</groupId>
6 6
	<artifactId>lib3DMap</artifactId>
7 7
	<packaging>jar</packaging>
8
	<version>1.0-SNAPSHOT</version>
8
	<version>1.1-SNAPSHOT</version>
9 9
	<name>lib3DMap</name>
10 10
	<url>http://gvsig.org</url>
11 11
	<parent>
......
47 47
		<dependency>
48 48
			<groupId>org.gvsig.osgvp.libosgvp</groupId>
49 49
			<artifactId>libosgvp-ephemeris</artifactId>
50
			<version>2.1.7</version>
50
			<version>2.2.0</version>
51 51
		</dependency>
52 52
		<dependency>
53 53
			<groupId>org.gvsig.osgvp.libosgvp</groupId>
54 54
			<artifactId>libosgvp-stereoconfig</artifactId>
55
			<version>2.1.7</version>
55
			<version>2.2.0</version>
56 56
		</dependency>
57 57
		<dependency>
58 58
			<groupId>org.gvsig.osgvp.libosgvp</groupId>
59 59
			<artifactId>libosgvp-features</artifactId>
60
			<version>2.1.7</version>
60
			<version>2.2.0</version>
61 61
		</dependency>
62 62
		<dependency>
63 63
			<groupId>org.gvsig.osgvp.libosgvp</groupId>
64 64
			<artifactId>libosgvp-manipulator</artifactId>
65
			<version>2.1.7</version>
65
			<version>2.2.0</version>
66 66
		</dependency>
67 67
		<dependency>
68 68
			<groupId>org.gvsig</groupId>
69 69
			<artifactId>lib3DMap-share</artifactId>
70
			<version>1.0-SNAPSHOT</version>
70
			<version>1.1-SNAPSHOT</version>
71 71
		</dependency>
72 72
		<dependency>
73 73
			<groupId>org.gvsig</groupId>

Also available in: Unified diff