gwm17/glfw
1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-11-23 02:38:52 -05:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into tls

Browse Source
This commit is contained in:
Camilla Berglund 2012-08-12 15:35:06 +02:00
parent d03c8507e6 06b5d0f665
commit cd37da470f
11 changed files with 32 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/boing.c
View File

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

1
examples/splitview.c
View File

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

2
src/x11_joystick.c
View File

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

7
support/getopt.c
View File

@ -41,7 +41,10 @@
#include <string.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>
*
* 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;

2
support/getopt.h
View File

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

4
tests/accuracy.c
View File

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

11
tests/defaults.c
View File

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

22
tests/gamma.c
View File

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

10
tests/iconify.c
View File

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

2
tests/modes.c
View File

@ -68,7 +68,7 @@ static void error_callback(int error, const char* 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);

4
tests/tearing.c
View File

@ -43,9 +43,7 @@ static void set_swap_interval(GLFWwindow window, int interval)
swap_interval = interval;
glfwSwapInterval(swap_interval);
sprintf(title,
"Tearing detector (interval %i)",
swap_interval);
sprintf(title, "Tearing detector (interval %i)", swap_interval);
glfwSetWindowTitle(window, title);
}