From 2ca5de70f8ea8986d0c429e0f5761fc3cfb5bb62 Mon Sep 17 00:00:00 2001 From: Mark Fine Date: Thu, 10 Oct 2024 17:23:17 +0000 Subject: [PATCH] ARCore iOS SDK 1.46.0 --- .../project.pbxproj | 208 ++-- .../AugmentedFacesExample/AppDelegate.swift | 35 - .../AugmentedFacesExampleApp.swift | 26 + ...er.swift => AugmentedFacesViewModel.swift} | 187 ++- .../AugmentedFacesExample/ContentView.swift | 46 + .../FaceMeshGeometryConverter.swift | 47 +- .../AugmentedFacesExample/Info.plist | 21 +- .../LaunchScreen.storyboard | 10 - Examples/AugmentedFacesExample/Podfile | 4 +- Examples/CloudAnchorExample/Podfile | 2 +- Examples/GeospatialExample/Podfile | 2 +- Examples/PersistentCloudAnchorExample/Podfile | 2 +- Examples/SemanticsExample/Podfile | 2 +- LICENSE | 1055 ++++++++++++++++- Package.swift | 57 +- 15 files changed, 1393 insertions(+), 311 deletions(-) delete mode 100644 Examples/AugmentedFacesExample/AugmentedFacesExample/AppDelegate.swift create mode 100644 Examples/AugmentedFacesExample/AugmentedFacesExample/AugmentedFacesExampleApp.swift rename Examples/AugmentedFacesExample/AugmentedFacesExample/{FacesViewController.swift => AugmentedFacesViewModel.swift} (64%) create mode 100644 Examples/AugmentedFacesExample/AugmentedFacesExample/ContentView.swift delete mode 100644 Examples/AugmentedFacesExample/AugmentedFacesExample/LaunchScreen.storyboard diff --git a/Examples/AugmentedFacesExample/AugmentedFacesExample.xcodeproj/project.pbxproj b/Examples/AugmentedFacesExample/AugmentedFacesExample.xcodeproj/project.pbxproj index bf4309b..8389780 100644 --- a/Examples/AugmentedFacesExample/AugmentedFacesExample.xcodeproj/project.pbxproj +++ b/Examples/AugmentedFacesExample/AugmentedFacesExample.xcodeproj/project.pbxproj @@ -3,31 +3,31 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 56; objects = { /* Begin PBXBuildFile section */ - 6933B02823172482007E1C28 /* FaceMeshGeometryConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6933B01F23172481007E1C28 /* FaceMeshGeometryConverter.swift */; }; - 6933B02923172482007E1C28 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6933B02023172481007E1C28 /* LaunchScreen.storyboard */; }; - 6933B02A23172482007E1C28 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6933B02123172481007E1C28 /* Assets.xcassets */; }; - 6933B02B23172482007E1C28 /* FacesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6933B02223172481007E1C28 /* FacesViewController.swift */; }; - 6933B02C23172482007E1C28 /* Face.scnassets in Resources */ = {isa = PBXBuildFile; fileRef = 6933B02323172481007E1C28 /* Face.scnassets */; }; - 6933B02D23172482007E1C28 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6933B02423172481007E1C28 /* AppDelegate.swift */; }; + 3ED15DF32C49CE2E008518F8 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3ED15DED2C49CE2E008518F8 /* Assets.xcassets */; }; + 3ED15DF42C49CE2E008518F8 /* AugmentedFacesExampleApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3ED15DEE2C49CE2E008518F8 /* AugmentedFacesExampleApp.swift */; }; + 3ED15DF52C49CE2E008518F8 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3ED15DEF2C49CE2E008518F8 /* ContentView.swift */; }; + 3ED15DF62C49CE2E008518F8 /* Face.scnassets in Resources */ = {isa = PBXBuildFile; fileRef = 3ED15DF02C49CE2E008518F8 /* Face.scnassets */; }; + 3ED15DF92C4AD88B008518F8 /* AugmentedFacesViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3ED15DF82C4AD88B008518F8 /* AugmentedFacesViewModel.swift */; }; + 3ED15DFB2C4AD8C0008518F8 /* FaceMeshGeometryConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3ED15DFA2C4AD8C0008518F8 /* FaceMeshGeometryConverter.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 3EFA88E428810ADE00569759 /* AugmentedFacesExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AugmentedFacesExample.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 6933B01F23172481007E1C28 /* FaceMeshGeometryConverter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FaceMeshGeometryConverter.swift; sourceTree = ""; }; - 6933B02023172481007E1C28 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = ""; }; - 6933B02123172481007E1C28 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - 6933B02223172481007E1C28 /* FacesViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FacesViewController.swift; sourceTree = ""; }; - 6933B02323172481007E1C28 /* Face.scnassets */ = {isa = PBXFileReference; lastKnownFileType = wrapper.scnassets; path = Face.scnassets; sourceTree = ""; }; - 6933B02423172481007E1C28 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - 6933B02723172481007E1C28 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 3ED15DCE2C49C6C8008518F8 /* AugmentedFacesExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = AugmentedFacesExample.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 3ED15DED2C49CE2E008518F8 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 3ED15DEE2C49CE2E008518F8 /* AugmentedFacesExampleApp.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AugmentedFacesExampleApp.swift; sourceTree = ""; }; + 3ED15DEF2C49CE2E008518F8 /* ContentView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; + 3ED15DF02C49CE2E008518F8 /* Face.scnassets */ = {isa = PBXFileReference; lastKnownFileType = wrapper.scnassets; path = Face.scnassets; sourceTree = ""; }; + 3ED15DF12C49CE2E008518F8 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 3ED15DF82C4AD88B008518F8 /* AugmentedFacesViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AugmentedFacesViewModel.swift; sourceTree = ""; }; + 3ED15DFA2C4AD8C0008518F8 /* FaceMeshGeometryConverter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FaceMeshGeometryConverter.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 692DB6D922FCA472007A4EEF /* Frameworks */ = { + 3ED15DCB2C49C6C8008518F8 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( @@ -37,31 +37,32 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 3ED1D94B2880F94C00E6A968 /* Frameworks */ = { + 3ED15DC52C49C6C8008518F8 = { isa = PBXGroup; children = ( + 3ED15DF22C49CE2E008518F8 /* AugmentedFacesExample */, + 3ED15DCF2C49C6C8008518F8 /* Products */, ); - name = Frameworks; sourceTree = ""; }; - 692DB6D322FCA472007A4EEF = { + 3ED15DCF2C49C6C8008518F8 /* Products */ = { isa = PBXGroup; children = ( - 6933B01E23172481007E1C28 /* AugmentedFacesExample */, - 3ED1D94B2880F94C00E6A968 /* Frameworks */, + 3ED15DCE2C49C6C8008518F8 /* AugmentedFacesExample.app */, ); + name = Products; sourceTree = ""; }; - 6933B01E23172481007E1C28 /* AugmentedFacesExample */ = { + 3ED15DF22C49CE2E008518F8 /* AugmentedFacesExample */ = { isa = PBXGroup; children = ( - 6933B02423172481007E1C28 /* AppDelegate.swift */, - 6933B02223172481007E1C28 /* FacesViewController.swift */, - 6933B01F23172481007E1C28 /* FaceMeshGeometryConverter.swift */, - 6933B02023172481007E1C28 /* LaunchScreen.storyboard */, - 6933B02123172481007E1C28 /* Assets.xcassets */, - 6933B02323172481007E1C28 /* Face.scnassets */, - 6933B02723172481007E1C28 /* Info.plist */, + 3ED15DF12C49CE2E008518F8 /* Info.plist */, + 3ED15DED2C49CE2E008518F8 /* Assets.xcassets */, + 3ED15DF02C49CE2E008518F8 /* Face.scnassets */, + 3ED15DEE2C49CE2E008518F8 /* AugmentedFacesExampleApp.swift */, + 3ED15DF82C4AD88B008518F8 /* AugmentedFacesViewModel.swift */, + 3ED15DEF2C49CE2E008518F8 /* ContentView.swift */, + 3ED15DFA2C4AD8C0008518F8 /* FaceMeshGeometryConverter.swift */, ); path = AugmentedFacesExample; sourceTree = ""; @@ -69,13 +70,13 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 692DB6DB22FCA472007A4EEF /* AugmentedFacesExample */ = { + 3ED15DCD2C49C6C8008518F8 /* AugmentedFacesExample */ = { isa = PBXNativeTarget; - buildConfigurationList = 692DB6EE22FCA472007A4EEF /* Build configuration list for PBXNativeTarget "AugmentedFacesExample" */; + buildConfigurationList = 3ED15DDC2C49C6C9008518F8 /* Build configuration list for PBXNativeTarget "AugmentedFacesExample" */; buildPhases = ( - 692DB6D822FCA472007A4EEF /* Sources */, - 692DB6D922FCA472007A4EEF /* Frameworks */, - 692DB6DA22FCA472007A4EEF /* Resources */, + 3ED15DCA2C49C6C8008518F8 /* Sources */, + 3ED15DCB2C49C6C8008518F8 /* Frameworks */, + 3ED15DCC2C49C6C8008518F8 /* Resources */, ); buildRules = ( ); @@ -84,79 +85,80 @@ name = AugmentedFacesExample; packageProductDependencies = ( ); - productName = FacesSample; - productReference = 3EFA88E428810ADE00569759 /* AugmentedFacesExample.app */; + productName = AugmentedFacesExample; + productReference = 3ED15DCE2C49C6C8008518F8 /* AugmentedFacesExample.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ - 692DB6D422FCA472007A4EEF /* Project object */ = { + 3ED15DC62C49C6C8008518F8 /* Project object */ = { isa = PBXProject; attributes = { - LastSwiftUpdateCheck = 1020; - LastUpgradeCheck = 1020; - ORGANIZATIONNAME = "Google LLC"; + BuildIndependentTargetsInParallel = 1; + LastSwiftUpdateCheck = 1540; + LastUpgradeCheck = 1540; TargetAttributes = { - 692DB6DB22FCA472007A4EEF = { - CreatedOnToolsVersion = 10.2.1; - LastSwiftMigration = 1020; + 3ED15DCD2C49C6C8008518F8 = { + CreatedOnToolsVersion = 15.4; }; }; }; - buildConfigurationList = 692DB6D722FCA472007A4EEF /* Build configuration list for PBXProject "AugmentedFacesExample" */; - compatibilityVersion = "Xcode 9.3"; + buildConfigurationList = 3ED15DC92C49C6C8008518F8 /* Build configuration list for PBXProject "AugmentedFacesExample" */; + compatibilityVersion = "Xcode 14.0"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, Base, ); - mainGroup = 692DB6D322FCA472007A4EEF; - productRefGroup = 692DB6D322FCA472007A4EEF; + mainGroup = 3ED15DC52C49C6C8008518F8; + packageReferences = ( + ); + productRefGroup = 3ED15DCF2C49C6C8008518F8 /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( - 692DB6DB22FCA472007A4EEF /* AugmentedFacesExample */, + 3ED15DCD2C49C6C8008518F8 /* AugmentedFacesExample */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 692DB6DA22FCA472007A4EEF /* Resources */ = { + 3ED15DCC2C49C6C8008518F8 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 6933B02A23172482007E1C28 /* Assets.xcassets in Resources */, - 6933B02C23172482007E1C28 /* Face.scnassets in Resources */, - 6933B02923172482007E1C28 /* LaunchScreen.storyboard in Resources */, + 3ED15DF62C49CE2E008518F8 /* Face.scnassets in Resources */, + 3ED15DF32C49CE2E008518F8 /* Assets.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 692DB6D822FCA472007A4EEF /* Sources */ = { + 3ED15DCA2C49C6C8008518F8 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 6933B02D23172482007E1C28 /* AppDelegate.swift in Sources */, - 6933B02823172482007E1C28 /* FaceMeshGeometryConverter.swift in Sources */, - 6933B02B23172482007E1C28 /* FacesViewController.swift in Sources */, + 3ED15DF52C49CE2E008518F8 /* ContentView.swift in Sources */, + 3ED15DF42C49CE2E008518F8 /* AugmentedFacesExampleApp.swift in Sources */, + 3ED15DFB2C4AD8C0008518F8 /* FaceMeshGeometryConverter.swift in Sources */, + 3ED15DF92C4AD88B008518F8 /* AugmentedFacesViewModel.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ - 692DB6EC22FCA472007A4EEF /* Debug */ = { + 3ED15DDA2C49C6C9008518F8 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; CLANG_ENABLE_OBJC_WEAK = YES; @@ -175,18 +177,19 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu17; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; @@ -200,24 +203,25 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.2; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; + LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; }; name = Debug; }; - 692DB6ED22FCA472007A4EEF /* Release */ = { + 3ED15DDB2C49C6C9008518F8 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_CXX_LIBRARY = "libc++"; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; CLANG_ENABLE_OBJC_WEAK = YES; @@ -236,18 +240,19 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - CODE_SIGN_IDENTITY = "iPhone Developer"; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu17; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; @@ -255,64 +260,87 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.2; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; + LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OPTIMIZATION_LEVEL = "-O"; VALIDATE_PRODUCT = YES; }; name = Release; }; - 692DB6EF22FCA472007A4EEF /* Debug */ = { + 3ED15DDD2C49C6C9008518F8 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = ""; CODE_SIGN_STYLE = Manual; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = ""; - ENABLE_BITCODE = NO; - INFOPLIST_FILE = "$(SRCROOT)/AugmentedFacesExample/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + ENABLE_PREVIEWS = YES; + GENERATE_INFOPLIST_FILE = NO; + INFOPLIST_FILE = AugmentedFacesExample/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = AugmentedFaces; + INFOPLIST_KEY_NSCameraUsageDescription = "This application will use the camera for Augmented Reality."; + INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; + INFOPLIST_KEY_UILaunchScreen_Generation = YES; + INFOPLIST_KEY_UIRequiresFullScreen = YES; + INFOPLIST_KEY_UIStatusBarHidden = NO; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = UIInterfaceOrientationPortrait; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = UIInterfaceOrientationPortrait; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); + MARKETING_VERSION = 1.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", ); - PRODUCT_BUNDLE_IDENTIFIER = com.google.arcore.FacesSample; + PRODUCT_BUNDLE_IDENTIFIER = com.google.ARAugmentedFaces; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; - 692DB6F022FCA472007A4EEF /* Release */ = { + 3ED15DDE2C49C6C9008518F8 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CLANG_ENABLE_MODULES = YES; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = ""; CODE_SIGN_STYLE = Manual; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = ""; - ENABLE_BITCODE = NO; - INFOPLIST_FILE = "$(SRCROOT)/AugmentedFacesExample/Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + ENABLE_PREVIEWS = YES; + GENERATE_INFOPLIST_FILE = NO; + INFOPLIST_FILE = AugmentedFacesExample/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = AugmentedFaces; + INFOPLIST_KEY_NSCameraUsageDescription = "This application will use the camera for Augmented Reality."; + INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; + INFOPLIST_KEY_UILaunchScreen_Generation = YES; + INFOPLIST_KEY_UIRequiresFullScreen = YES; + INFOPLIST_KEY_UIStatusBarHidden = NO; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = UIInterfaceOrientationPortrait; + INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = UIInterfaceOrientationPortrait; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", ); + MARKETING_VERSION = 1.0; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", ); - PRODUCT_BUNDLE_IDENTIFIER = com.google.arcore.FacesSample; + PRODUCT_BUNDLE_IDENTIFIER = com.google.ARAugmentedFaces; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -321,25 +349,25 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 692DB6D722FCA472007A4EEF /* Build configuration list for PBXProject "AugmentedFacesExample" */ = { + 3ED15DC92C49C6C8008518F8 /* Build configuration list for PBXProject "AugmentedFacesExample" */ = { isa = XCConfigurationList; buildConfigurations = ( - 692DB6EC22FCA472007A4EEF /* Debug */, - 692DB6ED22FCA472007A4EEF /* Release */, + 3ED15DDA2C49C6C9008518F8 /* Debug */, + 3ED15DDB2C49C6C9008518F8 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 692DB6EE22FCA472007A4EEF /* Build configuration list for PBXNativeTarget "AugmentedFacesExample" */ = { + 3ED15DDC2C49C6C9008518F8 /* Build configuration list for PBXNativeTarget "AugmentedFacesExample" */ = { isa = XCConfigurationList; buildConfigurations = ( - 692DB6EF22FCA472007A4EEF /* Debug */, - 692DB6F022FCA472007A4EEF /* Release */, + 3ED15DDD2C49C6C9008518F8 /* Debug */, + 3ED15DDE2C49C6C9008518F8 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; - rootObject = 692DB6D422FCA472007A4EEF /* Project object */; + rootObject = 3ED15DC62C49C6C8008518F8 /* Project object */; } diff --git a/Examples/AugmentedFacesExample/AugmentedFacesExample/AppDelegate.swift b/Examples/AugmentedFacesExample/AugmentedFacesExample/AppDelegate.swift deleted file mode 100644 index 1726fb4..0000000 --- a/Examples/AugmentedFacesExample/AugmentedFacesExample/AppDelegate.swift +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2019 Google LLC. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import UIKit - -@UIApplicationMain -class AppDelegate: UIResponder, UIApplicationDelegate { - - var window: UIWindow? - - func application( - _ application: UIApplication, - didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? - ) -> Bool { - - window = UIWindow(frame: UIScreen.main.bounds) - window?.rootViewController = FacesViewController() - window?.makeKeyAndVisible() - - return true - } -} diff --git a/Examples/AugmentedFacesExample/AugmentedFacesExample/AugmentedFacesExampleApp.swift b/Examples/AugmentedFacesExample/AugmentedFacesExample/AugmentedFacesExampleApp.swift new file mode 100644 index 0000000..23e3fd2 --- /dev/null +++ b/Examples/AugmentedFacesExample/AugmentedFacesExample/AugmentedFacesExampleApp.swift @@ -0,0 +1,26 @@ +// +// Copyright 2024 Google LLC. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import SwiftUI + +@main +struct AugmentedFacesExampleApp: App { + var body: some Scene { + WindowGroup { + ContentView() + } + } +} diff --git a/Examples/AugmentedFacesExample/AugmentedFacesExample/FacesViewController.swift b/Examples/AugmentedFacesExample/AugmentedFacesExample/AugmentedFacesViewModel.swift similarity index 64% rename from Examples/AugmentedFacesExample/AugmentedFacesExample/FacesViewController.swift rename to Examples/AugmentedFacesExample/AugmentedFacesExample/AugmentedFacesViewModel.swift index 1e354a0..4652c0a 100644 --- a/Examples/AugmentedFacesExample/AugmentedFacesExample/FacesViewController.swift +++ b/Examples/AugmentedFacesExample/AugmentedFacesExample/AugmentedFacesViewModel.swift @@ -1,42 +1,46 @@ -/* - * Copyright 2019 Google LLC. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// +// Copyright 2024 Google LLC. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// import ARCore import AVFoundation +import CoreGraphics +import CoreImage import CoreMedia import CoreMotion +import Foundation import SceneKit import UIKit +import simd /// Demonstrates how to use ARCore Augmented Faces with SceneKit. -public final class FacesViewController: UIViewController { +class AugmentedFacesViewModel: NSObject, ObservableObject { // MARK: - Member Variables - private var needToShowFatalError = false - private var alertWindowTitle = "Nothing" - private var alertMessage = "Nothing" - private var viewDidAppearReached = false + + @Published var showsAlert = false + @Published private(set) var alertWindowTitle = "" + @Published private(set) var alertMessage = "" + var viewSize: CGSize? // MARK: - Camera / Scene properties private var captureDevice: AVCaptureDevice? private var captureSession: AVCaptureSession? - private var videoFieldOfView = Float(0) - private lazy var cameraImageLayer = CALayer() - private lazy var sceneView = SCNView() + @Published private(set) var scene: SCNScene? + @Published private(set) var pointOfView = SCNNode() private lazy var sceneCamera = SCNCamera() private lazy var motionManager = CMMotionManager() @@ -55,8 +59,8 @@ public final class FacesViewController: UIViewController { // MARK: - Implementation methods - override public func viewDidLoad() { - super.viewDidLoad() + override init() { + super.init() if !setupScene() { return @@ -69,25 +73,17 @@ public final class FacesViewController: UIViewController { } do { - faceSession = try GARAugmentedFaceSession(fieldOfView: videoFieldOfView) + faceSession = try GARAugmentedFaceSession( + fieldOfView: captureDevice?.activeFormat.videoFieldOfView ?? 0) } catch { alertWindowTitle = "A fatal error occurred." alertMessage = "Failed to create session. Error description: \(error)" - popupAlertWindowOnError(alertWindowTitle: alertWindowTitle, alertMessage: alertMessage) - } - } - - override public func viewDidAppear(_ animated: Bool) { - super.viewDidAppear(animated) - - viewDidAppearReached = true - - if needToShowFatalError { - popupAlertWindowOnError(alertWindowTitle: alertWindowTitle, alertMessage: alertMessage) + showsAlert = true } } /// Create the scene view from a scene and supporting nodes, and add to the view. + /// /// The scene is loaded from 'fox_face.scn' which was created from 'canonical_face_mesh.fbx', the /// canonical face mesh asset. /// https://developers.google.com/ar/develop/developer-guides/creating-assets-for-augmented-faces @@ -99,9 +95,10 @@ public final class FacesViewController: UIViewController { else { alertWindowTitle = "A fatal error occurred." alertMessage = "Failed to load face scene!" - popupAlertWindowOnError(alertWindowTitle: alertWindowTitle, alertMessage: alertMessage) + showsAlert = true return false } + self.scene = scene // SceneKit uses meters for units, while the canonical face mesh asset uses centimeters. modelRoot.simdScale = simd_float3(1, 1, 1) * 0.01 @@ -113,19 +110,7 @@ public final class FacesViewController: UIViewController { faceNode.addChildNode(faceOccluderNode) scene.rootNode.addChildNode(faceNode) - let cameraNode = SCNNode() - cameraNode.camera = sceneCamera - scene.rootNode.addChildNode(cameraNode) - - sceneView.scene = scene - sceneView.frame = view.bounds - sceneView.delegate = self - sceneView.rendersContinuously = true - sceneView.autoresizingMask = [.flexibleWidth, .flexibleHeight] - sceneView.backgroundColor = .clear - // Flip 'x' to mirror content to mimic 'selfie' mode - sceneView.layer.transform = CATransform3DMakeScale(-1, 1, 1) - view.addSubview(sceneView) + pointOfView.camera = sceneCamera faceTextureMaterial.diffuse.contents = faceImage // SCNMaterial does not premultiply alpha even with blendMode set to alpha, so do it manually. @@ -145,7 +130,7 @@ public final class FacesViewController: UIViewController { else { alertWindowTitle = "A fatal error occurred." alertMessage = "Failed to get device from AVCaptureDevice." - popupAlertWindowOnError(alertWindowTitle: alertWindowTitle, alertMessage: alertMessage) + showsAlert = true return false } @@ -154,7 +139,7 @@ public final class FacesViewController: UIViewController { else { alertWindowTitle = "A fatal error occurred." alertMessage = "Failed to get device input from AVCaptureDeviceInput." - popupAlertWindowOnError(alertWindowTitle: alertWindowTitle, alertMessage: alertMessage) + showsAlert = true return false } @@ -169,24 +154,20 @@ public final class FacesViewController: UIViewController { captureSession = session captureDevice = device - videoFieldOfView = captureDevice?.activeFormat.videoFieldOfView ?? 0 - - cameraImageLayer.contentsGravity = .center - cameraImageLayer.frame = self.view.bounds - view.layer.insertSublayer(cameraImageLayer, at: 0) - // Start capturing images from the capture session once permission is granted. - getVideoPermission(permissionHandler: { granted in + getVideoPermission { [weak self] granted in + guard let self else { return } guard granted else { NSLog("Permission not granted to use camera.") self.alertWindowTitle = "Alert" self.alertMessage = "Permission not granted to use camera." - self.popupAlertWindowOnError( - alertWindowTitle: self.alertWindowTitle, alertMessage: self.alertMessage) + self.showsAlert = true return } - self.captureSession?.startRunning() - }) + DispatchQueue.global(qos: .userInitiated).async { [weak self] in + self?.captureSession?.startRunning() + } + } return true } @@ -197,7 +178,7 @@ public final class FacesViewController: UIViewController { guard motionManager.isDeviceMotionAvailable else { alertWindowTitle = "Alert" alertMessage = "Device does not have motion sensors." - popupAlertWindowOnError(alertWindowTitle: alertWindowTitle, alertMessage: alertMessage) + showsAlert = true return false } motionManager.deviceMotionUpdateInterval = 0.01 @@ -242,49 +223,28 @@ public final class FacesViewController: UIViewController { // 'forward' (Z+) opposite of SceneKit's forward (Z-), so rotate to orient correctly. node.simdLocalRotate(by: simd_quatf(angle: .pi, axis: simd_float3(0, 1, 0))) } - - private func popupAlertWindowOnError(alertWindowTitle: String, alertMessage: String) { - if !self.viewDidAppearReached { - self.needToShowFatalError = true - // Then the process will proceed to viewDidAppear, which will popup an alert window when needToShowFatalError is true. - return - } - // viewDidAppearReached is true, so we can pop up window now. - let alertController = UIAlertController( - title: alertWindowTitle, message: alertMessage, preferredStyle: .alert) - alertController.addAction( - UIAlertAction( - title: NSLocalizedString("OK", comment: "Default action"), style: .default, - handler: { _ in - self.needToShowFatalError = false - })) - self.present(alertController, animated: true, completion: nil) - } - } // MARK: - Camera delegate -extension FacesViewController: AVCaptureVideoDataOutputSampleBufferDelegate { +extension AugmentedFacesViewModel: AVCaptureVideoDataOutputSampleBufferDelegate { public func captureOutput( _ output: AVCaptureOutput, didOutput sampleBuffer: CMSampleBuffer, from connection: AVCaptureConnection ) { - guard let imgBuffer = CMSampleBufferGetImageBuffer(sampleBuffer), - let deviceMotion = motionManager.deviceMotion + guard let imgBuffer = sampleBuffer.imageBuffer, let deviceMotion = motionManager.deviceMotion else { NSLog("In captureOutput, imgBuffer or deviceMotion is nil.") return } - let frameTime = CMTimeGetSeconds(CMSampleBufferGetPresentationTimeStamp(sampleBuffer)) - + let frameTime = sampleBuffer.presentationTimeStamp.seconds // Use the device's gravity vector to determine which direction is up for a face. This is the // positive counter-clockwise rotation of the device relative to landscape left orientation. let rotation = 2 * .pi - atan2(deviceMotion.gravity.x, deviceMotion.gravity.y) + .pi / 2 - let rotationDegrees = (UInt)(rotation * 180 / .pi) % 360 + let rotationDegrees = UInt(rotation * 180 / .pi) % 360 faceSession?.update(with: imgBuffer, timestamp: frameTime, recognitionRotation: rotationDegrees) } @@ -293,7 +253,21 @@ extension FacesViewController: AVCaptureVideoDataOutputSampleBufferDelegate { // MARK: - Scene Renderer delegate -extension FacesViewController: SCNSceneRendererDelegate { +extension AugmentedFacesViewModel: SCNSceneRendererDelegate { + + /// Calculates the rectangle to crop the camera image to so it fits the viewport. + /// + /// - Parameters: + /// - viewSize: The size of the view. + /// - extent: The extent of the `CIImage`. + /// - Returns: the rectangle to crop to. + private func cropRect(for viewSize: CGSize, extent: CGRect) -> CGRect { + CGRect( + x: extent.maxX / 2 - viewSize.width / 2, + y: extent.minY / 2 - viewSize.height / 2, + width: viewSize.width, + height: viewSize.height) + } public func renderer(_ renderer: SCNSceneRenderer, updateAtTime time: TimeInterval) { guard let frame = faceSession?.currentFrame else { @@ -312,31 +286,26 @@ extension FacesViewController: SCNSceneRendererDelegate { updateTransform(face.transform(for: .foreheadLeft), for: foreheadLeftNode) updateTransform(face.transform(for: .foreheadRight), for: foreheadRightNode) } + guard let viewSize else { return } // Set the scene camera's transform to the projection matrix for this frame. - sceneCamera.projectionTransform = SCNMatrix4.init( + sceneCamera.projectionTransform = SCNMatrix4( frame.projectionMatrix( - forViewportSize: cameraImageLayer.bounds.size, + forViewportSize: viewSize, presentationOrientation: .portrait, mirrored: false, zNear: 0.05, - zFar: 100) - ) - - // Update the camera image layer's transform to the display transform for this frame. - CATransaction.begin() - CATransaction.setAnimationDuration(0) - cameraImageLayer.contents = frame.capturedImage as CVPixelBuffer - cameraImageLayer.setAffineTransform( - frame.displayTransform( - forViewportSize: cameraImageLayer.bounds.size, - presentationOrientation: .portrait, - mirrored: true) - ) - CATransaction.commit() + zFar: 100)) + + let ciImage = CIImage(cvPixelBuffer: frame.capturedImage).transformed( + by: frame.displayTransform( + forViewportSize: viewSize, + presentationOrientation: .portraitUpsideDown, + mirrored: false)) + scene?.background.contents = CIContext().createCGImage( + ciImage, from: cropRect(for: viewSize, extent: ciImage.extent)) // Only show AR content when a face is detected. - sceneView.scene?.rootNode.isHidden = frame.face == nil + scene?.rootNode.isHidden = frame.face == nil } - } diff --git a/Examples/AugmentedFacesExample/AugmentedFacesExample/ContentView.swift b/Examples/AugmentedFacesExample/AugmentedFacesExample/ContentView.swift new file mode 100644 index 0000000..e9382f6 --- /dev/null +++ b/Examples/AugmentedFacesExample/AugmentedFacesExample/ContentView.swift @@ -0,0 +1,46 @@ +// +// Copyright 2024 Google LLC. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +import SceneKit +import SwiftUI + +/// View for testing Augmented Faces. +struct ContentView: View { + @StateObject private var model = AugmentedFacesViewModel() + + var body: some View { + GeometryReader { proxy in + SceneView( + scene: model.scene, pointOfView: model.pointOfView, options: .rendersContinuously, + delegate: model + ) + .scaleEffect(x: -1, y: 1) + .onAppear { + model.viewSize = proxy.size + } + } + .ignoresSafeArea() + .alert(model.alertWindowTitle, isPresented: $model.showsAlert) { + Button("OK") {} + } message: { + Text(model.alertMessage) + } + } +} + +#Preview { + ContentView() +} diff --git a/Examples/AugmentedFacesExample/AugmentedFacesExample/FaceMeshGeometryConverter.swift b/Examples/AugmentedFacesExample/AugmentedFacesExample/FaceMeshGeometryConverter.swift index ac6d254..40e60f6 100644 --- a/Examples/AugmentedFacesExample/AugmentedFacesExample/FaceMeshGeometryConverter.swift +++ b/Examples/AugmentedFacesExample/AugmentedFacesExample/FaceMeshGeometryConverter.swift @@ -1,20 +1,22 @@ -/* - * Copyright 2019 Google LLC. All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// +// Copyright 2024 Google LLC. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// import ARCore +import Foundation +import Metal import SceneKit /// Contains all objects needed to hold a face mesh. Used for multi-buffering. @@ -29,7 +31,7 @@ private class FaceMesh { var mtlNormalBuffer: MTLBuffer? /// Buffer containing triangle indices. - var indexBuffer: NSMutableData? + var indexBuffer: Data? /// SceneKit geometry source for vertex positions. var vertSource = SCNGeometrySource() @@ -143,10 +145,10 @@ final public class FaceMeshGeometryConverter { } // Creates an index buffer and sets up an element when the index buffer size changes. - if faceMesh.indexBuffer?.length != idxBufSize { - let indexBuffer = NSMutableData( + if faceMesh.indexBuffer?.count != idxBufSize { + let indexBuffer = Data( bytes: face.mesh.triangleIndices, - length: idxBufSize) + count: idxBufSize) faceMesh.indexBuffer = indexBuffer faceMesh.element = SCNGeometryElement( data: indexBuffer as Data?, @@ -160,12 +162,14 @@ final public class FaceMeshGeometryConverter { if let vertexBuffer = faceMesh.mtlVertexBuffer, let textureBuffer = faceMesh.mtlTexBuffer, let normalBuffer = faceMesh.mtlNormalBuffer, - let indexBuffer = faceMesh.indexBuffer + var indexBuffer = faceMesh.indexBuffer { memcpy(vertexBuffer.contents(), face.mesh.vertices, vertBufSize) memcpy(textureBuffer.contents(), face.mesh.textureCoordinates, texBufSize) memcpy(normalBuffer.contents(), face.mesh.normals, normalBufSize) - memcpy(indexBuffer.mutableBytes, face.mesh.triangleIndices, idxBufSize) + _ = indexBuffer.withUnsafeMutableBytes { pointer in + memcpy(pointer.baseAddress, face.mesh.triangleIndices, idxBufSize) + } } // If any of the sources or element changed, reallocate the geometry. @@ -178,5 +182,4 @@ final public class FaceMeshGeometryConverter { return faceMesh.geometry } - } diff --git a/Examples/AugmentedFacesExample/AugmentedFacesExample/Info.plist b/Examples/AugmentedFacesExample/AugmentedFacesExample/Info.plist index ee4b742..310ecf1 100644 --- a/Examples/AugmentedFacesExample/AugmentedFacesExample/Info.plist +++ b/Examples/AugmentedFacesExample/AugmentedFacesExample/Info.plist @@ -24,17 +24,22 @@ NSCameraUsageDescription This application will use the camera for Augmented Reality. - UILaunchStoryboardName - LaunchScreen - UIRequiredDeviceCapabilities - - armv7 - - UISupportedInterfaceOrientations + UIApplicationSupportsIndirectInputEvents + + UILaunchScreen + + UILaunchScreen + + + UIRequiresFullScreen + + UIStatusBarHidden + + UISupportedInterfaceOrientations~ipad UIInterfaceOrientationPortrait - UISupportedInterfaceOrientations~ipad + UISupportedInterfaceOrientations~iphone UIInterfaceOrientationPortrait diff --git a/Examples/AugmentedFacesExample/AugmentedFacesExample/LaunchScreen.storyboard b/Examples/AugmentedFacesExample/AugmentedFacesExample/LaunchScreen.storyboard deleted file mode 100644 index 2e72994..0000000 --- a/Examples/AugmentedFacesExample/AugmentedFacesExample/LaunchScreen.storyboard +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/Examples/AugmentedFacesExample/Podfile b/Examples/AugmentedFacesExample/Podfile index fb8b3cd..6a42455 100644 --- a/Examples/AugmentedFacesExample/Podfile +++ b/Examples/AugmentedFacesExample/Podfile @@ -1,4 +1,4 @@ target 'AugmentedFacesExample' use_frameworks! -platform :ios, '12.0' -pod 'ARCore/AugmentedFaces', '~> 1.45.0' \ No newline at end of file +platform :ios, '15.0' +pod 'ARCore/AugmentedFaces', '~> 1.46.0' \ No newline at end of file diff --git a/Examples/CloudAnchorExample/Podfile b/Examples/CloudAnchorExample/Podfile index c756175..399c5b3 100644 --- a/Examples/CloudAnchorExample/Podfile +++ b/Examples/CloudAnchorExample/Podfile @@ -1,5 +1,5 @@ target 'CloudAnchorExample' use_frameworks! platform :ios, '17.0' -pod 'ARCore/CloudAnchors', '~> 1.45.0' +pod 'ARCore/CloudAnchors', '~> 1.46.0' pod 'Firebase/Database', '>= 8.0' diff --git a/Examples/GeospatialExample/Podfile b/Examples/GeospatialExample/Podfile index ced122f..00a607f 100644 --- a/Examples/GeospatialExample/Podfile +++ b/Examples/GeospatialExample/Podfile @@ -1,4 +1,4 @@ target 'GeospatialExample' use_frameworks! platform :ios, '17.0' -pod 'ARCore/Geospatial', '~> 1.45.0' +pod 'ARCore/Geospatial', '~> 1.46.0' diff --git a/Examples/PersistentCloudAnchorExample/Podfile b/Examples/PersistentCloudAnchorExample/Podfile index ca5ce71..ae694e9 100644 --- a/Examples/PersistentCloudAnchorExample/Podfile +++ b/Examples/PersistentCloudAnchorExample/Podfile @@ -1,4 +1,4 @@ target 'PersistentCloudAnchorExample' use_frameworks! platform :ios, '17.0' -pod 'ARCore/CloudAnchors', '~> 1.45.0' +pod 'ARCore/CloudAnchors', '~> 1.46.0' diff --git a/Examples/SemanticsExample/Podfile b/Examples/SemanticsExample/Podfile index dee0ca1..0915b0a 100644 --- a/Examples/SemanticsExample/Podfile +++ b/Examples/SemanticsExample/Podfile @@ -1,4 +1,4 @@ target 'SemanticsExample' use_frameworks! platform :ios, '15.0' -pod 'ARCore/Semantics', '~> 1.45.0' +pod 'ARCore/Semantics', '~> 1.46.0' diff --git a/LICENSE b/LICENSE index 4def239..bd371a4 100644 --- a/LICENSE +++ b/LICENSE @@ -6938,6 +6938,37 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +-------------------------------------------------------------------------------- + +Files: LAPACKE/* + + Copyright (c) 2012, Intel Corp. + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + * Neither the name of Intel Corporation nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF + THE POSSIBILITY OF SUCH DAMAGE. + This software is partially based on LLVM: Copied from llvm-project/llvm/LICENSE.TXT: @@ -9630,6 +9661,41 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +This software is partially based on Protocol Buffers for Java: + +Copyright 2008 Google Inc. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright +notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above +copyright notice, this list of conditions and the following disclaimer +in the documentation and/or other materials provided with the +distribution. + * Neither the name of Google Inc. nor the names of its +contributors may be used to endorse or promote products derived from +this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Code generated by the Protocol Buffer compiler is owned by the owner +of the input file used when generating it. This code is not +standalone and requires a support library to be linked with it. This +support library is itself covered by the above license. + This software is partially based on RE2: // Copyright (c) 2009 The RE2 Authors. All rights reserved. @@ -12813,13 +12879,13 @@ Some of the benchmark data in util/zippy/testdata is licensed differently: - kppkn.gtb is taken from the Gaviota chess tablebase set, and is licensed under the MIT License. See - https://sites.google.com/site/gaviotachessengine/Home/endgame-tablebases-1 + https://github.com/michiguel/Gaviota-Tablebases/blob/master/license.txt for more information. - paper-100k.pdf is an excerpt (bytes 92160 to 194560) from the paper “Combinatorial Modeling of Chromatin Features Quantitatively Predicts DNA Replication Timing in _Drosophila_” by Federico Comoglio and Renato Paro, - which is licensed under the CC-BY license. See + which is licensed under the CC-BY-4.0 license. See http://www.ploscompbiol.org/static/license for more ifnormation. - alice29.txt, asyoulik.txt, plrabn12.txt and lcet10.txt are from Project @@ -12828,6 +12894,772 @@ Some of the benchmark data in util/zippy/testdata is licensed differently: public domain according to the license information (http://www.gutenberg.org/ebooks/53). +== + +For Gaviota chess tablebase set, the license is: + +Copyright (c) 2010 Miguel A. Ballicora + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, + copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following + conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + +== + +For fireworks.jpeg, the license is: + +Creative Commons Legal Code + +Attribution 3.0 Unported + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR + DAMAGES RESULTING FROM ITS USE. + +License + +THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE +COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY +COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS +AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. + +BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE +TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY +BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS +CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND +CONDITIONS. + +1. Definitions + + a. "Adaptation" means a work based upon the Work, or upon the Work and + other pre-existing works, such as a translation, adaptation, + derivative work, arrangement of music or other alterations of a + literary or artistic work, or phonogram or performance and includes + cinematographic adaptations or any other form in which the Work may be + recast, transformed, or adapted including in any form recognizably + derived from the original, except that a work that constitutes a + Collection will not be considered an Adaptation for the purpose of + this License. For the avoidance of doubt, where the Work is a musical + work, performance or phonogram, the synchronization of the Work in + timed-relation with a moving image ("synching") will be considered an + Adaptation for the purpose of this License. + b. "Collection" means a collection of literary or artistic works, such as + encyclopedias and anthologies, or performances, phonograms or + broadcasts, or other works or subject matter other than works listed + in Section 1(f) below, which, by reason of the selection and + arrangement of their contents, constitute intellectual creations, in + which the Work is included in its entirety in unmodified form along + with one or more other contributions, each constituting separate and + independent works in themselves, which together are assembled into a + collective whole. A work that constitutes a Collection will not be + considered an Adaptation (as defined above) for the purposes of this + License. + c. "Distribute" means to make available to the public the original and + copies of the Work or Adaptation, as appropriate, through sale or + other transfer of ownership. + d. "Licensor" means the individual, individuals, entity or entities that + offer(s) the Work under the terms of this License. + e. "Original Author" means, in the case of a literary or artistic work, + the individual, individuals, entity or entities who created the Work + or if no individual or entity can be identified, the publisher; and in + addition (i) in the case of a performance the actors, singers, + musicians, dancers, and other persons who act, sing, deliver, declaim, + play in, interpret or otherwise perform literary or artistic works or + expressions of folklore; (ii) in the case of a phonogram the producer + being the person or legal entity who first fixes the sounds of a + performance or other sounds; and, (iii) in the case of broadcasts, the + organization that transmits the broadcast. + f. "Work" means the literary and/or artistic work offered under the terms + of this License including without limitation any production in the + literary, scientific and artistic domain, whatever may be the mode or + form of its expression including digital form, such as a book, + pamphlet and other writing; a lecture, address, sermon or other work + of the same nature; a dramatic or dramatico-musical work; a + choreographic work or entertainment in dumb show; a musical + composition with or without words; a cinematographic work to which are + assimilated works expressed by a process analogous to cinematography; + a work of drawing, painting, architecture, sculpture, engraving or + lithography; a photographic work to which are assimilated works + expressed by a process analogous to photography; a work of applied + art; an illustration, map, plan, sketch or three-dimensional work + relative to geography, topography, architecture or science; a + performance; a broadcast; a phonogram; a compilation of data to the + extent it is protected as a copyrightable work; or a work performed by + a variety or circus performer to the extent it is not otherwise + considered a literary or artistic work. + g. "You" means an individual or entity exercising rights under this + License who has not previously violated the terms of this License with + respect to the Work, or who has received express permission from the + Licensor to exercise rights under this License despite a previous + violation. + h. "Publicly Perform" means to perform public recitations of the Work and + to communicate to the public those public recitations, by any means or + process, including by wire or wireless means or public digital + performances; to make available to the public Works in such a way that + members of the public may access these Works from a place and at a + place individually chosen by them; to perform the Work to the public + by any means or process and the communication to the public of the + performances of the Work, including by public digital performance; to + broadcast and rebroadcast the Work by any means including signs, + sounds or images. + i. "Reproduce" means to make copies of the Work by any means including + without limitation by sound or visual recordings and the right of + fixation and reproducing fixations of the Work, including storage of a + protected performance or phonogram in digital form or other electronic + medium. + +2. Fair Dealing Rights. Nothing in this License is intended to reduce, +limit, or restrict any uses free from copyright or rights arising from +limitations or exceptions that are provided for in connection with the +copyright protection under copyright law or other applicable laws. + +3. License Grant. Subject to the terms and conditions of this License, +Licensor hereby grants You a worldwide, royalty-free, non-exclusive, +perpetual (for the duration of the applicable copyright) license to +exercise the rights in the Work as stated below: + + a. to Reproduce the Work, to incorporate the Work into one or more + Collections, and to Reproduce the Work as incorporated in the + Collections; + b. to create and Reproduce Adaptations provided that any such Adaptation, + including any translation in any medium, takes reasonable steps to + clearly label, demarcate or otherwise identify that changes were made + to the original Work. For example, a translation could be marked "The + original work was translated from English to Spanish," or a + modification could indicate "The original work has been modified."; + c. to Distribute and Publicly Perform the Work including as incorporated + in Collections; and, + d. to Distribute and Publicly Perform Adaptations. + e. For the avoidance of doubt: + + i. Non-waivable Compulsory License Schemes. In those jurisdictions in + which the right to collect royalties through any statutory or + compulsory licensing scheme cannot be waived, the Licensor + reserves the exclusive right to collect such royalties for any + exercise by You of the rights granted under this License; + ii. Waivable Compulsory License Schemes. In those jurisdictions in + which the right to collect royalties through any statutory or + compulsory licensing scheme can be waived, the Licensor waives the + exclusive right to collect such royalties for any exercise by You + of the rights granted under this License; and, + iii. Voluntary License Schemes. The Licensor waives the right to + collect royalties, whether individually or, in the event that the + Licensor is a member of a collecting society that administers + voluntary licensing schemes, via that society, from any exercise + by You of the rights granted under this License. + +The above rights may be exercised in all media and formats whether now +known or hereafter devised. The above rights include the right to make +such modifications as are technically necessary to exercise the rights in +other media and formats. Subject to Section 8(f), all rights not expressly +granted by Licensor are hereby reserved. + +4. Restrictions. The license granted in Section 3 above is expressly made +subject to and limited by the following restrictions: + + a. You may Distribute or Publicly Perform the Work only under the terms + of this License. You must include a copy of, or the Uniform Resource + Identifier (URI) for, this License with every copy of the Work You + Distribute or Publicly Perform. You may not offer or impose any terms + on the Work that restrict the terms of this License or the ability of + the recipient of the Work to exercise the rights granted to that + recipient under the terms of the License. You may not sublicense the + Work. You must keep intact all notices that refer to this License and + to the disclaimer of warranties with every copy of the Work You + Distribute or Publicly Perform. When You Distribute or Publicly + Perform the Work, You may not impose any effective technological + measures on the Work that restrict the ability of a recipient of the + Work from You to exercise the rights granted to that recipient under + the terms of the License. This Section 4(a) applies to the Work as + incorporated in a Collection, but this does not require the Collection + apart from the Work itself to be made subject to the terms of this + License. If You create a Collection, upon notice from any Licensor You + must, to the extent practicable, remove from the Collection any credit + as required by Section 4(b), as requested. If You create an + Adaptation, upon notice from any Licensor You must, to the extent + practicable, remove from the Adaptation any credit as required by + Section 4(b), as requested. + b. If You Distribute, or Publicly Perform the Work or any Adaptations or + Collections, You must, unless a request has been made pursuant to + Section 4(a), keep intact all copyright notices for the Work and + provide, reasonable to the medium or means You are utilizing: (i) the + name of the Original Author (or pseudonym, if applicable) if supplied, + and/or if the Original Author and/or Licensor designate another party + or parties (e.g., a sponsor institute, publishing entity, journal) for + attribution ("Attribution Parties") in Licensor's copyright notice, + terms of service or by other reasonable means, the name of such party + or parties; (ii) the title of the Work if supplied; (iii) to the + extent reasonably practicable, the URI, if any, that Licensor + specifies to be associated with the Work, unless such URI does not + refer to the copyright notice or licensing information for the Work; + and (iv) , consistent with Section 3(b), in the case of an Adaptation, + a credit identifying the use of the Work in the Adaptation (e.g., + "French translation of the Work by Original Author," or "Screenplay + based on original Work by Original Author"). The credit required by + this Section 4 (b) may be implemented in any reasonable manner; + provided, however, that in the case of a Adaptation or Collection, at + a minimum such credit will appear, if a credit for all contributing + authors of the Adaptation or Collection appears, then as part of these + credits and in a manner at least as prominent as the credits for the + other contributing authors. For the avoidance of doubt, You may only + use the credit required by this Section for the purpose of attribution + in the manner set out above and, by exercising Your rights under this + License, You may not implicitly or explicitly assert or imply any + connection with, sponsorship or endorsement by the Original Author, + Licensor and/or Attribution Parties, as appropriate, of You or Your + use of the Work, without the separate, express prior written + permission of the Original Author, Licensor and/or Attribution + Parties. + c. Except as otherwise agreed in writing by the Licensor or as may be + otherwise permitted by applicable law, if You Reproduce, Distribute or + Publicly Perform the Work either by itself or as part of any + Adaptations or Collections, You must not distort, mutilate, modify or + take other derogatory action in relation to the Work which would be + prejudicial to the Original Author's honor or reputation. Licensor + agrees that in those jurisdictions (e.g. Japan), in which any exercise + of the right granted in Section 3(b) of this License (the right to + make Adaptations) would be deemed to be a distortion, mutilation, + modification or other derogatory action prejudicial to the Original + Author's honor and reputation, the Licensor will waive or not assert, + as appropriate, this Section, to the fullest extent permitted by the + applicable national law, to enable You to reasonably exercise Your + right under Section 3(b) of this License (right to make Adaptations) + but not otherwise. + +5. Representations, Warranties and Disclaimer + +UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR +OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY +KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, +INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, +FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF +LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, +WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION +OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. + +6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE +LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR +ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES +ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS +BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. Termination + + a. This License and the rights granted hereunder will terminate + automatically upon any breach by You of the terms of this License. + Individuals or entities who have received Adaptations or Collections + from You under this License, however, will not have their licenses + terminated provided such individuals or entities remain in full + compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will + survive any termination of this License. + b. Subject to the above terms and conditions, the license granted here is + perpetual (for the duration of the applicable copyright in the Work). + Notwithstanding the above, Licensor reserves the right to release the + Work under different license terms or to stop distributing the Work at + any time; provided, however that any such election will not serve to + withdraw this License (or any other license that has been, or is + required to be, granted under the terms of this License), and this + License will continue in full force and effect unless terminated as + stated above. + +8. Miscellaneous + + a. Each time You Distribute or Publicly Perform the Work or a Collection, + the Licensor offers to the recipient a license to the Work on the same + terms and conditions as the license granted to You under this License. + b. Each time You Distribute or Publicly Perform an Adaptation, Licensor + offers to the recipient a license to the original Work on the same + terms and conditions as the license granted to You under this License. + c. If any provision of this License is invalid or unenforceable under + applicable law, it shall not affect the validity or enforceability of + the remainder of the terms of this License, and without further action + by the parties to this agreement, such provision shall be reformed to + the minimum extent necessary to make such provision valid and + enforceable. + d. No term or provision of this License shall be deemed waived and no + breach consented to unless such waiver or consent shall be in writing + and signed by the party to be charged with such waiver or consent. + e. This License constitutes the entire agreement between the parties with + respect to the Work licensed here. There are no understandings, + agreements or representations with respect to the Work not specified + here. Licensor shall not be bound by any additional provisions that + may appear in any communication from You. This License may not be + modified without the mutual written agreement of the Licensor and You. + f. The rights granted under, and the subject matter referenced, in this + License were drafted utilizing the terminology of the Berne Convention + for the Protection of Literary and Artistic Works (as amended on + September 28, 1979), the Rome Convention of 1961, the WIPO Copyright + Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 + and the Universal Copyright Convention (as revised on July 24, 1971). + These rights and subject matter take effect in the relevant + jurisdiction in which the License terms are sought to be enforced + according to the corresponding provisions of the implementation of + those treaty provisions in the applicable national law. If the + standard suite of rights granted under applicable copyright law + includes additional rights not granted under this License, such + additional rights are deemed to be included in the License; this + License is not intended to restrict the license of any rights under + applicable law. + + +Creative Commons Notice + + Creative Commons is not a party to this License, and makes no warranty + whatsoever in connection with the Work. Creative Commons will not be + liable to You or any party on any legal theory for any damages + whatsoever, including without limitation any general, special, + incidental or consequential damages arising in connection to this + license. Notwithstanding the foregoing two (2) sentences, if Creative + Commons has expressly identified itself as the Licensor hereunder, it + shall have all rights and obligations of Licensor. + + Except for the limited purpose of indicating to the public that the + Work is licensed under the CCPL, Creative Commons does not authorize + the use by either party of the trademark "Creative Commons" or any + related trademark or logo of Creative Commons without the prior + written consent of Creative Commons. Any permitted use will be in + compliance with Creative Commons' then-current trademark usage + guidelines, as may be published on its website or otherwise made + available upon request from time to time. For the avoidance of doubt, + this trademark restriction does not form part of this License. + + Creative Commons may be contacted at https://creativecommons.org/. + +== + +For the excerpt from “Combinatorial Modeling of Chromatin Features +Quantitatively Predicts DNA Replication Timing in _Drosophila_”, the license is: + +Attribution 4.0 International + +======================================================================= + +Creative Commons Corporation ("Creative Commons") is not a law firm and +does not provide legal services or legal advice. Distribution of +Creative Commons public licenses does not create a lawyer-client or +other relationship. Creative Commons makes its licenses and related +information available on an "as-is" basis. Creative Commons gives no +warranties regarding its licenses, any material licensed under their +terms and conditions, or any related information. Creative Commons +disclaims all liability for damages resulting from their use to the +fullest extent possible. + +Using Creative Commons Public Licenses + +Creative Commons public licenses provide a standard set of terms and +conditions that creators and other rights holders may use to share +original works of authorship and other material subject to copyright +and certain other rights specified in the public license below. The +following considerations are for informational purposes only, are not +exhaustive, and do not form part of our licenses. + + Considerations for licensors: Our public licenses are + intended for use by those authorized to give the public + permission to use material in ways otherwise restricted by + copyright and certain other rights. Our licenses are + irrevocable. Licensors should read and understand the terms + and conditions of the license they choose before applying it. + Licensors should also secure all rights necessary before + applying our licenses so that the public can reuse the + material as expected. Licensors should clearly mark any + material not subject to the license. This includes other CC- + licensed material, or material used under an exception or + limitation to copyright. More considerations for licensors: + wiki.creativecommons.org/Considerations_for_licensors + + Considerations for the public: By using one of our public + licenses, a licensor grants the public permission to use the + licensed material under specified terms and conditions. If + the licensor's permission is not necessary for any reason--for + example, because of any applicable exception or limitation to + copyright--then that use is not regulated by the license. Our + licenses grant only permissions under copyright and certain + other rights that a licensor has authority to grant. Use of + the licensed material may still be restricted for other + reasons, including because others have copyright or other + rights in the material. A licensor may make special requests, + such as asking that all changes be marked or described. + Although not required by our licenses, you are encouraged to + respect those requests where reasonable. More considerations + for the public: + wiki.creativecommons.org/Considerations_for_licensees + +======================================================================= + +Creative Commons Attribution 4.0 International Public License + +By exercising the Licensed Rights (defined below), You accept and agree +to be bound by the terms and conditions of this Creative Commons +Attribution 4.0 International Public License ("Public License"). To the +extent this Public License may be interpreted as a contract, You are +granted the Licensed Rights in consideration of Your acceptance of +these terms and conditions, and the Licensor grants You such rights in +consideration of benefits the Licensor receives from making the +Licensed Material available under these terms and conditions. + + +Section 1 -- Definitions. + + a. Adapted Material means material subject to Copyright and Similar + Rights that is derived from or based upon the Licensed Material + and in which the Licensed Material is translated, altered, + arranged, transformed, or otherwise modified in a manner requiring + permission under the Copyright and Similar Rights held by the + Licensor. For purposes of this Public License, where the Licensed + Material is a musical work, performance, or sound recording, + Adapted Material is always produced where the Licensed Material is + synched in timed relation with a moving image. + + b. Adapter's License means the license You apply to Your Copyright + and Similar Rights in Your contributions to Adapted Material in + accordance with the terms and conditions of this Public License. + + c. Copyright and Similar Rights means copyright and/or similar rights + closely related to copyright including, without limitation, + performance, broadcast, sound recording, and Sui Generis Database + Rights, without regard to how the rights are labeled or + categorized. For purposes of this Public License, the rights + specified in Section 2(b)(1)-(2) are not Copyright and Similar + Rights. + + d. Effective Technological Measures means those measures that, in the + absence of proper authority, may not be circumvented under laws + fulfilling obligations under Article 11 of the WIPO Copyright + Treaty adopted on December 20, 1996, and/or similar international + agreements. + + e. Exceptions and Limitations means fair use, fair dealing, and/or + any other exception or limitation to Copyright and Similar Rights + that applies to Your use of the Licensed Material. + + f. Licensed Material means the artistic or literary work, database, + or other material to which the Licensor applied this Public + License. + + g. Licensed Rights means the rights granted to You subject to the + terms and conditions of this Public License, which are limited to + all Copyright and Similar Rights that apply to Your use of the + Licensed Material and that the Licensor has authority to license. + + h. Licensor means the individual(s) or entity(ies) granting rights + under this Public License. + + i. Share means to provide material to the public by any means or + process that requires permission under the Licensed Rights, such + as reproduction, public display, public performance, distribution, + dissemination, communication, or importation, and to make material + available to the public including in ways that members of the + public may access the material from a place and at a time + individually chosen by them. + + j. Sui Generis Database Rights means rights other than copyright + resulting from Directive 96/9/EC of the European Parliament and of + the Council of 11 March 1996 on the legal protection of databases, + as amended and/or succeeded, as well as other essentially + equivalent rights anywhere in the world. + + k. You means the individual or entity exercising the Licensed Rights + under this Public License. Your has a corresponding meaning. + + +Section 2 -- Scope. + + a. License grant. + + 1. Subject to the terms and conditions of this Public License, + the Licensor hereby grants You a worldwide, royalty-free, + non-sublicensable, non-exclusive, irrevocable license to + exercise the Licensed Rights in the Licensed Material to: + + a. reproduce and Share the Licensed Material, in whole or + in part; and + + b. produce, reproduce, and Share Adapted Material. + + 2. Exceptions and Limitations. For the avoidance of doubt, where + Exceptions and Limitations apply to Your use, this Public + License does not apply, and You do not need to comply with + its terms and conditions. + + 3. Term. The term of this Public License is specified in Section + 6(a). + + 4. Media and formats; technical modifications allowed. The + Licensor authorizes You to exercise the Licensed Rights in + all media and formats whether now known or hereafter created, + and to make technical modifications necessary to do so. The + Licensor waives and/or agrees not to assert any right or + authority to forbid You from making technical modifications + necessary to exercise the Licensed Rights, including + technical modifications necessary to circumvent Effective + Technological Measures. For purposes of this Public License, + simply making modifications authorized by this Section 2(a) + (4) never produces Adapted Material. + + 5. Downstream recipients. + + a. Offer from the Licensor -- Licensed Material. Every + recipient of the Licensed Material automatically + receives an offer from the Licensor to exercise the + Licensed Rights under the terms and conditions of this + Public License. + + b. No downstream restrictions. You may not offer or impose + any additional or different terms or conditions on, or + apply any Effective Technological Measures to, the + Licensed Material if doing so restricts exercise of the + Licensed Rights by any recipient of the Licensed + Material. + + 6. No endorsement. Nothing in this Public License constitutes or + may be construed as permission to assert or imply that You + are, or that Your use of the Licensed Material is, connected + with, or sponsored, endorsed, or granted official status by, + the Licensor or others designated to receive attribution as + provided in Section 3(a)(1)(A)(i). + + b. Other rights. + + 1. Moral rights, such as the right of integrity, are not + licensed under this Public License, nor are publicity, + privacy, and/or other similar personality rights; however, to + the extent possible, the Licensor waives and/or agrees not to + assert any such rights held by the Licensor to the limited + extent necessary to allow You to exercise the Licensed + Rights, but not otherwise. + + 2. Patent and trademark rights are not licensed under this + Public License. + + 3. To the extent possible, the Licensor waives any right to + collect royalties from You for the exercise of the Licensed + Rights, whether directly or through a collecting society + under any voluntary or waivable statutory or compulsory + licensing scheme. In all other cases the Licensor expressly + reserves any right to collect such royalties. + + +Section 3 -- License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the +following conditions. + + a. Attribution. + + 1. If You Share the Licensed Material (including in modified + form), You must: + + a. retain the following if it is supplied by the Licensor + with the Licensed Material: + + i. identification of the creator(s) of the Licensed + Material and any others designated to receive + attribution, in any reasonable manner requested by + the Licensor (including by pseudonym if + designated); + + ii. a copyright notice; + + iii. a notice that refers to this Public License; + + iv. a notice that refers to the disclaimer of + warranties; + + v. a URI or hyperlink to the Licensed Material to the + extent reasonably practicable; + + b. indicate if You modified the Licensed Material and + retain an indication of any previous modifications; and + + c. indicate the Licensed Material is licensed under this + Public License, and include the text of, or the URI or + hyperlink to, this Public License. + + 2. You may satisfy the conditions in Section 3(a)(1) in any + reasonable manner based on the medium, means, and context in + which You Share the Licensed Material. For example, it may be + reasonable to satisfy the conditions by providing a URI or + hyperlink to a resource that includes the required + information. + + 3. If requested by the Licensor, You must remove any of the + information required by Section 3(a)(1)(A) to the extent + reasonably practicable. + + 4. If You Share Adapted Material You produce, the Adapter's + License You apply must not prevent recipients of the Adapted + Material from complying with this Public License. + + +Section 4 -- Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that +apply to Your use of the Licensed Material: + + a. for the avoidance of doubt, Section 2(a)(1) grants You the right + to extract, reuse, reproduce, and Share all or a substantial + portion of the contents of the database; + + b. if You include all or a substantial portion of the database + contents in a database in which You have Sui Generis Database + Rights, then the database in which You have Sui Generis Database + Rights (but not its individual contents) is Adapted Material; and + + c. You must comply with the conditions in Section 3(a) if You Share + all or a substantial portion of the contents of the database. + +For the avoidance of doubt, this Section 4 supplements and does not +replace Your obligations under this Public License where the Licensed +Rights include other Copyright and Similar Rights. + + +Section 5 -- Disclaimer of Warranties and Limitation of Liability. + + a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE + EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS + AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF + ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, + IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, + WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, + ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT + KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT + ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. + + b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE + TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, + NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, + INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, + COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR + USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR + DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR + IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. + + c. The disclaimer of warranties and limitation of liability provided + above shall be interpreted in a manner that, to the extent + possible, most closely approximates an absolute disclaimer and + waiver of all liability. + + +Section 6 -- Term and Termination. + + a. This Public License applies for the term of the Copyright and + Similar Rights licensed here. However, if You fail to comply with + this Public License, then Your rights under this Public License + terminate automatically. + + b. Where Your right to use the Licensed Material has terminated under + Section 6(a), it reinstates: + + 1. automatically as of the date the violation is cured, provided + it is cured within 30 days of Your discovery of the + violation; or + + 2. upon express reinstatement by the Licensor. + + For the avoidance of doubt, this Section 6(b) does not affect any + right the Licensor may have to seek remedies for Your violations + of this Public License. + + c. For the avoidance of doubt, the Licensor may also offer the + Licensed Material under separate terms or conditions or stop + distributing the Licensed Material at any time; however, doing so + will not terminate this Public License. + + d. Sections 1, 5, 6, 7, and 8 survive termination of this Public + License. + + +Section 7 -- Other Terms and Conditions. + + a. The Licensor shall not be bound by any additional or different + terms or conditions communicated by You unless expressly agreed. + + b. Any arrangements, understandings, or agreements regarding the + Licensed Material not stated herein are separate from and + independent of the terms and conditions of this Public License. + + +Section 8 -- Interpretation. + + a. For the avoidance of doubt, this Public License does not, and + shall not be interpreted to, reduce, limit, restrict, or impose + conditions on any use of the Licensed Material that could lawfully + be made without permission under this Public License. + + b. To the extent possible, if any provision of this Public License is + deemed unenforceable, it shall be automatically reformed to the + minimum extent necessary to make it enforceable. If the provision + cannot be reformed, it shall be severed from this Public License + without affecting the enforceability of the remaining terms and + conditions. + + c. No term or condition of this Public License will be waived and no + failure to comply consented to unless expressly agreed to by the + Licensor. + + d. Nothing in this Public License constitutes or may be interpreted + as a limitation upon, or waiver of, any privileges and immunities + that apply to the Licensor or You, including from the legal + processes of any jurisdiction or authority. + + +======================================================================= + +Creative Commons is not a party to its public +licenses. Notwithstanding, Creative Commons may elect to apply one of +its public licenses to material it publishes and in those instances +will be considered the “Licensor.” The text of the Creative Commons +public licenses is dedicated to the public domain under the CC0 Public +Domain Dedication. Except for the limited purpose of indicating that +material is shared under a Creative Commons public license or as +otherwise permitted by the Creative Commons policies published at +creativecommons.org/policies, Creative Commons does not authorize the +use of the trademark "Creative Commons" or any other trademark or logo +of Creative Commons without its prior written consent including, +without limitation, in connection with any unauthorized modifications +to any of its public licenses or any other arrangements, +understandings, or agreements concerning use of licensed material. For +the avoidance of doubt, this paragraph does not form part of the +public licenses. + +Creative Commons may be contacted at creativecommons.org. + + +== + +For content from Project Gutenberg: + +This eBook is for the use of anyone anywhere in the United States and most other +parts of the world at no cost and with almost no restrictions whatsoever. You +may copy it, give it away or re-use it under the terms of the Project Gutenberg +License included with this eBook or online at www.gutenberg.org. If you are not +located in the United States, you’ll have to check the laws of the country where +you are located before using this ebook. + +from https://www.gutenberg.org/policy/license.html + This software is partially based on Zstandard: BSD License @@ -16604,6 +17436,225 @@ This software is partially based on perfetto: See the License for the specific language governing permissions and limitations under the License. + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + Copyright (c) 2017, The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + +--- + + Copyright 2015 The Chromium Authors + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following disclaimer + in the documentation and/or other materials provided with the + distribution. + * Neither the name of Google LLC nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + This software is partially based on program_image_remapper: diff --git a/Package.swift b/Package.swift index 7237b7c..64523c3 100644 --- a/Package.swift +++ b/Package.swift @@ -1,19 +1,18 @@ // swift-tools-version: 5.5 -/* - * Copyright 2024 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ +// +// Copyright 2024 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. import PackageDescription @@ -35,8 +34,8 @@ let package = Package( ], targets: [ .binaryTarget( - name: "ARCoreBase", url: "https://dl.google.com/arcore/swiftpm/1.45.0/Base.zip", - checksum: "a1c17b5fab235b97a3e96d7b249ca78ecde0cbe9c868b24b65a00af94f2dfb4b" + name: "ARCoreBase", url: "https://dl.google.com/arcore/swiftpm/1.46.0/Base.zip", + checksum: "71087330b6935f5496ae64eb2404afb7fecdb823c55f5ce8736d8ec521a0bf1d" ), .target( name: "Base", @@ -51,8 +50,8 @@ let package = Package( ), .binaryTarget( name: "ARCoreCloudAnchors", - url: "https://dl.google.com/arcore/swiftpm/1.45.0/CloudAnchors.zip", - checksum: "a5232b391f5f84ebbc2321f3c49156220a4dee2edc2cfe5db6a745e1f0f8f6bd" + url: "https://dl.google.com/arcore/swiftpm/1.46.0/CloudAnchors.zip", + checksum: "dc383fc4148aaa3cb94ce86be52f0b465967367423b2430739face905bc548be" ), .target( name: "CloudAnchors", @@ -67,8 +66,8 @@ let package = Package( publicHeadersPath: "Sources" ), .binaryTarget( - name: "ARCoreGeospatial", url: "https://dl.google.com/arcore/swiftpm/1.45.0/Geospatial.zip", - checksum: "ed6bb8155bdae259661d41b21c2c06a479b8d2d05796cad89eed32d40f478564" + name: "ARCoreGeospatial", url: "https://dl.google.com/arcore/swiftpm/1.46.0/Geospatial.zip", + checksum: "b9f0bc8a454a28149d2fffc55f88ec773181dc646682f303c520178df21f0365" ), .target( name: "Geospatial", @@ -81,8 +80,8 @@ let package = Package( publicHeadersPath: "Sources" ), .binaryTarget( - name: "ARCoreGARSession", url: "https://dl.google.com/arcore/swiftpm/1.45.0/GARSession.zip", - checksum: "46ae76553c65018c549ee616be0bdef7492035137f797159d9b272495be3633f" + name: "ARCoreGARSession", url: "https://dl.google.com/arcore/swiftpm/1.46.0/GARSession.zip", + checksum: "13c0c0bd2b738917a4a4fb4ae11b78bbe939737c7dccb626318921e537bc9570" ), .target( name: "GARSession", @@ -99,8 +98,8 @@ let package = Package( ), .binaryTarget( name: "ARCoreAugmentedFaces", - url: "https://dl.google.com/arcore/swiftpm/1.45.0/AugmentedFaces.zip", - checksum: "3e81d128d4aa767254cf9ad87266a5e269f0d3cf6b85e44ce094c5f50d5c5f55" + url: "https://dl.google.com/arcore/swiftpm/1.46.0/AugmentedFaces.zip", + checksum: "994a30c2c726e1048b17c82edcea97771e4487253cda605b96600ca9dddd6918" ), .target( name: "AugmentedFaces", @@ -116,8 +115,8 @@ let package = Package( publicHeadersPath: "Sources" ), .binaryTarget( - name: "ARCoreSemantics", url: "https://dl.google.com/arcore/swiftpm/1.45.0/Semantics.zip", - checksum: "5e17cc0accfdb432aceb47f0f837343710795e9f9fe364e962ab5a28cbb17580" + name: "ARCoreSemantics", url: "https://dl.google.com/arcore/swiftpm/1.46.0/Semantics.zip", + checksum: "af39c088348d83b87e3e4619eb613cdebd4cc22c3264952ca3cfb114f4831c4b" ), .target( name: "Semantics", @@ -132,8 +131,8 @@ let package = Package( publicHeadersPath: "Sources" ), .binaryTarget( - name: "ARCoreTFShared", url: "https://dl.google.com/arcore/swiftpm/1.45.0/TFShared.zip", - checksum: "31c480256501d66dedb290a33ef101f2c9abdb295a03db78736619ddd640a534" + name: "ARCoreTFShared", url: "https://dl.google.com/arcore/swiftpm/1.46.0/TFShared.zip", + checksum: "21d448280900ee03e74298043bbd44344c570d7144a25af2e48bdf4baa7515b7" ), .target( name: "TFShared",