Another Fix for iOS

TorqueGameEngines · Dec 5, 2023 · 8c10deb · 8c10deb
1 parent a093cdf
commit 8c10deb
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 17 deletions.
diff --git a/engine/compilers/Xcode_iOS/Torque2D.xcodeproj/project.pbxproj b/engine/compilers/Xcode_iOS/Torque2D.xcodeproj/project.pbxproj
@@ -3044,19 +3044,7 @@
  867BAF7216AEC9050033868F /* platform */ = {
  isa = PBXGroup;
  children = (
- 2B9F16DC1F1CF35100B18D6B /* tmm_off.h */,
- 2B9F16DD1F1CF35100B18D6B /* tmm_on.h */,
- 2B9F16DE1F1CF35100B18D6B /* typetraits.h */,
- 2B9F16D41F1CF33F00B18D6B /* platformNet_ScriptBinding.cc */,
- 2B9F16D51F1CF33F00B18D6B /* platformNet.cpp */,
- 2B9F16D61F1CF33F00B18D6B /* platformNet.h */,
- 2B9F16D71F1CF33F00B18D6B /* platformNetAsync.cpp */,
- 2B9F16D81F1CF33F00B18D6B /* platformNetAsync.h */,
  B350D1B5174F06B700033EBB /* CursorManager_ScriptBinding.h */,
- B350D1B6174F06B700033EBB /* platformAssert_ScriptBinding.h */,
- B350D1B7174F06B700033EBB /* platformFileIO_ScriptBinding.h */,
- B350D1B9174F06B700033EBB /* platformString_ScriptBinding.h */,
- B350D1BA174F06B700033EBB /* platformVideo_ScriptBinding.h */,
  867BAF7316AEC9050033868F /* CursorManager.cc */,
  867BAF7416AEC9050033868F /* eaxtypes.h */,
  867BAF7516AEC9050033868F /* event.h */,
@@ -3065,37 +3053,48 @@
  867BAF7816AEC9050033868F /* GLUFunc.h */,
  867BAF7916AEC9050033868F /* menus */,
  867BAF7C16AEC9050033868F /* nativeDialogs */,
+ 867BAF8416AEC9050033868F /* platform_ScriptBinding.h */,
  867BAF8216AEC9050033868F /* platform.cc */,
  867BAF8316AEC9050033868F /* platform.h */,
- 867BAF8416AEC9050033868F /* platform_ScriptBinding.h */,
  867BAF8516AEC9050033868F /* platformAL.h */,
+ B350D1B6174F06B700033EBB /* platformAssert_ScriptBinding.h */,
  867BAF8616AEC9050033868F /* platformAssert.cc */,
  867BAF8716AEC9050033868F /* platformAssert.h */,
  867BAF8816AEC9050033868F /* platformAudio.h */,
  867BAF8916AEC9050033868F /* platformCPU.cc */,
  867BAF8A16AEC9050033868F /* platformCPU.h */,
  867BAF8C16AEC9050033868F /* platformEndian.h */,
+ B350D1B7174F06B700033EBB /* platformFileIO_ScriptBinding.h */,
  867BAF8D16AEC9050033868F /* platformFileIO.cc */,
  867BAF8E16AEC9050033868F /* platformFileIO.h */,
  867BAF8F16AEC9050033868F /* platformFont.cc */,
  867BAF9016AEC9050033868F /* platformFont.h */,
  867BAF9116AEC9050033868F /* platformGL.h */,
- 867BAF9216AEC9050033868F /* platformInput.h */,
  867BAF9316AEC9050033868F /* platformInput_ScriptBinding.h */,
+ 867BAF9216AEC9050033868F /* platformInput.h */,
  867BAF9416AEC9050033868F /* platformMath.h */,
  867BAF9516AEC9050033868F /* platformMemory.cc */,
  867BAF9616AEC9050033868F /* platformMemory.h */,
+ 2B9F16D41F1CF33F00B18D6B /* platformNet_ScriptBinding.cc */,
+ 2B9F16D51F1CF33F00B18D6B /* platformNet.cpp */,
+ 2B9F16D61F1CF33F00B18D6B /* platformNet.h */,
+ 2B9F16D71F1CF33F00B18D6B /* platformNetAsync.cpp */,
+ 2B9F16D81F1CF33F00B18D6B /* platformNetAsync.h */,
  867BAF9B16AEC9050033868F /* platformSemaphore.h */,
+ B350D1B9174F06B700033EBB /* platformString_ScriptBinding.h */,
  867BAF9C16AEC9050033868F /* platformString.cc */,
  867BAF9D16AEC9050033868F /* platformString.h */,
  867BAF9E16AEC9050033868F /* platformTimeManager.h */,
  867BAF9F16AEC9050033868F /* platformTLS.h */,
  867BAFA016AEC9050033868F /* platformVFS.h */,
+ B350D1BA174F06B700033EBB /* platformVideo_ScriptBinding.h */,
  867BAFA116AEC9050033868F /* platformVideo.cc */,
  867BAFA216AEC9050033868F /* platformVideo.h */,
  867BAFA316AEC9050033868F /* threads */,
  867BAFA716AEC9050033868F /* Tickable.cc */,
  867BAFA816AEC9050033868F /* Tickable.h */,
+ 2B9F16DC1F1CF35100B18D6B /* tmm_off.h */,
+ 2B9F16DD1F1CF35100B18D6B /* tmm_on.h */,
  867BAFA916AEC9050033868F /* types.arm.h */,
  867BAFAA16AEC9050033868F /* types.codewarrior.h */,
  867BAFAB16AEC9050033868F /* types.gcc.h */,
@@ -3106,6 +3105,7 @@
  867BAFB016AEC9050033868F /* types.win32.h */,
  867BAFB216AEC9050033868F /* typesPPC.h */,
  867BAFB316AEC9050033868F /* typesWin32.h */,
+ 2B9F16DE1F1CF35100B18D6B /* typetraits.h */,
  );
  name = platform;
  path = ../../../source/platform;
@@ -3527,11 +3527,11 @@
  86A9A3BA16AEC786003F01E6 /* Torque2D */ = {
  isa = PBXGroup;
  children = (
- D000F98D1CB0D48600C4D097 /* bitmapFont */,
  867BACF816AEC9050033868F /* 2d */,
  867BAD6916AEC9050033868F /* algorithm */,
  867BAD7016AEC9050033868F /* assets */,
  867BAD8916AEC9050033868F /* audio */,
+ D000F98D1CB0D48600C4D097 /* bitmapFont */,
  867BAD9816AEC9050033868F /* collection */,
  867BADAF16AEC9050033868F /* component */,
  867BADD016AEC9050033868F /* console */,

diff --git a/engine/source/platformiOS/iOSConsole.h b/engine/source/platformiOS/iOSConsole.h
@@ -27,7 +27,7 @@
 #include "console/console.h"
 #endif
 #ifndef _EVENT_H_
-#include "Platform/event.h"
+#include "platform/event.h"
 #endif
 
 

diff --git a/engine/source/platformiOS/iOSWindow.mm b/engine/source/platformiOS/iOSWindow.mm
@@ -31,6 +31,7 @@
 #include "console/console.h"
 #include "platformiOS/iOSEvents.h"
 #include "platform/threads/thread.h"
+#include "platformiOS/iOSOutlineGL.h"
 
 #include "platformiOS/iOSWindow.h"
 #import <OpenGLES/EAGLDrawable.h>
@@ -134,7 +135,7 @@
 
  // Set RetinaEnabled and the Scale
  // NOTE: I think we could get rid of RetinaEnabled through out and just multiply directly by the scale or use RetinaScale > 1 when needed because with iPhone 6 Plus the screenScale is 3.
- Con::setBoolVariable("$pref::iOS::RetinaEnabled", gOutlineEnabled);
+ Con::setBoolVariable("$pref::iOS::RetinaEnabled", false);
  Con::setBoolVariable("$pref::iOS::RetinaScale", screenScale);
 
  // Determine the Aspect Ratio and set the device type from that