Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
e2f85057
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,发现更多精彩内容 >>
提交
e2f85057
编写于
5月 11, 2015
作者:
M
Mr.doob
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Removing ShaderMaterial attributes support.
上级
6f9dc56b
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
7 addition
and
80 deletion
+7
-80
src/core/BufferGeometry.js
src/core/BufferGeometry.js
+0
-74
src/materials/ShaderMaterial.js
src/materials/ShaderMaterial.js
+7
-1
src/renderers/webgl/WebGLObjects.js
src/renderers/webgl/WebGLObjects.js
+0
-5
未找到文件。
src/core/BufferGeometry.js
浏览文件 @
e2f85057
...
...
@@ -174,7 +174,6 @@ THREE.BufferGeometry.prototype = {
this
.
addAttribute
(
'
skinIndex
'
,
skinIndices
.
copyVector4sArray
(
geometry
.
skinIndices
)
);
this
.
addAttribute
(
'
skinWeight
'
,
skinWeights
.
copyVector4sArray
(
geometry
.
skinWeights
)
);
}
if
(
geometry
instanceof
THREE
.
DynamicGeometry
)
{
...
...
@@ -189,41 +188,6 @@ THREE.BufferGeometry.prototype = {
}
if
(
material
.
attributes
!==
undefined
)
{
var
attributes
=
material
.
attributes
;
for
(
var
name
in
attributes
)
{
var
attribute
=
attributes
[
name
];
var
type
=
attribute
.
type
;
var
array
=
attribute
.
value
;
switch
(
type
)
{
case
"
f
"
:
this
.
addAttribute
(
name
,
new
THREE
.
Float32Attribute
(
array
.
length
,
1
).
copyArray
(
array
)
);
break
;
case
"
c
"
:
this
.
addAttribute
(
name
,
new
THREE
.
Float32Attribute
(
array
.
length
*
3
,
3
).
copyColorsArray
(
array
)
);
break
;
case
"
v3
"
:
this
.
addAttribute
(
name
,
new
THREE
.
Float32Attribute
(
array
.
length
*
3
,
3
).
copyVector3sArray
(
array
)
);
break
;
default
:
console
.
warn
(
'
THREE.BufferGeometry.setFromObject(). TODO: attribute unsupported
'
,
type
);
break
;
}
}
}
return
this
;
},
...
...
@@ -264,44 +228,6 @@ THREE.BufferGeometry.prototype = {
},
updateFromMaterial
:
function
(
material
)
{
if
(
material
.
attributes
!==
undefined
)
{
var
attributes
=
material
.
attributes
;
for
(
var
name
in
attributes
)
{
var
attribute
=
attributes
[
name
];
var
type
=
attribute
.
type
;
var
array
=
attribute
.
value
;
switch
(
type
)
{
case
"
f
"
:
this
.
attributes
[
name
].
copyArray
(
array
);
this
.
attributes
[
name
].
needsUpdate
=
true
;
break
;
case
"
c
"
:
this
.
attributes
[
name
].
copyColorsArray
(
array
);
this
.
attributes
[
name
].
needsUpdate
=
true
;
break
;
case
"
v3
"
:
this
.
attributes
[
name
].
copyVector3sArray
(
array
);
this
.
attributes
[
name
].
needsUpdate
=
true
;
break
;
}
}
}
},
fromGeometry
:
function
(
geometry
,
material
)
{
material
=
material
||
{
'
vertexColors
'
:
THREE
.
NoColors
};
...
...
src/materials/ShaderMaterial.js
浏览文件 @
e2f85057
...
...
@@ -36,7 +36,13 @@ THREE.ShaderMaterial = function ( parameters ) {
this
.
defines
=
{};
this
.
uniforms
=
{};
this
.
attributes
=
null
;
// this.attributes = null;
if
(
parameters
.
attributes
!==
undefined
)
{
console
.
warn
(
'
THREE.ShaderMaterial: Materials no longer support attributes. Use THREE.BufferGeometry attributes instead.
'
);
}
this
.
vertexShader
=
'
void main() {
\n\t
gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );
\n
}
'
;
this
.
fragmentShader
=
'
void main() {
\n\t
gl_FragColor = vec4( 1.0, 0.0, 0.0, 1.0 );
\n
}
'
;
...
...
src/renderers/webgl/WebGLObjects.js
浏览文件 @
e2f85057
...
...
@@ -114,11 +114,6 @@ THREE.WebGLObjects = function ( gl, info ) {
if
(
object
.
geometry
instanceof
THREE
.
DynamicGeometry
)
{
geometry
.
updateFromObject
(
object
);
geometry
.
updateFromMaterial
(
object
.
material
);
}
else
if
(
object
.
geometry
instanceof
THREE
.
Geometry
)
{
geometry
.
updateFromMaterial
(
object
.
material
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录