[Jake2-commits] jake2/src/jake2/render JoglBase.java, 1.15, 1.16 JoglRenderer.java, 1.6, NONE

[Rene S. <sa...@us...>]

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

Modified Files:
	JoglBase.java 
Removed Files:
	JoglRenderer.java 
Log Message:
major refactoring of the render module

--- JoglRenderer.java DELETED ---

Index: JoglBase.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/JoglBase.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** JoglBase.java	26 Jun 2005 08:51:19 -0000	1.15
--- JoglBase.java	31 Oct 2006 13:06:32 -0000	1.16
***************
*** 33,36 ****
--- 33,38 ----
  import jake2.qcommon.Cbuf;
  import jake2.qcommon.xcommand_t;
+ import jake2.render.common.Model;
+ import jake2.render.fastjogl.GLWrapJogl;
  import jake2.sys.JOGLKBD;
  
***************
*** 49,53 ****
   * JoglCommon
   */
! public abstract class JoglBase implements GLEventListener {
  
  	// IMPORTED FUNCTIONS
--- 51,56 ----
   * JoglCommon
   */
! public abstract class JoglBase extends jake2.render.common.Misc
! 	implements GLEventListener {
  
  	// IMPORTED FUNCTIONS
***************
*** 61,67 ****
  	protected GLUT glut = new GLUT();
  
! 	// window position on the screen
! 	int window_xpos, window_ypos;
! 	protected viddef_t vid = new viddef_t();
  
  	// handles the post initialization with JoglRenderer
--- 64,68 ----
  	protected GLUT glut = new GLUT();
  
! 
  
  	// handles the post initialization with JoglRenderer
***************
*** 88,99 ****
  	};
  	protected xcommand_t callback = INIT_CALLBACK;
- 	
- 	protected cvar_t vid_fullscreen;
- 
- 	// enum rserr_t
- 	protected static final int rserr_ok = 0;
- 	protected static final int rserr_invalid_fullscreen = 1;
- 	protected static final int rserr_invalid_mode = 2;
- 	protected static final int rserr_unknown = 3;
  		
  	public DisplayMode[] getModeList() {
--- 89,92 ----
***************
*** 329,332 ****
--- 322,329 ----
  	}
  
+ 	protected void GLimp_Finish() {
+ 		gl.glFinish();
+ 	}
+ 	
  	/* 
  	 * @see jake2.client.refexport_t#updateScreen()
***************
*** 350,355 ****
  	public void init(GLDrawable drawable) {
  		this.gl = drawable.getGL();
  		this.glu = drawable.getGLU();
! 
  		// this is a hack to run R_init() in gl context
  		post_init = R_Init2();
--- 347,353 ----
  	public void init(GLDrawable drawable) {
  		this.gl = drawable.getGL();
+ 		ggl = new GLWrapJogl (this.gl);
  		this.glu = drawable.getGLU();
! 		
  		// this is a hack to run R_init() in gl context
  		post_init = R_Init2();