Skip to content

A
AR.js

cqiang1993 / AR.js
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 0
Fork 0
A
AR.js

体验新版 GitCode，发现更多精彩内容 >>

提交 bc82c983 编写于 作者: J Jerome Etienne
浏览文件
操作

Last commit before release

上级 8025f378
展开全部 隐藏空白更改
内联 并排
Showing with 36 addition and 13 deletion
CHANGELOG.md
浏览文件 @ bc82c983
# 1.5.0-dev # 1.5.1
## aframe-ar.js ## aframe-ar.js
- aframe-ar.js - added link into webxr.io/augmented-website - aframe-ar.js - added link into webxr.io/augmented-website
......
README.md
浏览文件 @ bc82c983
...@@ -247,7 +247,7 @@ git checkout master ...@@ -247,7 +247,7 @@ git checkout master
git merge dev git merge dev
# tag the release # tag the release
git tag 1.4.10 git tag 1.5.1
# push the tag on github # push the tag on github
git push origin --tags git push origin --tags
......
aframe/build/aframe-ar.js
浏览文件 @ bc82c983
...@@ -5205,7 +5205,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype ); ...@@ -5205,7 +5205,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.5.0' ARjs.Context.REVISION = '1.5.1'
aframe/build/aframe-ar.min.js
浏览文件 @ bc82c983
此差异已折叠。
babylon.js/build/babylon-ar.js
浏览文件 @ bc82c983
...@@ -49315,7 +49315,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype ); ...@@ -49315,7 +49315,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.5.0' ARjs.Context.REVISION = '1.5.1'
babylon.js/build/babylon-ar.min.js
浏览文件 @ bc82c983
此差异已折叠。
babylon.js/examples/basic.html
浏览文件 @ bc82c983
...@@ -28,7 +28,30 @@ ...@@ -28,7 +28,30 @@
} }
</style> </style>
</head> </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"> <div id="canvasZone">
<canvas id="renderCanvas"></canvas> <canvas id="renderCanvas"></canvas>
</div> </div>
......
package.json
浏览文件 @ bc82c983
{ {
"name": "ar.js", "name": "ar.js",
"version": "1.5.0", "version": "1.5.1",
"description": "Efficient Augmented Reality for the Web", "description": "Efficient Augmented Reality for the Web",
"main": "three.js", "main": "three.js",
"scripts": { "scripts": {
......
three.js/build/ar.js
浏览文件 @ bc82c983
...@@ -5205,7 +5205,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype ); ...@@ -5205,7 +5205,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.5.0' ARjs.Context.REVISION = '1.5.1'
three.js/build/ar.min.js
浏览文件 @ bc82c983
此差异已折叠。
three.js/src/threex/threex-artoolkitcontext.js
浏览文件 @ bc82c983
...@@ -73,7 +73,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype ); ...@@ -73,7 +73,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.5.0' ARjs.Context.REVISION = '1.5.1'
......
webvr-polyfill/build/artoolkit-webvr-polyfill.js
浏览文件 @ bc82c983
...@@ -5205,7 +5205,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype ); ...@@ -5205,7 +5205,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.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.
先完成此消息的编辑！
想要评论请 注册 或