Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4659/src/net/sourceforge/bprocessor/gl/view
Modified Files:
View.java
Log Message:
Refactored code in the model.
delete(Surface) no longer deletes edges
Index: View.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v
retrieving revision 1.213
retrieving revision 1.214
diff -C2 -d -r1.213 -r1.214
*** View.java 30 May 2007 17:29:53 -0000 1.213
--- View.java 31 May 2007 12:41:59 -0000 1.214
***************
*** 1663,1689 ****
gl.glNormal3d(norm.getX(), norm.getY(), norm.getZ());
}
- if (debug) {
- Vertex from = s.getEdges().get(0).getFrom();
- Vertex to = from.add(norm);
- drawEdge(new Edge(from, to));
- }
drawContour(s, tess);
! Collection innerSurfaces = s.getHoles();
! if (innerSurfaces != null) {
! Iterator innerIt = innerSurfaces.iterator();
! while (innerIt.hasNext()) {
! Surface surface = (Surface)innerIt.next();
! if (surface.getOwner() == s.getOwner()) {
! drawContour(surface, tess);
! }
! if (FALSE) {
! if (hit) {
! if (surface.getOwner() == s.getOwner()) {
! drawContour(surface, tess);
! }
! } else {
! drawContour(surface, tess);
! }
! }
}
}
--- 1663,1671 ----
gl.glNormal3d(norm.getX(), norm.getY(), norm.getZ());
}
drawContour(s, tess);
! Collection<Surface> holes = s.getHoles();
! for (Surface surface : holes) {
! if (surface.getOwner() == s.getOwner()) {
! drawContour(surface, tess);
}
}
|
