[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model/modellor InnerWallModellor.java, 1.10, 1.11 ModelBathModellor2.java, 1.10, 1.11 TileModellor.java, 1.22, 1.23 WindowModellor.java, 1.4, 1.5 WallPartingModellor.java, 1.4, 1.5

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

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

Modified Files:
	InnerWallModellor.java ModelBathModellor2.java 
	TileModellor.java WindowModellor.java WallPartingModellor.java 
Log Message:
renamed Vertex.scale to scaleInPlace

Index: TileModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/TileModellor.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** TileModellor.java	5 Nov 2007 10:18:50 -0000	1.22
--- TileModellor.java	13 Nov 2007 12:19:30 -0000	1.23
***************
*** 353,362 ****
                                       Collection<Vertex> createdVerts,
                                       Vertex increment) {
!     increment.scale(-1);
      do {
        slider.move(increment);
      } while (cs.translate(slider.getFrom()).getY() > minY &&
               cs.translate(slider.getFrom()).getX() > minX);
!     increment.scale(-1);
      do {
        List<Vertex> intersections = new LinkedList<Vertex>();
--- 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>();

Index: WindowModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/WindowModellor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** WindowModellor.java	9 Nov 2007 09:45:25 -0000	1.4
--- WindowModellor.java	13 Nov 2007 12:19:30 -0000	1.5
***************
*** 143,147 ****
      //make hole in frame
      Vertex normal = surface.normal();
!     normal.scale(-offset);
      inner.move(normal.getX(), normal.getY(), normal.getZ());
      List holeedges = Edge.offset(inner.getEdges(), inner, -framewidth);
--- 143,147 ----
      //make hole in frame
      Vertex normal = surface.normal();
!     normal.scaleInPlace(-offset);
      inner.move(normal.getX(), normal.getY(), normal.getZ());
      List holeedges = Edge.offset(inner.getEdges(), inner, -framewidth);

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

Index: InnerWallModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/modellor/InnerWallModellor.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** InnerWallModellor.java	5 Nov 2007 10:18:50 -0000	1.10
--- InnerWallModellor.java	13 Nov 2007 12:19:30 -0000	1.11
***************
*** 228,232 ****
        if (vertical(e)) {
          dir.normalize();
!         dir.scale(JOIST_WIDTH);
          o = e.getFrom();
          o = o.add(dir);
--- 228,232 ----
        if (vertical(e)) {
          dir.normalize();
!         dir.scaleInPlace(JOIST_WIDTH);
          o = e.getFrom();
          o = o.add(dir);
***************
*** 274,278 ****
        Vertex j = cs.getJ().copy();
        j.normalize();
!       j.scale(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.scaleInPlace(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.scale(-1);
          }
          i = j.cross(n);
--- 375,379 ----
          j = surface.normal();
          if (surface.getBackDomain() == space) {
!           j.scaleInPlace(-1);
          }
          i = j.cross(n);
***************
*** 385,389 ****
          Vertex topToBottom = vertical.otherVertex(origin).minus(origin);
          Vertex interval = horizontal.getDirection();
!         interval.scale(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.scaleInPlace(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.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ModelBathModellor2.java	5 Nov 2007 10:18:50 -0000	1.10
--- ModelBathModellor2.java	13 Nov 2007 12:19:30 -0000	1.11
***************
*** 223,230 ****
              Vertex delta = outer.getDirection();
              delta.normalize();
!             delta.scale(wallThickness - 0.005);
              outerCopy.getFrom().move(delta.getX(), delta.getY(), delta.getZ());
              delta.normalize();
!             delta.scale(wallThickness);
              tileCopy.getFrom().move(delta.getX(), delta.getY(), delta.getZ());
              fromInnerOffset = null;
--- 223,230 ----
              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;
***************
*** 232,241 ****
              Vertex delta = outer.getDirection();
              delta.normalize();
!             delta.scale(wallThickness);
              tileCopy.getFrom().move(delta.getX(), delta.getY(), delta.getZ());
              if (corner.equals("Split")) {
                fromInnerOffset = delta;
                fromInnerOffset.normalize();
!               fromInnerOffset.scale(wallThickness - 0.005);
              }
            }
--- 232,241 ----
              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);
              }
            }
***************
*** 251,259 ****
              Vertex delta = outer.getDirection();
              delta.normalize();
!             delta.scale(-1);
!             delta.scale(wallThickness - 0.005);
              outerCopy.getTo().move(delta.getX(), delta.getY(), delta.getZ());
              delta.normalize();
!             delta.scale(wallThickness);
              tileCopy.getTo().move(delta.getX(), delta.getY(), delta.getZ());
              toInnerOffset = null;
--- 251,259 ----
              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;
***************
*** 261,271 ****
              Vertex delta = outer.getDirection();
              delta.normalize();
!             delta.scale(-1);
!             delta.scale(wallThickness);
              tileCopy.getTo().move(delta.getX(), delta.getY(), delta.getZ());
              if (corner.equals("Split")) {
                toInnerOffset = delta;
                toInnerOffset.normalize();
!               toInnerOffset.scale(wallThickness - 0.005);
              }
            }
--- 261,271 ----
              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);
              }
            }
***************
*** 285,289 ****
        dir.normalize();
        Vertex usedDir = dir.copy();
!       usedDir.scale(wallThickness - 0.005);
        inner.move(usedDir);
        Edge between1 = new Edge(outerCopy.getFrom(), inner.getFrom());
--- 285,289 ----
        dir.normalize();
        Vertex usedDir = dir.copy();
!       usedDir.scaleInPlace(wallThickness - 0.005);
        inner.move(usedDir);
        Edge between1 = new Edge(outerCopy.getFrom(), inner.getFrom());
***************
*** 300,308 ****
        //surface for tiles
        dir.normalize();
!       dir.scale(wallThickness - 0.005);
        tileCopy.move(dir);
        Edge inner2 = tileCopy.copy();
        dir.normalize();
!       dir.scale(0.005);
        inner2.move(dir);
        between1 = new Edge(tileCopy.getFrom(), inner2.getFrom());
--- 300,308 ----
        //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());
***************
*** 546,550 ****
        Vertex orthoDir = alongE.cross(cross);
        Vertex deltaUnit = orthoDir.copy();
!       orthoDir.scale(wallThickness);
        double slideScale = 0;
        if (deltaUnit.getX() != 0) {
--- 546,550 ----
        Vertex orthoDir = alongE.cross(cross);
        Vertex deltaUnit = orthoDir.copy();
!       orthoDir.scaleInPlace(wallThickness);
        double slideScale = 0;
        if (deltaUnit.getX() != 0) {
***************
*** 556,560 ****
          slideScale = orthoDir.getZ() / (direction.dot(deltaUnit) * deltaUnit.getZ());
        }
!       direction.scale(slideScale);
        //Create other edge and connections
        Edge moved = copy.copy();
--- 556,560 ----
          slideScale = orthoDir.getZ() / (direction.dot(deltaUnit) * deltaUnit.getZ());
        }
!       direction.scaleInPlace(slideScale);
        //Create other edge and connections
        Edge moved = copy.copy();