Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
6a0c4bd0
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,发现更多精彩内容 >>
提交
6a0c4bd0
编写于
12月 23, 2015
作者:
S
SUNAG
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
renamed environmentAlpha to environmentIntensity
上级
48d93817
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
12 addition
and
12 deletion
+12
-12
examples/js/nodes/materials/PhongNode.js
examples/js/nodes/materials/PhongNode.js
+5
-5
examples/js/nodes/materials/PhongNodeMaterial.js
examples/js/nodes/materials/PhongNodeMaterial.js
+1
-1
examples/js/nodes/materials/StandardNode.js
examples/js/nodes/materials/StandardNode.js
+5
-5
examples/js/nodes/materials/StandardNodeMaterial.js
examples/js/nodes/materials/StandardNodeMaterial.js
+1
-1
未找到文件。
examples/js/nodes/materials/PhongNode.js
浏览文件 @
6a0c4bd0
...
...
@@ -114,7 +114,7 @@ THREE.PhongNode.prototype.build = function( builder ) {
if
(
this
.
normalScale
&&
this
.
normal
)
this
.
normalScale
.
verify
(
builder
);
if
(
this
.
environment
)
this
.
environment
.
verify
(
builder
);
if
(
this
.
environment
Alpha
&&
this
.
environment
)
this
.
environmentAlpha
.
verify
(
builder
);
if
(
this
.
environment
Intensity
&&
this
.
environment
)
this
.
environmentIntensity
.
verify
(
builder
);
// build code
...
...
@@ -133,7 +133,7 @@ THREE.PhongNode.prototype.build = function( builder ) {
var
normalScale
=
this
.
normalScale
&&
this
.
normal
?
this
.
normalScale
.
buildCode
(
builder
,
'
v2
'
)
:
undefined
;
var
environment
=
this
.
environment
?
this
.
environment
.
buildCode
(
builder
,
'
c
'
)
:
undefined
;
var
environment
Alpha
=
this
.
environmentAlpha
&&
this
.
environment
?
this
.
environmentAlpha
.
buildCode
(
builder
,
'
fv1
'
)
:
undefined
;
var
environment
Intensity
=
this
.
environmentIntensity
&&
this
.
environment
?
this
.
environmentIntensity
.
buildCode
(
builder
,
'
fv1
'
)
:
undefined
;
material
.
requestAttrib
.
transparent
=
alpha
!=
undefined
;
...
...
@@ -236,11 +236,11 @@ THREE.PhongNode.prototype.build = function( builder ) {
output
.
push
(
environment
.
code
);
if
(
environment
Alpha
)
{
if
(
environment
Intensity
)
{
output
.
push
(
environment
Alpha
.
code
);
output
.
push
(
environment
Intensity
.
code
);
output
.
push
(
"
outgoingLight = mix(
"
+
'
outgoingLight
'
+
"
,
"
+
environment
.
result
+
"
,
"
+
environment
Alpha
.
result
+
"
);
"
);
output
.
push
(
"
outgoingLight = mix(
"
+
'
outgoingLight
'
+
"
,
"
+
environment
.
result
+
"
,
"
+
environment
Intensity
.
result
+
"
);
"
);
}
else
{
...
...
examples/js/nodes/materials/PhongNodeMaterial.js
浏览文件 @
6a0c4bd0
...
...
@@ -14,4 +14,4 @@ THREE.PhongNodeMaterial.prototype = Object.create( THREE.NodeMaterial.prototype
THREE
.
PhongNodeMaterial
.
prototype
.
constructor
=
THREE
.
PhongNodeMaterial
;
THREE
.
NodeMaterial
.
Shortcuts
(
THREE
.
PhongNodeMaterial
.
prototype
,
'
node
'
,
[
'
color
'
,
'
alpha
'
,
'
specular
'
,
'
shininess
'
,
'
normal
'
,
'
normalScale
'
,
'
emissive
'
,
'
ambient
'
,
'
shadow
'
,
'
ao
'
,
'
environment
'
,
'
environment
Alpha
'
,
'
transform
'
]
);
[
'
color
'
,
'
alpha
'
,
'
specular
'
,
'
shininess
'
,
'
normal
'
,
'
normalScale
'
,
'
emissive
'
,
'
ambient
'
,
'
shadow
'
,
'
ao
'
,
'
environment
'
,
'
environment
Intensity
'
,
'
transform
'
]
);
examples/js/nodes/materials/StandardNode.js
浏览文件 @
6a0c4bd0
...
...
@@ -120,7 +120,7 @@ THREE.StandardNode.prototype.build = function( builder ) {
if
(
this
.
normalScale
&&
this
.
normal
)
this
.
normalScale
.
verify
(
builder
);
if
(
this
.
environment
)
this
.
environment
.
verify
(
builder
,
'
env
'
,
requires
);
// isolate environment from others inputs ( see TextureNode, CubeTextureNode )
if
(
this
.
environment
Alpha
&&
this
.
environment
)
this
.
environmentAlpha
.
verify
(
builder
);
if
(
this
.
environment
Intensity
&&
this
.
environment
)
this
.
environmentIntensity
.
verify
(
builder
);
// build code
...
...
@@ -139,7 +139,7 @@ THREE.StandardNode.prototype.build = function( builder ) {
var
normalScale
=
this
.
normalScale
&&
this
.
normal
?
this
.
normalScale
.
buildCode
(
builder
,
'
v2
'
)
:
undefined
;
var
environment
=
this
.
environment
?
this
.
environment
.
buildCode
(
builder
,
'
c
'
,
'
env
'
,
requires
)
:
undefined
;
var
environment
Alpha
=
this
.
environmentAlpha
&&
this
.
environment
?
this
.
environmentAlpha
.
buildCode
(
builder
,
'
fv1
'
)
:
undefined
;
var
environment
Intensity
=
this
.
environmentIntensity
&&
this
.
environment
?
this
.
environmentIntensity
.
buildCode
(
builder
,
'
fv1
'
)
:
undefined
;
material
.
requestAttrib
.
transparent
=
alpha
!=
undefined
;
...
...
@@ -254,10 +254,10 @@ THREE.StandardNode.prototype.build = function( builder ) {
output
.
push
(
environment
.
code
);
output
.
push
(
"
RE_IndirectSpecular(
"
+
environment
.
result
+
"
, geometry, material, reflectedLight );
"
);
if
(
environment
Alpha
)
{
if
(
environment
Intensity
)
{
output
.
push
(
environment
Alpha
.
code
);
output
.
push
(
"
reflectedLight.indirectSpecular *=
"
+
environment
Alpha
.
result
+
"
;
"
);
output
.
push
(
environment
Intensity
.
code
);
output
.
push
(
"
reflectedLight.indirectSpecular *=
"
+
environment
Intensity
.
result
+
"
;
"
);
}
...
...
examples/js/nodes/materials/StandardNodeMaterial.js
浏览文件 @
6a0c4bd0
...
...
@@ -14,4 +14,4 @@ THREE.StandardNodeMaterial.prototype = Object.create( THREE.NodeMaterial.prototy
THREE
.
StandardNodeMaterial
.
prototype
.
constructor
=
THREE
.
StandardNodeMaterial
;
THREE
.
NodeMaterial
.
Shortcuts
(
THREE
.
StandardNodeMaterial
.
prototype
,
'
node
'
,
[
'
color
'
,
'
alpha
'
,
'
roughness
'
,
'
metalness
'
,
'
normal
'
,
'
normalScale
'
,
'
emissive
'
,
'
ambient
'
,
'
shadow
'
,
'
ao
'
,
'
environment
'
,
'
environment
Alpha
'
,
'
transform
'
]
);
[
'
color
'
,
'
alpha
'
,
'
roughness
'
,
'
metalness
'
,
'
normal
'
,
'
normalScale
'
,
'
emissive
'
,
'
ambient
'
,
'
shadow
'
,
'
ao
'
,
'
environment
'
,
'
environment
Intensity
'
,
'
transform
'
]
);
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录