projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From http://www.jwz.org/xscreensaver/xscreensaver-5.18.tar.gz
[xscreensaver]
/
hacks
/
glx
/
trackball.c
diff --git
a/hacks/glx/trackball.c
b/hacks/glx/trackball.c
index a0efbea84fd269315a8530bf10dcca6001b58773..429ade91ebd80ad6ccb70ebc9f0540fd8ba74bb6 100644
(file)
--- a/
hacks/glx/trackball.c
+++ b/
hacks/glx/trackball.c
@@
-49,8
+49,13
@@
* Much mucking with by:
* Gavin Bell
*/
* Much mucking with by:
* Gavin Bell
*/
-#include "config.h"
+
#include <math.h>
#include <math.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include "trackball.h"
/*
#include "trackball.h"
/*
@@
-67,8
+72,9
@@
*/
static float tb_project_to_sphere(float, float, float);
static void normalize_quat(float [4]);
*/
static float tb_project_to_sphere(float, float, float);
static void normalize_quat(float [4]);
+static void axis_to_quat(float a[3], float phi, float q[4]);
-void
+
static
void
vzero(float *v)
{
v[0] = 0.0;
vzero(float *v)
{
v[0] = 0.0;
@@
-76,7
+82,7
@@
vzero(float *v)
v[2] = 0.0;
}
v[2] = 0.0;
}
-void
+
static
void
vset(float *v, float x, float y, float z)
{
v[0] = x;
vset(float *v, float x, float y, float z)
{
v[0] = x;
@@
-84,7
+90,7
@@
vset(float *v, float x, float y, float z)
v[2] = z;
}
v[2] = z;
}
-void
+
static
void
vsub(const float *src1, const float *src2, float *dst)
{
dst[0] = src1[0] - src2[0];
vsub(const float *src1, const float *src2, float *dst)
{
dst[0] = src1[0] - src2[0];
@@
-92,7
+98,7
@@
vsub(const float *src1, const float *src2, float *dst)
dst[2] = src1[2] - src2[2];
}
dst[2] = src1[2] - src2[2];
}
-void
+
static
void
vcopy(const float *v1, float *v2)
{
register int i;
vcopy(const float *v1, float *v2)
{
register int i;
@@
-100,7
+106,7
@@
vcopy(const float *v1, float *v2)
v2[i] = v1[i];
}
v2[i] = v1[i];
}
-void
+
static
void
vcross(const float *v1, const float *v2, float *cross)
{
float temp[3];
vcross(const float *v1, const float *v2, float *cross)
{
float temp[3];
@@
-111,13
+117,13
@@
vcross(const float *v1, const float *v2, float *cross)
vcopy(temp, cross);
}
vcopy(temp, cross);
}
-float
+
static
float
vlength(const float *v)
{
return sqrt(v[0] * v[0] + v[1] * v[1] + v[2] * v[2]);
}
vlength(const float *v)
{
return sqrt(v[0] * v[0] + v[1] * v[1] + v[2] * v[2]);
}
-void
+
static
void
vscale(float *v, float div)
{
v[0] *= div;
vscale(float *v, float div)
{
v[0] *= div;
@@
-125,19
+131,19
@@
vscale(float *v, float div)
v[2] *= div;
}
v[2] *= div;
}
-void
+
static
void
vnormal(float *v)
{
vscale(v,1.0/vlength(v));
}
vnormal(float *v)
{
vscale(v,1.0/vlength(v));
}
-float
+
static
float
vdot(const float *v1, const float *v2)
{
return v1[0]*v2[0] + v1[1]*v2[1] + v1[2]*v2[2];
}
vdot(const float *v1, const float *v2)
{
return v1[0]*v2[0] + v1[1]*v2[1] + v1[2]*v2[2];
}
-void
+
static
void
vadd(const float *src1, const float *src2, float *dst)
{
dst[0] = src1[0] + src2[0];
vadd(const float *src1, const float *src2, float *dst)
{
dst[0] = src1[0] + src2[0];