summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt1
-rw-r--r--macOS/Ether.xcodeproj/project.pbxproj523
-rw-r--r--macOS/Ether.xcodeproj/project.xcworkspace/contents.xcworkspacedata7
-rw-r--r--macOS/Ether.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist8
-rw-r--r--macOS/Ether.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings5
-rw-r--r--macOS/Ether.xcodeproj/project.xcworkspace/xcuserdata/hatkirby.xcuserdatad/UserInterfaceState.xcuserstatebin0 -> 45018 bytes
-rw-r--r--macOS/Ether.xcodeproj/project.xcworkspace/xcuserdata/hatkirby.xcuserdatad/WorkspaceSettings.xcsettings18
-rw-r--r--macOS/Ether.xcodeproj/xcuserdata/hatkirby.xcuserdatad/xcschemes/xcschememanagement.plist14
-rw-r--r--macOS/Ether/Assets.xcassets/AppIcon.appiconset/Contents.json65
-rw-r--r--macOS/Ether/Assets.xcassets/AppIcon.appiconset/icon.pngbin0 -> 504 bytes
-rw-r--r--macOS/Ether/Assets.xcassets/AppIcon.appiconset/icon128.pngbin0 -> 1680 bytes
-rw-r--r--macOS/Ether/Assets.xcassets/AppIcon.appiconset/icon256-1.pngbin0 -> 2625 bytes
-rw-r--r--macOS/Ether/Assets.xcassets/AppIcon.appiconset/icon256.pngbin0 -> 2625 bytes
-rw-r--r--macOS/Ether/Assets.xcassets/AppIcon.appiconset/icon32-1.pngbin0 -> 735 bytes
-rw-r--r--macOS/Ether/Assets.xcassets/AppIcon.appiconset/icon32.pngbin0 -> 735 bytes
-rw-r--r--macOS/Ether/Assets.xcassets/AppIcon.appiconset/icon64.pngbin0 -> 1084 bytes
-rw-r--r--macOS/Ether/Assets.xcassets/Contents.json6
-rw-r--r--macOS/Ether/Ether.entitlements10
-rw-r--r--macOS/Ether/Info.plist30
l---------res/Master.bank1
l---------res/Master.strings.bank1
-rw-r--r--res/fmod/.cache/fsbcache/Desktop/1FE16EE9.fobjbin2507 -> 2507 bytes
-rw-r--r--res/fmod/.cache/fsbcache/Desktop/3019A628.fobjbin1421014 -> 1421014 bytes
-rw-r--r--res/fmod/.cache/fsbcache/Desktop/3AA7253D.fobjbin820154 -> 820154 bytes
-rw-r--r--res/fmod/.cache/fsbcache/Desktop/3C7FCD0D.fobjbin1426 -> 1426 bytes
-rw-r--r--res/fmod/.cache/fsbcache/Desktop/53616416.fobjbin146752 -> 146752 bytes
-rw-r--r--res/fmod/.cache/fsbcache/Desktop/57E359F0.fobjbin3238 -> 3238 bytes
-rw-r--r--res/fmod/.cache/fsbcache/Desktop/5A3FB1CD.fobjbin2113 -> 2113 bytes
-rw-r--r--res/fmod/.cache/fsbcache/Desktop/71C77FCD.fobjbin2312 -> 2312 bytes
-rw-r--r--res/fmod/.cache/fsbcache/Desktop/7FBDFDEC.fobjbin1779 -> 1779 bytes
-rw-r--r--res/fmod/.cache/fsbcache/Desktop/8E6D2689.fobjbin3184 -> 3184 bytes
-rw-r--r--res/fmod/.cache/fsbcache/Desktop/B1D38FCD.fobjbin1624 -> 1624 bytes
-rw-r--r--res/fmod/.cache/fsbcache/Desktop/BA7E5A1C.fobjbin880483 -> 880483 bytes
-rw-r--r--res/fmod/.cache/fsbcache/Desktop/C8D72C41.fobjbin1387706 -> 1387706 bytes
-rw-r--r--res/fmod/.cache/fsbcache/Desktop/E5DD54AC.fobjbin1528 -> 1528 bytes
-rw-r--r--res/fmod/.cache/fsbcache/Desktop/ED73FAF7.fobjbin945324 -> 945324 bytes
-rw-r--r--res/fmod/Metadata/Bank/{a23d2b1c-914e-48d4-8df9-80f6edad6c28}.xml3
-rw-r--r--res/icon.pngbin0 -> 504 bytes
-rw-r--r--res/icon128.pngbin0 -> 1680 bytes
-rw-r--r--res/icon256.pngbin0 -> 2625 bytes
-rw-r--r--res/icon32.pngbin0 -> 735 bytes
-rw-r--r--res/icon64.pngbin0 -> 1084 bytes
-rw-r--r--src/game.cpp9
-rw-r--r--src/game.h3
-rw-r--r--src/main.cpp1
-rw-r--r--src/muxer.cpp5
-rw-r--r--src/renderer.cpp23
-rw-r--r--src/runtime.h13
-rw-r--r--src/runtime_macos.mm16
-rw-r--r--src/runtime_test.cpp5
50 files changed, 748 insertions, 19 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9f6d26c..58a7649 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -39,6 +39,7 @@ add_executable(Ether
39 src/game.cpp 39 src/game.cpp
40 src/sign.cpp 40 src/sign.cpp
41 src/menu.cpp 41 src/menu.cpp
42 src/runtime_test.cpp
42 vendor/fov.c 43 vendor/fov.c
43) 44)
44 45
diff --git a/macOS/Ether.xcodeproj/project.pbxproj b/macOS/Ether.xcodeproj/project.pbxproj new file mode 100644 index 0000000..4a8219f --- /dev/null +++ b/macOS/Ether.xcodeproj/project.pbxproj
@@ -0,0 +1,523 @@
1// !$*UTF8*$!
2{
3 archiveVersion = 1;
4 classes = {
5 };
6 objectVersion = 50;
7 objects = {
8
9/* Begin PBXBuildFile section */
10 6C0CDB7F27E7839D00F43B44 /* libSDL2_image-2.0.0.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6CD6FEF127E76CA2005B65A5 /* libSDL2_image-2.0.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
11 6C0CDB8027E7839D00F43B44 /* libSDL2_ttf-2.0.0.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6CD6FEF327E76CA2005B65A5 /* libSDL2_ttf-2.0.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
12 6C0CDB8127E7839D00F43B44 /* libSDL2-2.0.0.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6CD6FEF227E76CA2005B65A5 /* libSDL2-2.0.0.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
13 6CD6FEBE27E76AE1005B65A5 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6CD6FEBD27E76AE1005B65A5 /* Assets.xcassets */; };
14 6CD6FEE027E76BCF005B65A5 /* animation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6CD6FECB27E76BCE005B65A5 /* animation.cpp */; };
15 6CD6FEE127E76BCF005B65A5 /* renderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6CD6FECC27E76BCE005B65A5 /* renderer.cpp */; };
16 6CD6FEE227E76BCF005B65A5 /* game.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6CD6FECE27E76BCE005B65A5 /* game.cpp */; };
17 6CD6FEE327E76BCF005B65A5 /* menu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6CD6FED027E76BCE005B65A5 /* menu.cpp */; };
18 6CD6FEE427E76BCF005B65A5 /* sign.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6CD6FED227E76BCE005B65A5 /* sign.cpp */; };
19 6CD6FEE527E76BCF005B65A5 /* muxer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6CD6FED427E76BCE005B65A5 /* muxer.cpp */; };
20 6CD6FEE627E76BCF005B65A5 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6CD6FEDA27E76BCE005B65A5 /* main.cpp */; };
21 6CD6FEE727E76BCF005B65A5 /* runtime_macos.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6CD6FEDE27E76BCE005B65A5 /* runtime_macos.mm */; };
22 6CD6FEEF27E76C3F005B65A5 /* libfmodstudio.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 6CD6FEEB27E76C3F005B65A5 /* libfmodstudio.dylib */; };
23 6CD6FEF027E76C3F005B65A5 /* libfmod.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 6CD6FEEC27E76C3F005B65A5 /* libfmod.dylib */; };
24 6CD6FEF427E76CA2005B65A5 /* libSDL2_image-2.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 6CD6FEF127E76CA2005B65A5 /* libSDL2_image-2.0.0.dylib */; };
25 6CD6FEF527E76CA2005B65A5 /* libSDL2-2.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 6CD6FEF227E76CA2005B65A5 /* libSDL2-2.0.0.dylib */; };
26 6CD6FEF627E76CA2005B65A5 /* libSDL2_ttf-2.0.0.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 6CD6FEF327E76CA2005B65A5 /* libSDL2_ttf-2.0.0.dylib */; };
27 6CD6FF0727E77C59005B65A5 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6CD6FF0627E77C59005B65A5 /* Cocoa.framework */; };
28 6CD6FF1227E77D7B005B65A5 /* title3.png in Resources */ = {isa = PBXBuildFile; fileRef = 6CD6FF0827E77D7A005B65A5 /* title3.png */; };
29 6CD6FF1327E77D7B005B65A5 /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 6CD6FF0927E77D7A005B65A5 /* icon.png */; };
30 6CD6FF1427E77D7B005B65A5 /* lamp.png in Resources */ = {isa = PBXBuildFile; fileRef = 6CD6FF0A27E77D7A005B65A5 /* lamp.png */; };
31 6CD6FF1527E77D7B005B65A5 /* lighting.png in Resources */ = {isa = PBXBuildFile; fileRef = 6CD6FF0B27E77D7A005B65A5 /* lighting.png */; };
32 6CD6FF1627E77D7B005B65A5 /* runninbloods.png in Resources */ = {isa = PBXBuildFile; fileRef = 6CD6FF0C27E77D7B005B65A5 /* runninbloods.png */; };
33 6CD6FF1727E77D7B005B65A5 /* menu.png in Resources */ = {isa = PBXBuildFile; fileRef = 6CD6FF0D27E77D7B005B65A5 /* menu.png */; };
34 6CD6FF1827E77D7B005B65A5 /* read_instruction.png in Resources */ = {isa = PBXBuildFile; fileRef = 6CD6FF0E27E77D7B005B65A5 /* read_instruction.png */; };
35 6CD6FF1927E77D7B005B65A5 /* player.png in Resources */ = {isa = PBXBuildFile; fileRef = 6CD6FF0F27E77D7B005B65A5 /* player.png */; };
36 6CD6FF1A27E77D7B005B65A5 /* title0.png in Resources */ = {isa = PBXBuildFile; fileRef = 6CD6FF1027E77D7B005B65A5 /* title0.png */; };
37 6CD6FF1B27E77D7B005B65A5 /* title1.png in Resources */ = {isa = PBXBuildFile; fileRef = 6CD6FF1127E77D7B005B65A5 /* title1.png */; };
38 6CD6FF1F27E77ED5005B65A5 /* libfmod.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6CD6FEEC27E76C3F005B65A5 /* libfmod.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
39 6CD6FF2027E77ED5005B65A5 /* libfmodstudio.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 6CD6FEEB27E76C3F005B65A5 /* libfmodstudio.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
40 6CD6FF2827E780D3005B65A5 /* softsquare.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6CD6FF2527E780D3005B65A5 /* softsquare.ttf */; };
41 6CD6FF2927E780D3005B65A5 /* childoflight.txt in Resources */ = {isa = PBXBuildFile; fileRef = 6CD6FF2627E780D3005B65A5 /* childoflight.txt */; };
42 6CD6FF2A27E780D3005B65A5 /* player_anim.txt in Resources */ = {isa = PBXBuildFile; fileRef = 6CD6FF2727E780D3005B65A5 /* player_anim.txt */; };
43 6CD6FF2D27E780E6005B65A5 /* fov.c in Sources */ = {isa = PBXBuildFile; fileRef = 6CD6FF2C27E780E6005B65A5 /* fov.c */; };
44 6CD6FF3027E78218005B65A5 /* Master.strings.bank in Resources */ = {isa = PBXBuildFile; fileRef = 6CD6FF2E27E78218005B65A5 /* Master.strings.bank */; };
45 6CD6FF3127E78218005B65A5 /* Master.bank in Resources */ = {isa = PBXBuildFile; fileRef = 6CD6FF2F27E78218005B65A5 /* Master.bank */; };
46/* End PBXBuildFile section */
47
48/* Begin PBXCopyFilesBuildPhase section */
49 6CD6FF1E27E77EC6005B65A5 /* CopyFiles */ = {
50 isa = PBXCopyFilesBuildPhase;
51 buildActionMask = 2147483647;
52 dstPath = "";
53 dstSubfolderSpec = 10;
54 files = (
55 6C0CDB7F27E7839D00F43B44 /* libSDL2_image-2.0.0.dylib in CopyFiles */,
56 6C0CDB8027E7839D00F43B44 /* libSDL2_ttf-2.0.0.dylib in CopyFiles */,
57 6C0CDB8127E7839D00F43B44 /* libSDL2-2.0.0.dylib in CopyFiles */,
58 6CD6FF1F27E77ED5005B65A5 /* libfmod.dylib in CopyFiles */,
59 6CD6FF2027E77ED5005B65A5 /* libfmodstudio.dylib in CopyFiles */,
60 );
61 runOnlyForDeploymentPostprocessing = 0;
62 };
63/* End PBXCopyFilesBuildPhase section */
64
65/* Begin PBXFileReference section */
66 6CD6FEB727E76AE0005B65A5 /* Ether.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Ether.app; sourceTree = BUILT_PRODUCTS_DIR; };
67 6CD6FEBD27E76AE1005B65A5 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
68 6CD6FEC227E76AE1005B65A5 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
69 6CD6FEC527E76AE1005B65A5 /* Ether.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Ether.entitlements; sourceTree = "<group>"; };
70 6CD6FECB27E76BCE005B65A5 /* animation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = animation.cpp; path = ../../src/animation.cpp; sourceTree = "<group>"; };
71 6CD6FECC27E76BCE005B65A5 /* renderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = renderer.cpp; path = ../../src/renderer.cpp; sourceTree = "<group>"; };
72 6CD6FECD27E76BCE005B65A5 /* consts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = consts.h; path = ../../src/consts.h; sourceTree = "<group>"; };
73 6CD6FECE27E76BCE005B65A5 /* game.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = game.cpp; path = ../../src/game.cpp; sourceTree = "<group>"; tabWidth = 2; };
74 6CD6FECF27E76BCE005B65A5 /* direction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = direction.h; path = ../../src/direction.h; sourceTree = "<group>"; };
75 6CD6FED027E76BCE005B65A5 /* menu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = menu.cpp; path = ../../src/menu.cpp; sourceTree = "<group>"; };
76 6CD6FED127E76BCE005B65A5 /* renderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = renderer.h; path = ../../src/renderer.h; sourceTree = "<group>"; };
77 6CD6FED227E76BCE005B65A5 /* sign.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = sign.cpp; path = ../../src/sign.cpp; sourceTree = "<group>"; };
78 6CD6FED327E76BCE005B65A5 /* menu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = menu.h; path = ../../src/menu.h; sourceTree = "<group>"; };
79 6CD6FED427E76BCE005B65A5 /* muxer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = muxer.cpp; path = ../../src/muxer.cpp; sourceTree = "<group>"; };
80 6CD6FED527E76BCE005B65A5 /* timer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = timer.h; path = ../../src/timer.h; sourceTree = "<group>"; };
81 6CD6FED627E76BCE005B65A5 /* interpolation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = interpolation.h; path = ../../src/interpolation.h; sourceTree = "<group>"; };
82 6CD6FED727E76BCE005B65A5 /* muxer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = muxer.h; path = ../../src/muxer.h; sourceTree = "<group>"; };
83 6CD6FED827E76BCE005B65A5 /* sign.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sign.h; path = ../../src/sign.h; sourceTree = "<group>"; };
84 6CD6FED927E76BCE005B65A5 /* game.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = game.h; path = ../../src/game.h; sourceTree = "<group>"; };
85 6CD6FEDA27E76BCE005B65A5 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = ../../src/main.cpp; sourceTree = "<group>"; };
86 6CD6FEDB27E76BCE005B65A5 /* animation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = animation.h; path = ../../src/animation.h; sourceTree = "<group>"; };
87 6CD6FEDC27E76BCE005B65A5 /* util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = util.h; path = ../../src/util.h; sourceTree = "<group>"; };
88 6CD6FEDD27E76BCE005B65A5 /* map.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = map.h; path = ../../src/map.h; sourceTree = "<group>"; };
89 6CD6FEDE27E76BCE005B65A5 /* runtime_macos.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = runtime_macos.mm; path = ../../src/runtime_macos.mm; sourceTree = "<group>"; };
90 6CD6FEDF27E76BCF005B65A5 /* runtime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = runtime.h; path = ../../src/runtime.h; sourceTree = "<group>"; };
91 6CD6FEE927E76C3F005B65A5 /* libfmodstudioL.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libfmodstudioL.dylib; path = ../vendor/fmod/lib/libfmodstudioL.dylib; sourceTree = "<group>"; };
92 6CD6FEEA27E76C3F005B65A5 /* libfmodL.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libfmodL.dylib; path = ../vendor/fmod/lib/libfmodL.dylib; sourceTree = "<group>"; };
93 6CD6FEEB27E76C3F005B65A5 /* libfmodstudio.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libfmodstudio.dylib; path = ../vendor/fmod/lib/libfmodstudio.dylib; sourceTree = "<group>"; };
94 6CD6FEEC27E76C3F005B65A5 /* libfmod.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libfmod.dylib; path = ../vendor/fmod/lib/libfmod.dylib; sourceTree = "<group>"; };
95 6CD6FEF127E76CA2005B65A5 /* libSDL2_image-2.0.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libSDL2_image-2.0.0.dylib"; path = "../../../../../usr/local/Cellar/sdl2_image/2.0.5/lib/libSDL2_image-2.0.0.dylib"; sourceTree = "<group>"; };
96 6CD6FEF227E76CA2005B65A5 /* libSDL2-2.0.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libSDL2-2.0.0.dylib"; path = "../../../../../usr/local/Cellar/sdl2/2.0.14_1/lib/libSDL2-2.0.0.dylib"; sourceTree = "<group>"; };
97 6CD6FEF327E76CA2005B65A5 /* libSDL2_ttf-2.0.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libSDL2_ttf-2.0.0.dylib"; path = "../../../../../usr/local/Cellar/sdl2_ttf/2.0.15/lib/libSDL2_ttf-2.0.0.dylib"; sourceTree = "<group>"; };
98 6CD6FF0627E77C59005B65A5 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
99 6CD6FF0827E77D7A005B65A5 /* title3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = title3.png; path = ../../../res/title3.png; sourceTree = "<group>"; };
100 6CD6FF0927E77D7A005B65A5 /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = icon.png; path = ../../../res/icon.png; sourceTree = "<group>"; };
101 6CD6FF0A27E77D7A005B65A5 /* lamp.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = lamp.png; path = ../../../res/lamp.png; sourceTree = "<group>"; };
102 6CD6FF0B27E77D7A005B65A5 /* lighting.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = lighting.png; path = ../../../res/lighting.png; sourceTree = "<group>"; };
103 6CD6FF0C27E77D7B005B65A5 /* runninbloods.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = runninbloods.png; path = ../../../res/runninbloods.png; sourceTree = "<group>"; };
104 6CD6FF0D27E77D7B005B65A5 /* menu.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = menu.png; path = ../../../res/menu.png; sourceTree = "<group>"; };
105 6CD6FF0E27E77D7B005B65A5 /* read_instruction.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = read_instruction.png; path = ../../../res/read_instruction.png; sourceTree = "<group>"; };
106 6CD6FF0F27E77D7B005B65A5 /* player.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = player.png; path = ../../../res/player.png; sourceTree = "<group>"; };
107 6CD6FF1027E77D7B005B65A5 /* title0.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = title0.png; path = ../../../res/title0.png; sourceTree = "<group>"; };
108 6CD6FF1127E77D7B005B65A5 /* title1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = title1.png; path = ../../../res/title1.png; sourceTree = "<group>"; };
109 6CD6FF2527E780D3005B65A5 /* softsquare.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = softsquare.ttf; path = ../../../res/softsquare.ttf; sourceTree = "<group>"; };
110 6CD6FF2627E780D3005B65A5 /* childoflight.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = childoflight.txt; path = ../../../res/childoflight.txt; sourceTree = "<group>"; };
111 6CD6FF2727E780D3005B65A5 /* player_anim.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = player_anim.txt; path = ../../../res/player_anim.txt; sourceTree = "<group>"; };
112 6CD6FF2B27E780E6005B65A5 /* fov.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = fov.h; path = ../../vendor/fov.h; sourceTree = "<group>"; };
113 6CD6FF2C27E780E6005B65A5 /* fov.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = fov.c; path = ../../vendor/fov.c; sourceTree = "<group>"; };
114 6CD6FF2E27E78218005B65A5 /* Master.strings.bank */ = {isa = PBXFileReference; lastKnownFileType = file; name = Master.strings.bank; path = ../../../res/fmod/Build/Desktop/Master.strings.bank; sourceTree = "<group>"; };
115 6CD6FF2F27E78218005B65A5 /* Master.bank */ = {isa = PBXFileReference; lastKnownFileType = file; name = Master.bank; path = ../../../res/fmod/Build/Desktop/Master.bank; sourceTree = "<group>"; };
116/* End PBXFileReference section */
117
118/* Begin PBXFrameworksBuildPhase section */
119 6CD6FEB427E76AE0005B65A5 /* Frameworks */ = {
120 isa = PBXFrameworksBuildPhase;
121 buildActionMask = 2147483647;
122 files = (
123 6CD6FF0727E77C59005B65A5 /* Cocoa.framework in Frameworks */,
124 6CD6FEF427E76CA2005B65A5 /* libSDL2_image-2.0.0.dylib in Frameworks */,
125 6CD6FEF527E76CA2005B65A5 /* libSDL2-2.0.0.dylib in Frameworks */,
126 6CD6FEF627E76CA2005B65A5 /* libSDL2_ttf-2.0.0.dylib in Frameworks */,
127 6CD6FEEF27E76C3F005B65A5 /* libfmodstudio.dylib in Frameworks */,
128 6CD6FEF027E76C3F005B65A5 /* libfmod.dylib in Frameworks */,
129 );
130 runOnlyForDeploymentPostprocessing = 0;
131 };
132/* End PBXFrameworksBuildPhase section */
133
134/* Begin PBXGroup section */
135 6CD6FEAE27E76AE0005B65A5 = {
136 isa = PBXGroup;
137 children = (
138 6CD6FEB927E76AE0005B65A5 /* Ether */,
139 6CD6FEB827E76AE0005B65A5 /* Products */,
140 6CD6FEE827E76C3F005B65A5 /* Frameworks */,
141 );
142 sourceTree = "<group>";
143 };
144 6CD6FEB827E76AE0005B65A5 /* Products */ = {
145 isa = PBXGroup;
146 children = (
147 6CD6FEB727E76AE0005B65A5 /* Ether.app */,
148 );
149 name = Products;
150 sourceTree = "<group>";
151 };
152 6CD6FEB927E76AE0005B65A5 /* Ether */ = {
153 isa = PBXGroup;
154 children = (
155 6CD6FF0127E76DC7005B65A5 /* resources */,
156 6CD6FF0027E76DB8005B65A5 /* vendor */,
157 6CD6FECB27E76BCE005B65A5 /* animation.cpp */,
158 6CD6FEDB27E76BCE005B65A5 /* animation.h */,
159 6CD6FECD27E76BCE005B65A5 /* consts.h */,
160 6CD6FECF27E76BCE005B65A5 /* direction.h */,
161 6CD6FECE27E76BCE005B65A5 /* game.cpp */,
162 6CD6FED927E76BCE005B65A5 /* game.h */,
163 6CD6FED627E76BCE005B65A5 /* interpolation.h */,
164 6CD6FEDA27E76BCE005B65A5 /* main.cpp */,
165 6CD6FEDD27E76BCE005B65A5 /* map.h */,
166 6CD6FED027E76BCE005B65A5 /* menu.cpp */,
167 6CD6FED327E76BCE005B65A5 /* menu.h */,
168 6CD6FED427E76BCE005B65A5 /* muxer.cpp */,
169 6CD6FED727E76BCE005B65A5 /* muxer.h */,
170 6CD6FECC27E76BCE005B65A5 /* renderer.cpp */,
171 6CD6FED127E76BCE005B65A5 /* renderer.h */,
172 6CD6FEDE27E76BCE005B65A5 /* runtime_macos.mm */,
173 6CD6FEDF27E76BCF005B65A5 /* runtime.h */,
174 6CD6FED227E76BCE005B65A5 /* sign.cpp */,
175 6CD6FED827E76BCE005B65A5 /* sign.h */,
176 6CD6FED527E76BCE005B65A5 /* timer.h */,
177 6CD6FEDC27E76BCE005B65A5 /* util.h */,
178 6CD6FEBD27E76AE1005B65A5 /* Assets.xcassets */,
179 6CD6FEC227E76AE1005B65A5 /* Info.plist */,
180 6CD6FEC527E76AE1005B65A5 /* Ether.entitlements */,
181 );
182 path = Ether;
183 sourceTree = "<group>";
184 };
185 6CD6FEE827E76C3F005B65A5 /* Frameworks */ = {
186 isa = PBXGroup;
187 children = (
188 6CD6FF0627E77C59005B65A5 /* Cocoa.framework */,
189 6CD6FEF127E76CA2005B65A5 /* libSDL2_image-2.0.0.dylib */,
190 6CD6FEF327E76CA2005B65A5 /* libSDL2_ttf-2.0.0.dylib */,
191 6CD6FEF227E76CA2005B65A5 /* libSDL2-2.0.0.dylib */,
192 6CD6FEEC27E76C3F005B65A5 /* libfmod.dylib */,
193 6CD6FEEA27E76C3F005B65A5 /* libfmodL.dylib */,
194 6CD6FEEB27E76C3F005B65A5 /* libfmodstudio.dylib */,
195 6CD6FEE927E76C3F005B65A5 /* libfmodstudioL.dylib */,
196 );
197 name = Frameworks;
198 sourceTree = "<group>";
199 };
200 6CD6FF0027E76DB8005B65A5 /* vendor */ = {
201 isa = PBXGroup;
202 children = (
203 6CD6FF2C27E780E6005B65A5 /* fov.c */,
204 6CD6FF2B27E780E6005B65A5 /* fov.h */,
205 );
206 name = vendor;
207 sourceTree = "<group>";
208 };
209 6CD6FF0127E76DC7005B65A5 /* resources */ = {
210 isa = PBXGroup;
211 children = (
212 6CD6FF2F27E78218005B65A5 /* Master.bank */,
213 6CD6FF2E27E78218005B65A5 /* Master.strings.bank */,
214 6CD6FF2627E780D3005B65A5 /* childoflight.txt */,
215 6CD6FF2727E780D3005B65A5 /* player_anim.txt */,
216 6CD6FF2527E780D3005B65A5 /* softsquare.ttf */,
217 6CD6FF0927E77D7A005B65A5 /* icon.png */,
218 6CD6FF0A27E77D7A005B65A5 /* lamp.png */,
219 6CD6FF0B27E77D7A005B65A5 /* lighting.png */,
220 6CD6FF0D27E77D7B005B65A5 /* menu.png */,
221 6CD6FF0F27E77D7B005B65A5 /* player.png */,
222 6CD6FF0E27E77D7B005B65A5 /* read_instruction.png */,
223 6CD6FF0C27E77D7B005B65A5 /* runninbloods.png */,
224 6CD6FF1027E77D7B005B65A5 /* title0.png */,
225 6CD6FF1127E77D7B005B65A5 /* title1.png */,
226 6CD6FF0827E77D7A005B65A5 /* title3.png */,
227 );
228 path = resources;
229 sourceTree = "<group>";
230 };
231/* End PBXGroup section */
232
233/* Begin PBXNativeTarget section */
234 6CD6FEB627E76AE0005B65A5 /* Ether */ = {
235 isa = PBXNativeTarget;
236 buildConfigurationList = 6CD6FEC827E76AE1005B65A5 /* Build configuration list for PBXNativeTarget "Ether" */;
237 buildPhases = (
238 6CD6FEB327E76AE0005B65A5 /* Sources */,
239 6CD6FEB427E76AE0005B65A5 /* Frameworks */,
240 6CD6FEB527E76AE0005B65A5 /* Resources */,
241 6CD6FF1E27E77EC6005B65A5 /* CopyFiles */,
242 );
243 buildRules = (
244 );
245 dependencies = (
246 );
247 name = Ether;
248 productName = Ether;
249 productReference = 6CD6FEB727E76AE0005B65A5 /* Ether.app */;
250 productType = "com.apple.product-type.application";
251 };
252/* End PBXNativeTarget section */
253
254/* Begin PBXProject section */
255 6CD6FEAF27E76AE0005B65A5 /* Project object */ = {
256 isa = PBXProject;
257 attributes = {
258 LastUpgradeCheck = 1010;
259 ORGANIZATIONNAME = "Starla Insigna";
260 TargetAttributes = {
261 6CD6FEB627E76AE0005B65A5 = {
262 CreatedOnToolsVersion = 10.1;
263 };
264 };
265 };
266 buildConfigurationList = 6CD6FEB227E76AE0005B65A5 /* Build configuration list for PBXProject "Ether" */;
267 compatibilityVersion = "Xcode 9.3";
268 developmentRegion = en;
269 hasScannedForEncodings = 0;
270 knownRegions = (
271 en,
272 Base,
273 );
274 mainGroup = 6CD6FEAE27E76AE0005B65A5;
275 productRefGroup = 6CD6FEB827E76AE0005B65A5 /* Products */;
276 projectDirPath = "";
277 projectRoot = "";
278 targets = (
279 6CD6FEB627E76AE0005B65A5 /* Ether */,
280 );
281 };
282/* End PBXProject section */
283
284/* Begin PBXResourcesBuildPhase section */
285 6CD6FEB527E76AE0005B65A5 /* Resources */ = {
286 isa = PBXResourcesBuildPhase;
287 buildActionMask = 2147483647;
288 files = (
289 6CD6FF3027E78218005B65A5 /* Master.strings.bank in Resources */,
290 6CD6FF3127E78218005B65A5 /* Master.bank in Resources */,
291 6CD6FF1B27E77D7B005B65A5 /* title1.png in Resources */,
292 6CD6FF1927E77D7B005B65A5 /* player.png in Resources */,
293 6CD6FF1627E77D7B005B65A5 /* runninbloods.png in Resources */,
294 6CD6FF1427E77D7B005B65A5 /* lamp.png in Resources */,
295 6CD6FF2827E780D3005B65A5 /* softsquare.ttf in Resources */,
296 6CD6FEBE27E76AE1005B65A5 /* Assets.xcassets in Resources */,
297 6CD6FF1227E77D7B005B65A5 /* title3.png in Resources */,
298 6CD6FF1827E77D7B005B65A5 /* read_instruction.png in Resources */,
299 6CD6FF2927E780D3005B65A5 /* childoflight.txt in Resources */,
300 6CD6FF1A27E77D7B005B65A5 /* title0.png in Resources */,
301 6CD6FF1327E77D7B005B65A5 /* icon.png in Resources */,
302 6CD6FF1727E77D7B005B65A5 /* menu.png in Resources */,
303 6CD6FF2A27E780D3005B65A5 /* player_anim.txt in Resources */,
304 6CD6FF1527E77D7B005B65A5 /* lighting.png in Resources */,
305 );
306 runOnlyForDeploymentPostprocessing = 0;
307 };
308/* End PBXResourcesBuildPhase section */
309
310/* Begin PBXSourcesBuildPhase section */
311 6CD6FEB327E76AE0005B65A5 /* Sources */ = {
312 isa = PBXSourcesBuildPhase;
313 buildActionMask = 2147483647;
314 files = (
315 6CD6FF2D27E780E6005B65A5 /* fov.c in Sources */,
316 6CD6FEE727E76BCF005B65A5 /* runtime_macos.mm in Sources */,
317 6CD6FEE127E76BCF005B65A5 /* renderer.cpp in Sources */,
318 6CD6FEE027E76BCF005B65A5 /* animation.cpp in Sources */,
319 6CD6FEE327E76BCF005B65A5 /* menu.cpp in Sources */,
320 6CD6FEE427E76BCF005B65A5 /* sign.cpp in Sources */,
321 6CD6FEE627E76BCF005B65A5 /* main.cpp in Sources */,
322 6CD6FEE227E76BCF005B65A5 /* game.cpp in Sources */,
323 6CD6FEE527E76BCF005B65A5 /* muxer.cpp in Sources */,
324 );
325 runOnlyForDeploymentPostprocessing = 0;
326 };
327/* End PBXSourcesBuildPhase section */
328
329/* Begin XCBuildConfiguration section */
330 6CD6FEC627E76AE1005B65A5 /* Debug */ = {
331 isa = XCBuildConfiguration;
332 buildSettings = {
333 ALWAYS_SEARCH_USER_PATHS = NO;
334 CLANG_ANALYZER_NONNULL = YES;
335 CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
336 CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
337 CLANG_CXX_LIBRARY = "libc++";
338 CLANG_ENABLE_MODULES = YES;
339 CLANG_ENABLE_OBJC_ARC = YES;
340 CLANG_ENABLE_OBJC_WEAK = YES;
341 CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
342 CLANG_WARN_BOOL_CONVERSION = YES;
343 CLANG_WARN_COMMA = YES;
344 CLANG_WARN_CONSTANT_CONVERSION = YES;
345 CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
346 CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
347 CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
348 CLANG_WARN_EMPTY_BODY = YES;
349 CLANG_WARN_ENUM_CONVERSION = YES;
350 CLANG_WARN_INFINITE_RECURSION = YES;
351 CLANG_WARN_INT_CONVERSION = YES;
352 CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
353 CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
354 CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
355 CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
356 CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
357 CLANG_WARN_STRICT_PROTOTYPES = YES;
358 CLANG_WARN_SUSPICIOUS_MOVE = YES;
359 CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
360 CLANG_WARN_UNREACHABLE_CODE = YES;
361 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
362 CODE_SIGN_IDENTITY = "-";
363 COPY_PHASE_STRIP = NO;
364 DEBUG_INFORMATION_FORMAT = dwarf;
365 ENABLE_STRICT_OBJC_MSGSEND = YES;
366 ENABLE_TESTABILITY = YES;
367 GCC_C_LANGUAGE_STANDARD = gnu11;
368 GCC_DYNAMIC_NO_PIC = NO;
369 GCC_NO_COMMON_BLOCKS = YES;
370 GCC_OPTIMIZATION_LEVEL = 0;
371 GCC_PREPROCESSOR_DEFINITIONS = (
372 "DEBUG=1",
373 "$(inherited)",
374 );
375 GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
376 GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
377 GCC_WARN_UNDECLARED_SELECTOR = YES;
378 GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
379 GCC_WARN_UNUSED_FUNCTION = YES;
380 GCC_WARN_UNUSED_VARIABLE = YES;
381 MACOSX_DEPLOYMENT_TARGET = 10.13;
382 MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
383 MTL_FAST_MATH = YES;
384 ONLY_ACTIVE_ARCH = YES;
385 SDKROOT = macosx;
386 };
387 name = Debug;
388 };
389 6CD6FEC727E76AE1005B65A5 /* Release */ = {
390 isa = XCBuildConfiguration;
391 buildSettings = {
392 ALWAYS_SEARCH_USER_PATHS = NO;
393 CLANG_ANALYZER_NONNULL = YES;
394 CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
395 CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
396 CLANG_CXX_LIBRARY = "libc++";
397 CLANG_ENABLE_MODULES = YES;
398 CLANG_ENABLE_OBJC_ARC = YES;
399 CLANG_ENABLE_OBJC_WEAK = YES;
400 CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
401 CLANG_WARN_BOOL_CONVERSION = YES;
402 CLANG_WARN_COMMA = YES;
403 CLANG_WARN_CONSTANT_CONVERSION = YES;
404 CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
405 CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
406 CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
407 CLANG_WARN_EMPTY_BODY = YES;
408 CLANG_WARN_ENUM_CONVERSION = YES;
409 CLANG_WARN_INFINITE_RECURSION = YES;
410 CLANG_WARN_INT_CONVERSION = YES;
411 CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
412 CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
413 CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
414 CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
415 CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
416 CLANG_WARN_STRICT_PROTOTYPES = YES;
417 CLANG_WARN_SUSPICIOUS_MOVE = YES;
418 CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
419 CLANG_WARN_UNREACHABLE_CODE = YES;
420 CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
421 CODE_SIGN_IDENTITY = "-";
422 COPY_PHASE_STRIP = NO;
423 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
424 ENABLE_NS_ASSERTIONS = NO;
425 ENABLE_STRICT_OBJC_MSGSEND = YES;
426 GCC_C_LANGUAGE_STANDARD = gnu11;
427 GCC_NO_COMMON_BLOCKS = YES;
428 GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
429 GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
430 GCC_WARN_UNDECLARED_SELECTOR = YES;
431 GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
432 GCC_WARN_UNUSED_FUNCTION = YES;
433 GCC_WARN_UNUSED_VARIABLE = YES;
434 MACOSX_DEPLOYMENT_TARGET = 10.13;
435 MTL_ENABLE_DEBUG_INFO = NO;
436 MTL_FAST_MATH = YES;
437 SDKROOT = macosx;
438 };
439 name = Release;
440 };
441 6CD6FEC927E76AE1005B65A5 /* Debug */ = {
442 isa = XCBuildConfiguration;
443 buildSettings = {
444 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
445 CLANG_CXX_LANGUAGE_STANDARD = "c++17";
446 CODE_SIGN_ENTITLEMENTS = Ether/Ether.entitlements;
447 CODE_SIGN_STYLE = Automatic;
448 COMBINE_HIDPI_IMAGES = YES;
449 HEADER_SEARCH_PATHS = (
450 /usr/local/include/SDL2,
451 /Users/hatkirby/Repos/ether/vendor/fmod/inc,
452 );
453 INFOPLIST_FILE = Ether/Info.plist;
454 LD_RUNPATH_SEARCH_PATHS = (
455 "$(inherited)",
456 "@executable_path/../Frameworks",
457 );
458 LIBRARY_SEARCH_PATHS = (
459 "$(inherited)",
460 /usr/local/Cellar/sdl2_image/2.0.5/lib,
461 /usr/local/Cellar/sdl2/2.0.14_1/lib,
462 /usr/local/Cellar/sdl2_ttf/2.0.15/lib,
463 /Users/hatkirby/Repos/ether/vendor/fmod/lib,
464 );
465 PRODUCT_BUNDLE_IDENTIFIER = se.feffernoo.Ether;
466 PRODUCT_NAME = "$(TARGET_NAME)";
467 };
468 name = Debug;
469 };
470 6CD6FECA27E76AE1005B65A5 /* Release */ = {
471 isa = XCBuildConfiguration;
472 buildSettings = {
473 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
474 CLANG_CXX_LANGUAGE_STANDARD = "c++17";
475 CODE_SIGN_ENTITLEMENTS = Ether/Ether.entitlements;
476 CODE_SIGN_STYLE = Automatic;
477 COMBINE_HIDPI_IMAGES = YES;
478 HEADER_SEARCH_PATHS = (
479 /usr/local/include/SDL2,
480 /Users/hatkirby/Repos/ether/vendor/fmod/inc,
481 );
482 INFOPLIST_FILE = Ether/Info.plist;
483 LD_RUNPATH_SEARCH_PATHS = (
484 "$(inherited)",
485 "@executable_path/../Frameworks",
486 );
487 LIBRARY_SEARCH_PATHS = (
488 "$(inherited)",
489 /usr/local/Cellar/sdl2_image/2.0.5/lib,
490 /usr/local/Cellar/sdl2/2.0.14_1/lib,
491 /usr/local/Cellar/sdl2_ttf/2.0.15/lib,
492 /Users/hatkirby/Repos/ether/vendor/fmod/lib,
493 );
494 PRODUCT_BUNDLE_IDENTIFIER = se.feffernoo.Ether;
495 PRODUCT_NAME = "$(TARGET_NAME)";
496 };
497 name = Release;
498 };
499/* End XCBuildConfiguration section */
500
501/* Begin XCConfigurationList section */
502 6CD6FEB227E76AE0005B65A5 /* Build configuration list for PBXProject "Ether" */ = {
503 isa = XCConfigurationList;
504 buildConfigurations = (
505 6CD6FEC627E76AE1005B65A5 /* Debug */,
506 6CD6FEC727E76AE1005B65A5 /* Release */,
507 );
508 defaultConfigurationIsVisible = 0;
509 defaultConfigurationName = Release;
510 };
511 6CD6FEC827E76AE1005B65A5 /* Build configuration list for PBXNativeTarget "Ether" */ = {
512 isa = XCConfigurationList;
513 buildConfigurations = (
514 6CD6FEC927E76AE1005B65A5 /* Debug */,
515 6CD6FECA27E76AE1005B65A5 /* Release */,
516 );
517 defaultConfigurationIsVisible = 0;
518 defaultConfigurationName = Release;
519 };
520/* End XCConfigurationList section */
521 };
522 rootObject = 6CD6FEAF27E76AE0005B65A5 /* Project object */;
523}
diff --git a/macOS/Ether.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/macOS/Ether.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..27087db --- /dev/null +++ b/macOS/Ether.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<Workspace
3 version = "1.0">
4 <FileRef
5 location = "self:Ether.xcodeproj">
6 </FileRef>
7</Workspace>
diff --git a/macOS/Ether.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/macOS/Ether.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/macOS/Ether.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3<plist version="1.0">
4<dict>
5 <key>IDEDidComputeMac32BitWarning</key>
6 <true/>
7</dict>
8</plist>
diff --git a/macOS/Ether.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/macOS/Ether.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..0c67376 --- /dev/null +++ b/macOS/Ether.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,5 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3<plist version="1.0">
4<dict/>
5</plist>
diff --git a/macOS/Ether.xcodeproj/project.xcworkspace/xcuserdata/hatkirby.xcuserdatad/UserInterfaceState.xcuserstate b/macOS/Ether.xcodeproj/project.xcworkspace/xcuserdata/hatkirby.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000..9974391 --- /dev/null +++ b/macOS/Ether.xcodeproj/project.xcworkspace/xcuserdata/hatkirby.xcuserdatad/UserInterfaceState.xcuserstate
Binary files differ
diff --git a/macOS/Ether.xcodeproj/project.xcworkspace/xcuserdata/hatkirby.xcuserdatad/WorkspaceSettings.xcsettings b/macOS/Ether.xcodeproj/project.xcworkspace/xcuserdata/hatkirby.xcuserdatad/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f25782d --- /dev/null +++ b/macOS/Ether.xcodeproj/project.xcworkspace/xcuserdata/hatkirby.xcuserdatad/WorkspaceSettings.xcsettings
@@ -0,0 +1,18 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3<plist version="1.0">
4<dict>
5 <key>BuildLocationStyle</key>
6 <string>UseAppPreferences</string>
7 <key>CustomBuildLocationType</key>
8 <string>RelativeToDerivedData</string>
9 <key>DerivedDataLocationStyle</key>
10 <string>Default</string>
11 <key>EnabledFullIndexStoreVisibility</key>
12 <false/>
13 <key>IssueFilterStyle</key>
14 <string>ShowActiveSchemeOnly</string>
15 <key>LiveSourceIssuesEnabled</key>
16 <true/>
17</dict>
18</plist>
diff --git a/macOS/Ether.xcodeproj/xcuserdata/hatkirby.xcuserdatad/xcschemes/xcschememanagement.plist b/macOS/Ether.xcodeproj/xcuserdata/hatkirby.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..2061852 --- /dev/null +++ b/macOS/Ether.xcodeproj/xcuserdata/hatkirby.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,14 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3<plist version="1.0">
4<dict>
5 <key>SchemeUserState</key>
6 <dict>
7 <key>Ether.xcscheme_^#shared#^_</key>
8 <dict>
9 <key>orderHint</key>
10 <integer>0</integer>
11 </dict>
12 </dict>
13</dict>
14</plist>
diff --git a/macOS/Ether/Assets.xcassets/AppIcon.appiconset/Contents.json b/macOS/Ether/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..388036d --- /dev/null +++ b/macOS/Ether/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,65 @@
1{
2 "images" : [
3 {
4 "size" : "16x16",
5 "idiom" : "mac",
6 "filename" : "icon.png",
7 "scale" : "1x"
8 },
9 {
10 "size" : "16x16",
11 "idiom" : "mac",
12 "filename" : "icon32-1.png",
13 "scale" : "2x"
14 },
15 {
16 "size" : "32x32",
17 "idiom" : "mac",
18 "filename" : "icon32.png",
19 "scale" : "1x"
20 },
21 {
22 "size" : "32x32",
23 "idiom" : "mac",
24 "filename" : "icon64.png",
25 "scale" : "2x"
26 },
27 {
28 "size" : "128x128",
29 "idiom" : "mac",
30 "filename" : "icon128.png",
31 "scale" : "1x"
32 },
33 {
34 "size" : "128x128",
35 "idiom" : "mac",
36 "filename" : "icon256.png",
37 "scale" : "2x"
38 },
39 {
40 "size" : "256x256",
41 "idiom" : "mac",
42 "filename" : "icon256-1.png",
43 "scale" : "1x"
44 },
45 {
46 "idiom" : "mac",
47 "size" : "256x256",
48 "scale" : "2x"
49 },
50 {
51 "idiom" : "mac",
52 "size" : "512x512",
53 "scale" : "1x"
54 },
55 {
56 "idiom" : "mac",
57 "size" : "512x512",
58 "scale" : "2x"
59 }
60 ],
61 "info" : {
62 "version" : 1,
63 "author" : "xcode"
64 }
65} \ No newline at end of file
diff --git a/macOS/Ether/Assets.xcassets/AppIcon.appiconset/icon.png b/macOS/Ether/Assets.xcassets/AppIcon.appiconset/icon.png new file mode 100644 index 0000000..0b43935 --- /dev/null +++ b/macOS/Ether/Assets.xcassets/AppIcon.appiconset/icon.png
Binary files differ
diff --git a/macOS/Ether/Assets.xcassets/AppIcon.appiconset/icon128.png b/macOS/Ether/Assets.xcassets/AppIcon.appiconset/icon128.png new file mode 100644 index 0000000..eff7e8d --- /dev/null +++ b/macOS/Ether/Assets.xcassets/AppIcon.appiconset/icon128.png
Binary files differ
diff --git a/macOS/Ether/Assets.xcassets/AppIcon.appiconset/icon256-1.png b/macOS/Ether/Assets.xcassets/AppIcon.appiconset/icon256-1.png new file mode 100644 index 0000000..37b6894 --- /dev/null +++ b/macOS/Ether/Assets.xcassets/AppIcon.appiconset/icon256-1.png
Binary files differ
diff --git a/macOS/Ether/Assets.xcassets/AppIcon.appiconset/icon256.png b/macOS/Ether/Assets.xcassets/AppIcon.appiconset/icon256.png new file mode 100644 index 0000000..37b6894 --- /dev/null +++ b/macOS/Ether/Assets.xcassets/AppIcon.appiconset/icon256.png
Binary files differ
diff --git a/macOS/Ether/Assets.xcassets/AppIcon.appiconset/icon32-1.png b/macOS/Ether/Assets.xcassets/AppIcon.appiconset/icon32-1.png new file mode 100644 index 0000000..580c814 --- /dev/null +++ b/macOS/Ether/Assets.xcassets/AppIcon.appiconset/icon32-1.png
Binary files differ
diff --git a/macOS/Ether/Assets.xcassets/AppIcon.appiconset/icon32.png b/macOS/Ether/Assets.xcassets/AppIcon.appiconset/icon32.png new file mode 100644 index 0000000..580c814 --- /dev/null +++ b/macOS/Ether/Assets.xcassets/AppIcon.appiconset/icon32.png
Binary files differ
diff --git a/macOS/Ether/Assets.xcassets/AppIcon.appiconset/icon64.png b/macOS/Ether/Assets.xcassets/AppIcon.appiconset/icon64.png new file mode 100644 index 0000000..b04357b --- /dev/null +++ b/macOS/Ether/Assets.xcassets/AppIcon.appiconset/icon64.png
Binary files differ
diff --git a/macOS/Ether/Assets.xcassets/Contents.json b/macOS/Ether/Assets.xcassets/Contents.json new file mode 100644 index 0000000..da4a164 --- /dev/null +++ b/macOS/Ether/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
1{
2 "info" : {
3 "version" : 1,
4 "author" : "xcode"
5 }
6} \ No newline at end of file
diff --git a/macOS/Ether/Ether.entitlements b/macOS/Ether/Ether.entitlements new file mode 100644 index 0000000..f2ef3ae --- /dev/null +++ b/macOS/Ether/Ether.entitlements
@@ -0,0 +1,10 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3<plist version="1.0">
4<dict>
5 <key>com.apple.security.app-sandbox</key>
6 <true/>
7 <key>com.apple.security.files.user-selected.read-only</key>
8 <true/>
9</dict>
10</plist>
diff --git a/macOS/Ether/Info.plist b/macOS/Ether/Info.plist new file mode 100644 index 0000000..98b16f1 --- /dev/null +++ b/macOS/Ether/Info.plist
@@ -0,0 +1,30 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3<plist version="1.0">
4<dict>
5 <key>CFBundleDevelopmentRegion</key>
6 <string>$(DEVELOPMENT_LANGUAGE)</string>
7 <key>CFBundleExecutable</key>
8 <string>$(EXECUTABLE_NAME)</string>
9 <key>CFBundleIconFile</key>
10 <string></string>
11 <key>CFBundleIdentifier</key>
12 <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
13 <key>CFBundleInfoDictionaryVersion</key>
14 <string>6.0</string>
15 <key>CFBundleName</key>
16 <string>$(PRODUCT_NAME)</string>
17 <key>CFBundlePackageType</key>
18 <string>APPL</string>
19 <key>CFBundleShortVersionString</key>
20 <string>1.0</string>
21 <key>CFBundleVersion</key>
22 <string>1</string>
23 <key>LSApplicationCategoryType</key>
24 <string>public.app-category.games</string>
25 <key>LSMinimumSystemVersion</key>
26 <string>$(MACOSX_DEPLOYMENT_TARGET)</string>
27 <key>NSHumanReadableCopyright</key>
28 <string>Copyright © 2022 Starla Insigna. All rights reserved.</string>
29</dict>
30</plist>
diff --git a/res/Master.bank b/res/Master.bank new file mode 120000 index 0000000..421f73f --- /dev/null +++ b/res/Master.bank
@@ -0,0 +1 @@
fmod/Build/Desktop/Master.bank \ No newline at end of file
diff --git a/res/Master.strings.bank b/res/Master.strings.bank new file mode 120000 index 0000000..aa181c7 --- /dev/null +++ b/res/Master.strings.bank
@@ -0,0 +1 @@
fmod/Build/Desktop/Master.strings.bank \ No newline at end of file
diff --git a/res/fmod/.cache/fsbcache/Desktop/1FE16EE9.fobj b/res/fmod/.cache/fsbcache/Desktop/1FE16EE9.fobj index 32ffbc7..0ab6cd5 100644 --- a/res/fmod/.cache/fsbcache/Desktop/1FE16EE9.fobj +++ b/res/fmod/.cache/fsbcache/Desktop/1FE16EE9.fobj
Binary files differ
diff --git a/res/fmod/.cache/fsbcache/Desktop/3019A628.fobj b/res/fmod/.cache/fsbcache/Desktop/3019A628.fobj index d7c5f5b..29a7667 100644 --- a/res/fmod/.cache/fsbcache/Desktop/3019A628.fobj +++ b/res/fmod/.cache/fsbcache/Desktop/3019A628.fobj
Binary files differ
diff --git a/res/fmod/.cache/fsbcache/Desktop/3AA7253D.fobj b/res/fmod/.cache/fsbcache/Desktop/3AA7253D.fobj index 6407ce9..3348d10 100644 --- a/res/fmod/.cache/fsbcache/Desktop/3AA7253D.fobj +++ b/res/fmod/.cache/fsbcache/Desktop/3AA7253D.fobj
Binary files differ
diff --git a/res/fmod/.cache/fsbcache/Desktop/3C7FCD0D.fobj b/res/fmod/.cache/fsbcache/Desktop/3C7FCD0D.fobj index 3cc9fd7..8bb9e34 100644 --- a/res/fmod/.cache/fsbcache/Desktop/3C7FCD0D.fobj +++ b/res/fmod/.cache/fsbcache/Desktop/3C7FCD0D.fobj
Binary files differ
diff --git a/res/fmod/.cache/fsbcache/Desktop/53616416.fobj b/res/fmod/.cache/fsbcache/Desktop/53616416.fobj index 40284c4..721ec90 100644 --- a/res/fmod/.cache/fsbcache/Desktop/53616416.fobj +++ b/res/fmod/.cache/fsbcache/Desktop/53616416.fobj
Binary files differ
diff --git a/res/fmod/.cache/fsbcache/Desktop/57E359F0.fobj b/res/fmod/.cache/fsbcache/Desktop/57E359F0.fobj index 2438622..343a4ee 100644 --- a/res/fmod/.cache/fsbcache/Desktop/57E359F0.fobj +++ b/res/fmod/.cache/fsbcache/Desktop/57E359F0.fobj
Binary files differ
diff --git a/res/fmod/.cache/fsbcache/Desktop/5A3FB1CD.fobj b/res/fmod/.cache/fsbcache/Desktop/5A3FB1CD.fobj index 48acbe0..d2e1237 100644 --- a/res/fmod/.cache/fsbcache/Desktop/5A3FB1CD.fobj +++ b/res/fmod/.cache/fsbcache/Desktop/5A3FB1CD.fobj
Binary files differ
diff --git a/res/fmod/.cache/fsbcache/Desktop/71C77FCD.fobj b/res/fmod/.cache/fsbcache/Desktop/71C77FCD.fobj index ee4f169..8c473ab 100644 --- a/res/fmod/.cache/fsbcache/Desktop/71C77FCD.fobj +++ b/res/fmod/.cache/fsbcache/Desktop/71C77FCD.fobj
Binary files differ
diff --git a/res/fmod/.cache/fsbcache/Desktop/7FBDFDEC.fobj b/res/fmod/.cache/fsbcache/Desktop/7FBDFDEC.fobj index 9420705..d081c02 100644 --- a/res/fmod/.cache/fsbcache/Desktop/7FBDFDEC.fobj +++ b/res/fmod/.cache/fsbcache/Desktop/7FBDFDEC.fobj
Binary files differ
diff --git a/res/fmod/.cache/fsbcache/Desktop/8E6D2689.fobj b/res/fmod/.cache/fsbcache/Desktop/8E6D2689.fobj index 9cab574..0bbfa9d 100644 --- a/res/fmod/.cache/fsbcache/Desktop/8E6D2689.fobj +++ b/res/fmod/.cache/fsbcache/Desktop/8E6D2689.fobj
Binary files differ
diff --git a/res/fmod/.cache/fsbcache/Desktop/B1D38FCD.fobj b/res/fmod/.cache/fsbcache/Desktop/B1D38FCD.fobj index b9b2179..5134d87 100644 --- a/res/fmod/.cache/fsbcache/Desktop/B1D38FCD.fobj +++ b/res/fmod/.cache/fsbcache/Desktop/B1D38FCD.fobj
Binary files differ
diff --git a/res/fmod/.cache/fsbcache/Desktop/BA7E5A1C.fobj b/res/fmod/.cache/fsbcache/Desktop/BA7E5A1C.fobj index c719bce..2c18b9c 100644 --- a/res/fmod/.cache/fsbcache/Desktop/BA7E5A1C.fobj +++ b/res/fmod/.cache/fsbcache/Desktop/BA7E5A1C.fobj
Binary files differ
diff --git a/res/fmod/.cache/fsbcache/Desktop/C8D72C41.fobj b/res/fmod/.cache/fsbcache/Desktop/C8D72C41.fobj index a5764cd..50648aa 100644 --- a/res/fmod/.cache/fsbcache/Desktop/C8D72C41.fobj +++ b/res/fmod/.cache/fsbcache/Desktop/C8D72C41.fobj
Binary files differ
diff --git a/res/fmod/.cache/fsbcache/Desktop/E5DD54AC.fobj b/res/fmod/.cache/fsbcache/Desktop/E5DD54AC.fobj index e4b878b..c056e3f 100644 --- a/res/fmod/.cache/fsbcache/Desktop/E5DD54AC.fobj +++ b/res/fmod/.cache/fsbcache/Desktop/E5DD54AC.fobj
Binary files differ
diff --git a/res/fmod/.cache/fsbcache/Desktop/ED73FAF7.fobj b/res/fmod/.cache/fsbcache/Desktop/ED73FAF7.fobj index 57514a3..09cdb22 100644 --- a/res/fmod/.cache/fsbcache/Desktop/ED73FAF7.fobj +++ b/res/fmod/.cache/fsbcache/Desktop/ED73FAF7.fobj
Binary files differ
diff --git a/res/fmod/Metadata/Bank/{a23d2b1c-914e-48d4-8df9-80f6edad6c28}.xml b/res/fmod/Metadata/Bank/{a23d2b1c-914e-48d4-8df9-80f6edad6c28}.xml index 75781eb..4a6657c 100644 --- a/res/fmod/Metadata/Bank/{a23d2b1c-914e-48d4-8df9-80f6edad6c28}.xml +++ b/res/fmod/Metadata/Bank/{a23d2b1c-914e-48d4-8df9-80f6edad6c28}.xml
@@ -1,6 +1,9 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<objects serializationModel="Studio.01.10.00"> 2<objects serializationModel="Studio.01.10.00">
3 <object class="MasterBank" id="{a23d2b1c-914e-48d4-8df9-80f6edad6c28}"> 3 <object class="MasterBank" id="{a23d2b1c-914e-48d4-8df9-80f6edad6c28}">
4 <property name="name">
5 <value>Master</value>
6 </property>
4 <relationship name="folder"> 7 <relationship name="folder">
5 <destination>{ad94bc40-033a-43b5-b7c3-369573d66376}</destination> 8 <destination>{ad94bc40-033a-43b5-b7c3-369573d66376}</destination>
6 </relationship> 9 </relationship>
diff --git a/res/icon.png b/res/icon.png new file mode 100644 index 0000000..0b43935 --- /dev/null +++ b/res/icon.png
Binary files differ
diff --git a/res/icon128.png b/res/icon128.png new file mode 100644 index 0000000..eff7e8d --- /dev/null +++ b/res/icon128.png
Binary files differ
diff --git a/res/icon256.png b/res/icon256.png new file mode 100644 index 0000000..37b6894 --- /dev/null +++ b/res/icon256.png
Binary files differ
diff --git a/res/icon32.png b/res/icon32.png new file mode 100644 index 0000000..580c814 --- /dev/null +++ b/res/icon32.png
Binary files differ
diff --git a/res/icon64.png b/res/icon64.png new file mode 100644 index 0000000..b04357b --- /dev/null +++ b/res/icon64.png
Binary files differ
diff --git a/src/game.cpp b/src/game.cpp index a3aa7be..39828f4 100644 --- a/src/game.cpp +++ b/src/game.cpp
@@ -1,6 +1,6 @@
1#include "game.h" 1#include "game.h"
2#include <vector> 2#include <vector>
3#include <fov.h> 3#include "fov.h"
4#include <iostream> 4#include <iostream>
5#include <fstream> 5#include <fstream>
6#include <set> 6#include <set>
@@ -8,6 +8,7 @@
8#include "util.h" 8#include "util.h"
9#include "renderer.h" 9#include "renderer.h"
10#include "consts.h" 10#include "consts.h"
11#include "runtime.h"
11 12
12Game::Game(std::mt19937& rng, Muxer& muxer, Renderer& renderer) : 13Game::Game(std::mt19937& rng, Muxer& muxer, Renderer& renderer) :
13 rng(rng), 14 rng(rng),
@@ -35,7 +36,7 @@ Game::Game(std::mt19937& rng, Muxer& muxer, Renderer& renderer) :
35 tick(); 36 tick();
36 } while (!isInitialCaveBigEnough()); 37 } while (!isInitialCaveBigEnough());
37 38
38 std::ifstream textFile("../res/childoflight.txt"); 39 std::ifstream textFile(Runtime::getResourcePath("childoflight.txt"));
39 std::string line; 40 std::string line;
40 while (std::getline(textFile, line)) { 41 while (std::getline(textFile, line)) {
41 signTexts.push_back(line); 42 signTexts.push_back(line);
@@ -284,7 +285,7 @@ void Game::recalculateLighting()
284 if (game.map.inBounds(x, y)) 285 if (game.map.inBounds(x, y))
285 { 286 {
286 MapData& sourceData = *static_cast<MapData*>(source); 287 MapData& sourceData = *static_cast<MapData*>(source);
287 double lightRadius = static_cast<double>(sourceData.lightRadius); 288 //double lightRadius = static_cast<double>(sourceData.lightRadius);
288 289
289 if (!game.map.at(x,y).lit) 290 if (!game.map.at(x,y).lit)
290 { 291 {
@@ -302,7 +303,7 @@ void Game::recalculateLighting()
302 for (int x = map.getLeft(); x < map.getRight(); x++) 303 for (int x = map.getLeft(); x < map.getRight(); x++)
303 { 304 {
304 Source ls = Source::None; 305 Source ls = Source::None;
305 int lightRadius; 306 int lightRadius = 0;
306 307
307 if (renderPlayer && player_x == x && player_y == y) 308 if (renderPlayer && player_x == x && player_y == y)
308 { 309 {
diff --git a/src/game.h b/src/game.h index 3b092dd..914df53 100644 --- a/src/game.h +++ b/src/game.h
@@ -13,6 +13,7 @@
13#include "consts.h" 13#include "consts.h"
14#include "sign.h" 14#include "sign.h"
15#include "menu.h" 15#include "menu.h"
16#include "runtime.h"
16 17
17class Renderer; 18class Renderer;
18 19
@@ -88,7 +89,7 @@ public:
88 int player_oldx = 0; 89 int player_oldx = 0;
89 int player_oldy = 0; 90 int player_oldy = 0;
90 bool renderPlayer = true; 91 bool renderPlayer = true;
91 Animation playerAnim {"../res/player_anim.txt"}; 92 Animation playerAnim {Runtime::getResourcePath("player_anim.txt")};
92 93
93 int maxZoom = INIT_ZOOM; 94 int maxZoom = INIT_ZOOM;
94 int curZoom = INIT_ZOOM; 95 int curZoom = INIT_ZOOM;
diff --git a/src/main.cpp b/src/main.cpp index ae64079..0b9195f 100644 --- a/src/main.cpp +++ b/src/main.cpp
@@ -1,5 +1,4 @@
1#include <vector> 1#include <vector>
2#include <fov.h>
3#include <iostream> 2#include <iostream>
4#include <memory> 3#include <memory>
5#include "util.h" 4#include "util.h"
diff --git a/src/muxer.cpp b/src/muxer.cpp index 6ae6936..c276c0f 100644 --- a/src/muxer.cpp +++ b/src/muxer.cpp
@@ -1,6 +1,7 @@
1#include "muxer.h" 1#include "muxer.h"
2#include <iostream> 2#include <iostream>
3#include <fmod_errors.h> 3#include <fmod_errors.h>
4#include "runtime.h"
4 5
5void ERRCHECK_fn(FMOD_RESULT result, const char* file, int line) { 6void ERRCHECK_fn(FMOD_RESULT result, const char* file, int line) {
6 if (result != FMOD_OK) { 7 if (result != FMOD_OK) {
@@ -22,10 +23,10 @@ Muxer::Muxer() {
22 ERRCHECK(system_->initialize(1024, FMOD_STUDIO_INIT_NORMAL, FMOD_INIT_NORMAL, nullptr)); 23 ERRCHECK(system_->initialize(1024, FMOD_STUDIO_INIT_NORMAL, FMOD_INIT_NORMAL, nullptr));
23 24
24 FMOD::Studio::Bank* masterBank = nullptr; 25 FMOD::Studio::Bank* masterBank = nullptr;
25 ERRCHECK(system_->loadBankFile("../res/fmod/Build/Desktop/Master Bank.bank", FMOD_STUDIO_LOAD_BANK_NORMAL, &masterBank)); 26 ERRCHECK(system_->loadBankFile(Runtime::getResourcePath("Master.bank").c_str(), FMOD_STUDIO_LOAD_BANK_NORMAL, &masterBank));
26 27
27 FMOD::Studio::Bank* stringsBank = nullptr; 28 FMOD::Studio::Bank* stringsBank = nullptr;
28 ERRCHECK(system_->loadBankFile("../res/fmod/Build/Desktop/Master Bank.strings.bank", FMOD_STUDIO_LOAD_BANK_NORMAL, &stringsBank)); 29 ERRCHECK(system_->loadBankFile(Runtime::getResourcePath("Master.strings.bank").c_str(), FMOD_STUDIO_LOAD_BANK_NORMAL, &stringsBank));
29} 30}
30 31
31void Muxer::setPlayerLoc(int x, int y) { 32void Muxer::setPlayerLoc(int x, int y) {
diff --git a/src/renderer.cpp b/src/renderer.cpp index 724e297..09bddc9 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp
@@ -1,6 +1,7 @@
1#include "renderer.h" 1#include "renderer.h"
2#include <iostream> 2#include <iostream>
3#include "game.h" 3#include "game.h"
4#include "runtime.h"
4 5
5Renderer::Renderer() 6Renderer::Renderer()
6{ 7{
@@ -33,7 +34,7 @@ Renderer::Renderer()
33 } 34 }
34 35
35 texture_ptr origFade; 36 texture_ptr origFade;
36 loadTextureFromFile("../res/lighting.png", origFade); 37 loadTextureFromFile("lighting.png", origFade);
37 38
38 playerFade_ = texture_ptr( 39 playerFade_ = texture_ptr(
39 SDL_CreateTexture( 40 SDL_CreateTexture(
@@ -105,22 +106,22 @@ Renderer::Renderer()
105 SDL_SetRenderDrawColor(ren_.get(), 100, 100, 100, 255); 106 SDL_SetRenderDrawColor(ren_.get(), 100, 100, 100, 255);
106 SDL_RenderFillRect(ren_.get(), nullptr); 107 SDL_RenderFillRect(ren_.get(), nullptr);
107 108
108 loadTextureFromFile("../res/player.png", playerSheet_); 109 loadTextureFromFile("player.png", playerSheet_);
109 loadTextureFromFile("../res/runninbloods.png", tileset_); 110 loadTextureFromFile("runninbloods.png", tileset_);
110 loadTextureFromFile("../res/lamp.png", lamp_); 111 loadTextureFromFile("lamp.png", lamp_);
111 loadTextureFromFile("../res/read_instruction.png", readInstruction_); 112 loadTextureFromFile("read_instruction.png", readInstruction_);
112 loadTextureFromFile("../res/menu.png", menuBg_); 113 loadTextureFromFile("menu.png", menuBg_);
113 114
114 loadTextureFromFile("../res/title0.png", titles_[0]); 115 loadTextureFromFile("title0.png", titles_[0]);
115 SDL_QueryTexture(titles_[0].get(), nullptr, nullptr, &titleWidths_[0], &titleHeights_[0]); 116 SDL_QueryTexture(titles_[0].get(), nullptr, nullptr, &titleWidths_[0], &titleHeights_[0]);
116 117
117 loadTextureFromFile("../res/title1.png", titles_[1]); 118 loadTextureFromFile("title1.png", titles_[1]);
118 SDL_QueryTexture(titles_[1].get(), nullptr, nullptr, &titleWidths_[1], &titleHeights_[1]); 119 SDL_QueryTexture(titles_[1].get(), nullptr, nullptr, &titleWidths_[1], &titleHeights_[1]);
119 120
120 loadTextureFromFile("../res/title3.png", titles_[2]); 121 loadTextureFromFile("title3.png", titles_[2]);
121 SDL_QueryTexture(titles_[2].get(), nullptr, nullptr, &titleWidths_[2], &titleHeights_[2]); 122 SDL_QueryTexture(titles_[2].get(), nullptr, nullptr, &titleWidths_[2], &titleHeights_[2]);
122 123
123 font_ = font_ptr(TTF_OpenFont("../res/softsquare.ttf", 45)); 124 font_ = font_ptr(TTF_OpenFont(Runtime::getResourcePath("softsquare.ttf").c_str(), 45));
124 if (!font_) { 125 if (!font_) {
125 throw ttf_error(); 126 throw ttf_error();
126 } 127 }
@@ -553,7 +554,7 @@ void Renderer::renderTitle(int num, double fade) {
553} 554}
554 555
555void Renderer::loadTextureFromFile(std::string_view path, texture_ptr& texture) { 556void Renderer::loadTextureFromFile(std::string_view path, texture_ptr& texture) {
556 surface_ptr pfs(IMG_Load(path.data())); 557 surface_ptr pfs(IMG_Load(Runtime::getResourcePath(path).c_str()));
557 if (!pfs) 558 if (!pfs)
558 { 559 {
559 throw img_error(); 560 throw img_error();
diff --git a/src/runtime.h b/src/runtime.h new file mode 100644 index 0000000..a0e3a2c --- /dev/null +++ b/src/runtime.h
@@ -0,0 +1,13 @@
1#ifndef RUNTIME_H_A8DA6E1E
2#define RUNTIME_H_A8DA6E1E
3
4#include <string>
5#include <string_view>
6
7class Runtime {
8public:
9
10 static std::string getResourcePath(std::string_view filename);
11};
12
13#endif /* end of include guard: RUNTIME_H_A8DA6E1E */
diff --git a/src/runtime_macos.mm b/src/runtime_macos.mm new file mode 100644 index 0000000..b46e6f8 --- /dev/null +++ b/src/runtime_macos.mm
@@ -0,0 +1,16 @@
1#include "runtime.h"
2#import <Foundation/Foundation.h>
3
4std::string Runtime::getResourcePath(std::string_view filename) {
5 CFStringRef fileNameRef = CFStringCreateWithCString(kCFAllocatorDefault, filename.data(), kCFStringEncodingUTF8);
6 CFURLRef appUrlRef = CFBundleCopyResourceURL(CFBundleGetMainBundle(), fileNameRef, NULL, NULL);
7 CFStringRef filePathRef = CFURLCopyPath(appUrlRef);
8 const char* filePath = CFStringGetCStringPtr(filePathRef, kCFStringEncodingUTF8);
9 std::string result(filePath);
10
11 CFRelease(filePathRef);
12 CFRelease(appUrlRef);
13 CFRelease(fileNameRef);
14
15 return result;
16}
diff --git a/src/runtime_test.cpp b/src/runtime_test.cpp new file mode 100644 index 0000000..b4a6d34 --- /dev/null +++ b/src/runtime_test.cpp
@@ -0,0 +1,5 @@
1#include "runtime.h"
2
3std::string Runtime::getResourcePath(std::string_view name) {
4 return std::string("../res/") + std::string(name);
5}