Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
56113d0a
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,发现更多精彩内容 >>
提交
56113d0a
编写于
9月 30, 2011
作者:
M
Mr.doob
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'NINE78/dev' into dev
上级
00b01e88
c311a719
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
26 addition
and
6 deletion
+26
-6
src/renderers/WebGLRenderer.js
src/renderers/WebGLRenderer.js
+26
-6
未找到文件。
src/renderers/WebGLRenderer.js
浏览文件 @
56113d0a
...
...
@@ -3636,7 +3636,12 @@ THREE.WebGLRenderer = function ( parameters ) {
setObjectFaces
(
object
);
program
=
setProgram
(
_cameraLight
,
lights
,
fog
,
_depthMaterial
,
object
);
object
.
render
(
function
(
object
)
{
renderBufferImmediate
(
object
,
program
,
_depthMaterial
.
shading
);
}
);
if
(
object
.
immediateRenderCallback
)
{
object
.
immediateRenderCallback
(
program
,
_gl
,
_frustum
);
}
else
{
object
.
render
(
function
(
object
)
{
renderBufferImmediate
(
object
,
program
,
_depthMaterial
.
shading
);
}
);
}
}
...
...
@@ -3814,7 +3819,12 @@ THREE.WebGLRenderer = function ( parameters ) {
setObjectFaces
(
object
);
program
=
setProgram
(
camera
,
lights
,
fog
,
scene
.
overrideMaterial
,
object
);
object
.
render
(
function
(
object
)
{
renderBufferImmediate
(
object
,
program
,
scene
.
overrideMaterial
.
shading
);
}
);
if
(
object
.
immediateRenderCallback
)
{
object
.
immediateRenderCallback
(
program
,
_gl
,
_frustum
);
}
else
{
object
.
render
(
function
(
object
)
{
renderBufferImmediate
(
object
,
program
,
_depthMaterial
.
shading
);
}
);
}
}
...
...
@@ -3876,7 +3886,12 @@ THREE.WebGLRenderer = function ( parameters ) {
setPolygonOffset
(
material
.
polygonOffset
,
material
.
polygonOffsetFactor
,
material
.
polygonOffsetUnits
);
program
=
setProgram
(
camera
,
lights
,
fog
,
material
,
object
);
object
.
render
(
function
(
object
)
{
renderBufferImmediate
(
object
,
program
,
material
.
shading
);
}
);
if
(
object
.
immediateRenderCallback
)
{
object
.
immediateRenderCallback
(
program
,
_gl
,
_frustum
);
}
else
{
object
.
render
(
function
(
object
)
{
renderBufferImmediate
(
object
,
program
,
_depthMaterial
.
shading
);
}
);
}
}
...
...
@@ -3939,7 +3954,12 @@ THREE.WebGLRenderer = function ( parameters ) {
setPolygonOffset
(
material
.
polygonOffset
,
material
.
polygonOffsetFactor
,
material
.
polygonOffsetUnits
);
program
=
setProgram
(
camera
,
lights
,
fog
,
material
,
object
);
object
.
render
(
function
(
object
)
{
renderBufferImmediate
(
object
,
program
,
material
.
shading
);
}
);
if
(
object
.
immediateRenderCallback
)
{
object
.
immediateRenderCallback
(
program
,
_gl
,
_frustum
);
}
else
{
object
.
render
(
function
(
object
)
{
renderBufferImmediate
(
object
,
program
,
_depthMaterial
.
shading
);
}
);
}
}
...
...
@@ -4275,7 +4295,7 @@ THREE.WebGLRenderer = function ( parameters ) {
geometry
=
object
.
geometry
;
addBuffer
(
scene
.
__webglObjects
,
geometry
,
object
);
}
else
if
(
THREE
.
MarchingCubes
!==
undefined
&&
object
instanceof
THREE
.
MarchingCubes
)
{
}
else
if
(
THREE
.
MarchingCubes
!==
undefined
&&
object
instanceof
THREE
.
MarchingCubes
||
object
.
immediateRenderCallback
)
{
addBufferImmediate
(
scene
.
__webglObjectsImmediate
,
object
);
...
...
@@ -4480,7 +4500,7 @@ THREE.WebGLRenderer = function ( parameters ) {
removeInstancesDirect
(
scene
.
__webglSprites
,
object
);
}
else
if
(
object
instanceof
THREE
.
MarchingCubes
)
{
}
else
if
(
object
instanceof
THREE
.
MarchingCubes
||
object
.
immediateRenderCallback
)
{
removeInstances
(
scene
.
__webglObjectsImmediate
,
object
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录