[Bprocessor-commit] facade/src/net/sourceforge/bprocessor/facade/modellor NetFacadeModellor.java, 1.41, 1.42 FacadeModellor.java, 1.36, 1.37

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

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

Modified Files:
	NetFacadeModellor.java FacadeModellor.java 
Log Message:
Renamed copy(scale) to scale

Index: NetFacadeModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/NetFacadeModellor.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** NetFacadeModellor.java	13 Nov 2007 12:19:10 -0000	1.41
--- NetFacadeModellor.java	13 Nov 2007 12:21:46 -0000	1.42
***************
*** 685,689 ****
        deltaCorrection *= -1;
      }
!     Vertex n = s.normal().copy(delta * deltaCorrection);
      s.move(n.getX(), n.getY(), n.getZ());
    }
--- 685,689 ----
        deltaCorrection *= -1;
      }
!     Vertex n = s.normal().scale(delta * deltaCorrection);
      s.move(n.getX(), n.getY(), n.getZ());
    }

Index: FacadeModellor.java
===================================================================
RCS file: /cvsroot/bprocessor/facade/src/net/sourceforge/bprocessor/facade/modellor/FacadeModellor.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** FacadeModellor.java	13 Nov 2007 12:19:11 -0000	1.36
--- FacadeModellor.java	13 Nov 2007 12:21:46 -0000	1.37
***************
*** 463,470 ****
              frame = frameWidth;
            }
!           Vertex topOffset = vertDir.copy(frame / vertDir.length()); 
!           Vertex leftOffset = horDir.copy(frame / horDir.length()); 
!           Vertex bottomOffset = vertDir.copy((vertEdge.getLength() - frame) / vertDir.length()); 
!           Vertex rightOffset = horDir.copy((horEdge.getLength() - frame) / horDir.length());      
            topBound = new Line(cross.add(topOffset), horDir);
            leftBound = new Line(cross.add(leftOffset), vertDir);
--- 463,470 ----
              frame = frameWidth;
            }
!           Vertex topOffset = vertDir.scale(frame / vertDir.length()); 
!           Vertex leftOffset = horDir.scale(frame / horDir.length()); 
!           Vertex bottomOffset = vertDir.scale((vertEdge.getLength() - frame) / vertDir.length()); 
!           Vertex rightOffset = horDir.scale((horEdge.getLength() - frame) / horDir.length());      
            topBound = new Line(cross.add(topOffset), horDir);
            leftBound = new Line(cross.add(leftOffset), vertDir);
***************
*** 563,569 ****
        if (type == SINGLE_BAR) {
          vDir = vertSegs[0][0].getDirection();
!         vDir = vDir.copy((vertPostWidth / 2) / vDir.length());
          hDir = horSegs[0][0].getDirection();
!         hDir = hDir.copy((horPostWidth / 2) / hDir.length());
        }
        List slist = new LinkedList();
--- 563,569 ----
        if (type == SINGLE_BAR) {
          vDir = vertSegs[0][0].getDirection();
!         vDir = vDir.scale((vertPostWidth / 2) / vDir.length());
          hDir = horSegs[0][0].getDirection();
!         hDir = hDir.scale((horPostWidth / 2) / hDir.length());
        }
        List slist = new LinkedList();
***************
*** 642,653 ****
                if (dirChanged) {
                  if (j + dj > 0 && j + dj < horPosts + 1) {
!                   next.move(vDir.copy(stepI).getX(),
!                             vDir.copy(stepI).getY(),
!                             vDir.copy(stepI).getZ());
                  }
                  if (i + di > 0 && i + di < vertPosts + 1) {
!                   next.move(hDir.copy(-stepJ).getX(),
!                             hDir.copy(-stepJ).getY(),
!                             hDir.copy(-stepJ).getZ());
                  }
                }
--- 642,653 ----
                if (dirChanged) {
                  if (j + dj > 0 && j + dj < horPosts + 1) {
!                   next.move(vDir.scale(stepI).getX(),
!                             vDir.scale(stepI).getY(),
!                             vDir.scale(stepI).getZ());
                  }
                  if (i + di > 0 && i + di < vertPosts + 1) {
!                   next.move(hDir.scale(-stepJ).getX(),
!                             hDir.scale(-stepJ).getY(),
!                             hDir.scale(-stepJ).getZ());
                  }
                }
***************
*** 657,664 ****
                next = vertSegs[i + di][j + dj].intersection(horSegs[i + di][j + dj]);
                if (j + dj > 0 && j + dj < horPosts + 1) {
!                 next = next.add(vDir.copy(stepI));
                }
                if (i + di > 0 && i + di < vertPosts + 1) {
!                 next = next.add(hDir.copy(-stepJ));
                }
              }
--- 657,664 ----
                next = vertSegs[i + di][j + dj].intersection(horSegs[i + di][j + dj]);
                if (j + dj > 0 && j + dj < horPosts + 1) {
!                 next = next.add(vDir.scale(stepI));
                }
                if (i + di > 0 && i + di < vertPosts + 1) {
!                 next = next.add(hDir.scale(-stepJ));
                }
              }