Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27099/src/net/sourceforge/bprocessor/gl/view
Modified Files:
View.java Display.java
Log Message:
ClippingPlane improved
Index: Display.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/Display.java,v
retrieving revision 1.83
retrieving revision 1.84
diff -C2 -d -r1.83 -r1.84
*** Display.java 9 Sep 2008 13:42:51 -0000 1.83
--- Display.java 10 Sep 2008 22:53:50 -0000 1.84
***************
*** 50,55 ****
public class Display {
private static final boolean TRUE = true;
!
!
private static boolean initialized;
private static boolean selecting;
--- 50,55 ----
public class Display {
private static final boolean TRUE = true;
!
[...1382 lines suppressed...]
!
if (!selecting()) {
disableClipplanes();
***************
*** 1484,1490 ****
translateToCoordinatesystem((Instance) active);
}
!
hilite(geometrics);
!
if (active.isInstance()) {
gl.glPopMatrix();
--- 1491,1497 ----
translateToCoordinatesystem((Instance) active);
}
!
hilite(geometrics);
!
if (active.isInstance()) {
gl.glPopMatrix();
Index: View.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v
retrieving revision 1.282
retrieving revision 1.283
diff -C2 -d -r1.282 -r1.283
*** View.java 9 Sep 2008 12:15:03 -0000 1.282
--- View.java 10 Sep 2008 22:53:50 -0000 1.283
***************
*** 669,673 ****
pushName(gl, current);
gl.glColor3fv(SELECTED_COLOR, 0);
! drawClipplane(current);
popName(gl);
gl.glEnable(GL.GL_DEPTH_TEST);
--- 669,673 ----
pushName(gl, current);
gl.glColor3fv(SELECTED_COLOR, 0);
! Display.draw(current);
popName(gl);
gl.glEnable(GL.GL_DEPTH_TEST);
***************
*** 679,683 ****
}
pushName(gl, current);
! drawClipplane(current);
popName(gl);
}
--- 679,683 ----
}
pushName(gl, current);
! Display.draw(current);
popName(gl);
}
***************
*** 1263,1295 ****
/**
- * Draw a clippingPlane
- * @param clipplane The clipplane to draw
- */
- private void drawClipplane(ClippingPlane clipplane) {
- Collection<Vertex> corners = clipplane.getCorners();
- gl.glLineWidth(3.0f);
- gl.glBegin(GL.GL_LINE_LOOP);
- for (Vertex current : corners) {
- gl.glVertex3d(current.getX(),
- current.getY(),
- current.getZ());
- }
- gl.glEnd();
- if (clipplane.isActive()) {
- gl.glLineWidth(1.5f);
- Collection<Edge> lines = clipplane.getLines();
- for (Edge current : lines) {
- if (current.getStrippled()) {
- gl.glEnable(GL.GL_LINE_STIPPLE);
- drawEdge(current);
- gl.glDisable(GL.GL_LINE_STIPPLE);
- } else {
- drawEdge(current);
- }
- }
- }
- }
-
- /**
* FIXME edge-drawing
* Draw an Edge
--- 1263,1266 ----
|
