-

aiekick · Nov 19, 2023 · 32853a4 · 32853a4
1 parent cbd2c12
commit 32853a4
Show file tree

Hide file tree

Showing 26 changed files with 1,330 additions and 1,445 deletions.
diff --git a/Plugins/CodeGenerator/src/Editor/UBOEditor.cpp b/Plugins/CodeGenerator/src/Editor/UBOEditor.cpp
diff --git a/Plugins/CodeGenerator/src/Editor/UBOEditor.h b/Plugins/CodeGenerator/src/Editor/UBOEditor.h
@@ -7,14 +7,28 @@
 #include <vector>
 class UBOItem : public conf::ConfigAbstract {
 private:
-    std::vector<std::string> m_TypeArray = {
-        "float", "vec2", "vec3", "vec4", "int", "ivec2", "ivec3", "ivec4", "uint", "uvec2", "uvec3", "uvec4", "bool", "bvec2", "bvec3", "bvec4"};
+    std::vector<std::string> m_WidgetsArray = {//
+        "Input",                               // 0
+        "Slider",                              // 1
+        "Combo Box",                           // 2
+        "Check Box",                           // 3
+        "Color RGB",                           // 4
+        "Color RGBA"};                         // 5
+    int m_WidgetIndex = 0U;
+    std::vector<std::string> m_TypeArray = {//
+        "float", "vec2", "vec3", "vec4",    //
+        "int", "ivec2", "ivec3", "ivec4",   //
+        "uint", "uvec2", "uvec3", "uvec4",  //
+        "bool", "bvec2", "bvec3", "bvec4"};
     int m_InputTypeIndex = 0U;
     ImWidgets::InputText m_InputName;
     ImWidgets::InputText m_InputValue_x;
     ImWidgets::InputText m_InputValue_y;
     ImWidgets::InputText m_InputValue_z;
     ImWidgets::InputText m_InputValue_w;
+    bool m_CheckBoxItem_DefaultValue = false;
+    ct::fvec3 m_ColorRGBItem_DefaultValue = false;
+    ct::fvec4 m_ColorRGBAItem_DefaultValue = false;
 
 public:
     UBOItem() = default;
@@ -47,7 +61,7 @@ class UBOEditor : public conf::ConfigAbstract {
     std::string Get_Glsl_Header(const std::string& vRendererType, const int32_t& vUboBindingIndex, const int32_t& vUboIndex, const bool& vIsAnEffect);
     std::string Get_Cpp_Header(const std::string& vRendererType, const int32_t& vUboIndex, const bool& vIsAnEffect);
     std::string Get_Cpp_WriteDescriptors(const std::string& vRendererType, const int32_t& vUboBindingIndex, const int32_t& vUboIndex);
-    std::string Get_Cpp_LayoutBindings(const std::string& vRendererType, const int32_t& vUboBindingIndex);
+    std::string Get_Cpp_LayoutBindings(const std::string& vRendererType, const int32_t& vUboBindingIndex, const int32_t& vUboIndex);
     std::string Get_Cpp_GetXML(const std::string& vRendererType, const int32_t& vUboIndex, const bool& vIsAnEffect);
     std::string Get_Cpp_SetXML(const std::string& vRendererType, const int32_t& vUboIndex, const bool& vIsFirst, const bool& vIsAnEffect);
     std::string Get_Create_Header(const std::string& vRendererType, const int32_t& vUboIndex);

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 606
+#define CodeGenerator_BuildNumber 628
 #define CodeGenerator_MinorNumber 0
 #define CodeGenerator_MajorNumber 0
-#define CodeGenerator_BuildId "0.0.606"
+#define CodeGenerator_BuildId "0.0.628"