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

Make sure the name of the view is set correclty

Browse Source 
even if there was a setting found
This commit is contained in:
Bruno Herbelin
2022-01-08 15:01:12 +01:00
parent ceaac03adf
commit b9ed64fba2
5 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
GeometryView.cpp
View File

@@ -48,13 +48,12 @@ GeometryView::GeometryView() : View(GEOMETRY)
{ {
scene.root()->scale_ = glm::vec3(GEOMETRY_DEFAULT_SCALE, GEOMETRY_DEFAULT_SCALE, 1.0f); scene.root()->scale_ = glm::vec3(GEOMETRY_DEFAULT_SCALE, GEOMETRY_DEFAULT_SCALE, 1.0f);
// read default settings // read default settings
if ( Settings::application.views[mode_].name.empty() ) { if ( Settings::application.views[mode_].name.empty() )
// no settings found: store application default // no settings found: store application default
Settings::application.views[mode_].name = "Geometry";
saveSettings(); saveSettings();
}
else else
restoreSettings(); restoreSettings();
Settings::application.views[mode_].name = "Geometry";
// Geometry Scene foreground // Geometry Scene foreground
output_surface_ = new Surface; output_surface_ = new Surface;

8
LayerView.cpp
View File

@@ -46,14 +46,12 @@ LayerView::LayerView() : View(LAYER), aspect_ratio(1.f)
scene.root()->scale_ = glm::vec3(LAYER_DEFAULT_SCALE, LAYER_DEFAULT_SCALE, 1.0f); scene.root()->scale_ = glm::vec3(LAYER_DEFAULT_SCALE, LAYER_DEFAULT_SCALE, 1.0f);
scene.root()->translation_ = glm::vec3(2.2f, 1.2f, 0.0f); scene.root()->translation_ = glm::vec3(2.2f, 1.2f, 0.0f);
// read default settings // read default settings
if ( Settings::application.views[mode_].name.empty() ) { if ( Settings::application.views[mode_].name.empty() )
// no settings found: store application default // no settings found: store application default
Settings::application.views[mode_].name = "Layer";
saveSettings(); saveSettings();
} else
else {
restoreSettings(); restoreSettings();
} Settings::application.views[mode_].name = "Layer";
// Geometry Scene background // Geometry Scene background
frame_ = new Group; frame_ = new Group;

5
MixingView.cpp
View File

@@ -53,13 +53,12 @@ MixingView::MixingView() : View(MIXING), limbo_scale_(MIXING_MIN_THRESHOLD)
scene.root()->scale_ = glm::vec3(MIXING_DEFAULT_SCALE, MIXING_DEFAULT_SCALE, 1.0f); scene.root()->scale_ = glm::vec3(MIXING_DEFAULT_SCALE, MIXING_DEFAULT_SCALE, 1.0f);
scene.root()->translation_ = glm::vec3(0.0f, 0.0f, 0.0f); scene.root()->translation_ = glm::vec3(0.0f, 0.0f, 0.0f);
// read default settings // read default settings
if ( Settings::application.views[mode_].name.empty() ) { if ( Settings::application.views[mode_].name.empty() )
// no settings found: store application default // no settings found: store application default
Settings::application.views[mode_].name = "Mixing";
saveSettings(); saveSettings();
}
else else
restoreSettings(); restoreSettings();
Settings::application.views[mode_].name = "Mixing";
// Mixing scene background // Mixing scene background
limbo_ = new Mesh("mesh/disk.ply"); limbo_ = new Mesh("mesh/disk.ply");

5
TextureView.cpp
View File

@@ -50,13 +50,12 @@ TextureView::TextureView() : View(TEXTURE), edit_source_(nullptr), need_edit_upd
scene.root()->scale_ = glm::vec3(APPEARANCE_DEFAULT_SCALE, APPEARANCE_DEFAULT_SCALE, 1.0f); scene.root()->scale_ = glm::vec3(APPEARANCE_DEFAULT_SCALE, APPEARANCE_DEFAULT_SCALE, 1.0f);
scene.root()->translation_ = glm::vec3(0.8f, 0.f, 0.0f); scene.root()->translation_ = glm::vec3(0.8f, 0.f, 0.0f);
// read default settings // read default settings
if ( Settings::application.views[mode_].name.empty() ) { if ( Settings::application.views[mode_].name.empty() )
// no settings found: store application default // no settings found: store application default
Settings::application.views[mode_].name = "Texture";
saveSettings(); saveSettings();
}
else else
restoreSettings(); restoreSettings();
Settings::application.views[mode_].name = "Texturing";
// //
// Scene background // Scene background

2
TransitionView.cpp
View File

@@ -48,13 +48,13 @@ TransitionView::TransitionView() : View(TRANSITION), transition_source_(nullptr)
if ( Settings::application.views[mode_].name.empty() ) if ( Settings::application.views[mode_].name.empty() )
{ {
// no settings found: store application default // no settings found: store application default
Settings::application.views[mode_].name = "Transition";
scene.root()->scale_ = glm::vec3(TRANSITION_DEFAULT_SCALE, TRANSITION_DEFAULT_SCALE, 1.0f); scene.root()->scale_ = glm::vec3(TRANSITION_DEFAULT_SCALE, TRANSITION_DEFAULT_SCALE, 1.0f);
scene.root()->translation_ = glm::vec3(1.5f, 0.f, 0.0f); scene.root()->translation_ = glm::vec3(1.5f, 0.f, 0.0f);
saveSettings(); saveSettings();
} }
else else
restoreSettings(); restoreSettings();
Settings::application.views[mode_].name = "Transition";
// Geometry Scene background // Geometry Scene background
gradient_ = new Switch; gradient_ = new Switch;