diff --git a/GoogleCardboardIOS/Images.xcassets/AppIcon.appiconset/Contents.json b/GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from GoogleCardboardIOS/Images.xcassets/AppIcon.appiconset/Contents.json rename to GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/AppIcon.appiconset/Contents.json diff --git a/GoogleCardboardIOS/Images.xcassets/AppIcon.appiconset/Icon-20.png b/GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/AppIcon.appiconset/Icon-20.png similarity index 100% rename from GoogleCardboardIOS/Images.xcassets/AppIcon.appiconset/Icon-20.png rename to GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/AppIcon.appiconset/Icon-20.png diff --git a/GoogleCardboardIOS/Images.xcassets/AppIcon.appiconset/Icon-20@2x-1.png b/GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/AppIcon.appiconset/Icon-20@2x-1.png similarity index 100% rename from GoogleCardboardIOS/Images.xcassets/AppIcon.appiconset/Icon-20@2x-1.png rename to GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/AppIcon.appiconset/Icon-20@2x-1.png diff --git a/GoogleCardboardIOS/Images.xcassets/AppIcon.appiconset/Icon-20@2x-2.png b/GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/AppIcon.appiconset/Icon-20@2x-2.png similarity index 100% rename from GoogleCardboardIOS/Images.xcassets/AppIcon.appiconset/Icon-20@2x-2.png rename to GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/AppIcon.appiconset/Icon-20@2x-2.png diff --git a/GoogleCardboardIOS/Images.xcassets/AppIcon.appiconset/Icon-20@2x.png b/GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/AppIcon.appiconset/Icon-20@2x.png similarity index 100% rename from GoogleCardboardIOS/Images.xcassets/AppIcon.appiconset/Icon-20@2x.png rename to GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/AppIcon.appiconset/Icon-20@2x.png diff --git a/GoogleCardboardIOS/Images.xcassets/AppIcon.appiconset/Icon-20@3x.png b/GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/AppIcon.appiconset/Icon-20@3x.png similarity index 100% rename from GoogleCardboardIOS/Images.xcassets/AppIcon.appiconset/Icon-20@3x.png rename to GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/AppIcon.appiconset/Icon-20@3x.png diff --git a/GoogleCardboardIOS/Images.xcassets/AppIcon.appiconset/Icon-29.png b/GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/AppIcon.appiconset/Icon-29.png similarity index 100% rename from GoogleCardboardIOS/Images.xcassets/AppIcon.appiconset/Icon-29.png rename to GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/AppIcon.appiconset/Icon-29.png diff --git a/GoogleCardboardIOS/Images.xcassets/AppIcon.appiconset/Icon-29@2x-1.png b/GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/AppIcon.appiconset/Icon-29@2x-1.png similarity index 100% rename from GoogleCardboardIOS/Images.xcassets/AppIcon.appiconset/Icon-29@2x-1.png rename to GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/AppIcon.appiconset/Icon-29@2x-1.png diff --git a/GoogleCardboardIOS/Images.xcassets/AppIcon.appiconset/Icon-29@2x.png b/GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/AppIcon.appiconset/Icon-29@2x.png similarity index 100% rename from GoogleCardboardIOS/Images.xcassets/AppIcon.appiconset/Icon-29@2x.png rename to GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/AppIcon.appiconset/Icon-29@2x.png diff --git a/GoogleCardboardIOS/Images.xcassets/AppIcon.appiconset/Icon-29@3x.png b/GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/AppIcon.appiconset/Icon-29@3x.png similarity index 100% rename from GoogleCardboardIOS/Images.xcassets/AppIcon.appiconset/Icon-29@3x.png rename to GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/AppIcon.appiconset/Icon-29@3x.png diff --git a/GoogleCardboardIOS/Images.xcassets/AppIcon.appiconset/Icon-40@2x-1.png b/GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/AppIcon.appiconset/Icon-40@2x-1.png similarity index 100% rename from GoogleCardboardIOS/Images.xcassets/AppIcon.appiconset/Icon-40@2x-1.png rename to GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/AppIcon.appiconset/Icon-40@2x-1.png diff --git a/GoogleCardboardIOS/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png b/GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png similarity index 100% rename from GoogleCardboardIOS/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png rename to GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png diff --git a/GoogleCardboardIOS/Images.xcassets/AppIcon.appiconset/Icon-40@3x-1.png b/GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/AppIcon.appiconset/Icon-40@3x-1.png similarity index 100% rename from GoogleCardboardIOS/Images.xcassets/AppIcon.appiconset/Icon-40@3x-1.png rename to GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/AppIcon.appiconset/Icon-40@3x-1.png diff --git a/GoogleCardboardIOS/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png b/GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png similarity index 100% rename from GoogleCardboardIOS/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png rename to GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png diff --git a/GoogleCardboardIOS/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png b/GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png similarity index 100% rename from GoogleCardboardIOS/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png rename to GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png diff --git a/GoogleCardboardIOS/Images.xcassets/AppIcon.appiconset/Icon-76.png b/GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/AppIcon.appiconset/Icon-76.png similarity index 100% rename from GoogleCardboardIOS/Images.xcassets/AppIcon.appiconset/Icon-76.png rename to GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/AppIcon.appiconset/Icon-76.png diff --git a/GoogleCardboardIOS/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png b/GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png similarity index 100% rename from GoogleCardboardIOS/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png rename to GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/AppIcon.appiconset/Icon-76@2x.png diff --git a/GoogleCardboardIOS/Images.xcassets/AppIcon.appiconset/Icon-83_5@2x.png b/GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/AppIcon.appiconset/Icon-83_5@2x.png similarity index 100% rename from GoogleCardboardIOS/Images.xcassets/AppIcon.appiconset/Icon-83_5@2x.png rename to GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/AppIcon.appiconset/Icon-83_5@2x.png diff --git a/GoogleCardboardIOS/Images.xcassets/Contents.json b/GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/Contents.json similarity index 100% rename from GoogleCardboardIOS/Images.xcassets/Contents.json rename to GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/Contents.json diff --git a/GoogleCardboardIOS/Images.xcassets/LaunchImage.launchimage/Contents.json b/GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/LaunchImage.launchimage/Contents.json similarity index 100% rename from GoogleCardboardIOS/Images.xcassets/LaunchImage.launchimage/Contents.json rename to GoogleCardboardIOS/NOMADVRIOS/Images.xcassets/LaunchImage.launchimage/Contents.json diff --git a/GoogleCardboardIOS/NOMADVR-Info.plist b/GoogleCardboardIOS/NOMADVRIOS/NOMADVR-Info.plist similarity index 100% rename from GoogleCardboardIOS/NOMADVR-Info.plist rename to GoogleCardboardIOS/NOMADVRIOS/NOMADVR-Info.plist diff --git a/GoogleCardboardIOS/NOMADVR.xcodeproj/project.pbxproj b/GoogleCardboardIOS/NOMADVRIOS/NOMADVR.xcodeproj/project.pbxproj similarity index 100% rename from GoogleCardboardIOS/NOMADVR.xcodeproj/project.pbxproj rename to GoogleCardboardIOS/NOMADVRIOS/NOMADVR.xcodeproj/project.pbxproj diff --git a/GoogleCardboardIOS/NOMADVR.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/GoogleCardboardIOS/NOMADVRIOS/NOMADVR.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from GoogleCardboardIOS/NOMADVR.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to GoogleCardboardIOS/NOMADVRIOS/NOMADVR.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/GoogleCardboardIOS/NOMADVR.xcodeproj/project.xcworkspace/xcuserdata/lrz.xcuserdatad/UserInterfaceState.xcuserstate b/GoogleCardboardIOS/NOMADVRIOS/NOMADVR.xcodeproj/project.xcworkspace/xcuserdata/lrz.xcuserdatad/UserInterfaceState.xcuserstate similarity index 100% rename from GoogleCardboardIOS/NOMADVR.xcodeproj/project.xcworkspace/xcuserdata/lrz.xcuserdatad/UserInterfaceState.xcuserstate rename to GoogleCardboardIOS/NOMADVRIOS/NOMADVR.xcodeproj/project.xcworkspace/xcuserdata/lrz.xcuserdatad/UserInterfaceState.xcuserstate diff --git a/GoogleCardboardIOS/NOMADVR.xcodeproj/xcuserdata/lrz.xcuserdatad/xcschemes/xcschememanagement.plist b/GoogleCardboardIOS/NOMADVRIOS/NOMADVR.xcodeproj/xcuserdata/lrz.xcuserdatad/xcschemes/xcschememanagement.plist similarity index 100% rename from GoogleCardboardIOS/NOMADVR.xcodeproj/xcuserdata/lrz.xcuserdatad/xcschemes/xcschememanagement.plist rename to GoogleCardboardIOS/NOMADVRIOS/NOMADVR.xcodeproj/xcuserdata/lrz.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/GoogleCardboardIOS/NOMADVRSDK-Info.plist b/GoogleCardboardIOS/NOMADVRIOS/NOMADVRSDK-Info.plist similarity index 100% rename from GoogleCardboardIOS/NOMADVRSDK-Info.plist rename to GoogleCardboardIOS/NOMADVRIOS/NOMADVRSDK-Info.plist diff --git a/GoogleCardboardIOS/NOMADVRIOS/NOMADVRSDK.xcworkspace/contents.xcworkspacedata b/GoogleCardboardIOS/NOMADVRIOS/NOMADVRSDK.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000000000000000000000000000000000000..defd9413bc8a89e5a96ed4b04a46de045a9f1668 --- /dev/null +++ b/GoogleCardboardIOS/NOMADVRIOS/NOMADVRSDK.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ + + + + + + + diff --git a/GoogleCardboardIOS/Podfile b/GoogleCardboardIOS/NOMADVRIOS/Podfile similarity index 93% rename from GoogleCardboardIOS/Podfile rename to GoogleCardboardIOS/NOMADVRIOS/Podfile index bc5ff22518d5c74c5a907bd00a9db821b6ebc231..103c8a222b91435a1cac4f9138f49f0111ef6ff6 100644 --- a/GoogleCardboardIOS/Podfile +++ b/GoogleCardboardIOS/NOMADVRIOS/Podfile @@ -1,4 +1,4 @@ -target 'NOMADVRSDK' do +target 'NOMADVR' do pod 'GVRSDK' pod 'GVRAudioSDK' source 'https://github.com/CocoaPods/Specs.git' diff --git a/GoogleCardboardIOS/Podfile.lock b/GoogleCardboardIOS/NOMADVRIOS/Podfile.lock similarity index 100% rename from GoogleCardboardIOS/Podfile.lock rename to GoogleCardboardIOS/NOMADVRIOS/Podfile.lock diff --git a/GoogleCardboardIOS/TreasureHuntAppDelegate.h b/GoogleCardboardIOS/NOMADVRIOS/TreasureHuntAppDelegate.h similarity index 100% rename from GoogleCardboardIOS/TreasureHuntAppDelegate.h rename to GoogleCardboardIOS/NOMADVRIOS/TreasureHuntAppDelegate.h diff --git a/GoogleCardboardIOS/TreasureHuntAppDelegate.m b/GoogleCardboardIOS/NOMADVRIOS/TreasureHuntAppDelegate.m similarity index 100% rename from GoogleCardboardIOS/TreasureHuntAppDelegate.m rename to GoogleCardboardIOS/NOMADVRIOS/TreasureHuntAppDelegate.m diff --git a/GoogleCardboardIOS/TreasureHuntNDK.xcworkspace/contents.xcworkspacedata b/GoogleCardboardIOS/NOMADVRIOS/TreasureHuntNDK.xcworkspace/contents.xcworkspacedata similarity index 100% rename from GoogleCardboardIOS/TreasureHuntNDK.xcworkspace/contents.xcworkspacedata rename to GoogleCardboardIOS/NOMADVRIOS/TreasureHuntNDK.xcworkspace/contents.xcworkspacedata diff --git a/GoogleCardboardIOS/TreasureHuntNDK.xcworkspace/xcuserdata/lrz.xcuserdatad/UserInterfaceState.xcuserstate b/GoogleCardboardIOS/NOMADVRIOS/TreasureHuntNDK.xcworkspace/xcuserdata/lrz.xcuserdatad/UserInterfaceState.xcuserstate similarity index 100% rename from GoogleCardboardIOS/TreasureHuntNDK.xcworkspace/xcuserdata/lrz.xcuserdatad/UserInterfaceState.xcuserstate rename to GoogleCardboardIOS/NOMADVRIOS/TreasureHuntNDK.xcworkspace/xcuserdata/lrz.xcuserdatad/UserInterfaceState.xcuserstate diff --git a/GoogleCardboardIOS/TreasureHuntNDK.xcworkspace/xcuserdata/lrz.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/GoogleCardboardIOS/NOMADVRIOS/TreasureHuntNDK.xcworkspace/xcuserdata/lrz.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist similarity index 100% rename from GoogleCardboardIOS/TreasureHuntNDK.xcworkspace/xcuserdata/lrz.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist rename to GoogleCardboardIOS/NOMADVRIOS/TreasureHuntNDK.xcworkspace/xcuserdata/lrz.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist diff --git a/GoogleCardboardIOS/TreasureHuntNDK.xcworkspace/xcuserdata/lrz.xcuserdatad/xcschemes/TreasureHuntNDK.xcscheme b/GoogleCardboardIOS/NOMADVRIOS/TreasureHuntNDK.xcworkspace/xcuserdata/lrz.xcuserdatad/xcschemes/TreasureHuntNDK.xcscheme similarity index 100% rename from GoogleCardboardIOS/TreasureHuntNDK.xcworkspace/xcuserdata/lrz.xcuserdatad/xcschemes/TreasureHuntNDK.xcscheme rename to GoogleCardboardIOS/NOMADVRIOS/TreasureHuntNDK.xcworkspace/xcuserdata/lrz.xcuserdatad/xcschemes/TreasureHuntNDK.xcscheme diff --git a/GoogleCardboardIOS/TreasureHuntNDK.xcworkspace/xcuserdata/lrz.xcuserdatad/xcschemes/xcschememanagement.plist b/GoogleCardboardIOS/NOMADVRIOS/TreasureHuntNDK.xcworkspace/xcuserdata/lrz.xcuserdatad/xcschemes/xcschememanagement.plist similarity index 100% rename from GoogleCardboardIOS/TreasureHuntNDK.xcworkspace/xcuserdata/lrz.xcuserdatad/xcschemes/xcschememanagement.plist rename to GoogleCardboardIOS/NOMADVRIOS/TreasureHuntNDK.xcworkspace/xcuserdata/lrz.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/GoogleCardboardIOS/TreasureHuntViewController.h b/GoogleCardboardIOS/NOMADVRIOS/TreasureHuntViewController.h similarity index 100% rename from GoogleCardboardIOS/TreasureHuntViewController.h rename to GoogleCardboardIOS/NOMADVRIOS/TreasureHuntViewController.h diff --git a/GoogleCardboardIOS/TreasureHuntViewController.mm b/GoogleCardboardIOS/NOMADVRIOS/TreasureHuntViewController.mm similarity index 100% rename from GoogleCardboardIOS/TreasureHuntViewController.mm rename to GoogleCardboardIOS/NOMADVRIOS/TreasureHuntViewController.mm diff --git a/GoogleCardboardIOS/launch.xib b/GoogleCardboardIOS/NOMADVRIOS/launch.xib similarity index 100% rename from GoogleCardboardIOS/launch.xib rename to GoogleCardboardIOS/NOMADVRIOS/launch.xib diff --git a/GoogleCardboardIOS/main.m b/GoogleCardboardIOS/NOMADVRIOS/main.m similarity index 100% rename from GoogleCardboardIOS/main.m rename to GoogleCardboardIOS/NOMADVRIOS/main.m diff --git a/GoogleCardboardIOS/treasure_hunt_renderer.h b/GoogleCardboardIOS/NOMADVRIOS/treasure_hunt_renderer.h similarity index 100% rename from GoogleCardboardIOS/treasure_hunt_renderer.h rename to GoogleCardboardIOS/NOMADVRIOS/treasure_hunt_renderer.h diff --git a/GoogleCardboardIOS/treasure_hunt_renderer.mm b/GoogleCardboardIOS/NOMADVRIOS/treasure_hunt_renderer.mm similarity index 100% rename from GoogleCardboardIOS/treasure_hunt_renderer.mm rename to GoogleCardboardIOS/NOMADVRIOS/treasure_hunt_renderer.mm diff --git a/GoogleCardboardIOS/readme.md b/GoogleCardboardIOS/readme.md new file mode 100644 index 0000000000000000000000000000000000000000..bd1f7ca1fd40749283e681c2bff72624b2c02c47 --- /dev/null +++ b/GoogleCardboardIOS/readme.md @@ -0,0 +1,19 @@ +This directory contains the demo for Google Cardboard using Google Cardboard SDK +for IOS. + +Follow https://developers.google.com/vr/develop/ios/get-started to install +the SDK. + +Copy NOMADVRIOS in gvr-ios-sdk/Samples +Enter gvr-ios-sdk/Samples/NOMADVRIOS and run + pod update + +If you get this error + [!] Failed to connect to GitHub to update the CocoaPods/Specs specs repo - Please check if you are offline, or that GitHub is down +follow this: + https://stackoverflow.com/questions/38993527/cocoapods-failed-to-connect-to-github-to-update-the-cocoapods-specs-specs-repo + +Open Xcode and select NOMADVR.xcworkspace +Setup Developer Account / Profiles / Code signing +Compile and run + diff --git a/README.md b/README.md index f01302306c369a82f381746d73eb0abcf3eee444..e924d74c0d5f87a272df2f6fe6f495322adab615 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,8 @@ Context: Requirements: -Supported virtual reality hardware: HTC Vive or Oculus Rift, GearVR, - Google Cardboard for Android, or the LRZ CAVE environment. + Google Cardboard for Android or IOS, or the LRZ CAVE + environment. Usage Instructions: See https://www.nomad-coe.eu/the-project/graphics/VR-prototype @@ -18,6 +19,9 @@ Subdirectories: OpenVR: Demos for HTC Vive. OculusMobile: Demos for GearVR. GoogleCardboardAndroid: Demos for Google Cardboard (android) + GoogleCardboardIOS: Demo for Google Cardboard (IOS) + GoogleCardboard: Common files between Google Cardboard for Android + and for IOS CAVE: Demos for LRZ CAVE-like environment (linux) NOMADGearVRChooser: Android app to select the dataset for GearVR, which