Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
cqiang1993
AR.js
提交
8025f378
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,发现更多精彩内容 >>
提交
8025f378
编写于
8月 14, 2017
作者:
J
Jerome Etienne
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Last commit before release
上级
390ac634
变更
12
展开全部
隐藏空白更改
内联
并排
Showing
12 changed file
with
106 addition
and
18 deletion
+106
-18
Makefile
Makefile
+8
-2
README.md
README.md
+2
-2
aframe/build/aframe-ar.js
aframe/build/aframe-ar.js
+16
-1
aframe/build/aframe-ar.min.js
aframe/build/aframe-ar.min.js
+3
-3
babylon.js/build/babylon-ar.js
babylon.js/build/babylon-ar.js
+1
-1
babylon.js/build/babylon-ar.min.js
babylon.js/build/babylon-ar.min.js
+52
-0
package.json
package.json
+1
-1
three.js/build/ar.js
three.js/build/ar.js
+1
-1
three.js/build/ar.min.js
three.js/build/ar.min.js
+2
-2
three.js/src/threex/threex-artoolkitcontext.js
three.js/src/threex/threex-artoolkitcontext.js
+1
-1
webvr-polyfill/build/artoolkit-webvr-polyfill.js
webvr-polyfill/build/artoolkit-webvr-polyfill.js
+16
-1
webvr-polyfill/build/artoolkit-webvr-polyfill.min.js
webvr-polyfill/build/artoolkit-webvr-polyfill.min.js
+3
-3
未找到文件。
Makefile
浏览文件 @
8025f378
build
:
build
:
(
cd
three.js
&&
make build
)
&&
(
cd
aframe
&&
make build
)
&&
(
cd
webvr-polyfill
&&
make build
)
cd
three.js
&&
make build
cd
aframe
&&
make build
cd
babylon.js
&&
make build
cd
webvr-polyfill
&&
make build
minify
:
minify
:
(
cd
three.js
&&
make minify
)
&&
(
cd
aframe
&&
make minify
)
&&
(
cd
webvr-polyfill
&&
make minify
)
cd
three.js
&&
make minify
cd
aframe
&&
make minify
cd
babylon.js
&&
make minify
cd
webvr-polyfill
&&
make minify
.PHONY
:
test
.PHONY
:
test
test
:
test
:
...
...
README.md
浏览文件 @
8025f378
...
@@ -232,10 +232,10 @@ This one is mainly for [me](@jerome_etienne) to remember :)
...
@@ -232,10 +232,10 @@ This one is mainly for [me](@jerome_etienne) to remember :)
```
bash
```
bash
# replace REVISION to the proper version
# replace REVISION to the proper version
atom three.js/src/threex-artoolkitcontext.js package.json
atom three.js/src/threex
/threex
-artoolkitcontext.js package.json
# Rebuild a-frame and webvr-polyfill
# Rebuild a-frame and webvr-polyfill
make
build
make
minify
# Commit everything
# Commit everything
git add
.
&&
git commit
-a
-m
'Last commit before release'
git add
.
&&
git commit
-a
-m
'Last commit before release'
...
...
aframe/build/aframe-ar.js
浏览文件 @
8025f378
...
@@ -5205,7 +5205,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype );
...
@@ -5205,7 +5205,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.
4.1
0'
ARjs.Context.REVISION = '1.
5.
0'
...
@@ -6903,6 +6903,21 @@ ARjs.HitTesting.Result.prototype.applyPosition = function(object3d){
...
@@ -6903,6 +6903,21 @@ ARjs.HitTesting.Result.prototype.applyPosition = function(object3d){
object3d.position.copy(this.position)
object3d.position.copy(this.position)
object3d.updateMatrix()
object3d.updateMatrix()
return this
}
/**
* Apply to a controlled object3d
*
* @param {THREE.Object3D} object3d - the result to apply
*/
ARjs.HitTesting.Result.prototype.applyQuaternion = function(object3d){
object3d.quaternion.copy(this.quaternion)
object3d.updateMatrix()
return this
}
}
var ARjs = ARjs || {}
var ARjs = ARjs || {}
aframe/build/aframe-ar.min.js
浏览文件 @
8025f378
因为 它太大了无法显示 source diff 。你可以改为
查看blob
。
babylon.js/build/babylon-ar.js
浏览文件 @
8025f378
...
@@ -49315,7 +49315,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype );
...
@@ -49315,7 +49315,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.
4.1
0'
ARjs.Context.REVISION = '1.
5.
0'
babylon.js/build/babylon-ar.min.js
0 → 100644
浏览文件 @
8025f378
此差异已折叠。
点击以展开。
package.json
浏览文件 @
8025f378
{
{
"name"
:
"ar.js"
,
"name"
:
"ar.js"
,
"version"
:
"1.
4.1
0"
,
"version"
:
"1.
5.
0"
,
"description"
:
"Efficient Augmented Reality for the Web"
,
"description"
:
"Efficient Augmented Reality for the Web"
,
"main"
:
"three.js"
,
"main"
:
"three.js"
,
"scripts"
:
{
"scripts"
:
{
...
...
three.js/build/ar.js
浏览文件 @
8025f378
...
@@ -5205,7 +5205,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype );
...
@@ -5205,7 +5205,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.
4.1
0'
ARjs.Context.REVISION = '1.
5.
0'
three.js/build/ar.min.js
浏览文件 @
8025f378
因为 它太大了无法显示 source diff 。你可以改为
查看blob
。
three.js/src/threex/threex-artoolkitcontext.js
浏览文件 @
8025f378
...
@@ -73,7 +73,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype );
...
@@ -73,7 +73,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.
4.1
0
'
ARjs
.
Context
.
REVISION
=
'
1.
5.
0
'
...
...
webvr-polyfill/build/artoolkit-webvr-polyfill.js
浏览文件 @
8025f378
...
@@ -5205,7 +5205,7 @@ Object.assign( ARjs.Context.prototype, THREE.EventDispatcher.prototype );
...
@@ -5205,7 +5205,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.
4.1
0'
ARjs.Context.REVISION = '1.
5.
0'
...
@@ -6903,6 +6903,21 @@ ARjs.HitTesting.Result.prototype.applyPosition = function(object3d){
...
@@ -6903,6 +6903,21 @@ ARjs.HitTesting.Result.prototype.applyPosition = function(object3d){
object3d.position.copy(this.position)
object3d.position.copy(this.position)
object3d.updateMatrix()
object3d.updateMatrix()
return this
}
/**
* Apply to a controlled object3d
*
* @param {THREE.Object3D} object3d - the result to apply
*/
ARjs.HitTesting.Result.prototype.applyQuaternion = function(object3d){
object3d.quaternion.copy(this.quaternion)
object3d.updateMatrix()
return this
}
}
var ARjs = ARjs || {}
var ARjs = ARjs || {}
webvr-polyfill/build/artoolkit-webvr-polyfill.min.js
浏览文件 @
8025f378
因为 它太大了无法显示 source diff 。你可以改为
查看blob
。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录