Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
266d1cdf
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,发现更多精彩内容 >>
提交
266d1cdf
编写于
10月 15, 2012
作者:
A
alteredq
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Editor: less obtrusive warnings for missing UVs.
上级
9f6d3a9c
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
31 addition
and
16 deletion
+31
-16
editor/js/ui/Sidebar.Properties.Material.js
editor/js/ui/Sidebar.Properties.Material.js
+31
-16
未找到文件。
editor/js/ui/Sidebar.Properties.Material.js
浏览文件 @
266d1cdf
...
...
@@ -231,6 +231,7 @@ Sidebar.Properties.Material = function ( signals ) {
function
update
()
{
var
material
=
selected
.
material
;
var
textureWarning
=
false
;
if
(
material
)
{
...
...
@@ -245,10 +246,6 @@ Sidebar.Properties.Material = function ( signals ) {
material
.
map
=
dummyTexture
;
}
else
{
console
.
warn
(
"
Can't set texture, model doesn't have texture coordinates
"
);
}
}
...
...
@@ -285,14 +282,16 @@ Sidebar.Properties.Material = function ( signals ) {
if
(
material
.
map
!==
undefined
)
{
var
mapEnabled
=
materialMapEnabled
.
getValue
()
===
true
;
if
(
selectedHasUvs
)
{
material
.
map
=
ma
terialMapEnabled
.
getValue
()
===
true
?
materialMap
.
getValue
()
:
dummyTexture
;
material
.
map
=
ma
pEnabled
?
materialMap
.
getValue
()
:
dummyTexture
;
material
.
needsUpdate
=
true
;
}
else
{
console
.
warn
(
"
Can't set texture, model doesn't have texture coordinates
"
)
;
if
(
mapEnabled
)
textureWarning
=
true
;
}
...
...
@@ -301,14 +300,16 @@ Sidebar.Properties.Material = function ( signals ) {
/*
if ( material.lightMap !== undefined ) {
var lightMapEnabled = materialLightMapEnabled.getValue() === true;
if ( selectedHasUvs ) {
material.lightMap =
materialLightMapEnabled.getValue() === true
? materialLightMap.getValue() : null;
material.lightMap =
lightMapEnabled
? materialLightMap.getValue() : null;
material.needsUpdate = true;
} else {
console.warn( "Can't set texture, model doesn't have texture coordinates" )
;
if ( lightMapEnabled ) textureWarning = true
;
}
...
...
@@ -317,15 +318,17 @@ Sidebar.Properties.Material = function ( signals ) {
if
(
material
.
bumpMap
!==
undefined
)
{
var
bumpMapEnabled
=
materialBumpMapEnabled
.
getValue
()
===
true
;
if
(
selectedHasUvs
)
{
material
.
bumpMap
=
materialBumpMapEnabled
.
getValue
()
===
true
?
materialBumpMap
.
getValue
()
:
null
;
material
.
bumpMap
=
bumpMapEnabled
?
materialBumpMap
.
getValue
()
:
null
;
material
.
bumpScale
=
materialBumpScale
.
getValue
();
material
.
needsUpdate
=
true
;
}
else
{
console
.
warn
(
"
Can't set texture, model doesn't have texture coordinates
"
)
;
if
(
bumpMapEnabled
)
textureWarning
=
true
;
}
...
...
@@ -333,14 +336,16 @@ Sidebar.Properties.Material = function ( signals ) {
if
(
material
.
normalMap
!==
undefined
)
{
var
normalMapEnabled
=
materialNormalMapEnabled
.
getValue
()
===
true
;
if
(
selectedHasUvs
)
{
material
.
normalMap
=
materialNormalMapEnabled
.
getValue
()
===
true
?
materialNormalMap
.
getValue
()
:
null
;
material
.
normalMap
=
normalMapEnabled
?
materialNormalMap
.
getValue
()
:
null
;
material
.
needsUpdate
=
true
;
}
else
{
console
.
warn
(
"
Can't set texture, model doesn't have texture coordinates
"
)
;
if
(
normalMapEnabled
)
textureWarning
=
true
;
}
...
...
@@ -348,14 +353,16 @@ Sidebar.Properties.Material = function ( signals ) {
if
(
material
.
specularMap
!==
undefined
)
{
var
specularMapEnabled
=
materialSpecularMapEnabled
.
getValue
()
===
true
;
if
(
selectedHasUvs
)
{
material
.
specularMap
=
materialSpecularMapEnabled
.
getValue
()
===
true
?
materialSpecularMap
.
getValue
()
:
null
;
material
.
specularMap
=
specularMapEnabled
?
materialSpecularMap
.
getValue
()
:
null
;
material
.
needsUpdate
=
true
;
}
else
{
console
.
warn
(
"
Can't set texture, model doesn't have texture coordinates
"
)
;
if
(
specularMapEnabled
)
textureWarning
=
true
;
}
...
...
@@ -363,15 +370,17 @@ Sidebar.Properties.Material = function ( signals ) {
if
(
material
.
envMap
!==
undefined
)
{
var
envMapEnabled
=
materialEnvMapEnabled
.
getValue
()
===
true
;
if
(
selectedHasUvs
)
{
material
.
envMap
=
materialEnvMapEnabled
.
getValue
()
===
true
?
materialEnvMap
.
getValue
()
:
null
;
material
.
envMap
=
envMapEnabled
?
materialEnvMap
.
getValue
()
:
null
;
material
.
reflectivity
=
materialReflectivity
.
getValue
();
material
.
needsUpdate
=
true
;
}
else
{
console
.
warn
(
"
Can't set texture, model doesn't have texture coordinates
"
)
;
if
(
envMapEnabled
)
textureWarning
=
true
;
}
...
...
@@ -407,6 +416,12 @@ Sidebar.Properties.Material = function ( signals ) {
}
if
(
textureWarning
)
{
console
.
warn
(
"
Can't set texture, model doesn't have texture coordinates
"
);
}
};
function
updateRows
()
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录