[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/view View.java, 1.179, 1.180

[Michael L. <he...@us...>]

Update of /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv28603/src/net/sourceforge/bprocessor/gl/view

Modified Files:
	View.java 
Log Message:
Elemenent-surfaces attach to the space-surfaces

Index: View.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View.java,v
retrieving revision 1.179
retrieving revision 1.180
diff -C2 -d -r1.179 -r1.180
*** View.java	30 Jan 2007 19:40:13 -0000	1.179
--- View.java	31 Jan 2007 09:18:27 -0000	1.180
***************
*** 571,575 ****
        edges.add(e3);
        Surface s = new Surface(edges);
!       drawSurface(s);
      }
    }
--- 571,575 ----
        edges.add(e3);
        Surface s = new Surface(edges);
!       drawSurface(s, false);
      }
    }
***************
*** 1218,1222 ****
        gl.glPolygonStipple(highlight, 0);
        Surface s = (Surface) o;
!       drawSurface(s);
        gl.glDisable(GL.GL_POLYGON_STIPPLE);
      } else if (o instanceof ClippingPlane) {
--- 1218,1222 ----
        gl.glPolygonStipple(highlight, 0);
        Surface s = (Surface) o;
!       drawSurface(s, false);
        gl.glDisable(GL.GL_POLYGON_STIPPLE);
      } else if (o instanceof ClippingPlane) {
***************
*** 1655,1659 ****
          if (side == BOTH) {
            if (visible) {
!             drawSurface(s);
            }
          } else {
--- 1655,1659 ----
          if (side == BOTH) {
            if (visible) {
!             drawSurface(s, false);
            }
          } else {
***************
*** 1680,1684 ****
              }
            }
!           drawSurface(s);
            if (!visible) {
              gl.glDisable(GL.GL_POLYGON_STIPPLE);
--- 1680,1684 ----
              }
            }
!           drawSurface(s, false);
            if (!visible) {
              gl.glDisable(GL.GL_POLYGON_STIPPLE);
***************
*** 1692,1697 ****
     * Draw a surface
     * @param s The surface to draw
     */
!   private void drawSurface(Surface s) {
      GLUtessellator tess = glu.gluNewTess();
      GLUtessellatorCallback cb = new Callback();
--- 1692,1698 ----
     * Draw a surface
     * @param s The surface to draw
+    * @param hit The hit-detection flag
     */
!   private void drawSurface(Surface s, boolean hit) {
      GLUtessellator tess = glu.gluNewTess();
      GLUtessellatorCallback cb = new Callback();
***************
*** 1724,1728 ****
        while (innerIt.hasNext()) {
          Surface surface = (Surface)innerIt.next();
!         drawContour(surface, tess);
        }
      }
--- 1725,1735 ----
        while (innerIt.hasNext()) {
          Surface surface = (Surface)innerIt.next();
!         if (hit) {
!           if (surface.getOwner() == s.getOwner()) {
!             drawContour(surface, tess);
!           }
!         } else {
!           drawContour(surface, tess);
!         }
        }
      }
***************
*** 2087,2091 ****
            transformTo(owner);
          }
!         drawSurface(s);
          popName(gl);
        }
--- 2094,2098 ----
            transformTo(owner);
          }
!         drawSurface(s, true);
          popName(gl);
        }
***************
*** 2169,2173 ****
                      Surface surface = system.surface(5);
                      pushName(gl, surface);
!                     drawSurface(surface);
                      popName(gl);
                    } else {
--- 2176,2180 ----
                      Surface surface = system.surface(5);
                      pushName(gl, surface);
!                     drawSurface(surface, true);
                      popName(gl);
                    } else {