[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model/modellor InnerWallModellor.java, 1.13, 1.14 ModelBathModellor2.java, 1.12, 1.13 TileModellor.java, 1.23, 1.24 WallPartingModellor.java, 1.5, 1.6

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

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

Modified Files:
	InnerWallModellor.java ModelBathModellor2.java 
	TileModellor.java WallPartingModellor.java 
Log Message:
renamed scaleInPlace to scaleIt

Index: TileModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/TileModellor.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** TileModellor.java	13 Nov 2007 12:19:30 -0000	1.23
--- TileModellor.java	11 Dec 2007 14:49:03 -0000	1.24
***************
*** 353,362 ****
                                       Collection<Vertex> createdVerts,
                                       Vertex increment) {
!     increment.scaleInPlace(-1);
      do {
        slider.move(increment);
      } while (cs.translate(slider.getFrom()).getY() > minY &&
               cs.translate(slider.getFrom()).getX() > minX);
!     increment.scaleInPlace(-1);
      do {
        List<Vertex> intersections = new LinkedList<Vertex>();
--- 353,362 ----
                                       Collection<Vertex> createdVerts,
                                       Vertex increment) {
!     increment.scaleIt(-1);
      do {
        slider.move(increment);
      } while (cs.translate(slider.getFrom()).getY() > minY &&
               cs.translate(slider.getFrom()).getX() > minX);
!     increment.scaleIt(-1);
      do {
        List<Vertex> intersections = new LinkedList<Vertex>();

Index: WallPartingModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/WallPartingModellor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** WallPartingModellor.java	13 Nov 2007 12:19:30 -0000	1.5
--- WallPartingModellor.java	11 Dec 2007 14:49:03 -0000	1.6
***************
*** 95,102 ****
              Vertex delta = outer.getDirection();
              delta.normalize();
!             delta.scaleInPlace(wallThickness  - 0.005);
              outerCopy.getFrom().move(delta.getX(), delta.getY(), delta.getZ());
              delta.normalize();
!             delta.scaleInPlace(wallThickness);
              tileCopy.getFrom().move(delta.getX(), delta.getY(), delta.getZ());
              fromInnerOffset = null;
--- 95,102 ----
              Vertex delta = outer.getDirection();
              delta.normalize();
!             delta.scaleIt(wallThickness  - 0.005);
              outerCopy.getFrom().move(delta.getX(), delta.getY(), delta.getZ());
              delta.normalize();
!             delta.scaleIt(wallThickness);
              tileCopy.getFrom().move(delta.getX(), delta.getY(), delta.getZ());
              fromInnerOffset = null;
***************
*** 104,113 ****
              Vertex delta = outer.getDirection();
              delta.normalize();
!             delta.scaleInPlace(wallThickness);
              tileCopy.getFrom().move(delta.getX(), delta.getY(), delta.getZ());
              if (corner.equals("Split")) {
                fromInnerOffset = delta;
                fromInnerOffset.normalize();
!               fromInnerOffset.scaleInPlace(wallThickness - 0.005);
              }
            }
--- 104,113 ----
              Vertex delta = outer.getDirection();
              delta.normalize();
!             delta.scaleIt(wallThickness);
              tileCopy.getFrom().move(delta.getX(), delta.getY(), delta.getZ());
              if (corner.equals("Split")) {
                fromInnerOffset = delta;
                fromInnerOffset.normalize();
!               fromInnerOffset.scaleIt(wallThickness - 0.005);
              }
            }
***************
*** 123,131 ****
              Vertex delta = outer.getDirection();
              delta.normalize();
!             delta.scaleInPlace(-1);
!             delta.scaleInPlace(wallThickness - 0.005);
              outerCopy.getTo().move(delta.getX(), delta.getY(), delta.getZ());
              delta.normalize();
!             delta.scaleInPlace(wallThickness);
              tileCopy.getTo().move(delta.getX(), delta.getY(), delta.getZ());
              toInnerOffset = null;
--- 123,131 ----
              Vertex delta = outer.getDirection();
              delta.normalize();
!             delta.scaleIt(-1);
!             delta.scaleIt(wallThickness - 0.005);
              outerCopy.getTo().move(delta.getX(), delta.getY(), delta.getZ());
              delta.normalize();
!             delta.scaleIt(wallThickness);
              tileCopy.getTo().move(delta.getX(), delta.getY(), delta.getZ());
              toInnerOffset = null;
***************
*** 133,143 ****
              Vertex delta = outer.getDirection();
              delta.normalize();
!             delta.scaleInPlace(-1);
!             delta.scaleInPlace(wallThickness);
              tileCopy.getTo().move(delta.getX(), delta.getY(), delta.getZ());
              if (corner.equals("Split")) {
                toInnerOffset = delta;
                toInnerOffset.normalize();
!               toInnerOffset.scaleInPlace(wallThickness - 0.005);
              }
            }
--- 133,143 ----
              Vertex delta = outer.getDirection();
              delta.normalize();
!             delta.scaleIt(-1);
!             delta.scaleIt(wallThickness);
              tileCopy.getTo().move(delta.getX(), delta.getY(), delta.getZ());
              if (corner.equals("Split")) {
                toInnerOffset = delta;
                toInnerOffset.normalize();
!               toInnerOffset.scaleIt(wallThickness - 0.005);
              }
            }
***************
*** 157,161 ****
        dir.normalize();
        Vertex usedDir = dir.copy();
!       usedDir.scaleInPlace(wallThickness - 0.005);
        inner.move(usedDir);
        Edge between1 = new Edge(outerCopy.getFrom(), inner.getFrom());
--- 157,161 ----
        dir.normalize();
        Vertex usedDir = dir.copy();
!       usedDir.scaleIt(wallThickness - 0.005);
        inner.move(usedDir);
        Edge between1 = new Edge(outerCopy.getFrom(), inner.getFrom());
***************
*** 172,180 ****
        //surface for tiles
        dir.normalize();
!       dir.scaleInPlace(wallThickness - 0.005);
        tileCopy.move(dir);
        Edge inner2 = tileCopy.copy();
        dir.normalize();
!       dir.scaleInPlace(0.005);
        inner2.move(dir);
        between1 = new Edge(tileCopy.getFrom(), inner2.getFrom());
--- 172,180 ----
        //surface for tiles
        dir.normalize();
!       dir.scaleIt(wallThickness - 0.005);
        tileCopy.move(dir);
        Edge inner2 = tileCopy.copy();
        dir.normalize();
!       dir.scaleIt(0.005);
        inner2.move(dir);
        between1 = new Edge(tileCopy.getFrom(), inner2.getFrom());

Index: InnerWallModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/InnerWallModellor.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** InnerWallModellor.java	3 Dec 2007 09:10:59 -0000	1.13
--- InnerWallModellor.java	11 Dec 2007 14:49:03 -0000	1.14
***************
*** 228,232 ****
        if (vertical(e)) {
          dir.normalize();
!         dir.scaleInPlace(JOIST_WIDTH);
          o = e.getFrom();
          o = o.add(dir);
--- 228,232 ----
        if (vertical(e)) {
          dir.normalize();
!         dir.scaleIt(JOIST_WIDTH);
          o = e.getFrom();
          o = o.add(dir);
***************
*** 274,278 ****
        Vertex j = cs.getJ().copy();
        j.normalize();
!       j.scaleInPlace(SHEET_THICKNESS + JOIST_DEPTH);
        sheet2.move(j.getX(), j.getY(), j.getZ());
        double correction = 1;
--- 274,278 ----
        Vertex j = cs.getJ().copy();
        j.normalize();
!       j.scaleIt(SHEET_THICKNESS + JOIST_DEPTH);
        sheet2.move(j.getX(), j.getY(), j.getZ());
        double correction = 1;
***************
*** 375,379 ****
          j = surface.normal();
          if (surface.getBackDomain() == space) {
!           j.scaleInPlace(-1);
          }
          i = j.cross(n);
--- 375,379 ----
          j = surface.normal();
          if (surface.getBackDomain() == space) {
!           j.scaleIt(-1);
          }
          i = j.cross(n);
***************
*** 385,389 ****
          Vertex topToBottom = vertical.otherVertex(origin).minus(origin);
          Vertex interval = horizontal.getDirection();
!         interval.scaleInPlace(joistInterval / interval.length());
          Vertex current = origin.copy();
          current.move(interval.getX(), interval.getY(), interval.getZ());
--- 385,389 ----
          Vertex topToBottom = vertical.otherVertex(origin).minus(origin);
          Vertex interval = horizontal.getDirection();
!         interval.scaleIt(joistInterval / interval.length());
          Vertex current = origin.copy();
          current.move(interval.getX(), interval.getY(), interval.getZ());

Index: ModelBathModellor2.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/ModelBathModellor2.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ModelBathModellor2.java	29 Nov 2007 19:31:57 -0000	1.12
--- ModelBathModellor2.java	11 Dec 2007 14:49:03 -0000	1.13
***************
*** 224,231 ****
              Vertex delta = outer.getDirection();
              delta.normalize();
!             delta.scaleInPlace(wallThickness - 0.005);
              outerCopy.getFrom().move(delta.getX(), delta.getY(), delta.getZ());
              delta.normalize();
!             delta.scaleInPlace(wallThickness);
              tileCopy.getFrom().move(delta.getX(), delta.getY(), delta.getZ());
              fromInnerOffset = null;
--- 224,231 ----
              Vertex delta = outer.getDirection();
              delta.normalize();
!             delta.scaleIt(wallThickness - 0.005);
              outerCopy.getFrom().move(delta.getX(), delta.getY(), delta.getZ());
              delta.normalize();
!             delta.scaleIt(wallThickness);
              tileCopy.getFrom().move(delta.getX(), delta.getY(), delta.getZ());
              fromInnerOffset = null;
***************
*** 233,242 ****
              Vertex delta = outer.getDirection();
              delta.normalize();
!             delta.scaleInPlace(wallThickness);
              tileCopy.getFrom().move(delta.getX(), delta.getY(), delta.getZ());
              if (corner.equals("Split")) {
                fromInnerOffset = delta;
                fromInnerOffset.normalize();
!               fromInnerOffset.scaleInPlace(wallThickness - 0.005);
              }
            }
--- 233,242 ----
              Vertex delta = outer.getDirection();
              delta.normalize();
!             delta.scaleIt(wallThickness);
              tileCopy.getFrom().move(delta.getX(), delta.getY(), delta.getZ());
              if (corner.equals("Split")) {
                fromInnerOffset = delta;
                fromInnerOffset.normalize();
!               fromInnerOffset.scaleIt(wallThickness - 0.005);
              }
            }
***************
*** 252,260 ****
              Vertex delta = outer.getDirection();
              delta.normalize();
!             delta.scaleInPlace(-1);
!             delta.scaleInPlace(wallThickness - 0.005);
              outerCopy.getTo().move(delta.getX(), delta.getY(), delta.getZ());
              delta.normalize();
!             delta.scaleInPlace(wallThickness);
              tileCopy.getTo().move(delta.getX(), delta.getY(), delta.getZ());
              toInnerOffset = null;
--- 252,260 ----
              Vertex delta = outer.getDirection();
              delta.normalize();
!             delta.scaleIt(-1);
!             delta.scaleIt(wallThickness - 0.005);
              outerCopy.getTo().move(delta.getX(), delta.getY(), delta.getZ());
              delta.normalize();
!             delta.scaleIt(wallThickness);
              tileCopy.getTo().move(delta.getX(), delta.getY(), delta.getZ());
              toInnerOffset = null;
***************
*** 262,272 ****
              Vertex delta = outer.getDirection();
              delta.normalize();
!             delta.scaleInPlace(-1);
!             delta.scaleInPlace(wallThickness);
              tileCopy.getTo().move(delta.getX(), delta.getY(), delta.getZ());
              if (corner.equals("Split")) {
                toInnerOffset = delta;
                toInnerOffset.normalize();
!               toInnerOffset.scaleInPlace(wallThickness - 0.005);
              }
            }
--- 262,272 ----
              Vertex delta = outer.getDirection();
              delta.normalize();
!             delta.scaleIt(-1);
!             delta.scaleIt(wallThickness);
              tileCopy.getTo().move(delta.getX(), delta.getY(), delta.getZ());
              if (corner.equals("Split")) {
                toInnerOffset = delta;
                toInnerOffset.normalize();
!               toInnerOffset.scaleIt(wallThickness - 0.005);
              }
            }
***************
*** 286,290 ****
        dir.normalize();
        Vertex usedDir = dir.copy();
!       usedDir.scaleInPlace(wallThickness - 0.005);
        inner.move(usedDir);
        Edge between1 = new Edge(outerCopy.getFrom(), inner.getFrom());
--- 286,290 ----
        dir.normalize();
        Vertex usedDir = dir.copy();
!       usedDir.scaleIt(wallThickness - 0.005);
        inner.move(usedDir);
        Edge between1 = new Edge(outerCopy.getFrom(), inner.getFrom());
***************
*** 301,309 ****
        //surface for tiles
        dir.normalize();
!       dir.scaleInPlace(wallThickness - 0.005);
        tileCopy.move(dir);
        Edge inner2 = tileCopy.copy();
        dir.normalize();
!       dir.scaleInPlace(0.005);
        inner2.move(dir);
        between1 = new Edge(tileCopy.getFrom(), inner2.getFrom());
--- 301,309 ----
        //surface for tiles
        dir.normalize();
!       dir.scaleIt(wallThickness - 0.005);
        tileCopy.move(dir);
        Edge inner2 = tileCopy.copy();
        dir.normalize();
!       dir.scaleIt(0.005);
        inner2.move(dir);
        between1 = new Edge(tileCopy.getFrom(), inner2.getFrom());
***************
*** 547,551 ****
        Vertex orthoDir = alongE.cross(cross);
        Vertex deltaUnit = orthoDir.copy();
!       orthoDir.scaleInPlace(wallThickness);
        double slideScale = 0;
        if (deltaUnit.getX() != 0) {
--- 547,551 ----
        Vertex orthoDir = alongE.cross(cross);
        Vertex deltaUnit = orthoDir.copy();
!       orthoDir.scaleIt(wallThickness);
        double slideScale = 0;
        if (deltaUnit.getX() != 0) {
***************
*** 557,561 ****
          slideScale = orthoDir.getZ() / (direction.dot(deltaUnit) * deltaUnit.getZ());
        }
!       direction.scaleInPlace(slideScale);
        //Create other edge and connections
        Edge moved = copy.copy();
--- 557,561 ----
          slideScale = orthoDir.getZ() / (direction.dot(deltaUnit) * deltaUnit.getZ());
        }
!       direction.scaleIt(slideScale);
        //Create other edge and connections
        Edge moved = copy.copy();