Menu
▾
▴
jake2-commits — Jake2 cvs commits
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(52) |
Aug
(34) |
Sep
(99) |
Oct
(110) |
Nov
(21) |
Dec
(69) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(117) |
Feb
(90) |
Mar
(1) |
Apr
(22) |
May
(96) |
Jun
(25) |
Jul
(22) |
Aug
|
Sep
|
Oct
(18) |
Nov
(43) |
Dec
(71) |
| 2006 |
Jan
(20) |
Feb
(10) |
Mar
|
Apr
(4) |
May
(2) |
Jun
|
Jul
|
Aug
(3) |
Sep
|
Oct
(60) |
Nov
(63) |
Dec
(35) |
| 2007 |
Jan
(18) |
Feb
(40) |
Mar
(14) |
Apr
(18) |
May
(33) |
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2008 |
Jan
|
Feb
(1) |
Mar
(25) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(5) |
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(15) |
Aug
|
Sep
|
Oct
|
Nov
(3) |
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Carsten W. <ca...@us...> - 2008-03-01 17:42:54
|
Update of /cvsroot/jake2/jake2/.settings In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24858/.settings Modified Files: org.eclipse.jdt.ui.prefs Log Message: version of eclipse 3.3 formatter settings changed Index: org.eclipse.jdt.ui.prefs =================================================================== RCS file: /cvsroot/jake2/jake2/.settings/org.eclipse.jdt.ui.prefs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** org.eclipse.jdt.ui.prefs 10 Jan 2007 14:38:40 -0000 1.2 --- org.eclipse.jdt.ui.prefs 1 Mar 2008 17:42:47 -0000 1.3 *************** *** 1,6 **** ! #Wed Jan 10 14:09:23 CET 2007 eclipse.preferences.version=1 formatter_profile=org.eclipse.jdt.ui.default.sun_profile ! formatter_settings_version=10 org.eclipse.jdt.ui.ignorelowercasenames=true org.eclipse.jdt.ui.importorder=java;javax;org;com; --- 1,6 ---- ! #Sat Mar 01 18:36:38 GMT+01:00 2008 eclipse.preferences.version=1 formatter_profile=org.eclipse.jdt.ui.default.sun_profile ! formatter_settings_version=11 org.eclipse.jdt.ui.ignorelowercasenames=true org.eclipse.jdt.ui.importorder=java;javax;org;com; |
|
From: Holger Z. <hz...@us...> - 2008-02-25 19:26:37
|
Update of /cvsroot/jake2/CVSROOT In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv8014/CVSROOT Modified Files: avail Log Message: add Ken Russel Index: avail =================================================================== RCS file: /cvsroot/jake2/CVSROOT/avail,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** avail 16 Dec 2004 22:01:29 -0000 1.2 --- avail 25 Feb 2008 19:26:30 -0000 1.3 *************** *** 1,4 **** unavail avail|hzi ! avail|cawe, salomo|jake2 avail|dsanders1234|jake2/src/jake2/render/lwjgl, jake2/src/jake2/sound/lwjgl --- 1,4 ---- unavail avail|hzi ! avail|cawe, salomo, kbrussel|jake2 avail|dsanders1234|jake2/src/jake2/render/lwjgl, jake2/src/jake2/sound/lwjgl |
|
From: Carsten W. <ca...@us...> - 2007-11-03 13:04:30
|
Update of /cvsroot/jake2/jake2/src/jake2/render/opengl In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv29019/src/jake2/render/opengl Modified Files: LwjglDriver.java Jsr231Driver.java Jsr231cbDriver.java Log Message: set new window location only in fullscreen mode Index: Jsr231cbDriver.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/render/opengl/Jsr231cbDriver.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Jsr231cbDriver.java 11 Dec 2006 13:00:37 -0000 1.2 --- Jsr231cbDriver.java 3 Nov 2007 13:04:23 -0000 1.3 *************** *** 195,199 **** canvas.setAutoSwapBufferMode(false); - canvas.setAutoSwapBufferMode(false); canvas.addGLEventListener(this); --- 195,198 ---- *************** *** 237,241 **** } else { ! window.setLocation(window_xpos, window_ypos); window.pack(); window.setResizable(false); --- 236,240 ---- } else { ! //window.setLocation(window_xpos, window_ypos); window.pack(); window.setResizable(false); Index: LwjglDriver.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/render/opengl/LwjglDriver.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** LwjglDriver.java 14 Feb 2007 19:50:48 -0000 1.4 --- LwjglDriver.java 3 Nov 2007 13:04:23 -0000 1.5 *************** *** 220,224 **** Display.setTitle("Jake2 (lwjgl)"); - Display.setLocation(0, 0); DisplayMode displayMode = findDisplayMode(newDim); --- 220,223 ---- *************** *** 256,260 **** return Base.rserr_invalid_fullscreen; } ! Display.setLocation(window_xpos, window_ypos); } --- 255,259 ---- return Base.rserr_invalid_fullscreen; } ! //Display.setLocation(window_xpos, window_ypos); } Index: Jsr231Driver.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/render/opengl/Jsr231Driver.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** Jsr231Driver.java 12 Dec 2006 13:18:44 -0000 1.24 --- Jsr231Driver.java 3 Nov 2007 13:04:23 -0000 1.25 *************** *** 208,212 **** EventQueue.invokeAndWait(new Runnable() { public void run() { ! f2.setLocation(window_xpos, window_ypos); f2.pack(); f2.setResizable(false); --- 208,212 ---- EventQueue.invokeAndWait(new Runnable() { public void run() { ! //f2.setLocation(window_xpos, window_ypos); f2.pack(); f2.setResizable(false); |
|
From: Carsten W. <ca...@us...> - 2007-06-07 10:31:16
|
Update of /cvsroot/jake2/jake2/src/jake2/server In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv30060/src/jake2/server Modified Files: SV_CCMDS.java Log Message: code clean up (shift the variable declarations down) Index: SV_CCMDS.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/server/SV_CCMDS.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** SV_CCMDS.java 3 Dec 2005 19:45:42 -0000 1.15 --- SV_CCMDS.java 7 Jun 2007 10:31:10 -0000 1.16 *************** *** 178,186 **** public static void SV_WipeSavegame(String savename) { ! String name, s; ! ! Com.DPrintf("SV_WipeSaveGame(" + savename + ")\n"); ! name = FS.Gamedir() + "/save/" + savename + "/server.ssv"; remove(name); --- 178,184 ---- public static void SV_WipeSavegame(String savename) { ! Com.DPrintf("SV_WipeSaveGame(" + savename + ")\n"); ! String name = FS.Gamedir() + "/save/" + savename + "/server.ssv"; remove(name); *************** *** 278,286 **** */ public static void SV_CopySaveGame(String src, String dst) { - //char name[MAX_OSPATH], name2[MAX_OSPATH]; - int l, len; - File found; - - String name, name2; Com.DPrintf("SV_CopySaveGame(" + src + "," + dst + ")\n"); --- 276,279 ---- *************** *** 289,294 **** // copy the savegame over ! name = FS.Gamedir() + "/save/" + src + "/server.ssv"; ! name2 = FS.Gamedir() + "/save/" + dst + "/server.ssv"; FS.CreatePath(name2); CopyFile(name, name2); --- 282,287 ---- // copy the savegame over ! String name = FS.Gamedir() + "/save/" + src + "/server.ssv"; ! String name2 = FS.Gamedir() + "/save/" + dst + "/server.ssv"; FS.CreatePath(name2); CopyFile(name, name2); *************** *** 299,306 **** String name1 = FS.Gamedir() + "/save/" + src + "/"; - len = name1.length(); name = FS.Gamedir() + "/save/" + src + "/*.sav"; ! found = Sys.FindFirst(name, 0, 0); while (found != null) { --- 292,298 ---- String name1 = FS.Gamedir() + "/save/" + src + "/"; name = FS.Gamedir() + "/save/" + src + "/*.sav"; ! File found = Sys.FindFirst(name, 0, 0); while (found != null) { *************** *** 461,465 **** */ public static void SV_ReadServerFile() { ! String filename="", name = "", string, comment, mapcmd; try { QuakeFile f; --- 453,457 ---- */ public static void SV_ReadServerFile() { ! String filename="", name = "", string, mapcmd; try { QuakeFile f; *************** *** 473,478 **** f = new QuakeFile(filename, "r"); ! // read the comment field ! comment = f.readString(); // read the mapcmd --- 465,470 ---- f = new QuakeFile(filename, "r"); ! // read the comment field but ignore ! f.readString(); // read the mapcmd *************** *** 538,545 **** */ public static void SV_GameMap_f() { - String map; - int i; - client_t cl; - boolean savedInuse[]; if (Cmd.Argc() != 2) { --- 530,533 ---- *************** *** 553,557 **** // check for clearing the current savegame ! map = Cmd.Argv(1); if (map.charAt(0) == '*') { // wipe all the *.sav files --- 541,545 ---- // check for clearing the current savegame ! String map = Cmd.Argv(1); if (map.charAt(0) == '*') { // wipe all the *.sav files *************** *** 563,568 **** // when the level is re-entered, the clients will spawn // at spawn points instead of occupying body shells ! savedInuse = new boolean[(int) SV_MAIN.maxclients.value]; ! for (i = 0; i < SV_MAIN.maxclients.value; i++) { cl = SV_INIT.svs.clients[i]; savedInuse[i] = cl.edict.inuse; --- 551,557 ---- // when the level is re-entered, the clients will spawn // at spawn points instead of occupying body shells ! client_t cl; ! boolean[] savedInuse = new boolean[(int) SV_MAIN.maxclients.value]; ! for (int i = 0; i < SV_MAIN.maxclients.value; i++) { cl = SV_INIT.svs.clients[i]; savedInuse[i] = cl.edict.inuse; *************** *** 573,577 **** // we must restore these for clients to transfer over correctly ! for (i = 0; i < SV_MAIN.maxclients.value; i++) { cl = SV_INIT.svs.clients[i]; cl.edict.inuse = savedInuse[i]; --- 562,566 ---- // we must restore these for clients to transfer over correctly ! for (int i = 0; i < SV_MAIN.maxclients.value; i++) { cl = SV_INIT.svs.clients[i]; cl.edict.inuse = savedInuse[i]; *************** *** 639,646 **** public static void SV_Loadgame_f() { - String name; - RandomAccessFile f; - String dir; - if (Cmd.Argc() != 2) { Com.Printf("USAGE: loadgame <directory>\n"); --- 628,631 ---- *************** *** 650,654 **** Com.Printf("Loading game...\n"); ! dir = Cmd.Argv(1); if ( (dir.indexOf("..") > -1) || (dir.indexOf("/") > -1) || (dir.indexOf("\\") > -1)) { Com.Printf("Bad savedir.\n"); --- 635,639 ---- Com.Printf("Loading game...\n"); ! String dir = Cmd.Argv(1); if ( (dir.indexOf("..") > -1) || (dir.indexOf("/") > -1) || (dir.indexOf("\\") > -1)) { Com.Printf("Bad savedir.\n"); *************** *** 656,660 **** // make sure the server.ssv file exists ! name = FS.Gamedir() + "/save/" + Cmd.Argv(1) + "/server.ssv"; try { f = new RandomAccessFile(name, "r"); --- 641,646 ---- // make sure the server.ssv file exists ! String name = FS.Gamedir() + "/save/" + Cmd.Argv(1) + "/server.ssv"; ! RandomAccessFile f; try { f = new RandomAccessFile(name, "r"); |
|
From: Carsten W. <ca...@us...> - 2007-06-07 10:22:18
|
Update of /cvsroot/jake2/jake2/src/jake2/server In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv25769/src/jake2/server Modified Files: SV_ENTS.java Log Message: code clean up and set the buffer final Index: SV_ENTS.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/server/SV_ENTS.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** SV_ENTS.java 14 May 2007 23:37:00 -0000 1.8 --- SV_ENTS.java 7 Jun 2007 10:22:07 -0000 1.9 *************** *** 21,26 **** // Created on 17.01.2004 by RST. - // $Id$ - package jake2.server; --- 21,24 ---- *************** *** 140,150 **** static void SV_WritePlayerstateToClient(client_frame_t from, client_frame_t to, sizebuf_t msg) { - int i; - int pflags; // ptr player_state_t ps, ops; // mem player_state_t dummy; - int statbits; ps = to.ps; --- 138,145 ---- *************** *** 153,161 **** dummy = new player_state_t(); ops = dummy; ! } else ops = from.ps; // determine what needs to be sent ! pflags = 0; if (ps.pmove.pm_type != ops.pmove.pm_type) --- 148,157 ---- dummy = new player_state_t(); ops = dummy; ! } else { ops = from.ps; + } // determine what needs to be sent ! int pflags = 0; if (ps.pmove.pm_type != ops.pmove.pm_type) *************** *** 296,305 **** // send stats ! statbits = 0; ! for (i = 0; i < Defines.MAX_STATS; i++) if (ps.stats[i] != ops.stats[i]) statbits |= 1 << i; MSG.WriteLong(msg, statbits); ! for (i = 0; i < Defines.MAX_STATS; i++) if ((statbits & (1 << i)) != 0) MSG.WriteShort(msg, ps.stats[i]); --- 292,301 ---- // send stats ! int statbits = 0; ! for (int i = 0; i < Defines.MAX_STATS; i++) if (ps.stats[i] != ops.stats[i]) statbits |= 1 << i; MSG.WriteLong(msg, statbits); ! for (int i = 0; i < Defines.MAX_STATS; i++) if ((statbits & (1 << i)) != 0) MSG.WriteShort(msg, ps.stats[i]); *************** *** 537,541 **** // stack variable ! private static byte buf_data[] = new byte[32768]; /** --- 533,537 ---- // stack variable ! private static final byte buf_data[] = new byte[32768]; /** |
|
From: Carsten W. <ca...@us...> - 2007-05-14 23:38:18
|
Update of /cvsroot/jake2/jake2/src/jake2/client In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv5638/src/jake2/client Modified Files: CL.java Log Message: define variables late Index: CL.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL.java,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** CL.java 18 Dec 2005 22:10:10 -0000 1.29 --- CL.java 14 May 2007 23:38:15 -0000 1.30 *************** *** 626,631 **** */ static void CheckForResend() { - netadr_t adr = new netadr_t(); - // if the local server is running and we aren't // then connect --- 626,629 ---- *************** *** 646,649 **** --- 644,648 ---- return; + netadr_t adr = new netadr_t(); if (!NET.StringToAdr(Globals.cls.servername, adr)) { Com.Printf("Bad server address\n"); |
|
From: Carsten W. <ca...@us...> - 2007-05-14 23:37:13
|
Update of /cvsroot/jake2/jake2/src/jake2/server In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv4884/src/jake2/server Modified Files: SV_ENTS.java Log Message: this was the biggest garbage producer (32KB each frame), now fixed Index: SV_ENTS.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/server/SV_ENTS.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** SV_ENTS.java 27 Dec 2005 21:02:30 -0000 1.7 --- SV_ENTS.java 14 May 2007 23:37:00 -0000 1.8 *************** *** 535,538 **** --- 535,542 ---- } + + // stack variable + private static byte buf_data[] = new byte[32768]; + /** * Save everything in the world out without deltas. Used for recording *************** *** 540,554 **** */ public static void SV_RecordDemoMessage() { - int e; - edict_t ent; - entity_state_t nostate = new entity_state_t(null); - sizebuf_t buf = new sizebuf_t(); - byte buf_data[] = new byte[32768]; - int len; - if (SV_INIT.svs.demofile == null) return; //memset (nostate, 0, sizeof(nostate)); SZ.Init(buf, buf_data, buf_data.length); --- 544,553 ---- */ public static void SV_RecordDemoMessage() { if (SV_INIT.svs.demofile == null) return; //memset (nostate, 0, sizeof(nostate)); + entity_state_t nostate = new entity_state_t(null); + sizebuf_t buf = new sizebuf_t(); SZ.Init(buf, buf_data, buf_data.length); *************** *** 559,564 **** MSG.WriteByte(buf, Defines.svc_packetentities); ! e = 1; ! ent = GameBase.g_edicts[e]; while (e < GameBase.num_edicts) { --- 558,563 ---- MSG.WriteByte(buf, Defines.svc_packetentities); ! int e = 1; ! edict_t ent = GameBase.g_edicts[e]; while (e < GameBase.num_edicts) { *************** *** 583,587 **** // now write the entire message to the file, prefixed by the length ! len = EndianHandler.swapInt(buf.cursize); try { --- 582,586 ---- // now write the entire message to the file, prefixed by the length ! int len = EndianHandler.swapInt(buf.cursize); try { |
|
From: Carsten W. <ca...@us...> - 2007-05-14 22:29:35
|
Update of /cvsroot/jake2/jake2/src/jake2/qcommon In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv7711/src/jake2/qcommon Modified Files: Cvar.java Log Message: use Lib.atof instead Index: Cvar.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/Cvar.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Cvar.java 27 Dec 2005 21:02:30 -0000 1.9 --- Cvar.java 14 May 2007 22:29:30 -0000 1.10 *************** *** 78,87 **** var.string = new String(var_value); var.modified = true; ! // handles atof(var.string) ! try { ! var.value = Float.parseFloat(var.string); ! } catch (NumberFormatException e) { ! var.value = 0.0f; ! } // link the variable in var.next = Globals.cvar_vars; --- 78,82 ---- var.string = new String(var_value); var.modified = true; ! var.value = Lib.atof(var.string); // link the variable in var.next = Globals.cvar_vars; *************** *** 132,141 **** var.string = value; ! try { ! var.value = Float.parseFloat(var.string); ! } catch (Exception e) { ! var.value = 0.0f; ! } ! var.flags = flags; --- 127,131 ---- var.string = value; ! var.value = Lib.atof(var.string); var.flags = flags; *************** *** 197,205 **** } else { var.string = value; ! try { ! var.value = Float.parseFloat(var.string); ! } catch (Exception e) { ! var.value = 0.0f; ! } if (var.name.equals("game")) { FS.SetGamedir(var.string); --- 187,191 ---- } else { var.string = value; ! var.value = Lib.atof(var.string); if (var.name.equals("game")) { FS.SetGamedir(var.string); *************** *** 326,335 **** if (var == null) return 0; ! float val = 0.0f; ! try { ! val = Float.parseFloat(var.string); ! } catch (Exception e) { ! } ! return val; } --- 312,317 ---- if (var == null) return 0; ! ! return Lib.atof(var.string); } *************** *** 387,395 **** var.string = var.latched_string; var.latched_string = null; ! try { ! var.value = Float.parseFloat(var.string); ! } catch (NumberFormatException e) { ! var.value = 0.0f; ! } if (var.name.equals("game")) { FS.SetGamedir(var.string); --- 369,373 ---- var.string = var.latched_string; var.latched_string = null; ! var.value = Lib.atof(var.string); if (var.name.equals("game")) { FS.SetGamedir(var.string); |
|
From: Carsten W. <ca...@us...> - 2007-05-14 22:29:35
|
Update of /cvsroot/jake2/jake2/src/jake2/client In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv7711/src/jake2/client Modified Files: CL_pred.java Log Message: use Lib.atof instead Index: CL_pred.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL_pred.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CL_pred.java 4 Oct 2004 12:50:37 -0000 1.6 --- CL_pred.java 14 May 2007 22:29:30 -0000 1.7 *************** *** 30,33 **** --- 30,34 ---- import jake2.game.*; import jake2.qcommon.*; + import jake2.util.Lib; import jake2.util.Math3D; *************** *** 252,261 **** }; ! try { ! PMove.pm_airaccelerate = Float ! .parseFloat(Globals.cl.configstrings[Defines.CS_AIRACCEL]); ! } catch (Exception e) { ! PMove.pm_airaccelerate = 0; ! } // bugfix (rst) yeah !!!!!!!! found the solution to the B E W E G U N G --- 253,257 ---- }; ! PMove.pm_airaccelerate = Lib.atof(Globals.cl.configstrings[Defines.CS_AIRACCEL]); // bugfix (rst) yeah !!!!!!!! found the solution to the B E W E G U N G |
|
From: Carsten W. <ca...@us...> - 2007-05-14 22:18:35
|
Update of /cvsroot/jake2/jake2/src/jake2/util In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv3316/src/jake2/util Modified Files: Lib.java Log Message: better empty string handling without throwing a exception Index: Lib.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/util/Lib.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Lib.java 18 Dec 2005 22:10:12 -0000 1.18 --- Lib.java 14 May 2007 22:18:29 -0000 1.19 *************** *** 76,88 **** /** Like in libc. */ public static float atof(String in) { ! float res = 0; ! try { ! res = Float.parseFloat(in); ! } ! catch (Exception e) { } - - return res; } --- 76,86 ---- /** Like in libc. */ public static float atof(String in) { ! if (in == null || in.length() == 0) ! return 0; try { ! return Float.parseFloat(in); ! } catch (Exception e) { ! return 0; } } |
|
From: Carsten W. <ca...@us...> - 2007-05-13 00:07:39
|
Update of /cvsroot/jake2/jake2/src/jake2/client In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv17758/src/jake2/client Modified Files: SCR.java Added Files: LayoutParser.java Log Message: add a new layout string parser to minimize the String garbage Index: SCR.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/SCR.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** SCR.java 27 Feb 2007 14:00:34 -0000 1.19 --- SCR.java 13 May 2007 00:07:34 -0000 1.20 *************** *** 32,36 **** import jake2.sound.S; import jake2.sys.Timer; - import jake2.util.Lib; import jake2.util.Vargs; --- 32,35 ---- *************** *** 827,831 **** AddDirtyPoint(x + width * CHAR_WIDTH + 2, y + 23); ! num = "" + value; l = num.length(); if (l > width) --- 826,830 ---- AddDirtyPoint(x + width * CHAR_WIDTH + 2, y + 23); ! num = String.valueOf(value); l = num.length(); if (l > width) *************** *** 873,876 **** --- 872,876 ---- } + private static LayoutParser layoutParser = new LayoutParser(); /* * ================ SCR_ExecuteLayoutString *************** *** 879,939 **** */ static void ExecuteLayoutString(String s) { - int x, y; - int value; - String token; - int width; - int index; - clientinfo_t ci; if (cls.state != ca_active || !cl.refresh_prepped) return; - // if (!s[0]) if (s == null || s.length() == 0) return; ! x = 0; ! y = 0; ! width = 3; ! Com.ParseHelp ph = new Com.ParseHelp(s); ! while (!ph.isEof()) { ! token = Com.Parse(ph); ! if (token.equals("xl")) { ! token = Com.Parse(ph); ! x = Lib.atoi(token); continue; } ! if (token.equals("xr")) { ! token = Com.Parse(ph); ! x = viddef.width + Lib.atoi(token); continue; } ! if (token.equals("xv")) { ! token = Com.Parse(ph); ! x = viddef.width / 2 - 160 + Lib.atoi(token); continue; } ! if (token.equals("yt")) { ! token = Com.Parse(ph); ! y = Lib.atoi(token); continue; } ! if (token.equals("yb")) { ! token = Com.Parse(ph); ! y = viddef.height + Lib.atoi(token); continue; } ! if (token.equals("yv")) { ! token = Com.Parse(ph); ! y = viddef.height / 2 - 120 + Lib.atoi(token); continue; } ! if (token.equals("pic")) { // draw a pic from a stat number ! token = Com.Parse(ph); ! value = cl.frame.playerstate.stats[Lib.atoi(token)]; if (value >= MAX_IMAGES) Com.Error(ERR_DROP, "Pic >= MAX_IMAGES"); --- 879,934 ---- */ static void ExecuteLayoutString(String s) { if (cls.state != ca_active || !cl.refresh_prepped) return; if (s == null || s.length() == 0) return; ! int x = 0; ! int y = 0; ! int width = 3; ! int value; ! LayoutParser parser = layoutParser; ! parser.init(s); ! while (parser.hasNext()) { ! parser.next(); ! if (parser.tokenEquals("xl")) { ! parser.next(); ! x = parser.tokenAsInt(); continue; } ! if (parser.tokenEquals("xr")) { ! parser.next(); ! x = viddef.width + parser.tokenAsInt(); continue; } ! if (parser.tokenEquals("xv")) { ! parser.next(); ! x = viddef.width / 2 - 160 + parser.tokenAsInt(); continue; } ! if (parser.tokenEquals("yt")) { ! parser.next(); ! y = parser.tokenAsInt(); continue; } ! if (parser.tokenEquals("yb")) { ! parser.next(); ! y = viddef.height + parser.tokenAsInt(); continue; } ! if (parser.tokenEquals("yv")) { ! parser.next(); ! y = viddef.height / 2 - 120 + parser.tokenAsInt(); continue; } ! if (parser.tokenEquals("pic")) { // draw a pic from a stat number ! parser.next(); ! value = cl.frame.playerstate.stats[parser.tokenAsInt()]; if (value >= MAX_IMAGES) Com.Error(ERR_DROP, "Pic >= MAX_IMAGES"); *************** *** 946,973 **** } ! if (token.equals("client")) { // draw a deathmatch client block int score, ping, time; ! token = Com.Parse(ph); ! x = viddef.width / 2 - 160 + Lib.atoi(token); ! token = Com.Parse(ph); ! y = viddef.height / 2 - 120 + Lib.atoi(token); AddDirtyPoint(x, y); AddDirtyPoint(x + 159, y + 31); ! token = Com.Parse(ph); ! value = Lib.atoi(token); if (value >= MAX_CLIENTS || value < 0) Com.Error(ERR_DROP, "client >= MAX_CLIENTS"); ! ci = cl.clientinfo[value]; ! token = Com.Parse(ph); ! score = Lib.atoi(token); ! token = Com.Parse(ph); ! ping = Lib.atoi(token); ! token = Com.Parse(ph); ! time = Lib.atoi(token); Console.DrawAltString(x + 32, y, ci.name); --- 941,968 ---- } ! if (parser.tokenEquals("client")) { // draw a deathmatch client block int score, ping, time; ! parser.next(); ! x = viddef.width / 2 - 160 + parser.tokenAsInt(); ! parser.next(); ! y = viddef.height / 2 - 120 + parser.tokenAsInt(); AddDirtyPoint(x, y); AddDirtyPoint(x + 159, y + 31); ! parser.next(); ! value = parser.tokenAsInt(); if (value >= MAX_CLIENTS || value < 0) Com.Error(ERR_DROP, "client >= MAX_CLIENTS"); ! clientinfo_t ci = cl.clientinfo[value]; ! parser.next(); ! score = parser.tokenAsInt(); ! parser.next(); ! ping = parser.tokenAsInt(); ! parser.next(); ! time = parser.tokenAsInt(); Console.DrawAltString(x + 32, y, ci.name); *************** *** 983,1007 **** } ! if (token.equals("ctf")) { // draw a ctf client block int score, ping; ! token = Com.Parse(ph); ! x = viddef.width / 2 - 160 + Lib.atoi(token); ! token = Com.Parse(ph); ! y = viddef.height / 2 - 120 + Lib.atoi(token); AddDirtyPoint(x, y); AddDirtyPoint(x + 159, y + 31); ! token = Com.Parse(ph); ! value = Lib.atoi(token); if (value >= MAX_CLIENTS || value < 0) Com.Error(ERR_DROP, "client >= MAX_CLIENTS"); ! ci = cl.clientinfo[value]; ! token = Com.Parse(ph); ! score = Lib.atoi(token); ! token = Com.Parse(ph); ! ping = Lib.atoi(token); if (ping > 999) ping = 999; --- 978,1002 ---- } ! if (parser.tokenEquals("ctf")) { // draw a ctf client block int score, ping; ! parser.next(); ! x = viddef.width / 2 - 160 + parser.tokenAsInt(); ! parser.next(); ! y = viddef.height / 2 - 120 + parser.tokenAsInt(); AddDirtyPoint(x, y); AddDirtyPoint(x + 159, y + 31); ! parser.next(); ! value = parser.tokenAsInt(); if (value >= MAX_CLIENTS || value < 0) Com.Error(ERR_DROP, "client >= MAX_CLIENTS"); ! clientinfo_t ci = cl.clientinfo[value]; ! parser.next(); ! score = parser.tokenAsInt(); ! parser.next(); ! ping = parser.tokenAsInt(); if (ping > 999) ping = 999; *************** *** 1018,1039 **** } ! if (token.equals("picn")) { // draw a pic from a name ! token = Com.Parse(ph); AddDirtyPoint(x, y); AddDirtyPoint(x + 23, y + 23); ! re.DrawPic(x, y, token); continue; } ! if (token.equals("num")) { // draw a number ! token = Com.Parse(ph); ! width = Lib.atoi(token); ! token = Com.Parse(ph); ! value = cl.frame.playerstate.stats[Lib.atoi(token)]; DrawField(x, y, 0, width, value); continue; } ! if (token.equals("hnum")) { // health number int color; --- 1013,1034 ---- } ! if (parser.tokenEquals("picn")) { // draw a pic from a name ! parser.next(); AddDirtyPoint(x, y); AddDirtyPoint(x + 23, y + 23); ! re.DrawPic(x, y, parser.token()); continue; } ! if (parser.tokenEquals("num")) { // draw a number ! parser.next(); ! width = parser.tokenAsInt(); ! parser.next(); ! value = cl.frame.playerstate.stats[parser.tokenAsInt()]; DrawField(x, y, 0, width, value); continue; } ! if (parser.tokenEquals("hnum")) { // health number int color; *************** *** 1054,1058 **** } ! if (token.equals("anum")) { // ammo number int color; --- 1049,1053 ---- } ! if (parser.tokenEquals("anum")) { // ammo number int color; *************** *** 1073,1077 **** } ! if (token.equals("rnum")) { // armor number int color; --- 1068,1072 ---- } ! if (parser.tokenEquals("rnum")) { // armor number int color; *************** *** 1090,1096 **** } ! if (token.equals("stat_string")) { ! token = Com.Parse(ph); ! index = Lib.atoi(token); if (index < 0 || index >= MAX_CONFIGSTRINGS) Com.Error(ERR_DROP, "Bad stat_string index"); --- 1085,1091 ---- } ! if (parser.tokenEquals("stat_string")) { ! parser.next(); ! int index = parser.tokenAsInt(); if (index < 0 || index >= MAX_CONFIGSTRINGS) Com.Error(ERR_DROP, "Bad stat_string index"); *************** *** 1102,1135 **** } ! if (token.equals("cstring")) { ! token = Com.Parse(ph); ! DrawHUDString(token, x, y, 320, 0); continue; } ! if (token.equals("string")) { ! token = Com.Parse(ph); ! Console.DrawString(x, y, token); continue; } ! if (token.equals("cstring2")) { ! token = Com.Parse(ph); ! DrawHUDString(token, x, y, 320, 0x80); continue; } ! if (token.equals("string2")) { ! token = Com.Parse(ph); ! Console.DrawAltString(x, y, token); continue; } ! if (token.equals("if")) { // draw a number ! token = Com.Parse(ph); ! value = cl.frame.playerstate.stats[Lib.atoi(token)]; if (value == 0) { // skip to endif ! while (!ph.isEof() && !(token = Com.Parse(ph)).equals("endif")); } continue; --- 1097,1133 ---- } ! if (parser.tokenEquals("cstring")) { ! parser.next(); ! DrawHUDString(parser.token(), x, y, 320, 0); continue; } ! if (parser.tokenEquals("string")) { ! parser.next(); ! Console.DrawString(x, y, parser.token()); continue; } ! if (parser.tokenEquals("cstring2")) { ! parser.next(); ! DrawHUDString(parser.token(), x, y, 320, 0x80); continue; } ! if (parser.tokenEquals("string2")) { ! parser.next(); ! Console.DrawAltString(x, y, parser.token()); continue; } ! if (parser.tokenEquals("if")) { // draw a number ! parser.next(); ! value = cl.frame.playerstate.stats[parser.tokenAsInt()]; if (value == 0) { + parser.next(); // skip to endif ! while (parser.hasNext() && !(parser.tokenEquals("endif"))) { ! parser.next(); ! } } continue; --- NEW FILE: LayoutParser.java --- /* * LayoutParser.java * Copyright (C) 2003 */ /* 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. */ package jake2.client; import jake2.Defines; import jake2.qcommon.Com; final class LayoutParser { int tokenPos; int tokenLength; int index; int length; String data; LayoutParser() { init(null); } public void init(String layout) { tokenPos = 0; tokenLength = 0; index = 0; data = (layout != null) ? layout : ""; length = (layout != null) ? layout.length() : 0; } public boolean hasNext() { return !isEof(); } public void next() { if (data == null) { tokenLength = 0; return; } while (true) { // skip whitespace skipwhites(); if (isEof()) { tokenLength = 0; return; } // skip // comments if (getchar() == '/') { if (nextchar() == '/') { skiptoeol(); // goto skip whitespace continue; } else { prevchar(); break; } } else break; } int c; int len = 0; // handle quoted strings specially if (getchar() == '\"') { nextchar(); tokenPos = index; while (true) { c = getchar(); nextchar(); if (c == '\"' || c == 0) { tokenLength = len; return; } if (len < Defines.MAX_TOKEN_CHARS) { ++len; } } } // parse a regular word c = getchar(); tokenPos = index; do { if (len < Defines.MAX_TOKEN_CHARS) { ++len; } c = nextchar(); } while (c > 32); if (len == Defines.MAX_TOKEN_CHARS) { Com.Printf("Token exceeded " + Defines.MAX_TOKEN_CHARS + " chars, discarded.\n"); len = 0; } tokenLength = len; return; } public boolean tokenEquals(String other) { if (tokenLength != other.length()) return false; return data.regionMatches(tokenPos, other, 0, tokenLength); } public int tokenAsInt() { if (tokenLength == 0) return 0; return atoi(); } public String token() { if (tokenLength == 0) return ""; return data.substring(tokenPos, tokenPos + tokenLength); } private int atoi() { int result = 0; boolean negative = false; int i = 0, max = tokenLength; String s = data; int limit; int multmin; int digit; if (max > 0) { if (s.charAt(tokenPos) == '-') { negative = true; limit = Integer.MIN_VALUE; i++; } else { limit = -Integer.MAX_VALUE; } multmin = limit / 10; if (i < max) { digit = Character.digit(s.charAt(tokenPos + i++), 10); if (digit < 0) { return 0; // wrong format } else { result = -digit; } } while (i < max) { // Accumulating negatively avoids surprises near MAX_VALUE digit = Character.digit(s.charAt(tokenPos + i++), 10); if (digit < 0) { return 0; // wrong format } if (result < multmin) { return 0; // wrong format } result *= 10; if (result < limit + digit) { return 0; // wrong format } result -= digit; } } else { return 0; // wrong format } if (negative) { if (i > 1) { return result; } else { /* Only got "-" */ return 0; // wrong format } } else { return -result; } } private char getchar() { if (index < length) { return data.charAt(index); } return 0; } private char nextchar() { ++index; if (index < length) { return data.charAt(index); } return 0; } private char prevchar() { if (index > 0) { --index; return data.charAt(index); } return 0; } private boolean isEof() { return index >= length; } private char skipwhites() { char c = 0; while (index < length && ((c = data.charAt(index)) <= ' ') && c != 0) ++index; return c; } private char skiptoeol() { char c = 0; while (index < length && (c = data.charAt(index)) != '\n' && c != 0) ++index; return c; } } |
|
From: Carsten W. <ca...@us...> - 2007-05-12 23:20:37
|
Update of /cvsroot/jake2/jake2/src/jake2/render/fast In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv30611/src/jake2/render/fast Modified Files: Draw.java Image.java Log Message: "pics/" + name + ".pcx" removed; do this only on loading and put the short name into the hash map (much lesser String garbage) Index: Image.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/render/fast/Image.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Image.java 15 Feb 2007 14:28:47 -0000 1.5 --- Image.java 12 May 2007 23:20:29 -0000 1.6 *************** *** 1452,1456 **** image_t GL_FindImage(String name, int type) { ! if (name == null || name.length() < 5) return null; --- 1452,1456 ---- image_t GL_FindImage(String name, int type) { ! if (name == null || name.length() < 1) return null; *************** *** 1491,1497 **** image = GL_LoadPic(name, pic, dim.width, dim.height, type, 32); } ! imageCache.put(image.name, image); return image; } --- 1491,1504 ---- image = GL_LoadPic(name, pic, dim.width, dim.height, type, 32); + } else { + + pic = LoadPCX("pics/" + name + ".pcx", null, dim); + if (pic == null) + return null; + image = GL_LoadPic(name, pic, dim.width, dim.height, type, 8); + } ! imageCache.put(image.name, image); return image; } Index: Draw.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/render/fast/Draw.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Draw.java 21 Nov 2006 00:50:46 -0000 1.2 --- Draw.java 12 May 2007 23:20:29 -0000 1.3 *************** *** 102,116 **** */ public image_t Draw_FindPic(String name) { - image_t image = null; - String fullname; - if (!name.startsWith("/") && !name.startsWith("\\")) { ! fullname = "pics/" + name + ".pcx"; ! image = GL_FindImage(fullname, it_pic); } else { ! image = GL_FindImage(name.substring(1), it_pic); } - return image; } --- 102,111 ---- */ public image_t Draw_FindPic(String name) { if (!name.startsWith("/") && !name.startsWith("\\")) { ! return GL_FindImage(name, it_pic); } else { ! return GL_FindImage(name.substring(1), it_pic); } } |
|
From: Carsten W. <ca...@us...> - 2007-05-12 15:15:35
|
Update of /cvsroot/jake2/jake2/src/jake2/sys In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv22411/src/jake2/sys Modified Files: JOGLKBD.java Log Message: bugfix: center the mouse correct, now really ;-) Index: JOGLKBD.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/sys/JOGLKBD.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** JOGLKBD.java 12 May 2007 15:02:18 -0000 1.11 --- JOGLKBD.java 12 May 2007 15:15:32 -0000 1.12 *************** *** 57,62 **** mx = (((MouseEvent)event.ev).getX() - win_w2) * 2; my = (((MouseEvent)event.ev).getY() - win_h2) * 2; - System.out - .println(mx + " " + my); } else { mx = 0; --- 57,60 ---- *************** *** 91,96 **** win_x = 0; win_y = 0; ! win_w2 = (c.getWidth() + 1) / 2; ! win_h2 = (c.getHeight() + 1) / 2; int left = 0; int top = 0; while (c != null) { --- 89,94 ---- win_x = 0; win_y = 0; ! win_w2 = c.getWidth() / 2; ! win_h2 = c.getHeight() / 2; int left = 0; int top = 0; while (c != null) { *************** *** 105,109 **** } win_x += left; win_y += top; ! win_w2 -= (left + 1) / 2; win_h2 -= (top + 1) / 2; break; } --- 103,107 ---- } win_x += left; win_y += top; ! win_w2 -= left / 2; win_h2 -= top / 2; break; } |
|
From: Carsten W. <ca...@us...> - 2007-05-12 15:02:21
|
Update of /cvsroot/jake2/jake2/src/jake2/sys In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16651/src/jake2/sys Modified Files: JOGLKBD.java Log Message: bugfix: center the mouse correct, now really ;-) Index: JOGLKBD.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/sys/JOGLKBD.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** JOGLKBD.java 12 May 2007 13:31:19 -0000 1.10 --- JOGLKBD.java 12 May 2007 15:02:18 -0000 1.11 *************** *** 57,60 **** --- 57,62 ---- mx = (((MouseEvent)event.ev).getX() - win_w2) * 2; my = (((MouseEvent)event.ev).getY() - win_h2) * 2; + System.out + .println(mx + " " + my); } else { mx = 0; *************** *** 89,99 **** win_x = 0; win_y = 0; ! win_w2 = c.getWidth() / 2; ! win_h2 = c.getHeight() / 2; while (c != null) { if (c instanceof Container) { Insets insets = ((Container)c).getInsets(); ! win_x += insets.left; ! win_y += insets.top; } win_x += c.getX(); --- 91,102 ---- win_x = 0; win_y = 0; ! win_w2 = (c.getWidth() + 1) / 2; ! win_h2 = (c.getHeight() + 1) / 2; ! int left = 0; int top = 0; while (c != null) { if (c instanceof Container) { Insets insets = ((Container)c).getInsets(); ! left += insets.left; ! top += insets.top; } win_x += c.getX(); *************** *** 101,104 **** --- 104,109 ---- c = c.getParent(); } + win_x += left; win_y += top; + win_w2 -= (left + 1) / 2; win_h2 -= (top + 1) / 2; break; } |
|
From: Carsten W. <ca...@us...> - 2007-05-12 13:31:22
|
Update of /cvsroot/jake2/jake2/src/jake2/sys In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv8997/src/jake2/sys Modified Files: JOGLKBD.java Log Message: bugfix: sorry the mouse goes crazy Index: JOGLKBD.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/sys/JOGLKBD.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** JOGLKBD.java 12 May 2007 13:02:29 -0000 1.9 --- JOGLKBD.java 12 May 2007 13:31:19 -0000 1.10 *************** *** 94,99 **** if (c instanceof Container) { Insets insets = ((Container)c).getInsets(); ! win_x += insets.left / 2; ! win_y += insets.top / 2; } win_x += c.getX(); --- 94,99 ---- if (c instanceof Container) { Insets insets = ((Container)c).getInsets(); ! win_x += insets.left; ! win_y += insets.top; } win_x += c.getX(); |
|
From: Carsten W. <ca...@us...> - 2007-05-12 13:02:34
|
Update of /cvsroot/jake2/jake2/src/jake2/sys In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv28374/src/jake2/sys Modified Files: JOGLKBD.java Log Message: bugfix: center the mouse correct Index: JOGLKBD.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/sys/JOGLKBD.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** JOGLKBD.java 1 Jul 2005 14:20:54 -0000 1.8 --- JOGLKBD.java 12 May 2007 13:02:29 -0000 1.9 *************** *** 94,99 **** if (c instanceof Container) { Insets insets = ((Container)c).getInsets(); ! win_x += insets.left; ! win_y += insets.top; } win_x += c.getX(); --- 94,99 ---- if (c instanceof Container) { Insets insets = ((Container)c).getInsets(); ! win_x += insets.left / 2; ! win_y += insets.top / 2; } win_x += c.getX(); |
|
From: Carsten W. <ca...@us...> - 2007-05-11 23:01:15
|
Update of /cvsroot/jake2/jake2/lib/lwjgl/windows In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv744/lib/lwjgl/windows Modified Files: OpenAL32.dll Log Message: use previous version, the new one doesn't run on my win2k Index: OpenAL32.dll =================================================================== RCS file: /cvsroot/jake2/jake2/lib/lwjgl/windows/OpenAL32.dll,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvs3tnviK and /tmp/cvssy6alA differ |
|
From: Carsten W. <ca...@us...> - 2007-05-11 22:02:30
|
Update of /cvsroot/jake2/jake2/lib/lwjgl/patch/org/lwjgl In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv9219/lib/lwjgl/patch/org/lwjgl Modified Files: BufferChecks.java Log Message: update to lwjgl 1.1 Index: BufferChecks.java =================================================================== RCS file: /cvsroot/jake2/jake2/lib/lwjgl/patch/org/lwjgl/BufferChecks.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** BufferChecks.java 11 May 2007 21:00:27 -0000 1.3 --- BufferChecks.java 11 May 2007 22:02:27 -0000 1.4 *************** *** 116,120 **** * @throws IllegalArgumentException */ ! private static void checkBufferSize(Buffer buf, int size) { } --- 116,120 ---- * @throws IllegalArgumentException */ ! public static void checkBufferSize(Buffer buf, int size) { } |
|
From: Carsten W. <ca...@us...> - 2007-05-11 21:54:07
|
Update of /cvsroot/jake2/jake2/lib/lwjgl/patch/org/lwjgl/opengl In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv5172/lib/lwjgl/patch/org/lwjgl/opengl Modified Files: GL11.java Log Message: update to lwjgl 1.1 Index: GL11.java =================================================================== RCS file: /cvsroot/jake2/jake2/lib/lwjgl/patch/org/lwjgl/opengl/GL11.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GL11.java 17 Mar 2007 16:04:19 -0000 1.2 --- GL11.java 11 May 2007 21:54:02 -0000 1.3 *************** *** 1,3015 **** ! /* MACHINE GENERATED FILE, DO NOT EDIT */ ! ! package org.lwjgl.opengl; ! ! import org.lwjgl.LWJGLException; ! import org.lwjgl.BufferChecks; ! import java.nio.*; ! ! public final class GL11 { ! public static final int GL_ACCUM = 0x100; [...5886 lines suppressed...] ! nglStencilOp(fail, zfail, zpass, function_pointer); ! } ! private static native void nglStencilOp(int fail, int zfail, int zpass, long function_pointer); ! ! public static void glStencilMask(int mask) { ! ContextCapabilities caps = GLContext.getCapabilities(); ! long function_pointer = caps.GL11_glStencilMask_pointer; ! ! nglStencilMask(mask, function_pointer); ! } ! private static native void nglStencilMask(int mask, long function_pointer); ! ! public static void glViewport(int x, int y, int width, int height) { ! ContextCapabilities caps = GLContext.getCapabilities(); ! long function_pointer = caps.GL11_glViewport_pointer; ! ! nglViewport(x, y, width, height, function_pointer); ! } ! private static native void nglViewport(int x, int y, int width, int height, long function_pointer); ! } |
|
From: Carsten W. <ca...@us...> - 2007-05-11 21:00:35
|
Update of /cvsroot/jake2/jake2/lib/lwjgl/patch/org/lwjgl In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv15265/lib/lwjgl/patch/org/lwjgl Modified Files: BufferChecks.java Log Message: update to lwjgl 1.1 Index: BufferChecks.java =================================================================== RCS file: /cvsroot/jake2/jake2/lib/lwjgl/patch/org/lwjgl/BufferChecks.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BufferChecks.java 17 Mar 2007 16:02:17 -0000 1.2 --- BufferChecks.java 11 May 2007 21:00:27 -0000 1.3 *************** *** 44,47 **** --- 44,49 ---- * in the buffer when the call is made then a buffer overflow would otherwise * occur and cause unexpected behaviour, a crash, or worse, a security risk. + * + * Internal class, don't use. * </p> * @author cix_foo <ci...@us...> *************** *** 76,105 **** /** - * Helper methods to ensure a buffer is direct or null. - */ - public static void checkDirectOrNull(ByteBuffer buf) { - } - - public static void checkDirectOrNull(ShortBuffer buf) { - } - public static void checkDirectOrNull(IntBuffer buf) { - } - - public static void checkDirectOrNull(LongBuffer buf) { - } - - public static void checkDirectOrNull(FloatBuffer buf) { - } - - public static void checkDirectOrNull(DoubleBuffer buf) { - } - - /** * Helper methods to ensure a buffer is direct (and, implicitly, non-null). */ - public static void checkDirectBuffer(Buffer buf) { - } - public static void checkDirect(ByteBuffer buf) { } --- 78,84 ---- *************** *** 157,187 **** public static void checkBuffer(DoubleBuffer buf, int size) { } - - /** - * Helper methods to ensure a buffer is big enough to receive data from a - * glGet* operation. To avoid unnecessarily complex buffer size checking - * we've just set the bar artificially high and insist that any receiving - * buffer has at least 4 remaining(). - * - * @param buf - * The buffer to check - * @throws IllegalArgumentException - */ - public static void checkBuffer(ByteBuffer buf) { - } - - public static void checkBuffer(ShortBuffer buf) { - } - - public static void checkBuffer(IntBuffer buf) { - } - - public static void checkBuffer(LongBuffer buf) { - } - - public static void checkBuffer(FloatBuffer buf) { - } - - public static void checkBuffer(DoubleBuffer buf) { - } } --- 136,138 ---- |
|
From: Carsten W. <ca...@us...> - 2007-05-11 20:55:27
|
Update of /cvsroot/jake2/jake2/lib/lwjgl/patch/org/lwjgl/opengl In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv13123/lib/lwjgl/patch/org/lwjgl/opengl Modified Files: GLChecks.java Log Message: update to lwjgl 1.1 Index: GLChecks.java =================================================================== RCS file: /cvsroot/jake2/jake2/lib/lwjgl/patch/org/lwjgl/opengl/GLChecks.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GLChecks.java 17 Mar 2007 16:02:53 -0000 1.2 --- GLChecks.java 11 May 2007 20:55:17 -0000 1.3 *************** *** 126,139 **** } ! static int calculateTexImage1DStorage(Buffer buffer, int format, int type, int width, int border) { ! return calculateTexImage1DStorage(format, type, width, border) >> BufferUtils.getElementSizeExponent(buffer); } ! static int calculateTexImage2DStorage(Buffer buffer, int format, int type, int width, int height, int border) { ! return calculateTexImage2DStorage(format, type, width, height, border) >> BufferUtils.getElementSizeExponent(buffer); } ! static int calculateTexImage3DStorage(Buffer buffer, int format, int type, int width, int height, int depth, int border) { ! return calculateTexImage3DStorage(format, type, width, height, depth, border) >> BufferUtils.getElementSizeExponent(buffer); } --- 126,139 ---- } ! static int calculateTexImage1DStorage(Buffer buffer, int format, int type, int width) { ! return calculateTexImage1DStorage(format, type, width) >> BufferUtils.getElementSizeExponent(buffer); } ! static int calculateTexImage2DStorage(Buffer buffer, int format, int type, int width, int height) { ! return calculateTexImage2DStorage(format, type, width, height) >> BufferUtils.getElementSizeExponent(buffer); } ! static int calculateTexImage3DStorage(Buffer buffer, int format, int type, int width, int height, int depth) { ! return calculateTexImage3DStorage(format, type, width, height, depth) >> BufferUtils.getElementSizeExponent(buffer); } *************** *** 153,166 **** } ! private static int calculateTexImage1DStorage(int format, int type, int width, int border) { ! return calculateBytesPerPixel(format, type) * (width + (border << 1)); } ! private static int calculateTexImage2DStorage(int format, int type, int width, int height, int border) { ! return calculateTexImage1DStorage(format, type, width, border) * (height + (border << 1)); } ! private static int calculateTexImage3DStorage(int format, int type, int width, int height, int depth, int border) { ! return calculateTexImage2DStorage(format, type, width, height, border) * (depth + (border << 1)); } --- 153,166 ---- } ! private static int calculateTexImage1DStorage(int format, int type, int width) { ! return calculateBytesPerPixel(format, type) * width; } ! private static int calculateTexImage2DStorage(int format, int type, int width, int height) { ! return calculateTexImage1DStorage(format, type, width) * height; } ! private static int calculateTexImage3DStorage(int format, int type, int width, int height, int depth) { ! return calculateTexImage2DStorage(format, type, width, height) * depth; } |
|
From: Carsten W. <ca...@us...> - 2007-05-11 20:34:24
|
Update of /cvsroot/jake2/jake2/lib/lwjgl/linux In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv3231/lib/lwjgl/linux Modified Files: liblwjgl64.so liblwjgl.so Log Message: update to lwjgl 1.1 (bugfix release) Index: liblwjgl64.so =================================================================== RCS file: /cvsroot/jake2/jake2/lib/lwjgl/linux/liblwjgl64.so,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 Binary files /tmp/cvswwVkWe and /tmp/cvsMClxIg differ Index: liblwjgl.so =================================================================== RCS file: /cvsroot/jake2/jake2/lib/lwjgl/linux/liblwjgl.so,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 Binary files /tmp/cvseXp5vl and /tmp/cvsXSZOsn differ |
|
From: Carsten W. <ca...@us...> - 2007-05-11 20:34:24
|
Update of /cvsroot/jake2/jake2/lib/lwjgl/windows In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv3231/lib/lwjgl/windows Modified Files: lwjgl.dll OpenAL32.dll Log Message: update to lwjgl 1.1 (bugfix release) Index: lwjgl.dll =================================================================== RCS file: /cvsroot/jake2/jake2/lib/lwjgl/windows/lwjgl.dll,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 Binary files /tmp/cvs8jOswF and /tmp/cvspFPT4F differ Index: OpenAL32.dll =================================================================== RCS file: /cvsroot/jake2/jake2/lib/lwjgl/windows/OpenAL32.dll,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvsg4qAKL and /tmp/cvsxLwupM differ |
|
From: Carsten W. <ca...@us...> - 2007-05-11 20:34:00
|
Update of /cvsroot/jake2/jake2/lib/lwjgl In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv3231/lib/lwjgl Modified Files: lwjgl.jar lwjgl_util.jar Log Message: update to lwjgl 1.1 (bugfix release) Index: lwjgl.jar =================================================================== RCS file: /cvsroot/jake2/jake2/lib/lwjgl/lwjgl.jar,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 Binary files /tmp/cvsutZdFR and /tmp/cvspq30hZ differ Index: lwjgl_util.jar =================================================================== RCS file: /cvsroot/jake2/jake2/lib/lwjgl/lwjgl_util.jar,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 Binary files /tmp/cvsDD0bY8 and /tmp/cvsbjSWUg differ |
|
From: Carsten W. <ca...@us...> - 2007-05-11 20:34:00
|
Update of /cvsroot/jake2/jake2/src/jake2/sound/lwjgl In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv3231/src/jake2/sound/lwjgl Modified Files: LWJGLSoundImpl.java Log Message: update to lwjgl 1.1 (bugfix release) Index: LWJGLSoundImpl.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/sound/lwjgl/LWJGLSoundImpl.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** LWJGLSoundImpl.java 26 Oct 2006 22:02:55 -0000 1.9 --- LWJGLSoundImpl.java 11 May 2007 20:33:53 -0000 1.10 *************** *** 9,13 **** import jake2.Defines; import jake2.Globals; ! import jake2.game.*; import jake2.qcommon.*; import jake2.sound.*; --- 9,15 ---- import jake2.Defines; import jake2.Globals; ! import jake2.game.Cmd; ! import jake2.game.cvar_t; ! import jake2.game.entity_state_t; import jake2.qcommon.*; import jake2.sound.*; *************** *** 16,19 **** --- 18,22 ---- import java.nio.*; + import org.lwjgl.LWJGLException; import org.lwjgl.openal.*; *************** *** 103,112 **** } ! String defaultSpecifier = ALC.alcGetString(ALC.ALC_DEFAULT_DEVICE_SPECIFIER); Com.Printf(os + " using " + ((deviceName == null) ? defaultSpecifier : deviceName) + '\n'); // Check for an error. ! if (ALC.alcGetError() != ALC.ALC_NO_ERROR) { Com.DPrintf("Error with SoundDevice"); --- 106,115 ---- } ! String defaultSpecifier = ALC10.alcGetString(AL.getDevice(), ALC10.ALC_DEFAULT_DEVICE_SPECIFIER); Com.Printf(os + " using " + ((deviceName == null) ? defaultSpecifier : deviceName) + '\n'); // Check for an error. ! if (ALC10.alcGetError(AL.getDevice()) != ALC10.ALC_NO_ERROR) { Com.DPrintf("Error with SoundDevice"); |
2 messages has been excluded from this view by a project administrator.
