[Bprocessor-commit] gl/src/net/sourceforge/bprocessor/gl/view ViewXY.java,1.4,1.5 View3D.java,1.6,1.7 ViewXZ.java,1.4,1.5 ViewYZ.java,1.4,1.5

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

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

Modified Files:
	ViewXY.java View3D.java ViewXZ.java ViewYZ.java 
Log Message:
changed color use

Index: View3D.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/View3D.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** View3D.java	17 Aug 2005 11:03:22 -0000	1.6
--- View3D.java	25 Aug 2005 09:44:18 -0000	1.7
***************
*** 28,32 ****
  
    /** The rotation about the Y axis */
!   private static double rotationY = 130;
    
    /** 
--- 28,32 ----
  
    /** The rotation about the Y axis */
!   private static double rotationZ = 130;
    
    /** 
***************
*** 50,55 ****
      int[] viewport = new int[] {0, 0, (int)width, (int)height};
          
-     gl.glShadeModel(GL.GL_SMOOTH); //hacking linux
- 
      gl.glMatrixMode(GL.GL_PROJECTION);
      gl.glLoadIdentity();
--- 50,53 ----
***************
*** 61,79 ****
      if (aspect < 1.0) {
        // fovy, aspect, near, far (relative to camera position)
!       glu.gluPerspective(aspect * 60.0, 1.0, 0.5, 50.0 * getZoomFactor());
      } else {
!       glu.gluPerspective(60.0, aspect, 0.5, 50.0 * getZoomFactor());
      }
  
      gl.glMatrixMode(GL.GL_MODELVIEW);
      gl.glLoadIdentity();
!     glu.gluLookAt(0.0 + center[0], 
!                   25.0 * getZoomFactor() + center[1], 
!                   0.0 + center[2], 
                    center[0], center[1], center[2],
                    0.0, 0.0, 1.0);
!     gl.glMultMatrixd(viewTrans);
      gl.glRotated(rotationX, 1.0, 0.0, 0.0);
!     gl.glRotated(rotationY, 0.0, 0.0, 1.0);
    }
  
--- 59,78 ----
      if (aspect < 1.0) {
        // fovy, aspect, near, far (relative to camera position)
!       glu.gluPerspective(aspect * 60.0, 1.0, 2.0 / getZoomFactor(), 100.0 * getZoomFactor());
      } else {
!       glu.gluPerspective(60.0, aspect, 2.0 / getZoomFactor(), 100.0 * getZoomFactor());
      }
  
      gl.glMatrixMode(GL.GL_MODELVIEW);
      gl.glLoadIdentity();
! 
!     gl.glLightfv(GL.GL_LIGHT0, GL.GL_POSITION, new float[] {0.0f, 0.0f, 0.0f, 1.0f});
!     glu.gluLookAt(0.0 + center[0], 25.0 * getZoomFactor() + center[1], 0.0 + center[2], 
                    center[0], center[1], center[2],
                    0.0, 0.0, 1.0);
! 
!     //gl.glMultMatrixd(viewTrans);
      gl.glRotated(rotationX, 1.0, 0.0, 0.0);
!     gl.glRotated(rotationZ, 0.0, 0.0, 1.0);
    }
  
***************
*** 105,109 ****
     */
    public void translateRotationY(double change) {
!     rotationY -= change / width;
    }
  
--- 104,108 ----
     */
    public void translateRotationY(double change) {
!     rotationZ -= change / width;
    }
  
***************
*** 118,130 ****
        size /= aspect;  
      }
!     gl.glColor4dv(GRID_COLOR);
      gl.glBegin(GL.GL_LINES);
      for (int x = -(int)size; x <= (int)size; x++) {
!       gl.glVertex3d((double) x, -size, -0.001);
!       gl.glVertex3d((double) x, size, -0.001);
      }
      for (int y = -(int)size; y <= (int)size; y++) {
!       gl.glVertex3d(-size, (double) y, -0.001);
!       gl.glVertex3d(size, (double) y, -0.001);
      }
      gl.glEnd();  
--- 117,129 ----
        size /= aspect;  
      }
!     gl.glColor4fv(GRID_COLOR);
      gl.glBegin(GL.GL_LINES);
      for (int x = -(int)size; x <= (int)size; x++) {
!       gl.glVertex3d((double) x, -size, -0.01);
!       gl.glVertex3d((double) x, size, -0.01);
      }
      for (int y = -(int)size; y <= (int)size; y++) {
!       gl.glVertex3d(-size, (double) y, -0.01);
!       gl.glVertex3d(size, (double) y, -0.01);
      }
      gl.glEnd();  
***************
*** 136,146 ****
    protected void coords() {
      gl.glBegin(GL.GL_LINES);
!     gl.glColor3dv(X_AXIS_COLOR);
      gl.glVertex3d(0.0, 0.0, 0.0);
      gl.glVertex3d(10.0, 0.0, 0.0);
!     gl.glColor3dv(Y_AXIS_COLOR);
      gl.glVertex3d(0.0, 0.0, 0.0);
      gl.glVertex3d(0.0, 10.0, 0.0);
!     gl.glColor3dv(Z_AXIS_COLOR);
      gl.glVertex3d(0.0, 0.0, 0.0);
      gl.glVertex3d(0.0, 0.0, 10.0);
--- 135,145 ----
    protected void coords() {
      gl.glBegin(GL.GL_LINES);
!     gl.glColor3fv(X_AXIS_COLOR);
      gl.glVertex3d(0.0, 0.0, 0.0);
      gl.glVertex3d(10.0, 0.0, 0.0);
!     gl.glColor3fv(Y_AXIS_COLOR);
      gl.glVertex3d(0.0, 0.0, 0.0);
      gl.glVertex3d(0.0, 10.0, 0.0);
!     gl.glColor3fv(Z_AXIS_COLOR);
      gl.glVertex3d(0.0, 0.0, 0.0);
      gl.glVertex3d(0.0, 0.0, 10.0);

Index: ViewYZ.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/ViewYZ.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ViewYZ.java	23 Aug 2005 11:59:42 -0000	1.4
--- ViewYZ.java	25 Aug 2005 09:44:18 -0000	1.5
***************
*** 91,95 ****
        size = this.size * getZoomFactor() / aspect;  
      }
!     gl.glColor4dv(GRID_COLOR);
      gl.glBegin(GL.GL_LINES);
      for (int y = -(int)size; y <= size; y++) {
--- 91,95 ----
        size = this.size * getZoomFactor() / aspect;  
      }
!     gl.glColor4fv(GRID_COLOR);
      gl.glBegin(GL.GL_LINES);
      for (int y = -(int)size; y <= size; y++) {
***************
*** 109,116 ****
    protected void coords() {
      gl.glBegin(GL.GL_LINES);
!     gl.glColor3dv(Y_AXIS_COLOR);
      gl.glVertex3d(0.0, 0.0, 0.0);
      gl.glVertex3d(0.0, 10.0, 0.0);
!     gl.glColor3dv(Z_AXIS_COLOR);
      gl.glVertex3d(0.0, 0.0, 0.0);
      gl.glVertex3d(0.0, 0.0, 10.0);
--- 109,116 ----
    protected void coords() {
      gl.glBegin(GL.GL_LINES);
!     gl.glColor3fv(Y_AXIS_COLOR);
      gl.glVertex3d(0.0, 0.0, 0.0);
      gl.glVertex3d(0.0, 10.0, 0.0);
!     gl.glColor3fv(Z_AXIS_COLOR);
      gl.glVertex3d(0.0, 0.0, 0.0);
      gl.glVertex3d(0.0, 0.0, 10.0);

Index: ViewXY.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/ViewXY.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ViewXY.java	23 Aug 2005 11:59:07 -0000	1.4
--- ViewXY.java	25 Aug 2005 09:44:18 -0000	1.5
***************
*** 90,94 ****
        size = this.size * getZoomFactor() / aspect;  
      }
!     gl.glColor4dv(GRID_COLOR);
      gl.glBegin(GL.GL_LINES);
      for (int x = -(int)size; x <= (int)size; x++) {
--- 90,94 ----
        size = this.size * getZoomFactor() / aspect;  
      }
!     gl.glColor4fv(GRID_COLOR);
      gl.glBegin(GL.GL_LINES);
      for (int x = -(int)size; x <= (int)size; x++) {
***************
*** 108,115 ****
    protected void coords() {
      gl.glBegin(GL.GL_LINES);
!     gl.glColor3dv(X_AXIS_COLOR);
      gl.glVertex3d(0.0, 0.0, 0.0);
      gl.glVertex3d(10.0, 0.0, 0.0);
!     gl.glColor3dv(Y_AXIS_COLOR);
      gl.glVertex3d(0.0, 0.0, 0.0);
      gl.glVertex3d(0.0, 10.0, 0.0);
--- 108,115 ----
    protected void coords() {
      gl.glBegin(GL.GL_LINES);
!     gl.glColor3fv(X_AXIS_COLOR);
      gl.glVertex3d(0.0, 0.0, 0.0);
      gl.glVertex3d(10.0, 0.0, 0.0);
!     gl.glColor3fv(Y_AXIS_COLOR);
      gl.glVertex3d(0.0, 0.0, 0.0);
      gl.glVertex3d(0.0, 10.0, 0.0);

Index: ViewXZ.java
===================================================================
RCS file: /cvsroot/bprocessor/gl/src/net/sourceforge/bprocessor/gl/view/ViewXZ.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ViewXZ.java	23 Aug 2005 11:59:25 -0000	1.4
--- ViewXZ.java	25 Aug 2005 09:44:18 -0000	1.5
***************
*** 93,97 ****
        size = this.size * getZoomFactor() / aspect;  
      }
!     gl.glColor4dv(GRID_COLOR);
      gl.glBegin(GL.GL_LINES);
      for (int x = -(int)size; x <= (int)size; x++) {
--- 93,97 ----
        size = this.size * getZoomFactor() / aspect;  
      }
!     gl.glColor4fv(GRID_COLOR);
      gl.glBegin(GL.GL_LINES);
      for (int x = -(int)size; x <= (int)size; x++) {
***************
*** 111,118 ****
    protected void coords() {
      gl.glBegin(GL.GL_LINES);
!     gl.glColor3dv(X_AXIS_COLOR);
      gl.glVertex3d(0.0, 0.0, 0.0);
      gl.glVertex3d(10.0, 0.0, 0.0);
!     gl.glColor3dv(Z_AXIS_COLOR);
      gl.glVertex3d(0.0, 0.0, 0.0);
      gl.glVertex3d(0.0, 0.0, 10.0);
--- 111,118 ----
    protected void coords() {
      gl.glBegin(GL.GL_LINES);
!     gl.glColor3fv(X_AXIS_COLOR);
      gl.glVertex3d(0.0, 0.0, 0.0);
      gl.glVertex3d(10.0, 0.0, 0.0);
!     gl.glColor3fv(Z_AXIS_COLOR);
      gl.glVertex3d(0.0, 0.0, 0.0);
      gl.glVertex3d(0.0, 0.0, 10.0);