Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7016/src/net/sourceforge/bprocessor/gl/model
Modified Files:
GlCamera.java GlObject.java
Log Message:
simplification of GlObject
Index: GlObject.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/model/GlObject.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** GlObject.java 20 Feb 2007 15:12:04 -0000 1.5
--- GlObject.java 15 Nov 2007 10:41:52 -0000 1.6
***************
*** 10,15 ****
import javax.media.opengl.GL;
import net.sourceforge.bprocessor.model.Edge;
- import net.sourceforge.bprocessor.model.Plane;
- import net.sourceforge.bprocessor.model.Vertex;
/**
--- 10,13 ----
***************
*** 30,39 ****
* @return The intersection vertex
*/
! public Vertex intersection(Edge e);
!
! /**
! * Return the associated plane for the GlObject
! * @return The plane
! */
! public Plane getPlane();
}
--- 28,31 ----
* @return The intersection vertex
*/
! public Intersection intersection(Edge e);
}
Index: GlCamera.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/model/GlCamera.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** GlCamera.java 20 Feb 2007 15:13:00 -0000 1.1
--- GlCamera.java 15 Nov 2007 10:41:52 -0000 1.2
***************
*** 8,16 ****
import javax.media.opengl.GL;
-
- import org.apache.log4j.Logger;
-
import com.sun.opengl.util.GLUT;
-
import net.sourceforge.bprocessor.model.Camera;
import net.sourceforge.bprocessor.model.Edge;
--- 8,12 ----
***************
*** 23,30 ****
*/
public class GlCamera implements GlObject {
-
- /** The logger */
- private static Logger log = Logger.getLogger(GlCamera.class);
-
/** The camera to represent in 3d */
private Camera cam;
--- 19,22 ----
***************
*** 86,92 ****
* {@inheritDoc}
*/
! public Vertex intersection(Edge e) {
! Plane p = getPlane();
! return p.intersection(e);
}
/**
--- 78,83 ----
* {@inheritDoc}
*/
! public Intersection intersection(Edge e) {
! return null;
}
/**
|
