From 297d271e6328318612418e11d9ebda42385f9996 Mon Sep 17 00:00:00 2001 From: Bruno Herbelin Date: Tue, 15 Feb 2022 23:44:54 +0100 Subject: [PATCH] Change direction Loom more logical to set positive delta to increase visibility --- SourceCallback.cpp | 2 +- UserInterfaceManager.cpp | 2 +- rsc/osc/vimix.mk1.touchosc | Bin 2395 -> 2401 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SourceCallback.cpp b/SourceCallback.cpp index 4b6d806..e0f0e42 100644 --- a/SourceCallback.cpp +++ b/SourceCallback.cpp @@ -280,7 +280,7 @@ void Loom::update(Source *s, float dt) progress_ += dt; // move target by speed vector (in the direction of step_, amplitude of speed * time (in second)) - pos_ += step_ * ( speed_ * dt * 0.001f); + pos_ -= step_ * ( speed_ * dt * 0.001f ); // apply alpha if valid in range [0 1] float alpha = SourceCore::alphaFromCordinates(pos_.x, pos_.y); diff --git a/UserInterfaceManager.cpp b/UserInterfaceManager.cpp index 8ba72e3..3f5d69e 100644 --- a/UserInterfaceManager.cpp +++ b/UserInterfaceManager.cpp @@ -4400,7 +4400,7 @@ void InputMappingInterface::SliderParametersCallback(SourceCallback *callback) if (ImGui::SliderFloat("##CALLBACK_LOOM", &val, -1.f, 1.f, "%.2f", 2.f)) edited->setValue(val); ImGui::SameLine(0, 6); - ImGuiToolkit::Indication("Change alpha to make source more visible (<0) or more transparent (>0)", 19, 12); + ImGuiToolkit::Indication("Change alpha to make source more visible (>0) or more transparent (<0)", 19, 12); } break; case SourceCallback::CALLBACK_GRAB: diff --git a/rsc/osc/vimix.mk1.touchosc b/rsc/osc/vimix.mk1.touchosc index b5ad3a22266c9ca9db99ca057a3e08b0a09789c1..05d37bf4e395827e859efe8bfd564dccda73818c 100644 GIT binary patch delta 2355 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