Skip to content

A
AR.js

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

从无法访问的项目Fork

通知 2
Star 0
Fork 0
A
AR.js

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

提交 f8ef4374 编写于 作者: N nicolo.carpignoli
浏览文件
操作

Merge branch 'issue/clean-paths' into dev

上级 23da00d9 c350c24a
展开全部 隐藏空白更改
内联 并排
Showing with 550 addition and 651 deletion
CHANGELOG.md
浏览文件 @ f8ef4374
# 1.7.3
- added events for camera initialization success/error
- use relative paths instead of remotes (i.e. `camera_para.data` not found bug)
- enhanced Debug UI style
- minor documentation fixes
# 1.7.2
- updated `three.js` dependency to `r103` version
......
README.md
浏览文件 @ f8ef4374
......@@ -75,7 +75,7 @@ More details about markers:
<!doctype HTML>
<html>
<script src="https://aframe.io/releases/0.9.1/aframe.min.js"></script>
<script src="https://cdn.rawgit.com/jeromeetienne/AR.js/1.7.2/aframe/build/aframe-ar.js"></script>
<script src="https://cdn.rawgit.com/jeromeetienne/AR.js/1.7.3/aframe/build/aframe-ar.js"></script>
<body style='margin : 0px; overflow: hidden;'>
<a-scene embedded arjs>
<a-marker preset="hiro">
......
aframe/build/aframe-ar.js
浏览文件 @ f8ef4374
......@@ -5308,7 +5308,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.7.2';
ARjs.Context.REVISION = '1.7.3';
/**
* Create a default camera for this trackingBackend
......@@ -6719,75 +6719,53 @@ var ARjs = ARjs || {}
/**
* Create an debug UI for an ARjs.Anchor
*
*
* @param {ARjs.Anchor} arAnchor - the anchor to user
*/
ARjs.SessionDebugUI = function(arSession, tangoPointCloud){
var trackingBackend = arSession.arContext.parameters.trackingBackend
this.domElement = document.createElement('div')
this.domElement.style.color = 'rgba(0,0,0,0.9)'
this.domElement.style.backgroundColor = 'rgba(127,127,127,0.5)'
this.domElement.style.display = 'inline-block'
this.domElement.style.padding = '0.5em'
this.domElement.style.margin = '0.5em'
this.domElement.style.textAlign = 'left'
//////////////////////////////////////////////////////////////////////////////
// add title
//////////////////////////////////////////////////////////////////////////////
// var domElement = document.createElement('div')
// domElement.style.display = 'block'
// domElement.style.fontWeight = 'bold'
// domElement.style.fontSize = '120%'
// this.domElement.appendChild(domElement)
// domElement.innerHTML = 'AR.js Session Debug'
//////////////////////////////////////////////////////////////////////////////
// current-tracking-backend
//////////////////////////////////////////////////////////////////////////////
var domElement = document.createElement('span')
domElement.style.display = 'block'
this.domElement.appendChild(domElement)
domElement.innerHTML = '<b>trackingBackend</b> : ' +trackingBackend
//////////////////////////////////////////////////////////////////////////////
// augmented-websites
//////////////////////////////////////////////////////////////////////////////
if( ARjs.SessionDebugUI.AugmentedWebsiteURL ){
var domElement = document.createElement('a')
domElement.innerHTML = 'Share on augmented-websites'
domElement.style.display = 'block'
// domElement.setAttribute('target', '_blank')
domElement.href = ARjs.SessionDebugUI.AugmentedWebsiteURL + '?'+location.href
this.domElement.appendChild(domElement)
}
//////////////////////////////////////////////////////////////////////////////
// toggle-point-cloud
//////////////////////////////////////////////////////////////////////////////
if( trackingBackend === 'tango' && tangoPointCloud ){
var domElement = document.createElement('button')
this.domElement.appendChild(domElement)
domElement.id= 'buttonTangoTogglePointCloud'
domElement.innerHTML = 'toggle-point-cloud'
domElement.href='javascript:void(0)'
domElement.addEventListener('click', function(){
var scene = arSession.parameters.scene
// TODO how tangoPointCloud, get connected here ???
// in arguments simply ?
if( tangoPointCloud.object3d.parent ){
scene.remove(tangoPointCloud.object3d)
}else{
scene.add(tangoPointCloud.object3d)
}
})
}
ARjs.SessionDebugUI = function (arSession, tangoPointCloud) {
var trackingBackend = arSession.arContext.parameters.trackingBackend
this.domElement = document.createElement('div')
this.domElement.style.color = 'rgba(0,0,0,0.9)'
this.domElement.style.backgroundColor = 'rgba(127,127,127,0.5)'
this.domElement.style.display = 'block'
this.domElement.style.padding = '0.5em'
this.domElement.style.position = 'fixed'
this.domElement.style.left = '5px'
this.domElement.style.bottom = '10px'
this.domElement.style.textAlign = 'right'
//////////////////////////////////////////////////////////////////////////////
// current-tracking-backend
//////////////////////////////////////////////////////////////////////////////
var domElement = document.createElement('span')
domElement.style.display = 'block'
domElement.innerHTML = '<b>trackingBackend</b> : ' + trackingBackend
this.domElement.appendChild(domElement)
//////////////////////////////////////////////////////////////////////////////
// toggle-point-cloud
//////////////////////////////////////////////////////////////////////////////
if (trackingBackend === 'tango' && tangoPointCloud) {
var domElement = document.createElement('button')
this.domElement.appendChild(domElement)
domElement.id = 'buttonTangoTogglePointCloud'
domElement.innerHTML = 'toggle-point-cloud'
domElement.href = 'javascript:void(0)'
domElement.addEventListener('click', function () {
var scene = arSession.parameters.scene
if (tangoPointCloud.object3d.parent) {
scene.remove(tangoPointCloud.object3d)
} else {
scene.add(tangoPointCloud.object3d)
}
})
}
}
/**
......@@ -6800,108 +6778,103 @@ ARjs.SessionDebugUI.AugmentedWebsiteURL = 'https://webxr.io/augmented-website'
// ARjs.AnchorDebugUI
//////////////////////////////////////////////////////////////////////////////
/**
* Create an debug UI for an ARjs.Anchor
*
*
* @param {ARjs.Anchor} arAnchor - the anchor to user
*/
ARjs.AnchorDebugUI = function(arAnchor){
var _this = this
var arSession = arAnchor.arSession
var trackingBackend = arSession.arContext.parameters.trackingBackend
this.domElement = document.createElement('div')
this.domElement.style.color = 'rgba(0,0,0,0.9)'
this.domElement.style.backgroundColor = 'rgba(127,127,127,0.5)'
this.domElement.style.display = 'inline-block'
this.domElement.style.padding = '0.5em'
this.domElement.style.margin = '0.5em'
this.domElement.style.textAlign = 'left'
//////////////////////////////////////////////////////////////////////////////
// add title
//////////////////////////////////////////////////////////////////////////////
// var domElement = document.createElement('div')
// domElement.style.display = 'block'
// domElement.style.fontWeight = 'bold'
// domElement.style.fontSize = '120%'
// this.domElement.appendChild(domElement)
// domElement.innerHTML = 'Anchor Marker Debug'
//////////////////////////////////////////////////////////////////////////////
// current-tracking-backend
//////////////////////////////////////////////////////////////////////////////
var domElement = document.createElement('span')
domElement.style.display = 'block'
this.domElement.appendChild(domElement)
domElement.innerHTML = '<b>markersAreaEnabled</b> :' +arAnchor.parameters.markersAreaEnabled
//////////////////////////////////////////////////////////////////////////////
// toggle-marker-helper
//////////////////////////////////////////////////////////////////////////////
if( arAnchor.parameters.markersAreaEnabled ){
var domElement = document.createElement('button')
domElement.style.display = 'block'
this.domElement.appendChild(domElement)
domElement.id= 'buttonToggleMarkerHelpers'
domElement.innerHTML = 'toggle-marker-helper'
domElement.href='javascript:void(0)'
var subMarkerHelpersVisible = false
domElement.addEventListener('click', function(){
subMarkerHelpersVisible = subMarkerHelpersVisible ? false : true
arAnchor.markersArea.setSubMarkersVisibility(subMarkerHelpersVisible)
})
}
//////////////////////////////////////////////////////////////////////////////
// Learn-new-marker-area
//////////////////////////////////////////////////////////////////////////////
if( arAnchor.parameters.markersAreaEnabled ){
var domElement = document.createElement('button')
domElement.style.display = 'block'
this.domElement.appendChild(domElement)
domElement.id = 'buttonMarkersAreaLearner'
domElement.innerHTML = 'Learn-new-marker-area'
domElement.href ='javascript:void(0)'
ARjs.AnchorDebugUI = function (arAnchor) {
var arSession = arAnchor.arSession
var trackingBackend = arSession.arContext.parameters.trackingBackend
this.domElement = document.createElement('div')
this.domElement.style.color = 'rgba(0,0,0,0.9)'
this.domElement.style.backgroundColor = 'rgba(127,127,127,0.5)'
this.domElement.style.display = 'inline-block'
this.domElement.style.padding = '0.5em'
this.domElement.style.margin = '0.5em'
this.domElement.style.textAlign = 'left'
//////////////////////////////////////////////////////////////////////////////
// current-tracking-backend
//////////////////////////////////////////////////////////////////////////////
var domElement = document.createElement('span')
domElement.style.display = 'block'
domElement.style.padding = '0.5em'
domElement.style.color = 'rgba(0,0,0,0.9)'
domElement.style.backgroundColor = 'rgba(127,127,127,0.5)'
domElement.style.position = 'fixed'
domElement.style.left = '5px'
domElement.style.bottom = '40px'
this.domElement.appendChild(domElement)
domElement.innerHTML = '<b>markersAreaEnabled</b> :' + arAnchor.parameters.markersAreaEnabled
//////////////////////////////////////////////////////////////////////////////
// toggle-marker-helper
//////////////////////////////////////////////////////////////////////////////
if (arAnchor.parameters.markersAreaEnabled) {
var domElement = document.createElement('button')
domElement.style.display = 'block'
this.domElement.style.padding = '0.5em'
this.domElement.style.position = 'fixed'
this.domElement.style.textAlign = 'left'
this.domElement.appendChild(domElement)
domElement.id = 'buttonToggleMarkerHelpers'
domElement.innerHTML = 'toggle-marker-helper'
domElement.href = 'javascript:void(0)'
var subMarkerHelpersVisible = false
domElement.addEventListener('click', function () {
subMarkerHelpersVisible = subMarkerHelpersVisible ? false : true
arAnchor.markersArea.setSubMarkersVisibility(subMarkerHelpersVisible)
})
}
domElement.addEventListener('click', function(){
if( ARjs.AnchorDebugUI.MarkersAreaLearnerURL !== null ){
var learnerURL = ARjs.AnchorDebugUI.MarkersAreaLearnerURL
}else{
var learnerURL = ARjs.Context.baseURL + 'examples/multi-markers/examples/learner.html'
}
ARjs.MarkersAreaUtils.navigateToLearnerPage(learnerURL, trackingBackend)
})
}
//////////////////////////////////////////////////////////////////////////////
// Learn-new-marker-area
//////////////////////////////////////////////////////////////////////////////
if (arAnchor.parameters.markersAreaEnabled) {
var domElement = document.createElement('button')
domElement.style.display = 'block'
this.domElement.appendChild(domElement)
domElement.id = 'buttonMarkersAreaLearner'
domElement.innerHTML = 'Learn-new-marker-area'
domElement.href = 'javascript:void(0)'
domElement.addEventListener('click', function () {
if (ARjs.AnchorDebugUI.MarkersAreaLearnerURL !== null) {
var learnerURL = ARjs.AnchorDebugUI.MarkersAreaLearnerURL
} else {
var learnerURL = ARjs.Context.baseURL + 'examples/multi-markers/examples/learner.html'
}
ARjs.MarkersAreaUtils.navigateToLearnerPage(learnerURL, trackingBackend)
})
}
//////////////////////////////////////////////////////////////////////////////
// Reset-marker-area
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
// Reset-marker-area
//////////////////////////////////////////////////////////////////////////////
if( arAnchor.parameters.markersAreaEnabled ){
var domElement = document.createElement('button')
domElement.style.display = 'block'
this.domElement.appendChild(domElement)
if (arAnchor.parameters.markersAreaEnabled) {
var domElement = document.createElement('button')
domElement.style.display = 'block'
this.domElement.appendChild(domElement)
domElement.id = 'buttonMarkersAreaReset'
domElement.innerHTML = 'Reset-marker-area'
domElement.href ='javascript:void(0)'
domElement.id = 'buttonMarkersAreaReset'
domElement.innerHTML = 'Reset-marker-area'
domElement.href = 'javascript:void(0)'
domElement.addEventListener('click', function(){
ARjs.MarkersAreaUtils.storeDefaultMultiMarkerFile(trackingBackend)
location.reload()
})
}
domElement.addEventListener('click', function () {
ARjs.MarkersAreaUtils.storeDefaultMultiMarkerFile(trackingBackend)
location.reload()
})
}
}
/**
aframe/build/aframe-ar.min.js
浏览文件 @ f8ef4374
此差异已折叠。
three.js/build/ar.js
浏览文件 @ f8ef4374
......@@ -5308,7 +5308,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.7.2';
ARjs.Context.REVISION = '1.7.3';
/**
* Create a default camera for this trackingBackend
......@@ -6719,75 +6719,53 @@ var ARjs = ARjs || {}
/**
* Create an debug UI for an ARjs.Anchor
*
*
* @param {ARjs.Anchor} arAnchor - the anchor to user
*/
ARjs.SessionDebugUI = function(arSession, tangoPointCloud){
var trackingBackend = arSession.arContext.parameters.trackingBackend
this.domElement = document.createElement('div')
this.domElement.style.color = 'rgba(0,0,0,0.9)'
this.domElement.style.backgroundColor = 'rgba(127,127,127,0.5)'
this.domElement.style.display = 'inline-block'
this.domElement.style.padding = '0.5em'
this.domElement.style.margin = '0.5em'
this.domElement.style.textAlign = 'left'
//////////////////////////////////////////////////////////////////////////////
// add title
//////////////////////////////////////////////////////////////////////////////
// var domElement = document.createElement('div')
// domElement.style.display = 'block'
// domElement.style.fontWeight = 'bold'
// domElement.style.fontSize = '120%'
// this.domElement.appendChild(domElement)
// domElement.innerHTML = 'AR.js Session Debug'
//////////////////////////////////////////////////////////////////////////////
// current-tracking-backend
//////////////////////////////////////////////////////////////////////////////
var domElement = document.createElement('span')
domElement.style.display = 'block'
this.domElement.appendChild(domElement)
domElement.innerHTML = '<b>trackingBackend</b> : ' +trackingBackend
//////////////////////////////////////////////////////////////////////////////
// augmented-websites
//////////////////////////////////////////////////////////////////////////////
if( ARjs.SessionDebugUI.AugmentedWebsiteURL ){
var domElement = document.createElement('a')
domElement.innerHTML = 'Share on augmented-websites'
domElement.style.display = 'block'
// domElement.setAttribute('target', '_blank')
domElement.href = ARjs.SessionDebugUI.AugmentedWebsiteURL + '?'+location.href
this.domElement.appendChild(domElement)
}
//////////////////////////////////////////////////////////////////////////////
// toggle-point-cloud
//////////////////////////////////////////////////////////////////////////////
if( trackingBackend === 'tango' && tangoPointCloud ){
var domElement = document.createElement('button')
this.domElement.appendChild(domElement)
domElement.id= 'buttonTangoTogglePointCloud'
domElement.innerHTML = 'toggle-point-cloud'
domElement.href='javascript:void(0)'
domElement.addEventListener('click', function(){
var scene = arSession.parameters.scene
// TODO how tangoPointCloud, get connected here ???
// in arguments simply ?
if( tangoPointCloud.object3d.parent ){
scene.remove(tangoPointCloud.object3d)
}else{
scene.add(tangoPointCloud.object3d)
}
})
}
ARjs.SessionDebugUI = function (arSession, tangoPointCloud) {
var trackingBackend = arSession.arContext.parameters.trackingBackend
this.domElement = document.createElement('div')
this.domElement.style.color = 'rgba(0,0,0,0.9)'
this.domElement.style.backgroundColor = 'rgba(127,127,127,0.5)'
this.domElement.style.display = 'block'
this.domElement.style.padding = '0.5em'
this.domElement.style.position = 'fixed'
this.domElement.style.left = '5px'
this.domElement.style.bottom = '10px'
this.domElement.style.textAlign = 'right'
//////////////////////////////////////////////////////////////////////////////
// current-tracking-backend
//////////////////////////////////////////////////////////////////////////////
var domElement = document.createElement('span')
domElement.style.display = 'block'
domElement.innerHTML = '<b>trackingBackend</b> : ' + trackingBackend
this.domElement.appendChild(domElement)
//////////////////////////////////////////////////////////////////////////////
// toggle-point-cloud
//////////////////////////////////////////////////////////////////////////////
if (trackingBackend === 'tango' && tangoPointCloud) {
var domElement = document.createElement('button')
this.domElement.appendChild(domElement)
domElement.id = 'buttonTangoTogglePointCloud'
domElement.innerHTML = 'toggle-point-cloud'
domElement.href = 'javascript:void(0)'
domElement.addEventListener('click', function () {
var scene = arSession.parameters.scene
if (tangoPointCloud.object3d.parent) {
scene.remove(tangoPointCloud.object3d)
} else {
scene.add(tangoPointCloud.object3d)
}
})
}
}
/**
......@@ -6800,108 +6778,103 @@ ARjs.SessionDebugUI.AugmentedWebsiteURL = 'https://webxr.io/augmented-website'
// ARjs.AnchorDebugUI
//////////////////////////////////////////////////////////////////////////////
/**
* Create an debug UI for an ARjs.Anchor
*
*
* @param {ARjs.Anchor} arAnchor - the anchor to user
*/
ARjs.AnchorDebugUI = function(arAnchor){
var _this = this
var arSession = arAnchor.arSession
var trackingBackend = arSession.arContext.parameters.trackingBackend
this.domElement = document.createElement('div')
this.domElement.style.color = 'rgba(0,0,0,0.9)'
this.domElement.style.backgroundColor = 'rgba(127,127,127,0.5)'
this.domElement.style.display = 'inline-block'
this.domElement.style.padding = '0.5em'
this.domElement.style.margin = '0.5em'
this.domElement.style.textAlign = 'left'
//////////////////////////////////////////////////////////////////////////////
// add title
//////////////////////////////////////////////////////////////////////////////
// var domElement = document.createElement('div')
// domElement.style.display = 'block'
// domElement.style.fontWeight = 'bold'
// domElement.style.fontSize = '120%'
// this.domElement.appendChild(domElement)
// domElement.innerHTML = 'Anchor Marker Debug'
//////////////////////////////////////////////////////////////////////////////
// current-tracking-backend
//////////////////////////////////////////////////////////////////////////////
var domElement = document.createElement('span')
domElement.style.display = 'block'
this.domElement.appendChild(domElement)
domElement.innerHTML = '<b>markersAreaEnabled</b> :' +arAnchor.parameters.markersAreaEnabled
//////////////////////////////////////////////////////////////////////////////
// toggle-marker-helper
//////////////////////////////////////////////////////////////////////////////
if( arAnchor.parameters.markersAreaEnabled ){
var domElement = document.createElement('button')
domElement.style.display = 'block'
this.domElement.appendChild(domElement)
domElement.id= 'buttonToggleMarkerHelpers'
domElement.innerHTML = 'toggle-marker-helper'
domElement.href='javascript:void(0)'
var subMarkerHelpersVisible = false
domElement.addEventListener('click', function(){
subMarkerHelpersVisible = subMarkerHelpersVisible ? false : true
arAnchor.markersArea.setSubMarkersVisibility(subMarkerHelpersVisible)
})
}
//////////////////////////////////////////////////////////////////////////////
// Learn-new-marker-area
//////////////////////////////////////////////////////////////////////////////
if( arAnchor.parameters.markersAreaEnabled ){
var domElement = document.createElement('button')
domElement.style.display = 'block'
this.domElement.appendChild(domElement)
domElement.id = 'buttonMarkersAreaLearner'
domElement.innerHTML = 'Learn-new-marker-area'
domElement.href ='javascript:void(0)'
ARjs.AnchorDebugUI = function (arAnchor) {
var arSession = arAnchor.arSession
var trackingBackend = arSession.arContext.parameters.trackingBackend
this.domElement = document.createElement('div')
this.domElement.style.color = 'rgba(0,0,0,0.9)'
this.domElement.style.backgroundColor = 'rgba(127,127,127,0.5)'
this.domElement.style.display = 'inline-block'
this.domElement.style.padding = '0.5em'
this.domElement.style.margin = '0.5em'
this.domElement.style.textAlign = 'left'
//////////////////////////////////////////////////////////////////////////////
// current-tracking-backend
//////////////////////////////////////////////////////////////////////////////
var domElement = document.createElement('span')
domElement.style.display = 'block'
domElement.style.padding = '0.5em'
domElement.style.color = 'rgba(0,0,0,0.9)'
domElement.style.backgroundColor = 'rgba(127,127,127,0.5)'
domElement.style.position = 'fixed'
domElement.style.left = '5px'
domElement.style.bottom = '40px'
this.domElement.appendChild(domElement)
domElement.innerHTML = '<b>markersAreaEnabled</b> :' + arAnchor.parameters.markersAreaEnabled
//////////////////////////////////////////////////////////////////////////////
// toggle-marker-helper
//////////////////////////////////////////////////////////////////////////////
if (arAnchor.parameters.markersAreaEnabled) {
var domElement = document.createElement('button')
domElement.style.display = 'block'
this.domElement.style.padding = '0.5em'
this.domElement.style.position = 'fixed'
this.domElement.style.textAlign = 'left'
this.domElement.appendChild(domElement)
domElement.id = 'buttonToggleMarkerHelpers'
domElement.innerHTML = 'toggle-marker-helper'
domElement.href = 'javascript:void(0)'
var subMarkerHelpersVisible = false
domElement.addEventListener('click', function () {
subMarkerHelpersVisible = subMarkerHelpersVisible ? false : true
arAnchor.markersArea.setSubMarkersVisibility(subMarkerHelpersVisible)
})
}
domElement.addEventListener('click', function(){
if( ARjs.AnchorDebugUI.MarkersAreaLearnerURL !== null ){
var learnerURL = ARjs.AnchorDebugUI.MarkersAreaLearnerURL
}else{
var learnerURL = ARjs.Context.baseURL + 'examples/multi-markers/examples/learner.html'
}
ARjs.MarkersAreaUtils.navigateToLearnerPage(learnerURL, trackingBackend)
})
}
//////////////////////////////////////////////////////////////////////////////
// Learn-new-marker-area
//////////////////////////////////////////////////////////////////////////////
if (arAnchor.parameters.markersAreaEnabled) {
var domElement = document.createElement('button')
domElement.style.display = 'block'
this.domElement.appendChild(domElement)
domElement.id = 'buttonMarkersAreaLearner'
domElement.innerHTML = 'Learn-new-marker-area'
domElement.href = 'javascript:void(0)'
domElement.addEventListener('click', function () {
if (ARjs.AnchorDebugUI.MarkersAreaLearnerURL !== null) {
var learnerURL = ARjs.AnchorDebugUI.MarkersAreaLearnerURL
} else {
var learnerURL = ARjs.Context.baseURL + 'examples/multi-markers/examples/learner.html'
}
ARjs.MarkersAreaUtils.navigateToLearnerPage(learnerURL, trackingBackend)
})
}
//////////////////////////////////////////////////////////////////////////////
// Reset-marker-area
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
// Reset-marker-area
//////////////////////////////////////////////////////////////////////////////
if( arAnchor.parameters.markersAreaEnabled ){
var domElement = document.createElement('button')
domElement.style.display = 'block'
this.domElement.appendChild(domElement)
if (arAnchor.parameters.markersAreaEnabled) {
var domElement = document.createElement('button')
domElement.style.display = 'block'
this.domElement.appendChild(domElement)
domElement.id = 'buttonMarkersAreaReset'
domElement.innerHTML = 'Reset-marker-area'
domElement.href ='javascript:void(0)'
domElement.id = 'buttonMarkersAreaReset'
domElement.innerHTML = 'Reset-marker-area'
domElement.href = 'javascript:void(0)'
domElement.addEventListener('click', function(){
ARjs.MarkersAreaUtils.storeDefaultMultiMarkerFile(trackingBackend)
location.reload()
})
}
domElement.addEventListener('click', function () {
ARjs.MarkersAreaUtils.storeDefaultMultiMarkerFile(trackingBackend)
location.reload()
})
}
}
/**
three.js/build/ar.lean.js
浏览文件 @ f8ef4374
......@@ -2574,7 +2574,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.7.2';
ARjs.Context.REVISION = '1.7.3';
/**
* Create a default camera for this trackingBackend
......@@ -3985,75 +3985,53 @@ var ARjs = ARjs || {}
/**
* Create an debug UI for an ARjs.Anchor
*
*
* @param {ARjs.Anchor} arAnchor - the anchor to user
*/
ARjs.SessionDebugUI = function(arSession, tangoPointCloud){
var trackingBackend = arSession.arContext.parameters.trackingBackend
this.domElement = document.createElement('div')
this.domElement.style.color = 'rgba(0,0,0,0.9)'
this.domElement.style.backgroundColor = 'rgba(127,127,127,0.5)'
this.domElement.style.display = 'inline-block'
this.domElement.style.padding = '0.5em'
this.domElement.style.margin = '0.5em'
this.domElement.style.textAlign = 'left'
//////////////////////////////////////////////////////////////////////////////
// add title
//////////////////////////////////////////////////////////////////////////////
// var domElement = document.createElement('div')
// domElement.style.display = 'block'
// domElement.style.fontWeight = 'bold'
// domElement.style.fontSize = '120%'
// this.domElement.appendChild(domElement)
// domElement.innerHTML = 'AR.js Session Debug'
//////////////////////////////////////////////////////////////////////////////
// current-tracking-backend
//////////////////////////////////////////////////////////////////////////////
var domElement = document.createElement('span')
domElement.style.display = 'block'
this.domElement.appendChild(domElement)
domElement.innerHTML = '<b>trackingBackend</b> : ' +trackingBackend
//////////////////////////////////////////////////////////////////////////////
// augmented-websites
//////////////////////////////////////////////////////////////////////////////
if( ARjs.SessionDebugUI.AugmentedWebsiteURL ){
var domElement = document.createElement('a')
domElement.innerHTML = 'Share on augmented-websites'
domElement.style.display = 'block'
// domElement.setAttribute('target', '_blank')
domElement.href = ARjs.SessionDebugUI.AugmentedWebsiteURL + '?'+location.href
this.domElement.appendChild(domElement)
}
//////////////////////////////////////////////////////////////////////////////
// toggle-point-cloud
//////////////////////////////////////////////////////////////////////////////
if( trackingBackend === 'tango' && tangoPointCloud ){
var domElement = document.createElement('button')
this.domElement.appendChild(domElement)
domElement.id= 'buttonTangoTogglePointCloud'
domElement.innerHTML = 'toggle-point-cloud'
domElement.href='javascript:void(0)'
domElement.addEventListener('click', function(){
var scene = arSession.parameters.scene
// TODO how tangoPointCloud, get connected here ???
// in arguments simply ?
if( tangoPointCloud.object3d.parent ){
scene.remove(tangoPointCloud.object3d)
}else{
scene.add(tangoPointCloud.object3d)
}
})
}
ARjs.SessionDebugUI = function (arSession, tangoPointCloud) {
var trackingBackend = arSession.arContext.parameters.trackingBackend
this.domElement = document.createElement('div')
this.domElement.style.color = 'rgba(0,0,0,0.9)'
this.domElement.style.backgroundColor = 'rgba(127,127,127,0.5)'
this.domElement.style.display = 'block'
this.domElement.style.padding = '0.5em'
this.domElement.style.position = 'fixed'
this.domElement.style.left = '5px'
this.domElement.style.bottom = '10px'
this.domElement.style.textAlign = 'right'
//////////////////////////////////////////////////////////////////////////////
// current-tracking-backend
//////////////////////////////////////////////////////////////////////////////
var domElement = document.createElement('span')
domElement.style.display = 'block'
domElement.innerHTML = '<b>trackingBackend</b> : ' + trackingBackend
this.domElement.appendChild(domElement)
//////////////////////////////////////////////////////////////////////////////
// toggle-point-cloud
//////////////////////////////////////////////////////////////////////////////
if (trackingBackend === 'tango' && tangoPointCloud) {
var domElement = document.createElement('button')
this.domElement.appendChild(domElement)
domElement.id = 'buttonTangoTogglePointCloud'
domElement.innerHTML = 'toggle-point-cloud'
domElement.href = 'javascript:void(0)'
domElement.addEventListener('click', function () {
var scene = arSession.parameters.scene
if (tangoPointCloud.object3d.parent) {
scene.remove(tangoPointCloud.object3d)
} else {
scene.add(tangoPointCloud.object3d)
}
})
}
}
/**
......@@ -4066,108 +4044,103 @@ ARjs.SessionDebugUI.AugmentedWebsiteURL = 'https://webxr.io/augmented-website'
// ARjs.AnchorDebugUI
//////////////////////////////////////////////////////////////////////////////
/**
* Create an debug UI for an ARjs.Anchor
*
*
* @param {ARjs.Anchor} arAnchor - the anchor to user
*/
ARjs.AnchorDebugUI = function(arAnchor){
var _this = this
var arSession = arAnchor.arSession
var trackingBackend = arSession.arContext.parameters.trackingBackend
this.domElement = document.createElement('div')
this.domElement.style.color = 'rgba(0,0,0,0.9)'
this.domElement.style.backgroundColor = 'rgba(127,127,127,0.5)'
this.domElement.style.display = 'inline-block'
this.domElement.style.padding = '0.5em'
this.domElement.style.margin = '0.5em'
this.domElement.style.textAlign = 'left'
//////////////////////////////////////////////////////////////////////////////
// add title
//////////////////////////////////////////////////////////////////////////////
// var domElement = document.createElement('div')
// domElement.style.display = 'block'
// domElement.style.fontWeight = 'bold'
// domElement.style.fontSize = '120%'
// this.domElement.appendChild(domElement)
// domElement.innerHTML = 'Anchor Marker Debug'
//////////////////////////////////////////////////////////////////////////////
// current-tracking-backend
//////////////////////////////////////////////////////////////////////////////
var domElement = document.createElement('span')
domElement.style.display = 'block'
this.domElement.appendChild(domElement)
domElement.innerHTML = '<b>markersAreaEnabled</b> :' +arAnchor.parameters.markersAreaEnabled
//////////////////////////////////////////////////////////////////////////////
// toggle-marker-helper
//////////////////////////////////////////////////////////////////////////////
if( arAnchor.parameters.markersAreaEnabled ){
var domElement = document.createElement('button')
domElement.style.display = 'block'
this.domElement.appendChild(domElement)
domElement.id= 'buttonToggleMarkerHelpers'
domElement.innerHTML = 'toggle-marker-helper'
domElement.href='javascript:void(0)'
var subMarkerHelpersVisible = false
domElement.addEventListener('click', function(){
subMarkerHelpersVisible = subMarkerHelpersVisible ? false : true
arAnchor.markersArea.setSubMarkersVisibility(subMarkerHelpersVisible)
})
}
//////////////////////////////////////////////////////////////////////////////
// Learn-new-marker-area
//////////////////////////////////////////////////////////////////////////////
if( arAnchor.parameters.markersAreaEnabled ){
var domElement = document.createElement('button')
domElement.style.display = 'block'
this.domElement.appendChild(domElement)
domElement.id = 'buttonMarkersAreaLearner'
domElement.innerHTML = 'Learn-new-marker-area'
domElement.href ='javascript:void(0)'
domElement.addEventListener('click', function(){
if( ARjs.AnchorDebugUI.MarkersAreaLearnerURL !== null ){
var learnerURL = ARjs.AnchorDebugUI.MarkersAreaLearnerURL
}else{
var learnerURL = ARjs.Context.baseURL + 'examples/multi-markers/examples/learner.html'
}
ARjs.MarkersAreaUtils.navigateToLearnerPage(learnerURL, trackingBackend)
})
}
ARjs.AnchorDebugUI = function (arAnchor) {
var arSession = arAnchor.arSession
var trackingBackend = arSession.arContext.parameters.trackingBackend
this.domElement = document.createElement('div')
this.domElement.style.color = 'rgba(0,0,0,0.9)'
this.domElement.style.backgroundColor = 'rgba(127,127,127,0.5)'
this.domElement.style.display = 'inline-block'
this.domElement.style.padding = '0.5em'
this.domElement.style.margin = '0.5em'
this.domElement.style.textAlign = 'left'
//////////////////////////////////////////////////////////////////////////////
// current-tracking-backend
//////////////////////////////////////////////////////////////////////////////
var domElement = document.createElement('span')
domElement.style.display = 'block'
domElement.style.padding = '0.5em'
domElement.style.color = 'rgba(0,0,0,0.9)'
domElement.style.backgroundColor = 'rgba(127,127,127,0.5)'
domElement.style.position = 'fixed'
domElement.style.left = '5px'
domElement.style.bottom = '40px'
this.domElement.appendChild(domElement)
domElement.innerHTML = '<b>markersAreaEnabled</b> :' + arAnchor.parameters.markersAreaEnabled
//////////////////////////////////////////////////////////////////////////////
// toggle-marker-helper
//////////////////////////////////////////////////////////////////////////////
if (arAnchor.parameters.markersAreaEnabled) {
var domElement = document.createElement('button')
domElement.style.display = 'block'
this.domElement.style.padding = '0.5em'
this.domElement.style.position = 'fixed'
this.domElement.style.textAlign = 'left'
this.domElement.appendChild(domElement)
domElement.id = 'buttonToggleMarkerHelpers'
domElement.innerHTML = 'toggle-marker-helper'
domElement.href = 'javascript:void(0)'
var subMarkerHelpersVisible = false
domElement.addEventListener('click', function () {
subMarkerHelpersVisible = subMarkerHelpersVisible ? false : true
arAnchor.markersArea.setSubMarkersVisibility(subMarkerHelpersVisible)
})
}
//////////////////////////////////////////////////////////////////////////////
// Learn-new-marker-area
//////////////////////////////////////////////////////////////////////////////
if (arAnchor.parameters.markersAreaEnabled) {
var domElement = document.createElement('button')
domElement.style.display = 'block'
this.domElement.appendChild(domElement)
domElement.id = 'buttonMarkersAreaLearner'
domElement.innerHTML = 'Learn-new-marker-area'
domElement.href = 'javascript:void(0)'
domElement.addEventListener('click', function () {
if (ARjs.AnchorDebugUI.MarkersAreaLearnerURL !== null) {
var learnerURL = ARjs.AnchorDebugUI.MarkersAreaLearnerURL
} else {
var learnerURL = ARjs.Context.baseURL + 'examples/multi-markers/examples/learner.html'
}
ARjs.MarkersAreaUtils.navigateToLearnerPage(learnerURL, trackingBackend)
})
}
//////////////////////////////////////////////////////////////////////////////
// Reset-marker-area
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
// Reset-marker-area
//////////////////////////////////////////////////////////////////////////////
if( arAnchor.parameters.markersAreaEnabled ){
var domElement = document.createElement('button')
domElement.style.display = 'block'
this.domElement.appendChild(domElement)
if (arAnchor.parameters.markersAreaEnabled) {
var domElement = document.createElement('button')
domElement.style.display = 'block'
this.domElement.appendChild(domElement)
domElement.id = 'buttonMarkersAreaReset'
domElement.innerHTML = 'Reset-marker-area'
domElement.href ='javascript:void(0)'
domElement.id = 'buttonMarkersAreaReset'
domElement.innerHTML = 'Reset-marker-area'
domElement.href = 'javascript:void(0)'
domElement.addEventListener('click', function(){
ARjs.MarkersAreaUtils.storeDefaultMultiMarkerFile(trackingBackend)
location.reload()
})
}
domElement.addEventListener('click', function () {
ARjs.MarkersAreaUtils.storeDefaultMultiMarkerFile(trackingBackend)
location.reload()
})
}
}
/**
......
three.js/build/ar.lean.min.js
浏览文件 @ f8ef4374
此差异已折叠。
three.js/build/ar.min.js
浏览文件 @ f8ef4374
此差异已折叠。
three.js/contribs/portableAR.js/build/portable-ar.js
浏览文件 @ f8ef4374
......@@ -53806,7 +53806,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.7.2';
ARjs.Context.REVISION = '1.7.3';
/**
* Create a default camera for this trackingBackend
......@@ -55217,75 +55217,53 @@ var ARjs = ARjs || {}
/**
* Create an debug UI for an ARjs.Anchor
*
*
* @param {ARjs.Anchor} arAnchor - the anchor to user
*/
ARjs.SessionDebugUI = function(arSession, tangoPointCloud){
var trackingBackend = arSession.arContext.parameters.trackingBackend
this.domElement = document.createElement('div')
this.domElement.style.color = 'rgba(0,0,0,0.9)'
this.domElement.style.backgroundColor = 'rgba(127,127,127,0.5)'
this.domElement.style.display = 'inline-block'
this.domElement.style.padding = '0.5em'
this.domElement.style.margin = '0.5em'
this.domElement.style.textAlign = 'left'
//////////////////////////////////////////////////////////////////////////////
// add title
//////////////////////////////////////////////////////////////////////////////
// var domElement = document.createElement('div')
// domElement.style.display = 'block'
// domElement.style.fontWeight = 'bold'
// domElement.style.fontSize = '120%'
// this.domElement.appendChild(domElement)
// domElement.innerHTML = 'AR.js Session Debug'
//////////////////////////////////////////////////////////////////////////////
// current-tracking-backend
//////////////////////////////////////////////////////////////////////////////
var domElement = document.createElement('span')
domElement.style.display = 'block'
this.domElement.appendChild(domElement)
domElement.innerHTML = '<b>trackingBackend</b> : ' +trackingBackend
//////////////////////////////////////////////////////////////////////////////
// augmented-websites
//////////////////////////////////////////////////////////////////////////////
if( ARjs.SessionDebugUI.AugmentedWebsiteURL ){
var domElement = document.createElement('a')
domElement.innerHTML = 'Share on augmented-websites'
domElement.style.display = 'block'
// domElement.setAttribute('target', '_blank')
domElement.href = ARjs.SessionDebugUI.AugmentedWebsiteURL + '?'+location.href
this.domElement.appendChild(domElement)
}
//////////////////////////////////////////////////////////////////////////////
// toggle-point-cloud
//////////////////////////////////////////////////////////////////////////////
if( trackingBackend === 'tango' && tangoPointCloud ){
var domElement = document.createElement('button')
this.domElement.appendChild(domElement)
domElement.id= 'buttonTangoTogglePointCloud'
domElement.innerHTML = 'toggle-point-cloud'
domElement.href='javascript:void(0)'
domElement.addEventListener('click', function(){
var scene = arSession.parameters.scene
// TODO how tangoPointCloud, get connected here ???
// in arguments simply ?
if( tangoPointCloud.object3d.parent ){
scene.remove(tangoPointCloud.object3d)
}else{
scene.add(tangoPointCloud.object3d)
}
})
}
ARjs.SessionDebugUI = function (arSession, tangoPointCloud) {
var trackingBackend = arSession.arContext.parameters.trackingBackend
this.domElement = document.createElement('div')
this.domElement.style.color = 'rgba(0,0,0,0.9)'
this.domElement.style.backgroundColor = 'rgba(127,127,127,0.5)'
this.domElement.style.display = 'block'
this.domElement.style.padding = '0.5em'
this.domElement.style.position = 'fixed'
this.domElement.style.left = '5px'
this.domElement.style.bottom = '10px'
this.domElement.style.textAlign = 'right'
//////////////////////////////////////////////////////////////////////////////
// current-tracking-backend
//////////////////////////////////////////////////////////////////////////////
var domElement = document.createElement('span')
domElement.style.display = 'block'
domElement.innerHTML = '<b>trackingBackend</b> : ' + trackingBackend
this.domElement.appendChild(domElement)
//////////////////////////////////////////////////////////////////////////////
// toggle-point-cloud
//////////////////////////////////////////////////////////////////////////////
if (trackingBackend === 'tango' && tangoPointCloud) {
var domElement = document.createElement('button')
this.domElement.appendChild(domElement)
domElement.id = 'buttonTangoTogglePointCloud'
domElement.innerHTML = 'toggle-point-cloud'
domElement.href = 'javascript:void(0)'
domElement.addEventListener('click', function () {
var scene = arSession.parameters.scene
if (tangoPointCloud.object3d.parent) {
scene.remove(tangoPointCloud.object3d)
} else {
scene.add(tangoPointCloud.object3d)
}
})
}
}
/**
......@@ -55298,108 +55276,103 @@ ARjs.SessionDebugUI.AugmentedWebsiteURL = 'https://webxr.io/augmented-website'
// ARjs.AnchorDebugUI
//////////////////////////////////////////////////////////////////////////////
/**
* Create an debug UI for an ARjs.Anchor
*
*
* @param {ARjs.Anchor} arAnchor - the anchor to user
*/
ARjs.AnchorDebugUI = function(arAnchor){
var _this = this
var arSession = arAnchor.arSession
var trackingBackend = arSession.arContext.parameters.trackingBackend
this.domElement = document.createElement('div')
this.domElement.style.color = 'rgba(0,0,0,0.9)'
this.domElement.style.backgroundColor = 'rgba(127,127,127,0.5)'
this.domElement.style.display = 'inline-block'
this.domElement.style.padding = '0.5em'
this.domElement.style.margin = '0.5em'
this.domElement.style.textAlign = 'left'
//////////////////////////////////////////////////////////////////////////////
// add title
//////////////////////////////////////////////////////////////////////////////
// var domElement = document.createElement('div')
// domElement.style.display = 'block'
// domElement.style.fontWeight = 'bold'
// domElement.style.fontSize = '120%'
// this.domElement.appendChild(domElement)
// domElement.innerHTML = 'Anchor Marker Debug'
//////////////////////////////////////////////////////////////////////////////
// current-tracking-backend
//////////////////////////////////////////////////////////////////////////////
var domElement = document.createElement('span')
domElement.style.display = 'block'
this.domElement.appendChild(domElement)
domElement.innerHTML = '<b>markersAreaEnabled</b> :' +arAnchor.parameters.markersAreaEnabled
//////////////////////////////////////////////////////////////////////////////
// toggle-marker-helper
//////////////////////////////////////////////////////////////////////////////
if( arAnchor.parameters.markersAreaEnabled ){
var domElement = document.createElement('button')
domElement.style.display = 'block'
this.domElement.appendChild(domElement)
domElement.id= 'buttonToggleMarkerHelpers'
domElement.innerHTML = 'toggle-marker-helper'
domElement.href='javascript:void(0)'
var subMarkerHelpersVisible = false
domElement.addEventListener('click', function(){
subMarkerHelpersVisible = subMarkerHelpersVisible ? false : true
arAnchor.markersArea.setSubMarkersVisibility(subMarkerHelpersVisible)
})
}
//////////////////////////////////////////////////////////////////////////////
// Learn-new-marker-area
//////////////////////////////////////////////////////////////////////////////
if( arAnchor.parameters.markersAreaEnabled ){
var domElement = document.createElement('button')
domElement.style.display = 'block'
this.domElement.appendChild(domElement)
domElement.id = 'buttonMarkersAreaLearner'
domElement.innerHTML = 'Learn-new-marker-area'
domElement.href ='javascript:void(0)'
ARjs.AnchorDebugUI = function (arAnchor) {
var arSession = arAnchor.arSession
var trackingBackend = arSession.arContext.parameters.trackingBackend
this.domElement = document.createElement('div')
this.domElement.style.color = 'rgba(0,0,0,0.9)'
this.domElement.style.backgroundColor = 'rgba(127,127,127,0.5)'
this.domElement.style.display = 'inline-block'
this.domElement.style.padding = '0.5em'
this.domElement.style.margin = '0.5em'
this.domElement.style.textAlign = 'left'
//////////////////////////////////////////////////////////////////////////////
// current-tracking-backend
//////////////////////////////////////////////////////////////////////////////
var domElement = document.createElement('span')
domElement.style.display = 'block'
domElement.style.padding = '0.5em'
domElement.style.color = 'rgba(0,0,0,0.9)'
domElement.style.backgroundColor = 'rgba(127,127,127,0.5)'
domElement.style.position = 'fixed'
domElement.style.left = '5px'
domElement.style.bottom = '40px'
this.domElement.appendChild(domElement)
domElement.innerHTML = '<b>markersAreaEnabled</b> :' + arAnchor.parameters.markersAreaEnabled
//////////////////////////////////////////////////////////////////////////////
// toggle-marker-helper
//////////////////////////////////////////////////////////////////////////////
if (arAnchor.parameters.markersAreaEnabled) {
var domElement = document.createElement('button')
domElement.style.display = 'block'
this.domElement.style.padding = '0.5em'
this.domElement.style.position = 'fixed'
this.domElement.style.textAlign = 'left'
this.domElement.appendChild(domElement)
domElement.id = 'buttonToggleMarkerHelpers'
domElement.innerHTML = 'toggle-marker-helper'
domElement.href = 'javascript:void(0)'
var subMarkerHelpersVisible = false
domElement.addEventListener('click', function () {
subMarkerHelpersVisible = subMarkerHelpersVisible ? false : true
arAnchor.markersArea.setSubMarkersVisibility(subMarkerHelpersVisible)
})
}
domElement.addEventListener('click', function(){
if( ARjs.AnchorDebugUI.MarkersAreaLearnerURL !== null ){
var learnerURL = ARjs.AnchorDebugUI.MarkersAreaLearnerURL
}else{
var learnerURL = ARjs.Context.baseURL + 'examples/multi-markers/examples/learner.html'
}
ARjs.MarkersAreaUtils.navigateToLearnerPage(learnerURL, trackingBackend)
})
}
//////////////////////////////////////////////////////////////////////////////
// Learn-new-marker-area
//////////////////////////////////////////////////////////////////////////////
if (arAnchor.parameters.markersAreaEnabled) {
var domElement = document.createElement('button')
domElement.style.display = 'block'
this.domElement.appendChild(domElement)
domElement.id = 'buttonMarkersAreaLearner'
domElement.innerHTML = 'Learn-new-marker-area'
domElement.href = 'javascript:void(0)'
domElement.addEventListener('click', function () {
if (ARjs.AnchorDebugUI.MarkersAreaLearnerURL !== null) {
var learnerURL = ARjs.AnchorDebugUI.MarkersAreaLearnerURL
} else {
var learnerURL = ARjs.Context.baseURL + 'examples/multi-markers/examples/learner.html'
}
ARjs.MarkersAreaUtils.navigateToLearnerPage(learnerURL, trackingBackend)
})
}
//////////////////////////////////////////////////////////////////////////////
// Reset-marker-area
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
// Reset-marker-area
//////////////////////////////////////////////////////////////////////////////
if( arAnchor.parameters.markersAreaEnabled ){
var domElement = document.createElement('button')
domElement.style.display = 'block'
this.domElement.appendChild(domElement)
if (arAnchor.parameters.markersAreaEnabled) {
var domElement = document.createElement('button')
domElement.style.display = 'block'
this.domElement.appendChild(domElement)
domElement.id = 'buttonMarkersAreaReset'
domElement.innerHTML = 'Reset-marker-area'
domElement.href ='javascript:void(0)'
domElement.id = 'buttonMarkersAreaReset'
domElement.innerHTML = 'Reset-marker-area'
domElement.href = 'javascript:void(0)'
domElement.addEventListener('click', function(){
ARjs.MarkersAreaUtils.storeDefaultMultiMarkerFile(trackingBackend)
location.reload()
})
}
domElement.addEventListener('click', function () {
ARjs.MarkersAreaUtils.storeDefaultMultiMarkerFile(trackingBackend)
location.reload()
})
}
}
/**
three.js/src/threex/threex-artoolkitcontext.js
浏览文件 @ f8ef4374
......@@ -76,7 +76,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.7.2';
ARjs.Context.REVISION = '1.7.3';
/**
* Create a default camera for this trackingBackend
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或