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...> - 2007-04-16 22:13:48
|
Update of /cvsroot/jake2/jake2/src/jake2/qcommon In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv21704/src/jake2/qcommon Modified Files: Netchan.java Log Message: clean up Index: Netchan.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/Netchan.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Netchan.java 15 Apr 2007 20:12:33 -0000 1.8 --- Netchan.java 16 Apr 2007 22:13:37 -0000 1.9 *************** *** 2,7 **** * NetChannel.java * Copyright (C) 2003 - * - * $Id$ */ /* --- 2,5 ---- *************** *** 269,288 **** */ public static boolean Process(netchan_t chan, sizebuf_t msg) { - int sequence, sequence_ack; - int reliable_ack, reliable_message; - int qport; - // get sequence numbers MSG.BeginReading(msg); ! sequence = MSG.ReadLong(msg); ! sequence_ack = MSG.ReadLong(msg); // read the qport if we are a server if (chan.sock == Defines.NS_SERVER) ! qport = MSG.ReadShort(msg); // achtung unsigned int ! reliable_message = sequence >>> 31; ! reliable_ack = sequence_ack >>> 31; sequence &= ~(1 << 31); --- 267,282 ---- */ public static boolean Process(netchan_t chan, sizebuf_t msg) { // get sequence numbers MSG.BeginReading(msg); ! int sequence = MSG.ReadLong(msg); ! int sequence_ack = MSG.ReadLong(msg); // read the qport if we are a server if (chan.sock == Defines.NS_SERVER) ! MSG.ReadShort(msg); // achtung unsigned int ! int reliable_message = sequence >>> 31; ! int reliable_ack = sequence_ack >>> 31; sequence &= ~(1 << 31); |
|
From: Carsten W. <ca...@us...> - 2007-04-16 22:08:07
|
Update of /cvsroot/jake2/jake2/src/jake2/qcommon In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv19259/src/jake2/qcommon Modified Files: CM.java Log Message: clean up Index: CM.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/CM.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** CM.java 15 Apr 2007 20:12:33 -0000 1.13 --- CM.java 16 Apr 2007 22:08:04 -0000 1.14 *************** *** 20,26 **** // Created on 02.01.2004 by RST. - - // $Id$ - package jake2.qcommon; --- 20,23 ---- *************** *** 587,599 **** public static void CMod_LoadLeafBrushes(lump_t l) { Com.DPrintf("CMod_LoadLeafBrushes()\n"); - int i; - int out[]; - short in[]; - int count; if ((l.filelen % 2) != 0) Com.Error(Defines.ERR_DROP, "MOD_LoadBmodel: funny lump size"); ! count = l.filelen / 2; Com.DPrintf(" numbrushes=" + count + "\n"); --- 584,592 ---- public static void CMod_LoadLeafBrushes(lump_t l) { Com.DPrintf("CMod_LoadLeafBrushes()\n"); if ((l.filelen % 2) != 0) Com.Error(Defines.ERR_DROP, "MOD_LoadBmodel: funny lump size"); ! int count = l.filelen / 2; Com.DPrintf(" numbrushes=" + count + "\n"); *************** *** 606,610 **** Com.Error(Defines.ERR_DROP, "Map has too many leafbrushes"); ! out = map_leafbrushes; numleafbrushes = count; --- 599,603 ---- Com.Error(Defines.ERR_DROP, "Map has too many leafbrushes"); ! int[] out = map_leafbrushes; numleafbrushes = count; *************** *** 616,620 **** } ! for (i = 0; i < count; i++) { out[i] = bb.getShort(); if (debugloadmap) { --- 609,613 ---- } ! for (int i = 0; i < count; i++) { out[i] = bb.getShort(); if (debugloadmap) { *************** *** 757,761 **** public static void CMod_LoadVisibility(lump_t l) { Com.DPrintf("CMod_LoadVisibility()\n"); - int i; numvisibility = l.filelen; --- 750,753 ---- *************** *** 795,804 **** /** Returns the model with a given id "*" + <number> */ public static cmodel_t InlineModel(String name) { - int num; - if (name == null || name.charAt(0) != '*') Com.Error(Defines.ERR_DROP, "CM_InlineModel: bad name"); ! num = Lib.atoi(name.substring(1)); if (num < 1 || num >= numcmodels) --- 787,794 ---- /** Returns the model with a given id "*" + <number> */ public static cmodel_t InlineModel(String name) { if (name == null || name.charAt(0) != '*') Com.Error(Defines.ERR_DROP, "CM_InlineModel: bad name"); ! int num = Lib.atoi(name.substring(1)); if (num < 1 || num >= numcmodels) *************** *** 850,858 **** */ public static void CM_InitBoxHull() { - int i; - int side; - cnode_t c; - cplane_t p; - cbrushside_t s; box_headnode = numnodes; //rst: still room for 6 brushes left? --- 840,843 ---- *************** *** 885,889 **** map_leafbrushes[numleafbrushes] = numbrushes; ! for (i = 0; i < 6; i++) { side = i & 1; --- 870,879 ---- map_leafbrushes[numleafbrushes] = numbrushes; ! int side; ! cnode_t c; ! cplane_t p; ! cbrushside_t s; ! ! for (int i = 0; i < 6; i++) { side = i & 1; *************** *** 1790,1810 **** */ public static boolean CM_HeadnodeVisible(int nodenum, byte visbits[]) { - int leafnum; - int cluster; - cnode_t node; - if (nodenum < 0) { ! leafnum = -1 - nodenum; ! cluster = map_leafs[leafnum].cluster; ! if (cluster == -1) ! return false; ! if (0 != (visbits[cluster >>> 3] & (1 << (cluster & 7)))) ! return true; return false; } ! node = map_nodes[nodenum]; ! if (CM_HeadnodeVisible(node.children[0], visbits)) ! return true; return CM_HeadnodeVisible(node.children[1], visbits); } --- 1780,1796 ---- */ public static boolean CM_HeadnodeVisible(int nodenum, byte visbits[]) { if (nodenum < 0) { ! int leafnum = -1 - nodenum; ! int cluster = map_leafs[leafnum].cluster; ! if (cluster == -1) return false; ! ! if (0 != (visbits[cluster >>> 3] & (1 << (cluster & 7)))) return true; ! return false; } ! cnode_t node = map_nodes[nodenum]; ! if (CM_HeadnodeVisible(node.children[0], visbits)) return true; ! return CM_HeadnodeVisible(node.children[1], visbits); } |
|
From: Carsten W. <ca...@us...> - 2007-04-16 21:58:41
|
Update of /cvsroot/jake2/jake2/src/jake2/client In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv15136/src/jake2/client Modified Files: CL_parse.java Log Message: clean up Index: CL_parse.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL_parse.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** CL_parse.java 15 Apr 2007 20:12:32 -0000 1.23 --- CL_parse.java 16 Apr 2007 21:58:06 -0000 1.24 *************** *** 22,28 **** */ - - // $Id$ - package jake2.client; --- 22,25 ---- *************** *** 67,73 **** */ public static boolean CheckOrDownloadFile(String filename) { - RandomAccessFile fp; - String name; - if (filename.indexOf("..") != -1) { Com.Printf("Refusing to download a path with ..\n"); --- 64,67 ---- *************** *** 75,79 **** } ! if (FS.FileLength(filename) > 0) { // it exists, no need to download return true; } --- 69,74 ---- } ! if (FS.FileLength(filename) > 0) { ! // it exists, no need to download return true; } *************** *** 92,98 **** // resume // open the file if not opened yet ! name = DownloadFileName(Globals.cls.downloadtempname); ! fp = Lib.fopen(name, "r+b"); if (fp != null) { --- 87,93 ---- // resume // open the file if not opened yet ! String name = DownloadFileName(Globals.cls.downloadtempname); ! RandomAccessFile fp = Lib.fopen(name, "r+b"); if (fp != null) { *************** *** 250,255 **** SZ.Print(Globals.cls.netchan.message, "nextdl"); } else { - String oldn, newn; - try { Globals.cls.download.close(); --- 245,248 ---- *************** *** 259,264 **** // rename the temp file to it's final name ! oldn = DownloadFileName(Globals.cls.downloadtempname); ! newn = DownloadFileName(Globals.cls.downloadname); int r = Lib.rename(oldn, newn); if (r != 0) --- 252,257 ---- // rename the temp file to it's final name ! String oldn = DownloadFileName(Globals.cls.downloadtempname); ! String newn = DownloadFileName(Globals.cls.downloadname); int r = Lib.rename(oldn, newn); if (r != 0) *************** *** 287,294 **** //checked once, was ok. public static void ParseServerData() { - - String str; - int i; - Com.DPrintf("ParseServerData():Serverdata packet received.\n"); // --- 280,283 ---- *************** *** 299,303 **** // parse protocol version number ! i = MSG.ReadLong(Globals.net_message); Globals.cls.serverProtocol = i; --- 288,292 ---- // parse protocol version number ! int i = MSG.ReadLong(Globals.net_message); Globals.cls.serverProtocol = i; *************** *** 312,316 **** // game directory ! str = MSG.ReadString(Globals.net_message); Globals.cl.gamedir = str; Com.dprintln("gamedir=" + str); --- 301,305 ---- // game directory ! String str = MSG.ReadString(Globals.net_message); Globals.cl.gamedir = str; Com.dprintln("gamedir=" + str); *************** *** 350,361 **** */ public static void ParseBaseline() { - entity_state_t es; - int newnum; - entity_state_t nullstate = new entity_state_t(null); //memset(nullstate, 0, sizeof(nullstate)); int bits[] = { 0 }; ! newnum = CL_ents.ParseEntityBits(bits); ! es = Globals.cl_entities[newnum].baseline; CL_ents.ParseDelta(nullstate, es, newnum, bits[0]); } --- 339,347 ---- */ public static void ParseBaseline() { entity_state_t nullstate = new entity_state_t(null); //memset(nullstate, 0, sizeof(nullstate)); int bits[] = { 0 }; ! int newnum = CL_ents.ParseEntityBits(bits); ! entity_state_t es = Globals.cl_entities[newnum].baseline; CL_ents.ParseDelta(nullstate, es, newnum, bits[0]); } *************** *** 367,373 **** */ public static void LoadClientinfo(clientinfo_t ci, String s) { - int i; - int t; - //char model_name[MAX_QPATH]; //char skin_name[MAX_QPATH]; --- 353,356 ---- *************** *** 385,389 **** //ci.name[sizeof(ci.name) - 1] = 0; ! t = s.indexOf('\\'); //t = strstr(s, "\\"); --- 368,372 ---- //ci.name[sizeof(ci.name) - 1] = 0; ! int t = s.indexOf('\\'); //t = strstr(s, "\\"); *************** *** 463,467 **** // weapon file ! for (i = 0; i < CL_view.num_cl_weaponmodels; i++) { weapon_filename = "players/" + model_name + "/" + CL_view.cl_weaponmodels[i]; --- 446,450 ---- // weapon file ! for (int i = 0; i < CL_view.num_cl_weaponmodels; i++) { weapon_filename = "players/" + model_name + "/" + CL_view.cl_weaponmodels[i]; *************** *** 500,509 **** */ public static void ParseClientinfo(int player) { ! String s; ! clientinfo_t ci; ! ! s = Globals.cl.configstrings[player + Defines.CS_PLAYERSKINS]; ! ci = Globals.cl.clientinfo[player]; LoadClientinfo(ci, s); --- 483,489 ---- */ public static void ParseClientinfo(int player) { ! String s = Globals.cl.configstrings[player + Defines.CS_PLAYERSKINS]; ! clientinfo_t ci = Globals.cl.clientinfo[player]; LoadClientinfo(ci, s); *************** *** 514,529 **** */ public static void ParseConfigString() { ! int i; ! String s; ! String olds; ! ! i = MSG.ReadShort(Globals.net_message); if (i < 0 || i >= Defines.MAX_CONFIGSTRINGS) Com.Error(Defines.ERR_DROP, "configstring > MAX_CONFIGSTRINGS"); ! s = MSG.ReadString(Globals.net_message); ! olds = Globals.cl.configstrings[i]; Globals.cl.configstrings[i] = s; --- 494,505 ---- */ public static void ParseConfigString() { ! int i = MSG.ReadShort(Globals.net_message); if (i < 0 || i >= Defines.MAX_CONFIGSTRINGS) Com.Error(Defines.ERR_DROP, "configstring > MAX_CONFIGSTRINGS"); ! String s = MSG.ReadString(Globals.net_message); ! String olds = Globals.cl.configstrings[i]; Globals.cl.configstrings[i] = s; *************** *** 577,591 **** */ public static void ParseStartSoundPacket() { ! float pos[]; ! int channel, ent; ! int sound_num; ! float volume; ! float attenuation; ! int flags; ! float ofs; ! ! flags = MSG.ReadByte(Globals.net_message); ! sound_num = MSG.ReadByte(Globals.net_message); if ((flags & Defines.SND_VOLUME) != 0) volume = MSG.ReadByte(Globals.net_message) / 255.0f; --- 553,560 ---- */ public static void ParseStartSoundPacket() { ! int flags = MSG.ReadByte(Globals.net_message); ! int sound_num = MSG.ReadByte(Globals.net_message); + float volume; if ((flags & Defines.SND_VOLUME) != 0) volume = MSG.ReadByte(Globals.net_message) / 255.0f; *************** *** 593,596 **** --- 562,566 ---- volume = Defines.DEFAULT_SOUND_PACKET_VOLUME; + float attenuation; if ((flags & Defines.SND_ATTENUATION) != 0) attenuation = MSG.ReadByte(Globals.net_message) / 64.0f; *************** *** 598,601 **** --- 568,572 ---- attenuation = Defines.DEFAULT_SOUND_PACKET_ATTENUATION; + float ofs; if ((flags & Defines.SND_OFFSET) != 0) ofs = MSG.ReadByte(Globals.net_message) / 1000.0f; *************** *** 603,606 **** --- 574,579 ---- ofs = 0; + int channel; + int ent; if ((flags & Defines.SND_ENT) != 0) { // entity reletive channel = MSG.ReadShort(Globals.net_message); *************** *** 616,619 **** --- 589,593 ---- } + float pos[]; if ((flags & Defines.SND_POS) != 0) { // positioned in space MSG.ReadPos(Globals.net_message, pos_v); *************** *** 640,647 **** */ public static void ParseServerMessage() { - int cmd; - String s; - int i; - // // if recording demos, copy the message out --- 614,617 ---- *************** *** 662,666 **** } ! cmd = MSG.ReadByte(Globals.net_message); if (cmd == -1) { --- 632,636 ---- } ! int cmd = MSG.ReadByte(Globals.net_message); if (cmd == -1) { *************** *** 708,712 **** case Defines.svc_print: ! i = MSG.ReadByte(Globals.net_message); if (i == Defines.PRINT_CHAT) { S.StartLocalSound("misc/talk.wav"); --- 678,682 ---- case Defines.svc_print: ! int i = MSG.ReadByte(Globals.net_message); if (i == Defines.PRINT_CHAT) { S.StartLocalSound("misc/talk.wav"); *************** *** 722,726 **** case Defines.svc_stufftext: ! s = MSG.ReadString(Globals.net_message); Com.DPrintf("stufftext: " + s + "\n"); Cbuf.AddText(s); --- 692,696 ---- case Defines.svc_stufftext: ! String s = MSG.ReadString(Globals.net_message); Com.DPrintf("stufftext: " + s + "\n"); Cbuf.AddText(s); *************** *** 769,774 **** case Defines.svc_layout: ! s = MSG.ReadString(Globals.net_message); ! Globals.cl.layout = s; break; --- 739,743 ---- case Defines.svc_layout: ! Globals.cl.layout = MSG.ReadString(Globals.net_message); break; |
|
From: Rene S. <sa...@us...> - 2007-04-15 20:13:08
|
Update of /cvsroot/jake2/jake2/src/jake2/client In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2419/src/jake2/client Modified Files: CL_parse.java Log Message: cosmetic Index: CL_parse.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL_parse.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** CL_parse.java 27 Feb 2007 14:22:30 -0000 1.22 --- CL_parse.java 15 Apr 2007 20:12:32 -0000 1.23 *************** *** 22,25 **** --- 22,28 ---- */ + + // $Id$ + package jake2.client; *************** *** 58,66 **** } ! /* ! * =============== CL_CheckOrDownloadFile ! * ! * Returns true if the file exists, otherwise it attempts to start a ! * download from the server. =============== */ public static boolean CheckOrDownloadFile(String filename) { --- 61,68 ---- } ! /** ! * CL_CheckOrDownloadFile returns true if the file exists, ! * otherwise it attempts to start a ! * download from the server. */ public static boolean CheckOrDownloadFile(String filename) { *************** *** 232,241 **** } ! //fwrite(net_message.data[net_message.readcount], 1, size, ! // cls.download); try { Globals.cls.download.write(Globals.net_message.data, Globals.net_message.readcount, size); ! } catch (Exception e) { } Globals.net_message.readcount += size; --- 234,243 ---- } ! try { Globals.cls.download.write(Globals.net_message.data, Globals.net_message.readcount, size); ! } ! catch (Exception e) { } Globals.net_message.readcount += size; *************** *** 249,260 **** } else { String oldn, newn; - //char oldn[MAX_OSPATH]; - //char newn[MAX_OSPATH]; - - // Com.Printf ("100%%\n"); try { Globals.cls.download.close(); ! } catch (IOException e) { } --- 251,259 ---- } else { String oldn, newn; try { Globals.cls.download.close(); ! } ! catch (IOException e) { } |
|
From: Rene S. <sa...@us...> - 2007-04-15 20:13:08
|
Update of /cvsroot/jake2/jake2/src/jake2/qcommon In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2419/src/jake2/qcommon Modified Files: CM.java Netchan.java Log Message: cosmetic Index: Netchan.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/Netchan.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Netchan.java 18 Dec 2005 22:10:08 -0000 1.7 --- Netchan.java 15 Apr 2007 20:12:33 -0000 1.8 *************** *** 103,112 **** public static byte net_message_buffer[] = new byte[Defines.MAX_MSGLEN]; ! /* ! * =============== Netchan_Init * - * =============== */ - //ok. public static void Netchan_Init() { long port; --- 103,110 ---- public static byte net_message_buffer[] = new byte[Defines.MAX_MSGLEN]; ! /** ! * Netchan_Init. * */ public static void Netchan_Init() { long port; *************** *** 122,131 **** private static final byte send_buf[] = new byte[Defines.MAX_MSGLEN]; private static final sizebuf_t send = new sizebuf_t(); ! /* ! * =============== Netchan_OutOfBand ! * ! * Sends an out-of-band datagram ================ */ - //ok. public static void Netchan_OutOfBand(int net_socket, netadr_t adr, int length, byte data[]) { --- 120,127 ---- private static final byte send_buf[] = new byte[Defines.MAX_MSGLEN]; private static final sizebuf_t send = new sizebuf_t(); ! ! /** ! * Netchan_OutOfBand. Sends an out-of-band datagram. */ public static void Netchan_OutOfBand(int net_socket, netadr_t adr, int length, byte data[]) { *************** *** 145,156 **** } ! /* ! * ============== Netchan_Setup ! * ! * called to open a channel to a remote system ============== */ public static void Setup(int sock, netchan_t chan, netadr_t adr, int qport) { - //memset (chan, 0, sizeof(*chan)); - chan.clear(); chan.sock = sock; --- 141,148 ---- } ! /** ! * Netchan_Setup is alled to open a channel to a remote system. */ public static void Setup(int sock, netchan_t chan, netadr_t adr, int qport) { chan.clear(); chan.sock = sock; *************** *** 165,172 **** } ! /* ! * =============== Netchan_CanReliable ! * ! * Returns true if the last reliable message has acked ================ */ public static boolean Netchan_CanReliable(netchan_t chan) { --- 157,162 ---- } ! /** ! * Netchan_CanReliable. Returns true if the last reliable message has acked. */ public static boolean Netchan_CanReliable(netchan_t chan) { *************** *** 176,180 **** } ! // das ist richtig !!! public static boolean Netchan_NeedReliable(netchan_t chan) { boolean send_reliable; --- 166,170 ---- } ! public static boolean Netchan_NeedReliable(netchan_t chan) { boolean send_reliable; *************** *** 196,209 **** } ! // private static final byte send_buf[] = new byte[Defines.MAX_MSGLEN]; ! // private static final sizebuf_t send = new sizebuf_t(); ! /* ! * =============== Netchan_Transmit ! * ! * tries to send an unreliable message to a connection, and handles the ! * transmition / retransmition of the reliable messages. * * A 0 length will still generate a packet and deal with the reliable ! * messages. ================ */ public static void Transmit(netchan_t chan, int length, byte data[]) { --- 186,195 ---- } ! /** ! * Netchan_Transmit tries to send an unreliable message to a connection, ! * and handles the transmition / retransmition of the reliable messages. * * A 0 length will still generate a packet and deal with the reliable ! * messages. */ public static void Transmit(netchan_t chan, int length, byte data[]) { *************** *** 264,268 **** if (send_reliable != 0) Com.Printf( - //"send %4i : s=%i reliable=%i ack=%i rack=%i\n" "send " + send.cursize + " : s=" + (chan.outgoing_sequence - 1) + " reliable=" --- 250,253 ---- *************** *** 272,276 **** else Com.Printf( - //"send %4i : s=%i ack=%i rack=%i\n" "send " + send.cursize + " : s=" + (chan.outgoing_sequence - 1) + " ack=" --- 257,260 ---- *************** *** 280,288 **** } ! /* ! * ================= Netchan_Process ! * ! * called when the current net_message is from remote_address modifies ! * net_message so that it points to the packet payload ================= */ public static boolean Process(netchan_t chan, sizebuf_t msg) { --- 264,270 ---- } ! /** ! * Netchan_Process is called when the current net_message is from remote_address modifies ! * net_message so that it points to the packet payload. */ public static boolean Process(netchan_t chan, sizebuf_t msg) { *************** *** 310,314 **** if (reliable_message != 0) Com.Printf( - //"recv %4i : s=%i reliable=%i ack=%i rack=%i\n" "recv " + msg.cursize + " : s=" + sequence + " reliable=" --- 292,295 ---- *************** *** 317,323 **** + reliable_ack + "\n"); else ! Com ! .Printf( ! //"recv %4i : s=%i ack=%i rack=%i\n" "recv " + msg.cursize + " : s=" + sequence + " ack=" + sequence_ack + " rack=" + reliable_ack + "\n"); --- 298,302 ---- + reliable_ack + "\n"); else ! Com.Printf( "recv " + msg.cursize + " : s=" + sequence + " ack=" + sequence_ack + " rack=" + reliable_ack + "\n"); Index: CM.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/CM.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** CM.java 4 Dec 2005 21:00:17 -0000 1.12 --- CM.java 15 Apr 2007 20:12:33 -0000 1.13 *************** *** 208,212 **** Com.DPrintf("CM_LoadMap(" + name + ")...\n"); byte buf[]; - int i; qfiles.dheader_t header; int length; --- 208,211 ---- *************** *** 331,343 **** out.headnode = in.headnode; if (debugloadmap) { ! Com ! .DPrintf( ! "|%6i|%8.2f|%8.2f|%8.2f| %8.2f|%8.2f|%8.2f| %8.2f|%8.2f|%8.2f|\n", ! new Vargs().add(out.headnode) ! .add(out.origin[0]).add(out.origin[1]) ! .add(out.origin[2]).add(out.mins[0]) ! .add(out.mins[1]).add(out.mins[2]).add( ! out.maxs[0]).add(out.maxs[1]) ! .add(out.maxs[2])); } } --- 330,339 ---- out.headnode = in.headnode; if (debugloadmap) { ! Com.DPrintf( ! "|%6i|%8.2f|%8.2f|%8.2f| %8.2f|%8.2f|%8.2f| %8.2f|%8.2f|%8.2f|\n", ! new Vargs().add(out.headnode) ! .add(out.origin[0]).add(out.origin[1]).add(out.origin[2]) ! .add(out.mins[0]).add(out.mins[1]).add(out.mins[2]) ! .add(out.maxs[0]).add(out.maxs[1]).add(out.maxs[2])); } } *************** *** 457,464 **** if (debugloadmap) { ! Com ! .DPrintf("| %6i| %6i| %8X|\n", new Vargs().add( ! out.firstbrushside).add(out.numsides).add( ! out.contents)); } } --- 453,459 ---- if (debugloadmap) { ! Com.DPrintf("| %6i| %6i| %8X|\n", new Vargs().add( ! out.firstbrushside).add(out.numsides).add( ! out.contents)); } } *************** *** 1258,1263 **** } ! /* ! * ================ CM_TraceToLeaf ================ */ public static void CM_TraceToLeaf(int leafnum) { --- 1253,1258 ---- } ! /** ! * CM_TraceToLeaf. */ public static void CM_TraceToLeaf(int leafnum) { *************** *** 1513,1521 **** } ! /* ! * ================== CM_TransformedBoxTrace ! * ! * Handles offseting and rotation of the end points for moving and rotating ! * entities ================== */ public static trace_t TransformedBoxTrace(float[] start, float[] end, --- 1508,1514 ---- } ! /** ! * CM_TransformedBoxTrace handles offseting and rotation of the end points for moving and rotating ! * entities. */ public static trace_t TransformedBoxTrace(float[] start, float[] end, *************** *** 1670,1675 **** } ! /* ! * ==================== FloodAreaConnections ==================== */ public static void FloodAreaConnections() { --- 1663,1668 ---- } ! /** ! * FloodAreaConnections. */ public static void FloodAreaConnections() { *************** *** 1696,1701 **** } ! /* ! * ================= CM_SetAreaPortalState ================= */ public static void CM_SetAreaPortalState(int portalnum, boolean open) { --- 1689,1694 ---- } ! /** ! * CM_SetAreaPortalState. */ public static void CM_SetAreaPortalState(int portalnum, boolean open) { *************** *** 1707,1712 **** } ! /* ! * ================= CM_AreasConnected ================= */ --- 1700,1705 ---- } ! /** ! * CM_AreasConnected returns true, if two areas are connected. */ *************** *** 1724,1734 **** } ! /* ! * ================= CM_WriteAreaBits ! * ! * Writes a length byte followed by a bit vector of all the areas that area * in the same flood as the area parameter * ! * This is used by the client refreshes to cull visibility ================= */ public static int CM_WriteAreaBits(byte buffer[], int area) { --- 1717,1725 ---- } ! /** ! * CM_WriteAreaBits writes a length byte followed by a bit vector of all the areas that area * in the same flood as the area parameter * ! * This is used by the client refreshes to cull visibility. */ public static int CM_WriteAreaBits(byte buffer[], int area) { *************** *** 1739,1743 **** bytes = (numareas + 7) >> 3; ! if (map_noareas.value != 0) { // for debugging, send everything Arrays.fill(buffer, 0, bytes, (byte) 255); } else { --- 1730,1735 ---- bytes = (numareas + 7) >> 3; ! if (map_noareas.value != 0) { ! // for debugging, send everything Arrays.fill(buffer, 0, bytes, (byte) 255); } else { *************** *** 1753,1767 **** } ! /* ! * =================== CM_WritePortalState ! * ! * Writes the portal state to a savegame file =================== */ public static void CM_WritePortalState(RandomAccessFile os) { - //was: fwrite(portalopen, sizeof(portalopen), 1, f); try { - for (int n = 0; n < portalopen.length; n++) if (portalopen[n]) --- 1745,1755 ---- } ! /** ! * CM_WritePortalState writes the portal state to a savegame file. */ public static void CM_WritePortalState(RandomAccessFile os) { try { for (int n = 0; n < portalopen.length; n++) if (portalopen[n]) *************** *** 1775,1783 **** } ! /* ! * =================== CM_ReadPortalState ! * ! * Reads the portal state from a savegame file and recalculates the area ! * connections =================== */ public static void CM_ReadPortalState(RandomAccessFile f) { --- 1763,1769 ---- } ! /** ! * CM_ReadPortalState reads the portal state from a savegame file and recalculates the area ! * connections. */ public static void CM_ReadPortalState(RandomAccessFile f) { *************** *** 1799,1807 **** } ! /* ! * ============= CM_HeadnodeVisible ! * ! * Returns true if any leaf under headnode has a cluster that is potentially ! * visible ============= */ public static boolean CM_HeadnodeVisible(int nodenum, byte visbits[]) { --- 1785,1791 ---- } ! /** ! * CM_HeadnodeVisible returns true if any leaf under headnode has a cluster that is potentially ! * visible. */ public static boolean CM_HeadnodeVisible(int nodenum, byte visbits[]) { |
|
From: Rene S. <sa...@us...> - 2007-04-15 20:12:39
|
Update of /cvsroot/jake2/jake2/src/jake2/sys In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2419/src/jake2/sys Modified Files: NET.java Log Message: cosmetic Index: NET.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/sys/NET.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** NET.java 11 Jan 2006 22:04:42 -0000 1.10 --- NET.java 15 Apr 2007 20:12:33 -0000 1.11 *************** *** 168,173 **** public static boolean GetLoopPacket(int sock, netadr_t net_from, sizebuf_t net_message) { ! loopback_t loop; ! loop = loopbacks[sock]; if (loop.send - loop.get > MAX_LOOPBACK) --- 168,173 ---- public static boolean GetLoopPacket(int sock, netadr_t net_from, sizebuf_t net_message) { ! ! loopback_t loop = loopbacks[sock]; if (loop.send - loop.get > MAX_LOOPBACK) |
|
From: Carsten W. <ca...@us...> - 2007-03-20 18:57:22
|
Update of /cvsroot/jake2/jake2/test/jake2/render In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv13609/test/jake2/render Modified Files: DancingQueens.java Log Message: use lwjgl for performance tests Index: DancingQueens.java =================================================================== RCS file: /cvsroot/jake2/jake2/test/jake2/render/DancingQueens.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** DancingQueens.java 21 Nov 2006 01:20:48 -0000 1.11 --- DancingQueens.java 20 Mar 2007 18:57:16 -0000 1.12 *************** *** 72,76 **** Jake2.Q2Dialog.setVisible(true); ! String DRIVER = "jsr231"; Qcommon.Init(new String[] { "DancingQueens", "+set", "gl_mode", "4", --- 72,76 ---- Jake2.Q2Dialog.setVisible(true); ! String DRIVER = "lwjgl"; Qcommon.Init(new String[] { "DancingQueens", "+set", "gl_mode", "4", |
|
From: Carsten W. <ca...@us...> - 2007-03-19 03:08:43
|
Update of /cvsroot/jake2/jake2/lib/lwjgl/patch/org In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv1997/lib/lwjgl/patch/org Log Message: Directory /cvsroot/jake2/jake2/lib/lwjgl/patch/org added to the repository |
|
From: Carsten W. <ca...@us...> - 2007-03-19 03:08:42
|
Update of /cvsroot/jake2/jake2/lib/lwjgl/patch In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv1997/lib/lwjgl/patch Log Message: Directory /cvsroot/jake2/jake2/lib/lwjgl/patch added to the repository |
|
From: Carsten W. <ca...@us...> - 2007-03-19 03:08:38
|
Update of /cvsroot/jake2/jake2/lib/lwjgl/patch/org/lwjgl In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2076/lib/lwjgl/patch/org/lwjgl Added Files: BufferChecks.java Log Message: original lwjgl1.0 classes --- NEW FILE: BufferChecks.java --- /* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are * met: * * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * * Neither the name of 'LWJGL' nor the names of * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl; import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.DoubleBuffer; import java.nio.FloatBuffer; import java.nio.IntBuffer; import java.nio.ShortBuffer; import java.nio.LongBuffer; /** * <p>A class to check buffer boundaries in general. If there is unsufficient space * 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. * </p> * @author cix_foo <ci...@us...> * @author elias_naur <eli...@us...> * @version $Revision: 1.1 $ * $Id: BufferChecks.java,v 1.1 2007/03/17 15:59:54 cawe Exp $ */ public class BufferChecks { /** Static methods only! */ private BufferChecks() { } /** * Default buffer size for most buffer checks. */ private static final int DEFAULT_BUFFER_SIZE = 4; /** * Helper methods to ensure a function pointer is not-null (0) */ public static void checkFunctionAddress(long pointer) { if (pointer == 0) { throw new IllegalStateException("Function is not supported"); } } /** * Helper methods to ensure a ByteBuffer is null-terminated */ public static void checkNullTerminated(ByteBuffer buf) { if (buf.get(buf.limit() - 1) != 0) { throw new IllegalArgumentException("Missing null termination"); } } public static void checkNotNull(Object o) { if (o == null) throw new IllegalArgumentException("Null argument"); } /** * Helper methods to ensure a buffer is direct or null. */ public static void checkDirectOrNull(ByteBuffer buf) { if (buf != null) { checkDirect(buf); } } public static void checkDirectOrNull(ShortBuffer buf) { if (buf != null) { checkDirect(buf); } } public static void checkDirectOrNull(IntBuffer buf) { if (buf != null) { checkDirect(buf); } } public static void checkDirectOrNull(LongBuffer buf) { if (buf != null) { checkDirect(buf); } } public static void checkDirectOrNull(FloatBuffer buf) { if (buf != null) { checkDirect(buf); } } public static void checkDirectOrNull(DoubleBuffer buf) { if (buf != null) { checkDirect(buf); } } /** * Helper methods to ensure a buffer is direct (and, implicitly, non-null). */ public static void checkDirectBuffer(Buffer buf) { if (buf instanceof FloatBuffer) checkDirect((FloatBuffer)buf); else if (buf instanceof ByteBuffer) checkDirect((ByteBuffer)buf); else if (buf instanceof ShortBuffer) checkDirect((ShortBuffer)buf); else if (buf instanceof IntBuffer) checkDirect((IntBuffer)buf); else if (buf instanceof LongBuffer) checkDirect((LongBuffer)buf); else if (buf instanceof DoubleBuffer) checkDirect((DoubleBuffer)buf); else throw new IllegalStateException("Unsupported buffer type"); } public static void checkDirect(ByteBuffer buf) { if (!buf.isDirect()) { throw new IllegalArgumentException("ByteBuffer is not direct"); } } public static void checkDirect(ShortBuffer buf) { if (!buf.isDirect()) { throw new IllegalArgumentException("ShortBuffer is not direct"); } } public static void checkDirect(IntBuffer buf) { if (!buf.isDirect()) { throw new IllegalArgumentException("IntBuffer is not direct"); } } public static void checkDirect(LongBuffer buf) { if (!buf.isDirect()) { throw new IllegalArgumentException("LongBuffer is not direct"); } } public static void checkDirect(FloatBuffer buf) { if (!buf.isDirect()) { throw new IllegalArgumentException("FloatBuffer is not direct"); } } public static void checkDirect(DoubleBuffer buf) { if (!buf.isDirect()) { throw new IllegalArgumentException("DoubleBuffer is not direct"); } } /** * This is a separate call to help inline checkBufferSize. */ private static void throwBufferSizeException(Buffer buf, int size) { throw new IllegalArgumentException("Number of remaining buffer elements is " + buf.remaining() + ", must be at least " + size); } /** * Helper method to ensure a buffer is big enough to receive data from a * glGet* operation. * * @param buf * The buffer to check * @param size * The minimum buffer size * @throws IllegalArgumentException */ private static void checkBufferSize(Buffer buf, int size) { if (buf.remaining() < size) { throwBufferSizeException(buf, size); } } public static void checkBuffer(ByteBuffer buf, int size) { checkBufferSize(buf, size); checkDirect(buf); } public static void checkBuffer(ShortBuffer buf, int size) { checkBufferSize(buf, size); checkDirect(buf); } public static void checkBuffer(IntBuffer buf, int size) { checkBufferSize(buf, size); checkDirect(buf); } public static void checkBuffer(LongBuffer buf, int size) { checkBufferSize(buf, size); checkDirect(buf); } public static void checkBuffer(FloatBuffer buf, int size) { checkBufferSize(buf, size); checkDirect(buf); } public static void checkBuffer(DoubleBuffer buf, int size) { checkBufferSize(buf, size); checkDirect(buf); } /** * 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) { checkBuffer(buf, DEFAULT_BUFFER_SIZE); } public static void checkBuffer(ShortBuffer buf) { checkBuffer(buf, DEFAULT_BUFFER_SIZE); } public static void checkBuffer(IntBuffer buf) { checkBuffer(buf, DEFAULT_BUFFER_SIZE); } public static void checkBuffer(LongBuffer buf) { checkBuffer(buf, DEFAULT_BUFFER_SIZE); } public static void checkBuffer(FloatBuffer buf) { checkBuffer(buf, DEFAULT_BUFFER_SIZE); } public static void checkBuffer(DoubleBuffer buf) { checkBuffer(buf, DEFAULT_BUFFER_SIZE); } } |
|
From: Carsten W. <ca...@us...> - 2007-03-19 02:17:16
|
Update of /cvsroot/jake2/jake2/lib/lwjgl/patch/org/lwjgl In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv1997/lib/lwjgl/patch/org/lwjgl Log Message: Directory /cvsroot/jake2/jake2/lib/lwjgl/patch/org/lwjgl added to the repository |
|
From: Carsten W. <ca...@us...> - 2007-03-19 02:16:05
|
Update of /cvsroot/jake2/jake2/lib/lwjgl/patch/org/lwjgl In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv3471/lib/lwjgl/patch/org/lwjgl Modified Files: BufferChecks.java Log Message: performance patch; checks removed Index: BufferChecks.java =================================================================== RCS file: /cvsroot/jake2/jake2/lib/lwjgl/patch/org/lwjgl/BufferChecks.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BufferChecks.java 17 Mar 2007 15:59:54 -0000 1.1 --- BufferChecks.java 17 Mar 2007 16:02:17 -0000 1.2 *************** *** 64,70 **** */ public static void checkFunctionAddress(long pointer) { - if (pointer == 0) { - throw new IllegalStateException("Function is not supported"); - } } --- 64,67 ---- *************** *** 73,84 **** */ public static void checkNullTerminated(ByteBuffer buf) { - if (buf.get(buf.limit() - 1) != 0) { - throw new IllegalArgumentException("Missing null termination"); - } } public static void checkNotNull(Object o) { - if (o == null) - throw new IllegalArgumentException("Null argument"); } --- 70,76 ---- *************** *** 87,123 **** */ public static void checkDirectOrNull(ByteBuffer buf) { - if (buf != null) { - checkDirect(buf); - } } public static void checkDirectOrNull(ShortBuffer buf) { - if (buf != null) { - checkDirect(buf); - } } public static void checkDirectOrNull(IntBuffer buf) { - if (buf != null) { - checkDirect(buf); - } } public static void checkDirectOrNull(LongBuffer buf) { - if (buf != null) { - checkDirect(buf); - } } public static void checkDirectOrNull(FloatBuffer buf) { - if (buf != null) { - checkDirect(buf); - } } public static void checkDirectOrNull(DoubleBuffer buf) { - if (buf != null) { - checkDirect(buf); - } } --- 79,97 ---- *************** *** 126,179 **** */ public static void checkDirectBuffer(Buffer buf) { - if (buf instanceof FloatBuffer) - checkDirect((FloatBuffer)buf); - else if (buf instanceof ByteBuffer) - checkDirect((ByteBuffer)buf); - else if (buf instanceof ShortBuffer) - checkDirect((ShortBuffer)buf); - else if (buf instanceof IntBuffer) - checkDirect((IntBuffer)buf); - else if (buf instanceof LongBuffer) - checkDirect((LongBuffer)buf); - else if (buf instanceof DoubleBuffer) - checkDirect((DoubleBuffer)buf); - else - throw new IllegalStateException("Unsupported buffer type"); } public static void checkDirect(ByteBuffer buf) { - if (!buf.isDirect()) { - throw new IllegalArgumentException("ByteBuffer is not direct"); - } } public static void checkDirect(ShortBuffer buf) { - if (!buf.isDirect()) { - throw new IllegalArgumentException("ShortBuffer is not direct"); - } } public static void checkDirect(IntBuffer buf) { - if (!buf.isDirect()) { - throw new IllegalArgumentException("IntBuffer is not direct"); - } } public static void checkDirect(LongBuffer buf) { - if (!buf.isDirect()) { - throw new IllegalArgumentException("LongBuffer is not direct"); - } } public static void checkDirect(FloatBuffer buf) { - if (!buf.isDirect()) { - throw new IllegalArgumentException("FloatBuffer is not direct"); - } } public static void checkDirect(DoubleBuffer buf) { - if (!buf.isDirect()) { - throw new IllegalArgumentException("DoubleBuffer is not direct"); - } } --- 100,121 ---- *************** *** 196,232 **** */ private static void checkBufferSize(Buffer buf, int size) { - if (buf.remaining() < size) { - throwBufferSizeException(buf, size); - } } public static void checkBuffer(ByteBuffer buf, int size) { - checkBufferSize(buf, size); - checkDirect(buf); } public static void checkBuffer(ShortBuffer buf, int size) { - checkBufferSize(buf, size); - checkDirect(buf); } public static void checkBuffer(IntBuffer buf, int size) { - checkBufferSize(buf, size); - checkDirect(buf); } public static void checkBuffer(LongBuffer buf, int size) { - checkBufferSize(buf, size); - checkDirect(buf); } public static void checkBuffer(FloatBuffer buf, int size) { - checkBufferSize(buf, size); - checkDirect(buf); } public static void checkBuffer(DoubleBuffer buf, int size) { - checkBufferSize(buf, size); - checkDirect(buf); } --- 138,159 ---- *************** *** 242,266 **** */ public static void checkBuffer(ByteBuffer buf) { - checkBuffer(buf, DEFAULT_BUFFER_SIZE); } public static void checkBuffer(ShortBuffer buf) { - checkBuffer(buf, DEFAULT_BUFFER_SIZE); } public static void checkBuffer(IntBuffer buf) { - checkBuffer(buf, DEFAULT_BUFFER_SIZE); } public static void checkBuffer(LongBuffer buf) { - checkBuffer(buf, DEFAULT_BUFFER_SIZE); } public static void checkBuffer(FloatBuffer buf) { - checkBuffer(buf, DEFAULT_BUFFER_SIZE); } public static void checkBuffer(DoubleBuffer buf) { - checkBuffer(buf, DEFAULT_BUFFER_SIZE); } } --- 169,187 ---- |
|
From: Carsten W. <ca...@us...> - 2007-03-18 12:00:02
|
Update of /cvsroot/jake2/jake2/lib/lwjgl/patch/org/lwjgl/opengl In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv1997/lib/lwjgl/patch/org/lwjgl/opengl Log Message: Directory /cvsroot/jake2/jake2/lib/lwjgl/patch/org/lwjgl/opengl added to the repository |
|
From: Carsten W. <ca...@us...> - 2007-03-18 12:00:02
|
Update of /cvsroot/jake2/jake2/webstart In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv31673/webstart Modified Files: jake2_lwjgl.jnlp jake2_jsr231.jnlp jake2_online.jnlp jake2_jogl11.jnlp Log Message: change location of jake2 webstart Index: jake2_online.jnlp =================================================================== RCS file: /cvsroot/jake2/jake2/webstart/jake2_online.jnlp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** jake2_online.jnlp 22 Nov 2006 17:07:54 -0000 1.3 --- jake2_online.jnlp 17 Mar 2007 17:14:44 -0000 1.4 *************** *** 1,5 **** <?xml version="1.0" encoding="utf-8"?> <jnlp spec="1.0+" ! codebase="http://www.bytonic.de/downloads" href="jake2_online.jnlp"> --- 1,5 ---- <?xml version="1.0" encoding="utf-8"?> <jnlp spec="1.0+" ! codebase="http://jake2.in-chemnitz.de/downloads" href="jake2_online.jnlp"> *************** *** 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> --- 9,13 ---- <homepage href="http://www.bytonic.de/html/jake2.html"/> <description>Java port of the Quake2 game engine</description> ! <icon href="http://jake2.in-chemnitz.de/downloads/icon.gif"/> <offline-allowed/> </information> *************** *** 19,26 **** <resources> <j2se version="1.4+" max-heap-size="100M"/> ! <jar href="http://jake2.sourceforge.net/lib/jake2.jar"/> <property name="sun.java2d.noddraw" value="true"/> ! <property name="ATI_WORKAROUND" value="false"/> ! <extension name="jogl" href="http://download.java.net/media/jogl/builds/archive/jsr-231-1.0.0/jogl.jnlp" /> <extension name="joal" href="http://download.java.net/media/joal/webstart/joal.jnlp" /> </resources> --- 19,25 ---- <resources> <j2se version="1.4+" max-heap-size="100M"/> ! <jar href="http://jake2.in-chemnitz.de/downloads/lib/jake2.jar"/> <property name="sun.java2d.noddraw" value="true"/> ! <extension name="jogl" href="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-current/jogl.jnlp" /> <extension name="joal" href="http://download.java.net/media/joal/webstart/joal.jnlp" /> </resources> *************** *** 36,41 **** <argument>adr0</argument> <argument>jake2.in-chemnitz.de</argument> <argument>+connect</argument> ! <argument>jake2.in-chemnitz.de</argument> </application-desc> --- 35,43 ---- <argument>adr0</argument> <argument>jake2.in-chemnitz.de</argument> + <argument>+set</argument> + <argument>clientport</argument> + <argument>27910</argument> <argument>+connect</argument> ! <argument>88.198.147.212</argument> </application-desc> Index: jake2_jogl11.jnlp =================================================================== RCS file: /cvsroot/jake2/jake2/webstart/jake2_jogl11.jnlp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** jake2_jogl11.jnlp 26 Oct 2006 20:22:17 -0000 1.15 --- jake2_jogl11.jnlp 17 Mar 2007 17:14:44 -0000 1.16 *************** *** 1,5 **** <?xml version="1.0" encoding="utf-8"?> <jnlp spec="1.0+" ! codebase="http://www.bytonic.de/downloads" href="jake2_jogl11.jnlp"> --- 1,5 ---- <?xml version="1.0" encoding="utf-8"?> <jnlp spec="1.0+" ! codebase="http://jake2.in-chemnitz.de/downloads" href="jake2_jogl11.jnlp"> *************** *** 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> --- 9,13 ---- <homepage href="http://www.bytonic.de/html/jake2.html"/> <description>Java port of the Quake2 game engine</description> ! <icon href="http://jake2.in-chemnitz.de/downloads/icon.gif"/> <offline-allowed/> </information> *************** *** 19,25 **** <resources> <j2se version="1.4+" max-heap-size="100M"/> ! <jar href="http://jake2.sourceforge.net/lib/jake2.jar"/> <property name="sun.java2d.noddraw" value="true"/> - <property name="ATI_WORKAROUND" value="false"/> <extension name="jogl" href="https://jogl.dev.java.net/webstart/jogl-1-1.jnlp"/> <extension name="joal" href="http://download.java.net/media/joal/webstart/joal.jnlp" /> --- 19,24 ---- <resources> <j2se version="1.4+" max-heap-size="100M"/> ! <jar href="http://jake2.in-chemnitz.de/downloads/lib/jake2.jar"/> <property name="sun.java2d.noddraw" value="true"/> <extension name="jogl" href="https://jogl.dev.java.net/webstart/jogl-1-1.jnlp"/> <extension name="joal" href="http://download.java.net/media/joal/webstart/joal.jnlp" /> Index: jake2_lwjgl.jnlp =================================================================== RCS file: /cvsroot/jake2/jake2/webstart/jake2_lwjgl.jnlp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** jake2_lwjgl.jnlp 23 Nov 2006 13:52:30 -0000 1.13 --- jake2_lwjgl.jnlp 17 Mar 2007 17:14:44 -0000 1.14 *************** *** 1,5 **** <?xml version="1.0" encoding="utf-8"?> <jnlp spec="1.0+" ! codebase="http://www.bytonic.de/downloads" href="jake2_lwjgl.jnlp"> --- 1,5 ---- <?xml version="1.0" encoding="utf-8"?> <jnlp spec="1.0+" ! codebase="http://jake2.in-chemnitz.de/downloads" href="jake2_lwjgl.jnlp"> *************** *** 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> --- 9,13 ---- <homepage href="http://www.bytonic.de/html/jake2.html"/> <description>Java port of the Quake2 game engine</description> ! <icon href="http://jake2.in-chemnitz.de/downloads/icon.gif"/> <offline-allowed/> </information> *************** *** 19,26 **** <resources> <j2se version="1.4+" max-heap-size="100M"/> ! <jar href="http://jake2.sourceforge.net/lib/jake2.jar"/> ! <extension name="lwjgl" href="http://lwjgl.org/jnlp/extension.php"/> </resources> <application-desc main-class="jake2.Jake2"> <argument>+set</argument> --- 19,39 ---- <resources> <j2se version="1.4+" max-heap-size="100M"/> ! <jar href="http://jake2.in-chemnitz.de/downloads/lib/jake2.jar"/> ! <jar href="http://jake2.in-chemnitz.de/downloads/lib/lwjgl.jar"/> ! <jar href="http://jake2.in-chemnitz.de/downloads/lib/lwjgl_util.jar"/> ! </resources> ! ! <resources os="Linux"> ! <nativelib href="http://jake2.in-chemnitz.de/downloads/lib/linux/lwjgl-native.jar"/> ! </resources> ! ! <resources os="Windows"> ! <nativelib href="http://jake2.in-chemnitz.de/downloads/lib/windows/lwjgl-native.jar"/> </resources> + <resources os="Mac OS X"> + <nativelib href="http://jake2.in-chemnitz.de/downloads/lib/osx/lwjgl-native.jar"/> + </resources> + <application-desc main-class="jake2.Jake2"> <argument>+set</argument> Index: jake2_jsr231.jnlp =================================================================== RCS file: /cvsroot/jake2/jake2/webstart/jake2_jsr231.jnlp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** jake2_jsr231.jnlp 22 Nov 2006 17:05:33 -0000 1.1 --- jake2_jsr231.jnlp 17 Mar 2007 17:14:44 -0000 1.2 *************** *** 1,5 **** <?xml version="1.0" encoding="utf-8"?> <jnlp spec="1.0+" ! codebase="http://www.bytonic.de/downloads" href="jake2_jsr231.jnlp"> --- 1,5 ---- <?xml version="1.0" encoding="utf-8"?> <jnlp spec="1.0+" ! codebase="http://jake2.in-chemnitz.de/downloads" href="jake2_jsr231.jnlp"> *************** *** 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> --- 9,13 ---- <homepage href="http://www.bytonic.de/html/jake2.html"/> <description>Java port of the Quake2 game engine</description> ! <icon href="http://jake2.in-chemnitz.de/downloads/icon.gif"/> <offline-allowed/> </information> *************** *** 19,26 **** <resources> <j2se version="1.4+" max-heap-size="100M"/> ! <jar href="http://jake2.sourceforge.net/lib/jake2.jar"/> <property name="sun.java2d.noddraw" value="true"/> ! <property name="ATI_WORKAROUND" value="false"/> ! <extension name="jogl" href="http://download.java.net/media/jogl/builds/archive/jsr-231-1.0.0/jogl.jnlp" /> <extension name="joal" href="http://download.java.net/media/joal/webstart/joal.jnlp" /> </resources> --- 19,25 ---- <resources> <j2se version="1.4+" max-heap-size="100M"/> ! <jar href="http://jake2.in-chemnitz.de/downloads/lib/jake2.jar"/> <property name="sun.java2d.noddraw" value="true"/> ! <extension name="jogl" href="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-current/jogl.jnlp" /> <extension name="joal" href="http://download.java.net/media/joal/webstart/joal.jnlp" /> </resources> |
|
From: Carsten W. <ca...@us...> - 2007-03-18 12:00:01
|
Update of /cvsroot/jake2/jake2/lib/lwjgl/patch/org/lwjgl/opengl In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv3501/lib/lwjgl/patch/org/lwjgl/opengl Modified Files: GLChecks.java Log Message: performance patch; checks removed Index: GLChecks.java =================================================================== RCS file: /cvsroot/jake2/jake2/lib/lwjgl/patch/org/lwjgl/opengl/GLChecks.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GLChecks.java 17 Mar 2007 15:59:54 -0000 1.1 --- GLChecks.java 17 Mar 2007 16:02:53 -0000 1.2 *************** *** 81,135 **** /** Helper method to ensure that array buffer objects are disabled. If they are enabled, we'll throw an OpenGLException */ static void ensureArrayVBOdisabled(ContextCapabilities caps) { - if ((caps.OpenGL15 && !checkBufferObject(caps, GL15.GL_ARRAY_BUFFER_BINDING, false) || - (caps.GL_ARB_vertex_buffer_object && !checkBufferObject(caps, ARBVertexBufferObject.GL_ARRAY_BUFFER_BINDING_ARB, false)))) - throw new OpenGLException("Cannot use Buffers when Array Buffer Object is enabled"); } /** Helper method to ensure that array buffer objects are enabled. If they are disabled, we'll throw an OpenGLException */ static void ensureArrayVBOenabled(ContextCapabilities caps) { - if ((caps.OpenGL15 && !checkBufferObject(caps, GL15.GL_ARRAY_BUFFER_BINDING, true) || - (caps.GL_ARB_vertex_buffer_object && !checkBufferObject(caps, ARBVertexBufferObject.GL_ARRAY_BUFFER_BINDING_ARB, true)))) - throw new OpenGLException("Cannot use offsets when Array Buffer Object is disabled"); } /** Helper method to ensure that element array buffer objects are disabled. If they are enabled, we'll throw an OpenGLException */ static void ensureElementVBOdisabled(ContextCapabilities caps) { - if ((caps.OpenGL15 && !checkBufferObject(caps, GL15.GL_ELEMENT_ARRAY_BUFFER_BINDING, false) || - (caps.GL_ARB_vertex_buffer_object && !checkBufferObject(caps, ARBVertexBufferObject.GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB, false)))) - throw new OpenGLException("Cannot use Buffers when Element Array Buffer Object is enabled"); } /** Helper method to ensure that element array buffer objects are enabled. If they are disabled, we'll throw an OpenGLException */ static void ensureElementVBOenabled(ContextCapabilities caps) { - if ((caps.OpenGL15 && !checkBufferObject(caps, GL15.GL_ELEMENT_ARRAY_BUFFER_BINDING, true) || - (caps.GL_ARB_vertex_buffer_object && !checkBufferObject(caps, ARBVertexBufferObject.GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB, true)))) - throw new OpenGLException("Cannot use offsets when Element Array Buffer Object is disabled"); } /** Helper method to ensure that pixel pack buffer objects are disabled. If they are enabled, we'll throw an OpenGLException */ static void ensurePackPBOdisabled(ContextCapabilities caps) { - if ((caps.GL_ARB_pixel_buffer_object && !checkBufferObject(caps, ARBPixelBufferObject.GL_PIXEL_PACK_BUFFER_BINDING_ARB, false) || (caps.GL_EXT_pixel_buffer_object && !checkBufferObject(caps, EXTPixelBufferObject.GL_PIXEL_PACK_BUFFER_BINDING_EXT, false)))) - throw new OpenGLException("Cannot use Buffers when Pixel Pack Buffer Object is enabled"); } /** Helper method to ensure that pixel pack buffer objects are enabled. If they are disabled, we'll throw an OpenGLException */ static void ensurePackPBOenabled(ContextCapabilities caps) { - if ((caps.GL_ARB_pixel_buffer_object && !checkBufferObject(caps, ARBPixelBufferObject.GL_PIXEL_PACK_BUFFER_BINDING_ARB, true) || - (caps.GL_EXT_pixel_buffer_object && !checkBufferObject(caps, EXTPixelBufferObject.GL_PIXEL_PACK_BUFFER_BINDING_EXT, true)))) - throw new OpenGLException("Cannot use offsets when Pixel Pack Buffer Object is disabled"); } /** Helper method to ensure that pixel unpack buffer objects are disabled. If they are enabled, we'll throw an OpenGLException */ static void ensureUnpackPBOdisabled(ContextCapabilities caps) { - if ((caps.GL_ARB_pixel_buffer_object && !checkBufferObject(caps, ARBPixelBufferObject.GL_PIXEL_UNPACK_BUFFER_BINDING_ARB, false) || - (caps.GL_EXT_pixel_buffer_object && !checkBufferObject(caps, EXTPixelBufferObject.GL_PIXEL_UNPACK_BUFFER_BINDING_EXT, false)))) - throw new OpenGLException("Cannot use Buffers when Pixel Unpack Buffer Object is enabled"); } /** Helper method to ensure that pixel unpack buffer objects are enabled. If they are disabled, we'll throw an OpenGLException */ static void ensureUnpackPBOenabled(ContextCapabilities caps) { - if ((caps.GL_ARB_pixel_buffer_object && !checkBufferObject(caps, ARBPixelBufferObject.GL_PIXEL_UNPACK_BUFFER_BINDING_ARB, true) || - (caps.GL_EXT_pixel_buffer_object && !checkBufferObject(caps, EXTPixelBufferObject.GL_PIXEL_UNPACK_BUFFER_BINDING_EXT, true)))) - throw new OpenGLException("Cannot use offsets when Pixel Unpack Buffer Object is disabled"); } --- 81,112 ---- |
|
From: Carsten W. <ca...@us...> - 2007-03-18 11:59:58
|
Update of /cvsroot/jake2/jake2/webstart In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv11261/webstart Modified Files: jake2_online.jnlp Log Message: disable client port Index: jake2_online.jnlp =================================================================== RCS file: /cvsroot/jake2/jake2/webstart/jake2_online.jnlp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** jake2_online.jnlp 17 Mar 2007 17:14:44 -0000 1.4 --- jake2_online.jnlp 17 Mar 2007 17:43:09 -0000 1.5 *************** *** 35,41 **** <argument>adr0</argument> <argument>jake2.in-chemnitz.de</argument> ! <argument>+set</argument> ! <argument>clientport</argument> ! <argument>27910</argument> <argument>+connect</argument> <argument>88.198.147.212</argument> --- 35,43 ---- <argument>adr0</argument> <argument>jake2.in-chemnitz.de</argument> ! <!-- ! <argument>+set</argument> ! <argument>clientport</argument> ! <argument>27910</argument> ! --> <argument>+connect</argument> <argument>88.198.147.212</argument> |
|
From: Carsten W. <ca...@us...> - 2007-03-18 11:59:55
|
Update of /cvsroot/jake2/jake2/webstart In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv15107/webstart Modified Files: jake2_online.jnlp Log Message: sorry, enable client port Index: jake2_online.jnlp =================================================================== RCS file: /cvsroot/jake2/jake2/webstart/jake2_online.jnlp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** jake2_online.jnlp 17 Mar 2007 17:43:09 -0000 1.5 --- jake2_online.jnlp 17 Mar 2007 17:52:38 -0000 1.6 *************** *** 35,43 **** <argument>adr0</argument> <argument>jake2.in-chemnitz.de</argument> ! <!-- ! <argument>+set</argument> ! <argument>clientport</argument> ! <argument>27910</argument> ! --> <argument>+connect</argument> <argument>88.198.147.212</argument> --- 35,41 ---- <argument>adr0</argument> <argument>jake2.in-chemnitz.de</argument> ! <argument>+set</argument> ! <argument>clientport</argument> ! <argument>27910</argument> <argument>+connect</argument> <argument>88.198.147.212</argument> |
|
From: Carsten W. <ca...@us...> - 2007-03-18 11:59:55
|
Update of /cvsroot/jake2/jake2/lib/lwjgl/patch/org/lwjgl/opengl In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv4276/lib/lwjgl/patch/org/lwjgl/opengl Modified Files: GL11.java Log Message: performance patch; checks removed Index: GL11.java =================================================================== RCS file: /cvsroot/jake2/jake2/lib/lwjgl/patch/org/lwjgl/opengl/GL11.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GL11.java 17 Mar 2007 15:59:54 -0000 1.1 --- GL11.java 17 Mar 2007 16:04:19 -0000 1.2 *************** *** 548,552 **** ContextCapabilities caps = GLContext.getCapabilities(); long function_pointer = caps.GL11_glAccum_pointer; ! BufferChecks.checkFunctionAddress(function_pointer); nglAccum(op, value, function_pointer); } --- 548,552 ---- ContextCapabilities caps = GLContext.getCapabilities(); long function_pointer = caps.GL11_glAccum_pointer; ! nglAccum(op, value, function_pointer); [...4215 lines suppressed...] } --- 3001,3005 ---- ContextCapabilities caps = GLContext.getCapabilities(); long function_pointer = caps.GL11_glStencilMask_pointer; ! nglStencilMask(mask, function_pointer); } *************** *** 3017,3021 **** ContextCapabilities caps = GLContext.getCapabilities(); long function_pointer = caps.GL11_glViewport_pointer; ! BufferChecks.checkFunctionAddress(function_pointer); nglViewport(x, y, width, height, function_pointer); } --- 3009,3013 ---- ContextCapabilities caps = GLContext.getCapabilities(); long function_pointer = caps.GL11_glViewport_pointer; ! nglViewport(x, y, width, height, function_pointer); } |
|
From: Carsten W. <ca...@us...> - 2007-03-18 11:59:52
|
Update of /cvsroot/jake2/jake2 In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv7365 Modified Files: build.xml Log Message: New "patch" task for lwjgl1.0 to improve performance. This updates the original lwjgl.jar with modified versions of: org.lwjgl.BufferChecks org.lwjgl.opengl.GLChecks org.lwjgl.opengl.GL11 Index: build.xml =================================================================== RCS file: /cvsroot/jake2/jake2/build.xml,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** build.xml 22 Nov 2006 17:20:47 -0000 1.33 --- build.xml 17 Mar 2007 16:11:59 -0000 1.34 *************** *** 15,19 **** <property name="version" value="cvs"/> <property name="src" location="src"/> - <property name="patch" location="patch"/> <property name="test" location="test"/> <property name="build" location="build"/> --- 15,18 ---- *************** *** 169,173 **** </proguard --> </target> ! <!-- everything --> <target name="all" depends="installer,bindist,srcdist"> --- 168,185 ---- </proguard --> </target> ! ! <target name="patch" depends="copy"> ! <!-- performance patch for lwjgl --> ! <javac destdir="${build}" optimize="off" debug="on" source="1.4"> ! <src path="lib/lwjgl/patch"/> ! <include name="org/lwjgl/**"/> ! <classpath refid="build.class.path"/> ! </javac> ! <!-- update original lwjgl.jar --> ! <jar destfile="${dist}/lib/lwjgl.jar" basedir="${build}" update="true"> ! <include name="org/lwjgl/**"/> ! </jar> ! </target> ! <!-- everything --> <target name="all" depends="installer,bindist,srcdist"> *************** *** 175,179 **** <!-- dist --> ! <target name="dist" depends="jar,copy"> </target> --- 187,191 ---- <!-- dist --> ! <target name="dist" depends="jar,copy,patch"> </target> |
|
From: Carsten W. <ca...@us...> - 2007-03-18 11:59:47
|
Update of /cvsroot/jake2/jake2/lib/lwjgl/patch/org/lwjgl/opengl In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2076/lib/lwjgl/patch/org/lwjgl/opengl Added Files: GLChecks.java GL11.java Log Message: original lwjgl1.0 classes --- NEW FILE: GLChecks.java --- /* * Copyright (c) 2002-2004 LWJGL Project * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are * met: * * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * * Neither the name of 'LWJGL' nor the names of * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ package org.lwjgl.opengl; import java.nio.Buffer; import java.nio.IntBuffer; import org.lwjgl.BufferUtils; /** * A class to check buffer boundaries in GL methods. Many GL * methods read data from the GL into a native Buffer at its current position. If there is unsufficient space 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. Therefore in those methods where GL reads data back into a buffer, we will call a bounds check method from this class * to ensure that there is sufficient space in the buffer. * <p/> * Thrown by the debug build library of the LWJGL if any OpenGL operation causes an error. * * @author cix_foo <ci...@us...> * @version $Revision: 1.1 $ * $Id: GLChecks.java,v 1.1 2007/03/17 15:59:54 cawe Exp $ */ class GLChecks { /** Static methods only! */ private GLChecks() { } static References getReferences(ContextCapabilities caps) { return StateTracker.getReferencesStack(caps).getReferences(); } static int getBufferObjectSize(ContextCapabilities caps, int buffer_enum) { IntBuffer scratch_buffer = caps.scratch_int_buffer; GL15.glGetBufferParameter(buffer_enum, GL15.GL_BUFFER_SIZE, scratch_buffer); return scratch_buffer.get(0); } static int getBufferObjectSizeARB(ContextCapabilities caps, int buffer_enum) { IntBuffer scratch_buffer = caps.scratch_int_buffer; ARBBufferObject.glGetBufferParameterARB(buffer_enum, ARBBufferObject.GL_BUFFER_SIZE_ARB, scratch_buffer); return scratch_buffer.get(0); } private static boolean checkBufferObject(ContextCapabilities caps, int buffer_enum, boolean state) { IntBuffer scratch_buffer = caps.scratch_int_buffer; GL11.glGetInteger(buffer_enum, scratch_buffer); boolean is_enabled = scratch_buffer.get(0) != 0; return state == is_enabled; } /** Helper method to ensure that array buffer objects are disabled. If they are enabled, we'll throw an OpenGLException */ static void ensureArrayVBOdisabled(ContextCapabilities caps) { if ((caps.OpenGL15 && !checkBufferObject(caps, GL15.GL_ARRAY_BUFFER_BINDING, false) || (caps.GL_ARB_vertex_buffer_object && !checkBufferObject(caps, ARBVertexBufferObject.GL_ARRAY_BUFFER_BINDING_ARB, false)))) throw new OpenGLException("Cannot use Buffers when Array Buffer Object is enabled"); } /** Helper method to ensure that array buffer objects are enabled. If they are disabled, we'll throw an OpenGLException */ static void ensureArrayVBOenabled(ContextCapabilities caps) { if ((caps.OpenGL15 && !checkBufferObject(caps, GL15.GL_ARRAY_BUFFER_BINDING, true) || (caps.GL_ARB_vertex_buffer_object && !checkBufferObject(caps, ARBVertexBufferObject.GL_ARRAY_BUFFER_BINDING_ARB, true)))) throw new OpenGLException("Cannot use offsets when Array Buffer Object is disabled"); } /** Helper method to ensure that element array buffer objects are disabled. If they are enabled, we'll throw an OpenGLException */ static void ensureElementVBOdisabled(ContextCapabilities caps) { if ((caps.OpenGL15 && !checkBufferObject(caps, GL15.GL_ELEMENT_ARRAY_BUFFER_BINDING, false) || (caps.GL_ARB_vertex_buffer_object && !checkBufferObject(caps, ARBVertexBufferObject.GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB, false)))) throw new OpenGLException("Cannot use Buffers when Element Array Buffer Object is enabled"); } /** Helper method to ensure that element array buffer objects are enabled. If they are disabled, we'll throw an OpenGLException */ static void ensureElementVBOenabled(ContextCapabilities caps) { if ((caps.OpenGL15 && !checkBufferObject(caps, GL15.GL_ELEMENT_ARRAY_BUFFER_BINDING, true) || (caps.GL_ARB_vertex_buffer_object && !checkBufferObject(caps, ARBVertexBufferObject.GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB, true)))) throw new OpenGLException("Cannot use offsets when Element Array Buffer Object is disabled"); } /** Helper method to ensure that pixel pack buffer objects are disabled. If they are enabled, we'll throw an OpenGLException */ static void ensurePackPBOdisabled(ContextCapabilities caps) { if ((caps.GL_ARB_pixel_buffer_object && !checkBufferObject(caps, ARBPixelBufferObject.GL_PIXEL_PACK_BUFFER_BINDING_ARB, false) || (caps.GL_EXT_pixel_buffer_object && !checkBufferObject(caps, EXTPixelBufferObject.GL_PIXEL_PACK_BUFFER_BINDING_EXT, false)))) throw new OpenGLException("Cannot use Buffers when Pixel Pack Buffer Object is enabled"); } /** Helper method to ensure that pixel pack buffer objects are enabled. If they are disabled, we'll throw an OpenGLException */ static void ensurePackPBOenabled(ContextCapabilities caps) { if ((caps.GL_ARB_pixel_buffer_object && !checkBufferObject(caps, ARBPixelBufferObject.GL_PIXEL_PACK_BUFFER_BINDING_ARB, true) || (caps.GL_EXT_pixel_buffer_object && !checkBufferObject(caps, EXTPixelBufferObject.GL_PIXEL_PACK_BUFFER_BINDING_EXT, true)))) throw new OpenGLException("Cannot use offsets when Pixel Pack Buffer Object is disabled"); } /** Helper method to ensure that pixel unpack buffer objects are disabled. If they are enabled, we'll throw an OpenGLException */ static void ensureUnpackPBOdisabled(ContextCapabilities caps) { if ((caps.GL_ARB_pixel_buffer_object && !checkBufferObject(caps, ARBPixelBufferObject.GL_PIXEL_UNPACK_BUFFER_BINDING_ARB, false) || (caps.GL_EXT_pixel_buffer_object && !checkBufferObject(caps, EXTPixelBufferObject.GL_PIXEL_UNPACK_BUFFER_BINDING_EXT, false)))) throw new OpenGLException("Cannot use Buffers when Pixel Unpack Buffer Object is enabled"); } /** Helper method to ensure that pixel unpack buffer objects are enabled. If they are disabled, we'll throw an OpenGLException */ static void ensureUnpackPBOenabled(ContextCapabilities caps) { if ((caps.GL_ARB_pixel_buffer_object && !checkBufferObject(caps, ARBPixelBufferObject.GL_PIXEL_UNPACK_BUFFER_BINDING_ARB, true) || (caps.GL_EXT_pixel_buffer_object && !checkBufferObject(caps, EXTPixelBufferObject.GL_PIXEL_UNPACK_BUFFER_BINDING_EXT, true)))) throw new OpenGLException("Cannot use offsets when Pixel Unpack Buffer Object is disabled"); } /** * Calculate the storage required for an image in elements * * @param format The format of the image (example: GL_RGBA) * @param type The type of the image elements (example: GL_UNSIGNED_BYTE) * @param width The width of the image * @param height The height of the image (1 for 1D images) * @param depth The depth of the image (1 for 2D images) * * @return the size, in elements, of the image */ static int calculateImageStorage(Buffer buffer, int format, int type, int width, int height, int depth) { return calculateImageStorage(format, type, width, height, depth) >> BufferUtils.getElementSizeExponent(buffer); } 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); } /** * Calculate the storage required for an image in bytes. * * @param format The format of the image (example: GL_RGBA) * @param type The type of the image elements (example: GL_UNSIGNED_BYTE) * @param width The width of the image * @param height The height of the image (1 for 1D images) * @param depth The depth of the image (1 for 2D images) * * @return the size, in bytes, of the image */ private static int calculateImageStorage(int format, int type, int width, int height, int depth) { return calculateBytesPerPixel(format, type) * width * height * depth; } 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)); } private static int calculateBytesPerPixel(int format, int type) { int bpe; switch ( type ) { case GL11.GL_UNSIGNED_BYTE: case GL11.GL_BYTE: bpe = 1; break; case GL11.GL_UNSIGNED_SHORT: case GL11.GL_SHORT: bpe = 2; break; case GL11.GL_UNSIGNED_INT: case GL11.GL_INT: case GL11.GL_FLOAT: bpe = 4; break; default : // TODO: Add more types (like the GL12 types GL_UNSIGNED_INT_8_8_8_8 return 0; // throw new IllegalArgumentException("Unknown type " + type); } int epp; switch ( format ) { case GL11.GL_LUMINANCE: case GL11.GL_ALPHA: epp = 1; break; case GL11.GL_LUMINANCE_ALPHA: epp = 2; break; case GL11.GL_RGB: case EXTBgra.GL_BGR_EXT: epp = 3; break; case GL11.GL_RGBA: case EXTAbgr.GL_ABGR_EXT: case EXTBgra.GL_BGRA_EXT: epp = 4; break; default : // TODO: Add more formats. Assuming 4 is too wasteful on buffer sizes where e.g. 1 is enough (like GL_DEPTH_COMPONENT) return 0; /* // Assume 4 elements per pixel epp = 4;*/ } return bpe * epp; } } --- NEW FILE: GL11.java --- /* 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; public static final int GL_LOAD = 0x101; public static final int GL_RETURN = 0x102; public static final int GL_MULT = 0x103; public static final int GL_ADD = 0x104; public static final int GL_NEVER = 0x200; public static final int GL_LESS = 0x201; public static final int GL_EQUAL = 0x202; public static final int GL_LEQUAL = 0x203; public static final int GL_GREATER = 0x204; [...2984 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; BufferChecks.checkFunctionAddress(function_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; BufferChecks.checkFunctionAddress(function_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-02-27 14:59:27
|
Update of /cvsroot/jake2/jake2/src/jake2/render/basic In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv20368/src/jake2/render/basic Modified Files: Model.java Log Message: clean up Index: Model.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/render/basic/Model.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Model.java 21 Nov 2006 00:50:46 -0000 1.2 --- Model.java 27 Feb 2007 14:59:21 -0000 1.3 *************** *** 2,7 **** * Model.java * Copyright (C) 2003 - * - * $Id$ */ /* --- 2,5 ---- *************** *** 346,351 **** void Mod_LoadVisibility(lump_t l) { - int i; - if (l.filelen == 0) { --- 344,347 ---- *************** *** 499,503 **** mtexinfo_t[] out; mtexinfo_t step; ! int i, j, count; int next; String name; --- 495,499 ---- mtexinfo_t[] out; mtexinfo_t step; ! int i, count; int next; String name; *************** *** 776,780 **** qfiles.dleaf_t in; mleaf_t[] out; ! int i, j, count, p; if ((l.filelen % qfiles.dleaf_t.SIZE) != 0) --- 772,776 ---- qfiles.dleaf_t in; mleaf_t[] out; ! int i, j, count; if ((l.filelen % qfiles.dleaf_t.SIZE) != 0) *************** *** 1000,1004 **** void Mod_LoadAliasModel (model_t mod, ByteBuffer buffer) { ! int i, j; qfiles.dmdl_t pheader; qfiles.dstvert_t[] poutst; --- 996,1000 ---- void Mod_LoadAliasModel (model_t mod, ByteBuffer buffer) { ! int i; qfiles.dmdl_t pheader; qfiles.dstvert_t[] poutst; |
|
From: Carsten W. <ca...@us...> - 2007-02-27 14:56:52
|
Update of /cvsroot/jake2/jake2/src/jake2/render/basic In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv19109/src/jake2/render/basic Modified Files: Image.java Log Message: clean up Index: Image.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/render/basic/Image.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Image.java 21 Nov 2006 00:50:46 -0000 1.2 --- Image.java 27 Feb 2007 14:56:49 -0000 1.3 *************** *** 2,7 **** * Image.java * Copyright (C) 2003 - * - * $Id$ */ /* --- 2,5 ---- *************** *** 30,38 **** import jake2.client.particle_t; import jake2.game.cvar_t; ! import jake2.qcommon.Com; ! import jake2.qcommon.Cvar; ! import jake2.qcommon.FS; ! import jake2.qcommon.longjmpException; ! import jake2.qcommon.qfiles; import jake2.render.image_t; import jake2.util.Lib; --- 28,32 ---- import jake2.client.particle_t; import jake2.game.cvar_t; ! import jake2.qcommon.*; import jake2.render.image_t; import jake2.util.Lib; *************** *** 43,47 **** import java.awt.image.AffineTransformOp; import java.awt.image.BufferedImage; ! import java.nio.*; import java.util.Arrays; --- 37,43 ---- import java.awt.image.AffineTransformOp; import java.awt.image.BufferedImage; ! import java.nio.ByteBuffer; ! import java.nio.ByteOrder; ! import java.nio.IntBuffer; import java.util.Arrays; *************** *** 549,553 **** byte[] raw; ByteBuffer buf_p; - int length; qfiles.tga_t targa_header; byte[] pic = null; --- 545,548 ---- *************** *** 1259,1263 **** } else { int p; - int rgb; for (int i = 0; i < s; i++) { p = data[i] & 0xff; --- 1254,1257 ---- *************** *** 1565,1575 **** protected void Draw_GetPalette() { int r, g, b; - Dimension dim; - byte[] pic; byte[][] palette = new byte[1][]; //new byte[768]; // get the palette ! pic = LoadPCX("pics/colormap.pcx", palette, dim = new Dimension()); if (palette[0] == null || palette[0].length != 768) --- 1559,1567 ---- protected void Draw_GetPalette() { int r, g, b; byte[][] palette = new byte[1][]; //new byte[768]; // get the palette ! LoadPCX("pics/colormap.pcx", palette, new Dimension()); if (palette[0] == null || palette[0].length != 768) |
|
From: Carsten W. <ca...@us...> - 2007-02-27 14:54:30
|
Update of /cvsroot/jake2/jake2/src/jake2/render/basic In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv18236/src/jake2/render/basic Modified Files: Light.java Log Message: clean up Index: Light.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/render/basic/Light.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Light.java 21 Nov 2006 00:50:46 -0000 1.2 --- Light.java 27 Feb 2007 14:54:21 -0000 1.3 *************** *** 2,7 **** * Light.java * Copyright (C) 2003 - * - * $Id$ */ /* --- 2,5 ---- *************** *** 29,33 **** import jake2.Globals; import jake2.client.dlight_t; - import jake2.client.lightstyle_t; import jake2.game.cplane_t; import jake2.qcommon.Com; --- 27,30 ---- *************** *** 464,468 **** int nummaps; float[] bl; - lightstyle_t style; int monolightmap; --- 461,464 ---- *************** *** 488,492 **** for (maps = 0; maps < Defines.MAXLIGHTMAPS && surf.styles[maps] != (byte) 255; maps++) { - style = r_newrefdef.lightstyles[surf.styles[maps] & 0xFF]; } // goto store; --- 484,487 ---- |
|
From: Carsten W. <ca...@us...> - 2007-02-27 14:52:58
|
Update of /cvsroot/jake2/jake2/src/jake2/render/basic In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv17387/src/jake2/render/basic Modified Files: Mesh.java Log Message: clean up Index: Mesh.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/render/basic/Mesh.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Mesh.java 27 Feb 2007 13:32:34 -0000 1.3 --- Mesh.java 27 Feb 2007 14:52:55 -0000 1.4 *************** *** 2,7 **** * Mesh.java * Copyright (C) 2003 - * - * $Id$ */ /* --- 2,5 ---- *************** *** 73,80 **** void GL_LerpVerts(int nverts, int[] ov, int[] v, float[][] lerp, float[] move, float[] frontv, float[] backv) { ! int i; ! int lerpIndex = 0; ! ! int ovv, vv; //PMM -- added RF_SHELL_DOUBLE, RF_SHELL_HALF_DAM --- 71,76 ---- void GL_LerpVerts(int nverts, int[] ov, int[] v, float[][] lerp, float[] move, float[] frontv, float[] backv) { ! ! int ovv, vv; //PMM -- added RF_SHELL_DOUBLE, RF_SHELL_HALF_DAM *************** *** 83,87 **** | Defines.RF_SHELL_DOUBLE | Defines.RF_SHELL_HALF_DAM)) != 0) { float[] normal; ! for (i = 0; i < nverts; i++ /* , v++, ov++, lerp+=4 */ ) { vv = v[i]; --- 79,83 ---- | Defines.RF_SHELL_DOUBLE | Defines.RF_SHELL_HALF_DAM)) != 0) { float[] normal; ! for (int i = 0; i < nverts; i++ /* , v++, ov++, lerp+=4 */ ) { vv = v[i]; *************** *** 97,101 **** } } else { ! for (i = 0; i < nverts; i++ /* , v++, ov++, lerp+=4 */ ) { vv = v[i]; --- 93,97 ---- } } else { ! for (int i = 0; i < nverts; i++ /* , v++, ov++, lerp+=4 */ ) { vv = v[i]; *************** *** 113,119 **** void GL_LerpVerts(int nverts, int[] ov, int[] v, float[] move, float[] frontv, float[] backv) { ! int lerpIndex = 0; ! ! int ovv, vv; FloatBuffer lerp = vertexArrayBuf; --- 109,114 ---- void GL_LerpVerts(int nverts, int[] ov, int[] v, float[] move, float[] frontv, float[] backv) { ! ! int ovv, vv; FloatBuffer lerp = vertexArrayBuf; *************** *** 381,390 **** float[] point = { 0, 0, 0 }; int count; - qfiles.daliasframe_t frame; - float lheight = currententity.origin[2] - lightspot[2]; - frame = paliashdr.aliasFrames[currententity.frame]; - int[] order = paliashdr.glCmds; --- 376,381 ---- |
|
From: Carsten W. <ca...@us...> - 2007-02-27 14:49:41
|
Update of /cvsroot/jake2/jake2/src/jake2/qcommon In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv16006/src/jake2/qcommon Modified Files: FS.java Log Message: clean up Index: FS.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/FS.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** FS.java 13 Nov 2005 13:36:00 -0000 1.15 --- FS.java 27 Feb 2007 14:49:38 -0000 1.16 *************** *** 2,7 **** * FS.java * Copyright (C) 2003 - * - * $Id$ */ /* --- 2,5 ---- *************** *** 167,171 **** String netpath; pack_t pak; - int i; filelink_t link; --- 165,168 ---- *************** *** 240,244 **** String netpath; pack_t pak; - int i; filelink_t link; File file = null; --- 237,240 ---- *************** *** 320,330 **** public static void Read(byte[] buffer, int len, RandomAccessFile f) { - int block, remaining; int offset = 0; int read = 0; - boolean tries = true; - // read in chunks for progress bar ! remaining = len; while (remaining != 0) { --- 316,324 ---- public static void Read(byte[] buffer, int len, RandomAccessFile f) { int offset = 0; int read = 0; // read in chunks for progress bar ! int remaining = len; ! int block; while (remaining != 0) { *************** *** 394,398 **** String netpath; pack_t pak; - int i; filelink_t link; File file = null; --- 388,391 ---- *************** *** 956,969 **** public static int Developer_searchpath(int who) { - int ch; // PMM - warning removal // char *start; searchpath_t s; - if (who == 1) // xatrix - ch = 'x'; - else if (who == 2) - ch = 'r'; - for (s = fs_searchpaths; s != null; s = s.next) { if (s.filename.indexOf("xatrix") != -1) --- 949,956 ---- |
2 messages has been excluded from this view by a project administrator.
![http://jake2.sourceforge.net/icon.gif"/>](http://jake2.sourceforge.net/icon.gif"/>){kind=link}
![http://jake2.in-chemnitz.de/downloads/icon.gif"/>](http://jake2.in-chemnitz.de/downloads/icon.gif"/>){kind=link}