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

Cosmetics

Browse Source
This commit is contained in:
brunoherbelin
2020-06-03 21:10:55 +02:00
parent 87fe169d73
commit efeaf959b3
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Decorations.cpp
View File

@@ -121,7 +121,7 @@ void Frame::accept(Visitor& v)
Handles::Handles(Type type) : Node(), type_(type) 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 ) { if ( type_ == ROTATE ) {
handle_ = new Mesh("mesh/border_handles_rotation.ply"); handle_ = new Mesh("mesh/border_handles_rotation.ply");

12
Source.cpp
View File

@@ -42,7 +42,7 @@ Source::Source() : initialized_(false), need_update_(true)
overlays_[View::MIXING]->visible_ = false; overlays_[View::MIXING]->visible_ = false;
frame = new Frame(Frame::ROUND_LARGE); frame = new Frame(Frame::ROUND_LARGE);
frame->translation_.z = 0.1; 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); overlays_[View::MIXING]->attach(frame);
groups_[View::MIXING]->attach(overlays_[View::MIXING]); 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]->translation_.z = 0.15;
overlays_[View::GEOMETRY]->visible_ = false; overlays_[View::GEOMETRY]->visible_ = false;
frame = new Frame(Frame::SHARP_LARGE); 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); overlays_[View::GEOMETRY]->attach(frame);
resize_handle_ = new Handles(Handles::RESIZE); 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; resize_handle_->translation_.z = 0.1;
overlays_[View::GEOMETRY]->attach(resize_handle_); overlays_[View::GEOMETRY]->attach(resize_handle_);
resize_H_handle_ = new Handles(Handles::RESIZE_H); 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; resize_H_handle_->translation_.z = 0.1;
overlays_[View::GEOMETRY]->attach(resize_H_handle_); overlays_[View::GEOMETRY]->attach(resize_H_handle_);
resize_V_handle_ = new Handles(Handles::RESIZE_V); 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; resize_V_handle_->translation_.z = 0.1;
overlays_[View::GEOMETRY]->attach(resize_V_handle_); overlays_[View::GEOMETRY]->attach(resize_V_handle_);
rotate_handle_ = new Handles(Handles::ROTATE); 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; rotate_handle_->translation_.z = 0.1;
overlays_[View::GEOMETRY]->attach(rotate_handle_); overlays_[View::GEOMETRY]->attach(rotate_handle_);
groups_[View::GEOMETRY]->attach(overlays_[View::GEOMETRY]); groups_[View::GEOMETRY]->attach(overlays_[View::GEOMETRY]);

3
defines.h
View File

@@ -42,7 +42,8 @@
#define COLOR_BGROUND 0.2f, 0.2f, 0.2f #define COLOR_BGROUND 0.2f, 0.2f, 0.2f
#define COLOR_NAVIGATOR 0.1f, 0.1f, 0.1f #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 // from glmixer
#define TEXTURE_REQUIRED_MAXIMUM 2048 #define TEXTURE_REQUIRED_MAXIMUM 2048