diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-11-26 13:51:33 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-11-26 14:14:13 +0000 |
| commit | 7fba471728f2216d7e3b7900297fc3b3531e286c (patch) | |
| tree | 5caef3b2efc23aefccb215ec9005cd8e7d2e91b8 /lib/location.cpp | |
| parent | Fix todo for handling a terrain walk from outside the mesh (diff) | |
| parent | Model positions as integers (diff) | |
| download | ilt-7fba471728f2216d7e3b7900297fc3b3531e286c.tar.bz2 ilt-7fba471728f2216d7e3b7900297fc3b3531e286c.tar.xz ilt-7fba471728f2216d7e3b7900297fc3b3531e286c.zip | |
Merge branch 'ints' into terrain
Conflicts fix, compiles, some test failures remain.
Trees not added, possibility of OM invalid handle assertion failures,
normals broken due to integer overflow in Newell's method.
Diffstat (limited to 'lib/location.cpp')
| -rw-r--r-- | lib/location.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/location.cpp b/lib/location.cpp index 732dd6d..ff7cfa6 100644 --- a/lib/location.cpp +++ b/lib/location.cpp @@ -3,7 +3,7 @@ #include <glm/gtx/transform.hpp> glm::mat4 -Location::getTransform() const +Location::getRotationTransform() const { - return glm::translate(pos) * rotate_ypr(rot); + return rotate_ypr(rot); } |