Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
65b8e841
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,发现更多精彩内容 >>
提交
65b8e841
编写于
9月 22, 2016
作者:
M
Mr.doob
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Removed dynamic uniforms. See #9662 #9741
上级
8e8e2e20
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
17 addition
and
81 deletion
+17
-81
src/Three.Legacy.js
src/Three.Legacy.js
+17
-0
src/core/Uniform.js
src/core/Uniform.js
+0
-18
src/renderers/WebGLRenderer.js
src/renderers/WebGLRenderer.js
+0
-14
src/renderers/webgl/WebGLUniforms.js
src/renderers/webgl/WebGLUniforms.js
+0
-49
未找到文件。
src/Three.Legacy.js
浏览文件 @
65b8e841
...
...
@@ -11,6 +11,7 @@ import { BufferGeometry } from './core/BufferGeometry.js';
import
{
EventDispatcher
}
from
'
./core/EventDispatcher.js
'
;
import
{
Face3
}
from
'
./core/Face3.js
'
;
import
{
Object3D
}
from
'
./core/Object3D.js
'
;
import
{
Uniform
}
from
'
./core/Uniform
'
;
import
{
BoxGeometry
}
from
'
./geometries/BoxGeometry.js
'
;
import
{
EdgesGeometry
}
from
'
./geometries/EdgesGeometry.js
'
;
import
{
ExtrudeGeometry
}
from
'
./geometries/ExtrudeGeometry.js
'
;
...
...
@@ -524,6 +525,22 @@ EventDispatcher.prototype = Object.assign( Object.create( {
//
Object
.
defineProperties
(
Uniform
.
prototype
,
{
dynamic
:
{
set
:
function
(
value
)
{
console
.
warn
(
'
THREE.Uniform: .dynamic has been removed. Use object.onBeforeRender() instead.
'
);
}
},
onUpdate
:
{
value
:
function
()
{
console
.
warn
(
'
THREE.Uniform: .onUpdate() has been removed. Use object.onBeforeRender() instead.
'
);
return
this
;
}
}
}
);
//
Object
.
assign
(
WebGLRenderer
.
prototype
,
{
supportsFloatTextures
:
function
()
{
console
.
warn
(
'
THREE.WebGLRenderer: .supportsFloatTextures() is now .extensions.get(
\'
OES_texture_float
\'
).
'
);
...
...
src/core/Uniform.js
浏览文件 @
65b8e841
...
...
@@ -13,24 +13,6 @@ function Uniform( value ) {
this
.
value
=
value
;
this
.
dynamic
=
false
;
}
Uniform
.
prototype
=
{
constructor
:
Uniform
,
onUpdate
:
function
(
callback
)
{
this
.
dynamic
=
true
;
this
.
onUpdateCallback
=
callback
;
return
this
;
}
};
export
{
Uniform
};
src/renderers/WebGLRenderer.js
浏览文件 @
65b8e841
...
...
@@ -1677,8 +1677,6 @@ function WebGLRenderer( parameters ) {
WebGLUniforms
.
seqWithValue
(
progUniforms
.
seq
,
uniforms
);
materialProperties
.
uniformsList
=
uniformsList
;
materialProperties
.
dynamicUniforms
=
WebGLUniforms
.
splitDynamic
(
uniformsList
,
uniforms
);
}
...
...
@@ -1967,18 +1965,6 @@ function WebGLRenderer( parameters ) {
p_uniforms
.
set
(
_gl
,
object
,
'
normalMatrix
'
);
p_uniforms
.
setValue
(
_gl
,
'
modelMatrix
'
,
object
.
matrixWorld
);
// dynamic uniforms
var
dynUniforms
=
materialProperties
.
dynamicUniforms
;
if
(
dynUniforms
!==
null
)
{
WebGLUniforms
.
evalDynamic
(
dynUniforms
,
m_uniforms
,
object
,
material
,
camera
);
WebGLUniforms
.
upload
(
_gl
,
dynUniforms
,
m_uniforms
,
_this
);
}
return
program
;
}
...
...
src/renderers/webgl/WebGLUniforms.js
浏览文件 @
65b8e841
...
...
@@ -30,10 +30,6 @@
*
* filters 'seq' entries with corresponding entry in values
*
* .splitDynamic( seq, values ) : filteredSeq
*
* filters 'seq' entries with dynamic entry and removes them from 'seq'
*
*
* Methods of the top-level container (renderer factorizations):
*
...
...
@@ -543,49 +539,4 @@ WebGLUniforms.seqWithValue = function( seq, values ) {
};
WebGLUniforms
.
splitDynamic
=
function
(
seq
,
values
)
{
var
r
=
null
,
n
=
seq
.
length
,
w
=
0
;
for
(
var
i
=
0
;
i
!==
n
;
++
i
)
{
var
u
=
seq
[
i
],
v
=
values
[
u
.
id
];
if
(
v
&&
v
.
dynamic
===
true
)
{
if
(
r
===
null
)
r
=
[];
r
.
push
(
u
);
}
else
{
// in-place compact 'seq', removing the matches
if
(
w
<
i
)
seq
[
w
]
=
u
;
++
w
;
}
}
if
(
w
<
n
)
seq
.
length
=
w
;
return
r
;
};
WebGLUniforms
.
evalDynamic
=
function
(
seq
,
values
,
object
,
material
,
camera
)
{
for
(
var
i
=
0
,
n
=
seq
.
length
;
i
!==
n
;
++
i
)
{
var
v
=
values
[
seq
[
i
].
id
],
f
=
v
.
onUpdateCallback
;
if
(
f
!==
undefined
)
f
.
call
(
v
,
object
,
material
,
camera
);
}
};
export
{
WebGLUniforms
};
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录