ARCore iOS SDK v1.14.0

google-ar · Dec 12, 2019 · ae50aa7 · ae50aa7
1 parent 5689930
commit ae50aa7
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 22 deletions.
diff --git a/Examples/AugmentedFacesExample/Podfile b/Examples/AugmentedFacesExample/Podfile
@@ -1,3 +1,3 @@
 target 'AugmentedFacesExample'
 platform :ios, '11.0'
-pod 'ARCore/AugmentedFaces', '~> 1.13.0'
+pod 'ARCore/AugmentedFaces', '~> 1.14.0'
diff --git a/Examples/CloudAnchorExample/CloudAnchorExample/AppDelegate.m b/Examples/CloudAnchorExample/CloudAnchorExample/AppDelegate.m
@@ -16,17 +16,17 @@
 
 #import "AppDelegate.h"
 
+#import "ExampleViewController.h"
+
 #import <FirebaseCore/FirebaseCore.h>
 
-#import "ExampleViewController.h"
 
 @interface AppDelegate ()
 
 @end
 
 @implementation AppDelegate
 
-
 - (BOOL)application:(UIApplication *)application
     didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
   [UIApplication sharedApplication].idleTimerDisabled = YES;
@@ -35,8 +35,10 @@ - (BOOL)application:(UIApplication *)application
 
   [FIRApp configure];
 
-  UIStoryboard* storyBoard = [UIStoryboard storyboardWithName:@"Main" bundle:nil];
-  ExampleViewController* viewController = [storyBoard instantiateInitialViewController];
+  UIStoryboard *storyBoard =
+      [UIStoryboard storyboardWithName:@"Main" bundle:nil];
+  ExampleViewController *viewController =
+      [storyBoard instantiateInitialViewController];
   self.window.rootViewController = viewController;
 
   [self.window makeKeyAndVisible];
@@ -45,7 +47,7 @@ - (BOOL)application:(UIApplication *)application
 }
 
 - (UIInterfaceOrientationMask)application:(UIApplication *)application
-  supportedInterfaceOrientationsForWindow:(UIWindow *)window {
+    supportedInterfaceOrientationsForWindow:(UIWindow *)window {
   return UIInterfaceOrientationMaskPortrait;
 }
 

diff --git a/Examples/CloudAnchorExample/CloudAnchorExample/CloudAnchorManager.m b/Examples/CloudAnchorExample/CloudAnchorExample/CloudAnchorManager.m
@@ -16,6 +16,8 @@
 
 #import "CloudAnchorManager.h"
 
+#import <Foundation/Foundation.h>
+
 #import <ARCore/ARCore.h>
 #import <FirebaseDatabase/FirebaseDatabase.h>
 

diff --git a/Examples/CloudAnchorExample/CloudAnchorExample/ExampleViewController.h b/Examples/CloudAnchorExample/CloudAnchorExample/ExampleViewController.h
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#import <UIKit/UIKit.h>
-#import <SceneKit/SceneKit.h>
 #import <ARKit/ARKit.h>
+#import <SceneKit/SceneKit.h>
+#import <UIKit/UIKit.h>
 
 @interface ExampleViewController : UIViewController
 

diff --git a/Examples/CloudAnchorExample/CloudAnchorExample/ExampleViewController.m b/Examples/CloudAnchorExample/CloudAnchorExample/ExampleViewController.m
@@ -16,14 +16,15 @@
 
 #import "ExampleViewController.h"
 
+#import "CloudAnchorManager.h"
+
 #import <dispatch/dispatch.h>
 
 #import <ARKit/ARKit.h>
-#import <ARCore/ARCore.h>
 #import <ModelIO/ModelIO.h>
 #import <SceneKit/ModelIO.h>
 
-#import "CloudAnchorManager.h"
+#import <ARCore/ARCore.h>
 
 typedef NS_ENUM(NSInteger, HelloARState) {
   HelloARStateDefault,
@@ -102,9 +103,9 @@ - (void)touchesEnded:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event {
   CGPoint touchLocation = [touch locationInView:self.sceneView];
 
   NSArray *hitTestResults =
-  [self.sceneView hitTest:touchLocation
-                    types:ARHitTestResultTypeExistingPlaneUsingExtent |
-                          ARHitTestResultTypeEstimatedHorizontalPlane];
+      [self.sceneView hitTest:touchLocation
+                        types:ARHitTestResultTypeExistingPlaneUsingExtent |
+                              ARHitTestResultTypeEstimatedHorizontalPlane];
 
   if (hitTestResults.count > 0) {
     ARHitTestResult *result = [hitTestResults firstObject];
@@ -324,8 +325,8 @@ - (NSString *)cloudStateString:(GARCloudAnchorState)cloudState {
       return @"ErrorResolvingSdkVersionTooNew";
     case GARCloudAnchorStateErrorResolvingSdkVersionTooOld:
       return @"ErrorResolvingSdkVersionTooOld";
-    case GARCloudAnchorStateErrorServiceUnavailable:
-      return @"ErrorServiceUnavailable";
+    case GARCloudAnchorStateErrorHostingServiceUnavailable:
+      return @"ErrorHostingServiceUnavailable";
     default:
       return @"Unknown";
   }
@@ -469,7 +470,7 @@ - (void)renderer:(id<SCNSceneRenderer>)renderer
     SCNPlane *plane = [SCNPlane planeWithWidth:width height:height];
 
     plane.materials.firstObject.diffuse.contents =
-        [UIColor colorWithRed:0.0f green:0.0f blue:1.0f alpha:0.3f];
+        [UIColor colorWithRed:0.0f green:0.0f blue:1.0f alpha:0.7f];
 
     SCNNode *planeNode = [SCNNode nodeWithGeometry:plane];
 

diff --git a/Examples/CloudAnchorExample/CloudAnchorExample/Info.plist b/Examples/CloudAnchorExample/CloudAnchorExample/Info.plist
@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
 	<string>Cloud Anchor Example</string>
 	<key>CFBundleExecutable</key>

diff --git a/Examples/CloudAnchorExample/CloudAnchorExample/example.scnassets/andy.dae b/Examples/CloudAnchorExample/CloudAnchorExample/example.scnassets/andy.dae
diff --git a/Examples/CloudAnchorExample/CloudAnchorExample/main.m b/Examples/CloudAnchorExample/CloudAnchorExample/main.m
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-#import <UIKit/UIKit.h>
 #import "AppDelegate.h"
+#import <UIKit/UIKit.h>
 
-int main(int argc, char * argv[]) {
+int main(int argc, char *argv[]) {
   @autoreleasepool {
-      return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
+    return UIApplicationMain(argc, argv, nil,
+                             NSStringFromClass([AppDelegate class]));
   }
 }
diff --git a/Examples/CloudAnchorExample/Podfile b/Examples/CloudAnchorExample/Podfile
@@ -1,5 +1,5 @@
 target 'CloudAnchorExample'
 platform :ios, '11.0'
-pod 'ARCore/CloudAnchors', '~> 1.13.0'
+pod 'ARCore/CloudAnchors', '~> 1.14.0'
 pod 'Firebase/Core', '~> 4.11'
 pod 'Firebase/Database', '~> 4.11'