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

Cleanup creation of sources

Browse Source
This commit is contained in:
brunoherbelin
2020-05-23 14:46:01 +02:00
parent 781023a93d
commit 84ca3b1f82
11 changed files with 171 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ImGuiVisitor.cpp
View File

@@ -300,6 +300,6 @@ void ImGuiVisitor::visit (RenderSource& s)
void ImGuiVisitor::visit (CloneSource& s) void ImGuiVisitor::visit (CloneSource& s)
{ {
// ImGui::Button("Expand", ImVec2(IMGUI_RIGHT_ALIGN, 0)); // ImGui::Button("Expand", ImVec2(IMGUI_RIGHT_ALIGN, 0));
ImGui::Text("Clone of %s", s.origin()->name()); ImGui::Text("Clone of %s", s.origin()->name().c_str());
} }

97
Mixer.cpp
View File

@@ -159,12 +159,16 @@ void Mixer::update()
// update session and associated sources // update session and associated sources
session_->update(dt); session_->update(dt);
if (session()->failedSource() != nullptr)
deleteSource(session()->failedSource());
// update views // update views
mixing_.update(dt); mixing_.update(dt);
geometry_.update(dt); geometry_.update(dt);
layer_.update(dt); layer_.update(dt);
// optimize the reordering in depth for views // optimize the reordering in depth for views
// deep updates shall be performed only 1 frame
View::need_deep_update_ = false; View::need_deep_update_ = false;
} }
@@ -175,44 +179,45 @@ void Mixer::draw()
} }
// manangement of sources // manangement of sources
void Mixer::createSourceFile(std::string path) Source * Mixer::createSourceFile(std::string path)
{ {
// sanity check
if ( !SystemToolkit::file_exists( path ) ) {
Log::Notify("File %s does not exist.", path.c_str());
return;
}
// ready to create a source // ready to create a source
Source *s = nullptr; Source *s = nullptr;
// test type of file by extension // sanity check
std::string ext = SystemToolkit::extension_filename(path); if ( SystemToolkit::file_exists( path ) ) {
if ( ext == "vmx" )
{ // test type of file by extension
// create a session source std::string ext = SystemToolkit::extension_filename(path);
SessionSource *ss = new SessionSource(); if ( ext == "vmx" )
ss->load(path); {
s = ss; // create a session source
} SessionSource *ss = new SessionSource();
else { ss->load(path);
// (try to) create media source by default s = ss;
MediaSource *ms = new MediaSource; }
ms->setPath(path); else {
s = ms; // (try to) create media source by default
MediaSource *ms = new MediaSource;
ms->setPath(path);
s = ms;
}
// remember in recent media
Settings::application.recentImport.push(path);
Settings::application.recentImport.path = SystemToolkit::path_filename(path);
// propose a new name based on uri
renameSource(s, SystemToolkit::base_filename(path));
} }
else
Log::Notify("File %s does not exist.", path.c_str());
// remember in recent media return s;
Settings::application.recentImport.push(path);
Settings::application.recentImport.path = SystemToolkit::path_filename(path);
// propose a new name based on uri
renameSource(s, SystemToolkit::base_filename(path));
// add to mixer
insertSource(s);
} }
void Mixer::createSourceRender() Source * Mixer::createSourceRender()
{ {
// ready to create a source // ready to create a source
RenderSource *s = new RenderSource; RenderSource *s = new RenderSource;
@@ -220,37 +225,41 @@ void Mixer::createSourceRender()
// propose a new name based on session name // propose a new name based on session name
renameSource(s, SystemToolkit::base_filename(session_->filename())); renameSource(s, SystemToolkit::base_filename(session_->filename()));
// add to mixer return s;
insertSource(s);
} }
void Mixer::createSourceClone(std::string namesource) Source * Mixer::createSourceClone(std::string namesource)
{ {
// ready to create a source
Source *s = nullptr;
SourceList::iterator origin = session_->find(namesource); SourceList::iterator origin = session_->find(namesource);
if (origin != session_->end()) { if (origin != session_->end()) {
// create a source // create a source
CloneSource *s = (*origin)->clone(); s = (*origin)->clone();
// get new name // get new name
renameSource(s, (*origin)->name()); renameSource(s, (*origin)->name());
// add to mixer
insertSource(s);
} }
return s;
} }
void Mixer::insertSource(Source *s) void Mixer::insertSource(Source *s)
{ {
// Add source to Session and set it as current if ( s != nullptr )
setCurrentSource( session_->addSource(s) ); {
// Add source to Session and set it as current
setCurrentSource( session_->addSource(s) );
// add sources Nodes to all views // add sources Nodes to all views
mixing_.scene.ws()->attach(s->group(View::MIXING)); mixing_.scene.ws()->attach(s->group(View::MIXING));
geometry_.scene.ws()->attach(s->group(View::GEOMETRY)); geometry_.scene.ws()->attach(s->group(View::GEOMETRY));
layer_.scene.ws()->attach(s->group(View::LAYER)); layer_.scene.ws()->attach(s->group(View::LAYER));
layer_.setDepth(s); layer_.setDepth(s);
}
} }
void Mixer::deleteCurrentSource() void Mixer::deleteCurrentSource()

12
Mixer.h
View File

@@ -34,13 +34,14 @@ public:
void draw(); void draw();
// manangement of sources // manangement of sources
void createSourceFile(std::string path); Source * createSourceFile(std::string path);
void createSourceRender(); Source * createSourceClone(std::string namesource);
void createSourceClone(std::string namesource); Source * createSourceRender();
// operations on sources // operations on sources
void renameSource(Source *s, const std::string &newname); void insertSource(Source *s);
void deleteSource(Source *s); void deleteSource(Source *s);
void renameSource(Source *s, const std::string &newname);
// current source // current source
void setCurrentSource(std::string namesource); void setCurrentSource(std::string namesource);
@@ -49,7 +50,7 @@ public:
void setCurrentSource(Source *s); void setCurrentSource(Source *s);
void unsetCurrentSource(); void unsetCurrentSource();
void deleteCurrentSource(); void deleteCurrentSource();
Source *currentSource(); Source * currentSource();
int indexCurrentSource(); int indexCurrentSource();
// management of view // management of view
@@ -73,7 +74,6 @@ protected:
Session *back_session_; Session *back_session_;
void swap(); void swap();
void insertSource(Source *s);
void setCurrentSource(SourceList::iterator it); void setCurrentSource(SourceList::iterator it);
SourceList::iterator current_source_; SourceList::iterator current_source_;
int current_source_index_; int current_source_index_;

2
RenderingManager.cpp
View File

@@ -446,7 +446,7 @@ void Rendering::FileDropped(GLFWwindow *, int path_count, const char* paths[])
if (filename.empty()) if (filename.empty())
break; break;
// try to create a source // try to create a source
Mixer::manager().createSourceFile( filename ); Mixer::manager().insertSource ( Mixer::manager().createSourceFile( filename ) );
} }
} }

2
Scene.h
View File

@@ -67,7 +67,7 @@ public:
// public members, to manipulate with care // public members, to manipulate with care
bool visible_; bool visible_;
uint refcount_; uint refcount_;
glm::mat4 transform_; glm::mat4 transform_;
glm::vec3 scale_, rotation_, translation_; glm::vec3 scale_, rotation_, translation_;

18
Session.cpp
View File

@@ -8,7 +8,7 @@
#include "Log.h" #include "Log.h"
Session::Session() : filename_("") Session::Session() : filename_(""), failedSource_(nullptr)
{ {
config_[View::RENDERING] = new Group; config_[View::RENDERING] = new Group;
config_[View::RENDERING]->scale_ = render_.resolution(); config_[View::RENDERING]->scale_ = render_.resolution();
@@ -40,12 +40,20 @@ Session::~Session()
// update all sources // update all sources
void Session::update(float dt) void Session::update(float dt)
{ {
failedSource_ = nullptr;
// pre-render of all sources // pre-render of all sources
for( SourceList::iterator it = sources_.begin(); it != sources_.end(); it++){ for( SourceList::iterator it = sources_.begin(); it != sources_.end(); it++){
// render the source
(*it)->render(); if ( (*it)->failed() ) {
// update the source failedSource_ = (*it);
(*it)->update(dt); }
else {
// render the source
(*it)->render();
// update the source
(*it)->update(dt);
}
} }
// update the scene tree // update the scene tree

4
Session.h
View File

@@ -25,8 +25,9 @@ public:
SourceList::iterator find (Node *node); SourceList::iterator find (Node *node);
uint numSource() const; uint numSource() const;
// update all sources // update all sources and return the list of source which failed
void update (float dt); void update (float dt);
Source *failedSource() { return failedSource_; }
// result of render // result of render
inline FrameBuffer *frame () const { return render_.frame(); } inline FrameBuffer *frame () const { return render_.frame(); }
@@ -41,6 +42,7 @@ public:
protected: protected:
RenderView render_; RenderView render_;
Source *failedSource_;
SourceList sources_; SourceList sources_;
std::string filename_; std::string filename_;
std::map<View::Mode, Group*> config_; std::map<View::Mode, Group*> config_;

4
SessionSource.cpp
View File

@@ -136,6 +136,10 @@ void SessionSource::render()
// update session // update session
session_->update(dt_); session_->update(dt_);
// delete a source which failed
if (session()->failedSource() != nullptr)
session()->deleteSource(session()->failedSource());
// render the sesion into frame buffer // render the sesion into frame buffer
static glm::mat4 projection = glm::ortho(-1.f, 1.f, -1.f, 1.f, -1.f, 1.f); static glm::mat4 projection = glm::ortho(-1.f, 1.f, -1.f, 1.f, -1.f, 1.f);
renderbuffer_->begin(); renderbuffer_->begin();

102
UserInterfaceManager.cpp
View File

@@ -854,6 +854,9 @@ Navigator::Navigator()
pannel_width = 5.f * width; pannel_width = 5.f * width;
height = 100; height = 100;
padding_width = 100; padding_width = 100;
new_source_type_ = 0;
new_source_to_create_ = "";
sprintf(new_source_filename_, " ");
} }
void Navigator::toggle(int index) void Navigator::toggle(int index)
@@ -871,6 +874,8 @@ void Navigator::clearSelection()
{ {
for(int i=0; i<NAV_COUNT; ++i) for(int i=0; i<NAV_COUNT; ++i)
selected_button[i] = false; selected_button[i] = false;
new_source_to_create_ = "";
sprintf(new_source_filename_, " ");
} }
void Navigator::showPannelSource(int index) void Navigator::showPannelSource(int index)
@@ -927,7 +932,6 @@ void Navigator::Render()
// the list of INITIALS for sources // the list of INITIALS for sources
int index = 0; int index = 0;
SourceList::iterator iter; SourceList::iterator iter;
Source *source_to_delete = nullptr;
for (iter = Mixer::manager().session()->begin(); iter != Mixer::manager().session()->end(); iter++, index++) for (iter = Mixer::manager().session()->begin(); iter != Mixer::manager().session()->end(); iter++, index++)
{ {
// draw an indicator for current source // draw an indicator for current source
@@ -946,13 +950,7 @@ void Navigator::Render()
if (selected_button[index]) if (selected_button[index])
Mixer::manager().setCurrentSource(selected_source_index); Mixer::manager().setCurrentSource(selected_source_index);
} }
// delete sources which failed
if ( (*iter)->failed() )
source_to_delete = *iter;
} }
// TODO : general (mixer?) paradigm to delete failed sources (here it looks like a hack)
if (source_to_delete != nullptr)
Mixer::manager().deleteSource(source_to_delete);
// the "+" icon for action of creating new source // the "+" icon for action of creating new source
if (ImGui::Selectable( ICON_FA_PLUS, &selected_button[NAV_NEW], 0, iconsize)) if (ImGui::Selectable( ICON_FA_PLUS, &selected_button[NAV_NEW], 0, iconsize))
@@ -1078,62 +1076,108 @@ void Navigator::RenderNewPannel()
ImGui::PopFont(); ImGui::PopFont();
ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN); ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN);
static int new_source_type = 0; ImGui::Combo("Origin", &new_source_type_, "File\0Software\0Hardware\0");
ImGui::Combo("Origin", &new_source_type, "File\0Software\0Hardware\0");
// Media Source creation // Media Source creation
if (new_source_type == 0) { if (new_source_type_ == 0) {
// helper // helper
ImGui::SetCursorPosX(pannel_width - 30 + IMGUI_RIGHT_ALIGN); ImGui::SetCursorPosX(pannel_width - 30 + IMGUI_RIGHT_ALIGN);
ImGuiToolkit::HelpMarker("Create a source from a file:\n- Video (*.mpg, *mov, *.avi, etc.)\n- Image (*.jpg, *.png, etc.)\n- Vector graphics (*.svg)\n- vimix session (*.vmx)\n\nEquivalent to dropping the file in the workspace."); ImGuiToolkit::HelpMarker("Create a source from a file:\n- Video (*.mpg, *mov, *.avi, etc.)\n- Image (*.jpg, *.png, etc.)\n- Vector graphics (*.svg)\n- vimix session (*.vmx)\n\nEquivalent to dropping the file in the workspace.");
// filename of the media to open
static char filename[2048];
// browse for a filename // browse for a filename
if (ImGuiToolkit::ButtonIcon(2, 5)) { if (ImGuiToolkit::ButtonIcon(2, 5)) {
std::thread (ImportFileDialogOpen, filename, Settings::application.recentImport.path).detach(); std::thread (ImportFileDialogOpen, new_source_filename_, Settings::application.recentImport.path).detach();
} }
// combo of recent media filenames // combo of recent media filenames
ImGui::SameLine(0, 10); ImGui::SameLine(0, 10);
ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN); ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN);
if (ImGui::BeginCombo("##RecentImport", "Select recent")) if (ImGui::BeginCombo("##RecentImport", "Select recent"))
{ {
std::for_each(Settings::application.recentImport.filenames.begin(), for (auto path = Settings::application.recentImport.filenames.begin();
Settings::application.recentImport.filenames.end(), [](std::string& path) { path != Settings::application.recentImport.filenames.end(); path++ )
int right = MIN( 40, path.size()); {
if (ImGui::Selectable( path.substr( path.size() - right ).c_str() )) { int right = MIN( 40, path->size());
sprintf(filename, "%s", path.c_str()); if (ImGui::Selectable( path->substr( path->size() - right ).c_str() )) {
sprintf(new_source_filename_, "%s", path->c_str());
} }
}); }
ImGui::EndCombo(); ImGui::EndCombo();
} }
// filename text entry - [Return] to validate // filename text entry - [Return] to validate
ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN); ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN);
if (ImGui::InputText("Path", filename, IM_ARRAYSIZE(filename), ImGuiInputTextFlags_EnterReturnsTrue) ) { Source *s = nullptr;
Mixer::manager().createSourceFile( std::string(filename) ); if (ImGui::InputText("Path", new_source_filename_, IM_ARRAYSIZE(new_source_filename_), ImGuiInputTextFlags_EnterReturnsTrue) ) {
s = Mixer::manager().createSourceFile( std::string(new_source_filename_) );
selected_button[NAV_NEW] = false; selected_button[NAV_NEW] = false;
} }
// or press Validate button // or press Validate button
ImGui::Text(" "); ImGui::Text(" ");
if ( ImGui::Button("Create !", ImVec2(pannel_width - padding_width, 0)) ) { if ( ImGui::Button("Create !", ImVec2(pannel_width - padding_width, 0)) ) {
Mixer::manager().createSourceFile( std::string(filename) ); s = Mixer::manager().createSourceFile( std::string(new_source_filename_) );
selected_button[NAV_NEW] = false; selected_button[NAV_NEW] = false;
} }
Mixer::manager().insertSource(s);
} }
// Render Source creator // Render Source creator
else if (new_source_type == 1){ else if (new_source_type_ == 1){
// helper // helper
ImGui::SetCursorPosX(pannel_width - 30 + IMGUI_RIGHT_ALIGN); ImGui::SetCursorPosX(pannel_width - 30 + IMGUI_RIGHT_ALIGN);
ImGuiToolkit::HelpMarker("Create a source from a software algorithm or from vimix objects."); ImGuiToolkit::HelpMarker("Create a source from a software algorithm or from vimix objects.");
ImGui::Text(" "); // Selection of a source to create
if ( ImGui::Button("Create !", ImVec2(pannel_width - padding_width, 0)) ) { static uint texture = 0;
static ImVec2 preview_size;
static ImVec2 preview_uv1, preview_uv2;
static float preview_width = ImGui::GetContentRegionAvail().x IMGUI_RIGHT_ALIGN;
Mixer::manager().createSourceClone("toto"); ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN);
// Mixer::manager().createSourceRender(); if (ImGui::BeginCombo("##Source", "Select source"))
selected_button[NAV_NEW] = false; {
if (ImGui::Selectable( "Render" )) {
new_source_to_create_ = "Render";
texture = Mixer::manager().session()->frame()->texture();
preview_size = ImVec2( preview_width, preview_width / Mixer::manager().session()->frame()->aspectRatio());
preview_uv1 = ImVec2(0.f, 1.f);
preview_uv2 = ImVec2(1.f, 0.f);
}
SourceList::iterator iter;
for (iter = Mixer::manager().session()->begin(); iter != Mixer::manager().session()->end(); iter++)
{
if (ImGui::Selectable( (*iter)->name().c_str() )) {
new_source_to_create_ = (*iter)->name();
texture = (*iter)->texture();
preview_size = ImVec2( preview_width, preview_width / (*iter)->frame()->aspectRatio());
preview_uv1 = ImVec2(0.f, 0.f);
preview_uv2 = ImVec2(1.f, 1.f);
}
}
ImGui::EndCombo();
}
if (!new_source_to_create_.empty()) {
// preview
if (texture != 0) {
ImGui::Image((void*)(uintptr_t) texture, preview_size, preview_uv1, preview_uv2);
}
ImGui::Text("%s ", new_source_to_create_.c_str());
if ( ImGui::Button("Create !", ImVec2(pannel_width - padding_width, 0)) ) {
Source *s = nullptr;
if (new_source_to_create_ == "Render")
s = Mixer::manager().createSourceRender();
else
s = Mixer::manager().createSourceClone(new_source_to_create_);
Mixer::manager().insertSource(s);
// reset for next time
new_source_to_create_ = "";
texture = 0;
selected_button[NAV_NEW] = false;
}
} }
} }

4
UserInterfaceManager.h
View File

@@ -33,6 +33,10 @@ class Navigator
void RenderNewPannel(); void RenderNewPannel();
void RenderMainPannel(); void RenderMainPannel();
int new_source_type_;
std::string new_source_to_create_;
char new_source_filename_[2048];
public: public:
Navigator(); Navigator();

49
main.cpp
View File

@@ -24,25 +24,10 @@
#include "ImGuiVisitor.h" #include "ImGuiVisitor.h"
// vmix // vmix
#include "defines.h"
#include "Settings.h" #include "Settings.h"
// mixing
#include "Mixer.h" #include "Mixer.h"
#include "Source.h"
#include "RenderingManager.h" #include "RenderingManager.h"
#include "UserInterfaceManager.h" #include "UserInterfaceManager.h"
#include "FrameBuffer.h"
#include "Resource.h"
#include "ImageProcessingShader.h"
#include "MediaPlayer.h"
#include "Scene.h"
#include "Primitives.h"
#include "Mesh.h"
#include "SessionVisitor.h"
#define PI 3.14159265358979323846
void drawScene() void drawScene()
@@ -83,31 +68,11 @@ int main(int, char**)
#endif #endif
// test text editor // test text editor
UserInterface::manager().fillShaderEditor( Resource::getText("shaders/image.fs") ); // UserInterface::manager().fillShaderEditor( Resource::getText("shaders/image.fs") );
// draw the scene // draw the scene
Rendering::manager().PushFrontDrawCallback(drawScene); Rendering::manager().PushFrontDrawCallback(drawScene);
// init elements to the scene
// if ( !Mixer::manager().open("./testsession.vmx") )
// {
// Mixer::manager().createSourceMedia("file:///home/bhbn/Videos/iss.mov");
// Mixer::manager().createSourceMedia("file:///home/bhbn/Videos/fish.mp4");
// }
// Animation A;
// A.translation_ = glm::vec3(0.f, 0.f, 3.f);
// A.speed_ = 0.1f;
// A.axis_ = glm::vec3(1.f, 1.f, 1.f);
// Mesh P("mesh/point.ply");
// P.scale_ = glm::vec3(0.15f);
// A.addChild(&P);
// Mixer::manager().currentView()->scene.root()->addChild(&A);
// custom test window
// Rendering::manager().PushBackDrawCallback(drawCustomGui);
/// ///
/// Main LOOP /// Main LOOP
/// ///
@@ -118,11 +83,21 @@ int main(int, char**)
Rendering::manager().Draw(); Rendering::manager().Draw();
} }
///
/// UI TERMINATE
///
UserInterface::manager().Terminate(); UserInterface::manager().Terminate();
///
/// RENDERING TERMINATE
///
Rendering::manager().Terminate(); Rendering::manager().Terminate();
///
/// Settings
///
Settings::Save(); Settings::Save();
/// ok
return 0; return 0;
} }