[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model Direction.java, 1.16, 1.17 Geometry.java, 1.66, 1.67 Line.java, 1.37, 1.38 EnergyCalc.java, 1.13, 1.14 Command.java, 1.50, 1.51 CoordinateSystem.java, 1.68, 1.69 Edge.java, 1.102, 1.103 Vertex.java, 1.73, 1.74 ClippingPlane.java, 1.24, 1.25 SpaceAnalysis.java, 1.8, 1.9 Surface.java, 1.207, 1.208 Camera.java, 1.49, 1.50 Space.java, 1.214, 1.215 Plane.java, 1.34, 1.35

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

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

Modified Files:
	Direction.java Geometry.java Line.java EnergyCalc.java 
	Command.java CoordinateSystem.java Edge.java Vertex.java 
	ClippingPlane.java SpaceAnalysis.java Surface.java Camera.java 
	Space.java Plane.java 
Log Message:
renamed scaleInPlace to scaleIt

Index: Command.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Command.java,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** Command.java	9 Dec 2007 12:10:32 -0000	1.50
--- Command.java	11 Dec 2007 14:49:01 -0000	1.51
***************
*** 687,691 ****
        double length = v.length();
        double delta = length / n;
!       v.scaleInPlace(delta / length);
        Vertex current = from;
        Space space = edge.getOwner();
--- 687,691 ----
        double length = v.length();
        double delta = length / n;
!       v.scaleIt(delta / length);
        Vertex current = from;
        Space space = edge.getOwner();
***************
*** 752,756 ****
            Vertex normal = v.copy();
            normal.setZ(0);
!           normal.scaleInPlace(-1);
            normal.normalize();
            normals.add(normal);
--- 752,756 ----
            Vertex normal = v.copy();
            normal.setZ(0);
!           normal.scaleIt(-1);
            normal.normalize();
            normals.add(normal);
***************
*** 1602,1606 ****
      private Prism extrude(Surface bottom, double distance) {
        Vertex normal = bottom.normal();
!       normal.scaleInPlace(distance);
        HashMap map = new HashMap();
        Surface top = (Surface) bottom.copy(map);
--- 1602,1606 ----
      private Prism extrude(Surface bottom, double distance) {
        Vertex normal = bottom.normal();
!       normal.scaleIt(distance);
        HashMap map = new HashMap();
        Surface top = (Surface) bottom.copy(map);

Index: CoordinateSystem.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/CoordinateSystem.java,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** CoordinateSystem.java	10 Dec 2007 08:34:21 -0000	1.68
--- CoordinateSystem.java	11 Dec 2007 14:49:01 -0000	1.69
***************
*** 358,368 ****
      Vertex origin = v0;
      Vertex i = v1.minus(v0);
!     i.scaleInPlace(1 / i.length());
      Vertex v = v2.minus(v1);
      Vertex n = i.cross(v);
      if (n.length() > 0) {
!       n.scaleInPlace(1 / n.length());
        Vertex j = n.cross(i);
!       j.scaleInPlace(1 / j.length());
        return new CoordinateSystem(i, j, n, origin);
      } else {
--- 358,368 ----
      Vertex origin = v0;
      Vertex i = v1.minus(v0);
!     i.scaleIt(1 / i.length());
      Vertex v = v2.minus(v1);
      Vertex n = i.cross(v);
      if (n.length() > 0) {
!       n.scaleIt(1 / n.length());
        Vertex j = n.cross(i);
!       j.scaleIt(1 / j.length());
        return new CoordinateSystem(i, j, n, origin);
      } else {
***************
*** 439,443 ****
      projection.setZ(n.getZ());
      double scalar = n.dot(vector);
!     projection.scaleInPlace(scalar);
      return projection;
    }
--- 439,443 ----
      projection.setZ(n.getZ());
      double scalar = n.dot(vector);
!     projection.scaleIt(scalar);
      return projection;
    }
***************
*** 463,467 ****
      double t = vector.dot(n);
      Vertex normal = n.copy();
!     normal.scaleInPlace(t);
      vector = vector.minus(normal);
      return origin.add(vector);
--- 463,467 ----
      double t = vector.dot(n);
      Vertex normal = n.copy();
!     normal.scaleIt(t);
      vector = vector.minus(normal);
      return origin.add(vector);
***************
*** 504,512 ****
    public Vertex unTranslate(Vertex vertex) {
      Vertex ii = i.copy();
!     ii.scaleInPlace(vertex.getX());
      Vertex jj = j.copy();
!     jj.scaleInPlace(vertex.getY());
      Vertex nn = n.copy();
!     nn.scaleInPlace(vertex.getZ());
      Vertex result = getOrigin().add(ii).add(jj).add(nn);
      return result;
--- 504,512 ----
    public Vertex unTranslate(Vertex vertex) {
      Vertex ii = i.copy();
!     ii.scaleIt(vertex.getX());
      Vertex jj = j.copy();
!     jj.scaleIt(vertex.getY());
      Vertex nn = n.copy();
!     nn.scaleIt(vertex.getZ());
      Vertex result = getOrigin().add(ii).add(jj).add(nn);
      return result;
***************
*** 632,638 ****
      Vertex nn = n.copy();
      Vertex newI = coordinate.i;
!     ii.scaleInPlace(newI.getX());
!     jj.scaleInPlace(newI.getY());
!     nn.scaleInPlace(newI.getZ());
      newI = ii.add(jj).add(nn);
      
--- 632,638 ----
      Vertex nn = n.copy();
      Vertex newI = coordinate.i;
!     ii.scaleIt(newI.getX());
!     jj.scaleIt(newI.getY());
!     nn.scaleIt(newI.getZ());
      newI = ii.add(jj).add(nn);
      
***************
*** 641,647 ****
      nn = n.copy();
      Vertex newJ = coordinate.j;
!     ii.scaleInPlace(newJ.getX());
!     jj.scaleInPlace(newJ.getY());
!     nn.scaleInPlace(newJ.getZ());
      newJ = ii.add(jj).add(nn);
      
--- 641,647 ----
      nn = n.copy();
      Vertex newJ = coordinate.j;
!     ii.scaleIt(newJ.getX());
!     jj.scaleIt(newJ.getY());
!     nn.scaleIt(newJ.getZ());
      newJ = ii.add(jj).add(nn);
      
***************
*** 650,656 ****
      nn = n.copy();
      Vertex newN = coordinate.n;
!     ii.scaleInPlace(newN.getX());
!     jj.scaleInPlace(newN.getY());
!     nn.scaleInPlace(newN.getZ());
      newN = ii.add(jj).add(nn);
      Vertex origin = unTranslate(coordinate.origin);
--- 650,656 ----
      nn = n.copy();
      Vertex newN = coordinate.n;
!     ii.scaleIt(newN.getX());
!     jj.scaleIt(newN.getY());
!     nn.scaleIt(newN.getZ());
      newN = ii.add(jj).add(nn);
      Vertex origin = unTranslate(coordinate.origin);
***************
*** 772,777 ****
      Vertex v = i.copy();
      Vertex u = j.copy();
!     v.scaleInPlace(size);
!     u.scaleInPlace(size);
      Vertex a = origin.add(u).minus(v);
      Vertex b = origin.add(u).add(v);
--- 772,777 ----
      Vertex v = i.copy();
      Vertex u = j.copy();
!     v.scaleIt(size);
!     u.scaleIt(size);
      Vertex a = origin.add(u).minus(v);
      Vertex b = origin.add(u).add(v);
***************
*** 833,842 ****
      Vertex o = getOrigin();
      Vertex i = getI().copy();
!     i.scaleInPlace(size);
      Vertex from = o.minus(i);
      Vertex to = o.add(i);
      list.add(new Guide(from, to));
      Vertex j = getJ().copy();
!     j.scaleInPlace(size);
      from = o.minus(j);
      to = o.add(j);
--- 833,842 ----
      Vertex o = getOrigin();
      Vertex i = getI().copy();
!     i.scaleIt(size);
      Vertex from = o.minus(i);
      Vertex to = o.add(i);
      list.add(new Guide(from, to));
      Vertex j = getJ().copy();
!     j.scaleIt(size);
      from = o.minus(j);
      to = o.add(j);
***************
*** 844,848 ****
      if (!onlyPlane()) {
        Vertex n = getN().copy();
!       n.scaleInPlace(size);
        from = o.minus(n);
        to = o.add(n);
--- 844,848 ----
      if (!onlyPlane()) {
        Vertex n = getN().copy();
!       n.scaleIt(size);
        from = o.minus(n);
        to = o.add(n);
***************
*** 892,896 ****
      i = j;
      j = tmp;
!     n.scaleInPlace(-1);
    }
    
--- 892,896 ----
      i = j;
      j = tmp;
!     n.scaleIt(-1);
    }
    
***************
*** 996,1000 ****
        this.vector = vector;
        Vertex v = vector.copy();
!       v.scaleInPlace(distance);
        v = getOrigin().add(v);
        setX(v.getX());
--- 996,1000 ----
        this.vector = vector;
        Vertex v = vector.copy();
!       v.scaleIt(distance);
        v = getOrigin().add(v);
        setX(v.getX());

Index: Surface.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Surface.java,v
retrieving revision 1.207
retrieving revision 1.208
diff -C2 -d -r1.207 -r1.208
*** Surface.java	21 Nov 2007 09:21:52 -0000	1.207
--- Surface.java	11 Dec 2007 14:49:02 -0000	1.208
***************
*** 626,630 ****
    public Surface extrusion(double delta, Collection sides) {
      Vertex normal = normal();
!     normal.scaleInPlace(delta);
      List vertices = getVertices();
      List edges = getEdges();
--- 626,630 ----
    public Surface extrusion(double delta, Collection sides) {
      Vertex normal = normal();
!     normal.scaleIt(delta);
      List vertices = getVertices();
      List edges = getEdges();
***************
*** 794,798 ****
        } else {
          Vertex ncopy = normal.copy();
!         ncopy.scaleInPlace(distance);
          vmap[i] = v[i].copy().add(ncopy);
        }
--- 794,798 ----
        } else {
          Vertex ncopy = normal.copy();
!         ncopy.scaleIt(distance);
          vmap[i] = v[i].copy().add(ncopy);
        }
***************
*** 1615,1622 ****
        origin = getFirstVertex();
        i = e0.otherVertex(origin).minus(origin);
!       i.scaleInPlace(1 / i.length());
        j = n.cross(i);
        if (j != null) {
!         j.scaleInPlace(1 / j.length());
          return new CoordinateSystem(i, j, n, origin.copy());
        }
--- 1615,1622 ----
        origin = getFirstVertex();
        i = e0.otherVertex(origin).minus(origin);
!       i.scaleIt(1 / i.length());
        j = n.cross(i);
        if (j != null) {
!         j.scaleIt(1 / j.length());
          return new CoordinateSystem(i, j, n, origin.copy());
        }

Index: Edge.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Edge.java,v
retrieving revision 1.102
retrieving revision 1.103
diff -C2 -d -r1.102 -r1.103
*** Edge.java	23 Nov 2007 10:27:12 -0000	1.102
--- Edge.java	11 Dec 2007 14:49:02 -0000	1.103
***************
*** 471,475 ****
        Vertex w = vertex.minus(from);
        double t = v.dot(w);
!       v.scaleInPlace(t / (length * length));
        return from.add(v);
      }
--- 471,475 ----
        Vertex w = vertex.minus(from);
        double t = v.dot(w);
!       v.scaleIt(t / (length * length));
        return from.add(v);
      }
***************
*** 607,611 ****
      }
      if ((t > 0 && t < 1)) {
!       r.scaleInPlace(t);
        Vertex p = p0.add(r).minus(q);
        if (p.length() < 0.0000001) {
--- 607,611 ----
      }
      if ((t > 0 && t < 1)) {
!       r.scaleIt(t);
        Vertex p = p0.add(r).minus(q);
        if (p.length() < 0.0000001) {
***************
*** 635,639 ****
        t = (q.getZ() - p0.getZ()) / r.getZ();
      }
!     r.scaleInPlace(t);
      Vertex p = p0.add(r).minus(q);
      if (p.length() < 0.0000001) {
--- 635,639 ----
        t = (q.getZ() - p0.getZ()) / r.getZ();
      }
!     r.scaleIt(t);
      Vertex p = p0.add(r).minus(q);
      if (p.length() < 0.0000001) {
***************
*** 771,780 ****
              org1 = dir1.cross(normal);
              org1.normalize();
!             org1.scaleInPlace(((Double)offsetMap.get(e1)).doubleValue());
            }
            if (which.contains(e2)) {
              org2 = dir2.cross(normal);
              org2.normalize();
!             org2.scaleInPlace(((Double)offsetMap.get(e2)).doubleValue());
            }
            org1 = org1.add(work);
--- 771,780 ----
              org1 = dir1.cross(normal);
              org1.normalize();
!             org1.scaleIt(((Double)offsetMap.get(e1)).doubleValue());
            }
            if (which.contains(e2)) {
              org2 = dir2.cross(normal);
              org2.normalize();
!             org2.scaleIt(((Double)offsetMap.get(e2)).doubleValue());
            }
            org1 = org1.add(work);
***************
*** 801,805 ****
              scale = ((Double)offsetMap.get(e2)).doubleValue();
            }
!           mainDir.scaleInPlace(scale);
          }
          v2Dir.put(work, mainDir);
--- 801,805 ----
              scale = ((Double)offsetMap.get(e2)).doubleValue();
            }
!           mainDir.scaleIt(scale);
          }
          v2Dir.put(work, mainDir);
***************
*** 863,867 ****
          Vertex workDir = (Vertex)directions.get(work);
          workDir.normalize();
!         workDir.scaleInPlace(((Double)offsetMap.get(e1)).doubleValue() /  
              workDir.dot(dir1));
          ((Vertex)v2v.get(work)).move(workDir.getX(), workDir.getY(), workDir.getZ()); 
--- 863,867 ----
          Vertex workDir = (Vertex)directions.get(work);
          workDir.normalize();
!         workDir.scaleIt(((Double)offsetMap.get(e1)).doubleValue() /  
              workDir.dot(dir1));
          ((Vertex)v2v.get(work)).move(workDir.getX(), workDir.getY(), workDir.getZ()); 
***************
*** 872,876 ****
          Vertex workDir = (Vertex)directions.get(work);
          workDir.normalize();
!         workDir.scaleInPlace(((Double)offsetMap.get(e2)).doubleValue() /  
              workDir.dot(dir2));
          ((Vertex)v2v.get(work)).move(workDir.getX(), workDir.getY(), workDir.getZ()); 
--- 872,876 ----
          Vertex workDir = (Vertex)directions.get(work);
          workDir.normalize();
!         workDir.scaleIt(((Double)offsetMap.get(e2)).doubleValue() /  
              workDir.dot(dir2));
          ((Vertex)v2v.get(work)).move(workDir.getX(), workDir.getY(), workDir.getZ()); 
***************
*** 1004,1008 ****
            dir2.normalize();
            Vertex mainDir = dir1.add(dir2);
!           mainDir.scaleInPlace(1 / mainDir.dot(dir1));
            dir.setDirection(mainDir);
          } else {
--- 1004,1008 ----
            dir2.normalize();
            Vertex mainDir = dir1.add(dir2);
!           mainDir.scaleIt(1 / mainDir.dot(dir1));
            dir.setDirection(mainDir);
          } else {
***************
*** 1022,1026 ****
              Vertex dir2 = other.minus(work);
              dir2.normalize();
!             dir2.scaleInPlace(1 / dir2.dot(dir1));
              dir.setDirection(dir2);
            } else {
--- 1022,1026 ----
              Vertex dir2 = other.minus(work);
              dir2.normalize();
!             dir2.scaleIt(1 / dir2.dot(dir1));
              dir.setDirection(dir2);
            } else {
***************
*** 1044,1048 ****
            Vertex dir1 = other.minus(work);
            dir1.normalize();
!           dir1.scaleInPlace(1 / dir1.dot(dir2));
            dir.setDirection(dir1);
          } else {
--- 1044,1048 ----
            Vertex dir1 = other.minus(work);
            dir1.normalize();
!           dir1.scaleIt(1 / dir1.dot(dir2));
            dir.setDirection(dir1);
          } else {
***************
*** 1059,1065 ****
        Direction cur = (Direction)diriter.next();
        Vertex dir = cur.getDirection();
!       dir.scaleInPlace(-1);
        dir = dir.copy();
!       dir.scaleInPlace(offset);
        cur.getVertex().move(dir.getX(), dir.getY(), dir.getZ());
      }    
--- 1059,1065 ----
        Direction cur = (Direction)diriter.next();
        Vertex dir = cur.getDirection();
!       dir.scaleIt(-1);
        dir = dir.copy();
!       dir.scaleIt(offset);
        cur.getVertex().move(dir.getX(), dir.getY(), dir.getZ());
      }    

Index: ClippingPlane.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/ClippingPlane.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** ClippingPlane.java	16 Nov 2007 11:46:50 -0000	1.24
--- ClippingPlane.java	11 Dec 2007 14:49:02 -0000	1.25
***************
*** 86,90 ****
        Vertex n = c.getN().copy();
        n.normalize();
!       n.scaleInPlace(0.00001);
        c.move(n.getX(), n.getY(), n.getZ());
        plane = c.plane();
--- 86,90 ----
        Vertex n = c.getN().copy();
        n.normalize();
!       n.scaleIt(0.00001);
        c.move(n.getX(), n.getY(), n.getZ());
        plane = c.plane();

Index: Camera.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Camera.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** Camera.java	11 Dec 2007 14:34:07 -0000	1.49
--- Camera.java	11 Dec 2007 14:49:02 -0000	1.50
***************
*** 388,397 ****
    public static void rotateHorizontallyEye(Camera c, double angle) {
      Vertex up = new Vertex(c.roll[0], c.roll[1], c.roll[2]);
!     up.scaleInPlace(1 / up.length());
      double x = c.center[0] - c.camera[0];
      double y = c.center[1] - c.camera[1];
      double z = c.center[2] - c.camera[2];
      Vertex forward = new Vertex(x, y, z);
!     forward.scaleInPlace(1 / forward.length());
      Geometry.rotate(angle, 0, 0, 1, c.center, c.camera);
      Geometry.rotate(angle, 0, 0, 1, c.roll, new double[]{0, 0, 0});
--- 388,397 ----
    public static void rotateHorizontallyEye(Camera c, double angle) {
      Vertex up = new Vertex(c.roll[0], c.roll[1], c.roll[2]);
!     up.scaleIt(1 / up.length());
      double x = c.center[0] - c.camera[0];
      double y = c.center[1] - c.camera[1];
      double z = c.center[2] - c.camera[2];
      Vertex forward = new Vertex(x, y, z);
!     forward.scaleIt(1 / forward.length());
      Geometry.rotate(angle, 0, 0, 1, c.center, c.camera);
      Geometry.rotate(angle, 0, 0, 1, c.roll, new double[]{0, 0, 0});
***************
*** 405,416 ****
    public static void rotateVerticallyEye(Camera c, double angle) {
      Vertex up = new Vertex(c.roll[0], c.roll[1], c.roll[2]);
!     up.scaleInPlace(1 / up.length());
      double x = c.center[0] - c.camera[0];
      double y = c.center[1] - c.camera[1];
      double z = c.center[2] - c.camera[2];
      Vertex forward = new Vertex(x, y, z);
!     forward.scaleInPlace(1 / forward.length());
      Vertex sidewards = up.cross(forward);
!     sidewards.scaleInPlace(1 / sidewards.length());
  
      Geometry.rotate(angle,  sidewards.getX(), sidewards.getY(), sidewards.getZ(),
--- 405,416 ----
    public static void rotateVerticallyEye(Camera c, double angle) {
      Vertex up = new Vertex(c.roll[0], c.roll[1], c.roll[2]);
!     up.scaleIt(1 / up.length());
      double x = c.center[0] - c.camera[0];
      double y = c.center[1] - c.camera[1];
      double z = c.center[2] - c.camera[2];
      Vertex forward = new Vertex(x, y, z);
!     forward.scaleIt(1 / forward.length());
      Vertex sidewards = up.cross(forward);
!     sidewards.scaleIt(1 / sidewards.length());
  
      Geometry.rotate(angle,  sidewards.getX(), sidewards.getY(), sidewards.getZ(),
***************
*** 451,455 ****
      //forward.scale(1 / forward.length());
      Vertex sidewards = up.cross(forward);
!     sidewards.scaleInPlace(1 / sidewards.length());
  
      Geometry.rotate(angle, sidewards.getX(), sidewards.getY(), sidewards.getZ(), 
--- 451,455 ----
      //forward.scale(1 / forward.length());
      Vertex sidewards = up.cross(forward);
!     sidewards.scaleIt(1 / sidewards.length());
  
      Geometry.rotate(angle, sidewards.getX(), sidewards.getY(), sidewards.getZ(), 
***************
*** 471,475 ****
      double z = c.center[2] - c.camera[2];
      Vertex forward = new Vertex(x, y, z);
!     forward.scaleInPlace(1 / forward.length());
      Geometry.rotate(angle / 2, forward.getX(), 
          forward.getY(), forward.getZ(), c.roll, new double[] {0, 0, 0});
--- 471,475 ----
      double z = c.center[2] - c.camera[2];
      Vertex forward = new Vertex(x, y, z);
!     forward.scaleIt(1 / forward.length());
      Geometry.rotate(angle / 2, forward.getX(), 
          forward.getY(), forward.getZ(), c.roll, new double[] {0, 0, 0});
***************
*** 705,709 ****
        if (p1 != null && p2 != null) {
          modelCenter = p1.minus(p2);
!         modelCenter.scaleInPlace(1.0 / 2.0);
          modelCenter = modelCenter.add(p2);
          it = vertices.iterator();
--- 705,709 ----
        if (p1 != null && p2 != null) {
          modelCenter = p1.minus(p2);
!         modelCenter.scaleIt(1.0 / 2.0);
          modelCenter = modelCenter.add(p2);
          it = vertices.iterator();
***************
*** 714,718 ****
            if (dist > radius) {
              radius = (dist + radius) / 2.0;
!             dV.scaleInPlace((dist - radius) / dist);
              modelCenter = modelCenter.add(dV);
            }
--- 714,718 ----
            if (dist > radius) {
              radius = (dist + radius) / 2.0;
!             dV.scaleIt((dist - radius) / dist);
              modelCenter = modelCenter.add(dV);
            }
***************
*** 758,762 ****
            camera[1] - center[1],
            camera[2] - center[2]);
!       cameraPos.scaleInPlace(cameraDistance / cameraPos.length());
        cameraPos = cameraPos.add(modelCenter);
        setCenter(new double[] {modelCenter.getX(),
--- 758,762 ----
            camera[1] - center[1],
            camera[2] - center[2]);
!       cameraPos.scaleIt(cameraDistance / cameraPos.length());
        cameraPos = cameraPos.add(modelCenter);
        setCenter(new double[] {modelCenter.getX(),
***************
*** 1001,1005 ****
      double[] center = current.getCenter();
      Vertex back = new Vertex(camera).minus(new Vertex(center));
!     back.scaleInPlace(length / back.length());
      camera[0] = center[0] + back.getX();
      camera[1] = center[1] + back.getY();
--- 1001,1005 ----
      double[] center = current.getCenter();
      Vertex back = new Vertex(camera).minus(new Vertex(center));
!     back.scaleIt(length / back.length());
      camera[0] = center[0] + back.getX();
      camera[1] = center[1] + back.getY();

Index: Plane.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Plane.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** Plane.java	22 Nov 2007 10:12:49 -0000	1.34
--- Plane.java	11 Dec 2007 14:49:02 -0000	1.35
***************
*** 96,100 ****
    public Vertex normal() {
      Vertex normal = new Vertex(a, b, c);
!     normal.scaleInPlace(1 / normal.length());
      return normal;
    }
--- 96,100 ----
    public Vertex normal() {
      Vertex normal = new Vertex(a, b, c);
!     normal.scaleIt(1 / normal.length());
      return normal;
    }
***************
*** 158,162 ****
      Vertex temp = alfa.cross(beta);
      Vertex norm = temp.cross(beta);
!     norm.scaleInPlace(1 / norm.length());
      Vertex intersec = intersection(rayIn);
      double a = norm.getX();
--- 158,162 ----
      Vertex temp = alfa.cross(beta);
      Vertex norm = temp.cross(beta);
!     norm.scaleIt(1 / norm.length());
      Vertex intersec = intersection(rayIn);
      double a = norm.getX();
***************
*** 226,230 ****
      Vertex normal = normal();
      double t = vector.dot(normal());
!     normal.scaleInPlace(t / normal.length());
      vector = vector.minus(normal);
      return origin().add(vector);
--- 226,230 ----
      Vertex normal = normal();
      double t = vector.dot(normal());
!     normal.scaleIt(t / normal.length());
      vector = vector.minus(normal);
      return origin().add(vector);
***************
*** 296,300 ****
      i.setY(i.getY() - n.getY() * t);
      i.setZ(i.getZ() - n.getZ() * t);
!     i.scaleInPlace(1 / i.length());
      
      j = n.cross(i);
--- 296,300 ----
      i.setY(i.getY() - n.getY() * t);
      i.setZ(i.getZ() - n.getZ() * t);
!     i.scaleIt(1 / i.length());
      
      j = n.cross(i);

Index: SpaceAnalysis.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/SpaceAnalysis.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** SpaceAnalysis.java	13 Nov 2007 12:19:29 -0000	1.8
--- SpaceAnalysis.java	11 Dec 2007 14:49:02 -0000	1.9
***************
*** 125,129 ****
      Vertex i = leader.normal();
      int direction = travel(leader, edge);
!     n.scaleInPlace(direction);
      Surface selected = leader;
      double minimum = 2 * Math.PI;
--- 125,129 ----
      Vertex i = leader.normal();
      int direction = travel(leader, edge);
!     n.scaleIt(direction);
      Surface selected = leader;
      double minimum = 2 * Math.PI;
***************
*** 133,137 ****
          Vertex normal = current.normal();
          if (travel(current, edge) != direction) {
!           normal.scaleInPlace(-1);
          }
          double t = i.dot(normal);
--- 133,137 ----
          Vertex normal = current.normal();
          if (travel(current, edge) != direction) {
!           normal.scaleIt(-1);
          }
          double t = i.dot(normal);

Index: Direction.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Direction.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Direction.java	13 Nov 2007 12:19:29 -0000	1.16
--- Direction.java	11 Dec 2007 14:49:01 -0000	1.17
***************
*** 55,59 ****
      double slideScale;
      Vertex vunit = v.copy();
!     vunit.scaleInPlace(1 / v.length());
      if (v.getX() != 0) {
        slideScale =  v.getX() / (slideDir.dot(vunit) * vunit.getX());
--- 55,59 ----
      double slideScale;
      Vertex vunit = v.copy();
!     vunit.scaleIt(1 / v.length());
      if (v.getX() != 0) {
        slideScale =  v.getX() / (slideDir.dot(vunit) * vunit.getX());
***************
*** 64,68 ****
      }
      direction = slideDir;
!     direction.scaleInPlace(slideScale);
    }
    
--- 64,68 ----
      }
      direction = slideDir;
!     direction.scaleIt(slideScale);
    }
    

Index: Space.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Space.java,v
retrieving revision 1.214
retrieving revision 1.215
diff -C2 -d -r1.214 -r1.215
*** Space.java	10 Dec 2007 13:31:11 -0000	1.214
--- Space.java	11 Dec 2007 14:49:02 -0000	1.215
***************
*** 1181,1185 ****
          average = average.add((Vertex)it.next());
        } 
!       average.scaleInPlace(1.0 / (double)verts.size());
      }
      return average;
--- 1181,1185 ----
          average = average.add((Vertex)it.next());
        } 
!       average.scaleIt(1.0 / (double)verts.size());
      }
      return average;
***************
*** 1900,1906 ****
        Vertex spaceVector = s.normal();
        if (s.getFrontDomain() == this) {
!         spaceVector.scaleInPlace(1 / spaceVector.length());
        } else if (s.getBackDomain() == this) {
!         spaceVector.scaleInPlace(-1 / spaceVector.length());
        } else {
          return false;
--- 1900,1906 ----
        Vertex spaceVector = s.normal();
        if (s.getFrontDomain() == this) {
!         spaceVector.scaleIt(1 / spaceVector.length());
        } else if (s.getBackDomain() == this) {
!         spaceVector.scaleIt(-1 / spaceVector.length());
        } else {
          return false;
***************
*** 1931,1935 ****
      //Building a coordinate system:
      Vertex n = sharedEdge.getDirection();
!     n.scaleInPlace(1 / n.length());
  
      Vertex j = startSurface.normal();
--- 1931,1935 ----
      //Building a coordinate system:
      Vertex n = sharedEdge.getDirection();
!     n.scaleIt(1 / n.length());
  
      Vertex j = startSurface.normal();
***************
*** 1938,1944 ****
      }
      if (startSurface.getFrontDomain() == this) {
!       j.scaleInPlace(1 / j.length());
      } else {
!       j.scaleInPlace(-1 / j.length());
      }
  
--- 1938,1944 ----
      }
      if (startSurface.getFrontDomain() == this) {
!       j.scaleIt(1 / j.length());
      } else {
!       j.scaleIt(-1 / j.length());
      }
  
***************
*** 1953,1957 ****
                            n.getZ() * sharedVertex.getZ()));
      Vertex i = (p.project(sharedVertex)).minus(p.project(adjacentVertex));
!     i.scaleInPlace(1 / i.length());
      CoordinateSystem cs = new CoordinateSystem(i, j , n, sharedVertex);
      
--- 1953,1957 ----
                            n.getZ() * sharedVertex.getZ()));
      Vertex i = (p.project(sharedVertex)).minus(p.project(adjacentVertex));
!     i.scaleIt(1 / i.length());
      CoordinateSystem cs = new CoordinateSystem(i, j , n, sharedVertex);
      
***************
*** 1999,2003 ****
      Vertex projNotShared = coordinateSystem.projection(notShared);
      Vertex projEdgeDir = projNotShared.minus(projShared);
!     projEdgeDir.scaleInPlace(1 / projEdgeDir.length());
      Vertex xAxis = coordinateSystem.getI().copy();
      double cosAngle = xAxis.dot(projEdgeDir);
--- 1999,2003 ----
      Vertex projNotShared = coordinateSystem.projection(notShared);
      Vertex projEdgeDir = projNotShared.minus(projShared);
!     projEdgeDir.scaleIt(1 / projEdgeDir.length());
      Vertex xAxis = coordinateSystem.getI().copy();
      double cosAngle = xAxis.dot(projEdgeDir);

Index: Geometry.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Geometry.java,v
retrieving revision 1.66
retrieving revision 1.67
diff -C2 -d -r1.66 -r1.67
*** Geometry.java	3 Dec 2007 15:01:37 -0000	1.66
--- Geometry.java	11 Dec 2007 14:49:01 -0000	1.67
***************
*** 122,128 ****
      double tetra = angle(projection);
      if (tetra > 0) {
!       normal.scaleInPlace(-1);
      }
!     normal.scaleInPlace(1 / normal.length());
      return normal;
    }
--- 122,128 ----
      double tetra = angle(projection);
      if (tetra > 0) {
!       normal.scaleIt(-1);
      }
!     normal.scaleIt(1 / normal.length());
      return normal;
    }
***************
*** 222,226 ****
        double t = v.dot(normal);
        Vertex up = normal.copy();
!       up.scaleInPlace(t);
        projection.add(v.minus(up));
      }
--- 222,226 ----
        double t = v.dot(normal);
        Vertex up = normal.copy();
!       up.scaleIt(t);
        projection.add(v.minus(up));
      }

Index: Line.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Line.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** Line.java	13 Nov 2007 12:19:29 -0000	1.37
--- Line.java	11 Dec 2007 14:49:01 -0000	1.38
***************
*** 130,134 ****
    public Vertex getPointAt(double t) {
      Vertex tmp = direction.copy();
!     tmp.scaleInPlace(t);
      return getOrigin().add(tmp);
    }
--- 130,134 ----
    public Vertex getPointAt(double t) {
      Vertex tmp = direction.copy();
!     tmp.scaleIt(t);
      return getOrigin().add(tmp);
    }
***************
*** 195,199 ****
      Vertex origin = getOrigin();
      Vertex direction = getDirection().copy();
!     direction.scaleInPlace(length);
      Vertex from = origin.minus(direction);
      Vertex to = origin.add(direction);
--- 195,199 ----
      Vertex origin = getOrigin();
      Vertex direction = getDirection().copy();
!     direction.scaleIt(length);
      Vertex from = origin.minus(direction);
      Vertex to = origin.add(direction);
***************
*** 261,266 ****
      double s = ((v2 * w1 - v1 * w2) / denom);
      double t = ((u1 * w2 - u2 * w1) / -denom);
!     d.scaleInPlace(-s);
!     c.scaleInPlace(-t);
      Vertex inter1 = d.add(o);
      Vertex inter2 = c.add(p);
--- 261,266 ----
      double s = ((v2 * w1 - v1 * w2) / denom);
      double t = ((u1 * w2 - u2 * w1) / -denom);
!     d.scaleIt(-s);
!     c.scaleIt(-t);
      Vertex inter1 = d.add(o);
      Vertex inter2 = c.add(p);

Index: EnergyCalc.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/EnergyCalc.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** EnergyCalc.java	13 Nov 2007 12:19:29 -0000	1.13
--- EnergyCalc.java	11 Dec 2007 14:49:01 -0000	1.14
***************
*** 94,98 ****
      Vertex normal = current.normal(); 
      if (current.getBackDomain().isConstructionSpace()) {
!       normal.scaleInPlace(-1); 
      } 
      Vertex origin = current.center();
--- 94,98 ----
      Vertex normal = current.normal(); 
      if (current.getBackDomain().isConstructionSpace()) {
!       normal.scaleIt(-1); 
      } 
      Vertex origin = current.center();

Index: Vertex.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Vertex.java,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** Vertex.java	5 Dec 2007 10:25:34 -0000	1.73
--- Vertex.java	11 Dec 2007 14:49:02 -0000	1.74
***************
*** 376,380 ****
     * @param scale The scale
     */
!   public void scaleInPlace(double scale) {
      setX(getX() * scale);
      setY(getY() * scale);
--- 376,380 ----
     * @param scale The scale
     */
!   public void scaleIt(double scale) {
      setX(getX() * scale);
      setY(getY() * scale);
***************
*** 495,499 ****
    public void normalize() {
      if (getX() != 0.0 || getY() != 0.0 || getZ() != 0.0) {
!       scaleInPlace(1 / length());
      }
    }
--- 495,499 ----
    public void normalize() {
      if (getX() != 0.0 || getY() != 0.0 || getZ() != 0.0) {
!       scaleIt(1 / length());
      }
    }
***************
*** 543,547 ****
        double scale = this.dot(onto) / onto.dot(onto);
        Vertex res = onto.copy();
!       res.scaleInPlace(scale);
        return res;
      }
--- 543,547 ----
        double scale = this.dot(onto) / onto.dot(onto);
        Vertex res = onto.copy();
!       res.scaleIt(scale);
        return res;
      }