diff --git a/Source/Rampage.xcodeproj/project.pbxproj b/Source/Rampage.xcodeproj/project.pbxproj index d7af904..650c399 100644 --- a/Source/Rampage.xcodeproj/project.pbxproj +++ b/Source/Rampage.xcodeproj/project.pbxproj @@ -7,15 +7,11 @@ objects = { /* Begin PBXBuildFile section */ - 0108A65E23F4D84C0075E1AF /* Renderer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0108A65723F4D84C0075E1AF /* Renderer.framework */; }; - 0108A65F23F4D84C0075E1AF /* Renderer.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 0108A65723F4D84C0075E1AF /* Renderer.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 0108A66323F4D8E80075E1AF /* Bitmap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01D09AF222A482030052745A /* Bitmap.swift */; }; - 0108A66523F4D8F00075E1AF /* Renderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01ADC63B22B957FD00DC8AAD /* Renderer.swift */; }; - 0108A66723F4D9370075E1AF /* Color.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01D09AF022A481AB0052745A /* Color.swift */; }; - 0108A66923F4D9B70075E1AF /* Textures.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0108A66823F4D9B70075E1AF /* Textures.swift */; }; - 0108A66F23F543750075E1AF /* Pathfinder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0108A66E23F543740075E1AF /* Pathfinder.swift */; }; 0128F26223EEE7AE00439050 /* shotgunFire.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 0128F26123EEE7AE00439050 /* shotgunFire.mp3 */; }; 0128F26423EEEB0A00439050 /* shotgunPickup.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 0128F26323EEEB0A00439050 /* shotgunPickup.mp3 */; }; + 0128F26523F1511000439050 /* medkit.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 013D492423ED607D00763FCA /* medkit.mp3 */; }; + 0128F26623F1511D00439050 /* shotgunPickup.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 0128F26323EEEB0A00439050 /* shotgunPickup.mp3 */; }; + 0128F26723F1512100439050 /* shotgunFire.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 0128F26123EEE7AE00439050 /* shotgunFire.mp3 */; }; 012A0C4D22C96E150068E8EF /* Tile.swift in Sources */ = {isa = PBXBuildFile; fileRef = 012A0C4C22C96E150068E8EF /* Tile.swift */; }; 012A0C4F22C96E1F0068E8EF /* Thing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 012A0C4E22C96E1F0068E8EF /* Thing.swift */; }; 012A0C6222CC200E0068E8EF /* Billboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 012A0C6022CC200D0068E8EF /* Billboard.swift */; }; @@ -23,12 +19,27 @@ 012A0C9E22D47C220068E8EF /* Actor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 012A0C9D22D47C220068E8EF /* Actor.swift */; }; 012A0CA222D7AD0A0068E8EF /* Animation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 012A0CA122D7AD0A0068E8EF /* Animation.swift */; }; 012DF10822E251CF00D52706 /* Effect.swift in Sources */ = {isa = PBXBuildFile; fileRef = 012DF10722E251CF00D52706 /* Effect.swift */; }; + 013712F523FC749F0096261D /* Renderer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 013712EE23FC749E0096261D /* Renderer.framework */; }; + 013712F623FC749F0096261D /* Renderer.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 013712EE23FC749E0096261D /* Renderer.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 013712FD23FC774F0096261D /* Bitmap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 013712FA23FC774F0096261D /* Bitmap.swift */; }; + 013712FE23FC774F0096261D /* Renderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 013712FB23FC774F0096261D /* Renderer.swift */; }; + 013712FF23FC774F0096261D /* Textures.swift in Sources */ = {isa = PBXBuildFile; fileRef = 013712FC23FC774F0096261D /* Textures.swift */; }; + 0137130523FC77A50096261D /* Pathfinder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0137130423FC77A50096261D /* Pathfinder.swift */; }; 013D492523ED607D00763FCA /* medkit.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 013D492423ED607D00763FCA /* medkit.mp3 */; }; 013D492723EE17C000763FCA /* Weapon.swift in Sources */ = {isa = PBXBuildFile; fileRef = 013D492623EE17C000763FCA /* Weapon.swift */; }; 01467C3E22E6F54600B5607D /* Easing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01467C3D22E6F54600B5607D /* Easing.swift */; }; 01557AD0245109E600FF8FF0 /* HUD.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01557ACF245109E600FF8FF0 /* HUD.swift */; }; 0159A3F523DEF636001EEB81 /* Pickup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0159A3F423DEF636001EEB81 /* Pickup.swift */; }; 015A23C9230586E3004CBB78 /* Switch.swift in Sources */ = {isa = PBXBuildFile; fileRef = 015A23C8230586E3004CBB78 /* Switch.swift */; }; + 015B5237236B4D6500879492 /* Levels.json in Resources */ = {isa = PBXBuildFile; fileRef = 01D09B0022A493A70052745A /* Levels.json */; }; + 015B5238236B4D6500879492 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 016E41B9228E9A5E00ACF137 /* Assets.xcassets */; }; + 0160390D236836E200E22F31 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0160390C236836E200E22F31 /* AppDelegate.swift */; }; + 0160390F236836E200E22F31 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0160390E236836E200E22F31 /* ViewController.swift */; }; + 01603911236836E300E22F31 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 01603910236836E300E22F31 /* Assets.xcassets */; }; + 01603914236836E300E22F31 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 01603912236836E300E22F31 /* Main.storyboard */; }; + 0160391C2368370200E22F31 /* Engine.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 016E41C9228E9A8600ACF137 /* Engine.framework */; }; + 0160391E2368377300E22F31 /* Engine.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 016E41C9228E9A8600ACF137 /* Engine.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 0160392523683C0300E22F31 /* NSImage+Bitmap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0160392423683C0200E22F31 /* NSImage+Bitmap.swift */; }; 016E41B3228E9A5B00ACF137 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 016E41B2228E9A5B00ACF137 /* AppDelegate.swift */; }; 016E41B5228E9A5B00ACF137 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 016E41B4228E9A5B00ACF137 /* ViewController.swift */; }; 016E41B8228E9A5B00ACF137 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 016E41B6228E9A5B00ACF137 /* Main.storyboard */; }; @@ -36,6 +47,20 @@ 016E41BD228E9A5E00ACF137 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 016E41BB228E9A5E00ACF137 /* LaunchScreen.storyboard */; }; 016E41D0228E9A8600ACF137 /* Engine.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 016E41C9228E9A8600ACF137 /* Engine.framework */; }; 016E41D1228E9A8600ACF137 /* Engine.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 016E41C9228E9A8600ACF137 /* Engine.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 01792F2C23E600F6006616B3 /* SoundManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0199F57323E242D4003E3F08 /* SoundManager.swift */; }; + 01792F2D23E60128006616B3 /* pistolFire.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 0199F55623E1A517003E3F08 /* pistolFire.mp3 */; }; + 01792F2E23E60128006616B3 /* monsterGroan.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 0199F55F23E1A517003E3F08 /* monsterGroan.mp3 */; }; + 01792F2F23E60128006616B3 /* monsterSwipe.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 0199F55523E1A517003E3F08 /* monsterSwipe.mp3 */; }; + 01792F3023E60128006616B3 /* monsterHit.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 0199F55A23E1A517003E3F08 /* monsterHit.mp3 */; }; + 01792F3123E60128006616B3 /* monsterDeath.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 0199F55D23E1A517003E3F08 /* monsterDeath.mp3 */; }; + 01792F3223E60128006616B3 /* ricochet.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 0199F55C23E1A517003E3F08 /* ricochet.mp3 */; }; + 01792F3323E60128006616B3 /* playerWalk.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 0199F55923E1A517003E3F08 /* playerWalk.mp3 */; }; + 01792F3423E60128006616B3 /* playerDeath.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 0199F55E23E1A517003E3F08 /* playerDeath.mp3 */; }; + 01792F3523E60128006616B3 /* squelch.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 0199F55B23E1A517003E3F08 /* squelch.mp3 */; }; + 01792F3623E60128006616B3 /* doorSlide.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 0199F55823E1A517003E3F08 /* doorSlide.mp3 */; }; + 01792F3723E60128006616B3 /* wallSlide.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 0199F55723E1A517003E3F08 /* wallSlide.mp3 */; }; + 01792F3823E60128006616B3 /* wallThud.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 0199F56123E1A517003E3F08 /* wallThud.mp3 */; }; + 01792F3923E60128006616B3 /* switchFlip.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 0199F56023E1A517003E3F08 /* switchFlip.mp3 */; }; 0199F56223E1A517003E3F08 /* monsterSwipe.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 0199F55523E1A517003E3F08 /* monsterSwipe.mp3 */; }; 0199F56323E1A517003E3F08 /* pistolFire.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 0199F55623E1A517003E3F08 /* pistolFire.mp3 */; }; 0199F56423E1A517003E3F08 /* wallSlide.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 0199F55723E1A517003E3F08 /* wallSlide.mp3 */; }; @@ -52,6 +77,7 @@ 0199F57023E1AFEA003E3F08 /* Sounds.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0199F56F23E1AFEA003E3F08 /* Sounds.swift */; }; 0199F57423E242D4003E3F08 /* SoundManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0199F57323E242D4003E3F08 /* SoundManager.swift */; }; 01ADC64022B9846B00DC8AAD /* World.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01ADC63F22B9846B00DC8AAD /* World.swift */; }; + 01D09AF122A481AB0052745A /* Color.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01D09AF022A481AB0052745A /* Color.swift */; }; 01D09AF522A482450052745A /* UIImage+Bitmap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01D09AF422A482450052745A /* UIImage+Bitmap.swift */; }; 01D09AF922A484B10052745A /* Vector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01D09AF822A484B10052745A /* Vector.swift */; }; 01D09AFB22A485040052745A /* Player.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01D09AFA22A485040052745A /* Player.swift */; }; @@ -66,19 +92,36 @@ 01D0F5F122FF095E00682CA1 /* Door.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01D0F5F022FF095E00682CA1 /* Door.swift */; }; 01DD25AA244FA74900D00FE5 /* Font.json in Resources */ = {isa = PBXBuildFile; fileRef = 01DD25A9244FA74900D00FE5 /* Font.json */; }; 01DD25AC244FA85E00D00FE5 /* Font.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01DD25AB244FA85E00D00FE5 /* Font.swift */; }; + 01DE30E624547AB50071096F /* Renderer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 013712EE23FC749E0096261D /* Renderer.framework */; }; + 01DE30E724547AE50071096F /* Renderer.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 013712EE23FC749E0096261D /* Renderer.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 01DE30E824547D0F0071096F /* Font.json in Resources */ = {isa = PBXBuildFile; fileRef = 01DD25A9244FA74900D00FE5 /* Font.json */; }; 01E3963A2342758D00D02236 /* Pushwall.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01E396392342758D00D02236 /* Pushwall.swift */; }; 01EDA5DB2444DC2C00FC1795 /* Game.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01EDA5DA2444DC2B00FC1795 /* Game.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 0108A65C23F4D84C0075E1AF /* PBXContainerItemProxy */ = { + 013712F323FC749F0096261D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 016E41A7228E9A5B00ACF137 /* Project object */; proxyType = 1; - remoteGlobalIDString = 0108A65623F4D84C0075E1AF; + remoteGlobalIDString = 013712ED23FC749E0096261D; remoteInfo = Renderer; }; - 0108A66C23F4DA5D0075E1AF /* PBXContainerItemProxy */ = { + 0137130023FC775E0096261D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 016E41A7228E9A5B00ACF137 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 013712ED23FC749E0096261D; + remoteInfo = Renderer; + }; + 0137130223FC77650096261D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 016E41A7228E9A5B00ACF137 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 016E41C8228E9A8600ACF137; + remoteInfo = Engine; + }; + 0160391A236836FC00E22F31 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 016E41A7228E9A5B00ACF137 /* Project object */; proxyType = 1; @@ -102,6 +145,18 @@ /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ + 0160391D2368375F00E22F31 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 01DE30E724547AE50071096F /* Renderer.framework in Embed Frameworks */, + 0160391E2368377300E22F31 /* Engine.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; 016E41D5228E9A8600ACF137 /* Embed Frameworks */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -109,7 +164,7 @@ dstSubfolderSpec = 10; files = ( 016E41D1228E9A8600ACF137 /* Engine.framework in Embed Frameworks */, - 0108A65F23F4D84C0075E1AF /* Renderer.framework in Embed Frameworks */, + 013712F623FC749F0096261D /* Renderer.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -117,10 +172,6 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 0108A65723F4D84C0075E1AF /* Renderer.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Renderer.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 0108A65A23F4D84C0075E1AF /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 0108A66823F4D9B70075E1AF /* Textures.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Textures.swift; sourceTree = ""; }; - 0108A66E23F543740075E1AF /* Pathfinder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Pathfinder.swift; sourceTree = ""; }; 0128F26123EEE7AE00439050 /* shotgunFire.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = shotgunFire.mp3; sourceTree = ""; }; 0128F26323EEEB0A00439050 /* shotgunPickup.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = shotgunPickup.mp3; sourceTree = ""; }; 012A0C4C22C96E150068E8EF /* Tile.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tile.swift; sourceTree = ""; }; @@ -130,12 +181,26 @@ 012A0C9D22D47C220068E8EF /* Actor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Actor.swift; sourceTree = ""; }; 012A0CA122D7AD0A0068E8EF /* Animation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Animation.swift; sourceTree = ""; }; 012DF10722E251CF00D52706 /* Effect.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Effect.swift; sourceTree = ""; }; + 013712EE23FC749E0096261D /* Renderer.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Renderer.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 013712F123FC749F0096261D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 013712FA23FC774F0096261D /* Bitmap.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Bitmap.swift; sourceTree = ""; }; + 013712FB23FC774F0096261D /* Renderer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Renderer.swift; sourceTree = ""; }; + 013712FC23FC774F0096261D /* Textures.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Textures.swift; sourceTree = ""; }; + 0137130423FC77A50096261D /* Pathfinder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Pathfinder.swift; sourceTree = ""; }; 013D492423ED607D00763FCA /* medkit.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = medkit.mp3; sourceTree = ""; }; 013D492623EE17C000763FCA /* Weapon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Weapon.swift; sourceTree = ""; }; 01467C3D22E6F54600B5607D /* Easing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Easing.swift; sourceTree = ""; }; 01557ACF245109E600FF8FF0 /* HUD.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HUD.swift; sourceTree = ""; }; 0159A3F423DEF636001EEB81 /* Pickup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Pickup.swift; sourceTree = ""; }; 015A23C8230586E3004CBB78 /* Switch.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Switch.swift; sourceTree = ""; }; + 0160390A236836E200E22F31 /* RampageMac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RampageMac.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 0160390C236836E200E22F31 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 0160390E236836E200E22F31 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; + 01603910236836E300E22F31 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 01603913236836E300E22F31 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 01603915236836E300E22F31 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 01603916236836E300E22F31 /* RampageMac.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = RampageMac.entitlements; sourceTree = ""; }; + 0160392423683C0200E22F31 /* NSImage+Bitmap.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSImage+Bitmap.swift"; sourceTree = ""; }; 016E41AF228E9A5B00ACF137 /* Rampage.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Rampage.app; sourceTree = BUILT_PRODUCTS_DIR; }; 016E41B2228E9A5B00ACF137 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 016E41B4228E9A5B00ACF137 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; @@ -160,10 +225,8 @@ 0199F56123E1A517003E3F08 /* wallThud.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = wallThud.mp3; sourceTree = ""; }; 0199F56F23E1AFEA003E3F08 /* Sounds.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Sounds.swift; sourceTree = ""; }; 0199F57323E242D4003E3F08 /* SoundManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SoundManager.swift; sourceTree = ""; }; - 01ADC63B22B957FD00DC8AAD /* Renderer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Renderer.swift; sourceTree = ""; }; 01ADC63F22B9846B00DC8AAD /* World.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = World.swift; sourceTree = ""; }; 01D09AF022A481AB0052745A /* Color.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Color.swift; sourceTree = ""; }; - 01D09AF222A482030052745A /* Bitmap.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Bitmap.swift; sourceTree = ""; }; 01D09AF422A482450052745A /* UIImage+Bitmap.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIImage+Bitmap.swift"; sourceTree = ""; }; 01D09AF822A484B10052745A /* Vector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Vector.swift; sourceTree = ""; }; 01D09AFA22A485040052745A /* Player.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Player.swift; sourceTree = ""; }; @@ -185,19 +248,28 @@ /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 0108A65423F4D84C0075E1AF /* Frameworks */ = { + 013712EB23FC749E0096261D /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( ); runOnlyForDeploymentPostprocessing = 0; }; + 01603907236836E200E22F31 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 01DE30E624547AB50071096F /* Renderer.framework in Frameworks */, + 0160391C2368370200E22F31 /* Engine.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 016E41AC228E9A5B00ACF137 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( 016E41D0228E9A8600ACF137 /* Engine.framework in Frameworks */, - 0108A65E23F4D84C0075E1AF /* Renderer.framework in Frameworks */, + 013712F523FC749F0096261D /* Renderer.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -218,35 +290,52 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 0108A65823F4D84C0075E1AF /* Renderer */ = { + 013712EF23FC749E0096261D /* Renderer */ = { isa = PBXGroup; children = ( - 01D09AF222A482030052745A /* Bitmap.swift */, - 01ADC63B22B957FD00DC8AAD /* Renderer.swift */, - 0108A66823F4D9B70075E1AF /* Textures.swift */, - 0108A65A23F4D84C0075E1AF /* Info.plist */, + 013712FA23FC774F0096261D /* Bitmap.swift */, + 013712FB23FC774F0096261D /* Renderer.swift */, + 013712FC23FC774F0096261D /* Textures.swift */, + 013712F123FC749F0096261D /* Info.plist */, ); path = Renderer; sourceTree = ""; }; - 0108A66A23F4DA580075E1AF /* Frameworks */ = { + 016039042368365A00E22F31 /* Frameworks */ = { isa = PBXGroup; children = ( ); name = Frameworks; sourceTree = ""; }; + 0160390B236836E200E22F31 /* RampageMac */ = { + isa = PBXGroup; + children = ( + 0160390C236836E200E22F31 /* AppDelegate.swift */, + 0160390E236836E200E22F31 /* ViewController.swift */, + 0160392423683C0200E22F31 /* NSImage+Bitmap.swift */, + 01603910236836E300E22F31 /* Assets.xcassets */, + 01603912236836E300E22F31 /* Main.storyboard */, + 01603915236836E300E22F31 /* Info.plist */, + 01603916236836E300E22F31 /* RampageMac.entitlements */, + ); + path = RampageMac; + sourceTree = ""; + }; 016E41A6228E9A5B00ACF137 = { isa = PBXGroup; children = ( 016E41B1228E9A5B00ACF137 /* Rampage */, + 0160390B236836E200E22F31 /* RampageMac */, 016E41CA228E9A8600ACF137 /* Engine */, - 0108A65823F4D84C0075E1AF /* Renderer */, + 013712EF23FC749E0096261D /* Renderer */, 01D0F5D722F80E1600682CA1 /* RampageTests */, 016E41B0228E9A5B00ACF137 /* Products */, - 0108A66A23F4DA580075E1AF /* Frameworks */, + 016039042368365A00E22F31 /* Frameworks */, ); + indentWidth = 4; sourceTree = ""; + tabWidth = 4; }; 016E41B0228E9A5B00ACF137 /* Products */ = { isa = PBXGroup; @@ -254,7 +343,8 @@ 016E41AF228E9A5B00ACF137 /* Rampage.app */, 016E41C9228E9A8600ACF137 /* Engine.framework */, 01D0F5D622F80E1600682CA1 /* RampageTests.xctest */, - 0108A65723F4D84C0075E1AF /* Renderer.framework */, + 0160390A236836E200E22F31 /* RampageMac.app */, + 013712EE23FC749E0096261D /* Renderer.framework */, ); name = Products; sourceTree = ""; @@ -292,7 +382,7 @@ 01557ACF245109E600FF8FF0 /* HUD.swift */, 01D09B0222A4958E0052745A /* Input.swift */, 012A0C6122CC200D0068E8EF /* Monster.swift */, - 0108A66E23F543740075E1AF /* Pathfinder.swift */, + 0137130423FC77A50096261D /* Pathfinder.swift */, 0159A3F423DEF636001EEB81 /* Pickup.swift */, 01D09AFA22A485040052745A /* Player.swift */, 01E396392342758D00D02236 /* Pushwall.swift */, @@ -300,8 +390,8 @@ 01D09AFC22A4873B0052745A /* Rect.swift */, 01D09B0622A6E09A0052745A /* Rotation.swift */, 015A23C8230586E3004CBB78 /* Switch.swift */, - 0199F56F23E1AFEA003E3F08 /* Sounds.swift */, 01D09B0A22A7F7570052745A /* Texture.swift */, + 0199F56F23E1AFEA003E3F08 /* Sounds.swift */, 012A0C4C22C96E150068E8EF /* Tile.swift */, 01D09AFE22A48E990052745A /* Tilemap.swift */, 012A0C4E22C96E1F0068E8EF /* Thing.swift */, @@ -348,7 +438,7 @@ /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ - 0108A65223F4D84C0075E1AF /* Headers */ = { + 013712E923FC749E0096261D /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( @@ -365,25 +455,45 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 0108A65623F4D84C0075E1AF /* Renderer */ = { + 013712ED23FC749E0096261D /* Renderer */ = { isa = PBXNativeTarget; - buildConfigurationList = 0108A66223F4D84C0075E1AF /* Build configuration list for PBXNativeTarget "Renderer" */; + buildConfigurationList = 013712F923FC749F0096261D /* Build configuration list for PBXNativeTarget "Renderer" */; buildPhases = ( - 0108A65223F4D84C0075E1AF /* Headers */, - 0108A65323F4D84C0075E1AF /* Sources */, - 0108A65423F4D84C0075E1AF /* Frameworks */, - 0108A65523F4D84C0075E1AF /* Resources */, + 013712E923FC749E0096261D /* Headers */, + 013712EA23FC749E0096261D /* Sources */, + 013712EB23FC749E0096261D /* Frameworks */, + 013712EC23FC749E0096261D /* Resources */, ); buildRules = ( ); dependencies = ( - 0108A66D23F4DA5D0075E1AF /* PBXTargetDependency */, + 0137130323FC77650096261D /* PBXTargetDependency */, ); name = Renderer; productName = Renderer; - productReference = 0108A65723F4D84C0075E1AF /* Renderer.framework */; + productReference = 013712EE23FC749E0096261D /* Renderer.framework */; productType = "com.apple.product-type.framework"; }; + 01603909236836E200E22F31 /* RampageMac */ = { + isa = PBXNativeTarget; + buildConfigurationList = 01603917236836E300E22F31 /* Build configuration list for PBXNativeTarget "RampageMac" */; + buildPhases = ( + 01603906236836E200E22F31 /* Sources */, + 01603907236836E200E22F31 /* Frameworks */, + 01603908236836E200E22F31 /* Resources */, + 0160391D2368375F00E22F31 /* Embed Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 0137130123FC775E0096261D /* PBXTargetDependency */, + 0160391B236836FC00E22F31 /* PBXTargetDependency */, + ); + name = RampageMac; + productName = RampageMac; + productReference = 0160390A236836E200E22F31 /* RampageMac.app */; + productType = "com.apple.product-type.application"; + }; 016E41AE228E9A5B00ACF137 /* Rampage */ = { isa = PBXNativeTarget; buildConfigurationList = 016E41C1228E9A5E00ACF137 /* Build configuration list for PBXNativeTarget "Rampage" */; @@ -397,7 +507,7 @@ ); dependencies = ( 016E41CF228E9A8600ACF137 /* PBXTargetDependency */, - 0108A65D23F4D84C0075E1AF /* PBXTargetDependency */, + 013712F423FC749F0096261D /* PBXTargetDependency */, ); name = Rampage; productName = Rampage; @@ -448,10 +558,10 @@ attributes = { DefaultBuildSystemTypeForWorkspace = Original; LastSwiftUpdateCheck = 1010; - LastUpgradeCheck = 1130; + LastUpgradeCheck = 1140; ORGANIZATIONNAME = "Nick Lockwood"; TargetAttributes = { - 0108A65623F4D84C0075E1AF = { + 013712ED23FC749E0096261D = { CreatedOnToolsVersion = 11.3.1; LastSwiftMigration = 1130; }; @@ -484,21 +594,50 @@ projectRoot = ""; targets = ( 016E41AE228E9A5B00ACF137 /* Rampage */, + 01603909236836E200E22F31 /* RampageMac */, 016E41C8228E9A8600ACF137 /* Engine */, - 0108A65623F4D84C0075E1AF /* Renderer */, + 013712ED23FC749E0096261D /* Renderer */, 01D0F5D522F80E1600682CA1 /* RampageTests */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 0108A65523F4D84C0075E1AF /* Resources */ = { + 013712EC23FC749E0096261D /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( ); runOnlyForDeploymentPostprocessing = 0; }; + 01603908236836E200E22F31 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 01792F2F23E60128006616B3 /* monsterSwipe.mp3 in Resources */, + 01DE30E824547D0F0071096F /* Font.json in Resources */, + 01792F3223E60128006616B3 /* ricochet.mp3 in Resources */, + 01792F3623E60128006616B3 /* doorSlide.mp3 in Resources */, + 01792F3123E60128006616B3 /* monsterDeath.mp3 in Resources */, + 01792F3023E60128006616B3 /* monsterHit.mp3 in Resources */, + 01792F3523E60128006616B3 /* squelch.mp3 in Resources */, + 01792F2D23E60128006616B3 /* pistolFire.mp3 in Resources */, + 0128F26723F1512100439050 /* shotgunFire.mp3 in Resources */, + 01792F3723E60128006616B3 /* wallSlide.mp3 in Resources */, + 01792F2E23E60128006616B3 /* monsterGroan.mp3 in Resources */, + 01792F3323E60128006616B3 /* playerWalk.mp3 in Resources */, + 015B5237236B4D6500879492 /* Levels.json in Resources */, + 01792F3423E60128006616B3 /* playerDeath.mp3 in Resources */, + 01603911236836E300E22F31 /* Assets.xcassets in Resources */, + 015B5238236B4D6500879492 /* Assets.xcassets in Resources */, + 0128F26523F1511000439050 /* medkit.mp3 in Resources */, + 01603914236836E300E22F31 /* Main.storyboard in Resources */, + 0128F26623F1511D00439050 /* shotgunPickup.mp3 in Resources */, + 01792F3923E60128006616B3 /* switchFlip.mp3 in Resources */, + 01792F3823E60128006616B3 /* wallThud.mp3 in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 016E41AD228E9A5B00ACF137 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -544,13 +683,24 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 0108A65323F4D84C0075E1AF /* Sources */ = { + 013712EA23FC749E0096261D /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 0108A66323F4D8E80075E1AF /* Bitmap.swift in Sources */, - 0108A66923F4D9B70075E1AF /* Textures.swift in Sources */, - 0108A66523F4D8F00075E1AF /* Renderer.swift in Sources */, + 013712FE23FC774F0096261D /* Renderer.swift in Sources */, + 013712FD23FC774F0096261D /* Bitmap.swift in Sources */, + 013712FF23FC774F0096261D /* Textures.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 01603906236836E200E22F31 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 0160392523683C0300E22F31 /* NSImage+Bitmap.swift in Sources */, + 01792F2C23E600F6006616B3 /* SoundManager.swift in Sources */, + 0160390F236836E200E22F31 /* ViewController.swift in Sources */, + 0160390D236836E200E22F31 /* AppDelegate.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -588,12 +738,12 @@ 012A0C6222CC200E0068E8EF /* Billboard.swift in Sources */, 013D492723EE17C000763FCA /* Weapon.swift in Sources */, 01ADC64022B9846B00DC8AAD /* World.swift in Sources */, - 0108A66723F4D9370075E1AF /* Color.swift in Sources */, 012A0C4D22C96E150068E8EF /* Tile.swift in Sources */, 01D0F5F122FF095E00682CA1 /* Door.swift in Sources */, - 0108A66F23F543750075E1AF /* Pathfinder.swift in Sources */, 01D09B0322A4958E0052745A /* Input.swift in Sources */, 01DD25AC244FA85E00D00FE5 /* Font.swift in Sources */, + 0137130523FC77A50096261D /* Pathfinder.swift in Sources */, + 01D09AF122A481AB0052745A /* Color.swift in Sources */, 012A0CA222D7AD0A0068E8EF /* Animation.swift in Sources */, 01D09B0522A5C9DB0052745A /* Ray.swift in Sources */, 01E3963A2342758D00D02236 /* Pushwall.swift in Sources */, @@ -611,15 +761,25 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 0108A65D23F4D84C0075E1AF /* PBXTargetDependency */ = { + 013712F423FC749F0096261D /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 013712ED23FC749E0096261D /* Renderer */; + targetProxy = 013712F323FC749F0096261D /* PBXContainerItemProxy */; + }; + 0137130123FC775E0096261D /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 0108A65623F4D84C0075E1AF /* Renderer */; - targetProxy = 0108A65C23F4D84C0075E1AF /* PBXContainerItemProxy */; + target = 013712ED23FC749E0096261D /* Renderer */; + targetProxy = 0137130023FC775E0096261D /* PBXContainerItemProxy */; }; - 0108A66D23F4DA5D0075E1AF /* PBXTargetDependency */ = { + 0137130323FC77650096261D /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 016E41C8228E9A8600ACF137 /* Engine */; - targetProxy = 0108A66C23F4DA5D0075E1AF /* PBXContainerItemProxy */; + targetProxy = 0137130223FC77650096261D /* PBXContainerItemProxy */; + }; + 0160391B236836FC00E22F31 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 016E41C8228E9A8600ACF137 /* Engine */; + targetProxy = 0160391A236836FC00E22F31 /* PBXContainerItemProxy */; }; 016E41CF228E9A8600ACF137 /* PBXTargetDependency */ = { isa = PBXTargetDependency; @@ -634,6 +794,14 @@ /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ + 01603912236836E300E22F31 /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 01603913236836E300E22F31 /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; 016E41B6228E9A5B00ACF137 /* Main.storyboard */ = { isa = PBXVariantGroup; children = ( @@ -653,13 +821,15 @@ /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ - 0108A66023F4D84C0075E1AF /* Debug */ = { + 013712F723FC749F0096261D /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_STYLE = Automatic; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = 8VQKF583ED; + DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -670,25 +840,32 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + MACOSX_DEPLOYMENT_TARGET = 10.12; PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.Renderer; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SDKROOT = ""; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx"; SWIFT_DISABLE_SAFETY_CHECKS = YES; SWIFT_OPTIMIZATION_LEVEL = "-O"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; + TVOS_DEPLOYMENT_TARGET = 12.1; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Debug; }; - 0108A66123F4D84C0075E1AF /* Release */ = { + 013712F823FC749F0096261D /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_STYLE = Automatic; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = 8VQKF583ED; + DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -699,17 +876,70 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + MACOSX_DEPLOYMENT_TARGET = 10.12; PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.Renderer; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SDKROOT = ""; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx"; SWIFT_DISABLE_SAFETY_CHECKS = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; + TVOS_DEPLOYMENT_TARGET = 12.1; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Release; }; + 01603918236836E300E22F31 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_ENTITLEMENTS = RampageMac/RampageMac.entitlements; + CODE_SIGN_IDENTITY = "-"; + CODE_SIGN_STYLE = Manual; + COMBINE_HIDPI_IMAGES = YES; + DEVELOPMENT_TEAM = ""; + ENABLE_HARDENED_RUNTIME = YES; + INFOPLIST_FILE = RampageMac/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + MACOSX_DEPLOYMENT_TARGET = 10.14; + PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.RampageMac; + PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SDKROOT = macosx; + SWIFT_VERSION = 4.2; + }; + name = Debug; + }; + 01603919236836E300E22F31 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_ENTITLEMENTS = RampageMac/RampageMac.entitlements; + CODE_SIGN_IDENTITY = "-"; + CODE_SIGN_STYLE = Manual; + COMBINE_HIDPI_IMAGES = YES; + DEVELOPMENT_TEAM = ""; + ENABLE_HARDENED_RUNTIME = YES; + INFOPLIST_FILE = RampageMac/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + MACOSX_DEPLOYMENT_TARGET = 10.14; + PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.RampageMac; + PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SDKROOT = macosx; + SWIFT_VERSION = 4.2; + }; + name = Release; + }; 016E41BF228E9A5E00ACF137 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -762,6 +992,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 11.0; + MACOSX_DEPLOYMENT_TARGET = 10.13; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -817,6 +1048,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 11.0; + MACOSX_DEPLOYMENT_TARGET = 10.13; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; @@ -831,8 +1063,8 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = 8VQKF583ED; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = Rampage/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -840,6 +1072,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.Rampage; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -850,8 +1083,8 @@ buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = 8VQKF583ED; + CODE_SIGN_STYLE = Manual; + DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = Rampage/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -859,6 +1092,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.Rampage; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -868,11 +1102,12 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = ""; - CODE_SIGN_STYLE = Automatic; + CLANG_LINK_OBJC_RUNTIME = NO; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = 8VQKF583ED; + DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -883,13 +1118,19 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + MACOSX_DEPLOYMENT_TARGET = 10.12; PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.Engine; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SDKROOT = ""; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "iphoneos macosx iphonesimulator"; SWIFT_DISABLE_SAFETY_CHECKS = NO; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; + TVOS_DEPLOYMENT_TARGET = 12.1; + "VALID_ARCHS[sdk=*]" = "i386 x86_64"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -899,11 +1140,12 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_MODULES = YES; - CODE_SIGN_IDENTITY = ""; - CODE_SIGN_STYLE = Automatic; + CLANG_LINK_OBJC_RUNTIME = NO; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = 8VQKF583ED; + DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -915,12 +1157,17 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); + MACOSX_DEPLOYMENT_TARGET = 10.12; PRODUCT_BUNDLE_IDENTIFIER = com.charcoaldesign.Engine; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SDKROOT = ""; SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "iphoneos macosx iphonesimulator"; SWIFT_DISABLE_SAFETY_CHECKS = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; + TVOS_DEPLOYMENT_TARGET = 12.1; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -969,11 +1216,20 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 0108A66223F4D84C0075E1AF /* Build configuration list for PBXNativeTarget "Renderer" */ = { + 013712F923FC749F0096261D /* Build configuration list for PBXNativeTarget "Renderer" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 013712F723FC749F0096261D /* Debug */, + 013712F823FC749F0096261D /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 01603917236836E300E22F31 /* Build configuration list for PBXNativeTarget "RampageMac" */ = { isa = XCConfigurationList; buildConfigurations = ( - 0108A66023F4D84C0075E1AF /* Debug */, - 0108A66123F4D84C0075E1AF /* Release */, + 01603918236836E300E22F31 /* Debug */, + 01603919236836E300E22F31 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/Source/Rampage.xcodeproj/xcshareddata/xcschemes/Engine.xcscheme b/Source/Rampage.xcodeproj/xcshareddata/xcschemes/Engine.xcscheme index 8fdc9d0..6c8fd93 100644 --- a/Source/Rampage.xcodeproj/xcshareddata/xcschemes/Engine.xcscheme +++ b/Source/Rampage.xcodeproj/xcshareddata/xcschemes/Engine.xcscheme @@ -1,6 +1,6 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/Rampage.xcodeproj/xcshareddata/xcschemes/Renderer.xcscheme b/Source/Rampage.xcodeproj/xcshareddata/xcschemes/Renderer.xcscheme new file mode 100644 index 0000000..13e5cbe --- /dev/null +++ b/Source/Rampage.xcodeproj/xcshareddata/xcschemes/Renderer.xcscheme @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/Rampage/SoundManager.swift b/Source/Rampage/SoundManager.swift index d2b7175..a52a98a 100644 --- a/Source/Rampage/SoundManager.swift +++ b/Source/Rampage/SoundManager.swift @@ -23,7 +23,9 @@ public class SoundManager: NSObject, AVAudioPlayerDelegate { public extension SoundManager { func activate() throws { + #if os(iOS) try AVAudioSession.sharedInstance().setActive(true) + #endif } func preload(_ url: URL, channel: Int? = nil) throws -> AVAudioPlayer { diff --git a/Source/RampageMac/AppDelegate.swift b/Source/RampageMac/AppDelegate.swift new file mode 100644 index 0000000..e1a0787 --- /dev/null +++ b/Source/RampageMac/AppDelegate.swift @@ -0,0 +1,26 @@ +// +// AppDelegate.swift +// RampageMac +// +// Created by Nick Lockwood on 29/10/2019. +// Copyright © 2019 Nick Lockwood. All rights reserved. +// + +import Cocoa + +@NSApplicationMain +class AppDelegate: NSObject, NSApplicationDelegate { + + + + func applicationDidFinishLaunching(_ aNotification: Notification) { + // Insert code here to initialize your application + } + + func applicationWillTerminate(_ aNotification: Notification) { + // Insert code here to tear down your application + } + + +} + diff --git a/Source/RampageMac/Assets.xcassets/AppIcon.appiconset/Contents.json b/Source/RampageMac/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..2db2b1c --- /dev/null +++ b/Source/RampageMac/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,58 @@ +{ + "images" : [ + { + "idiom" : "mac", + "size" : "16x16", + "scale" : "1x" + }, + { + "idiom" : "mac", + "size" : "16x16", + "scale" : "2x" + }, + { + "idiom" : "mac", + "size" : "32x32", + "scale" : "1x" + }, + { + "idiom" : "mac", + "size" : "32x32", + "scale" : "2x" + }, + { + "idiom" : "mac", + "size" : "128x128", + "scale" : "1x" + }, + { + "idiom" : "mac", + "size" : "128x128", + "scale" : "2x" + }, + { + "idiom" : "mac", + "size" : "256x256", + "scale" : "1x" + }, + { + "idiom" : "mac", + "size" : "256x256", + "scale" : "2x" + }, + { + "idiom" : "mac", + "size" : "512x512", + "scale" : "1x" + }, + { + "idiom" : "mac", + "size" : "512x512", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Source/RampageMac/Assets.xcassets/Contents.json b/Source/RampageMac/Assets.xcassets/Contents.json new file mode 100644 index 0000000..da4a164 --- /dev/null +++ b/Source/RampageMac/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Source/RampageMac/Base.lproj/Main.storyboard b/Source/RampageMac/Base.lproj/Main.storyboard new file mode 100644 index 0000000..f09dea1 --- /dev/null +++ b/Source/RampageMac/Base.lproj/Main.storyboard @@ -0,0 +1,720 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Default + + + + + + + Left to Right + + + + + + + Right to Left + + + + + + + + + + + Default + + + + + + + Left to Right + + + + + + + Right to Left + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Source/RampageMac/Info.plist b/Source/RampageMac/Info.plist new file mode 100644 index 0000000..25275d6 --- /dev/null +++ b/Source/RampageMac/Info.plist @@ -0,0 +1,38 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIconFile + + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + $(PRODUCT_BUNDLE_PACKAGE_TYPE) + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + LSApplicationCategoryType + public.app-category.action-games + LSMinimumSystemVersion + $(MACOSX_DEPLOYMENT_TARGET) + NSHumanReadableCopyright + Copyright © 2019 Nick Lockwood. All rights reserved. + NSMainStoryboardFile + Main + NSPrincipalClass + NSApplication + NSSupportsAutomaticTermination + + NSSupportsSuddenTermination + + + diff --git a/Source/RampageMac/NSImage+Bitmap.swift b/Source/RampageMac/NSImage+Bitmap.swift new file mode 100644 index 0000000..43aecde --- /dev/null +++ b/Source/RampageMac/NSImage+Bitmap.swift @@ -0,0 +1,91 @@ +// +// NSImage+Bitmap.swift +// RampageMac +// +// Created by Nick Lockwood on 29/10/2019. +// Copyright © 2019 Nick Lockwood. All rights reserved. +// + +import Cocoa +import Engine +import Renderer + +extension NSImage { + convenience init?(bitmap: Bitmap) { + let alphaInfo = CGImageAlphaInfo.premultipliedLast + let bytesPerPixel = MemoryLayout.size + let bytesPerRow = bitmap.height * bytesPerPixel + + guard let providerRef = CGDataProvider(data: Data( + bytes: bitmap.pixels, count: bitmap.width * bytesPerRow + ) as CFData) else { + return nil + } + + guard let cgImage = CGImage( + width: bitmap.height, + height: bitmap.width, + bitsPerComponent: 8, + bitsPerPixel: bytesPerPixel * 8, + bytesPerRow: bytesPerRow, + space: CGColorSpaceCreateDeviceRGB(), + bitmapInfo: CGBitmapInfo(rawValue: alphaInfo.rawValue), + provider: providerRef, + decode: nil, + shouldInterpolate: true, + intent: .defaultIntent + ) else { + return nil + } + + let rotatedSize = NSSize(width: bitmap.height, height: bitmap.width) + let rotatedImage = NSImage(cgImage: cgImage, size: rotatedSize) + let transform = NSAffineTransform() + transform.rotate(byDegrees: 90) + transform.scaleX(by: -1, yBy: 1) + transform.translateX(by: -rotatedSize.width, yBy: -rotatedSize.height) + self.init(size: NSSize(width: bitmap.width, height: bitmap.height)) + self.lockFocus() + transform.concat() + rotatedImage.draw(in: NSRect(origin: .zero, size: rotatedSize)) + self.unlockFocus() + } +} + +extension Bitmap { + init?(image: NSImage) { + var rect = NSRect( + x: 0, + y: 0, + width: Int(image.size.width), + height: Int(image.size.height) + ) + guard let cgImage = image.cgImage(forProposedRect: &rect, context: nil, hints: nil) else { + return nil + } + + let alphaInfo = CGImageAlphaInfo.premultipliedLast + let bytesPerPixel = MemoryLayout.size + let bytesPerRow = cgImage.height * bytesPerPixel + + var pixels = [Color](repeating: .clear, count: cgImage.width * cgImage.height) + guard let context = CGContext( + data: &pixels, + width: cgImage.height, + height: cgImage.width, + bitsPerComponent: 8, + bytesPerRow: bytesPerRow, + space: CGColorSpaceCreateDeviceRGB(), + bitmapInfo: alphaInfo.rawValue + ) else { + return nil + } + + context.translateBy(x: rect.size.height, y: rect.size.width) + context.rotate(by: .pi/2) + context.scaleBy(x: -1, y: 1) + context.draw(cgImage, in: NSRectToCGRect(rect)) + self.init(height: cgImage.height, pixels: pixels) + } +} + diff --git a/Source/RampageMac/RampageMac.entitlements b/Source/RampageMac/RampageMac.entitlements new file mode 100644 index 0000000..782cf2d --- /dev/null +++ b/Source/RampageMac/RampageMac.entitlements @@ -0,0 +1,12 @@ + + + + + com.apple.security.app-sandbox + + com.apple.security.cs.disable-library-validation + + com.apple.security.files.user-selected.read-only + + + diff --git a/Source/RampageMac/ViewController.swift b/Source/RampageMac/ViewController.swift new file mode 100644 index 0000000..dfdf297 --- /dev/null +++ b/Source/RampageMac/ViewController.swift @@ -0,0 +1,209 @@ +// +// ViewController.swift +// RampageMac +// +// Created by Nick Lockwood on 29/10/2019. +// Copyright © 2019 Nick Lockwood. All rights reserved. +// + +import Cocoa +import Engine +import Renderer + +private let joystickRadius: Double = 40 +private let maximumTimeStep: Double = 1 / 20 +private let worldTimeStep: Double = 1 / 120 + +public func loadLevels() -> [Tilemap] { + let jsonURL = Bundle.main.url(forResource: "Levels", withExtension: "json")! + let jsonData = try! Data(contentsOf: jsonURL) + let levels = try! JSONDecoder().decode([MapData].self, from: jsonData) + return levels.enumerated().map { Tilemap($0.element, index: $0.offset) } +} + +public func loadFont() -> Font { + let jsonURL = Bundle.main.url(forResource: "Font", withExtension: "json")! + let jsonData = try! Data(contentsOf: jsonURL) + return try! JSONDecoder().decode(Font.self, from: jsonData) +} + +public func loadTextures() -> Textures { + return Textures(loader: { name in + Bitmap(image: NSImage(named: name)!)! + }) +} + +public extension SoundName { + var url: URL? { + return Bundle.main.url(forResource: rawValue, withExtension: "mp3") + } +} + +func setUpAudio() { + for name in SoundName.allCases { + precondition(name.url != nil, "Missing mp3 file for \(name.rawValue)") + } + try? SoundManager.shared.activate() + _ = try? SoundManager.shared.preload(SoundName.allCases[0].url!) +} + +enum Key: UInt16 { + case space = 49 // fire + case leftArrow = 123 // turn left + case rightArrow = 124 // turn right + case downArrow = 125 // backwards + case upArrow = 126 // forwards + + // Not used + case `return` = 36 + case tab = 48 + case backspace = 51 + case rightCommand = 54 + case leftCommand = 55 + case leftShift = 56 + case capsLock = 57 + case leftOption = 58 + case control = 59 + case rightShift = 60 + case rightOption = 61 + case fn = 63 +} + +class ViewController: NSViewController { + private let imageView = NSImageView() + + private let textures = loadTextures() + private var game = Game(levels: loadLevels(), font: loadFont()) + private var lastFrameTime = CACurrentMediaTime() + private var lastFiredTime = 0.0 + private var keysDown = Set() + + override func viewDidLoad() { + super.viewDidLoad() + + setUpAudio() + setUpImageView() + + let timer = Timer(timeInterval: 1/60.0, repeats: true, block: update) + RunLoop.main.add(timer, forMode: .common) + + NSEvent.addLocalMonitorForEvents(matching: .flagsChanged) { [weak self] event in + guard let self = self, let key = Key(rawValue: event.keyCode) else { + // Unrecognized modifier key + print(event.keyCode) + return event + } + if self.keysDown.contains(key) { + self.keysDown.remove(key) + } else { + self.keysDown.insert(key) + } + return nil + } + NSEvent.addLocalMonitorForEvents(matching: .keyDown) { [weak self] event in + guard let key = Key(rawValue: event.keyCode) else { + // Unrecognized key + print(event.keyCode) + return event + } + self?.keysDown.insert(key) + return nil + } + NSEvent.addLocalMonitorForEvents(matching: .keyUp) { [weak self] event in + if let key = Key(rawValue: event.keyCode) { + self?.keysDown.remove(key) + } + return event + } + + game.delegate = self + game.titleText = "PRESS SPACE TO START" + } + + override func viewDidLayout() { + super.viewDidLayout() + update(nil) + } + + private var inputVector: Vector { + var vector = Vector(x: 0, y: 0) + if keysDown.contains(.upArrow) { + vector.y -= 1 + } + if keysDown.contains(.downArrow) { + vector.y += 1 + } + if keysDown.contains(.leftArrow) { + vector.x -= 1 + } + if keysDown.contains(.rightArrow) { + vector.x += 1 + } + return vector + } + + var isFiring: Bool { + return keysDown.contains(.space) + } + + func update(_ timer: Timer?) { + let timestamp = CACurrentMediaTime() + let timeStep = min(maximumTimeStep, timestamp - lastFrameTime) + let inputVector = self.inputVector + let rotation = inputVector.x * game.world.player.turningSpeed * worldTimeStep + var input = Input( + speed: -inputVector.y, + rotation: Rotation(sine: sin(rotation), cosine: cos(rotation)), + isFiring: self.isFiring + ) + lastFrameTime = timestamp + lastFiredTime = min(lastFiredTime, lastFrameTime) + + let worldSteps = (timeStep / worldTimeStep).rounded(.up) + for _ in 0 ..< Int(worldSteps) { + game.update(timeStep: timeStep / worldSteps, input: input) + input.isFiring = false + } + + let aspect = Double(view.bounds.width / view.bounds.height) + let height = min(Int(view.bounds.height), 480), width = Int(Double(height) * aspect) + var renderer = Renderer(width: width, height: height, textures: textures) + renderer.draw(game) + + imageView.image = NSImage(bitmap: renderer.bitmap) + } + + func setUpImageView() { + view.addSubview(imageView) + imageView.translatesAutoresizingMaskIntoConstraints = false + imageView.topAnchor.constraint(equalTo: view.topAnchor).isActive = true + imageView.leftAnchor.constraint(equalTo: view.leftAnchor).isActive = true + imageView.widthAnchor.constraint(greaterThanOrEqualTo: view.widthAnchor).isActive = true + imageView.heightAnchor.constraint(greaterThanOrEqualTo: view.heightAnchor).isActive = true + imageView.imageScaling = .scaleProportionallyUpOrDown + imageView.imageAlignment = .alignTopLeft + } +} + +extension ViewController: GameDelegate { + func playSound(_ sound: Sound) { + DispatchQueue.main.asyncAfter(deadline: .now() + sound.delay) { + guard let url = sound.name?.url else { + if let channel = sound.channel { + SoundManager.shared.clearChannel(channel) + } + return + } + try? SoundManager.shared.play( + url, + channel: sound.channel, + volume: sound.volume, + pan: sound.pan + ) + } + } + + func clearSounds() { + SoundManager.shared.clearAll() + } +}