summaryrefslogtreecommitdiff
path: root/src/math.c
diff options
context:
space:
mode:
authorepoch <epoch@thebackupbox.net>2020-10-10 00:00:55 -0500
committerepoch <epoch@thebackupbox.net>2020-10-10 00:00:55 -0500
commitfe9ad894000ff986cd642d23ac4762e97d5b1ccc (patch)
tree1e253ac02dc7d3339b60ca68d9bfca24cbd3ef7e /src/math.c
parent19feecae5124e5eb4c8a2f2dfd300e94e59b9d9f (diff)
parent4982876f0d021e4637f6db500063169477fe7289 (diff)
downloadhackvr-fe9ad894000ff986cd642d23ac4762e97d5b1ccc.tar.gz
hackvr-fe9ad894000ff986cd642d23ac4762e97d5b1ccc.zip
Merge branch 'master' of ssh://batou.thebackupbox.net:65432/hackvr
Diffstat (limited to 'src/math.c')
-rw-r--r--src/math.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/src/math.c b/src/math.c
index 2221957..0f48dd3 100644
--- a/src/math.c
+++ b/src/math.c
@@ -157,8 +157,7 @@ c3_t c3_multiply(c3_t p,c3_t s) {
// arm pieces will rotate around origin...
// I dunno....
c3_t point_apply_group_relative(c3_t p,c3_group_rel_t *gr) {
- if(!gr) return p;//fuck it. nothing to do..
-
+ if(!gr) { return p; }
return c3_add(point_apply_group_relative(gr->p,get_group_relative(gr->parent)),
rotate_c3_xr(
rotate_c3_yr(
@@ -202,20 +201,6 @@ c3_s_t apply_group_relative(c3_s_t s,c3_group_rel_t *group_rel) {
} else {
if(gr) {
s2.p[i]=point_apply_group_relative(s.p[i],gr);
-
-/*
- s.p[i].x *= gr->s.x;
- s.p[i].y *= gr->s.y;
- s.p[i].z *= gr->s.z;//scaling applied? sure....
- //s2.p[i]=c3_add(gr->p,rotate_c3_yr(s.p[i],gr->p,d2r(gr->r.y)));
- s2.p[i]=c3_add(gr->p,rotate_c3_xr(
- rotate_c3_yr(
- rotate_c3_zr(s.p[i],(c3_t){0,0,0},d2r(gr->r.z)
- ),(c3_t){0,0,0},d2r(gr->r.y)
- ),(c3_t){0,0,0},d2r(gr->r.x)
- )
- );
-*/
} else {
s2.p[i]=s.p[i];
}