Skip to content

Commit 4fa8eec

Browse files
committed
ObjectLoader: Add fallback for Geometry
1 parent e2e3ba7 commit 4fa8eec

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

src/Three.Legacy.js

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1888,14 +1888,6 @@ export function CanvasRenderer() {
18881888

18891889
//
18901890

1891-
export function JSONLoader() {
1892-
1893-
console.error( 'THREE.JSONLoader has been removed.' );
1894-
1895-
}
1896-
1897-
//
1898-
18991891
export var SceneUtils = {
19001892

19011893
createMultiMaterialObject: function ( /* geometry, materials */ ) {

src/loaders/ObjectLoader.js

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,17 @@ Object.assign( ObjectLoader.prototype, {
422422

423423
case 'Geometry':
424424

425-
console.error( 'THREE.ObjectLoader: "Geometry" is no longer supported.' );
425+
if ( 'THREE' in window && 'JSONLoader' in THREE ) {
426+
427+
var geometryLoader = new THREE.JSONLoader();
428+
geometry = geometryLoader.parse( data, this.resourcePath ).geometry;
429+
430+
431+
} else {
432+
433+
console.error( 'THREE.ObjectLoader: You have to import JSONLoader in order load geometry data of type "Geometry".' );
434+
435+
}
426436

427437
break;
428438

0 commit comments

Comments
 (0)