Author: tma
Date: 2006-08-13 13:09:05 -0400 (Sun, 13 Aug 2006)
New Revision: 838
Modified:
trunk/Makefile
trunk/code/client/cl_input.c
trunk/code/client/cl_main.c
trunk/code/client/client.h
trunk/code/renderer/tr_image.c
trunk/code/renderer/tr_init.c
trunk/code/server/sv_snapshot.c
Log:
* qvm files no longer installed by "make copyfiles"
* Loopback clients only get snapshots at the server frame rate now
(Anonymous <nkylqinhvgcbyl at mailinator.com>)
* JPEG chroma subsampling disabled if the quality value is >= 85
(Anonymous <nkylqinhvgcbyl at mailinator.com>)
* cl_lanForcePackets. When set to 0 (default is 1) the cl_maxpackets setting
will be ignored if on a LAN. (Anonymous <nkylqinhvgcbyl at mailinator.com>)
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2006-08-12 18:48:30 UTC (rev 837)
+++ trunk/Makefile 2006-08-13 17:09:05 UTC (rev 838)
@@ -1760,17 +1760,6 @@
$(COPYDIR)/missionpack/.
endif
-ifneq ($(BUILD_GAME_QVM),0)
- -$(MKDIR) -p -m 0755 $(COPYDIR)/baseq3/vm
- $(INSTALL) -m 0755 $(BR)/baseq3/vm/qagame.qvm $(COPYDIR)/baseq3/vm/qagame.qvm
- $(INSTALL) -m 0755 $(BR)/baseq3/vm/cgame.qvm $(COPYDIR)/baseq3/vm/cgame.qvm
- $(INSTALL) -m 0755 $(BR)/baseq3/vm/ui.qvm $(COPYDIR)/baseq3/vm/ui.qvm
- -$(MKDIR) -p -m 0755 $(COPYDIR)/missionpack/vm
- $(INSTALL) -m 0755 $(BR)/missionpack/vm/qagame.qvm $(COPYDIR)/missionpack/vm/qagame.qvm
- $(INSTALL) -m 0755 $(BR)/missionpack/vm/cgame.qvm $(COPYDIR)/missionpack/vm/cgame.qvm
- $(INSTALL) -m 0755 $(BR)/missionpack/vm/ui.qvm $(COPYDIR)/missionpack/vm/ui.qvm
-endif
-
clean: clean-debug clean-release
$(MAKE) -C $(LOKISETUPDIR) clean
Modified: trunk/code/client/cl_input.c
===================================================================
--- trunk/code/client/cl_input.c 2006-08-12 18:48:30 UTC (rev 837)
+++ trunk/code/client/cl_input.c 2006-08-13 17:09:05 UTC (rev 838)
@@ -645,7 +645,7 @@
}
// send every frame for LAN
- if ( Sys_IsLANAddress( clc.netchan.remoteAddress ) ) {
+ if ( cl_lanForcePackets->integer && Sys_IsLANAddress( clc.netchan.remoteAddress ) ) {
return qtrue;
}
Modified: trunk/code/client/cl_main.c
===================================================================
--- trunk/code/client/cl_main.c 2006-08-12 18:48:30 UTC (rev 837)
+++ trunk/code/client/cl_main.c 2006-08-13 17:09:05 UTC (rev 838)
@@ -72,6 +72,8 @@
cvar_t *cl_serverStatusResendTime;
cvar_t *cl_trn;
+cvar_t *cl_lanForcePackets;
+
clientActive_t cl;
clientConnection_t clc;
clientStatic_t cls;
@@ -2484,6 +2486,7 @@
Cvar_Get( "cl_maxPing", "800", CVAR_ARCHIVE );
+ cl_lanForcePackets = Cvar_Get ("cl_lanForcePackets", "1", CVAR_ARCHIVE);
// userinfo
Cvar_Get ("name", "UnnamedPlayer", CVAR_USERINFO | CVAR_ARCHIVE );
Modified: trunk/code/client/client.h
===================================================================
--- trunk/code/client/client.h 2006-08-12 18:48:30 UTC (rev 837)
+++ trunk/code/client/client.h 2006-08-13 17:09:05 UTC (rev 838)
@@ -355,6 +355,8 @@
extern cvar_t *cl_conXOffset;
extern cvar_t *cl_inGameVideo;
+extern cvar_t *cl_lanForcePackets;
+
//=================================================
//
Modified: trunk/code/renderer/tr_image.c
===================================================================
--- trunk/code/renderer/tr_image.c 2006-08-12 18:48:30 UTC (rev 837)
+++ trunk/code/renderer/tr_image.c 2006-08-13 17:09:05 UTC (rev 838)
@@ -1816,6 +1816,11 @@
* Here we just illustrate the use of quality (quantization table) scaling:
*/
jpeg_set_quality(&cinfo, quality, TRUE /* limit to baseline-JPEG values */);
+ /* If quality is set high, disable chroma subsampling */
+ if (quality >= 85) {
+ cinfo.comp_info[0].h_samp_factor = 1;
+ cinfo.comp_info[0].v_samp_factor = 1;
+ }
/* Step 4: Start compressor */
@@ -1890,6 +1895,11 @@
jpeg_set_defaults(&cinfo);
jpeg_set_quality(&cinfo, quality, TRUE /* limit to baseline-JPEG values */);
+ /* If quality is set high, disable chroma subsampling */
+ if (quality >= 85) {
+ cinfo.comp_info[0].h_samp_factor = 1;
+ cinfo.comp_info[0].v_samp_factor = 1;
+ }
/* Step 4: Start compressor */
jpeg_start_compress(&cinfo, TRUE);
Modified: trunk/code/renderer/tr_init.c
===================================================================
--- trunk/code/renderer/tr_init.c 2006-08-12 18:48:30 UTC (rev 837)
+++ trunk/code/renderer/tr_init.c 2006-08-13 17:09:05 UTC (rev 838)
@@ -423,7 +423,7 @@
}
ri.FS_WriteFile( fileName, buffer, 1 ); // create path
- SaveJPG( fileName, 95, glConfig.vidWidth, glConfig.vidHeight, buffer);
+ SaveJPG( fileName, 90, glConfig.vidWidth, glConfig.vidHeight, buffer);
ri.Hunk_FreeTempMemory( buffer );
}
@@ -727,7 +727,7 @@
if( cmd->motionJpeg )
{
- frameSize = SaveJPGToBuffer( cmd->encodeBuffer, 95,
+ frameSize = SaveJPGToBuffer( cmd->encodeBuffer, 90,
cmd->width, cmd->height, cmd->captureBuffer );
ri.CL_WriteAVIVideoFrame( cmd->encodeBuffer, frameSize );
}
Modified: trunk/code/server/sv_snapshot.c
===================================================================
--- trunk/code/server/sv_snapshot.c 2006-08-12 18:48:30 UTC (rev 837)
+++ trunk/code/server/sv_snapshot.c 2006-08-13 17:09:05 UTC (rev 838)
@@ -583,11 +583,11 @@
// set nextSnapshotTime based on rate and requested number of updates
- // local clients get snapshots every frame
+ // local clients get snapshots every server frame
// TTimo - https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=491
// added sv_lanForceRate check
if ( client->netchan.remoteAddress.type == NA_LOOPBACK || (sv_lanForceRate->integer && Sys_IsLANAddress (client->netchan.remoteAddress)) ) {
- client->nextSnapshotTime = svs.time - 1;
+ client->nextSnapshotTime = svs.time + (1000/sv_fps->integer);
return;
}