summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--procgen.c4
-rw-r--r--vis.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/procgen.c b/procgen.c
index d015ecb..d58334c 100644
--- a/procgen.c
+++ b/procgen.c
@@ -131,8 +131,8 @@ fs(Shaderparams *sp)
}
Shadertab shaders = {
- .vshader = vs,
- .fshader = fs
+ .vs = vs,
+ .fs = fs
};
void
diff --git a/vis.c b/vis.c
index 7533eb4..08a6337 100644
--- a/vis.c
+++ b/vis.c
@@ -236,9 +236,9 @@ lmb(void)
Δorient = mulq(orient, invq(Δorient));
for(e = scene->ents.next; e != &scene->ents; e = e->next){
- e->bx = vcs2world(maincam, Vecquat(mulq(mulq(Δorient, Quatvec(0, world2vcs(maincam, e->bx))), invq(Δorient))));
- e->by = vcs2world(maincam, Vecquat(mulq(mulq(Δorient, Quatvec(0, world2vcs(maincam, e->by))), invq(Δorient))));
- e->bz = vcs2world(maincam, Vecquat(mulq(mulq(Δorient, Quatvec(0, world2vcs(maincam, e->bz))), invq(Δorient))));
+ e->bx = vcs2world(maincam, qsandwichpt3(Δorient, world2vcs(maincam, e->bx)));
+ e->by = vcs2world(maincam, qsandwichpt3(Δorient, world2vcs(maincam, e->by)));
+ e->bz = vcs2world(maincam, qsandwichpt3(Δorient, world2vcs(maincam, e->bz)));
}
}else{ /* DBG only */
Framebuf *fb;