Revision 21195

View differences:

trunk/libraries/lib3DMap/src/com/iver/ai2/gvsig3d/geometry/GeometryFactory3D.java
12 12
	public Point createPoint3D(String id){
13 13
		return createPoint3D(id, 0.0,0.0,0.0);
14 14
	}
15
	
15 16
	public Point createPoint3D(String id,double x, double y, double z){
16 17
		Point3D point3D = new Point3D(id);
17 18
		point3D.setX(x);
trunk/libraries/lib3DMap/src/com/iver/ai2/gvsig3d/geometry/Point3D.java
15 15
import org.gvsig.fmap.geom.primitive.Point;
16 16
import org.gvsig.fmap.geom.type.GeometryType;
17 17

  
18
import com.iver.ai2.gvsig3d.geometry.operation.Draw3DPoint3DTest;
18 19

  
20

  
19 21
public class Point3D extends AbstractPrimitive	implements Point {
20 22

  
21 23
	private static final long serialVersionUID = 1L;
......
24 26
	private static final GeometryType geomType = GeometryManager.getInstance()
25 27
			.registerGeometryType(Point3D.class);
26 28
		
27
	/** CTEs para identificar las operaciones registradas para el tipo de geometrĂ­a geomType */
29
//	/** CTEs para identificar las operaciones registradas para el tipo de geometrĂ­a geomType */
28 30
//    public static final int OPERATION_PRINTLN = GeometryManager.getInstance()
29 31
//			.registerGeometryOperation("draw3D",  new Draw3DPoint3D(), geomType);
30 32
	
33
	public static final int CODE = geomType.getType();
31 34
	
32
	
33 35
	public Point3D(String id) {
34 36
		super(id, null);
35
		this.setId(id);
37
//		th 	is.setId(id);
36 38
		
37 39
	}
38 40

  
......
41 43
	private double z = 0;
42 44
	private String id;
43 45

  
44
	public void setId(String id) {
45
		this.id = id;
46
	}
46
//	public void setId(String id) {
47
//		this.id = id;
48
//	}
47 49

  
48 50
	public double getX() {
49 51
		return x;
......
71 73

  
72 74
	@Override
73 75
	public GeometryType getGeometryType() {
74
		// TODO Auto-generated method stub
75
		return null;
76
		return geomType;
76 77
	}
77 78

  
78 79
	@Override
......
102 103
	}
103 104

  
104 105
	public int getType() {
105
		// TODO Auto-generated method stub
106
		return 0;
106
		return CODE;
107 107
	}
108 108

  
109 109
	public boolean intersects(Rectangle2D arg0) {
trunk/libraries/lib3DMap/src/com/iver/ai2/gvsig3d/geometry/operation/Draw3DSolid.java
1
//package com.iver.ai2.gvsig3d.geometry.operation;
2
//
3
//import org.gvsig.fmap.geom.Geometry;
4
//import org.gvsig.fmap.geom.operation.GeometryOperation;
5
//import org.gvsig.fmap.geom.operation.GeometryOperationContext;
6
//
7
//public class Draw3DSolid extends GeometryOperation {
8
//
9
//	@Override
10
//	public Object invoke(Geometry geom, GeometryOperationContext ctx) {
11
//		// TODO Auto-generated method stub
12
//		return null;
13
//	}
14
//
15
//
16
//}
1
package com.iver.ai2.gvsig3d.geometry.operation;
2

  
3
import org.gvsig.fmap.geom.Geometry;
4
import org.gvsig.fmap.geom.GeometryManager;
5
import org.gvsig.fmap.geom.operation.GeometryOperation;
6
import org.gvsig.fmap.geom.operation.GeometryOperationContext;
7

  
8
import com.iver.ai2.gvsig3d.geometry.Solid;
9

  
10
public class Draw3DSolid extends GeometryOperation {
11

  
12
	// Check GeometryManager for alternative methods to register an operation
13
	public static final int CODE = GeometryManager.getInstance()
14
			.registerGeometryOperation("Draw3DSolid", new Draw3DSolid(),Solid.class);
15

  
16
	@Override
17
	public Object invoke(Geometry geom, GeometryOperationContext ctx) {
18
		// TODO Auto-generated method stub
19
		return null;
20
	}
21

  
22
	@Override
23
	public int getOperationIndex() {
24
		// TODO Auto-generated method stub
25
		return CODE;
26
	}
27

  
28
}
trunk/libraries/lib3DMap/src/com/iver/ai2/gvsig3d/geometry/operation/context/Draw3DContext.java
1
package com.iver.ai2.gvsig3d.geometry.operation.context;
2

  
3
import org.gvsig.fmap.geom.operation.GeometryOperationContext;
4
import org.gvsig.osgvp.planets.Planet;
5

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

  
8
public class Draw3DContext extends GeometryOperationContext {
9

  
10
	private Planet planet = null;
11
	private ISymbol symbol = null;
12

  
13
	public Planet getPlanet() {
14
		return planet;
15
	}
16

  
17
	public void setPlanet(Planet planet) {
18
		this.planet = planet;
19
	}
20

  
21
	public ISymbol getSymbol() {
22
		return symbol;
23
	}
24

  
25
	public void setSymbol(ISymbol symbol) {
26
		this.symbol = symbol;
27
	}
28
}
trunk/libraries/lib3DMap/src/com/iver/ai2/gvsig3d/geometry/operation/Draw3DPoint3D.java
1
//package com.iver.ai2.gvsig3d.geometry.operation;
2
//
3
//import org.gvsig.fmap.geom.Geometry;
4
//import org.gvsig.fmap.geom.operation.GeometryOperation;
5
//import org.gvsig.fmap.geom.operation.GeometryOperationContext;
6
//
7
//import com.iver.ai2.gvsig3d.geometry.Point3D;
8
//import com.iver.cit.gvsig.fmap.core.AbstractGeometry;
9
//
10
//public class Draw3DPoint3D extends GeometryOperation {
11
//
12
//
13
//	public Object invoke(Geometry geom, GeometryOperationContext ctx) {
14
//		// TODO Auto-generated method stub
15
//		Point3D p3D = (Point3D) geom;
16
//		System.out.println("X: " + p3D.getX());
17
//		System.out.println("Y: " + p3D.getY());
18
//		System.out.println("Z: " + p3D.getZ());
19
//		System.out.println("Tipo: " + p3D.getGeometryType());
20
//		return null;
21
//	}
22
//
23
//}
1
package com.iver.ai2.gvsig3d.geometry.operation;
2

  
3
import org.gvsig.fmap.geom.Geometry;
4
import org.gvsig.fmap.geom.GeometryManager;
5
import org.gvsig.fmap.geom.operation.GeometryOperation;
6
import org.gvsig.fmap.geom.operation.GeometryOperationContext;
7

  
8
import com.iver.ai2.gvsig3d.geometry.Point3D;
9

  
10
public class Draw3DPoint3D extends GeometryOperation {
11

  
12
	// Check GeometryManager for alternative methods to register an operation
13
	public static final int CODE = GeometryManager.getInstance()
14
			.registerGeometryOperation("Draw3DPoint3D", new Draw3DPoint3D(),
15
					Point3D.class);
16

  
17
	public Object invoke(Geometry geom, GeometryOperationContext ctx) {
18
		// TODO Auto-generated method stub
19
		Point3D p3D = (Point3D) geom;
20
		System.out.println("Codigo de la geometria: " + p3D.getType());
21
		System.out.println("Nombre: " + p3D.getId());
22
		System.out.println("X: " + p3D.getX());
23
		System.out.println("Y: " + p3D.getY());
24
		System.out.println("Z: " + p3D.getZ());
25
		if (ctx!=null){
26
			System.out.println("contexto no nulo");
27
		}
28
		return null;
29
	}
30

  
31
	public int getOperationIndex() {
32
		return CODE;
33
	}
34

  
35
}
trunk/libraries/lib3DMap/test/com/iver/ai2/gvsig3d/Point3DTest.java
1
//package com.iver.ai2.gvsig3d;
2
//
3
//import junit.framework.TestCase;
4
//
5
//import org.gvsig.exceptions.BaseException;
6
//import org.gvsig.fmap.geom.GeometryManager;
7
//
8
//import com.iver.ai2.gvsig3d.geometry.GeometryFactory;
9
//import com.iver.ai2.gvsig3d.geometry.Point3D;
10
//
11
//public class Point3DTest extends TestCase {
12
//
13
//	public void testPoint1() throws BaseException {
14
//		Point3D point = (Point3D) GeometryFactory.createPoint3D("punto3D");
15
//		System.out.println("creado punto ");
16
//		assertEquals(point.getId(), "punto3D");
17
//		assertEquals(point.getX(), 0.0);
18
//		assertEquals(point.getY(), 0.0);
19
//		assertEquals(point.getZ(), 0.0);
20
//		
21
//		GeometryManager.getInstance().getGeometryType(Point3D.class);
22
//		
23
//	}
24
//	
25
//	public void testPoint2() throws BaseException {
26
//		Point3D point = (Point3D) GeometryFactory.createPoint3D("punto3D",1.1,1.2,1.3);
27
//		assertEquals(point.getId(), "punto3D");
28
//		assertEquals(point.getX(), 1.1);
29
//		assertEquals(point.getY(), 1.2);
30
//		assertEquals(point.getZ(), 1.3);
31
//	}
32
//	
33
//	public void testPoint3() throws BaseException {
34
//		Point3D point = (Point3D) GeometryFactory.createPoint3D("punto3D");
35
//		point.setId("new_name");
36
//		point.setX(2.0);
37
//		point.setY(3.0);
38
//		point.setZ(4.0);
39
//		assertEquals(point.getId(), "new_name");
40
//		assertEquals(point.getX(), 2.0);
41
//		assertEquals(point.getY(), 3.0);
42
//		assertEquals(point.getZ(), 4.0);
43
//	}
44
//
45
//}
trunk/libraries/lib3DMap/test/com/iver/ai2/gvsig3d/SolidTest.java
1
//package com.iver.ai2.gvsig3d;
2
//
3
//import java.awt.Color;
4
//import java.awt.Image;
5
//import java.awt.geom.Point2D;
6
//import java.util.Vector;
7
//
8
//import junit.framework.TestCase;
9
//
10
//import org.gvsig.exceptions.BaseException;
11
//
12
//import com.iver.ai2.gvsig3d.geometry.GeometryFactory;
13
//import com.iver.ai2.gvsig3d.geometry.Point3D;
14
//import com.iver.ai2.gvsig3d.geometry.PrimitiveSet;
15
//import com.iver.ai2.gvsig3d.geometry.Solid;
16
//import com.iver.ai2.gvsig3d.geometry.Solid.AttributeBinding;
17
//
18
//public class SolidTest extends TestCase {
19
//
20
//	public void testCreateSolidID() throws BaseException {
21
//		System.out.println("testCreateSolidID()");
22
//		Solid solid = (Solid) GeometryFactory.createSolid("solid");
23
//		System.out.println("Solid created ");
24
//		// Testing ID default
25
//		assertEquals(solid.getId(), "solid");
26
//		// Setting new ID
27
////		solid.setId("New_Solid");
28
//		// Testing new ID
29
//		assertEquals(solid.getId(), "New_Solid");
30
//	}
31
//	
32
//	public void testSolidBindings() throws BaseException {
33
//		System.out.println("testSolidBindings()");
34
//		Solid solid = (Solid) GeometryFactory.createSolid("solid");
35
//		System.out.println("Solid created ");
36
//		// Testing binding attributes 
37
//		assertEquals(solid.getColorBinding(), AttributeBinding.BIND_OFF);
38
//		assertEquals(solid.getNormalBinding(), AttributeBinding.BIND_OFF);
39
//		// Setting new binding attributes
40
//		solid.setColorBinding(AttributeBinding.BIND_OVERALL);
41
//		solid.setNormalBinding(AttributeBinding.BIND_PER_VERTEX);
42
//		// Testing new binding attributes 
43
//		assertEquals(solid.getColorBinding(), AttributeBinding.BIND_OVERALL);
44
//		assertEquals(solid.getNormalBinding(), AttributeBinding.BIND_PER_VERTEX);
45
//		
46
//	}
47
//	
48
//	public void testSolidVectors() throws BaseException {
49
//		System.out.println("testSolidVectors()");
50
//		Solid solid = (Solid) GeometryFactory.createSolid("solid");
51
//		System.out.println("Solid created ");
52
//		// Testing not null values of the vectors
53
//		this.assertNotNull(solid.getPrimitiveSets());
54
//		this.assertNotNull(solid.getVertices());
55
//		this.assertNotNull(solid.getNormals());
56
//		this.assertNotNull(solid.getColors());
57
//		this.assertNotNull(solid.getTexcoord());
58
//		this.assertNotNull(solid.getTextures());
59
//		
60
//		// Setting creating and setting new vectors
61
//		solid.setPrimitiveSets(new Vector<PrimitiveSet>());
62
//		solid.setVertices(new Vector<Point3D>());
63
//		solid.setNormals(new Vector<Point3D>());
64
//		solid.setColors(new Vector<Color>());
65
//		solid.setTexcoord(new Vector<Vector<Point2D>>());
66
//		solid.setTextures(new Vector<Image>());
67
//		
68
//		// Testing not null values of the new vectors
69
//		this.assertNotNull(solid.getPrimitiveSets());
70
//		this.assertNotNull(solid.getVertices());
71
//		this.assertNotNull(solid.getNormals());
72
//		this.assertNotNull(solid.getColors());
73
//		this.assertNotNull(solid.getTexcoord());
74
//		this.assertNotNull(solid.getTextures());
75
//		
76
//	}
77
//	
78
//
79
//
80
//}
trunk/libraries/lib3DMap/test/com/iver/ai2/gvsig3d/geometry/Point3DTest.java
1
package com.iver.ai2.gvsig3d.geometry;
2

  
3
import junit.framework.TestCase;
4

  
5
import org.gvsig.exceptions.BaseException;
6
import org.gvsig.fmap.geom.GeometryManager;
7
import org.gvsig.fmap.geom.operation.GeometryOperationContext;
8

  
9
import com.iver.ai2.gvsig3d.geometry.operation.Draw3DPoint3D;
10

  
11
public class Point3DTest extends TestCase {
12

  
13
	public void testRegisterGeometryFactory() throws BaseException {
14
		GeometryFactory3D geomfact3D = new GeometryFactory3D();
15
		GeometryManager.getInstance().registerGeometryFactory(geomfact3D);
16
	}
17

  
18
	public void testGetGeometryFactory() throws BaseException {
19
		GeometryFactory3D gf3D = (GeometryFactory3D) GeometryManager
20
				.getInstance().getGeometryFactory();
21
		assertNotNull(gf3D);
22
	}
23

  
24
	public void testPoint1() throws BaseException {
25

  
26
		GeometryFactory3D gf3D = new GeometryFactory3D();
27

  
28
		Point3D point = (Point3D) gf3D.createPoint3D("punto3D");
29
		System.out.println("creado punto ");
30
		assertEquals(point.getId(), "punto3D");
31
		assertEquals(point.getX(), 0.0);
32
		assertEquals(point.getY(), 0.0);
33
		assertEquals(point.getZ(), 0.0);
34
		assertNotNull(point.getGeometryType());
35

  
36
		GeometryManager.getInstance().getGeometryType(Point3D.class);
37

  
38
	}
39

  
40
	public void testPoint2() throws BaseException {
41
		GeometryFactory3D gf3D = new GeometryFactory3D();
42
		Point3D point = (Point3D) gf3D.createPoint3D("punto3D", 1.1, 1.2, 1.3);
43
		assertEquals(point.getId(), "punto3D");
44
		assertEquals(point.getX(), 1.1);
45
		assertEquals(point.getY(), 1.2);
46
		assertEquals(point.getZ(), 1.3);
47
		assertNotNull(point.getGeometryType());
48
	}
49

  
50
	public void testPoint3() throws BaseException {
51
		System.out.println("Creando factory");
52
		GeometryFactory3D gf3D = new GeometryFactory3D();
53
		System.out.println("creando punto");
54
		Point3D point = (Point3D) gf3D.createPoint3D("punto3D");
55
		System.out.println("seteando parametros");
56
		point.setX(2.0);
57
		point.setY(3.0);
58
		point.setZ(4.0);
59
		System.out.println("Asserts");
60
		System.out.println("Id");
61
		assertEquals(point.getId(), "punto3D");
62
		System.out.println("X");
63
		assertEquals(point.getX(), 2.0);
64
		System.out.println("Y");
65
		assertEquals(point.getY(), 3.0);
66
		System.out.println("Z");
67
		assertEquals(point.getZ(), 4.0);
68
		assertNotNull(point.getGeometryType());
69
	}
70
	
71
	public void testPointOperation() throws BaseException {
72
		GeometryFactory3D gf3D = new GeometryFactory3D();
73
		Point3D point = (Point3D) gf3D.createPoint3D("punto3D", 1.1, 1.2, 1.3);
74
		Draw3DPoint3D d3DP = new Draw3DPoint3D();
75
		point.invokeOperation(d3DP.getOperationIndex(), new GeometryOperationContext());
76
	}
77

  
78
}
trunk/libraries/lib3DMap/test/com/iver/ai2/gvsig3d/geometry/operation/Draw3DPoint3DTest.java
1
package com.iver.ai2.gvsig3d.geometry.operation;
2

  
3
public class Draw3DPoint3DTest {
4

  
5
}
trunk/libraries/lib3DMap/test/com/iver/ai2/gvsig3d/geometry/operation/Draw3DSolidTest.java
1
package com.iver.ai2.gvsig3d.geometry.operation;
2

  
3
public class Draw3DSolidTest {
4

  
5
}
trunk/libraries/lib3DMap/test/com/iver/ai2/gvsig3d/geometry/operation/context/Draw3DContextTest.java
1
package com.iver.ai2.gvsig3d.geometry.operation.context;
2

  
3
public class Draw3DContextTest {
4

  
5
}
trunk/libraries/lib3DMap/test/com/iver/ai2/gvsig3d/geometry/SolidTest.java
1
package com.iver.ai2.gvsig3d.geometry;
2
//package com.iver.ai2.gvsig3d;
3
//
4
//import java.awt.Color;
5
//import java.awt.Image;
6
//import java.awt.geom.Point2D;
7
//import java.util.Vector;
8
//
9
//import junit.framework.TestCase;
10
//
11
//import org.gvsig.exceptions.BaseException;
12
//
13
//import com.iver.ai2.gvsig3d.geometry.GeometryFactory;
14
//import com.iver.ai2.gvsig3d.geometry.Point3D;
15
//import com.iver.ai2.gvsig3d.geometry.PrimitiveSet;
16
//import com.iver.ai2.gvsig3d.geometry.Solid;
17
//import com.iver.ai2.gvsig3d.geometry.Solid.AttributeBinding;
18
//
19
//public class SolidTest extends TestCase {
20
//
21
//	public void testCreateSolidID() throws BaseException {
22
//		System.out.println("testCreateSolidID()");
23
//		Solid solid = (Solid) GeometryFactory.createSolid("solid");
24
//		System.out.println("Solid created ");
25
//		// Testing ID default
26
//		assertEquals(solid.getId(), "solid");
27
//		// Setting new ID
28
////		solid.setId("New_Solid");
29
//		// Testing new ID
30
//		assertEquals(solid.getId(), "New_Solid");
31
//	}
32
//	
33
//	public void testSolidBindings() throws BaseException {
34
//		System.out.println("testSolidBindings()");
35
//		Solid solid = (Solid) GeometryFactory.createSolid("solid");
36
//		System.out.println("Solid created ");
37
//		// Testing binding attributes 
38
//		assertEquals(solid.getColorBinding(), AttributeBinding.BIND_OFF);
39
//		assertEquals(solid.getNormalBinding(), AttributeBinding.BIND_OFF);
40
//		// Setting new binding attributes
41
//		solid.setColorBinding(AttributeBinding.BIND_OVERALL);
42
//		solid.setNormalBinding(AttributeBinding.BIND_PER_VERTEX);
43
//		// Testing new binding attributes 
44
//		assertEquals(solid.getColorBinding(), AttributeBinding.BIND_OVERALL);
45
//		assertEquals(solid.getNormalBinding(), AttributeBinding.BIND_PER_VERTEX);
46
//		
47
//	}
48
//	
49
//	public void testSolidVectors() throws BaseException {
50
//		System.out.println("testSolidVectors()");
51
//		Solid solid = (Solid) GeometryFactory.createSolid("solid");
52
//		System.out.println("Solid created ");
53
//		// Testing not null values of the vectors
54
//		this.assertNotNull(solid.getPrimitiveSets());
55
//		this.assertNotNull(solid.getVertices());
56
//		this.assertNotNull(solid.getNormals());
57
//		this.assertNotNull(solid.getColors());
58
//		this.assertNotNull(solid.getTexcoord());
59
//		this.assertNotNull(solid.getTextures());
60
//		
61
//		// Setting creating and setting new vectors
62
//		solid.setPrimitiveSets(new Vector<PrimitiveSet>());
63
//		solid.setVertices(new Vector<Point3D>());
64
//		solid.setNormals(new Vector<Point3D>());
65
//		solid.setColors(new Vector<Color>());
66
//		solid.setTexcoord(new Vector<Vector<Point2D>>());
67
//		solid.setTextures(new Vector<Image>());
68
//		
69
//		// Testing not null values of the new vectors
70
//		this.assertNotNull(solid.getPrimitiveSets());
71
//		this.assertNotNull(solid.getVertices());
72
//		this.assertNotNull(solid.getNormals());
73
//		this.assertNotNull(solid.getColors());
74
//		this.assertNotNull(solid.getTexcoord());
75
//		this.assertNotNull(solid.getTextures());
76
//		
77
//	}
78
//	
79
//
80
//
81
//}

Also available in: Unified diff