[Jake2-commits] jake2/src/jake2/render/lwjgl LWJGLBase.java,1.1,1.1.2.1

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

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

Modified Files:
      Tag: RST
	LWJGLBase.java 
Log Message:


Index: LWJGLBase.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/render/lwjgl/LWJGLBase.java,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** LWJGLBase.java	16 Dec 2004 19:53:41 -0000	1.1
--- LWJGLBase.java	31 Dec 2004 14:08:38 -0000	1.1.2.1
***************
*** 1,365 ****
! /*
!  * LWJGLBase.java
!  * Copyright (C) 2004
!  * 
!  * $Id$
!  */
! /*
! Copyright (C) 1997-2001 Id Software, Inc.
! 
! This program is free software; you can redistribute it and/or
! modify it under the terms of the GNU General Public License
! as published by the Free Software Foundation; either version 2
! of the License, or (at your option) any later version.
! 
! This program is distributed in the hope that it will be useful,
! but WITHOUT ANY WARRANTY; without even the implied warranty of
! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
! 
! See the GNU General Public License for more details.
! 
! You should have received a copy of the GNU General Public License
! along with this program; if not, write to the Free Software
! Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
! 
! */
! package jake2.render.lwjgl;
! 
! import jake2.Defines;
! import jake2.client.VID;
! import jake2.client.viddef_t;
! import jake2.game.cvar_t;
! import jake2.qcommon.xcommand_t;
! 
! import java.awt.Dimension;
! import java.util.LinkedList;
! 
! import org.lwjgl.LWJGLException;
! import org.lwjgl.opengl.Display;
! import org.lwjgl.opengl.DisplayMode;
! import org.lwjgl.opengl.GL11;
! import org.lwjgl.util.GLImpl;
! 
! public abstract class LWJGLBase {
! 	// IMPORTED FUNCTIONS
! 	protected DisplayMode oldDisplayMode; 
! 
! 	protected GLImpl gl=new GLImpl();
! 	
! 	// window position on the screen
! 	int window_xpos, window_ypos;
! 	protected viddef_t vid = new viddef_t();
! 
! 	// handles the post initialization with JoglRenderer
! 	protected boolean post_init = false;
! 	protected boolean contextInUse = false;
! 	protected abstract boolean R_Init2();
! 	
! 	protected final xcommand_t INIT_CALLBACK = new xcommand_t() {
! 		public void execute() {
! 			// only used for the first run (initialization)
! 			// clear the screen
! 			gl.glClearColor(0, 0, 0, 0);
! 			gl.glClear(GL11.GL_COLOR_BUFFER_BIT | GL11.GL_DEPTH_BUFFER_BIT);
! 
! 			//
! 			// check the post init process
! 			//
! 			if (!post_init) {
! 				VID.Printf(Defines.PRINT_ALL, "Missing multi-texturing for FastJOGL renderer\n");
! 			}
! 
! 			GLimp_EndFrame();
! 		}
! 	};
! 	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;
! 	
! 	private java.awt.DisplayMode toAwtDisplayMode(DisplayMode m)
! 	{
! 		return new java.awt.DisplayMode(m.getWidth(),m.getHeight(),m.getBitsPerPixel(),m.getFrequency());
! 	}
! 
! 	public java.awt.DisplayMode[] getModeList() 
! 	{
! 		DisplayMode[] modes = Display.getAvailableDisplayModes();
! 		
! 		LinkedList l = new LinkedList();
! 		l.add(toAwtDisplayMode(oldDisplayMode));
! 		
! 		for (int i = 0; i < modes.length; i++) {
! 			DisplayMode m = modes[i];
! 			
! 			if (m.getBitsPerPixel() != oldDisplayMode.getBitsPerPixel()) continue;
! 			if (m.getFrequency() > oldDisplayMode.getFrequency()) continue;
! 			if (m.getHeight() < 240 || m.getWidth() < 320) continue;
! 			
! 			int j = 0;
! 			java.awt.DisplayMode ml = null;
! 			for (j = 0; j < l.size(); j++) {
! 				ml = (java.awt.DisplayMode)l.get(j);
! 				if (ml.getWidth() > m.getWidth()) break;
! 				if (ml.getWidth() == m.getWidth() && ml.getHeight() >= m.getHeight()) break;
! 			}
! 			if (j == l.size()) {
! 				l.addLast(toAwtDisplayMode(m));
! 			} else if (ml.getWidth() > m.getWidth() || ml.getHeight() > m.getHeight()) {
! 				l.add(j, toAwtDisplayMode(m));
! 			} else if (m.getFrequency() > ml.getRefreshRate()){
! 				l.remove(j);
! 				l.add(j, toAwtDisplayMode(m));
! 			}
! 		}
! 		java.awt.DisplayMode[] ma = new java.awt.DisplayMode[l.size()];
! 		l.toArray(ma);
! 		return ma;
! 	}
! 	
! 	public DisplayMode[] getLWJGLModeList() {
! 		DisplayMode[] modes = Display.getAvailableDisplayModes();
! 		
! 		LinkedList l = new LinkedList();
! 		l.add(oldDisplayMode);
! 		
! 		for (int i = 0; i < modes.length; i++) {
! 			DisplayMode m = modes[i];
! 			
! 			if (m.getBitsPerPixel() != oldDisplayMode.getBitsPerPixel()) continue;
! 			if (m.getFrequency() > oldDisplayMode.getFrequency()) continue;
! 			if (m.getHeight() < 240 || m.getWidth() < 320) continue;
! 			
! 			int j = 0;
! 			DisplayMode ml = null;
! 			for (j = 0; j < l.size(); j++) {
! 				ml = (DisplayMode)l.get(j);
! 				if (ml.getWidth() > m.getWidth()) break;
! 				if (ml.getWidth() == m.getWidth() && ml.getHeight() >= m.getHeight()) break;
! 			}
! 			if (j == l.size()) {
! 				l.addLast(m);
! 			} else if (ml.getWidth() > m.getWidth() || ml.getHeight() > m.getHeight()) {
! 				l.add(j, m);
! 			} else if (m.getFrequency() > ml.getFrequency()){
! 				l.remove(j);
! 				l.add(j, m);
! 			}
! 		}
! 		DisplayMode[] ma = new DisplayMode[l.size()];
! 		l.toArray(ma);
! 		return ma;
! 	}
! 	
! 	private DisplayMode findDisplayMode(Dimension dim) {
! 		DisplayMode mode = null;
! 		DisplayMode m = null;
! 		DisplayMode[] modes = getLWJGLModeList();
! 		int w = dim.width;
! 		int h = dim.height;
! 		
! 		for (int i = 0; i < modes.length; i++) {
! 			m = modes[i];
! 			if (m.getWidth() == w && m.getHeight() == h) {
! 				mode = m;
! 				break;
! 			}
! 		}
! 		if (mode == null) mode = oldDisplayMode;
! 		return mode;		
! 	}
! 		
! 	String getModeString(DisplayMode m) {
! 		StringBuffer sb = new StringBuffer();
! 		sb.append(m.getWidth());
! 		sb.append('x');
! 		sb.append(m.getHeight());
! 		sb.append('x');
! 		sb.append(m.getBitsPerPixel());
! 		sb.append('@');
! 		sb.append(m.getFrequency());
! 		sb.append("Hz");
! 		return sb.toString();
! 	}
! 
! 	/**
! 	 * @param dim
! 	 * @param mode
! 	 * @param fullscreen
! 	 * @return enum rserr_t
! 	 */
! 	protected int GLimp_SetMode(Dimension dim, int mode, boolean fullscreen) {
! 
! 		Dimension newDim = new Dimension();
! 
! 		VID.Printf(Defines.PRINT_ALL, "Initializing OpenGL display\n");
! 
! 		VID.Printf(Defines.PRINT_ALL, "...setting mode " + mode + ":");
! 		
! 		/*
! 		 * fullscreen handling
! 		 */
! 		if (oldDisplayMode == null) {
! 			oldDisplayMode = Display.getDisplayMode();
! 		}
! 
! 		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
! 		GLimp_Shutdown();
! 
! 		Display.setTitle("Jake2");
! 
! 		DisplayMode displayMode = findDisplayMode(newDim);
! 		newDim.width = displayMode.getWidth();
! 		newDim.height = displayMode.getHeight();
! 		
! 		if (fullscreen) 
! 		{
! 			try {
! 				Display.setDisplayMode(displayMode);
! 			} 
! 			catch (LWJGLException e)
! 			{
! 				return rserr_invalid_mode; 
! 			}	
! 				
! 			Display.setLocation(0,0);
! 
! 			try {
! 				Display.setFullscreen(fullscreen);
! 			} 
! 			catch (LWJGLException e)
! 			{
! 				return rserr_invalid_fullscreen; 
! 			}	
! 
! 			VID.Printf(Defines.PRINT_ALL, "...setting fullscreen " + getModeString(displayMode) + '\n');
! 
! 		} 
! 		else 
! 		{
! 			try 
! 			{
! 				Display.setDisplayMode(displayMode);
! 			} 
! 			catch (LWJGLException e)
! 			{
! 				return rserr_invalid_mode;
! 			}
! 
! 			try {
! 				Display.setFullscreen(false);
! 			} 
! 			catch (LWJGLException e)
! 			{
! 				return rserr_invalid_fullscreen; 
! 			}	
! 			Display.setLocation(window_xpos, window_ypos);
! 		}
! 
! 		vid.width = newDim.width;
! 		vid.height = newDim.height;
! 		
! 		try
! 		{
! 			Display.create();
! 		} 
! 		catch (LWJGLException e)
! 		{
! 			return rserr_unknown; 
! 		}	
! 		
! 		// let the sound and input subsystems know about the new window
! 		VID.NewWindow(vid.width, vid.height);
! 
! 		post_init = R_Init2();
! 
! 		updateScreen();
! 		
! 		return rserr_ok;
! 	}
! 
! 	protected void GLimp_Shutdown() {
! 		if (oldDisplayMode != null && Display.isFullscreen()) {
! 			try {
! 				Display.setFullscreen(false);
! 				Display.setDisplayMode(oldDisplayMode);
! 			} catch (Exception e) {
! 				e.printStackTrace();
! 			}
! 		}
! 		
! 		if (Display.isCreated()) Display.destroy();
! 
! 		post_init = false;
! 		callback = INIT_CALLBACK;
! 	}
! 
! 	/**
! 	 * @return true
! 	 */
! 	protected boolean GLimp_Init(int xpos, int ypos) {
! 		// do nothing
! 		window_xpos = xpos;
! 		window_ypos = ypos;
! 		return true;
! 	}
! 
! 	protected void GLimp_EndFrame() {
! 		gl.glFlush();
! 		// swap buffer
! //		TODO this and a new JOGL-release solves the flickering bug (Loading)
! //		canvas.swapBuffers();
! 	}
! 	protected void GLimp_BeginFrame(float camera_separation) {
! 		// do nothing
! 	}
! 
! 	protected void GLimp_AppActivate(boolean activate) {
! 		// do nothing
! 	}
! 
! 	protected void GLimp_EnableLogging(boolean enable) {
! 		// doesn't need jogl logging
! 		// do nothing
! 	}
! 
! 	protected void GLimp_LogNewFrame() {
! 		// doesn't need jogl logging
! 		// do nothing
! 	}
! 
! 	/* 
! 	 * @see jake2.client.refexport_t#updateScreen()
! 	 */
! 	public void updateScreen() {
! 		this.callback = INIT_CALLBACK;
! 
! 		contextInUse = true;
! 		callback.execute();
! 		contextInUse = false;
! 		
! 		Display.update();
! 	}
! 	
! 	public void updateScreen(xcommand_t callback) {
! 		this.callback = callback;
! 
! 		contextInUse = true;
! 		callback.execute();
! 		contextInUse = false;
! 		
! 		Display.update();
! 	}	
! }
--- 1,324 ----
! /*
!  * LWJGLBase.java
!  * Copyright (C) 2004
!  * 
!  * $Id$
!  */
! /*
! Copyright (C) 1997-2001 Id Software, Inc.
! 
! This program is free software; you can redistribute it and/or
! modify it under the terms of the GNU General Public License
! as published by the Free Software Foundation; either version 2
! of the License, or (at your option) any later version.
! 
! This program is distributed in the hope that it will be useful,
! but WITHOUT ANY WARRANTY; without even the implied warranty of
! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
! 
! See the GNU General Public License for more details.
! 
! You should have received a copy of the GNU General Public License
! along with this program; if not, write to the Free Software
! Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
! 
! */
! package jake2.render.lwjgl;
! 
! import jake2.Defines;
! import jake2.client.VID;
! import jake2.client.viddef_t;
! import jake2.game.cvar_t;
! import jake2.qcommon.xcommand_t;
! 
! import java.awt.Dimension;
! import java.util.LinkedList;
! 
! import org.lwjgl.LWJGLException;
! import org.lwjgl.opengl.Display;
! import org.lwjgl.opengl.DisplayMode;
! import org.lwjgl.util.GLImpl;
! 
! /**
!  * LWJGLBase
!  * 
!  * @author dsanders/cwei
!  */
! public abstract class LWJGLBase {
! 	// IMPORTED FUNCTIONS
! 	protected DisplayMode oldDisplayMode; 
! 
! 	protected GLImpl gl = new GLImpl();
! 	
! 	// window position on the screen
! 	int window_xpos, window_ypos;
! 	protected viddef_t vid = new viddef_t();
! 
! 	// handles the post initialization with LWJGLRenderer
! 	protected abstract boolean R_Init2();
! 	
! 	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;
! 	
! 	private java.awt.DisplayMode toAwtDisplayMode(DisplayMode m)
! 	{
! 		return new java.awt.DisplayMode(m.getWidth(),m.getHeight(),m.getBitsPerPixel(),m.getFrequency());
! 	}
! 
! 	public java.awt.DisplayMode[] getModeList() 
! 	{
! 		DisplayMode[] modes = Display.getAvailableDisplayModes();
! 		
! 		LinkedList l = new LinkedList();
! 		l.add(toAwtDisplayMode(oldDisplayMode));
! 		
! 		for (int i = 0; i < modes.length; i++) {
! 			DisplayMode m = modes[i];
! 			
! 			if (m.getBitsPerPixel() != oldDisplayMode.getBitsPerPixel()) continue;
! 			if (m.getFrequency() > oldDisplayMode.getFrequency()) continue;
! 			if (m.getHeight() < 240 || m.getWidth() < 320) continue;
! 			
! 			int j = 0;
! 			java.awt.DisplayMode ml = null;
! 			for (j = 0; j < l.size(); j++) {
! 				ml = (java.awt.DisplayMode)l.get(j);
! 				if (ml.getWidth() > m.getWidth()) break;
! 				if (ml.getWidth() == m.getWidth() && ml.getHeight() >= m.getHeight()) break;
! 			}
! 			if (j == l.size()) {
! 				l.addLast(toAwtDisplayMode(m));
! 			} else if (ml.getWidth() > m.getWidth() || ml.getHeight() > m.getHeight()) {
! 				l.add(j, toAwtDisplayMode(m));
! 			} else if (m.getFrequency() > ml.getRefreshRate()){
! 				l.remove(j);
! 				l.add(j, toAwtDisplayMode(m));
! 			}
! 		}
! 		java.awt.DisplayMode[] ma = new java.awt.DisplayMode[l.size()];
! 		l.toArray(ma);
! 		return ma;
! 	}
! 	
! 	public DisplayMode[] getLWJGLModeList() {
! 		DisplayMode[] modes = Display.getAvailableDisplayModes();
! 		
! 		LinkedList l = new LinkedList();
! 		l.add(oldDisplayMode);
! 		
! 		for (int i = 0; i < modes.length; i++) {
! 			DisplayMode m = modes[i];
! 			
! 			if (m.getBitsPerPixel() != oldDisplayMode.getBitsPerPixel()) continue;
! 			if (m.getFrequency() > oldDisplayMode.getFrequency()) continue;
! 			if (m.getHeight() < 240 || m.getWidth() < 320) continue;
! 			
! 			int j = 0;
! 			DisplayMode ml = null;
! 			for (j = 0; j < l.size(); j++) {
! 				ml = (DisplayMode)l.get(j);
! 				if (ml.getWidth() > m.getWidth()) break;
! 				if (ml.getWidth() == m.getWidth() && ml.getHeight() >= m.getHeight()) break;
! 			}
! 			if (j == l.size()) {
! 				l.addLast(m);
! 			} else if (ml.getWidth() > m.getWidth() || ml.getHeight() > m.getHeight()) {
! 				l.add(j, m);
! 			} else if (m.getFrequency() > ml.getFrequency()){
! 				l.remove(j);
! 				l.add(j, m);
! 			}
! 		}
! 		DisplayMode[] ma = new DisplayMode[l.size()];
! 		l.toArray(ma);
! 		return ma;
! 	}
! 	
! 	private DisplayMode findDisplayMode(Dimension dim) {
! 		DisplayMode mode = null;
! 		DisplayMode m = null;
! 		DisplayMode[] modes = getLWJGLModeList();
! 		int w = dim.width;
! 		int h = dim.height;
! 		
! 		for (int i = 0; i < modes.length; i++) {
! 			m = modes[i];
! 			if (m.getWidth() == w && m.getHeight() == h) {
! 				mode = m;
! 				break;
! 			}
! 		}
! 		if (mode == null) mode = oldDisplayMode;
! 		return mode;		
! 	}
! 		
! 	String getModeString(DisplayMode m) {
! 		StringBuffer sb = new StringBuffer();
! 		sb.append(m.getWidth());
! 		sb.append('x');
! 		sb.append(m.getHeight());
! 		sb.append('x');
! 		sb.append(m.getBitsPerPixel());
! 		sb.append('@');
! 		sb.append(m.getFrequency());
! 		sb.append("Hz");
! 		return sb.toString();
! 	}
! 
! 	/**
! 	 * @param dim
! 	 * @param mode
! 	 * @param fullscreen
! 	 * @return enum rserr_t
! 	 */
! 	protected int GLimp_SetMode(Dimension dim, int mode, boolean fullscreen) {
! 
! 		Dimension newDim = new Dimension();
! 
! 		VID.Printf(Defines.PRINT_ALL, "Initializing OpenGL display\n");
! 
! 		VID.Printf(Defines.PRINT_ALL, "...setting mode " + mode + ":");
! 		
! 		/*
! 		 * fullscreen handling
! 		 */
! 		if (oldDisplayMode == null) {
! 			oldDisplayMode = Display.getDisplayMode();
! 		}
! 
! 		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
! 		GLimp_Shutdown();
! 
! 		Display.setTitle("Jake2");
! 
! 		DisplayMode displayMode = findDisplayMode(newDim);
! 		newDim.width = displayMode.getWidth();
! 		newDim.height = displayMode.getHeight();
! 		
! 		if (fullscreen) 
! 		{
! 			try {
! 				Display.setDisplayMode(displayMode);
! 			} 
! 			catch (LWJGLException e)
! 			{
! 				return rserr_invalid_mode; 
! 			}	
! 				
! 			Display.setLocation(0,0);
! 
! 			try {
! 				Display.setFullscreen(fullscreen);
! 			} 
! 			catch (LWJGLException e)
! 			{
! 				return rserr_invalid_fullscreen; 
! 			}	
! 
! 			VID.Printf(Defines.PRINT_ALL, "...setting fullscreen " + getModeString(displayMode) + '\n');
! 
! 		} 
! 		else 
! 		{
! 			try 
! 			{
! 				Display.setDisplayMode(displayMode);
! 			} 
! 			catch (LWJGLException e)
! 			{
! 				return rserr_invalid_mode;
! 			}
! 
! 			try {
! 				Display.setFullscreen(false);
! 			} 
! 			catch (LWJGLException e)
! 			{
! 				return rserr_invalid_fullscreen; 
! 			}	
! 			Display.setLocation(window_xpos, window_ypos);
! 		}
! 
! 		vid.width = newDim.width;
! 		vid.height = newDim.height;
! 		
! 		try
! 		{
! 			Display.create();
! 		} 
! 		catch (LWJGLException e)
! 		{
! 			return rserr_unknown; 
! 		}	
! 		
! 		// let the sound and input subsystems know about the new window
! 		VID.NewWindow(vid.width, vid.height);
! 		return rserr_ok;
! 	}
! 
! 	protected void GLimp_Shutdown() {
! 		if (oldDisplayMode != null && Display.isFullscreen()) {
! 			try {
! 				Display.setDisplayMode(oldDisplayMode);
! 			} catch (Exception e) {
! 				e.printStackTrace();
! 			}
! 		}
! 		
! 		while (Display.isCreated()) {
! 			Display.destroy();
! 		} 
! 	}
! 
! 	/**
! 	 * @return true
! 	 */
! 	protected boolean GLimp_Init(int xpos, int ypos) {
! 		// do nothing
! 		window_xpos = xpos;
! 		window_ypos = ypos;
! 		return true;
! 	}
! 
! 	protected void GLimp_EndFrame() {
! 		gl.glFlush();
! 		// swap buffers
! 		Display.update();
! 	}
! 
! 	protected void GLimp_BeginFrame(float camera_separation) {
! 		// do nothing
! 	}
! 
! 	protected void GLimp_AppActivate(boolean activate) {
! 		// do nothing
! 	}
! 
! 	protected void GLimp_EnableLogging(boolean enable) {
! 		// do nothing
! 	}
! 
! 	protected void GLimp_LogNewFrame() {
! 		// do nothing
! 	}
! 
! 	/**
! 	 * this is a hack for jogl renderers.
! 	 * @param callback
! 	 */
! 	public final void updateScreen(xcommand_t callback) {
! 		callback.execute();
! 	}	
! }