[Jake2-commits] jake2/src/jake2/client VID.java,1.14,1.15

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

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

Modified Files:
	VID.java 
Log Message:
the brightness slider now modifies the gl_modulate value too,
because it looks better than a pure gamma correction.

Index: VID.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/VID.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** VID.java	12 Jan 2005 08:36:21 -0000	1.14
--- VID.java	7 Apr 2005 15:29:21 -0000	1.15
***************
*** 426,432 ****
  		** invert sense so greater = brighter, and scale to a range of 0.5 to 1.3
  		*/
! 		float gamma = ( 0.8f - ( s_brightness_slider.curvalue/10.0f - 0.5f ) ) + 0.5f;
  
  		Cvar.SetValue( "vid_gamma", gamma );
  		Cvar.SetValue( "sw_stipplealpha", s_stipple_box.curvalue );
  		Cvar.SetValue( "gl_picmip", 3 - s_tq_slider.curvalue );
--- 426,438 ----
  		** invert sense so greater = brighter, and scale to a range of 0.5 to 1.3
  		*/
! 		// the original was modified, because on CRTs it was too dark.
! 		// the slider range is [5; 13]
! 		// gamma: [1.1; 0.7]
! 		float gamma = ( 0.4f - ( s_brightness_slider.curvalue/20.0f - 0.25f ) ) + 0.7f;
! 		// modulate:  [1.0; 2.6]
! 		float modulate = s_brightness_slider.curvalue * 0.2f;
  
  		Cvar.SetValue( "vid_gamma", gamma );
+ 		Cvar.SetValue( "gl_modulate", modulate);
  		Cvar.SetValue( "sw_stipplealpha", s_stipple_box.curvalue );
  		Cvar.SetValue( "gl_picmip", 3 - s_tq_slider.curvalue );