Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
4fc9550b
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,发现更多精彩内容 >>
提交
4fc9550b
编写于
7月 16, 2014
作者:
M
Mr.doob
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Editor: Fixed ShaderMaterial init.
上级
a99c5cf6
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
10 addition
and
8 deletion
+10
-8
editor/js/Sidebar.Material.js
editor/js/Sidebar.Material.js
+2
-2
examples/index.html
examples/index.html
+2
-1
examples/js/loaders/gltf/glTFLoader.js
examples/js/loaders/gltf/glTFLoader.js
+6
-5
未找到文件。
editor/js/Sidebar.Material.js
浏览文件 @
4fc9550b
...
...
@@ -135,7 +135,7 @@ Sidebar.Material = function ( editor ) {
var
materialUniformsRow
=
new
UI
.
Panel
();
var
materialUniforms
=
new
UI
.
TextArea
().
setWidth
(
'
150px
'
).
setHeight
(
'
80px
'
);
materialUniforms
.
setValue
(
''
).
onChange
(
update
);
materialUniforms
.
setValue
(
'
{
\n
"uColor": {
\n
"type": "3f",
\n
"value": [1, 0, 0]
\n
}
\n
}
'
).
onChange
(
update
);
materialUniformsRow
.
add
(
new
UI
.
Text
(
'
Uniforms
'
).
setWidth
(
'
90px
'
)
);
materialUniformsRow
.
add
(
materialUniforms
);
...
...
@@ -157,7 +157,7 @@ Sidebar.Material = function ( editor ) {
var
materialFragmentShaderRow
=
new
UI
.
Panel
();
var
materialFragmentShader
=
new
UI
.
TextArea
().
setWidth
(
'
150px
'
).
setHeight
(
'
80px
'
);
materialFragmentShader
.
setValue
(
'
void main() {
\n\t
gl_FragColor = vec4( 1.0, 0.0, 0.0
, 1.0 );
\n
}
'
).
onChange
(
update
);
materialFragmentShader
.
setValue
(
'
uniform vec3 uColor;
\n\n
void main() {
\n\t
gl_FragColor = vec4( uColor
, 1.0 );
\n
}
'
).
onChange
(
update
);
materialFragmentShaderRow
.
add
(
new
UI
.
Text
(
'
Fragment Shader
'
).
setWidth
(
'
90px
'
)
);
materialFragmentShaderRow
.
add
(
materialFragmentShader
);
...
...
examples/index.html
浏览文件 @
4fc9550b
...
...
@@ -280,7 +280,8 @@
"
webgl_terrain_dynamic
"
,
"
webgl_test_memory
"
,
"
webgl_test_memory2
"
,
"
webgl_trails
"
"
webgl_trails
"
,
"
webgl_video_panorama_equirectangular
"
],
"
webgl3
"
:
[
"
webgl3_performance
"
...
...
examples/js/loaders/gltf/glTFLoader.js
浏览文件 @
4fc9550b
...
...
@@ -1216,7 +1216,8 @@ THREE.glTFLoader.prototype.load = function( url, callback ) {
threeMesh
.
boneInverses
=
[];
var
jointsIds
=
skin
.
jointsIds
;
var
joints
=
[];
var
bones
=
[];
var
boneInverses
=
[];
var
i
,
len
=
jointsIds
.
length
;
for
(
i
=
0
;
i
<
len
;
i
++
)
{
var
jointId
=
jointsIds
[
i
];
...
...
@@ -1225,8 +1226,7 @@ THREE.glTFLoader.prototype.load = function( url, callback ) {
if
(
joint
)
{
joint
.
skin
=
threeMesh
;
joints
.
push
(
joint
);
threeMesh
.
skeleton
.
bones
.
push
(
joint
);
bones
.
push
(
joint
);
var
m
=
skin
.
inverseBindMatrices
;
var
mat
=
new
THREE
.
Matrix4
(
...
...
@@ -1235,13 +1235,14 @@ THREE.glTFLoader.prototype.load = function( url, callback ) {
m
[
i
*
16
+
2
],
m
[
i
*
16
+
6
],
m
[
i
*
16
+
10
],
m
[
i
*
16
+
14
],
m
[
i
*
16
+
3
],
m
[
i
*
16
+
7
],
m
[
i
*
16
+
11
],
m
[
i
*
16
+
15
]
);
threeMesh
.
skeleton
.
boneInverses
.
push
(
mat
);
threeMesh
.
pose
();
boneInverses
.
push
(
mat
);
}
else
{
console
.
log
(
"
WARNING: jointId:
"
+
jointId
+
"
cannot be found in skeleton:
"
+
skeleton
);
}
}
threeMesh
.
bind
(
new
THREE
.
Skeleton
(
bones
,
boneInverses
,
false
));
}
if
(
threeMesh
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录