Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
26ffbd29
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,发现更多精彩内容 >>
提交
26ffbd29
编写于
9月 06, 2019
作者:
M
Mugen87
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Examples: Remove usage of BufferAttribute.setArray().
上级
4ff90827
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
14 addition
and
62 deletion
+14
-62
examples/js/loaders/GLTFLoader.js
examples/js/loaders/GLTFLoader.js
+1
-1
examples/js/utils/BufferGeometryUtils.js
examples/js/utils/BufferGeometryUtils.js
+6
-30
examples/jsm/loaders/GLTFLoader.js
examples/jsm/loaders/GLTFLoader.js
+1
-1
examples/jsm/utils/BufferGeometryUtils.js
examples/jsm/utils/BufferGeometryUtils.js
+6
-30
未找到文件。
examples/js/loaders/GLTFLoader.js
浏览文件 @
26ffbd29
...
...
@@ -1910,7 +1910,7 @@ THREE.GLTFLoader = ( function () {
if
(
bufferView
!==
null
)
{
// Avoid modifying the original ArrayBuffer, if the bufferView wasn't initialized with zeroes.
bufferAttribute
.
setArray
(
bufferAttribute
.
array
.
slice
()
);
bufferAttribute
=
new
THREE
.
BufferAttribute
(
bufferAttribute
.
array
.
slice
(),
bufferAttribute
.
itemSize
,
bufferAttribute
.
normalized
);
}
...
...
examples/js/utils/BufferGeometryUtils.js
浏览文件 @
26ffbd29
...
...
@@ -589,19 +589,9 @@ THREE.BufferGeometryUtils = {
var
name
=
attributeNames
[
i
];
var
oldAttribute
=
geometry
.
getAttribute
(
name
);
var
attribute
;
var
buffer
=
new
oldAttribute
.
array
.
constructor
(
attrArrays
[
name
]
);
if
(
oldAttribute
.
isInterleavedBufferAttribute
)
{
attribute
=
new
THREE
.
BufferAttribute
(
buffer
,
oldAttribute
.
itemSize
,
oldAttribute
.
itemSize
);
}
else
{
attribute
=
geometry
.
getAttribute
(
name
).
clone
();
attribute
.
setArray
(
buffer
);
}
var
attribute
=
new
THREE
.
BufferAttribute
(
buffer
,
oldAttribute
.
itemSize
,
oldAttribute
.
normalized
);
result
.
addAttribute
(
name
,
attribute
);
...
...
@@ -610,8 +600,10 @@ THREE.BufferGeometryUtils = {
for
(
var
j
=
0
;
j
<
morphAttrsArrays
[
name
].
length
;
j
++
)
{
var
morphAttribute
=
geometry
.
morphAttributes
[
name
][
j
].
clone
();
morphAttribute
.
setArray
(
new
morphAttribute
.
array
.
constructor
(
morphAttrsArrays
[
name
][
j
]
)
);
var
oldMorphAttribute
=
geometry
.
morphAttributes
[
name
][
j
];
var
buffer
=
new
oldMorphAttribute
.
array
.
constructor
(
morphAttrsArrays
[
name
][
j
]
);
var
morphAttribute
=
new
THREE
.
BufferAttribute
(
buffer
,
oldMorphAttribute
.
itemSize
,
oldMorphAttribute
.
normalized
);
result
.
morphAttributes
[
name
][
j
]
=
morphAttribute
;
}
...
...
@@ -620,23 +612,7 @@ THREE.BufferGeometryUtils = {
}
// Generate an index buffer typed array
var
cons
=
Uint8Array
;
if
(
newIndices
.
length
>=
Math
.
pow
(
2
,
8
)
)
cons
=
Uint16Array
;
if
(
newIndices
.
length
>=
Math
.
pow
(
2
,
16
)
)
cons
=
Uint32Array
;
var
newIndexBuffer
=
new
cons
(
newIndices
);
var
newIndices
=
null
;
if
(
indices
===
null
)
{
newIndices
=
new
THREE
.
BufferAttribute
(
newIndexBuffer
,
1
);
}
else
{
newIndices
=
geometry
.
getIndex
().
clone
();
newIndices
.
setArray
(
newIndexBuffer
);
}
// indices
result
.
setIndex
(
newIndices
);
...
...
examples/jsm/loaders/GLTFLoader.js
浏览文件 @
26ffbd29
...
...
@@ -1974,7 +1974,7 @@ var GLTFLoader = ( function () {
if
(
bufferView
!==
null
)
{
// Avoid modifying the original ArrayBuffer, if the bufferView wasn't initialized with zeroes.
bufferAttribute
.
setArray
(
bufferAttribute
.
array
.
slice
()
);
bufferAttribute
=
new
BufferAttribute
(
bufferAttribute
.
array
.
slice
(),
bufferAttribute
.
itemSize
,
bufferAttribute
.
normalized
);
}
...
...
examples/jsm/utils/BufferGeometryUtils.js
浏览文件 @
26ffbd29
...
...
@@ -598,19 +598,9 @@ var BufferGeometryUtils = {
var
name
=
attributeNames
[
i
];
var
oldAttribute
=
geometry
.
getAttribute
(
name
);
var
attribute
;
var
buffer
=
new
oldAttribute
.
array
.
constructor
(
attrArrays
[
name
]
);
if
(
oldAttribute
.
isInterleavedBufferAttribute
)
{
attribute
=
new
BufferAttribute
(
buffer
,
oldAttribute
.
itemSize
,
oldAttribute
.
itemSize
);
}
else
{
attribute
=
geometry
.
getAttribute
(
name
).
clone
();
attribute
.
setArray
(
buffer
);
}
var
attribute
=
new
BufferAttribute
(
buffer
,
oldAttribute
.
itemSize
,
oldAttribute
.
normalized
);
result
.
addAttribute
(
name
,
attribute
);
...
...
@@ -619,8 +609,10 @@ var BufferGeometryUtils = {
for
(
var
j
=
0
;
j
<
morphAttrsArrays
[
name
].
length
;
j
++
)
{
var
morphAttribute
=
geometry
.
morphAttributes
[
name
][
j
].
clone
();
morphAttribute
.
setArray
(
new
morphAttribute
.
array
.
constructor
(
morphAttrsArrays
[
name
][
j
]
)
);
var
oldMorphAttribute
=
geometry
.
morphAttributes
[
name
][
j
];
var
buffer
=
new
oldMorphAttribute
.
array
.
constructor
(
morphAttrsArrays
[
name
][
j
]
);
var
morphAttribute
=
new
BufferAttribute
(
buffer
,
oldMorphAttribute
.
itemSize
,
oldMorphAttribute
.
normalized
);
result
.
morphAttributes
[
name
][
j
]
=
morphAttribute
;
}
...
...
@@ -629,23 +621,7 @@ var BufferGeometryUtils = {
}
// Generate an index buffer typed array
var
cons
=
Uint8Array
;
if
(
newIndices
.
length
>=
Math
.
pow
(
2
,
8
)
)
cons
=
Uint16Array
;
if
(
newIndices
.
length
>=
Math
.
pow
(
2
,
16
)
)
cons
=
Uint32Array
;
var
newIndexBuffer
=
new
cons
(
newIndices
);
var
newIndices
=
null
;
if
(
indices
===
null
)
{
newIndices
=
new
BufferAttribute
(
newIndexBuffer
,
1
);
}
else
{
newIndices
=
geometry
.
getIndex
().
clone
();
newIndices
.
setArray
(
newIndexBuffer
);
}
// indices
result
.
setIndex
(
newIndices
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录