Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
d1e4dbc9
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,发现更多精彩内容 >>
提交
d1e4dbc9
编写于
2月 05, 2019
作者:
W
WestLangley
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Require target Vector2 in WebGLRenderer getSize() methods
上级
c4dff1c9
变更
10
显示空白变更内容
内联
并排
Showing
10 changed file
with
47 addition
and
27 deletion
+47
-27
docs/api/en/renderers/WebGLRenderer.html
docs/api/en/renderers/WebGLRenderer.html
+12
-4
examples/js/effects/OutlineEffect.js
examples/js/effects/OutlineEffect.js
+2
-2
examples/js/effects/StereoEffect.js
examples/js/effects/StereoEffect.js
+2
-1
examples/js/nodes/postprocessing/NodePostProcessing.js
examples/js/nodes/postprocessing/NodePostProcessing.js
+1
-1
examples/js/postprocessing/EffectComposer.js
examples/js/postprocessing/EffectComposer.js
+3
-3
examples/js/renderers/WebGLDeferredRenderer.js
examples/js/renderers/WebGLDeferredRenderer.js
+2
-2
examples/webgl2_multisampled_renderbuffers.html
examples/webgl2_multisampled_renderbuffers.html
+1
-1
examples/webgl_postprocessing_nodes.html
examples/webgl_postprocessing_nodes.html
+2
-2
examples/webgl_postprocessing_nodes_pass.html
examples/webgl_postprocessing_nodes_pass.html
+1
-1
src/renderers/WebGLRenderer.js
src/renderers/WebGLRenderer.js
+21
-10
未找到文件。
docs/api/en/renderers/WebGLRenderer.html
浏览文件 @
d1e4dbc9
...
...
@@ -351,14 +351,22 @@
<h3>
[method:RenderTarget getCurrentViewport]()
</h3>
<p>
Returns the current viewport.
</p>
<h3>
[method:Object getDrawingBufferSize]()
</h3>
<p>
Returns an object containing the width and height of the renderer's drawing buffer, in pixels.
</p>
<h3>
[method:Vector2 getDrawingBufferSize]( [param:Vector2 target] )
</h3>
<p>
[page:Vector2 target] — the result will be copied into this Vector2.
<br
/><br
/>
Returns the width and height of the renderer's drawing buffer, in pixels.
</p>
<h3>
[method:number getPixelRatio]()
</h3>
<p>
Returns current device pixel ratio used.
</p>
<h3>
[method:Object getSize]()
</h3>
<p>
Returns an object containing the width and height of the renderer's output canvas, in pixels.
</p>
<h3>
[method:Vector2 getSize]( [param:Vector2 target] )
</h3>
<p>
[page:Vector2 target] — the result will be copied into this Vector2.
<br
/><br
/>
Returns the width and height of the renderer's output canvas, in pixels.
</p>
<h3>
[method:null resetGLState]( )
</h3>
<p>
Reset the GL state to default. Called internally if the WebGL context is lost.
</p>
...
...
examples/js/effects/OutlineEffect.js
浏览文件 @
d1e4dbc9
...
...
@@ -478,9 +478,9 @@ THREE.OutlineEffect = function ( renderer, parameters ) {
};
this
.
getSize
=
function
()
{
this
.
getSize
=
function
(
target
)
{
return
renderer
.
getSize
();
return
renderer
.
getSize
(
target
);
};
...
...
examples/js/effects/StereoEffect.js
浏览文件 @
d1e4dbc9
...
...
@@ -9,6 +9,7 @@ THREE.StereoEffect = function ( renderer ) {
var
_stereo
=
new
THREE
.
StereoCamera
();
_stereo
.
aspect
=
0.5
;
var
size
=
new
THREE
.
Vector2
();
this
.
setEyeSeparation
=
function
(
eyeSep
)
{
...
...
@@ -30,7 +31,7 @@ THREE.StereoEffect = function ( renderer ) {
_stereo
.
update
(
camera
);
var
size
=
renderer
.
getSize
(
);
renderer
.
getSize
(
size
);
if
(
renderer
.
autoClear
)
renderer
.
clear
();
renderer
.
setScissorTest
(
true
);
...
...
examples/js/nodes/postprocessing/NodePostProcessing.js
浏览文件 @
d1e4dbc9
...
...
@@ -16,7 +16,7 @@ function NodePostProcessing( renderer, renderTarget ) {
stencilBuffer
:
false
};
var
size
=
renderer
.
getDrawingBufferSize
();
var
size
=
renderer
.
getDrawingBufferSize
(
new
THREE
.
Vector2
()
);
renderTarget
=
new
THREE
.
WebGLRenderTarget
(
size
.
width
,
size
.
height
,
parameters
);
}
...
...
examples/js/postprocessing/EffectComposer.js
浏览文件 @
d1e4dbc9
...
...
@@ -15,7 +15,7 @@ THREE.EffectComposer = function ( renderer, renderTarget ) {
stencilBuffer
:
false
};
var
size
=
renderer
.
getDrawingBufferSize
();
var
size
=
renderer
.
getDrawingBufferSize
(
new
THREE
.
Vector2
()
);
renderTarget
=
new
THREE
.
WebGLRenderTarget
(
size
.
width
,
size
.
height
,
parameters
);
renderTarget
.
texture
.
name
=
'
EffectComposer.rt1
'
;
...
...
@@ -64,7 +64,7 @@ Object.assign( THREE.EffectComposer.prototype, {
this
.
passes
.
push
(
pass
);
var
size
=
this
.
renderer
.
getDrawingBufferSize
();
var
size
=
this
.
renderer
.
getDrawingBufferSize
(
new
THREE
.
Vector2
()
);
pass
.
setSize
(
size
.
width
,
size
.
height
);
},
...
...
@@ -139,7 +139,7 @@ Object.assign( THREE.EffectComposer.prototype, {
if
(
renderTarget
===
undefined
)
{
var
size
=
this
.
renderer
.
getDrawingBufferSize
();
var
size
=
this
.
renderer
.
getDrawingBufferSize
(
new
THREE
.
Vector2
()
);
renderTarget
=
this
.
renderTarget1
.
clone
();
renderTarget
.
setSize
(
size
.
width
,
size
.
height
);
...
...
examples/js/renderers/WebGLDeferredRenderer.js
浏览文件 @
d1e4dbc9
...
...
@@ -125,8 +125,8 @@ THREE.WebGLDeferredRenderer = function ( parameters ) {
_gl
=
_this
.
renderer
.
context
;
_width
=
parameters
.
width
!==
undefined
?
parameters
.
width
:
_this
.
renderer
.
getSize
().
width
;
_height
=
parameters
.
height
!==
undefined
?
parameters
.
height
:
_this
.
renderer
.
getSize
().
height
;
_width
=
parameters
.
width
!==
undefined
?
parameters
.
width
:
_this
.
renderer
.
getSize
(
new
THREE
.
Vector2
()
).
width
;
_height
=
parameters
.
height
!==
undefined
?
parameters
.
height
:
_this
.
renderer
.
getSize
(
new
THREE
.
Vector2
()
).
height
;
var
antialias
=
parameters
.
antialias
!==
undefined
?
parameters
.
antialias
:
false
;
...
...
examples/webgl2_multisampled_renderbuffers.html
浏览文件 @
d1e4dbc9
...
...
@@ -130,7 +130,7 @@
stencilBuffer
:
false
};
var
size
=
renderer
.
getDrawingBufferSize
();
var
size
=
renderer
.
getDrawingBufferSize
(
new
THREE
.
Vector2
()
);
var
renderTarget
=
new
THREE
.
WebGLMultisampleRenderTarget
(
size
.
width
,
size
.
height
,
parameters
);
var
renderPass
=
new
THREE
.
RenderPass
(
scene
,
camera
);
...
...
examples/webgl_postprocessing_nodes.html
浏览文件 @
d1e4dbc9
...
...
@@ -369,7 +369,7 @@
// POST
var
size
=
renderer
.
getDrawingBufferSize
();
var
size
=
renderer
.
getDrawingBufferSize
(
new
THREE
.
Vector2
()
);
var
screen
=
new
THREE
.
ScreenNode
();
...
...
@@ -451,7 +451,7 @@
// POST
var
size
=
renderer
.
getDrawingBufferSize
();
var
size
=
renderer
.
getDrawingBufferSize
(
new
THREE
.
Vector2
()
);
var
blurScreen
=
new
THREE
.
BlurNode
(
new
THREE
.
ScreenNode
()
);
blurScreen
.
size
=
new
THREE
.
Vector2
(
size
.
width
,
size
.
height
);
...
...
examples/webgl_postprocessing_nodes_pass.html
浏览文件 @
d1e4dbc9
...
...
@@ -432,7 +432,7 @@
// PASS
var
size
=
renderer
.
getDrawingBufferSize
();
var
size
=
renderer
.
getDrawingBufferSize
(
new
THREE
.
Vector2
()
);
var
blurScreen
=
new
THREE
.
BlurNode
(
new
THREE
.
ScreenNode
()
);
blurScreen
.
size
=
new
THREE
.
Vector2
(
size
.
width
,
size
.
height
);
...
...
src/renderers/WebGLRenderer.js
浏览文件 @
d1e4dbc9
...
...
@@ -17,6 +17,7 @@ import { Matrix4 } from '../math/Matrix4.js';
import
{
ShaderLib
}
from
'
./shaders/ShaderLib.js
'
;
import
{
UniformsLib
}
from
'
./shaders/UniformsLib.js
'
;
import
{
cloneUniforms
}
from
'
./shaders/UniformsUtils.js
'
;
import
{
Vector2
}
from
'
../math/Vector2.js
'
;
import
{
Vector3
}
from
'
../math/Vector3.js
'
;
import
{
Vector4
}
from
'
../math/Vector4.js
'
;
import
{
WebGLAnimation
}
from
'
./webgl/WebGLAnimation.js
'
;
...
...
@@ -360,12 +361,17 @@ function WebGLRenderer( parameters ) {
};
this
.
getSize
=
function
()
{
this
.
getSize
=
function
(
target
)
{
return
{
width
:
_width
,
height
:
_height
};
if
(
target
===
undefined
)
{
console
.
warn
(
'
WebGLRenderer: .getsize() now requires a Vector2 as an argument
'
);
target
=
new
Vector2
();
}
return
target
.
set
(
_width
,
_height
);
};
...
...
@@ -395,12 +401,17 @@ function WebGLRenderer( parameters ) {
};
this
.
getDrawingBufferSize
=
function
()
{
this
.
getDrawingBufferSize
=
function
(
target
)
{
return
{
width
:
_width
*
_pixelRatio
,
height
:
_height
*
_pixelRatio
};
if
(
target
===
undefined
)
{
console
.
warn
(
'
WebGLRenderer: .getdrawingBufferSize() now requires a Vector2 as an argument
'
);
target
=
new
Vector2
();
}
return
target
.
set
(
_width
*
_pixelRatio
,
_height
*
_pixelRatio
);
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录