Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
cqiang1993
AR.js
提交
62ffc3be
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,发现更多精彩内容 >>
提交
62ffc3be
编写于
6月 30, 2017
作者:
J
Jerome Etienne
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
added link from augmented-website to webar-playground
上级
4a653d99
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
23 addition
and
24 deletion
+23
-24
three.js/examples/augmented-website/TODO.md
three.js/examples/augmented-website/TODO.md
+2
-17
three.js/examples/augmented-website/index.html
three.js/examples/augmented-website/index.html
+3
-3
three.js/examples/augmented-website/landing-page/js/arAppURL.js
...js/examples/augmented-website/landing-page/js/arAppURL.js
+18
-4
未找到文件。
three.js/examples/augmented-website/TODO.md
浏览文件 @
62ffc3be
-
rename arAppURL as appURL
# Nice Url for augemented-webpages
# Nice Url for augemented-webpages
-
then support on external site - try to get nice url
-
then support on external site - try to get nice url
-
include that in webxr.io - little AR logo in bottom right - try clean url
-
include that in webxr.io - little AR logo in bottom right - try clean url
...
@@ -7,20 +9,3 @@
...
@@ -7,20 +9,3 @@
-
here goes in iframe with the augmented-webpages examples
-
here goes in iframe with the augmented-webpages examples
-
and url remains simple
-
and url remains simple
-
no need to move files
-
no need to move files
-
later refactor learning in multimarker itself
-
this will clean the code for webar-playground and other potential application
# TODO
-
cleanup code in the screenAsPortal examples
-
then make that the example for multi marker with a simpler 3d
-
put learner in the same .html to avoid reload
-
maybe do a threex-armultimarkersimple.js which regroup the usual usage of multi marker
-
thus the boilerplate isnt too big when it is repeated all the time
-
clean up learner
-
remove arToolkitContext
-
have caller listen to the event and call areaLearning.onSourceProcessed()
-
we learn while we play ? thus the result are getting better and better
-
able to play when all marker are markers as learned
-
do nice visual on each marker - phase 'scan all the markers'
-
once all markers are learned we can start playing
three.js/examples/augmented-website/index.html
浏览文件 @
62ffc3be
...
@@ -64,7 +64,7 @@
...
@@ -64,7 +64,7 @@
-
-
arrow keys to tune
arrow keys to tune
<br/>
<br/>
<a
href=
'javascript:void(0)'
onclick=
'markersPageLeave()'
>
Back
</a>
<a
href=
'javascript:void(0)'
onclick=
'markersPageLeave()'
>
Back to qrcode
</a>
</div>
</div>
<div
style=
'position: absolute; bottom: 10px; width:100%; text-align: center;'
;
>
<div
style=
'position: absolute; bottom: 10px; width:100%; text-align: center;'
;
>
Tracking backend:
Tracking backend:
...
@@ -171,8 +171,8 @@
...
@@ -171,8 +171,8 @@
</div>
</div>
<div
style=
'position: absolute; bottom: 10px; width:100%; text-align: center;'
;
>
<div
style=
'position: absolute; bottom: 10px; width:100%; text-align: center;'
;
>
Made with love by
<a
href=
'https://twitter.com/jerome_etienne'
target=
'_blank'
>
@jerome_etienne
</a>
.
Made with love by
<a
href=
'https://twitter.com/jerome_etienne'
target=
'_blank'
>
@jerome_etienne
</a>
.
Create your own AR with
<a
href=
'https://jeromeetienne.github.io/webar-playground/
'
target=
'_blank'
>
WebAR Playground
</a>
.
Create your own AR with
<a
id=
'webARPlaygroundLink'
href=
'javascript:void(0)
'
target=
'_blank'
>
WebAR Playground
</a>
.
Direct link to
<a
target=
'_blank'
id=
'arAppURLLink'
href=
'javascript:void(0)'
>
AR A
pp
</a>
Direct link to
the
<a
target=
'_blank'
id=
'arAppURLLink'
href=
'javascript:void(0)'
>
a
pp
</a>
</div>
</div>
</main>
</main>
</div>
</div>
...
...
three.js/examples/augmented-website/landing-page/js/arAppURL.js
浏览文件 @
62ffc3be
...
@@ -54,6 +54,19 @@ function arAppURLUpdatePage(url){
...
@@ -54,6 +54,19 @@ function arAppURLUpdatePage(url){
}
}
function
updateArAppURL
(){
function
updateArAppURL
(){
;(
function
(){
var
urlOptions
=
{
trackingBackend
:
'
artoolkit
'
,
markerPageResolution
:
window
.
innerWidth
+
'
x
'
+
window
.
innerHeight
,
firebasePeerID
:
(
typeof
(
firebasePeerID
)
!==
'
undefined
'
&&
firebasePeerID
!==
null
)
?
firebasePeerID
:
undefined
,
arAppURL
:
'
https://jeromeetienne.github.io/webar-playground/
'
}
var
url
=
'
app/
'
+
'
#
'
+
encodeURIComponent
(
JSON
.
stringify
(
urlOptions
));
document
.
querySelector
(
'
#webARPlaygroundLink
'
).
href
=
url
})()
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
// build urlOptions
// build urlOptions
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
...
@@ -61,12 +74,13 @@ function updateArAppURL(){
...
@@ -61,12 +74,13 @@ function updateArAppURL(){
var
urlOptions
=
{
var
urlOptions
=
{
trackingBackend
:
'
artoolkit
'
,
trackingBackend
:
'
artoolkit
'
,
markerPageResolution
:
window
.
innerWidth
+
'
x
'
+
window
.
innerHeight
,
markerPageResolution
:
window
.
innerWidth
+
'
x
'
+
window
.
innerHeight
,
firebasePeerID
:
(
typeof
(
firebasePeerID
)
!==
'
undefined
'
&&
firebasePeerID
!==
null
)
?
firebasePeerID
:
undefined
,
}
}
if
(
typeof
(
firebasePeerID
)
!==
'
undefined
'
&&
firebasePeerID
!==
null
){
//
if( typeof(firebasePeerID) !== 'undefined' && firebasePeerID !== null ){
urlOptions
.
firebasePeerID
=
firebasePeerID
//
urlOptions.firebasePeerID = firebasePeerID
}
//
}
//
// build arAppURL
// build arAppURL
if
(
location
.
search
.
substring
(
1
)
){
if
(
location
.
search
.
substring
(
1
)
){
urlOptions
.
arAppURL
=
location
.
search
.
substring
(
1
)
urlOptions
.
arAppURL
=
location
.
search
.
substring
(
1
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录