Allow iOS gltf-viewer to load models from documents directory (#4327)

This commit is contained in:
Ben Doherty
2021-07-15 16:42:59 -07:00
committed by GitHub
parent cece128bb9
commit 2686b0bbac
2 changed files with 55 additions and 4 deletions
@@ -62,7 +62,28 @@ using namespace utils;
self.title = @"https://google.github.io/filament/remote";
[self createRenderables];
// Arguments:
// --model <path>
// path to glb or gltf file to load from documents directory
NSString* modelPath = nil;
NSArray* arguments = [[NSProcessInfo processInfo] arguments];
for (NSUInteger i = 0; i < arguments.count; i++) {
NSString* argument = arguments[i];
NSString* nextArgument = (i + 1) < arguments.count ? arguments[i + 1] : nil;
if ([argument isEqualToString:@"--model"]) {
if (!nextArgument) {
NSLog(@"Warning: --model option requires path argument. None provided.");
}
modelPath = nextArgument;
}
}
if (modelPath) {
[self createRenderablesFromPath:modelPath];
} else {
[self createDefaultRenderables];
}
[self createLights];
_server = new viewer::RemoteServer();
@@ -93,7 +114,37 @@ using namespace utils;
#pragma mark Private
- (void)createRenderables {
- (void)createRenderablesFromPath:(NSString*)model {
// Retrieve the full path to the model in the documents directory.
NSString* documentPath = [NSSearchPathForDirectoriesInDomains(
NSDocumentDirectory, NSUserDomainMask, YES) firstObject];
NSString* path = [documentPath stringByAppendingPathComponent:model];
if (![[NSFileManager defaultManager] fileExistsAtPath:path]) {
NSLog(@"Error: no file exists at %@", path);
return;
}
NSData* buffer = [NSData dataWithContentsOfFile:path];
if ([model hasSuffix:@".glb"]) {
[self.modelView loadModelGlb:buffer];
} else if ([model hasSuffix:@".gltf"]) {
NSString* parentDirectory = [path stringByDeletingLastPathComponent];
[self.modelView loadModelGltf:buffer
callback:^NSData*(NSString* uri) {
NSString* p = [parentDirectory stringByAppendingPathComponent:uri];
return [NSData dataWithContentsOfFile:p];
}];
} else {
NSLog(@"Error: file %@ must have either a .glb or .gltf extension.", path);
return;
}
self.title = model;
[self.modelView transformToUnitCube];
}
- (void)createDefaultRenderables {
NSString* path = [[NSBundle mainBundle] pathForResource:@"scene"
ofType:@"gltf"
inDirectory:@"BusterDrone"];
@@ -20,8 +20,6 @@
<string>1.0</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>NSCameraUsageDescription</key>
<string>The camera is used to display AR content.</string>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
@@ -33,5 +31,7 @@
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>UIFileSharingEnabled</key>
<true/>
</dict>
</plist>