[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/view AbstractView.java,1.33,1.34

[rimestad <rim...@us...>]

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

Modified Files:
	AbstractView.java 
Log Message:
moved more to initializing of the view

Index: AbstractView.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/AbstractView.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** AbstractView.java	21 Sep 2005 09:43:23 -0000	1.33
--- AbstractView.java	21 Sep 2005 14:06:37 -0000	1.34
***************
*** 196,200 ****
      gl.glViewport(0, 0, (int)width, (int)height);
      ball = glu.gluNewQuadric();
!    
    }
  
--- 196,215 ----
      gl.glViewport(0, 0, (int)width, (int)height);
      ball = glu.gluNewQuadric();
! 
!     gl.glEnable(GL.GL_LIGHT0);
!     gl.glLightModeli(GL.GL_LIGHT_MODEL_TWO_SIDE, 1);
!     gl.glLightModeli(GL.GL_LIGHT_MODEL_LOCAL_VIEWER, 1);
!     gl.glLightfv(GL.GL_LIGHT0, GL.GL_AMBIENT, new float[] {0.3f, 0.3f, 0.3f, 1.0f});
!     gl.glLightfv(GL.GL_LIGHT0, GL.GL_DIFFUSE, new float[] {0.7f, 0.7f, 0.7f, 1.0f});
! 
!     gl.glEnable(GL.GL_LINE_SMOOTH);
!     gl.glEnable(GL.GL_POINT_SMOOTH);
!     //gl.glEnable(GL.GL_POLYGON_SMOOTH);
!     gl.glEnable(GL.GL_BLEND);
!     gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
!     //gl.glDepthMask(true);
! 
!     gl.glEnable(GL.GL_COLOR_MATERIAL);
!     gl.glColorMaterial(GL.GL_FRONT_AND_BACK, GL.GL_AMBIENT_AND_DIFFUSE);
    }
  
***************
*** 222,232 ****
      picking = 0;
  
-     gl.glEnable(GL.GL_LINE_SMOOTH);
-     gl.glEnable(GL.GL_POINT_SMOOTH);
-     //gl.glEnable(GL.GL_POLYGON_SMOOTH);
-     gl.glEnable(GL.GL_BLEND);
-     gl.glBlendFunc(GL.GL_SRC_ALPHA, GL.GL_ONE_MINUS_SRC_ALPHA);
-     //gl.glDepthMask(true);
- 
      // grid and coords are always completely lit
      gl.glDisable(GL.GL_DEPTH_TEST);
--- 237,240 ----
***************
*** 237,241 ****
      gl.glEnable(GL.GL_DEPTH_TEST);
      coords();
-     gl.glEnable(GL.GL_LIGHTING);
  
      // set up lighting for the model
--- 245,248 ----
***************
*** 243,255 ****
        //gl.glShadeModel(GL.GL_SMOOTH);
        gl.glEnable(GL.GL_LIGHTING);
-       gl.glEnable(GL.GL_LIGHT0);
-       gl.glEnable(GL.GL_COLOR_MATERIAL);
-       gl.glLightModeli(GL.GL_LIGHT_MODEL_TWO_SIDE, 1);
-       gl.glLightModeli(GL.GL_LIGHT_MODEL_LOCAL_VIEWER, 1);
-       gl.glColorMaterial(GL.GL_FRONT_AND_BACK, GL.GL_AMBIENT_AND_DIFFUSE);
-       gl.glLightfv(GL.GL_LIGHT0, GL.GL_AMBIENT, new float[] {0.3f, 0.3f, 0.3f, 1.0f});
-       gl.glLightfv(GL.GL_LIGHT0, GL.GL_DIFFUSE, new float[] {0.7f, 0.7f, 0.7f, 1.0f});
      } else {
-       gl.glDisable(GL.GL_COLOR_MATERIAL);
        gl.glDisable(GL.GL_LIGHTING);
      }
--- 250,254 ----
***************
*** 588,602 ****
    private void drawContour(Surface surface, GLUtesselator tess) {
      List vertices = surface.getVertices();
!     Vertex first = (Vertex) vertices.get(0);
!     Vertex last = (Vertex) vertices.get(vertices.size() - 1);
!     if (first == last) {
!       Iterator iter = vertices.iterator();
!       glu.gluTessBeginContour(tess);
!       while (iter.hasNext()) {
!         Vertex current = (Vertex) iter.next();
!         double[] coords = new double[] {current.getX(), current.getY(), current.getZ()};
!         glu.gluTessVertex(tess, coords, new Point(coords[0], coords[1], coords[2]));
        }
-       glu.gluTessEndContour(tess);
      }
    }
--- 587,603 ----
    private void drawContour(Surface surface, GLUtesselator tess) {
      List vertices = surface.getVertices();
!     if (vertices.size() > 0) {
!       Vertex first = (Vertex) vertices.get(0);
!       Vertex last = (Vertex) vertices.get(vertices.size() - 1);
!       if (first == last) {
!         Iterator iter = vertices.iterator();
!         glu.gluTessBeginContour(tess);
!         while (iter.hasNext()) {
!           Vertex current = (Vertex) iter.next();
!           double[] coords = new double[] {current.getX(), current.getY(), current.getZ()};
!           glu.gluTessVertex(tess, coords, new Point(coords[0], coords[1], coords[2]));
!         }
!         glu.gluTessEndContour(tess);
        }
      }
    }