Move glTF instantiator to modules/addons (#1007)

examples/core/gltf/app.js

@@ -1,14 +1,8 @@
 /* global document, window */
 import {GLTFParser} from '@loaders.gl/gltf';
 import {DracoDecoder} from '@loaders.gl/draco';
-import {
-  setParameters,
-  clear,
-  log,
-  createGLTFObjects,
-  _GLTFEnvironment as GLTFEnvironment
-} from '@luma.gl/core';
-import {VRAnimationLoop} from '@luma.gl/addons';
+import {setParameters, clear, log} from '@luma.gl/core';
+import {createGLTFObjects, GLTFEnvironment, VRAnimationLoop} from '@luma.gl/addons';
 import GL from '@luma.gl/constants';
 import {Matrix4, radians} from 'math.gl';
 

modules/addons/package.json

@@ -37,6 +37,9 @@
   },
   "dependencies": {
     "@luma.gl/constants": "^7.0.0-alpha.18",
-    "@luma.gl/core": "^7.0.0-alpha.18"
+    "@luma.gl/core": "^7.0.0-alpha.18",
+    "@luma.gl/shadertools": "^7.0.0-alpha.18",
+    "@luma.gl/webgl": "^7.0.0-alpha.18",
+    "math.gl": "^2.3.1"
   }
 }

modules/core/src/scenegraph/gltf/create-gltf-model.js → modules/addons/src/gltf/create-gltf-model.js

@@ -1,7 +1,6 @@
 import {pbr} from '@luma.gl/shadertools';
 import {isWebGL2} from '@luma.gl/webgl';
-import {log} from '../../utils';
-import ModelNode from '../nodes/model-node';
+import {ModelNode, log} from '@luma.gl/core';
 import GLTFMaterialParser from './gltf-material-parser';
 
 const vs = `

modules/core/src/scenegraph/gltf/gltf-instantiator.js → modules/addons/src/gltf/gltf-instantiator.js

@@ -1,7 +1,6 @@
 import {Matrix4} from 'math.gl';
 import {Buffer, Accessor} from '@luma.gl/webgl';
-import {log} from '../../utils';
-import GroupNode from '../nodes/group-node';
+import {GroupNode, log} from '@luma.gl/core';
 
 import GLTFAnimator from './gltf-animator';
 import createGLTFModel from './create-gltf-model';

modules/core/src/scenegraph/gltf/gltf-material-parser.js → modules/addons/src/gltf/gltf-material-parser.js

@@ -1,5 +1,5 @@
 import {Texture2D} from '@luma.gl/webgl';
-import {log} from '../../utils';
+import {log} from '@luma.gl/core';
 
 export default class GLTFMaterialParser {
   constructor(gl, {attributes, material, pbrDebug, imageBasedLightingEnvironment, lights}) {

modules/addons/src/index.js

@@ -1,5 +1,9 @@
 // VR
 export {default as VRAnimationLoop} from './webvr/vr-animation-loop';
 
+// glTF Scenegraph Instantiator
+export {default as createGLTFObjects} from './gltf/create-gltf-objects';
+export {default as GLTFEnvironment} from './gltf/gltf-environment';
+
 // Misc
 export {addEvents} from './events/add-events';

modules/core/src/index.js

@@ -136,10 +136,6 @@ export {default as Plane} from './scenegraph/geometric-nodes/plane';
 export {default as Sphere} from './scenegraph/geometric-nodes/sphere';
 export {default as TruncatedCone} from './scenegraph/geometric-nodes/truncated-cone';
 
-// glTF scenegraph instantiator
-export {default as createGLTFObjects} from './scenegraph/gltf/create-gltf-objects';
-export {default as _GLTFEnvironment} from './scenegraph/gltf/gltf-environment';
-
 // TODO/CLEAN UP FOR V7
 //  We should have a minimal set of forwarding exports from shadertools (ideally none)
 //  Analyze risk of breaking apps

modules/core/src/scenegraph/index.js

@@ -5,9 +5,6 @@ export {default as GroupNode} from './nodes/group-node';
 export {default as ModelNode} from './nodes/model-node';
 export {default as CameraNode} from './nodes/camera-node';
 
-// GLTF SCENEGRAPH INSTANTIATOR
-export {default as createGLTFObjects} from './gltf/create-gltf-objects';
-
 // PREPACKAGED MODEL-NODES
 export {default as Cone} from './geometric-nodes/cone';
 export {default as Cube} from './geometric-nodes/cube';