Revision 26998

View differences:

branches/3D_Animation_prepto_osgvp_2_2_0/extensions/ext3Dgui/src/org/gvsig/gvsig3dgui/display/FullScreenPanel.java
19 19

  
20 20
import org.gvsig.gui.beans.swing.GridBagLayoutPanel;
21 21
import org.gvsig.gvsig3d.map3d.MapContext3D;
22
import org.gvsig.gvsig3d.map3d.ViewPort3D;
23
import org.gvsig.gvsig3d.map3d.layers.FLayers3D;
24 22
import org.gvsig.gvsig3dgui.view.View3D;
25
import org.gvsig.osgvp.CameraHUD;
26
import org.gvsig.osgvp.Group;
27
import org.gvsig.osgvp.Matrix;
28
import org.gvsig.osgvp.Node;
29
import org.gvsig.osgvp.Vec3;
30
import org.gvsig.osgvp.Vec4;
23
import org.gvsig.osgvp.core.osg.Group;
24
import org.gvsig.osgvp.core.osg.Matrix;
25
import org.gvsig.osgvp.core.osg.Node;
26
import org.gvsig.osgvp.core.osg.Vec3;
27
import org.gvsig.osgvp.core.osg.Vec4;
31 28
import org.gvsig.osgvp.exceptions.node.ChildIndexOutOfBoundsExceptions;
32 29
import org.gvsig.osgvp.exceptions.node.NodeException;
33 30
import org.gvsig.osgvp.features.Polygon;
......
36 33
import org.gvsig.osgvp.planets.PlanetViewer;
37 34
import org.gvsig.osgvp.planets.exceptions.PlanetExtentException;
38 35
import org.gvsig.osgvp.stereoconfig.StereoConfig;
36
import org.gvsig.osgvp.util.CameraHUD;
39 37
import org.gvsig.osgvp.viewer.Camera;
40 38
import org.gvsig.osgvp.viewer.DisplaySettings;
41 39

  
42
import com.iver.ai2.gvsig3d.map3d.layers.Layer3DProps;
43 40
import com.iver.andami.PluginServices;
44 41
import com.iver.andami.ui.mdiManager.IWindow;
45 42
import com.iver.andami.ui.mdiManager.IWindowListener;
46 43
import com.iver.andami.ui.mdiManager.WindowInfo;
47
import com.iver.cit.gvsig.fmap.MapContext;
48
import com.iver.cit.gvsig.fmap.ViewPort;
49
import com.iver.cit.gvsig.fmap.layers.FLayer;
50
import com.iver.cit.gvsig.fmap.layers.FLayers;
51
import com.iver.cit.gvsig.fmap.layers.SingleLayerIterator;
52
import com.iver.cit.gvsig.project.Project;
53
import com.iver.utiles.console.jedit.PropsTokenMarker;
54 44

  
55 45
public class FullScreenPanel extends GridBagLayoutPanel implements IWindow,
56 46
		ChangeListener, IWindowListener {
branches/3D_Animation_prepto_osgvp_2_2_0/extensions/ext3Dgui/src/org/gvsig/gvsig3dgui/display/EnableCompass.java
1 1
package org.gvsig.gvsig3dgui.display;
2 2

  
3 3
import org.gvsig.gvsig3dgui.view.View3D;
4
import org.gvsig.osgvp.Group;
4
import org.gvsig.osgvp.core.osg.Group;
5 5
import org.gvsig.osgvp.exceptions.node.ChildIndexOutOfBoundsExceptions;
6 6
import org.gvsig.osgvp.planets.PlanetViewer;
7 7

  
branches/3D_Animation_prepto_osgvp_2_2_0/extensions/ext3Dgui/src/org/gvsig/gvsig3dgui/ProjectView3D.java
18 18
import org.gvsig.gvsig3d.navigation.NavigationMode;
19 19
import org.gvsig.gvsig3dgui.view.View3D;
20 20
import org.gvsig.gvsig3dgui.view.ViewProperties3D;
21
import org.gvsig.osgvp.Vec3;
22
import org.gvsig.osgvp.exceptions.node.ChildIndexOutOfBoundsExceptions;
21
import org.gvsig.osgvp.core.osg.Vec3;
23 22
import org.gvsig.osgvp.exceptions.node.NodeException;
24 23
import org.gvsig.osgvp.planets.Planet;
25 24
import org.gvsig.osgvp.planets.PlanetViewer;
branches/3D_Animation_prepto_osgvp_2_2_0/extensions/ext3Dgui/src/org/gvsig/gvsig3dgui/view/InsertPosition.java
57 57
import org.gvsig.gui.beans.swing.GridBagLayoutPanel;
58 58
import org.gvsig.gui.beans.swing.JButton;
59 59
import org.gvsig.gvsig3dgui.ProjectView3D;
60
import org.gvsig.osgvp.Vec3;
60
import org.gvsig.osgvp.core.osg.Vec3;
61 61
import org.gvsig.osgvp.planets.Planet;
62 62

  
63 63
import com.iver.andami.PluginServices;
branches/3D_Animation_prepto_osgvp_2_2_0/extensions/ext3Dgui/src/org/gvsig/gvsig3dgui/listener/PointSelectListerner3D.java
3 3
import java.awt.geom.Point2D;
4 4

  
5 5
import org.gvsig.gvsig3d.map3d.MapContext3D;
6
import org.gvsig.osgvp.Vec3;
6
import org.gvsig.osgvp.core.osg.Vec3;
7 7
import org.gvsig.osgvp.viewer.Intersections;
8 8

  
9 9
import com.hardcode.gdbms.driver.exceptions.ReadDriverException;
branches/3D_Animation_prepto_osgvp_2_2_0/extensions/ext3Dgui/src/org/gvsig/gvsig3dgui/listener/RectangleSelectListener3D.java
4 4
import java.awt.geom.Rectangle2D;
5 5

  
6 6
import org.gvsig.gvsig3d.map3d.MapContext3D;
7
import org.gvsig.osgvp.Vec3;
7
import org.gvsig.osgvp.core.osg.Vec3;
8 8
import org.gvsig.osgvp.viewer.Intersections;
9 9

  
10 10
import com.hardcode.gdbms.driver.exceptions.ReadDriverException;
branches/3D_Animation_prepto_osgvp_2_2_0/extensions/ext3Dgui/src/org/gvsig/gvsig3dgui/behavior/RectangleBehavior3D.java
10 10
import org.apache.log4j.Logger;
11 11
import org.gvsig.gvsig3d.map3d.GraphicLayer3D;
12 12
import org.gvsig.gvsig3d.map3d.MapContext3D;
13
import org.gvsig.osgvp.Vec3;
13
import org.gvsig.osgvp.core.osg.Vec3;
14 14
import org.gvsig.osgvp.exceptions.OSGVPException;
15 15
import org.gvsig.osgvp.exceptions.node.NodeException;
16 16
import org.gvsig.osgvp.features.SelectionRectangle;
branches/3D_Animation_prepto_osgvp_2_2_0/extensions/ext3Dgui/src/org/gvsig/gvsig3dgui/import3D/ControlImport3D.java
52 52
import org.gvsig.gvsig3d.cacheservices.OSGCacheService;
53 53
import org.gvsig.gvsig3d.map3d.MapContext3D;
54 54
import org.gvsig.gvsig3dgui.view.View3D;
55
import org.gvsig.osgvp.Vec3;
55

  
56
import org.gvsig.osgvp.core.osg.Vec3;
56 57
import org.gvsig.osgvp.viewer.Intersections;
57 58

  
58 59
import com.iver.ai2.gvsig3d.map3d.layers.Layer3DProps;
branches/3D_Animation_prepto_osgvp_2_2_0/extensions/ext3Dgui/src/org/gvsig/gvsig3dgui/import3D/SaveLayerOSG.java
30 30

  
31 31
import org.gvsig.gvsig3d.cacheservices.OSGCacheService;
32 32
import org.gvsig.gvsig3dgui.view.View3D;
33
import org.gvsig.osgvp.Group;
34
import org.gvsig.osgvp.osgDB;
33
import org.gvsig.osgvp.core.osg.Group;
34
import org.gvsig.osgvp.core.osgdb.osgDB;
35

  
35 36
import org.gvsig.osgvp.exceptions.node.NodeException;
36 37
import org.gvsig.osgvp.exceptions.node.SaveNodeException;
37 38

  
branches/3D_Animation_prepto_osgvp_2_2_0/extensions/ext3Dgui/pom.xml
4 4
	<groupId>org.gvsig</groupId>
5 5
	<artifactId>ext3Dgui</artifactId>
6 6
	<packaging>jar</packaging>
7
	<version>1.0-SNAPSHOT</version>
7
	<version>1.1-SNAPSHOT</version>
8 8
	<name>ext3Dgui</name>
9 9
	<url>http://gvsig.org</url>
10 10
	<description> This is the extension that contains all the GUI part for
......
19 19
		<dependency>
20 20
			<groupId>org.gvsig</groupId>
21 21
			<artifactId>lib3DMap</artifactId>
22
			<version>1.0-SNAPSHOT</version>
22
			<version>1.1-SNAPSHOT</version>
23 23
		</dependency>
24 24
		<dependency>
25 25
			<groupId>org.gvsig</groupId>

Also available in: Unified diff