[Jake2-commits] jake2/src/jake2/render/fastjogl Draw.java,1.1,1.2 Base.java,1.1,1.2 Main.java,1.1,1.2 Impl.java,1.1,NONE

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

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

Modified Files:
	Draw.java Base.java Main.java 
Removed Files:
	Impl.java 
Log Message:
show fullscreen modes in video menu
move common renderer code to JoglBase

Index: Base.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/fastjogl/Base.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Base.java	9 Jul 2004 06:50:49 -0000	1.1
--- Base.java	15 Jul 2004 14:37:33 -0000	1.2
***************
*** 26,29 ****
--- 26,30 ----
  package jake2.render.fastjogl;
  
+ import jake2.render.JoglBase;
  import net.java.games.jogl.GL;
  
***************
*** 33,37 ****
   * @author cwei
   */
! public class Base {
  	
  	static final int GL_COLOR_INDEX8_EXT = GL.GL_COLOR_INDEX;
--- 34,38 ----
   * @author cwei
   */
! public abstract class Base extends JoglBase {
  	
  	static final int GL_COLOR_INDEX8_EXT = GL.GL_COLOR_INDEX;
***************
*** 76,85 ****
  //	  ===================================================================
  
- 	// enum rserr_t
- 	static final int rserr_ok = 0;
- 	static final int rserr_invalid_fullscreen = 1;
- 	static final int rserr_invalid_mode = 2;
- 	static final int rserr_unknown = 3;
- 
  //
  //	#include "gl_model.h"
--- 77,80 ----

--- Impl.java DELETED ---

Index: Main.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/fastjogl/Main.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Main.java	9 Jul 2004 06:50:49 -0000	1.1
--- Main.java	15 Jul 2004 14:37:33 -0000	1.2
***************
*** 26,30 ****
  package jake2.render.fastjogl;
  
! import jake2.*;
  import jake2.client.*;
  import jake2.game.cplane_t;
--- 26,31 ----
  package jake2.render.fastjogl;
  
! import jake2.Defines;
! import jake2.Globals;
  import jake2.client.*;
  import jake2.game.cplane_t;
***************
*** 41,47 ****
  
  import net.java.games.jogl.GL;
- import net.java.games.jogl.GLU;
- import net.java.games.jogl.util.BufferUtils;
- import net.java.games.jogl.util.GLUT;
  
  /**
--- 42,45 ----
***************
*** 52,58 ****
  public abstract class Main extends Base {
  
- 	GL gl;
- 	GLU glu;
- 	GLUT glut = new GLUT();
  
  	public static int[] d_8to24table = new int[256];
--- 50,53 ----
***************
*** 84,96 ****
  	abstract mleaf_t Mod_PointInLeaf(float[] point, model_t model);
  
- 	abstract boolean QGL_Init(String dll_name);
- 	abstract void QGL_Shutdown();
- 	abstract boolean GLimp_Init(int xpos, int ypos);
- 	abstract void GLimp_BeginFrame(float camera_separation);
- 	abstract int GLimp_SetMode(Dimension dim, int mode, boolean fullscreen);
- 	abstract void GLimp_Shutdown();
- 	abstract void GLimp_EnableLogging(boolean enable);
- 	abstract void GLimp_LogNewFrame();
- 
  	abstract void GL_SetDefaultState();
  
--- 79,82 ----
***************
*** 126,136 ****
  	*/
  
- 	// IMPORTED FUNCTIONS
- 	protected refimport_t ri = null;
- 
  	int GL_TEXTURE0 = GL.GL_TEXTURE0;
  	int GL_TEXTURE1 = GL.GL_TEXTURE1;
  
- 	viddef_t vid = new viddef_t();
  
  	model_t r_worldmodel;
--- 112,118 ----
***************
*** 236,240 ****
  	cvar_t gl_3dlabs_broken;
  
- 	cvar_t vid_fullscreen;
  	cvar_t vid_gamma;
  	cvar_t vid_ref;
--- 218,221 ----
***************
*** 1111,1127 ****
  		R_Register();
  
- 		// initialize our QGL dynamic bindings
- 		if (!QGL_Init(gl_driver.string)) {
- 			QGL_Shutdown();
- 			ri.Con_Printf(Defines.PRINT_ALL, "ref_gl::R_Init() - could not load \"" + gl_driver.string + "\"\n");
- 			return false;
- 		}
- 
- 		// initialize OS-specific parts of OpenGL
- 		if (!GLimp_Init(vid_xpos, vid_ypos)) {
- 			QGL_Shutdown();
- 			return false;
- 		}
- 
  		// set our "safe" modes
  		gl_state.prev_mode = 3;
--- 1092,1095 ----
***************
*** 1129,1133 ****
  		// create the window and set up the context
  		if (!R_SetMode()) {
- 			QGL_Shutdown();
  			ri.Con_Printf(Defines.PRINT_ALL, "ref_gl::R_Init() - could not R_SetMode()\n");
  			return false;
--- 1097,1100 ----
***************
*** 1136,1140 ****
  	}
  
! 	boolean R_Init2() {
  		ri.Vid_MenuInit();
  
--- 1103,1107 ----
  	}
  
! 	protected boolean R_Init2() {
  		ri.Vid_MenuInit();
  
***************
*** 1351,1359 ****
  		 */
  		GLimp_Shutdown();
- 
- 		/*
- 		 * shutdown our QGL subsystem
- 		 */
- 		QGL_Shutdown();
  	}
  
--- 1318,1321 ----

Index: Draw.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/fastjogl/Draw.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Draw.java	9 Jul 2004 06:50:49 -0000	1.1
--- Draw.java	15 Jul 2004 14:37:33 -0000	1.2
***************
*** 27,31 ****
  
  import jake2.Defines;
- import jake2.Globals;
  import jake2.render.image_t;
  
--- 27,30 ----
***************
*** 33,37 ****
  
  import net.java.games.jogl.GL;
- import net.java.games.jogl.util.GLUT;
  
  /**
--- 32,35 ----