[Jake2-commits] jake2/src/jake2/render/jogl Image.java,1.5,1.6 Warp.java,1.6,1.7 Light.java,1.6,1.7 Mesh.java,1.6,1.7

[Rene S. <sa...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/render/jogl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11556/src/jake2/render/jogl

Modified Files:
	Image.java Warp.java Light.java Mesh.java 
Log Message:
major refactoring in game, server and client package

Index: Light.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/jogl/Light.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Light.java	16 Jul 2004 10:11:35 -0000	1.6
--- Light.java	22 Sep 2004 19:22:16 -0000	1.7
***************
*** 6,27 ****
   */
  /*
! Copyright (C) 1997-2001 Id Software, Inc.
  
! This program is free software; you can redistribute it and/or
! modify it under the terms of the GNU General Public License
! as published by the Free Software Foundation; either version 2
! of the License, or (at your option) any later version.
  
! This program is distributed in the hope that it will be useful,
[...1456 lines suppressed...]
!                         break;
!                     case 'A':
!                     default:
!                         r = g = b = 0;
!                         a = 255 - a;
!                         break;
!                     }
!                     r &= 0xFF;
!                     g &= 0xFF;
!                     b &= 0xFF;
!                     a &= 0xFF;
!                     dest.put(destp++, (a << 24) | (b << 16) | (g << 8)
!                             | (r << 0));
!                 }
!             }
!         }
!     }
! 
! }
\ No newline at end of file

Index: Warp.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/jogl/Warp.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Warp.java	16 Jul 2004 10:11:35 -0000	1.6
--- Warp.java	22 Sep 2004 19:22:16 -0000	1.7
***************
*** 6,27 ****
   */
  /*
! Copyright (C) 1997-2001 Id Software, Inc.
  
! This program is free software; you can redistribute it and/or
! modify it under the terms of the GNU General Public License
! as published by the Free Software Foundation; either version 2
! of the License, or (at your option) any later version.
  
! This program is distributed in the hope that it will be useful,
[...1353 lines suppressed...]
!             }
! 
!             sky_images[i] = GL_FindImage(pathname, it_sky);
! 
!             if (sky_images[i] == null)
!                 sky_images[i] = r_notexture;
! 
!             if (gl_skymip.value != 0 || skyrotate != 0) { // take less memory
!                 gl_picmip.value--;
!                 sky_min = 1.0f / 256;
!                 sky_max = 255.0f / 256;
!             } else {
!                 sky_min = 1.0f / 512;
!                 sky_max = 511.0f / 512;
!             }
!         }
!     }
! 
! }
\ No newline at end of file

Index: Mesh.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/jogl/Mesh.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Mesh.java	16 Jul 2004 10:11:35 -0000	1.6
--- Mesh.java	22 Sep 2004 19:22:16 -0000	1.7
***************
*** 6,27 ****
   */
  /*
! Copyright (C) 1997-2001 Id Software, Inc.
  
! This program is free software; you can redistribute it and/or
! modify it under the terms of the GNU General Public License
! as published by the Free Software Foundation; either version 2
! of the License, or (at your option) any later version.
  
! This program is distributed in the hope that it will be useful,
[...1640 lines suppressed...]
!         if ((currententity.flags & Defines.RF_DEPTHHACK) != 0)
!             gl.glDepthRange(gldepthmin, gldepthmax);
! 
!         if (gl_shadows.value != 0.0f
!                 && (currententity.flags & (Defines.RF_TRANSLUCENT | Defines.RF_WEAPONMODEL)) == 0) {
!             gl.glPushMatrix();
!             R_RotateForEntity(e);
!             gl.glDisable(GL.GL_TEXTURE_2D);
!             gl.glEnable(GL.GL_BLEND);
!             gl.glColor4f(0, 0, 0, 0.5f);
!             GL_DrawAliasShadow(paliashdr, currententity.frame);
!             gl.glEnable(GL.GL_TEXTURE_2D);
!             gl.glDisable(GL.GL_BLEND);
!             gl.glPopMatrix();
!         }
!         gl.glColor4f(1, 1, 1, 1);
!     }
! 
! }
\ No newline at end of file

Index: Image.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/jogl/Image.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Image.java	16 Jul 2004 10:11:35 -0000	1.5
--- Image.java	22 Sep 2004 19:22:16 -0000	1.6
***************
*** 6,27 ****
   */
  /*
! Copyright (C) 1997-2001 Id Software, Inc.
  
! This program is free software; you can redistribute it and/or
! modify it under the terms of the GNU General Public License
! as published by the Free Software Foundation; either version 2
! of the License, or (at your option) any later version.
  
! This program is distributed in the hope that it will be useful,
[...3305 lines suppressed...]
!     /*
!      * =============== GL_ShutdownImages ===============
!      */
!     void GL_ShutdownImages() {
!         image_t image;
! 
!         for (int i = 0; i < numgltextures; i++) {
!             image = gltextures[i];
! 
!             if (image.registration_sequence == 0)
!                 continue; // free image_t slot
!             // free it
!             // TODO jogl bug
!             gl.glDeleteTextures(1, new int[] { image.texnum });
!             image.clear();
!         }
!     }
! 
! }
\ No newline at end of file