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

Visually integrated Layer view (not operational though).

Browse Source
This commit is contained in:
brunoherbelin
2020-05-17 23:40:20 +02:00
parent 69a58de026
commit 80478abde2
3 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Mixer.cpp
View File

@@ -450,6 +450,7 @@ void Mixer::newSession()
// default view config // default view config
mixing_.restoreSettings(); mixing_.restoreSettings();
geometry_.restoreSettings(); geometry_.restoreSettings();
layer_.restoreSettings();
// empty session file name (does not save) // empty session file name (does not save)
sessionFilename_ = ""; sessionFilename_ = "";

1
Source.cpp
View File

@@ -245,6 +245,7 @@ void MediaSource::init()
ImageShader *is = static_cast<ImageShader *>(surfacemix->shader()); ImageShader *is = static_cast<ImageShader *>(surfacemix->shader());
if (is) is->stipple = 1.0; if (is) is->stipple = 1.0;
groups_[View::MIXING]->attach(surfacemix); groups_[View::MIXING]->attach(surfacemix);
groups_[View::LAYER]->attach(surfacemix);
if (mediaplayer_->duration() == GST_CLOCK_TIME_NONE) if (mediaplayer_->duration() == GST_CLOCK_TIME_NONE)
overlays_[View::MIXING]->attach( new Mesh("mesh/icon_image.ply") ); overlays_[View::MIXING]->attach( new Mesh("mesh/icon_image.ply") );
else else

35
View.cpp
View File

@@ -65,17 +65,14 @@ void View::drag (glm::vec2 from, glm::vec2 to)
MixingView::MixingView() : View(MIXING) MixingView::MixingView() : View(MIXING)
{ {
// read default settings // read default settings
if ( Settings::application.views[View::MIXING].name.empty() ) { if ( Settings::application.views[mode_].name.empty() ) {
// no settings found: store application default // no settings found: store application default
Settings::application.views[View::MIXING].name = "Mixing"; Settings::application.views[mode_].name = "Mixing";
scene.root()->scale_ = glm::vec3(2.0f, 2.0f, 1.0f); scene.root()->scale_ = glm::vec3(2.0f, 2.0f, 1.0f);
saveSettings(); saveSettings();
} }
else
restoreSettings();
// Mixing scene background // Mixing scene background
Mesh *disk = new Mesh("mesh/disk.ply"); Mesh *disk = new Mesh("mesh/disk.ply");
disk->setTexture(textureMixingQuadratic()); disk->setTexture(textureMixingQuadratic());
scene.bg()->attach(disk); scene.bg()->attach(disk);
@@ -112,7 +109,7 @@ void MixingView::grab (glm::vec2 from, glm::vec2 to, Source *s, std::pair<Node *
if (!s) if (!s)
return; return;
Group *sourceNode = s->group(View::MIXING); Group *sourceNode = s->group(mode_);
static glm::vec3 start_translation = glm::vec3(0.f); static glm::vec3 start_translation = glm::vec3(0.f);
static glm::vec2 start_position = glm::vec2(0.f); static glm::vec2 start_position = glm::vec2(0.f);
@@ -218,14 +215,12 @@ void RenderView::draw()
GeometryView::GeometryView() : View(GEOMETRY) GeometryView::GeometryView() : View(GEOMETRY)
{ {
// read default settings // read default settings
if ( Settings::application.views[View::GEOMETRY].name.empty() ) { if ( Settings::application.views[mode_].name.empty() ) {
// no settings found: store application default // no settings found: store application default
Settings::application.views[View::GEOMETRY].name = "Geometry"; Settings::application.views[mode_].name = "Geometry";
scene.root()->scale_ = glm::vec3(1.2f, 1.2f, 1.0f); scene.root()->scale_ = glm::vec3(1.2f, 1.2f, 1.0f);
saveSettings(); saveSettings();
} }
else
restoreSettings();
// Geometry Scene background // Geometry Scene background
Surface *rect = new Surface; Surface *rect = new Surface;
@@ -269,7 +264,7 @@ void GeometryView::grab (glm::vec2 from, glm::vec2 to, Source *s, std::pair<Node
// work on the given source // work on the given source
if (!s) if (!s)
return; return;
Group *sourceNode = s->group(View::GEOMETRY); Group *sourceNode = s->group(mode_);
// remember source transform at moment of clic at position 'from' // remember source transform at moment of clic at position 'from'
static glm::vec2 start_clic_position = glm::vec2(0.f); static glm::vec2 start_clic_position = glm::vec2(0.f);
@@ -333,25 +328,25 @@ void GeometryView::grab (glm::vec2 from, glm::vec2 to, Source *s, std::pair<Node
LayerView::LayerView() : View(LAYER), aspect_ratio(1.f) LayerView::LayerView() : View(LAYER), aspect_ratio(1.f)
{ {
// read default settings // read default settings
if ( Settings::application.views[View::LAYER].name.empty() ) { if ( Settings::application.views[mode_].name.empty() ) {
// no settings found: store application default // no settings found: store application default
Settings::application.views[View::LAYER].name = "Layer"; Settings::application.views[mode_].name = "Layer";
scene.root()->scale_ = glm::vec3(1.0f, 1.0f, 1.0f); scene.root()->scale_ = glm::vec3(0.8f, 0.8f, 1.0f);
scene.root()->translation_ = glm::vec3(1.3f, 0.5f, 0.0f);
saveSettings(); saveSettings();
} }
else
restoreSettings();
// Geometry Scene background // Geometry Scene background
Surface *rect = new Surface; Surface *rect = new Surface;
rect->shader()->color.a = 0.3f;
scene.bg()->attach(rect); scene.bg()->attach(rect);
Mesh *persp = new Mesh("mesh/perspective_layer.ply"); Mesh *persp = new Mesh("mesh/perspective_layer.ply");
persp->translation_.z = -0.1f; persp->translation_.z = -0.1f;
scene.bg()->attach(persp); scene.bg()->attach(persp);
Frame *border = new Frame(Frame::SHARP_THIN); Frame *border = new Frame(Frame::ROUND_SHADOW);
border->color = glm::vec4( 0.8f, 0.f, 0.8f, 1.f ); border->color = glm::vec4( 0.8f, 0.f, 0.8f, 0.7f );
scene.bg()->attach(border); scene.bg()->attach(border);
} }
@@ -363,6 +358,7 @@ LayerView::~LayerView()
void LayerView::draw () void LayerView::draw ()
{ {
// update rendering of render frame // update rendering of render frame
FrameBuffer *output = Mixer::manager().session()->frame(); FrameBuffer *output = Mixer::manager().session()->frame();
if (output) if (output)
@@ -383,6 +379,7 @@ void LayerView::zoom (float factor)
z = CLAMP( z + 0.1f * factor, 0.2f, 10.f); z = CLAMP( z + 0.1f * factor, 0.2f, 10.f);
scene.root()->scale_.x = z; scene.root()->scale_.x = z;
scene.root()->scale_.y = z; scene.root()->scale_.y = z;
Log::Info("scale layer %f", scene.root()->scale_.x );
} }
@@ -391,7 +388,7 @@ void LayerView::grab (glm::vec2 from, glm::vec2 to, Source *s, std::pair<Node *,
if (!s) if (!s)
return; return;
Group *sourceNode = s->group(View::LAYER); Group *sourceNode = s->group(mode_);
static glm::vec3 start_translation = glm::vec3(0.f); static glm::vec3 start_translation = glm::vec3(0.f);
static glm::vec2 start_position = glm::vec2(0.f); static glm::vec2 start_position = glm::vec2(0.f);