Skip to content

A
AR.js

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

从无法访问的项目Fork

通知 2
Star 0
Fork 0
A
AR.js

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

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

Merge branch 'dev' into issue/clean-paths 

# Conflicts:
#	aframe/build/aframe-ar.min.js
#	three.js/build/ar.lean.min.js
#	three.js/build/ar.min.js
#	three.js/contribs/portableAR.js/build/portable-ar.min.js
上级 22f10bb2 6d48e649
展开全部 隐藏空白更改
内联 并排
Showing with 55 addition and 46 deletion
CHANGELOG.md
浏览文件 @ 215aa1a9
# 1.7.2
- updated `three.js` dependency to `r103` version
- minor documentation fixes
- replace all rawgit URLs (learn more at https://rawgit.com/)
# 1.7.1
- added possibility to change border marker color in marker generator
......@@ -15,7 +21,7 @@
# 1.6.2
- Adds TravisCI config with NPM deployment configured - thanks @joestrong -
- Adds TravisCI config with NPM deployment configured - thanks @joestrong -
[#344](https://github.com/jeromeetienne/AR.js/pull/344)
# 1.6.1
......
README.md
浏览文件 @ 215aa1a9
......@@ -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.1/aframe/build/aframe-ar.js"></script>
<script src="https://cdn.rawgit.com/jeromeetienne/AR.js/1.7.2/aframe/build/aframe-ar.js"></script>
<body style='margin : 0px; overflow: hidden;'>
<a-scene embedded arjs>
<a-marker preset="hiro">
......@@ -108,7 +108,7 @@ all the crazy ideas related to AR.js.
- How to write a AR.js application ?
Here is a [full tutorial](https://marmelab.com/blog/2017/06/19/augmented-reality-html5.html)
by [marmelab](https://marmelab.com/) featuring [François Zaninotto](https://twitter.com/francoisz).
It explain how to code a full application on phone! Step by Steps, with explaination and videos.
It explain how to code a full application on phone! Step by Steps, with explanation and videos.
Very great! the perfect step if you want to start writing AR application today.
## Advanced guides
......
aframe/build/aframe-ar.js
浏览文件 @ 215aa1a9
......@@ -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.1';
ARjs.Context.REVISION = '1.7.2';
/**
* Create a default camera for this trackingBackend
aframe/build/aframe-ar.min.js
浏览文件 @ 215aa1a9
此差异已折叠。
aframe/demos/demo-hatsune-miku/full-hatsune-original.html
浏览文件 @ 215aa1a9
......@@ -13,11 +13,11 @@
};
*/
</script>
<script src="https://cdn.rawgit.com/aframevr/aframe/v0.5.0/dist/aframe-master.min.js"></script>
<script src="https://cdn.rawgit.com/kripken/ammo.js/dcab07bf0e7f2b4b64c01dc45da846344c8f50be/builds/ammo.js"></script>
<script src="https://cdn.rawgit.com/donmccurdy/aframe-extras/v3.2.0/dist/aframe-extras.min.js"></script>
<script src="https://cdn.rawgit.com/takahirox/aframe-outline/v1.1.0/build/aframe-outline.min.js"></script>
<script src='https://cdn.rawgit.com/takahirox/a-mmd/v1.0.2/build/a-mmd.js'></script>
<script src="https://raw.githack.com/aframevr/aframe/v0.5.0/dist/aframe-master.min.js"></script>
<script src="https://raw.githack.com/kripken/ammo.js/dcab07bf0e7f2b4b64c01dc45da846344c8f50be/builds/ammo.js"></script>
<script src="https://raw.githack.com/donmccurdy/aframe-extras/v3.2.0/dist/aframe-extras.min.js"></script>
<script src="https://raw.githack.com/takahirox/aframe-outline/v1.1.0/build/aframe-outline.min.js"></script>
<script src='https://raw.githack.com/takahirox/a-mmd/v1.0.2/build/a-mmd.js'></script>
</head>
<body>
......@@ -28,17 +28,17 @@ https://github.com/mrdoob/three.js/tree/dev/examples/models/mmd#readme
<a-scene antialias="true" outline stats>
<a-assets>
<img id="sky" src="https://cdn.rawgit.com/aframevr/aframe/master/examples/primitives/models/peach-gradient.jpg">
<img id="sky" src="https://raw.githack.com/aframevr/aframe/master/examples/primitives/models/peach-gradient.jpg">
</a-assets>
<a-entity position="0 13 13">
<a-camera></a-camera>
</a-entity>
<a-entity mmd="audio:https://cdn.rawgit.com/mrdoob/three.js/dev/examples/models/mmd/audios/wavefile_short.mp3;
<a-entity mmd="audio:https://raw.githack.com/mrdoob/three.js/dev/examples/models/mmd/audios/wavefile_short.mp3;
audioDelayTime:5.333333333333333; afterglow:2.0;">
<a-entity mmd-model="model:https://cdn.rawgit.com/mrdoob/three.js/dev/examples/models/mmd/miku/miku_v2.pmd;
vmd:https://cdn.rawgit.com/mrdoob/three.js/dev/examples/models/mmd/vmds/wavefile_v2.vmd;
<a-entity mmd-model="model:https://raw.githack.com/mrdoob/three.js/dev/examples/models/mmd/miku/miku_v2.pmd;
vmd:https://raw.githack.com/mrdoob/three.js/dev/examples/models/mmd/vmds/wavefile_v2.vmd;
physics:true;"
shadow="cast:true"
position="0 0 0"></a-entity>
......
aframe/demos/demo-hatsune-miku/old-full-hatsune.html
浏览文件 @ 215aa1a9
......@@ -12,11 +12,11 @@
};
*/
</script>
<script src="https://cdn.rawgit.com/aframevr/aframe/v0.5.0/dist/aframe-master.min.js"></script>
<script src="https://cdn.rawgit.com/kripken/ammo.js/dcab07bf0e7f2b4b64c01dc45da846344c8f50be/builds/ammo.js"></script>
<script src="https://cdn.rawgit.com/donmccurdy/aframe-extras/v3.2.0/dist/aframe-extras.min.js"></script>
<script src="https://cdn.rawgit.com/takahirox/aframe-outline/v1.1.0/build/aframe-outline.min.js"></script>
<script src="https://cdn.rawgit.com/takahirox/a-mmd/master/build/a-mmd.js"></script>
<script src="https://raw.githack.com/aframevr/aframe/v0.5.0/dist/aframe-master.min.js"></script>
<script src="https://raw.githack.com/kripken/ammo.js/dcab07bf0e7f2b4b64c01dc45da846344c8f50be/builds/ammo.js"></script>
<script src="https://raw.githack.com/donmccurdy/aframe-extras/v3.2.0/dist/aframe-extras.min.js"></script>
<script src="https://raw.githack.com/takahirox/aframe-outline/v1.1.0/build/aframe-outline.min.js"></script>
<script src="https://raw.githack.com/takahirox/a-mmd/master/build/a-mmd.js"></script>
<!-- include aframe-ar.js -->
<script src="../../build/aframe-ar.js"></script>
......@@ -31,16 +31,16 @@ https://github.com/mrdoob/three.js/tree/dev/examples/models/mmd#readme
<a-scene embedded arjs='debug: false; sourceType: webcam;' antialias="true" outline stats>
<a-assets>
<img id="sky" src="https://cdn.rawgit.com/aframevr/aframe/master/examples/primitives/models/peach-gradient.jpg">
<img id="sky" src="https://raw.githack.com/aframevr/aframe/master/examples/primitives/models/peach-gradient.jpg">
</a-assets>
<a-entity camera></a-entity>
<a-anchor>
<a-entity mmd="audio:https://cdn.rawgit.com/mrdoob/three.js/dev/examples/models/mmd/audios/wavefile_short.mp3;
<a-entity mmd="audio:https://raw.githack.com/mrdoob/three.js/dev/examples/models/mmd/audios/wavefile_short.mp3;
audioDelayTime:5.333333333333333; afterglow:2.0;">
<a-entity mmd-model="model:https://cdn.rawgit.com/mrdoob/three.js/dev/examples/models/mmd/miku/miku_v2.pmd;
vmd:https://cdn.rawgit.com/mrdoob/three.js/dev/examples/models/mmd/vmds/wavefile_v2.vmd;
<a-entity mmd-model="model:https://raw.githack.com/mrdoob/three.js/dev/examples/models/mmd/miku/miku_v2.pmd;
vmd:https://raw.githack.com/mrdoob/three.js/dev/examples/models/mmd/vmds/wavefile_v2.vmd;
physics:false;"
shadow="cast:true">
</a-entity>
......
aframe/demos/demo-hatsune-miku/old-hatsune.html
浏览文件 @ 215aa1a9
......@@ -22,13 +22,13 @@
<!-- add an hatsune miku -->
<a-entity scale="0.08 0.08 0.08">
<a-entity mmd='outline: true' afterglow:2.0;>
<a-entity mmd-model="model:https://cdn.rawgit.com/mrdoob/three.js/dev/examples/models/mmd/miku/miku_v2.pmd;
vmd:https://cdn.rawgit.com/mrdoob/three.js/dev/examples/models/mmd/vmds/wavefile_v2.vmd;"
<a-entity mmd-model="model:https://raw.githack.com/mrdoob/three.js/dev/examples/models/mmd/miku/miku_v2.pmd;
vmd:https://raw.githack.com/mrdoob/three.js/dev/examples/models/mmd/vmds/wavefile_v2.vmd;"
shadow="cast:true"
position="0 0 0"></a-entity>
</a-entity>
<!-- add sounds -->
<!-- <a-entity mmd="audio:https://cdn.rawgit.com/mrdoob/three.js/dev/examples/models/mmd/audios/wavefile_short.mp3;
<!-- <a-entity mmd="audio:https://raw.githack.com/mrdoob/three.js/dev/examples/models/mmd/audios/wavefile_short.mp3;
audioDelayTime:5.333333333333333; afterglow:2.0;"> -->
</a-entity>
......
package.json
浏览文件 @ 215aa1a9
{
"name": "ar.js",
"version": "1.7.1",
"version": "1.7.2",
"description": "Efficient Augmented Reality for the Web",
"main": "",
"scripts": {
......
three.js/build/ar.js
浏览文件 @ 215aa1a9
......@@ -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.1';
ARjs.Context.REVISION = '1.7.2';
/**
* Create a default camera for this trackingBackend
three.js/build/ar.lean.js
浏览文件 @ 215aa1a9
......@@ -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.1';
ARjs.Context.REVISION = '1.7.2';
/**
* Create a default camera for this trackingBackend
......
three.js/build/ar.lean.min.js
浏览文件 @ 215aa1a9
此差异已折叠。
three.js/build/ar.min.js
浏览文件 @ 215aa1a9
此差异已折叠。
three.js/contribs/portableAR.js/build/portable-ar.js
浏览文件 @ 215aa1a9
......@@ -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.1';
ARjs.Context.REVISION = '1.7.2';
/**
* Create a default camera for this trackingBackend
three.js/examples/arcode.html
浏览文件 @ 215aa1a9
......@@ -11,7 +11,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<!-- https://davidshimjs.github.io/qrcodejs/ -->
<script src='https://cdn.rawgit.com/davidshimjs/qrcodejs/gh-pages/qrcode.min.js'></script>
<script src='https://raw.githack.com/davidshimjs/qrcodejs/gh-pages/qrcode.min.js'></script>
<!-- Include pdfMake - http://pdfmake.org/ -->
<script src='vendor/pdfMake/pdfmake.min.js'></script>
......
three.js/src/new-api/arjs-debugui.js
浏览文件 @ 215aa1a9
......@@ -3,7 +3,7 @@ var ARjs = ARjs || {}
/**
* Create an debug UI for an ARjs.Anchor
*
*
* @param {ARjs.Anchor} arAnchor - the anchor to user
*/
ARjs.SessionDebugUI = function(arSession, tangoPointCloud){
......@@ -35,7 +35,7 @@ ARjs.SessionDebugUI = function(arSession, tangoPointCloud){
domElement.style.display = 'block'
this.domElement.appendChild(domElement)
domElement.innerHTML = '<b>trackingBackend</b> : ' +trackingBackend
//////////////////////////////////////////////////////////////////////////////
// augmented-websites
//////////////////////////////////////////////////////////////////////////////
......@@ -43,10 +43,13 @@ ARjs.SessionDebugUI = function(arSession, tangoPointCloud){
if( ARjs.SessionDebugUI.AugmentedWebsiteURL ){
var domElement = document.createElement('a')
domElement.innerHTML = 'Share on augmented-websites'
domElement.style.display = 'block'
domElement.style.display = 'block'
domElement.style.position = 'fixed';
domElement.style.left = '5px';
domElement.style.bottom = '10px';
// domElement.setAttribute('target', '_blank')
domElement.href = ARjs.SessionDebugUI.AugmentedWebsiteURL + '?'+location.href
this.domElement.appendChild(domElement)
this.domElement.appendChild(domElement)
}
//////////////////////////////////////////////////////////////////////////////
......@@ -68,7 +71,7 @@ ARjs.SessionDebugUI = function(arSession, tangoPointCloud){
if( tangoPointCloud.object3d.parent ){
scene.remove(tangoPointCloud.object3d)
}else{
scene.add(tangoPointCloud.object3d)
scene.add(tangoPointCloud.object3d)
}
})
}
......@@ -89,14 +92,14 @@ ARjs.SessionDebugUI.AugmentedWebsiteURL = 'https://webxr.io/augmented-website'
/**
* Create an debug UI for an ARjs.Anchor
*
*
* @param {ARjs.Anchor} arAnchor - the anchor to user
*/
ARjs.AnchorDebugUI = function(arAnchor){
var _this = this
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)'
......@@ -141,10 +144,10 @@ ARjs.AnchorDebugUI = function(arAnchor){
var subMarkerHelpersVisible = false
domElement.addEventListener('click', function(){
subMarkerHelpersVisible = subMarkerHelpersVisible ? false : true
arAnchor.markersArea.setSubMarkersVisibility(subMarkerHelpersVisible)
arAnchor.markersArea.setSubMarkersVisibility(subMarkerHelpersVisible)
})
}
//////////////////////////////////////////////////////////////////////////////
// Learn-new-marker-area
//////////////////////////////////////////////////////////////////////////////
......@@ -165,7 +168,7 @@ ARjs.AnchorDebugUI = function(arAnchor){
var learnerURL = ARjs.Context.baseURL + 'examples/multi-markers/examples/learner.html'
}
ARjs.MarkersAreaUtils.navigateToLearnerPage(learnerURL, trackingBackend)
})
})
}
//////////////////////////////////////////////////////////////////////////////
......
three.js/src/threex/threex-artoolkitcontext.js
浏览文件 @ 215aa1a9
......@@ -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.1';
ARjs.Context.REVISION = '1.7.2';
/**
* Create a default camera for this trackingBackend
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或