From 7891f2b33b5908fcbc171a234aa1473fe3baa828 Mon Sep 17 00:00:00 2001
From: "Mr.doob" <info@mrdoob.com>
Date: Sat, 8 Oct 2011 00:21:13 +0200
Subject: [PATCH] JSONLoader.load( parameters ) to JSONLoader( url, callback,
 texturePath )

---
 src/extras/loaders/JSONLoader.js | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/extras/loaders/JSONLoader.js b/src/extras/loaders/JSONLoader.js
index ef371053..bc36fa73 100644
--- a/src/extras/loaders/JSONLoader.js
+++ b/src/extras/loaders/JSONLoader.js
@@ -14,25 +14,27 @@ THREE.JSONLoader.prototype.constructor = THREE.JSONLoader;
 THREE.JSONLoader.prototype.supr = THREE.Loader.prototype;
 
 
-/**
- * Load models generated by slim OBJ converter with ASCII option (converter_obj_three_slim.py -t ascii)
- *  - parameters
- *  - model (required)
- *  - callback (required)
- *  - texture_path (optional: if not specified, textures will be assumed to be in the same folder as JS model file)
- */
+THREE.JSONLoader.prototype.load = function ( url, callback, texturePath ) {
 
-THREE.JSONLoader.prototype.load = function ( parameters ) {
+	var scope = this, worker;
 
-	var scope = this,
-		url = parameters.model,
-		callback = parameters.callback,
-		texture_path = parameters.texture_path ? parameters.texture_path : this.extractUrlbase( url ),
-		worker = new Worker( url );
+	if ( url instanceof Object ) {
+
+		console.warn( 'DEPRECATED: JSONLoader( parameters ) is now JSONLoader( url, callback, texturePath ).' );
+
+		var object = url;
+		url = object.model;
+		callback = object.callback;
+		texturePath = object.texture_path;
+
+	}
+
+	worker = new Worker( url );
+	texturePath = texturePath ? texturePath : this.extractUrlbase( url ),
 
 	worker.onmessage = function ( event ) {
 
-		scope.createModel( event.data, callback, texture_path );
+		scope.createModel( event.data, callback, texturePath );
 		scope.onLoadComplete();
 
 	};