Update of /cvsroot/jake2/jake2/test/jake2/render
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv10678/test/jake2/render
Modified Files:
TestRenderer.java
Log Message:
better driver init (solves conflicts with config.cfg)
Index: TestRenderer.java
===================================================================
RCS file: /cvsroot/jake2/jake2/test/jake2/render/TestRenderer.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TestRenderer.java 11 Jun 2005 19:43:48 -0000 1.7
--- TestRenderer.java 21 Nov 2006 01:59:41 -0000 1.8
***************
*** 28,31 ****
--- 28,32 ----
import jake2.Defines;
import jake2.Globals;
+ import jake2.Jake2;
import jake2.client.*;
import jake2.game.Cmd;
***************
*** 67,93 ****
}
void init() {
!
! Qcommon.Init(new String[] { "TestRenderer", "+set", "gl_mode", "5",
! "+set", "vid_fullscreen", "0" });
!
! // very important
! VID.Shutdown();
!
! String[] names = Renderer.getDriverNames();
! System.out.println("Registered Drivers: " + Arrays.asList(names));
!
! this.re = Renderer.getDriver("jogl");
!
! System.out.println("Use driver: " + re);
! System.out.println();
!
! re.Init(0, 0);
!
! Cmd.AddCommand("nexttest", nexttest);
! Cbuf.AddText("bind n nexttest");
! Cbuf.Execute();
! Globals.cls.key_dest = Defines.key_game;
! Globals.cls.state = Defines.ca_active;
}
--- 68,104 ----
}
+ KBD kbd;
+
void init() {
! Globals.dedicated = Cvar.Get("dedicated", "0", Qcommon.CVAR_NOSET);
! Jake2.Q2Dialog = new Q2DataDialog();
! Locale.setDefault(Locale.US);
! Jake2.Q2Dialog.setVisible(true);
!
! String DRIVER = "jsr231";
!
! Qcommon.Init(new String[] { "TestRenderer", "+set", "gl_mode", "6",
! "+set", "vid_fullscreen", "0", "+set", "vid_ref", DRIVER });
! // sehr wichtig !!!
! VID.Shutdown();
!
! String[] names = Renderer.getDriverNames();
! System.out.println("Registered Drivers: " + Arrays.asList(names));
!
! this.re = Renderer.getDriver(DRIVER);
! Globals.re = this.re;
!
! System.out.println("Use driver: " + re);
! System.out.flush();
!
! re.Init(0, 0);
! kbd = re.getKeyboardHandler();
! kbd.Init();
!
! Cmd.AddCommand("nexttest", nexttest);
! Cbuf.AddText("bind n nexttest");
! Cbuf.Execute();
! Globals.cls.key_dest = Defines.key_game;
! Globals.cls.state = Defines.ca_active;
}
***************
*** 145,149 ****
while (true) {
re.updateScreen(callback);
! re.getKeyboardHandler().Update();
Cbuf.Execute();
try {
--- 156,160 ----
while (true) {
re.updateScreen(callback);
! kbd.Update();
Cbuf.Execute();
try {
|
