moved static variables and functions that should not have stuck behind in fg_joystick...

[freeglut] / progs / demos / shapes / glmatrix.c

diff --git a/progs/demos/shapes/glmatrix.c b/progs/demos/shapes/glmatrix.c
index 3d1b77e..485e324 100644 (file)
--- a/progs/demos/shapes/glmatrix.c
+++ b/progs/demos/shapes/glmatrix.c
@@ -3,6 +3,10 @@
 #include <math.h>\r
 #include "glmatrix.h"\r
 \r
+#ifndef M_PI\r
+#define M_PI   3.141592653589793\r
+#endif\r
+\r
 #define MMODE_IDX(x)   ((x) - GL_MODELVIEW)\r
 #define MAT_STACK_SIZE 32\r
 #define MAT_IDENT      {1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1}\r
@@ -114,17 +118,17 @@ void gl_scalef(float x, float y, float z)
     gl_mult_matrixf(mat);\r
 }\r
 \r
-void gl_ortho(float left, float right, float bottom, float top, float near, float far)\r
+void gl_ortho(float left, float right, float bottom, float top, float znear, float zfar)\r
 {\r
     float mat[] = MAT_IDENT;\r
 \r
     float dx = right - left;\r
     float dy = top - bottom;\r
-    float dz = far - near;\r
+    float dz = zfar - znear;\r
 \r
     float tx = -(right + left) / dx;\r
     float ty = -(top + bottom) / dy;\r
-    float tz = -(far + near) / dz;\r
+    float tz = -(zfar + znear) / dz;\r
 \r
     float sx = 2.f / dx;\r
     float sy = 2.f / dy;\r
@@ -140,37 +144,39 @@ void gl_ortho(float left, float right, float bottom, float top, float near, floa
     gl_mult_matrixf(mat);\r
 }\r
 \r
-void gl_frustum(float left, float right, float bottom, float top, float near, float far)\r
+void gl_frustum(float left, float right, float bottom, float top, float znear, float zfar)\r
 {\r
     float mat[] = MAT_IDENT;\r
 \r
     float dx = right - left;\r
     float dy = top - bottom;\r
-    float dz = far - near;\r
+    float dz = zfar - znear;\r
 \r
     float a = (right + left) / dx;\r
     float b = (top + bottom) / dy;\r
-    float c = -(far + near) / dz;\r
-    float d = -2.f * far * near / dz;\r
+    float c = -(zfar + znear) / dz;\r
+    float d = -2.f * zfar * znear / dz;\r
 \r
-    mat[0] = 2.f * near / dx;\r
-    mat[5] = 2.f * near / dy;\r
+    mat[0] = 2.f * znear / dx;\r
+    mat[5] = 2.f * znear / dy;\r
     mat[8] = a;\r
     mat[9] = b;\r
     mat[10] = c;\r
     mat[11] = -1.f;\r
     mat[14] = d;\r
+    mat[15] = 0;\r
 \r
     gl_mult_matrixf(mat);\r
 }\r
 \r
-void glu_perspective(float vfov, float aspect, float near, float far)\r
+void glu_perspective(float vfov, float aspect, float znear, float zfar)\r
 {\r
     float vfov_rad = (float)M_PI * vfov / 180.f;\r
-    float x = near * (float)tan(vfov_rad / 2.f);\r
-    gl_frustum(-aspect * x, aspect * x, -x, x, near, far);\r
+    float x = znear * (float)tan(vfov_rad / 2.f);\r
+    gl_frustum(-aspect * x, aspect * x, -x, x, znear, zfar);\r
 }\r
 \r
+/* return the matrix (16 elements, 4x4 matrix, row-major order */\r
 float* get_matrix(int mm)\r
 {\r
     int idx = MMODE_IDX(mm);\r
@@ -182,6 +188,10 @@ float* get_matrix(int mm)
 #define M3(i, j)       ((i * 3) + j)\r
 static float inv_transpose_result[9];\r
 \r
+/* return the inverse transpose of the left-upper 3x3 of a matrix\r
+   The returned pointer is only valid until the next time this function is\r
+   called, so make a deep copy when you want to keep it around.\r
+ */\r
 float* get_inv_transpose_3x3(int mm)\r
 {\r
     int idx = MMODE_IDX(mm);\r
@@ -207,48 +217,3 @@ float* get_inv_transpose_3x3(int mm)
 \r
     return inv_transpose_result;\r
 }\r
-\r
-\r
-#if 0\r
-void gl_apply_xform(unsigned int prog)\r
-{\r
-    int loc, mvidx, pidx, tidx, mvtop, ptop, ttop;\r
-\r
-    mvidx = MMODE_IDX(GL_MODELVIEW);\r
-    pidx = MMODE_IDX(GL_PROJECTION);\r
-    tidx = MMODE_IDX(GL_TEXTURE);\r
-\r
-    mvtop = stack_top[mvidx];\r
-    ptop = stack_top[pidx];\r
-    ttop = stack_top[tidx];\r
-\r
-    assert(prog);\r
-\r
-    if((loc = glGetUniformLocation(prog, "matrix_modelview")) != -1) {\r
-        glUniformMatrix4fv(loc, 1, 0, mat_stack[mvidx][mvtop]);\r
-    }\r
-\r
-    if((loc = glGetUniformLocation(prog, "matrix_projection")) != -1) {\r
-        glUniformMatrix4fv(loc, 1, 0, mat_stack[pidx][ptop]);\r
-    }\r
-\r
-    if((loc = glGetUniformLocation(prog, "matrix_texture")) != -1) {\r
-        glUniformMatrix4fv(loc, 1, 0, mat_stack[tidx][ttop]);\r
-    }\r
-\r
-    if((loc = glGetUniformLocation(prog, "matrix_normal")) != -1) {\r
-        float nmat[9];\r
-\r
-        nmat[0] = mat_stack[mvidx][mvtop][0];\r
-        nmat[1] = mat_stack[mvidx][mvtop][1];\r
-        nmat[2] = mat_stack[mvidx][mvtop][2];\r
-        nmat[3] = mat_stack[mvidx][mvtop][4];\r
-        nmat[4] = mat_stack[mvidx][mvtop][5];\r
-        nmat[5] = mat_stack[mvidx][mvtop][6];\r
-        nmat[6] = mat_stack[mvidx][mvtop][8];\r
-        nmat[7] = mat_stack[mvidx][mvtop][9];\r
-        nmat[8] = mat_stack[mvidx][mvtop][10];\r
-        glUniformMatrix3fv(loc, 1, 0, nmat);\r
-    }\r
-}\r
-#endif\r