Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
f9514c2a
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,发现更多精彩内容 >>
提交
f9514c2a
编写于
9月 06, 2016
作者:
M
Mr.doob
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ObjectLoader: Removed CoreGeometry. See #9539.
上级
2d757261
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
16 addition
and
23 deletion
+16
-23
src/Three.js
src/Three.js
+4
-2
src/core/Geometries.js
src/core/Geometries.js
+0
-4
src/loaders/ObjectLoader.js
src/loaders/ObjectLoader.js
+12
-17
未找到文件。
src/Three.js
浏览文件 @
f9514c2a
...
...
@@ -78,8 +78,10 @@ export { AnimationObjectGroup } from './animation/AnimationObjectGroup.js';
export
{
AnimationMixer
}
from
'
./animation/AnimationMixer.js
'
;
export
{
AnimationClip
}
from
'
./animation/AnimationClip.js
'
;
export
{
Uniform
}
from
'
./core/Uniform.js
'
;
export
*
from
'
./core/Geometries.js
'
;
export
{
GeometryIdCount
}
from
'
./core/Geometry.js
'
;
export
{
InstancedBufferGeometry
}
from
'
./core/InstancedBufferGeometry.js
'
;
export
{
BufferGeometry
}
from
'
./core/BufferGeometry.js
'
;
export
{
DirectGeometry
}
from
'
./core/DirectGeometry.js
'
;
export
{
GeometryIdCount
,
Geometry
}
from
'
./core/Geometry.js
'
;
export
{
InterleavedBufferAttribute
}
from
'
./core/InterleavedBufferAttribute.js
'
;
export
{
InstancedInterleavedBuffer
}
from
'
./core/InstancedInterleavedBuffer.js
'
;
export
{
InterleavedBuffer
}
from
'
./core/InterleavedBuffer.js
'
;
...
...
src/core/Geometries.js
已删除
100644 → 0
浏览文件 @
2d757261
export
{
InstancedBufferGeometry
}
from
'
./InstancedBufferGeometry.js
'
;
export
{
BufferGeometry
}
from
'
./BufferGeometry.js
'
;
export
{
DirectGeometry
}
from
'
./DirectGeometry.js
'
;
export
{
Geometry
}
from
'
./Geometry.js
'
;
src/loaders/ObjectLoader.js
浏览文件 @
f9514c2a
...
...
@@ -28,17 +28,12 @@ import { MaterialLoader } from './MaterialLoader';
import
{
BufferGeometryLoader
}
from
'
./BufferGeometryLoader
'
;
import
{
JSONLoader
}
from
'
./JSONLoader
'
;
import
{
XHRLoader
}
from
'
./XHRLoader
'
;
import
*
as
CoreGeometry
from
'
../core/Geometries
'
;
import
*
as
ExtraGeometry
from
'
../extras/geometries/Geometries
'
;
import
*
as
Geometry
from
'
../extras/geometries/Geometries
'
;
/**
* @author mrdoob / http://mrdoob.com/
*/
function
resolveGeometryType
(
type
)
{
return
CoreGeometry
[
type
]
||
ExtraGeometry
[
type
];
}
function
ObjectLoader
(
manager
)
{
this
.
manager
=
(
manager
!==
undefined
)
?
manager
:
DefaultLoadingManager
;
...
...
@@ -129,7 +124,7 @@ Object.assign( ObjectLoader.prototype, {
case
'
PlaneGeometry
'
:
case
'
PlaneBufferGeometry
'
:
geometry
=
new
(
resolveGeometryType
(
data
.
type
))
(
geometry
=
new
Geometry
[
data
.
type
]
(
data
.
width
,
data
.
height
,
data
.
widthSegments
,
...
...
@@ -142,7 +137,7 @@ Object.assign( ObjectLoader.prototype, {
case
'
BoxBufferGeometry
'
:
case
'
CubeGeometry
'
:
// backwards compatible
geometry
=
new
(
resolveGeometryType
(
data
.
type
))
(
geometry
=
new
Geometry
[
data
.
type
]
(
data
.
width
,
data
.
height
,
data
.
depth
,
...
...
@@ -156,7 +151,7 @@ Object.assign( ObjectLoader.prototype, {
case
'
CircleGeometry
'
:
case
'
CircleBufferGeometry
'
:
geometry
=
new
(
resolveGeometryType
(
data
.
type
))
(
geometry
=
new
Geometry
[
data
.
type
]
(
data
.
radius
,
data
.
segments
,
data
.
thetaStart
,
...
...
@@ -168,7 +163,7 @@ Object.assign( ObjectLoader.prototype, {
case
'
CylinderGeometry
'
:
case
'
CylinderBufferGeometry
'
:
geometry
=
new
(
resolveGeometryType
(
data
.
type
))
(
geometry
=
new
Geometry
[
data
.
type
]
(
data
.
radiusTop
,
data
.
radiusBottom
,
data
.
height
,
...
...
@@ -184,7 +179,7 @@ Object.assign( ObjectLoader.prototype, {
case
'
ConeGeometry
'
:
case
'
ConeBufferGeometry
'
:
geometry
=
new
(
resolveGeometryType
(
data
.
type
))
(
geometry
=
new
Geometry
[
data
.
type
]
(
data
.
radius
,
data
.
height
,
data
.
radialSegments
,
...
...
@@ -199,7 +194,7 @@ Object.assign( ObjectLoader.prototype, {
case
'
SphereGeometry
'
:
case
'
SphereBufferGeometry
'
:
geometry
=
new
(
resolveGeometryType
(
data
.
type
))
(
geometry
=
new
Geometry
[
data
.
type
]
(
data
.
radius
,
data
.
widthSegments
,
data
.
heightSegments
,
...
...
@@ -216,7 +211,7 @@ Object.assign( ObjectLoader.prototype, {
case
'
OctahedronGeometry
'
:
case
'
TetrahedronGeometry
'
:
geometry
=
new
(
resolveGeometryType
(
data
.
type
))
(
geometry
=
new
Geometry
[
data
.
type
]
(
data
.
radius
,
data
.
detail
);
...
...
@@ -226,7 +221,7 @@ Object.assign( ObjectLoader.prototype, {
case
'
RingGeometry
'
:
case
'
RingBufferGeometry
'
:
geometry
=
new
(
resolveGeometryType
(
data
.
type
))
(
geometry
=
new
Geometry
[
data
.
type
]
(
data
.
innerRadius
,
data
.
outerRadius
,
data
.
thetaSegments
,
...
...
@@ -240,7 +235,7 @@ Object.assign( ObjectLoader.prototype, {
case
'
TorusGeometry
'
:
case
'
TorusBufferGeometry
'
:
geometry
=
new
(
resolveGeometryType
(
data
.
type
))
(
geometry
=
new
Geometry
[
data
.
type
]
(
data
.
radius
,
data
.
tube
,
data
.
radialSegments
,
...
...
@@ -253,7 +248,7 @@ Object.assign( ObjectLoader.prototype, {
case
'
TorusKnotGeometry
'
:
case
'
TorusKnotBufferGeometry
'
:
geometry
=
new
(
resolveGeometryType
(
data
.
type
))
(
geometry
=
new
Geometry
[
data
.
type
]
(
data
.
radius
,
data
.
tube
,
data
.
tubularSegments
,
...
...
@@ -267,7 +262,7 @@ Object.assign( ObjectLoader.prototype, {
case
'
LatheGeometry
'
:
case
'
LatheBufferGeometry
'
:
geometry
=
new
(
resolveGeometryType
(
data
.
type
))
(
geometry
=
new
Geometry
[
data
.
type
]
(
data
.
points
,
data
.
segments
,
data
.
phiStart
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录