[RFR] : reformat code

aiekick · Dec 11, 2023 · c5b575e · c5b575e
1 parent cfc4ca5
commit c5b575e
Show file tree

Hide file tree

Showing 230 changed files with 911 additions and 883 deletions.
diff --git 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 94
+#define AudiArt_BuildNumber 98
 #define AudiArt_MinorNumber 0
 #define AudiArt_MajorNumber 0
-#define AudiArt_BuildId "0.0.94"
+#define AudiArt_BuildId "0.0.98"
diff --git a/Plugins/AudiArt/src/Modules/Operations/AudioTextureModule.h b/Plugins/AudiArt/src/Modules/Operations/AudioTextureModule.h
@@ -46,14 +46,14 @@ limitations under the License.
 #include <LumoBackend/Interfaces/ResizerInterface.h>
 
 #include <Interfaces/SceneAudiArtInputInterface.h>
-#include <LumoBackend/Interfaces/TextureOutputInterface.h>
+#include <LumoBackend/Interfaces/Texture2DOutputInterface.h>
 
 class AudioTextureModule_Comp_2D_Pass;
 class AudioTextureModule : public NodeInterface,
                            public BaseRenderer,
                            public TaskInterface,
                            public SceneAudiArtInputInterface,
-                           public TextureOutputInterface {
+                           public Texture2DOutputInterface {
 public:
     static std::shared_ptr<AudioTextureModule> Create(GaiApi::VulkanCoreWeak vVulkanCore, BaseNodeWeak vParentNode);
 

diff --git a/Plugins/AudiArt/src/Modules/Operations/HistorizeModule.h b/Plugins/AudiArt/src/Modules/Operations/HistorizeModule.h
@@ -45,15 +45,15 @@ limitations under the License.
 #include <LumoBackend/Interfaces/NodeInterface.h>
 #include <LumoBackend/Interfaces/ResizerInterface.h>
 
-#include <LumoBackend/Interfaces/TextureInputInterface.h>
-#include <LumoBackend/Interfaces/TextureOutputInterface.h>
+#include <LumoBackend/Interfaces/Texture2DInputInterface.h>
+#include <LumoBackend/Interfaces/Texture2DOutputInterface.h>
 
 class HistorizeModule_Comp_2D_Pass;
 class HistorizeModule : public NodeInterface,
                         public BaseRenderer,
                         public TaskInterface,
-                        public TextureInputInterface<0U>,
-                        public TextureOutputInterface {
+                        public Texture2DInputInterface<0U>,
+                        public Texture2DOutputInterface {
 public:
     static std::shared_ptr<HistorizeModule> Create(GaiApi::VulkanCoreWeak vVulkanCore, BaseNodeWeak vParentNode);
 

diff --git a/Plugins/AudiArt/src/Modules/Operations/Pass/AudioTextureModule_Comp_2D_Pass.h b/Plugins/AudiArt/src/Modules/Operations/Pass/AudioTextureModule_Comp_2D_Pass.h
@@ -41,9 +41,9 @@ limitations under the License.
 #include <LumoBackend/Interfaces/GuiInterface.h>
 #include <LumoBackend/Interfaces/NodeInterface.h>
 #include <Interfaces/SceneAudiArtInputInterface.h>
-#include <LumoBackend/Interfaces/TextureOutputInterface.h>
+#include <LumoBackend/Interfaces/Texture2DOutputInterface.h>
 
-class AudioTextureModule_Comp_2D_Pass : public ShaderPass, public SceneAudiArtInputInterface, public TextureOutputInterface, public NodeInterface {
+class AudioTextureModule_Comp_2D_Pass : public ShaderPass, public SceneAudiArtInputInterface, public Texture2DOutputInterface, public NodeInterface {
 private:
 public:
     AudioTextureModule_Comp_2D_Pass(GaiApi::VulkanCoreWeak vVulkanCore);

diff --git a/Plugins/AudiArt/src/Modules/Operations/Pass/HistorizeModule_Comp_2D_Pass.h b/Plugins/AudiArt/src/Modules/Operations/Pass/HistorizeModule_Comp_2D_Pass.h
@@ -40,10 +40,10 @@ limitations under the License.
 
 #include <LumoBackend/Interfaces/GuiInterface.h>
 #include <LumoBackend/Interfaces/NodeInterface.h>
-#include <LumoBackend/Interfaces/TextureInputInterface.h>
-#include <LumoBackend/Interfaces/TextureOutputInterface.h>
+#include <LumoBackend/Interfaces/Texture2DInputInterface.h>
+#include <LumoBackend/Interfaces/Texture2DOutputInterface.h>
 
-class HistorizeModule_Comp_2D_Pass : public ShaderPass, public TextureInputInterface<1>, public TextureOutputInterface, public NodeInterface {
+class HistorizeModule_Comp_2D_Pass : public ShaderPass, public Texture2DInputInterface<1>, public Texture2DOutputInterface, public NodeInterface {
 private:
     struct UBO_Comp {
         alignas(4) float u_Name1 = 0.0f;

diff --git a/Plugins/AudiArt/src/Modules/Viewer/Pass/VisuHexGridModule_Vertex_Pass.h b/Plugins/AudiArt/src/Modules/Viewer/Pass/VisuHexGridModule_Vertex_Pass.h
@@ -40,10 +40,10 @@ limitations under the License.
 
 #include <LumoBackend/Interfaces/GuiInterface.h>
 #include <LumoBackend/Interfaces/NodeInterface.h>
-#include <LumoBackend/Interfaces/TextureInputInterface.h>
-#include <LumoBackend/Interfaces/TextureOutputInterface.h>
+#include <LumoBackend/Interfaces/Texture2DInputInterface.h>
+#include <LumoBackend/Interfaces/Texture2DOutputInterface.h>
 
-class VisuHexGridModule_Vertex_Pass : public VertexShaderPass, public TextureInputInterface<1>, public TextureOutputInterface, public NodeInterface {
+class VisuHexGridModule_Vertex_Pass : public VertexShaderPass, public Texture2DInputInterface<1>, public Texture2DOutputInterface, public NodeInterface {
 private:
     struct UBO_Frag {
         alignas(4) float u_Name1 = 0.0f;

diff --git a/Plugins/AudiArt/src/Modules/Viewer/VisuHexGridModule.h b/Plugins/AudiArt/src/Modules/Viewer/VisuHexGridModule.h
@@ -45,15 +45,15 @@ limitations under the License.
 #include <LumoBackend/Interfaces/NodeInterface.h>
 #include <LumoBackend/Interfaces/ResizerInterface.h>
 
-#include <LumoBackend/Interfaces/TextureInputInterface.h>
-#include <LumoBackend/Interfaces/TextureOutputInterface.h>
+#include <LumoBackend/Interfaces/Texture2DInputInterface.h>
+#include <LumoBackend/Interfaces/Texture2DOutputInterface.h>
 
 class VisuHexGridModule_Vertex_Pass;
 class VisuHexGridModule : public NodeInterface,
                           public BaseRenderer,
                           public TaskInterface,
-                          public TextureInputInterface<0U>,
-                          public TextureOutputInterface {
+                          public Texture2DInputInterface<0U>,
+                          public Texture2DOutputInterface {
 public:
     static std::shared_ptr<VisuHexGridModule> Create(GaiApi::VulkanCoreWeak vVulkanCore, BaseNodeWeak vParentNode);
 

diff --git a/Plugins/AudiArt/src/Nodes/Operations/AudioTextureNode.cpp b/Plugins/AudiArt/src/Nodes/Operations/AudioTextureNode.cpp
@@ -20,7 +20,7 @@ limitations under the License.
 #include "AudioTextureNode.h"
 #include <Modules/Operations/AudioTextureModule.h>
 #include <Slots/NodeSlotSceneAudiArtInput.h>
-#include <LumoBackend/Graph/Slots/NodeSlotTextureOutput.h>
+#include <LumoBackend/Graph/Slots/NodeSlotTexture2DOutput.h>
 
 #ifdef PROFILER_INCLUDE
 #include <Gaia/gaia.h>
@@ -71,7 +71,7 @@ bool AudioTextureNode::Init(GaiApi::VulkanCoreWeak vVulkanCore) {
 
     AddInput(NodeSlotSceneAudiArtInput::Create(""), false, true);
 
-    AddOutput(NodeSlotTextureOutput::Create("", 0), false, true);
+    AddOutput(NodeSlotTexture2DOutput::Create("", 0), false, true);
 
     m_AudioTextureModulePtr = AudioTextureModule::Create(vVulkanCore, m_This);
     if (m_AudioTextureModulePtr) {

diff --git a/Plugins/AudiArt/src/Nodes/Operations/AudioTextureNode.h b/Plugins/AudiArt/src/Nodes/Operations/AudioTextureNode.h
@@ -17,11 +17,11 @@ limitations under the License.
 #include <LumoBackend/Graph/Graph.h>
 #include <LumoBackend/Graph/Base/BaseNode.h>
 #include <Interfaces/SceneAudiArtInputInterface.h>
-#include <LumoBackend/Interfaces/TextureOutputInterface.h>
+#include <LumoBackend/Interfaces/Texture2DOutputInterface.h>
 #include <LumoBackend/Interfaces/ShaderUpdateInterface.h>
 
 class AudioTextureModule;
-class AudioTextureNode : public SceneAudiArtInputInterface, public TextureOutputInterface, public ShaderUpdateInterface, public BaseNode {
+class AudioTextureNode : public SceneAudiArtInputInterface, public Texture2DOutputInterface, public ShaderUpdateInterface, public BaseNode {
 public:
     static std::shared_ptr<AudioTextureNode> Create(GaiApi::VulkanCoreWeak vVulkanCore);
 

diff --git a/Plugins/AudiArt/src/Nodes/Operations/HistorizeNode.cpp b/Plugins/AudiArt/src/Nodes/Operations/HistorizeNode.cpp
@@ -19,8 +19,8 @@ limitations under the License.
 
 #include "HistorizeNode.h"
 #include <Modules/Operations/HistorizeModule.h>
-#include <LumoBackend/Graph/Slots/NodeSlotTextureInput.h>
-#include <LumoBackend/Graph/Slots/NodeSlotTextureOutput.h>
+#include <LumoBackend/Graph/Slots/NodeSlotTexture2DInput.h>
+#include <LumoBackend/Graph/Slots/NodeSlotTexture2DOutput.h>
 
 #ifdef PROFILER_INCLUDE
 #include <Gaia/gaia.h>
@@ -69,9 +69,9 @@ bool HistorizeNode::Init(GaiApi::VulkanCoreWeak vVulkanCore) {
 
     name = "Historize";
 
-    AddInput(NodeSlotTextureInput::Create("", 0), false, true);
+    AddInput(NodeSlotTexture2DInput::Create("", 0), false, true);
 
-    AddOutput(NodeSlotTextureOutput::Create("", 0), false, true);
+    AddOutput(NodeSlotTexture2DOutput::Create("", 0), false, true);
 
     m_HistorizeModulePtr = HistorizeModule::Create(vVulkanCore, m_This);
     if (m_HistorizeModulePtr) {
@@ -93,7 +93,7 @@ bool HistorizeNode::ExecuteAllTime(const uint32_t& vCurrentFrame, vk::CommandBuf
     BaseNode::ExecuteInputTasks(vCurrentFrame, vCmd, vBaseNodeState);
 
     // for update input texture buffer infos => avoid vk crash
-    UpdateTextureInputDescriptorImageInfos(m_Inputs);
+    UpdateTexture2DInputDescriptorImageInfos(m_Inputs);
     if (m_HistorizeModulePtr) {
         res = m_HistorizeModulePtr->Execute(vCurrentFrame, vCmd, vBaseNodeState);
     }

diff --git a/Plugins/AudiArt/src/Nodes/Operations/HistorizeNode.h b/Plugins/AudiArt/src/Nodes/Operations/HistorizeNode.h
@@ -16,12 +16,12 @@ limitations under the License.
 
 #include <LumoBackend/Graph/Graph.h>
 #include <LumoBackend/Graph/Base/BaseNode.h>
-#include <LumoBackend/Interfaces/TextureInputInterface.h>
-#include <LumoBackend/Interfaces/TextureOutputInterface.h>
+#include <LumoBackend/Interfaces/Texture2DInputInterface.h>
+#include <LumoBackend/Interfaces/Texture2DOutputInterface.h>
 #include <LumoBackend/Interfaces/ShaderUpdateInterface.h>
 
 class HistorizeModule;
-class HistorizeNode : public TextureInputInterface<0U>, public TextureOutputInterface, public ShaderUpdateInterface, public BaseNode {
+class HistorizeNode : public Texture2DInputInterface<0U>, public Texture2DOutputInterface, public ShaderUpdateInterface, public BaseNode {
 public:
     static std::shared_ptr<HistorizeNode> Create(GaiApi::VulkanCoreWeak vVulkanCore);
 

diff --git a/Plugins/AudiArt/src/Nodes/Viewer/VisuHexGridNode.cpp b/Plugins/AudiArt/src/Nodes/Viewer/VisuHexGridNode.cpp
@@ -19,8 +19,8 @@ limitations under the License.
 
 #include "VisuHexGridNode.h"
 #include <Modules/Viewer/VisuHexGridModule.h>
-#include <LumoBackend/Graph/Slots/NodeSlotTextureInput.h>
-#include <LumoBackend/Graph/Slots/NodeSlotTextureOutput.h>
+#include <LumoBackend/Graph/Slots/NodeSlotTexture2DInput.h>
+#include <LumoBackend/Graph/Slots/NodeSlotTexture2DOutput.h>
 
 #ifdef PROFILER_INCLUDE
 #include <Gaia/gaia.h>
@@ -69,9 +69,9 @@ bool VisuHexGridNode::Init(GaiApi::VulkanCoreWeak vVulkanCore) {
 
     name = "Visu Hex Grid";
 
-    AddInput(NodeSlotTextureInput::Create("Histo", 0), false, false);
+    AddInput(NodeSlotTexture2DInput::Create("Histo", 0), false, false);
 
-    AddOutput(NodeSlotTextureOutput::Create("", 0), false, true);
+    AddOutput(NodeSlotTexture2DOutput::Create("", 0), false, true);
 
     m_VisuHexGridModulePtr = VisuHexGridModule::Create(vVulkanCore, m_This);
     if (m_VisuHexGridModulePtr) {
@@ -93,7 +93,7 @@ bool VisuHexGridNode::ExecuteAllTime(const uint32_t& vCurrentFrame, vk::CommandB
     BaseNode::ExecuteInputTasks(vCurrentFrame, vCmd, vBaseNodeState);
 
     // for update input texture buffer infos => avoid vk crash
-    UpdateTextureInputDescriptorImageInfos(m_Inputs);
+    UpdateTexture2DInputDescriptorImageInfos(m_Inputs);
     if (m_VisuHexGridModulePtr) {
         res = m_VisuHexGridModulePtr->Execute(vCurrentFrame, vCmd, vBaseNodeState);
     }

diff --git a/Plugins/AudiArt/src/Nodes/Viewer/VisuHexGridNode.h b/Plugins/AudiArt/src/Nodes/Viewer/VisuHexGridNode.h
@@ -16,12 +16,12 @@ limitations under the License.
 
 #include <LumoBackend/Graph/Graph.h>
 #include <LumoBackend/Graph/Base/BaseNode.h>
-#include <LumoBackend/Interfaces/TextureInputInterface.h>
-#include <LumoBackend/Interfaces/TextureOutputInterface.h>
+#include <LumoBackend/Interfaces/Texture2DInputInterface.h>
+#include <LumoBackend/Interfaces/Texture2DOutputInterface.h>
 #include <LumoBackend/Interfaces/ShaderUpdateInterface.h>
 
 class VisuHexGridModule;
-class VisuHexGridNode : public TextureInputInterface<0U>, public TextureOutputInterface, public ShaderUpdateInterface, public BaseNode {
+class VisuHexGridNode : public Texture2DInputInterface<0U>, public Texture2DOutputInterface, public ShaderUpdateInterface, public BaseNode {
 public:
     static std::shared_ptr<VisuHexGridNode> Create(GaiApi::VulkanCoreWeak vVulkanCore);
 

diff --git a/Plugins/CodeGenerator/src/Editor/SlotEditor.cpp b/Plugins/CodeGenerator/src/Editor/SlotEditor.cpp
@@ -8,8 +8,11 @@
 #include <LumoBackend/Graph/Slots/NodeSlotModelInput.h>
 #include <LumoBackend/Graph/Slots/NodeSlotModelOutput.h>
 
-#include <LumoBackend/Graph/Slots/NodeSlotTextureInput.h>
-#include <LumoBackend/Graph/Slots/NodeSlotTextureOutput.h>
+#include <LumoBackend/Graph/Slots/NodeSlotTexture2DInput.h>
+#include <LumoBackend/Graph/Slots/NodeSlotTexture2DOutput.h>
+
+#include <LumoBackend/Graph/Slots/NodeSlotTexture3DInput.h>
+#include <LumoBackend/Graph/Slots/NodeSlotTexture3DOutput.h>
 
 #include <LumoBackend/Graph/Slots/NodeSlotVariableInput.h>
 #include <LumoBackend/Graph/Slots/NodeSlotVariableOutput.h>
@@ -166,8 +169,12 @@ NodeSlotWeak SlotEditor::DrawSlotCreationPane(
                 }
                 vChange |= ImGui::CheckBoxBoolDefault("Hide Name", &slotPtr->hideName, false);
                 vChange |= ImGui::CheckBoxBoolDefault("Show widget", &slotPtr->showWidget, false);
-                if (m_SelectedType == "StorageBuffer" || m_SelectedType == "TexelBuffer" || m_SelectedType == "Texture" ||
-                    m_SelectedType == "TextureCube" || m_SelectedType == "TextureGroup") {
+                if (m_SelectedType == "StorageBuffer" ||  //
+                    m_SelectedType == "TexelBuffer" ||    //
+                    m_SelectedType == "Texture2D" ||      //
+                    m_SelectedType == "Texture3D" ||      //
+                    m_SelectedType == "TextureCube" ||    //
+                    m_SelectedType == "TextureGroup") {
                     vChange |= ImGui::InputUIntDefault(0.0f, "Descriptor Binding", &slotPtr->descriptorBinding, 1U, 2U, 0U);
                 } else if (m_SelectedType == "Variable") {
                     vChange |= ImGui::InputUIntDefault(0.0f, "Variable Index", &slotPtr->variableIndex, 1U, 2U, 0U);
@@ -204,8 +211,10 @@ NodeSlotWeak SlotEditor::ChangeInputSlotType(
                     if (slotPtr->slotType.empty())
                         slotPtr->slotType = "NONE";
                     resPtr = NodeSlotTexelBufferInput::Create(slotPtr->name, slotPtr->slotType);
-                } else if (vType == "Texture") {
-                    resPtr = NodeSlotTextureInput::Create(slotPtr->name, slotPtr->descriptorBinding);
+                } else if (vType == "Texture2D") {
+                    resPtr = NodeSlotTexture2DInput::Create(slotPtr->name, slotPtr->descriptorBinding);
+                } else if (vType == "Texture3D") {
+                    resPtr = NodeSlotTexture3DInput::Create(slotPtr->name, slotPtr->descriptorBinding);
                 } else if (vType == "TextureCube") {
                     resPtr = NodeSlotTextureCubeInput::Create(slotPtr->name, slotPtr->descriptorBinding);
                 } else if (vType == "TextureGroup") {
@@ -261,8 +270,10 @@ NodeSlotWeak SlotEditor::ChangeOutputSlotType(
                     if (slotPtr->slotType.empty())
                         slotPtr->slotType = "NONE";
                     resPtr = NodeSlotTexelBufferOutput::Create(slotPtr->name, slotPtr->slotType);
-                } else if (vType == "Texture") {
-                    resPtr = NodeSlotTextureOutput::Create(slotPtr->name, slotPtr->descriptorBinding);
+                } else if (vType == "Texture2D") {
+                    resPtr = NodeSlotTexture2DOutput::Create(slotPtr->name, slotPtr->descriptorBinding);
+                } else if (vType == "Texture3D") {
+                    resPtr = NodeSlotTexture3DOutput::Create(slotPtr->name, slotPtr->descriptorBinding);
                 } else if (vType == "TextureCube") {
                     resPtr = NodeSlotTextureCubeOutput::Create(slotPtr->name, slotPtr->descriptorBinding);
                 } else if (vType == "TextureGroup") {

diff --git a/Plugins/CodeGenerator/src/Editor/UBOEditor.h b/Plugins/CodeGenerator/src/Editor/UBOEditor.h
@@ -7,13 +7,15 @@
 #include <vector>
 class UBOItem : public conf::ConfigAbstract {
 private:
-    std::vector<std::string> m_WidgetsArray = {//
-        "Input",                               // 0
-        "Slider",                              // 1
-        "Combo Box",                           // 2
-        "Check Box",                           // 3
-        "Color RGB",                           // 4
-        "Color RGBA"};                         // 5
+    std::vector<std::string> m_WidgetsArray = {
+        "Input",       // 0
+        "Slider",      // 1
+        "Combo Box",   // 2
+        "Check Box",   // 3
+        "Color RGB",   // 4
+        "Color RGBA",  // 5
+        "Gizmo"        // 6
+    }; 
     int m_WidgetIndex = 0U;
     std::vector<std::string> m_TypeArray = {//
         "float", "vec2", "vec3", "vec4",    //

diff --git 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 689
+#define CodeGenerator_BuildNumber 694
 #define CodeGenerator_MinorNumber 0
 #define CodeGenerator_MajorNumber 0
-#define CodeGenerator_BuildId "0.0.689"
+#define CodeGenerator_BuildId "0.0.694"
diff --git a/Plugins/CodeGenerator/src/Modules/GeneratorModule.cpp b/Plugins/CodeGenerator/src/Modules/GeneratorModule.cpp
@@ -13,8 +13,8 @@
 #include <LumoBackend/Graph/Slots/NodeSlotTaskOutput.h>
 #include <LumoBackend/Graph/Slots/NodeSlotModelInput.h>
 #include <LumoBackend/Graph/Slots/NodeSlotModelOutput.h>
-#include <LumoBackend/Graph/Slots/NodeSlotTextureInput.h>
-#include <LumoBackend/Graph/Slots/NodeSlotTextureOutput.h>
+#include <LumoBackend/Graph/Slots/NodeSlotTexture2DInput.h>
+#include <LumoBackend/Graph/Slots/NodeSlotTexture2DOutput.h>
 #include <LumoBackend/Graph/Slots/NodeSlotVariableInput.h>
 #include <LumoBackend/Graph/Slots/NodeSlotVariableOutput.h>
 #include <LumoBackend/Graph/Slots/NodeSlotLightGroupInput.h>