Update of /cvsroot/jake2/jake2/src/jake2/render/jogl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14706/src/jake2/render/jogl
Modified Files:
Main.java Base.java Draw.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/jogl/Base.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Base.java 7 Jul 2004 19:59:36 -0000 1.1.1.1
--- Base.java 15 Jul 2004 14:37:34 -0000 1.2
***************
*** 26,29 ****
--- 26,30 ----
package jake2.render.jogl;
+ 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/jogl/Main.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Main.java 9 Jul 2004 06:50:47 -0000 1.3
--- Main.java 15 Jul 2004 14:37:34 -0000 1.4
***************
*** 26,36 ****
package jake2.render.jogl;
! import jake2.*;
import jake2.client.*;
import jake2.game.cplane_t;
import jake2.game.cvar_t;
! import jake2.qcommon.Cvar;
! import jake2.qcommon.qfiles;
! import jake2.qcommon.xcommand_t;
import jake2.render.*;
import jake2.util.Math3D;
--- 26,35 ----
package jake2.render.jogl;
! import jake2.Defines;
! import jake2.Globals;
import jake2.client.*;
import jake2.game.cplane_t;
import jake2.game.cvar_t;
! import jake2.qcommon.*;
import jake2.render.*;
import jake2.util.Math3D;
***************
*** 42,48 ****
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;
/**
--- 41,44 ----
***************
*** 53,60 ****
public abstract class Main extends Base {
- GL gl;
- GLU glu;
- GLUT glut = new GLUT();
-
public static int[] d_8to24table = new int[256];
--- 49,52 ----
***************
*** 87,99 ****
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 ----
***************
*** 129,140 ****
*/
- // 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 ----
***************
*** 239,243 ****
cvar_t gl_3dlabs_broken;
- cvar_t vid_fullscreen;
cvar_t vid_gamma;
cvar_t vid_ref;
--- 217,220 ----
***************
*** 1114,1130 ****
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;
--- 1091,1094 ----
***************
*** 1132,1136 ****
// 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;
--- 1096,1099 ----
***************
*** 1139,1143 ****
}
! boolean R_Init2() {
ri.Vid_MenuInit();
--- 1102,1106 ----
}
! protected boolean R_Init2() {
ri.Vid_MenuInit();
***************
*** 1386,1394 ****
*/
GLimp_Shutdown();
-
- /*
- * shutdown our QGL subsystem
- */
- QGL_Shutdown();
}
--- 1349,1352 ----
Index: Draw.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/jogl/Draw.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Draw.java 9 Jul 2004 06:50:48 -0000 1.3
--- Draw.java 15 Jul 2004 14:37:34 -0000 1.4
***************
*** 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 ----
|
