Renaming extension ImGuiEXT to ImGui

The singleton class ImGuiEXT also was renamed to ImGuiPresenter

extensions/CMakeLists.txt

@@ -17,7 +17,7 @@ option(AX_ENABLE_EXT_COCOSTUDIO "Build extension cocostudio" ON)
 option(AX_ENABLE_EXT_FAIRYGUI "Build extension FairyGUI" ON)
 
 if(WINDOWS OR MACOSX OR LINUX)
-  option(AX_ENABLE_EXT_IMGUI "Build extension ImGuiEXT" ON)
+  option(AX_ENABLE_EXT_IMGUI "Build extension ImGui" ON)
 else()
   set(AX_ENABLE_EXT_IMGUI OFF)
 endif()
@@ -96,7 +96,7 @@ if(AX_ENABLE_EXT_FAIRYGUI)
 endif()
 
 if(AX_ENABLE_EXT_IMGUI)
-  add_subdirectory(ImGuiEXT)
+  add_subdirectory(ImGui)
 endif()
 
 if(AX_ENABLE_EXT_COCOSTUDIO)

extensions/ImGui/CMakeLists.txt

@@ -1,9 +1,9 @@
-set(target_name ImGuiEXT)
+set(target_name ImGui)
 
 include_directories(imgui)
 
 set(HEADER
-    CCImGuiEXT.h
+    ImGuiPresenter.h
     # CCImGuiColorTextEdit.h
     imgui_impl_adxe.h
     imgui/imconfig.h
@@ -19,7 +19,7 @@ set(HEADER
 )
 
 set(SOURCE
-    CCImGuiEXT.cpp
+    ImGuiPresenter.cpp
     # CCImGuiColorTextEdit.cpp
     imgui_impl_adxe.cpp
     imgui/imgui.cpp

extensions/ImGui/ImGuiPresenter.cpp

@@ -1,4 +1,4 @@
-#include "CCImGuiEXT.h"
+#include "ImGuiPresenter.h"
 #include <assert.h>
 #include "imgui_impl_adxe.h"
 #include "imgui_internal.h"
@@ -21,14 +21,14 @@ static uint32_t fourccValue(std::string_view str)
     return value;
 }
 
-class ImGuiEXTEventTracker
+class ImGuiEventTracker
 {
 public:
-    virtual ~ImGuiEXTEventTracker() {}
+    virtual ~ImGuiEventTracker() {}
 };
 
 // Track scene event and check whether routed to the scene graph
-class ImGuiEXTSceneEventTracker : public ImGuiEXTEventTracker
+class ImGuiSceneEventTracker : public ImGuiEventTracker
 {
 public:
     bool initWithScene(Scene* scene)
@@ -73,7 +73,7 @@ public:
         return true;
     }
 
-    ~ImGuiEXTSceneEventTracker()
+    ~ImGuiSceneEventTracker()
     {
 #ifdef CC_PLATFORM_PC
         if (_trackLayer)
@@ -89,7 +89,7 @@ private:
     Layer* _trackLayer = nullptr;
 };
 
-class ImGuiEXTGlobalEventTracker : public ImGuiEXTEventTracker
+class ImGuiGlobalEventTracker : public ImGuiEventTracker
 {
     static const int highestPriority = (std::numeric_limits<int>::min)();
 
@@ -120,7 +120,7 @@ public:
         return true;
     }
 
-    ~ImGuiEXTGlobalEventTracker()
+    ~ImGuiGlobalEventTracker()
     {
 #ifdef CC_PLATFORM_PC
         auto eventDispatcher = Director::getInstance()->getEventDispatcher();
@@ -136,14 +136,14 @@ public:
     EventListenerMouse* _mouseListener         = nullptr;
 };
 
-static ImGuiEXT* _instance = nullptr;
-std::function<void(ImGuiEXT*)> ImGuiEXT::_onInit;
+static ImGuiPresenter* _instance = nullptr;
+std::function<void(ImGuiPresenter*)> ImGuiPresenter::_onInit;
 
-ImGuiEXT* ImGuiEXT::getInstance()
+ImGuiPresenter* ImGuiPresenter::getInstance()
 {
     if (_instance == nullptr)
     {
-        _instance = new ImGuiEXT();
+        _instance = new ImGuiPresenter();
         _instance->init();
         if (_onInit)
             _onInit(_instance);
@@ -151,7 +151,7 @@ ImGuiEXT* ImGuiEXT::getInstance()
     return _instance;
 }
 
-void ImGuiEXT::destroyInstance()
+void ImGuiPresenter::destroyInstance()
 {
     if (_instance)
     {
@@ -161,7 +161,7 @@ void ImGuiEXT::destroyInstance()
     }
 }
 
-void ImGuiEXT::init()
+void ImGuiPresenter::init()
 {
     // Setup Dear ImGui context
     IMGUI_CHECKVERSION();
@@ -201,7 +201,7 @@ void ImGuiEXT::init()
     ImGui_ImplGlfw_InitForAdxe(window, true);
     ImGui_ImplAdxe_Init();
 
-    ImGui_ImplAdxe_SetCustomFontLoader(&ImGuiEXT::loadCustomFonts, this);
+    ImGui_ImplAdxe_SetCustomFontLoader(&ImGuiPresenter::loadCustomFonts, this);
 
     ImGui::StyleColorsClassic();
 
@@ -210,7 +210,7 @@ void ImGuiEXT::init()
     eventDispatcher->addCustomEventListener(Director::EVENT_AFTER_VISIT, [=](EventCustom*) { endFrame(); });
 }
 
-void ImGuiEXT::cleanup()
+void ImGuiPresenter::cleanup()
 {
     auto eventDispatcher = Director::getInstance()->getEventDispatcher();
     eventDispatcher->removeCustomEventListeners(Director::EVENT_AFTER_VISIT);
@@ -225,14 +225,14 @@ void ImGuiEXT::cleanup()
     ImGui::DestroyContext();
 }
 
-void ImGuiEXT::setOnInit(const std::function<void(ImGuiEXT*)>& callBack)
+void ImGuiPresenter::setOnInit(const std::function<void(ImGuiPresenter*)>& callBack)
 {
     _onInit = callBack;
 }
 
-void ImGuiEXT::loadCustomFonts(void* ud)
+void ImGuiPresenter::loadCustomFonts(void* ud)
 {
-    auto thiz = (ImGuiEXT*)ud;
+    auto thiz = (ImGuiPresenter*)ud;
 
     auto imFonts = ImGui::GetIO().Fonts;
     imFonts->Clear();
@@ -263,7 +263,7 @@ void ImGuiEXT::loadCustomFonts(void* ud)
     }
 }
 
-float ImGuiEXT::scaleAllByDPI(float userScale)
+float ImGuiPresenter::scaleAllByDPI(float userScale)
 {
     // Gets scale
     float xscale = 1.0f;
@@ -293,7 +293,7 @@ float ImGuiEXT::scaleAllByDPI(float userScale)
     return zoomFactor;
 }
 
-void ImGuiEXT::addFont(std::string_view fontFile, float fontSize, CHS_GLYPH_RANGE glyphRange)
+void ImGuiPresenter::addFont(std::string_view fontFile, float fontSize, CHS_GLYPH_RANGE glyphRange)
 {
     if (FileUtils::getInstance()->isFileExistInternal(fontFile))
     {
@@ -302,7 +302,7 @@ void ImGuiEXT::addFont(std::string_view fontFile, float fontSize, CHS_GLYPH_RANG
     }
 }
 
-void ImGuiEXT::removeFont(std::string_view fontFile)
+void ImGuiPresenter::removeFont(std::string_view fontFile)
 {
     auto count = _fontsInfoMap.size();
     _fontsInfoMap.erase(fontFile);
@@ -310,7 +310,7 @@ void ImGuiEXT::removeFont(std::string_view fontFile)
         ImGui_ImplAdxe_SetDeviceObjectsDirty();
 }
 
-void ImGuiEXT::clearFonts()
+void ImGuiPresenter::clearFonts()
 {
     bool haveCustomFonts = !_fontsInfoMap.empty();
     _fontsInfoMap.clear();
@@ -321,7 +321,7 @@ void ImGuiEXT::clearFonts()
     // if(drawData) drawData->Clear();
 }
 
-void ImGuiEXT::end()
+void ImGuiPresenter::end()
 {
     _purgeNextLoop = true;
 }
@@ -329,7 +329,7 @@ void ImGuiEXT::end()
 /*
  * begin ImGui frame and draw ImGui stubs
  */
-void ImGuiEXT::beginFrame()
+void ImGuiPresenter::beginFrame()
 {  // drived by event Director::EVENT_BEFORE_DRAW from engine mainLoop
     if (_purgeNextLoop)
     {
@@ -358,7 +358,7 @@ void ImGuiEXT::beginFrame()
 /*
  * flush ImGui draw data to engine
  */
-void ImGuiEXT::endFrame()
+void ImGuiPresenter::endFrame()
 {
     if (_beginFrames > 0)
     {
@@ -376,7 +376,7 @@ void ImGuiEXT::endFrame()
     }
 }
 
-void ImGuiEXT::update()
+void ImGuiPresenter::update()
 {
     // clear things from last frame
     usedCCRefIdMap.clear();
@@ -388,7 +388,7 @@ void ImGuiEXT::update()
     // commands will be processed after update
 }
 
-bool ImGuiEXT::addRenderLoop(std::string_view id, std::function<void()> func, Scene* target)
+bool ImGuiPresenter::addRenderLoop(std::string_view id, std::function<void()> func, Scene* target)
 {
     // TODO: check whether exist
     auto fourccId = fourccValue(id);
@@ -397,11 +397,11 @@ bool ImGuiEXT::addRenderLoop(std::string_view id, std::function<void()> func, Sc
         return false;
     }
 
-    ImGuiEXTEventTracker* tracker;
+    ImGuiEventTracker* tracker;
     if (target)
-        tracker = utils::newInstance<ImGuiEXTSceneEventTracker>(&ImGuiEXTSceneEventTracker::initWithScene, target);
+        tracker = utils::newInstance<ImGuiSceneEventTracker>(&ImGuiSceneEventTracker::initWithScene, target);
     else
-        tracker = utils::newInstance<ImGuiEXTGlobalEventTracker>();
+        tracker = utils::newInstance<ImGuiGlobalEventTracker>();
 
     if (tracker)
     {
@@ -411,7 +411,7 @@ bool ImGuiEXT::addRenderLoop(std::string_view id, std::function<void()> func, Sc
     return false;
 }
 
-void ImGuiEXT::removeRenderLoop(std::string_view id)
+void ImGuiPresenter::removeRenderLoop(std::string_view id)
 {
     auto fourccId   = fourccValue(id);
     const auto iter = _renderPiplines.find(fourccId);
@@ -426,7 +426,7 @@ void ImGuiEXT::removeRenderLoop(std::string_view id)
         deactiveImGuiViewports();
 }
 
-void ImGuiEXT::deactiveImGuiViewports()
+void ImGuiPresenter::deactiveImGuiViewports()
 {
     ImGuiContext& g = *GImGui;
     if (!(g.ConfigFlagsCurrFrame & ImGuiConfigFlags_ViewportsEnable))
@@ -457,7 +457,7 @@ static std::tuple<ImVec2, ImVec2> getTextureUV(Sprite* sp)
     return std::tuple<ImVec2, ImVec2>{uv0, uv1};
 }
 
-void ImGuiEXT::image(Texture2D* tex,
+void ImGuiPresenter::image(Texture2D* tex,
                      const ImVec2& size,
                      const ImVec2& uv0,
                      const ImVec2& uv1,
@@ -476,7 +476,7 @@ void ImGuiEXT::image(Texture2D* tex,
     ImGui::PopID();
 }
 
-void ImGuiEXT::image(Sprite* sprite, const ImVec2& size, const ImVec4& tint_col, const ImVec4& border_col)
+void ImGuiPresenter::image(Sprite* sprite, const ImVec2& size, const ImVec4& tint_col, const ImVec4& border_col)
 {
     if (!sprite || !sprite->getTexture())
         return;
@@ -493,7 +493,7 @@ void ImGuiEXT::image(Sprite* sprite, const ImVec2& size, const ImVec4& tint_col,
     ImGui::PopID();
 }
 
-bool ImGuiEXT::imageButton(Texture2D* tex,
+bool ImGuiPresenter::imageButton(Texture2D* tex,
                            const ImVec2& size,
                            const ImVec2& uv0,
                            const ImVec2& uv1,
@@ -514,7 +514,7 @@ bool ImGuiEXT::imageButton(Texture2D* tex,
     return ret;
 }
 
-bool ImGuiEXT::imageButton(Sprite* sprite,
+bool ImGuiPresenter::imageButton(Sprite* sprite,
                            const ImVec2& size,
                            int frame_padding,
                            const ImVec4& bg_col,
@@ -537,7 +537,7 @@ bool ImGuiEXT::imageButton(Sprite* sprite,
     return ret;
 }
 
-void ImGuiEXT::node(Node* node, const ImVec4& tint_col, const ImVec4& border_col)
+void ImGuiPresenter::node(Node* node, const ImVec4& tint_col, const ImVec4& border_col)
 {
     if (!node)
         return;
@@ -558,7 +558,7 @@ void ImGuiEXT::node(Node* node, const ImVec4& tint_col, const ImVec4& border_col
     ImGui::PopID();
 }
 
-bool ImGuiEXT::nodeButton(Node* node, int frame_padding, const ImVec4& bg_col, const ImVec4& tint_col)
+bool ImGuiPresenter::nodeButton(Node* node, int frame_padding, const ImVec4& bg_col, const ImVec4& tint_col)
 {
     if (!node)
         return false;
@@ -586,14 +586,14 @@ bool ImGuiEXT::nodeButton(Node* node, int frame_padding, const ImVec4& bg_col, c
     return ret;
 }
 
-std::tuple<ImTextureID, int> ImGuiEXT::useTexture(Texture2D* texture)
+std::tuple<ImTextureID, int> ImGuiPresenter::useTexture(Texture2D* texture)
 {
     if (!texture)
         return std::tuple<ImTextureID, int>{nullptr, 0};
     return std::tuple<ImTextureID, int>{(ImTextureID)texture, getCCRefId(texture)};
 }
 
-std::tuple<ImTextureID, ImVec2, ImVec2, int> ImGuiEXT::useSprite(Sprite* sprite)
+std::tuple<ImTextureID, ImVec2, ImVec2, int> ImGuiPresenter::useSprite(Sprite* sprite)
 {
     if (!sprite || !sprite->getTexture())
         return std::tuple<ImTextureID, ImVec2, ImVec2, int>{nullptr, {}, {}, 0};
@@ -603,7 +603,7 @@ std::tuple<ImTextureID, ImVec2, ImVec2, int> ImGuiEXT::useSprite(Sprite* sprite)
                                                         getCCRefId(sprite)};
 }
 
-std::tuple<ImTextureID, ImVec2, ImVec2, int> ImGuiEXT::useNode(Node* node, const ImVec2& pos)
+std::tuple<ImTextureID, ImVec2, ImVec2, int> ImGuiPresenter::useNode(Node* node, const ImVec2& pos)
 {
     if (!node)
         return std::tuple<ImTextureID, ImVec2, ImVec2, int>{nullptr, {}, {}, 0};
@@ -617,7 +617,7 @@ std::tuple<ImTextureID, ImVec2, ImVec2, int> ImGuiEXT::useNode(Node* node, const
         (ImTextureID)node, pos, ImVec2(pos.x + size.width, pos.y + size.height), getCCRefId(node)};
 }
 
-void ImGuiEXT::setNodeColor(Node* node, const ImVec4& col)
+void ImGuiPresenter::setNodeColor(Node* node, const ImVec4& col)
 {
     if (node)
     {
@@ -626,13 +626,13 @@ void ImGuiEXT::setNodeColor(Node* node, const ImVec4& col)
     }
 }
 
-void ImGuiEXT::setNodeColor(Node* node, ImGuiCol col)
+void ImGuiPresenter::setNodeColor(Node* node, ImGuiCol col)
 {
     if (node && 0 <= col && col < ImGuiCol_COUNT)
         setNodeColor(node, ImGui::GetStyleColorVec4(col));
 }
 
-void ImGuiEXT::setLabelColor(Label* label, const ImVec4& col)
+void ImGuiPresenter::setLabelColor(Label* label, const ImVec4& col)
 {
     if (label)
     {
@@ -640,19 +640,19 @@ void ImGuiEXT::setLabelColor(Label* label, const ImVec4& col)
     }
 }
 
-void ImGuiEXT::setLabelColor(Label* label, bool disabled)
+void ImGuiPresenter::setLabelColor(Label* label, bool disabled)
 {
     if (label)
         setLabelColor(label, ImGui::GetStyleColorVec4(disabled ? ImGuiCol_TextDisabled : ImGuiCol_Text));
 }
 
-void ImGuiEXT::setLabelColor(Label* label, ImGuiCol col)
+void ImGuiPresenter::setLabelColor(Label* label, ImGuiCol col)
 {
     if (label && 0 <= col && col < ImGuiCol_COUNT)
         setLabelColor(label, ImGui::GetStyleColorVec4(col));
 }
 
-ImWchar* ImGuiEXT::addGlyphRanges(std::string_view key, const std::vector<ImWchar>& ranges)
+ImWchar* ImGuiPresenter::addGlyphRanges(std::string_view key, const std::vector<ImWchar>& ranges)
 {
     auto it = glyphRanges.find(key);
     // the pointer must be persistant, do not replace
@@ -664,7 +664,7 @@ ImWchar* ImGuiEXT::addGlyphRanges(std::string_view key, const std::vector<ImWcha
     return it->second.data();
 }
 
-void ImGuiEXT::mergeFontGlyphs(ImFont* dst, ImFont* src, ImWchar start, ImWchar end)
+void ImGuiPresenter::mergeFontGlyphs(ImFont* dst, ImFont* src, ImWchar start, ImWchar end)
 {
     if (!dst || !src || start > end)
         return;
@@ -679,7 +679,7 @@ void ImGuiEXT::mergeFontGlyphs(ImFont* dst, ImFont* src, ImWchar start, ImWchar
     dst->BuildLookupTable();
 }
 
-int ImGuiEXT::getCCRefId(Ref* p)
+int ImGuiPresenter::getCCRefId(Ref* p)
 {
     int id        = 0;
     const auto it = usedCCRefIdMap.find(p);

extensions/ImGui/ImGuiPresenter.h

@@ -12,10 +12,10 @@
 
 NS_CC_EXT_BEGIN
 
-class ImGuiEXTEventTracker;
-class ImGuiEXT
+class ImGuiEventTracker;
+class ImGuiPresenter
 {
-    friend class ImGuiEXTRenderer;
+    friend class ImGuiRenderer;
     void init();
     void cleanup();
 
@@ -32,9 +32,9 @@ public:
         DEFAULT_FONT_SIZE = 13  // see imgui.cpp
     };
 
-    static ImGuiEXT* getInstance();
+    static ImGuiPresenter* getInstance();
     static void destroyInstance();
-    static void setOnInit(const std::function<void(ImGuiEXT*)>& callBack);
+    static void setOnInit(const std::function<void(ImGuiPresenter*)>& callBack);
 
     /// <summary>
     /// Scale ImGui with majorMoniter DPI scaling
@@ -127,11 +127,11 @@ private:
     static void deactiveImGuiViewports();
 
 private:
-    static std::function<void(ImGuiEXT*)> _onInit;
+    static std::function<void(ImGuiPresenter*)> _onInit;
 
     struct RenderPipline
     {
-        ImGuiEXTEventTracker* tracker;
+        ImGuiEventTracker* tracker;
         std::function<void()> frame;
     };
 

tests/cpp-tests/CMakeLists.txt

@@ -108,7 +108,7 @@ list(APPEND GAME_HEADER
      Classes/VibrateTest/VibrateTest.h
      Classes/ClippingNodeTest/ClippingNodeTest.h
      Classes/UserDefaultTest/UserDefaultTest.h
-     Classes/ImGuiEXTTest/ImGuiEXTTest.h
+     Classes/ImGuiTest/ImGuiTest.h
      Classes/tests.h
      Classes/DataVisitorTest/DataVisitorTest.h
      Classes/NewAudioEngineTest/NewAudioEngineTest.h
@@ -330,7 +330,7 @@ list(APPEND GAME_SOURCE
 #     Classes/UnitTest/RefPtrTest.cpp
      Classes/UnitTest/UnitTest.cpp
      Classes/UserDefaultTest/UserDefaultTest.cpp
-     Classes/ImGuiEXTTest/ImGuiEXTTest.cpp
+     Classes/ImGuiTest/ImGuiTest.cpp
      Classes/VisibleRect.cpp
      Classes/VibrateTest/VibrateTest.cpp
      Classes/ZwoptexTest/ZwoptexTest.cpp

tests/cpp-tests/Classes/Box2DTestBed/Box2DTestBed.cpp

@@ -24,7 +24,7 @@
 
 #include "platform/CCPlatformConfig.h"
 #include "extensions/cocos-ext.h"
-#include "ImGuiEXT/CCImGuiEXT.h"
+#include "ImGui/ImGuiPresenter.h"
 #include "cocos2d.h"
 
 #include "Box2DTestBed.h"
@@ -236,13 +236,13 @@ void Box2DTestBed::onMouseScroll(Event* event)
 void Box2DTestBed::onEnter()
 {
     Scene::onEnter();
-    ImGuiEXT::getInstance()->addFont(FileUtils::getInstance()->fullPathForFilename("fonts/arial.ttf"));
-    ImGuiEXT::getInstance()->addRenderLoop("#im01", CC_CALLBACK_0(Box2DTestBed::onDrawImGui, this), this);
+    ImGuiPresenter::getInstance()->addFont(FileUtils::getInstance()->fullPathForFilename("fonts/arial.ttf"));
+    ImGuiPresenter::getInstance()->addRenderLoop("#im01", CC_CALLBACK_0(Box2DTestBed::onDrawImGui, this), this);
 }
 void Box2DTestBed::onExit()
 {
     Scene::onExit();
-    ImGuiEXT::getInstance()->removeRenderLoop("#im01");
+    ImGuiPresenter::getInstance()->removeRenderLoop("#im01");
 }
 
 void Box2DTestBed::update(float dt)

tests/cpp-tests/Classes/ImGuiTest/ImGuiTest.cpp

@@ -1,7 +1,7 @@
 #include "platform/CCPlatformConfig.h"
-#include "ImGuiEXTTest.h"
+#include "ImGuiTest.h"
 
-#include "ImGuiEXT/CCImGuiEXT.h"
+#include "ImGui/ImGuiPresenter.h"
 
 USING_NS_CC;
 USING_NS_CC_EXT;
@@ -12,7 +12,7 @@ static bool show_test_window    = true;
 static bool show_another_window = true;
 static ImVec4 clear_color       = ImColor(114, 144, 154);
 
-ImGuiEXTTests::ImGuiEXTTests()
+ImGuiTests::ImGuiTests()
 {
     // Resize (expand) window
     static Size resourceSize(1280, 720);
@@ -20,28 +20,28 @@ ImGuiEXTTests::ImGuiEXTTests()
     GLViewImpl* view = (GLViewImpl*)Director::getInstance()->getOpenGLView();
     view->setWindowed(resourceSize.width, resourceSize.height);
 
-    ADD_TEST_CASE(ImGuiEXTTest);
+    ADD_TEST_CASE(ImGuiTest);
 }
 
-void ImGuiEXTTest::onEnter()
+void ImGuiTest::onEnter()
 {
     TestCase::onEnter();
 
-    ImGuiEXT::getInstance()->addFont(FileUtils::getInstance()->fullPathForFilename("fonts/arial.ttf"));
-    ImGuiEXT::getInstance()->addRenderLoop("#test", CC_CALLBACK_0(ImGuiEXTTest::onDrawImGui, this), this);
+    ImGuiPresenter::getInstance()->addFont(FileUtils::getInstance()->fullPathForFilename("fonts/arial.ttf"));
+    ImGuiPresenter::getInstance()->addRenderLoop("#test", CC_CALLBACK_0(ImGuiTest::onDrawImGui, this), this);
 }
 
-void ImGuiEXTTest::onExit()
+void ImGuiTest::onExit()
 {
-    ImGuiEXT::getInstance()->removeRenderLoop("#test");
-    ImGuiEXT::getInstance()->clearFonts();
+    ImGuiPresenter::getInstance()->removeRenderLoop("#test");
+    ImGuiPresenter::getInstance()->clearFonts();
 
-    ImGuiEXT::destroyInstance();
+    ImGuiPresenter::destroyInstance();
 
     TestCase::onExit();
 }
 
-void ImGuiEXTTest::onDrawImGui()
+void ImGuiTest::onDrawImGui()
 {
     // 1. Show a simple window
     // Tip: if we don't call ImGui::Begin()/ImGui::End() the widgets appears in a window automatically called "Debug"

tests/cpp-tests/Classes/ImGuiTest/ImGuiTest.h

@@ -1,6 +1,7 @@
 /****************************************************************************
  Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
  Copyright (c) 2020 c4games.com
+ Copyright (c) 2022 Bytedance Inc.
 
  https://adxeproject.github.io/
 
@@ -31,14 +32,14 @@
 
 #if defined(CC_PLATFORM_PC)
 
-DEFINE_TEST_SUITE(ImGuiEXTTests);
+DEFINE_TEST_SUITE(ImGuiTests);
 
-class ImGuiEXTTest : public TestCase
+class ImGuiTest : public TestCase
 {
 public:
-    CREATE_FUNC(ImGuiEXTTest);
+    CREATE_FUNC(ImGuiTest);
 
-    std::string title() const override { return "ImGuiEXT Test"; }
+    std::string title() const override { return "ImGui Test"; }
 
     void onEnter() override;
     void onDrawImGui();

tests/cpp-tests/Classes/controller.cpp

@@ -45,7 +45,7 @@ public:
     {
 //        addTest("Node: Scene3D", [](){return new Scene3DTests(); });
 #if defined(CC_PLATFORM_PC)
-        addTest("ImGuiEXT", []() { return new ImGuiEXTTests(); });
+        addTest("ImGui", []() { return new ImGuiTests(); });
 #endif
         addTest("Texture2D", []() { return new Texture2DTests(); });
         addTest("ActionManager", []() { return new ActionManagerTests(); });

tests/cpp-tests/Classes/tests.h

@@ -120,6 +120,6 @@
 #include "SpriteFrameCacheTest/SpriteFrameCacheTest.h"
 #include "ZipTest/ZipTests.h"
 #if defined(CC_PLATFORM_PC)
-#    include "ImGuiEXTTest/ImGuiEXTTest.h"
+#    include "ImGuiTest/ImGuiTest.h"
 #endif
 #endif