Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
e69ea71a
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,发现更多精彩内容 >>
提交
e69ea71a
编写于
8月 13, 2015
作者:
M
Mr.doob
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
WebGLRenderer: Removed `materialIndex` code. Sorry @ikerr.
上级
f774b2f4
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
8 addition
and
20 deletion
+8
-20
src/renderers/WebGLRenderer.js
src/renderers/WebGLRenderer.js
+8
-20
未找到文件。
src/renderers/WebGLRenderer.js
浏览文件 @
e69ea71a
...
...
@@ -773,7 +773,7 @@ THREE.WebGLRenderer = function ( parameters ) {
};
this
.
renderBufferDirect
=
function
(
camera
,
lights
,
fog
,
material
,
object
,
materialIndex
)
{
this
.
renderBufferDirect
=
function
(
camera
,
lights
,
fog
,
material
,
object
)
{
if
(
material
instanceof
THREE
.
MeshFaceMaterial
)
{
...
...
@@ -785,7 +785,7 @@ THREE.WebGLRenderer = function ( parameters ) {
if
(
material
===
null
||
material
.
visible
===
false
)
continue
;
_this
.
renderBufferDirect
(
camera
,
lights
,
fog
,
material
,
object
,
i
);
_this
.
renderBufferDirect
(
camera
,
lights
,
fog
,
material
,
object
);
}
...
...
@@ -868,15 +868,15 @@ THREE.WebGLRenderer = function ( parameters ) {
if
(
object
instanceof
THREE
.
Mesh
)
{
renderMesh
(
material
,
geometry
,
program
,
updateBuffers
,
materialIndex
);
renderMesh
(
material
,
geometry
,
program
,
updateBuffers
);
}
else
if
(
object
instanceof
THREE
.
Line
)
{
renderLine
(
material
,
geometry
,
object
,
program
,
updateBuffers
,
materialIndex
);
renderLine
(
material
,
geometry
,
object
,
program
,
updateBuffers
);
}
else
if
(
object
instanceof
THREE
.
PointCloud
)
{
renderPointCloud
(
material
,
geometry
,
program
,
updateBuffers
,
materialIndex
);
renderPointCloud
(
material
,
geometry
,
program
,
updateBuffers
);
}
...
...
@@ -1013,7 +1013,7 @@ THREE.WebGLRenderer = function ( parameters ) {
}
function
renderMesh
(
material
,
geometry
,
program
,
updateBuffers
,
materialIndex
)
{
function
renderMesh
(
material
,
geometry
,
program
,
updateBuffers
)
{
var
mode
=
_gl
.
TRIANGLES
;
...
...
@@ -1100,8 +1100,6 @@ THREE.WebGLRenderer = function ( parameters ) {
var
startIndex
=
offsets
[
i
].
index
;
if
(
materialIndex
!==
undefined
&&
offsets
[
i
].
materialIndex
!==
materialIndex
)
continue
;
if
(
updateBuffers
)
{
setupVertexAttributes
(
material
,
program
,
geometry
,
startIndex
);
...
...
@@ -1211,8 +1209,6 @@ THREE.WebGLRenderer = function ( parameters ) {
// render non-indexed triangles
if
(
materialIndex
!==
undefined
&&
offsets
[
i
].
materialIndex
!==
materialIndex
)
continue
;
if
(
geometry
instanceof
THREE
.
InstancedBufferGeometry
)
{
console
.
error
(
'
THREE.WebGLRenderer.renderMesh: cannot use drawCalls with THREE.InstancedBufferGeometry.
'
);
...
...
@@ -1236,7 +1232,7 @@ THREE.WebGLRenderer = function ( parameters ) {
}
function
renderLine
(
material
,
geometry
,
object
,
program
,
updateBuffers
,
materialIndex
)
{
function
renderLine
(
material
,
geometry
,
object
,
program
,
updateBuffers
)
{
var
mode
=
object
instanceof
THREE
.
LineSegments
?
_gl
.
LINES
:
_gl
.
LINE_STRIP
;
...
...
@@ -1295,8 +1291,6 @@ THREE.WebGLRenderer = function ( parameters ) {
var
startIndex
=
offsets
[
i
].
index
;
if
(
materialIndex
!==
undefined
&&
offsets
[
i
].
materialIndex
===
materialIndex
)
continue
;
if
(
updateBuffers
)
{
setupVertexAttributes
(
material
,
program
,
geometry
,
startIndex
);
...
...
@@ -1339,8 +1333,6 @@ THREE.WebGLRenderer = function ( parameters ) {
for
(
var
i
=
0
,
il
=
offsets
.
length
;
i
<
il
;
i
++
)
{
if
(
materialIndex
!==
undefined
&&
offsets
[
i
].
materialIndex
!==
materialIndex
)
continue
;
_gl
.
drawArrays
(
mode
,
offsets
[
i
].
index
,
offsets
[
i
].
count
);
_infoRender
.
calls
++
;
...
...
@@ -1354,7 +1346,7 @@ THREE.WebGLRenderer = function ( parameters ) {
}
function
renderPointCloud
(
material
,
geometry
,
program
,
updateBuffers
,
materialIndex
)
{
function
renderPointCloud
(
material
,
geometry
,
program
,
updateBuffers
)
{
var
mode
=
_gl
.
POINTS
;
...
...
@@ -1408,8 +1400,6 @@ THREE.WebGLRenderer = function ( parameters ) {
var
startIndex
=
offsets
[
i
].
index
;
if
(
materialIndex
!==
undefined
&&
offsets
[
i
].
materialIndex
!==
materialIndex
)
continue
;
if
(
updateBuffers
)
{
setupVertexAttributes
(
material
,
program
,
geometry
,
startIndex
);
...
...
@@ -1452,8 +1442,6 @@ THREE.WebGLRenderer = function ( parameters ) {
for
(
var
i
=
0
,
il
=
offsets
.
length
;
i
<
il
;
i
++
)
{
if
(
materialIndex
!==
undefined
&&
offsets
[
i
].
materialIndex
!==
materialIndex
)
continue
;
_gl
.
drawArrays
(
mode
,
offsets
[
i
].
index
,
offsets
[
i
].
count
);
_infoRender
.
calls
++
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录