Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
50d05fc2
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,发现更多精彩内容 >>
提交
50d05fc2
编写于
2月 20, 2019
作者:
M
Mugen87
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
WebGLRenderer: Add activeCubeFace/activeMipMapLevel to setRenderTarget()
上级
8e4a57b0
变更
11
显示空白变更内容
内联
并排
Showing
11 changed file
with
26 addition
and
43 deletion
+26
-43
docs/api/en/renderers/WebGLRenderTargetCube.html
docs/api/en/renderers/WebGLRenderTargetCube.html
+0
-6
docs/api/en/renderers/WebGLRenderer.html
docs/api/en/renderers/WebGLRenderer.html
+4
-2
docs/api/zh/renderers/WebGLRenderTargetCube.html
docs/api/zh/renderers/WebGLRenderTargetCube.html
+0
-5
docs/api/zh/renderers/WebGLRenderer.html
docs/api/zh/renderers/WebGLRenderer.html
+4
-2
examples/js/loaders/EquirectangularToCubeGenerator.js
examples/js/loaders/EquirectangularToCubeGenerator.js
+1
-3
examples/js/pmrem/PMREMGenerator.js
examples/js/pmrem/PMREMGenerator.js
+1
-2
src/cameras/CubeCamera.js
src/cameras/CubeCamera.js
+6
-8
src/renderers/WebGLRenderTargetCube.d.ts
src/renderers/WebGLRenderTargetCube.d.ts
+0
-2
src/renderers/WebGLRenderTargetCube.js
src/renderers/WebGLRenderTargetCube.js
+0
-3
src/renderers/WebGLRenderer.d.ts
src/renderers/WebGLRenderer.d.ts
+7
-7
src/renderers/WebGLRenderer.js
src/renderers/WebGLRenderer.js
+3
-3
未找到文件。
docs/api/en/renderers/WebGLRenderTargetCube.html
浏览文件 @
50d05fc2
...
...
@@ -50,12 +50,6 @@
<h2>
Properties
</h2>
<h3>
[property:integer activeCubeFace]
</h3>
<p>
The activeCubeFace property corresponds to a cube side (PX 0, NX 1, PY 2, NY 3, PZ 4, NZ 5) and is
used and set internally by the [page:CubeCamera].
</p>
<h3>
See [page:WebGLRenderTarget] for inherited properties
</h3>
...
...
docs/api/en/renderers/WebGLRenderer.html
浏览文件 @
50d05fc2
...
...
@@ -434,9 +434,11 @@
<h3>
[method:null setPixelRatio]( [param:number value] )
</h3>
<p>
Sets device pixel ratio. This is usually used for HiDPI device to prevent bluring output canvas.
</p>
<h3>
[method:null setRenderTarget]( [param:WebGLRenderTarget renderTarget] )
</h3>
<h3>
[method:null setRenderTarget]( [param:WebGLRenderTarget renderTarget]
, [param:Integer activeCubeFace], [param:Integer activeMipMapLevel]
)
</h3>
<p>
renderTarget -- The [page:WebGLRenderTarget renderTarget] that needs to be activated (optional).
<br
/><br
/>
renderTarget -- The [page:WebGLRenderTarget renderTarget] that needs to be activated (optional).
<br
/>
activeCubeFace -- Specifies the active cube side (PX 0, NX 1, PY 2, NY 3, PZ 4, NZ 5) of [page:WebGLRenderTargetCube] (optional).
<br
/>
activeMipMapLevel -- Specifies the active mipmap level (optional).
<br
/><br
/>
This method sets the active rendertarget. If the parameter is omitted the canvas is set as the active rendertarget.
</p>
...
...
docs/api/zh/renderers/WebGLRenderTargetCube.html
浏览文件 @
50d05fc2
...
...
@@ -47,11 +47,6 @@
<h2>
属性
</h2>
<h3>
[property:integer activeCubeFace]
</h3>
<p>
activeCubeFace属性对应立方体的面(PX 0, NX 1, PY 2, NY 3, PZ 4, NZ 5) 并由[page:CubeCamera]内部使用和设置
</p>
<h3>
继承属性,请参阅[page:WebGLRenderTarget]
</h3>
...
...
docs/api/zh/renderers/WebGLRenderer.html
浏览文件 @
50d05fc2
...
...
@@ -387,9 +387,11 @@
<h3>
[method:null setPixelRatio]( [param:number value] )
</h3>
<p>
设置设备像素比。通常用于避免HiDPI设备上绘图模糊
</p>
<h3>
[method:null setRenderTarget]( [param:WebGLRenderTarget renderTarget] )
</h3>
<h3>
[method:null setRenderTarget]( [param:WebGLRenderTarget renderTarget]
, [param:Integer activeCubeFace], [param:Integer activeMipMapLevel]
)
</h3>
<p>
renderTarget -- 需要被激活的[page:WebGLRenderTarget renderTarget](可选).
<br
/><br
/>
renderTarget -- 需要被激活的[page:WebGLRenderTarget renderTarget](可选).
<br
/>
activeCubeFace -- Specifies the active cube side (PX 0, NX 1, PY 2, NY 3, PZ 4, NZ 5) of [page:WebGLRenderTargetCube] (optional).
<br
/>
activeMipMapLevel -- Specifies the active mipmap level (optional).
<br
/><br
/>
该方法设置活跃rendertarget. 参数缺省则将canvas设置成活跃rendertarget
</p>
...
...
examples/js/loaders/EquirectangularToCubeGenerator.js
浏览文件 @
50d05fc2
...
...
@@ -162,15 +162,13 @@ THREE.EquirectangularToCubeGenerator = ( function () {
for
(
var
i
=
0
;
i
<
6
;
i
++
)
{
this
.
renderTarget
.
activeCubeFace
=
i
;
var
v
=
this
.
views
[
i
];
camera
.
position
.
set
(
0
,
0
,
0
);
camera
.
up
.
set
(
v
.
u
[
0
],
v
.
u
[
1
],
v
.
u
[
2
]
);
camera
.
lookAt
(
v
.
t
[
0
],
v
.
t
[
1
],
v
.
t
[
2
]
);
renderer
.
setRenderTarget
(
this
.
renderTarget
);
renderer
.
setRenderTarget
(
this
.
renderTarget
,
i
);
renderer
.
clear
();
renderer
.
render
(
scene
,
camera
);
...
...
examples/js/pmrem/PMREMGenerator.js
浏览文件 @
50d05fc2
...
...
@@ -135,9 +135,8 @@ THREE.PMREMGenerator = ( function () {
renderToCubeMapTargetFace
:
function
(
renderer
,
renderTarget
,
faceIndex
)
{
renderTarget
.
activeCubeFace
=
faceIndex
;
shader
.
uniforms
[
'
faceIndex
'
].
value
=
faceIndex
;
renderer
.
setRenderTarget
(
renderTarget
);
renderer
.
setRenderTarget
(
renderTarget
,
faceIndex
);
renderer
.
clear
();
renderer
.
render
(
scene
,
camera
);
...
...
src/cameras/CubeCamera.js
浏览文件 @
50d05fc2
...
...
@@ -65,26 +65,24 @@ function CubeCamera( near, far, cubeResolution, options ) {
renderTarget
.
texture
.
generateMipmaps
=
false
;
renderTarget
.
activeCubeFace
=
0
;
renderer
.
setRenderTarget
(
renderTarget
);
renderer
.
setRenderTarget
(
renderTarget
,
0
);
renderer
.
render
(
scene
,
cameraPX
);
render
Target
.
activeCubeFace
=
1
;
render
er
.
setRenderTarget
(
renderTarget
,
1
)
;
renderer
.
render
(
scene
,
cameraNX
);
render
Target
.
activeCubeFace
=
2
;
render
er
.
setRenderTarget
(
renderTarget
,
2
)
;
renderer
.
render
(
scene
,
cameraPY
);
render
Target
.
activeCubeFace
=
3
;
render
er
.
setRenderTarget
(
renderTarget
,
3
)
;
renderer
.
render
(
scene
,
cameraNY
);
render
Target
.
activeCubeFace
=
4
;
render
er
.
setRenderTarget
(
renderTarget
,
4
)
;
renderer
.
render
(
scene
,
cameraPZ
);
renderTarget
.
texture
.
generateMipmaps
=
generateMipmaps
;
render
Target
.
activeCubeFace
=
5
;
render
er
.
setRenderTarget
(
renderTarget
,
5
)
;
renderer
.
render
(
scene
,
cameraNZ
);
renderer
.
setRenderTarget
(
currentRenderTarget
);
...
...
src/renderers/WebGLRenderTargetCube.d.ts
浏览文件 @
50d05fc2
...
...
@@ -10,6 +10,4 @@ export class WebGLRenderTargetCube extends WebGLRenderTarget {
options
?:
WebGLRenderTargetOptions
);
activeCubeFace
:
number
;
// PX 0, NX 1, PY 2, NY 3, PZ 4, NZ 5
activeMipMapLevel
:
number
;
}
src/renderers/WebGLRenderTargetCube.js
浏览文件 @
50d05fc2
...
...
@@ -8,9 +8,6 @@ function WebGLRenderTargetCube( width, height, options ) {
WebGLRenderTarget
.
call
(
this
,
width
,
height
,
options
);
this
.
activeCubeFace
=
0
;
// PX 0, NX 1, PY 2, NY 3, PZ 4, NZ 5
this
.
activeMipMapLevel
=
0
;
}
WebGLRenderTargetCube
.
prototype
=
Object
.
create
(
WebGLRenderTarget
.
prototype
);
...
...
src/renderers/WebGLRenderer.d.ts
浏览文件 @
50d05fc2
...
...
@@ -346,7 +346,7 @@ export class WebGLRenderer implements Renderer {
* @deprecated Use {@link WebGLRenderer#getRenderTarget .getRenderTarget()} instead.
*/
getCurrentRenderTarget
():
RenderTarget
;
setRenderTarget
(
renderTarget
?:
RenderTarget
):
void
;
setRenderTarget
(
renderTarget
?:
RenderTarget
,
activeCubeFace
?:
number
,
activeMipMapLevel
?:
number
):
void
;
readRenderTargetPixels
(
renderTarget
:
RenderTarget
,
x
:
number
,
...
...
src/renderers/WebGLRenderer.js
浏览文件 @
50d05fc2
...
...
@@ -2548,7 +2548,7 @@ function WebGLRenderer( parameters ) {
};
this
.
setRenderTarget
=
function
(
renderTarget
)
{
this
.
setRenderTarget
=
function
(
renderTarget
,
activeCubeFace
,
activeMipMapLevel
)
{
_currentRenderTarget
=
renderTarget
;
...
...
@@ -2567,7 +2567,7 @@ function WebGLRenderer( parameters ) {
if
(
renderTarget
.
isWebGLRenderTargetCube
)
{
framebuffer
=
__webglFramebuffer
[
renderTarget
.
activeCubeFace
];
framebuffer
=
__webglFramebuffer
[
activeCubeFace
||
0
];
isCube
=
true
;
}
else
if
(
renderTarget
.
isWebGLMultisampleRenderTarget
)
{
...
...
@@ -2606,7 +2606,7 @@ function WebGLRenderer( parameters ) {
if
(
isCube
)
{
var
textureProperties
=
properties
.
get
(
renderTarget
.
texture
);
_gl
.
framebufferTexture2D
(
_gl
.
FRAMEBUFFER
,
_gl
.
COLOR_ATTACHMENT0
,
_gl
.
TEXTURE_CUBE_MAP_POSITIVE_X
+
renderTarget
.
activeCubeFace
,
textureProperties
.
__webglTexture
,
renderTarget
.
activeMipMapLevel
);
_gl
.
framebufferTexture2D
(
_gl
.
FRAMEBUFFER
,
_gl
.
COLOR_ATTACHMENT0
,
_gl
.
TEXTURE_CUBE_MAP_POSITIVE_X
+
activeCubeFace
||
0
,
textureProperties
.
__webglTexture
,
activeMipMapLevel
||
0
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录