[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Surface.java, 1.150, 1.151

[Nordholt <nor...@us...>]

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv31825/src/net/sourceforge/bprocessor/model

Modified Files:
	Surface.java 
Log Message:
adding support for surfaces that are not in the xy plane in the mergespaces method

Index: Surface.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v
retrieving revision 1.150
retrieving revision 1.151
diff -C2 -d -r1.150 -r1.151
*** Surface.java	29 Mar 2007 13:57:14 -0000	1.150
--- Surface.java	30 Mar 2007 11:14:04 -0000	1.151
***************
*** 2024,2029 ****
      Space front = null;
      Space back = null;
!     if (sur1.direction(Project.getInstance().getActiveCoordinateSystem()) == 
!       sur2.direction(Project.getInstance().getActiveCoordinateSystem())) {
        //the surfaces have the same turning so front is front
        if (sur1.getFrontDomain() == sur2.getFrontDomain()) {
--- 2024,2030 ----
      Space front = null;
      Space back = null;
!     Vertex n1 = sur1.normal();
!     Vertex n2 = sur2.normal();
!     if (n1.dot(n2) > 0) {
        //the surfaces have the same turning so front is front
        if (sur1.getFrontDomain() == sur2.getFrontDomain()) {