From efeaf959b39f461a78864d01c98d6c624dfbe03a Mon Sep 17 00:00:00 2001 From: brunoherbelin Date: Wed, 3 Jun 2020 21:10:55 +0200 Subject: [PATCH] Cosmetics --- Decorations.cpp | 2 +- Source.cpp | 12 ++++++------ defines.h | 3 ++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Decorations.cpp b/Decorations.cpp index de8329d..1fb8acb 100644 --- a/Decorations.cpp +++ b/Decorations.cpp @@ -121,7 +121,7 @@ void Frame::accept(Visitor& v) Handles::Handles(Type type) : Node(), type_(type) { - color = glm::vec4( 1.f, 1.f, 1.f, 1.f); + color = glm::vec4( 1.f, 1.f, 0.f, 1.f); if ( type_ == ROTATE ) { handle_ = new Mesh("mesh/border_handles_rotation.ply"); diff --git a/Source.cpp b/Source.cpp index 46f8c6e..a42e98a 100644 --- a/Source.cpp +++ b/Source.cpp @@ -42,7 +42,7 @@ Source::Source() : initialized_(false), need_update_(true) overlays_[View::MIXING]->visible_ = false; frame = new Frame(Frame::ROUND_LARGE); frame->translation_.z = 0.1; - frame->color = glm::vec4( COLOR_DEFAULT_SOURCE, 1.f); + frame->color = glm::vec4( COLOR_HIGHLIGHT_SOURCE, 1.f); overlays_[View::MIXING]->attach(frame); groups_[View::MIXING]->attach(overlays_[View::MIXING]); @@ -58,22 +58,22 @@ Source::Source() : initialized_(false), need_update_(true) overlays_[View::GEOMETRY]->translation_.z = 0.15; overlays_[View::GEOMETRY]->visible_ = false; frame = new Frame(Frame::SHARP_LARGE); - frame->color = glm::vec4( COLOR_DEFAULT_SOURCE, 1.f); + frame->color = glm::vec4( COLOR_HIGHLIGHT_SOURCE, 1.f); overlays_[View::GEOMETRY]->attach(frame); resize_handle_ = new Handles(Handles::RESIZE); - resize_handle_->color = glm::vec4( COLOR_DEFAULT_SOURCE, 1.f); + resize_handle_->color = glm::vec4( COLOR_HIGHLIGHT_SOURCE, 1.f); resize_handle_->translation_.z = 0.1; overlays_[View::GEOMETRY]->attach(resize_handle_); resize_H_handle_ = new Handles(Handles::RESIZE_H); - resize_H_handle_->color = glm::vec4( COLOR_DEFAULT_SOURCE, 1.f); + resize_H_handle_->color = glm::vec4( COLOR_HIGHLIGHT_SOURCE, 1.f); resize_H_handle_->translation_.z = 0.1; overlays_[View::GEOMETRY]->attach(resize_H_handle_); resize_V_handle_ = new Handles(Handles::RESIZE_V); - resize_V_handle_->color = glm::vec4( COLOR_DEFAULT_SOURCE, 1.f); + resize_V_handle_->color = glm::vec4( COLOR_HIGHLIGHT_SOURCE, 1.f); resize_V_handle_->translation_.z = 0.1; overlays_[View::GEOMETRY]->attach(resize_V_handle_); rotate_handle_ = new Handles(Handles::ROTATE); - rotate_handle_->color = glm::vec4( COLOR_DEFAULT_SOURCE, 1.f); + rotate_handle_->color = glm::vec4( COLOR_HIGHLIGHT_SOURCE, 1.f); rotate_handle_->translation_.z = 0.1; overlays_[View::GEOMETRY]->attach(rotate_handle_); groups_[View::GEOMETRY]->attach(overlays_[View::GEOMETRY]); diff --git a/defines.h b/defines.h index e315fe6..95f6bcc 100644 --- a/defines.h +++ b/defines.h @@ -42,7 +42,8 @@ #define COLOR_BGROUND 0.2f, 0.2f, 0.2f #define COLOR_NAVIGATOR 0.1f, 0.1f, 0.1f -#define COLOR_DEFAULT_SOURCE 1.f, 1.f, 1.f +#define COLOR_DEFAULT_SOURCE 0.8f, 0.8f, 0.8f +#define COLOR_HIGHLIGHT_SOURCE 1.f, 1.f, 1.f // from glmixer #define TEXTURE_REQUIRED_MAXIMUM 2048