[Jake2-commits] jake2/src/jake2/render JoglRenderer.java,1.5,1.6 JoglBase.java,1.12,1.13 FastJoglRenderer.java,1.3,1.4

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

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

Modified Files:
	JoglRenderer.java JoglBase.java FastJoglRenderer.java 
Log Message:
merge LWJGL input system changes

Index: JoglRenderer.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/JoglRenderer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** JoglRenderer.java	16 Jul 2004 10:11:34 -0000	1.5
--- JoglRenderer.java	14 Dec 2004 00:11:03 -0000	1.6
***************
*** 27,33 ****
  
  import jake2.Defines;
! import jake2.client.*;
  import jake2.qcommon.xcommand_t;
  import jake2.render.jogl.Misc;
  
  import java.awt.Dimension;
--- 27,36 ----
  
  import jake2.Defines;
! import jake2.client.refdef_t;
! import jake2.client.refexport_t;
  import jake2.qcommon.xcommand_t;
  import jake2.render.jogl.Misc;
+ import jake2.sys.JOGLKBD;
+ import jake2.sys.KBD;
  
  import java.awt.Dimension;
***************
*** 40,43 ****
--- 43,48 ----
  final class JoglRenderer extends Misc implements refexport_t, Ref {
  
+ 	private JOGLKBD kbd=new JOGLKBD();
+ 	
  	public static final String DRIVER_NAME = "jogl";
  
***************
*** 302,304 ****
--- 307,314 ----
  		return this;
  	}
+ 	
+ 	public KBD getKeyboardHandler()
+ 	{
+ 		return kbd;
+ 	}	
  }
\ No newline at end of file

Index: FastJoglRenderer.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/FastJoglRenderer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FastJoglRenderer.java	16 Jul 2004 10:11:34 -0000	1.3
--- FastJoglRenderer.java	14 Dec 2004 00:11:09 -0000	1.4
***************
*** 30,33 ****
--- 30,35 ----
  import jake2.qcommon.xcommand_t;
  import jake2.render.fastjogl.Misc;
+ import jake2.sys.JOGLKBD;
+ import jake2.sys.KBD;
  
  import java.awt.Dimension;
***************
*** 40,43 ****
--- 42,47 ----
  final class FastJoglRenderer extends Misc implements refexport_t, Ref {
  	
+ 	private JOGLKBD kbd=new JOGLKBD();
+ 	
  	public static final String DRIVER_NAME = "fastjogl";
  	
***************
*** 305,307 ****
--- 309,315 ----
  	}
  
+ 	public KBD getKeyboardHandler()
+ 	{
+ 		return kbd;
+ 	}	
  }
\ No newline at end of file

Index: JoglBase.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/JoglBase.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** JoglBase.java	3 Nov 2004 08:53:27 -0000	1.12
--- JoglBase.java	14 Dec 2004 00:11:09 -0000	1.13
***************
*** 32,35 ****
--- 32,36 ----
  import jake2.qcommon.Cbuf;
  import jake2.qcommon.xcommand_t;
+ import jake2.sys.JOGLKBD;
  import jake2.sys.KBD;
  
***************
*** 228,236 ****
  		
  		// D I F F E R E N T   J A K E 2   E V E N T   P R O C E S S I N G      		
! 		window.addComponentListener(KBD.listener);
! 		canvas.addKeyListener(KBD.listener);
! 		canvas.addMouseListener(KBD.listener);
! 		canvas.addMouseMotionListener(KBD.listener);
! 		canvas.addMouseWheelListener(KBD.listener);
  				        
  		if (fullscreen) {
--- 229,237 ----
  		
  		// D I F F E R E N T   J A K E 2   E V E N T   P R O C E S S I N G      		
! 		window.addComponentListener(JOGLKBD.listener);
! 		canvas.addKeyListener(JOGLKBD.listener);
! 		canvas.addMouseListener(JOGLKBD.listener);
! 		canvas.addMouseMotionListener(JOGLKBD.listener);
! 		canvas.addMouseWheelListener(JOGLKBD.listener);
  				        
  		if (fullscreen) {