Skip to content

Commit 97d2c1a

Browse files
kalwaltkalwalt
committed
upgrade three.js and aframe
- three.js/examples/basic.html with the three.js lib loaded thanks to importmap
1 parent 0259764 commit 97d2c1a

10 files changed

+663
-466
lines changed

‎aframe/build/aframe-ar-location-only.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎aframe/build/aframe-ar-new-location-only.js

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎aframe/build/aframe-ar-nft.js

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎aframe/build/aframe-ar.js

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package-lock.json

Lines changed: 638 additions & 452 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
"format-check": "prettier --check .",
88
"format": "prettier --write .",
99
"test": "echo \"Error: no test specified\" && exit 1",
10-
"build": "./node_modules/.bin/webpack --mode=production",
11-
"build:dev": "./node_modules/.bin/webpack --mode=development --progress --watch",
10+
"build": "webpack --mode=production",
11+
"build:dev": "webpack --mode=development --progress --watch",
1212
"server": "npx http-server -c -1",
1313
"prepare": "husky install"
1414
},
@@ -60,8 +60,8 @@
6060
},
6161
"dependencies": {
6262
"@ar-js-org/artoolkit5-js": "^0.3.0",
63-
"aframe": "^1.3.0",
64-
"three": "^0.150.0"
63+
"aframe": "^1.6.0",
64+
"three": "^0.164.0"
6565
},
6666
"lint-staged": {
6767
"*.js": "prettier --write"

‎three.js/build/ar-threex-location-only.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎three.js/build/ar-threex.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎three.js/build/ar.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎three.js/examples/basic.html

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
<!DOCTYPE html>
22
<meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
3-
<!-- three.js library -->
4-
<script src='vendor/three.js/build/three.min.js'></script>
3+
<!-- import three.js library as a module-->
4+
<script type="importmap">
5+
{
6+
"imports": {
7+
"three": "./vendor/three.js/build/three.module.min.js",
8+
}
9+
}
10+
</script>
511
<!-- ar.js -->
612
<script src="../build/ar-threex.js"></script>
713
<script>THREEx.ArToolkitContext.baseURL = '../'</script>
@@ -12,7 +18,9 @@
1218
<br />
1319
Contact me any time at <a href='https://twitter.com/nicolocarp' target='_blank'>@nicolocarp</a>
1420
</div>
15-
<script>
21+
<script type="module">
22+
import * as THREE from 'three'
23+
1624
//////////////////////////////////////////////////////////////////////////////////
1725
// Init
1826
//////////////////////////////////////////////////////////////////////////////////

0 commit comments

Comments
 (0)