Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
87ae9e71
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,发现更多精彩内容 >>
提交
87ae9e71
编写于
5月 19, 2016
作者:
M
Mr.doob
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed postprocessing Object.assign()s.
上级
e803bbc0
变更
16
隐藏空白更改
内联
并排
Showing
16 changed file
with
36 addition
and
38 deletion
+36
-38
examples/js/postprocessing/AdaptiveToneMappingPass.js
examples/js/postprocessing/AdaptiveToneMappingPass.js
+2
-2
examples/js/postprocessing/BloomPass.js
examples/js/postprocessing/BloomPass.js
+2
-2
examples/js/postprocessing/BokehPass.js
examples/js/postprocessing/BokehPass.js
+2
-2
examples/js/postprocessing/ClearPass.js
examples/js/postprocessing/ClearPass.js
+2
-2
examples/js/postprocessing/DotScreenPass.js
examples/js/postprocessing/DotScreenPass.js
+2
-2
examples/js/postprocessing/EffectComposer.js
examples/js/postprocessing/EffectComposer.js
+4
-6
examples/js/postprocessing/FilmPass.js
examples/js/postprocessing/FilmPass.js
+2
-2
examples/js/postprocessing/GlitchPass.js
examples/js/postprocessing/GlitchPass.js
+2
-2
examples/js/postprocessing/ManualMSAARenderPass.js
examples/js/postprocessing/ManualMSAARenderPass.js
+2
-2
examples/js/postprocessing/MaskPass.js
examples/js/postprocessing/MaskPass.js
+2
-2
examples/js/postprocessing/RenderPass.js
examples/js/postprocessing/RenderPass.js
+2
-2
examples/js/postprocessing/SMAAPass.js
examples/js/postprocessing/SMAAPass.js
+3
-3
examples/js/postprocessing/SavePass.js
examples/js/postprocessing/SavePass.js
+2
-2
examples/js/postprocessing/ShaderPass.js
examples/js/postprocessing/ShaderPass.js
+2
-2
examples/js/postprocessing/TAARenderPass.js
examples/js/postprocessing/TAARenderPass.js
+3
-3
examples/js/postprocessing/TexturePass.js
examples/js/postprocessing/TexturePass.js
+2
-2
未找到文件。
examples/js/postprocessing/AdaptiveToneMappingPass.js
浏览文件 @
87ae9e71
...
...
@@ -123,9 +123,9 @@ THREE.AdaptiveToneMappingPass = function ( adaptive, resolution ) {
};
THREE
.
AdaptiveToneMappingPass
.
prototype
=
Object
.
create
(
THREE
.
Pass
.
prototype
);
THREE
.
AdaptiveToneMappingPass
.
prototype
=
Object
.
assign
(
Object
.
create
(
THREE
.
Pass
.
prototype
),
{
Object
.
assign
(
THREE
.
AdaptiveToneMappingPass
.
prototype
,
{
constructor
:
THREE
.
AdaptiveToneMappingPass
,
render
:
function
(
renderer
,
writeBuffer
,
readBuffer
,
delta
,
maskActive
)
{
...
...
examples/js/postprocessing/BloomPass.js
浏览文件 @
87ae9e71
...
...
@@ -73,9 +73,9 @@ THREE.BloomPass = function ( strength, kernelSize, sigma, resolution ) {
};
THREE
.
BloomPass
.
prototype
=
Object
.
create
(
THREE
.
Pass
.
prototype
);
THREE
.
BloomPass
.
prototype
=
Object
.
assign
(
Object
.
create
(
THREE
.
Pass
.
prototype
),
{
Object
.
assign
(
THREE
.
BloomPass
.
prototype
,
{
constructor
:
THREE
.
BloomPass
,
render
:
function
(
renderer
,
writeBuffer
,
readBuffer
,
delta
,
maskActive
)
{
...
...
examples/js/postprocessing/BokehPass.js
浏览文件 @
87ae9e71
...
...
@@ -67,9 +67,9 @@ THREE.BokehPass = function ( scene, camera, params ) {
};
THREE
.
BokehPass
.
prototype
=
Object
.
create
(
THREE
.
Pass
.
prototype
);
THREE
.
BokehPass
.
prototype
=
Object
.
assign
(
Object
.
create
(
THREE
.
Pass
.
prototype
),
{
Object
.
assign
(
THREE
.
BokehPass
.
prototype
,
{
constructor
:
THREE
.
BokehPass
,
render
:
function
(
renderer
,
writeBuffer
,
readBuffer
,
delta
,
maskActive
)
{
...
...
examples/js/postprocessing/ClearPass.js
浏览文件 @
87ae9e71
...
...
@@ -10,9 +10,9 @@ THREE.ClearPass = function () {
};
THREE
.
ClearPass
.
prototype
=
Object
.
create
(
THREE
.
Pass
.
prototype
);
THREE
.
ClearPass
.
prototype
=
Object
.
assign
(
Object
.
create
(
THREE
.
Pass
.
prototype
),
Object
.
assign
(
THREE
.
ClearPass
.
prototype
,
{
constructor
:
THREE
.
ClearPass
,
render
:
function
(
renderer
,
writeBuffer
,
readBuffer
,
delta
,
maskActive
)
{
...
...
examples/js/postprocessing/DotScreenPass.js
浏览文件 @
87ae9e71
...
...
@@ -33,9 +33,9 @@ THREE.DotScreenPass = function ( center, angle, scale ) {
};
THREE
.
DotScreenPass
.
prototype
=
Object
.
create
(
THREE
.
Pass
.
prototype
);
THREE
.
DotScreenPass
.
prototype
=
Object
.
assign
(
Object
.
create
(
THREE
.
Pass
.
prototype
),
{
Object
.
assign
(
THREE
.
DotScreenPass
.
prototype
,
{
constructor
:
THREE
.
DotScreenPass
,
render
:
function
(
renderer
,
writeBuffer
,
readBuffer
,
delta
,
maskActive
)
{
...
...
examples/js/postprocessing/EffectComposer.js
浏览文件 @
87ae9e71
...
...
@@ -34,7 +34,7 @@ THREE.EffectComposer = function ( renderer, renderTarget ) {
};
THREE
.
EffectComposer
.
prototype
=
{
Object
.
assign
(
THREE
.
EffectComposer
.
prototype
,
{
swapBuffers
:
function
()
{
...
...
@@ -142,7 +142,7 @@ THREE.EffectComposer.prototype = {
}
};
}
)
;
THREE
.
Pass
=
function
()
{
...
...
@@ -161,9 +161,7 @@ THREE.Pass = function () {
};
THREE
.
Pass
.
prototype
=
{
constructor
:
THREE
.
Pass
,
Object
.
assign
(
THREE
.
Pass
.
prototype
,
{
setSize
:
function
(
width
,
height
)
{},
...
...
@@ -173,4 +171,4 @@ THREE.Pass.prototype = {
}
};
}
)
;
examples/js/postprocessing/FilmPass.js
浏览文件 @
87ae9e71
...
...
@@ -34,9 +34,9 @@ THREE.FilmPass = function ( noiseIntensity, scanlinesIntensity, scanlinesCount,
};
THREE
.
FilmPass
.
prototype
=
Object
.
create
(
THREE
.
Pass
.
prototype
);
THREE
.
FilmPass
.
prototype
=
Object
.
assign
(
Object
.
create
(
THREE
.
Pass
.
prototype
),
{
Object
.
assign
(
THREE
.
FilmPass
.
prototype
,
{
constructor
:
THREE
.
FilmPass
,
render
:
function
(
renderer
,
writeBuffer
,
readBuffer
,
delta
,
maskActive
)
{
...
...
examples/js/postprocessing/GlitchPass.js
浏览文件 @
87ae9e71
...
...
@@ -35,9 +35,9 @@ THREE.GlitchPass = function ( dt_size ) {
};
THREE
.
GlitchPass
.
prototype
=
Object
.
create
(
THREE
.
Pass
.
prototype
);
THREE
.
GlitchPass
.
prototype
=
Object
.
assign
(
Object
.
create
(
THREE
.
Pass
.
prototype
),
{
Object
.
assign
(
THREE
.
GlitchPass
.
prototype
,
{
constructor
:
THREE
.
GlitchPass
,
render
:
function
(
renderer
,
writeBuffer
,
readBuffer
,
delta
,
maskActive
)
{
...
...
examples/js/postprocessing/ManualMSAARenderPass.js
浏览文件 @
87ae9e71
...
...
@@ -43,9 +43,9 @@ THREE.ManualMSAARenderPass = function ( scene, camera ) {
};
THREE
.
ManualMSAARenderPass
.
prototype
=
Object
.
create
(
THREE
.
Pass
.
prototype
);
THREE
.
ManualMSAARenderPass
.
prototype
=
Object
.
assign
(
Object
.
create
(
THREE
.
Pass
.
prototype
),
{
Object
.
assign
(
THREE
.
ManualMSAARenderPass
.
prototype
,
{
constructor
:
THREE
.
ManualMSAARenderPass
,
dispose
:
function
()
{
...
...
examples/js/postprocessing/MaskPass.js
浏览文件 @
87ae9e71
...
...
@@ -16,9 +16,9 @@ THREE.MaskPass = function ( scene, camera ) {
};
THREE
.
MaskPass
.
prototype
=
Object
.
create
(
THREE
.
Pass
.
prototype
);
THREE
.
MaskPass
.
prototype
=
Object
.
assign
(
Object
.
create
(
THREE
.
Pass
.
prototype
),
{
Object
.
assign
(
THREE
.
MaskPass
.
prototype
,
{
constructor
:
THREE
.
MaskPass
,
render
:
function
(
renderer
,
writeBuffer
,
readBuffer
,
delta
,
maskActive
)
{
...
...
examples/js/postprocessing/RenderPass.js
浏览文件 @
87ae9e71
...
...
@@ -22,9 +22,9 @@ THREE.RenderPass = function ( scene, camera, overrideMaterial, clearColor, clear
};
THREE
.
RenderPass
.
prototype
=
Object
.
create
(
THREE
.
Pass
.
prototype
);
THREE
.
RenderPass
.
prototype
=
Object
.
assign
(
Object
.
create
(
THREE
.
Pass
.
prototype
),
{
Object
.
assign
(
THREE
.
RenderPass
.
prototype
,
{
constructor
:
THREE
.
RenderPass
,
render
:
function
(
renderer
,
writeBuffer
,
readBuffer
,
delta
,
maskActive
)
{
...
...
examples/js/postprocessing/SMAAPass.js
浏览文件 @
87ae9e71
...
...
@@ -104,10 +104,10 @@ THREE.SMAAPass = function ( width, height ) {
};
THREE
.
SMAAPass
.
prototype
=
Object
.
create
(
THREE
.
Pass
.
prototype
);
THREE
.
SMAAPass
.
prototype
=
Object
.
assign
(
Object
.
create
(
THREE
.
Pass
.
prototype
),
{
constructor
:
THREE
.
SMAAPass
,
Object
.
assign
(
THREE
.
SMAAPass
.
prototype
,
{
render
:
function
(
renderer
,
writeBuffer
,
readBuffer
,
delta
,
maskActive
)
{
// pass 1
...
...
examples/js/postprocessing/SavePass.js
浏览文件 @
87ae9e71
...
...
@@ -42,9 +42,9 @@ THREE.SavePass = function ( renderTarget ) {
};
THREE
.
SavePass
.
prototype
=
Object
.
create
(
THREE
.
Pass
.
prototype
);
THREE
.
SavePass
.
prototype
=
Object
.
assign
(
Object
.
create
(
THREE
.
Pass
.
prototype
),
{
Object
.
assign
(
THREE
.
SavePass
.
prototype
,
{
constructor
:
THREE
.
SavePass
,
render
:
function
(
renderer
,
writeBuffer
,
readBuffer
,
delta
,
maskActive
)
{
...
...
examples/js/postprocessing/ShaderPass.js
浏览文件 @
87ae9e71
...
...
@@ -38,9 +38,9 @@ THREE.ShaderPass = function( shader, textureID ) {
};
THREE
.
ShaderPass
.
prototype
=
Object
.
create
(
THREE
.
Pass
.
prototype
);
THREE
.
ShaderPass
.
prototype
=
Object
.
assign
(
Object
.
create
(
THREE
.
Pass
.
prototype
),
{
Object
.
assign
(
THREE
.
ShaderPass
.
prototype
,
{
constructor
:
THREE
.
ShaderPass
,
render
:
function
(
renderer
,
writeBuffer
,
readBuffer
,
delta
,
maskActive
)
{
...
...
examples/js/postprocessing/TAARenderPass.js
浏览文件 @
87ae9e71
...
...
@@ -28,9 +28,9 @@ THREE.TAARenderPass = function ( scene, camera, params ) {
THREE
.
TAARenderPass
.
JitterVectors
=
THREE
.
ManualMSAARenderPass
.
JitterVectors
;
THREE
.
TAARenderPass
.
prototype
=
Object
.
create
(
THREE
.
ManualMSAARenderPass
.
prototype
);
THREE
.
TAARenderPass
.
prototype
=
Object
.
assign
(
Object
.
create
(
THREE
.
ManualMSAARenderPass
.
prototype
),
{
Object
.
assign
(
THREE
.
TAARenderPass
.
prototype
,
{
constructor
:
THREE
.
TAARenderPass
,
render
:
function
(
renderer
,
writeBuffer
,
readBuffer
,
delta
)
{
...
...
@@ -95,7 +95,7 @@ Object.assign( THREE.TAARenderPass.prototype, {
}
if
(
this
.
camera
.
clearViewOffset
)
this
.
camera
.
clearViewOffset
();
}
var
accumulationWeight
=
this
.
accumulateIndex
*
sampleWeight
;
...
...
examples/js/postprocessing/TexturePass.js
浏览文件 @
87ae9e71
...
...
@@ -34,9 +34,9 @@ THREE.TexturePass = function ( texture, opacity ) {
};
THREE
.
TexturePass
.
prototype
=
Object
.
create
(
THREE
.
Pass
.
prototype
);
THREE
.
TexturePass
.
prototype
=
Object
.
assign
(
Object
.
create
(
THREE
.
Pass
.
prototype
),
{
Object
.
assign
(
THREE
.
TexturePass
.
prototype
,
{
constructor
:
THREE
.
TexturePass
,
render
:
function
(
renderer
,
writeBuffer
,
readBuffer
,
delta
,
maskActive
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录