Skip to content

A
AR.js

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

从无法访问的项目Fork

通知 2
Star 0
Fork 0
A
AR.js

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

提交 b41235c5 编写于 作者: N nicolocarpignoli
浏览文件
操作

Last commit before release

上级 3e584f59
展开全部 隐藏空白更改
内联 并排
Showing with 72 addition and 34 deletion
CHANGELOG.md
浏览文件 @ b41235c5
# 1.7.1
- added possibility to change border marker color in marker generator
# 1.7.0 # 1.7.0
- optionally manage smooth parameter (for video entity glitches and similar problems) - optionally manage smooth parameter (for video entity glitches and similar problems)
......
README.md
浏览文件 @ b41235c5
...@@ -75,7 +75,7 @@ More details about markers: ...@@ -75,7 +75,7 @@ More details about markers:
<!doctype HTML> <!doctype HTML>
<html> <html>
<script src="https://aframe.io/releases/0.9.1/aframe.min.js"></script> <script src="https://aframe.io/releases/0.9.1/aframe.min.js"></script>
<script src="https://cdn.rawgit.com/jeromeetienne/AR.js/1.7.0/aframe/build/aframe-ar.js"></script> <script src="https://cdn.rawgit.com/jeromeetienne/AR.js/1.7.1/aframe/build/aframe-ar.js"></script>
<body style='margin : 0px; overflow: hidden;'> <body style='margin : 0px; overflow: hidden;'>
<a-scene embedded arjs> <a-scene embedded arjs>
<a-marker preset="hiro"> <a-marker preset="hiro">
......
aframe/build/aframe-ar.js
浏览文件 @ b41235c5
...@@ -5308,9 +5308,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype ); ...@@ -5308,9 +5308,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.6.2' ARjs.Context.REVISION = '1.7.1';
/** /**
* Create a default camera for this trackingBackend * Create a default camera for this trackingBackend
...@@ -8472,14 +8470,14 @@ AFRAME.registerPrimitive('a-anchor', AFRAME.utils.extendDeep({}, AFRAME.primitiv ...@@ -8472,14 +8470,14 @@ AFRAME.registerPrimitive('a-anchor', AFRAME.utils.extendDeep({}, AFRAME.primitiv
'url': 'arjs-anchor.patternUrl', 'url': 'arjs-anchor.patternUrl',
'value': 'arjs-anchor.barcodeValue', 'value': 'arjs-anchor.barcodeValue',
'preset': 'arjs-anchor.preset', 'preset': 'arjs-anchor.preset',
'minConfidence': 'arjs-anchor.minConfidence', 'min-confidence': 'arjs-anchor.minConfidence',
'markerhelpers': 'arjs-anchor.markerhelpers', 'marker-helpers': 'arjs-anchor.markerhelpers',
'smooth': 'arjs-anchor.smooth', 'smooth': 'arjs-anchor.smooth',
'smoothCount': 'arjs-anchor.smoothCount', 'smooth-count': 'arjs-anchor.smoothCount',
'smoothTolerance': 'arjs-anchor.smoothTolerance', 'smooth-tolerance': 'arjs-anchor.smoothTolerance',
'smoothThreshold': 'arjs-anchor.smoothThreshold', 'smooth-threshold': 'arjs-anchor.smoothThreshold',
'hit-testing-renderDebug': 'arjs-hit-testing.renderDebug', 'hit-testing-render-debug': 'arjs-hit-testing.renderDebug',
'hit-testing-enabled': 'arjs-hit-testing.enabled', 'hit-testing-enabled': 'arjs-hit-testing.enabled',
} }
})) }))
...@@ -8509,14 +8507,14 @@ AFRAME.registerPrimitive('a-marker', AFRAME.utils.extendDeep({}, AFRAME.primitiv ...@@ -8509,14 +8507,14 @@ AFRAME.registerPrimitive('a-marker', AFRAME.utils.extendDeep({}, AFRAME.primitiv
'url': 'arjs-anchor.patternUrl', 'url': 'arjs-anchor.patternUrl',
'value': 'arjs-anchor.barcodeValue', 'value': 'arjs-anchor.barcodeValue',
'preset': 'arjs-anchor.preset', 'preset': 'arjs-anchor.preset',
'minConfidence': 'arjs-anchor.minConfidence', 'min-confidence': 'arjs-anchor.minConfidence',
'markerhelpers': 'arjs-anchor.markerhelpers', 'marker-helpers': 'arjs-anchor.markerhelpers',
'smooth': 'arjs-anchor.smooth', 'smooth': 'arjs-anchor.smooth',
'smoothCount': 'arjs-anchor.smoothCount', 'smooth-count': 'arjs-anchor.smoothCount',
'smoothTolerance': 'arjs-anchor.smoothTolerance', 'smooth-tolerance': 'arjs-anchor.smoothTolerance',
'smoothThreshold': 'arjs-anchor.smoothThreshold', 'smooth-threshold': 'arjs-anchor.smoothThreshold',
'hit-testing-renderDebug': 'arjs-hit-testing.renderDebug', 'hit-testing-render-debug': 'arjs-hit-testing.renderDebug',
'hit-testing-enabled': 'arjs-hit-testing.enabled', 'hit-testing-enabled': 'arjs-hit-testing.enabled',
} }
})) }))
...@@ -8534,8 +8532,8 @@ AFRAME.registerPrimitive('a-marker-camera', AFRAME.utils.extendDeep({}, AFRAME.p ...@@ -8534,8 +8532,8 @@ AFRAME.registerPrimitive('a-marker-camera', AFRAME.utils.extendDeep({}, AFRAME.p
'url': 'arjs-anchor.patternUrl', 'url': 'arjs-anchor.patternUrl',
'value': 'arjs-anchor.barcodeValue', 'value': 'arjs-anchor.barcodeValue',
'preset': 'arjs-anchor.preset', 'preset': 'arjs-anchor.preset',
'minConfidence': 'arjs-anchor.minConfidence', 'min-confidence': 'arjs-anchor.minConfidence',
'markerhelpers': 'arjs-anchor.markerhelpers', 'marker-helpers': 'arjs-anchor.markerhelpers',
} }
})) }))
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
aframe/build/aframe-ar.min.js
浏览文件 @ b41235c5
此差异已折叠。
prova.html 0 → 100644
浏览文件 @ b41235c5
<!doctype HTML>
<html>
<head>
<meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
</head>
<script src="https://aframe.io/releases/0.9.1/aframe.min.js"></script>
<script src="./aframe/build/aframe-ar.min.js"></script>
<script src="https://rawgit.com/donmccurdy/aframe-extras/master/dist/aframe-extras.loaders.min.js"></script>
<body style='margin : 0px; overflow: hidden;'>
<a-scene embedded arjs='sourceType: webcam; debugUIEnabled: false; detectionMode: mono_and_matrix; matrixCodeType: 3x3;'>
<a-assets>
<a-asset-item id="animated-asset" src="https://raw.githubusercontent.com/nicolocarpignoli/nicolocarpignoli.github.io/master/ar-experimental/models/butterf.glb"></a-asset-item>
</a-assets>
<a-marker type='barcode' value='7'>
<a-entity
scale="0.5 0.5 0.5"
animation-mixer="loop: repeat"
gltf-model='#animated-asset'
rotation="-90 0 0">
</a-entity>
</a-marker>
<a-marker id="animated-marker" type='barcode' value='6'>
<a-entity
smooth="true"
smoothCount="10"
smoothTolerance="0.01"
smoothThreshold="5"
scale="0.5 0.5 0.5"
animation-mixer="loop: repeat"
gltf-model='#animated-asset'
rotation="-90 0 0">
</a-entity>
</a-marker>
<!-- use this <a-entity camera> to support multiple-markers, otherwise use <a-marker-camera> instead of </a-marker> -->
<a-entity camera></a-entity>
</a-scene>
</body>
</html>
\ No newline at end of file
three.js/build/ar.js
浏览文件 @ b41235c5
...@@ -5308,9 +5308,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype ); ...@@ -5308,9 +5308,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.6.2' ARjs.Context.REVISION = '1.7.1';
/** /**
* Create a default camera for this trackingBackend * Create a default camera for this trackingBackend
three.js/build/ar.lean.js
浏览文件 @ b41235c5
...@@ -2574,9 +2574,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype ); ...@@ -2574,9 +2574,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.6.2' ARjs.Context.REVISION = '1.7.1';
/** /**
* Create a default camera for this trackingBackend * Create a default camera for this trackingBackend
......
three.js/build/ar.lean.min.js
浏览文件 @ b41235c5
此差异已折叠。
three.js/build/ar.min.js
浏览文件 @ b41235c5
此差异已折叠。
three.js/contribs/portableAR.js/build/portable-ar.js
浏览文件 @ b41235c5
...@@ -49418,9 +49418,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype ); ...@@ -49418,9 +49418,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.6.2' ARjs.Context.REVISION = '1.7.1';
/** /**
* Create a default camera for this trackingBackend * Create a default camera for this trackingBackend
three.js/src/threex/threex-artoolkitcontext.js
浏览文件 @ b41235c5
import * as PACKAGE from '../../../package.json';
var ARjs = ARjs || {} var ARjs = ARjs || {}
var THREEx = THREEx || {} var THREEx = THREEx || {}
...@@ -78,7 +76,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype ); ...@@ -78,7 +76,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 = PACKAGE.version; ARjs.Context.REVISION = '1.7.1';
/** /**
* Create a default camera for this trackingBackend * Create a default camera for this trackingBackend
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或