Skip to content

Commit

Permalink
Core : Add events duplication prevention
Browse files Browse the repository at this point in the history
  • Loading branch information
@diegomrno
diegomrno committed May 15, 2024
1 parent 9dbcf87 commit d0bfbb8
Show file tree
Hide file tree
Showing 5 changed files with 161 additions and 83 deletions.
Binary file modified build/bin/vortex
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion main/builtint/vortex.modules.builtin.toolchains
Submodule vortex.modules.builtin.toolchains updated 4 files
+16 −1 main.cpp
+8 −10 src/instances/toolchainInstance/ToolchainRenderInstance.cpp
+244 −236 src/module.cpp
+2 −0 src/module.h
20 changes: 20 additions & 0 deletions main/src/modules/interface.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,16 @@ void ModuleInterface::AddFunction(void (*item)(), const std::string &name)
*/
void ModuleInterface::AddInputEvent(void (*item)(const std::shared_ptr<hArgs> &args), const std::string &name)
{
// Checking if the event already exist
for(auto existing_events : this->m_input_events)
{
if(name == existing_events->m_name)
{
this->LogError("\"" + name + "\" event already registered ! Abording.");
return;
}
}

// Create a shared_ptr to the ModuleInputEvent
std::shared_ptr<ModuleInputEvent> p_event = std::make_shared<ModuleInputEvent>(item, name);

Expand All @@ -130,6 +140,16 @@ void ModuleInterface::AddInputEvent(void (*item)(const std::shared_ptr<hArgs> &a

void ModuleInterface::AddInputEvent(void (*item)(const std::shared_ptr<hArgs>& args), const std::string& name, DevFlag devflag, const std::string& description, const std::vector<std::tuple<std::string, std::string, std::string>>& args_def, const bool& can_callback)
{
// Checking if the event already exist
for(auto existing_events : this->m_input_events)
{
if(name == existing_events->m_name)
{
this->LogError("\"" + name + "\" event already registered ! Abording.");
return;
}
}

// Create a shared_ptr to the ModuleInputEvent
std::shared_ptr<ModuleInputEvent> p_event = std::make_shared<ModuleInputEvent>(item, name);

Expand Down
13 changes: 11 additions & 2 deletions main/src/modules/runtime.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,17 @@ VORTEX_API void FinalStartModule(const std::string &module_name, std::shared_ptr
VortexMaker::LogInfo("Modules", "Start \"" + em->m_name + "\"");
processed_modules->push_back(em->m_name);

VortexMaker::LogWarn("qsd","qsd");
em->Start();
try
{
em->Start();
}
catch (const std::exception &e)
{
// Log the error
VortexMaker::LogError("Modules", "Error starting module \"" + em->m_name + "\": " + e.what());
// Continue to the next module
continue;
}
}
}
}
Expand Down
209 changes: 129 additions & 80 deletions tools/editor/app/instances/Utils/ModuleDetails/ModuleDetails.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ std::string ModuleDetails::render()
ImGui::Text(this->m_module->m_proper_name.c_str());

ImGui::TextColored(ImVec4(1.0f, 1.0f, 1.0f, 0.5f), "Module State :");
ImGui::SameLine();
ImGui::SameLine();
if (this->m_module->m_state == "running")
{
ImGui::TextColored(ImVec4(0.6f, 1.0f, 0.6f, 0.8f), "Running");
Expand All @@ -165,7 +165,6 @@ std::string ModuleDetails::render()
ImGui::TextColored(ImVec4(1.0f, 1.0f, 1.0f, 0.5f), "Not running");
}


ImGui::GetFont()->Scale = oldsize;
ImGui::PopFont();

Expand All @@ -183,77 +182,128 @@ std::string ModuleDetails::render()
ImGui::SameLine();
static std::string version;
version.clear();
for(auto ver : this->m_module->m_supported_versions){
for (auto ver : this->m_module->m_supported_versions)
{
version += "[" + ver + "]";
}
ImGui::Text(version.c_str());

ImGui::Separator();
if (ImGui::CollapsingHeader("Dependancies"))
{ static ImGuiTableFlags flags = ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_RowBg | ImGuiTableFlags_Borders | ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable;

if (ImGui::BeginTable("table_deps", 4, flags))
{
ImGui::TableSetupColumn("Name", ImGuiTableColumnFlags_WidthFixed);
ImGui::TableSetupColumn("Type", ImGuiTableColumnFlags_WidthFixed);
ImGui::TableSetupColumn("Version", ImGuiTableColumnFlags_WidthFixed);
ImGui::TableSetupColumn("State", ImGuiTableColumnFlags_WidthFixed);
ImGui::TableHeadersRow();
for (int i = 0; i < this->m_module->m_dependencies.size(); i++)
{
ImGui::TableNextRow();
for (int column = 0; column < 4; column++)
{
ImGui::TableSetColumnIndex(column);

if (column == 0)
{
ImGui::Text(this->m_module->m_dependencies[i]->name.c_str());
}
else if (column == 1)
{
ImGui::Text(this->m_module->m_dependencies[i]->type.c_str());
}
else if (column == 2)
{
static std::string versions;
versions.clear();
for(auto ver : this->m_module->m_dependencies[i]->supported_versions)
{
version += "[" + ver + "] ";
}

ImGui::Text(versions.c_str());
}
else if (column == 3)
{

if (this->m_module->m_dependencies[i]->satisfied)
{
ImGui::TextColored(ImVec4(0.0f, 1.0f, 0.0f, 1.0f), "Satisfied");
}
else
{
ImGui::TextColored(ImVec4(1.0f, 0.0f, 0.0f, 1.0f), "Not satisfied");
}

}

}
}
ImGui::EndTable();
}

}
if (ImGui::CollapsingHeader("Instances"))
{
// Behavior
}
if (ImGui::CollapsingHeader("Input events"))
{
for (int row = 0; row < this->m_module->m_input_events.size(); row++)
{

if (ImGui::TreeNode(this->m_module->m_input_events[row]->m_name.c_str()))
{
ImGui::Text("Name : ");
ImGui::SameLine();
ImGui::Text(this->m_module->m_input_events[row]->m_name.c_str());
ImGui::Text("Description : ");
ImGui::SameLine();
ImGui::Text(this->m_module->m_input_events[row]->m_description.c_str());

if(this->m_module->m_input_events[row]->m_devflag == DevFlag::READY)
{
ImGui::TextColored(ImVec4(0.0f, 1.0f, 0.0f, 1.0f), "Ready to use");
}
else if(this->m_module->m_input_events[row]->m_devflag == DevFlag::DEPRECIATED)
for (int row = 0; row < this->m_module->m_input_events.size(); row++)
{
ImGui::TextColored(ImVec4(0.8f, 0.8f, 0.0f, 1.0f), "Depreciated");
}

static ImGuiTableFlags flags = ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_RowBg | ImGuiTableFlags_Borders | ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable;

if (ImGui::BeginTable("table_input_event_args", 3, flags))
{
ImGui::TableSetupColumn("Name", ImGuiTableColumnFlags_WidthFixed);
ImGui::TableSetupColumn("C++ type", ImGuiTableColumnFlags_WidthFixed);
ImGui::TableSetupColumn("Description", ImGuiTableColumnFlags_WidthFixed);
ImGui::TableHeadersRow();
for (int param = 0; param < this->m_module->m_input_events[row]->m_params.size(); param++)
if (ImGui::TreeNode(this->m_module->m_input_events[row]->m_name.c_str()))
{
ImGui::TableNextRow();
for (int column = 0; column < 3; column++)
ImGui::Text("Name : ");
ImGui::SameLine();
ImGui::Text(this->m_module->m_input_events[row]->m_name.c_str());
ImGui::Text("Description : ");
ImGui::SameLine();
ImGui::Text(this->m_module->m_input_events[row]->m_description.c_str());

if (this->m_module->m_input_events[row]->m_devflag == DevFlag::READY)
{
ImGui::TableSetColumnIndex(column);
ImGui::TextColored(ImVec4(0.0f, 1.0f, 0.0f, 1.0f), "Ready to use");
}
else if (this->m_module->m_input_events[row]->m_devflag == DevFlag::DEPRECIATED)
{
ImGui::TextColored(ImVec4(0.8f, 0.8f, 0.0f, 1.0f), "Depreciated");
}

if (column == 0)
{
ImGui::Text(std::get<0>(this->m_module->m_input_events[row]->m_params[param]).c_str());
}
if (column == 1)
{
ImGui::Text(std::get<1>(this->m_module->m_input_events[row]->m_params[param]).c_str());
}
if (column == 2)
static ImGuiTableFlags flags = ImGuiTableFlags_SizingFixedFit | ImGuiTableFlags_RowBg | ImGuiTableFlags_Borders | ImGuiTableFlags_Resizable | ImGuiTableFlags_Reorderable | ImGuiTableFlags_Hideable;

if (ImGui::BeginTable("table_input_event_args", 3, flags))
{
ImGui::TableSetupColumn("Name", ImGuiTableColumnFlags_WidthFixed);
ImGui::TableSetupColumn("C++ type", ImGuiTableColumnFlags_WidthFixed);
ImGui::TableSetupColumn("Description", ImGuiTableColumnFlags_WidthFixed);
ImGui::TableHeadersRow();
for (int param = 0; param < this->m_module->m_input_events[row]->m_params.size(); param++)
{
ImGui::Text(std::get<2>(this->m_module->m_input_events[row]->m_params[param]).c_str());
ImGui::TableNextRow();
for (int column = 0; column < 3; column++)
{
ImGui::TableSetColumnIndex(column);

if (column == 0)
{
ImGui::Text(std::get<0>(this->m_module->m_input_events[row]->m_params[param]).c_str());
}
if (column == 1)
{
ImGui::Text(std::get<1>(this->m_module->m_input_events[row]->m_params[param]).c_str());
}
if (column == 2)
{
ImGui::Text(std::get<2>(this->m_module->m_input_events[row]->m_params[param]).c_str());
}
}
}
ImGui::EndTable();
}
}
ImGui::EndTable();
}

}

}



}
if (ImGui::CollapsingHeader("Functions"))
{
Expand Down Expand Up @@ -365,43 +415,42 @@ std::string ModuleDetails::render()
ImGui::TableHeadersRow();
for (int i = 0; i < logs.size(); i++)
{
ImGui::TableNextRow();
for (int column = 0; column < 4; column++)
ImGui::TableNextRow();
for (int column = 0; column < 4; column++)
{
ImGui::TableSetColumnIndex(column);
if (column == 0)
{
ImGui::TableSetColumnIndex(column);
if (column == 0)
if (logs[i]->m_level == spdlog::level::critical)
{
if (logs[i]->m_level == spdlog::level::critical)
{
ImGui::TextColored(ImVec4(1.0f, 0.0f, 0.0f, 1.0f), "Fatal");
}
else if (logs[i]->m_level == spdlog::level::err)
{
ImGui::TextColored(ImVec4(0.8f, 0.2f, 0.2f, 1.0f), "Error");
}
else if (logs[i]->m_level == spdlog::level::warn)
{
ImGui::TextColored(ImVec4(0.8f, 0.8f, 0.0f, 1.0f), "Warning");
}
else if (logs[i]->m_level == spdlog::level::info)
{
ImGui::TextColored(ImVec4(0.0f, 1.0f, 0.0f, 1.0f), "Information");
}
ImGui::TextColored(ImVec4(1.0f, 0.0f, 0.0f, 1.0f), "Fatal");
}
else if (column == 1)
else if (logs[i]->m_level == spdlog::level::err)
{
ImGui::Text(logs[i]->m_timestamp.c_str());
ImGui::TextColored(ImVec4(0.8f, 0.2f, 0.2f, 1.0f), "Error");
}
else if (column == 2)
else if (logs[i]->m_level == spdlog::level::warn)
{
ImGui::Text(logs[i]->m_filter.c_str());
ImGui::TextColored(ImVec4(0.8f, 0.8f, 0.0f, 1.0f), "Warning");
}
else if (column == 3)
else if (logs[i]->m_level == spdlog::level::info)
{
ImGui::Text(logs[i]->m_message.c_str());
ImGui::TextColored(ImVec4(0.0f, 1.0f, 0.0f, 1.0f), "Information");
}
}

else if (column == 1)
{
ImGui::Text(logs[i]->m_timestamp.c_str());
}
else if (column == 2)
{
ImGui::Text(logs[i]->m_filter.c_str());
}
else if (column == 3)
{
ImGui::TextWrapped(logs[i]->m_message.c_str());
}
}
}
ImGui::EndTable();
}
Expand Down

0 comments on commit d0bfbb8

Please sign in to comment.