Skip to content

Commit

Permalink
Updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@dmarcos
dmarcos committed Nov 14, 2023
1 parent c0e2783 commit 1a387fb
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 18 deletions.
2 changes: 1 addition & 1 deletion dist/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ script below from the [jsdelivr CDN](https://www.jsdelivr.com/):
```html
<html>
<head>
<script src="https://cdn.jsdelivr.net/gh/aframevr/aframe@f322d237cb6be356661a2334dfdf7459da6885c4/dist/aframe-master.min.js"></script>
<script src="https://cdn.jsdelivr.net/gh/aframevr/aframe@9b8609bd84a292ef97bf1e8589401ae0d3201280/dist/aframe-master.min.js"></script>
</head>
<body>
<a-scene>
Expand Down
4 changes: 2 additions & 2 deletions dist/aframe-master.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30714,7 +30714,7 @@ __webpack_require__(/*! ./core/a-mixin */ "./src/core/a-mixin.js");
// Extras.
__webpack_require__(/*! ./extras/components/ */ "./src/extras/components/index.js");
__webpack_require__(/*! ./extras/primitives/ */ "./src/extras/primitives/index.js");
console.log('A-Frame Version: 1.5.0 (Date 2023-11-14, Commit #59290b36)');
console.log('A-Frame Version: 1.5.0 (Date 2023-11-14, Commit #7856a058)');
console.log('THREE Version (https://github.com/supermedium/three.js):', pkg.dependencies['super-three']);
console.log('WebVR Polyfill Version:', pkg.dependencies['webvr-polyfill']);
module.exports = window.AFRAME = {
Expand Down Expand Up @@ -46824,7 +46824,7 @@ class WorkerPool {
/***/ ((module) => {

"use strict";
module.exports = JSON.parse('{"name":"aframe","version":"1.5.0","description":"A web framework for building virtual reality experiences.","homepage":"https://aframe.io/","main":"dist/aframe-master.js","scripts":{"dev":"cross-env INSPECTOR_VERSION=dev webpack serve --port 8080","dist":"node scripts/updateVersionLog.js && npm run dist:min && npm run dist:max","dist:max":"webpack --config webpack.config.js","dist:min":"webpack --config webpack.prod.config.js","docs":"markserv --dir docs --port 9001","preghpages":"node ./scripts/preghpages.js","ghpages":"ghpages -p gh-pages/","lint":"standardx -v | snazzy","lint:fix":"standardx --fix","precommit":"npm run lint","prepush":"node scripts/testOnlyCheck.js","prerelease":"node scripts/release.js 1.4.1 1.4.2","start":"npm run dev","start:https":"npm run dev -- --server-type https","test":"karma start ./tests/karma.conf.js","test:docs":"node scripts/docsLint.js","test:firefox":"npm test -- --browsers Firefox","test:chrome":"npm test -- --browsers Chrome","test:nobrowser":"NO_BROWSER=true npm test","test:node":"mocha --ui tdd tests/node"},"repository":"aframevr/aframe","license":"MIT","files":["dist/*","docs/**/*","src/**/*","vendor/**/*"],"dependencies":{"@ungap/custom-elements":"^1.1.0","buffer":"^6.0.3","custom-event-polyfill":"^1.0.6","debug":"ngokevin/debug#noTimestamp","deep-assign":"^2.0.0","load-bmfont":"^1.2.3","object-assign":"^4.0.1","present":"0.0.6","promise-polyfill":"^3.1.0","super-animejs":"^3.1.0","super-three":"0.158.0","three-bmfont-text":"dmarcos/three-bmfont-text#eed4878795be9b3e38cf6aec6b903f56acd1f695","webvr-polyfill":"^0.10.12"},"devDependencies":{"@babel/core":"^7.17.10","babel-loader":"^8.2.5","babel-plugin-istanbul":"^6.1.1","chai":"^4.3.6","chai-shallow-deep-equal":"^1.4.0","chalk":"^1.1.3","cross-env":"^7.0.3","css-loader":"^6.7.1","eslint":"^8.45.0","eslint-config-semistandard":"^17.0.0","eslint-config-standard-jsx":"^11.0.0","ghpages":"0.0.8","git-rev":"^0.2.1","glob":"^8.0.3","husky":"^0.11.7","jsdom":"^20.0.0","karma":"^6.4.0","karma-chai-shallow-deep-equal":"0.0.4","karma-chrome-launcher":"^3.1.1","karma-coverage":"^2.2.0","karma-env-preprocessor":"^0.1.1","karma-firefox-launcher":"^2.1.2","karma-mocha":"^2.0.1","karma-mocha-reporter":"^2.2.5","karma-sinon-chai":"^2.0.2","karma-webpack":"^5.0.0","markserv":"github:sukima/markserv#feature/fix-broken-websoketio-link","mocha":"^10.0.0","replace-in-file":"^2.5.3","shelljs":"^0.7.7","shx":"^0.2.2","sinon":"<12.0.0","sinon-chai":"^3.7.0","snazzy":"^5.0.0","standardx":"^7.0.0","style-loader":"^3.3.1","too-wordy":"ngokevin/too-wordy","webpack":"^5.73.0","webpack-cli":"^4.10.0","webpack-dev-server":"^4.11.0","webpack-merge":"^5.8.0","write-good":"^1.0.8"},"link":true,"standardx":{"ignore":["build/**","dist/**","examples/**/shaders/*.js","**/vendor/**"]},"keywords":["3d","aframe","cardboard","components","oculus","three","three.js","rift","vive","vr","quest","meta","web-components","webvr","webxr"],"engines":{"node":">= 4.6.0","npm":">= 2.15.9"}}');
module.exports = JSON.parse('{"name":"aframe","version":"1.5.0","description":"A web framework for building virtual reality experiences.","homepage":"https://aframe.io/","main":"dist/aframe-master.js","scripts":{"dev":"cross-env INSPECTOR_VERSION=dev webpack serve --port 8080","dist":"node scripts/updateVersionLog.js && npm run dist:min && npm run dist:max","dist:max":"webpack --config webpack.config.js","dist:min":"webpack --config webpack.prod.config.js","docs":"markserv --dir docs --port 9001","preghpages":"node ./scripts/preghpages.js","ghpages":"ghpages -p gh-pages/","lint":"standardx -v | snazzy","lint:fix":"standardx --fix","precommit":"npm run lint","prepush":"node scripts/testOnlyCheck.js","prerelease":"node scripts/release.js 1.4.2 1.5.0","start":"npm run dev","start:https":"npm run dev -- --server-type https","test":"karma start ./tests/karma.conf.js","test:docs":"node scripts/docsLint.js","test:firefox":"npm test -- --browsers Firefox","test:chrome":"npm test -- --browsers Chrome","test:nobrowser":"NO_BROWSER=true npm test","test:node":"mocha --ui tdd tests/node"},"repository":"aframevr/aframe","license":"MIT","files":["dist/*","docs/**/*","src/**/*","vendor/**/*"],"dependencies":{"@ungap/custom-elements":"^1.1.0","buffer":"^6.0.3","custom-event-polyfill":"^1.0.6","debug":"ngokevin/debug#noTimestamp","deep-assign":"^2.0.0","load-bmfont":"^1.2.3","object-assign":"^4.0.1","present":"0.0.6","promise-polyfill":"^3.1.0","super-animejs":"^3.1.0","super-three":"0.158.0","three-bmfont-text":"dmarcos/three-bmfont-text#eed4878795be9b3e38cf6aec6b903f56acd1f695","webvr-polyfill":"^0.10.12"},"devDependencies":{"@babel/core":"^7.17.10","babel-loader":"^8.2.5","babel-plugin-istanbul":"^6.1.1","chai":"^4.3.6","chai-shallow-deep-equal":"^1.4.0","chalk":"^1.1.3","cross-env":"^7.0.3","css-loader":"^6.7.1","eslint":"^8.45.0","eslint-config-semistandard":"^17.0.0","eslint-config-standard-jsx":"^11.0.0","ghpages":"0.0.8","git-rev":"^0.2.1","glob":"^8.0.3","husky":"^0.11.7","jsdom":"^20.0.0","karma":"^6.4.0","karma-chai-shallow-deep-equal":"0.0.4","karma-chrome-launcher":"^3.1.1","karma-coverage":"^2.2.0","karma-env-preprocessor":"^0.1.1","karma-firefox-launcher":"^2.1.2","karma-mocha":"^2.0.1","karma-mocha-reporter":"^2.2.5","karma-sinon-chai":"^2.0.2","karma-webpack":"^5.0.0","markserv":"github:sukima/markserv#feature/fix-broken-websoketio-link","mocha":"^10.0.0","replace-in-file":"^2.5.3","shelljs":"^0.7.7","shx":"^0.2.2","sinon":"<12.0.0","sinon-chai":"^3.7.0","snazzy":"^5.0.0","standardx":"^7.0.0","style-loader":"^3.3.1","too-wordy":"ngokevin/too-wordy","webpack":"^5.73.0","webpack-cli":"^4.10.0","webpack-dev-server":"^4.11.0","webpack-merge":"^5.8.0","write-good":"^1.0.8"},"link":true,"standardx":{"ignore":["build/**","dist/**","examples/**/shaders/*.js","**/vendor/**"]},"keywords":["3d","aframe","cardboard","components","oculus","three","three.js","rift","vive","vr","quest","meta","web-components","webvr","webxr"],"engines":{"node":">= 4.6.0","npm":">= 2.15.9"}}');

/***/ })

Expand Down
2 changes: 1 addition & 1 deletion dist/aframe-master.js.map
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/aframe-master.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/aframe-master.min.js.map
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion examples/mixed-reality/anchor/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta charset="utf-8">
<title>Anchor (Mixed Reality) • A-Frame</title>
<meta name="description" content="Anchor (Mixed Reality) • A-Frame">
<script src="../../dist/aframe-master.min.js"></script>
<script src="../../../dist/aframe-master.min.js"></script>
<script src="../../js/info-message.js"></script>
<script src="https://unpkg.com/[email protected]/dist/aframe-environment-component.min.js"></script>
<script src="anchor-grabbed-entity.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions examples/mixed-reality/real-world-meshing/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta charset="utf-8">
<title>Real World Meshing (Mixed Reality) • A-Frame</title>
<meta name="description" content="Real World Meshing (Mixed Reality) • A-Frame">
<script src="../../dist/aframe-master.min.js"></script>
<script src="../../../dist/aframe-master.min.js"></script>
<script src="../../js/info-message.js"></script>
<script src="../../js/center-model.js"></script>
<script src="hide-model-parts.js"></script>
Expand All @@ -25,7 +25,7 @@
* source: https://sketchfab.com/3d-models/coffee-963a9e5d288c42509886c5efd4fedd3c
* author: Rosnandie Yikie (https://sketchfab.com/rosnandie.yikie) -->
<a-asset-item id="coffee"
src="https://cdn.aframe.io/examples/mixed-reality/real-world-meshing/models/ coffee.glb"
src="https://cdn.aframe.io/examples/mixed-reality/real-world-meshing/models/coffee.glb"
response-type="arraybuffer" crossorigin="anonymous"></a-asset-item>
<a-asset-item id="messageText" src="message.html"></a-asset-item>
<a-mixin
Expand Down
14 changes: 5 additions & 9 deletions examples/showcase/hand-tracking-grab-controls/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta charset="utf-8">
<title>Hand Tracking Grab Controls • A-Frame</title>
<meta name="description" content="Hand Tracking Grab Controls • A-Frame">
<script src="../../dist/aframe-master.min.js"></script>
<script src="../../../dist/aframe-master.min.js"></script>
<script src="../../js/spatial-ui/spatial-utils.js"></script>
<script src="../../js/spatial-ui/spatial-modal.js"></script>
<script src="../../js/spatial-ui/spatial-hero-image.js"></script>
Expand All @@ -20,21 +20,17 @@
obb-collider="showColliders: false"
info-message="htmlSrc: #messageText">
<a-assets>
<a-asset-item id="pickle"
src="scene.gltf"
response-type="arraybuffer" crossorigin="anonymous"></a-asset-item>
<a-asset-item id="messageText" src="message.html"></a-asset-item>
<img id="ubuntu" src="./images/ubuntu-desktop.png" />
</a-assets>
<a-entity camera position="0 1.5 0" look-controls wasd-controls></a-entity>
<a-entity position="0 1.5 -0.5" gltf-model="#pickle" grabbable scale="0.04 0.04 0.04"></a-entity>
<!-- <a-entity position="0 1.7 -1" grabbable hover>
<a-entity position="0 1.6 -1" grabbable hover>
<a-entity spatial-modal="width: 1.81; height: 1.035; roundCorners: false">
<a-entity spatial-hero-image="src: #ubuntu; width: 1.775; height: 1; roundCorners: false" position="0 0 0.001"></a-entity>
</a-entity>
</a-entity> -->
<a-entity id="rightHand" laser-controls="hand: right" hand-tracking-grab-controls="hand: right"></a-entity>
<a-entity id="leftHand" laser-controls="hand: left" hand-tracking-grab-controls="hand: left"></a-entity>
</a-entity>
<a-entity id="rightHand" hand-tracking-grab-controls="hand: right"></a-entity>
<a-entity id="leftHand" hand-tracking-grab-controls="hand: left"></a-entity>
</a-scene>
</body>
</html>

0 comments on commit 1a387fb

Please sign in to comment.