From 21f41a2bb77cb4a26f584742f8568614034b1f6b Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Mon, 31 Dec 2012 19:45:13 +0100 Subject: [PATCH] Renamed GLFW_SAMPLES and GLFW_SHOULD_CLOSE. --- examples/boing.c | 2 +- examples/splitview.c | 2 +- examples/triangle.c | 2 +- include/GL/glfw3.h | 14 +++++++------- readme.html | 3 ++- src/window.c | 4 ++-- tests/accuracy.c | 2 +- tests/events.c | 2 +- tests/fsaa.c | 4 ++-- tests/joysticks.c | 2 +- tests/peter.c | 2 +- tests/tearing.c | 2 +- tests/threads.c | 2 +- tests/title.c | 2 +- tests/windows.c | 2 +- 15 files changed, 24 insertions(+), 23 deletions(-) diff --git a/examples/boing.c b/examples/boing.c index f9771122..d6db6fcd 100644 --- a/examples/boing.c +++ b/examples/boing.c @@ -614,7 +614,7 @@ int main( void ) /* Check if we are still running */ if (glfwGetKey( window, GLFW_KEY_ESCAPE )) break; - if (glfwGetWindowParam(window, GLFW_CLOSE_REQUESTED)) + if (glfwGetWindowParam(window, GLFW_SHOULD_CLOSE)) break; } diff --git a/examples/splitview.c b/examples/splitview.c index 965a183c..41207769 100644 --- a/examples/splitview.c +++ b/examples/splitview.c @@ -502,7 +502,7 @@ int main(void) // Check if the ESC key was pressed or the window should be closed if (glfwGetKey(window, GLFW_KEY_ESCAPE)) break; - if (glfwGetWindowParam(window, GLFW_CLOSE_REQUESTED)) + if (glfwGetWindowParam(window, GLFW_SHOULD_CLOSE)) break; } diff --git a/examples/triangle.c b/examples/triangle.c index 13ef0a98..934d3f37 100644 --- a/examples/triangle.c +++ b/examples/triangle.c @@ -90,7 +90,7 @@ int main(void) // Check if the ESC key was pressed or the window should be closed if (glfwGetKey(window, GLFW_KEY_ESCAPE)) break; - if (glfwGetWindowParam(window, GLFW_CLOSE_REQUESTED)) + if (glfwGetWindowParam(window, GLFW_SHOULD_CLOSE)) break; } diff --git a/include/GL/glfw3.h b/include/GL/glfw3.h index 46db151f..87e5b2d5 100644 --- a/include/GL/glfw3.h +++ b/include/GL/glfw3.h @@ -481,11 +481,11 @@ extern "C" { * otherwise. * @see glfwGetWindowParam */ -#define GLFW_CLOSE_REQUESTED 0x00020003 +#define GLFW_SHOULD_CLOSE 0x00020003 /*! @brief The client API version revision. * @see glfwGetWindowParam */ -#define GLFW_CONTEXT_REVISION 0x00020004 +#define GLFW_CONTEXT_REVISION 0x00020004 /*! @brief The bit depth of the red component of the color buffer. * @see glfwWindowHint @@ -543,7 +543,7 @@ extern "C" { * zero to disable multisampling. * @see glfwWindowHint */ -#define GLFW_FSAA_SAMPLES 0x0002100E +#define GLFW_SAMPLES 0x0002100E /*! @brief @c GL_TRUE if the framebuffer should be sRGB capable, or @c GL_FALSE * otherwise. * @see glfwWindowHint @@ -1075,8 +1075,8 @@ GLFWAPI void glfwDefaultWindowHints(void); * * The @ref GLFW_STEREO hint specifies whether to use stereoscopic rendering. * - * The @ref GLFW_FSAA_SAMPLES hint specifies the desired number of samples to - * use for multisampling. + * The @ref GLFW_SAMPLES hint specifies the desired number of samples to use + * for multisampling. * * The @ref GLFW_SRGB_CAPABLE hint specifies whether the framebuffer should be * sRGB capable. @@ -1304,7 +1304,7 @@ GLFWAPI void glfwHideWindow(GLFWwindow window); * The @ref GLFW_RESIZABLE property indicates whether the window is resizable * by the user. * - * The @ref GLFW_CLOSE_REQUESTED property indicates whether the window has been + * The @ref GLFW_SHOULD_CLOSE property indicates whether the window has been * requested by the user to close. * * The @ref GLFW_REFRESH_RATE property will be replaced when the @c @@ -1383,7 +1383,7 @@ GLFWAPI void glfwSetWindowSizeCallback(GLFWwindow window, GLFWwindowsizefun cbfu * callback to be called. * * The return value of the close callback becomes the new value of the @ref - * GLFW_CLOSE_REQUESTED window parameter. + * GLFW_SHOULD_CLOSE window parameter. */ GLFWAPI void glfwSetWindowCloseCallback(GLFWwindow window, GLFWwindowclosefun cbfun); diff --git a/readme.html b/readme.html index d5e9d922..adee790e 100644 --- a/readme.html +++ b/readme.html @@ -301,6 +301,7 @@ version of GLFW.

  • Renamed glfw.h to glfw3.h to avoid conflicts with 2.x series
  • Renamed glfwOpenWindowHint to glfwWindowHint
  • Renamed GLFW_ACTIVE to GLFW_FOCUSED
    • +
  • Renamed GLFW_FSAA_SAMPLES to GLFW_SAMPLES
  • Renamed GLFW_WINDOW token to GLFW_WINDOWED
  • Renamed GLFW_WINDOW_NO_RESIZE to GLFW_RESIZABLE
  • Renamed GLFW_BUILD_DLL to _GLFW_BUILD_DLL
    • @@ -314,7 +315,7 @@ version of GLFW.

  • Replaced mouse wheel interface with two-dimensional, floating point scrolling interface
  • Replaced glfwEnable and glfwDisable with glfwGetInputMode and glfwSetInputMode
  • Replaced joystick test with graphical version
    • -
  • Replaced automatic closing of windows with GLFW_CLOSE_REQUESTED window parameter
    • +
  • Replaced automatic closing of windows with GLFW_SHOULD_CLOSE window parameter
  • Removed the GLFW_KEY_REPEAT input option
  • Removed event auto-polling and the GLFW_AUTO_POLL_EVENTS window enable
  • Removed the Win32 port .def files
    • diff --git a/src/window.c b/src/window.c index 83db3bdd..1db4fed1 100644 --- a/src/window.c +++ b/src/window.c @@ -442,7 +442,7 @@ GLFWAPI void glfwWindowHint(int target, int hint) case GLFW_POSITION_Y: _glfwLibrary.hints.positionY = hint; break; - case GLFW_FSAA_SAMPLES: + case GLFW_SAMPLES: _glfwLibrary.hints.samples = hint; break; case GLFW_SRGB_CAPABLE: @@ -715,7 +715,7 @@ GLFWAPI int glfwGetWindowParam(GLFWwindow handle, int param) return window == _glfwLibrary.focusedWindow; case GLFW_ICONIFIED: return window->iconified; - case GLFW_CLOSE_REQUESTED: + case GLFW_SHOULD_CLOSE: return window->closeRequested; case GLFW_REFRESH_RATE: return window->refreshRate; diff --git a/tests/accuracy.c b/tests/accuracy.c index 099a619c..8219a4e8 100644 --- a/tests/accuracy.c +++ b/tests/accuracy.c @@ -108,7 +108,7 @@ int main(void) set_swap_interval(window, swap_interval); - while (!glfwGetWindowParam(window, GLFW_CLOSE_REQUESTED)) + while (!glfwGetWindowParam(window, GLFW_SHOULD_CLOSE)) { glClear(GL_COLOR_BUFFER_BIT); diff --git a/tests/events.c b/tests/events.c index c79af8b8..687af7f8 100644 --- a/tests/events.c +++ b/tests/events.c @@ -386,7 +386,7 @@ int main(void) printf("Main loop starting\n"); - while (!glfwGetWindowParam(window, GLFW_CLOSE_REQUESTED)) + while (!glfwGetWindowParam(window, GLFW_SHOULD_CLOSE)) glfwWaitEvents(); glfwTerminate(); diff --git a/tests/fsaa.c b/tests/fsaa.c index b564bfe4..4dfa819a 100644 --- a/tests/fsaa.c +++ b/tests/fsaa.c @@ -97,7 +97,7 @@ int main(int argc, char** argv) else printf("Requesting that FSAA not be available\n"); - glfwWindowHint(GLFW_FSAA_SAMPLES, samples); + glfwWindowHint(GLFW_SAMPLES, samples); window = glfwCreateWindow(800, 400, GLFW_WINDOWED, "Aliasing Detector", NULL); if (!window) @@ -128,7 +128,7 @@ int main(int argc, char** argv) gluOrtho2D(0.f, 1.f, 0.f, 0.5f); glMatrixMode(GL_MODELVIEW); - while (!glfwGetWindowParam(window, GLFW_CLOSE_REQUESTED)) + while (!glfwGetWindowParam(window, GLFW_SHOULD_CLOSE)) { GLfloat time = (GLfloat) glfwGetTime(); diff --git a/tests/joysticks.c b/tests/joysticks.c index d297a3f4..ff6b4282 100644 --- a/tests/joysticks.c +++ b/tests/joysticks.c @@ -207,7 +207,7 @@ int main(void) glfwMakeContextCurrent(window); glfwSwapInterval(1); - while (!glfwGetWindowParam(window, GLFW_CLOSE_REQUESTED)) + while (!glfwGetWindowParam(window, GLFW_SHOULD_CLOSE)) { glClear(GL_COLOR_BUFFER_BIT); diff --git a/tests/peter.c b/tests/peter.c index d7209e3a..4bfef7d2 100644 --- a/tests/peter.c +++ b/tests/peter.c @@ -129,7 +129,7 @@ int main(void) glClearColor(0.f, 0.f, 0.f, 0.f); - while (!glfwGetWindowParam(window_handle, GLFW_CLOSE_REQUESTED)) + while (!glfwGetWindowParam(window_handle, GLFW_SHOULD_CLOSE)) { glClear(GL_COLOR_BUFFER_BIT); diff --git a/tests/tearing.c b/tests/tearing.c index 8ab6a1d4..af5bc3c1 100644 --- a/tests/tearing.c +++ b/tests/tearing.c @@ -91,7 +91,7 @@ int main(void) glOrtho(-1.f, 1.f, -1.f, 1.f, 1.f, -1.f); glMatrixMode(GL_MODELVIEW); - while (!glfwGetWindowParam(window, GLFW_CLOSE_REQUESTED)) + while (!glfwGetWindowParam(window, GLFW_SHOULD_CLOSE)) { glClear(GL_COLOR_BUFFER_BIT); diff --git a/tests/threads.c b/tests/threads.c index 9cc78975..471b4946 100644 --- a/tests/threads.c +++ b/tests/threads.c @@ -122,7 +122,7 @@ int main(void) for (i = 0; i < count; i++) { - if (glfwGetWindowParam(threads[i].window, GLFW_CLOSE_REQUESTED)) + if (glfwGetWindowParam(threads[i].window, GLFW_SHOULD_CLOSE)) running = GL_FALSE; } } diff --git a/tests/title.c b/tests/title.c index b23f0ab2..6b540149 100644 --- a/tests/title.c +++ b/tests/title.c @@ -63,7 +63,7 @@ int main(void) glfwSetWindowSizeCallback(window, window_size_callback); - while (!glfwGetWindowParam(window, GLFW_CLOSE_REQUESTED)) + while (!glfwGetWindowParam(window, GLFW_SHOULD_CLOSE)) { glClear(GL_COLOR_BUFFER_BIT); glfwSwapBuffers(window); diff --git a/tests/windows.c b/tests/windows.c index d0006836..6b20c423 100644 --- a/tests/windows.c +++ b/tests/windows.c @@ -82,7 +82,7 @@ int main(void) glClear(GL_COLOR_BUFFER_BIT); glfwSwapBuffers(windows[i]); - if (glfwGetWindowParam(windows[i], GLFW_CLOSE_REQUESTED)) + if (glfwGetWindowParam(windows[i], GLFW_SHOULD_CLOSE)) running = GL_FALSE; }