diff --git a/ArkitDoushiQi/ArkitDoushiQi.xcodeproj/project.pbxproj b/ArkitDoushiQi/ArkitDoushiQi.xcodeproj/project.pbxproj index 13fd91e..f702364 100644 --- a/ArkitDoushiQi/ArkitDoushiQi.xcodeproj/project.pbxproj +++ b/ArkitDoushiQi/ArkitDoushiQi.xcodeproj/project.pbxproj @@ -18,21 +18,20 @@ 82740EBE2C19762C009711A5 /* ArKitView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82740EBD2C19762C009711A5 /* ArKitView.swift */; }; 82740EC02C197A48009711A5 /* ArKitViewRepresentable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82740EBF2C197A48009711A5 /* ArKitViewRepresentable.swift */; }; 82740EC22C197C1A009711A5 /* ContentArkit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82740EC12C197C1A009711A5 /* ContentArkit.swift */; }; - 827AC57F2C206374001701CC /* cat.usdz in Resources */ = {isa = PBXBuildFile; fileRef = 827AC57E2C206374001701CC /* cat.usdz */; }; - 827AC5812C206385001701CC /* dog.usdz in Resources */ = {isa = PBXBuildFile; fileRef = 827AC5802C206385001701CC /* dog.usdz */; }; - 827AC5832C206395001701CC /* elephant.usdz in Resources */ = {isa = PBXBuildFile; fileRef = 827AC5822C206395001701CC /* elephant.usdz */; }; - 827AC5852C2063AB001701CC /* leopard.usdz in Resources */ = {isa = PBXBuildFile; fileRef = 827AC5842C2063AB001701CC /* leopard.usdz */; }; - 827AC5872C2063B6001701CC /* lion.usdz in Resources */ = {isa = PBXBuildFile; fileRef = 827AC5862C2063B6001701CC /* lion.usdz */; }; - 827AC5892C2063C7001701CC /* rat.usdz in Resources */ = {isa = PBXBuildFile; fileRef = 827AC5882C2063C7001701CC /* rat.usdz */; }; - 827AC58B2C2063D6001701CC /* tiger.usdz in Resources */ = {isa = PBXBuildFile; fileRef = 827AC58A2C2063D6001701CC /* tiger.usdz */; }; - 827AC58D2C2063E2001701CC /* wolf.usdz in Resources */ = {isa = PBXBuildFile; fileRef = 827AC58C2C2063E2001701CC /* wolf.usdz */; }; 827AC58E2C206625001701CC /* DSQ.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = C2A535D82C0F56A700503472 /* DSQ.xcframework */; }; 827AC58F2C206625001701CC /* DSQ.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = C2A535D82C0F56A700503472 /* DSQ.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 82CCA5442C1C2B6400AFF485 /* board.usdz in Resources */ = {isa = PBXBuildFile; fileRef = 82CCA5432C1C2B6400AFF485 /* board.usdz */; }; - 82CCA5462C1C2B8E00AFF485 /* CatPiece.usdz in Resources */ = {isa = PBXBuildFile; fileRef = 82CCA5452C1C2B8E00AFF485 /* CatPiece.usdz */; }; 82CE59E92C045D1100ADEE24 /* GameScene.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82CE59E82C045D1100ADEE24 /* GameScene.swift */; }; 82CE59EB2C045E3800ADEE24 /* GameView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82CE59EA2C045E3800ADEE24 /* GameView.swift */; }; 82CE59EF2C0460E500ADEE24 /* SpriteMoople.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82CE59EE2C0460E500ADEE24 /* SpriteMoople.swift */; }; + 82FBE2F22C25811400672F32 /* lion.usdz in Resources */ = {isa = PBXBuildFile; fileRef = 82FBE2E92C25811400672F32 /* lion.usdz */; }; + 82FBE2F32C25811400672F32 /* dog.usdz in Resources */ = {isa = PBXBuildFile; fileRef = 82FBE2EA2C25811400672F32 /* dog.usdz */; }; + 82FBE2F42C25811400672F32 /* board.usdz in Resources */ = {isa = PBXBuildFile; fileRef = 82FBE2EB2C25811400672F32 /* board.usdz */; }; + 82FBE2F52C25811400672F32 /* tiger.usdz in Resources */ = {isa = PBXBuildFile; fileRef = 82FBE2EC2C25811400672F32 /* tiger.usdz */; }; + 82FBE2F62C25811400672F32 /* wolf.usdz in Resources */ = {isa = PBXBuildFile; fileRef = 82FBE2ED2C25811400672F32 /* wolf.usdz */; }; + 82FBE2F72C25811400672F32 /* leopard.usdz in Resources */ = {isa = PBXBuildFile; fileRef = 82FBE2EE2C25811400672F32 /* leopard.usdz */; }; + 82FBE2F82C25811400672F32 /* cat.usdz in Resources */ = {isa = PBXBuildFile; fileRef = 82FBE2EF2C25811400672F32 /* cat.usdz */; }; + 82FBE2F92C25811400672F32 /* elephant.usdz in Resources */ = {isa = PBXBuildFile; fileRef = 82FBE2F02C25811400672F32 /* elephant.usdz */; }; + 82FBE2FA2C25811400672F32 /* rat.usdz in Resources */ = {isa = PBXBuildFile; fileRef = 82FBE2F12C25811400672F32 /* rat.usdz */; }; C205A2B72BF373360097BD93 /* ArkitDoushiQiApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = C205A2B62BF373360097BD93 /* ArkitDoushiQiApp.swift */; }; C205A2BB2BF373380097BD93 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C205A2BA2BF373380097BD93 /* Assets.xcassets */; }; C205A2BE2BF373380097BD93 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C205A2BD2BF373380097BD93 /* Preview Assets.xcassets */; }; @@ -111,19 +110,18 @@ 82740EBD2C19762C009711A5 /* ArKitView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArKitView.swift; sourceTree = ""; }; 82740EBF2C197A48009711A5 /* ArKitViewRepresentable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArKitViewRepresentable.swift; sourceTree = ""; }; 82740EC12C197C1A009711A5 /* ContentArkit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentArkit.swift; sourceTree = ""; }; - 827AC57E2C206374001701CC /* cat.usdz */ = {isa = PBXFileReference; lastKnownFileType = file.usdz; path = cat.usdz; sourceTree = ""; }; - 827AC5802C206385001701CC /* dog.usdz */ = {isa = PBXFileReference; lastKnownFileType = file.usdz; path = dog.usdz; sourceTree = ""; }; - 827AC5822C206395001701CC /* elephant.usdz */ = {isa = PBXFileReference; lastKnownFileType = file.usdz; path = elephant.usdz; sourceTree = ""; }; - 827AC5842C2063AB001701CC /* leopard.usdz */ = {isa = PBXFileReference; lastKnownFileType = file.usdz; path = leopard.usdz; sourceTree = ""; }; - 827AC5862C2063B6001701CC /* lion.usdz */ = {isa = PBXFileReference; lastKnownFileType = file.usdz; path = lion.usdz; sourceTree = ""; }; - 827AC5882C2063C7001701CC /* rat.usdz */ = {isa = PBXFileReference; lastKnownFileType = file.usdz; path = rat.usdz; sourceTree = ""; }; - 827AC58A2C2063D6001701CC /* tiger.usdz */ = {isa = PBXFileReference; lastKnownFileType = file.usdz; path = tiger.usdz; sourceTree = ""; }; - 827AC58C2C2063E2001701CC /* wolf.usdz */ = {isa = PBXFileReference; lastKnownFileType = file.usdz; path = wolf.usdz; sourceTree = ""; }; - 82CCA5432C1C2B6400AFF485 /* board.usdz */ = {isa = PBXFileReference; lastKnownFileType = file.usdz; path = board.usdz; sourceTree = ""; }; - 82CCA5452C1C2B8E00AFF485 /* CatPiece.usdz */ = {isa = PBXFileReference; lastKnownFileType = file.usdz; name = CatPiece.usdz; path = ArkitDoushiQi/Resources/Object/CatPiece.usdz; sourceTree = SOURCE_ROOT; }; 82CE59E82C045D1100ADEE24 /* GameScene.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameScene.swift; sourceTree = ""; }; 82CE59EA2C045E3800ADEE24 /* GameView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameView.swift; sourceTree = ""; }; 82CE59EE2C0460E500ADEE24 /* SpriteMoople.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpriteMoople.swift; sourceTree = ""; }; + 82FBE2E92C25811400672F32 /* lion.usdz */ = {isa = PBXFileReference; lastKnownFileType = file.usdz; name = lion.usdz; path = Ressources/3DModel/lion.usdz; sourceTree = SOURCE_ROOT; }; + 82FBE2EA2C25811400672F32 /* dog.usdz */ = {isa = PBXFileReference; lastKnownFileType = file.usdz; name = dog.usdz; path = Ressources/3DModel/dog.usdz; sourceTree = SOURCE_ROOT; }; + 82FBE2EB2C25811400672F32 /* board.usdz */ = {isa = PBXFileReference; lastKnownFileType = file.usdz; name = board.usdz; path = Ressources/3DModel/board.usdz; sourceTree = SOURCE_ROOT; }; + 82FBE2EC2C25811400672F32 /* tiger.usdz */ = {isa = PBXFileReference; lastKnownFileType = file.usdz; name = tiger.usdz; path = Ressources/3DModel/tiger.usdz; sourceTree = SOURCE_ROOT; }; + 82FBE2ED2C25811400672F32 /* wolf.usdz */ = {isa = PBXFileReference; lastKnownFileType = file.usdz; name = wolf.usdz; path = Ressources/3DModel/wolf.usdz; sourceTree = SOURCE_ROOT; }; + 82FBE2EE2C25811400672F32 /* leopard.usdz */ = {isa = PBXFileReference; lastKnownFileType = file.usdz; name = leopard.usdz; path = Ressources/3DModel/leopard.usdz; sourceTree = SOURCE_ROOT; }; + 82FBE2EF2C25811400672F32 /* cat.usdz */ = {isa = PBXFileReference; lastKnownFileType = file.usdz; name = cat.usdz; path = Ressources/3DModel/cat.usdz; sourceTree = SOURCE_ROOT; }; + 82FBE2F02C25811400672F32 /* elephant.usdz */ = {isa = PBXFileReference; lastKnownFileType = file.usdz; name = elephant.usdz; path = Ressources/3DModel/elephant.usdz; sourceTree = SOURCE_ROOT; }; + 82FBE2F12C25811400672F32 /* rat.usdz */ = {isa = PBXFileReference; lastKnownFileType = file.usdz; name = rat.usdz; path = Ressources/3DModel/rat.usdz; sourceTree = SOURCE_ROOT; }; C205A2B32BF373360097BD93 /* ArkitDoushiQi.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ArkitDoushiQi.app; sourceTree = BUILT_PRODUCTS_DIR; }; C205A2B62BF373360097BD93 /* ArkitDoushiQiApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArkitDoushiQiApp.swift; sourceTree = ""; }; C205A2BA2BF373380097BD93 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; @@ -197,6 +195,7 @@ 165725EB2C1985920052D7EF /* Ressources */ = { isa = PBXGroup; children = ( + 82FBE2E82C2580D800672F32 /* Object */, 16FA058D2C1C14FD0042D688 /* fr.lproj */, 16FA05892C1C14F50042D688 /* en.lproj */, 165725EF2C1985920052D7EF /* Font */, @@ -212,23 +211,6 @@ path = Font; sourceTree = ""; }; - 16DB00A52C257E7800BA190C /* Recovered References */ = { - isa = PBXGroup; - children = ( - 82CCA5432C1C2B6400AFF485 /* board.usdz */, - 827AC58C2C2063E2001701CC /* wolf.usdz */, - 827AC57E2C206374001701CC /* cat.usdz */, - 82CCA5452C1C2B8E00AFF485 /* CatPiece.usdz */, - 827AC5842C2063AB001701CC /* leopard.usdz */, - 827AC5822C206395001701CC /* elephant.usdz */, - 827AC5802C206385001701CC /* dog.usdz */, - 827AC5862C2063B6001701CC /* lion.usdz */, - 827AC58A2C2063D6001701CC /* tiger.usdz */, - 827AC5882C2063C7001701CC /* rat.usdz */, - ); - name = "Recovered References"; - sourceTree = ""; - }; 16FA05892C1C14F50042D688 /* en.lproj */ = { isa = PBXGroup; children = ( @@ -284,6 +266,22 @@ path = SKNodes; sourceTree = ""; }; + 82FBE2E82C2580D800672F32 /* Object */ = { + isa = PBXGroup; + children = ( + 82FBE2EB2C25811400672F32 /* board.usdz */, + 82FBE2EF2C25811400672F32 /* cat.usdz */, + 82FBE2EA2C25811400672F32 /* dog.usdz */, + 82FBE2F02C25811400672F32 /* elephant.usdz */, + 82FBE2EE2C25811400672F32 /* leopard.usdz */, + 82FBE2E92C25811400672F32 /* lion.usdz */, + 82FBE2F12C25811400672F32 /* rat.usdz */, + 82FBE2EC2C25811400672F32 /* tiger.usdz */, + 82FBE2ED2C25811400672F32 /* wolf.usdz */, + ); + path = Object; + sourceTree = ""; + }; C205A2AA2BF373360097BD93 = { isa = PBXGroup; children = ( @@ -293,7 +291,6 @@ C205A2D02BF373380097BD93 /* ArkitDoushiQiUITests */, C205A2B42BF373360097BD93 /* Products */, 8203E9052BF60117005F5C4A /* Frameworks */, - 16DB00A52C257E7800BA190C /* Recovered References */, ); sourceTree = ""; }; @@ -560,24 +557,23 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 82CCA5442C1C2B6400AFF485 /* board.usdz in Resources */, C205A2BE2BF373380097BD93 /* Preview Assets.xcassets in Resources */, + 82FBE2FA2C25811400672F32 /* rat.usdz in Resources */, + 82FBE2F92C25811400672F32 /* elephant.usdz in Resources */, 16DB00A42C257BA900BA190C /* nuku1.ttf in Resources */, C2DF07652C20719800BEE0E1 /* FireworkLaunch.sks in Resources */, + 82FBE2F22C25811400672F32 /* lion.usdz in Resources */, C2DF07642C20719800BEE0E1 /* Spark.sks in Resources */, C2DF07662C20719800BEE0E1 /* Fireworks.sks in Resources */, - 827AC58D2C2063E2001701CC /* wolf.usdz in Resources */, - 827AC57F2C206374001701CC /* cat.usdz in Resources */, - 82CCA5462C1C2B8E00AFF485 /* CatPiece.usdz in Resources */, - 827AC5852C2063AB001701CC /* leopard.usdz in Resources */, - 827AC5832C206395001701CC /* elephant.usdz in Resources */, + 82FBE2F62C25811400672F32 /* wolf.usdz in Resources */, + 82FBE2F52C25811400672F32 /* tiger.usdz in Resources */, + 82FBE2F82C25811400672F32 /* cat.usdz in Resources */, C2DF07622C20719800BEE0E1 /* Magic.sks in Resources */, C2DF07632C20719800BEE0E1 /* Assets.xcassets in Resources */, - 827AC5812C206385001701CC /* dog.usdz in Resources */, - 827AC5872C2063B6001701CC /* lion.usdz in Resources */, - 827AC58B2C2063D6001701CC /* tiger.usdz in Resources */, + 82FBE2F32C25811400672F32 /* dog.usdz in Resources */, + 82FBE2F42C25811400672F32 /* board.usdz in Resources */, C205A2BB2BF373380097BD93 /* Assets.xcassets in Resources */, - 827AC5892C2063C7001701CC /* rat.usdz in Resources */, + 82FBE2F72C25811400672F32 /* leopard.usdz in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/ArkitDoushiQi/ArkitDoushiQi/ArkitDoushiQiApp.swift b/ArkitDoushiQi/ArkitDoushiQi/ArkitDoushiQiApp.swift index 95273db..116c4e9 100644 --- a/ArkitDoushiQi/ArkitDoushiQi/ArkitDoushiQiApp.swift +++ b/ArkitDoushiQi/ArkitDoushiQi/ArkitDoushiQiApp.swift @@ -25,8 +25,8 @@ struct ArkitDoushiQiApp: App { .environmentObject(LanguageSettings(selectedLanguage: .French) ) .environmentObject(languageSettings) - .preferredColorScheme(isDarkMode ? .dark : .light)*/ - ContentArkit() + .preferredColorScheme(isDarkMode ? .dark : .light) + //ContentArkit() } } } diff --git a/ArkitDoushiQi/Ressources/3DModel/CatPiece 2.usdz b/ArkitDoushiQi/Ressources/3DModel/CatPiece 2.usdz deleted file mode 100644 index 021f023..0000000 Binary files a/ArkitDoushiQi/Ressources/3DModel/CatPiece 2.usdz and /dev/null differ diff --git a/ArkitDoushiQi/Ressources/3DModel/CatPiece.usdz b/ArkitDoushiQi/Ressources/3DModel/CatPiece.usdz deleted file mode 100644 index 021f023..0000000 Binary files a/ArkitDoushiQi/Ressources/3DModel/CatPiece.usdz and /dev/null differ diff --git a/ArkitDoushiQi/Ressources/3DModel/LionPiece.usdz b/ArkitDoushiQi/Ressources/3DModel/LionPiece.usdz deleted file mode 100644 index 64eea9f..0000000 Binary files a/ArkitDoushiQi/Ressources/3DModel/LionPiece.usdz and /dev/null differ