Skip to content

Fix script tag position #10

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.

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
33 changes: 17 additions & 16 deletions autorotate.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,22 +55,23 @@ <h2>JavaScript:</h2>
alt="An image of a model of a teapot" />
</model>
</div>
</body>
<script type="module">
let initialTransform;
const model = document.querySelector('model');
await model.ready;
initialTransform = model.entityTransform.translate(0, 0, -0.05);
requestAnimationFrame(update);

function update() {
try {
const angleY = performance.now() / 10;
model.entityTransform = initialTransform.rotate(0, angleY, 0);
} catch (error) {
console.warn('failed to set transform', error);
}
<script type="module">
let initialTransform;
const model = document.querySelector('model');
await model.ready;
initialTransform = model.entityTransform.translate(0, 0, -0.05);
requestAnimationFrame(update);
}
</script>

function update() {
try {
const angleY = performance.now() / 10;
model.entityTransform = initialTransform.rotate(0, angleY, 0);
} catch (error) {
console.warn('failed to set transform', error);
}
requestAnimationFrame(update);
}
</script>
</body>
</html>
16 changes: 8 additions & 8 deletions basic-blob-url.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ <h2>JavaScript</h2>
alt="An image of a model of a teapot" />
</model>
</div>
</body>

<script type="module">
const model = document.querySelector('model');
const { src, type } = model.dataset;
const bytes = await (await fetch(src)).bytes();
const srcString = URL.createObjectURL(new Blob([bytes], { type }));
model.setAttribute('src', srcString);
</script>
<script type="module">
const model = document.querySelector('model');
const { src, type } = model.dataset;
const bytes = await (await fetch(src)).bytes();
const srcString = URL.createObjectURL(new Blob([bytes], { type }));
model.setAttribute('src', srcString);
</script>
</body>
</html>
44 changes: 23 additions & 21 deletions css-scale.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,40 +13,42 @@
</style>
</head>
<body>
<h1>Model: CSS scale test</h1>
<hr />
<p>
This model has a CSS transform scale applied to it. Click the button to
toggle the scale.
</p>
<div class="container">
<h1>Model: CSS scale test</h1>
<hr />
<p>
This model has a CSS transform scale applied to it. Click the button to
toggle the scale.
</p>

<h2>CSS</h2>
<pre>
<h2>CSS</h2>
<pre>
.scale {
transform: scale(0.5, 1);
}
</pre
>
>

<h2>HTML</h2>
<pre>
<h2>HTML</h2>
<pre>
&lt;model alt="A model of a teapot" class="scale"&gt;
&lt;source src="./teapot.usdz" type="model/vnd.usdz+zip" /&gt;
&lt;source src="./teapot.glb" type="model/gltf-binary" /&gt;
&lt;/model&gt;
</pre
>
>

<model alt="A model of a teapot" class="scale">
<source src="./teapot.usdz" type="model/vnd.usdz+zip" />
<source src="./teapot.glb" type="model/gltf-binary" />
<img
src="./teapot-fallback-black.jpg"
alt="An image of a model of a teapot" />
</model>
<br />
<model alt="A model of a teapot" class="scale">
<source src="./teapot.usdz" type="model/vnd.usdz+zip" />
<source src="./teapot.glb" type="model/gltf-binary" />
<img
src="./teapot-fallback-black.jpg"
alt="An image of a model of a teapot" />
</model>
<br />

<button id="toggle-scale">Toggle Scale</button>
<button id="toggle-scale">Toggle Scale</button>
</div>

<script type="module">
const model = document.querySelector('model');
Expand Down
18 changes: 9 additions & 9 deletions currenttime.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ <h2>JavaScript</h2>
<span id="timelabel"></span>
<input type="range" min="0" max="1" value="0" step="0.02" id="time" />
</div>
</body>

<script type="module">
const model = document.querySelector('model');
await model.ready;
time.addEventListener('input', (e) => {
timelabel.innerHTML = (time.value * model.duration).toFixed(1) + 's';
model.currentTime = time.value * model.duration;
});
</script>
<script type="module">
const model = document.querySelector('model');
await model.ready;
time.addEventListener('input', (e) => {
timelabel.innerHTML = (time.value * model.duration).toFixed(1) + 's';
model.currentTime = time.value * model.duration;
});
</script>
</body>
</html>
36 changes: 19 additions & 17 deletions data-url.html

Large diffs are not rendered by default.

140 changes: 70 additions & 70 deletions jsorbit.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,89 +26,89 @@ <h2>Result</h2>
</model>
<div id="log"></div>
</div>
</body>

<script type="module">
let startDragX, startDragY, omegaX, omegaY;
<script type="module">
let startDragX, startDragY, omegaX, omegaY;

const VERTICAL_DRAG_FACTOR = 7;
const HORIZONTAL_DRAG_FACTOR = 5;
const VERTICAL_RELEASE_DECAY = 0.9;
const HORIZONTAL_RELEASE_DECAY = 0.94;
const INPUT_SMOOTH_FACTOR = 0.85;
const VERTICAL_DRAG_FACTOR = 7;
const HORIZONTAL_DRAG_FACTOR = 5;
const VERTICAL_RELEASE_DECAY = 0.9;
const HORIZONTAL_RELEASE_DECAY = 0.94;
const INPUT_SMOOTH_FACTOR = 0.85;

let dx = 0;
let dy = 0;
let smoothDX = 0;
let smoothDY = 0;
let prevX = 0;
let curX = 0;
let vX = 0;
let errors = {};
let dx = 0;
let dy = 0;
let smoothDX = 0;
let smoothDY = 0;
let prevX = 0;
let curX = 0;
let vX = 0;
let errors = {};

let pointerDown = false;
let initialXfo;
let pointerDown = false;
let initialXfo;

function tick() {
requestAnimationFrame(tick);
try {
if (!pointerDown) {
dy *= VERTICAL_RELEASE_DECAY;
vX *= HORIZONTAL_RELEASE_DECAY;
dx += vX;
}
function tick() {
requestAnimationFrame(tick);
try {
if (!pointerDown) {
dy *= VERTICAL_RELEASE_DECAY;
vX *= HORIZONTAL_RELEASE_DECAY;
dx += vX;
}

smoothDX =
(1 - INPUT_SMOOTH_FACTOR) * dx + INPUT_SMOOTH_FACTOR * smoothDX;
smoothDY =
(1 - INPUT_SMOOTH_FACTOR) * dy + INPUT_SMOOTH_FACTOR * smoothDY;
smoothDX =
(1 - INPUT_SMOOTH_FACTOR) * dx + INPUT_SMOOTH_FACTOR * smoothDX;
smoothDY =
(1 - INPUT_SMOOTH_FACTOR) * dy + INPUT_SMOOTH_FACTOR * smoothDY;

model.entityTransform = initialXfo
.rotate(smoothDY / VERTICAL_DRAG_FACTOR, 0, 0)
.rotate(0, smoothDX / HORIZONTAL_DRAG_FACTOR, 0);
} catch (err) {
errors[err.message] = errors[err.message] || 0;
errors[err.message]++;
log.innerText =
'errors:' +
Object.keys(errors)
.map((type) => type + ':' + errors[type])
.join('<br>');
model.entityTransform = initialXfo
.rotate(smoothDY / VERTICAL_DRAG_FACTOR, 0, 0)
.rotate(0, smoothDX / HORIZONTAL_DRAG_FACTOR, 0);
} catch (err) {
errors[err.message] = errors[err.message] || 0;
errors[err.message]++;
log.innerText =
'errors:' +
Object.keys(errors)
.map((type) => type + ':' + errors[type])
.join('<br>');
}
}
}

const model = document.querySelector('model');
const model = document.querySelector('model');

await model.ready;
initialXfo = model.entityTransform;
await model.ready;
initialXfo = model.entityTransform;

model.addEventListener('touchstart', (e) => {
e.preventDefault();
e.stopImmediatePropagation();
document.body.classList.add('noscroll');
});
model.addEventListener('touchstart', (e) => {
e.preventDefault();
e.stopImmediatePropagation();
document.body.classList.add('noscroll');
});

model.addEventListener('pointerdown', (e) => {
pointerDown = true;
startDragX = e.clientX - dx;
startDragY = e.clientY;
vX = 0;
});
model.addEventListener('pointerdown', (e) => {
pointerDown = true;
startDragX = e.clientX - dx;
startDragY = e.clientY;
vX = 0;
});

window.addEventListener('pointermove', (e) => {
if (pointerDown) {
dx = e.clientX - startDragX;
dy = e.clientY - startDragY;
prevX = curX;
curX = e.clientX;
}
});
window.addEventListener('pointermove', (e) => {
if (pointerDown) {
dx = e.clientX - startDragX;
dy = e.clientY - startDragY;
prevX = curX;
curX = e.clientX;
}
});

window.addEventListener('pointerup', (e) => {
pointerDown = false;
vX = curX - prevX;
});
window.addEventListener('pointerup', (e) => {
pointerDown = false;
vX = curX - prevX;
});

requestAnimationFrame(tick);
</script>
requestAnimationFrame(tick);
</script>
</body>
</html>
22 changes: 11 additions & 11 deletions playbackrate.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@ <h2>JavaScript</h2>
<span id="ratelabel"></span>
<input type="range" min="0" max="2" value="1" step="0.1" id="rate" />
</div>
</body>

<script type="module">
const model = document.querySelector('model');
await model.ready;
model.playbackRate = 1;
rate.addEventListener('input', (e) => {
var rateSq = Math.pow(rate.value, 2);
ratelabel.innerHTML = (rateSq * 100).toFixed() + '%';
model.playbackRate = rateSq;
});
</script>
<script type="module">
const model = document.querySelector('model');
await model.ready;
model.playbackRate = 1;
rate.addEventListener('input', (e) => {
var rateSq = Math.pow(rate.value, 2);
ratelabel.innerHTML = (rateSq * 100).toFixed() + '%';
model.playbackRate = rateSq;
});
</script>
</body>
</html>