Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
886e79fc
T
three.js
项目概览
车家大少爷
/
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,发现更多精彩内容 >>
提交
886e79fc
编写于
8月 22, 2018
作者:
M
Mugen87
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Clean up
上级
1fe4e34b
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
8 addition
and
14 deletion
+8
-14
editor/js/Loader.js
editor/js/Loader.js
+1
-1
examples/js/loaders/MMDLoader.js
examples/js/loaders/MMDLoader.js
+7
-11
examples/js/math/Lut.js
examples/js/math/Lut.js
+0
-2
未找到文件。
editor/js/Loader.js
浏览文件 @
886e79fc
...
@@ -490,7 +490,7 @@ var Loader = function ( editor ) {
...
@@ -490,7 +490,7 @@ var Loader = function ( editor ) {
if
(
file
.
name
.
search
(
/
\.
glb$/i
)
>
-
1
)
{
if
(
file
.
name
.
search
(
/
\.
glb$/i
)
>
-
1
)
{
var
loader
=
new
THREE
.
GLTFLoader
(
manager
);
var
loader
=
new
THREE
.
GLTFLoader
();
loader
.
parse
(
file
.
asArrayBuffer
(),
''
,
function
(
result
)
{
loader
.
parse
(
file
.
asArrayBuffer
(),
''
,
function
(
result
)
{
editor
.
execute
(
new
AddObjectCommand
(
result
.
scene
)
);
editor
.
execute
(
new
AddObjectCommand
(
result
.
scene
)
);
...
...
examples/js/loaders/MMDLoader.js
浏览文件 @
886e79fc
...
@@ -75,7 +75,6 @@ THREE.MMDLoader = ( function () {
...
@@ -75,7 +75,6 @@ THREE.MMDLoader = ( function () {
*/
*/
load
:
function
(
url
,
onLoad
,
onProgress
,
onError
)
{
load
:
function
(
url
,
onLoad
,
onProgress
,
onError
)
{
var
parser
=
this
.
_getParser
();
var
builder
=
this
.
meshBuilder
.
setCrossOrigin
(
this
.
crossOrigin
);
var
builder
=
this
.
meshBuilder
.
setCrossOrigin
(
this
.
crossOrigin
);
var
texturePath
=
THREE
.
LoaderUtils
.
extractUrlBase
(
url
);
var
texturePath
=
THREE
.
LoaderUtils
.
extractUrlBase
(
url
);
...
@@ -216,7 +215,6 @@ THREE.MMDLoader = ( function () {
...
@@ -216,7 +215,6 @@ THREE.MMDLoader = ( function () {
var
vmds
=
[];
var
vmds
=
[];
var
vmdNum
=
urls
.
length
;
var
vmdNum
=
urls
.
length
;
var
scope
=
this
;
var
parser
=
this
.
_getParser
();
var
parser
=
this
.
_getParser
();
this
.
loader
this
.
loader
...
@@ -246,9 +244,7 @@ THREE.MMDLoader = ( function () {
...
@@ -246,9 +244,7 @@ THREE.MMDLoader = ( function () {
* @param {function} onProgress
* @param {function} onProgress
* @param {function} onError
* @param {function} onError
*/
*/
loadVPD
:
function
(
url
,
isUnicode
,
onLoad
,
onProgress
,
onError
,
params
)
{
loadVPD
:
function
(
url
,
isUnicode
,
onLoad
,
onProgress
,
onError
)
{
params
=
params
||
{};
var
parser
=
this
.
_getParser
();
var
parser
=
this
.
_getParser
();
...
@@ -353,9 +349,9 @@ THREE.MMDLoader = ( function () {
...
@@ -353,9 +349,9 @@ THREE.MMDLoader = ( function () {
var
geometry
=
this
.
geometryBuilder
.
build
(
data
);
var
geometry
=
this
.
geometryBuilder
.
build
(
data
);
var
material
=
this
.
materialBuilder
var
material
=
this
.
materialBuilder
.
setCrossOrigin
(
this
.
crossOrigin
)
.
setCrossOrigin
(
this
.
crossOrigin
)
.
setTexturePath
(
texturePath
)
.
setTexturePath
(
texturePath
)
.
build
(
data
,
geometry
,
onProgress
,
onError
);
.
build
(
data
,
geometry
,
onProgress
,
onError
);
var
mesh
=
new
THREE
.
SkinnedMesh
(
geometry
,
material
);
var
mesh
=
new
THREE
.
SkinnedMesh
(
geometry
,
material
);
...
@@ -1081,7 +1077,7 @@ THREE.MMDLoader = ( function () {
...
@@ -1081,7 +1077,7 @@ THREE.MMDLoader = ( function () {
// parameters for OutlineEffect
// parameters for OutlineEffect
params
.
userData
.
outlineParameters
=
{
params
.
userData
.
outlineParameters
=
{
thickness
:
material
.
edgeSize
/
300
,
// TODO: better calculation?
thickness
:
material
.
edgeSize
/
300
,
// TODO: better calculation?
color
:
material
.
edgeColor
.
slice
(
0
,
3
),
color
:
material
.
edgeColor
.
slice
(
0
,
3
),
alpha
:
material
.
edgeColor
[
3
],
alpha
:
material
.
edgeColor
[
3
],
visible
:
(
material
.
flag
&
0x10
)
!==
0
&&
material
.
edgeSize
>
0.0
visible
:
(
material
.
flag
&
0x10
)
!==
0
&&
material
.
edgeSize
>
0.0
...
@@ -1439,7 +1435,7 @@ THREE.MMDLoader = ( function () {
...
@@ -1439,7 +1435,7 @@ THREE.MMDLoader = ( function () {
array
.
push
(
interpolation
[
index
+
4
]
/
127
);
// y1
array
.
push
(
interpolation
[
index
+
4
]
/
127
);
// y1
array
.
push
(
interpolation
[
index
+
12
]
/
127
);
// y2
array
.
push
(
interpolation
[
index
+
12
]
/
127
);
// y2
}
;
}
var
tracks
=
[];
var
tracks
=
[];
...
@@ -1593,7 +1589,7 @@ THREE.MMDLoader = ( function () {
...
@@ -1593,7 +1589,7 @@ THREE.MMDLoader = ( function () {
array
.
push
(
interpolation
[
index
*
4
+
2
]
/
127
);
// y1
array
.
push
(
interpolation
[
index
*
4
+
2
]
/
127
);
// y1
array
.
push
(
interpolation
[
index
*
4
+
3
]
/
127
);
// y2
array
.
push
(
interpolation
[
index
*
4
+
3
]
/
127
);
// y2
}
;
}
var
tracks
=
[];
var
tracks
=
[];
...
...
examples/js/math/Lut.js
浏览文件 @
886e79fc
...
@@ -390,8 +390,6 @@ THREE.Lut.prototype = {
...
@@ -390,8 +390,6 @@ THREE.Lut.prototype = {
contextTick
.
font
=
'
Normal
'
+
this
.
legend
.
labels
.
fontsize
+
'
px
'
+
this
.
legend
.
labels
.
fontface
;
contextTick
.
font
=
'
Normal
'
+
this
.
legend
.
labels
.
fontsize
+
'
px
'
+
this
.
legend
.
labels
.
fontface
;
var
metrics
=
contextTick
.
measureText
(
value
.
toString
()
);
contextTick
.
fillStyle
=
'
rgba(
'
+
backgroundColor
.
r
+
'
,
'
+
backgroundColor
.
g
+
'
,
'
+
backgroundColor
.
b
+
'
,
'
+
backgroundColor
.
a
+
'
)
'
;
contextTick
.
fillStyle
=
'
rgba(
'
+
backgroundColor
.
r
+
'
,
'
+
backgroundColor
.
g
+
'
,
'
+
backgroundColor
.
b
+
'
,
'
+
backgroundColor
.
a
+
'
)
'
;
contextTick
.
strokeStyle
=
'
rgba(
'
+
borderColor
.
r
+
'
,
'
+
borderColor
.
g
+
'
,
'
+
borderColor
.
b
+
'
,
'
+
borderColor
.
a
+
'
)
'
;
contextTick
.
strokeStyle
=
'
rgba(
'
+
borderColor
.
r
+
'
,
'
+
borderColor
.
g
+
'
,
'
+
borderColor
.
b
+
'
,
'
+
borderColor
.
a
+
'
)
'
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录