michael/lwjgl
michael
/
lwjgl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Repaired gamma code.

This commit is contained in:
Caspian Rychlik-Prince 2003-09-10 22:39:46 +00:00
parent 14f38f43e5
commit e92a54db87
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/native/win32/org_lwjgl_Display.cpp
View File

@ -281,7 +281,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_Display_setDisplayMode
JNIEXPORT void JNICALL Java_org_lwjgl_Display_resetDisplayMode JNIEXPORT void JNICALL Java_org_lwjgl_Display_resetDisplayMode
(JNIEnv * env, jclass clazz) (JNIEnv * env, jclass clazz)
{ {
/*
// Return device gamma to normal // Return device gamma to normal
HDC screenDC = GetDC(NULL); HDC screenDC = GetDC(NULL);
try { try {
@ -294,7 +294,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_Display_resetDisplayMode
printf("Exception occurred in SetDeviceGammaRamp\n"); printf("Exception occurred in SetDeviceGammaRamp\n");
} }
ReleaseDC(NULL, screenDC); ReleaseDC(NULL, screenDC);
*/
if (modeSet) { if (modeSet) {
modeSet = false; modeSet = false;
// Under Win32, all we have to do is: // Under Win32, all we have to do is:
@ -309,7 +309,6 @@ JNIEXPORT void JNICALL Java_org_lwjgl_Display_resetDisplayMode
* Temporarily reset display settings. This is called when the window is minimized. * Temporarily reset display settings. This is called when the window is minimized.
*/ */
void tempResetDisplayMode() { void tempResetDisplayMode() {
/*
// Return device gamma to normal // Return device gamma to normal
HDC screenDC = GetDC(NULL); HDC screenDC = GetDC(NULL);
try { try {
@ -322,7 +321,7 @@ void tempResetDisplayMode() {
printf("Exception occurred in SetDeviceGammaRamp\n"); printf("Exception occurred in SetDeviceGammaRamp\n");
} }
ReleaseDC(NULL, screenDC); ReleaseDC(NULL, screenDC);
*/
if (modeSet) { if (modeSet) {
#ifdef _DEBUG #ifdef _DEBUG
printf("Attempting to temporarily reset the display mode\n"); printf("Attempting to temporarily reset the display mode\n");
@ -338,7 +337,6 @@ void tempResetDisplayMode() {
*/ */
void tempRestoreDisplayMode() { void tempRestoreDisplayMode() {
// Restore gamma // Restore gamma
/*
HDC screenDC = GetDC(NULL); HDC screenDC = GetDC(NULL);
try { try {
if (!SetDeviceGammaRamp(screenDC, currentGamma)) { if (!SetDeviceGammaRamp(screenDC, currentGamma)) {
@ -350,7 +348,7 @@ void tempRestoreDisplayMode() {
printf("Exception occurred in SetDeviceGammaRamp\n"); printf("Exception occurred in SetDeviceGammaRamp\n");
} }
ReleaseDC(NULL, screenDC); ReleaseDC(NULL, screenDC);
*/
if (!modeSet) { if (!modeSet) {
#ifdef _DEBUG #ifdef _DEBUG
@ -389,7 +387,7 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_Display_setGammaRamp
{ {
return JNI_FALSE; return JNI_FALSE;
/*
const float *gammaRamp = (const float *)env->GetDirectBufferAddress(gammaRampBuffer); const float *gammaRamp = (const float *)env->GetDirectBufferAddress(gammaRampBuffer);
// Turn array of floats into array of RGB WORDs // Turn array of floats into array of RGB WORDs
@ -418,7 +416,6 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_Display_setGammaRamp
ReleaseDC(NULL, screenDC); ReleaseDC(NULL, screenDC);
return ret; return ret;
*/
} }
@ -452,7 +449,6 @@ JNIEXPORT void JNICALL Java_org_lwjgl_Display_init
env->SetStaticObjectField(clazz, fid_initialMode, newMode); env->SetStaticObjectField(clazz, fid_initialMode, newMode);
env->DeleteLocalRef(newMode); env->DeleteLocalRef(newMode);
/*
// Get the default gamma ramp // Get the default gamma ramp
try { try {
if (GetDeviceGammaRamp(screenDC, originalGamma) == FALSE) { if (GetDeviceGammaRamp(screenDC, originalGamma) == FALSE) {
@ -463,7 +459,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_Display_init
} catch (...) { } catch (...) {
printf("Exception occurred in GetDeviceGammaRamp\n"); printf("Exception occurred in GetDeviceGammaRamp\n");
} }
*/
ReleaseDC(NULL, screenDC); ReleaseDC(NULL, screenDC);
} }