jake2-commits — Jake2 cvs commits

[Jake2-commits] jake2/test/jake2/qcommon TestMSG.java,1.1.1.1,1.2 TestLoadGame.java,1.1.1.1,1.2 TestINFO.java,1.1.1.1,1.2

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

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

Modified Files:
	TestMSG.java TestLoadGame.java TestINFO.java 
Log Message:
major refactoring in game, server and client package

Index: TestINFO.java
===================================================================
RCS file: /cvsroot/jake2/jake2/test/jake2/qcommon/TestINFO.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** TestINFO.java	7 Jul 2004 19:59:56 -0000	1.1.1.1
--- TestINFO.java	22 Sep 2004 19:22:10 -0000	1.2
***************
*** 27,31 ****
  import jake2.client.*;
  import jake2.game.*;
- import jake2.qcommon.*;
  import jake2.render.*;
  import jake2.server.*;
--- 27,30 ----

Index: TestLoadGame.java
===================================================================
RCS file: /cvsroot/jake2/jake2/test/jake2/qcommon/TestLoadGame.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** TestLoadGame.java	7 Jul 2004 19:59:56 -0000	1.1.1.1
--- TestLoadGame.java	22 Sep 2004 19:22:10 -0000	1.2
***************
*** 1,42 ****
  /*
! Copyright (C) 1997-2001 Id Software, Inc.
! 
! This program is free software; you can redistribute it and/or
! modify it under the terms of the GNU General Public License
! as published by the Free Software Foundation; either version 2
! of the License, or (at your option) any later version.
! 
! This program is distributed in the hope that it will be useful,
! but WITHOUT ANY WARRANTY; without even the implied warranty of
! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
! 
! See the GNU General Public License for more details.
! 
! You should have received a copy of the GNU General Public License
! along with this program; if not, write to the Free Software
! Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
! 
! */
  
  // Created on 02.01.2004 by RST.
  // $Id$
- 
  package jake2.qcommon;
  
! import jake2.*;
! import jake2.client.*;
! import jake2.game.*;
! import jake2.qcommon.*;
! import jake2.render.*;
! import jake2.server.*;
  
  public class TestLoadGame {
! 	public static void main(String args[]) {
! 		
! 		Qcommon.Init(args);
! 		
! 		System.out.println("hello!");
! 		GameSave.InitGame();
! 		GameSave.ReadGame("test/data/savegames/game.ssv");
! 	}
! }
--- 1,36 ----
  /*
!  * Copyright (C) 1997-2001 Id Software, Inc.
!  * 
!  * This program is free software; you can redistribute it and/or modify it under
!  * the terms of the GNU General Public License as published by the Free Software
!  * Foundation; either version 2 of the License, or (at your option) any later
!  * version.
!  * 
!  * This program is distributed in the hope that it will be useful, but WITHOUT
!  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
!  * FOR A PARTICULAR PURPOSE.
!  * 
!  * See the GNU General Public License for more details.
!  * 
!  * You should have received a copy of the GNU General Public License along with
!  * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
!  * Place - Suite 330, Boston, MA 02111-1307, USA.
!  *  
!  */
  
  // Created on 02.01.2004 by RST.
  // $Id$
  package jake2.qcommon;
  
! import jake2.game.GameSave;
  
  public class TestLoadGame {
!     public static void main(String args[]) {
! 
!         Qcommon.Init(args);
! 
!         System.out.println("hello!");
!         GameSave.InitGame();
!         GameSave.ReadGame("test/data/savegames/game.ssv");
!     }
! }
\ No newline at end of file

Index: TestMSG.java
===================================================================
RCS file: /cvsroot/jake2/jake2/test/jake2/qcommon/TestMSG.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** TestMSG.java	7 Jul 2004 19:59:58 -0000	1.1.1.1
--- TestMSG.java	22 Sep 2004 19:22:10 -0000	1.2
***************
*** 7,10 ****
--- 7,11 ----
  package jake2.qcommon;
  
+ import jake2.Defines;
  /**
   * @author rst
***************
*** 13,20 ****
  	public static void main(String[] args) {
  	
! 		byte buf_data[] = new byte[MAX_MSGLEN];
  		sizebuf_t buf = new sizebuf_t();	
  		
! 		SZ.Init(buf, buf_data, MAX_MSGLEN);
  		
  		MSG.WriteInt(buf, 0x80000000);
--- 14,21 ----
  	public static void main(String[] args) {
  	
! 		byte buf_data[] = new byte[Defines.MAX_MSGLEN];
  		sizebuf_t buf = new sizebuf_t();	
  		
! 		SZ.Init(buf, buf_data, Defines.MAX_MSGLEN);
  		
  		MSG.WriteInt(buf, 0x80000000);
***************
*** 58,63 ****
  		System.out.println("Read:" + MSG.ReadShort(buf));
  		System.out.println("Read:" + MSG.ReadShort(buf));
! 		System.out.println("Read:" + MSG.ReadShort(buf));
! 		
  
  		System.out.println("Read:" + MSG.ReadFloat(buf));
--- 59,63 ----
  		System.out.println("Read:" + MSG.ReadShort(buf));
  		System.out.println("Read:" + MSG.ReadShort(buf));
! 		System.out.println("Read:" + MSG.ReadShort(buf));		
  
  		System.out.println("Read:" + MSG.ReadFloat(buf));

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

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

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

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

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

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

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

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

[Jake2-commits] jake2/src/jake2/sound/joal JOALSoundImpl.java,1.4,1.5

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

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

Modified Files:
	JOALSoundImpl.java 
Log Message:
major refactoring in game, server and client package

Index: JOALSoundImpl.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/sound/joal/JOALSoundImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** JOALSoundImpl.java	19 Sep 2004 09:12:20 -0000	1.4
--- JOALSoundImpl.java	22 Sep 2004 19:22:15 -0000	1.5
***************
*** 10,13 ****
--- 10,14 ----
  import jake2.Globals;
  import jake2.client.CL;
+ import jake2.client.CL_ents;
  import jake2.game.*;
  import jake2.qcommon.*;
***************
*** 358,362 ****
  			}
  
! 			if ((Game.gi.pointcontents.pointcontents(origin)& Defines.MASK_WATER)!= 0) {
  				changeEnv = currentEnv != EAX.EAX_ENVIRONMENT_UNDERWATER;
  				currentEnv = EAX.EAX_ENVIRONMENT_UNDERWATER;
--- 359,363 ----
  			}
  
! 			if ((GameBase.gi.pointcontents.pointcontents(origin)& Defines.MASK_WATER)!= 0) {
  				changeEnv = currentEnv != EAX.EAX_ENVIRONMENT_UNDERWATER;
  				currentEnv = EAX.EAX_ENVIRONMENT_UNDERWATER;
***************
*** 484,488 ****
  						break;
  					case Channel.DYNAMIC:
! 						CL.GetEntitySoundOrigin(ch.entity, entityOrigin);
  						convertVector(entityOrigin, sourceOrigin);
  						break;
--- 485,489 ----
  						break;
  					case Channel.DYNAMIC:
! 						CL_ents.GetEntitySoundOrigin(ch.entity, entityOrigin);
  						convertVector(entityOrigin, sourceOrigin);
  						break;

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

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

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

Modified Files:
	medge_t.java mvertex_t.java 
Log Message:
major refactoring in game, server and client package

Index: mvertex_t.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/mvertex_t.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** mvertex_t.java	7 Jul 2004 19:59:35 -0000	1.1.1.1
--- mvertex_t.java	22 Sep 2004 19:22:15 -0000	1.2
***************
*** 1,25 ****
  /*
! Copyright (C) 1997-2001 Id Software, Inc.
! 
! This program is free software; you can redistribute it and/or
! modify it under the terms of the GNU General Public License
! as published by the Free Software Foundation; either version 2
! of the License, or (at your option) any later version.
! 
! This program is distributed in the hope that it will be useful,
! but WITHOUT ANY WARRANTY; without even the implied warranty of
! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
! 
! See the GNU General Public License for more details.
! 
! You should have received a copy of the GNU General Public License
! along with this program; if not, write to the Free Software
! Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
! 
! */
  
  // Created on 20.11.2003 by RST.
  // $Id$
- 
  package jake2.render;
  
--- 1,24 ----
  /*
!  * Copyright (C) 1997-2001 Id Software, Inc.
!  * 
!  * This program is free software; you can redistribute it and/or modify it under
!  * the terms of the GNU General Public License as published by the Free Software
!  * Foundation; either version 2 of the License, or (at your option) any later
!  * version.
!  * 
!  * This program is distributed in the hope that it will be useful, but WITHOUT
!  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
!  * FOR A PARTICULAR PURPOSE.
!  * 
!  * See the GNU General Public License for more details.
!  * 
!  * You should have received a copy of the GNU General Public License along with
!  * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
!  * Place - Suite 330, Boston, MA 02111-1307, USA.
!  *  
!  */
  
  // Created on 20.11.2003 by RST.
  // $Id$
  package jake2.render;
  
***************
*** 29,41 ****
  
  public class mvertex_t {
! 	public static final int DISK_SIZE = 3 * Defines.SIZE_OF_FLOAT; 
! 	public static final int MEM_SIZE = 3 * Defines.SIZE_OF_FLOAT; 
  
! 	public float[] position = {0, 0, 0};
  
! 	public mvertex_t(ByteBuffer b) {
! 		position[0] = b.getFloat();
! 		position[1] = b.getFloat();
! 		position[2] = b.getFloat();
! 	}
! }
--- 28,41 ----
  
  public class mvertex_t {
!     public static final int DISK_SIZE = 3 * Defines.SIZE_OF_FLOAT;
  
!     public static final int MEM_SIZE = 3 * Defines.SIZE_OF_FLOAT;
  
!     public float[] position = { 0, 0, 0 };
! 
!     public mvertex_t(ByteBuffer b) {
!         position[0] = b.getFloat();
!         position[1] = b.getFloat();
!         position[2] = b.getFloat();
!     }
! }
\ No newline at end of file

Index: medge_t.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/medge_t.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** medge_t.java	7 Jul 2004 19:59:35 -0000	1.1.1.1
--- medge_t.java	22 Sep 2004 19:22:15 -0000	1.2
***************
*** 1,25 ****
  /*
! Copyright (C) 1997-2001 Id Software, Inc.
! 
! This program is free software; you can redistribute it and/or
! modify it under the terms of the GNU General Public License
! as published by the Free Software Foundation; either version 2
! of the License, or (at your option) any later version.
! 
! This program is distributed in the hope that it will be useful,
! but WITHOUT ANY WARRANTY; without even the implied warranty of
! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
! 
! See the GNU General Public License for more details.
! 
! You should have received a copy of the GNU General Public License
! along with this program; if not, write to the Free Software
! Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
! 
! */
  
  // Created on 20.11.2003 by RST.
  // $Id$
- 
  package jake2.render;
  
--- 1,24 ----
  /*
!  * Copyright (C) 1997-2001 Id Software, Inc.
!  * 
!  * This program is free software; you can redistribute it and/or modify it under
!  * the terms of the GNU General Public License as published by the Free Software
!  * Foundation; either version 2 of the License, or (at your option) any later
!  * version.
!  * 
!  * This program is distributed in the hope that it will be useful, but WITHOUT
!  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
!  * FOR A PARTICULAR PURPOSE.
!  * 
!  * See the GNU General Public License for more details.
!  * 
!  * You should have received a copy of the GNU General Public License along with
!  * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
!  * Place - Suite 330, Boston, MA 02111-1307, USA.
!  *  
!  */
  
  // Created on 20.11.2003 by RST.
  // $Id$
  package jake2.render;
  
***************
*** 29,43 ****
  
  public class medge_t {
! 	
! 	public static final int DISK_SIZE = 2 * Defines.SIZE_OF_SHORT;
! 	public static final int MEM_SIZE = 3 * Defines.SIZE_OF_INT;
! 	
! 	// unsigned short
! 	public int[] v = new int[2];
! 	public int cachededgeoffset;
! 	
! 	public medge_t(ByteBuffer b) {
! 		v[0] = b.getShort() & 0xFFFF;
! 		v[1] = b.getShort() & 0xFFFF;
! 	}
! }
--- 28,44 ----
  
  public class medge_t {
! 
!     public static final int DISK_SIZE = 2 * Defines.SIZE_OF_SHORT;
! 
!     public static final int MEM_SIZE = 3 * Defines.SIZE_OF_INT;
! 
!     // unsigned short
!     public int[] v = new int[2];
! 
!     public int cachededgeoffset;
! 
!     public medge_t(ByteBuffer b) {
!         v[0] = b.getShort() & 0xFFFF;
!         v[1] = b.getShort() & 0xFFFF;
!     }
! }
\ No newline at end of file

[Jake2-commits] jake2/webstart jake2_jogl11.jnlp,NONE,1.1 jake2_jogl11ATI.jnlp,NONE,1.1 jake2.jnlp,1.2,1.3

[Holger Z. <hz...@us...>]

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

Modified Files:
	jake2.jnlp 
Added Files:
	jake2_jogl11.jnlp jake2_jogl11ATI.jnlp 
Log Message:
jogl 1.1 version
changed file locations

Index: jake2.jnlp
===================================================================
RCS file: /cvsroot/jake2/jake2/webstart/jake2.jnlp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** jake2.jnlp	19 Sep 2004 20:36:45 -0000	1.2
--- jake2.jnlp	21 Sep 2004 13:30:09 -0000	1.3
***************
*** 1,5 ****
  <?xml version="1.0" encoding="utf-8"?>
  <jnlp spec="1.0+" 
! 	codebase="http://hoz.in-chemnitz.de/jake2"
  	href="jake2.jnlp">
  	
--- 1,5 ----
  <?xml version="1.0" encoding="utf-8"?>
  <jnlp spec="1.0+" 
! 	codebase="http://www.bytonic.de/downloads"
  	href="jake2.jnlp">
  	
***************
*** 9,13 ****
  		<homepage href="http://www.bytonic.de/html/jake2.html"/>
  		<description>Java port of the Quake2 game engine</description>
! 		<icon href="icon.gif"/>
  		<offline-allowed/>
  	</information>
--- 9,13 ----
  		<homepage href="http://www.bytonic.de/html/jake2.html"/>
  		<description>Java port of the Quake2 game engine</description>
! 		<icon href="http://jake2.sourceforge.net/icon.gif"/>
  		<offline-allowed/>
  	</information>
***************
*** 19,24 ****
  	<resources>
  		<j2se version="1.4+" max-heap-size="128M"/>
! 		<jar href="lib/jake2.jar"/>
! 		<jar href="lib/jogl.jar"/>
  		<property name="sun.java2d.noddraw" value="true"/>
  	</resources>
--- 19,24 ----
  	<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"/>
  		<property name="sun.java2d.noddraw" value="true"/>
  	</resources>
***************
*** 26,42 ****
  	<resources os="Linux">
  		<j2se version="1.4+" max-heap-size="128M"/>
! 		<jar href="lib/linux/joal.jar"/>
! 		<nativelib href="lib/linux/jogl-native.jar"/>
! 		<nativelib href="lib/linux/joal-native.jar"/>
  	</resources>
  	
  	<resources os="Windows">
  		<j2se version="1.4+" max-heap-size="128M"/>
! 		<jar href="lib/windows/joal.jar"/>
! 		<nativelib href="lib/windows/jogl-native.jar"/>
! 		<nativelib href="lib/windows/joal-native.jar"/>
  	</resources>
  
  	<application-desc main-class="jake2.Jake2"/> 
  
! </jnlp>
\ No newline at end of file
--- 26,42 ----
  	<resources os="Linux">
  		<j2se version="1.4+" max-heap-size="128M"/>
! 		<jar href="http://jake2.sourceforge.net/lib/linux/joal.jar"/>
! 		<nativelib href="http://jake2.sourceforge.net/lib/linux/jogl-native.jar"/>
! 		<nativelib href="http://jake2.sourceforge.net/lib/linux/joal-native.jar"/>
  	</resources>
  	
  	<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"/>
! 		<nativelib href="http://jake2.sourceforge.net/lib/windows/joal-native.jar"/>
  	</resources>
  
  	<application-desc main-class="jake2.Jake2"/> 
  
! </jnlp>

--- NEW FILE: jake2_jogl11ATI.jnlp ---
<?xml version="1.0" encoding="utf-8"?>
<jnlp spec="1.0+" 
	codebase="http://www.bytonic.de/downloads"
	href="jake2_jogl11.jnlp">
	
	<information>
		<title>Jake2</title>
		<vendor>Bytonic Software</vendor>
		<homepage href="http://www.bytonic.de/html/jake2.html"/>
		<description>Java port of the Quake2 game engine</description>
		<icon href="http://jake2.sourceforge.net/icon.gif"/>
		<offline-allowed/>
	</information>
	
	<security>
		<all-permissions/>
	</security>
	
	<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"/>
		<property name="ATI_WORKAROUND" value="true"/>
		<extension href="https://jogl.dev.java.net/webstart/jogl.jnlp" name="jogl"/>
	</resources>
	
	<resources os="Linux">
		<j2se version="1.4+" max-heap-size="128M"/>
		<jar href="http://jake2.sourceforge.net/lib/linux/joal.jar"/>
		<nativelib href="http://jake2.sourceforge.net/lib/linux/joal-native.jar"/>
	</resources>
	
	<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"/>
	</resources>

	<application-desc main-class="jake2.Jake2"/> 

</jnlp>

--- NEW FILE: jake2_jogl11.jnlp ---
<?xml version="1.0" encoding="utf-8"?>
<jnlp spec="1.0+" 
	codebase="http://www.bytonic.de/downloads"
	href="jake2_jogl11.jnlp">
	
	<information>
		<title>Jake2</title>
		<vendor>Bytonic Software</vendor>
		<homepage href="http://www.bytonic.de/html/jake2.html"/>
		<description>Java port of the Quake2 game engine</description>
		<icon href="http://jake2.sourceforge.net/icon.gif"/>
		<offline-allowed/>
	</information>
	
	<security>
		<all-permissions/>
	</security>
	
	<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"/>
		<property name="ATI_WORKAROUND" value="false"/>
		<extension href="https://jogl.dev.java.net/webstart/jogl.jnlp" name="jogl"/>
	</resources>
	
	<resources os="Linux">
		<j2se version="1.4+" max-heap-size="128M"/>
		<jar href="http://jake2.sourceforge.net/lib/linux/joal.jar"/>
		<nativelib href="http://jake2.sourceforge.net/lib/linux/joal-native.jar"/>
	</resources>
	
	<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"/>
	</resources>

	<application-desc main-class="jake2.Jake2"/> 

</jnlp>

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

[Holger Z. <hz...@us...>]

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

Modified Files:
	Q2DataDialog.java 
Log Message:
dialog reorganized

Index: Q2DataDialog.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/Q2DataDialog.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Q2DataDialog.java	21 Sep 2004 10:46:08 -0000	1.5
--- Q2DataDialog.java	21 Sep 2004 12:52:14 -0000	1.6
***************
*** 32,35 ****
--- 32,37 ----
  		int y = (mode.getHeight() - getHeight()) / 2;
  		setLocation(x, y);
+ 		dir = System.getProperty("user.home") + "/jake2";
+ 		jTextField1.setText(dir);
      }
      
***************
*** 149,152 ****
--- 151,156 ----
  		statusPanel.add(status, gridBagConstraints);
  		getContentPane().add(statusPanel, java.awt.BorderLayout.SOUTH);
+ 		
+ 		installPanel = new InstallPanel(this);
  						
          pack();
***************
*** 156,165 ****
      private void installButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_installButtonActionPerformed
  		dir = jTextField1.getText();
! 		InstallDialog installer = new InstallDialog(this, dir);
  		dir += "/baseq2";
  		jTextField1.setText(dir);
  		
!         new Thread(installer).start();
! 
      }//GEN-LAST:event_installButtonActionPerformed
  
--- 160,170 ----
      private void installButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_installButtonActionPerformed
  		dir = jTextField1.getText();
! 		showInstallPanel();
! 		installPanel.destDir = dir;
! 		
  		dir += "/baseq2";
  		jTextField1.setText(dir);
  		
! 		new Thread(installPanel).start();
      }//GEN-LAST:event_installButtonActionPerformed
  
***************
*** 208,211 ****
--- 213,217 ----
      private javax.swing.JPanel choosePanel;
      private JPanel statusPanel;
+     private InstallPanel installPanel;
      private JLabel status;
      private javax.swing.JTextField jTextField1;
***************
*** 217,220 ****
--- 223,227 ----
  	void showChooseDialog() {
  		getContentPane().remove(statusPanel);
+ 		getContentPane().remove(installPanel);
  		getContentPane().add(choosePanel, BorderLayout.SOUTH);
  		validate();
***************
*** 229,232 ****
--- 236,246 ----
  	}
  	
+ 	void showInstallPanel() {
+ 		getContentPane().remove(choosePanel);
+ 		getContentPane().add(installPanel, BorderLayout.SOUTH);
+ 		validate();
+ 		repaint();
+ 	}
+ 	
  	void setStatus(String text) {
  		status.setText(text);
***************
*** 244,247 ****
--- 258,262 ----
  		}
  		showStatus();
+ 		repaint();
  	}
  		
***************
*** 268,278 ****
  	}
  	
! 	static class InstallDialog extends JDialog implements Runnable {
  		
  		static final String[] locs = { 
- 			"ftp://ftp.idsoftware.com/idstuff/quake2/q2-314-demo-x86.exe", 
  			"ftp://ftp.fu-berlin.de/pc/msdos/games/idgames/idstuff/quake2/q2-314-demo-x86.exe",
  			"ftp://ftp.demon.co.uk/pub/mirrors/idsoftware/quake2/q2-314-demo-x86.exe",
! 			"ftp://ftp.fragzone.se/pub/spel/quake2/q2-314-demo-x86.exe" };
  		static byte[] buf = new byte[8192];
  		String destDir;
--- 283,293 ----
  	}
  	
! 	static class InstallPanel extends JPanel implements Runnable {
  		
  		static final String[] locs = { 
  			"ftp://ftp.fu-berlin.de/pc/msdos/games/idgames/idstuff/quake2/q2-314-demo-x86.exe",
  			"ftp://ftp.demon.co.uk/pub/mirrors/idsoftware/quake2/q2-314-demo-x86.exe",
! 			"ftp://ftp.fragzone.se/pub/spel/quake2/q2-314-demo-x86.exe",
! 			"ftp://ftp.idsoftware.com/idstuff/quake2/q2-314-demo-x86.exe"  };
  		static byte[] buf = new byte[8192];
  		String destDir;
***************
*** 282,293 ****
  		Q2DataDialog parent;
  		
! 		public InstallDialog(Q2DataDialog parent, String dir) {
! 			super(parent);
! 	
  			initComponents();
! 			setResizable(false);
! 	
! 			this.parent = parent;		
! 			destDir = dir;
  		}
  		
--- 297,303 ----
  		Q2DataDialog parent;
  		
! 		public InstallPanel(Q2DataDialog d) {
  			initComponents();
! 			parent = d;
  		}
  		
***************
*** 295,311 ****
  			progress.setMinimum(0);
  			progress.setMaximum(100);
! 			progress.setMinimumSize(new Dimension(200, 20));
! 			progress.setMaximumSize(new Dimension(200, 20));
! 			progress.setPreferredSize(new Dimension(200, 20));
! 			getContentPane().add(progress, BorderLayout.CENTER);
! 			getContentPane().add(label, BorderLayout.NORTH);
! 			pack();
  		}
  						
  		public void run() {
! 			
! 			parent.setEnabled(false);
! 			setVisible(true);
! 			
  			InputStream in = null;
  			OutputStream out = null;
--- 305,331 ----
  			progress.setMinimum(0);
  			progress.setMaximum(100);
! 			setLayout(new GridBagLayout());
! 			GridBagConstraints gridBagConstraints = new GridBagConstraints();
! 
! 			gridBagConstraints = new java.awt.GridBagConstraints();
! 			gridBagConstraints.gridx = 0;
! 			gridBagConstraints.gridy = 0;
! 			gridBagConstraints.gridwidth = 1;
! 			gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
! 			gridBagConstraints.insets = new java.awt.Insets(10, 10, 10, 10);
! 			gridBagConstraints.weightx = 1.0;
! 			gridBagConstraints.anchor = GridBagConstraints.SOUTH;
! 			add(label, gridBagConstraints);
! 			gridBagConstraints.gridy = 1;
! 			gridBagConstraints.anchor = GridBagConstraints.NORTH;
! 			add(progress, gridBagConstraints);
! 			Dimension d = new Dimension(400, 100);
! 			setMinimumSize(d);
! 			setMaximumSize(d);
! 			setPreferredSize(d);
  		}
  						
  		public void run() {
! 						
  			InputStream in = null;
  			OutputStream out = null;
***************
*** 314,335 ****
  			label.setText("downloading...");
  			
  			try {
- 				URL url = new URL(locs[1]);
- 				URLConnection conn = url.openConnection();
- 				int length = conn.getContentLength();
- 				progress.setMaximum(length/1024);
- 				
- 				in = conn.getInputStream();
- 				
- 				outFile = File.createTempFile("Jake2Data", ".zip");
- 				System.out.println(outFile.getCanonicalPath());
- 				outFile.deleteOnExit();
- 				out = new FileOutputStream(outFile);
- 				
- 				copyStream(in, out);
- 				
  				installData(outFile.getCanonicalPath());
- 				
  			} catch (Exception e) {}
  			
  			try {
--- 334,371 ----
  			label.setText("downloading...");
  			
+ 			File dir = null;
+ 			try {
+ 				dir = new File(destDir);
+ 				dir.mkdirs();
+ 			}
+ 			catch (Exception e) {}
+ 			try {
+ 				if (!dir.isDirectory() || !dir.canWrite()) return;
+ 			}
+ 			catch (Exception e) {
+ 				return;
+ 			}
+ 			
+ 			for (int i = 0; i < locs.length; i++) {
+ 				try {
+ 					URL url = new URL(locs[i]);
+ 					URLConnection conn = url.openConnection();
+ 					int length = conn.getContentLength();
+ 					progress.setMaximum(length / 1024);
+ 
+ 					in = conn.getInputStream();
+ 
+ 					outFile = File.createTempFile("Jake2Data", ".zip");
+ 					outFile.deleteOnExit();
+ 					out = new FileOutputStream(outFile);
+ 
+ 					copyStream(in, out);
+ 					break;
+ 				} catch (Exception e) {}
+ 			}
  			try {
  				installData(outFile.getCanonicalPath());
  			} catch (Exception e) {}
+ 
  			
  			try {
***************
*** 337,344 ****
  			} catch (Exception e) {}
  			
! 			setVisible(false);
! 			parent.setEnabled(true);
  			parent.okButtonActionPerformed(null);
- 			dispose();
  		}
  		
--- 373,378 ----
  			} catch (Exception e) {}
  			
! 			parent.showChooseDialog();
  			parent.okButtonActionPerformed(null);
  		}
  		
***************
*** 358,362 ****
  							outFile.mkdirs();
  						} else {
! 							label.setText(outFile.getName());
  							progress.setMaximum((int)entry.getSize()/1024);
  							progress.setValue(0); 
--- 392,396 ----
  							outFile.mkdirs();
  						} else {
! 							label.setText("installing " + outFile.getName());
  							progress.setMaximum((int)entry.getSize()/1024);
  							progress.setValue(0); 
***************
*** 368,374 ****
  					}
  				}
! 			} catch (Exception e) {
! 				e.printStackTrace();
! 			}
  		}
  		
--- 402,406 ----
  					}
  				}
! 			} catch (Exception e) {}
  		}
  		
***************
*** 381,389 ****
  					c += l;
  					progress.setValue(c / 1024);
- 					//progress.repaint();
  				}
! 			} catch (Exception e) {
! 				e.printStackTrace();
! 			}
  			
  			try {
--- 413,418 ----
  					c += l;
  					progress.setValue(c / 1024);
  				}
! 			} catch (Exception e) {}
  			
  			try {

[Jake2-commits] jake2/src/jake2/qcommon FS.java,1.6,1.7 Q2DataDialog.java,1.4,1.5

[Holger Z. <hz...@us...>]

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

Modified Files:
	FS.java Q2DataDialog.java 
Log Message:
FTP installer

Index: Q2DataDialog.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/Q2DataDialog.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Q2DataDialog.java	20 Sep 2004 17:59:24 -0000	1.4
--- Q2DataDialog.java	21 Sep 2004 10:46:08 -0000	1.5
***************
*** 1,268 ****
! /*
!  * Q2DataDialog.java
!  *
!  * Created on 17. September 2004, 20:13
!  */
! 
! package jake2.qcommon;
! 
! import java.awt.*;
! import java.awt.DisplayMode;
! import java.awt.GraphicsEnvironment;
! import java.io.IOException;
! 
! import javax.swing.*;
! import javax.swing.JFileChooser;
! import javax.swing.JPanel;
! 
! /**
!  *
!  * @author  hoz
!  */
! public class Q2DataDialog extends javax.swing.JDialog {
!     
!     /** Creates new form Q2DataDialog */
!     public Q2DataDialog() {
!         super();
!         initComponents();
!        
! 		DisplayMode mode = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice().getDisplayMode();
! 		int x = (mode.getWidth() - getWidth()) / 2;
! 		int y = (mode.getHeight() - getHeight()) / 2;
! 		setLocation(x, y);
!     }
!     
!     /** This method is called from within the constructor to
!      * initialize the form.
!      * WARNING: Do NOT modify this code. The content of this method is
!      * always regenerated by the Form Editor.
!      */
!     private void initComponents() {//GEN-BEGIN:initComponents
!         java.awt.GridBagConstraints gridBagConstraints;
! 
!         choosePanel = new javax.swing.JPanel();
!         statusPanel = new JPanel();
!         status = new JLabel("initializing Jake2...");
!         jTextField1 = new javax.swing.JTextField();
!         changeButton = new javax.swing.JButton();
!         installButton = new javax.swing.JButton();
!         exitButton = new javax.swing.JButton();
!         okButton = new javax.swing.JButton();
! 
!         setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE);
!         setTitle("Jake2 - Bytonic Software");
! 
!         setResizable(false);
!         addWindowListener(new java.awt.event.WindowAdapter() {
!             public void windowClosing(java.awt.event.WindowEvent evt) {
!                 formWindowClosing(evt);
!             }
!         });
! 
!         choosePanel.setLayout(new java.awt.GridBagLayout());
! 
!         choosePanel.setMaximumSize(new java.awt.Dimension(400, 100));
!         choosePanel.setMinimumSize(new java.awt.Dimension(400, 100));
!         choosePanel.setPreferredSize(new java.awt.Dimension(400, 100));
!         jTextField1.setPreferredSize(null);
!         gridBagConstraints = new java.awt.GridBagConstraints();
!         gridBagConstraints.gridx = 0;
!         gridBagConstraints.gridy = 0;
!         gridBagConstraints.gridwidth = 2;
!         gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
!         gridBagConstraints.insets = new java.awt.Insets(10, 10, 10, 10);
!         gridBagConstraints.weightx = 1.0;
!         choosePanel.add(jTextField1, gridBagConstraints);
! 
!         changeButton.setText("change");
!         changeButton.addActionListener(new java.awt.event.ActionListener() {
!             public void actionPerformed(java.awt.event.ActionEvent evt) {
!                 changeButtonActionPerformed(evt);
!             }
!         });
! 
!         gridBagConstraints = new java.awt.GridBagConstraints();
!         gridBagConstraints.gridx = 2;
!         gridBagConstraints.gridy = 0;
!         gridBagConstraints.insets = new java.awt.Insets(10, 10, 10, 10);
!         gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
!         choosePanel.add(changeButton, gridBagConstraints);
! 
!         installButton.setText("Install");
!         installButton.addActionListener(new java.awt.event.ActionListener() {
!             public void actionPerformed(java.awt.event.ActionEvent evt) {
!                 installButtonActionPerformed(evt);
!             }
!         });
! 
!         gridBagConstraints = new java.awt.GridBagConstraints();
!         gridBagConstraints.gridx = 0;
!         gridBagConstraints.gridy = 1;
!         gridBagConstraints.insets = new java.awt.Insets(10, 10, 10, 10);
!         gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
!         choosePanel.add(installButton, gridBagConstraints);
! 
!         exitButton.setText("Exit");
!         exitButton.addActionListener(new java.awt.event.ActionListener() {
!             public void actionPerformed(java.awt.event.ActionEvent evt) {
!                 exitButtonActionPerformed(evt);
!             }
!         });
! 
!         gridBagConstraints = new java.awt.GridBagConstraints();
!         gridBagConstraints.gridx = 1;
!         gridBagConstraints.gridy = 1;
!         gridBagConstraints.insets = new java.awt.Insets(10, 10, 10, 10);
!         choosePanel.add(exitButton, gridBagConstraints);
! 
!         okButton.setText("OK");
!         okButton.addActionListener(new java.awt.event.ActionListener() {
!             public void actionPerformed(java.awt.event.ActionEvent evt) {
!                 okButtonActionPerformed(evt);
!             }
!         });
! 
!         gridBagConstraints = new java.awt.GridBagConstraints();
!         gridBagConstraints.gridx = 2;
!         gridBagConstraints.gridy = 1;
!         gridBagConstraints.insets = new java.awt.Insets(10, 10, 10, 10);
!         gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
!         choosePanel.add(okButton, gridBagConstraints);
! 
!         //getContentPane().add(choosePanel, java.awt.BorderLayout.SOUTH);
! 
! 		Jake2Canvas c = new Jake2Canvas();
! 		getContentPane().add(c, BorderLayout.CENTER);
! 
! 		statusPanel.setLayout(new java.awt.GridBagLayout());
! 		statusPanel.setMaximumSize(new java.awt.Dimension(400, 100));
! 		statusPanel.setMinimumSize(new java.awt.Dimension(400, 100));
! 		statusPanel.setPreferredSize(new java.awt.Dimension(400, 100));
! 		gridBagConstraints = new java.awt.GridBagConstraints();
! 		gridBagConstraints.gridx = 0;
! 		gridBagConstraints.gridy = 0;
! 		gridBagConstraints.gridwidth = 1;
! 		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
! 		gridBagConstraints.insets = new java.awt.Insets(10, 10, 10, 10);
! 		gridBagConstraints.weightx = 1.0;
! 		statusPanel.add(status, gridBagConstraints);
! 		getContentPane().add(statusPanel, java.awt.BorderLayout.SOUTH);
! 						
!         pack();
!     }//GEN-END:initComponents
! 
!     private void installButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_installButtonActionPerformed
!         // TODO add your handling code here:
!     }//GEN-LAST:event_installButtonActionPerformed
! 
!     private void exitButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_exitButtonActionPerformed
!     	System.exit(1);
!     	dispose();
!     }//GEN-LAST:event_exitButtonActionPerformed
! 
!     private void okButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_okButtonActionPerformed
!     	
!     	Cvar.Set("cddir", dir);
!     	FS.setCDDir();
!     	
!     	synchronized(this) {
!     		notifyAll();
!     	}
!     }//GEN-LAST:event_okButtonActionPerformed
! 
!     private void changeButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_changeButtonActionPerformed
!     	JFileChooser chooser = new JFileChooser();
!     	chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
!     	chooser.setDialogType(JFileChooser.CUSTOM_DIALOG);
!     	chooser.setMultiSelectionEnabled(false);
!     	chooser.setDialogTitle("choose a valid baseq2 directory");
!     	chooser.showDialog(this, "OK");
!     	
!     	dir = null;
!     	try {
! 			dir = chooser.getSelectedFile().getCanonicalPath();
! 		} catch (IOException e) {}
! 		jTextField1.setText(dir);
!         
!     }//GEN-LAST:event_changeButtonActionPerformed
! 
!     private void formWindowClosing(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_formWindowClosing
!     	System.exit(1);
!     	dispose();
!     }//GEN-LAST:event_formWindowClosing
!     
!     /**
!      * @param args the command line arguments
!      */
!     public static void main(String args[]) {
!         new Q2DataDialog().setVisible(true);
!         System.out.println("Hi");
!     }
!     
!     // Variables declaration - do not modify//GEN-BEGIN:variables
!     private javax.swing.JButton changeButton;
!     private javax.swing.JButton exitButton;
!     private javax.swing.JButton installButton;
!     private Jake2Canvas canvas;
!     private javax.swing.JPanel choosePanel;
!     private JPanel statusPanel;
!     private JLabel status;
!     private javax.swing.JTextField jTextField1;
!     private javax.swing.JButton okButton;
!     // End of variables declaration//GEN-END:variables
!     
! 	private String dir;
! 	
! 	void showChooseDialog() {
! 		getContentPane().remove(statusPanel);
! 		getContentPane().add(choosePanel, BorderLayout.SOUTH);
! 		validate();
! 		repaint();
! 	}
! 	
! 	void showStatus() {
! 		getContentPane().remove(choosePanel);
! 		getContentPane().add(statusPanel, BorderLayout.SOUTH);
! 		validate();
! 		repaint();		
! 	}
! 	
! 	void setStatus(String text) {
! 		status.setText(text);
! 	}
! 	
! 	void testQ2Data() {
! 		while (FS.LoadFile("pics/colormap.pcx") == null) {
! 			showChooseDialog();
! 			
! 			try {
! 				synchronized(this) {
! 					wait();
! 				}
! 			} catch (InterruptedException e) {}
! 		}
! 		showStatus();
! 	}
! 		
! 	static class Jake2Canvas extends Canvas {
! 		private Image image;
! 		Jake2Canvas() {
! 			setSize(400, 200);
! 			image = Toolkit.getDefaultToolkit().getImage(getClass().getResource("/splash.png"));
! 			while (!Toolkit.getDefaultToolkit().prepareImage(image, -1, -1, null)) {
! 				try {
! 					Thread.sleep(50);
! 				} catch (InterruptedException e) {}
! 			} 
! 		}
! 		
! 		
! 		/* (non-Javadoc)
! 		 * @see java.awt.Component#paint(java.awt.Graphics)
! 		 */
! 		public void paint(Graphics g) {
! 			g.drawImage(image, 0, 0, null);
! 		}
! 
! 	}
! }
--- 1,398 ----
! /*
!  * Q2DataDialog.java
!  *
!  * Created on 17. September 2004, 20:13
!  */
! 
! package jake2.qcommon;
! 
! import java.awt.*;
! import java.io.*;
! import java.net.URL;
! import java.net.URLConnection;
! import java.util.Enumeration;
! import java.util.zip.ZipEntry;
! import java.util.zip.ZipFile;
! 
! import javax.swing.*;
! 
! /**
!  *
!  * @author  hoz
!  */
! public class Q2DataDialog extends javax.swing.JDialog {
!     
!     /** Creates new form Q2DataDialog */
!     public Q2DataDialog() {
!         super();
!         initComponents();
!        
! 		DisplayMode mode = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice().getDisplayMode();
! 		int x = (mode.getWidth() - getWidth()) / 2;
! 		int y = (mode.getHeight() - getHeight()) / 2;
! 		setLocation(x, y);
!     }
!     
!     /** This method is called from within the constructor to
!      * initialize the form.
!      * WARNING: Do NOT modify this code. The content of this method is
!      * always regenerated by the Form Editor.
!      */
!     private void initComponents() {//GEN-BEGIN:initComponents
!         java.awt.GridBagConstraints gridBagConstraints;
! 
!         choosePanel = new javax.swing.JPanel();
!         statusPanel = new JPanel();
!         status = new JLabel("initializing Jake2...");
!         jTextField1 = new javax.swing.JTextField();
!         changeButton = new javax.swing.JButton();
!         installButton = new javax.swing.JButton();
!         exitButton = new javax.swing.JButton();
!         okButton = new javax.swing.JButton();
! 
!         setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE);
!         setTitle("Jake2 - Bytonic Software");
! 
!         setResizable(false);
!         addWindowListener(new java.awt.event.WindowAdapter() {
!             public void windowClosing(java.awt.event.WindowEvent evt) {
!                 formWindowClosing(evt);
!             }
!         });
! 
!         choosePanel.setLayout(new java.awt.GridBagLayout());
! 
!         choosePanel.setMaximumSize(new java.awt.Dimension(400, 100));
!         choosePanel.setMinimumSize(new java.awt.Dimension(400, 100));
!         choosePanel.setPreferredSize(new java.awt.Dimension(400, 100));
!         jTextField1.setPreferredSize(null);
!         gridBagConstraints = new java.awt.GridBagConstraints();
!         gridBagConstraints.gridx = 0;
!         gridBagConstraints.gridy = 0;
!         gridBagConstraints.gridwidth = 2;
!         gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
!         gridBagConstraints.insets = new java.awt.Insets(10, 10, 10, 10);
!         gridBagConstraints.weightx = 1.0;
!         choosePanel.add(jTextField1, gridBagConstraints);
! 
!         changeButton.setText("change");
!         changeButton.addActionListener(new java.awt.event.ActionListener() {
!             public void actionPerformed(java.awt.event.ActionEvent evt) {
!                 changeButtonActionPerformed(evt);
!             }
!         });
! 
!         gridBagConstraints = new java.awt.GridBagConstraints();
!         gridBagConstraints.gridx = 2;
!         gridBagConstraints.gridy = 0;
!         gridBagConstraints.insets = new java.awt.Insets(10, 10, 10, 10);
!         gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
!         choosePanel.add(changeButton, gridBagConstraints);
! 
!         installButton.setText("Install");
!         installButton.addActionListener(new java.awt.event.ActionListener() {
!             public void actionPerformed(java.awt.event.ActionEvent evt) {
!                 installButtonActionPerformed(evt);
!             }
!         });
! 
!         gridBagConstraints = new java.awt.GridBagConstraints();
!         gridBagConstraints.gridx = 0;
!         gridBagConstraints.gridy = 1;
!         gridBagConstraints.insets = new java.awt.Insets(10, 10, 10, 10);
!         gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
!         choosePanel.add(installButton, gridBagConstraints);
! 
!         exitButton.setText("Exit");
!         exitButton.addActionListener(new java.awt.event.ActionListener() {
!             public void actionPerformed(java.awt.event.ActionEvent evt) {
!                 exitButtonActionPerformed(evt);
!             }
!         });
! 
!         gridBagConstraints = new java.awt.GridBagConstraints();
!         gridBagConstraints.gridx = 1;
!         gridBagConstraints.gridy = 1;
!         gridBagConstraints.insets = new java.awt.Insets(10, 10, 10, 10);
!         choosePanel.add(exitButton, gridBagConstraints);
! 
!         okButton.setText("OK");
!         okButton.addActionListener(new java.awt.event.ActionListener() {
!             public void actionPerformed(java.awt.event.ActionEvent evt) {
!                 okButtonActionPerformed(evt);
!             }
!         });
! 
!         gridBagConstraints = new java.awt.GridBagConstraints();
!         gridBagConstraints.gridx = 2;
!         gridBagConstraints.gridy = 1;
!         gridBagConstraints.insets = new java.awt.Insets(10, 10, 10, 10);
!         gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
!         choosePanel.add(okButton, gridBagConstraints);
! 
!         //getContentPane().add(choosePanel, java.awt.BorderLayout.SOUTH);
! 
! 		Jake2Canvas c = new Jake2Canvas();
! 		getContentPane().add(c, BorderLayout.CENTER);
! 
! 		statusPanel.setLayout(new java.awt.GridBagLayout());
! 		statusPanel.setMaximumSize(new java.awt.Dimension(400, 100));
! 		statusPanel.setMinimumSize(new java.awt.Dimension(400, 100));
! 		statusPanel.setPreferredSize(new java.awt.Dimension(400, 100));
! 		gridBagConstraints = new java.awt.GridBagConstraints();
! 		gridBagConstraints.gridx = 0;
! 		gridBagConstraints.gridy = 0;
! 		gridBagConstraints.gridwidth = 1;
! 		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
! 		gridBagConstraints.insets = new java.awt.Insets(10, 10, 10, 10);
! 		gridBagConstraints.weightx = 1.0;
! 		statusPanel.add(status, gridBagConstraints);
! 		getContentPane().add(statusPanel, java.awt.BorderLayout.SOUTH);
! 						
!         pack();
!     }//GEN-END:initComponents
! 
! 	
!     private void installButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_installButtonActionPerformed
! 		dir = jTextField1.getText();
! 		InstallDialog installer = new InstallDialog(this, dir);
! 		dir += "/baseq2";
! 		jTextField1.setText(dir);
! 		
!         new Thread(installer).start();
! 
!     }//GEN-LAST:event_installButtonActionPerformed
! 
!     private void exitButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_exitButtonActionPerformed
!     	System.exit(1);
!     	dispose();
!     }//GEN-LAST:event_exitButtonActionPerformed
! 
!     private void okButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_okButtonActionPerformed
!     	
!     	dir = jTextField1.getText();
!     	Cvar.Set("cddir", dir);
!     	FS.setCDDir();
!     	
!     	synchronized(this) {
!     		notifyAll();
!     	}
!     }//GEN-LAST:event_okButtonActionPerformed
! 
!     private void changeButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_changeButtonActionPerformed
!     	JFileChooser chooser = new JFileChooser();
!     	chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
!     	chooser.setDialogType(JFileChooser.CUSTOM_DIALOG);
!     	chooser.setMultiSelectionEnabled(false);
!     	chooser.setDialogTitle("choose a valid baseq2 directory");
!     	chooser.showDialog(this, "OK");
!     	
!     	dir = null;
!     	try {
! 			dir = chooser.getSelectedFile().getCanonicalPath();
! 		} catch (IOException e) {}
! 		jTextField1.setText(dir);
!         
!     }//GEN-LAST:event_changeButtonActionPerformed
! 
!     private void formWindowClosing(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_formWindowClosing
!     	System.exit(1);
!     	dispose();
!     }//GEN-LAST:event_formWindowClosing
!         
!     // Variables declaration - do not modify//GEN-BEGIN:variables
!     private javax.swing.JButton changeButton;
!     private javax.swing.JButton exitButton;
!     private javax.swing.JButton installButton;
!     private Jake2Canvas canvas;
!     private javax.swing.JPanel choosePanel;
!     private JPanel statusPanel;
!     private JLabel status;
!     private javax.swing.JTextField jTextField1;
!     private javax.swing.JButton okButton;
!     // End of variables declaration//GEN-END:variables
!     
! 	private String dir;
! 	
! 	void showChooseDialog() {
! 		getContentPane().remove(statusPanel);
! 		getContentPane().add(choosePanel, BorderLayout.SOUTH);
! 		validate();
! 		repaint();
! 	}
! 	
! 	void showStatus() {
! 		getContentPane().remove(choosePanel);
! 		getContentPane().add(statusPanel, BorderLayout.SOUTH);
! 		validate();
! 		repaint();		
! 	}
! 	
! 	void setStatus(String text) {
! 		status.setText(text);
! 	}
! 	
! 	void testQ2Data() {
! 		while (FS.LoadFile("pics/colormap.pcx") == null) {
! 			showChooseDialog();
! 			
! 			try {
! 				synchronized(this) {
! 					wait();
! 				}
! 			} catch (InterruptedException e) {}
! 		}
! 		showStatus();
! 	}
! 		
! 	static class Jake2Canvas extends Canvas {
! 		private Image image;
! 		Jake2Canvas() {
! 			setSize(400, 200);
! 			image = Toolkit.getDefaultToolkit().getImage(getClass().getResource("/splash.png"));
! 			while (!Toolkit.getDefaultToolkit().prepareImage(image, -1, -1, null)) {
! 				try {
! 					Thread.sleep(50);
! 				} catch (InterruptedException e) {}
! 			} 
! 		}
! 		
! 		
! 		/* (non-Javadoc)
! 		 * @see java.awt.Component#paint(java.awt.Graphics)
! 		 */
! 		public void paint(Graphics g) {
! 			g.drawImage(image, 0, 0, null);
! 		}
! 
! 	}
! 	
! 	static class InstallDialog extends JDialog implements Runnable {
! 		
! 		static final String[] locs = { 
! 			"ftp://ftp.idsoftware.com/idstuff/quake2/q2-314-demo-x86.exe", 
! 			"ftp://ftp.fu-berlin.de/pc/msdos/games/idgames/idstuff/quake2/q2-314-demo-x86.exe",
! 			"ftp://ftp.demon.co.uk/pub/mirrors/idsoftware/quake2/q2-314-demo-x86.exe",
! 			"ftp://ftp.fragzone.se/pub/spel/quake2/q2-314-demo-x86.exe" };
! 		static byte[] buf = new byte[8192];
! 		String destDir;
! 		
! 		JProgressBar progress = new JProgressBar();
! 		JLabel label = new JLabel("test");
! 		Q2DataDialog parent;
! 		
! 		public InstallDialog(Q2DataDialog parent, String dir) {
! 			super(parent);
! 	
! 			initComponents();
! 			setResizable(false);
! 	
! 			this.parent = parent;		
! 			destDir = dir;
! 		}
! 		
! 		void initComponents() {
! 			progress.setMinimum(0);
! 			progress.setMaximum(100);
! 			progress.setMinimumSize(new Dimension(200, 20));
! 			progress.setMaximumSize(new Dimension(200, 20));
! 			progress.setPreferredSize(new Dimension(200, 20));
! 			getContentPane().add(progress, BorderLayout.CENTER);
! 			getContentPane().add(label, BorderLayout.NORTH);
! 			pack();
! 		}
! 						
! 		public void run() {
! 			
! 			parent.setEnabled(false);
! 			setVisible(true);
! 			
! 			InputStream in = null;
! 			OutputStream out = null;
! 			File outFile = null;
! 			
! 			label.setText("downloading...");
! 			
! 			try {
! 				URL url = new URL(locs[1]);
! 				URLConnection conn = url.openConnection();
! 				int length = conn.getContentLength();
! 				progress.setMaximum(length/1024);
! 				
! 				in = conn.getInputStream();
! 				
! 				outFile = File.createTempFile("Jake2Data", ".zip");
! 				System.out.println(outFile.getCanonicalPath());
! 				outFile.deleteOnExit();
! 				out = new FileOutputStream(outFile);
! 				
! 				copyStream(in, out);
! 				
! 				installData(outFile.getCanonicalPath());
! 				
! 			} catch (Exception e) {}
! 			
! 			try {
! 				if (outFile != null) outFile.delete();
! 			} catch (Exception e) {}
! 			
! 			setVisible(false);
! 			parent.setEnabled(true);
! 			parent.okButtonActionPerformed(null);
! 			dispose();
! 		}
! 		
! 		
! 		void installData(String filename) {
! 			try {
! 				ZipFile f = new ZipFile(filename);
! 				Enumeration e = f.entries();
! 				while (e.hasMoreElements()) {
! 					ZipEntry entry = (ZipEntry)e.nextElement();
! 					String name = entry.getName();
! 					int i;
! 					if ((i = name.indexOf("/baseq2")) > -1 && name.indexOf(".dll") == -1) {
! 						name = destDir + name.substring(i);
! 						File outFile = new File(name);
! 						if (entry.isDirectory()) {
! 							outFile.mkdirs();
! 						} else {
! 							label.setText(outFile.getName());
! 							progress.setMaximum((int)entry.getSize()/1024);
! 							progress.setValue(0); 
! 							outFile.getParentFile().mkdirs();
! 							OutputStream out = new FileOutputStream(outFile);
! 							InputStream in = f.getInputStream(entry);
! 							copyStream(in, out);
! 						}
! 					}
! 				}
! 			} catch (Exception e) {
! 				e.printStackTrace();
! 			}
! 		}
! 		
! 		void copyStream(InputStream in, OutputStream out) {
! 			try {
! 				int c = 0;
! 				int l;
! 				while ((l = in.read(buf)) > 0) {
! 					out.write(buf, 0, l);
! 					c += l;
! 					progress.setValue(c / 1024);
! 					//progress.repaint();
! 				}
! 			} catch (Exception e) {
! 				e.printStackTrace();
! 			}
! 			
! 			try {
! 				in.close();
! 			} catch (Exception e) {}
! 			try {
! 				out.close();
! 			} catch (Exception e) {}			
! 		}
! 	}
! 	
! }

Index: FS.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/FS.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FS.java	20 Sep 2004 20:26:40 -0000	1.6
--- FS.java	21 Sep 2004 10:46:07 -0000	1.7
***************
*** 117,122 ****
  		if (index > 0) {
  			File f = new File(path.substring(0, index));
! 			if (!f.mkdirs()) {
! 				//Com.Printf("can't create path \"" + path + '"' + "\n" );
  			}
  		}
--- 117,122 ----
  		if (index > 0) {
  			File f = new File(path.substring(0, index));
! 			if (!f.mkdirs() && !f.isDirectory()) {
! 				Com.Printf("can't create path \"" + path + '"' + "\n" );
  			}
  		}

[Jake2-commits] jake2/src/jake2/qcommon FS.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-serv27886/src/jake2/qcommon

Modified Files:
	FS.java 
Log Message:
chdir (this is the original value)

Index: FS.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/FS.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FS.java	18 Sep 2004 12:35:52 -0000	1.5
--- FS.java	20 Sep 2004 20:26:40 -0000	1.6
***************
*** 827,831 ****
  	 */
  	static void setCDDir() {
! 		fs_cddir = Cvar.Get("cddir", "../../baseq2", CVAR_ARCHIVE);
  		if (fs_cddir.string.length() > 0)
  			AddGameDirectory(fs_cddir.string);		
--- 827,831 ----
  	 */
  	static void setCDDir() {
! 		fs_cddir = Cvar.Get("cddir", "", CVAR_ARCHIVE);
  		if (fs_cddir.string.length() > 0)
  			AddGameDirectory(fs_cddir.string);		

[Jake2-commits] jake2/src/jake2/qcommon Q2DataDialog.java,1.3,1.4

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

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

Modified Files:
	Q2DataDialog.java 
Log Message:
setVisible(true) is correct

Index: Q2DataDialog.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/Q2DataDialog.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Q2DataDialog.java	19 Sep 2004 20:53:07 -0000	1.3
--- Q2DataDialog.java	20 Sep 2004 17:59:24 -0000	1.4
***************
*** 196,200 ****
       */
      public static void main(String args[]) {
!         new Q2DataDialog().show();
          System.out.println("Hi");
      }
--- 196,200 ----
       */
      public static void main(String args[]) {
!         new Q2DataDialog().setVisible(true);
          System.out.println("Hi");
      }

[Jake2-commits] jake2/src/jake2/qcommon Q2DataDialog.java,1.2,1.3 Qcommon.java,1.8,1.9 Q2DataTest.java,1.2,NONE

[Holger Z. <hz...@us...>]

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

Modified Files:
	Q2DataDialog.java Qcommon.java 
Removed Files:
	Q2DataTest.java 
Log Message:
move test method

Index: Qcommon.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/Qcommon.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Qcommon.java	19 Sep 2004 19:53:51 -0000	1.8
--- Qcommon.java	19 Sep 2004 20:53:07 -0000	1.9
***************
*** 87,91 ****
  
  			FS.setCDDir(); // use cddir from config.cfg
! 			Q2DataTest.run(); // test for valid baseq2
  			reconfigure(); // reload default.cfg and config.cfg
  			
--- 87,91 ----
  
  			FS.setCDDir(); // use cddir from config.cfg
! 			Jake2.Q2Dialog.testQ2Data(); // test for valid baseq2
  			reconfigure(); // reload default.cfg and config.cfg
  			

Index: Q2DataDialog.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/Q2DataDialog.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Q2DataDialog.java	19 Sep 2004 19:53:51 -0000	1.2
--- Q2DataDialog.java	19 Sep 2004 20:53:07 -0000	1.3
***************
*** 232,235 ****
--- 232,248 ----
  	}
  	
+ 	void testQ2Data() {
+ 		while (FS.LoadFile("pics/colormap.pcx") == null) {
+ 			showChooseDialog();
+ 			
+ 			try {
+ 				synchronized(this) {
+ 					wait();
+ 				}
+ 			} catch (InterruptedException e) {}
+ 		}
+ 		showStatus();
+ 	}
+ 		
  	static class Jake2Canvas extends Canvas {
  		private Image image;

--- Q2DataTest.java DELETED ---

[Jake2-commits] jake2/webstart icon.gif,NONE,1.1 jake2.jnlp,1.1,1.2

[Holger Z. <hz...@us...>]

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

Modified Files:
	jake2.jnlp 
Added Files:
	icon.gif 
Log Message:
webstart icon

Index: jake2.jnlp
===================================================================
RCS file: /cvsroot/jake2/jake2/webstart/jake2.jnlp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** jake2.jnlp	19 Sep 2004 09:44:51 -0000	1.1
--- jake2.jnlp	19 Sep 2004 20:36:45 -0000	1.2
***************
*** 9,12 ****
--- 9,13 ----
  		<homepage href="http://www.bytonic.de/html/jake2.html"/>
  		<description>Java port of the Quake2 game engine</description>
+ 		<icon href="icon.gif"/>
  		<offline-allowed/>
  	</information>

--- NEW FILE: icon.gif ---
(This appears to be a binary file; contents omitted.)

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

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

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

Modified Files:
	JoglBase.java 
Log Message:
error with stupid import

Index: JoglBase.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/JoglBase.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** JoglBase.java	19 Sep 2004 12:47:49 -0000	1.8
--- JoglBase.java	19 Sep 2004 20:32:05 -0000	1.9
***************
*** 42,47 ****
  import javax.swing.JFrame;
  
- import com.sun.rsasign.t;
- 
  import net.java.games.jogl.*;
  import net.java.games.jogl.util.GLUT;
--- 42,45 ----

[Jake2-commits] jake2/src/jake2/qcommon Q2DataDialog.java,1.1,1.2 Q2DataTest.java,1.1,1.2 Qcommon.java,1.7,1.8

[Holger Z. <hz...@us...>]

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

Modified Files:
	Q2DataDialog.java Q2DataTest.java Qcommon.java 
Log Message:
splash screen with status messages

Index: Qcommon.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/Qcommon.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Qcommon.java	18 Sep 2004 12:36:53 -0000	1.7
--- Qcommon.java	19 Sep 2004 19:53:51 -0000	1.8
***************
*** 27,30 ****
--- 27,31 ----
  
  import jake2.Globals;
+ import jake2.Jake2;
  import jake2.client.*;
  import jake2.game.Cmd;
***************
*** 73,78 ****
--- 74,81 ----
  			Cbuf.Execute();
  
+ 			Jake2.Q2Dialog.setStatus("initializing filesystem...");
  			FS.InitFilesystem();
  
+ 			Jake2.Q2Dialog.setStatus("loading config...");
  			Cbuf.AddText("exec default.cfg\n");
  			Cbuf.Execute();
***************
*** 109,116 ****
--- 112,122 ----
  			Cvar.Get("version", s, CVAR_SERVERINFO | CVAR_NOSET);
  
+ 			Jake2.Q2Dialog.setStatus("initializing network subsystem...");
  			NET.NET_Init();	//ok
  			Netchan.Netchan_Init();	//ok
  
+ 			Jake2.Q2Dialog.setStatus("initializing server subsystem...");
  			SV_MAIN.SV_Init();	//ok
+ 			Jake2.Q2Dialog.setStatus("initializing client subsystem...");
  			CL.Init();
  
***************
*** 127,130 ****
--- 133,137 ----
  
  			Com.Printf("====== Quake2 Initialized ======\n\n");
+ 			Jake2.Q2Dialog.dispose();
  
  		} catch (longjmpException e) {

Index: Q2DataDialog.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/Q2DataDialog.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Q2DataDialog.java	18 Sep 2004 12:36:53 -0000	1.1
--- Q2DataDialog.java	19 Sep 2004 19:53:51 -0000	1.2
***************
*** 7,17 ****
  package jake2.qcommon;
  
! import jake2.Globals;
! 
  import java.awt.DisplayMode;
  import java.awt.GraphicsEnvironment;
  import java.io.IOException;
  
  import javax.swing.JFileChooser;
  
  /**
--- 7,18 ----
  package jake2.qcommon;
  
! import java.awt.*;
  import java.awt.DisplayMode;
  import java.awt.GraphicsEnvironment;
  import java.io.IOException;
  
+ import javax.swing.*;
  import javax.swing.JFileChooser;
+ import javax.swing.JPanel;
  
  /**
***************
*** 22,32 ****
      
      /** Creates new form Q2DataDialog */
!     public Q2DataDialog(java.awt.Frame parent, boolean modal) {
!         super(parent, modal);
          initComponents();
!         DisplayMode mode = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice().getDisplayMode();
!         int x = (mode.getWidth() - getWidth()) / 2;
!         int y = (mode.getHeight() - getHeight()) / 2;
!         setLocation(x, y);
      }
      
--- 23,34 ----
      
      /** Creates new form Q2DataDialog */
!     public Q2DataDialog() {
!         super();
          initComponents();
!        
! 		DisplayMode mode = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice().getDisplayMode();
! 		int x = (mode.getWidth() - getWidth()) / 2;
! 		int y = (mode.getHeight() - getHeight()) / 2;
! 		setLocation(x, y);
      }
      
***************
*** 39,44 ****
          java.awt.GridBagConstraints gridBagConstraints;
  
!         jPanel1 = new javax.swing.JPanel();
!         jPanel2 = new javax.swing.JPanel();
          jTextField1 = new javax.swing.JTextField();
          changeButton = new javax.swing.JButton();
--- 41,47 ----
          java.awt.GridBagConstraints gridBagConstraints;
  
!         choosePanel = new javax.swing.JPanel();
!         statusPanel = new JPanel();
!         status = new JLabel("initializing Jake2...");
          jTextField1 = new javax.swing.JTextField();
          changeButton = new javax.swing.JButton();
***************
*** 48,53 ****
  
          setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE);
!         setTitle("Looking for Quake2 level data...");
!         setModal(true);
          setResizable(false);
          addWindowListener(new java.awt.event.WindowAdapter() {
--- 51,56 ----
  
          setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE);
!         setTitle("Jake2 - Bytonic Software");
! 
          setResizable(false);
          addWindowListener(new java.awt.event.WindowAdapter() {
***************
*** 57,72 ****
          });
  
!         jPanel1.setBackground(new java.awt.Color(255, 255, 255));
!         jPanel1.setDoubleBuffered(false);
!         jPanel1.setMaximumSize(new java.awt.Dimension(400, 200));
!         jPanel1.setMinimumSize(new java.awt.Dimension(400, 200));
!         jPanel1.setPreferredSize(new java.awt.Dimension(400, 200));
!         getContentPane().add(jPanel1, java.awt.BorderLayout.CENTER);
! 
!         jPanel2.setLayout(new java.awt.GridBagLayout());
  
!         jPanel2.setMaximumSize(new java.awt.Dimension(400, 100));
!         jPanel2.setMinimumSize(new java.awt.Dimension(400, 100));
!         jPanel2.setPreferredSize(new java.awt.Dimension(400, 100));
          jTextField1.setPreferredSize(null);
          gridBagConstraints = new java.awt.GridBagConstraints();
--- 60,68 ----
          });
  
!         choosePanel.setLayout(new java.awt.GridBagLayout());
  
!         choosePanel.setMaximumSize(new java.awt.Dimension(400, 100));
!         choosePanel.setMinimumSize(new java.awt.Dimension(400, 100));
!         choosePanel.setPreferredSize(new java.awt.Dimension(400, 100));
          jTextField1.setPreferredSize(null);
          gridBagConstraints = new java.awt.GridBagConstraints();
***************
*** 77,81 ****
          gridBagConstraints.insets = new java.awt.Insets(10, 10, 10, 10);
          gridBagConstraints.weightx = 1.0;
!         jPanel2.add(jTextField1, gridBagConstraints);
  
          changeButton.setText("change");
--- 73,77 ----
          gridBagConstraints.insets = new java.awt.Insets(10, 10, 10, 10);
          gridBagConstraints.weightx = 1.0;
!         choosePanel.add(jTextField1, gridBagConstraints);
  
          changeButton.setText("change");
***************
*** 91,95 ****
          gridBagConstraints.insets = new java.awt.Insets(10, 10, 10, 10);
          gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
!         jPanel2.add(changeButton, gridBagConstraints);
  
          installButton.setText("Install");
--- 87,91 ----
          gridBagConstraints.insets = new java.awt.Insets(10, 10, 10, 10);
          gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
!         choosePanel.add(changeButton, gridBagConstraints);
  
          installButton.setText("Install");
***************
*** 105,109 ****
          gridBagConstraints.insets = new java.awt.Insets(10, 10, 10, 10);
          gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
!         jPanel2.add(installButton, gridBagConstraints);
  
          exitButton.setText("Exit");
--- 101,105 ----
          gridBagConstraints.insets = new java.awt.Insets(10, 10, 10, 10);
          gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST;
!         choosePanel.add(installButton, gridBagConstraints);
  
          exitButton.setText("Exit");
***************
*** 118,122 ****
          gridBagConstraints.gridy = 1;
          gridBagConstraints.insets = new java.awt.Insets(10, 10, 10, 10);
!         jPanel2.add(exitButton, gridBagConstraints);
  
          okButton.setText("OK");
--- 114,118 ----
          gridBagConstraints.gridy = 1;
          gridBagConstraints.insets = new java.awt.Insets(10, 10, 10, 10);
!         choosePanel.add(exitButton, gridBagConstraints);
  
          okButton.setText("OK");
***************
*** 132,139 ****
          gridBagConstraints.insets = new java.awt.Insets(10, 10, 10, 10);
          gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
!         jPanel2.add(okButton, gridBagConstraints);
  
!         getContentPane().add(jPanel2, java.awt.BorderLayout.SOUTH);
  
          pack();
      }//GEN-END:initComponents
--- 128,152 ----
          gridBagConstraints.insets = new java.awt.Insets(10, 10, 10, 10);
          gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST;
!         choosePanel.add(okButton, gridBagConstraints);
  
!         //getContentPane().add(choosePanel, java.awt.BorderLayout.SOUTH);
! 
! 		Jake2Canvas c = new Jake2Canvas();
! 		getContentPane().add(c, BorderLayout.CENTER);
  
+ 		statusPanel.setLayout(new java.awt.GridBagLayout());
+ 		statusPanel.setMaximumSize(new java.awt.Dimension(400, 100));
+ 		statusPanel.setMinimumSize(new java.awt.Dimension(400, 100));
+ 		statusPanel.setPreferredSize(new java.awt.Dimension(400, 100));
+ 		gridBagConstraints = new java.awt.GridBagConstraints();
+ 		gridBagConstraints.gridx = 0;
+ 		gridBagConstraints.gridy = 0;
+ 		gridBagConstraints.gridwidth = 1;
+ 		gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
+ 		gridBagConstraints.insets = new java.awt.Insets(10, 10, 10, 10);
+ 		gridBagConstraints.weightx = 1.0;
+ 		statusPanel.add(status, gridBagConstraints);
+ 		getContentPane().add(statusPanel, java.awt.BorderLayout.SOUTH);
+ 						
          pack();
      }//GEN-END:initComponents
***************
*** 146,150 ****
      	System.exit(1);
      	dispose();
- 		notifyAll();
      }//GEN-LAST:event_exitButtonActionPerformed
  
--- 159,162 ----
***************
*** 154,161 ****
      	FS.setCDDir();
      	
!     	synchronized (this) {
!     		notify();
      	}
- 		dispose();
      }//GEN-LAST:event_okButtonActionPerformed
  
--- 166,172 ----
      	FS.setCDDir();
      	
!     	synchronized(this) {
!     		notifyAll();
      	}
      }//GEN-LAST:event_okButtonActionPerformed
  
***************
*** 179,183 ****
      	System.exit(1);
      	dispose();
- 		notifyAll();
      }//GEN-LAST:event_formWindowClosing
      
--- 190,193 ----
***************
*** 186,190 ****
       */
      public static void main(String args[]) {
!         new Q2DataDialog(new javax.swing.JFrame(), true).show();
      }
      
--- 196,201 ----
       */
      public static void main(String args[]) {
!         new Q2DataDialog().show();
!         System.out.println("Hi");
      }
      
***************
*** 193,198 ****
      private javax.swing.JButton exitButton;
      private javax.swing.JButton installButton;
!     private javax.swing.JPanel jPanel1;
!     private javax.swing.JPanel jPanel2;
      private javax.swing.JTextField jTextField1;
      private javax.swing.JButton okButton;
--- 204,211 ----
      private javax.swing.JButton exitButton;
      private javax.swing.JButton installButton;
!     private Jake2Canvas canvas;
!     private javax.swing.JPanel choosePanel;
!     private JPanel statusPanel;
!     private JLabel status;
      private javax.swing.JTextField jTextField1;
      private javax.swing.JButton okButton;
***************
*** 200,202 ****
--- 213,255 ----
      
  	private String dir;
+ 	
+ 	void showChooseDialog() {
+ 		getContentPane().remove(statusPanel);
+ 		getContentPane().add(choosePanel, BorderLayout.SOUTH);
+ 		validate();
+ 		repaint();
+ 	}
+ 	
+ 	void showStatus() {
+ 		getContentPane().remove(choosePanel);
+ 		getContentPane().add(statusPanel, BorderLayout.SOUTH);
+ 		validate();
+ 		repaint();		
+ 	}
+ 	
+ 	void setStatus(String text) {
+ 		status.setText(text);
+ 	}
+ 	
+ 	static class Jake2Canvas extends Canvas {
+ 		private Image image;
+ 		Jake2Canvas() {
+ 			setSize(400, 200);
+ 			image = Toolkit.getDefaultToolkit().getImage(getClass().getResource("/splash.png"));
+ 			while (!Toolkit.getDefaultToolkit().prepareImage(image, -1, -1, null)) {
+ 				try {
+ 					Thread.sleep(50);
+ 				} catch (InterruptedException e) {}
+ 			} 
+ 		}
+ 		
+ 		
+ 		/* (non-Javadoc)
+ 		 * @see java.awt.Component#paint(java.awt.Graphics)
+ 		 */
+ 		public void paint(Graphics g) {
+ 			g.drawImage(image, 0, 0, null);
+ 		}
+ 
+ 	}
  }

Index: Q2DataTest.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/Q2DataTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Q2DataTest.java	18 Sep 2004 12:36:53 -0000	1.1
--- Q2DataTest.java	19 Sep 2004 19:53:51 -0000	1.2
***************
*** 7,10 ****
--- 7,12 ----
  package jake2.qcommon;
  
+ import jake2.Jake2;
+ 
  /**
   * Q2DataTest
***************
*** 14,23 ****
  	static void run() {
  		while (FS.LoadFile("pics/colormap.pcx") == null) {
! 			Q2DataDialog d = new Q2DataDialog(null, true);
! 			d.setVisible(true);
  			try {
! 				d.wait();
! 			} catch (Exception e) {}
  		}
  	}
  }
--- 16,28 ----
  	static void run() {
  		while (FS.LoadFile("pics/colormap.pcx") == null) {
! 			Jake2.Q2Dialog.showChooseDialog();
! 			
  			try {
! 				synchronized(Jake2.Q2Dialog) {
! 					Jake2.Q2Dialog.wait();
! 				}
! 			} catch (InterruptedException e) {}
  		}
+ 		Jake2.Q2Dialog.showStatus();
  	}
  }

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

[Holger Z. <hz...@us...>]

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

Modified Files:
	Jake2.java 
Log Message:
splash screen with status messages

Index: Jake2.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/Jake2.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Jake2.java	9 Jul 2004 06:50:51 -0000	1.3
--- Jake2.java	19 Sep 2004 19:53:51 -0000	1.4
***************
*** 27,30 ****
--- 27,31 ----
  
  import jake2.client.SCR;
+ import jake2.qcommon.*;
  import jake2.qcommon.Cvar;
  import jake2.qcommon.Qcommon;
***************
*** 36,40 ****
  public final class Jake2 {
  
! 
  	/**
  	 * main is used to start the game. Quake2 for Java supports the 
--- 37,42 ----
  public final class Jake2 {
  
! 	public static Q2DataDialog Q2Dialog = new Q2DataDialog();
! 	
  	/**
  	 * main is used to start the game. Quake2 for Java supports the 
***************
*** 44,47 ****
--- 46,51 ----
  	public static void main(String[] args) {
  
+ 		Q2Dialog.setVisible(true);
+ 		
  		// in C the first arg is the filename
  		int argc = (args == null) ? 1 : args.length + 1;

[Jake2-commits] jake2 build.xml,1.9,1.10

[Holger Z. <hz...@us...>]

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

Modified Files:
	build.xml 
Log Message:
add resources to jake2.jar

Index: build.xml
===================================================================
RCS file: /cvsroot/jake2/jake2/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** build.xml	19 Sep 2004 10:21:53 -0000	1.9
--- build.xml	19 Sep 2004 12:49:45 -0000	1.10
***************
*** 48,52 ****
  		</javac>
  	</target>
! 		
  	<!-- copy files -->
  	<target name="copy">
--- 48,61 ----
  		</javac>
  	</target>
! 	
! 	<!-- copy resources -->
! 	<target name="copyres" depends="init">
! 		<copy todir="${build}">
! 			<fileset dir="resources">
! 				<include name="**/*"/>
! 			</fileset>
! 		</copy>
! 	</target>
! 	
  	<!-- copy files -->
  	<target name="copy">
***************
*** 99,105 ****
  		
  	<!-- jar -->
! 	<target name="jar" depends="compile">
  		<jar destfile="${dist}/lib/jake.jar" basedir="${build}">
! 			<include name="jake2/**"/>
  		</jar>
  		<proguard printseeds="on" printusage="off" outjar="${dist}/lib/jake2.jar"
--- 108,114 ----
  		
  	<!-- jar -->
! 	<target name="jar" depends="compile,copyres">
  		<jar destfile="${dist}/lib/jake.jar" basedir="${build}">
! 			<include name="**"/>
  		</jar>
  		<proguard printseeds="on" printusage="off" outjar="${dist}/lib/jake2.jar"

[Jake2-commits] jake2 .classpath,1.3,1.4

[Holger Z. <hz...@us...>]

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

Modified Files:
	.classpath 
Log Message:
add resources to classpath

Index: .classpath
===================================================================
RCS file: /cvsroot/jake2/jake2/.classpath,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** .classpath	9 Jul 2004 06:50:48 -0000	1.3
--- .classpath	19 Sep 2004 12:48:53 -0000	1.4
***************
*** 7,10 ****
--- 7,11 ----
      <classpathentry kind="lib" path="lib/joal/windows/joal.jar"/>
      <classpathentry kind="lib" path="lib/jogl/jogl.jar"/>
+     <classpathentry kind="lib" path="resources"/>
      <classpathentry kind="output" path="build"/>
  </classpath>

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

[Holger Z. <hz...@us...>]

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

Modified Files:
	JoglBase.java 
Log Message:
set Icon

Index: JoglBase.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/JoglBase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** JoglBase.java	23 Aug 2004 20:49:12 -0000	1.7
--- JoglBase.java	19 Sep 2004 12:47:49 -0000	1.8
***************
*** 39,44 ****
--- 39,47 ----
  import java.util.LinkedList;
  
+ import javax.swing.ImageIcon;
  import javax.swing.JFrame;
  
+ import com.sun.rsasign.t;
+ 
  import net.java.games.jogl.*;
  import net.java.games.jogl.util.GLUT;
***************
*** 194,197 ****
--- 197,203 ----
  
  		window = new JFrame("Jake2");
+ 		ImageIcon icon = new ImageIcon(getClass().getResource("/icon-small.png"));
+ 		window.setIconImage(icon.getImage());
+ 		
  		GLCanvas canvas = GLDrawableFactory.getFactory().createGLCanvas(new GLCapabilities());
  

[Jake2-commits] jake2/resources icon-small.png,NONE,1.1 splash.png,NONE,1.1 icon.png,NONE,1.1

[Holger Z. <hz...@us...>]

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

Added Files:
	icon-small.png splash.png icon.png 
Log Message:
images and icons

--- NEW FILE: splash.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon-small.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: icon.png ---
(This appears to be a binary file; contents omitted.)

[Jake2-commits] jake2/resources - New directory

[Holger Z. <hz...@us...>]

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

Log Message:
Directory /cvsroot/jake2/jake2/resources added to the repository

[Jake2-commits] jake2 build.xml,1.8,1.9

[Holger Z. <hz...@us...>]

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

Modified Files:
	build.xml 
Log Message:
use property for keystore password

Index: build.xml
===================================================================
RCS file: /cvsroot/jake2/jake2/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** build.xml	19 Sep 2004 09:40:16 -0000	1.8
--- build.xml	19 Sep 2004 10:21:53 -0000	1.9
***************
*** 198,202 ****
  			<include name="OpenAL32.dll"/>
  		</jar>
! 		<signjar keystore="${user.home}/bytonic" alias="hoz" storepass="">
  			<fileset dir="webstart/lib">
  				<include name="**/*.jar"/>
--- 198,202 ----
  			<include name="OpenAL32.dll"/>
  		</jar>
! 		<signjar keystore="${user.home}/bytonic" alias="hoz" storepass="${bytonic.pass}">
  			<fileset dir="webstart/lib">
  				<include name="**/*.jar"/>

[Jake2-commits] jake2/webstart .cvsignore,NONE,1.1

[Holger Z. <hz...@us...>]

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

Added Files:
	.cvsignore 
Log Message:


--- NEW FILE: .cvsignore ---
lib

[Jake2-commits] jake2/webstart jake2.jnlp,NONE,1.1

[Holger Z. <hz...@us...>]

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

Added Files:
	jake2.jnlp 
Log Message:
webstart file

--- NEW FILE: jake2.jnlp ---
<?xml version="1.0" encoding="utf-8"?>
<jnlp spec="1.0+" 
	codebase="http://hoz.in-chemnitz.de/jake2"
	href="jake2.jnlp">
	
	<information>
		<title>Jake2</title>
		<vendor>Bytonic Software</vendor>
		<homepage href="http://www.bytonic.de/html/jake2.html"/>
		<description>Java port of the Quake2 game engine</description>
		<offline-allowed/>
	</information>
	
	<security>
		<all-permissions/>
	</security>
	
	<resources>
		<j2se version="1.4+" max-heap-size="128M"/>
		<jar href="lib/jake2.jar"/>
		<jar href="lib/jogl.jar"/>
		<property name="sun.java2d.noddraw" value="true"/>
	</resources>
	
	<resources os="Linux">
		<j2se version="1.4+" max-heap-size="128M"/>
		<jar href="lib/linux/joal.jar"/>
		<nativelib href="lib/linux/jogl-native.jar"/>
		<nativelib href="lib/linux/joal-native.jar"/>
	</resources>
	
	<resources os="Windows">
		<j2se version="1.4+" max-heap-size="128M"/>
		<jar href="lib/windows/joal.jar"/>
		<nativelib href="lib/windows/jogl-native.jar"/>
		<nativelib href="lib/windows/joal-native.jar"/>
	</resources>

	<application-desc main-class="jake2.Jake2"/> 

</jnlp>

[Jake2-commits] jake2/webstart - New directory

[Holger Z. <hz...@us...>]

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

Log Message:
Directory /cvsroot/jake2/jake2/webstart added to the repository

[Jake2-commits] jake2 build.xml,1.7,1.8

[Holger Z. <hz...@us...>]

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

Modified Files:
	build.xml 
Log Message:
build signed webstart jars

Index: build.xml
===================================================================
RCS file: /cvsroot/jake2/jake2/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** build.xml	8 Sep 2004 21:10:04 -0000	1.7
--- build.xml	19 Sep 2004 09:40:16 -0000	1.8
***************
*** 176,179 ****
--- 176,208 ----
  	</target>
  	
+ 	<!-- webstart -->
+ 	<target name="webstart" depends="dist">
+ 		<mkdir dir="webstart/lib"/>
+ 		<copy todir="webstart/lib">
+ 			<fileset dir="${dist}/lib">
+ 				<include name="**/*.jar"/>
+ 			</fileset>
+ 		</copy>
+ 		<jar destfile="webstart/lib/linux/jogl-native.jar" basedir="${dist}/lib/linux">
+ 			<include name="libjogl*.so"/>
+ 		</jar>
+ 		<jar destfile="webstart/lib/linux/joal-native.jar" basedir="${dist}/lib/linux">
+ 			<include name="libjoal.so"/>
+ 			<include name="libopenal.so"/>
+ 		</jar>
+ 		<jar destfile="webstart/lib/windows/jogl-native.jar" basedir="${dist}/lib/windows">
+ 			<include name="jogl*.dll"/>
+ 		</jar>
+ 		<jar destfile="webstart/lib/windows/joal-native.jar" basedir="${dist}/lib/windows">
+ 			<include name="joal.dll"/>
+ 			<include name="OpenAL32.dll"/>
+ 		</jar>
+ 		<signjar keystore="${user.home}/bytonic" alias="hoz" storepass="">
+ 			<fileset dir="webstart/lib">
+ 				<include name="**/*.jar"/>
+ 			</fileset>
+ 		</signjar>
+ 	</target>
+ 	
  	<!-- clean -->
  	<target name="clean">
***************
*** 184,187 ****
--- 213,217 ----
  	<target name="distclean" depends="clean">
  		<delete dir="${dist}"/>
+ 		<delete dir="webstart/lib"/>
  		<delete>
  			<fileset dir=".">

[Jake2-commits] jake2/src/jake2/sound/joal JOALSoundImpl.java,1.3,1.4

[Holger Z. <hz...@us...>]

Update of /cvsroot/jake2/jake2/src/jake2/sound/joal
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13504/src/jake2/sound/joal

Modified Files:
	JOALSoundImpl.java 
Log Message:
preload OpenAL native library,  installation in 
LD_LIBRARY_PATH isn't required anymore

Index: JOALSoundImpl.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/sound/joal/JOALSoundImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JOALSoundImpl.java	4 Sep 2004 14:25:32 -0000	1.3
--- JOALSoundImpl.java	19 Sep 2004 09:12:20 -0000	1.4
***************
*** 56,59 ****
--- 56,67 ----
  	public boolean Init() {
  		
+ 		// preload OpenAL native library
+ 		String os = System.getProperty("os.name");
+ 		if (os.startsWith("Linux")) {
+ 			System.loadLibrary("openal");	
+ 		} else if (os.startsWith("Windows")) {
+ 			System.loadLibrary("OpenAL32");
+ 		}
+ 		
  		try {
  			initOpenAL();