Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3568/src/net/sourceforge/bprocessor/gl/tool
Modified Files:
ExtrusionTool.java
Log Message:
Uses new mesh-insertion in extrude tool
Index: ExtrusionTool.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/tool/ExtrusionTool.java,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** ExtrusionTool.java 28 Mar 2007 08:59:30 -0000 1.52
--- ExtrusionTool.java 29 Mar 2007 10:10:57 -0000 1.53
***************
*** 27,30 ****
--- 27,31 ----
import net.sourceforge.bprocessor.model.Geometry;
import net.sourceforge.bprocessor.model.Line;
+ import net.sourceforge.bprocessor.model.Mesh;
import net.sourceforge.bprocessor.model.Plane;
import net.sourceforge.bprocessor.model.Project;
***************
*** 88,94 ****
*/
private void insert(Space space, Collection<Surface> extrusion) {
! for (Surface surface : extrusion) {
! space.insert(surface);
! }
space.changed();
}
--- 89,96 ----
*/
private void insert(Space space, Collection<Surface> extrusion) {
! Collection<Edge> edges = Surface.edges(extrusion);
! Collection<Vertex> vertices = Edge.vertices(edges);
! Mesh mesh = new Mesh(extrusion, edges, vertices);
! space.insert(mesh);
space.changed();
}
***************
*** 338,344 ****
protected void pressed(MouseEvent e) {
if (!Selection.primary().isEmpty()) {
- // some of the selction should be extruded
if (extrudeEdges == null) {
- // The extrusion havn't started yet
extrudeEdges = new ArrayList<Edge>();
for (Object o : Selection.primary()) {
--- 340,344 ----
***************
*** 346,350 ****
extrudeEdges.add((Edge) o);
} else {
- GUI.getInstance().alert("Selection isn't extrudable, due to other elements than edges");
extrudeEdges.clear();
}
--- 346,349 ----
***************
*** 365,369 ****
Plane plane = new Plane(0, 0, 1, extrudeEdges.get(0).getFrom());
dragplane = plane.orthogonalPlane(ray);
- //from = view.toPlaneCoords(startx, starty, dragplane);
active = true;
start = findIntersection(e);
--- 364,367 ----
***************
*** 371,375 ****
}
} else {
- // finish the extrusion
if (extrusion != null) {
if (ontoPlane != null) {
--- 369,372 ----
***************
*** 384,388 ****
}
} else {
- // look at the mouse target
if (extrudesurface == null) {
findTarget(e);
--- 381,384 ----
|
