Rename internal ios class: EARenderView => RenderHostView

Author: halx99

core/platform/CMakeLists.txt

@@ -82,7 +82,7 @@ elseif(APPLE)
       ${_AX_PLATFORM_SPECIFIC_HEADER}
       platform/ios/Application-ios.h
       platform/ios/DirectorCaller-ios.h
-      platform/ios/EARenderView-ios.h
+      platform/ios/RenderHostView-ios.h
       platform/ios/RenderViewImpl-ios.h
       platform/ios/StdC-ios.h
       platform/ios/InputView-ios.h
@@ -95,7 +95,7 @@ elseif(APPLE)
       platform/ios/Common-ios.mm
       platform/ios/Device-ios.mm
       platform/ios/DirectorCaller-ios.mm
-      platform/ios/EARenderView-ios.mm
+      platform/ios/RenderHostView-ios.mm
       platform/ios/RenderViewImpl-ios.mm
       platform/ios/Image-ios.mm
       platform/ios/InputView-ios.mm

core/platform/ios/AxmolViewController.mm

@@ -23,7 +23,7 @@ of this software and associated documentation files (the "Software"), to deal
  ****************************************************************************/
 
 #import "AxmolViewController.h"
-#import "platform/ios/EARenderView-ios.h"
+#import "platform/ios/RenderHostView-ios.h"
 #include "platform/Device.h"
 #include "platform/Application.h"
 #include "base/Director.h"

core/platform/ios/Device-ios.mm

@@ -904,24 +904,13 @@ static bool _initWithString(std::string_view text,
     return Device::Orientation::Portrait; // fallback
 }
 
-static bool isPhone()
-{
-#if !defined(AX_TARGET_OS_TVOS)
-    return [[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone;
-#else
-    return false;
-#endif
-}
 Device::Orientation Device::resolveOrientation()
 {
     auto supported = getSupportedOrientations();
     auto preferred = getPreferredOrientation();
     auto physical  = getPhysicalOrientation();
 
     auto tryUse = [&](Orientation o) -> Orientation {
-        if (isPhone() && o == Orientation::ReversePortrait)
-            return Orientation::Portrait; // iPhone treats ReversePortrait as Portrait
-
         return ((supported & toMask(o)) == toMask(o)) ? o : Orientation::Unknown;
     };
 

core/platform/ios/DirectorCaller-ios.mm

@@ -31,7 +31,7 @@ of this software and associated documentation files (the "Software"), to deal
 #import <OpenGLES/EAGL.h>
 
 #import "base/Director.h"
-#import "platform/ios/EARenderView-ios.h"
+#import "platform/ios/RenderHostView-ios.h"
 
 static id s_sharedDirectorCaller;
 
@@ -139,7 +139,7 @@ - (void)doCaller:(id)sender
     {
         ax::Director* director = ax::Director::getInstance();
 #if AX_GLES_PROFILE
-        EAGLContext* context = [(__bridge EARenderView*)director->getRenderView()->getEARenderView() context];
+        EAGLContext* context = [(__bridge RenderHostView*)director->getRenderView()->getEARenderView() context];
         if (context != [EAGLContext currentContext])
             glFlush();
 

core/platform/ios/EARenderView-ios.h core/platform/ios/RenderHostView-ios.hcore/platform/ios/EARenderView-ios.h renamed to core/platform/ios/RenderHostView-ios.h

@@ -15,7 +15,7 @@ seeds.
 
 =====================
 
-File: EARenderView.h
+File: RenderHostView.h
 Abstract: Convenience class that wraps the CAEAGLLayer from CoreAnimation into a
 UIView subclass.
 
@@ -77,12 +77,12 @@ Copyright (C) 2008 Apple Inc. All Rights Reserved.
 
 // CLASS INTERFACE:
 
-/** EARenderView Class.
+/** RenderHostView Class.
  * This class wraps the CAEAGLLayer from CoreAnimation into a convenient UIView subclass.
  * The view content is basically an EAGL surface you render your OpenGL scene into.
  * Note that setting the view non-opaque will only work if the EAGL surface has an alpha channel.
  */
-@interface EARenderView : UIView {
+@interface RenderHostView : UIView {
 #if AX_GLES_PROFILE
     id<ESRenderer> renderer_;
 #endif
@@ -94,13 +94,13 @@ Copyright (C) 2008 Apple Inc. All Rights Reserved.
     unsigned int requestedSamples_;
 }
 
-/** creates an initializes an EARenderView with a frame and 0-bit depth buffer, and a RGB565 color buffer */
+/** creates an initializes an RenderHostView with a frame and 0-bit depth buffer, and a RGB565 color buffer */
 + (id)viewWithFrame:(CGRect)frame;
-/** creates an initializes an EARenderView with a frame, a color buffer format, and 0-bit depth buffer */
+/** creates an initializes an RenderHostView with a frame, a color buffer format, and 0-bit depth buffer */
 + (id)viewWithFrame:(CGRect)frame pixelFormat:(int)format;
-/** creates an initializes an EARenderView with a frame, a color buffer format, and a depth buffer format */
+/** creates an initializes an RenderHostView with a frame, a color buffer format, and a depth buffer format */
 + (id)viewWithFrame:(CGRect)frame pixelFormat:(int)format depthFormat:(int)depth;
-/** creates an initializes an EARenderView with a frame, a color buffer format, a depth buffer format, a sharegroup, and
+/** creates an initializes an RenderHostView with a frame, a color buffer format, a depth buffer format, a sharegroup, and
  * multisampling */
 + (id)viewWithFrame:(CGRect)frame
            pixelFormat:(int)format
@@ -110,11 +110,11 @@ Copyright (C) 2008 Apple Inc. All Rights Reserved.
          multiSampling:(BOOL)multisampling
        numberOfSamples:(unsigned int)samples;
 
-/** Initializes an EARenderView with a frame and 0-bit depth buffer, and a RGB565 color buffer */
+/** Initializes an RenderHostView with a frame and 0-bit depth buffer, and a RGB565 color buffer */
 - (id)initWithFrame:(CGRect)frame;  // These also set the current context
-/** Initializes an EARenderView with a frame, a color buffer format, and 0-bit depth buffer */
+/** Initializes an RenderHostView with a frame, a color buffer format, and 0-bit depth buffer */
 - (id)initWithFrame:(CGRect)frame pixelFormat:(int)format;
-/** Initializes an EARenderView with a frame, a color buffer format, a depth buffer format, a sharegroup and multisampling
+/** Initializes an RenderHostView with a frame, a color buffer format, a depth buffer format, a sharegroup and multisampling
  * support */
 - (id)initWithFrame:(CGRect)frame
            pixelFormat:(int)format
@@ -140,7 +140,7 @@ Copyright (C) 2008 Apple Inc. All Rights Reserved.
 @property(nonatomic, readwrite) BOOL multiSampling;
 @property(nonatomic, readonly) BOOL isKeyboardShown;
 
-/** EARenderView uses double-buffer. This method swaps the buffers */
+/** RenderHostView uses double-buffer. This method swaps the buffers */
 - (void)swapBuffers;
 
 - (CGRect)convertRectFromViewToSurface:(CGRect)rect;

core/platform/ios/EARenderView-ios.mm core/platform/ios/RenderHostView-ios.mmcore/platform/ios/EARenderView-ios.mm renamed to core/platform/ios/RenderHostView-ios.mm

@@ -15,7 +15,7 @@
 
 =====================
 
-File: EARenderView.m
+File: RenderHostView.m
 Abstract: Convenience class that wraps the CAEAGLLayer from CoreAnimation into a
 UIView subclass.
 
@@ -60,7 +60,7 @@ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
 Copyright (C) 2008 Apple Inc. All Rights Reserved.
 
 */
-#import "platform/ios/EARenderView-ios.h"
+#import "platform/ios/RenderHostView-ios.h"
 
 #import <QuartzCore/QuartzCore.h>
 
@@ -84,14 +84,14 @@ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
 
 #define IOS_MAX_TOUCHES_COUNT 10
 
-@interface EARenderView ()
+@interface RenderHostView ()
 @property(nonatomic) TextInputView* textInputView;
 @property(nonatomic, readwrite, assign) BOOL isKeyboardShown;
 @property(nonatomic, copy) NSNotification* keyboardShowNotification;
 @property(nonatomic, assign) CGRect originalRect;
 @end
 
-@implementation EARenderView
+@implementation RenderHostView
 
 @synthesize surfaceSize = size_;
 @synthesize pixelFormat = pixelformat_, depthFormat = depthFormat_;
@@ -432,7 +432,7 @@ - (unsigned int)convertPixelFormat:(int)pixelFormat
 }
 #endif
 
-#pragma mark EARenderView - Point conversion
+#pragma mark RenderHostView - Point conversion
 
 - (CGPoint)convertPointFromViewToSurface:(CGPoint)point
 {
@@ -459,7 +459,7 @@ - (CGRect)convertRectFromViewToSurface:(CGRect)rect
 }
 
 // Pass the touches to the superview
-#pragma mark EARenderView - Touch Delegate
+#pragma mark RenderHostView - Touch Delegate
 - (void)touchesBegan:(NSSet*)touches withEvent:(UIEvent*)event
 {
     if (self.isKeyboardShown)

core/platform/ios/RenderViewImpl-ios.h

@@ -77,10 +77,10 @@ class AX_DLL RenderViewImpl : public RenderView
     bool isRetinaDisplay() const override { return getContentScaleFactor() == 2.0; }
 
     /** @since axmol-2.8.0, returns the objective-c UIWindow instance */
-    void* getEAWindow() const override { return _eaWindowHandle; }
+    void* getEAWindow() const override { return _hostWindowHandle; }
 
-    /** @since axmol-2.8.0, returns the objective-c EARenderView instance */
-    void* getEARenderView() const override { return _eaViewHandle; }
+    /** @since axmol-2.8.0, returns the objective-c RenderHostView instance */
+    void* getEARenderView() const override { return _hostViewHandle; }
 
     // overrides
     bool isGfxContextReady() override;
@@ -102,8 +102,8 @@ class AX_DLL RenderViewImpl : public RenderView
     bool initWithFullScreen(std::string_view viewName);
 
     // the objective-c instance handles
-    void* _eaViewHandle;
-    void* _eaWindowHandle;
+    void* _hostViewHandle;
+    void* _hostWindowHandle;
 };
 
 #ifndef AX_CORE_PROFILE

core/platform/ios/RenderViewImpl-ios.mm

@@ -26,7 +26,7 @@ of this software and associated documentation files (the "Software"), to deal
  ****************************************************************************/
 #import <UIKit/UIKit.h>
 
-#include "platform/ios/EARenderView-ios.h"
+#include "platform/ios/RenderHostView-ios.h"
 #include "platform/ios/DirectorCaller-ios.h"
 #include "platform/ios/RenderViewImpl-ios.h"
 #include "platform/Device.h"
@@ -147,15 +147,15 @@ static CGSize computeLogicalScreenSize()
 
 RenderViewImpl::~RenderViewImpl()
 {
-    // auto eaView = (__bridge EARenderView*) _eaViewHandle;
+    // auto eaView = (__bridge RenderHostView*) _hostViewHandle;
     //[eaView release];
 }
 
 #ifndef AX_CORE_PROFILE
 bool RenderViewImpl::initWithEARenderView(void* viewHandle)
 {
-    _eaViewHandle          = viewHandle;
-    EARenderView* eaView  = (__bridge EARenderView*)_eaViewHandle;
+    _hostViewHandle          = viewHandle;
+    RenderHostView* eaView  = (__bridge RenderHostView*)_hostViewHandle;
 
     _screenSize.width = _designResolutionSize.width = [eaView getWidth];
     _screenSize.height = _designResolutionSize.height = [eaView getHeight];
@@ -171,10 +171,10 @@ static CGSize computeLogicalScreenSize()
     choosePixelFormats();
 
     // create platform window
-    _eaWindowHandle = [[UIWindow alloc] initWithFrame:r];
+    _hostWindowHandle = [[UIWindow alloc] initWithFrame:r];
 
     // create platform render view
-    EARenderView* eaView = [EARenderView viewWithFrame:r
+    RenderHostView* hostView = [RenderHostView viewWithFrame:r
                                          pixelFormat:(int)_pixelFormat
                                          depthFormat:(int)_depthFormat
                                   preserveBackbuffer:NO
@@ -184,16 +184,18 @@ static CGSize computeLogicalScreenSize()
 
     // Not available on tvOS
 #if !defined(AX_TARGET_OS_TVOS)
-    [eaView setMultipleTouchEnabled:YES];
+    [hostView setMultipleTouchEnabled:YES];
 #endif
 
     auto logicalSize = computeLogicalScreenSize();
+    
+    const auto backingScaleFactor = hostView.contentScaleFactor;
 
-    _screenSize.width = _designResolutionSize.width = logicalSize.width;
-    _screenSize.height = _designResolutionSize.height = logicalSize.height;
+    _screenSize.width = _designResolutionSize.width = logicalSize.width * backingScaleFactor;
+    _screenSize.height = _designResolutionSize.height = logicalSize.height * backingScaleFactor;
     //    _scaleX = _scaleY = [eaView contentScaleFactor];
 
-    _eaViewHandle = eaView;
+    _hostViewHandle = hostView;
 
     return true;
 }
@@ -213,21 +215,21 @@ static CGSize computeLogicalScreenSize()
 void RenderViewImpl::setMultipleTouchEnabled(bool enabled)
 {
 #if !defined(AX_TARGET_OS_TVOS)
-    [(__bridge EARenderView*)_eaViewHandle setMultipleTouchEnabled:enabled];
+    [(__bridge RenderHostView*)_hostViewHandle setMultipleTouchEnabled:enabled];
 #else
     AX_UNUSED_PARAM(enabled);
 #endif
 }
 
 void RenderViewImpl::showWindow(void* viewController)
 {
-    auto window = (__bridge UIWindow*)_eaWindowHandle;
+    auto window = (__bridge UIWindow*)_hostWindowHandle;
     auto controller = (__bridge UIViewController*)viewController;
 
 #if !defined(AX_TARGET_OS_TVOS)
     controller.extendedLayoutIncludesOpaqueBars = YES;
 #endif
-    auto view = (__bridge EARenderView*)_eaViewHandle;
+    auto view = (__bridge RenderHostView*)_hostViewHandle;
     controller.view = view;
 
     // Set RootViewController to window
@@ -257,40 +259,40 @@ static CGSize computeLogicalScreenSize()
 
 bool RenderViewImpl::isGfxContextReady()
 {
-    return _eaViewHandle != nullptr;
+    return _hostViewHandle != nullptr;
 }
 
 bool RenderViewImpl::setContentScaleFactor(float contentScaleFactor)
 {
     AX_ASSERT(_resolutionPolicy == ResolutionPolicy::UNKNOWN);  // cannot enable retina mode
     _scaleX = _scaleY = contentScaleFactor;
 
-    [(__bridge EARenderView*)_eaViewHandle setNeedsLayout];
+    [(__bridge RenderHostView*)_hostViewHandle setNeedsLayout];
 
     return true;
 }
 
 float RenderViewImpl::getContentScaleFactor() const
 {
-    return [(__bridge EARenderView*)_eaViewHandle contentScaleFactor];
+    return [(__bridge RenderHostView*)_hostViewHandle contentScaleFactor];
 }
 
 void RenderViewImpl::end()
 {
     [CCDirectorCaller destroy];
 
-    [(__bridge EARenderView*)_eaViewHandle removeFromSuperview];
+    [(__bridge RenderHostView*)_hostViewHandle removeFromSuperview];
     release();
 }
 
 void RenderViewImpl::swapBuffers()
 {
-    [(__bridge EARenderView*)_eaViewHandle swapBuffers];
+    [(__bridge RenderHostView*)_hostViewHandle swapBuffers];
 }
 
 void RenderViewImpl::setIMEKeyboardState(bool open)
 {
-    auto eaView = (__bridge EARenderView*)_eaViewHandle;
+    auto eaView = (__bridge RenderHostView*)_hostViewHandle;
     if (open)
     {
         [eaView showKeyboard];
@@ -303,7 +305,7 @@ static CGSize computeLogicalScreenSize()
 
 Rect RenderViewImpl::getSafeAreaRect() const
 {
-    EARenderView* eaView = (__bridge EARenderView*)_eaViewHandle;
+    RenderHostView* eaView = (__bridge RenderHostView*)_hostViewHandle;
 
 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000
     float version = [[UIDevice currentDevice].systemVersion floatValue];

core/ui/UIEditBox/UIEditBoxImpl-ios.mm

@@ -34,7 +34,7 @@ of this software and associated documentation files (the "Software"), to deal
 #    include "ui/UIEditBox/UIEditBox.h"
 #    include "base/Director.h"
 #    include "2d/Label.h"
-#    import "platform/ios/EARenderView-ios.h"
+#    import "platform/ios/RenderHostView-ios.h"
 
 #    import <Foundation/Foundation.h>
 #    import <UIKit/UIKit.h>
@@ -182,7 +182,7 @@ of this software and associated documentation files (the "Software"), to deal
 void EditBoxImplIOS::updateNativeFrame(const Rect& rect)
 {
     auto renderView          = ax::Director::getInstance()->getRenderView();
-    EARenderView* eaView = (__bridge EARenderView*)renderView->getEARenderView();
+    RenderHostView* eaView = (__bridge RenderHostView*)renderView->getEARenderView();
 
     float factor = eaView.contentScaleFactor;
 
@@ -210,7 +210,7 @@ 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");
-    auto eaView = static_cast<EARenderView*>(ax::Director::getInstance()->getRenderView()->getEARenderView());
+    auto eaView = static_cast<RenderHostView*>(ax::Director::getInstance()->getRenderView()->getEARenderView());
     float retinaFactor   = eaView.contentScaleFactor;
     NSString* fntName    = [NSString stringWithUTF8String:fontName];
 

core/ui/UIEditBox/UIEditBoxImpl-mac.mm

@@ -48,7 +48,7 @@ of this software and associated documentation files (the "Software"), to deal
 EditBoxImplMac::EditBoxImplMac(EditBox* pEditText) : EditBoxImplCommon(pEditText), _sysEdit(nullptr)
 {
     //! TODO: Retina on Mac
-    //! _inRetinaMode = [[EARenderView sharedERenderView] contentScaleFactor] == 2.0f ? true : false;
+    //! _inRetinaMode = [[RenderHostView sharedERenderView] contentScaleFactor] == 2.0f ? true : false;
     _inRetinaMode = false;
 }