Skip to content

Support extended AR QuickLook parameters when auto generating USDZ blob #3434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elalish merged 3 commits into from
May 13, 2022
Merged

Support extended AR QuickLook parameters when auto generating USDZ blob #3434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f39038
replicate src hash to usdz blob url
milesgreen May 9, 2022
80c6211
fixed auto usdz params test case
milesgreen May 10, 2022
f15e3a6
expanded auto usdz test case
milesgreen May 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions packages/model-viewer/src/features/ar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,15 @@ configuration or device capabilities');
const objectURL = generateUsdz ? await this.prepareUSDZ() : this.iosSrc!;
const modelUrl = new URL(objectURL, self.location.toString());

if(generateUsdz){
const location = self.location.toString();
const locationUrl = new URL(location);
const srcUrl = new URL(this.src!, locationUrl);
if(srcUrl.hash){
modelUrl.hash = srcUrl.hash;
Comment thread
milesgreen marked this conversation as resolved.
}
}

if (this.arScale === 'fixed') {
if (modelUrl.hash) {
modelUrl.hash += '&';
Expand Down
36 changes: 36 additions & 0 deletions packages/model-viewer/src/test/features/ar-spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,42 @@ suite('ModelViewerElementBase with ARMixin', () => {
expect(url.hash).to.equal(
'#custom=path-to-banner.html&allowsContentScaling=0');
});

test('replicate src hash to usdz blob url', async () => {
element.src = assetPath('models/cube.gltf')+'#custom=path-to-banner.html';
element.arModes = 'webxr scene-viewer quick-look';

await (element as any)[$openIOSARQuickLook]();

expect(intentUrls.length).to.be.equal(1);

const url = new URL(intentUrls[0]);

expect(url.protocol).to.equal(
'blob:');

expect(url.hash).to.equal(
'#custom=path-to-banner.html');
});

test('replicate src hash to usdz blob and set hash for fixed scale', async () => {
element.src = assetPath('models/cube.gltf')+'#custom=path-to-banner.html';
element.arModes = 'webxr scene-viewer quick-look';
element.arScale = 'fixed';

await (element as any)[$openIOSARQuickLook]();

expect(intentUrls.length).to.be.equal(1);

const url = new URL(intentUrls[0]);

expect(url.protocol).to.equal(
'blob:');

expect(url.hash).to.equal(
'#custom=path-to-banner.html&allowsContentScaling=0');
});

});
});

Expand Down