Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
cqiang1993
AR.js
提交
98adde3b
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,体验更适合开发者的 AI 搜索 >>
提交
98adde3b
编写于
12月 23, 2019
作者:
N
nicolo.carpignoli
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Last commit before release
上级
263f7ade
变更
11
展开全部
隐藏空白更改
内联
并排
Showing
11 changed file
with
18 addition
and
13 deletion
+18
-13
CHANGELOG.md
CHANGELOG.md
+5
-0
README.md
README.md
+1
-1
aframe/build/aframe-ar.js
aframe/build/aframe-ar.js
+2
-2
aframe/build/aframe-ar.min.js
aframe/build/aframe-ar.min.js
+1
-1
package.json
package.json
+1
-1
three.js/build/ar.js
three.js/build/ar.js
+2
-2
three.js/build/ar.lean.js
three.js/build/ar.lean.js
+2
-2
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/src/threex/threex-artoolkitcontext.js
three.js/src/threex/threex-artoolkitcontext.js
+1
-1
three.js/src/threex/threex-artoolkitsource.js
three.js/src/threex/threex-artoolkitsource.js
+1
-1
未找到文件。
CHANGELOG.md
浏览文件 @
98adde3b
# 2.1.1
-
fixed a bug that causes Overconstrained Error on desktop
-
cleaned repo (removed data like videos and heavy files)
# 2.1.0
-
Removed support for Google Tango (obsolete and no more supported by Google)
...
...
README.md
浏览文件 @
98adde3b
...
...
@@ -127,7 +127,7 @@ You can also use GeoAR.js **without** the script, adding `gps-entity-place` enti
<!doctype HTML>
<html>
<script
src=
"https://aframe.io/releases/1.0.0/aframe.min.js"
></script>
<script
src=
"https://raw.githack.com/jeromeetienne/AR.js/2.1.
0
/aframe/build/aframe-ar.js"
></script>
<script
src=
"https://raw.githack.com/jeromeetienne/AR.js/2.1.
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
浏览文件 @
98adde3b
...
...
@@ -2506,7 +2506,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 = '2.1.
0
';
ARjs.Context.REVISION = '2.1.
1
';
/**
* Create a default camera for this trackingBackend
...
...
@@ -3105,7 +3105,7 @@ ARjs.Source.prototype._initSourceWebcam = function (onReady, onError) {
var userMediaConstraints = {
audio: false,
video: {
facingMode:
{ exact: 'environment' }
,
facingMode:
'environment'
,
width: {
ideal: _this.parameters.sourceWidth,
// min: 1024,
...
...
aframe/build/aframe-ar.min.js
浏览文件 @
98adde3b
此差异已折叠。
点击以展开。
package.json
浏览文件 @
98adde3b
{
"name"
:
"ar.js"
,
"version"
:
"2.1.
0
"
,
"version"
:
"2.1.
1
"
,
"description"
:
"Efficient Augmented Reality for the Web"
,
"main"
:
""
,
"scripts"
:
{
...
...
three.js/build/ar.js
浏览文件 @
98adde3b
...
...
@@ -2506,7 +2506,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 = '2.1.
0
';
ARjs.Context.REVISION = '2.1.
1
';
/**
* Create a default camera for this trackingBackend
...
...
@@ -3105,7 +3105,7 @@ ARjs.Source.prototype._initSourceWebcam = function (onReady, onError) {
var userMediaConstraints = {
audio: false,
video: {
facingMode:
{ exact: 'environment' }
,
facingMode:
'environment'
,
width: {
ideal: _this.parameters.sourceWidth,
// min: 1024,
...
...
three.js/build/ar.lean.js
浏览文件 @
98adde3b
...
...
@@ -2506,7 +2506,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 = '2.1.
0
';
ARjs.Context.REVISION = '2.1.
1
';
/**
* Create a default camera for this trackingBackend
...
...
@@ -3105,7 +3105,7 @@ ARjs.Source.prototype._initSourceWebcam = function (onReady, onError) {
var userMediaConstraints = {
audio: false,
video: {
facingMode:
{ exact: 'environment' }
,
facingMode:
'environment'
,
width: {
ideal: _this.parameters.sourceWidth,
// min: 1024,
...
...
three.js/build/ar.lean.min.js
浏览文件 @
98adde3b
此差异已折叠。
点击以展开。
three.js/build/ar.min.js
浏览文件 @
98adde3b
此差异已折叠。
点击以展开。
three.js/src/threex/threex-artoolkitcontext.js
浏览文件 @
98adde3b
...
...
@@ -76,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
=
'
2.1.
0
'
;
ARjs
.
Context
.
REVISION
=
'
2.1.
1
'
;
/**
* Create a default camera for this trackingBackend
...
...
three.js/src/threex/threex-artoolkitsource.js
浏览文件 @
98adde3b
...
...
@@ -183,7 +183,7 @@ ARjs.Source.prototype._initSourceWebcam = function (onReady, onError) {
var
userMediaConstraints
=
{
audio
:
false
,
video
:
{
facingMode
:
{
exact
:
'
environment
'
}
,
facingMode
:
'
environment
'
,
width
:
{
ideal
:
_this
.
parameters
.
sourceWidth
,
// min: 1024,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录