Fix missing renaming #2602 (#2604)

halx99 · web-flow · commit d7caceac29fe · 2025-07-17T00:21:40.000+08:00
* Fix missing renaming #2602 * Update docs/DevSetup.md
diff --git a/1k/build.profiles b/1k/build.profiles
@@ -85,7 +85,7 @@ guava=33.3.1
 # The emsdk version, as stable as possible
 # Notes:
 # - emscan-deps available since emsdk-4.0.3, but it's still not work properly
-# - since emsdk-4.0.0+ can't be debugging via chrome properly
+# - since emsdk-4.0.0+ can't be debugging via chrome properly on windows (macos and linux no this issue)
 # - axmol can build with emsdk-3.1.73+
 # - please use emsdk-3.1.73 if you want debug axmol wasm app properly
 emsdk=3.1.73+
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -122,7 +122,7 @@
 
 - Update android devenv to support android 16 by @halx99 in https://github.com/axmolengine/axmol/pull/2546
 - Update Android Studio minimum required version to `2024.3.2`
-- **Downgrade emsdk from `4.0.6` to `3.1.73` due to axmol apps can't be debugging via chrome properly when build with emsdk-4.0+, the breakpoint can't be trigger by default, or triggerd, but can't watch any variables even through build with -O0**
+- **Downgrade emsdk from `4.0.6` to `3.1.73` due to axmol apps can't be debugging via chrome properly on windows when build with emsdk-4.0+, the debugger will always report `No debug information for function "<func_name_signature>"`, and can't watch any variables even through build with `-O0`**
 
 ## Bug fixes
 
diff --git a/core/base/Director.cpp b/core/base/Director.cpp
@@ -263,7 +263,7 @@ void Director::setDefaultValues()
 
 void Director::setGLDefaultValues()
 {
-    // This method SHOULD be called only after glView_ was initialized
+    // This method SHOULD be called only after _renderView was initialized
     AXASSERT(_renderView, "opengl view should not be null");
 
     _renderer->setDepthTest(false);
diff --git a/core/platform/ios/DirectorCaller-ios.mm b/core/platform/ios/DirectorCaller-ios.mm
@@ -139,7 +139,7 @@ - (void)doCaller:(id)sender
     {
         ax::Director* director = ax::Director::getInstance();
 #if AX_GLES_PROFILE
-        EAGLContext* context = [(EARenderView*)director->getRenderView()->getEARenderView() context];
+        EAGLContext* context = [(__bridge EARenderView*)director->getRenderView()->getEARenderView() context];
         if (context != [EAGLContext currentContext])
             glFlush();
 
diff --git a/core/platform/winrt/RenderViewImpl-winrt.cpp b/core/platform/winrt/RenderViewImpl-winrt.cpp
@@ -44,7 +44,7 @@ THE SOFTWARE.
 namespace ax
 {
 
-static RenderViewImpl* s_pEglView = nullptr;
+static RenderViewImpl* s_renderView = nullptr;
 
 static EventMouse::MouseButton checkMouseButton(Windows::UI::Core::PointerEventArgs const& args)
 {
@@ -116,7 +116,7 @@ RenderViewImpl::RenderViewImpl()
     , m_appShouldExit(false)
     , _lastMouseButtonPressed(EventMouse::MouseButton::BUTTON_UNSET)
 {
-    s_pEglView = this;
+    s_renderView = this;
     _viewName  = "axmol2";
     m_keyboard = KeyBoardWinRT();
 
@@ -127,8 +127,8 @@ RenderViewImpl::RenderViewImpl()
 
 RenderViewImpl::~RenderViewImpl()
 {
-    AX_ASSERT(this == s_pEglView);
-    s_pEglView = nullptr;
+    AX_ASSERT(this == s_renderView);
+    s_renderView = nullptr;
 }
 
 bool RenderViewImpl::initWithRect(std::string_view viewName, const Rect& rect, float frameZoomFactor)
@@ -452,7 +452,7 @@ void RenderViewImpl::centerWindow()
 
 RenderViewImpl* RenderViewImpl::sharedRenderView()
 {
-    return s_pEglView;
+    return s_renderView;
 }
 
 int RenderViewImpl::Run()
diff --git a/core/renderer/Renderer.cpp b/core/renderer/Renderer.cpp
@@ -406,16 +406,15 @@ void Renderer::render()
 {
     // TODO: setup camera or MVP
     _isRendering = true;
-    //    if (_glViewAssigned)
+
+    // Process render commands
+    // 1. Sort render commands based on ID
+    for (auto&& renderqueue : _renderGroups)
     {
-        // Process render commands
-        // 1. Sort render commands based on ID
-        for (auto&& renderqueue : _renderGroups)
-        {
-            renderqueue.sort();
-        }
-        visitRenderQueue(_renderGroups[0]);
+        renderqueue.sort();
     }
+    visitRenderQueue(_renderGroups[0]);
+
     clean();
     _isRendering = false;
 }
diff --git a/core/ui/UIEditBox/UIEditBoxImpl-ios.mm b/core/ui/UIEditBox/UIEditBoxImpl-ios.mm
@@ -182,9 +182,9 @@ of this software and associated documentation files (the "Software"), to deal
 void EditBoxImplIOS::updateNativeFrame(const Rect& rect)
 {
     auto renderView          = ax::Director::getInstance()->getRenderView();
-    EARenderView* eaglView = (EARenderView*)renderView->getEARenderView();
+    EARenderView* eaView = (__bridge EARenderView*)renderView->getEARenderView();
 
-    float factor = eaglView.contentScaleFactor;
+    float factor = eaView.contentScaleFactor;
 
     [_systemControl updateFrame:CGRectMake(rect.origin.x / factor, rect.origin.y / factor, rect.size.width / factor,
                                            rect.size.height / factor)];
@@ -210,8 +210,8 @@ of this software and associated documentation files (the "Software"), to deal
 UIFont* EditBoxImplIOS::constructFont(const char* fontName, int fontSize)
 {
     AXASSERT(fontName != nullptr, "fontName can't be nullptr");
-    EARenderView* eaglView = static_cast<EARenderView*>(ax::Director::getInstance()->getRenderView()->getEARenderView());
-    float retinaFactor   = eaglView.contentScaleFactor;
+    auto eaView = static_cast<EARenderView*>(ax::Director::getInstance()->getRenderView()->getEARenderView());
+    float retinaFactor   = eaView.contentScaleFactor;
     NSString* fntName    = [NSString stringWithUTF8String:fontName];
 
     fntName = [[fntName lastPathComponent] stringByDeletingPathExtension];
diff --git a/core/ui/UIEditBox/UIEditBoxImpl-mac.mm b/core/ui/UIEditBox/UIEditBoxImpl-mac.mm
@@ -195,8 +195,8 @@ of this software and associated documentation files (the "Software"), to deal
 
 void EditBoxImplMac::updateNativeFrame(const ax::Rect& rect)
 {
-    RenderView* eglView = Director::getInstance()->getRenderView();
-    auto frameSize  = eglView->getFrameSize();
+    RenderView* renderView = Director::getInstance()->getRenderView();
+    auto frameSize  = renderView->getFrameSize();
     // Coordinate System on OSX has its origin at the lower left corner.
     //    https://developer.apple.com/library/ios/documentation/General/Conceptual/Devpedia-CocoaApp/CoordinateSystem.html
     auto screenPosY = frameSize.height - rect.origin.y - rect.size.height;
diff --git a/core/ui/UIEditBox/iOS/UIEditBoxIOS.mm b/core/ui/UIEditBox/iOS/UIEditBoxIOS.mm
@@ -320,9 +320,9 @@ - (void)setPlaceHolder:(NSString*)text
 - (void)doAnimationWhenKeyboardMoveWithDuration:(float)duration distance:(float)distance
 {
     auto view            = ax::Director::getInstance()->getRenderView();
-    EARenderView* eaglView = (EARenderView*)view->getEARenderView();
+    EARenderView* eaView = (__bridge EARenderView*)view->getEARenderView();
 
-    [eaglView doAnimationWhenKeyboardMoveWithDuration:duration distance:distance];
+    [eaView doAnimationWhenKeyboardMoveWithDuration:duration distance:distance];
 }
 
 - (void)updateFrame:(CGRect)rect
@@ -337,9 +337,9 @@ - (void)updateFrame:(CGRect)rect
 - (void)openKeyboard
 {
     auto view            = ax::Director::getInstance()->getRenderView();
-    EARenderView* eaglView = (EARenderView*)view->getEARenderView();
+    EARenderView* eaView = (__bridge EARenderView*)view->getEARenderView();
 
-    [eaglView addSubview:self.textInput];
+    [eaView addSubview:self.textInput];
     [self.textInput becomeFirstResponder];
 }
 
@@ -362,9 +362,9 @@ - (BOOL)textFieldShouldReturn:(UITextField*)sender
 - (void)animationSelector
 {
     auto view            = ax::Director::getInstance()->getRenderView();
-    EARenderView* eaglView = (EARenderView*)view->getEARenderView();
+    EARenderView* eaView = (__bridge EARenderView*)view->getEARenderView();
 
-    [eaglView doAnimationWhenAnotherEditBeClicked];
+    [eaView doAnimationWhenAnotherEditBeClicked];
 }
 
 #pragma mark - UITextView delegate methods
@@ -376,9 +376,9 @@ - (BOOL)textViewShouldBeginEditing:(UITextView*)textView
     _returnPressed = NO;
 
     auto view            = ax::Director::getInstance()->getRenderView();
-    EARenderView* eaglView = (EARenderView*)view->getEARenderView();
+    EARenderView* eaView = (__bridge EARenderView*)view->getEARenderView();
 
-    if ([eaglView isKeyboardShown])
+    if ([eaView isKeyboardShown])
     {
         [self performSelector:@selector(animationSelector) withObject:nil afterDelay:0.0f];
     }
@@ -469,9 +469,9 @@ - (BOOL)textFieldShouldBeginEditing:(UITextField*)sender  // return NO to disall
     _returnPressed = NO;
 
     auto view            = ax::Director::getInstance()->getRenderView();
-    EARenderView* eaglView = (EARenderView*)view->getEARenderView();
+    EARenderView* eaView = (__bridge EARenderView*)view->getEARenderView();
 
-    if ([eaglView isKeyboardShown])
+    if ([eaView isKeyboardShown])
     {
         [self performSelector:@selector(animationSelector) withObject:nil afterDelay:0.0f];
     }
diff --git a/core/ui/UIWebView/UIWebViewImpl-ios.mm b/core/ui/UIWebView/UIWebViewImpl-ios.mm
@@ -133,8 +133,8 @@ - (void)setupWebView
     if (!self.wkWebView.superview)
     {
         auto view     = ax::Director::getInstance()->getRenderView();
-        auto eaglView = (EARenderView*)view->getEARenderView();
-        [eaglView addSubview:self.wkWebView];
+        auto eaView = (__bridge EARenderView*)view->getEARenderView();
+        [eaView addSubview:self.wkWebView];
     }
 }
 
diff --git a/docs/DevSetup.md b/docs/DevSetup.md
@@ -241,3 +241,13 @@ Note: if you use non-SDK provided CMake, you will need to download `ninja` from
   to build and run.
 
 Notes: if you need debug in VSCode, remember to choose `CMake: [Debug]` in the WSCode taskbar.
+
+### WebAssembly
+
+Build & Run/Debug  
+
+1. Install [`C/C++ DevTools Support (DWARF) Chrome extension`](https://goo.gle/wasm-debugging-extension)
+2. Execute `axmol run -p wasm -O2` or `axmol run -p wasm -O0` in your axmol project root
+3. Now you can debug axmol apps via Chrome DevTools, for more details, refer to: [Debug C/C++ WebAssembly](https://developer.chrome.com/docs/devtools/wasm)
+
+*Note: When build axmol wasm apps with emsdk-4.0+, can't debug properly on windows, due to many developer works on windows (`linux` or `macos` no this issue), so axmol set emsdk default version to `3.1.73` in `1k/build.profiles` ensure developer can debug axmol wasm apps properly. if you use `linux` or `macos`, you can set emsdk to 4.0+ in your `.axproj`, for example `emsdk=4.0.11`.*
diff --git a/templates/common/proj.ios_mac/ios/RootViewController.mm b/templates/common/proj.ios_mac/ios/RootViewController.mm
@@ -80,15 +80,15 @@ - (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceO
 {
     [super didRotateFromInterfaceOrientation:fromInterfaceOrientation];
 
-    auto glView = ax::Director::getInstance()->getRenderView();
+    auto renderView = ax::Director::getInstance()->getRenderView();
 
-    if (glView)
+    if (renderView)
     {
-        EARenderView* eaglView = (__bridge EARenderView*)glView->getEARenderView();
+        EARenderView* eaView = (__bridge EARenderView*)renderView->getEARenderView();
 
-        if (eaglView)
+        if (eaView)
         {
-            CGSize s = CGSizeMake([eaglView getWidth], [eaglView getHeight]);
+            CGSize s = CGSizeMake([eaView getWidth], [eaView getHeight]);
             ax::Application::getInstance()->applicationScreenSizeChanged((int)s.width, (int)s.height);
         }
     }
diff --git a/templates/cpp/Source/AppDelegate.cpp b/templates/cpp/Source/AppDelegate.cpp
@@ -56,17 +56,17 @@ bool AppDelegate::applicationDidFinishLaunching()
 {
     // initialize director
     auto director = Director::getInstance();
-    auto glView   = director->getRenderView();
-    if (!glView)
+    auto renderView   = director->getRenderView();
+    if (!renderView)
     {
 #if (AX_TARGET_PLATFORM == AX_PLATFORM_WIN32) || (AX_TARGET_PLATFORM == AX_PLATFORM_MAC) || \
     (AX_TARGET_PLATFORM == AX_PLATFORM_LINUX)
-        glView = RenderViewImpl::createWithRect(
+        renderView = RenderViewImpl::createWithRect(
             "Dummy", ax::Rect(0, 0, designResolutionSize.width, designResolutionSize.height));
 #else
-        glView = RenderViewImpl::create("Dummy");
+        renderView = RenderViewImpl::create("Dummy");
 #endif
-        director->setRenderView(glView);
+        director->setRenderView(renderView);
     }
 
     // turn on display FPS
@@ -76,7 +76,7 @@ bool AppDelegate::applicationDidFinishLaunching()
     director->setAnimationInterval(1.0f / 60);
 
     // Set the design resolution
-    glView->setDesignResolutionSize(designResolutionSize.width, designResolutionSize.height,
+    renderView->setDesignResolutionSize(designResolutionSize.width, designResolutionSize.height,
                                     ResolutionPolicy::SHOW_ALL);
 
     // create a scene. it's an autorelease object
diff --git a/tests/cpp-tests/Source/AppDelegate.cpp b/tests/cpp-tests/Source/AppDelegate.cpp
@@ -70,19 +70,19 @@ bool AppDelegate::applicationDidFinishLaunching()
 
     // initialize director
     auto director = Director::getInstance();
-    auto glView   = director->getRenderView();
-    if (!glView)
+    auto renderView   = director->getRenderView();
+    if (!renderView)
     {
         std::string title = "Cpp Tests";
 #ifndef NDEBUG
         title += " *Debug*",
 #endif
 #ifdef AX_PLATFORM_PC
-        glView = RenderViewImpl::createWithRect(title, Rect(0, 0, g_resourceSize.width, g_resourceSize.height), 1.0F, true);
+        renderView = RenderViewImpl::createWithRect(title, Rect(0, 0, g_resourceSize.width, g_resourceSize.height), 1.0F, true);
 #else
-        glView = RenderViewImpl::createWithRect(title, Rect(0, 0, g_resourceSize.width, g_resourceSize.height));
+        renderView = RenderViewImpl::createWithRect(title, Rect(0, 0, g_resourceSize.width, g_resourceSize.height));
 #endif
-        director->setRenderView(glView);
+        director->setRenderView(renderView);
     }
 
     director->setStatsDisplay(true);
@@ -93,7 +93,7 @@ bool AppDelegate::applicationDidFinishLaunching()
     director->setAnimationInterval(1.0f / 60);
 #endif
 
-    auto screenSize = glView->getFrameSize();
+    auto screenSize = renderView->getFrameSize();
 
     auto fileUtils = FileUtils::getInstance();
     std::vector<std::string> searchPaths;
@@ -119,7 +119,7 @@ bool AppDelegate::applicationDidFinishLaunching()
     std::copy(oldSearchPaths.begin(), oldSearchPaths.end(), std::back_inserter(searchPaths));
     fileUtils->setSearchPaths(searchPaths);
 
-    glView->setDesignResolutionSize(g_designSize.width, g_designSize.height, ResolutionPolicy::SHOW_ALL);
+    renderView->setDesignResolutionSize(g_designSize.width, g_designSize.height, ResolutionPolicy::SHOW_ALL);
 
     // Enable Remote Console
     auto console = director->getConsole();
diff --git a/tests/cpp-tests/Source/BaseTest.cpp b/tests/cpp-tests/Source/BaseTest.cpp
@@ -164,12 +164,12 @@ void TestList::runThisTest()
      * otherwise, the layout will incorrect
      */
 
-    RenderViewImpl* glView = (RenderViewImpl*)Director::getInstance()->getRenderView();
+    RenderViewImpl* renderView = (RenderViewImpl*)Director::getInstance()->getRenderView();
 #if defined(AX_PLATFORM_PC) || defined(__EMSCRIPTEN__)
-    glView->setWindowed(g_resourceSize.width, g_resourceSize.height);
+    renderView->setWindowed(g_resourceSize.width, g_resourceSize.height);
 #endif
 
-    glView->setDesignResolutionSize(g_designSize.width, g_designSize.height, ResolutionPolicy::SHOW_ALL);
+    renderView->setDesignResolutionSize(g_designSize.width, g_designSize.height, ResolutionPolicy::SHOW_ALL);
 
     auto director = Director::getInstance();
     auto scene    = Scene::create();
diff --git a/tests/cpp-tests/Source/BugsTest/Bug-14327.cpp b/tests/cpp-tests/Source/BugsTest/Bug-14327.cpp
@@ -41,9 +41,9 @@ bool Bug14327Layer::init()
 {
     if (BugsTestBase::init())
     {
-        auto glView        = Director::getInstance()->getRenderView();
-        auto visibleOrigin = glView->getVisibleOrigin();
-        auto visibleSize   = glView->getVisibleSize();
+        auto renderView        = Director::getInstance()->getRenderView();
+        auto visibleOrigin = renderView->getVisibleOrigin();
+        auto visibleSize   = renderView->getVisibleSize();
 
         auto pBg = Sprite::create("Images/HelloWorld.png");
         pBg->setPosition(Vec2(visibleOrigin.x + visibleSize.width / 2, visibleOrigin.y + visibleSize.height / 2));
diff --git a/tests/cpp-tests/Source/ChipmunkTestBed/ChipmunkTestBed.cpp b/tests/cpp-tests/Source/ChipmunkTestBed/ChipmunkTestBed.cpp
@@ -309,9 +309,9 @@ ChipmunkTestBed::ChipmunkTestBed()
     // halx99: since axmol init scene default camera at 'initWithXXX' function, only change design size at scene
     // construct is ok see also: https://github.com/axmolengine/axmol/commit/581a7921554c09746616759d5a5ca6ce9d3eaa22
     auto director = Director::getInstance();
-    auto glView   = director->getRenderView();
+    auto renderView   = director->getRenderView();
     Size designSize(g_designSize.width * 0.85, g_designSize.height * 0.85);
-    glView->setDesignResolutionSize(designSize.width, designSize.height, ResolutionPolicy::SHOW_ALL);
+    renderView->setDesignResolutionSize(designSize.width, designSize.height, ResolutionPolicy::SHOW_ALL);
 
     // creating a keyboard event listener
     auto listener          = EventListenerKeyboard::create();
diff --git a/tests/cpp-tests/Source/UITest/CocoStudioGUITest/UIEditBoxTest.cpp b/tests/cpp-tests/Source/UITest/CocoStudioGUITest/UIEditBoxTest.cpp
diff --git a/tests/cpp-tests/Source/VRTest/VRTest.cpp b/tests/cpp-tests/Source/VRTest/VRTest.cpp
diff --git a/tests/cpp-tests/Source/WindowTest/WindowTest.cpp b/tests/cpp-tests/Source/WindowTest/WindowTest.cpp
diff --git a/tests/fairygui-tests/Source/AppDelegate.cpp b/tests/fairygui-tests/Source/AppDelegate.cpp
diff --git a/tests/live2d-tests/Source/AppDelegate.cpp b/tests/live2d-tests/Source/AppDelegate.cpp
diff --git a/tests/unit-tests/Source/AppDelegate.cpp b/tests/unit-tests/Source/AppDelegate.cpp

Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ void Director::setDefaultValues()`
`263`	`263`
`264`	`264`	`void Director::setGLDefaultValues()`
`265`	`265`	`{`
`266`		`- // This method SHOULD be called only after glView_ was initialized`
	`266`	`+ // This method SHOULD be called only after _renderView was initialized`
`267`	`267`	`AXASSERT(_renderView, "opengl view should not be null");`
`268`	`268`
`269`	`269`	`_renderer->setDepthTest(false);`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ - (void)doCaller:(id)sender`
`139`	`139`	`{`
`140`	`140`	`ax::Director* director = ax::Director::getInstance();`
`141`	`141`	`#if AX_GLES_PROFILE`
`142`		`- EAGLContext* context = [(EARenderView*)director->getRenderView()->getEARenderView() context];`
	`142`	`+ EAGLContext* context = [(__bridge EARenderView*)director->getRenderView()->getEARenderView() context];`
`143`	`143`	`if (context != [EAGLContext currentContext])`
`144`	`144`	`glFlush();`
`145`	`145`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ THE SOFTWARE.`
`44`	`44`	`namespace ax`
`45`	`45`	`{`
`46`	`46`
`47`		`-static RenderViewImpl* s_pEglView = nullptr;`
	`47`	`+static RenderViewImpl* s_renderView = nullptr;`
`48`	`48`
`49`	`49`	`static EventMouse::MouseButton checkMouseButton(Windows::UI::Core::PointerEventArgs const& args)`
`50`	`50`	`{`
`@@ -116,7 +116,7 @@ RenderViewImpl::RenderViewImpl()`
`116`	`116`	`, m_appShouldExit(false)`
`117`	`117`	`, _lastMouseButtonPressed(EventMouse::MouseButton::BUTTON_UNSET)`
`118`	`118`	`{`
`119`		`- s_pEglView = this;`
	`119`	`+ s_renderView = this;`
`120`	`120`	`_viewName = "axmol2";`
`121`	`121`	`m_keyboard = KeyBoardWinRT();`
`122`	`122`
`@@ -127,8 +127,8 @@ RenderViewImpl::RenderViewImpl()`
`127`	`127`
`128`	`128`	`RenderViewImpl::~RenderViewImpl()`
`129`	`129`	`{`
`130`		`- AX_ASSERT(this == s_pEglView);`
`131`		`- s_pEglView = nullptr;`
	`130`	`+ AX_ASSERT(this == s_renderView);`
	`131`	`+ s_renderView = nullptr;`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`bool RenderViewImpl::initWithRect(std::string_view viewName, const Rect& rect, float frameZoomFactor)`
`@@ -452,7 +452,7 @@ void RenderViewImpl::centerWindow()`
`452`	`452`
`453`	`453`	`RenderViewImpl* RenderViewImpl::sharedRenderView()`
`454`	`454`	`{`
`455`		`- return s_pEglView;`
	`455`	`+ return s_renderView;`
`456`	`456`	`}`
`457`	`457`
`458`	`458`	`int RenderViewImpl::Run()`
Original file line number	Diff line number	Diff line change
`@@ -406,16 +406,15 @@ void Renderer::render()`
`406`	`406`	`{`
`407`	`407`	`// TODO: setup camera or MVP`
`408`	`408`	`_isRendering = true;`
`409`		`- // if (_glViewAssigned)`
	`409`	`+`
	`410`	`+ // Process render commands`
	`411`	`+ // 1. Sort render commands based on ID`
	`412`	`+ for (auto&& renderqueue : _renderGroups)`
`410`	`413`	`{`
`411`		`- // Process render commands`
`412`		`- // 1. Sort render commands based on ID`
`413`		`- for (auto&& renderqueue : _renderGroups)`
`414`		`- {`
`415`		`- renderqueue.sort();`
`416`		`- }`
`417`		`- visitRenderQueue(_renderGroups[0]);`
	`414`	`+ renderqueue.sort();`
`418`	`415`	`}`
	`416`	`+ visitRenderQueue(_renderGroups[0]);`
	`417`	`+`
`419`	`418`	`clean();`
`420`	`419`	`_isRendering = false;`
`421`	`420`	`}`
Original file line number	Diff line number	Diff line change
`@@ -320,9 +320,9 @@ - (void)setPlaceHolder:(NSString*)text`
`320`	`320`	`- (void)doAnimationWhenKeyboardMoveWithDuration:(float)duration distance:(float)distance`
`321`	`321`	`{`
`322`	`322`	`auto view = ax::Director::getInstance()->getRenderView();`
`323`		`- EARenderView* eaglView = (EARenderView*)view->getEARenderView();`
	`323`	`+ EARenderView* eaView = (__bridge EARenderView*)view->getEARenderView();`
`324`	`324`
`325`		`- [eaglView doAnimationWhenKeyboardMoveWithDuration:duration distance:distance];`
	`325`	`+ [eaView doAnimationWhenKeyboardMoveWithDuration:duration distance:distance];`
`326`	`326`	`}`
`327`	`327`
`328`	`328`	`- (void)updateFrame:(CGRect)rect`
`@@ -337,9 +337,9 @@ - (void)updateFrame:(CGRect)rect`
`337`	`337`	`- (void)openKeyboard`
`338`	`338`	`{`
`339`	`339`	`auto view = ax::Director::getInstance()->getRenderView();`
`340`		`- EARenderView* eaglView = (EARenderView*)view->getEARenderView();`
	`340`	`+ EARenderView* eaView = (__bridge EARenderView*)view->getEARenderView();`
`341`	`341`
`342`		`- [eaglView addSubview:self.textInput];`
	`342`	`+ [eaView addSubview:self.textInput];`
`343`	`343`	`[self.textInput becomeFirstResponder];`
`344`	`344`	`}`
`345`	`345`
`@@ -362,9 +362,9 @@ - (BOOL)textFieldShouldReturn:(UITextField*)sender`
`362`	`362`	`- (void)animationSelector`
`363`	`363`	`{`
`364`	`364`	`auto view = ax::Director::getInstance()->getRenderView();`
`365`		`- EARenderView* eaglView = (EARenderView*)view->getEARenderView();`
	`365`	`+ EARenderView* eaView = (__bridge EARenderView*)view->getEARenderView();`
`366`	`366`
`367`		`- [eaglView doAnimationWhenAnotherEditBeClicked];`
	`367`	`+ [eaView doAnimationWhenAnotherEditBeClicked];`
`368`	`368`	`}`
`369`	`369`
`370`	`370`	`#pragma mark - UITextView delegate methods`
`@@ -376,9 +376,9 @@ - (BOOL)textViewShouldBeginEditing:(UITextView*)textView`
`376`	`376`	`_returnPressed = NO;`
`377`	`377`
`378`	`378`	`auto view = ax::Director::getInstance()->getRenderView();`
`379`		`- EARenderView* eaglView = (EARenderView*)view->getEARenderView();`
	`379`	`+ EARenderView* eaView = (__bridge EARenderView*)view->getEARenderView();`
`380`	`380`
`381`		`- if ([eaglView isKeyboardShown])`
	`381`	`+ if ([eaView isKeyboardShown])`
`382`	`382`	`{`
`383`	`383`	`[self performSelector:@selector(animationSelector) withObject:nil afterDelay:0.0f];`
`384`	`384`	`}`
`@@ -469,9 +469,9 @@ - (BOOL)textFieldShouldBeginEditing:(UITextField*)sender // return NO to disall`
`469`	`469`	`_returnPressed = NO;`
`470`	`470`
`471`	`471`	`auto view = ax::Director::getInstance()->getRenderView();`
`472`		`- EARenderView* eaglView = (EARenderView*)view->getEARenderView();`
	`472`	`+ EARenderView* eaView = (__bridge EARenderView*)view->getEARenderView();`
`473`	`473`
`474`		`- if ([eaglView isKeyboardShown])`
	`474`	`+ if ([eaView isKeyboardShown])`
`475`	`475`	`{`
`476`	`476`	`[self performSelector:@selector(animationSelector) withObject:nil afterDelay:0.0f];`
`477`	`477`	`}`
Original file line number	Diff line number	Diff line change
`@@ -133,8 +133,8 @@ - (void)setupWebView`
`133`	`133`	`if (!self.wkWebView.superview)`
`134`	`134`	`{`
`135`	`135`	`auto view = ax::Director::getInstance()->getRenderView();`
`136`		`- auto eaglView = (EARenderView*)view->getEARenderView();`
`137`		`- [eaglView addSubview:self.wkWebView];`
	`136`	`+ auto eaView = (__bridge EARenderView*)view->getEARenderView();`
	`137`	`+ [eaView addSubview:self.wkWebView];`
`138`	`138`	`}`
`139`	`139`	`}`
`140`	`140`