Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
cqiang1993
AR.js
提交
8af3ec40
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,发现更多精彩内容 >>
提交
8af3ec40
编写于
7月 17, 2019
作者:
N
nicolo.carpignoli
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
https://github.com/jeromeetienne/AR.js
上级
45ea143a
8a5c6432
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
36 addition
and
25 deletion
+36
-25
PULL_REQUEST_TEMPLATE.md
PULL_REQUEST_TEMPLATE.md
+9
-2
README.md
README.md
+5
-1
aframe/demos/demo-hatsune-miku/full-hatsune-original.html
aframe/demos/demo-hatsune-miku/full-hatsune-original.html
+9
-9
aframe/demos/demo-hatsune-miku/old-full-hatsune.html
aframe/demos/demo-hatsune-miku/old-full-hatsune.html
+9
-9
aframe/demos/demo-hatsune-miku/old-hatsune.html
aframe/demos/demo-hatsune-miku/old-hatsune.html
+3
-3
three.js/examples/arcode.html
three.js/examples/arcode.html
+1
-1
未找到文件。
PULL_REQUEST_TEMPLATE.md
浏览文件 @
8af3ec40
<!-- Please don't delete this template or we'll close your issue -->
<!-- All PRs should be done versus 'dev' branch -->
<!-- Please, don't delete this template or we'll close your issue -->
**⚠️ All PRs have to be done versus 'dev' branch, so be aware of that, or we'll close your issue ⚠️**
**What kind of change does this PR introduce?**
<!-- Can be a new feature, a bugfix, or refactoring, etc -->
**Can it be referenced to an Issue? If so what is the issue # ?**
**How can we test it?**
<!-- All information can be found about our tests in https://github.com/jeromeetienne/AR.js/blob/master/test/TODO.md -->
<!-- At the moment we don't explicitly require tests, because it's not streamlined yet -->
**Summary**
<!-- State here what problem the PR solves and what is the proposed solution -->
**Does this PR introduce a breaking change?**
**Please TEST your PR before proposing it. Specify here what device you have used for tests, version of OS and version of Browser**
**Other information**
README.md
浏览文件 @
8af3ec40
...
...
@@ -17,12 +17,16 @@ Stuff is still moving fast, we have reached a good status though.
An article has been published on
[
uploadvr
](
https://uploadvr.com/ar-js-efficient-augmented-reality-for-the-web/
)
.
So I wanted to publish this so people can try it and have fun with it :)
🚀For more updated stuff about AR.js, new versions and more, you can follow
[
@nicolocarp
](
https://twitter.com/nicolocarp
)
and Watch this repo!
**Key points**
:
-
**Very Fast**
: it runs efficiently even on phones -
[
60 fps on my 2 year-old phone
](
https://twitter.com/jerome_etienne/status/831333879810236421
)
!
-
**Web-based**
: It is a pure web solution, so no installation required. Full javascript based on three.js + jsartoolkit5
-
**Open Source**
: It is completely open source and free of charge!
-
**Standards**
: It works on any phone with
[
webgl
](
http://caniuse.com/#feat=webgl
)
and
[
webrtc
](
http://caniuse.com/#feat=stream
)
[
![AR.js 1.0 Video
](
https://cloud.githubusercontent.com/assets/252962/23441016/ab6900ce-fe17-11e6-971b-24614fb8ac0e.png
)
](https://youtu.be/0MtvjFg7tik)
# Try it on Mobile
...
...
aframe/demos/demo-hatsune-miku/full-hatsune-original.html
浏览文件 @
8af3ec40
...
...
@@ -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
浏览文件 @
8af3ec40
...
...
@@ -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
浏览文件 @
8af3ec40
...
...
@@ -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>
...
...
three.js/examples/arcode.html
浏览文件 @
8af3ec40
...
...
@@ -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>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录