提交 bc82c983 编写于 作者: J Jerome Etienne

Last commit before release

上级 8025f378
# 1.5.0-dev
# 1.5.1
## aframe-ar.js
- aframe-ar.js - added link into webxr.io/augmented-website
......
......@@ -247,7 +247,7 @@ git checkout master
git merge dev
# tag the release
git tag 1.4.10
git tag 1.5.1
# push the tag on github
git push origin --tags
......
......@@ -5205,7 +5205,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype );
// ARjs.Context.baseURL = '../'
// default to github page
ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/'
ARjs.Context.REVISION = '1.5.0'
ARjs.Context.REVISION = '1.5.1'
此差异已折叠。
......@@ -49315,7 +49315,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype );
// ARjs.Context.baseURL = '../'
// default to github page
ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/'
ARjs.Context.REVISION = '1.5.0'
ARjs.Context.REVISION = '1.5.1'
此差异已折叠。
......@@ -28,7 +28,30 @@
}
</style>
</head>
<body>
<body><div style='position: absolute; top: 10px; width:100%; text-align: center; z-index: 1;'>
<a href='https://github.com/jeromeetienne/AR.js/' target='_blank'>AR.js</a> - Session API demo with multi tracking and hit testing
- by <a href='https://twitter.com/jerome_etienne' target='_blank'>@jerome_etienne</a>
<br/>
Marker image
<a href='../../data/images/hiro.jpg' target='_blank'>hiro for artoolkit</a>
/
<a href='../../three.js/threex/threex-aruco/examples/images/1001.png' target='_blank'>1001 for aruco</a>
<br/>
<strong>Tracking Backend:</strong>
<a href='#artoolkit' onclick='location.reload()'>artoolkit</a>
/
<a href='#aruco' onclick='location.reload()'>aruco</a>
/
<a href='#area-artoolkit' onclick='location.reload()'>area artoolkit</a>
/
<a href='#area-aruco' onclick='location.reload()'>area aruco</a>
/
<a href='#tango' onclick='location.reload()'>tango</a>
/
<a href='#best' onclick='location.reload()'>best</a>
<div id="arjsDebugUIContainer"></div>
</div>
<div id="canvasZone">
<canvas id="renderCanvas"></canvas>
</div>
......
{
"name": "ar.js",
"version": "1.5.0",
"version": "1.5.1",
"description": "Efficient Augmented Reality for the Web",
"main": "three.js",
"scripts": {
......
......@@ -5205,7 +5205,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype );
// ARjs.Context.baseURL = '../'
// default to github page
ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/'
ARjs.Context.REVISION = '1.5.0'
ARjs.Context.REVISION = '1.5.1'
此差异已折叠。
......@@ -73,7 +73,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype );
// ARjs.Context.baseURL = '../'
// default to github page
ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/'
ARjs.Context.REVISION = '1.5.0'
ARjs.Context.REVISION = '1.5.1'
......
......@@ -5205,7 +5205,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype );
// ARjs.Context.baseURL = '../'
// default to github page
ARjs.Context.baseURL = 'https://jeromeetienne.github.io/AR.js/three.js/'
ARjs.Context.REVISION = '1.5.0'
ARjs.Context.REVISION = '1.5.1'
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册