Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
2a597765
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,发现更多精彩内容 >>
提交
2a597765
编写于
10月 10, 2014
作者:
M
Mr.doob
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #5423 from vincent/dev
passing event handlers. see #4807 #4803
上级
df876803
86f082b9
变更
13
隐藏空白更改
内联
并排
Showing
13 changed file
with
60 addition
and
19 deletion
+60
-19
examples/js/loaders/AssimpJSONLoader.js
examples/js/loaders/AssimpJSONLoader.js
+1
-1
examples/js/loaders/BabylonLoader.js
examples/js/loaders/BabylonLoader.js
+1
-1
examples/js/loaders/MTLLoader.js
examples/js/loaders/MTLLoader.js
+1
-1
examples/js/loaders/OBJLoader.js
examples/js/loaders/OBJLoader.js
+1
-1
examples/js/loaders/OBJMTLLoader.js
examples/js/loaders/OBJMTLLoader.js
+2
-2
examples/js/loaders/PDBLoader.js
examples/js/loaders/PDBLoader.js
+2
-2
examples/js/loaders/SVGLoader.js
examples/js/loaders/SVGLoader.js
+2
-2
examples/js/loaders/SceneLoader.js
examples/js/loaders/SceneLoader.js
+1
-1
examples/js/loaders/TGALoader.js
examples/js/loaders/TGALoader.js
+2
-2
examples/webgl_loader_assimp2json.html
examples/webgl_loader_assimp2json.html
+12
-3
examples/webgl_loader_obj.html
examples/webgl_loader_obj.html
+12
-1
examples/webgl_loader_obj_mtl.html
examples/webgl_loader_obj_mtl.html
+12
-1
examples/webgl_loader_pdb.html
examples/webgl_loader_pdb.html
+11
-1
未找到文件。
examples/js/loaders/AssimpJSONLoader.js
浏览文件 @
2a597765
...
...
@@ -53,7 +53,7 @@ THREE.AssimpJSONLoader.prototype = {
scene
=
scope
.
parse
(
json
);
onLoad
(
scene
);
}
);
}
,
onProgress
,
onError
);
},
setCrossOrigin
:
function
(
value
)
{
...
...
examples/js/loaders/BabylonLoader.js
浏览文件 @
2a597765
...
...
@@ -22,7 +22,7 @@ THREE.BabylonLoader.prototype = {
onLoad
(
scope
.
parse
(
JSON
.
parse
(
text
)
)
);
}
);
}
,
onProgress
,
onError
);
},
...
...
examples/js/loaders/MTLLoader.js
浏览文件 @
2a597765
...
...
@@ -26,7 +26,7 @@ THREE.MTLLoader.prototype = {
onLoad
(
scope
.
parse
(
text
)
);
}
);
}
,
onProgress
,
onError
);
},
...
...
examples/js/loaders/OBJLoader.js
浏览文件 @
2a597765
...
...
@@ -22,7 +22,7 @@ THREE.OBJLoader.prototype = {
onLoad
(
scope
.
parse
(
text
)
);
}
);
}
,
onProgress
,
onError
);
},
...
...
examples/js/loaders/OBJMTLLoader.js
浏览文件 @
2a597765
...
...
@@ -45,9 +45,9 @@ THREE.OBJMTLLoader.prototype = {
onLoad
(
object
);
}
);
}
,
onProgress
,
onError
);
}
);
}
,
onProgress
,
onError
);
},
...
...
examples/js/loaders/PDBLoader.js
浏览文件 @
2a597765
...
...
@@ -12,7 +12,7 @@ THREE.PDBLoader.prototype = {
constructor
:
THREE
.
PDBLoader
,
load
:
function
(
url
,
onLoad
)
{
load
:
function
(
url
,
onLoad
,
onProgress
,
onError
)
{
var
scope
=
this
;
...
...
@@ -23,7 +23,7 @@ THREE.PDBLoader.prototype = {
var
json
=
scope
.
parsePDB
(
text
);
scope
.
createModel
(
json
,
onLoad
);
}
);
}
,
onProgress
,
onError
);
},
...
...
examples/js/loaders/SVGLoader.js
浏览文件 @
2a597765
...
...
@@ -25,7 +25,7 @@ THREE.SVGLoader.prototype = {
onLoad
(
doc
.
firstChild
);
}
);
}
,
onProgress
,
onError
);
}
};
\ No newline at end of file
};
examples/js/loaders/SceneLoader.js
浏览文件 @
2a597765
...
...
@@ -32,7 +32,7 @@ THREE.SceneLoader.prototype = {
scope
.
parse
(
JSON
.
parse
(
text
),
onLoad
,
url
);
}
);
}
,
onProgress
,
onError
);
},
...
...
examples/js/loaders/TGALoader.js
浏览文件 @
2a597765
...
...
@@ -9,7 +9,7 @@ THREE.TGALoader.prototype = {
constructor
:
THREE
.
TGALoader
,
load
:
function
(
url
,
onLoad
,
onError
)
{
load
:
function
(
url
,
onLoad
,
on
Progress
,
on
Error
)
{
var
scope
=
this
;
...
...
@@ -24,7 +24,7 @@ THREE.TGALoader.prototype = {
if
(
onLoad
)
onLoad
(
texture
);
}
);
}
,
onProgress
,
onError
);
return
texture
;
...
...
examples/webgl_loader_assimp2json.html
浏览文件 @
2a597765
...
...
@@ -80,6 +80,16 @@
// init scene
init
();
var
onProgress
=
function
(
xhr
)
{
if
(
xhr
.
lengthComputable
)
{
var
percentComplete
=
xhr
.
loaded
/
xhr
.
total
*
100
;
console
.
log
(
Math
.
round
(
percentComplete
,
2
)
+
'
% downloaded
'
);
}
};
var
onError
=
function
(
xhr
)
{
};
// Load jeep model using the AssimpJSONLoader
var
loader1
=
new
THREE
.
AssimpJSONLoader
();
loader1
.
load
(
'
models/assimp/jeep/jeep.assimp.json
'
,
function
(
assimpjson
)
{
...
...
@@ -88,8 +98,7 @@
assimpjson
.
updateMatrix
();
scene
.
add
(
assimpjson
);
}
);
},
onProgress
,
onError
);
// load interior model
var
loader2
=
new
THREE
.
AssimpJSONLoader
();
...
...
@@ -100,7 +109,7 @@
scene
.
add
(
assimpjson
);
}
);
}
,
onProgress
,
onError
);
animate
();
...
...
examples/webgl_loader_obj.html
浏览文件 @
2a597765
...
...
@@ -79,6 +79,17 @@
var
texture
=
new
THREE
.
Texture
();
var
onProgress
=
function
(
xhr
)
{
if
(
xhr
.
lengthComputable
)
{
var
percentComplete
=
xhr
.
loaded
/
xhr
.
total
*
100
;
console
.
log
(
Math
.
round
(
percentComplete
,
2
)
+
'
% downloaded
'
);
}
};
var
onError
=
function
(
xhr
)
{
};
var
loader
=
new
THREE
.
ImageLoader
(
manager
);
loader
.
load
(
'
textures/UV_Grid_Sm.jpg
'
,
function
(
image
)
{
...
...
@@ -105,7 +116,7 @@
object
.
position
.
y
=
-
80
;
scene
.
add
(
object
);
}
);
}
,
onProgress
,
onError
);
//
...
...
examples/webgl_loader_obj_mtl.html
浏览文件 @
2a597765
...
...
@@ -76,6 +76,17 @@
// model
var
onProgress
=
function
(
xhr
)
{
if
(
xhr
.
lengthComputable
)
{
var
percentComplete
=
xhr
.
loaded
/
xhr
.
total
*
100
;
console
.
log
(
Math
.
round
(
percentComplete
,
2
)
+
'
% downloaded
'
);
}
};
var
onError
=
function
(
xhr
)
{
};
THREE
.
Loader
.
Handlers
.
add
(
/
\.
dds$/i
,
new
THREE
.
DDSLoader
()
);
var
loader
=
new
THREE
.
OBJMTLLoader
();
...
...
@@ -84,7 +95,7 @@
object
.
position
.
y
=
-
80
;
scene
.
add
(
object
);
}
);
}
,
onProgress
,
onError
);
//
...
...
examples/webgl_loader_pdb.html
浏览文件 @
2a597765
...
...
@@ -181,6 +181,16 @@
//
var
onProgress
=
function
(
xhr
)
{
if
(
xhr
.
lengthComputable
)
{
var
percentComplete
=
xhr
.
loaded
/
xhr
.
total
*
100
;
console
.
log
(
Math
.
round
(
percentComplete
,
2
)
+
'
% downloaded
'
);
}
};
var
onError
=
function
(
xhr
)
{
};
function
loadMolecule
(
url
)
{
while
(
root
.
children
.
length
>
0
)
{
...
...
@@ -244,7 +254,7 @@
render
();
}
);
}
,
onProgress
,
onError
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录