Minor cleanup

.clang-format

@@ -7,6 +7,7 @@ AlwaysBreakTemplateDeclarations: Yes
 BinPackArguments: false
 BinPackParameters: true
 PointerAlignment: Left
+AllowShortFunctionsOnASingleLine: InlineOnly
 
 BreakBeforeBraces: Custom
 BraceWrapping:

gdext/src/CanvasRenderer.h

@@ -14,10 +14,7 @@ class CanvasRenderer : public Renderer
     CanvasRenderer();
     virtual ~CanvasRenderer();
 
-    virtual const char* Name() override
-    {
-        return "godot4_canvas";
-    }
+    virtual const char* Name() override { return "godot4_canvas"; }
 
     bool Init() override;
     void InitViewport(RID vprid) override;

gdext/src/Context.h

@@ -41,20 +41,12 @@ enum class RendererType
 
 struct Context
 {
-    // Window* mainWindow = nullptr;
     std::unique_ptr<Viewports> viewports;
     std::unique_ptr<Fonts> fonts;
     std::unique_ptr<Input> input;
     std::unique_ptr<Renderer> renderer;
     float scale = 1.0f;
 
-    // RID svp;
-    // RID ci;
-    // Ref<ImageTexture> fontTexture;
-    // bool headless = false;
-    // int dpiFactor = 1;
-    // bool scaleToDPI = false;
-
     Context(Window* mainWindow, RID mainSubViewport, std::unique_ptr<Renderer> r);
     ~Context();
 };
@@ -75,7 +67,6 @@ void AddFontDefault();
 void RebuildFontAtlas();
 void SetIniFilename(const String& fn);
 void SetVisible(bool visible);
-bool IsVisible();
 
 bool SubViewportWidget(SubViewport* svp);
 

gdext/src/DummyRenderer.h

@@ -6,39 +6,16 @@ namespace ImGui::Godot {
 class DummyRenderer : public Renderer
 {
 public:
-    DummyRenderer()
-    {
-    }
+    DummyRenderer() {}
+    ~DummyRenderer() {}
 
-    ~DummyRenderer()
-    {
-    }
+    const char* Name() override { return "godot4_dummy"; }
 
-    const char* Name() override
-    {
-        return "godot4_dummy";
-    }
-
-    bool Init() override
-    {
-        return true;
-    }
-
-    void InitViewport(RID vprid) override
-    {
-    }
-
-    void CloseViewport(RID vprid) override
-    {
-    }
-
-    void Render() override
-    {
-    }
-
-    void OnHide() override
-    {
-    }
+    bool Init() override { return true; }
+    void InitViewport(RID vprid) override {}
+    void CloseViewport(RID vprid) override {}
+    void Render() override {}
+    void OnHide() override {}
 };
 
 } // namespace ImGui::Godot

gdext/src/Fonts.h

@@ -1,7 +1,7 @@
 #pragma once
-#include <memory>
-#include <imgui.h>
 #include <godot_cpp/classes/font_file.hpp>
+#include <imgui.h>
+#include <memory>
 using namespace godot;
 
 namespace ImGui::Godot {

gdext/src/ImGuiAPI.cpp

@@ -16,9 +16,9 @@ inline Color ToColor(ImVec4 v)
     return Color(v.x, v.y, v.z, v.w);
 }
 
-std::unordered_map<StringName, std::string> stringname_cache;
 const char* sn_to_cstr(const StringName& sn)
 {
+    static std::unordered_map<StringName, std::string> stringname_cache;
     if (!stringname_cache.contains(sn))
     {
         stringname_cache[sn] = std::string(String(sn).utf8().get_data());

gdext/src/ImGuiAPI.h

@@ -29,15 +29,9 @@ struct GdsPtr
         val = arr[0];
     }
 
-    ~GdsPtr()
-    {
-        arr[0] = val;
-    }
+    ~GdsPtr() { arr[0] = val; }
 
-    operator T*()
-    {
-        return &val;
-    }
+    operator T*() { return &val; }
 };
 
 template <>
@@ -60,10 +54,7 @@ struct GdsPtr<String>
         }
     }
 
-    operator char*()
-    {
-        return buf.data();
-    }
+    operator char*() { return buf.data(); }
 };
 
 template <class T>
@@ -88,10 +79,7 @@ struct GdsArray
         }
     }
 
-    operator T*()
-    {
-        return buf.data();
-    }
+    operator T*() { return buf.data(); }
 };
 
 template <>
@@ -118,24 +106,16 @@ struct GdsArray<const char* const>
         }
     }
 
-    operator const char* const*()
-    {
-        return ptrs.data();
-    }
+    operator const char* const*() { return ptrs.data(); }
 };
 
 struct GdsZeroArray
 {
     const std::vector<char>& buf;
 
-    GdsZeroArray(const Array& a) : buf(gdscache->GetZeroArray(a))
-    {
-    }
+    GdsZeroArray(const Array& a) : buf(gdscache->GetZeroArray(a)) {}
 
-    operator const char*()
-    {
-        return buf.data();
-    }
+    operator const char*() { return buf.data(); }
 };
 
 #define VARIANT_CSTR(v) v.get_type() == Variant::STRING ? static_cast<String>(v).utf8().get_data() : nullptr

gdext/src/RdRenderer.cpp

@@ -32,7 +32,6 @@ struct RdRenderer::Impl
     RID sampler;
     TypedArray<RID> srcBuffers;
     TypedArray<RDUniform> uniforms;
-    // TypedArray<RID> storageTextures;
     godot::PackedColorArray clearColors;
 
     std::unordered_map<RID, RID> framebuffers;

gdext/src/RdRenderer.h

@@ -14,20 +14,13 @@ class RdRenderer : public Renderer
     RdRenderer();
     virtual ~RdRenderer();
 
-    virtual const char* Name() override
-    {
-        return "godot4_rd";
-    }
+    virtual const char* Name() override { return "godot4_rd"; }
 
     bool Init() override;
     void InitViewport(RID vprid) override;
-    void CloseViewport(RID vprid) override
-    {
-    }
+    void CloseViewport(RID vprid) override {}
     virtual void Render() override;
-    void OnHide() override
-    {
-    }
+    void OnHide() override {}
 
 protected:
     void Render(RID fb, ImDrawData* drawData);

gdext/src/RdRendererThreadSafe.h

@@ -14,10 +14,7 @@ class RdRendererThreadSafe : public RdRenderer
     RdRendererThreadSafe();
     virtual ~RdRendererThreadSafe();
 
-    const char* Name() override
-    {
-        return "godot4_rd_mt";
-    }
+    const char* Name() override { return "godot4_rd_mt"; }
 
     void Render() override;
     void OnFramePreDraw() override;

gdext/src/Renderer.h

@@ -10,13 +10,8 @@ namespace ImGui::Godot {
 class Renderer
 {
 public:
-    Renderer()
-    {
-    }
-
-    virtual ~Renderer()
-    {
-    }
+    Renderer() {}
+    virtual ~Renderer() {}
 
     virtual const char* Name() = 0;
 
@@ -25,9 +20,7 @@ class Renderer
     virtual void CloseViewport(RID vprid) = 0;
     virtual void Render() = 0;
     virtual void OnHide() = 0;
-    virtual void OnFramePreDraw()
-    {
-    }
+    virtual void OnFramePreDraw() {}
 };
 
 } // namespace ImGui::Godot

gdext/src/Viewports.h

@@ -29,15 +29,9 @@ class ImGuiWindow : public Window
 
     void _input(const Ref<InputEvent>& evt) override;
 
-    void _close_requested()
-    {
-        _vp->PlatformRequestClose = true;
-    }
+    void _close_requested() { _vp->PlatformRequestClose = true; }
 
-    void _size_changed()
-    {
-        _vp->PlatformRequestResize = true;
-    }
+    void _size_changed() { _vp->PlatformRequestResize = true; }
 
 private:
     ImGuiViewport* _vp = nullptr;

gdext/src/common.h

@@ -25,8 +25,5 @@ inline RID make_rid(ImTextureID id)
 template <>
 struct std::hash<RID>
 {
-    std::size_t operator()(const RID& rid) const noexcept
-    {
-        return std::hash<int64_t>{}(rid.get_id());
-    }
+    std::size_t operator()(const RID& rid) const noexcept { return std::hash<int64_t>{}(rid.get_id()); }
 };