Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl
In directory sc8-pr-cvs1:/tmp/cvs-serv27638/src/java/org/lwjgl
Modified Files:
Display.java DisplayMode.java
Log Message:
Reverted display mode selection
Index: Display.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/Display.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/Display.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Display.java 3 Mar 2003 21:58:17 -0000 1.17
+++ Display.java 19 Mar 2003 12:41:27 -0000 1.18
@@ -110,13 +110,19 @@
* destroyed.
*
* @param displayMode A display mode to choose
+ * @param alpha Minimun number of alpha bits on the display
+ * @param depth Minimun number of depth bits on the display
+ * @param stencil Minimun number of stencil bits on the display
* @param fullscreen Whether to create the display fullscreen
* @param title The title for the application
* @throws Exception if the display mode could not be set
* @see #destroy()
*/
public static void create(
- DisplayMode displayMode,
+ DisplayMode displayMode,
+ int alpha,
+ int depth,
+ int stencil,
boolean fullscreen,
String title)
throws Exception {
@@ -129,9 +135,9 @@
displayMode.height,
displayMode.bpp,
displayMode.freq,
- displayMode.alpha,
- displayMode.depth,
- displayMode.stencil,
+ alpha,
+ depth,
+ stencil,
fullscreen,
title)) {
throw new Exception("Failed to set display mode to " + displayMode);
@@ -274,4 +280,4 @@
public static boolean isCloseRequested() {
return closeRequested;
}
-}
\ No newline at end of file
+}
Index: DisplayMode.java
CVS Browser:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/DisplayMode.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/DisplayMode.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- DisplayMode.java 3 Mar 2003 22:12:21 -0000 1.8
+++ DisplayMode.java 19 Mar 2003 12:41:27 -0000 1.9
@@ -46,21 +46,18 @@
public final class DisplayMode {
/** properties of the display mode */
- public final int width, height, bpp, freq, alpha, depth, stencil;
+ public final int width, height, bpp, freq;
/**
* Construct a display mode.
*
* @see Display
*/
- private DisplayMode(int width, int height, int bpp, int freq, int alpha, int depth, int stencil) {
+ private DisplayMode(int width, int height, int bpp, int freq) {
this.width = width;
this.height = height;
this.bpp = bpp;
this.freq = freq;
- this.alpha = alpha;
- this.depth = depth;
- this.stencil = stencil;
}
/**
@@ -77,10 +74,7 @@
return dm.width == width
&& dm.height == dm.height
&& dm.bpp == bpp
- && dm.freq == freq
- && dm.alpha == alpha
- && dm.depth == depth
- && dm.stencil == stencil;
+ && dm.freq == freq;
}
/**
@@ -89,7 +83,7 @@
* @see java.lang.Object#hashCode()
*/
public int hashCode() {
- return width ^ height ^ freq ^ bpp ^ alpha ^ (depth << 8) ^ (stencil << 24);
+ return width ^ height ^ freq ^ bpp;
}
/**
@@ -106,13 +100,7 @@
sb.append(bpp);
sb.append(" @");
sb.append(freq);
- sb.append("Hz ");
- sb.append(alpha);
- sb.append("bit alpha, ");
- sb.append(depth);
- sb.append("bit depth, ");
- sb.append(stencil);
- sb.append("bit stencil");
+ sb.append("Hz");
return sb.toString();
}
-}
\ No newline at end of file
+}
|