Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
b8533a25
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,体验更适合开发者的 AI 搜索 >>
提交
b8533a25
编写于
9月 14, 2015
作者:
T
tschw
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Renderer: Fixed WebGLPrograms factorization.
上级
0ffd772a
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
64 addition
and
65 deletion
+64
-65
src/renderers/WebGLRenderer.js
src/renderers/WebGLRenderer.js
+34
-61
src/renderers/webgl/WebGLProgram.js
src/renderers/webgl/WebGLProgram.js
+9
-0
src/renderers/webgl/WebGLPrograms.js
src/renderers/webgl/WebGLPrograms.js
+21
-4
未找到文件。
src/renderers/WebGLRenderer.js
浏览文件 @
b8533a25
...
...
@@ -82,8 +82,6 @@ THREE.WebGLRenderer = function ( parameters ) {
var
_this
=
this
,
_programs
=
[],
// internal state cache
_currentProgram
=
null
,
...
...
@@ -131,7 +129,6 @@ THREE.WebGLRenderer = function ( parameters ) {
_infoMemory
=
{
programs
:
0
,
geometries
:
0
,
textures
:
0
...
...
@@ -150,10 +147,16 @@ THREE.WebGLRenderer = function ( parameters ) {
render
:
_infoRender
,
memory
:
_infoMemory
,
programs
:
_programs
programs
:
[]
};
Object
.
defineProperty
(
_infoMemory
,
'
programs
'
,
{
get
:
function
()
{
return
_this
.
info
.
programs
.
length
;
}
}
);
// initialize
var
_gl
;
...
...
@@ -589,41 +592,13 @@ THREE.WebGLRenderer = function ( parameters ) {
function
releaseMaterialProgramReference
(
material
)
{
var
program
=
properties
.
get
(
material
).
program
.
program
;
if
(
program
===
undefined
)
return
;
var
programInfo
=
properties
.
get
(
material
).
program
;
material
.
program
=
undefined
;
for
(
var
i
=
0
,
n
=
_programs
.
length
;
i
!==
n
;
++
i
)
{
var
programInfo
=
_programs
[
i
];
if
(
programInfo
.
program
===
program
)
{
var
newReferenceCount
=
--
programInfo
.
usedTimes
;
if
(
newReferenceCount
===
0
)
{
// the last material that has been using the program let
// go of it, so remove it from the (unordered) _programs
// set and deallocate the GL resource
var
newLength
=
n
-
1
;
_programs
[
i
]
=
_programs
[
newLength
];
_programs
.
pop
();
_gl
.
deleteProgram
(
program
);
_infoMemory
.
programs
=
newLength
;
}
break
;
}
if
(
programInfo
!==
undefined
)
{
programCache
.
releaseProgram
(
programInfo
);
}
}
...
...
@@ -1442,15 +1417,15 @@ THREE.WebGLRenderer = function ( parameters ) {
var
parameters
=
programCache
.
getParameters
(
material
,
lights
,
fog
,
object
);
var
code
=
programCache
.
getProgramCode
(
material
,
parameters
);
var
program
=
materialProperties
.
program
;
var
programChange
=
true
;
if
(
!
materialProperties
.
program
)
{
if
(
program
===
undefined
)
{
// new material
material
.
addEventListener
(
'
dispose
'
,
onMaterialDispose
);
}
else
if
(
materialProperties
.
program
.
code
!==
code
)
{
}
else
if
(
program
.
code
!==
code
)
{
// changed glsl or parameters
releaseMaterialProgramReference
(
material
);
...
...
@@ -1467,41 +1442,39 @@ THREE.WebGLRenderer = function ( parameters ) {
}
if
(
p
arameters
.
shaderID
)
{
if
(
p
rogramChange
)
{
var
shader
=
THREE
.
ShaderLib
[
parameters
.
shaderID
];
if
(
parameters
.
shaderID
)
{
materialProperties
.
__webglShader
=
{
name
:
material
.
type
,
uniforms
:
THREE
.
UniformsUtils
.
clone
(
shader
.
uniforms
),
vertexShader
:
shader
.
vertexShader
,
fragmentShader
:
shader
.
fragmentShader
};
var
shader
=
THREE
.
ShaderLib
[
parameters
.
shaderID
];
}
else
{
materialProperties
.
__webglShader
=
{
name
:
material
.
type
,
uniforms
:
THREE
.
UniformsUtils
.
clone
(
shader
.
uniforms
),
vertexShader
:
shader
.
vertexShader
,
fragmentShader
:
shader
.
fragmentShader
};
materialProperties
.
__webglShader
=
{
name
:
material
.
type
,
uniforms
:
material
.
uniforms
,
vertexShader
:
material
.
vertexShader
,
fragmentShader
:
material
.
fragmentShader
};
}
else
{
}
materialProperties
.
__webglShader
=
{
name
:
material
.
type
,
uniforms
:
material
.
uniforms
,
vertexShader
:
material
.
vertexShader
,
fragmentShader
:
material
.
fragmentShader
};
material
.
__webglShader
=
materialProperties
.
__webglShader
;
}
var
program
=
programCache
.
getProgram
(
material
,
parameters
,
code
)
;
material
.
__webglShader
=
materialProperties
.
__webglShader
;
if
(
programChange
)
{
program
=
programCache
.
acquireProgram
(
material
,
parameters
,
code
);
program
.
usedTimes
++
;
materialProperties
.
program
=
program
;
material
.
program
=
program
;
}
materialProperties
.
program
=
program
;
material
.
program
=
program
;
var
attributes
=
program
.
getAttributes
();
if
(
material
.
morphTargets
)
{
...
...
src/renderers/webgl/WebGLProgram.js
浏览文件 @
b8533a25
...
...
@@ -454,6 +454,15 @@ THREE.WebGLProgram = ( function () {
};
// free resource
this
.
destroy
=
function
()
{
gl
.
deleteProgram
(
program
);
this
.
program
=
undefined
;
};
// DEPRECATED
Object
.
defineProperties
(
this
,
{
...
...
src/renderers/webgl/WebGLPrograms.js
浏览文件 @
b8533a25
THREE
.
WebGLPrograms
=
function
(
renderer
,
capabilities
)
{
var
programs
=
[]
;
var
programs
=
renderer
.
info
.
programs
;
var
shaderIDs
=
{
MeshDepthMaterial
:
'
depth
'
,
...
...
@@ -230,7 +230,7 @@ THREE.WebGLPrograms = function ( renderer, capabilities ) {
};
this
.
get
Program
=
function
(
material
,
parameters
,
code
)
{
this
.
acquire
Program
=
function
(
material
,
parameters
,
code
)
{
var
program
;
...
...
@@ -242,6 +242,7 @@ THREE.WebGLPrograms = function ( renderer, capabilities ) {
if
(
programInfo
.
code
===
code
)
{
program
=
programInfo
;
++
program
.
usedTimes
;
break
;
...
...
@@ -256,8 +257,24 @@ THREE.WebGLPrograms = function ( renderer, capabilities ) {
}
return
program
;
return
program
;
}
};
this
.
releaseProgram
=
function
(
program
)
{
if
(
--
program
.
usedTimes
===
0
)
{
// Remove from unordered set
var
i
=
programs
.
indexOf
(
program
);
programs
[
i
]
=
programs
[
programs
.
length
-
1
];
programs
.
pop
();
// Free WebGL resources
program
.
destroy
();
}
};
};
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录