Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
82f3310e
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,体验更适合开发者的 AI 搜索 >>
提交
82f3310e
编写于
1月 18, 2017
作者:
B
Brian Burke
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Correct detection of Uint32BufferAttribute for length of verticies
上级
3ee05d49
变更
15
隐藏空白更改
内联
并排
Showing
15 changed file
with
15 addition
and
15 deletion
+15
-15
examples/js/loaders/AssimpJSONLoader.js
examples/js/loaders/AssimpJSONLoader.js
+1
-1
examples/js/loaders/MMDLoader.js
examples/js/loaders/MMDLoader.js
+1
-1
examples/js/loaders/PLYLoader.js
examples/js/loaders/PLYLoader.js
+1
-1
src/geometries/BoxGeometry.js
src/geometries/BoxGeometry.js
+1
-1
src/geometries/CircleGeometry.js
src/geometries/CircleGeometry.js
+1
-1
src/geometries/CylinderGeometry.js
src/geometries/CylinderGeometry.js
+1
-1
src/geometries/LatheGeometry.js
src/geometries/LatheGeometry.js
+1
-1
src/geometries/ParametricGeometry.js
src/geometries/ParametricGeometry.js
+1
-1
src/geometries/PlaneGeometry.js
src/geometries/PlaneGeometry.js
+1
-1
src/geometries/RingGeometry.js
src/geometries/RingGeometry.js
+1
-1
src/geometries/ShapeGeometry.js
src/geometries/ShapeGeometry.js
+1
-1
src/geometries/SphereGeometry.js
src/geometries/SphereGeometry.js
+1
-1
src/geometries/TorusGeometry.js
src/geometries/TorusGeometry.js
+1
-1
src/geometries/TorusKnotGeometry.js
src/geometries/TorusKnotGeometry.js
+1
-1
src/geometries/TubeGeometry.js
src/geometries/TubeGeometry.js
+1
-1
未找到文件。
examples/js/loaders/AssimpJSONLoader.js
浏览文件 @
82f3310e
...
@@ -125,7 +125,7 @@ THREE.AssimpJSONLoader.prototype = {
...
@@ -125,7 +125,7 @@ THREE.AssimpJSONLoader.prototype = {
}
}
geometry
.
setIndex
(
new
(
ind
ices
.
length
>
65535
?
THREE
.
Uint32BufferAttribute
:
THREE
.
Uint16BufferAttribute
)(
indices
,
1
)
);
geometry
.
setIndex
(
new
(
vert
ices
.
length
>
65535
?
THREE
.
Uint32BufferAttribute
:
THREE
.
Uint16BufferAttribute
)(
indices
,
1
)
);
geometry
.
addAttribute
(
'
position
'
,
new
THREE
.
Float32BufferAttribute
(
vertices
,
3
)
);
geometry
.
addAttribute
(
'
position
'
,
new
THREE
.
Float32BufferAttribute
(
vertices
,
3
)
);
if
(
normals
.
length
>
0
)
{
if
(
normals
.
length
>
0
)
{
...
...
examples/js/loaders/MMDLoader.js
浏览文件 @
82f3310e
...
@@ -1477,7 +1477,7 @@ THREE.MMDLoader.prototype.createMesh = function ( model, texturePath, onProgress
...
@@ -1477,7 +1477,7 @@ THREE.MMDLoader.prototype.createMesh = function ( model, texturePath, onProgress
var
initGeometry
=
function
()
{
var
initGeometry
=
function
()
{
geometry
.
setIndex
(
new
(
buffer
.
ind
ices
.
length
>
65535
?
THREE
.
Uint32BufferAttribute
:
THREE
.
Uint16BufferAttribute
)(
buffer
.
indices
,
1
)
);
geometry
.
setIndex
(
new
(
buffer
.
vert
ices
.
length
>
65535
?
THREE
.
Uint32BufferAttribute
:
THREE
.
Uint16BufferAttribute
)(
buffer
.
indices
,
1
)
);
geometry
.
addAttribute
(
'
position
'
,
new
THREE
.
Float32BufferAttribute
(
buffer
.
vertices
,
3
)
);
geometry
.
addAttribute
(
'
position
'
,
new
THREE
.
Float32BufferAttribute
(
buffer
.
vertices
,
3
)
);
geometry
.
addAttribute
(
'
normal
'
,
new
THREE
.
Float32BufferAttribute
(
buffer
.
normals
,
3
)
);
geometry
.
addAttribute
(
'
normal
'
,
new
THREE
.
Float32BufferAttribute
(
buffer
.
normals
,
3
)
);
geometry
.
addAttribute
(
'
uv
'
,
new
THREE
.
Float32BufferAttribute
(
buffer
.
uvs
,
2
)
);
geometry
.
addAttribute
(
'
uv
'
,
new
THREE
.
Float32BufferAttribute
(
buffer
.
uvs
,
2
)
);
...
...
examples/js/loaders/PLYLoader.js
浏览文件 @
82f3310e
...
@@ -313,7 +313,7 @@ THREE.PLYLoader.prototype = {
...
@@ -313,7 +313,7 @@ THREE.PLYLoader.prototype = {
// mandatory buffer data
// mandatory buffer data
if
(
buffer
.
indices
.
length
>
0
)
{
if
(
buffer
.
indices
.
length
>
0
)
{
geometry
.
setIndex
(
new
(
buffer
.
ind
ices
.
length
>
65535
?
THREE
.
Uint32BufferAttribute
:
THREE
.
Uint16BufferAttribute
)(
buffer
.
indices
,
1
)
);
geometry
.
setIndex
(
new
(
buffer
.
vert
ices
.
length
>
65535
?
THREE
.
Uint32BufferAttribute
:
THREE
.
Uint16BufferAttribute
)(
buffer
.
indices
,
1
)
);
}
}
geometry
.
addAttribute
(
'
position
'
,
new
THREE
.
Float32BufferAttribute
(
buffer
.
vertices
,
3
)
);
geometry
.
addAttribute
(
'
position
'
,
new
THREE
.
Float32BufferAttribute
(
buffer
.
vertices
,
3
)
);
...
...
src/geometries/BoxGeometry.js
浏览文件 @
82f3310e
...
@@ -82,7 +82,7 @@ function BoxBufferGeometry( width, height, depth, widthSegments, heightSegments,
...
@@ -82,7 +82,7 @@ function BoxBufferGeometry( width, height, depth, widthSegments, heightSegments,
// build geometry
// build geometry
this
.
setIndex
(
new
(
ind
ices
.
length
>
65535
?
Uint32BufferAttribute
:
Uint16BufferAttribute
)(
indices
,
1
)
);
this
.
setIndex
(
new
(
vert
ices
.
length
>
65535
?
Uint32BufferAttribute
:
Uint16BufferAttribute
)(
indices
,
1
)
);
this
.
addAttribute
(
'
position
'
,
new
Float32BufferAttribute
(
vertices
,
3
)
);
this
.
addAttribute
(
'
position
'
,
new
Float32BufferAttribute
(
vertices
,
3
)
);
this
.
addAttribute
(
'
normal
'
,
new
Float32BufferAttribute
(
normals
,
3
)
);
this
.
addAttribute
(
'
normal
'
,
new
Float32BufferAttribute
(
normals
,
3
)
);
this
.
addAttribute
(
'
uv
'
,
new
Float32BufferAttribute
(
uvs
,
2
)
);
this
.
addAttribute
(
'
uv
'
,
new
Float32BufferAttribute
(
uvs
,
2
)
);
...
...
src/geometries/CircleGeometry.js
浏览文件 @
82f3310e
...
@@ -106,7 +106,7 @@ function CircleBufferGeometry( radius, segments, thetaStart, thetaLength ) {
...
@@ -106,7 +106,7 @@ function CircleBufferGeometry( radius, segments, thetaStart, thetaLength ) {
// build geometry
// build geometry
this
.
setIndex
(
new
(
ind
ices
.
length
>
65535
?
Uint32BufferAttribute
:
Uint16BufferAttribute
)(
indices
,
1
)
);
this
.
setIndex
(
new
(
vert
ices
.
length
>
65535
?
Uint32BufferAttribute
:
Uint16BufferAttribute
)(
indices
,
1
)
);
this
.
addAttribute
(
'
position
'
,
new
Float32BufferAttribute
(
vertices
,
3
)
);
this
.
addAttribute
(
'
position
'
,
new
Float32BufferAttribute
(
vertices
,
3
)
);
this
.
addAttribute
(
'
normal
'
,
new
Float32BufferAttribute
(
normals
,
3
)
);
this
.
addAttribute
(
'
normal
'
,
new
Float32BufferAttribute
(
normals
,
3
)
);
this
.
addAttribute
(
'
uv
'
,
new
Float32BufferAttribute
(
uvs
,
2
)
);
this
.
addAttribute
(
'
uv
'
,
new
Float32BufferAttribute
(
uvs
,
2
)
);
...
...
src/geometries/CylinderGeometry.js
浏览文件 @
82f3310e
...
@@ -96,7 +96,7 @@ function CylinderBufferGeometry( radiusTop, radiusBottom, height, radialSegments
...
@@ -96,7 +96,7 @@ function CylinderBufferGeometry( radiusTop, radiusBottom, height, radialSegments
// build geometry
// build geometry
this
.
setIndex
(
new
(
ind
ices
.
length
>
65535
?
Uint32BufferAttribute
:
Uint16BufferAttribute
)(
indices
,
1
)
);
this
.
setIndex
(
new
(
vert
ices
.
length
>
65535
?
Uint32BufferAttribute
:
Uint16BufferAttribute
)(
indices
,
1
)
);
this
.
addAttribute
(
'
position
'
,
new
Float32BufferAttribute
(
vertices
,
3
)
);
this
.
addAttribute
(
'
position
'
,
new
Float32BufferAttribute
(
vertices
,
3
)
);
this
.
addAttribute
(
'
normal
'
,
new
Float32BufferAttribute
(
normals
,
3
)
);
this
.
addAttribute
(
'
normal
'
,
new
Float32BufferAttribute
(
normals
,
3
)
);
this
.
addAttribute
(
'
uv
'
,
new
Float32BufferAttribute
(
uvs
,
2
)
);
this
.
addAttribute
(
'
uv
'
,
new
Float32BufferAttribute
(
uvs
,
2
)
);
...
...
src/geometries/LatheGeometry.js
浏览文件 @
82f3310e
...
@@ -135,7 +135,7 @@ function LatheBufferGeometry( points, segments, phiStart, phiLength ) {
...
@@ -135,7 +135,7 @@ function LatheBufferGeometry( points, segments, phiStart, phiLength ) {
// build geometry
// build geometry
this
.
setIndex
(
new
(
ind
ices
.
length
>
65535
?
Uint32BufferAttribute
:
Uint16BufferAttribute
)(
indices
,
1
)
);
this
.
setIndex
(
new
(
vert
ices
.
length
>
65535
?
Uint32BufferAttribute
:
Uint16BufferAttribute
)(
indices
,
1
)
);
this
.
addAttribute
(
'
position
'
,
new
Float32BufferAttribute
(
vertices
,
3
)
);
this
.
addAttribute
(
'
position
'
,
new
Float32BufferAttribute
(
vertices
,
3
)
);
this
.
addAttribute
(
'
uv
'
,
new
Float32BufferAttribute
(
uvs
,
2
)
);
this
.
addAttribute
(
'
uv
'
,
new
Float32BufferAttribute
(
uvs
,
2
)
);
...
...
src/geometries/ParametricGeometry.js
浏览文件 @
82f3310e
...
@@ -100,7 +100,7 @@ function ParametricBufferGeometry( func, slices, stacks ) {
...
@@ -100,7 +100,7 @@ function ParametricBufferGeometry( func, slices, stacks ) {
// build geometry
// build geometry
this
.
setIndex
(
new
(
ind
ices
.
length
>
65535
?
Uint32BufferAttribute
:
Uint16BufferAttribute
)(
indices
,
1
)
);
this
.
setIndex
(
new
(
vert
ices
.
length
>
65535
?
Uint32BufferAttribute
:
Uint16BufferAttribute
)(
indices
,
1
)
);
this
.
addAttribute
(
'
position
'
,
new
Float32BufferAttribute
(
vertices
,
3
)
);
this
.
addAttribute
(
'
position
'
,
new
Float32BufferAttribute
(
vertices
,
3
)
);
this
.
addAttribute
(
'
uv
'
,
new
Float32BufferAttribute
(
uvs
,
2
)
);
this
.
addAttribute
(
'
uv
'
,
new
Float32BufferAttribute
(
uvs
,
2
)
);
...
...
src/geometries/PlaneGeometry.js
浏览文件 @
82f3310e
...
@@ -112,7 +112,7 @@ function PlaneBufferGeometry( width, height, widthSegments, heightSegments ) {
...
@@ -112,7 +112,7 @@ function PlaneBufferGeometry( width, height, widthSegments, heightSegments ) {
// build geometry
// build geometry
this
.
setIndex
(
new
(
ind
ices
.
length
>
65535
?
Uint32BufferAttribute
:
Uint16BufferAttribute
)(
indices
,
1
)
);
this
.
setIndex
(
new
(
vert
ices
.
length
>
65535
?
Uint32BufferAttribute
:
Uint16BufferAttribute
)(
indices
,
1
)
);
this
.
addAttribute
(
'
position
'
,
new
Float32BufferAttribute
(
vertices
,
3
)
);
this
.
addAttribute
(
'
position
'
,
new
Float32BufferAttribute
(
vertices
,
3
)
);
this
.
addAttribute
(
'
normal
'
,
new
Float32BufferAttribute
(
normals
,
3
)
);
this
.
addAttribute
(
'
normal
'
,
new
Float32BufferAttribute
(
normals
,
3
)
);
this
.
addAttribute
(
'
uv
'
,
new
Float32BufferAttribute
(
uvs
,
2
)
);
this
.
addAttribute
(
'
uv
'
,
new
Float32BufferAttribute
(
uvs
,
2
)
);
...
...
src/geometries/RingGeometry.js
浏览文件 @
82f3310e
...
@@ -137,7 +137,7 @@ function RingBufferGeometry( innerRadius, outerRadius, thetaSegments, phiSegment
...
@@ -137,7 +137,7 @@ function RingBufferGeometry( innerRadius, outerRadius, thetaSegments, phiSegment
// build geometry
// build geometry
this
.
setIndex
(
new
(
ind
ices
.
length
>
65535
?
Uint32BufferAttribute
:
Uint16BufferAttribute
)(
indices
,
1
)
);
this
.
setIndex
(
new
(
vert
ices
.
length
>
65535
?
Uint32BufferAttribute
:
Uint16BufferAttribute
)(
indices
,
1
)
);
this
.
addAttribute
(
'
position
'
,
new
Float32BufferAttribute
(
vertices
,
3
)
);
this
.
addAttribute
(
'
position
'
,
new
Float32BufferAttribute
(
vertices
,
3
)
);
this
.
addAttribute
(
'
normal
'
,
new
Float32BufferAttribute
(
normals
,
3
)
);
this
.
addAttribute
(
'
normal
'
,
new
Float32BufferAttribute
(
normals
,
3
)
);
this
.
addAttribute
(
'
uv
'
,
new
Float32BufferAttribute
(
uvs
,
2
)
);
this
.
addAttribute
(
'
uv
'
,
new
Float32BufferAttribute
(
uvs
,
2
)
);
...
...
src/geometries/ShapeGeometry.js
浏览文件 @
82f3310e
...
@@ -87,7 +87,7 @@ function ShapeBufferGeometry( shapes, curveSegments ) {
...
@@ -87,7 +87,7 @@ function ShapeBufferGeometry( shapes, curveSegments ) {
// build geometry
// build geometry
this
.
setIndex
(
new
(
ind
ices
.
length
>
65535
?
Uint32BufferAttribute
:
Uint16BufferAttribute
)(
indices
,
1
)
);
this
.
setIndex
(
new
(
vert
ices
.
length
>
65535
?
Uint32BufferAttribute
:
Uint16BufferAttribute
)(
indices
,
1
)
);
this
.
addAttribute
(
'
position
'
,
new
Float32BufferAttribute
(
vertices
,
3
)
);
this
.
addAttribute
(
'
position
'
,
new
Float32BufferAttribute
(
vertices
,
3
)
);
this
.
addAttribute
(
'
normal
'
,
new
Float32BufferAttribute
(
normals
,
3
)
);
this
.
addAttribute
(
'
normal
'
,
new
Float32BufferAttribute
(
normals
,
3
)
);
this
.
addAttribute
(
'
uv
'
,
new
Float32BufferAttribute
(
uvs
,
2
)
);
this
.
addAttribute
(
'
uv
'
,
new
Float32BufferAttribute
(
uvs
,
2
)
);
...
...
src/geometries/SphereGeometry.js
浏览文件 @
82f3310e
...
@@ -137,7 +137,7 @@ function SphereBufferGeometry( radius, widthSegments, heightSegments, phiStart,
...
@@ -137,7 +137,7 @@ function SphereBufferGeometry( radius, widthSegments, heightSegments, phiStart,
// build geometry
// build geometry
this
.
setIndex
(
new
(
ind
ices
.
length
>
65535
?
Uint32BufferAttribute
:
Uint16BufferAttribute
)(
indices
,
1
)
);
this
.
setIndex
(
new
(
vert
ices
.
length
>
65535
?
Uint32BufferAttribute
:
Uint16BufferAttribute
)(
indices
,
1
)
);
this
.
addAttribute
(
'
position
'
,
new
Float32BufferAttribute
(
vertices
,
3
)
);
this
.
addAttribute
(
'
position
'
,
new
Float32BufferAttribute
(
vertices
,
3
)
);
this
.
addAttribute
(
'
normal
'
,
new
Float32BufferAttribute
(
normals
,
3
)
);
this
.
addAttribute
(
'
normal
'
,
new
Float32BufferAttribute
(
normals
,
3
)
);
this
.
addAttribute
(
'
uv
'
,
new
Float32BufferAttribute
(
uvs
,
2
)
);
this
.
addAttribute
(
'
uv
'
,
new
Float32BufferAttribute
(
uvs
,
2
)
);
...
...
src/geometries/TorusGeometry.js
浏览文件 @
82f3310e
...
@@ -128,7 +128,7 @@ function TorusBufferGeometry( radius, tube, radialSegments, tubularSegments, arc
...
@@ -128,7 +128,7 @@ function TorusBufferGeometry( radius, tube, radialSegments, tubularSegments, arc
// build geometry
// build geometry
this
.
setIndex
(
new
(
ind
ices
.
length
>
65535
?
Uint32BufferAttribute
:
Uint16BufferAttribute
)(
indices
,
1
)
);
this
.
setIndex
(
new
(
vert
ices
.
length
>
65535
?
Uint32BufferAttribute
:
Uint16BufferAttribute
)(
indices
,
1
)
);
this
.
addAttribute
(
'
position
'
,
new
Float32BufferAttribute
(
vertices
,
3
)
);
this
.
addAttribute
(
'
position
'
,
new
Float32BufferAttribute
(
vertices
,
3
)
);
this
.
addAttribute
(
'
normal
'
,
new
Float32BufferAttribute
(
normals
,
3
)
);
this
.
addAttribute
(
'
normal
'
,
new
Float32BufferAttribute
(
normals
,
3
)
);
this
.
addAttribute
(
'
uv
'
,
new
Float32BufferAttribute
(
uvs
,
2
)
);
this
.
addAttribute
(
'
uv
'
,
new
Float32BufferAttribute
(
uvs
,
2
)
);
...
...
src/geometries/TorusKnotGeometry.js
浏览文件 @
82f3310e
...
@@ -166,7 +166,7 @@ function TorusKnotBufferGeometry( radius, tube, tubularSegments, radialSegments,
...
@@ -166,7 +166,7 @@ function TorusKnotBufferGeometry( radius, tube, tubularSegments, radialSegments,
// build geometry
// build geometry
this
.
setIndex
(
new
(
ind
ices
.
length
>
65535
?
Uint32BufferAttribute
:
Uint16BufferAttribute
)(
indices
,
1
)
);
this
.
setIndex
(
new
(
vert
ices
.
length
>
65535
?
Uint32BufferAttribute
:
Uint16BufferAttribute
)(
indices
,
1
)
);
this
.
addAttribute
(
'
position
'
,
new
Float32BufferAttribute
(
vertices
,
3
)
);
this
.
addAttribute
(
'
position
'
,
new
Float32BufferAttribute
(
vertices
,
3
)
);
this
.
addAttribute
(
'
normal
'
,
new
Float32BufferAttribute
(
normals
,
3
)
);
this
.
addAttribute
(
'
normal
'
,
new
Float32BufferAttribute
(
normals
,
3
)
);
this
.
addAttribute
(
'
uv
'
,
new
Float32BufferAttribute
(
uvs
,
2
)
);
this
.
addAttribute
(
'
uv
'
,
new
Float32BufferAttribute
(
uvs
,
2
)
);
...
...
src/geometries/TubeGeometry.js
浏览文件 @
82f3310e
...
@@ -101,7 +101,7 @@ function TubeBufferGeometry( path, tubularSegments, radius, radialSegments, clos
...
@@ -101,7 +101,7 @@ function TubeBufferGeometry( path, tubularSegments, radius, radialSegments, clos
// build geometry
// build geometry
this
.
setIndex
(
new
(
ind
ices
.
length
>
65535
?
Uint32BufferAttribute
:
Uint16BufferAttribute
)(
indices
,
1
)
);
this
.
setIndex
(
new
(
vert
ices
.
length
>
65535
?
Uint32BufferAttribute
:
Uint16BufferAttribute
)(
indices
,
1
)
);
this
.
addAttribute
(
'
position
'
,
new
Float32BufferAttribute
(
vertices
,
3
)
);
this
.
addAttribute
(
'
position
'
,
new
Float32BufferAttribute
(
vertices
,
3
)
);
this
.
addAttribute
(
'
normal
'
,
new
Float32BufferAttribute
(
normals
,
3
)
);
this
.
addAttribute
(
'
normal
'
,
new
Float32BufferAttribute
(
normals
,
3
)
);
this
.
addAttribute
(
'
uv
'
,
new
Float32BufferAttribute
(
uvs
,
2
)
);
this
.
addAttribute
(
'
uv
'
,
new
Float32BufferAttribute
(
uvs
,
2
)
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录