Correct path for assets

This commit is contained in:
Gadgeteer 2023-07-16 18:14:36 +01:00
parent 1a25a70019
commit af6869a0d3
12 changed files with 23726 additions and 6342 deletions

View file

@ -1617,7 +1617,7 @@ dispatch_group_t concurrentGroup;
@end @end
const std::string getAssetPath() { const std::string getAssetPath() {
return [NSBundle.mainBundle.resourcePath stringByAppendingString: @"/../../data/"].UTF8String; return [NSBundle.mainBundle.resourcePath stringByAppendingString: @"/../../assets/"].UTF8String;
} }
const std::string getShaderBasePath() { return [NSBundle.mainBundle.resourcePath stringByAppendingString: @"/../../shaders/"].UTF8String; } const std::string getShaderBasePath() { return [NSBundle.mainBundle.resourcePath stringByAppendingString: @"/../../shaders/"].UTF8String; }

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>

View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN""http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>BuildSystemType</key>
<string>Latest</string>
</dict>
</plist>

View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>BuildLocationStyle</key>
<string>UseTargetSettings</string>
</dict>
</plist>

View file

@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
uuid = "11A13F5B-FF2A-4A2D-8A02-EEB3B748C400"
type = "1"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "0B6AD17C-3733-4493-BE26-EF5CBC55A1EA"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "base/vulkanexamplebase.cpp"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1620"
endingLineNumber = "1620"
landmarkName = "getAssetPath()"
landmarkType = "9">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "45E1529D-0A3F-43DE-8AE4-E07F99344E78"
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "base/vulkanexamplebase.cpp"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "1621"
endingLineNumber = "1621"
landmarkName = "getAssetPath()"
landmarkType = "9">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>

View file

@ -0,0 +1,454 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>SchemeUserState</key>
<dict>
<key>ALL_BUILD.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>71</integer>
</dict>
<key>ZERO_CHECK.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>45</integer>
</dict>
<key>base.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>13</integer>
</dict>
<key>bloom.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>40</integer>
</dict>
<key>computecloth.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>51</integer>
</dict>
<key>computecullandlod.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>32</integer>
</dict>
<key>computeheadless.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>61</integer>
</dict>
<key>computenbody.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>57</integer>
</dict>
<key>computeparticles.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>10</integer>
</dict>
<key>computeraytracing.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>18</integer>
</dict>
<key>computeshader.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>49</integer>
</dict>
<key>conditionalrender.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>41</integer>
</dict>
<key>conservativeraster.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>43</integer>
</dict>
<key>debugmarker.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>70</integer>
</dict>
<key>deferred.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>88</integer>
</dict>
<key>deferredmultisampling.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>20</integer>
</dict>
<key>deferredshadows.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>54</integer>
</dict>
<key>descriptorbuffer.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>69</integer>
</dict>
<key>descriptorindexing.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>35</integer>
</dict>
<key>descriptorsets.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>27</integer>
</dict>
<key>displacement.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>86</integer>
</dict>
<key>distancefieldfonts.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>31</integer>
</dict>
<key>dynamicrendering.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>80</integer>
</dict>
<key>dynamicstate.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>56</integer>
</dict>
<key>dynamicuniformbuffer.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>77</integer>
</dict>
<key>gears.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>24</integer>
</dict>
<key>geometryshader.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>72</integer>
</dict>
<key>gltfloading.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>36</integer>
</dict>
<key>gltfscenerendering.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>38</integer>
</dict>
<key>gltfskinning.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>46</integer>
</dict>
<key>graphicspipelinelibrary.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>60</integer>
</dict>
<key>hdr.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>14</integer>
</dict>
<key>imgui.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>33</integer>
</dict>
<key>indirectdraw.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>3</integer>
</dict>
<key>inlineuniformblocks.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>28</integer>
</dict>
<key>inputattachments.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>15</integer>
</dict>
<key>instancing.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>78</integer>
</dict>
<key>meshshader.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>79</integer>
</dict>
<key>multisampling.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>52</integer>
</dict>
<key>multithreading.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>67</integer>
</dict>
<key>multiview.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>63</integer>
</dict>
<key>negativeviewportheight.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>29</integer>
</dict>
<key>occlusionquery.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>6</integer>
</dict>
<key>offscreen.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>73</integer>
</dict>
<key>oit.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>64</integer>
</dict>
<key>parallaxmapping.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>25</integer>
</dict>
<key>particlefire.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
</dict>
<key>pbrbasic.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>4</integer>
</dict>
<key>pbribl.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>55</integer>
</dict>
<key>pbrtexture.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>11</integer>
</dict>
<key>pipelines.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>26</integer>
</dict>
<key>pipelinestatistics.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
</dict>
<key>pushconstants.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>76</integer>
</dict>
<key>pushdescriptors.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>7</integer>
</dict>
<key>radialblur.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>39</integer>
</dict>
<key>rayquery.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>68</integer>
</dict>
<key>raytracingbasic.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>37</integer>
</dict>
<key>raytracingcallable.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>34</integer>
</dict>
<key>raytracingintersection.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>74</integer>
</dict>
<key>raytracingreflections.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>58</integer>
</dict>
<key>raytracingsbtdata.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>83</integer>
</dict>
<key>raytracingshadows.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>21</integer>
</dict>
<key>raytracingtextures.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>62</integer>
</dict>
<key>renderheadless.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>48</integer>
</dict>
<key>screenshot.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>44</integer>
</dict>
<key>shaderobjects.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>75</integer>
</dict>
<key>shadowmapping.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>5</integer>
</dict>
<key>shadowmappingcascade.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>81</integer>
</dict>
<key>shadowmappingomni.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>87</integer>
</dict>
<key>specializationconstants.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>50</integer>
</dict>
<key>sphericalenvmapping.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>82</integer>
</dict>
<key>ssao.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>84</integer>
</dict>
<key>stencilbuffer.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>2</integer>
</dict>
<key>subpasses.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>30</integer>
</dict>
<key>terraintessellation.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>42</integer>
</dict>
<key>tessellation.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>17</integer>
</dict>
<key>textoverlay.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>8</integer>
</dict>
<key>texture.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>59</integer>
</dict>
<key>texture3d.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>19</integer>
</dict>
<key>texturearray.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>65</integer>
</dict>
<key>texturecubemap.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>16</integer>
</dict>
<key>texturecubemaparray.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>12</integer>
</dict>
<key>texturemipmapgen.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>22</integer>
</dict>
<key>texturesparseresidency.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>66</integer>
</dict>
<key>triangle.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>53</integer>
</dict>
<key>variablerateshading.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>85</integer>
</dict>
<key>vertexattributes.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>9</integer>
</dict>
<key>viewportarray.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>23</integer>
</dict>
<key>vulkanscene.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>47</integer>
</dict>
</dict>
</dict>
</plist>

View file

@ -490,10 +490,11 @@
LastUpgradeCheck = 0920; LastUpgradeCheck = 0920;
TargetAttributes = { TargetAttributes = {
1D6058900D05DD3D006BFB54 = { 1D6058900D05DD3D006BFB54 = {
DevelopmentTeam = VU3TCKU48B; DevelopmentTeam = S42TTF822Y;
}; };
A977BCBD1B66BB010067E5BF = { A977BCBD1B66BB010067E5BF = {
DevelopmentTeam = VU3TCKU48B; DevelopmentTeam = S42TTF822Y;
ProvisioningStyle = Automatic;
}; };
}; };
}; };
@ -628,7 +629,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
DEVELOPMENT_TEAM = VU3TCKU48B; DEVELOPMENT_TEAM = S42TTF822Y;
GCC_PREFIX_HEADER = ""; GCC_PREFIX_HEADER = "";
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)", "$(inherited)",
@ -641,6 +642,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 13.0; IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = "@executable_path"; LD_RUNPATH_SEARCH_PATHS = "@executable_path";
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/MoltenVK/dylib/iOS\""; LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/MoltenVK/dylib/iOS\"";
PRODUCT_BUNDLE_IDENTIFIER = "com.moltenvk.examples-team";
SDKROOT = iphoneos; SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
@ -652,7 +654,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
DEVELOPMENT_TEAM = VU3TCKU48B; DEVELOPMENT_TEAM = S42TTF822Y;
GCC_PREFIX_HEADER = ""; GCC_PREFIX_HEADER = "";
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)", "$(inherited)",
@ -663,6 +665,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 13.0; IPHONEOS_DEPLOYMENT_TARGET = 13.0;
LD_RUNPATH_SEARCH_PATHS = "@executable_path"; LD_RUNPATH_SEARCH_PATHS = "@executable_path";
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/MoltenVK/dylib/iOS\""; LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/MoltenVK/dylib/iOS\"";
PRODUCT_BUNDLE_IDENTIFIER = "com.moltenvk.examples-team";
SDKROOT = iphoneos; SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos"; SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
@ -675,7 +678,10 @@
buildSettings = { buildSettings = {
ARCHS = "$(ARCHS_STANDARD)"; ARCHS = "$(ARCHS_STANDARD)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES; COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = S42TTF822Y;
GCC_PREFIX_HEADER = ""; GCC_PREFIX_HEADER = "";
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)", "$(inherited)",
@ -687,6 +693,8 @@
LD_RUNPATH_SEARCH_PATHS = "@executable_path"; LD_RUNPATH_SEARCH_PATHS = "@executable_path";
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/MoltenVK/dylib/macOS\""; LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/MoltenVK/dylib/macOS\"";
MACOSX_DEPLOYMENT_TARGET = 10.11; MACOSX_DEPLOYMENT_TARGET = 10.11;
PRODUCT_BUNDLE_IDENTIFIER = "com.moltenvk.examples-team";
PROVISIONING_PROFILE_SPECIFIER = "";
SDKROOT = macosx; SDKROOT = macosx;
}; };
name = Debug; name = Debug;
@ -696,7 +704,10 @@
buildSettings = { buildSettings = {
ARCHS = "$(ARCHS_STANDARD)"; ARCHS = "$(ARCHS_STANDARD)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES; COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = S42TTF822Y;
GCC_PREFIX_HEADER = ""; GCC_PREFIX_HEADER = "";
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)", "$(inherited)",
@ -707,6 +718,8 @@
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/MoltenVK/dylib/macOS\""; LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/MoltenVK/dylib/macOS\"";
MACOSX_DEPLOYMENT_TARGET = 10.11; MACOSX_DEPLOYMENT_TARGET = 10.11;
ONLY_ACTIVE_ARCH = NO; ONLY_ACTIVE_ARCH = NO;
PRODUCT_BUNDLE_IDENTIFIER = "com.moltenvk.examples-team";
PROVISIONING_PROFILE_SPECIFIER = "";
SDKROOT = macosx; SDKROOT = macosx;
}; };
name = Release; name = Release;

File diff suppressed because it is too large Load diff

View file

@ -18,10 +18,10 @@
<string>6.0</string> <string>6.0</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.0</string> <string>1.0</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>LSApplicationCategoryType</key> <key>LSApplicationCategoryType</key>
<string></string> <string></string>
<key>UIMainStoryboardFile</key> <key>UIMainStoryboardFile</key>