From 5e3b0112168e146f768f54199a338b43bb0c1426 Mon Sep 17 00:00:00 2001 From: aiekick Date: Thu, 28 Dec 2023 00:29:54 +0100 Subject: [PATCH] - --- Plugins/AudiArt/src/Headers/AudiArtBuild.h | 4 ++-- .../CodeGenerator/src/Headers/CodeGeneratorBuild.h | 4 ++-- Plugins/Landscape/src/Headers/LandscapeBuild.h | 4 ++-- Plugins/Lighting/src/Headers/LightingBuild.h | 4 ++-- Plugins/MeshGen/src/Headers/MeshGenBuild.h | 4 ++-- Plugins/Misc/src/Headers/MiscBuild.h | 4 ++-- Plugins/Particles/src/Headers/ParticlesBuild.h | 4 ++-- Plugins/PlanetSystem/src/Headers/PlanetSystemBuild.h | 4 ++-- .../PostProcessing/src/Headers/PostProcessingBuild.h | 4 ++-- Plugins/RTX/src/Headers/RTXBuild.h | 4 ++-- Plugins/ScreenSpace/src/Headers/ScreenSpaceBuild.h | 4 ++-- Plugins/Simulation/src/Headers/SimulationBuild.h | 4 ++-- Plugins/Smoke/src/Headers/SmokeBuild.h | 4 ++-- VERSION | 2 +- .../include/LumoBackend/Graph/Base/BaseNode.h | 2 ++ .../include/LumoBackend/Headers/LumoBackendBuild.h | 4 ++-- libs/LumoBackend/src/Graph/Base/BaseNode.cpp | 11 ++++++++++- src/Headers/LumoBuild.h | 4 ++-- 18 files changed, 43 insertions(+), 32 deletions(-) diff --git a/Plugins/AudiArt/src/Headers/AudiArtBuild.h b/Plugins/AudiArt/src/Headers/AudiArtBuild.h index 706de07a0..c4601dc0f 100644 --- a/Plugins/AudiArt/src/Headers/AudiArtBuild.h +++ b/Plugins/AudiArt/src/Headers/AudiArtBuild.h @@ -1,7 +1,7 @@ #pragma once #define AudiArt_Prefix "AudiArt" -#define AudiArt_BuildNumber 116 +#define AudiArt_BuildNumber 117 #define AudiArt_MinorNumber 0 #define AudiArt_MajorNumber 0 -#define AudiArt_BuildId "0.0.116" +#define AudiArt_BuildId "0.0.117" diff --git a/Plugins/CodeGenerator/src/Headers/CodeGeneratorBuild.h b/Plugins/CodeGenerator/src/Headers/CodeGeneratorBuild.h index c3dd4c6da..8cc2b2f06 100644 --- a/Plugins/CodeGenerator/src/Headers/CodeGeneratorBuild.h +++ b/Plugins/CodeGenerator/src/Headers/CodeGeneratorBuild.h @@ -1,7 +1,7 @@ #pragma once #define CodeGenerator_Prefix "CodeGenerator" -#define CodeGenerator_BuildNumber 732 +#define CodeGenerator_BuildNumber 734 #define CodeGenerator_MinorNumber 0 #define CodeGenerator_MajorNumber 0 -#define CodeGenerator_BuildId "0.0.732" +#define CodeGenerator_BuildId "0.0.734" diff --git a/Plugins/Landscape/src/Headers/LandscapeBuild.h b/Plugins/Landscape/src/Headers/LandscapeBuild.h index e409fdbef..560efb7f4 100644 --- a/Plugins/Landscape/src/Headers/LandscapeBuild.h +++ b/Plugins/Landscape/src/Headers/LandscapeBuild.h @@ -1,7 +1,7 @@ #pragma once #define Landscape_Prefix "Landscape" -#define Landscape_BuildNumber 18 +#define Landscape_BuildNumber 19 #define Landscape_MinorNumber 0 #define Landscape_MajorNumber 0 -#define Landscape_BuildId "0.0.18" +#define Landscape_BuildId "0.0.19" diff --git a/Plugins/Lighting/src/Headers/LightingBuild.h b/Plugins/Lighting/src/Headers/LightingBuild.h index d752be865..d7a746c02 100644 --- a/Plugins/Lighting/src/Headers/LightingBuild.h +++ b/Plugins/Lighting/src/Headers/LightingBuild.h @@ -1,7 +1,7 @@ #pragma once #define Lighting_Prefix "Lighting" -#define Lighting_BuildNumber 646 +#define Lighting_BuildNumber 647 #define Lighting_MinorNumber 0 #define Lighting_MajorNumber 0 -#define Lighting_BuildId "0.0.646" +#define Lighting_BuildId "0.0.647" diff --git a/Plugins/MeshGen/src/Headers/MeshGenBuild.h b/Plugins/MeshGen/src/Headers/MeshGenBuild.h index cb31b6316..7ad7ca8e5 100644 --- a/Plugins/MeshGen/src/Headers/MeshGenBuild.h +++ b/Plugins/MeshGen/src/Headers/MeshGenBuild.h @@ -1,7 +1,7 @@ #pragma once #define MeshGen_Prefix "MeshGen" -#define MeshGen_BuildNumber 400 +#define MeshGen_BuildNumber 401 #define MeshGen_MinorNumber 0 #define MeshGen_MajorNumber 0 -#define MeshGen_BuildId "0.0.400" +#define MeshGen_BuildId "0.0.401" diff --git a/Plugins/Misc/src/Headers/MiscBuild.h b/Plugins/Misc/src/Headers/MiscBuild.h index 5367c6f0a..becae8fe9 100644 --- a/Plugins/Misc/src/Headers/MiscBuild.h +++ b/Plugins/Misc/src/Headers/MiscBuild.h @@ -1,7 +1,7 @@ #pragma once #define Misc_Prefix "Misc" -#define Misc_BuildNumber 198 +#define Misc_BuildNumber 199 #define Misc_MinorNumber 1 #define Misc_MajorNumber 0 -#define Misc_BuildId "0.1.198" +#define Misc_BuildId "0.1.199" diff --git a/Plugins/Particles/src/Headers/ParticlesBuild.h b/Plugins/Particles/src/Headers/ParticlesBuild.h index ce7b9dab9..a106ca569 100644 --- a/Plugins/Particles/src/Headers/ParticlesBuild.h +++ b/Plugins/Particles/src/Headers/ParticlesBuild.h @@ -1,7 +1,7 @@ #pragma once #define Particles_Prefix "Particles" -#define Particles_BuildNumber 428 +#define Particles_BuildNumber 429 #define Particles_MinorNumber 0 #define Particles_MajorNumber 0 -#define Particles_BuildId "0.0.428" +#define Particles_BuildId "0.0.429" diff --git a/Plugins/PlanetSystem/src/Headers/PlanetSystemBuild.h b/Plugins/PlanetSystem/src/Headers/PlanetSystemBuild.h index d34effe82..c49661220 100644 --- a/Plugins/PlanetSystem/src/Headers/PlanetSystemBuild.h +++ b/Plugins/PlanetSystem/src/Headers/PlanetSystemBuild.h @@ -1,7 +1,7 @@ #pragma once #define PlanetSystem_Prefix "PlanetSystem" -#define PlanetSystem_BuildNumber 185 +#define PlanetSystem_BuildNumber 186 #define PlanetSystem_MinorNumber 0 #define PlanetSystem_MajorNumber 0 -#define PlanetSystem_BuildId "0.0.185" +#define PlanetSystem_BuildId "0.0.186" diff --git a/Plugins/PostProcessing/src/Headers/PostProcessingBuild.h b/Plugins/PostProcessing/src/Headers/PostProcessingBuild.h index 9479bf523..a347776b7 100644 --- a/Plugins/PostProcessing/src/Headers/PostProcessingBuild.h +++ b/Plugins/PostProcessing/src/Headers/PostProcessingBuild.h @@ -1,7 +1,7 @@ #pragma once #define PostProcessing_Prefix "PostProcessing" -#define PostProcessing_BuildNumber 695 +#define PostProcessing_BuildNumber 696 #define PostProcessing_MinorNumber 1 #define PostProcessing_MajorNumber 0 -#define PostProcessing_BuildId "0.1.695" +#define PostProcessing_BuildId "0.1.696" diff --git a/Plugins/RTX/src/Headers/RTXBuild.h b/Plugins/RTX/src/Headers/RTXBuild.h index 00c8cb9c4..fed8dc108 100644 --- a/Plugins/RTX/src/Headers/RTXBuild.h +++ b/Plugins/RTX/src/Headers/RTXBuild.h @@ -1,7 +1,7 @@ #pragma once #define RTX_Prefix "RTX" -#define RTX_BuildNumber 468 +#define RTX_BuildNumber 469 #define RTX_MinorNumber 0 #define RTX_MajorNumber 0 -#define RTX_BuildId "0.0.468" +#define RTX_BuildId "0.0.469" diff --git a/Plugins/ScreenSpace/src/Headers/ScreenSpaceBuild.h b/Plugins/ScreenSpace/src/Headers/ScreenSpaceBuild.h index 3889cffdf..662ef17c7 100644 --- a/Plugins/ScreenSpace/src/Headers/ScreenSpaceBuild.h +++ b/Plugins/ScreenSpace/src/Headers/ScreenSpaceBuild.h @@ -1,7 +1,7 @@ #pragma once #define ScreenSpace_Prefix "ScreenSpace" -#define ScreenSpace_BuildNumber 171 +#define ScreenSpace_BuildNumber 172 #define ScreenSpace_MinorNumber 0 #define ScreenSpace_MajorNumber 0 -#define ScreenSpace_BuildId "0.0.171" +#define ScreenSpace_BuildId "0.0.172" diff --git a/Plugins/Simulation/src/Headers/SimulationBuild.h b/Plugins/Simulation/src/Headers/SimulationBuild.h index 818311e3a..4b987d575 100644 --- a/Plugins/Simulation/src/Headers/SimulationBuild.h +++ b/Plugins/Simulation/src/Headers/SimulationBuild.h @@ -1,7 +1,7 @@ #pragma once #define Simulation_Prefix "Simulation" -#define Simulation_BuildNumber 457 +#define Simulation_BuildNumber 458 #define Simulation_MinorNumber 1 #define Simulation_MajorNumber 0 -#define Simulation_BuildId "0.1.457" +#define Simulation_BuildId "0.1.458" diff --git a/Plugins/Smoke/src/Headers/SmokeBuild.h b/Plugins/Smoke/src/Headers/SmokeBuild.h index 43ac52a5e..49caf7a36 100644 --- a/Plugins/Smoke/src/Headers/SmokeBuild.h +++ b/Plugins/Smoke/src/Headers/SmokeBuild.h @@ -1,7 +1,7 @@ #pragma once #define Smoke_Prefix "Smoke" -#define Smoke_BuildNumber 43 +#define Smoke_BuildNumber 44 #define Smoke_MinorNumber 0 #define Smoke_MajorNumber 0 -#define Smoke_BuildId "0.0.43" +#define Smoke_BuildId "0.0.44" diff --git a/VERSION b/VERSION index f6a74452f..674c404e8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Lumo_Windows_Debug_x64_v0.0.5546 +Lumo_Windows_Debug_x64_v0.0.5561 diff --git a/libs/LumoBackend/include/LumoBackend/Graph/Base/BaseNode.h b/libs/LumoBackend/include/LumoBackend/Graph/Base/BaseNode.h index 902d23e42..54acaa697 100644 --- a/libs/LumoBackend/include/LumoBackend/Graph/Base/BaseNode.h +++ b/libs/LumoBackend/include/LumoBackend/Graph/Base/BaseNode.h @@ -438,6 +438,8 @@ class LUMO_BACKEND_API BaseNode : public conf::ConfigAbstract, void ZoomToSelection() const; void NavigateToSelection() const; + [[nodiscard]] ImVec2 GetMousePos() const; + [[nodiscard]] ImVec2 GetCanvasOffset() const; [[nodiscard]] float GetCanvasScale() const; diff --git a/libs/LumoBackend/include/LumoBackend/Headers/LumoBackendBuild.h b/libs/LumoBackend/include/LumoBackend/Headers/LumoBackendBuild.h index 38f421be3..fc27b392d 100644 --- a/libs/LumoBackend/include/LumoBackend/Headers/LumoBackendBuild.h +++ b/libs/LumoBackend/include/LumoBackend/Headers/LumoBackendBuild.h @@ -1,7 +1,7 @@ #pragma once #define LumoBackend_Prefix "LumoBackend" -#define LumoBackend_BuildNumber 681 +#define LumoBackend_BuildNumber 687 #define LumoBackend_MinorNumber 2 #define LumoBackend_MajorNumber 0 -#define LumoBackend_BuildId "0.2.681" +#define LumoBackend_BuildId "0.2.687" diff --git a/libs/LumoBackend/src/Graph/Base/BaseNode.cpp b/libs/LumoBackend/src/Graph/Base/BaseNode.cpp index d1dc31c63..634e3f3ea 100644 --- a/libs/LumoBackend/src/Graph/Base/BaseNode.cpp +++ b/libs/LumoBackend/src/Graph/Base/BaseNode.cpp @@ -440,6 +440,11 @@ void BaseNode::NavigateToSelection() const { ////// CANVAS QUERY ////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// +ImVec2 BaseNode::GetMousePos() const { + return ImGui::GetMousePosOnOpeningCurrentPopup(); + return ImGui::GetMousePos(); +} + ImVec2 BaseNode::GetCanvasOffset() const { if (m_BaseNodeState.m_NodeGraphContext) { ax::NodeEditor::SetCurrentEditor(m_BaseNodeState.m_NodeGraphContext); @@ -1339,20 +1344,24 @@ void BaseNode::DoShorcutsOnNode(BaseNodeState* vBaseNodeState) { } void BaseNode::DoPopups(BaseNodeState* vBaseNodeState) { - m_OpenPopupPosition = ImGui::GetMousePos(); ax::NodeEditor::Suspend(); if (vBaseNodeState->m_CustomContextMenuRequested && !vBaseNodeState->m_CustomContextMenuNode.expired()) { + m_OpenPopupPosition = GetMousePos(); ImGui::OpenPopup("CustomNodePopup"); vBaseNodeState->m_CustomContextMenuRequested = false; } else if (ax::NodeEditor::ShowNodeContextMenu(&m_ContextMenuNodeId)) { + m_OpenPopupPosition = GetMousePos(); ImGui::OpenPopup("NodeContextMenu"); } else if (ax::NodeEditor::ShowPinContextMenu(&m_ContextMenuSlotId)) { + m_OpenPopupPosition = GetMousePos(); ImGui::OpenPopup("SlotContextMenu"); } else if (ax::NodeEditor::ShowLinkContextMenu(&m_ContextMenuLinkId)) { + m_OpenPopupPosition = GetMousePos(); ImGui::OpenPopup("LinkContextMenu"); } else if (ax::NodeEditor::ShowBackgroundContextMenu()) { + m_OpenPopupPosition = GetMousePos(); vBaseNodeState->linkFromSlot.reset(); ImGui::OpenPopup("CreateNewNode"); } diff --git a/src/Headers/LumoBuild.h b/src/Headers/LumoBuild.h index eb9da091b..d9747ca83 100644 --- a/src/Headers/LumoBuild.h +++ b/src/Headers/LumoBuild.h @@ -1,7 +1,7 @@ #pragma once #define Lumo_Prefix "Lumo" -#define Lumo_BuildNumber 5558 +#define Lumo_BuildNumber 5563 #define Lumo_MinorNumber 0 #define Lumo_MajorNumber 0 -#define Lumo_BuildId "0.0.5558" +#define Lumo_BuildId "0.0.5563"