|
@@ -4712,11 +4712,16 @@ var inputMedia = function(options, type, e) {
|
|
|
if(type == 'model'){
|
|
|
reader.readAsText( file );
|
|
|
}else{
|
|
|
- reader.readAsDataURL(file);
|
|
|
- }
|
|
|
-
|
|
|
+ reader.readAsDataURL(file);//readAsDataURL
|
|
|
+ }//readAsArrayBuffer readAsBinaryString
|
|
|
+ reader.onerror = function(evt) {
|
|
|
+ loadError()
|
|
|
+ }
|
|
|
reader.onload = function(evt) {
|
|
|
-
|
|
|
+ if(!evt.target.result){
|
|
|
+ $('.waiting').removeClass('showloading');
|
|
|
+ return alert('文件出错,可能文件太大')
|
|
|
+ }
|
|
|
if (inputType == "model") {
|
|
|
var object = new THREE.OBJLoader().parse( evt.target.result );
|
|
|
options.modelDone(file, object)
|