Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
b20f5212
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,发现更多精彩内容 >>
未验证
提交
b20f5212
编写于
2月 24, 2018
作者:
M
Mr.doob
提交者:
GitHub
2月 24, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #13422 from WestLangley/dev-defines
Shader Passes: clone defines
上级
7995ae3c
832c2ca0
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
7 addition
and
7 deletion
+7
-7
examples/js/postprocessing/AdaptiveToneMappingPass.js
examples/js/postprocessing/AdaptiveToneMappingPass.js
+1
-1
examples/js/postprocessing/BokehPass.js
examples/js/postprocessing/BokehPass.js
+1
-1
examples/js/postprocessing/SAOPass.js
examples/js/postprocessing/SAOPass.js
+2
-2
examples/js/postprocessing/SMAAPass.js
examples/js/postprocessing/SMAAPass.js
+2
-2
examples/js/postprocessing/ShaderPass.js
examples/js/postprocessing/ShaderPass.js
+1
-1
未找到文件。
examples/js/postprocessing/AdaptiveToneMappingPass.js
浏览文件 @
b20f5212
...
...
@@ -102,7 +102,7 @@ THREE.AdaptiveToneMappingPass = function ( adaptive, resolution ) {
uniforms
:
THREE
.
UniformsUtils
.
clone
(
this
.
adaptLuminanceShader
.
uniforms
),
vertexShader
:
this
.
adaptLuminanceShader
.
vertexShader
,
fragmentShader
:
this
.
adaptLuminanceShader
.
fragmentShader
,
defines
:
this
.
adaptLuminanceShader
.
defines
,
defines
:
Object
.
assign
(
{},
this
.
adaptLuminanceShader
.
defines
)
,
blending
:
THREE
.
NoBlending
}
);
...
...
examples/js/postprocessing/BokehPass.js
浏览文件 @
b20f5212
...
...
@@ -57,7 +57,7 @@ THREE.BokehPass = function ( scene, camera, params ) {
bokehUniforms
[
"
farClip
"
].
value
=
camera
.
far
;
this
.
materialBokeh
=
new
THREE
.
ShaderMaterial
(
{
defines
:
bokehShader
.
defines
,
defines
:
Object
.
assign
(
{},
bokehShader
.
defines
)
,
uniforms
:
bokehUniforms
,
vertexShader
:
bokehShader
.
vertexShader
,
fragmentShader
:
bokehShader
.
fragmentShader
...
...
examples/js/postprocessing/SAOPass.js
浏览文件 @
b20f5212
...
...
@@ -99,7 +99,7 @@ THREE.SAOPass = function ( scene, camera, depthTexture, useNormals, resolution )
this
.
vBlurMaterial
=
new
THREE
.
ShaderMaterial
(
{
uniforms
:
THREE
.
UniformsUtils
.
clone
(
THREE
.
DepthLimitedBlurShader
.
uniforms
),
defines
:
THREE
.
DepthLimitedBlurShader
.
defines
,
defines
:
Object
.
assign
(
{},
THREE
.
DepthLimitedBlurShader
.
defines
)
,
vertexShader
:
THREE
.
DepthLimitedBlurShader
.
vertexShader
,
fragmentShader
:
THREE
.
DepthLimitedBlurShader
.
fragmentShader
}
);
...
...
@@ -112,7 +112,7 @@ THREE.SAOPass = function ( scene, camera, depthTexture, useNormals, resolution )
this
.
hBlurMaterial
=
new
THREE
.
ShaderMaterial
(
{
uniforms
:
THREE
.
UniformsUtils
.
clone
(
THREE
.
DepthLimitedBlurShader
.
uniforms
),
defines
:
THREE
.
DepthLimitedBlurShader
.
defines
,
defines
:
Object
.
assign
(
{},
THREE
.
DepthLimitedBlurShader
.
defines
)
,
vertexShader
:
THREE
.
DepthLimitedBlurShader
.
vertexShader
,
fragmentShader
:
THREE
.
DepthLimitedBlurShader
.
fragmentShader
}
);
...
...
examples/js/postprocessing/SMAAPass.js
浏览文件 @
b20f5212
...
...
@@ -63,7 +63,7 @@ THREE.SMAAPass = function ( width, height ) {
this
.
uniformsEdges
[
"
resolution
"
].
value
.
set
(
1
/
width
,
1
/
height
);
this
.
materialEdges
=
new
THREE
.
ShaderMaterial
(
{
defines
:
THREE
.
SMAAShader
[
0
].
defines
,
defines
:
Object
.
assign
(
{},
THREE
.
SMAAShader
[
0
].
defines
)
,
uniforms
:
this
.
uniformsEdges
,
vertexShader
:
THREE
.
SMAAShader
[
0
].
vertexShader
,
fragmentShader
:
THREE
.
SMAAShader
[
0
].
fragmentShader
...
...
@@ -79,7 +79,7 @@ THREE.SMAAPass = function ( width, height ) {
this
.
uniformsWeights
[
"
tSearch
"
].
value
=
this
.
searchTexture
;
this
.
materialWeights
=
new
THREE
.
ShaderMaterial
(
{
defines
:
THREE
.
SMAAShader
[
1
].
defines
,
defines
:
Object
.
assign
(
{},
THREE
.
SMAAShader
[
1
].
defines
)
,
uniforms
:
this
.
uniformsWeights
,
vertexShader
:
THREE
.
SMAAShader
[
1
].
vertexShader
,
fragmentShader
:
THREE
.
SMAAShader
[
1
].
fragmentShader
...
...
examples/js/postprocessing/ShaderPass.js
浏览文件 @
b20f5212
...
...
@@ -20,7 +20,7 @@ THREE.ShaderPass = function ( shader, textureID ) {
this
.
material
=
new
THREE
.
ShaderMaterial
(
{
defines
:
shader
.
defines
||
{}
,
defines
:
Object
.
assign
(
{},
shader
.
defines
)
,
uniforms
:
this
.
uniforms
,
vertexShader
:
shader
.
vertexShader
,
fragmentShader
:
shader
.
fragmentShader
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录