提交 6b6c8ed0 编写于 作者: N nicolo.carpignoli

Last commit before release

上级 ccb11fbb
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
This one is mainly for [me](@jerome_etienne) to remember :) This one is mainly for [me](@jerome_etienne) to remember :)
```bash ```bash
# Update CHANGELOG.md - remove the -dev into version # Update following files:
atom CHANGELOG.md CHANGELOG.md
three.js/src/threex/threex-artoolkitcontext.js
# replace REVISION to the proper version, search/replace on the version string should do it package.json
atom three.js/src/threex/threex-artoolkitcontext.js package.json README.md README.md
# Rebuild and minify everything - aka a-frame and three.js # Rebuild and minify everything - aka a-frame and three.js
make minify make minify
...@@ -22,7 +22,7 @@ git checkout master ...@@ -22,7 +22,7 @@ git checkout master
git merge dev git merge dev
# tag the release # tag the release
git tag 1.5.5 git tag <tag>
# push the tag on github # push the tag on github
git push origin --tags git push origin --tags
...@@ -30,7 +30,7 @@ git push origin --tags ...@@ -30,7 +30,7 @@ git push origin --tags
# push commits tag on github # push commits tag on github
git push git push
# update npm package.json # publish on NPM (only if have proper credentials)
npm publish npm publish
# Come back to dev branch # Come back to dev branch
......
...@@ -5308,7 +5308,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype ); ...@@ -5308,7 +5308,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype );
// ARjs.Context.baseURL = '../' // ARjs.Context.baseURL = '../'
// default to github page // default to github page
ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/' ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/'
ARjs.Context.REVISION = '1.7.3'; ARjs.Context.REVISION = '1.7.4';
/** /**
* Create a default camera for this trackingBackend * Create a default camera for this trackingBackend
因为 它太大了无法显示 source diff 。你可以改为 查看blob
...@@ -6,12 +6,10 @@ ...@@ -6,12 +6,10 @@
<script> <script>
window.addEventListener('camera-init', (data) => { window.addEventListener('camera-init', (data) => {
console.log('camera-init', data); console.log('camera-init', data);
// TODO: Add your own code
}) })
window.addEventListener('camera-error', (error) => { window.addEventListener('camera-error', (error) => {
console.log('camera-error', error); console.log('camera-error', error);
// TODO: Add your own code e.g. splash screen, message to user, etc.
}) })
AFRAME.registerComponent('registerevents', { AFRAME.registerComponent('registerevents', {
......
{ {
"name": "ar.js", "name": "ar.js",
"version": "1.7.3", "version": "1.7.4",
"description": "Efficient Augmented Reality for the Web", "description": "Efficient Augmented Reality for the Web",
"main": "", "main": "",
"scripts": { "scripts": {
......
...@@ -5308,7 +5308,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype ); ...@@ -5308,7 +5308,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype );
// ARjs.Context.baseURL = '../' // ARjs.Context.baseURL = '../'
// default to github page // default to github page
ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/' ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/'
ARjs.Context.REVISION = '1.7.3'; ARjs.Context.REVISION = '1.7.4';
/** /**
* Create a default camera for this trackingBackend * Create a default camera for this trackingBackend
...@@ -2574,7 +2574,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype ); ...@@ -2574,7 +2574,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype );
// ARjs.Context.baseURL = '../' // ARjs.Context.baseURL = '../'
// default to github page // default to github page
ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/' ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/'
ARjs.Context.REVISION = '1.7.3'; ARjs.Context.REVISION = '1.7.4';
/** /**
* Create a default camera for this trackingBackend * Create a default camera for this trackingBackend
......
因为 它太大了无法显示 source diff 。你可以改为 查看blob
因为 它太大了无法显示 source diff 。你可以改为 查看blob
...@@ -53806,7 +53806,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype ); ...@@ -53806,7 +53806,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype );
// ARjs.Context.baseURL = '../' // ARjs.Context.baseURL = '../'
// default to github page // default to github page
ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/' ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/'
ARjs.Context.REVISION = '1.7.3'; ARjs.Context.REVISION = '1.7.4';
/** /**
* Create a default camera for this trackingBackend * Create a default camera for this trackingBackend
因为 它太大了无法显示 source diff 。你可以改为 查看blob
...@@ -76,7 +76,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype ); ...@@ -76,7 +76,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype );
// ARjs.Context.baseURL = '../' // ARjs.Context.baseURL = '../'
// default to github page // default to github page
ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/' ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/'
ARjs.Context.REVISION = '1.7.3'; ARjs.Context.REVISION = '1.7.4';
/** /**
* Create a default camera for this trackingBackend * Create a default camera for this trackingBackend
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册