[Jake2-commits] jake2/src/jake2/client refexport_t.java,1.2,1.3 VID.java,1.9,1.10

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

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

Modified Files:
	refexport_t.java VID.java 
Log Message:
merge LWJGL input system changes

Index: VID.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/VID.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** VID.java	23 Aug 2004 20:49:12 -0000	1.9
--- VID.java	14 Dec 2004 00:11:10 -0000	1.10
***************
*** 34,38 ****
  import jake2.sound.S;
  import jake2.sys.IN;
- import jake2.sys.KBD;
  import jake2.util.Vargs;
  
--- 34,37 ----
***************
*** 156,160 ****
  	{
  		if (Globals.re != null) {
! 			KBD.Close();
  			IN.Shutdown();
  		}
--- 155,159 ----
  	{
  		if (Globals.re != null) {
! 			Globals.re.getKeyboardHandler().Close();
  			IN.Shutdown();
  		}
***************
*** 174,178 ****
  		if ( reflib_active )
  		{
! 			KBD.Close();
  			IN.Shutdown();
  
--- 173,177 ----
  		if ( reflib_active )
  		{
! 			Globals.re.getKeyboardHandler().Close();
  			IN.Shutdown();
  
***************
*** 222,226 ****
  
  		/* Init KBD */
! 		KBD.Init();
  
  		Com.Printf( "------------------------------------\n");
--- 221,225 ----
  
  		/* Init KBD */
! 		Globals.re.getKeyboardHandler().Init();
  
  		Com.Printf( "------------------------------------\n");
***************
*** 330,334 ****
  		if ( reflib_active )
  		{
! 			KBD.Close();
  			IN.Shutdown();
  
--- 329,333 ----
  		if ( reflib_active )
  		{
! 			Globals.re.getKeyboardHandler().Close();
  			IN.Shutdown();
  
***************
*** 346,349 ****
--- 345,349 ----
  	static final int REF_OPENGL_JOGL = 0;
  	static final int REF_OPENGL_FASTJOGL =1;
+ 	static final int REF_OPENGL_LWJGL =2;
  
  	static cvar_t gl_mode;
***************
*** 532,535 ****
--- 532,541 ----
  					vid_ref.modified = true;
  				break;
+ 		case REF_OPENGL_LWJGL :
+ 				Cvar.Set( "vid_ref", "lwjgl" );
+ 				Cvar.Set( "gl_driver", "lwjgl" );
+ 				if (gl_driver.modified)
+ 					vid_ref.modified = true;
+ 				break;
  		}
  
***************
*** 566,569 ****
--- 572,576 ----
  		"[OpenGL jogl    ]",
  		"[OpenGL fastjogl]",
+ 		"[OpenGL lwjgl]",
  		null
  	};
***************
*** 659,662 ****
--- 666,674 ----
  			s_ref_list[0].curvalue = s_ref_list[1].curvalue = REF_OPENGL_FASTJOGL;
  		}
+ 		else if ( vid_ref.string.equalsIgnoreCase("lwjgl"))
+ 		{
+ 			s_current_menu_index = OPENGL_MENU;
+ 			s_ref_list[0].curvalue = s_ref_list[1].curvalue = REF_OPENGL_LWJGL;
+ 		}
  //		else if (strcmp( vid_ref->string, "softx" ) == 0 ) 
  //		{

Index: refexport_t.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/client/refexport_t.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** refexport_t.java	15 Jul 2004 14:37:35 -0000	1.2
--- refexport_t.java	14 Dec 2004 00:11:10 -0000	1.3
***************
*** 30,33 ****
--- 30,34 ----
  import jake2.render.image_t;
  import jake2.render.model_t;
+ import jake2.sys.KBD;
  
  import java.awt.Dimension;
***************
*** 108,110 ****
--- 109,113 ----
  	
  	DisplayMode[] getModeList();
+ 	
+ 	KBD getKeyboardHandler();
  }