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

Creation of the left sidebar with Navigator. Starting to migrate main

Browse Source 
window to side bar.
This commit is contained in:
brunoherbelin
2020-05-02 23:47:32 +02:00
parent cc03e7b7cd
commit fc8bd02d2f
18 changed files with 420 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
View.cpp
View File

@@ -24,13 +24,13 @@ View::View(Mode m) : mode_(m)
{
}
void View::restoreDefaultSettings()
void View::restoreSettings()
{
scene.root()->scale_ = Settings::application.views[mode_].default_scale;
scene.root()->translation_ = Settings::application.views[mode_].default_translation;
}
void View::setCurrentSettingsAsDefault()
void View::saveSettings()
{
Settings::application.views[mode_].default_scale = scene.root()->scale_;
Settings::application.views[mode_].default_translation = scene.root()->translation_;
@@ -49,13 +49,14 @@ MixingView::MixingView() : View(MIXING)
// no settings found: store application default
Settings::application.views[View::MIXING].name = "Mixing";
scene.root()->scale_ = glm::vec3(1.6f, 1.6f, 1.0f);
setCurrentSettingsAsDefault();
saveSettings();
}
else
restoreDefaultSettings();
restoreSettings();
// Mixing scene
backgound_ = new Group;
scene.root()->addChild(backgound_);
Mesh *disk = new Mesh("mesh/disk.ply");
disk->setTexture(textureMixingQuadratic());
@@ -66,7 +67,6 @@ MixingView::MixingView() : View(MIXING)
circle->shader()->color = pink;
backgound_->addChild(circle);
scene.root()->addChild(backgound_);
}
MixingView::~MixingView()
@@ -183,12 +183,22 @@ uint MixingView::textureMixingQuadratic()
RenderView::RenderView() : View(RENDERING), frame_buffer_(nullptr)
{
setResolution(1280, 720);
// application default
glm::vec3 resolution(1280.f, 720.f, 0.f);
// default settings
// read default settings
if ( Settings::application.views[View::RENDERING].name.empty() ) {
// no settings found: store application default
Settings::application.views[View::RENDERING].name = "Render";
// store default setting
Settings::application.views[View::RENDERING].default_scale = resolution;
}
else
resolution = Settings::application.views[View::RENDERING].default_scale;
// set resolution to settings or default
setResolution( int(resolution.x), int(resolution.y));
}
RenderView::~RenderView()
@@ -223,13 +233,14 @@ GeometryView::GeometryView() : View(GEOMETRY)
// no settings found: store application default
Settings::application.views[View::GEOMETRY].name = "Geometry";
scene.root()->scale_ = glm::vec3(1.2f, 1.2f, 1.0f);
setCurrentSettingsAsDefault();
saveSettings();
}
else
restoreDefaultSettings();
restoreSettings();
// Geometry Scene
backgound_ = new Group;
scene.root()->addChild(backgound_);
Surface *rect = new Surface;
backgound_->addChild(rect);
@@ -239,8 +250,6 @@ GeometryView::GeometryView() : View(GEOMETRY)
border->color = glm::vec4( 0.8f, 0.f, 0.8f, 1.f );
backgound_->addChild(border);
scene.root()->addChild(backgound_);
}
GeometryView::~GeometryView()