Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
aa42673b
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,发现更多精彩内容 >>
提交
aa42673b
编写于
10月 25, 2015
作者:
M
Mr.doob
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Moved GeometryUtils and ImageUtils to Three.Legacy.
上级
750670cd
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
80 addition
and
88 deletion
+80
-88
src/Three.Legacy.js
src/Three.Legacy.js
+80
-0
src/extras/GeometryUtils.js
src/extras/GeometryUtils.js
+0
-33
src/extras/ImageUtils.js
src/extras/ImageUtils.js
+0
-53
utils/build/includes/extras.json
utils/build/includes/extras.json
+0
-2
未找到文件。
src/Three.Legacy.js
浏览文件 @
aa42673b
...
...
@@ -180,6 +180,86 @@ Object.defineProperties( THREE.WebGLRenderer.prototype, {
//
THREE
.
GeometryUtils
=
{
merge
:
function
(
geometry1
,
geometry2
,
materialIndexOffset
)
{
console
.
warn
(
'
THREE.GeometryUtils: .merge() has been moved to Geometry. Use geometry.merge( geometry2, matrix, materialIndexOffset ) instead.
'
);
var
matrix
;
if
(
geometry2
instanceof
THREE
.
Mesh
)
{
geometry2
.
matrixAutoUpdate
&&
geometry2
.
updateMatrix
();
matrix
=
geometry2
.
matrix
;
geometry2
=
geometry2
.
geometry
;
}
geometry1
.
merge
(
geometry2
,
matrix
,
materialIndexOffset
);
},
center
:
function
(
geometry
)
{
console
.
warn
(
'
THREE.GeometryUtils: .center() has been moved to Geometry. Use geometry.center() instead.
'
);
return
geometry
.
center
();
}
};
THREE
.
ImageUtils
=
{
crossOrigin
:
undefined
,
loadTexture
:
function
(
url
,
mapping
,
onLoad
,
onError
)
{
console
.
warn
(
'
THREE.ImageUtils.loadTexture has been deprecated. Use THREE.TextureLoader() instead.
'
);
var
loader
=
new
THREE
.
TextureLoader
();
loader
.
setCrossOrigin
(
this
.
crossOrigin
);
var
texture
=
loader
.
load
(
url
,
onLoad
,
undefined
,
onError
);
if
(
mapping
)
texture
.
mapping
=
mapping
;
return
texture
;
},
loadTextureCube
:
function
(
urls
,
mapping
,
onLoad
,
onError
)
{
console
.
warn
(
'
THREE.ImageUtils.loadTextureCube has been deprecated. Use THREE.CubeTextureLoader() instead.
'
);
var
loader
=
new
THREE
.
CubeTextureLoader
();
loader
.
setCrossOrigin
(
this
.
crossOrigin
);
var
texture
=
loader
.
load
(
urls
,
onLoad
,
undefined
,
onError
);
if
(
mapping
)
texture
.
mapping
=
mapping
;
return
texture
;
},
loadCompressedTexture
:
function
()
{
console
.
error
(
'
THREE.ImageUtils.loadCompressedTexture has been removed. Use THREE.DDSLoader instead.
'
)
},
loadCompressedTextureCube
:
function
()
{
console
.
error
(
'
THREE.ImageUtils.loadCompressedTextureCube has been removed. Use THREE.DDSLoader instead.
'
)
}
};
//
THREE
.
Projector
=
function
()
{
console
.
error
(
'
THREE.Projector has been moved to /examples/js/renderers/Projector.js.
'
);
...
...
src/extras/GeometryUtils.js
已删除
100644 → 0
浏览文件 @
750670cd
/**
* @author mrdoob / http://mrdoob.com/
*/
THREE
.
GeometryUtils
=
{
merge
:
function
(
geometry1
,
geometry2
,
materialIndexOffset
)
{
console
.
warn
(
'
THREE.GeometryUtils: .merge() has been moved to Geometry. Use geometry.merge( geometry2, matrix, materialIndexOffset ) instead.
'
);
var
matrix
;
if
(
geometry2
instanceof
THREE
.
Mesh
)
{
geometry2
.
matrixAutoUpdate
&&
geometry2
.
updateMatrix
();
matrix
=
geometry2
.
matrix
;
geometry2
=
geometry2
.
geometry
;
}
geometry1
.
merge
(
geometry2
,
matrix
,
materialIndexOffset
);
},
center
:
function
(
geometry
)
{
console
.
warn
(
'
THREE.GeometryUtils: .center() has been moved to Geometry. Use geometry.center() instead.
'
);
return
geometry
.
center
();
}
};
src/extras/ImageUtils.js
已删除
100644 → 0
浏览文件 @
750670cd
/**
* @author alteredq / http://alteredqualia.com/
* @author mrdoob / http://mrdoob.com/
* @author Daosheng Mu / https://github.com/DaoshengMu/
*/
THREE
.
ImageUtils
=
{
crossOrigin
:
undefined
,
loadTexture
:
function
(
url
,
mapping
,
onLoad
,
onError
)
{
console
.
warn
(
'
THREE.ImageUtils.loadTexture is being deprecated. Use THREE.TextureLoader() instead.
'
);
var
loader
=
new
THREE
.
TextureLoader
();
loader
.
setCrossOrigin
(
this
.
crossOrigin
);
var
texture
=
loader
.
load
(
url
,
onLoad
,
undefined
,
onError
);
if
(
mapping
)
texture
.
mapping
=
mapping
;
return
texture
;
},
loadTextureCube
:
function
(
urls
,
mapping
,
onLoad
,
onError
)
{
console
.
warn
(
'
THREE.ImageUtils.loadTextureCube is being deprecated. Use THREE.CubeTextureLoader() instead.
'
);
var
loader
=
new
THREE
.
CubeTextureLoader
();
loader
.
setCrossOrigin
(
this
.
crossOrigin
);
var
texture
=
loader
.
load
(
urls
,
onLoad
,
undefined
,
onError
);
if
(
mapping
)
texture
.
mapping
=
mapping
;
return
texture
;
},
loadCompressedTexture
:
function
()
{
console
.
error
(
'
THREE.ImageUtils.loadCompressedTexture has been removed. Use THREE.DDSLoader instead.
'
)
},
loadCompressedTextureCube
:
function
()
{
console
.
error
(
'
THREE.ImageUtils.loadCompressedTextureCube has been removed. Use THREE.DDSLoader instead.
'
)
}
};
utils/build/includes/extras.json
浏览文件 @
aa42673b
[
"src/extras/CurveUtils.js"
,
"src/extras/GeometryUtils.js"
,
"src/extras/ImageUtils.js"
,
"src/extras/SceneUtils.js"
,
"src/extras/ShapeUtils.js"
,
"src/extras/audio/Audio.js"
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录