Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
ba8d0f8f
T
three.js
项目概览
Ablesons
/
three.js
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
three.js
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
ba8d0f8f
编写于
6月 27, 2019
作者:
M
Mugen87
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
VRMLLoader: Fix parsing in Safari.
上级
d0e0fa39
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
60 addition
and
16 deletion
+60
-16
examples/js/loaders/VRMLLoader.js
examples/js/loaders/VRMLLoader.js
+30
-8
examples/jsm/loaders/VRMLLoader.js
examples/jsm/loaders/VRMLLoader.js
+30
-8
未找到文件。
examples/js/loaders/VRMLLoader.js
浏览文件 @
ba8d0f8f
...
...
@@ -170,7 +170,8 @@ THREE.VRMLLoader = ( function () {
var
StringLiteral
=
createToken
(
{
name
:
"
StringLiteral
"
,
pattern
:
/"
(
:
?[^\\
"
\n\r]
+|
\\(
:
?[
bfnrtv"
\\/]
|u
[
0-9a-fA-F
]{4}))
*"/
}
);
var
NumberLiteral
=
createToken
(
{
name
:
'
NumberLiteral
'
,
pattern
:
/
[
-+
]?[
0-9
]
*
\.?[
0-9
]
+
([
eE
][
-+
]?[
0-9
]
+
)?
/
}
);
var
BooleanLiteral
=
createToken
(
{
name
:
'
BooleanLiteral
'
,
pattern
:
/TRUE|FALSE/
}
);
var
TrueLiteral
=
createToken
(
{
name
:
'
TrueLiteral
'
,
pattern
:
/TRUE/
}
);
var
FalseLiteral
=
createToken
(
{
name
:
'
FalseLiteral
'
,
pattern
:
/FALSE/
}
);
var
NullLiteral
=
createToken
(
{
name
:
'
NullLiteral
'
,
pattern
:
/NULL/
}
);
var
LSquare
=
createToken
(
{
name
:
'
LSquare
'
,
pattern
:
/
\[
/
}
);
var
RSquare
=
createToken
(
{
name
:
'
RSquare
'
,
pattern
:
/]/
}
);
...
...
@@ -198,7 +199,8 @@ THREE.VRMLLoader = ( function () {
USE
,
ROUTE
,
TO
,
BooleanLiteral
,
TrueLiteral
,
FalseLiteral
,
NullLiteral
,
// the Identifier must appear after the keywords because all keywords are valid identifiers
Version
,
...
...
@@ -446,15 +448,29 @@ THREE.VRMLLoader = ( function () {
}
if
(
ctx
.
Boolean
Literal
)
{
if
(
ctx
.
True
Literal
)
{
field
.
type
=
'
boolean
'
;
for
(
var
i
=
0
,
l
=
ctx
.
Boolean
Literal
.
length
;
i
<
l
;
i
++
)
{
for
(
var
i
=
0
,
l
=
ctx
.
True
Literal
.
length
;
i
<
l
;
i
++
)
{
var
booleanLiteral
=
ctx
.
Boolean
Literal
[
i
];
var
trueLiteral
=
ctx
.
True
Literal
[
i
];
field
.
values
.
push
(
booleanLiteral
.
image
===
'
TRUE
'
);
if
(
trueLiteral
.
image
===
'
TRUE
'
)
field
.
values
.
push
(
true
);
}
}
if
(
ctx
.
FalseLiteral
)
{
field
.
type
=
'
boolean
'
;
for
(
var
i
=
0
,
l
=
ctx
.
FalseLiteral
.
length
;
i
<
l
;
i
++
)
{
var
falseLiteral
=
ctx
.
FalseLiteral
[
i
];
if
(
falseLiteral
.
image
===
'
FALSE
'
)
field
.
values
.
push
(
false
);
}
...
...
@@ -2374,7 +2390,8 @@ THREE.VRMLLoader = ( function () {
var
RouteIdentifier
=
tokenVocabulary
[
'
RouteIdentifier
'
];
var
StringLiteral
=
tokenVocabulary
[
'
StringLiteral
'
];
var
NumberLiteral
=
tokenVocabulary
[
'
NumberLiteral
'
];
var
BooleanLiteral
=
tokenVocabulary
[
'
BooleanLiteral
'
];
var
TrueLiteral
=
tokenVocabulary
[
'
TrueLiteral
'
];
var
FalseLiteral
=
tokenVocabulary
[
'
FalseLiteral
'
];
var
NullLiteral
=
tokenVocabulary
[
'
NullLiteral
'
];
var
DEF
=
tokenVocabulary
[
'
DEF
'
];
var
USE
=
tokenVocabulary
[
'
USE
'
];
...
...
@@ -2483,7 +2500,12 @@ THREE.VRMLLoader = ( function () {
}
},
{
ALT
:
function
()
{
$
.
CONSUME
(
BooleanLiteral
);
$
.
CONSUME
(
TrueLiteral
);
}
},
{
ALT
:
function
()
{
$
.
CONSUME
(
FalseLiteral
);
}
},
{
ALT
:
function
()
{
...
...
examples/jsm/loaders/VRMLLoader.js
浏览文件 @
ba8d0f8f
...
...
@@ -204,7 +204,8 @@ var VRMLLoader = ( function () {
var
StringLiteral
=
createToken
(
{
name
:
"
StringLiteral
"
,
pattern
:
/"
(
:
?[^\\
"
\n\r]
+|
\\(
:
?[
bfnrtv"
\\/]
|u
[
0-9a-fA-F
]{4}))
*"/
}
);
var
NumberLiteral
=
createToken
(
{
name
:
'
NumberLiteral
'
,
pattern
:
/
[
-+
]?[
0-9
]
*
\.?[
0-9
]
+
([
eE
][
-+
]?[
0-9
]
+
)?
/
}
);
var
BooleanLiteral
=
createToken
(
{
name
:
'
BooleanLiteral
'
,
pattern
:
/TRUE|FALSE/
}
);
var
TrueLiteral
=
createToken
(
{
name
:
'
TrueLiteral
'
,
pattern
:
/TRUE/
}
);
var
FalseLiteral
=
createToken
(
{
name
:
'
FalseLiteral
'
,
pattern
:
/FALSE/
}
);
var
NullLiteral
=
createToken
(
{
name
:
'
NullLiteral
'
,
pattern
:
/NULL/
}
);
var
LSquare
=
createToken
(
{
name
:
'
LSquare
'
,
pattern
:
/
\[
/
}
);
var
RSquare
=
createToken
(
{
name
:
'
RSquare
'
,
pattern
:
/]/
}
);
...
...
@@ -232,7 +233,8 @@ var VRMLLoader = ( function () {
USE
,
ROUTE
,
TO
,
BooleanLiteral
,
TrueLiteral
,
FalseLiteral
,
NullLiteral
,
// the Identifier must appear after the keywords because all keywords are valid identifiers
Version
,
...
...
@@ -480,15 +482,29 @@ var VRMLLoader = ( function () {
}
if
(
ctx
.
Boolean
Literal
)
{
if
(
ctx
.
True
Literal
)
{
field
.
type
=
'
boolean
'
;
for
(
var
i
=
0
,
l
=
ctx
.
Boolean
Literal
.
length
;
i
<
l
;
i
++
)
{
for
(
var
i
=
0
,
l
=
ctx
.
True
Literal
.
length
;
i
<
l
;
i
++
)
{
var
booleanLiteral
=
ctx
.
Boolean
Literal
[
i
];
var
trueLiteral
=
ctx
.
True
Literal
[
i
];
field
.
values
.
push
(
booleanLiteral
.
image
===
'
TRUE
'
);
if
(
trueLiteral
.
image
===
'
TRUE
'
)
field
.
values
.
push
(
true
);
}
}
if
(
ctx
.
FalseLiteral
)
{
field
.
type
=
'
boolean
'
;
for
(
var
i
=
0
,
l
=
ctx
.
FalseLiteral
.
length
;
i
<
l
;
i
++
)
{
var
falseLiteral
=
ctx
.
FalseLiteral
[
i
];
if
(
falseLiteral
.
image
===
'
FALSE
'
)
field
.
values
.
push
(
false
);
}
...
...
@@ -2408,7 +2424,8 @@ var VRMLLoader = ( function () {
var
RouteIdentifier
=
tokenVocabulary
[
'
RouteIdentifier
'
];
var
StringLiteral
=
tokenVocabulary
[
'
StringLiteral
'
];
var
NumberLiteral
=
tokenVocabulary
[
'
NumberLiteral
'
];
var
BooleanLiteral
=
tokenVocabulary
[
'
BooleanLiteral
'
];
var
TrueLiteral
=
tokenVocabulary
[
'
TrueLiteral
'
];
var
FalseLiteral
=
tokenVocabulary
[
'
FalseLiteral
'
];
var
NullLiteral
=
tokenVocabulary
[
'
NullLiteral
'
];
var
DEF
=
tokenVocabulary
[
'
DEF
'
];
var
USE
=
tokenVocabulary
[
'
USE
'
];
...
...
@@ -2517,7 +2534,12 @@ var VRMLLoader = ( function () {
}
},
{
ALT
:
function
()
{
$
.
CONSUME
(
BooleanLiteral
);
$
.
CONSUME
(
TrueLiteral
);
}
},
{
ALT
:
function
()
{
$
.
CONSUME
(
FalseLiteral
);
}
},
{
ALT
:
function
()
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录