From 19040bc5e93cc8d19db775036748b9e153c8c8d0 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Thu, 6 Jul 2023 17:37:31 -0400 Subject: [PATCH] Slight improvements to the Vec3Edit widget --- mdlviewer/CMakeLists.txt | 5 ++++- mdlviewer/include/vec3edit.h | 2 ++ mdlviewer/src/vec3edit.cpp | 19 +++++++------------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/mdlviewer/CMakeLists.txt b/mdlviewer/CMakeLists.txt index 50eb27f..13e2253 100644 --- a/mdlviewer/CMakeLists.txt +++ b/mdlviewer/CMakeLists.txt @@ -7,7 +7,10 @@ add_executable(mdlviewer include/vec3edit.h src/gearview.cpp src/singlegearview.cpp - src/fullmodelviewer.cpp) + src/fullmodelviewer.cpp + src/quaternionedit.cpp + src/boneeditor.cpp + src/cmpeditor.cpp) target_include_directories(mdlviewer PUBLIC include) diff --git a/mdlviewer/include/vec3edit.h b/mdlviewer/include/vec3edit.h index 4bf3cc1..2d086a6 100644 --- a/mdlviewer/include/vec3edit.h +++ b/mdlviewer/include/vec3edit.h @@ -10,6 +10,8 @@ public: explicit Vector3Edit(glm::vec3& vec, QWidget* parent = nullptr); ~Vector3Edit(); + void setVector(glm::vec3& vec); + signals: void onValueChanged(); diff --git a/mdlviewer/src/vec3edit.cpp b/mdlviewer/src/vec3edit.cpp index 05fa378..89bebb0 100644 --- a/mdlviewer/src/vec3edit.cpp +++ b/mdlviewer/src/vec3edit.cpp @@ -39,20 +39,15 @@ Vector3Edit::Vector3Edit(glm::vec3& vec, QWidget* parent) : QWidget(parent), vec vec.z = d; emit onValueChanged(); }); - - // TODO: find a better way to do this - updateTimer = new QTimer(); - connect(updateTimer, &QTimer::timeout, [this, &vec]() { - if (vec.x != spinBoxes.x->value() || vec.y != spinBoxes.y->value() || vec.z != spinBoxes.z->value()) { - spinBoxes.x->setValue(vec.x); - spinBoxes.y->setValue(vec.y); - spinBoxes.z->setValue(vec.z); - } - }); - - updateTimer->start(1); } Vector3Edit::~Vector3Edit() { updateTimer->stop(); } + +void Vector3Edit::setVector(glm::vec3 &vec) { + this->vec = vec; + spinBoxes.x->setValue(vec.x); + spinBoxes.y->setValue(vec.y); + spinBoxes.z->setValue(vec.z); +}