bprocessor-commit

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv7016/src/net/sourceforge/bprocessor/gl/tool

Modified Files:
	Protractor.java RotationTool.java 
Log Message:
simplification of GlObject

Index: Protractor.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/Protractor.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Protractor.java	15 Nov 2007 08:41:09 -0000	1.10
--- Protractor.java	15 Nov 2007 10:41:52 -0000	1.11
***************
*** 17,20 ****
--- 17,21 ----
  import net.sourceforge.bprocessor.gl.GLView;
  import net.sourceforge.bprocessor.gl.model.GlObject;
+ import net.sourceforge.bprocessor.gl.model.Intersection;
  import net.sourceforge.bprocessor.gl.view.View;
  import net.sourceforge.bprocessor.model.Camera;
***************
*** 286,298 ****
  
      /** {@inheritDoc} */
!     public Plane getPlane() {
        Vertex n = u.cross(v);
        Plane plane = new Plane(n, origin);
!       return plane;
!     }
! 
!     /** {@inheritDoc} */
!     public Vertex intersection(Edge e) {
!       return getPlane().intersection(e);
      }
    }
--- 287,295 ----
  
      /** {@inheritDoc} */
!     public Intersection intersection(Edge e) {
        Vertex n = u.cross(v);
        Plane plane = new Plane(n, origin);
!       Vertex vertex = plane.intersection(e);
!       return new Intersection(vertex, Intersection.PLANE_INTERSECTION, plane);
      }
    }

Index: RotationTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/RotationTool.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** RotationTool.java	20 Jun 2007 13:17:56 -0000	1.27
--- RotationTool.java	15 Nov 2007 10:41:52 -0000	1.28
***************
*** 389,393 ****
       * @inheritDoc
       */
!     public Vertex intersection(Edge e) {
        Vertex i = plane.intersection(e);
        Iterator<Line> iter = edges.iterator();
--- 389,393 ----
       * @inheritDoc
       */
!     public Intersection intersection(Edge e) {
        Vertex i = plane.intersection(e);
        Iterator<Line> iter = edges.iterator();
***************
*** 406,410 ****
          }
        }
!       return i;
      }
  
--- 406,410 ----
          }
        }
!       return new Intersection(i, Intersection.PLANE_INTERSECTION, plane);
      }