[frontend] Boilerplate to make CLR0 nodes interactable

snailspeed3 · snailspeed3 · commit 6bad78f6d176 · 2025-05-22T12:59:42.000-07:00
diff --git a/source/frontend/CMakeLists.txt b/source/frontend/CMakeLists.txt
@@ -93,7 +93,7 @@ add_library(lib_frontend
  "properties/gc/Material/AdvTexConv.cpp"
  "properties/gc/Material/Merge.cpp"
  "editors/BtkEditor.cpp"
- "legacy_editor/views/BmdBrresOutliner.cpp" "renderer/MouseHider.cpp" "editors/MkwDebug.cpp" "PresetHelper.cpp")
+ "legacy_editor/views/BmdBrresOutliner.cpp" "renderer/MouseHider.cpp" "editors/MkwDebug.cpp" "PresetHelper.cpp" "properties/g3d/G3dUniformAnimView.cpp")
 
 
 add_executable(frontend 
diff --git a/source/frontend/legacy_editor/views/BmdBrresOutliner.hpp b/source/frontend/legacy_editor/views/BmdBrresOutliner.hpp
@@ -276,22 +276,17 @@ static inline std::vector<Node> CollectNodes(g3d::Collection* g3d,
     };
     result.push_back(n);
   }
-  auto add_new_clr0 = [pG = g3d]() {
-    auto& x = pG->clrs.emplace_back();
-    x.name = "Untitled CLR0";
-  };
-  result.push_back(HeaderBarImpl("clr0", 1, g3d->clrs.size(), nullptr,
-                                 add_new_clr0, nullptr));
-  for (int i = 0; i < g3d->clrs.size(); ++i) {
-    auto& tex = g3d->clrs[i];
+  result.push_back(HeaderBar("clr0", 1, g3d->getAnim_Clrs().low, outliner));
+  for (int i = 0; i < g3d->getAnim_Clrs().size(); ++i) {
+    auto& clr = g3d->getAnim_Clrs()[i];
     Node n{
         .indent = 2,
         .rti = richtypes["clr0"],
-        .icons_right = {},
-        .draw_context_menu_fn = nullptr,
-        .draw_modal_fn = nullptr,
-        .public_name = tex.name,
-        .obj = nullptr,
+        .icons_right = GetNodeIcons(clr),
+        .draw_context_menu_fn = CtxDraw(&clr),
+        .draw_modal_fn = ModalDraw(&clr),
+        .public_name = clr.name,
+        .obj = &clr,
         .is_container = false,
         .is_rich = true,
         .display_id_relative_to_parent = static_cast<int>(i),
diff --git a/source/frontend/properties/BrresBmdPropEdit.hpp b/source/frontend/properties/BrresBmdPropEdit.hpp
@@ -12,6 +12,7 @@ struct BrresBmdPropEdit {
   riistudio::G3dTexViews mG3dTexView;
   riistudio::G3dVcViews mG3dVcView;
   riistudio::G3dSrtViews mG3dSrtView;
+  riistudio::G3dUniformAnimViews mG3dUniformAnimView;
 
   riistudio::J3dMdlViews mJ3dMdlView;
   riistudio::J3dMaterialViews mJ3dMatView;
@@ -68,6 +69,10 @@ struct BrresBmdPropEdit {
     if (j3tex != nullptr) {
       return Views_TabTitles(mG3dTexView);
     }
+    auto* g3dclr = dynamic_cast<riistudio::g3d::CLR0*>(node);
+    if (g3dclr != nullptr) {
+      return Views_TabTitles(mG3dUniformAnimView);
+    }
     return {};
   }
   void TabTitleFancy(kpi::IObject* node, int index) {
@@ -131,6 +136,11 @@ struct BrresBmdPropEdit {
       Views_TabTitleFancy(mG3dTexView, index);
       return;
     }
+    auto* g3dclr = dynamic_cast<riistudio::g3d::CLR0*>(node);
+    if (g3dclr != nullptr) {
+      Views_TabTitleFancy(mG3dUniformAnimView, index);
+      return;
+    }
     ImGui::Text("???");
   }
   bool Tab(int index, std::function<void()> postUpdate,
@@ -246,6 +256,14 @@ struct BrresBmdPropEdit {
       handleUpdates();
       return ok;
     }
+    auto* g3dclr = dynamic_cast<riistudio::g3d::CLR0*>(node);
+    if (g3dclr != nullptr) {
+      auto dl = kpi::MakeDelegate<riistudio::g3d::CLR0>(
+          postUpdate, commit, g3dclr, selected, drawIcon);
+      auto ok = Views_Tab(mG3dUniformAnimView, dl, index);
+      handleUpdates();
+      return ok;
+    }
     return false;
   }
 };
diff --git a/source/frontend/properties/g3d/G3dMaterialViews.hpp b/source/frontend/properties/g3d/G3dMaterialViews.hpp
@@ -4,6 +4,7 @@
 
 #include <frontend/properties/g3d/G3dSrtView.hpp>
 #include <frontend/properties/g3d/G3dUi.hpp>
+#include <frontend/properties/g3d/G3dUniformAnimView.hpp>
 #include <frontend/properties/g3d/G3dVertexColorView.hpp>
 #include <frontend/properties/gc/Bone/BoneDisplaySurface.hpp>
 #include <frontend/properties/gc/Bone/BoneTransformSurface.hpp>
@@ -108,6 +109,10 @@ struct J3dMdlViews {
   riistudio::j3d::ui::ModelJ3DSurface ms;
 };
 
+struct G3dUniformAnimViews {
+  riistudio::g3d::G3dUniformAnimDataSurface data;
+};
+
 // TODO:
 // [X] BoneJ3DSurface
 // [X] ShapeJ3DSurface
diff --git a/source/frontend/properties/g3d/G3dUniformAnimView.cpp b/source/frontend/properties/g3d/G3dUniformAnimView.cpp
@@ -0,0 +1,21 @@
+#include "G3dUniformAnimView.hpp"
+#include <imcxx/Widgets.hpp>
+
+namespace riistudio::g3d {
+
+void drawProperty(kpi::PropertyDelegate<riistudio::g3d::CLR0>& dl,
+                 G3dUniformAnimDataSurface) {
+  auto& anim = dl.getActive();
+  
+  // Display the animation name
+  if (ImGui::BeginTable("UniformAnimData", 2)) {
+    ImGui::TableNextRow();
+    ImGui::TableNextColumn();
+    ImGui::Text("Name");
+    ImGui::TableNextColumn();
+    ImGui::Text("%s", anim.name.c_str());
+    ImGui::EndTable();
+  }
+}
+
+} // namespace riistudio::g3d
diff --git a/source/frontend/properties/g3d/G3dUniformAnimView.hpp b/source/frontend/properties/g3d/G3dUniformAnimView.hpp
@@ -0,0 +1,20 @@
+#pragma once
+
+#include <LibBadUIFramework/Node2.hpp>
+#include <LibBadUIFramework/PropertyView.hpp>
+#include <imcxx/Widgets.hpp>
+#include <plugins/g3d/collection.hpp>
+#include <vendor/fa5/IconsFontAwesome5.h>
+#include <librii/g3d/io/AnimClrIO.hpp>
+
+namespace riistudio::g3d {
+
+struct G3dUniformAnimDataSurface {
+  static inline const char* name() { return "Data"_j; }
+  static inline const char* icon = (const char*)ICON_FA_COG;
+};
+
+void drawProperty(kpi::PropertyDelegate<riistudio::g3d::CLR0>& dl,
+                 G3dUniformAnimDataSurface);
+
+} // namespace riistudio::g3d
diff --git a/source/plugins/g3d/Node.h b/source/plugins/g3d/Node.h
@@ -129,7 +129,6 @@ class Model : public libcube::Model, public kpi::TDocData<riistudio::g3d::G3DMod
 
 struct SceneData {
     std::vector<librii::g3d::ChrAnim> chrs;
-    std::vector<librii::g3d::ClrAnim> clrs;
     std::vector<librii::g3d::PatAnim> pats;
     std::vector<librii::g3d::BinaryVis> viss;
     std::string path;
@@ -147,32 +146,38 @@ class Collection
     kpi::MutCollectionRange<Model> getModels() { return { &mModels }; }
     kpi::MutCollectionRange<Texture> getTextures() { return { &mTextures }; }
     kpi::MutCollectionRange<SRT0> getAnim_Srts() { return { &mAnim_Srts }; }
+    kpi::MutCollectionRange<CLR0> getAnim_Clrs() { return { &mAnim_Clrs }; }
     kpi::ConstCollectionRange<Model> getModels() const { return { &mModels }; }
     kpi::ConstCollectionRange<Texture> getTextures() const { return { &mTextures }; }
     kpi::ConstCollectionRange<SRT0> getAnim_Srts() const { return { &mAnim_Srts }; }
+    kpi::ConstCollectionRange<CLR0> getAnim_Clrs() const { return { &mAnim_Clrs }; }
 
 	librii::g3d::Archive toLibRii() const;
 
 protected:
     kpi::ICollection* v_getModels() const { return const_cast<kpi::ICollection*>(static_cast<const kpi::ICollection*>(&mModels)); }
     kpi::ICollection* v_getTextures() const { return const_cast<kpi::ICollection*>(static_cast<const kpi::ICollection*>(&mTextures)); }
     kpi::ICollection* v_getAnim_Srts() const { return const_cast<kpi::ICollection*>(static_cast<const kpi::ICollection*>(&mAnim_Srts)); }
+    kpi::ICollection* v_getAnim_Clrs() const { return const_cast<kpi::ICollection*>(static_cast<const kpi::ICollection*>(&mAnim_Clrs)); }
     void onRelocate() {
         mModels.onParentMoved(this);
         mTextures.onParentMoved(this);
         mAnim_Srts.onParentMoved(this);
+        mAnim_Clrs.onParentMoved(this);
     }
     Collection(Collection&& rhs) {
         new (&mModels) decltype(mModels) (std::move(rhs.mModels));
         new (&mTextures) decltype(mTextures) (std::move(rhs.mTextures));
         new (&mAnim_Srts) decltype(mAnim_Srts) (std::move(rhs.mAnim_Srts));
+        new (&mAnim_Clrs) decltype(mAnim_Clrs) (std::move(rhs.mAnim_Clrs));
 
         onRelocate();
     }
     Collection(const Collection& rhs) {
         new (&mModels) decltype(mModels) (rhs.mModels);
         new (&mTextures) decltype(mTextures) (rhs.mTextures);
         new (&mAnim_Srts) decltype(mAnim_Srts) (rhs.mAnim_Srts);
+        new (&mAnim_Clrs) decltype(mAnim_Clrs) (rhs.mAnim_Clrs);
 
         onRelocate();
     }
@@ -191,19 +196,22 @@ class Collection
     kpi::CollectionImpl<Model> mModels{this};
     kpi::CollectionImpl<Texture> mTextures{this};
     kpi::CollectionImpl<SRT0> mAnim_Srts{this};
+    kpi::CollectionImpl<CLR0> mAnim_Clrs{this};
 
 public:
     struct _Memento : public kpi::IMemento {
         SceneData sd;
         kpi::ConstPersistentVec<Model> mModels;
         kpi::ConstPersistentVec<Texture> mTextures;
         kpi::ConstPersistentVec<SRT0> mAnim_Srts;
+        kpi::ConstPersistentVec<CLR0> mAnim_Clrs;
         template<typename M> _Memento(const M& _new, const kpi::IMemento* last=nullptr) {
             const auto* old = last ? dynamic_cast<const _Memento*>(last) : nullptr;
             sd = static_cast<const SceneData&>(_new);
             kpi::nextFolder(this->mModels, _new.getModels(), old ? &old->mModels : nullptr);
             kpi::nextFolder(this->mTextures, _new.getTextures(), old ? &old->mTextures : nullptr);
             kpi::nextFolder(this->mAnim_Srts, _new.getAnim_Srts(), old ? &old->mAnim_Srts : nullptr);
+            kpi::nextFolder(this->mAnim_Clrs, _new.getAnim_Clrs(), old ? &old->mAnim_Clrs : nullptr);
         }
     };
     std::unique_ptr<kpi::IMemento> next(const kpi::IMemento* last) const {
@@ -216,6 +224,7 @@ class Collection
         kpi::fromFolder(getModels(), in->mModels);
         kpi::fromFolder(getTextures(), in->mTextures);
         kpi::fromFolder(getAnim_Srts(), in->mAnim_Srts);
+        kpi::fromFolder(getAnim_Clrs(), in->mAnim_Clrs);
     }
     template<typename T> void* operator=(const T& rhs) { from(rhs); return this; }
 };
diff --git a/source/plugins/g3d/g3d_material.cpp b/source/plugins/g3d/g3d_material.cpp
@@ -106,10 +106,12 @@ Result<void> ApplyCratePresetToMaterial(riistudio::g3d::Material& mat,
     static_cast<librii::g3d::SrtAnimationArchive&>(t) = new_srt;
   }
   for (auto& new_clr : anim.clr) {
-    if (auto* x = findByName2(scene->clrs, new_clr.name)) {
+    if (auto* x = scene->getAnim_Clrs().findByName(new_clr.name);
+        x != nullptr) {
       new_clr.name += "_" + std::to_string(std::rand());
     }
-    scene->clrs.emplace_back(new_clr);
+    auto& t = scene->getAnim_Clrs().add();
+    static_cast<librii::g3d::ClrAnim&>(t) = new_clr;
   }
   for (auto& new_pat : anim.pat) {
     if (auto* x = findByName2(scene->pats, new_pat.name)) {
diff --git a/source/plugins/g3d/io/BRRES.cpp b/source/plugins/g3d/io/BRRES.cpp
@@ -94,8 +94,10 @@ Result<void> ReadBRRES(Collection& collection, librii::g3d::Archive& archive,
     static_cast<librii::g3d::SrtAnimationArchive&>(
         collection.getAnim_Srts().add()) = srt;
   }
+  for (auto& clr : archive.clrs) {
+    static_cast<librii::g3d::ClrAnim&>(collection.getAnim_Clrs().add()) = clr;
+  }
   collection.chrs = archive.chrs;
-  collection.clrs = archive.clrs;
   collection.pats = archive.pats;
   collection.viss = archive.viss;
   return {};
@@ -147,7 +149,7 @@ librii::g3d::Archive Collection::toLibRii() const {
   librii::g3d::Archive arc{
       .textures = getTextures() | rsl::ToList<librii::g3d::TextureData>(),
       .chrs = chrs,
-      .clrs = clrs,
+      .clrs = getAnim_Clrs() | rsl::ToList<librii::g3d::ClrAnim>(),
       .pats = pats,
       .srts = getAnim_Srts() | rsl::ToList<librii::g3d::SrtAnimationArchive>(),
       .viss = viss,
diff --git a/source/plugins/g3d/model.hpp b/source/plugins/g3d/model.hpp
@@ -10,6 +10,7 @@
 #include <librii/g3d/data/AnimData.hpp>
 #include <librii/g3d/data/ModelData.hpp>
 #include <librii/g3d/data/VertexData.hpp>
+#include <librii/g3d/io/AnimClrIO.hpp>
 #include <librii/gx.h>
 #include <plugins/gc/Export/Scene.hpp>
 #include <tuple>
@@ -90,6 +91,19 @@ struct SRT0 : public librii::g3d::SrtAnim, public virtual kpi::IObject {
   void setName(const std::string& _name) { name = _name; }
 };
 
+struct CLR0 : public librii::g3d::ClrAnim, public virtual kpi::IObject {
+  bool operator==(const CLR0& rhs) const {
+    return static_cast<const librii::g3d::ClrAnim&>(*this) == rhs;
+  }
+  CLR0& operator=(const CLR0& rhs) {
+    static_cast<librii::g3d::ClrAnim&>(*this) = rhs;
+    return *this;
+  }
+
+  std::string getName() const { return name; }
+  void setName(const std::string& _name) { name = _name; }
+};
+
 } // namespace riistudio::g3d
 
 #include "Node.h"

Original file line number	Diff line number	Diff line change
`@@ -106,10 +106,12 @@ Result<void> ApplyCratePresetToMaterial(riistudio::g3d::Material& mat,`
`106`	`106`	`static_cast<librii::g3d::SrtAnimationArchive&>(t) = new_srt;`
`107`	`107`	`}`
`108`	`108`	`for (auto& new_clr : anim.clr) {`
`109`		`- if (auto* x = findByName2(scene->clrs, new_clr.name)) {`
	`109`	`+ if (auto* x = scene->getAnim_Clrs().findByName(new_clr.name);`
	`110`	`+ x != nullptr) {`
`110`	`111`	`new_clr.name += "_" + std::to_string(std::rand());`
`111`	`112`	`}`
`112`		`- scene->clrs.emplace_back(new_clr);`
	`113`	`+ auto& t = scene->getAnim_Clrs().add();`
	`114`	`+ static_cast<librii::g3d::ClrAnim&>(t) = new_clr;`
`113`	`115`	`}`
`114`	`116`	`for (auto& new_pat : anim.pat) {`
`115`	`117`	`if (auto* x = findByName2(scene->pats, new_pat.name)) {`