summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Kummerlaender2022-01-28 21:14:01 +0100
committerAdrian Kummerlaender2022-01-28 21:14:01 +0100
commit2b8c63cd18cb132335f0f45bb55efe1a9659bc26 (patch)
tree11bc7128136973bcc81357275bbd49eca8444428
parent186bfae321f9d34b702a7c31b420eed4d10e7a50 (diff)
downloadLiterateLB-master.tar
LiterateLB-master.tar.gz
LiterateLB-master.tar.bz2
LiterateLB-master.tar.lz
LiterateLB-master.tar.xz
LiterateLB-master.tar.zst
LiterateLB-master.zip
Fix initialization of rotation quaternionHEADmaster
-rw-r--r--CMakeLists.txt1
-rw-r--r--lbm.org1
-rw-r--r--tangle/util/camera.h1
3 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4c3bcbc..4ad4de3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,7 +32,6 @@ link_libraries(
sfml-window
sfml-system
ImGui-SFML::ImGui-SFML
- glm
assets)
file(GLOB EXAMPLES ${CMAKE_CURRENT_SOURCE_DIR}/tangle/*.cu)
diff --git a/lbm.org b/lbm.org
index b21ca1d..9fa15e9 100644
--- a/lbm.org
+++ b/lbm.org
@@ -4544,6 +4544,7 @@ Camera(float3 target, float distance):
_distance(distance),
_target(target.x, target.y, target.z),
_rotating(false),
+ _rotation(1,0,0,0),
_moving(false),
_restricted_x(false),
_restricted_y(false) {
diff --git a/tangle/util/camera.h b/tangle/util/camera.h
index b54ad86..1118fd6 100644
--- a/tangle/util/camera.h
+++ b/tangle/util/camera.h
@@ -38,6 +38,7 @@ Camera(float3 target, float distance):
_distance(distance),
_target(target.x, target.y, target.z),
_rotating(false),
+ _rotation(1,0,0,0),
_moving(false),
_restricted_x(false),
_restricted_y(false) {