callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test/gtkgears.c: Fix on C89 Compilers

Browse Source 
Make sure that variables are declared at the top of the block.

Break up one of the sincos() calls into individual calls to sin() and cos()
so that we do not have to complicate the initialization of the following
GLfloat array.
This commit is contained in:
Chun-wei Fan 2015-03-06 11:01:30 +08:00
parent 9c545ac2e8
commit b3725a455d
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/gtkgears.c
View File

@ -408,9 +408,9 @@ multiply (GLfloat *m, const GLfloat *n)
static void static void
rotate(GLfloat *m, GLfloat angle, GLfloat x, GLfloat y, GLfloat z) rotate(GLfloat *m, GLfloat angle, GLfloat x, GLfloat y, GLfloat z)
{ {
double s, c; double s = sin (angle);
double c = cos (angle);
sincos(angle, &s, &c);
GLfloat r[16] = { GLfloat r[16] = {
x * x * (1 - c) + c, y * x * (1 - c) + z * s, x * z * (1 - c) - y * s, 0, x * x * (1 - c) + c, y * x * (1 - c) + z * s, x * z * (1 - c) - y * s, 0,
x * y * (1 - c) - z * s, y * y * (1 - c) + c, y * z * (1 - c) + x * s, 0, x * y * (1 - c) - z * s, y * y * (1 - c) + c, y * z * (1 - c) + x * s, 0,
@ -511,10 +511,9 @@ invert(GLfloat *m)
void perspective(GLfloat *m, GLfloat fovy, GLfloat aspect, GLfloat zNear, GLfloat zFar) void perspective(GLfloat *m, GLfloat fovy, GLfloat aspect, GLfloat zNear, GLfloat zFar)
{ {
GLfloat tmp[16]; GLfloat tmp[16];
identity(tmp);
double sine, cosine, cotangent, deltaZ; double sine, cosine, cotangent, deltaZ;
GLfloat radians = fovy / 2 * M_PI / 180; GLfloat radians = fovy / 2 * M_PI / 180;
identity(tmp);
deltaZ = zFar - zNear; deltaZ = zFar - zNear;
sincos(radians, &sine, &cosine); sincos(radians, &sine, &cosine);