|
@@ -53,17 +53,23 @@ THREE.JSONLoader.prototype = {
|
|
|
|
|
|
if ( metadata !== undefined ) {
|
|
|
|
|
|
- if ( metadata.type === 'object' ) {
|
|
|
+ var type = metadata.type;
|
|
|
|
|
|
- console.error( 'THREE.JSONLoader: ' + url + ' should be loaded with THREE.ObjectLoader instead.' );
|
|
|
- return;
|
|
|
+ if ( type !== undefined ) {
|
|
|
|
|
|
- }
|
|
|
+ if ( type.toLowerCase() === 'object' ) {
|
|
|
+
|
|
|
+ console.error( 'THREE.JSONLoader: ' + url + ' should be loaded with THREE.ObjectLoader instead.' );
|
|
|
+ return;
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ if ( type.toLowerCase() === 'scene' ) {
|
|
|
|
|
|
- if ( metadata.type === 'scene' ) {
|
|
|
+ console.error( 'THREE.JSONLoader: ' + url + ' should be loaded with THREE.SceneLoader instead.' );
|
|
|
+ return;
|
|
|
|
|
|
- console.error( 'THREE.JSONLoader: ' + url + ' should be loaded with THREE.SceneLoader instead.' );
|
|
|
- return;
|
|
|
+ }
|
|
|
|
|
|
}
|
|
|
|