eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-21 23:29:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

New OSC animation of alpha, position, size, etc.

Browse Source 
Added animation duration argument to OSC messages alpha, depth, position, size and angle.
This commit is contained in:
Bruno Herbelin
2024-02-18 17:33:23 +01:00
parent 8e28eba959
commit c06fdc7760
2 changed files with 41 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/ControlManager.cpp
View File

@@ -629,9 +629,13 @@ bool Control::receiveSourceAttribute(Source *target, const std::string &attribut
} }
/// e.g. '/vimix/current/alpha f 0.3' /// e.g. '/vimix/current/alpha f 0.3'
else if ( attribute.compare(OSC_SOURCE_ALPHA) == 0) { else if ( attribute.compare(OSC_SOURCE_ALPHA) == 0) {
float x = 1.f; float x = 0.f, t = 0.f;
arguments >> x >> osc::EndMessage; arguments >> x;
target->call( new SetAlpha(x), true ); if (arguments.Eos())
arguments >> osc::EndMessage;
else
arguments >> t >> osc::EndMessage;
target->call( new SetAlpha( x, t), true );
} }
/// e.g. '/vimix/current/alpha f 0.3' /// e.g. '/vimix/current/alpha f 0.3'
else if ( attribute.compare(OSC_SOURCE_LOOM) == 0) { else if ( attribute.compare(OSC_SOURCE_LOOM) == 0) {
@@ -643,15 +647,23 @@ bool Control::receiveSourceAttribute(Source *target, const std::string &attribut
} }
/// e.g. '/vimix/current/transparency f 0.7' /// e.g. '/vimix/current/transparency f 0.7'
else if ( attribute.compare(OSC_SOURCE_TRANSPARENCY) == 0) { else if ( attribute.compare(OSC_SOURCE_TRANSPARENCY) == 0) {
float x = 0.f; float x = 0.f, t = 0.f;
arguments >> x >> osc::EndMessage; arguments >> x;
target->call( new SetAlpha(1.f - x), true ); if (arguments.Eos())
arguments >> osc::EndMessage;
else
arguments >> t >> osc::EndMessage;
target->call( new SetAlpha(1.f - x, t), true );
} }
/// e.g. '/vimix/current/depth f 5.0' /// e.g. '/vimix/current/depth f 5.0'
else if ( attribute.compare(OSC_SOURCE_DEPTH) == 0) { else if ( attribute.compare(OSC_SOURCE_DEPTH) == 0) {
float x = 0.f; float x = 0.f, t = 0.f;
arguments >> x >> osc::EndMessage; arguments >> x;
target->call( new SetDepth(x), true ); if (arguments.Eos())
arguments >> osc::EndMessage;
else
arguments >> t >> osc::EndMessage;
target->call( new SetDepth(x, t), true );
} }
/// e.g. '/vimix/current/grab ff 10.0 2.2' /// e.g. '/vimix/current/grab ff 10.0 2.2'
else if ( attribute.compare(OSC_SOURCE_GRAB) == 0) { else if ( attribute.compare(OSC_SOURCE_GRAB) == 0) {
@@ -687,8 +699,12 @@ bool Control::receiveSourceAttribute(Source *target, const std::string &attribut
} }
catch (osc::WrongArgumentTypeException &) { catch (osc::WrongArgumentTypeException &) {
} }
arguments >> osc::EndMessage; float t = 0.f;
target->call( new SetGeometry( &transform, 0.f), true ); if (arguments.Eos())
arguments >> osc::EndMessage;
else
arguments >> t >> osc::EndMessage;
target->call( new SetGeometry( &transform, t), true );
} }
/// e.g. '/vimix/current/resize ff 10.0 2.2' /// e.g. '/vimix/current/resize ff 10.0 2.2'
else if ( attribute.compare(OSC_SOURCE_RESIZE) == 0) { else if ( attribute.compare(OSC_SOURCE_RESIZE) == 0) {
@@ -724,8 +740,12 @@ bool Control::receiveSourceAttribute(Source *target, const std::string &attribut
} }
catch (osc::WrongArgumentTypeException &) { catch (osc::WrongArgumentTypeException &) {
} }
arguments >> osc::EndMessage; float t = 0.f;
target->call( new SetGeometry( &transform, 0.f), true ); if (arguments.Eos())
arguments >> osc::EndMessage;
else
arguments >> t >> osc::EndMessage;
target->call( new SetGeometry( &transform, t), true );
} }
/// e.g. '/vimix/current/turn f 1.0' /// e.g. '/vimix/current/turn f 1.0'
else if ( attribute.compare(OSC_SOURCE_TURN) == 0) { else if ( attribute.compare(OSC_SOURCE_TURN) == 0) {
@@ -739,12 +759,16 @@ bool Control::receiveSourceAttribute(Source *target, const std::string &attribut
} }
/// e.g. '/vimix/current/angle f 3.1416' /// e.g. '/vimix/current/angle f 3.1416'
else if ( attribute.compare(OSC_SOURCE_ANGLE) == 0) { else if ( attribute.compare(OSC_SOURCE_ANGLE) == 0) {
float a = 0.f; float a = 0.f, t = 0.f;
arguments >> a >> osc::EndMessage; arguments >> a;
if (arguments.Eos())
arguments >> osc::EndMessage;
else
arguments >> t >> osc::EndMessage;
Group transform; Group transform;
transform.copyTransform(target->group(View::GEOMETRY)); transform.copyTransform(target->group(View::GEOMETRY));
transform.rotation_.z = a; transform.rotation_.z = a;
target->call( new SetGeometry( &transform, 0.f), true ); target->call( new SetGeometry( &transform, t), true );
} }
/// e.g. '/vimix/current/reset' /// e.g. '/vimix/current/reset'
else if ( attribute.compare(OSC_SOURCE_RESET) == 0) { else if ( attribute.compare(OSC_SOURCE_RESET) == 0) {

3
src/ImGuiVisitor.cpp
View File

@@ -1077,7 +1077,7 @@ void list_parameters_(ImageFilter &f, std::ostringstream &oss)
ImGuiIO& io = ImGui::GetIO(); ImGuiIO& io = ImGui::GetIO();
std::map<std::string, float> filter_parameters = f.program().parameters(); std::map<std::string, float> filter_parameters = f.program().parameters();
for (auto param = filter_parameters.begin(); param != filter_parameters.end(); ++param) for (auto param = filter_parameters.rbegin(); param != filter_parameters.rend(); ++param)
{ {
ImGui::PushID( param->first.c_str() ); ImGui::PushID( param->first.c_str() );
float v = param->second; float v = param->second;
@@ -1253,7 +1253,6 @@ void ImGuiVisitor::visit (AlphaFilter& f)
oss << " : " << "Tolerance" << " " << std::setprecision(3) << v; oss << " : " << "Tolerance" << " " << std::setprecision(3) << v;
Action::manager().store(oss.str()); Action::manager().store(oss.str());
} }
float t = filter_parameters["Threshold"]; float t = filter_parameters["Threshold"];
ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN); ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN);
if (ImGui::SliderFloat( "##Threshold", &t, 0.f, 1.f, "%.2f")) { if (ImGui::SliderFloat( "##Threshold", &t, 0.f, 1.f, "%.2f")) {