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

Clear view mode for transition view.

Browse Source
This commit is contained in:
brunoherbelin
2020-07-20 01:08:11 +02:00
parent 91dd7e5cc8
commit e3f75aa0ef
5 changed files with 39 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Settings.cpp
View File

@@ -81,7 +81,8 @@ void Settings::Save()
// Transition // Transition
XMLElement *TransitionNode = xmlDoc.NewElement( "Transition" ); XMLElement *TransitionNode = xmlDoc.NewElement( "Transition" );
TransitionNode->SetAttribute("auto_end", application.transition.auto_open); TransitionNode->SetAttribute("auto_open", application.transition.auto_open);
TransitionNode->SetAttribute("hide_windows", application.transition.hide_windows);
TransitionNode->SetAttribute("cross_fade", application.transition.cross_fade); TransitionNode->SetAttribute("cross_fade", application.transition.cross_fade);
TransitionNode->SetAttribute("duration", application.transition.duration); TransitionNode->SetAttribute("duration", application.transition.duration);
TransitionNode->SetAttribute("profile", application.transition.profile); TransitionNode->SetAttribute("profile", application.transition.profile);
@@ -221,7 +222,8 @@ void Settings::Load()
// Transition // Transition
XMLElement * transitionnode = pRoot->FirstChildElement("Transition"); XMLElement * transitionnode = pRoot->FirstChildElement("Transition");
if (transitionnode != nullptr) { if (transitionnode != nullptr) {
transitionnode->QueryBoolAttribute("auto_end", &application.transition.auto_open); transitionnode->QueryBoolAttribute("hide_windows", &application.transition.hide_windows);
transitionnode->QueryBoolAttribute("auto_open", &application.transition.auto_open);
transitionnode->QueryBoolAttribute("cross_fade", &application.transition.cross_fade); transitionnode->QueryBoolAttribute("cross_fade", &application.transition.cross_fade);
transitionnode->QueryFloatAttribute("duration", &application.transition.duration); transitionnode->QueryFloatAttribute("duration", &application.transition.duration);
transitionnode->QueryIntAttribute("profile", &application.transition.profile); transitionnode->QueryIntAttribute("profile", &application.transition.profile);

2
Settings.h
View File

@@ -89,12 +89,14 @@ struct TransitionConfig
{ {
bool cross_fade; bool cross_fade;
bool auto_open; bool auto_open;
bool hide_windows;
float duration; float duration;
int profile; int profile;
TransitionConfig() { TransitionConfig() {
cross_fade = true; cross_fade = true;
auto_open = true; auto_open = true;
hide_windows = true;
duration = 1.f; duration = 1.f;
profile = 0; profile = 0;
} }

2
UpdateCallback.cpp
View File

@@ -79,7 +79,7 @@ void InfiniteGlowCallback::update(Node *n, float dt)
initialized_ = true; initialized_ = true;
} }
time_ += dt / 1000.f; time_ += dt / 600.f;
n->scale_.x = initial_scale_.x + amplitude_ * sin(M_PI * time_); n->scale_.x = initial_scale_.x + amplitude_ * sin(M_PI * time_);
n->scale_.y = initial_scale_.y + amplitude_ * sin(M_PI * time_); n->scale_.y = initial_scale_.y + amplitude_ * sin(M_PI * time_);

53
UserInterfaceManager.cpp
View File

@@ -583,29 +583,35 @@ void UserInterface::Render()
// warning modal dialog // warning modal dialog
Log::Render(); Log::Render();
// windows // clear view mode in Transition view
if (Settings::application.widget.toolbox) if ( !Settings::application.transition.hide_windows || Settings::application.current_view != 4) {
toolbox.Render();
if (Settings::application.widget.preview) // windows
RenderPreview(); if (Settings::application.widget.toolbox)
if (Settings::application.widget.media_player) toolbox.Render();
mediacontrol.Render(); if (Settings::application.widget.preview)
if (Settings::application.widget.shader_editor) RenderPreview();
RenderShaderEditor(); if (Settings::application.widget.media_player)
mediacontrol.Render();
if (Settings::application.widget.shader_editor)
RenderShaderEditor();
if (Settings::application.widget.logs)
Log::ShowLogWindow(&Settings::application.widget.logs);
// about dialogs
if (show_about)
ShowAbout(&show_about);
if (show_imgui_about)
ImGui::ShowAboutWindow(&show_imgui_about);
if (show_gst_about)
ShowAboutGStreamer(&show_gst_about);
if (show_opengl_about)
ShowAboutOpengl(&show_opengl_about);
}
// stats in the corner
if (Settings::application.widget.stats) if (Settings::application.widget.stats)
ImGuiToolkit::ShowStats(&Settings::application.widget.stats, &Settings::application.widget.stats_corner); ImGuiToolkit::ShowStats(&Settings::application.widget.stats, &Settings::application.widget.stats_corner);
if (Settings::application.widget.logs)
Log::ShowLogWindow(&Settings::application.widget.logs);
// about
if (show_about)
ShowAbout(&show_about);
if (show_imgui_about)
ImGui::ShowAboutWindow(&show_imgui_about);
if (show_gst_about)
ShowAboutGStreamer(&show_gst_about);
if (show_opengl_about)
ShowAboutOpengl(&show_opengl_about);
// all IMGUI Rendering // all IMGUI Rendering
ImGui::Render(); ImGui::Render();
@@ -1685,7 +1691,8 @@ void Navigator::RenderTransitionPannel()
ImGui::SetCursorPosY(width_); ImGui::SetCursorPosY(width_);
ImGui::Text("Behavior"); ImGui::Text("Behavior");
ImGuiToolkit::ButtonSwitch( ICON_FA_RANDOM " Cross fading", &Settings::application.transition.cross_fade); ImGuiToolkit::ButtonSwitch( ICON_FA_RANDOM " Cross fading", &Settings::application.transition.cross_fade);
ImGuiToolkit::ButtonSwitch( ICON_FA_SIGN_IN_ALT " Automatic open", &Settings::application.transition.auto_open); ImGuiToolkit::ButtonSwitch( ICON_FA_CROSSHAIRS " Open on target", &Settings::application.transition.auto_open);
ImGuiToolkit::ButtonSwitch( ICON_FA_CLOUD_SUN " Clear view", &Settings::application.transition.hide_windows);
// Transition options // Transition options
ImGui::Text(" "); ImGui::Text(" ");
@@ -1700,7 +1707,7 @@ void Navigator::RenderTransitionPannel()
ImGui::Combo("Curve", &Settings::application.transition.profile, "Linear\0Quadratic\0"); ImGui::Combo("Curve", &Settings::application.transition.profile, "Linear\0Quadratic\0");
ImGui::Text(" "); ImGui::Text(" ");
if ( ImGui::Button( ICON_FA_PLAY " Play ", ImVec2(IMGUI_RIGHT_ALIGN, 0)) ){ if ( ImGui::Button( ICON_FA_SIGN_IN_ALT " Play ", ImVec2(IMGUI_RIGHT_ALIGN, 0)) ){
TransitionView *tv = static_cast<TransitionView *>(Mixer::manager().view(View::TRANSITION)); TransitionView *tv = static_cast<TransitionView *>(Mixer::manager().view(View::TRANSITION));
if (tv) tv->play(true); if (tv) tv->play(true);
} }

4
View.cpp
View File

@@ -970,7 +970,7 @@ void TransitionView::draw()
scene.accept(dv2); scene.accept(dv2);
// display interface duration // display interface duration
glm::vec2 P = Rendering::manager().project(glm::vec3(-0.03f, -0.14f, 0.f), scene.root()->transform_, false); glm::vec2 P = Rendering::manager().project(glm::vec3(-0.11f, -0.14f, 0.f), scene.root()->transform_, false);
ImGui::SetNextWindowPos(ImVec2(P.x, P.y), ImGuiCond_Always); ImGui::SetNextWindowPos(ImVec2(P.x, P.y), ImGuiCond_Always);
if (ImGui::Begin("##Transition", NULL, ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoBackground if (ImGui::Begin("##Transition", NULL, ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoBackground
| ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoSavedSettings
@@ -981,7 +981,7 @@ void TransitionView::draw()
ImGui::DragFloat("##nolabel", &Settings::application.transition.duration, ImGui::DragFloat("##nolabel", &Settings::application.transition.duration,
0.1f, TRANSITION_MIN_DURATION, TRANSITION_MAX_DURATION, "%.1f s"); 0.1f, TRANSITION_MIN_DURATION, TRANSITION_MAX_DURATION, "%.1f s");
ImGui::SameLine(); ImGui::SameLine();
if ( ImGui::Button(ICON_FA_PLAY) ) if ( ImGui::Button(ICON_FA_STEP_FORWARD) )
play(false); play(false);
ImGui::PopFont(); ImGui::PopFont();
ImGui::End(); ImGui::End();