Ver Fonte

Editor: Made Loader a property of Editor and slight refactoring.

Mr.doob há 12 anos atrás
pai
commit
a7a45902cf
3 ficheiros alterados com 14 adições e 12 exclusões
  1. 1 3
      editor/index.html
  2. 2 0
      editor/js/Editor.js
  3. 11 9
      editor/js/Loader.js

+ 1 - 3
editor/index.html

@@ -151,8 +151,6 @@
 
 			var editor = new Editor();
 
-			var loader = new Loader( editor );
-
 			var viewport = new Viewport( editor );
 			viewport.setTop( '32px' );
 			viewport.setLeft( '0px' );
@@ -216,7 +214,7 @@
 				
 			} else {
 
-				loader.loadLocalStorage();
+				editor.loader.loadLocalStorage();
 
 			}
 

+ 2 - 0
editor/js/Editor.js

@@ -33,6 +33,8 @@ var Editor = function () {
 
 	};
 
+	this.loader = new Loader( this );
+
 	this.scene = new THREE.Scene();
 	this.sceneHelpers = new THREE.Scene();
 

+ 11 - 9
editor/js/Loader.js

@@ -13,14 +13,7 @@ var Loader = function ( editor ) {
 	document.addEventListener( 'drop', function ( event ) {
 
 		event.preventDefault();
-
-		var file = event.dataTransfer.files[ 0 ];
-
-		var chunks = file.name.split( '.' );
-		var extension = chunks.pop().toLowerCase();
-		var filename = chunks.join( '.' );
-
-		scope.parseFile( file, filename, extension );
+		scope.loadFile( event.dataTransfer.files[ 0 ] );
 
 	}, false );
 
@@ -57,7 +50,10 @@ var Loader = function ( editor ) {
 	signals.objectChanged.add( this.saveLocalStorage );
 	signals.objectRemoved.add( this.saveLocalStorage );
 
-	this.parseFile = function ( file, filename, extension ) {
+	this.loadFile = function ( file ) {
+
+		var filename = file.name;
+		var extension = filename.split( '.' ).pop().toLowerCase();
 
 		switch ( extension ) {
 
@@ -306,6 +302,12 @@ var Loader = function ( editor ) {
 
 				break;
 
+			default:
+
+				alert( 'Unsupported file format.' );
+
+				break;
+
 		}
 
 	}