[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/view Display.java, 1.49, 1.50

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

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

Modified Files:
	Display.java 
Log Message:
smooth edges rendered grey

Index: Display.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/Display.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** Display.java	6 Nov 2007 18:27:03 -0000	1.49
--- Display.java	9 Nov 2007 10:42:16 -0000	1.50
***************
*** 423,430 ****
    private static void split(Collection<Edge> edges, 
        Collection<Edge> normal, 
!       Collection<Edge> stippled) {
      for (Edge current : edges) {
        if (current.getStrippled()) {
          stippled.add(current);
        } else {
          normal.add(current);
--- 423,433 ----
    private static void split(Collection<Edge> edges, 
        Collection<Edge> normal, 
!       Collection<Edge> stippled,
!       Collection<Edge> smooth) {
      for (Edge current : edges) {
        if (current.getStrippled()) {
          stippled.add(current);
+       } else if (current.isSmooth()) {
+         smooth.add(current);
        } else {
          normal.add(current);
***************
*** 979,987 ****
          Collection<Edge> stippled = new LinkedList();
          Collection<Edge> normal = new LinkedList();
          
          if (space.isNet()) {
            stippled.addAll(edges);
          } else {
!           split(edges, normal, stippled);
          }
  
--- 982,991 ----
          Collection<Edge> stippled = new LinkedList();
          Collection<Edge> normal = new LinkedList();
+         Collection<Edge> smooth = new LinkedList();
          
          if (space.isNet()) {
            stippled.addAll(edges);
          } else {
!           split(edges, normal, stippled, smooth);
          }
  
***************
*** 1000,1003 ****
--- 1004,1008 ----
          }
          paintEdges(normal, color, size);
+         paintEdges(smooth, grey, 1.0f);
          paintStippled(stippled, middleblue, size);
        }
***************
*** 1218,1223 ****
          Collection<Edge> stippled = new LinkedList();
          Collection<Edge> normal = new LinkedList();
!         split(edges, normal, stippled);
          paintEdges(normal, black, 1.0f);
          paintStippled(stippled, middleblue, 1.0f);
        }
--- 1223,1231 ----
          Collection<Edge> stippled = new LinkedList();
          Collection<Edge> normal = new LinkedList();
!         Collection<Edge> smooth = new LinkedList();
!         
!         split(edges, normal, stippled, smooth);
          paintEdges(normal, black, 1.0f);
+         paintEdges(smooth, grey, 1.0f);
          paintStippled(stippled, middleblue, 1.0f);
        }