Update of /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv22295/src/net/sourceforge/bprocessor/model
Modified Files:
Command.java
Log Message:
Changed cylinder to insert into active space
Index: Command.java
===================================================================
RCS file: /cvsroot/bprocessor/model/src/net/sourceforge/bprocessor/model/Command.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Command.java 28 Oct 2007 22:45:37 -0000 1.17
--- Command.java 29 Oct 2007 18:08:32 -0000 1.18
***************
*** 600,610 ****
edges.add(new Edge(prev, first));
Surface bottom = new Surface(edges);
! Space inside = Project.getInstance().world().createConstructionSpace("Cylinder");
! Space world = Project.getInstance().world();
bottom.setFrontDomain(inside);
Set<Surface> sides = new HashSet<Surface>();
Surface top = bottom.extrusion(h, sides);
! world.add(inside);
! world.insert(bottom);
for (Surface surface : sides) {
List<Vertex> normals = new LinkedList<Vertex>();
--- 600,610 ----
edges.add(new Edge(prev, first));
Surface bottom = new Surface(edges);
! Space space = Project.getInstance().getActiveSpace();
! Space inside = space.createConstructionSpace("Cylinder");
bottom.setFrontDomain(inside);
Set<Surface> sides = new HashSet<Surface>();
Surface top = bottom.extrusion(h, sides);
! space.add(inside);
! space.insert(bottom);
for (Surface surface : sides) {
List<Vertex> normals = new LinkedList<Vertex>();
***************
*** 617,630 ****
}
surface.setNormals(normals);
! world.insert(surface);
}
Collection<Edge> visibleEdges = Surface.edges(sides);
visibleEdges.removeAll(top.getEdges());
visibleEdges.removeAll(bottom.getEdges());
! Project.getInstance().getCurrentCamera().getHiddenGeometrics().addAll(visibleEdges);
sides.add(top);
sides.add(bottom);
! world.insert(top);
! Project.getInstance().changed(world);
Project.getInstance().checkpoint();
}
--- 617,632 ----
}
surface.setNormals(normals);
! space.insert(surface);
}
Collection<Edge> visibleEdges = Surface.edges(sides);
visibleEdges.removeAll(top.getEdges());
visibleEdges.removeAll(bottom.getEdges());
! for (Edge e : visibleEdges) {
! e.setSmooth(true);
! }
sides.add(top);
sides.add(bottom);
! space.insert(top);
! Project.getInstance().changed(space);
Project.getInstance().checkpoint();
}
|