xzw 3 tahun lalu
induk
melakukan
cea682b3f1
2 mengubah file dengan 10 tambahan dan 5 penghapusan
  1. 9 4
      js/edit.js
  2. 1 1
      js/manage.js

+ 9 - 4
js/edit.js

@@ -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) 

+ 1 - 1
js/manage.js

@@ -139,7 +139,7 @@ var toPrecision = function(e, t) {
 var dealMap = (map)=>{//使不resize  when   image is not power of two
     map.wrapS = map.wrapT = THREE.ClampToEdgeWrapping;
     map.minFilter = THREE.LinearFilter;
-    map.magFilter = THREE.LinearFilter;
+    //map.magFilter = THREE.LinearFilter;
     map.generateMipmaps = true;  
     
 }