[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool MultiExtrudeTool.java, 1.25, 1.26 Rec
Status: Pre-Alpha
Brought to you by:
henryml
From: Michael L. <he...@us...> - 2007-10-02 06:42:07
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24295/src/net/sourceforge/bprocessor/gl/tool Modified Files: MultiExtrudeTool.java RectTool.java Log Message: constructor drawing Index: RectTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/RectTool.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** RectTool.java 19 Sep 2007 20:57:47 -0000 1.21 --- RectTool.java 2 Oct 2007 06:42:09 -0000 1.22 *************** *** 20,23 **** --- 20,24 ---- import net.sourceforge.bprocessor.model.Geometry; import net.sourceforge.bprocessor.model.Selection; + import net.sourceforge.bprocessor.model.Surface; import net.sourceforge.bprocessor.model.Vertex; *************** *** 100,104 **** direction.scale((length - direction.length()) / direction.length()); movingEdge.move(direction.getX(), direction.getY(), direction.getZ()); ! Geometry.insertEdges(rectangle); cleanUp(); feedback(rectangle); --- 101,106 ---- direction.scale((length - direction.length()) / direction.length()); movingEdge.move(direction.getX(), direction.getY(), direction.getZ()); ! List surfaces = Geometry.insertEdges(rectangle); ! System.out.println("surfaces: " + surfaces); cleanUp(); feedback(rectangle); *************** *** 168,172 **** } else { if (baseEdge.getLength() > 0.0 && movingEdge.getLength() > 0.0) { ! Geometry.insertEdges(rectangle); } cleanUp(); --- 170,188 ---- } else { if (baseEdge.getLength() > 0.0 && movingEdge.getLength() > 0.0) { ! List<Surface> surfaces = Geometry.insertEdges(rectangle); ! for (Surface current : surfaces) { ! Surface exterior = current.getExterior(); ! if (exterior != null) { ! Vertex n1 = current.normal(); ! Vertex n2 = exterior.normal(); ! if (n1.dot(n2) > 0) { ! current.setFrontDomain(exterior.getFrontDomain()); ! current.setBackDomain(exterior.getBackDomain()); ! } else { ! current.setFrontDomain(exterior.getBackDomain()); ! current.setBackDomain(exterior.getFrontDomain()); ! } ! } ! } } cleanUp(); Index: MultiExtrudeTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/MultiExtrudeTool.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** MultiExtrudeTool.java 1 Oct 2007 13:26:16 -0000 1.25 --- MultiExtrudeTool.java 2 Oct 2007 06:42:09 -0000 1.26 *************** *** 281,285 **** while (holes.hasNext()) { Surface hole = (Surface) holes.next(); ! creations.add(hole.extrudeControlled(-direction, true, creations, e2e, v2e, e2s, v2dir)); } } --- 281,286 ---- while (holes.hasNext()) { Surface hole = (Surface) holes.next(); ! creations.add(hole.extrudeControlled(-direction, true, creations, ! e2e, v2e, e2s, v2dir)); } } |