[Bprocessor-commit] bprocessor/src/net/sourceforge/bprocessor/packages/physics PhysicsMeshExtrusionPackage.java, 1.2, 1.3 PhysicsPackage.java, 1.4, 1.5

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

Update of /cvsroot/bprocessor/bprocessor/src/net/sourceforge/bprocessor/packages/physics
In directory vz-cvs-2.sog:/tmp/cvs-serv25723/src/net/sourceforge/bprocessor/packages/physics

Modified Files:
	PhysicsMeshExtrusionPackage.java PhysicsPackage.java 
Log Message:
small changes to mesh extrusion


Index: PhysicsPackage.java
===================================================================
RCS file: /cvsroot/bprocessor/bprocessor/src/net/sourceforge/bprocessor/packages/physics/PhysicsPackage.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PhysicsPackage.java	23 May 2011 12:25:17 -0000	1.4
--- PhysicsPackage.java	26 May 2011 05:59:55 -0000	1.5
***************
*** 98,102 ****
        //normalForce = 0.0;
        //parameters.put("Normal Surface Force [N]", normalForce);
!       volume = 1.0;
        parameters.put("Volume [m3]", volume);
        //editNet = true;
--- 98,102 ----
        //normalForce = 0.0;
        //parameters.put("Normal Surface Force [N]", normalForce);
!       volume = 0.0;
        parameters.put("Volume [m3]", volume);
        //editNet = true;

Index: PhysicsMeshExtrusionPackage.java
===================================================================
RCS file: /cvsroot/bprocessor/bprocessor/src/net/sourceforge/bprocessor/packages/physics/PhysicsMeshExtrusionPackage.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PhysicsMeshExtrusionPackage.java	24 May 2011 05:53:51 -0000	1.2
--- PhysicsMeshExtrusionPackage.java	26 May 2011 05:59:55 -0000	1.3
***************
*** 229,232 ****
--- 229,233 ----
          //
          oS = new Surface(oEdgesUp);
+         oS.flip();
          cNetShell.insertAll(oS);
          saveMeshFaceParameter(oS,"Face Type", "Side 2");
***************
*** 235,238 ****
--- 236,241 ----
        List<Edge> fEdges = new ArrayList<Edge>();
        List<Edge> gEdges = new ArrayList<Edge>();
+       List<Vertex> vUp = new ArrayList<Vertex>();
+       List<Vertex> vDown = new ArrayList<Vertex>();
        Surface oS;
        Surface gS;
***************
*** 245,252 ****
--- 248,259 ----
          Vertex oADown = oVerticesDown.get(eA);
          Vertex oBDown = oVerticesDown.get(eB);
+         vDown.add(oADown);
+         vDown.add(oBDown);
          Edge oEDown = new Edge(oADown,oBDown);
          //
          Vertex oAUp = oVerticesUp.get(eA);
          Vertex oBUp = oVerticesUp.get(eB);
+         vUp.add(oAUp);
+         vUp.add(oBUp);
          Edge oEUp = new Edge(oBUp,oAUp);
          //
***************
*** 257,266 ****
          fEdges.add(oES1.copy());
          fEdges.add(oEUp.copy());
!         fEdges.add(oES2.copy());   
!         //
          gEdges.add(oEDown.copy());
          gEdges.add(oES1.copy());
          gEdges.add(oEUp.copy());
!         gEdges.add(oES2.copy());   
          //check if lateral or internal
          Collection<Surface> eSurfaces = e.getSurfaces();
--- 264,274 ----
          fEdges.add(oES1.copy());
          fEdges.add(oEUp.copy());
!         fEdges.add(oES2.copy()); 
!         // 
          gEdges.add(oEDown.copy());
          gEdges.add(oES1.copy());
          gEdges.add(oEUp.copy());
!         gEdges.add(oES2.copy());  
!         
          //check if lateral or internal
          Collection<Surface> eSurfaces = e.getSurfaces();
***************
*** 274,284 ****
            saveMeshFaceParameter(gS,"Face Type", "Lateral");
          } else {
!           oS = new Surface(fEdges);
!           cNetGrid.insertAll(oS);
!           saveMeshFaceParameter(oS,"Face Type", "Internal");
          }
        }
        union.add(cNetShell);
        union.add(cNetGrid);
      }
      
--- 282,302 ----
            saveMeshFaceParameter(gS,"Face Type", "Lateral");
          } else {
!           gS = new Surface(gEdges);
!           cNetGrid.insertAll(gS);
!           saveMeshFaceParameter(gS,"Face Type", "Internal");
          }
        }
        union.add(cNetShell);
        union.add(cNetGrid);
+       //make one side of vertices corners for grid shell
+       for (Vertex v : vDown) {
+         Collection<Vertex> gridVertices = cNetGrid.getVertices();
+         for (Vertex gV : gridVertices) {
+           if (v.coincides(gV)) {
+             System.out.println("found vertex");
+             gV.setCorner(true);
+           }
+         }
+       }
      }