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

Changed colors a bit

Browse Source 
Selection area, group and pain tools matching the highlight color. White
mask tool.
This commit is contained in:
brunoherbelin
2021-02-11 21:14:21 +01:00
parent dca3033c06
commit 0593e46e62
6 changed files with 46 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ImGuiToolkit.cpp
View File

@@ -1032,9 +1032,12 @@ void ImGuiToolkit::WindowDragFloat(const char* window_name, ImVec2 window_pos, f
} }
} }
ImVec4 ImGuiToolkit::HighlightColor() ImVec4 ImGuiToolkit::HighlightColor(bool active)
{ {
return ImGui::GetStyle().Colors[ImGuiCol_HeaderActive]; if (active)
return ImGui::GetStyle().Colors[ImGuiCol_CheckMark];
else
return ImGui::GetStyle().Colors[ImGuiCol_TabUnfocusedActive];
} }
void ImGuiToolkit::SetAccentColor(accent_color color) void ImGuiToolkit::SetAccentColor(accent_color color)

2
ImGuiToolkit.h
View File

@@ -60,7 +60,7 @@ namespace ImGuiToolkit
ACCENT_GREY ACCENT_GREY
} accent_color; } accent_color;
void SetAccentColor (accent_color color); void SetAccentColor (accent_color color);
struct ImVec4 HighlightColor (); struct ImVec4 HighlightColor (bool active = true);
void ShowStats (bool* p_open, int* p_corner, bool* p_timer); void ShowStats (bool* p_open, int* p_corner, bool* p_timer);

9
UserInterfaceManager.cpp
View File

@@ -651,10 +651,11 @@ void UserInterface::handleMouse()
} }
// Selection area // Selection area
else { else {
ImGui::GetBackgroundDrawList()->AddRect(io.MouseClickedPos[ImGuiMouseButton_Left], io.MousePos, // highlight-colored selection rectangle
ImGui::GetColorU32(ImGuiCol_HeaderActive)); ImVec4 color = ImGuiToolkit::HighlightColor();
ImGui::GetBackgroundDrawList()->AddRectFilled(io.MouseClickedPos[ImGuiMouseButton_Left], io.MousePos, ImGui::GetBackgroundDrawList()->AddRect(io.MouseClickedPos[ImGuiMouseButton_Left], io.MousePos, ImGui::GetColorU32(color));
ImGui::GetColorU32(ImGuiCol_Header, 0.3f)); color.w = 0.12; // transparent
ImGui::GetBackgroundDrawList()->AddRectFilled(io.MouseClickedPos[ImGuiMouseButton_Left], io.MousePos, ImGui::GetColorU32(color));
// Bounding box multiple sources selection // Bounding box multiple sources selection
Mixer::manager().view()->select(mouseclic[ImGuiMouseButton_Left], mousepos); Mixer::manager().view()->select(mouseclic[ImGuiMouseButton_Left], mousepos);

42
View.cpp
View File

@@ -265,15 +265,15 @@ MixingView::MixingView() : View(MIXING), limbo_scale_(1.3f)
mixingCircle_->shader()->color = glm::vec4( 1.f, 1.f, 1.f, 1.f ); mixingCircle_->shader()->color = glm::vec4( 1.f, 1.f, 1.f, 1.f );
scene.bg()->attach(mixingCircle_); scene.bg()->attach(mixingCircle_);
tmp = new Mesh("mesh/circle.ply"); circle_ = new Mesh("mesh/circle.ply");
tmp->shader()->color = glm::vec4( COLOR_FRAME, 0.9f ); circle_->shader()->color = glm::vec4( COLOR_CIRCLE, 0.9f );
scene.bg()->attach(tmp); scene.bg()->attach(circle_);
// Mixing scene foreground // Mixing scene foreground
tmp = new Mesh("mesh/disk.ply"); tmp = new Mesh("mesh/disk.ply");
tmp->scale_ = glm::vec3(0.033f, 0.033f, 1.f); tmp->scale_ = glm::vec3(0.033f, 0.033f, 1.f);
tmp->translation_ = glm::vec3(0.f, 1.f, 0.f); tmp->translation_ = glm::vec3(0.f, 1.f, 0.f);
tmp->shader()->color = glm::vec4( COLOR_FRAME, 0.9f ); tmp->shader()->color = glm::vec4( COLOR_CIRCLE, 0.9f );
scene.fg()->attach(tmp); scene.fg()->attach(tmp);
button_white_ = new Disk(); button_white_ = new Disk();
@@ -285,7 +285,7 @@ MixingView::MixingView() : View(MIXING), limbo_scale_(1.3f)
tmp = new Mesh("mesh/disk.ply"); tmp = new Mesh("mesh/disk.ply");
tmp->scale_ = glm::vec3(0.033f, 0.033f, 1.f); tmp->scale_ = glm::vec3(0.033f, 0.033f, 1.f);
tmp->translation_ = glm::vec3(0.f, -1.f, 0.f); tmp->translation_ = glm::vec3(0.f, -1.f, 0.f);
tmp->shader()->color = glm::vec4( COLOR_FRAME, 0.9f ); tmp->shader()->color = glm::vec4( COLOR_CIRCLE, 0.9f );
scene.fg()->attach(tmp); scene.fg()->attach(tmp);
button_black_ = new Disk(); button_black_ = new Disk();
@@ -300,7 +300,7 @@ MixingView::MixingView() : View(MIXING), limbo_scale_(1.3f)
tmp = new Mesh("mesh/disk.ply"); tmp = new Mesh("mesh/disk.ply");
tmp->scale_ = glm::vec3(0.08f, 0.08f, 1.f); tmp->scale_ = glm::vec3(0.08f, 0.08f, 1.f);
tmp->translation_ = glm::vec3(0.0f, 1.0f, 0.f); tmp->translation_ = glm::vec3(0.0f, 1.0f, 0.f);
tmp->shader()->color = glm::vec4( COLOR_FRAME, 0.9f ); tmp->shader()->color = glm::vec4( COLOR_CIRCLE, 0.9f );
slider_root_->attach(tmp); slider_root_->attach(tmp);
slider_ = new Disk(); slider_ = new Disk();
@@ -959,7 +959,7 @@ void GeometryView::draw()
| ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoBringToFrontOnFocus )) | ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_NoBringToFrontOnFocus ))
{ {
// style grey // style grey
ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(0.95f, 0.76f, 0.95f, 1.f)); // 1 ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(COLOR_FRAME_LIGHT, 1.f)); // 1
ImGui::PushStyleColor(ImGuiCol_PopupBg, ImVec4(0.14f, 0.14f, 0.14f, 0.9f)); ImGui::PushStyleColor(ImGuiCol_PopupBg, ImVec4(0.14f, 0.14f, 0.14f, 0.9f));
ImGui::PushStyleColor(ImGuiCol_FrameBg, ImVec4(0.14f, 0.14f, 0.14f, 0.00f)); ImGui::PushStyleColor(ImGuiCol_FrameBg, ImVec4(0.14f, 0.14f, 0.14f, 0.00f));
ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, ImVec4(0.14f, 0.14f, 0.14f, 0.46f)); ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, ImVec4(0.14f, 0.14f, 0.14f, 0.46f));
@@ -1549,13 +1549,13 @@ LayerView::LayerView() : View(LAYER), aspect_ratio(1.f)
scene.bg()->attach(frame_); scene.bg()->attach(frame_);
persp_left_ = new Mesh("mesh/perspective_axis_left.ply"); persp_left_ = new Mesh("mesh/perspective_axis_left.ply");
persp_left_->shader()->color = glm::vec4( COLOR_FRAME_LIGHT, 0.9f ); persp_left_->shader()->color = glm::vec4( COLOR_FRAME_LIGHT, 1.f );
persp_left_->scale_.x = LAYER_PERSPECTIVE; persp_left_->scale_.x = LAYER_PERSPECTIVE;
persp_left_->translation_.z = -0.1f; persp_left_->translation_.z = -0.1f;
scene.bg()->attach(persp_left_); scene.bg()->attach(persp_left_);
persp_right_ = new Mesh("mesh/perspective_axis_right.ply"); persp_right_ = new Mesh("mesh/perspective_axis_right.ply");
persp_right_->shader()->color = glm::vec4( COLOR_FRAME_LIGHT, 0.9f ); persp_right_->shader()->color = glm::vec4( COLOR_FRAME_LIGHT, 1.f );
persp_right_->scale_.x = LAYER_PERSPECTIVE; persp_right_->scale_.x = LAYER_PERSPECTIVE;
persp_right_->translation_.z = -0.1f; persp_right_->translation_.z = -0.1f;
scene.bg()->attach(persp_right_); scene.bg()->attach(persp_right_);
@@ -1564,7 +1564,7 @@ LayerView::LayerView() : View(LAYER), aspect_ratio(1.f)
overlay_group_->visible_ = false; overlay_group_->visible_ = false;
overlay_group_icon_ = new Handles(Handles::MENU); overlay_group_icon_ = new Handles(Handles::MENU);
overlay_group_->attach(overlay_group_icon_); overlay_group_->attach(overlay_group_icon_);
overlay_group_frame_ = new Frame(Frame::SHARP, Frame::THIN, Frame::NONE); overlay_group_frame_ = new Frame(Frame::SHARP, Frame::LARGE, Frame::NONE);
overlay_group_frame_->scale_ = glm::vec3(1.05f, 1.1f, 1.f); overlay_group_frame_->scale_ = glm::vec3(1.05f, 1.1f, 1.f);
overlay_group_->attach(overlay_group_frame_); overlay_group_->attach(overlay_group_frame_);
scene.fg()->attach(overlay_group_); scene.fg()->attach(overlay_group_);
@@ -2364,8 +2364,8 @@ AppearanceView::AppearanceView() : View(APPEARANCE), edit_source_(nullptr), need
mask_cursor_square_->visible_ = false; mask_cursor_square_->visible_ = false;
scene.fg()->attach(mask_cursor_square_); scene.fg()->attach(mask_cursor_square_);
mask_cursor_crop_ = new Mesh("mesh/icon_crop.ply"); mask_cursor_crop_ = new Mesh("mesh/icon_crop.ply");
mask_cursor_crop_->scale_ = glm::vec3(1.2f, 1.2f, 1.f); mask_cursor_crop_->scale_ = glm::vec3(1.4f, 1.4f, 1.f);
mask_cursor_crop_->shader()->color = glm::vec4( COLOR_APPEARANCE_MASK, 0.8f ); mask_cursor_crop_->shader()->color = glm::vec4( COLOR_APPEARANCE_MASK, 0.9f );
mask_cursor_crop_->visible_ = false; mask_cursor_crop_->visible_ = false;
scene.fg()->attach(mask_cursor_crop_); scene.fg()->attach(mask_cursor_crop_);
@@ -2465,11 +2465,17 @@ View::Cursor AppearanceView::over (glm::vec2 pos)
mask_cursor_square_->visible_ = Settings::application.brush.z > 0.0; mask_cursor_square_->visible_ = Settings::application.brush.z > 0.0;
edit_source_->maskShader()->option = mask_cursor_paint_; edit_source_->maskShader()->option = mask_cursor_paint_;
if (mask_cursor_paint_ > 1) { if (mask_cursor_paint_ > 1) {
mask_cursor_circle_->shader()->color = glm::vec4(COLOR_APPEARANCE_MASK_DISABLE, 0.9f ); ImVec4 c = ImGuiToolkit::HighlightColor(false);
mask_cursor_square_->shader()->color = glm::vec4(COLOR_APPEARANCE_MASK_DISABLE, 0.9f ); mask_cursor_circle_->shader()->color = glm::vec4(c.x, c.y, c.z, 0.8f );
mask_cursor_square_->shader()->color = glm::vec4(c.x, c.y, c.z, 0.8f );
// mask_cursor_circle_->shader()->color = glm::vec4(COLOR_APPEARANCE_MASK_DISABLE, 0.9f );
// mask_cursor_square_->shader()->color = glm::vec4(COLOR_APPEARANCE_MASK_DISABLE, 0.9f );
} else { } else {
mask_cursor_circle_->shader()->color = glm::vec4(COLOR_APPEARANCE_MASK, 0.9f ); ImVec4 c = ImGuiToolkit::HighlightColor();
mask_cursor_square_->shader()->color = glm::vec4(COLOR_APPEARANCE_MASK, 0.9f ); mask_cursor_circle_->shader()->color = glm::vec4(c.x, c.y, c.z, 0.8f );
mask_cursor_square_->shader()->color = glm::vec4(c.x, c.y, c.z, 0.8f );
// mask_cursor_circle_->shader()->color = glm::vec4(COLOR_APPEARANCE_MASK, 0.9f );
// mask_cursor_square_->shader()->color = glm::vec4(COLOR_APPEARANCE_MASK, 0.9f );
} }
} }
else { else {
@@ -2481,6 +2487,7 @@ View::Cursor AppearanceView::over (glm::vec2 pos)
else if (edit_source_->maskShader()->mode == MaskShader::SHAPE) { else if (edit_source_->maskShader()->mode == MaskShader::SHAPE) {
if (mask_cursor_shape_ > 0) { if (mask_cursor_shape_ > 0) {
mask_cursor_crop_->visible_ = true; mask_cursor_crop_->visible_ = true;
mask_cursor_crop_->scale_ = glm::vec3(1.4f /scene.root()->scale_.x, 1.4f / scene.root()->scale_.x, 1.f);
} }
} }
} }
@@ -2591,6 +2598,7 @@ void AppearanceView::adjustBackground()
mask_node_->scale_ = glm::vec3(scale.x, 1.f, 1.f); mask_node_->scale_ = glm::vec3(scale.x, 1.f, 1.f);
mask_node_->translation_ = glm::vec3(0.f, edit_source_->maskShader()->size.y * scale.y, 0.f); mask_node_->translation_ = glm::vec3(0.f, edit_source_->maskShader()->size.y * scale.y, 0.f);
} }
} }
// background scene // background scene
@@ -2700,7 +2708,7 @@ void AppearanceView::draw()
{ {
// style grey // style grey
ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(1.00f, 1.00f, 0.90f, 1.0f)); // 1 ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(COLOR_APPEARANCE_LIGHT, 1.0f)); // 1
ImGui::PushStyleColor(ImGuiCol_PopupBg, ImVec4(0.14f, 0.14f, 0.14f, 0.9f)); ImGui::PushStyleColor(ImGuiCol_PopupBg, ImVec4(0.14f, 0.14f, 0.14f, 0.9f));
ImGui::PushStyleColor(ImGuiCol_FrameBg, ImVec4(0.14f, 0.14f, 0.14f, 0.f)); ImGui::PushStyleColor(ImGuiCol_FrameBg, ImVec4(0.14f, 0.14f, 0.14f, 0.f));
ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, ImVec4(0.24f, 0.24f, 0.24f, 0.46f)); ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, ImVec4(0.24f, 0.24f, 0.24f, 0.46f));

1
View.h
View File

@@ -132,6 +132,7 @@ private:
Disk *button_black_; Disk *button_black_;
Disk *stashCircle_; Disk *stashCircle_;
Mesh *mixingCircle_; Mesh *mixingCircle_;
Mesh *circle_;
}; };
class RenderView : public View class RenderView : public View

12
defines.h
View File

@@ -86,12 +86,16 @@
#define COLOR_TRANSITION_SOURCE 1.f, 0.5f, 1.f #define COLOR_TRANSITION_SOURCE 1.f, 0.5f, 1.f
#define COLOR_TRANSITION_LINES 0.9f, 0.9f, 0.9f #define COLOR_TRANSITION_LINES 0.9f, 0.9f, 0.9f
#define COLOR_APPEARANCE_SOURCE 0.9f, 0.9f, 0.1f #define COLOR_APPEARANCE_SOURCE 0.9f, 0.9f, 0.1f
#define COLOR_APPEARANCE_MASK 0.1f, 0.9f, 0.9f #define COLOR_APPEARANCE_LIGHT 1.0f, 1.0f, 0.9f
#define COLOR_APPEARANCE_MASK_DISABLE 0.3f, 0.6f, 0.6f #define COLOR_APPEARANCE_MASK 0.9f, 0.9f, 0.9f
#define COLOR_FRAME 0.8f, 0.f, 0.8f #define COLOR_APPEARANCE_MASK_DISABLE 0.6f, 0.6f, 0.6f
#define COLOR_FRAME_LIGHT 0.95f, 0.3f, 0.95f #define COLOR_FRAME 0.75f, 0.2f, 0.75f
#define COLOR_FRAME_LIGHT 0.9f, 0.6f, 0.9f
#define COLOR_CIRCLE 0.25f, 0.65f, 0.7f
#define COLOR_CIRCLE_LIGHT 0.6f, 0.95f, 1.f
#define COLOR_LIMBO_CIRCLE 0.16f, 0.16f, 0.16f #define COLOR_LIMBO_CIRCLE 0.16f, 0.16f, 0.16f
#define COLOR_SLIDER_CIRCLE 0.11f, 0.11f, 0.11f #define COLOR_SLIDER_CIRCLE 0.11f, 0.11f, 0.11f
#define COLOR_STASH_CIRCLE 0.06f, 0.06f, 0.06f #define COLOR_STASH_CIRCLE 0.06f, 0.06f, 0.06f
#endif // VMIX_DEFINES_H #endif // VMIX_DEFINES_H