aboutsummaryrefslogtreecommitdiff
path: root/redist
diff options
context:
space:
mode:
authorJoshua Allen <axlecrusher@gmail.com>2017-03-08 20:10:22 -0500
committerJoshua Allen <axlecrusher@gmail.com>2017-03-08 20:10:22 -0500
commit4384e9850016e2117fda6e50499afec797993002 (patch)
tree6eae1ca4c09e839c8acbabe3f4be7f5ef204c295 /redist
parentb13b5f9af2c2803f919d8897cd3ed5d24831cad3 (diff)
parent5eeecb19eb884baf4781280a9c8e1c394fe9c669 (diff)
downloadlibsurvive-4384e9850016e2117fda6e50499afec797993002.tar.gz
libsurvive-4384e9850016e2117fda6e50499afec797993002.tar.bz2
Merge branch 'master' of github.com:cnlohr/libsurvive
Diffstat (limited to 'redist')
-rw-r--r--redist/linmath.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/redist/linmath.c b/redist/linmath.c
index 157141f..1c5c25b 100644
--- a/redist/linmath.c
+++ b/redist/linmath.c
@@ -93,11 +93,6 @@ void quatsetnone(FLT * q)
q[0] = 1; q[1] = 0; q[2] = 0; q[3] = 0;
}
-void quatsetidentity(FLT * q)
-{
- q[0] = 1; q[1] = 0; q[2] = 0; q[3] = 1;
-}
-
void quatcopy(FLT * qout, const FLT * qin)
{
qout[0] = qin[0];
@@ -447,7 +442,7 @@ void quatfrom2vectors(FLT *q, const FLT *src, const FLT *dest)
// If dot == 1, vectors are the same
if (d >= 1.0f)
{
- quatsetidentity(q);
+ quatsetnone(q);
return;
}
if (d < (1e-6f - 1.0f))