[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/view View.java,1.32,1.33 Transformation.java,1.5,1.6

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

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6606/src/net/sourceforge/bprocessor/gl/view

Modified Files:
	View.java Transformation.java 
Log Message:
Name removed Surface, Edge, and Vertex
Work done on  extrudetool

Index: Transformation.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/Transformation.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Transformation.java	20 Sep 2005 13:14:24 -0000	1.5
--- Transformation.java	19 Dec 2005 07:51:30 -0000	1.6
***************
*** 81,85 ****
        edges.add(project(current));
      }
!     Surface projected = new Surface("projection of " + surface.getName());
      projected.setEdges(edges);
      return projected;
--- 81,85 ----
        edges.add(project(current));
      }
!     Surface projected = new Surface();
      projected.setEdges(edges);
      return projected;
***************
*** 94,98 ****
      Vertex from = project(edge.getFrom());
      Vertex to = project(edge.getTo());
!     Edge projected = new Edge("projection of " + edge.getName());
      projected.setFrom(from);
      projected.setTo(to);
--- 94,98 ----
      Vertex from = project(edge.getFrom());
      Vertex to = project(edge.getTo());
!     Edge projected = new Edge();
      projected.setFrom(from);
      projected.setTo(to);
***************
*** 114,118 ****
        log.error("error projecting");
      }
!     Vertex projection = new Vertex("projection of " + vertex.getName());
      projection.setX(view[0]);
      projection.setY(view[1]);
--- 114,118 ----
        log.error("error projecting");
      }
!     Vertex projection = new Vertex();
      projection.setX(view[0]);
      projection.setY(view[1]);
***************
*** 134,138 ****
        edges.add(unProject(current));
      }
!     Surface projected = new Surface("projection of " + surface.getName());
      projected.setEdges(edges);
      return projected;
--- 134,138 ----
        edges.add(unProject(current));
      }
!     Surface projected = new Surface();
      projected.setEdges(edges);
      return projected;
***************
*** 147,151 ****
      Vertex from = unProject(edge.getFrom());
      Vertex to = unProject(edge.getTo());
!     Edge projected = new Edge("projection of " + edge.getName());
      projected.setFrom(from);
      projected.setTo(to);
--- 147,151 ----
      Vertex from = unProject(edge.getFrom());
      Vertex to = unProject(edge.getTo());
!     Edge projected = new Edge();
      projected.setFrom(from);
      projected.setTo(to);
***************
*** 167,171 ****
        log.error("error un-projecting");
      }
!     Vertex projection = new Vertex("un-projection of " + vertex.getName());
      projection.setX(round(view[0]));
      projection.setY(round(view[1]));
--- 167,171 ----
        log.error("error un-projecting");
      }
!     Vertex projection = new Vertex();
      projection.setX(round(view[0]));
      projection.setY(round(view[1]));

Index: View.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** View.java	15 Dec 2005 12:38:06 -0000	1.32
--- View.java	19 Dec 2005 07:51:30 -0000	1.33
***************
*** 559,563 ****
      Vertex n = system.getN();
          
!     Edge edge = new Edge("", from, from.add(n));
      gl.glColor3d(0.0, 0.0, 1.0);
      drawEdge(edge);
--- 559,563 ----
      Vertex n = system.getN();
          
!     Edge edge = new Edge(from, from.add(n));
      gl.glColor3d(0.0, 0.0, 1.0);
      drawEdge(edge);
***************
*** 632,643 ****
  
      if (!facingFront(surface)) {
!       frontTextAnchor = new Vertex("", front.getX() - (frontWidth / 2), 
                                     front.getY() - 17, front.getZ());
!       backTextAnchor = new Vertex("", front.getX() - (backWidth / 2),
                                    front.getY() + 7, front.getZ());
      } else {
!       frontTextAnchor = new Vertex("", front.getX() - (frontWidth / 2), 
                                     front.getY() + 7, front.getZ());
!       backTextAnchor = new Vertex("", front.getX() - (backWidth / 2),
                                    front.getY() - 17, front.getZ());
      }
--- 632,643 ----
  
      if (!facingFront(surface)) {
!       frontTextAnchor = new Vertex(front.getX() - (frontWidth / 2), 
                                     front.getY() - 17, front.getZ());
!       backTextAnchor = new Vertex(front.getX() - (backWidth / 2),
                                    front.getY() + 7, front.getZ());
      } else {
!       frontTextAnchor = new Vertex(front.getX() - (frontWidth / 2), 
                                     front.getY() + 7, front.getZ());
!       backTextAnchor = new Vertex(front.getX() - (backWidth / 2),
                                    front.getY() - 17, front.getZ());
      }
***************
*** 1353,1361 ****
          if (isVisible(s)) {
            if (side == FRONT) {
!             Space back = s.getBackDomain();
              gl.glColor3fv(getSpaceColor(back));
            }
            if (side == BACK) {
!             Space front = s.getFrontDomain();
              gl.glColor3fv(getSpaceColor(front));
            }
--- 1353,1361 ----
          if (isVisible(s)) {
            if (side == FRONT) {
!             Space back = s.getFrontDomain();
              gl.glColor3fv(getSpaceColor(back));
            }
            if (side == BACK) {
!             Space front = s.getBackDomain();
              gl.glColor3fv(getSpaceColor(front));
            }
***************
*** 1901,1907 ****
      Transformation transformation = transformation();    
      Vertex origin = transformation.project(system.origin());
!     Vertex from = new Vertex("", origin.getX(), origin.getY(), 0.0);
!     Vertex to = new Vertex("", origin.getX(), origin.getY(), 1.0);
!     Edge ray = new Edge("", from, to);
      Vertex rayDir;
      
--- 1901,1907 ----
      Transformation transformation = transformation();    
      Vertex origin = transformation.project(system.origin());
!     Vertex from = new Vertex(origin.getX(), origin.getY(), 0.0);
!     Vertex to = new Vertex(origin.getX(), origin.getY(), 1.0);
!     Edge ray = new Edge(from, to);
      Vertex rayDir;
      
***************
*** 2132,2138 ****
        Transformation transformation = transformation();
        
!       Vertex near = new Vertex("near", x, y, 0.0);
!       Vertex far = new Vertex("far", x, y, 1.0);
!       Edge ray = new Edge("ray", near, far);
        ray = transformation.unProject(ray);
        Vertex vertex = plane.intersection(ray);
--- 2132,2138 ----
        Transformation transformation = transformation();
        
!       Vertex near = new Vertex(x, y, 0.0);
!       Vertex far = new Vertex(x, y, 1.0);
!       Edge ray = new Edge(near, far);
        ray = transformation.unProject(ray);
        Vertex vertex = plane.intersection(ray);