Merge branch 'master' of github.com:elmindreda/glfw

This commit is contained in:
Camilla Berglund 2012-08-12 16:45:27 +02:00
commit 8699399103
15 changed files with 32 additions and 46 deletions

View File

@ -330,7 +330,7 @@ void DrawBoingBall( void )
/***************************************************************************** /*****************************************************************************
* Bounce the ball. * Bounce the ball.
*****************************************************************************/ *****************************************************************************/
void BounceBall( double dt ) void BounceBall( double delta_t )
{ {
GLfloat sign; GLfloat sign;
GLfloat deg; GLfloat deg;
@ -358,8 +358,8 @@ void BounceBall( double dt )
} }
/* Update ball position */ /* Update ball position */
ball_x += ball_x_inc * ((float)dt*ANIMATION_SPEED); ball_x += ball_x_inc * ((float)delta_t*ANIMATION_SPEED);
ball_y += ball_y_inc * ((float)dt*ANIMATION_SPEED); ball_y += ball_y_inc * ((float)delta_t*ANIMATION_SPEED);
/* /*
* Simulate the effects of gravity on Y movement. * Simulate the effects of gravity on Y movement.

View File

@ -442,7 +442,6 @@ static void mouseButtonFun(GLFWwindow window, int button, int action)
int main(void) int main(void)
{ {
GLFWwindow window; GLFWwindow window;
int width, height;
// Initialise GLFW // Initialise GLFW
if (!glfwInit()) if (!glfwInit())

View File

@ -866,8 +866,6 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
if (!initializeAppKit()) if (!initializeAppKit())
return GL_FALSE; return GL_FALSE;
window->resizable = wndconfig->resizable;
// We can only have one application delegate, but we only allocate it the // We can only have one application delegate, but we only allocate it the
// first time we create a window to keep all window code in this file // first time we create a window to keep all window code in this file
if (_glfwLibrary.NS.delegate == nil) if (_glfwLibrary.NS.delegate == nil)
@ -927,14 +925,10 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
withOptions:nil]; withOptions:nil];
} }
glfwMakeContextCurrent(window);
NSPoint point = [[NSCursor currentCursor] hotSpot]; NSPoint point = [[NSCursor currentCursor] hotSpot];
window->cursorPosX = point.x; window->cursorPosX = point.x;
window->cursorPosY = point.y; window->cursorPosY = point.y;
window->resizable = wndconfig->resizable;
return GL_TRUE; return GL_TRUE;
} }

View File

@ -59,8 +59,6 @@ void _glfwSetError(int error, const char* format, ...)
char buffer[16384]; char buffer[16384];
const char* description; const char* description;
// We would use vasprintf here if msvcrt supported it
if (format) if (format)
{ {
int count; int count;

View File

@ -959,7 +959,6 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
GLboolean recreateContext = GL_FALSE; GLboolean recreateContext = GL_FALSE;
window->Win32.desiredRefreshRate = wndconfig->refreshRate; window->Win32.desiredRefreshRate = wndconfig->refreshRate;
window->resizable = wndconfig->resizable;
if (!_glfwLibrary.Win32.classAtom) if (!_glfwLibrary.Win32.classAtom)
{ {

View File

@ -300,6 +300,7 @@ GLFWAPI GLFWwindow glfwCreateWindow(int width, int height,
window->width = width; window->width = width;
window->height = height; window->height = height;
window->mode = mode; window->mode = mode;
window->resizable = wndconfig.resizable;
window->cursorMode = GLFW_CURSOR_NORMAL; window->cursorMode = GLFW_CURSOR_NORMAL;
window->systemKeys = GL_TRUE; window->systemKeys = GL_TRUE;

View File

@ -83,7 +83,7 @@ void _glfwInitJoysticks(void)
{ {
#ifdef _GLFW_USE_LINUX_JOYSTICKS #ifdef _GLFW_USE_LINUX_JOYSTICKS
int k, n, fd, joy_count; int k, n, fd, joy_count;
char* joy_base_name; const char* joy_base_name;
char joy_dev_name[20]; char joy_dev_name[20];
int driver_version = 0x000800; int driver_version = 0x000800;
char ret_data; char ret_data;

View File

@ -889,7 +889,6 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
const _GLFWfbconfig* fbconfig) const _GLFWfbconfig* fbconfig)
{ {
window->refreshRate = wndconfig->refreshRate; window->refreshRate = wndconfig->refreshRate;
window->resizable = wndconfig->resizable;
if (!_glfwCreateContext(window, wndconfig, fbconfig)) if (!_glfwCreateContext(window, wndconfig, fbconfig))
return GL_FALSE; return GL_FALSE;

View File

@ -41,7 +41,10 @@
#include <string.h> #include <string.h>
#include "getopt.h" #include "getopt.h"
/* 2012-08-12 Lambert Clara <lambert.clara@yahoo.fr>
*
* Constify third argument of getopt.
*/
/* 2011-07-27 Camilla Berglund <elmindreda@elmindreda.org> /* 2011-07-27 Camilla Berglund <elmindreda@elmindreda.org>
* *
* Added _CRT_SECURE_NO_WARNINGS macro. * Added _CRT_SECURE_NO_WARNINGS macro.
@ -102,7 +105,7 @@ static int permute_argv_once()
} }
int getopt(int argc, char** argv, char* optstr) int getopt(int argc, char** argv, const char* optstr)
{ {
int c = 0; int c = 0;

View File

@ -48,7 +48,7 @@ extern int optind;
extern int opterr; extern int opterr;
extern int optopt; extern int optopt;
int getopt(int argc, char** argv, char* optstr); int getopt(int argc, char** argv, const char* optstr);
#ifdef __cplusplus #ifdef __cplusplus

View File

@ -46,9 +46,7 @@ static void set_swap_interval(GLFWwindow window, int interval)
swap_interval = interval; swap_interval = interval;
glfwSwapInterval(swap_interval); glfwSwapInterval(swap_interval);
sprintf(title, sprintf(title, "Cursor Inaccuracy Detector (interval %i)", swap_interval);
"Cursor Inaccuracy Detector (interval %i)",
swap_interval);
glfwSetWindowTitle(window, title); glfwSetWindowTitle(window, title);
} }

View File

@ -30,25 +30,22 @@
//======================================================================== //========================================================================
#include <GL/glfw3.h> #include <GL/glfw3.h>
#include <GL/glext.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#ifndef GL_ARB_multisample
#define GL_SAMPLES_ARB 0x80A9
#endif
typedef struct typedef struct
{ {
int param; int param;
char* ext; const char* ext;
char* name; const char* name;
} ParamGL; } ParamGL;
typedef struct typedef struct
{ {
int param; int param;
char* name; const char* name;
} ParamGLFW; } ParamGLFW;
static ParamGL gl_params[] = static ParamGL gl_params[] =

View File

@ -37,7 +37,7 @@
#define STEP_SIZE 0.1f #define STEP_SIZE 0.1f
static GLfloat gamma = 1.0f; static GLfloat gamma_value = 1.0f;
static void usage(void) static void usage(void)
{ {
@ -46,9 +46,9 @@ static void usage(void)
static void set_gamma(float value) static void set_gamma(float value)
{ {
gamma = value; gamma_value = value;
printf("Gamma: %f\n", gamma); printf("Gamma: %f\n", gamma_value);
glfwSetGamma(gamma); glfwSetGamma(gamma_value);
} }
static void key_callback(GLFWwindow window, int key, int action) static void key_callback(GLFWwindow window, int key, int action)
@ -67,15 +67,15 @@ static void key_callback(GLFWwindow window, int key, int action)
case GLFW_KEY_KP_ADD: case GLFW_KEY_KP_ADD:
case GLFW_KEY_Q: case GLFW_KEY_Q:
{ {
set_gamma(gamma + STEP_SIZE); set_gamma(gamma_value + STEP_SIZE);
break; break;
} }
case GLFW_KEY_KP_SUBTRACT: case GLFW_KEY_KP_SUBTRACT:
case GLFW_KEY_W: case GLFW_KEY_W:
{ {
if (gamma - STEP_SIZE > 0.f) if (gamma_value - STEP_SIZE > 0.f)
set_gamma(gamma - STEP_SIZE); set_gamma(gamma_value - STEP_SIZE);
break; break;
} }
@ -119,10 +119,10 @@ int main(int argc, char** argv)
if (mode == GLFW_FULLSCREEN) if (mode == GLFW_FULLSCREEN)
{ {
GLFWvidmode mode; GLFWvidmode desktop_mode;
glfwGetDesktopMode(&mode); glfwGetDesktopMode(&desktop_mode);
width = mode.width; width = desktop_mode.width;
height = mode.height; height = desktop_mode.height;
} }
else else
{ {

View File

@ -100,10 +100,10 @@ int main(int argc, char** argv)
if (mode == GLFW_FULLSCREEN) if (mode == GLFW_FULLSCREEN)
{ {
GLFWvidmode mode; GLFWvidmode desktop_mode;
glfwGetDesktopMode(&mode); glfwGetDesktopMode(&desktop_mode);
width = mode.width; width = desktop_mode.width;
height = mode.height; height = desktop_mode.height;
} }
else else
{ {
@ -130,8 +130,6 @@ int main(int argc, char** argv)
while (!glfwGetWindowParam(window, GLFW_CLOSE_REQUESTED)) while (!glfwGetWindowParam(window, GLFW_CLOSE_REQUESTED))
{ {
int width, height;
if (iconified != glfwGetWindowParam(window, GLFW_ICONIFIED) || if (iconified != glfwGetWindowParam(window, GLFW_ICONIFIED) ||
active != glfwGetWindowParam(window, GLFW_ACTIVE)) active != glfwGetWindowParam(window, GLFW_ACTIVE))
{ {

View File

@ -68,7 +68,7 @@ static void error_callback(int error, const char* description)
fprintf(stderr, "Error: %s\n", description); fprintf(stderr, "Error: %s\n", description);
} }
static void window_size_callback(GLFWwindow window, int width, int height) static void window_size_callback(GLFWwindow in_window, int width, int height)
{ {
printf("Window resized to %ix%i\n", width, height); printf("Window resized to %ix%i\n", width, height);