[Bprocessor-commit] model/src/net/sourceforge/bprocessor/model/plugin PhysicsNet.java, 1.4, 1.5 PhysicsSurface.java, 1.3, 1.4

[Sebastian G. <sg...@us...>]

Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/plugin
In directory vz-cvs-2.sog:/tmp/cvs-serv18099/src/net/sourceforge/bprocessor/model/plugin

Modified Files:
	PhysicsNet.java PhysicsSurface.java 
Log Message:


Index: PhysicsSurface.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/plugin/PhysicsSurface.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PhysicsSurface.java	9 May 2011 10:22:58 -0000	1.3
--- PhysicsSurface.java	9 May 2011 12:24:51 -0000	1.4
***************
*** 84,90 ****
      
    Vertex averageNormal() {
!     return bSurf.normal();
!     /*    
!      * @Michael: algorithm for Normal seems to be so complicated... why?
     Vertex nV = new Vertex(0,0,0);
      List<Vertex> vertices = bSurf.getVertices();
--- 84,91 ----
      
    Vertex averageNormal() {
!     //bSurf.calcNormals();
!     //return bSurf.normal();
!     
!      //* @Michael: algorithm for Normal seems to be so complicated... why?
     Vertex nV = new Vertex(0,0,0);
      List<Vertex> vertices = bSurf.getVertices();
***************
*** 113,117 ****
      }
      return nV;
!     */
    }
    
--- 114,118 ----
      }
      return nV;
!     
    }
    

Index: PhysicsNet.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/plugin/PhysicsNet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PhysicsNet.java	9 May 2011 10:22:58 -0000	1.4
--- PhysicsNet.java	9 May 2011 12:24:51 -0000	1.5
***************
*** 164,168 ****
        s.quadToRect(guides, time, rectConstant, rectDamping);
        s.planarize(guides, time, planeConstant, planeDamping);
!       if (volume>0) {
          double normalForce = s.calcArea()*volume/currentVolume;
          s.normalForce(guides, time, normalForce);
--- 164,168 ----
        s.quadToRect(guides, time, rectConstant, rectDamping);
        s.planarize(guides, time, planeConstant, planeDamping);
!       if ((volume>0) && (solid)) {
          double normalForce = s.calcArea()*volume/currentVolume;
          s.normalForce(guides, time, normalForce);