[Jake2-commits] jake2/test/jake2/render DancingQueens.java, 1.9, 1.10 TestMap.java, 1.6, 1.7

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

Update of /cvsroot/jake2/jake2/test/jake2/render
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv15164/test/jake2/render

Modified Files:
	DancingQueens.java TestMap.java 
Log Message:
merge render-refactoring branch into the HEAD

Index: TestMap.java
===================================================================
RCS file: /cvsroot/jake2/jake2/test/jake2/render/TestMap.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TestMap.java	14 Dec 2004 01:08:32 -0000	1.6
--- TestMap.java	21 Nov 2006 00:48:14 -0000	1.7
***************
*** 28,31 ****
--- 28,32 ----
  import jake2.Defines;
  import jake2.Globals;
+ import jake2.Jake2;
  import jake2.client.*;
  import jake2.game.Cmd;
***************
*** 72,81 ****
  	void init()
  	{
! 
  		Qcommon.Init(new String[] { "TestMap $Id$" });
  		// sehr wichtig !!!
  		VID.Shutdown();
  
! 		this.re = Renderer.getDriver("jogl");
  
  		re.Init(0, 0);
--- 73,90 ----
  	void init()
  	{
!         Globals.dedicated = Cvar.Get("dedicated", "0", Qcommon.CVAR_NOSET);
!         // open the q2dialog, if we are not in dedicated mode.
!         if (Globals.dedicated.value != 1.0f)
!         {
!             Jake2.Q2Dialog = new Q2DataDialog();
!             Locale.setDefault(Locale.US);
!             Jake2.Q2Dialog.setVisible(true);
!         }
!         
  		Qcommon.Init(new String[] { "TestMap $Id$" });
  		// sehr wichtig !!!
  		VID.Shutdown();
  
! 		Globals.re = this.re = Renderer.getDriver("jsr231", false);
  
  		re.Init(0, 0);

Index: DancingQueens.java
===================================================================
RCS file: /cvsroot/jake2/jake2/test/jake2/render/DancingQueens.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DancingQueens.java	10 Jan 2006 14:34:00 -0000	1.9
--- DancingQueens.java	21 Nov 2006 00:48:14 -0000	1.10
***************
*** 80,84 ****
          System.out.println("Registered Drivers: " + Arrays.asList(names));
          
!         this.re = Renderer.getDriver("fastjogl");
          Globals.re = this.re;
          
--- 80,84 ----
          System.out.println("Registered Drivers: " + Arrays.asList(names));
          
!         this.re = Renderer.getDriver("jsr231");
          Globals.re = this.re;