From daf084e6ae0611bfc2ba12b0e5d0c0eca48fb366 Mon Sep 17 00:00:00 2001
From: Sebastian Pape <Sebastian.Pape@rwth-aachen.de>
Date: Mon, 23 Jul 2018 11:10:44 +0200
Subject: [PATCH] Made up/down button pairs not holdable
---
demos/optical_bench/src/menu_helper.hpp | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/demos/optical_bench/src/menu_helper.hpp b/demos/optical_bench/src/menu_helper.hpp
index 78cfed30..77f97341 100644
--- a/demos/optical_bench/src/menu_helper.hpp
+++ b/demos/optical_bench/src/menu_helper.hpp
@@ -41,15 +41,14 @@ class MenuHelper {
float increments, float min, float max,
phx::Entity* parent,
std::function<void(float)> change) {
-
- auto text_entity = scene->CreateEntity();
- text_entity->AddComponent<phx::Transform>()
- ->Translate(glm::vec3(-0.001f, offset_y, -0.085f + offset_x))
- .SetLocalRotationEuler(glm::vec3(180, -90, 0))
- .SetParent(parent->GetFirstComponent<phx::Transform>());
- text = text_entity->AddComponent<phx::Text>("", 0.006f);
- text->SetGradient(glm::vec4(0), glm::vec4(0));
- text->SetAnchor(phx::Text::RIGHT);
+ auto text_entity = scene->CreateEntity();
+ text_entity->AddComponent<phx::Transform>()
+ ->Translate(glm::vec3(-0.001f, offset_y, -0.085f + offset_x))
+ .SetLocalRotationEuler(glm::vec3(180, -90, 0))
+ .SetParent(parent->GetFirstComponent<phx::Transform>());
+ text = text_entity->AddComponent<phx::Text>("", 0.006f);
+ text->SetGradient(glm::vec4(0), glm::vec4(0));
+ text->SetAnchor(phx::Text::RIGHT);
slider = new MenuSlider(scene, engine, increments);
slider->SetValueChanged(change);
@@ -82,6 +81,9 @@ class MenuHelper {
down->GetTransform()->SetParent(parent->GetFirstComponent<phx::Transform>(),
false);
+ up->SetHoldable(false);
+ down->SetHoldable(false);
+
up->GetTransform()->SetLocalRotationEuler(glm::vec3(0, -90, 90));
down->GetTransform()->SetLocalRotationEuler(glm::vec3(0, 90, 90));
up->GetTransform()->SetLocalScale(glm::vec3(0.03f, 0.01f, 0.03f));
--
GitLab