Improve code style

Author: halx99

.github/workflows/build.yml

@@ -143,6 +143,14 @@ jobs:
         - name: Build
           shell: pwsh
           run: .\tools\cmdline\axmol -p winuwp -a x64 -O3 -xc '-DAX_RENDER_API=d3d11'
+  winuwp-d3d12:
+        runs-on: windows-latest
+        steps:
+        - uses: actions/checkout@v6
+
+        - name: Build
+          shell: pwsh
+          run: .\tools\cmdline\axmol -p winuwp -a x64 -O3 -xc '-DAX_RENDER_API=d3d12'
   win32-clang-ogl:
         runs-on: windows-latest
         steps:

axmol/base/Director.cpp

@@ -401,7 +401,7 @@ void Director::calculateDeltaTime()
     // new delta time. Re-fixed issue #1277
     if (_nextDeltaTimeZero)
     {
-        _deltaTime         = 1e-6;
+        _deltaTime         = 1e-6f;
         _nextDeltaTimeZero = false;
         _lastUpdate        = std::chrono::steady_clock::now();
     }
@@ -414,7 +414,7 @@ void Director::calculateDeltaTime()
             _deltaTime  = std::chrono::duration_cast<std::chrono::microseconds>(now - _lastUpdate).count() / 1000000.0f;
             _lastUpdate = now;
         }
-        _deltaTime = MAX(1e-6, _deltaTime);
+        _deltaTime = MAX(1e-6f, _deltaTime);
     }
 
 #if defined(_AX_DEBUG) && _AX_DEBUG
@@ -1288,7 +1288,7 @@ void Director::resume()
 #endif
 
     _paused    = false;
-    _deltaTime = 1e-6;
+    _deltaTime = 1e-6f;
     // fix issue #3509, skip one fps to avoid incorrect time calculation.
     setNextDeltaTimeZero(true);
 }

axmol/base/Director.h

@@ -610,7 +610,7 @@ class AX_DLL Director
     EventCustom* _eventAfterGfxDrop      = nullptr;
 
     /* delta time since last tick to main loop */
-    float _deltaTime              = 1e-6;
+    float _deltaTime              = 1e-6f;
     bool _deltaTimePassedByCaller = false;
 
     /* The _renderView, where everything is rendered, RenderView is a abstract class,cocos2d-x provide RenderViewImpl

extensions/ImGui/README.md

@@ -69,11 +69,9 @@ public:
 ```
 More about use imgui widgets, please see: https://github.com/ocornut/imgui
 
-## Tested devices
+## Supported platforms
 
-* win32
-* macOS
-* Android
+All platforms supported by axmol.
 
 ## Notes
 

extensions/ImGui/src/ImGui/ImGuiPresenter.cpp

@@ -26,10 +26,10 @@ THE SOFTWARE.
 #include <assert.h>
 #if defined(AX_PLATFORM_PC)
 #    include "backends/imgui_impl_glfw.h"
-#    include "backends/imgui_impl_axmol.h"
 #else
 #    include "backends/imgui_impl_axmol_sw.h"
 #endif
+#include "backends/imgui_impl_axmol.h"
 #include "imgui_internal.h"
 #include "misc/freetype/imgui_freetype.h"
 
@@ -292,7 +292,7 @@ void ImGuiPresenter::init()
     IMGUI_CHECKVERSION();
     ImGui::CreateContext();
     ImGuiIO& io = ImGui::GetIO();
-    (void)io;
+
     io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;  // Enable Keyboard Controls
     // io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad;      // Enable Gamepad Controls
     io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;  // Enable Docking
@@ -327,7 +327,7 @@ void ImGuiPresenter::init()
     auto window = static_cast<RenderViewImpl*>(Director::getInstance()->getRenderView())->getWindow();
     ImGui_ImplGlfw_InitForAxmol(window, true);
 #else
-    ImGui_ImplAxmolSW_InitForAxmol(Director::getInstance()->getRenderView(), true);
+    ImGui_ImplAxmolSW_Init(Director::getInstance()->getRenderView(), true);
 #endif
     ImGui_ImplAxmol_Init();
 

extensions/ImGui/src/ImGui/backends/imgui_impl_axmol_sw.cpp

@@ -105,7 +105,7 @@ static bool ImGui_ImplAxmol_HitTest(const ImVec2& p)
 static int s_CapturedTouchId = -1;
 
 // Functions
-bool ImGui_ImplAxmolSW_InitForAxmol(RenderView* window, bool install_callbacks)
+bool ImGui_ImplAxmolSW_Init(RenderView* window, bool install_callbacks)
 {
     ImGuiIO& io = ImGui::GetIO();
     IM_ASSERT(io.BackendPlatformUserData == nullptr && "Already initialized a platform backend!");
@@ -114,11 +114,8 @@ bool ImGui_ImplAxmolSW_InitForAxmol(RenderView* window, bool install_callbacks)
     ImGui_ImplAxmolSW_Data* bd = IM_NEW(ImGui_ImplAxmolSW_Data)();
     io.BackendPlatformUserData = (void*)bd;
     io.BackendPlatformName     = "imgui_impl_axmol_sw";
-    // io.BackendFlags |= ImGuiBackendFlags_HasMouseCursors;         // We can honor GetMouseCursor() values (optional)
-    io.BackendFlags |=
-        ImGuiBackendFlags_HasSetMousePos;  // We can honor io.WantSetMousePos requests (optional, rarely used)
-    // io.BackendFlags |= ImGuiBackendFlags_PlatformHasViewports;    // We can create multi-viewports on the Platform
-    // side (optional)
+    // We can honor io.WantSetMousePos requests (optional, rarely used)
+    io.BackendFlags |= ImGuiBackendFlags_HasSetMousePos;
 
     bd->Window = window;
     bd->Time   = 0.0;

extensions/ImGui/src/ImGui/backends/imgui_impl_axmol_sw.h

@@ -1,8 +1,9 @@
 #pragma once
-#include "imgui_impl_axmol.h"
+
+#include "imgui.h"
 #include "axmol/platform/RenderView.h"
 
 /// ImGui Axmol SingleWindow platform spec APIs
-IMGUI_IMPL_API bool ImGui_ImplAxmolSW_InitForAxmol(ax::RenderView* window, bool install_callbacks);
+IMGUI_IMPL_API bool ImGui_ImplAxmolSW_Init(ax::RenderView* window, bool install_callbacks);
 IMGUI_IMPL_API void ImGui_ImplAxmolSW_Shutdown();
 IMGUI_IMPL_API void ImGui_ImplAxmolSW_NewFrame();