From a1702f56c790adfa6122d51127cf0e9276bff9ba Mon Sep 17 00:00:00 2001 From: Sidney Bofah Date: Mon, 12 Oct 2015 05:30:48 +0200 Subject: [PATCH 1/3] Updated XCode project for XCode 7. Changed minimum Target to iOS 8.4. --- CardboardVR-iOS.xcodeproj/project.pbxproj | 9 ++++--- .../AppIcon.appiconset/Contents.json | 5 ---- .../LaunchImage.launchimage/Contents.json | 25 +++++-------------- CardboardVR-iOS/Supporting Files/Info.plist | 2 +- .../Supporting Files/LaunchScreen.xib | 5 ++-- 5 files changed, 16 insertions(+), 30 deletions(-) diff --git a/CardboardVR-iOS.xcodeproj/project.pbxproj b/CardboardVR-iOS.xcodeproj/project.pbxproj index 4978b21..e8560c8 100644 --- a/CardboardVR-iOS.xcodeproj/project.pbxproj +++ b/CardboardVR-iOS.xcodeproj/project.pbxproj @@ -315,7 +315,7 @@ 35B1882C19ABEF58005A9930 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0600; + LastUpgradeCheck = 0700; ORGANIZATIONNAME = "Peter Tribe"; TargetAttributes = { 35B1883319ABEF58005A9930 = { @@ -416,6 +416,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -481,8 +482,9 @@ ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; GCC_INPUT_FILETYPE = automatic; INFOPLIST_FILE = "CardboardVR-iOS/Supporting Files/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 7.1; + IPHONEOS_DEPLOYMENT_TARGET = 8.4; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.pnimedia.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -494,8 +496,9 @@ ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; GCC_INPUT_FILETYPE = automatic; INFOPLIST_FILE = "CardboardVR-iOS/Supporting Files/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 7.1; + IPHONEOS_DEPLOYMENT_TARGET = 8.4; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = "com.pnimedia.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; diff --git a/CardboardVR-iOS/Images.xcassets/AppIcon.appiconset/Contents.json b/CardboardVR-iOS/Images.xcassets/AppIcon.appiconset/Contents.json index 298e38f..edcb7f1 100644 --- a/CardboardVR-iOS/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/CardboardVR-iOS/Images.xcassets/AppIcon.appiconset/Contents.json @@ -94,11 +94,6 @@ "idiom" : "ipad", "size" : "76x76", "scale" : "2x" - }, - { - "idiom" : "car", - "size" : "120x120", - "scale" : "1x" } ], "info" : { diff --git a/CardboardVR-iOS/Images.xcassets/LaunchImage.launchimage/Contents.json b/CardboardVR-iOS/Images.xcassets/LaunchImage.launchimage/Contents.json index 5a29666..a0ad363 100644 --- a/CardboardVR-iOS/Images.xcassets/LaunchImage.launchimage/Contents.json +++ b/CardboardVR-iOS/Images.xcassets/LaunchImage.launchimage/Contents.json @@ -3,43 +3,30 @@ { "orientation" : "portrait", "idiom" : "ipad", - "minimum-system-version" : "7.0", "extent" : "full-screen", - "scale" : "2x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", "minimum-system-version" : "7.0", - "extent" : "full-screen", "scale" : "1x" }, { "orientation" : "landscape", "idiom" : "ipad", - "minimum-system-version" : "7.0", "extent" : "full-screen", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", "minimum-system-version" : "7.0", - "scale" : "2x" + "scale" : "1x" }, { "orientation" : "portrait", - "idiom" : "iphone", + "idiom" : "ipad", + "extent" : "full-screen", "minimum-system-version" : "7.0", - "subtype" : "retina4", "scale" : "2x" }, { - "orientation" : "portrait", + "orientation" : "landscape", "idiom" : "ipad", - "minimum-system-version" : "7.0", "extent" : "full-screen", - "scale" : "1x" + "minimum-system-version" : "7.0", + "scale" : "2x" } ], "info" : { diff --git a/CardboardVR-iOS/Supporting Files/Info.plist b/CardboardVR-iOS/Supporting Files/Info.plist index 410a8ed..47785f2 100644 --- a/CardboardVR-iOS/Supporting Files/Info.plist +++ b/CardboardVR-iOS/Supporting Files/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier - com.pnimedia.$(PRODUCT_NAME:rfc1034identifier) + $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion 6.0 CFBundleName diff --git a/CardboardVR-iOS/Supporting Files/LaunchScreen.xib b/CardboardVR-iOS/Supporting Files/LaunchScreen.xib index dde6076..3a03861 100644 --- a/CardboardVR-iOS/Supporting Files/LaunchScreen.xib +++ b/CardboardVR-iOS/Supporting Files/LaunchScreen.xib @@ -1,7 +1,7 @@ - + - + @@ -9,6 +9,7 @@ + From 2cecfa4a87ec180ff844d9a8cf53ff9fc724e016 Mon Sep 17 00:00:00 2001 From: Sidney Bofah Date: Mon, 12 Oct 2015 05:31:11 +0200 Subject: [PATCH 2/3] Fixed minor XCode 7 warnings. --- CardboardVR-iOS/CardboardSDK/CardboardViewController.mm | 2 ++ CardboardVR-iOS/Samples/Cube/GLCubeRenderer.m | 2 +- CardboardVR-iOS/Samples/Cube/GLCubeViewController.m | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CardboardVR-iOS/CardboardSDK/CardboardViewController.mm b/CardboardVR-iOS/CardboardSDK/CardboardViewController.mm index e259ed8..a723868 100644 --- a/CardboardVR-iOS/CardboardSDK/CardboardViewController.mm +++ b/CardboardVR-iOS/CardboardSDK/CardboardViewController.mm @@ -131,6 +131,8 @@ @interface CardboardViewController () @implementation CardboardViewController +@dynamic view; + - (id)init { self = [super init]; diff --git a/CardboardVR-iOS/Samples/Cube/GLCubeRenderer.m b/CardboardVR-iOS/Samples/Cube/GLCubeRenderer.m index d919eba..ba42708 100644 --- a/CardboardVR-iOS/Samples/Cube/GLCubeRenderer.m +++ b/CardboardVR-iOS/Samples/Cube/GLCubeRenderer.m @@ -153,7 +153,7 @@ - (void)tearDownGL - (void)updateProjectionMatrixAspectWithSize:(CGSize)size { - float aspect = fabsf(size.width / + float aspect = fabs(size.width / size.height); _projectionMatrix = GLKMatrix4MakePerspective(GLKMathDegreesToRadians(50.0f), aspect, 0.1f, 100.0f); } diff --git a/CardboardVR-iOS/Samples/Cube/GLCubeViewController.m b/CardboardVR-iOS/Samples/Cube/GLCubeViewController.m index 9337cb5..2ca3be9 100644 --- a/CardboardVR-iOS/Samples/Cube/GLCubeViewController.m +++ b/CardboardVR-iOS/Samples/Cube/GLCubeViewController.m @@ -23,6 +23,8 @@ @interface GLCubeViewController () @implementation GLCubeViewController +@dynamic view; + - (void)viewDidLoad { [super viewDidLoad]; From f2db40b9a4eb6beb5e4619af6db022a7cae5366d Mon Sep 17 00:00:00 2001 From: Sidney Bofah Date: Mon, 12 Oct 2015 05:39:16 +0200 Subject: [PATCH 3/3] Add updated xib to xcodeproj --- CardboardVR-iOS/Supporting Files/LaunchScreen.xib | 1 + 1 file changed, 1 insertion(+) diff --git a/CardboardVR-iOS/Supporting Files/LaunchScreen.xib b/CardboardVR-iOS/Supporting Files/LaunchScreen.xib index 3a03861..3c0bc08 100644 --- a/CardboardVR-iOS/Supporting Files/LaunchScreen.xib +++ b/CardboardVR-iOS/Supporting Files/LaunchScreen.xib @@ -1,6 +1,7 @@ +