Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
08f1038d
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,发现更多精彩内容 >>
提交
08f1038d
编写于
6月 03, 2013
作者:
M
Mr.doob
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Third go at LoadingManager. See #3442.
上级
fdac67c2
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
123 addition
and
76 deletion
+123
-76
examples/canvas_geometry_earth.html
examples/canvas_geometry_earth.html
+9
-6
examples/js/loaders/OBJLoader.js
examples/js/loaders/OBJLoader.js
+5
-8
examples/webgl_loader_obj.html
examples/webgl_loader_obj.html
+6
-4
src/loaders/GeometryLoader.js
src/loaders/GeometryLoader.js
+10
-33
src/loaders/ImageLoader.js
src/loaders/ImageLoader.js
+7
-3
src/loaders/LoadingManager.js
src/loaders/LoadingManager.js
+3
-8
src/loaders/MaterialLoader.js
src/loaders/MaterialLoader.js
+10
-6
src/loaders/TextureLoader.js
src/loaders/TextureLoader.js
+10
-8
src/loaders/XHRLoader.js
src/loaders/XHRLoader.js
+62
-0
utils/build/includes/common.json
utils/build/includes/common.json
+1
-0
未找到文件。
examples/canvas_geometry_earth.html
浏览文件 @
08f1038d
...
...
@@ -54,7 +54,7 @@
container
=
document
.
getElementById
(
'
container
'
);
camera
=
new
THREE
.
PerspectiveCamera
(
60
,
window
.
innerWidth
/
window
.
innerHeight
,
1
,
10
000
);
camera
=
new
THREE
.
PerspectiveCamera
(
60
,
window
.
innerWidth
/
window
.
innerHeight
,
1
,
2
000
);
camera
.
position
.
z
=
500
;
scene
=
new
THREE
.
Scene
();
...
...
@@ -64,13 +64,16 @@
// earth
var
texture
=
new
THREE
.
TextureLoader
().
load
(
'
textures/land_ocean_ice_cloud_2048.jpg
'
);
var
loader
=
new
THREE
.
TextureLoader
();
loader
.
load
(
'
textures/land_ocean_ice_cloud_2048.jpg
'
,
function
(
texture
)
{
var
geometry
=
new
THREE
.
SphereGeometry
(
200
,
20
,
20
);
var
material
=
new
THREE
.
MeshBasicMaterial
(
{
map
:
texture
,
overdraw
:
true
}
);
var
geometry
=
new
THREE
.
SphereGeometry
(
200
,
20
,
20
);
var
mesh
=
new
THREE
.
Mesh
(
geometry
,
material
);
group
.
add
(
mesh
);
var
material
=
new
THREE
.
MeshBasicMaterial
(
{
map
:
texture
,
overdraw
:
true
}
);
var
mesh
=
new
THREE
.
Mesh
(
geometry
,
material
);
group
.
add
(
mesh
);
}
);
// shadow
...
...
examples/js/loaders/OBJLoader.js
浏览文件 @
08f1038d
...
...
@@ -12,18 +12,15 @@ THREE.OBJLoader.prototype = {
constructor
:
THREE
.
OBJLoader
,
load
:
function
(
url
,
callback
)
{
load
:
function
(
url
,
onLoad
,
onProgress
,
onError
)
{
var
scope
=
this
;
this
.
manager
.
add
(
url
,
'
text
'
,
function
(
event
)
{
var
loader
=
new
THREE
.
XHRLoader
();
loader
.
setCrossOrigin
(
this
.
crossOrigin
);
loader
.
load
(
url
,
function
(
text
)
{
if
(
callback
!==
undefined
)
{
var
geometry
=
scope
.
parse
(
event
.
target
.
responseText
);
callback
(
geometry
);
}
onLoad
(
scope
.
parse
(
text
)
);
}
);
...
...
examples/webgl_loader_obj.html
浏览文件 @
08f1038d
...
...
@@ -74,16 +74,18 @@
// texture
var
manager
=
new
THREE
.
LoadingManager
();
manager
.
addEventListener
(
'
load
'
,
function
(
event
)
{
/*
manager.onLoad( function () {
console
.
log
(
'
loading
'
,
event
.
loaded
/
event
.
total
);
console.log( 'loading
complete'
);
} );
manager
.
addEventListener
(
'
complete
'
,
function
(
event
)
{
manager.
onProgress(
function ( event ) {
console
.
log
(
'
loading
complete
'
);
console.log( 'loading
', event.loaded / event.total
);
} );
*/
var
texture
=
new
THREE
.
Texture
();
...
...
src/loaders/GeometryLoader.js
浏览文件 @
08f1038d
...
...
@@ -2,9 +2,9 @@
* @author mrdoob / http://mrdoob.com/
*/
THREE
.
GeometryLoader
=
function
(
crossOrigin
)
{
THREE
.
GeometryLoader
=
function
(
manager
)
{
this
.
crossOrigin
=
crossOrigin
;
this
.
manager
=
(
manager
!==
undefined
)
?
manager
:
THREE
.
DefaultLoadingManager
;
};
...
...
@@ -16,42 +16,19 @@ THREE.GeometryLoader.prototype = {
var
scope
=
this
;
var
request
=
new
XMLHttpRequest
();
var
loader
=
new
THREE
.
XHRLoader
();
loader
.
setCrossOrigin
(
this
.
crossOrigin
);
loader
.
load
(
url
,
function
(
text
)
{
if
(
onLoad
!==
undefined
)
{
onLoad
(
scope
.
parse
(
JSON
.
parse
(
text
)
)
);
request
.
addEventListener
(
'
load
'
,
function
(
event
)
{
}
);
onLoad
(
scope
.
parse
(
JSON
.
parse
(
event
.
target
.
responseText
)
)
);
},
false
);
}
if
(
onProgress
!==
undefined
)
{
request
.
addEventListener
(
'
progress
'
,
function
(
event
)
{
onProgress
(
event
);
},
false
);
}
if
(
onError
!==
undefined
)
{
request
.
addEventListener
(
'
error
'
,
function
(
event
)
{
onError
(
event
);
},
false
);
}
},
if
(
this
.
crossOrigin
!==
undefined
)
request
.
crossOrigin
=
this
.
crossOrigin
;
setCrossOrigin
:
function
(
value
)
{
request
.
open
(
'
GET
'
,
url
,
true
);
request
.
send
(
null
);
this
.
crossOrigin
=
value
;
},
...
...
src/loaders/ImageLoader.js
浏览文件 @
08f1038d
...
...
@@ -2,9 +2,9 @@
* @author mrdoob / http://mrdoob.com/
*/
THREE
.
ImageLoader
=
function
(
crossOrigin
)
{
THREE
.
ImageLoader
=
function
(
manager
)
{
this
.
crossOrigin
=
crossOrigin
;
this
.
manager
=
(
manager
!==
undefined
)
?
manager
:
THREE
.
DefaultLoadingManager
;
};
...
...
@@ -50,7 +50,11 @@ THREE.ImageLoader.prototype = {
image
.
src
=
url
;
return
image
;
},
setCrossOrigin
:
function
(
value
)
{
this
.
crossOrigin
=
value
;
}
...
...
src/loaders/LoadingManager.js
浏览文件 @
08f1038d
...
...
@@ -74,13 +74,12 @@ THREE.LoadingManager = function ( onLoad, onProgress, onError ) {
};
this
.
add
=
function
(
url
,
type
,
onLoad
,
onProgress
,
onError
)
{
this
.
add
=
function
(
url
,
onLoad
,
onProgress
,
onError
)
{
total
++
;
queue
.
push
(
{
url
:
url
,
type
:
type
,
onLoad
:
onLoad
,
onProgress
:
onProgress
,
onError
:
onError
...
...
@@ -90,10 +89,6 @@ THREE.LoadingManager = function ( onLoad, onProgress, onError ) {
};
this
.
addLoader
=
function
(
type
,
loader
)
{
loaders
[
type
]
=
loader
;
};
};
THREE
.
DefaultLoadingManager
=
new
THREE
.
LoadingManager
();
src/loaders/MaterialLoader.js
浏览文件 @
08f1038d
...
...
@@ -12,19 +12,23 @@ THREE.MaterialLoader.prototype = {
constructor
:
THREE
.
MaterialLoader
,
load
:
function
(
url
,
callback
)
{
load
:
function
(
url
,
onLoad
,
onProgress
,
onError
)
{
var
scope
=
this
;
this
.
manager
.
add
(
url
,
'
text
'
,
function
(
event
)
{
var
loader
=
new
THREE
.
XHRLoader
();
loader
.
setCrossOrigin
(
this
.
crossOrigin
);
loader
.
load
(
url
,
function
(
text
)
{
if
(
callback
!==
undefined
)
{
onLoad
(
scope
.
parse
(
JSON
.
parse
(
text
)
)
);
callback
(
scope
.
parse
(
JSON
.
parse
(
event
.
target
.
responseText
)
)
);
}
);
},
}
setCrossOrigin
:
function
(
value
)
{
}
)
;
this
.
crossOrigin
=
value
;
},
...
...
src/loaders/TextureLoader.js
浏览文件 @
08f1038d
...
...
@@ -2,9 +2,9 @@
* @author mrdoob / http://mrdoob.com/
*/
THREE
.
TextureLoader
=
function
(
crossOrigin
)
{
THREE
.
TextureLoader
=
function
(
manager
)
{
this
.
crossOrigin
=
crossOrigin
;
this
.
manager
=
(
manager
!==
undefined
)
?
manager
:
THREE
.
DefaultLoadingManager
;
};
...
...
@@ -12,15 +12,13 @@ THREE.TextureLoader.prototype = {
constructor
:
THREE
.
TextureLoader
,
load
:
function
(
url
,
onLoad
)
{
var
texture
=
new
THREE
.
Texture
();
load
:
function
(
url
,
onLoad
,
onProgress
,
onError
)
{
var
loader
=
new
THREE
.
ImageLoader
();
loader
.
crossOrigin
=
this
.
crossOrigin
;
loader
.
setCrossOrigin
(
this
.
crossOrigin
)
;
loader
.
load
(
url
,
function
(
image
)
{
texture
.
image
=
image
;
var
texture
=
new
THREE
.
Texture
(
image
)
;
texture
.
needsUpdate
=
true
;
if
(
onLoad
!==
undefined
)
{
...
...
@@ -31,7 +29,11 @@ THREE.TextureLoader.prototype = {
}
);
return
texture
;
},
setCrossOrigin
:
function
(
value
)
{
this
.
crossOrigin
=
value
;
}
...
...
src/loaders/XHRLoader.js
0 → 100644
浏览文件 @
08f1038d
/**
* @author mrdoob / http://mrdoob.com/
*/
THREE
.
XHRLoader
=
function
(
manager
)
{
this
.
manager
=
(
manager
!==
undefined
)
?
manager
:
THREE
.
DefaultLoadingManager
;
};
THREE
.
XHRLoader
.
prototype
=
{
constructor
:
THREE
.
XHRLoader
,
load
:
function
(
url
,
onLoad
,
onProgress
,
onError
)
{
var
request
=
new
XMLHttpRequest
();
if
(
onLoad
!==
undefined
)
{
request
.
addEventListener
(
'
load
'
,
function
(
event
)
{
onLoad
(
event
.
target
.
responseText
);
},
false
);
}
if
(
onProgress
!==
undefined
)
{
request
.
addEventListener
(
'
progress
'
,
function
(
event
)
{
onProgress
(
event
);
},
false
);
}
if
(
onError
!==
undefined
)
{
request
.
addEventListener
(
'
error
'
,
function
(
event
)
{
onError
(
event
);
},
false
);
}
if
(
this
.
crossOrigin
!==
undefined
)
request
.
crossOrigin
=
this
.
crossOrigin
;
request
.
open
(
'
GET
'
,
url
,
true
);
request
.
send
(
null
);
},
setCrossOrigin
:
function
(
value
)
{
this
.
crossOrigin
=
value
;
}
};
utils/build/includes/common.json
浏览文件 @
08f1038d
...
...
@@ -39,6 +39,7 @@
"src/lights/PointLight.js"
,
"src/lights/SpotLight.js"
,
"src/loaders/Loader.js"
,
"src/loaders/XHRLoader.js"
,
"src/loaders/ImageLoader.js"
,
"src/loaders/JSONLoader.js"
,
"src/loaders/LoadingManager.js"
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录