Skip to content

A
AR.js

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

从无法访问的项目Fork

通知 2
Star 0
Fork 0
A
AR.js

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

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

more work

上级 2225bd09
隐藏空白更改
内联 并排
Showing with 235 addition and 15 deletion
CHANGELOG.md
浏览文件 @ 8944821a
# 1.5.0-dev
- aframe-ar.js - added link into webxr.io/augmented-website
- aframe-ar.js - change debugUIEnabled default from false to true.
- drafting a demo for 3d.io
- made demo for portal-door - nice reuseable components available
- made demos to celebrate firefox 55
- made demo for mapbox
- vr-camera-controls - or how to walk in VR with AR.js
# 1.4.10
- support for markers-area
- Efficient user friendly area scanning
- More Versatile than single marker tracking 0 larger areas than single markers
......
TODO.md
浏览文件 @ 8944821a
......@@ -2,8 +2,10 @@
- do a button - display-hittester-plane
- in three.js and in aframe.js
- cleanup /three.js/examples
- which version remains in ar.js session and currently
- have a source in images and video. in three.js and aframe.js
-
- once this refactor is done, publish is as AR.js v1.5 with a blog post
- DONE ensure backward compatibility of aframe api
......
aframe/build/aframe-ar.js
浏览文件 @ 8944821a
......@@ -6597,15 +6597,39 @@ 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'
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 = 'trackingBackend :' +trackingBackend
domElement.innerHTML = '<b>trackingBackend</b> : ' +trackingBackend
//////////////////////////////////////////////////////////////////////////////
// augmented-websites
//////////////////////////////////////////////////////////////////////////////
var domElement = document.createElement('a')
domElement.innerHTML = 'Share on augmented-websites'
domElement.style.display = 'block'
domElement.setAttribute('target', '_blank')
domElement.href = 'https://webxr.io/augmented-website?'+location.href
this.domElement.appendChild(domElement)
//////////////////////////////////////////////////////////////////////////////
// toggle-point-cloud
//////////////////////////////////////////////////////////////////////////////
......@@ -6646,15 +6670,32 @@ ARjs.AnchorDebugUI = function(arAnchor){
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 = 'markersAreaEnabled :' +arAnchor.parameters.markersAreaEnabled
domElement.innerHTML = '<b>markersAreaEnabled</b> :' +arAnchor.parameters.markersAreaEnabled
//////////////////////////////////////////////////////////////////////////////
// toggle-marker-helper
......@@ -6662,6 +6703,7 @@ ARjs.AnchorDebugUI = function(arAnchor){
if( arAnchor.parameters.markersAreaEnabled ){
var domElement = document.createElement('button')
domElement.style.display = 'block'
this.domElement.appendChild(domElement)
domElement.id= 'buttonToggleMarkerHelpers'
......@@ -6681,7 +6723,9 @@ ARjs.AnchorDebugUI = function(arAnchor){
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)'
......@@ -6698,7 +6742,9 @@ ARjs.AnchorDebugUI = function(arAnchor){
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)'
......@@ -7999,8 +8045,17 @@ AFRAME.registerComponent('arjs-anchor', {
// honor .debugUIEnabled
//////////////////////////////////////////////////////////////////////////////
if( arjsSystem.data.debugUIEnabled ){
// get or create containerElement
var containerElement = document.querySelector('#arjsDebugUIContainer')
if( containerElement === null ){
containerElement = document.createElement('div')
containerElement.id = 'arjsDebugUIContainer'
containerElement.setAttribute('style', 'position: fixed; bottom: 10px; width:100%; text-align: center; z-index: 1; color: grey;')
document.body.appendChild(containerElement)
}
// create anchorDebugUI
var anchorDebugUI = new ARjs.AnchorDebugUI(arAnchor)
document.querySelector('#arjsDebugUIContainer').appendChild(anchorDebugUI.domElement)
containerElement.appendChild(anchorDebugUI.domElement)
}
}, 1000/60)
},
......@@ -8401,6 +8456,7 @@ AFRAME.registerSystem('arjs', {
arSource.copyElementSizeTo(document.body)
}
// fixing a-frame css
var buttonElement = document.querySelector('.a-enter-vr')
if( buttonElement ){
buttonElement.style.position = 'fixed'
......@@ -8411,9 +8467,20 @@ AFRAME.registerSystem('arjs', {
//////////////////////////////////////////////////////////////////////////////
// honor .debugUIEnabled
//////////////////////////////////////////////////////////////////////////////
if( _this.data.debugUIEnabled ){
if( _this.data.debugUIEnabled ) initDebugUI()
function initDebugUI(){
// get or create containerElement
var containerElement = document.querySelector('#arjsDebugUIContainer')
if( containerElement === null ){
containerElement = document.createElement('div')
containerElement.id = 'arjsDebugUIContainer'
containerElement.setAttribute('style', 'position: fixed; bottom: 10px; width:100%; text-align: center; z-index: 1;color: grey;')
document.body.appendChild(containerElement)
}
// create sessionDebugUI
var sessionDebugUI = new ARjs.SessionDebugUI(arSession)
document.querySelector('#arjsDebugUIContainer').appendChild(sessionDebugUI.domElement)
containerElement.appendChild(sessionDebugUI.domElement)
}
})
aframe/src/system-arjs.js
浏览文件 @ 8944821a
......@@ -203,6 +203,7 @@ AFRAME.registerSystem('arjs', {
arSource.copyElementSizeTo(document.body)
}
// fixing a-frame css
var buttonElement = document.querySelector('.a-enter-vr')
if( buttonElement ){
buttonElement.style.position = 'fixed'
......@@ -213,7 +214,8 @@ AFRAME.registerSystem('arjs', {
//////////////////////////////////////////////////////////////////////////////
// honor .debugUIEnabled
//////////////////////////////////////////////////////////////////////////////
if( _this.data.debugUIEnabled ){
if( _this.data.debugUIEnabled ) initDebugUI()
function initDebugUI(){
// get or create containerElement
var containerElement = document.querySelector('#arjsDebugUIContainer')
if( containerElement === null ){
......@@ -222,9 +224,10 @@ AFRAME.registerSystem('arjs', {
containerElement.setAttribute('style', 'position: fixed; bottom: 10px; width:100%; text-align: center; z-index: 1;color: grey;')
document.body.appendChild(containerElement)
}
// create sessionDebugUI
var sessionDebugUI = new ARjs.SessionDebugUI(arSession)
containerElement.appendChild(sessionDebugUI.domElement)
containerElement.appendChild(sessionDebugUI.domElement)
}
})
......
three.js/build/ar.js
浏览文件 @ 8944821a
......@@ -6597,15 +6597,39 @@ 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'
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 = 'trackingBackend :' +trackingBackend
domElement.innerHTML = '<b>trackingBackend</b> : ' +trackingBackend
//////////////////////////////////////////////////////////////////////////////
// augmented-websites
//////////////////////////////////////////////////////////////////////////////
var domElement = document.createElement('a')
domElement.innerHTML = 'Share on augmented-websites'
domElement.style.display = 'block'
domElement.setAttribute('target', '_blank')
domElement.href = 'https://webxr.io/augmented-website?'+location.href
this.domElement.appendChild(domElement)
//////////////////////////////////////////////////////////////////////////////
// toggle-point-cloud
//////////////////////////////////////////////////////////////////////////////
......@@ -6646,15 +6670,32 @@ ARjs.AnchorDebugUI = function(arAnchor){
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 = 'markersAreaEnabled :' +arAnchor.parameters.markersAreaEnabled
domElement.innerHTML = '<b>markersAreaEnabled</b> :' +arAnchor.parameters.markersAreaEnabled
//////////////////////////////////////////////////////////////////////////////
// toggle-marker-helper
......@@ -6662,6 +6703,7 @@ ARjs.AnchorDebugUI = function(arAnchor){
if( arAnchor.parameters.markersAreaEnabled ){
var domElement = document.createElement('button')
domElement.style.display = 'block'
this.domElement.appendChild(domElement)
domElement.id= 'buttonToggleMarkerHelpers'
......@@ -6681,7 +6723,9 @@ ARjs.AnchorDebugUI = function(arAnchor){
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)'
......@@ -6698,7 +6742,9 @@ ARjs.AnchorDebugUI = function(arAnchor){
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)'
three.js/src/new-api/arjs-debugui.js
浏览文件 @ 8944821a
......@@ -10,15 +10,39 @@ 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'
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 = 'trackingBackend :' +trackingBackend
domElement.innerHTML = '<b>trackingBackend</b> : ' +trackingBackend
//////////////////////////////////////////////////////////////////////////////
// augmented-websites
//////////////////////////////////////////////////////////////////////////////
var domElement = document.createElement('a')
domElement.innerHTML = 'Share on augmented-websites'
domElement.style.display = 'block'
domElement.setAttribute('target', '_blank')
domElement.href = 'https://webxr.io/augmented-website?'+location.href
this.domElement.appendChild(domElement)
//////////////////////////////////////////////////////////////////////////////
// toggle-point-cloud
//////////////////////////////////////////////////////////////////////////////
......@@ -59,15 +83,32 @@ ARjs.AnchorDebugUI = function(arAnchor){
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 = 'markersAreaEnabled :' +arAnchor.parameters.markersAreaEnabled
domElement.innerHTML = '<b>markersAreaEnabled</b> :' +arAnchor.parameters.markersAreaEnabled
//////////////////////////////////////////////////////////////////////////////
// toggle-marker-helper
......@@ -75,6 +116,7 @@ ARjs.AnchorDebugUI = function(arAnchor){
if( arAnchor.parameters.markersAreaEnabled ){
var domElement = document.createElement('button')
domElement.style.display = 'block'
this.domElement.appendChild(domElement)
domElement.id= 'buttonToggleMarkerHelpers'
......@@ -94,7 +136,9 @@ ARjs.AnchorDebugUI = function(arAnchor){
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)'
......@@ -111,7 +155,9 @@ ARjs.AnchorDebugUI = function(arAnchor){
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)'
......
webvr-polyfill/build/artoolkit-webvr-polyfill.js
浏览文件 @ 8944821a
......@@ -6597,15 +6597,39 @@ 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'
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 = 'trackingBackend :' +trackingBackend
domElement.innerHTML = '<b>trackingBackend</b> : ' +trackingBackend
//////////////////////////////////////////////////////////////////////////////
// augmented-websites
//////////////////////////////////////////////////////////////////////////////
var domElement = document.createElement('a')
domElement.innerHTML = 'Share on augmented-websites'
domElement.style.display = 'block'
domElement.setAttribute('target', '_blank')
domElement.href = 'https://webxr.io/augmented-website?'+location.href
this.domElement.appendChild(domElement)
//////////////////////////////////////////////////////////////////////////////
// toggle-point-cloud
//////////////////////////////////////////////////////////////////////////////
......@@ -6646,15 +6670,32 @@ ARjs.AnchorDebugUI = function(arAnchor){
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 = 'markersAreaEnabled :' +arAnchor.parameters.markersAreaEnabled
domElement.innerHTML = '<b>markersAreaEnabled</b> :' +arAnchor.parameters.markersAreaEnabled
//////////////////////////////////////////////////////////////////////////////
// toggle-marker-helper
......@@ -6662,6 +6703,7 @@ ARjs.AnchorDebugUI = function(arAnchor){
if( arAnchor.parameters.markersAreaEnabled ){
var domElement = document.createElement('button')
domElement.style.display = 'block'
this.domElement.appendChild(domElement)
domElement.id= 'buttonToggleMarkerHelpers'
......@@ -6681,7 +6723,9 @@ ARjs.AnchorDebugUI = function(arAnchor){
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)'
......@@ -6698,7 +6742,9 @@ ARjs.AnchorDebugUI = function(arAnchor){
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)'
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或