jake2-commits — Jake2 cvs commits

[Jake2-commits] jake2/src/jake2/render/fastjogl Mesh.java,1.9,1.10 Model.java,1.10,1.11

[Carsten W. <ca...@us...>]

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

Modified Files:
	Mesh.java Model.java 
Log Message:
model frame animation is now stored in an int[];
an int value contains the x, y, z, lightnormal (8bit for each element)
this reduces the memory footprint massive and performs better


Index: Model.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/fastjogl/Model.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Model.java	7 May 2005 18:00:03 -0000	1.10
--- Model.java	7 May 2005 23:44:38 -0000	1.11
***************
*** 995,1001 ****
              poutframe[i] = new qfiles.daliasframe_t(buffer);
              // verts are all 8 bit, so no swapping needed
!             poutframe[i].verts = new qfiles.dtrivertx_t[pheader.num_xyz];
              for (int k = 0; k < pheader.num_xyz; k++) {
!                 poutframe[i].verts[k] = new qfiles.dtrivertx_t(buffer);
              }
          }
--- 995,1001 ----
              poutframe[i] = new qfiles.daliasframe_t(buffer);
              // verts are all 8 bit, so no swapping needed
!             poutframe[i].verts = new int[pheader.num_xyz];
              for (int k = 0; k < pheader.num_xyz; k++) {
!                 poutframe[i].verts[k] = buffer.getInt();
              }
          }

Index: Mesh.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/fastjogl/Mesh.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Mesh.java	7 May 2005 22:15:05 -0000	1.9
--- Mesh.java	7 May 2005 23:44:38 -0000	1.10
***************
*** 72,79 ****
      float[] shadedots = r_avertexnormal_dots[0];
  
!     void GL_LerpVerts(int nverts, qfiles.dtrivertx_t[] ov,
!             qfiles.dtrivertx_t[] verts, float[] move, float[] frontv,
              float[] backv) {
!         qfiles.dtrivertx_t ovv, vv;
          FloatBuffer lerp = vertexArrayBuf;
  
--- 72,78 ----
      float[] shadedots = r_avertexnormal_dots[0];
  
!     void GL_LerpVerts(int nverts, int[] ov, int[] v, float[] move, float[] frontv,
              float[] backv) {
!         int ovv, vv;
          FloatBuffer lerp = vertexArrayBuf;
  
***************
*** 83,111 ****
                  | Defines.RF_SHELL_DOUBLE | Defines.RF_SHELL_HALF_DAM)) != 0) {
              float[] normal;
!             int j = 0;
!             for (int i = 0; i < nverts; i++ /* , v++, ov++, lerp+=4 */
!             ) {
!                 normal = r_avertexnormals[verts[i].lightnormalindex()];
!                 ovv = ov[i];
!                 vv = verts[i];
! 
!                 lerp.put(j++, move[0] + ovv.v0() * backv[0] + vv.v0() * frontv[0]
!                         + normal[0] * Defines.POWERSUIT_SCALE);
!                 lerp.put(j++, move[1] + ovv.v1() * backv[1] + vv.v1() * frontv[1]
!                         + normal[1] * Defines.POWERSUIT_SCALE);
!                 lerp.put(j++, move[2] + ovv.v2() * backv[2] + vv.v2() * frontv[2]
!                         + normal[2] * Defines.POWERSUIT_SCALE);
!             }
          } else {
!             int j = 0;
!             for (int i = 0; i < nverts; i++ /* , v++, ov++, lerp+=4 */
!             ) {
!                 ovv = ov[i];
!                 vv = verts[i];
! 
!                 lerp.put(j++, move[0] + ovv.v0() * backv[0] + vv.v0() * frontv[0]);
!                 lerp.put(j++, move[1] + ovv.v1() * backv[1] + vv.v1() * frontv[1]);
!                 lerp.put(j++, move[2] + ovv.v2() * backv[2] + vv.v2() * frontv[2]);
!             }
          }
      }
--- 82,106 ----
                  | Defines.RF_SHELL_DOUBLE | Defines.RF_SHELL_HALF_DAM)) != 0) {
              float[] normal;
! 			int j = -1;
! 			for (int i=0 ; i < nverts; i++/* , v++, ov++, lerp+=4 */)
! 			{
! 				vv = v[i];
! 				normal = r_avertexnormals[(vv >>> 24 ) & 0xFF];
! 				ovv = ov[i];
! 				lerp.put(++j, move[0] + (ovv & 0xFF)* backv[0] + (vv & 0xFF) * frontv[0] + normal[0] * Defines.POWERSUIT_SCALE);
! 				lerp.put(++j, move[1] + ((ovv >>> 8) & 0xFF) * backv[1] + ((vv >>> 8) & 0xFF) * frontv[1] + normal[1] * Defines.POWERSUIT_SCALE);
! 				lerp.put(++j, move[2] + ((ovv >>> 16) & 0xFF) * backv[2] + ((vv >>> 16) & 0xFF) * frontv[2] + normal[2] * Defines.POWERSUIT_SCALE); 
! 			}
          } else {
! 			int j = -1;
! 			for (int i=0 ; i < nverts; i++ /* , v++, ov++, lerp+=4 */)
! 			{
! 				ovv = ov[i];
! 				vv = v[i];
! 				
! 				lerp.put(++j, move[0] + (ovv & 0xFF)* backv[0] + (vv & 0xFF)*frontv[0]);
! 				lerp.put(++j, move[1] + ((ovv >>> 8) & 0xFF)* backv[1] + ((vv >>> 8) & 0xFF)*frontv[1]);
! 				lerp.put(++j, move[2] + ((ovv >>> 16) & 0xFF)* backv[2] + ((vv >>> 16) & 0xFF)*frontv[2]);
! 			}
          }
      }
***************
*** 141,149 ****
          qfiles.daliasframe_t frame = paliashdr.aliasFrames[currententity.frame];
  
!         qfiles.dtrivertx_t[] verts = frame.verts;
  
          qfiles.daliasframe_t oldframe = paliashdr.aliasFrames[currententity.oldframe];
  
!         qfiles.dtrivertx_t[] ov = oldframe.verts;
  
          if ((currententity.flags & Defines.RF_TRANSLUCENT) != 0)
--- 136,144 ----
          qfiles.daliasframe_t frame = paliashdr.aliasFrames[currententity.frame];
  
!         int[] verts = frame.verts;
  
          qfiles.daliasframe_t oldframe = paliashdr.aliasFrames[currententity.oldframe];
  
!         int[] ov = oldframe.verts;
  
          if ((currententity.flags & Defines.RF_TRANSLUCENT) != 0)
***************
*** 206,210 ****
              float l;
              for (int i = 0; i < paliashdr.num_xyz; i++) {
!                 l = shadedots[verts[i].lightnormalindex()];
                  color.put(j++, l * shadelight[0]);
                  color.put(j++, l * shadelight[1]);
--- 201,205 ----
              float l;
              for (int i = 0; i < paliashdr.num_xyz; i++) {
!                 l = shadedots[(verts[i] >>> 24 ) & 0xFF];
                  color.put(j++, l * shadelight[0]);
                  color.put(j++, l * shadelight[1]);
***************
*** 271,275 ****
       */
      void GL_DrawAliasShadow(qfiles.dmdl_t paliashdr, int posenum) {
-         qfiles.dtrivertx_t[] verts;
          int[] order;
          float height, lheight;
--- 266,269 ----
***************
*** 281,286 ****
          frame = paliashdr.aliasFrames[currententity.frame];
  
-         verts = frame.verts;
- 
          height = 0;
  
--- 275,278 ----

[Jake2-commits] jake2/src/jake2/render/lwjgl Model.java,1.8,1.9 Mesh.java,1.6,1.7

[Carsten W. <ca...@us...>]

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

Modified Files:
	Model.java Mesh.java 
Log Message:
model frame animation is now stored in an int[];
an int value contains the x, y, z, lightnormal (8bit for each element)
this reduces the memory footprint massive and performs better


Index: Model.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/lwjgl/Model.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Model.java	7 May 2005 18:00:03 -0000	1.8
--- Model.java	7 May 2005 23:44:37 -0000	1.9
***************
*** 1070,1076 ****
  			poutframe[i] = new qfiles.daliasframe_t(buffer);
  			// verts are all 8 bit, so no swapping needed
! 			poutframe[i].verts = new qfiles.dtrivertx_t[pheader.num_xyz];
  			for (int k=0; k < pheader.num_xyz; k++) {
! 				poutframe[i].verts[k] = new qfiles.dtrivertx_t(buffer);	
  			}
  		}
--- 1070,1076 ----
  			poutframe[i] = new qfiles.daliasframe_t(buffer);
  			// verts are all 8 bit, so no swapping needed
! 			poutframe[i].verts = new int[pheader.num_xyz];
  			for (int k=0; k < pheader.num_xyz; k++) {
! 				poutframe[i].verts[k] = buffer.getInt();	
  			}
  		}

Index: Mesh.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/lwjgl/Mesh.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Mesh.java	7 May 2005 22:15:05 -0000	1.6
--- Mesh.java	7 May 2005 23:44:37 -0000	1.7
***************
*** 77,88 ****
  	 * @param backv
  	 */
! 	void GL_LerpVerts(int nverts, qfiles.dtrivertx_t[] ov, qfiles.dtrivertx_t[] verts, float[] move, float[] frontv, float[] backv )
  	{
  		FloatBuffer lerp = vertexArrayBuf;
  		lerp.limit((nverts << 2) - nverts); // nverts * 3
  
! 		qfiles.dtrivertx_t ovv, vv;
! 		
! 		//PMM -- added RF_SHELL_DOUBLE, RF_SHELL_HALF_DAM
  		if ( (currententity.flags & ( Defines.RF_SHELL_RED | Defines.RF_SHELL_GREEN | Defines.RF_SHELL_BLUE | Defines.RF_SHELL_DOUBLE | Defines.RF_SHELL_HALF_DAM)) != 0 )
  		{
--- 77,87 ----
  	 * @param backv
  	 */
! 	void GL_LerpVerts(int nverts, int[] ov, int[] v, float[] move, float[] frontv, float[] backv )
  	{
  		FloatBuffer lerp = vertexArrayBuf;
  		lerp.limit((nverts << 2) - nverts); // nverts * 3
  
! 		int ovv, vv;
! 			//PMM -- added RF_SHELL_DOUBLE, RF_SHELL_HALF_DAM
  		if ( (currententity.flags & ( Defines.RF_SHELL_RED | Defines.RF_SHELL_GREEN | Defines.RF_SHELL_BLUE | Defines.RF_SHELL_DOUBLE | Defines.RF_SHELL_HALF_DAM)) != 0 )
  		{
***************
*** 91,101 ****
  			for (int i=0 ; i < nverts; i++/* , v++, ov++, lerp+=4 */)
  			{
! 				normal = r_avertexnormals[verts[i].lightnormalindex()];
  				ovv = ov[i];
! 				vv = verts[i];
! 				
! 				lerp.put(++j, move[0] + ovv.v0() * backv[0] + vv.v0() * frontv[0] + normal[0] * Defines.POWERSUIT_SCALE);
! 				lerp.put(++j, move[1] + ovv.v1() * backv[1] + vv.v1() * frontv[1] + normal[1] * Defines.POWERSUIT_SCALE);
! 				lerp.put(++j, move[2] + ovv.v2() * backv[2] + vv.v2() * frontv[2] + normal[2] * Defines.POWERSUIT_SCALE); 
  			}
  		}
--- 90,99 ----
  			for (int i=0 ; i < nverts; i++/* , v++, ov++, lerp+=4 */)
  			{
! 				vv = v[i];
! 				normal = r_avertexnormals[(vv >>> 24 ) & 0xFF];
  				ovv = ov[i];
! 				lerp.put(++j, move[0] + (ovv & 0xFF)* backv[0] + (vv & 0xFF) * frontv[0] + normal[0] * Defines.POWERSUIT_SCALE);
! 				lerp.put(++j, move[1] + ((ovv >>> 8) & 0xFF) * backv[1] + ((vv >>> 8) & 0xFF) * frontv[1] + normal[1] * Defines.POWERSUIT_SCALE);
! 				lerp.put(++j, move[2] + ((ovv >>> 16) & 0xFF) * backv[2] + ((vv >>> 16) & 0xFF) * frontv[2] + normal[2] * Defines.POWERSUIT_SCALE); 
  			}
  		}
***************
*** 106,114 ****
  			{
  				ovv = ov[i];
! 				vv = verts[i];
  				
! 				lerp.put(++j, move[0] + ovv.v0()* backv[0] + vv.v0()*frontv[0]);
! 				lerp.put(++j, move[1] + ovv.v1()* backv[1] + vv.v1()*frontv[1]);
! 				lerp.put(++j, move[2] + ovv.v2()* backv[2] + vv.v2()*frontv[2]);
  			}
  		}
--- 104,112 ----
  			{
  				ovv = ov[i];
! 				vv = v[i];
  				
! 				lerp.put(++j, move[0] + (ovv & 0xFF)* backv[0] + (vv & 0xFF)*frontv[0]);
! 				lerp.put(++j, move[1] + ((ovv >>> 8) & 0xFF)* backv[1] + ((vv >>> 8) & 0xFF)*frontv[1]);
! 				lerp.put(++j, move[2] + ((ovv >>> 16) & 0xFF)* backv[2] + ((vv >>> 16) & 0xFF)*frontv[2]);
  			}
  		}
***************
*** 138,146 ****
  		qfiles.daliasframe_t frame = paliashdr.aliasFrames[currententity.frame];
  
! 		qfiles.dtrivertx_t[] verts = frame.verts;
  
  		qfiles.daliasframe_t oldframe = paliashdr.aliasFrames[currententity.oldframe];
  
! 		qfiles.dtrivertx_t[] ov = oldframe.verts;
  
  		float	alpha;
--- 136,144 ----
  		qfiles.daliasframe_t frame = paliashdr.aliasFrames[currententity.frame];
  
! 		int[] verts = frame.verts;
  
  		qfiles.daliasframe_t oldframe = paliashdr.aliasFrames[currententity.oldframe];
  
! 		int[] ov = oldframe.verts;
  
  		float	alpha;
***************
*** 199,203 ****
  			for (int i = 0; i < size; i++ )
  			{
! 				l = shadedots[verts[i].lightnormalindex()];
  				color.put(++j,  l * shadelight[0]);
  				color.put(++j, l * shadelight[1]);
--- 197,201 ----
  			for (int i = 0; i < size; i++ )
  			{
! 				l = shadedots[(verts[i] >>> 24) & 0xFF];
  				color.put(++j,  l * shadelight[0]);
  				color.put(++j, l * shadelight[1]);
***************
*** 265,269 ****
  		float lheight = currententity.origin[2] - lightspot[2];
  		qfiles.daliasframe_t frame = paliashdr.aliasFrames[currententity.frame];
- 		qfiles.dtrivertx_t[] verts = frame.verts;
  		int[] order = paliashdr.glCmds;
  		float height = -lheight + 1.0f;
--- 263,266 ----

[Jake2-commits] jake2/src/jake2/qcommon qfiles.java,1.5,1.6

[Carsten W. <ca...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/qcommon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31161/src/jake2/qcommon

Modified Files:
	qfiles.java 
Log Message:
dtriverts never used

Index: qfiles.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/qfiles.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** qfiles.java	7 May 2005 22:15:04 -0000	1.5
--- qfiles.java	7 May 2005 23:40:49 -0000	1.6
***************
*** 195,229 ****
  	}
  
- 	public static class dtrivertx_t {
- 		private byte v0; //  byte 0..255 scaled byte to fit in frame mins/maxs
- 		private byte v1;
- 		private byte v2;
- 		
- 		private byte lightnormalindex; // byte 0 .. 255;
- 		
- 		public dtrivertx_t(ByteBuffer b) {
- 			v0 = b.get(); // unsigned byte
- 			v1 = b.get(); // unsigned byte
- 			v2 = b.get(); // unsigned byte
- 			lightnormalindex = b.get(); // unsigned byte
- 		}
- 		
- 		public final int v0() {
- 		    return v0 & 0xFF;
- 		}
- 		
- 		public final int v1() {
- 		    return v1 & 0xFF;
- 		}
- 		
- 		public final int v2() {
- 		    return v2 & 0xFF;
- 		}
- 		
- 		public final int lightnormalindex() {
- 		    return lightnormalindex & 0xFF;
- 		}
- 	}
- 
  	public static final int DTRIVERTX_V0 =  0;
  	public static final int DTRIVERTX_V1 = 1;
--- 195,198 ----
***************
*** 236,240 ****
  		public float[] translate = {0, 0, 0};	// then add this
  		public String name; // frame name from grabbing (size 16)
! 		public dtrivertx_t[] verts;	// variable sized
  		
  		public daliasframe_t(ByteBuffer b) {
--- 205,209 ----
  		public float[] translate = {0, 0, 0};	// then add this
  		public String name; // frame name from grabbing (size 16)
! 		public int[] verts;	// variable sized
  		
  		public daliasframe_t(ByteBuffer b) {

[Jake2-commits] jake2/src/jake2/render/jogl Mesh.java,1.8,1.9

[Carsten W. <ca...@us...>]

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

Modified Files:
	Mesh.java 
Log Message:
this reduces the memory footprint massive;
you can now run city3 with 90MB heap

Index: Mesh.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/jogl/Mesh.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Mesh.java	8 Apr 2005 14:05:34 -0000	1.8
--- Mesh.java	7 May 2005 22:15:04 -0000	1.9
***************
*** 85,95 ****
              for (i = 0; i < nverts; i++ /* , v++, ov++, lerp+=4 */
              ) {
!                 normal = r_avertexnormals[verts[i].lightnormalindex];
  
!                 lerp[i][0] = move[0] + ov[i].v[0] * backv[0] + v[i].v[0]
                          * frontv[0] + normal[0] * Defines.POWERSUIT_SCALE;
!                 lerp[i][1] = move[1] + ov[i].v[1] * backv[1] + v[i].v[1]
                          * frontv[1] + normal[1] * Defines.POWERSUIT_SCALE;
!                 lerp[i][2] = move[2] + ov[i].v[2] * backv[2] + v[i].v[2]
                          * frontv[2] + normal[2] * Defines.POWERSUIT_SCALE;
              }
--- 85,95 ----
              for (i = 0; i < nverts; i++ /* , v++, ov++, lerp+=4 */
              ) {
!                 normal = r_avertexnormals[verts[i].lightnormalindex()];
  
!                 lerp[i][0] = move[0] + ov[i].v0() * backv[0] + v[i].v0()
                          * frontv[0] + normal[0] * Defines.POWERSUIT_SCALE;
!                 lerp[i][1] = move[1] + ov[i].v1() * backv[1] + v[i].v1()
                          * frontv[1] + normal[1] * Defines.POWERSUIT_SCALE;
!                 lerp[i][2] = move[2] + ov[i].v2() * backv[2] + v[i].v2()
                          * frontv[2] + normal[2] * Defines.POWERSUIT_SCALE;
              }
***************
*** 97,105 ****
              for (i = 0; i < nverts; i++ /* , v++, ov++, lerp+=4 */
              ) {
!                 lerp[i][0] = move[0] + ov[i].v[0] * backv[0] + v[i].v[0]
                          * frontv[0];
!                 lerp[i][1] = move[1] + ov[i].v[1] * backv[1] + v[i].v[1]
                          * frontv[1];
!                 lerp[i][2] = move[2] + ov[i].v[2] * backv[2] + v[i].v[2]
                          * frontv[2];
              }
--- 97,105 ----
              for (i = 0; i < nverts; i++ /* , v++, ov++, lerp+=4 */
              ) {
!                 lerp[i][0] = move[0] + ov[i].v0() * backv[0] + v[i].v0()
                          * frontv[0];
!                 lerp[i][1] = move[1] + ov[i].v1() * backv[1] + v[i].v1()
                          * frontv[1];
!                 lerp[i][2] = move[2] + ov[i].v2() * backv[2] + v[i].v2()
                          * frontv[2];
              }
***************
*** 112,117 ****
          int lerpIndex = 0;
  
!         int[] ovv;
!         int[] vv;
          FloatBuffer lerp = vertexArrayBuf;
  
--- 112,116 ----
          int lerpIndex = 0;
  
!         qfiles.dtrivertx_t ovv, vv;
          FloatBuffer lerp = vertexArrayBuf;
  
***************
*** 124,136 ****
              for (int i = 0; i < nverts; i++ /* , v++, ov++, lerp+=4 */
              ) {
!                 normal = r_avertexnormals[verts[i].lightnormalindex];
!                 ovv = ov[i].v;
!                 vv = v[i].v;
  
!                 lerp.put(j, move[0] + ovv[0] * backv[0] + vv[0] * frontv[0]
                          + normal[0] * Defines.POWERSUIT_SCALE);
!                 lerp.put(j + 1, move[1] + ovv[1] * backv[1] + vv[1] * frontv[1]
                          + normal[1] * Defines.POWERSUIT_SCALE);
!                 lerp.put(j + 2, move[2] + ovv[2] * backv[2] + vv[2] * frontv[2]
                          + normal[2] * Defines.POWERSUIT_SCALE);
                  j += 3;
--- 123,135 ----
              for (int i = 0; i < nverts; i++ /* , v++, ov++, lerp+=4 */
              ) {
!                 normal = r_avertexnormals[verts[i].lightnormalindex()];
!                 ovv = ov[i];
!                 vv = v[i];
  
!                 lerp.put(j, move[0] + ovv.v0() * backv[0] + vv.v0() * frontv[0]
                          + normal[0] * Defines.POWERSUIT_SCALE);
!                 lerp.put(j + 1, move[1] + ovv.v1() * backv[1] + vv.v1() * frontv[1]
                          + normal[1] * Defines.POWERSUIT_SCALE);
!                 lerp.put(j + 2, move[2] + ovv.v2() * backv[2] + vv.v2() * frontv[2]
                          + normal[2] * Defines.POWERSUIT_SCALE);
                  j += 3;
***************
*** 140,152 ****
              for (int i = 0; i < nverts; i++ /* , v++, ov++, lerp+=4 */
              ) {
!                 ovv = ov[i].v;
!                 vv = v[i].v;
  
!                 lerp.put(j, move[0] + ovv[0] * backv[0] + vv[0] * frontv[0]);
                  lerp
!                         .put(j + 1, move[1] + ovv[1] * backv[1] + vv[1]
                                  * frontv[1]);
                  lerp
!                         .put(j + 2, move[2] + ovv[2] * backv[2] + vv[2]
                                  * frontv[2]);
                  j += 3;
--- 139,151 ----
              for (int i = 0; i < nverts; i++ /* , v++, ov++, lerp+=4 */
              ) {
!                 ovv = ov[i];
!                 vv = v[i];
  
!                 lerp.put(j, move[0] + ovv.v0() * backv[0] + vv.v0() * frontv[0]);
                  lerp
!                         .put(j + 1, move[1] + ovv.v1() * backv[1] + vv.v1()
                                  * frontv[1]);
                  lerp
!                         .put(j + 2, move[2] + ovv.v2() * backv[2] + vv.v2()
                                  * frontv[2]);
                  j += 3;
***************
*** 259,263 ****
                  int j = 0;
                  for (i = 0; i < paliashdr.num_xyz; i++) {
!                     l = shadedots[verts[i].lightnormalindex];
                      color.put(j++, l * shadelight[0]);
                      color.put(j++, l * shadelight[1]);
--- 258,262 ----
                  int j = 0;
                  for (i = 0; i < paliashdr.num_xyz; i++) {
!                     l = shadedots[verts[i].lightnormalindex()];
                      color.put(j++, l * shadelight[0]);
                      color.put(j++, l * shadelight[1]);
***************
*** 359,363 ****
  
                          // normals and vertexes come from the frame list
!                         l = shadedots[verts[index_xyz].lightnormalindex];
  
                          gl.glColor4f(l * shadelight[0], l * shadelight[1], l
--- 358,362 ----
  
                          // normals and vertexes come from the frame list
!                         l = shadedots[verts[index_xyz].lightnormalindex()];
  
                          gl.glColor4f(l * shadelight[0], l * shadelight[1], l

[Jake2-commits] jake2/src/jake2/render/fastjogl Mesh.java,1.8,1.9

[Carsten W. <ca...@us...>]

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

Modified Files:
	Mesh.java 
Log Message:
this reduces the memory footprint massive;
you can now run city3 with 90MB heap

Index: Mesh.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/fastjogl/Mesh.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Mesh.java	22 Jan 2005 22:30:35 -0000	1.8
--- Mesh.java	7 May 2005 22:15:05 -0000	1.9
***************
*** 75,80 ****
              qfiles.dtrivertx_t[] verts, float[] move, float[] frontv,
              float[] backv) {
!         int[] ovv;
!         int[] vv;
          FloatBuffer lerp = vertexArrayBuf;
  
--- 75,79 ----
              qfiles.dtrivertx_t[] verts, float[] move, float[] frontv,
              float[] backv) {
!         qfiles.dtrivertx_t ovv, vv;
          FloatBuffer lerp = vertexArrayBuf;
  
***************
*** 87,99 ****
              for (int i = 0; i < nverts; i++ /* , v++, ov++, lerp+=4 */
              ) {
!                 normal = r_avertexnormals[verts[i].lightnormalindex];
!                 ovv = ov[i].v;
!                 vv = verts[i].v;
  
!                 lerp.put(j++, move[0] + ovv[0] * backv[0] + vv[0] * frontv[0]
                          + normal[0] * Defines.POWERSUIT_SCALE);
!                 lerp.put(j++, move[1] + ovv[1] * backv[1] + vv[1] * frontv[1]
                          + normal[1] * Defines.POWERSUIT_SCALE);
!                 lerp.put(j++, move[2] + ovv[2] * backv[2] + vv[2] * frontv[2]
                          + normal[2] * Defines.POWERSUIT_SCALE);
              }
--- 86,98 ----
              for (int i = 0; i < nverts; i++ /* , v++, ov++, lerp+=4 */
              ) {
!                 normal = r_avertexnormals[verts[i].lightnormalindex()];
!                 ovv = ov[i];
!                 vv = verts[i];
  
!                 lerp.put(j++, move[0] + ovv.v0() * backv[0] + vv.v0() * frontv[0]
                          + normal[0] * Defines.POWERSUIT_SCALE);
!                 lerp.put(j++, move[1] + ovv.v1() * backv[1] + vv.v1() * frontv[1]
                          + normal[1] * Defines.POWERSUIT_SCALE);
!                 lerp.put(j++, move[2] + ovv.v2() * backv[2] + vv.v2() * frontv[2]
                          + normal[2] * Defines.POWERSUIT_SCALE);
              }
***************
*** 102,111 ****
              for (int i = 0; i < nverts; i++ /* , v++, ov++, lerp+=4 */
              ) {
!                 ovv = ov[i].v;
!                 vv = verts[i].v;
  
!                 lerp.put(j++, move[0] + ovv[0] * backv[0] + vv[0] * frontv[0]);
!                 lerp.put(j++, move[1] + ovv[1] * backv[1] + vv[1] * frontv[1]);
!                 lerp.put(j++, move[2] + ovv[2] * backv[2] + vv[2] * frontv[2]);
              }
          }
--- 101,110 ----
              for (int i = 0; i < nverts; i++ /* , v++, ov++, lerp+=4 */
              ) {
!                 ovv = ov[i];
!                 vv = verts[i];
  
!                 lerp.put(j++, move[0] + ovv.v0() * backv[0] + vv.v0() * frontv[0]);
!                 lerp.put(j++, move[1] + ovv.v1() * backv[1] + vv.v1() * frontv[1]);
!                 lerp.put(j++, move[2] + ovv.v2() * backv[2] + vv.v2() * frontv[2]);
              }
          }
***************
*** 207,211 ****
              float l;
              for (int i = 0; i < paliashdr.num_xyz; i++) {
!                 l = shadedots[verts[i].lightnormalindex];
                  color.put(j++, l * shadelight[0]);
                  color.put(j++, l * shadelight[1]);
--- 206,210 ----
              float l;
              for (int i = 0; i < paliashdr.num_xyz; i++) {
!                 l = shadedots[verts[i].lightnormalindex()];
                  color.put(j++, l * shadelight[0]);
                  color.put(j++, l * shadelight[1]);

[Jake2-commits] jake2/src/jake2/render/lwjgl Mesh.java,1.5,1.6

[Carsten W. <ca...@us...>]

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

Modified Files:
	Mesh.java 
Log Message:
this reduces the memory footprint massive;
you can now run city3 with 90MB heap

Index: Mesh.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/lwjgl/Mesh.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Mesh.java	1 Feb 2005 16:55:07 -0000	1.5
--- Mesh.java	7 May 2005 22:15:05 -0000	1.6
***************
*** 79,87 ****
  	void GL_LerpVerts(int nverts, qfiles.dtrivertx_t[] ov, qfiles.dtrivertx_t[] verts, float[] move, float[] frontv, float[] backv )
  	{
- 		int[] ovv;
- 		int[] vv;
  		FloatBuffer lerp = vertexArrayBuf;
  		lerp.limit((nverts << 2) - nverts); // nverts * 3
  
  		//PMM -- added RF_SHELL_DOUBLE, RF_SHELL_HALF_DAM
  		if ( (currententity.flags & ( Defines.RF_SHELL_RED | Defines.RF_SHELL_GREEN | Defines.RF_SHELL_BLUE | Defines.RF_SHELL_DOUBLE | Defines.RF_SHELL_HALF_DAM)) != 0 )
--- 79,87 ----
  	void GL_LerpVerts(int nverts, qfiles.dtrivertx_t[] ov, qfiles.dtrivertx_t[] verts, float[] move, float[] frontv, float[] backv )
  	{
  		FloatBuffer lerp = vertexArrayBuf;
  		lerp.limit((nverts << 2) - nverts); // nverts * 3
  
+ 		qfiles.dtrivertx_t ovv, vv;
+ 		
  		//PMM -- added RF_SHELL_DOUBLE, RF_SHELL_HALF_DAM
  		if ( (currententity.flags & ( Defines.RF_SHELL_RED | Defines.RF_SHELL_GREEN | Defines.RF_SHELL_BLUE | Defines.RF_SHELL_DOUBLE | Defines.RF_SHELL_HALF_DAM)) != 0 )
***************
*** 91,101 ****
  			for (int i=0 ; i < nverts; i++/* , v++, ov++, lerp+=4 */)
  			{
! 				normal = r_avertexnormals[verts[i].lightnormalindex];
! 				ovv = ov[i].v;
! 				vv = verts[i].v;
  				
! 				lerp.put(++j, move[0] + ovv[0]*backv[0] + vv[0]*frontv[0] + normal[0] * Defines.POWERSUIT_SCALE);
! 				lerp.put(++j, move[1] + ovv[1]*backv[1] + vv[1]*frontv[1] + normal[1] * Defines.POWERSUIT_SCALE);
! 				lerp.put(++j, move[2] + ovv[2]*backv[2] + vv[2]*frontv[2] + normal[2] * Defines.POWERSUIT_SCALE); 
  			}
  		}
--- 91,101 ----
  			for (int i=0 ; i < nverts; i++/* , v++, ov++, lerp+=4 */)
  			{
! 				normal = r_avertexnormals[verts[i].lightnormalindex()];
! 				ovv = ov[i];
! 				vv = verts[i];
  				
! 				lerp.put(++j, move[0] + ovv.v0() * backv[0] + vv.v0() * frontv[0] + normal[0] * Defines.POWERSUIT_SCALE);
! 				lerp.put(++j, move[1] + ovv.v1() * backv[1] + vv.v1() * frontv[1] + normal[1] * Defines.POWERSUIT_SCALE);
! 				lerp.put(++j, move[2] + ovv.v2() * backv[2] + vv.v2() * frontv[2] + normal[2] * Defines.POWERSUIT_SCALE); 
  			}
  		}
***************
*** 105,114 ****
  			for (int i=0 ; i < nverts; i++ /* , v++, ov++, lerp+=4 */)
  			{
! 				ovv = ov[i].v;
! 				vv = verts[i].v;
  				
! 				lerp.put(++j, move[0] + ovv[0]*backv[0] + vv[0]*frontv[0]);
! 				lerp.put(++j, move[1] + ovv[1]*backv[1] + vv[1]*frontv[1]);
! 				lerp.put(++j, move[2] + ovv[2]*backv[2] + vv[2]*frontv[2]);
  			}
  		}
--- 105,114 ----
  			for (int i=0 ; i < nverts; i++ /* , v++, ov++, lerp+=4 */)
  			{
! 				ovv = ov[i];
! 				vv = verts[i];
  				
! 				lerp.put(++j, move[0] + ovv.v0()* backv[0] + vv.v0()*frontv[0]);
! 				lerp.put(++j, move[1] + ovv.v1()* backv[1] + vv.v1()*frontv[1]);
! 				lerp.put(++j, move[2] + ovv.v2()* backv[2] + vv.v2()*frontv[2]);
  			}
  		}
***************
*** 199,203 ****
  			for (int i = 0; i < size; i++ )
  			{
! 				l = shadedots[verts[i].lightnormalindex];
  				color.put(++j,  l * shadelight[0]);
  				color.put(++j, l * shadelight[1]);
--- 199,203 ----
  			for (int i = 0; i < size; i++ )
  			{
! 				l = shadedots[verts[i].lightnormalindex()];
  				color.put(++j,  l * shadelight[0]);
  				color.put(++j, l * shadelight[1]);

[Jake2-commits] jake2/src/jake2/qcommon qfiles.java,1.4,1.5

[Carsten W. <ca...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/qcommon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13283/src/jake2/qcommon

Modified Files:
	qfiles.java 
Log Message:
this reduces the memory footprint massive;
you can now run city3 with 90MB heap

Index: qfiles.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/qfiles.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** qfiles.java	9 Jul 2004 06:50:50 -0000	1.4
--- qfiles.java	7 May 2005 22:15:04 -0000	1.5
***************
*** 196,207 ****
  
  	public static class dtrivertx_t {
! 		public int v[] = { 0, 0, 0 }; //  byte 0..255 scaled byte to fit in frame mins/maxs
! 		public int lightnormalindex; // byte 0 .. 255;
  		
  		public dtrivertx_t(ByteBuffer b) {
! 			v[0] = b.get() & 0xff; // unsigned byte
! 			v[1] = b.get() & 0xff; // unsigned byte
! 			v[2] = b.get() & 0xff; // unsigned byte
! 			lightnormalindex = b.get() & 0xff; // unsigned byte
  		}
  	}
--- 196,226 ----
  
  	public static class dtrivertx_t {
! 		private byte v0; //  byte 0..255 scaled byte to fit in frame mins/maxs
! 		private byte v1;
! 		private byte v2;
! 		
! 		private byte lightnormalindex; // byte 0 .. 255;
  		
  		public dtrivertx_t(ByteBuffer b) {
! 			v0 = b.get(); // unsigned byte
! 			v1 = b.get(); // unsigned byte
! 			v2 = b.get(); // unsigned byte
! 			lightnormalindex = b.get(); // unsigned byte
! 		}
! 		
! 		public final int v0() {
! 		    return v0 & 0xFF;
! 		}
! 		
! 		public final int v1() {
! 		    return v1 & 0xFF;
! 		}
! 		
! 		public final int v2() {
! 		    return v2 & 0xFF;
! 		}
! 		
! 		public final int lightnormalindex() {
! 		    return lightnormalindex & 0xFF;
  		}
  	}

[Jake2-commits] jake2/src/jake2/render/lwjgl Misc.java,1.6,1.7

[Carsten W. <ca...@us...>]

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

Modified Files:
	Misc.java 
Log Message:
better string handling and error messages

Index: Misc.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/lwjgl/Misc.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Misc.java	6 May 2005 23:22:04 -0000	1.6
--- Misc.java	7 May 2005 19:49:38 -0000	1.7
***************
*** 30,39 ****
  import jake2.qcommon.FS;
  
! import java.io.File;
! import java.io.RandomAccessFile;
  import java.nio.FloatBuffer;
  import java.nio.MappedByteBuffer;
  import java.nio.channels.FileChannel;
  
  import org.lwjgl.BufferUtils;
  import org.lwjgl.opengl.*;
--- 30,40 ----
  import jake2.qcommon.FS;
  
! import java.io.*;
  import java.nio.FloatBuffer;
  import java.nio.MappedByteBuffer;
  import java.nio.channels.FileChannel;
  
+ import net.java.games.jogl.GL;
+ 
  import org.lwjgl.BufferUtils;
  import org.lwjgl.opengl.*;
***************
*** 123,137 ****
  	================== 
  	*/  
! 	void GL_ScreenShot_f() 
! 	{
! 	    FS.CreatePath(FS.Gamedir() + "/scrshot/jake00.tga");
! 	    File file = new File(FS.Gamedir() + "/scrshot/jake00.tga");
  	    // find a valid file name
! 	    int i = 0;
  	    while (file.exists() && i++ < 100) {
! 	        file = new File(FS.Gamedir() + "/scrshot/jake" + (i/10) + (i%10) + ".tga");
          }
  	    if (i == 100) {
! 		    VID.Printf(Defines.PRINT_ALL, "Couldn't create a new screenshot file\n");
  		    return;
  	    }
--- 124,140 ----
  	================== 
  	*/  
! 	void GL_ScreenShot_f() {
! 	    StringBuffer sb = new StringBuffer(FS.Gamedir() + "/scrshot/jake00.tga");
! 	    FS.CreatePath(sb.toString());
! 	    File file = new File(sb.toString());
  	    // find a valid file name
! 	    int i = 0; int offset = sb.length() - 6;
  	    while (file.exists() && i++ < 100) {
! 	        sb.setCharAt(offset, (char) ((i/10) + '0'));
! 	        sb.setCharAt(offset + 1, (char) ((i%10) + '0'));
! 	        file = new File(sb.toString());
          }
  	    if (i == 100) {
! 		    VID.Printf(Defines.PRINT_ALL, "Clean up your screenshots\n");
  		    return;
  	    }
***************
*** 160,169 ****
  	        // check the GL_VERSION to use the TARGA BGR order if possible
  	        // e.g.: 1.5.2 NVIDIA 66.29
! 	        int colorFormat = (gl_config.version_string.charAt(2) > '1') ? GL12.GL_BGR : GL11.GL_RGB;
! 	        // read the BGR/RGB values into the image buffer
! 	        gl.glReadPixels(0, 0, vid.width, vid.height, colorFormat,
! 	                GL11.GL_UNSIGNED_BYTE, image);
! 	        
! 	        if (colorFormat == GL11.GL_RGB) {
  		        // flip RGB to BGR
  		        byte tmp;
--- 163,172 ----
  	        // check the GL_VERSION to use the TARGA BGR order if possible
  	        // e.g.: 1.5.2 NVIDIA 66.29
! 	        if (gl_config.getOpenGLVersion() >= 1.2f) {
! 	            // read the BGR values into the image buffer
! 	            gl.glReadPixels(0, 0, vid.width, vid.height, GL12.GL_BGR, GL.GL_UNSIGNED_BYTE, image);
! 	        } else {
! 	            // read the RGB values into the image buffer
! 	            gl.glReadPixels(0, 0, vid.width, vid.height, GL11.GL_RGB, GL.GL_UNSIGNED_BYTE, image);
  		        // flip RGB to BGR
  		        byte tmp;
***************
*** 176,182 ****
  	        // close the file channel
  	        ch.close();
! 	    } catch (Exception e) {
! 	        // TODO Auto-generated catch block
! 	        e.printStackTrace();
  	    }
  
--- 179,184 ----
  	        // close the file channel
  	        ch.close();
! 	    } catch (IOException e) {
! 	        VID.Printf(Defines.PRINT_ALL, e.getMessage() + '\n');
  	    }
  

[Jake2-commits] jake2/src/jake2/render/jogl Misc.java,1.5,1.6

[Carsten W. <ca...@us...>]

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

Modified Files:
	Misc.java 
Log Message:
better string handling and error messages

Index: Misc.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/jogl/Misc.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Misc.java	6 May 2005 17:47:09 -0000	1.5
--- Misc.java	7 May 2005 19:49:37 -0000	1.6
***************
*** 31,36 ****
  import jake2.qcommon.xcommand_t;
  
! import java.io.File;
! import java.io.RandomAccessFile;
  import java.nio.ByteBuffer;
  import java.nio.MappedByteBuffer;
--- 31,35 ----
  import jake2.qcommon.xcommand_t;
  
! import java.io.*;
  import java.nio.ByteBuffer;
  import java.nio.MappedByteBuffer;
***************
*** 141,153 ****
  	
  	private void screenshot_f() {
! 	    FS.CreatePath(FS.Gamedir() + "/scrshot/jake00.tga");
! 	    File file = new File(FS.Gamedir() + "/scrshot/jake00.tga");
  	    // find a valid file name
! 	    int i = 0;
  	    while (file.exists() && i++ < 100) {
! 	        file = new File(FS.Gamedir() + "/scrshot/jake" + (i/10) + (i%10) + ".tga");
          }
  	    if (i == 100) {
! 		    VID.Printf(Defines.PRINT_ALL, "Couldn't create a new screenshot file\n");
  		    return;
  	    }
--- 140,155 ----
  	
  	private void screenshot_f() {
! 	    StringBuffer sb = new StringBuffer(FS.Gamedir() + "/scrshot/jake00.tga");
! 	    FS.CreatePath(sb.toString());
! 	    File file = new File(sb.toString());
  	    // find a valid file name
! 	    int i = 0; int offset = sb.length() - 6;
  	    while (file.exists() && i++ < 100) {
! 	        sb.setCharAt(offset, (char) ((i/10) + '0'));
! 	        sb.setCharAt(offset + 1, (char) ((i%10) + '0'));
! 	        file = new File(sb.toString());
          }
  	    if (i == 100) {
! 		    VID.Printf(Defines.PRINT_ALL, "Clean up your screenshots\n");
  		    return;
  	    }
***************
*** 178,187 ****
  	        // check the GL_VERSION to use the TARGA BGR order if possible
  	        // e.g.: 1.5.2 NVIDIA 66.29
! 	        int colorFormat = (gl_config.version_string.charAt(2) > '1') ? GL.GL_BGR : GL.GL_RGB;
! 	        // read the BGR/RGB values into the image buffer
! 	        gl.glReadPixels(0, 0, vid.width, vid.height, colorFormat,
! 	                GL.GL_UNSIGNED_BYTE, rgb);
! 	        
! 	        if (colorFormat == GL.GL_RGB) {
  		        // flip RGB to BGR
  		        byte tmp;
--- 180,189 ----
  	        // check the GL_VERSION to use the TARGA BGR order if possible
  	        // e.g.: 1.5.2 NVIDIA 66.29
! 	        if (gl_config.getOpenGLVersion() >= 1.2f) {
! 	            // read the BGR values into the image buffer
! 	            gl.glReadPixels(0, 0, vid.width, vid.height, GL.GL_BGR, GL.GL_UNSIGNED_BYTE, rgb);
! 	        } else {
! 	            // read the RGB values into the image buffer
! 	            gl.glReadPixels(0, 0, vid.width, vid.height, GL.GL_RGB, GL.GL_UNSIGNED_BYTE, rgb);
  		        // flip RGB to BGR
  		        byte tmp;
***************
*** 194,200 ****
  	        // close the file channel
  	        ch.close();
! 	    } catch (Exception e) {
! 	        // TODO Auto-generated catch block
! 	        e.printStackTrace();
  	    }
  
--- 196,201 ----
  	        // close the file channel
  	        ch.close();
! 	    } catch (IOException e) {
! 		    VID.Printf(Defines.PRINT_ALL, e.getMessage() + '\n');
  	    }
  

[Jake2-commits] jake2/src/jake2/render/fastjogl Misc.java,1.5,1.6

[Carsten W. <ca...@us...>]

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

Modified Files:
	Misc.java 
Log Message:
better string handling and error messages

Index: Misc.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/fastjogl/Misc.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Misc.java	6 May 2005 17:47:10 -0000	1.5
--- Misc.java	7 May 2005 19:49:37 -0000	1.6
***************
*** 31,36 ****
  import jake2.qcommon.xcommand_t;
  
! import java.io.File;
! import java.io.RandomAccessFile;
  import java.nio.ByteBuffer;
  import java.nio.MappedByteBuffer;
--- 31,35 ----
  import jake2.qcommon.xcommand_t;
  
! import java.io.*;
  import java.nio.ByteBuffer;
  import java.nio.MappedByteBuffer;
***************
*** 129,141 ****
  	
  	private void screenshot_f() {
! 	    FS.CreatePath(FS.Gamedir() + "/scrshot/jake00.tga");
! 	    File file = new File(FS.Gamedir() + "/scrshot/jake00.tga");
  	    // find a valid file name
! 	    int i = 0;
  	    while (file.exists() && i++ < 100) {
! 	        file = new File(FS.Gamedir() + "/scrshot/jake" + (i/10) + (i%10) + ".tga");
          }
  	    if (i == 100) {
! 		    VID.Printf(Defines.PRINT_ALL, "Couldn't create a new screenshot file\n");
  		    return;
  	    }
--- 128,143 ----
  	
  	private void screenshot_f() {
! 	    StringBuffer sb = new StringBuffer(FS.Gamedir() + "/scrshot/jake00.tga");
! 	    FS.CreatePath(sb.toString());
! 	    File file = new File(sb.toString());
  	    // find a valid file name
! 	    int i = 0; int offset = sb.length() - 6;
  	    while (file.exists() && i++ < 100) {
! 	        sb.setCharAt(offset, (char) ((i/10) + '0'));
! 	        sb.setCharAt(offset + 1, (char) ((i%10) + '0'));
! 	        file = new File(sb.toString());
          }
  	    if (i == 100) {
! 		    VID.Printf(Defines.PRINT_ALL, "Clean up your screenshots\n");
  		    return;
  	    }
***************
*** 166,175 ****
  	        // check the GL_VERSION to use the TARGA BGR order if possible
  	        // e.g.: 1.5.2 NVIDIA 66.29
! 	        int colorFormat = (gl_config.version_string.charAt(2) > '1') ? GL.GL_BGR : GL.GL_RGB;
! 	        // read the BGR/RGB values into the image buffer
! 	        gl.glReadPixels(0, 0, vid.width, vid.height, colorFormat,
! 	                GL.GL_UNSIGNED_BYTE, rgb);
! 	        
! 	        if (colorFormat == GL.GL_RGB) {
  		        // flip RGB to BGR
  		        byte tmp;
--- 168,177 ----
  	        // check the GL_VERSION to use the TARGA BGR order if possible
  	        // e.g.: 1.5.2 NVIDIA 66.29
! 	        if (gl_config.getOpenGLVersion() >= 1.2f) {
! 	            // read the BGR values into the image buffer
! 	            gl.glReadPixels(0, 0, vid.width, vid.height, GL.GL_BGR, GL.GL_UNSIGNED_BYTE, rgb);
! 	        } else {
! 	            // read the RGB values into the image buffer
! 	            gl.glReadPixels(0, 0, vid.width, vid.height, GL.GL_RGB, GL.GL_UNSIGNED_BYTE, rgb);
  		        // flip RGB to BGR
  		        byte tmp;
***************
*** 182,188 ****
  	        // close the file channel
  	        ch.close();
! 	    } catch (Exception e) {
! 	        // TODO Auto-generated catch block
! 	        e.printStackTrace();
  	    }
  
--- 184,189 ----
  	        // close the file channel
  	        ch.close();
! 	    } catch (IOException e) {
! 		    VID.Printf(Defines.PRINT_ALL, e.getMessage() + '\n');
  	    }
  

[Jake2-commits] jake2/src/jake2/render/fastjogl Main.java,1.7,1.8

[Carsten W. <ca...@us...>]

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

Modified Files:
	Main.java 
Log Message:
helper functions to get the OpenGL version as float value

Index: Main.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/fastjogl/Main.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Main.java	7 Apr 2005 15:25:49 -0000	1.7
--- Main.java	7 May 2005 18:23:26 -0000	1.8
***************
*** 1121,1124 ****
--- 1121,1126 ----
  		gl_config.extensions_string = gl.glGetString(GL.GL_EXTENSIONS);
  		VID.Printf(Defines.PRINT_ALL, "GL_EXTENSIONS: " + gl_config.extensions_string + '\n');
+ 		
+ 		gl_config.parseOpenGLVersion();
  
  		String renderer_buffer = gl_config.renderer_string.toLowerCase();

[Jake2-commits] jake2/src/jake2/render/jogl Main.java,1.7,1.8

[Carsten W. <ca...@us...>]

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

Modified Files:
	Main.java 
Log Message:
helper functions to get the OpenGL version as float value

Index: Main.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/jogl/Main.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Main.java	7 Apr 2005 15:25:49 -0000	1.7
--- Main.java	7 May 2005 18:23:26 -0000	1.8
***************
*** 1119,1122 ****
--- 1119,1124 ----
  		gl_config.extensions_string = gl.glGetString(GL.GL_EXTENSIONS);
  		VID.Printf(Defines.PRINT_ALL, "GL_EXTENSIONS: " + gl_config.extensions_string + '\n');
+ 		
+ 		gl_config.parseOpenGLVersion();
  
  		String renderer_buffer = gl_config.renderer_string.toLowerCase();

[Jake2-commits] jake2/src/jake2/render/lwjgl Main.java,1.6,1.7

[Carsten W. <ca...@us...>]

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

Modified Files:
	Main.java 
Log Message:
helper functions to get the OpenGL version as float value

Index: Main.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/lwjgl/Main.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Main.java	7 Apr 2005 15:25:49 -0000	1.6
--- Main.java	7 May 2005 18:23:25 -0000	1.7
***************
*** 1112,1115 ****
--- 1112,1117 ----
  		gl_config.extensions_string = gl.glGetString(GL11.GL_EXTENSIONS);
  		VID.Printf(Defines.PRINT_ALL, "GL_EXTENSIONS: " + gl_config.extensions_string + '\n');
+ 		
+ 		gl_config.parseOpenGLVersion();
  
  		String renderer_buffer = gl_config.renderer_string.toLowerCase();

[Jake2-commits] jake2/src/jake2/render glconfig_t.java,1.1.1.1,1.2

[Carsten W. <ca...@us...>]

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

Modified Files:
	glconfig_t.java 
Log Message:
helper functions to get the OpenGL version as float value

Index: glconfig_t.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/glconfig_t.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** glconfig_t.java	7 Jul 2004 19:59:34 -0000	1.1.1.1
--- glconfig_t.java	7 May 2005 18:23:26 -0000	1.2
***************
*** 25,29 ****
  
  public class glconfig_t {
! 
  	public int renderer;
  	public String renderer_string;
--- 25,29 ----
  
  public class glconfig_t {
!     
  	public int renderer;
  	public String renderer_string;
***************
*** 33,35 ****
--- 33,45 ----
  
  	public boolean allow_cds;
+ 	
+ 	private float version = 1.1f;
+ 
+ 	public void parseOpenGLVersion() {
+ 	    version = Float.parseFloat(version_string.substring(0, 3));
+ 	}
+ 	
+ 	public float getOpenGLVersion() {
+ 	    return version;
+ 	}
  }

[Jake2-commits] jake2/src/jake2/render/lwjgl Model.java,1.7,1.8

[Carsten W. <ca...@us...>]

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

Modified Files:
	Model.java 
Log Message:
modified loading of submodels and faces to get better cache hit rates
(little bit faster)

Index: Model.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/lwjgl/Model.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Model.java	8 Feb 2005 17:52:20 -0000	1.7
--- Model.java	7 May 2005 18:00:03 -0000	1.8
***************
*** 426,463 ****
  	=================
  	*/
! 	void Mod_LoadSubmodels(lump_t l)
! 	{
! 		qfiles.dmodel_t	in;
! 		mmodel_t[] out;
! 		int i, j, count;
! 
! 		if ((l.filelen % qfiles.dmodel_t.SIZE) != 0)
! 			Com.Error(Defines.ERR_DROP, "MOD_LoadBmodel: funny lump size in " + loadmodel.name);
! 
! 		count = l.filelen / qfiles.dmodel_t.SIZE;
! 		// out = Hunk_Alloc ( count*sizeof(*out));
! 		out = new mmodel_t[count];
! 
! 		loadmodel.submodels = out;
! 		loadmodel.numsubmodels = count;
! 
! 		ByteBuffer bb = ByteBuffer.wrap(mod_base, l.fileofs, l.filelen);
! 		bb.order(ByteOrder.LITTLE_ENDIAN);
! 
! 		for ( i=0 ; i<count ; i++)
! 		{
! 			in = new qfiles.dmodel_t(bb);
! 			out[i] = new mmodel_t();
! 			for (j=0 ; j<3 ; j++)
! 			{	// spread the mins / maxs by a pixel
! 				out[i].mins[j] = in.mins[j] - 1;
! 				out[i].maxs[j] = in.maxs[j] + 1;
! 				out[i].origin[j] = in.origin[j];
! 			}
! 			out[i].radius = RadiusFromBounds(out[i].mins, out[i].maxs);
! 			out[i].headnode = in.headnode;
! 			out[i].firstface = in.firstface;
! 			out[i].numfaces = in.numfaces;
! 		}
  	}
  
--- 426,467 ----
  	=================
  	*/
! 	void Mod_LoadSubmodels(lump_t l) {
! 	    
! 	    if ((l.filelen % qfiles.dmodel_t.SIZE) != 0)
! 	        Com.Error(Defines.ERR_DROP, "MOD_LoadBmodel: funny lump size in "
! 	                + loadmodel.name);
! 	    
! 	    int i, j;
! 	    
! 	    int count = l.filelen / qfiles.dmodel_t.SIZE;
! 	    // out = Hunk_Alloc ( count*sizeof(*out));
! 	    mmodel_t out;
! 	    mmodel_t[] outs = new mmodel_t[count];
! 	    for (i = 0; i < count; i++) {
! 	        outs[i] = new mmodel_t();
! 	    }
! 	    
! 	    loadmodel.submodels = outs;
! 	    loadmodel.numsubmodels = count;
! 	    
! 	    ByteBuffer bb = ByteBuffer.wrap(mod_base, l.fileofs, l.filelen);
! 	    bb.order(ByteOrder.LITTLE_ENDIAN);
! 	    
! 	    qfiles.dmodel_t in;
! 	    
! 	    for (i = 0; i < count; i++) {
! 	        in = new qfiles.dmodel_t(bb);
! 	        out = outs[i];
! 	        for (j = 0; j < 3; j++) { // spread the mins / maxs by a
! 	            // pixel
! 	            out.mins[j] = in.mins[j] - 1;
! 	            out.maxs[j] = in.maxs[j] + 1;
! 	            out.origin[j] = in.origin[j];
! 	        }
! 	        out.radius = RadiusFromBounds(out.mins, out.maxs);
! 	        out.headnode = in.headnode;
! 	        out.firstface = in.firstface;
! 	        out.numfaces = in.numfaces;
! 	    }
  	}
  
***************
*** 609,699 ****
  	=================
  	*/
! 	void Mod_LoadFaces (lump_t l)
! 	{
! 		qfiles.dface_t in;
! 		msurface_t[] out;
! 		int i, count, surfnum;
! 		int planenum, side;
! 		int ti;
! 
! 		if ((l.filelen % qfiles.dface_t.SIZE) != 0)
! 			Com.Error (Defines.ERR_DROP, "MOD_LoadBmodel: funny lump size in " + loadmodel.name);
! 
! 		count = l.filelen / qfiles.dface_t.SIZE;
! 		// out = Hunk_Alloc ( count*sizeof(*out));
! 		out = new msurface_t[count];
! 			
! 		loadmodel.surfaces = out;
! 		loadmodel.numsurfaces = count;
! 
! 		ByteBuffer bb = ByteBuffer.wrap(mod_base, l.fileofs, l.filelen);
! 		bb.order(ByteOrder.LITTLE_ENDIAN);
! 
! 		currentmodel = loadmodel;
! 
! 		GL_BeginBuildingLightmaps(loadmodel);
! 
! 		for ( surfnum=0 ; surfnum<count ; surfnum++)
! 		{
! 			in = new qfiles.dface_t(bb);
! 			out[surfnum] = new msurface_t();
! 			out[surfnum].firstedge = in.firstedge;
! 			out[surfnum].numedges = in.numedges;		
! 			out[surfnum].flags = 0;
! 			out[surfnum].polys = null;
! 
! 			planenum = in.planenum;
! 			side = in.side;
! 			if (side != 0)
! 				out[surfnum].flags |= Defines.SURF_PLANEBACK;			
! 
! 			out[surfnum].plane = loadmodel.planes[planenum];
! 
! 			ti = in.texinfo;
! 			if (ti < 0 || ti >= loadmodel.numtexinfo)
! 				Com.Error(Defines.ERR_DROP, "MOD_LoadBmodel: bad texinfo number");
! 
! 			out[surfnum].texinfo = loadmodel.texinfo[ti];
! 
! 			CalcSurfaceExtents(out[surfnum]);
! 				
! 			// lighting info
! 
! 			for (i=0 ; i<Defines.MAXLIGHTMAPS ; i++)
! 				out[surfnum].styles[i] = in.styles[i];
! 				
! 			i = in.lightofs;
! 			if (i == -1)
! 				out[surfnum].samples = null;
! 			else {
! 				ByteBuffer pointer = ByteBuffer.wrap(loadmodel.lightdata);
! 				pointer.position(i);
! 				pointer = pointer.slice();
! 				pointer.mark();	
! 				out[surfnum].samples = pointer; // subarray
! 			}
! 		
! 			// set the drawing flags
! 		
! 			if ((out[surfnum].texinfo.flags & Defines.SURF_WARP) != 0)
! 			{
! 				out[surfnum].flags |= Defines.SURF_DRAWTURB;
! 				for (i=0 ; i<2 ; i++)
! 				{
! 					out[surfnum].extents[i] = 16384;
! 					out[surfnum].texturemins[i] = -8192;
! 				}
! 				GL_SubdivideSurface(out[surfnum]);	// cut up polygon for warps
! 			}
! 
! 			// create lightmaps and polygons
! 			if ((out[surfnum].texinfo.flags & (Defines.SURF_SKY | Defines.SURF_TRANS33 | Defines.SURF_TRANS66 | Defines.SURF_WARP)) == 0)
! 				GL_CreateSurfaceLightmap(out[surfnum]);
! 
! 			if ((out[surfnum].texinfo.flags & Defines.SURF_WARP) == 0) 
! 				GL_BuildPolygonFromSurface(out[surfnum]);
! 
! 		}
! 		GL_EndBuildingLightmaps ();
  	}
  
--- 613,707 ----
  	=================
  	*/
! 	void Mod_LoadFaces(lump_t l) {
! 	    
! 	    int i, surfnum;
! 	    int planenum, side;
! 	    int ti;
! 	    
! 	    if ((l.filelen % qfiles.dface_t.SIZE) != 0)
! 	        Com.Error(Defines.ERR_DROP, "MOD_LoadBmodel: funny lump size in "
! 	                + loadmodel.name);
! 	    
! 	    int count = l.filelen / qfiles.dface_t.SIZE;
! 	    // out = Hunk_Alloc ( count*sizeof(*out));
! 	    msurface_t[] outs = new msurface_t[count];
! 	    for (i = 0; i < count; i++) {
! 	        outs[i] = new msurface_t();
! 	    }
! 	    
! 	    loadmodel.surfaces = outs;
! 	    loadmodel.numsurfaces = count;
! 	    
! 	    ByteBuffer bb = ByteBuffer.wrap(mod_base, l.fileofs, l.filelen);
! 	    bb.order(ByteOrder.LITTLE_ENDIAN);
! 	    
! 	    currentmodel = loadmodel;
! 	    
! 	    GL_BeginBuildingLightmaps(loadmodel);
! 	    
! 	    qfiles.dface_t in;
! 	    msurface_t out;
! 	    
! 	    for (surfnum = 0; surfnum < count; surfnum++) {
! 	        in = new qfiles.dface_t(bb);
! 	        out = outs[surfnum];
! 	        out.firstedge = in.firstedge;
! 	        out.numedges = in.numedges;
! 	        out.flags = 0;
! 	        out.polys = null;
! 	        
! 	        planenum = in.planenum;
! 	        side = in.side;
! 	        if (side != 0)
! 	            out.flags |= Defines.SURF_PLANEBACK;
! 	        
! 	        out.plane = loadmodel.planes[planenum];
! 	        
! 	        ti = in.texinfo;
! 	        if (ti < 0 || ti >= loadmodel.numtexinfo)
! 	            Com.Error(Defines.ERR_DROP,
! 	            "MOD_LoadBmodel: bad texinfo number");
! 	        
! 	        out.texinfo = loadmodel.texinfo[ti];
! 	        
! 	        CalcSurfaceExtents(out);
! 	        
! 	        // lighting info
! 	        
! 	        for (i = 0; i < Defines.MAXLIGHTMAPS; i++)
! 	            out.styles[i] = in.styles[i];
! 	        
! 	        i = in.lightofs;
! 	        if (i == -1)
! 	            out.samples = null;
! 	        else {
! 	            ByteBuffer pointer = ByteBuffer.wrap(loadmodel.lightdata);
! 	            pointer.position(i);
! 	            pointer = pointer.slice();
! 	            pointer.mark();
! 	            out.samples = pointer; // subarray
! 	        }
! 	        
! 	        // set the drawing flags
! 	        
! 	        if ((out.texinfo.flags & Defines.SURF_WARP) != 0) {
! 	            out.flags |= Defines.SURF_DRAWTURB;
! 	            for (i = 0; i < 2; i++) {
! 	                out.extents[i] = 16384;
! 	                out.texturemins[i] = -8192;
! 	            }
! 	            GL_SubdivideSurface(out); // cut up polygon for warps
! 	        }
! 	        
! 	        // create lightmaps and polygons
! 	        if ((out.texinfo.flags & (Defines.SURF_SKY | Defines.SURF_TRANS33
! 	                | Defines.SURF_TRANS66 | Defines.SURF_WARP)) == 0)
! 	            GL_CreateSurfaceLightmap(out);
! 	        
! 	        if ((out.texinfo.flags & Defines.SURF_WARP) == 0)
! 	            GL_BuildPolygonFromSurface(out);
! 	        
! 	    }
! 	    GL_EndBuildingLightmaps();
  	}
  

[Jake2-commits] jake2/src/jake2/render/fastjogl Model.java,1.9,1.10

[Carsten W. <ca...@us...>]

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

Modified Files:
	Model.java 
Log Message:
modified loading of submodels and faces to get better cache hit rates
(little bit faster)

Index: Model.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/fastjogl/Model.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Model.java	8 Feb 2005 17:50:04 -0000	1.9
--- Model.java	7 May 2005 18:00:03 -0000	1.10
***************
*** 383,416 ****
       */
      void Mod_LoadSubmodels(lump_t l) {
!         qfiles.dmodel_t in;
!         mmodel_t[] out;
!         int i, j, count;
! 
          if ((l.filelen % qfiles.dmodel_t.SIZE) != 0)
              Com.Error(Defines.ERR_DROP, "MOD_LoadBmodel: funny lump size in "
                      + loadmodel.name);
! 
!         count = l.filelen / qfiles.dmodel_t.SIZE;
          // out = Hunk_Alloc ( count*sizeof(*out));
!         out = new mmodel_t[count];
! 
!         loadmodel.submodels = out;
          loadmodel.numsubmodels = count;
! 
          ByteBuffer bb = ByteBuffer.wrap(mod_base, l.fileofs, l.filelen);
          bb.order(ByteOrder.LITTLE_ENDIAN);
! 
          for (i = 0; i < count; i++) {
              in = new qfiles.dmodel_t(bb);
!             out[i] = new mmodel_t();
!             for (j = 0; j < 3; j++) { // spread the mins / maxs by a pixel
!                 out[i].mins[j] = in.mins[j] - 1;
!                 out[i].maxs[j] = in.maxs[j] + 1;
!                 out[i].origin[j] = in.origin[j];
              }
!             out[i].radius = RadiusFromBounds(out[i].mins, out[i].maxs);
!             out[i].headnode = in.headnode;
!             out[i].firstface = in.firstface;
!             out[i].numfaces = in.numfaces;
          }
      }
--- 383,422 ----
       */
      void Mod_LoadSubmodels(lump_t l) {
!         
          if ((l.filelen % qfiles.dmodel_t.SIZE) != 0)
              Com.Error(Defines.ERR_DROP, "MOD_LoadBmodel: funny lump size in "
                      + loadmodel.name);
!         
!         int i, j;
!         
!         int count = l.filelen / qfiles.dmodel_t.SIZE;
          // out = Hunk_Alloc ( count*sizeof(*out));
!         mmodel_t out;
!         mmodel_t[] outs = new mmodel_t[count];
!         for (i = 0; i < count; i++) {
!             outs[i] = new mmodel_t();
!         }
!         
!         loadmodel.submodels = outs;
          loadmodel.numsubmodels = count;
!         
          ByteBuffer bb = ByteBuffer.wrap(mod_base, l.fileofs, l.filelen);
          bb.order(ByteOrder.LITTLE_ENDIAN);
!         
!         qfiles.dmodel_t in;
!         
          for (i = 0; i < count; i++) {
              in = new qfiles.dmodel_t(bb);
!             out = outs[i];
!             for (j = 0; j < 3; j++) { // spread the mins / maxs by a
!                 // pixel
!                 out.mins[j] = in.mins[j] - 1;
!                 out.maxs[j] = in.maxs[j] + 1;
!                 out.origin[j] = in.origin[j];
              }
!             out.radius = RadiusFromBounds(out.mins, out.maxs);
!             out.headnode = in.headnode;
!             out.firstface = in.firstface;
!             out.numfaces = in.numfaces;
          }
      }
***************
*** 549,639 ****
       * ================= Mod_LoadFaces =================
       */
!     void Mod_LoadFaces(lump_t l) {
!         qfiles.dface_t in;
!         msurface_t[] out;
!         int i, count, surfnum;
!         int planenum, side;
!         int ti;
! 
!         if ((l.filelen % qfiles.dface_t.SIZE) != 0)
!             Com.Error(Defines.ERR_DROP, "MOD_LoadBmodel: funny lump size in "
!                     + loadmodel.name);
! 
!         count = l.filelen / qfiles.dface_t.SIZE;
!         // out = Hunk_Alloc ( count*sizeof(*out));
!         out = new msurface_t[count];
! 
!         loadmodel.surfaces = out;
!         loadmodel.numsurfaces = count;
! 
!         ByteBuffer bb = ByteBuffer.wrap(mod_base, l.fileofs, l.filelen);
!         bb.order(ByteOrder.LITTLE_ENDIAN);
! 
!         currentmodel = loadmodel;
! 
!         GL_BeginBuildingLightmaps(loadmodel);
! 
!         for (surfnum = 0; surfnum < count; surfnum++) {
!             in = new qfiles.dface_t(bb);
!             out[surfnum] = new msurface_t();
!             out[surfnum].firstedge = in.firstedge;
!             out[surfnum].numedges = in.numedges;
!             out[surfnum].flags = 0;
!             out[surfnum].polys = null;
! 
!             planenum = in.planenum;
!             side = in.side;
!             if (side != 0)
!                 out[surfnum].flags |= Defines.SURF_PLANEBACK;
! 
!             out[surfnum].plane = loadmodel.planes[planenum];
! 
!             ti = in.texinfo;
!             if (ti < 0 || ti >= loadmodel.numtexinfo)
!                 Com.Error(Defines.ERR_DROP,
!                         "MOD_LoadBmodel: bad texinfo number");
! 
!             out[surfnum].texinfo = loadmodel.texinfo[ti];
! 
!             CalcSurfaceExtents(out[surfnum]);
! 
!             // lighting info
! 
!             for (i = 0; i < Defines.MAXLIGHTMAPS; i++)
!                 out[surfnum].styles[i] = in.styles[i];
! 
!             i = in.lightofs;
!             if (i == -1)
!                 out[surfnum].samples = null;
!             else {
!                 ByteBuffer pointer = ByteBuffer.wrap(loadmodel.lightdata);
!                 pointer.position(i);
!                 pointer = pointer.slice();
!                 pointer.mark();
!                 out[surfnum].samples = pointer; // subarray
!             }
! 
!             // set the drawing flags
! 
!             if ((out[surfnum].texinfo.flags & Defines.SURF_WARP) != 0) {
!                 out[surfnum].flags |= Defines.SURF_DRAWTURB;
!                 for (i = 0; i < 2; i++) {
!                     out[surfnum].extents[i] = 16384;
!                     out[surfnum].texturemins[i] = -8192;
!                 }
!                 GL_SubdivideSurface(out[surfnum]); // cut up polygon for warps
!             }
! 
!             // create lightmaps and polygons
!             if ((out[surfnum].texinfo.flags & (Defines.SURF_SKY
!                     | Defines.SURF_TRANS33 | Defines.SURF_TRANS66 | Defines.SURF_WARP)) == 0)
!                 GL_CreateSurfaceLightmap(out[surfnum]);
! 
!             if ((out[surfnum].texinfo.flags & Defines.SURF_WARP) == 0)
!                 GL_BuildPolygonFromSurface(out[surfnum]);
! 
!         }
!         GL_EndBuildingLightmaps();
!     }
  
      /*
--- 555,650 ----
       * ================= Mod_LoadFaces =================
       */
! 	void Mod_LoadFaces(lump_t l) {
! 	    
! 	    int i, surfnum;
! 	    int planenum, side;
! 	    int ti;
! 	    
! 	    if ((l.filelen % qfiles.dface_t.SIZE) != 0)
! 	        Com.Error(Defines.ERR_DROP, "MOD_LoadBmodel: funny lump size in "
! 	                + loadmodel.name);
! 	    
! 	    int count = l.filelen / qfiles.dface_t.SIZE;
! 	    // out = Hunk_Alloc ( count*sizeof(*out));
! 	    msurface_t[] outs = new msurface_t[count];
! 	    for (i = 0; i < count; i++) {
! 	        outs[i] = new msurface_t();
! 	    }
! 	    
! 	    loadmodel.surfaces = outs;
! 	    loadmodel.numsurfaces = count;
! 	    
! 	    ByteBuffer bb = ByteBuffer.wrap(mod_base, l.fileofs, l.filelen);
! 	    bb.order(ByteOrder.LITTLE_ENDIAN);
! 	    
! 	    currentmodel = loadmodel;
! 	    
! 	    GL_BeginBuildingLightmaps(loadmodel);
! 	    
! 	    qfiles.dface_t in;
! 	    msurface_t out;
! 	    
! 	    for (surfnum = 0; surfnum < count; surfnum++) {
! 	        in = new qfiles.dface_t(bb);
! 	        out = outs[surfnum];
! 	        out.firstedge = in.firstedge;
! 	        out.numedges = in.numedges;
! 	        out.flags = 0;
! 	        out.polys = null;
! 	        
! 	        planenum = in.planenum;
! 	        side = in.side;
! 	        if (side != 0)
! 	            out.flags |= Defines.SURF_PLANEBACK;
! 	        
! 	        out.plane = loadmodel.planes[planenum];
! 	        
! 	        ti = in.texinfo;
! 	        if (ti < 0 || ti >= loadmodel.numtexinfo)
! 	            Com.Error(Defines.ERR_DROP,
! 	            "MOD_LoadBmodel: bad texinfo number");
! 	        
! 	        out.texinfo = loadmodel.texinfo[ti];
! 	        
! 	        CalcSurfaceExtents(out);
! 	        
! 	        // lighting info
! 	        
! 	        for (i = 0; i < Defines.MAXLIGHTMAPS; i++)
! 	            out.styles[i] = in.styles[i];
! 	        
! 	        i = in.lightofs;
! 	        if (i == -1)
! 	            out.samples = null;
! 	        else {
! 	            ByteBuffer pointer = ByteBuffer.wrap(loadmodel.lightdata);
! 	            pointer.position(i);
! 	            pointer = pointer.slice();
! 	            pointer.mark();
! 	            out.samples = pointer; // subarray
! 	        }
! 	        
! 	        // set the drawing flags
! 	        
! 	        if ((out.texinfo.flags & Defines.SURF_WARP) != 0) {
! 	            out.flags |= Defines.SURF_DRAWTURB;
! 	            for (i = 0; i < 2; i++) {
! 	                out.extents[i] = 16384;
! 	                out.texturemins[i] = -8192;
! 	            }
! 	            GL_SubdivideSurface(out); // cut up polygon for warps
! 	        }
! 	        
! 	        // create lightmaps and polygons
! 	        if ((out.texinfo.flags & (Defines.SURF_SKY | Defines.SURF_TRANS33
! 	                | Defines.SURF_TRANS66 | Defines.SURF_WARP)) == 0)
! 	            GL_CreateSurfaceLightmap(out);
! 	        
! 	        if ((out.texinfo.flags & Defines.SURF_WARP) == 0)
! 	            GL_BuildPolygonFromSurface(out);
! 	        
! 	    }
! 	    GL_EndBuildingLightmaps();
! 	}
  
      /*

[Jake2-commits] jake2/src/jake2/render/lwjgl Image.java,1.2,1.3

[Carsten W. <ca...@us...>]

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

Modified Files:
	Image.java 
Log Message:
preconstruct a Throwable is faster; (is used in control flow)

Index: Image.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/lwjgl/Image.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Image.java	14 Dec 2004 12:56:59 -0000	1.2
--- Image.java	7 May 2005 17:31:37 -0000	1.3
***************
*** 30,38 ****
  import jake2.client.particle_t;
  import jake2.game.cvar_t;
! import jake2.qcommon.Com;
! import jake2.qcommon.Cvar;
! import jake2.qcommon.FS;
! import jake2.qcommon.longjmpException;
! import jake2.qcommon.qfiles;
  import jake2.render.image_t;
  import jake2.util.Lib;
--- 30,34 ----
  import jake2.client.particle_t;
  import jake2.game.cvar_t;
! import jake2.qcommon.*;
  import jake2.render.image_t;
  import jake2.util.Lib;
***************
*** 43,49 ****
  import java.awt.image.AffineTransformOp;
  import java.awt.image.BufferedImage;
! import java.nio.ByteBuffer;
! import java.nio.ByteOrder;
! import java.nio.IntBuffer;
  import java.util.Arrays;
  
--- 39,43 ----
  import java.awt.image.AffineTransformOp;
  import java.awt.image.BufferedImage;
! import java.nio.*;
  import java.util.Arrays;
  
***************
*** 526,529 ****
--- 520,526 ----
  		return pix;
  	}
+ 	
+ 	private Throwable gotoBreakOut = new Throwable();
+ 	private Throwable gotoDone = gotoBreakOut;
  
  	//	/*
***************
*** 658,662 ****
  									else
  										// goto label breakOut;
! 										throw new longjmpException();
  			
  									pixbuf = row * columns * 4;
--- 655,659 ----
  									else
  										// goto label breakOut;
! 										throw gotoBreakOut;
  			
  									pixbuf = row * columns * 4;
***************
*** 694,698 ****
  									else
  										// goto label breakOut;
! 										throw new longjmpException();
  			
  									pixbuf = row * columns * 4;
--- 691,695 ----
  									else
  										// goto label breakOut;
! 										throw gotoBreakOut;
  			
  									pixbuf = row * columns * 4;
***************
*** 701,705 ****
  						}
  					}
! 				} catch (longjmpException e){
  					// label breakOut:
  				}
--- 698,702 ----
  						}
  					}
! 				} catch (Throwable e){
  					// label breakOut:
  				}
***************
*** 1156,1160 ****
  					}
  					//goto done;
! 					throw new longjmpException();
  				}
  				//memcpy (scaled, data, width*height*4); were bytes
--- 1153,1157 ----
  					}
  					//goto done;
! 					throw gotoDone;
  				}
  				//memcpy (scaled, data, width*height*4); were bytes
***************
*** 1229,1234 ****
  			// label done:
  		}
! 		catch (longjmpException e) {
! 			; // replaces label done
  		}
  
--- 1226,1231 ----
  			// label done:
  		}
! 		catch (Throwable e) {
! 			// replaces label done
  		}
  

[Jake2-commits] jake2/src/jake2/render/lwjgl Light.java,1.3,1.4

[Carsten W. <ca...@us...>]

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

Modified Files:
	Light.java 
Log Message:
preconstruct a Throwable is faster; (is used in control flow)

Index: Light.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/lwjgl/Light.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Light.java	17 Jan 2005 17:37:02 -0000	1.3
--- Light.java	7 May 2005 17:21:42 -0000	1.4
***************
*** 29,39 ****
  import jake2.Globals;
  import jake2.client.dlight_t;
- import jake2.game.GameBase;
  import jake2.game.cplane_t;
  import jake2.qcommon.Com;
! import jake2.qcommon.longjmpException;
! import jake2.render.mnode_t;
! import jake2.render.msurface_t;
! import jake2.render.mtexinfo_t;
  import jake2.util.Math3D;
  import jake2.util.Vec3Cache;
--- 29,35 ----
  import jake2.Globals;
  import jake2.client.dlight_t;
  import jake2.game.cplane_t;
  import jake2.qcommon.Com;
! import jake2.render.*;
  import jake2.util.Math3D;
  import jake2.util.Vec3Cache;
***************
*** 472,475 ****
--- 468,473 ----
  		}
  	}
+ 	
+ 	private Throwable gotoStore = new Throwable();
  
  //	TODO sync with jogl renderer. hoz
***************
*** 514,518 ****
  
                  // goto store;
!                 throw new longjmpException();
              }
  
--- 512,516 ----
  
                  // goto store;
!                 throw gotoStore;
              }
  
***************
*** 615,619 ****
  
              // label store:
!         } catch (longjmpException store) {
          }
  
--- 613,617 ----
  
              // label store:
!         } catch (Throwable store) {
          }
  

[Jake2-commits] jake2/src/jake2/render/fastjogl Light.java,1.11,1.12

[Carsten W. <ca...@us...>]

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

Modified Files:
	Light.java 
Log Message:
preconstruct a Throwable is faster; (is used in control flow)

Index: Light.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/fastjogl/Light.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Light.java	16 Jan 2005 15:24:50 -0000	1.11
--- Light.java	7 May 2005 17:17:48 -0000	1.12
***************
*** 31,35 ****
  import jake2.game.cplane_t;
  import jake2.qcommon.Com;
- import jake2.qcommon.longjmpException;
  import jake2.render.*;
  import jake2.util.Math3D;
--- 31,34 ----
***************
*** 449,452 ****
--- 448,454 ----
      }
  
+     // replaces the goto jump
+     private Throwable gotoStore = new Throwable();
+ 
      /*
       * =============== R_BuildLightMap
***************
*** 490,494 ****
  
                  // goto store;
!                 throw new longjmpException();
              }
  
--- 492,496 ----
  
                  // goto store;
!                 throw gotoStore;
              }
  
***************
*** 591,595 ****
  
              // label store:
!         } catch (longjmpException store) {
          }
  
--- 593,597 ----
  
              // label store:
!         } catch (Throwable store) {
          }
  

[Jake2-commits] jake2/src/jake2/render/lwjgl Misc.java,1.5,1.6

[Carsten W. <ca...@us...>]

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

Modified Files:
	Misc.java 
Log Message:
organized imports

Index: Misc.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/lwjgl/Misc.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Misc.java	6 May 2005 17:47:10 -0000	1.5
--- Misc.java	6 May 2005 23:22:04 -0000	1.6
***************
*** 36,41 ****
  import java.nio.channels.FileChannel;
  
- import net.java.games.jogl.GL;
- 
  import org.lwjgl.BufferUtils;
  import org.lwjgl.opengl.*;
--- 36,39 ----

[Jake2-commits] jake2/src/jake2/render/fastjogl Misc.java,1.4,1.5

[Carsten W. <ca...@us...>]

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

Modified Files:
	Misc.java 
Log Message:
use the GL_BGR (OpenGL1.2) format if possible;
then RGB to BGR flip loop isn't used. (faster)


Index: Misc.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/fastjogl/Misc.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Misc.java	25 Apr 2005 09:23:14 -0000	1.4
--- Misc.java	6 May 2005 17:47:10 -0000	1.5
***************
*** 26,29 ****
--- 26,34 ----
  package jake2.render.fastjogl;
  
+ import jake2.Defines;
+ import jake2.client.VID;
+ import jake2.qcommon.FS;
+ import jake2.qcommon.xcommand_t;
+ 
  import java.io.File;
  import java.io.RandomAccessFile;
***************
*** 32,41 ****
  import java.nio.channels.FileChannel;
  
- import org.lwjgl.opengl.GL11;
- 
- import jake2.Defines;
- import jake2.client.VID;
- import jake2.qcommon.FS;
- import jake2.qcommon.xcommand_t;
  import net.java.games.jogl.GL;
  import net.java.games.jogl.WGL;
--- 37,40 ----
***************
*** 163,176 ****
  	        // jogl needs a sliced buffer
  	        ByteBuffer rgb = image.slice();
- 	        // read the RGB values into the image buffer
- 	        gl.glReadPixels(0, 0, vid.width, vid.height, GL11.GL_RGB,
- 	                GL11.GL_UNSIGNED_BYTE, rgb);
  	        
! 	        // flip RGB to BGR
! 	        byte tmp;
! 	        for (i = TGA_HEADER_SIZE; i < fileLength; i += 3) {
! 	            tmp = image.get(i);
! 	            image.put(i, image.get(i + 2));
! 	            image.put(i + 2, tmp);
  	        }
  	        // close the file channel
--- 162,182 ----
  	        // jogl needs a sliced buffer
  	        ByteBuffer rgb = image.slice();
  	        
! 	        // OpenGL 1.2+ supports the GL_BGR color format
! 	        // check the GL_VERSION to use the TARGA BGR order if possible
! 	        // e.g.: 1.5.2 NVIDIA 66.29
! 	        int colorFormat = (gl_config.version_string.charAt(2) > '1') ? GL.GL_BGR : GL.GL_RGB;
! 	        // read the BGR/RGB values into the image buffer
! 	        gl.glReadPixels(0, 0, vid.width, vid.height, colorFormat,
! 	                GL.GL_UNSIGNED_BYTE, rgb);
! 	        
! 	        if (colorFormat == GL.GL_RGB) {
! 		        // flip RGB to BGR
! 		        byte tmp;
! 		        for (i = TGA_HEADER_SIZE; i < fileLength; i += 3) {
! 		            tmp = image.get(i);
! 		            image.put(i, image.get(i + 2));
! 		            image.put(i + 2, tmp);
! 		        }
  	        }
  	        // close the file channel

[Jake2-commits] jake2/src/jake2/render/lwjgl Misc.java,1.4,1.5

[Carsten W. <ca...@us...>]

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

Modified Files:
	Misc.java 
Log Message:
use the GL_BGR (OpenGL1.2) format if possible;
then RGB to BGR flip loop isn't used. (faster)


Index: Misc.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/lwjgl/Misc.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Misc.java	25 Apr 2005 09:24:09 -0000	1.4
--- Misc.java	6 May 2005 17:47:10 -0000	1.5
***************
*** 36,43 ****
  import java.nio.channels.FileChannel;
  
  import org.lwjgl.BufferUtils;
! import org.lwjgl.opengl.EXTPointParameters;
! import org.lwjgl.opengl.EXTSharedTexturePalette;
! import org.lwjgl.opengl.GL11;
  
  /**
--- 36,43 ----
  import java.nio.channels.FileChannel;
  
+ import net.java.games.jogl.GL;
+ 
  import org.lwjgl.BufferUtils;
! import org.lwjgl.opengl.*;
  
  /**
***************
*** 159,172 ****
  	        image.position(TGA_HEADER_SIZE);
  	        
! 	        // read the RGB values into the image buffer
! 	        gl.glReadPixels(0, 0, vid.width, vid.height, GL11.GL_RGB,
  	                GL11.GL_UNSIGNED_BYTE, image);
  	        
! 	        // flip RGB to BGR
! 	        byte tmp;
! 	        for (i = TGA_HEADER_SIZE; i < fileLength; i += 3) {
! 	            tmp = image.get(i);
! 	            image.put(i, image.get(i + 2));
! 	            image.put(i + 2, tmp);
  	        }
  	        // close the file channel
--- 159,178 ----
  	        image.position(TGA_HEADER_SIZE);
  	        
! 	        // OpenGL 1.2+ supports the GL_BGR color format
! 	        // check the GL_VERSION to use the TARGA BGR order if possible
! 	        // e.g.: 1.5.2 NVIDIA 66.29
! 	        int colorFormat = (gl_config.version_string.charAt(2) > '1') ? GL12.GL_BGR : GL11.GL_RGB;
! 	        // read the BGR/RGB values into the image buffer
! 	        gl.glReadPixels(0, 0, vid.width, vid.height, colorFormat,
  	                GL11.GL_UNSIGNED_BYTE, image);
  	        
! 	        if (colorFormat == GL11.GL_RGB) {
! 		        // flip RGB to BGR
! 		        byte tmp;
! 		        for (i = TGA_HEADER_SIZE; i < fileLength; i += 3) {
! 		            tmp = image.get(i);
! 		            image.put(i, image.get(i + 2));
! 		            image.put(i + 2, tmp);
! 		        }
  	        }
  	        // close the file channel

[Jake2-commits] jake2/src/jake2/render/jogl Misc.java,1.4,1.5

[Carsten W. <ca...@us...>]

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

Modified Files:
	Misc.java 
Log Message:
use the GL_BGR (OpenGL1.2) format if possible;
then RGB to BGR flip loop isn't used. (faster)


Index: Misc.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/jogl/Misc.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Misc.java	25 Apr 2005 09:23:13 -0000	1.4
--- Misc.java	6 May 2005 17:47:09 -0000	1.5
***************
*** 26,29 ****
--- 26,34 ----
  package jake2.render.jogl;
  
+ import jake2.Defines;
+ import jake2.client.VID;
+ import jake2.qcommon.FS;
+ import jake2.qcommon.xcommand_t;
+ 
  import java.io.File;
  import java.io.RandomAccessFile;
***************
*** 32,41 ****
  import java.nio.channels.FileChannel;
  
- import org.lwjgl.opengl.GL11;
- 
- import jake2.Defines;
- import jake2.client.VID;
- import jake2.qcommon.FS;
- import jake2.qcommon.xcommand_t;
  import net.java.games.jogl.GL;
  import net.java.games.jogl.WGL;
--- 37,40 ----
***************
*** 175,188 ****
  	        // jogl needs a sliced buffer
  	        ByteBuffer rgb = image.slice();
! 	        // read the RGB values into the image buffer
! 	        gl.glReadPixels(0, 0, vid.width, vid.height, GL11.GL_RGB,
! 	                GL11.GL_UNSIGNED_BYTE, rgb);
  	        
! 	        // flip RGB to BGR
! 	        byte tmp;
! 	        for (i = TGA_HEADER_SIZE; i < fileLength; i += 3) {
! 	            tmp = image.get(i);
! 	            image.put(i, image.get(i + 2));
! 	            image.put(i + 2, tmp);
  	        }
  	        // close the file channel
--- 174,194 ----
  	        // jogl needs a sliced buffer
  	        ByteBuffer rgb = image.slice();
! 
! 	        // OpenGL 1.2+ supports the GL_BGR color format
! 	        // check the GL_VERSION to use the TARGA BGR order if possible
! 	        // e.g.: 1.5.2 NVIDIA 66.29
! 	        int colorFormat = (gl_config.version_string.charAt(2) > '1') ? GL.GL_BGR : GL.GL_RGB;
! 	        // read the BGR/RGB values into the image buffer
! 	        gl.glReadPixels(0, 0, vid.width, vid.height, colorFormat,
! 	                GL.GL_UNSIGNED_BYTE, rgb);
  	        
! 	        if (colorFormat == GL.GL_RGB) {
! 		        // flip RGB to BGR
! 		        byte tmp;
! 		        for (i = TGA_HEADER_SIZE; i < fileLength; i += 3) {
! 		            tmp = image.get(i);
! 		            image.put(i, image.get(i + 2));
! 		            image.put(i + 2, tmp);
! 		        }
  	        }
  	        // close the file channel

[Jake2-commits] jake2/webstart jake2_lwjgl.jnlp,1.5,1.6 jake2_jogl11.jnlp,1.6,1.7 jake2_jogl11ATI.jnlp,1.7,1.8 jake2.jnlp,1.7,1.8

[Carsten W. <ca...@us...>]

Update of /cvsroot/jake2/jake2/webstart
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27695/webstart

Modified Files:
	jake2_lwjgl.jnlp jake2_jogl11.jnlp jake2_jogl11ATI.jnlp 
	jake2.jnlp 
Log Message:
undo (level city3 needs more mem)

Index: jake2.jnlp
===================================================================
RCS file: /cvsroot/jake2/jake2/webstart/jake2.jnlp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** jake2.jnlp	27 Apr 2005 18:29:57 -0000	1.7
--- jake2.jnlp	27 Apr 2005 19:17:21 -0000	1.8
***************
*** 18,22 ****
  	
  	<resources>
! 		<j2se version="1.4+" max-heap-size="100M"/>
  		<jar href="http://jake2.sourceforge.net/lib/jake2.jar"/>
  		<jar href="http://jake2.sourceforge.net/lib/jogl.jar"/>
--- 18,22 ----
  	
  	<resources>
! 		<j2se version="1.4+" max-heap-size="128M"/>
  		<jar href="http://jake2.sourceforge.net/lib/jake2.jar"/>
  		<jar href="http://jake2.sourceforge.net/lib/jogl.jar"/>
***************
*** 25,29 ****
  	
  	<resources os="Linux">
! 		<j2se version="1.4+" max-heap-size="100M"/>
  		<jar href="http://jake2.sourceforge.net/lib/patch.jar"/>
  		<jar href="http://jake2.sourceforge.net/lib/linux/joal.jar"/>
--- 25,29 ----
  	
  	<resources os="Linux">
! 		<j2se version="1.4+" max-heap-size="128M"/>
  		<jar href="http://jake2.sourceforge.net/lib/patch.jar"/>
  		<jar href="http://jake2.sourceforge.net/lib/linux/joal.jar"/>
***************
*** 34,38 ****
  	
  	<resources os="Windows">
! 		<j2se version="1.4+" max-heap-size="100M"/>
  		<jar href="http://jake2.sourceforge.net/lib/windows/joal.jar"/>
  		<nativelib href="http://jake2.sourceforge.net/lib/windows/jogl-native.jar"/>
--- 34,38 ----
  	
  	<resources os="Windows">
! 		<j2se version="1.4+" max-heap-size="128M"/>
  		<jar href="http://jake2.sourceforge.net/lib/windows/joal.jar"/>
  		<nativelib href="http://jake2.sourceforge.net/lib/windows/jogl-native.jar"/>

Index: jake2_lwjgl.jnlp
===================================================================
RCS file: /cvsroot/jake2/jake2/webstart/jake2_lwjgl.jnlp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** jake2_lwjgl.jnlp	27 Apr 2005 18:29:57 -0000	1.5
--- jake2_lwjgl.jnlp	27 Apr 2005 19:17:21 -0000	1.6
***************
*** 18,22 ****
  	
  	<resources>
! 		<j2se version="1.4+" max-heap-size="100M"/>
  		<jar href="http://jake2.sourceforge.net/lib/jake2.jar"/>
  		<jar href="http://jake2.sourceforge.net/lib/lwjgl.jar"/>
--- 18,22 ----
  	
  	<resources>
! 		<j2se version="1.4+" max-heap-size="128M"/>
  		<jar href="http://jake2.sourceforge.net/lib/jake2.jar"/>
  		<jar href="http://jake2.sourceforge.net/lib/lwjgl.jar"/>
***************
*** 26,40 ****
  	
  	<resources os="Linux">
! 		<j2se version="1.4+" max-heap-size="100M"/>
  		<nativelib href="http://jake2.sourceforge.net/lib/linux/lwjgl-native.jar"/>
  	</resources>
  	
  	<resources os="Windows">
! 		<j2se version="1.4+" max-heap-size="100M"/>
  		<nativelib href="http://jake2.sourceforge.net/lib/windows/lwjgl-native.jar"/>
  	</resources>
  
  	<resources os="Mac OS X">
! 		<j2se version="1.4+" max-heap-size="100M"/>
  		<nativelib href="http://jake2.sourceforge.net/lib/osx/lwjgl-native.jar"/>	
  	</resources>
--- 26,40 ----
  	
  	<resources os="Linux">
! 		<j2se version="1.4+" max-heap-size="128M"/>
  		<nativelib href="http://jake2.sourceforge.net/lib/linux/lwjgl-native.jar"/>
  	</resources>
  	
  	<resources os="Windows">
! 		<j2se version="1.4+" max-heap-size="128M"/>
  		<nativelib href="http://jake2.sourceforge.net/lib/windows/lwjgl-native.jar"/>
  	</resources>
  
  	<resources os="Mac OS X">
! 		<j2se version="1.4+" max-heap-size="128M"/>
  		<nativelib href="http://jake2.sourceforge.net/lib/osx/lwjgl-native.jar"/>	
  	</resources>

Index: jake2_jogl11.jnlp
===================================================================
RCS file: /cvsroot/jake2/jake2/webstart/jake2_jogl11.jnlp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** jake2_jogl11.jnlp	27 Apr 2005 18:29:57 -0000	1.6
--- jake2_jogl11.jnlp	27 Apr 2005 19:17:21 -0000	1.7
***************
*** 18,22 ****
  	
  	<resources>
! 		<j2se version="1.4+" max-heap-size="100M"/>
  		<jar href="http://jake2.sourceforge.net/lib/jake2.jar"/>
  		<property name="sun.java2d.noddraw" value="true"/>
--- 18,22 ----
  	
  	<resources>
! 		<j2se version="1.4+" max-heap-size="128M"/>
  		<jar href="http://jake2.sourceforge.net/lib/jake2.jar"/>
  		<property name="sun.java2d.noddraw" value="true"/>
***************
*** 26,30 ****
  	
  	<resources os="Linux">
! 		<j2se version="1.4+" max-heap-size="100M"/>
  		<jar href="http://jake2.sourceforge.net/lib/patch.jar"/>
  		<jar href="http://jake2.sourceforge.net/lib/linux/joal.jar"/>
--- 26,30 ----
  	
  	<resources os="Linux">
! 		<j2se version="1.4+" max-heap-size="128M"/>
  		<jar href="http://jake2.sourceforge.net/lib/patch.jar"/>
  		<jar href="http://jake2.sourceforge.net/lib/linux/joal.jar"/>
***************
*** 34,38 ****
  	
  	<resources os="Windows">
! 		<j2se version="1.4+" max-heap-size="100M"/>
  		<jar href="http://jake2.sourceforge.net/lib/windows/joal.jar"/>
  		<nativelib href="http://jake2.sourceforge.net/lib/windows/joal-native.jar"/>
--- 34,38 ----
  	
  	<resources os="Windows">
! 		<j2se version="1.4+" max-heap-size="128M"/>
  		<jar href="http://jake2.sourceforge.net/lib/windows/joal.jar"/>
  		<nativelib href="http://jake2.sourceforge.net/lib/windows/joal-native.jar"/>
***************
*** 40,44 ****
  
  	<resources os="Mac OS X">
! 		<j2se version="1.4+" max-heap-size="100M"/>
  		<jar href="http://jake2.sourceforge.net/lib/osx/joal.jar"/>
  		<nativelib href="http://jake2.sourceforge.net/lib/osx/joal-native.jar"/>		
--- 40,44 ----
  
  	<resources os="Mac OS X">
! 		<j2se version="1.4+" max-heap-size="128M"/>
  		<jar href="http://jake2.sourceforge.net/lib/osx/joal.jar"/>
  		<nativelib href="http://jake2.sourceforge.net/lib/osx/joal-native.jar"/>		

Index: jake2_jogl11ATI.jnlp
===================================================================
RCS file: /cvsroot/jake2/jake2/webstart/jake2_jogl11ATI.jnlp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** jake2_jogl11ATI.jnlp	27 Apr 2005 18:29:57 -0000	1.7
--- jake2_jogl11ATI.jnlp	27 Apr 2005 19:17:21 -0000	1.8
***************
*** 18,22 ****
  	
  	<resources>
! 		<j2se version="1.4+" max-heap-size="100M"/>
  		<jar href="http://jake2.sourceforge.net/lib/jake2.jar"/>
  		<property name="sun.java2d.noddraw" value="true"/>
--- 18,22 ----
  	
  	<resources>
! 		<j2se version="1.4+" max-heap-size="128M"/>
  		<jar href="http://jake2.sourceforge.net/lib/jake2.jar"/>
  		<property name="sun.java2d.noddraw" value="true"/>
***************
*** 26,30 ****
  	
  	<resources os="Linux">
! 		<j2se version="1.4+" max-heap-size="100M"/>
  		<jar href="http://jake2.sourceforge.net/lib/patch.jar"/>
  		<jar href="http://jake2.sourceforge.net/lib/linux/joal.jar"/>
--- 26,30 ----
  	
  	<resources os="Linux">
! 		<j2se version="1.4+" max-heap-size="128M"/>
  		<jar href="http://jake2.sourceforge.net/lib/patch.jar"/>
  		<jar href="http://jake2.sourceforge.net/lib/linux/joal.jar"/>
***************
*** 34,38 ****
  	
  	<resources os="Windows">
! 		<j2se version="1.4+" max-heap-size="100M"/>
  		<jar href="http://jake2.sourceforge.net/lib/windows/joal.jar"/>
  		<nativelib href="http://jake2.sourceforge.net/lib/windows/joal-native.jar"/>
--- 34,38 ----
  	
  	<resources os="Windows">
! 		<j2se version="1.4+" max-heap-size="128M"/>
  		<jar href="http://jake2.sourceforge.net/lib/windows/joal.jar"/>
  		<nativelib href="http://jake2.sourceforge.net/lib/windows/joal-native.jar"/>
***************
*** 40,44 ****
  	
  	<resources os="Mac OS X">
! 		<j2se version="1.4+" max-heap-size="100M"/>
  		<jar href="http://jake2.sourceforge.net/lib/osx/joal.jar"/>
  		<nativelib href="http://jake2.sourceforge.net/lib/osx/joal-native.jar"/>		
--- 40,44 ----
  	
  	<resources os="Mac OS X">
! 		<j2se version="1.4+" max-heap-size="128M"/>
  		<jar href="http://jake2.sourceforge.net/lib/osx/joal.jar"/>
  		<nativelib href="http://jake2.sourceforge.net/lib/osx/joal-native.jar"/>		

[Jake2-commits] jake2/webstart jake2_lwjgl.jnlp,1.4,1.5 jake2_jogl11.jnlp,1.5,1.6 jake2_jogl11ATI.jnlp,1.6,1.7 jake2.jnlp,1.6,1.7

[Carsten W. <ca...@us...>]

Update of /cvsroot/jake2/jake2/webstart
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1447/webstart

Modified Files:
	jake2_lwjgl.jnlp jake2_jogl11.jnlp jake2_jogl11ATI.jnlp 
	jake2.jnlp 
Log Message:
reduced max heap size (100M)

Index: jake2.jnlp
===================================================================
RCS file: /cvsroot/jake2/jake2/webstart/jake2.jnlp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** jake2.jnlp	12 Jan 2005 09:16:15 -0000	1.6
--- jake2.jnlp	27 Apr 2005 18:29:57 -0000	1.7
***************
*** 18,22 ****
  	
  	<resources>
! 		<j2se version="1.4+" max-heap-size="128M"/>
  		<jar href="http://jake2.sourceforge.net/lib/jake2.jar"/>
  		<jar href="http://jake2.sourceforge.net/lib/jogl.jar"/>
--- 18,22 ----
  	
  	<resources>
! 		<j2se version="1.4+" max-heap-size="100M"/>
  		<jar href="http://jake2.sourceforge.net/lib/jake2.jar"/>
  		<jar href="http://jake2.sourceforge.net/lib/jogl.jar"/>
***************
*** 25,29 ****
  	
  	<resources os="Linux">
! 		<j2se version="1.4+" max-heap-size="128M"/>
  		<jar href="http://jake2.sourceforge.net/lib/patch.jar"/>
  		<jar href="http://jake2.sourceforge.net/lib/linux/joal.jar"/>
--- 25,29 ----
  	
  	<resources os="Linux">
! 		<j2se version="1.4+" max-heap-size="100M"/>
  		<jar href="http://jake2.sourceforge.net/lib/patch.jar"/>
  		<jar href="http://jake2.sourceforge.net/lib/linux/joal.jar"/>
***************
*** 34,38 ****
  	
  	<resources os="Windows">
! 		<j2se version="1.4+" max-heap-size="128M"/>
  		<jar href="http://jake2.sourceforge.net/lib/windows/joal.jar"/>
  		<nativelib href="http://jake2.sourceforge.net/lib/windows/jogl-native.jar"/>
--- 34,38 ----
  	
  	<resources os="Windows">
! 		<j2se version="1.4+" max-heap-size="100M"/>
  		<jar href="http://jake2.sourceforge.net/lib/windows/joal.jar"/>
  		<nativelib href="http://jake2.sourceforge.net/lib/windows/jogl-native.jar"/>

Index: jake2_lwjgl.jnlp
===================================================================
RCS file: /cvsroot/jake2/jake2/webstart/jake2_lwjgl.jnlp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** jake2_lwjgl.jnlp	20 Feb 2005 13:42:08 -0000	1.4
--- jake2_lwjgl.jnlp	27 Apr 2005 18:29:57 -0000	1.5
***************
*** 18,22 ****
  	
  	<resources>
! 		<j2se version="1.4+" max-heap-size="128M"/>
  		<jar href="http://jake2.sourceforge.net/lib/jake2.jar"/>
  		<jar href="http://jake2.sourceforge.net/lib/lwjgl.jar"/>
--- 18,22 ----
  	
  	<resources>
! 		<j2se version="1.4+" max-heap-size="100M"/>
  		<jar href="http://jake2.sourceforge.net/lib/jake2.jar"/>
  		<jar href="http://jake2.sourceforge.net/lib/lwjgl.jar"/>
***************
*** 26,40 ****
  	
  	<resources os="Linux">
! 		<j2se version="1.4+" max-heap-size="128M"/>
  		<nativelib href="http://jake2.sourceforge.net/lib/linux/lwjgl-native.jar"/>
  	</resources>
  	
  	<resources os="Windows">
! 		<j2se version="1.4+" max-heap-size="128M"/>
  		<nativelib href="http://jake2.sourceforge.net/lib/windows/lwjgl-native.jar"/>
  	</resources>
  
  	<resources os="Mac OS X">
! 		<j2se version="1.4+" max-heap-size="128M"/>
  		<nativelib href="http://jake2.sourceforge.net/lib/osx/lwjgl-native.jar"/>	
  	</resources>
--- 26,40 ----
  	
  	<resources os="Linux">
! 		<j2se version="1.4+" max-heap-size="100M"/>
  		<nativelib href="http://jake2.sourceforge.net/lib/linux/lwjgl-native.jar"/>
  	</resources>
  	
  	<resources os="Windows">
! 		<j2se version="1.4+" max-heap-size="100M"/>
  		<nativelib href="http://jake2.sourceforge.net/lib/windows/lwjgl-native.jar"/>
  	</resources>
  
  	<resources os="Mac OS X">
! 		<j2se version="1.4+" max-heap-size="100M"/>
  		<nativelib href="http://jake2.sourceforge.net/lib/osx/lwjgl-native.jar"/>	
  	</resources>

Index: jake2_jogl11.jnlp
===================================================================
RCS file: /cvsroot/jake2/jake2/webstart/jake2_jogl11.jnlp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** jake2_jogl11.jnlp	12 Jan 2005 09:16:15 -0000	1.5
--- jake2_jogl11.jnlp	27 Apr 2005 18:29:57 -0000	1.6
***************
*** 18,22 ****
  	
  	<resources>
! 		<j2se version="1.4+" max-heap-size="128M"/>
  		<jar href="http://jake2.sourceforge.net/lib/jake2.jar"/>
  		<property name="sun.java2d.noddraw" value="true"/>
--- 18,22 ----
  	
  	<resources>
! 		<j2se version="1.4+" max-heap-size="100M"/>
  		<jar href="http://jake2.sourceforge.net/lib/jake2.jar"/>
  		<property name="sun.java2d.noddraw" value="true"/>
***************
*** 26,30 ****
  	
  	<resources os="Linux">
! 		<j2se version="1.4+" max-heap-size="128M"/>
  		<jar href="http://jake2.sourceforge.net/lib/patch.jar"/>
  		<jar href="http://jake2.sourceforge.net/lib/linux/joal.jar"/>
--- 26,30 ----
  	
  	<resources os="Linux">
! 		<j2se version="1.4+" max-heap-size="100M"/>
  		<jar href="http://jake2.sourceforge.net/lib/patch.jar"/>
  		<jar href="http://jake2.sourceforge.net/lib/linux/joal.jar"/>
***************
*** 34,38 ****
  	
  	<resources os="Windows">
! 		<j2se version="1.4+" max-heap-size="128M"/>
  		<jar href="http://jake2.sourceforge.net/lib/windows/joal.jar"/>
  		<nativelib href="http://jake2.sourceforge.net/lib/windows/joal-native.jar"/>
--- 34,38 ----
  	
  	<resources os="Windows">
! 		<j2se version="1.4+" max-heap-size="100M"/>
  		<jar href="http://jake2.sourceforge.net/lib/windows/joal.jar"/>
  		<nativelib href="http://jake2.sourceforge.net/lib/windows/joal-native.jar"/>
***************
*** 40,44 ****
  
  	<resources os="Mac OS X">
! 		<j2se version="1.4+" max-heap-size="128M"/>
  		<jar href="http://jake2.sourceforge.net/lib/osx/joal.jar"/>
  		<nativelib href="http://jake2.sourceforge.net/lib/osx/joal-native.jar"/>		
--- 40,44 ----
  
  	<resources os="Mac OS X">
! 		<j2se version="1.4+" max-heap-size="100M"/>
  		<jar href="http://jake2.sourceforge.net/lib/osx/joal.jar"/>
  		<nativelib href="http://jake2.sourceforge.net/lib/osx/joal-native.jar"/>		

Index: jake2_jogl11ATI.jnlp
===================================================================
RCS file: /cvsroot/jake2/jake2/webstart/jake2_jogl11ATI.jnlp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** jake2_jogl11ATI.jnlp	12 Jan 2005 09:16:15 -0000	1.6
--- jake2_jogl11ATI.jnlp	27 Apr 2005 18:29:57 -0000	1.7
***************
*** 18,22 ****
  	
  	<resources>
! 		<j2se version="1.4+" max-heap-size="128M"/>
  		<jar href="http://jake2.sourceforge.net/lib/jake2.jar"/>
  		<property name="sun.java2d.noddraw" value="true"/>
--- 18,22 ----
  	
  	<resources>
! 		<j2se version="1.4+" max-heap-size="100M"/>
  		<jar href="http://jake2.sourceforge.net/lib/jake2.jar"/>
  		<property name="sun.java2d.noddraw" value="true"/>
***************
*** 26,30 ****
  	
  	<resources os="Linux">
! 		<j2se version="1.4+" max-heap-size="128M"/>
  		<jar href="http://jake2.sourceforge.net/lib/patch.jar"/>
  		<jar href="http://jake2.sourceforge.net/lib/linux/joal.jar"/>
--- 26,30 ----
  	
  	<resources os="Linux">
! 		<j2se version="1.4+" max-heap-size="100M"/>
  		<jar href="http://jake2.sourceforge.net/lib/patch.jar"/>
  		<jar href="http://jake2.sourceforge.net/lib/linux/joal.jar"/>
***************
*** 34,38 ****
  	
  	<resources os="Windows">
! 		<j2se version="1.4+" max-heap-size="128M"/>
  		<jar href="http://jake2.sourceforge.net/lib/windows/joal.jar"/>
  		<nativelib href="http://jake2.sourceforge.net/lib/windows/joal-native.jar"/>
--- 34,38 ----
  	
  	<resources os="Windows">
! 		<j2se version="1.4+" max-heap-size="100M"/>
  		<jar href="http://jake2.sourceforge.net/lib/windows/joal.jar"/>
  		<nativelib href="http://jake2.sourceforge.net/lib/windows/joal-native.jar"/>
***************
*** 40,44 ****
  	
  	<resources os="Mac OS X">
! 		<j2se version="1.4+" max-heap-size="128M"/>
  		<jar href="http://jake2.sourceforge.net/lib/osx/joal.jar"/>
  		<nativelib href="http://jake2.sourceforge.net/lib/osx/joal-native.jar"/>		
--- 40,44 ----
  	
  	<resources os="Mac OS X">
! 		<j2se version="1.4+" max-heap-size="100M"/>
  		<jar href="http://jake2.sourceforge.net/lib/osx/joal.jar"/>
  		<nativelib href="http://jake2.sourceforge.net/lib/osx/joal-native.jar"/>