[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/tool ExtrusionTool.java,1.15,1.16 Util.java
Status: Pre-Alpha
Brought to you by:
henryml
From: Michael L. <he...@us...> - 2005-09-29 10:37:43
|
Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25056/src/net/sourceforge/bprocessor/gl/tool Modified Files: ExtrusionTool.java Removed Files: Util.java Log Message: Removed usage of Util (uses operations from model instead) --- Util.java DELETED --- Index: ExtrusionTool.java =================================================================== RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ExtrusionTool.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** ExtrusionTool.java 22 Sep 2005 23:32:50 -0000 1.15 --- ExtrusionTool.java 29 Sep 2005 10:37:27 -0000 1.16 *************** *** 86,92 **** normal.scale(normDotDelta / (normal.length() * normal.length())); //normal.scale(delta); ! List l = Util.traverse(dragSurface); //moving the dragged surface along its normal vector ! for (int count = 0; l != null && count < l.size(); count++) { Vertex v = (Vertex)l.get(count); updateVertex(v, new double[] {v.getX() + normal.getX(), --- 86,92 ---- normal.scale(normDotDelta / (normal.length() * normal.length())); //normal.scale(delta); ! List l = dragSurface.getVertices(); //moving the dragged surface along its normal vector ! for (int count = 0; l != null && count < l.size() - 1; count++) { Vertex v = (Vertex)l.get(count); updateVertex(v, new double[] {v.getX() + normal.getX(), *************** *** 100,105 **** while (innerIt.hasNext()) { Surface innerSurf = (Surface)innerIt.next(); ! List verticies = Util.traverse(innerSurf); ! for (int count = 0; verticies != null && count < verticies.size(); count++) { Vertex v = (Vertex)verticies.get(count); updateVertex(v, new double[] {v.getX() + normal.getX(), --- 100,105 ---- while (innerIt.hasNext()) { Surface innerSurf = (Surface)innerIt.next(); ! List verticies = innerSurf.getVertices(); ! for (int count = 0; verticies != null && count < verticies.size() - 1; count++) { Vertex v = (Vertex)verticies.get(count); updateVertex(v, new double[] {v.getX() + normal.getX(), *************** *** 128,132 **** } Vertex normal = s.normal(); ! List l = Util.traverse(s); if (l != null) { for (int i = 0; i < l.size(); i++) { --- 128,132 ---- } Vertex normal = s.normal(); ! List l = s.getVertices(); if (l != null) { for (int i = 0; i < l.size(); i++) { *************** *** 298,302 **** return topSurf; } ! /** * Do all the initial extrusion stuff returns the top of the extension --- 298,302 ---- return topSurf; } ! /** * Do all the initial extrusion stuff returns the top of the extension *************** *** 305,308 **** --- 305,309 ---- */ private Surface createExtension(Surface selectedSurface) { + Surface top = extendSurface(selectedSurface); Set innerSurfaces = selectedSurface.getInnerSurfaces(); |