Cardboard XR Plugin v1.18.0

googlevr · Oct 24, 2022 · f14b4d1 · f14b4d1
1 parent 5d09998
commit f14b4d1
Show file tree

Hide file tree

Showing 8 changed files with 150 additions and 4 deletions.
diff --git a/Editor/BuildPostProcessor.cs b/Editor/BuildPostProcessor.cs
@@ -45,6 +45,14 @@ public static void OnPostProcessBuild(BuildTarget buildTarget, string path)
                     path + "/Frameworks/com.google.xr.cardboard/Runtime/iOS/sdk.bundle/qrSample.png.meta");
                 FileUtil.DeleteFileOrDirectory(
                     path + "/Frameworks/com.google.xr.cardboard/Runtime/iOS/sdk.bundle/tickmarks.png.meta");
+
+                // Note: SDK binaries no longer contain bitcode, as
+                // <a https://developer.apple.com/documentation/Xcode-Release-Notes/xcode-14-release-notes>Apple has deprecated bitcode</a>.
+                string projectPath = PBXProject.GetPBXProjectPath(path);
+                string projectConfig = File.ReadAllText(projectPath);
+                projectConfig = projectConfig.Replace("ENABLE_BITCODE = YES",
+                                                      "ENABLE_BITCODE = NO");
+                File.WriteAllText(projectPath, projectConfig);
             }
         }
     }

diff --git a/Resources/Cardboard/quantum_ic_line_white_24.png b/Resources/Cardboard/quantum_ic_line_white_24.png
diff --git a/Resources/Cardboard/quantum_ic_line_white_24.png.meta b/Resources/Cardboard/quantum_ic_line_white_24.png.meta
diff --git a/Runtime/Android/GfxPluginCardboard.aar b/Runtime/Android/GfxPluginCardboard.aar
diff --git a/Runtime/UnitySubsystemsManifest.json b/Runtime/UnitySubsystemsManifest.json
@@ -1,6 +1,6 @@
 {
 	"name": "Cardboard",
-	"version": "1.17.0",
+	"version": "1.18.0",
 	"libraryName": "GfxPluginCardboard",
 	"displays": [
 		{

diff --git a/Runtime/XRLoader.cs b/Runtime/XRLoader.cs
@@ -42,6 +42,8 @@ public class XRLoader : XRLoaderHelper
 
         private static Texture2D _gearTexture;
 
+        private static Texture2D _whiteLineTexture;
+
         /// <summary>
         /// Pairs the native enum to set the graphics API being used.
         /// </summary>
@@ -165,7 +167,7 @@ internal static void RecalculateRectangles(Rect renderingArea)
                     1, _gearTexture.GetNativeTexturePtr(), gearRect.x, gearRect.y, gearRect.width,
                     gearRect.height);
             CardboardUnity_setWidgetParams(
-                    2, Texture2D.whiteTexture.GetNativeTexturePtr(), alignmentRect.x,
+                    2, _whiteLineTexture.GetNativeTexturePtr(), alignmentRect.x,
                     alignmentRect.y, alignmentRect.width, alignmentRect.height);
         }
 
@@ -282,6 +284,8 @@ private void CardboardSDKInitialize()
             DontDestroyOnLoad(_closeTexture);
             _gearTexture = Resources.Load<Texture2D>("Cardboard/quantum_ic_settings_white_24");
             DontDestroyOnLoad(_gearTexture);
+            _whiteLineTexture = Resources.Load<Texture2D>("Cardboard/quantum_ic_line_white_24");
+            DontDestroyOnLoad(_whiteLineTexture);
 
             SetGraphicsApi();
             SetViewportOrientation(Screen.orientation);
@@ -292,12 +296,13 @@ private void CardboardSDKInitialize()
         }
 
         /// <summary>
-        /// Close and gear button textures are preserved until the XR provider is deinitialized.
+        /// Widgets textures are preserved until the XR provider is deinitialized.
         /// </summary>
         private void CardboardSDKDeinitialize()
         {
             Resources.UnloadAsset(_closeTexture);
             Resources.UnloadAsset(_gearTexture);
+            Resources.UnloadAsset(_whiteLineTexture);
         }
     }
 }
diff --git a/Runtime/iOS/GfxPluginCardboard.a b/Runtime/iOS/GfxPluginCardboard.a
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "com.google.xr.cardboard",
     "displayName": "Google Cardboard XR Plugin for Unity",
-    "version": "1.17.0",
+    "version": "1.18.0",
     "unity": "2019.4",
     "description": "Provides rendering and input support for Google Cardboard.",
     "keywords": [