Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
cqiang1993
AR.js
提交
b41235c5
A
AR.js
项目概览
cqiang1993
/
AR.js
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
AR.js
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b41235c5
编写于
5月 19, 2019
作者:
N
nicolocarpignoli
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Last commit before release
上级
3e584f59
变更
12
展开全部
显示空白变更内容
内联
并排
Showing
12 changed file
with
72 addition
and
34 deletion
+72
-34
CHANGELOG.md
CHANGELOG.md
+4
-0
README.md
README.md
+1
-1
aframe/build/aframe-ar.js
aframe/build/aframe-ar.js
+15
-17
aframe/build/aframe-ar.min.js
aframe/build/aframe-ar.min.js
+1
-1
prova.html
prova.html
+44
-0
three.js/build/ar.js
three.js/build/ar.js
+1
-3
three.js/build/ar.lean.js
three.js/build/ar.lean.js
+1
-3
three.js/build/ar.lean.min.js
three.js/build/ar.lean.min.js
+1
-1
three.js/build/ar.min.js
three.js/build/ar.min.js
+1
-1
three.js/contribs/portableAR.js/build/portable-ar.js
three.js/contribs/portableAR.js/build/portable-ar.js
+1
-3
three.js/contribs/portableAR.js/build/portable-ar.min.js
three.js/contribs/portableAR.js/build/portable-ar.min.js
+1
-1
three.js/src/threex/threex-artoolkitcontext.js
three.js/src/threex/threex-artoolkitcontext.js
+1
-3
未找到文件。
CHANGELOG.md
浏览文件 @
b41235c5
# 1.7.1
-
added possibility to change border marker color in marker generator
# 1.7.0
-
optionally manage smooth parameter (for video entity glitches and similar problems)
...
...
README.md
浏览文件 @
b41235c5
...
...
@@ -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.
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;'
>
<a-scene
embedded
arjs
>
<a-marker
preset=
"hiro"
>
...
...
aframe/build/aframe-ar.js
浏览文件 @
b41235c5
...
...
@@ -5308,9 +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.6.2'
ARjs.Context.REVISION = '1.7.1';
/**
* Create a default camera for this trackingBackend
...
...
@@ -8472,14 +8470,14 @@ AFRAME.registerPrimitive('a-anchor', AFRAME.utils.extendDeep({}, AFRAME.primitiv
'url': 'arjs-anchor.patternUrl',
'value': 'arjs-anchor.barcodeValue',
'preset': 'arjs-anchor.preset',
'min
C
onfidence': 'arjs-anchor.minConfidence',
'markerhelpers': 'arjs-anchor.markerhelpers',
'min
-c
onfidence': 'arjs-anchor.minConfidence',
'marker
-
helpers': 'arjs-anchor.markerhelpers',
'smooth': 'arjs-anchor.smooth',
'smooth
C
ount': 'arjs-anchor.smoothCount',
'smooth
T
olerance': 'arjs-anchor.smoothTolerance',
'smooth
T
hreshold': 'arjs-anchor.smoothThreshold',
'smooth
-c
ount': 'arjs-anchor.smoothCount',
'smooth
-t
olerance': 'arjs-anchor.smoothTolerance',
'smooth
-t
hreshold': 'arjs-anchor.smoothThreshold',
'hit-testing-render
D
ebug': 'arjs-hit-testing.renderDebug',
'hit-testing-render
-d
ebug': 'arjs-hit-testing.renderDebug',
'hit-testing-enabled': 'arjs-hit-testing.enabled',
}
}))
...
...
@@ -8509,14 +8507,14 @@ AFRAME.registerPrimitive('a-marker', AFRAME.utils.extendDeep({}, AFRAME.primitiv
'url': 'arjs-anchor.patternUrl',
'value': 'arjs-anchor.barcodeValue',
'preset': 'arjs-anchor.preset',
'min
C
onfidence': 'arjs-anchor.minConfidence',
'markerhelpers': 'arjs-anchor.markerhelpers',
'min
-c
onfidence': 'arjs-anchor.minConfidence',
'marker
-
helpers': 'arjs-anchor.markerhelpers',
'smooth': 'arjs-anchor.smooth',
'smooth
C
ount': 'arjs-anchor.smoothCount',
'smooth
T
olerance': 'arjs-anchor.smoothTolerance',
'smooth
T
hreshold': 'arjs-anchor.smoothThreshold',
'smooth
-c
ount': 'arjs-anchor.smoothCount',
'smooth
-t
olerance': 'arjs-anchor.smoothTolerance',
'smooth
-t
hreshold': 'arjs-anchor.smoothThreshold',
'hit-testing-render
D
ebug': 'arjs-hit-testing.renderDebug',
'hit-testing-render
-d
ebug': 'arjs-hit-testing.renderDebug',
'hit-testing-enabled': 'arjs-hit-testing.enabled',
}
}))
...
...
@@ -8534,8 +8532,8 @@ AFRAME.registerPrimitive('a-marker-camera', AFRAME.utils.extendDeep({}, AFRAME.p
'url': 'arjs-anchor.patternUrl',
'value': 'arjs-anchor.barcodeValue',
'preset': 'arjs-anchor.preset',
'min
C
onfidence': 'arjs-anchor.minConfidence',
'markerhelpers': 'arjs-anchor.markerhelpers',
'min
-c
onfidence': 'arjs-anchor.minConfidence',
'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 );
// ARjs.Context.baseURL = '../'
// default to github page
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
three.js/build/ar.lean.js
浏览文件 @
b41235c5
...
...
@@ -2574,9 +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.6.2'
ARjs.Context.REVISION = '1.7.1';
/**
* 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 );
// ARjs.Context.baseURL = '../'
// default to github page
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
three.js/contribs/portableAR.js/build/portable-ar.min.js
浏览文件 @
b41235c5
此差异已折叠。
点击以展开。
three.js/src/threex/threex-artoolkitcontext.js
浏览文件 @
b41235c5
import
*
as
PACKAGE
from
'
../../../package.json
'
;
var
ARjs
=
ARjs
||
{}
var
THREEx
=
THREEx
||
{}
...
...
@@ -78,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
=
PACKAGE
.
version
;
ARjs
.
Context
.
REVISION
=
'
1.7.1
'
;
/**
* Create a default camera for this trackingBackend
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录