[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/view View.java, 1.145, 1.146

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

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

Modified Files:
	View.java 
Log Message:
More supporting edges (selected spaces contribute their edges)
Different default camera

Index: View.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v
retrieving revision 1.145
retrieving revision 1.146
diff -C2 -d -r1.145 -r1.146
*** View.java	28 Aug 2006 08:20:52 -0000	1.145
--- View.java	29 Aug 2006 08:49:20 -0000	1.146
***************
*** 16,19 ****
--- 16,20 ----
  import net.sourceforge.bprocessor.model.CoordinateSystem;
  import net.sourceforge.bprocessor.model.Defaults;
+ import net.sourceforge.bprocessor.model.Geometric;
  import net.sourceforge.bprocessor.model.Geometry;
  import net.sourceforge.bprocessor.model.Line;
***************
*** 798,804 ****
     */
    public Collection collectSupportingEdges(Space active) {
!     if (active == Project.getInstance().world()) {
!       return new LinkedList();
!     } else {
        Space empty = active.getOwner().getEmpty();
        Collection envelope = active.getEnvelope();
--- 799,804 ----
     */
    public Collection collectSupportingEdges(Space active) {
!     Collection edges = new HashSet();
!     if (active != Project.getInstance().world()) {
        Space empty = active.getOwner().getEmpty();
        Collection envelope = active.getEnvelope();
***************
*** 828,834 ****
          }
        }
!       Collection edges = Surface.edges(surfaces);
!       return edges;
      }
    }
    
--- 828,844 ----
          }
        }
!       edges.addAll(Surface.edges(surfaces));
!     }
!     {
!       Iterator iter = Selection.primary().iterator();
!       while (iter.hasNext()) {
!         Geometric current = (Geometric) iter.next();
!         if (current instanceof Space) {
!           Space space = (Space) current;
!           edges.addAll(space.getEdges());
!         }
!       }
      }
+     return edges;
    }