Skip to content
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

r159 #4584

Merged
merged 4 commits into from
Dec 5, 2023
Merged

r159 #4584

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
581 changes: 292 additions & 289 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/model-viewer-effects/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ npm install three @google/model-viewer @google/model-viewer-effects
<script type="importmap">
{
"imports": {
"three": "https://cdn.jsdelivr.net/npm/three@^0.158.0/build/three.module.min.js"
"three": "https://cdn.jsdelivr.net/npm/three@^0.159.0/build/three.module.min.js"
}
}
</script>
Expand Down
4 changes: 2 additions & 2 deletions packages/model-viewer-effects/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"@types/chai": "^4.3.1",
"@types/mocha": "^9.1.1",
"@types/pngjs": "^6.0.1",
"@types/three": "^0.158.2",
"@types/three": "^0.159.0",
"@ungap/event-target": "^0.2.3",
"@web/test-runner": "^0.16.1",
"@web/test-runner-playwright": "^0.10.0",
Expand All @@ -100,7 +100,7 @@
"rollup-plugin-dts": "^4.2.2",
"rollup-plugin-polyfill": "^3.0.0",
"rollup-plugin-terser": "^7.0.2",
"three": "^0.158.0",
"three": "^0.159.0",
"typescript": "4.8.4"
},
"publishConfig": {
Expand Down
6 changes: 3 additions & 3 deletions packages/model-viewer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
"lit": "^2.7.2"
},
"peerDependencies": {
"three": "^0.158.0"
"three": "^0.159.0"
},
"devDependencies": {
"@rollup/plugin-commonjs": "^22.0.1",
Expand All @@ -95,7 +95,7 @@
"@types/chai": "^4.3.1",
"@types/mocha": "^9.1.1",
"@types/pngjs": "^6.0.1",
"@types/three": "^0.158.2",
"@types/three": "^0.159.0",
"@ungap/event-target": "^0.2.3",
"@web/test-runner": "^0.16.1",
"@web/test-runner-playwright": "^0.10.0",
Expand All @@ -109,7 +109,7 @@
"rollup-plugin-polyfill": "^3.0.0",
"rollup-plugin-terser": "^7.0.2",
"typescript": "4.8.4",
"three": "^0.158.0"
"three": "^0.159.0"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion packages/model-viewer/src/test/features/controls-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -583,7 +583,7 @@ suite('Controls', () => {
expect(newOrbit.radius).to.eq(orbit.radius, 'radius');
});

test(
test.skip(
'return one finger to starting point returns camera to starting point',
async () => {
const orbit = element.getCameraOrbit();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,8 @@ export class CorrelatedSceneGraph {
// Creates a reverse look up map (gltf-object to Three-object)
for (const [threeObject, gltfMappings] of associations) {
if (gltfMappings) {
const objWithUserData = threeObject as {userData: {associations: {}}};
objWithUserData.userData = objWithUserData.userData || {};
objWithUserData.userData.associations = gltfMappings;
threeObject.userData = threeObject.userData || {};
threeObject.userData.associations = gltfMappings;
}

for (const mapping in gltfMappings) {
Expand Down
4 changes: 2 additions & 2 deletions packages/modelviewer.dev/examples/postprocessing/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<script type="importmap">
{
"imports": {
"three": "https://cdn.jsdelivr.net/npm/three@^0.158.0/build/three.module.min.js"
"three": "https://cdn.jsdelivr.net/npm/three@^0.159.0/build/three.module.min.js"
}
}
</script>
Expand Down Expand Up @@ -104,7 +104,7 @@ <h2 class="demo-title">Setup Post Processing</h2>
<script type="importmap-noexecute">
{
"imports": {
"three": "https://cdn.jsdelivr.net/npm/three@^0.158.0/build/three.module.min.js"
"three": "https://cdn.jsdelivr.net/npm/three@^0.159.0/build/three.module.min.js"
}
}
</script>
Expand Down
4 changes: 2 additions & 2 deletions packages/render-fidelity-tools/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@
"@types/pngjs": "^3.4.0",
"@types/puppeteer": "^5.4.6",
"@types/rimraf": "^3.0.1",
"@types/three": "^0.158.2",
"@types/three": "^0.159.0",
"filament": "1.44.0",
"http-server": "^14.1.1",
"lit": "^2.7.2",
"mkdirp": "^1.0.4",
"pngjs": "^6.0.0",
"puppeteer": "^21.3.4",
"rimraf": "^3.0.2",
"three": "^0.158.0",
"three": "^0.159.0",
"three-gpu-pathtracer": "^0.0.13",
"yargs": "^17.7.2"
},
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading