AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2024-11-24 20:40:15 +00:00
Code Issues Releases Wiki Activity

fix some GLFW 3.0 issues - since we are still in beta, the API is changing a bit

Browse Source 
- the closeWindowFun callback changed prototype (now returns void)
- keyboard functions now require the window handle (and pass it to the callback)
This commit is contained in:
Manuel Kraemer 2013-03-16 18:44:53 -07:00
parent 8e9e832f94
commit a4c43b0522
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/glViewer/viewer.cpp
View File

@ -1531,13 +1531,15 @@ reshape(int width, int height) {
//------------------------------------------------------------------------------
#if GLFW_VERSION_MAJOR>=3
int windowClose(GLFWwindow*) {
void windowClose(GLFWwindow*) {
g_running = false;
}
#else
int windowClose() {
#endif
g_running = false;
return GL_TRUE;
}
#endif
//------------------------------------------------------------------------------
static void

14
examples/paintTest/main.cpp
View File

@ -1011,12 +1011,12 @@ drawStroke(int x, int y)
//------------------------------------------------------------------------------
static void
#if GLFW_VERSION_MAJOR>=3
motion(GLFWwindow *, int x, int y) {
motion(GLFWwindow * w, int x, int y) {
#else
motion(int x, int y) {
#endif
if (glfwGetKey(GLFW_KEY_LALT)) {
if (glfwGetKey(w,GLFW_KEY_LALT)) {
if (g_mbutton[0] && !g_mbutton[1] && !g_mbutton[2]) {
// orbit
g_rotate[0] += x - g_prev_x;
@ -1045,7 +1045,7 @@ motion(int x, int y) {
//------------------------------------------------------------------------------
static void
#if GLFW_VERSION_MAJOR>=3
mouse(GLFWwindow *, int button, int state) {
mouse(GLFWwindow * w, int button, int state) {
#else
mouse(int button, int state) {
#endif
@ -1057,7 +1057,7 @@ mouse(int button, int state) {
g_mbutton[button] = (state == GLFW_PRESS);
}
if (not glfwGetKey(GLFW_KEY_LALT)) {
if (not glfwGetKey(w, GLFW_KEY_LALT)) {
if (g_mbutton[0] && !g_mbutton[1] && !g_mbutton[2]) {
drawStroke(g_prev_x, g_prev_y);
}
@ -1092,13 +1092,15 @@ reshape(int width, int height) {
//------------------------------------------------------------------------------
#if GLFW_VERSION_MAJOR>=3
int windowClose(GLFWwindow*) {
void windowClose(GLFWwindow*) {
g_running = false;
}
#else
int windowClose() {
#endif
g_running = false;
return GL_TRUE;
}
#endif
//------------------------------------------------------------------------------
static void

6
examples/simpleCpu/main.cpp
View File

@ -67,13 +67,15 @@ reshape(int width, int height) {
}
#if GLFW_VERSION_MAJOR>=3
int windowClose(GLFWwindow*) {
void windowClose(GLFWwindow*) {
g_running = false;
}
#else
int windowClose() {
#endif
g_running = false;
return GL_TRUE;
}
#endif
//
// Idle is called between frames, here we advance the frame number and update