Skip to content

Commit

Permalink
-
Browse files Browse the repository at this point in the history
  • Loading branch information
aiekick committed Dec 27, 2023
1 parent f8b91d1 commit 5e3b011
Show file tree
Hide file tree
Showing 18 changed files with 43 additions and 32 deletions.
4 changes: 2 additions & 2 deletions Plugins/AudiArt/src/Headers/AudiArtBuild.h
Original file line number Diff line number Diff line change
@@ -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"
4 changes: 2 additions & 2 deletions Plugins/CodeGenerator/src/Headers/CodeGeneratorBuild.h
Original file line number Diff line number Diff line change
@@ -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"
4 changes: 2 additions & 2 deletions Plugins/Landscape/src/Headers/LandscapeBuild.h
Original file line number Diff line number Diff line change
@@ -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"
4 changes: 2 additions & 2 deletions Plugins/Lighting/src/Headers/LightingBuild.h
Original file line number Diff line number Diff line change
@@ -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"
4 changes: 2 additions & 2 deletions Plugins/MeshGen/src/Headers/MeshGenBuild.h
Original file line number Diff line number Diff line change
@@ -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"
4 changes: 2 additions & 2 deletions Plugins/Misc/src/Headers/MiscBuild.h
Original file line number Diff line number Diff line change
@@ -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"
4 changes: 2 additions & 2 deletions Plugins/Particles/src/Headers/ParticlesBuild.h
Original file line number Diff line number Diff line change
@@ -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"
4 changes: 2 additions & 2 deletions Plugins/PlanetSystem/src/Headers/PlanetSystemBuild.h
Original file line number Diff line number Diff line change
@@ -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"
4 changes: 2 additions & 2 deletions Plugins/PostProcessing/src/Headers/PostProcessingBuild.h
Original file line number Diff line number Diff line change
@@ -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"
4 changes: 2 additions & 2 deletions Plugins/RTX/src/Headers/RTXBuild.h
Original file line number Diff line number Diff line change
@@ -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"
4 changes: 2 additions & 2 deletions Plugins/ScreenSpace/src/Headers/ScreenSpaceBuild.h
Original file line number Diff line number Diff line change
@@ -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"
4 changes: 2 additions & 2 deletions Plugins/Simulation/src/Headers/SimulationBuild.h
Original file line number Diff line number Diff line change
@@ -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"
4 changes: 2 additions & 2 deletions Plugins/Smoke/src/Headers/SmokeBuild.h
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Lumo_Windows_Debug_x64_v0.0.5546
Lumo_Windows_Debug_x64_v0.0.5561
2 changes: 2 additions & 0 deletions libs/LumoBackend/include/LumoBackend/Graph/Base/BaseNode.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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"
11 changes: 10 additions & 1 deletion libs/LumoBackend/src/Graph/Base/BaseNode.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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");
}
Expand Down
4 changes: 2 additions & 2 deletions src/Headers/LumoBuild.h
Original file line number Diff line number Diff line change
@@ -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"

0 comments on commit 5e3b011

Please sign in to comment.