Warning fix. Thanks to Martin.

This commit is contained in:
Luc Girod 2014-07-05 01:46:01 +02:00
parent 9ef75edb27
commit f57f2f3afc
4 changed files with 32 additions and 32 deletions

View File

@ -25,7 +25,7 @@
#include "sweet_types.h" #include "sweet_types.h"
mat2 mat2
sweet_matrix_null2 () sweet_matrix_null2 (void)
{ {
mat2 m; mat2 m;
@ -39,7 +39,7 @@ sweet_matrix_null2 ()
} }
mat3 mat3
sweet_matrix_null3 () sweet_matrix_null3 (void)
{ {
mat3 m; mat3 m;
@ -59,7 +59,7 @@ sweet_matrix_null3 ()
} }
mat4 mat4
sweet_matrix_null4 () sweet_matrix_null4 (void)
{ {
mat4 m; mat4 m;
@ -88,7 +88,7 @@ sweet_matrix_null4 ()
mat2 mat2
sweet_matrix_identity2 () sweet_matrix_identity2 (void)
{ {
mat2 m; mat2 m;
@ -102,7 +102,7 @@ sweet_matrix_identity2 ()
} }
mat3 mat3
sweet_matrix_identity3 () sweet_matrix_identity3 (void)
{ {
mat3 m; mat3 m;
@ -122,7 +122,7 @@ sweet_matrix_identity3 ()
} }
mat4 mat4
sweet_matrix_identity4 () sweet_matrix_identity4 (void)
{ {
mat4 m; mat4 m;
@ -268,7 +268,7 @@ sweet_matrix_look_at (vec3 pos, vec3 dir, vec3 up)
m.v[14] = pos.x * dir.x + pos.y * dir.y + pos.z * dir.z; m.v[14] = pos.x * dir.x + pos.y * dir.y + pos.z * dir.z;
m.v[15] = 1; m.v[15] = 1;
return m; return m;
} }
mat3 mat3
@ -509,7 +509,7 @@ sweet_matrix_scale2 (float x, float y)
} }
mat4 mat4
sweet_matrix_texture_bias () sweet_matrix_texture_bias (void)
{ {
mat4 m; mat4 m;
m.v[0] = 0.5; m.v[0] = 0.5;
@ -1083,7 +1083,7 @@ static void swap_rows (mat3 * a, float * s, int l1, int l2)
{ {
float tmp; float tmp;
if (l1 == l2) { return; } if (l1 == l2) { return; }
/* swap left part */ /* swap left part */
tmp = s[l1]; tmp = s[l1];
s[l1] = s[l2]; s[l1] = s[l2];
@ -1093,7 +1093,7 @@ static void swap_rows (mat3 * a, float * s, int l1, int l2)
tmp = a->v[l1]; tmp = a->v[l1];
a->v[l1] = a->v[l2]; a->v[l1] = a->v[l2];
a->v[l2] = tmp; a->v[l2] = tmp;
/* swap second column */ /* swap second column */
l1 += 3; l1 += 3;
l2 += 3; l2 += 3;
@ -1126,14 +1126,14 @@ static void substract_row (mat3 * a, float * s, int l1, int l2, int i)
{ {
r = - a->v[l2]; r = - a->v[l2];
a->v[l2] = 0; a->v[l2] = 0;
a->v[l2+3] = a->v[l2+3] + a->v[l1+3] * r; a->v[l2+3] = a->v[l2+3] + a->v[l1+3] * r;
a->v[l2+6] = a->v[l2+6] + a->v[l1+6] * r; a->v[l2+6] = a->v[l2+6] + a->v[l1+6] * r;
} }
else if (i == 1) else if (i == 1)
{ {
r = - a->v[l2+3]; r = - a->v[l2+3];
a->v[l2+3] = 0; a->v[l2+3] = 0;
a->v[l2+6] = a->v[l2+6] + a->v[l1+6] * r; a->v[l2+6] = a->v[l2+6] + a->v[l1+6] * r;
} }
else if (i == 2) else if (i == 2)
{ {
@ -1245,7 +1245,7 @@ static void get_eigen_vector (vec3 * v, mat3 * a, float h)
free_value = 1; free_value = 1;
v->z = 1; v->z = 1;
} }
if (!free_value && if (!free_value &&
sweet_math_approx_equals (a->v[2], 0, EPSILON) && sweet_math_approx_equals (a->v[2], 0, EPSILON) &&
sweet_math_approx_equals (a->v[5], 0, EPSILON) && sweet_math_approx_equals (a->v[5], 0, EPSILON) &&

View File

@ -25,15 +25,15 @@
/** Null Matrix */ /** Null Matrix */
/** @return Null matrix */ /** @return Null matrix */
mat2 sweet_matrix_null2 (); mat2 sweet_matrix_null2 (void);
mat3 sweet_matrix_null3 (); mat3 sweet_matrix_null3 (void);
mat4 sweet_matrix_null4 (); mat4 sweet_matrix_null4 (void);
/** Identity */ /** Identity */
/** @return Indentity matrix */ /** @return Indentity matrix */
mat2 sweet_matrix_identity2 (); mat2 sweet_matrix_identity2 (void);
mat3 sweet_matrix_identity3 (); mat3 sweet_matrix_identity3 (void);
mat4 sweet_matrix_identity4 (); mat4 sweet_matrix_identity4 (void);
/** Frustum */ /** Frustum */
/** @param Right as flaot */ /** @param Right as flaot */
@ -100,7 +100,7 @@ mat2 sweet_matrix_scale2 (float x, float y);
/** Texture bias */ /** Texture bias */
/** @return texture bias matrix */ /** @return texture bias matrix */
mat4 sweet_matrix_texture_bias (); mat4 sweet_matrix_texture_bias (void);
/** Transpose */ /** Transpose */
/** @param Matrix to transpose as mat2 *, mat3 * or mat4 * */ /** @param Matrix to transpose as mat2 *, mat3 * or mat4 * */

View File

@ -20,30 +20,30 @@
#include "sweet_matrix_stack.h" #include "sweet_matrix_stack.h"
matrix_stack2 matrix_stack2
sweet_matrix_stack2_new () sweet_matrix_stack2_new (void)
{ {
matrix_stack2 m; matrix_stack2 m;
m.position = 0; m.position = 0;
m.matrix[0] = sweet_matrix_identity2 (); m.matrix[0] = sweet_matrix_identity2 ();
return m; return m;
} }
matrix_stack3 matrix_stack3
sweet_matrix_stack3_new () sweet_matrix_stack3_new (void)
{ {
matrix_stack3 m; matrix_stack3 m;
m.position = 0; m.position = 0;
m.matrix[0] = sweet_matrix_identity3 (); m.matrix[0] = sweet_matrix_identity3 ();
return m; return m;
} }
matrix_stack4 matrix_stack4
sweet_matrix_stack4_new () sweet_matrix_stack4_new (void)
{ {
matrix_stack4 m; matrix_stack4 m;
m.position = 0; m.position = 0;
m.matrix[0] = sweet_matrix_identity4 (); m.matrix[0] = sweet_matrix_identity4 ();
return m; return m;
} }
int int
@ -178,7 +178,7 @@ sweet_matrix_stack4_get_matrix_pointer (matrix_stack4 * ms)
{ {
return (ms->matrix + ms->position); return (ms->matrix + ms->position);
} }
mat2 mat2
sweet_matrix_stack2_get_matrix (matrix_stack2 * ms) sweet_matrix_stack2_get_matrix (matrix_stack2 * ms)
{ {

View File

@ -46,11 +46,11 @@ typedef struct matrix_stack4
}matrix_stack4; }matrix_stack4;
matrix_stack2 sweet_matrix_stack2_new (); matrix_stack2 sweet_matrix_stack2_new (void);
matrix_stack3 sweet_matrix_stack3_new (); matrix_stack3 sweet_matrix_stack3_new (void);
matrix_stack4 sweet_matrix_stack4_new (); matrix_stack4 sweet_matrix_stack4_new (void);
int sweet_matrix_stack2_push (matrix_stack2 * ms); int sweet_matrix_stack2_push (matrix_stack2 * ms);
@ -81,7 +81,7 @@ mat2 * sweet_matrix_stack2_get_matrix_pointer (matrix_stack2 * m);
mat3 * sweet_matrix_stack3_get_matrix_pointer (matrix_stack3 * m); mat3 * sweet_matrix_stack3_get_matrix_pointer (matrix_stack3 * m);
mat4 * sweet_matrix_stack4_get_matrix_pointer (matrix_stack4 * m); mat4 * sweet_matrix_stack4_get_matrix_pointer (matrix_stack4 * m);
mat2 sweet_matrix_stack2_get_matrix (matrix_stack2 * m); mat2 sweet_matrix_stack2_get_matrix (matrix_stack2 * m);
mat3 sweet_matrix_stack3_get_matrix (matrix_stack3 * m); mat3 sweet_matrix_stack3_get_matrix (matrix_stack3 * m);