[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Surface.java, 1.132, 1.133 Geometry.java, 1.43, 1.44

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

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

Modified Files:
	Surface.java Geometry.java 
Log Message:
Elemenent-surfaces attach to the space-surfaces

Index: Surface.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v
retrieving revision 1.132
retrieving revision 1.133
diff -C2 -d -r1.132 -r1.133
*** Surface.java	30 Jan 2007 14:10:03 -0000	1.132
--- Surface.java	31 Jan 2007 09:18:30 -0000	1.133
***************
*** 634,637 ****
--- 634,639 ----
      // spaces here.
      boolean flip = false;
+     boolean inside = false;
+     
      
      if (exterior != null) {
***************
*** 642,645 ****
--- 644,648 ----
          flip = true;
        }
+       inside = exterior.getOwner() == getOwner();
      }
      
***************
*** 647,651 ****
        if (delta < 0) {
          facemap[i].setBackDomain(getBackDomain());
!         if (exterior != null) {
            if (flip) {
              facemap[i].setFrontDomain(exterior.getFrontDomain());
--- 650,654 ----
        if (delta < 0) {
          facemap[i].setBackDomain(getBackDomain());
!         if (exterior != null && inside) {
            if (flip) {
              facemap[i].setFrontDomain(exterior.getFrontDomain());
***************
*** 656,660 ****
        } else {
          facemap[i].setFrontDomain(getFrontDomain());
!         if (exterior != null) {
            if (flip) {
              facemap[i].setBackDomain(exterior.getBackDomain());
--- 659,663 ----
        } else {
          facemap[i].setFrontDomain(getFrontDomain());
!         if (exterior != null && inside) {
            if (flip) {
              facemap[i].setBackDomain(exterior.getBackDomain());

Index: Geometry.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Geometry.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** Geometry.java	30 Jan 2007 14:10:03 -0000	1.43
--- Geometry.java	31 Jan 2007 09:18:30 -0000	1.44
***************
*** 280,290 ****
        Collection<Surface> envelope = surface.getOwner().getEnvelope();
        candidates.addAll(surfaces);
!       //candidates.addAll(envelope);
        
        for (Surface current : candidates) {
          if (current != surface) {
!           if (current.surrounds(surface, false)) {
              exteriors.add(current);
!           } else if (surface.surrounds(current, false)) {
              interiors.add(current);
            }
--- 280,291 ----
        Collection<Surface> envelope = surface.getOwner().getEnvelope();
        candidates.addAll(surfaces);
!       candidates.addAll(envelope);
        
        for (Surface current : candidates) {
          if (current != surface) {
!           boolean outside = current.getOwner() != surface.getOwner();
!           if (current.surrounds(surface, outside)) {
              exteriors.add(current);
!           } else if (surface.surrounds(current, outside)) {
              interiors.add(current);
            }