From b4120478f4f6f9320bd34734563de154ac392974 Mon Sep 17 00:00:00 2001 From: Georgios Karnas Date: Mon, 25 Mar 2019 20:18:09 -0700 Subject: [PATCH] Move glTF instantiator to modules/addons --- examples/core/gltf/app.js | 10 ++-------- modules/addons/package.json | 5 ++++- .../src}/gltf/create-gltf-model.js | 3 +-- .../src}/gltf/create-gltf-objects.js | 0 .../scenegraph => addons/src}/gltf/gltf-animator.js | 0 .../scenegraph => addons/src}/gltf/gltf-environment.js | 0 .../src}/gltf/gltf-instantiator.js | 3 +-- .../src}/gltf/gltf-material-parser.js | 2 +- modules/addons/src/index.js | 4 ++++ modules/core/src/index.js | 4 ---- modules/core/src/scenegraph/index.js | 3 --- 11 files changed, 13 insertions(+), 21 deletions(-) rename modules/{core/src/scenegraph => addons/src}/gltf/create-gltf-model.js (96%) rename modules/{core/src/scenegraph => addons/src}/gltf/create-gltf-objects.js (100%) rename modules/{core/src/scenegraph => addons/src}/gltf/gltf-animator.js (100%) rename modules/{core/src/scenegraph => addons/src}/gltf/gltf-environment.js (100%) rename modules/{core/src/scenegraph => addons/src}/gltf/gltf-instantiator.js (98%) rename modules/{core/src/scenegraph => addons/src}/gltf/gltf-material-parser.js (99%) diff --git a/examples/core/gltf/app.js b/examples/core/gltf/app.js index 95b1ce018b..f2db9b84c5 100644 --- a/examples/core/gltf/app.js +++ b/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'; diff --git a/modules/addons/package.json b/modules/addons/package.json index d3286bff01..078fb1f4fa 100644 --- a/modules/addons/package.json +++ b/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" } } diff --git a/modules/core/src/scenegraph/gltf/create-gltf-model.js b/modules/addons/src/gltf/create-gltf-model.js similarity index 96% rename from modules/core/src/scenegraph/gltf/create-gltf-model.js rename to modules/addons/src/gltf/create-gltf-model.js index 7b821ac896..048a1545c1 100644 --- a/modules/core/src/scenegraph/gltf/create-gltf-model.js +++ b/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 = ` diff --git a/modules/core/src/scenegraph/gltf/create-gltf-objects.js b/modules/addons/src/gltf/create-gltf-objects.js similarity index 100% rename from modules/core/src/scenegraph/gltf/create-gltf-objects.js rename to modules/addons/src/gltf/create-gltf-objects.js diff --git a/modules/core/src/scenegraph/gltf/gltf-animator.js b/modules/addons/src/gltf/gltf-animator.js similarity index 100% rename from modules/core/src/scenegraph/gltf/gltf-animator.js rename to modules/addons/src/gltf/gltf-animator.js diff --git a/modules/core/src/scenegraph/gltf/gltf-environment.js b/modules/addons/src/gltf/gltf-environment.js similarity index 100% rename from modules/core/src/scenegraph/gltf/gltf-environment.js rename to modules/addons/src/gltf/gltf-environment.js diff --git a/modules/core/src/scenegraph/gltf/gltf-instantiator.js b/modules/addons/src/gltf/gltf-instantiator.js similarity index 98% rename from modules/core/src/scenegraph/gltf/gltf-instantiator.js rename to modules/addons/src/gltf/gltf-instantiator.js index a4b0b16aea..fa7bf36b50 100644 --- a/modules/core/src/scenegraph/gltf/gltf-instantiator.js +++ b/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'; diff --git a/modules/core/src/scenegraph/gltf/gltf-material-parser.js b/modules/addons/src/gltf/gltf-material-parser.js similarity index 99% rename from modules/core/src/scenegraph/gltf/gltf-material-parser.js rename to modules/addons/src/gltf/gltf-material-parser.js index 0d013ab931..07d29c75b9 100644 --- a/modules/core/src/scenegraph/gltf/gltf-material-parser.js +++ b/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}) { diff --git a/modules/addons/src/index.js b/modules/addons/src/index.js index 6d8f6a8cef..58a48ff95b 100644 --- a/modules/addons/src/index.js +++ b/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'; diff --git a/modules/core/src/index.js b/modules/core/src/index.js index 049fd1a8d5..e28d7ede3f 100644 --- a/modules/core/src/index.js +++ b/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 diff --git a/modules/core/src/scenegraph/index.js b/modules/core/src/scenegraph/index.js index 89fe4d5ec5..dd8c5e54bd 100644 --- a/modules/core/src/scenegraph/index.js +++ b/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';