[Jake2-commits] jake2/src/jake2/render Renderer.java,1.2,1.3 JoglBase.java,1.3,1.4 Ref.java,1.1.1.1,1.2 JoglRenderer.java,1.4,1.5 FastJoglRenderer.java,1.2,1.3

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

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

Modified Files:
	Renderer.java JoglBase.java Ref.java JoglRenderer.java 
	FastJoglRenderer.java 
Log Message:
refimport_t deleted

Index: JoglRenderer.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/JoglRenderer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** JoglRenderer.java	15 Jul 2004 14:37:35 -0000	1.4
--- JoglRenderer.java	16 Jul 2004 10:11:34 -0000	1.5
***************
*** 299,304 ****
  	}
  
! 	public refexport_t GetRefAPI(refimport_t rimp) {
! 		this.ri = rimp;
  		return this;
  	}
--- 299,303 ----
  	}
  
! 	public refexport_t GetRefAPI() {
  		return this;
  	}

Index: FastJoglRenderer.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/FastJoglRenderer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FastJoglRenderer.java	15 Jul 2004 14:37:35 -0000	1.2
--- FastJoglRenderer.java	16 Jul 2004 10:11:34 -0000	1.3
***************
*** 301,306 ****
  	}
  
! 	public refexport_t GetRefAPI(refimport_t rimp) {
! 		this.ri = rimp;
  		return this;
  	}
--- 301,305 ----
  	}
  
! 	public refexport_t GetRefAPI() {
  		return this;
  	}

Index: Ref.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/Ref.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Ref.java	7 Jul 2004 19:59:34 -0000	1.1.1.1
--- Ref.java	16 Jul 2004 10:11:34 -0000	1.2
***************
*** 27,31 ****
  
  import jake2.client.refexport_t;
- import jake2.client.refimport_t;
  
  /**
--- 27,30 ----
***************
*** 39,43 ****
  	// extensions (cwei) 
  	// ============================================================================
! 	refexport_t GetRefAPI(refimport_t rimp);
  	String getName();
  }
--- 38,42 ----
  	// extensions (cwei) 
  	// ============================================================================
! 	refexport_t GetRefAPI();
  	String getName();
  }

Index: Renderer.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/Renderer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Renderer.java	9 Jul 2004 06:50:47 -0000	1.2
--- Renderer.java	16 Jul 2004 10:11:34 -0000	1.3
***************
*** 29,33 ****
  
  import jake2.client.refexport_t;
- import jake2.client.refimport_t;
  
  /**
--- 29,32 ----
***************
*** 66,72 ****
  	 * @return refexport_t (Renderer singleton)
  	 */
! 	public static refexport_t getDriver(String driverName, refimport_t rimp) {
! 		if (rimp == null)
! 			throw new IllegalArgumentException("refimport_t can't be null");
  		// find a driver
  		Ref driver = null;
--- 65,69 ----
  	 * @return refexport_t (Renderer singleton)
  	 */
! 	public static refexport_t getDriver(String driverName) {
  		// find a driver
  		Ref driver = null;
***************
*** 75,79 ****
  			driver = (Ref) drivers.get(i);
  			if (driver.getName().equals(driverName)) {
! 				return driver.GetRefAPI(rimp);
  			}
  		}
--- 72,76 ----
  			driver = (Ref) drivers.get(i);
  			if (driver.getName().equals(driverName)) {
! 				return driver.GetRefAPI();
  			}
  		}

Index: JoglBase.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/JoglBase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** JoglBase.java	15 Jul 2004 16:33:24 -0000	1.3
--- JoglBase.java	16 Jul 2004 10:11:34 -0000	1.4
***************
*** 28,34 ****
  
  import jake2.Defines;
! import jake2.client.refimport_t;
! import jake2.client.viddef_t;
  import jake2.game.cvar_t;
  import jake2.qcommon.xcommand_t;
  import jake2.sys.KBD;
--- 28,34 ----
  
  import jake2.Defines;
! import jake2.client.*;
  import jake2.game.cvar_t;
+ import jake2.qcommon.Cbuf;
  import jake2.qcommon.xcommand_t;
  import jake2.sys.KBD;
***************
*** 50,55 ****
  
  	// IMPORTED FUNCTIONS
- 	protected refimport_t ri = null;
- 
  	protected GraphicsDevice device;
  	protected DisplayMode oldDisplayMode; 
--- 50,53 ----
***************
*** 81,85 ****
  			//
  			if (!post_init) {
! 				ri.Con_Printf(Defines.PRINT_ALL, "Missing multi-texturing for FastJOGL renderer\n");
  			}
  
--- 79,83 ----
  			//
  			if (!post_init) {
! 				VID.Printf(Defines.PRINT_ALL, "Missing multi-texturing for FastJOGL renderer\n");
  			}
  
***************
*** 170,176 ****
  		Dimension newDim = new Dimension();
  
! 		ri.Con_Printf(Defines.PRINT_ALL, "Initializing OpenGL display\n");
  
! 		ri.Con_Printf(Defines.PRINT_ALL, "...setting mode " + mode + ":");
  		
  		/*
--- 168,174 ----
  		Dimension newDim = new Dimension();
  
! 		VID.Printf(Defines.PRINT_ALL, "Initializing OpenGL display\n");
  
! 		VID.Printf(Defines.PRINT_ALL, "...setting mode " + mode + ":");
  		
  		/*
***************
*** 184,193 ****
  		}
  
! 		if (!ri.Vid_GetModeInfo(newDim, mode)) {
! 			ri.Con_Printf(Defines.PRINT_ALL, " invalid mode\n");
  			return rserr_invalid_mode;
  		}
  
! 		ri.Con_Printf(Defines.PRINT_ALL, " " + newDim.width + " " + newDim.height + '\n');
  
  		// destroy the existing window
--- 182,191 ----
  		}
  
! 		if (!VID.GetModeInfo(newDim, mode)) {
! 			VID.Printf(Defines.PRINT_ALL, " invalid mode\n");
  			return rserr_invalid_mode;
  		}
  
! 		VID.Printf(Defines.PRINT_ALL, " " + newDim.width + " " + newDim.height + '\n');
  
  		// destroy the existing window
***************
*** 211,215 ****
  		window.addWindowListener(new WindowAdapter() {
  			public void windowClosing(WindowEvent e) {
! 				ri.Cmd_ExecuteText(Defines.EXEC_APPEND, "quit");
  			}
  		});
--- 209,213 ----
  		window.addWindowListener(new WindowAdapter() {
  			public void windowClosing(WindowEvent e) {
! 				Cbuf.ExecuteText(Defines.EXEC_APPEND, "quit");
  			}
  		});
***************
*** 239,243 ****
  			canvas.setSize(displayMode.getWidth(), displayMode.getHeight());
  
! 			ri.Con_Printf(Defines.PRINT_ALL, "...setting fullscreen " + getModeString(displayMode) + '\n');
  
  		} else {
--- 237,241 ----
  			canvas.setSize(displayMode.getWidth(), displayMode.getHeight());
  
! 			VID.Printf(Defines.PRINT_ALL, "...setting fullscreen " + getModeString(displayMode) + '\n');
  
  		} else {
***************
*** 261,265 ****
  
  		// let the sound and input subsystems know about the new window
! 		ri.Vid_NewWindow(vid.width, vid.height);
  
  		return rserr_ok;
--- 259,263 ----
  
  		// let the sound and input subsystems know about the new window
! 		VID.NewWindow(vid.width, vid.height);
  
  		return rserr_ok;