Skip to content

Commit

Permalink
remove magic-leap and fallback docs (#1261)
Browse files Browse the repository at this point in the history
  • Loading branch information
elalish authored Jun 9, 2020
1 parent 364fb41 commit 47c9f57
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 37 deletions.
8 changes: 3 additions & 5 deletions packages/model-viewer/src/model-viewer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import {ARMixin} from './features/ar.js';
import {ControlsMixin} from './features/controls.js';
import {EnvironmentMixin} from './features/environment.js';
import {LoadingMixin} from './features/loading.js';
import {MagicLeapMixin} from './features/magic-leap.js';
import {SceneGraphMixin} from './features/scene-graph.js';
import {StagingMixin} from './features/staging.js';
import ModelViewerElementBase from './model-viewer-base.js';
Expand All @@ -29,10 +28,9 @@ import {FocusVisiblePolyfillMixin} from './utilities/focus-visible.js';
// export {default as TextureUtils} from './three-components/TextureUtils';
// export * from 'three';

export const ModelViewerElement =
AnnotationMixin(SceneGraphMixin(MagicLeapMixin(StagingMixin(
EnvironmentMixin(ControlsMixin(ARMixin(LoadingMixin(AnimationMixin(
FocusVisiblePolyfillMixin(ModelViewerElementBase))))))))));
export const ModelViewerElement = AnnotationMixin(SceneGraphMixin(StagingMixin(
EnvironmentMixin(ControlsMixin(ARMixin(LoadingMixin(AnimationMixin(
FocusVisiblePolyfillMixin(ModelViewerElementBase)))))))));

export type ModelViewerElement = InstanceType<typeof ModelViewerElement>;

Expand Down
1 change: 0 additions & 1 deletion packages/model-viewer/src/test/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ import './features/controls-spec.js';
import './features/environment-spec.js';
import './features/loading-spec.js';
import './features/loading/status-announcer-spec.js';
import './features/magic-leap-spec.js';
import './features/scene-graph-spec.js';
import './features/ar-spec.js';

Expand Down
8 changes: 4 additions & 4 deletions packages/modelviewer.dev/examples/animation.html
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ <h4></h4>
</div>
<example-snippet stamp-to="demo-container-1" highlight-as="html">
<template>
<model-viewer camera-controls autoplay ar ar-modes="webxr scene-viewer quick-look fallback" shadow-intensity="1" src="../shared-assets/models/RobotExpressive.glb" alt="An animated 3D model of a robot"></model-viewer>
<model-viewer camera-controls autoplay ar shadow-intensity="1" src="../shared-assets/models/RobotExpressive.glb" alt="An animated 3D model of a robot"></model-viewer>
</template>
</example-snippet>
</div>
Expand All @@ -77,7 +77,7 @@ <h4></h4>
</div>
<example-snippet stamp-to="demo-container-2" highlight-as="html">
<template>
<model-viewer camera-controls autoplay animation-name="Running" ar ar-modes="webxr scene-viewer quick-look fallback" shadow-intensity="1" src="../shared-assets/models/RobotExpressive.glb" alt="An animate 3D model of a robot"></model-viewer>
<model-viewer camera-controls autoplay animation-name="Running" ar shadow-intensity="1" src="../shared-assets/models/RobotExpressive.glb" alt="An animate 3D model of a robot"></model-viewer>
</template>
</example-snippet>
</div>
Expand All @@ -94,7 +94,7 @@ <h4></h4>
</div>
<example-snippet stamp-to="demo-container-3" highlight-as="html">
<template>
<model-viewer id="paused-change-demo" camera-controls autoplay animation-name="Running" ar ar-modes="webxr scene-viewer quick-look fallback" shadow-intensity="1" src="../shared-assets/models/RobotExpressive.glb" alt="An animated 3D model of a robot"></model-viewer>
<model-viewer id="paused-change-demo" camera-controls autoplay animation-name="Running" ar shadow-intensity="1" src="../shared-assets/models/RobotExpressive.glb" alt="An animated 3D model of a robot"></model-viewer>
<script>
(() => {
const modelViewer = document.querySelector('#paused-change-demo');
Expand All @@ -121,7 +121,7 @@ <h4></h4>
</div>
<example-snippet stamp-to="demo-container-4" highlight-as="html">
<template>
<model-viewer id="xfade-demo" camera-controls animation-name="Running" ar ar-modes="webxr scene-viewer quick-look fallback" shadow-intensity="1" src="../shared-assets/models/RobotExpressive.glb" alt="An animated 3D model of a robot"></model-viewer>
<model-viewer id="xfade-demo" camera-controls animation-name="Running" ar shadow-intensity="1" src="../shared-assets/models/RobotExpressive.glb" alt="An animated 3D model of a robot"></model-viewer>
<script>
(() => {
const modelViewer = document.querySelector('#xfade-demo');
Expand Down
13 changes: 4 additions & 9 deletions packages/modelviewer.dev/examples/augmented-reality.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@
<a class="lockup" href="../index.html"><div class="icon-button icon-modelviewer-black"></div><h1>examples</h1></a>
<div class="heading">
<h2 class="demo-title">Augmented Reality</h2>
<h4>This demonstrates several augmented reality modes, including <code>webxr</code>, <code>scene-viewer</code>, <code>quick-look</code>, &amp; the accompanying attributes, <code>magic-leap</code>, <code>ios-src</code>, <code>quick-look-browsers</code>.</h4>
<h4>This demonstrates several augmented reality modes, including <code>webxr</code>, <code>scene-viewer</code>, <code>quick-look</code> &amp; the accompanying attributes, <code>ios-src</code>, <code>quick-look-browsers</code>.</h4>
</div>
<example-snippet stamp-to="demo-container-1" highlight-as="html">
<template>
<model-viewer src="../shared-assets/models/Astronaut.glb" ar ar-modes="webxr scene-viewer quick-look fallback" ar-scale="auto" magic-leap camera-controls alt="A 3D model of an astronaut" skybox-image="../shared-assets/environments/aircraft_workshop_01_1k.hdr" ios-src="../shared-assets/models/Astronaut.usdz"></model-viewer>
<model-viewer src="../shared-assets/models/Astronaut.glb" ar ar-modes="webxr scene-viewer quick-look" ar-scale="auto" camera-controls alt="A 3D model of an astronaut" skybox-image="../shared-assets/environments/aircraft_workshop_01_1k.hdr" ios-src="../shared-assets/models/Astronaut.usdz"></model-viewer>
</template>
</example-snippet>

Expand All @@ -76,9 +76,8 @@ <h3 style="margin-top: 40px; padding-bottom: 8px;" class="border-bottom">AR attr
Augmented Reality</a>.
Allowed values are "webxr", to launch the AR experience in the browser, "scene-viewer",
to launch the <a href="https://developers.google.com/ar/develop/java/scene-viewer">Scene Viewer</a>
app, "quick-look", to launch the iOS Quick Look app, and "fallback", to launch a fullscreen non-AR
experience in the event Scene Viewer fails to launch. You can specify any number of modes separated by
whitespace. Defaults to "webxr scene-viewer quick-look fallback".
app, "quick-look", to launch the iOS Quick Look app. You can specify any number of modes separated by
whitespace. Defaults to "webxr scene-viewer quick-look".
</li>
<li>
<div>ar-scale</div>
Expand All @@ -101,10 +100,6 @@ <h3 style="margin-top: 40px; padding-bottom: 8px;" class="border-bottom">AR attr
"chrome". You can specify any number of browsers separated by
whitespace, for example: "safari chrome". Defaults to "safari".</p>
</li>
<li>
<div>magic-leap</div>
<p>Provides augmented reality on Magic Leap's Helio browser. Requires that the primary model be a GLB file, and the <a href="https://www.npmjs.com/package/@magicleap/prismatic">@magicleap/prismatic</a> library.</p>
</li>
</ul>

</div>
Expand Down
4 changes: 0 additions & 4 deletions packages/modelviewer.dev/examples/fuzzer.html
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,6 @@ <h1>&lt;model-viewer&gt; - fuzzer test</h1>
'assets/Astronaut.glb',
'i-do-not-exist.usdz',
],
}, {
name: 'magic-leap',
probability: 0.2,
values: [],
}, {
name: 'preload',
probability: 0.2,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ <h4></h4>
</div>
<example-snippet stamp-to="demo-container-5" highlight-as="html">
<template>
<model-viewer camera-controls auto-rotate src="../shared-assets/models/odd-shape-labeled.glb" alt="An abstract 3D model with labeled origin and center" shadow-intensity="1" ar ar-modes="webxr scene-viewer quick-look fallback"></model-viewer>
<model-viewer camera-controls auto-rotate src="../shared-assets/models/odd-shape-labeled.glb" alt="An abstract 3D model with labeled origin and center" shadow-intensity="1" ar></model-viewer>
</template>
</example-snippet>
</div>
Expand All @@ -162,7 +162,7 @@ <h4></h4>
</div>
<example-snippet stamp-to="demo-container-6" highlight-as="html">
<template>
<model-viewer camera-controls camera-target="0m 0m 0m" auto-rotate src="../shared-assets/models/odd-shape-labeled.glb" alt="An abstract 3D model with labeled origin and center" shadow-intensity="1" ar ar-modes="webxr scene-viewer quick-look fallback"></model-viewer>
<model-viewer camera-controls camera-target="0m 0m 0m" auto-rotate src="../shared-assets/models/odd-shape-labeled.glb" alt="An abstract 3D model with labeled origin and center" shadow-intensity="1" ar></model-viewer>
</template>
</example-snippet>
</div>
Expand Down
14 changes: 2 additions & 12 deletions packages/modelviewer.dev/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,8 @@ <h3 class="grouping-title">Attributes</h3>
Augmented Reality</a>.
Allowed values are "webxr", to launch the AR experience in the browser, "scene-viewer",
to launch the <a href="https://developers.google.com/ar/develop/java/scene-viewer">Scene Viewer</a>
app, "quick-look", to launch the iOS Quick Look app, and "fallback", to launch a fullscreen non-AR
experience in the event Scene Viewer fails to launch. You can specify any number of modes separated by
whitespace. Defaults to "webxr scene-viewer quick-look fallback".
app, "quick-look", to launch the iOS Quick Look app. You can specify any number of modes separated by
whitespace. Defaults to "webxr scene-viewer quick-look".
</li>
<li>
<div>ar-scale</div>
Expand Down Expand Up @@ -294,15 +293,6 @@ <h3 class="grouping-title">Attributes</h3>
href="https://github.com/GoogleWebComponents/model-viewer#augmented-reality">Augmented
Reality</a>.</p>
</li>
<li>
<div>magic-leap</div>
<p>Enables the ability to view models in AR when viewing content
on <a href="https://magicleaphelio.com/">Magic Leap's Helio</a>
browser, requires that src is a GLB model, and requires the
inclusion of the <a
href="https://www.npmjs.com/package/@magicleap/prismatic">@magicleap/prismatic</a>
library.</p>
</li>
<li>
<div>max-camera-orbit</div>
<p>Set the maximum orbital values of the camera. Takes values in
Expand Down

0 comments on commit 47c9f57

Please sign in to comment.