diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2019-11-25 02:44:26 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2019-11-25 02:44:26 +0000 |
| commit | c7319683cf2ebbe52704f3ad59d79518da7c49f3 (patch) | |
| tree | 90d61525b59845e375660df212d7cd3dbb24ce5d /Imgui/interface | |
| parent | clang-formatted AssetLoader (diff) | |
| download | DiligentTools-c7319683cf2ebbe52704f3ad59d79518da7c49f3.tar.gz DiligentTools-c7319683cf2ebbe52704f3ad59d79518da7c49f3.zip | |
clang-formatted ImGuiImpl
Diffstat (limited to 'Imgui/interface')
| -rw-r--r-- | Imgui/interface/ImGuiImplAndroid.h | 20 | ||||
| -rw-r--r-- | Imgui/interface/ImGuiImplDiligent.h | 14 | ||||
| -rw-r--r-- | Imgui/interface/ImGuiImplIOS.h | 28 | ||||
| -rw-r--r-- | Imgui/interface/ImGuiImplLinuxX11.h | 22 | ||||
| -rw-r--r-- | Imgui/interface/ImGuiImplLinuxXCB.h | 9 | ||||
| -rw-r--r-- | Imgui/interface/ImGuiImplMacOS.h | 2 | ||||
| -rw-r--r-- | Imgui/interface/ImGuiImplUWP.h | 28 | ||||
| -rw-r--r-- | Imgui/interface/ImGuiImplWin32.h | 18 | ||||
| -rw-r--r-- | Imgui/interface/ImGuiUtils.h | 20 |
9 files changed, 90 insertions, 71 deletions
diff --git a/Imgui/interface/ImGuiImplAndroid.h b/Imgui/interface/ImGuiImplAndroid.h index 7639f28..80d878e 100644 --- a/Imgui/interface/ImGuiImplAndroid.h +++ b/Imgui/interface/ImGuiImplAndroid.h @@ -34,21 +34,23 @@ namespace Diligent class ImGuiImplAndroid final : public ImGuiImplDiligent { public: - ImGuiImplAndroid(IRenderDevice* pDevice, - TEXTURE_FORMAT BackBufferFmt, - TEXTURE_FORMAT DepthBufferFmt, - Uint32 DisplayWidht, - Uint32 DisplayHeight, - Uint32 InitialVertexBufferSize = ImGuiImplDiligent::DefaultInitialVBSize, - Uint32 InitialIndexBufferSize = ImGuiImplDiligent::DefaultInitialIBSize); + ImGuiImplAndroid(IRenderDevice* pDevice, + TEXTURE_FORMAT BackBufferFmt, + TEXTURE_FORMAT DepthBufferFmt, + Uint32 DisplayWidht, + Uint32 DisplayHeight, + Uint32 InitialVertexBufferSize = ImGuiImplDiligent::DefaultInitialVBSize, + Uint32 InitialIndexBufferSize = ImGuiImplDiligent::DefaultInitialIBSize); ~ImGuiImplAndroid(); + // clang-format off ImGuiImplAndroid (const ImGuiImplAndroid&) = delete; ImGuiImplAndroid ( ImGuiImplAndroid&&) = delete; ImGuiImplAndroid& operator = (const ImGuiImplAndroid&) = delete; ImGuiImplAndroid& operator = ( ImGuiImplAndroid&&) = delete; + // clang-format on - virtual void NewFrame()override final; + virtual void NewFrame() override final; bool BeginDrag(float x, float y); bool DragMove(float x, float y); @@ -58,4 +60,4 @@ private: std::chrono::time_point<std::chrono::high_resolution_clock> m_LastTimestamp = {}; }; -} +} // namespace Diligent diff --git a/Imgui/interface/ImGuiImplDiligent.h b/Imgui/interface/ImGuiImplDiligent.h index dadc6eb..8370241 100644 --- a/Imgui/interface/ImGuiImplDiligent.h +++ b/Imgui/interface/ImGuiImplDiligent.h @@ -41,17 +41,19 @@ public: static constexpr Uint32 DefaultInitialVBSize = 1024; static constexpr Uint32 DefaultInitialIBSize = 2048; - ImGuiImplDiligent(IRenderDevice* pDevice, - TEXTURE_FORMAT BackBufferFmt, - TEXTURE_FORMAT DepthBufferFmt, - Uint32 InitialVertexBufferSize = DefaultInitialVBSize, - Uint32 InitialIndexBufferSize = DefaultInitialIBSize); + ImGuiImplDiligent(IRenderDevice* pDevice, + TEXTURE_FORMAT BackBufferFmt, + TEXTURE_FORMAT DepthBufferFmt, + Uint32 InitialVertexBufferSize = DefaultInitialVBSize, + Uint32 InitialIndexBufferSize = DefaultInitialIBSize); virtual ~ImGuiImplDiligent(); + // clang-format off ImGuiImplDiligent (const ImGuiImplDiligent&) = delete; ImGuiImplDiligent ( ImGuiImplDiligent&&) = delete; ImGuiImplDiligent& operator = (const ImGuiImplDiligent&) = delete; ImGuiImplDiligent& operator = ( ImGuiImplDiligent&&) = delete; + // clang-format on virtual void NewFrame(); virtual void Render(IDeviceContext* pCtx); @@ -64,4 +66,4 @@ private: std::unique_ptr<ImGuiImplDiligent_Internal> m_pImpl; }; -} +} // namespace Diligent diff --git a/Imgui/interface/ImGuiImplIOS.h b/Imgui/interface/ImGuiImplIOS.h index a8192d4..569a01a 100644 --- a/Imgui/interface/ImGuiImplIOS.h +++ b/Imgui/interface/ImGuiImplIOS.h @@ -32,28 +32,30 @@ namespace Diligent class ImGuiImplIOS final : public ImGuiImplDiligent { public: - ImGuiImplIOS(IRenderDevice* pDevice, - TEXTURE_FORMAT BackBufferFmt, - TEXTURE_FORMAT DepthBufferFmt, - Uint32 DisplayWidth, - Uint32 DisplayHeight, - Uint32 InitialVertexBufferSize = ImGuiImplDiligent::DefaultInitialVBSize, - Uint32 InitialIndexBufferSize = ImGuiImplDiligent::DefaultInitialIBSize); + ImGuiImplIOS(IRenderDevice* pDevice, + TEXTURE_FORMAT BackBufferFmt, + TEXTURE_FORMAT DepthBufferFmt, + Uint32 DisplayWidth, + Uint32 DisplayHeight, + Uint32 InitialVertexBufferSize = ImGuiImplDiligent::DefaultInitialVBSize, + Uint32 InitialIndexBufferSize = ImGuiImplDiligent::DefaultInitialIBSize); ~ImGuiImplIOS(); + // clang-format off ImGuiImplIOS (const ImGuiImplIOS&) = delete; ImGuiImplIOS ( ImGuiImplIOS&&) = delete; ImGuiImplIOS& operator = (const ImGuiImplIOS&) = delete; ImGuiImplIOS& operator = ( ImGuiImplIOS&&) = delete; + // clang-format on - virtual void NewFrame()override final; - virtual void Render(IDeviceContext* pCtx)override final; - void SetDisplaySize(Uint32 DisplayWidth, Uint32 DisplayHeight); - bool OnTouchEvent(float x, float y, bool IsActive); + virtual void NewFrame() override final; + virtual void Render(IDeviceContext* pCtx) override final; + void SetDisplaySize(Uint32 DisplayWidth, Uint32 DisplayHeight); + bool OnTouchEvent(float x, float y, bool IsActive); private: std::mutex m_Mtx; - double m_Time = 0.0; + double m_Time = 0.0; }; -} +} // namespace Diligent diff --git a/Imgui/interface/ImGuiImplLinuxX11.h b/Imgui/interface/ImGuiImplLinuxX11.h index 0398628..e4fbe09 100644 --- a/Imgui/interface/ImGuiImplLinuxX11.h +++ b/Imgui/interface/ImGuiImplLinuxX11.h @@ -34,25 +34,27 @@ namespace Diligent class ImGuiImplLinuxX11 final : public ImGuiImplDiligent { public: - ImGuiImplLinuxX11(IRenderDevice* pDevice, - TEXTURE_FORMAT BackBufferFmt, - TEXTURE_FORMAT DepthBufferFmt, - Uint32 DisplayWidht, - Uint32 DisplayHeight, - Uint32 InitialVertexBufferSize = ImGuiImplDiligent::DefaultInitialVBSize, - Uint32 InitialIndexBufferSize = ImGuiImplDiligent::DefaultInitialIBSize); + ImGuiImplLinuxX11(IRenderDevice* pDevice, + TEXTURE_FORMAT BackBufferFmt, + TEXTURE_FORMAT DepthBufferFmt, + Uint32 DisplayWidht, + Uint32 DisplayHeight, + Uint32 InitialVertexBufferSize = ImGuiImplDiligent::DefaultInitialVBSize, + Uint32 InitialIndexBufferSize = ImGuiImplDiligent::DefaultInitialIBSize); ~ImGuiImplLinuxX11(); + // clang-format off ImGuiImplLinuxX11 (const ImGuiImplLinuxX11&) = delete; ImGuiImplLinuxX11 ( ImGuiImplLinuxX11&&) = delete; ImGuiImplLinuxX11& operator = (const ImGuiImplLinuxX11&) = delete; ImGuiImplLinuxX11& operator = ( ImGuiImplLinuxX11&&) = delete; + // clang-format on - bool HandleXEvent(XEvent* event); - virtual void NewFrame()override final; + bool HandleXEvent(XEvent* event); + virtual void NewFrame() override final; private: std::chrono::time_point<std::chrono::high_resolution_clock> m_LastTimestamp = {}; }; -} +} // namespace Diligent diff --git a/Imgui/interface/ImGuiImplLinuxXCB.h b/Imgui/interface/ImGuiImplLinuxXCB.h index 62658b4..71571e6 100644 --- a/Imgui/interface/ImGuiImplLinuxXCB.h +++ b/Imgui/interface/ImGuiImplLinuxXCB.h @@ -46,19 +46,22 @@ public: Uint32 InitialIndexBufferSize = ImGuiImplDiligent::DefaultInitialIBSize); ~ImGuiImplLinuxXCB(); + // clang-format off ImGuiImplLinuxXCB (const ImGuiImplLinuxXCB&) = delete; ImGuiImplLinuxXCB ( ImGuiImplLinuxXCB&&) = delete; ImGuiImplLinuxXCB& operator = (const ImGuiImplLinuxXCB&) = delete; ImGuiImplLinuxXCB& operator = ( ImGuiImplLinuxXCB&&) = delete; + // clang-format on - bool HandleXCBEvent(xcb_generic_event_t* event); - virtual void NewFrame()override final; + bool HandleXCBEvent(xcb_generic_event_t* event); + virtual void NewFrame() override final; private: void HandleKeyEvent(xcb_key_release_event_t* event); _XCBKeySymbols* m_syms = nullptr; + std::chrono::time_point<std::chrono::high_resolution_clock> m_LastTimestamp = {}; }; -} +} // namespace Diligent diff --git a/Imgui/interface/ImGuiImplMacOS.h b/Imgui/interface/ImGuiImplMacOS.h index 504072f..28b6a32 100644 --- a/Imgui/interface/ImGuiImplMacOS.h +++ b/Imgui/interface/ImGuiImplMacOS.h @@ -44,10 +44,12 @@ public: Uint32 InitialIndexBufferSize = ImGuiImplDiligent::DefaultInitialIBSize); ~ImGuiImplMacOS(); + // clang-format off ImGuiImplMacOS (const ImGuiImplMacOS&) = delete; ImGuiImplMacOS ( ImGuiImplMacOS&&) = delete; ImGuiImplMacOS& operator = (const ImGuiImplMacOS&) = delete; ImGuiImplMacOS& operator = ( ImGuiImplMacOS&&) = delete; + // clang-format on virtual void NewFrame()override final; virtual void Render(IDeviceContext* _Nonnull pCtx)override final; diff --git a/Imgui/interface/ImGuiImplUWP.h b/Imgui/interface/ImGuiImplUWP.h index 97fbacf..788bae2 100644 --- a/Imgui/interface/ImGuiImplUWP.h +++ b/Imgui/interface/ImGuiImplUWP.h @@ -32,21 +32,23 @@ namespace Diligent class ImGuiImplUWP final : public ImGuiImplDiligent { public: - ImGuiImplUWP(IRenderDevice* pDevice, - TEXTURE_FORMAT BackBufferFmt, - TEXTURE_FORMAT DepthBufferFmt, - Uint32 DisplayWidth, - Uint32 DisplayHeight, - Uint32 InitialVertexBufferSize = ImGuiImplDiligent::DefaultInitialVBSize, - Uint32 InitialIndexBufferSize = ImGuiImplDiligent::DefaultInitialIBSize); + ImGuiImplUWP(IRenderDevice* pDevice, + TEXTURE_FORMAT BackBufferFmt, + TEXTURE_FORMAT DepthBufferFmt, + Uint32 DisplayWidth, + Uint32 DisplayHeight, + Uint32 InitialVertexBufferSize = ImGuiImplDiligent::DefaultInitialVBSize, + Uint32 InitialIndexBufferSize = ImGuiImplDiligent::DefaultInitialIBSize); ~ImGuiImplUWP(); + // clang-format off ImGuiImplUWP (const ImGuiImplUWP&) = delete; ImGuiImplUWP ( ImGuiImplUWP&&) = delete; ImGuiImplUWP& operator = (const ImGuiImplUWP&) = delete; ImGuiImplUWP& operator = ( ImGuiImplUWP&&) = delete; + // clang-format on - virtual void NewFrame()override final; + virtual void NewFrame() override final; void SetDisplaySize(Uint32 DisplayWidth, Uint32 DisplayHeight) { @@ -55,10 +57,10 @@ public: } private: - INT64 m_Time = 0; - INT64 m_TicksPerSecond = 0; - Uint32 m_DisplayWidth = 0; - Uint32 m_DisplayHeight = 0; + INT64 m_Time = 0; + INT64 m_TicksPerSecond = 0; + Uint32 m_DisplayWidth = 0; + Uint32 m_DisplayHeight = 0; }; -} +} // namespace Diligent diff --git a/Imgui/interface/ImGuiImplWin32.h b/Imgui/interface/ImGuiImplWin32.h index f926112..a10ffa9 100644 --- a/Imgui/interface/ImGuiImplWin32.h +++ b/Imgui/interface/ImGuiImplWin32.h @@ -32,22 +32,24 @@ namespace Diligent class ImGuiImplWin32 final : public ImGuiImplDiligent { public: - ImGuiImplWin32(HWND hWnd, - IRenderDevice* pDevice, - TEXTURE_FORMAT BackBufferFmt, - TEXTURE_FORMAT DepthBufferFmt, - Uint32 InitialVertexBufferSize = ImGuiImplDiligent::DefaultInitialVBSize, - Uint32 InitialIndexBufferSize = ImGuiImplDiligent::DefaultInitialIBSize); + ImGuiImplWin32(HWND hWnd, + IRenderDevice* pDevice, + TEXTURE_FORMAT BackBufferFmt, + TEXTURE_FORMAT DepthBufferFmt, + Uint32 InitialVertexBufferSize = ImGuiImplDiligent::DefaultInitialVBSize, + Uint32 InitialIndexBufferSize = ImGuiImplDiligent::DefaultInitialIBSize); ~ImGuiImplWin32(); LRESULT Win32_ProcHandler(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam); + // clang-format off ImGuiImplWin32 (const ImGuiImplWin32&) = delete; ImGuiImplWin32 ( ImGuiImplWin32&&) = delete; ImGuiImplWin32& operator = (const ImGuiImplWin32&) = delete; ImGuiImplWin32& operator = ( ImGuiImplWin32&&) = delete; + // clang-format on - virtual void NewFrame()override final; + virtual void NewFrame() override final; }; -} +} // namespace Diligent diff --git a/Imgui/interface/ImGuiUtils.h b/Imgui/interface/ImGuiUtils.h index 7bbe806..26992f8 100644 --- a/Imgui/interface/ImGuiUtils.h +++ b/Imgui/interface/ImGuiUtils.h @@ -36,7 +36,7 @@ class ImGuiScopedDisabler { public: explicit ImGuiScopedDisabler(bool Disable, float AlphaScale = 0.25f) : - m_IsDisabled(Disable) + m_IsDisabled{Disable} { if (m_IsDisabled) { @@ -58,15 +58,16 @@ private: const bool m_IsDisabled; }; -} +} // namespace Diligent namespace ImGui { -template<typename T> +template <typename T> inline bool Checkbox(const char* label, T* v) { bool b = *v != 0; + auto pressed = Checkbox(label, &b); if (pressed) *v = b ? 1 : 0; @@ -89,29 +90,30 @@ inline void HelpMarker(const char* desc, bool IsSameLine = true, const char* mar } } -template<typename T, typename = typename std::enable_if<std::numeric_limits<T>::is_integer>::type> +template <typename T, typename = typename std::enable_if<std::numeric_limits<T>::is_integer>::type> bool SliderIntT(const char* label, T* v, int v_min, int v_max, const char* format = "%d") { int i = static_cast<int>(*v); + auto value_changed = ImGui::SliderInt(label, &i, v_min, v_max, format); if (value_changed) *v = static_cast<T>(i); return value_changed; } -template<typename T> +template <typename T> bool Combo(const char* label, T* current_item, const std::pair<T, const char*> items[], int items_count, int popup_max_height_in_items = -1) { int item_idx = 0; - while(item_idx < items_count && items[item_idx].first != *current_item) + while (item_idx < items_count && items[item_idx].first != *current_item) ++item_idx; - if(item_idx >= items_count) + if (item_idx >= items_count) { UNEXPECTED("Current item was not found in the items list"); return false; } std::vector<const char*> names(items_count); - for(int i=0; i < items_count; ++i) + for (int i = 0; i < items_count; ++i) names[i] = items[i].second; auto value_changed = Combo(label, &item_idx, names.data(), items_count, popup_max_height_in_items); if (value_changed) @@ -120,4 +122,4 @@ bool Combo(const char* label, T* current_item, const std::pair<T, const char*> i return value_changed; } -} +} // namespace ImGui |
