wip

visgl · Apr 8, 2019 · 5e5c223 · 5e5c223
1 parent 3c3365f
commit 5e5c223
Show file tree

Hide file tree

Showing 22 changed files with 14 additions and 14 deletions.
diff --git a/modules/core/src/index.js b/modules/core/src/index.js
@@ -79,16 +79,16 @@ export {default as Geometry} from './geometry/geometry';
 export {default as Material} from './materials/material';
 export {AmbientLight, DirectionalLight, PointLight} from './lighting/light-source';
 
-// CORE
-export {default as AnimationLoop} from './core/animation-loop';
-export {encodePickingColor, decodePickingColor, getNullPickingColor} from './core/picking-colors';
-export {default as Model} from './core/model';
-export {default as Transform} from './core/transform';
-export {default as ClipSpace} from './core/clip-space';
+// LIB
+export {default as AnimationLoop} from './lib/animation-loop';
+export {encodePickingColor, decodePickingColor, getNullPickingColor} from './lib/picking-colors';
+export {default as Model} from './lib/model';
+export {default as Transform} from './lib/transform';
+export {default as ClipSpace} from './lib/clip-space';
 
 // Experimental core exports
-export {default as _ShaderCache} from './core/shader-cache';
-export {default as _AnimationLoopProxy} from './core/animation-loop-proxy';
+export {default as _ShaderCache} from './lib/shader-cache';
+export {default as _AnimationLoopProxy} from './lib/animation-loop-proxy';
 
 // Multipass Rendering
 export {default as _MultiPassRenderer} from './multipass/multi-pass-renderer';

diff --git a/...les/core/src/core/animation-loop-proxy.js → modules/core/src/lib/animation-loop-proxy.js b/...les/core/src/core/animation-loop-proxy.js → modules/core/src/lib/animation-loop-proxy.js
diff --git a/modules/core/src/core/animation-loop.js → modules/core/src/lib/animation-loop.js b/modules/core/src/core/animation-loop.js → modules/core/src/lib/animation-loop.js
diff --git a/modules/core/src/core/base-model.js → modules/core/src/lib/base-model.js b/modules/core/src/core/base-model.js → modules/core/src/lib/base-model.js
diff --git a/modules/core/src/core/clip-space.js → modules/core/src/lib/clip-space.js b/modules/core/src/core/clip-space.js → modules/core/src/lib/clip-space.js
@@ -1,6 +1,6 @@
 // ClipSpace
 import GL from '@luma.gl/constants';
-import Model from '../core/model';
+import Model from '../lib/model';
 import Geometry from '../geometry/geometry';
 
 const CLIPSPACE_VERTEX_SHADER = `\

diff --git a/modules/core/src/core/model-utils.js → modules/core/src/lib/model-utils.js b/modules/core/src/core/model-utils.js → modules/core/src/lib/model-utils.js
diff --git a/modules/core/src/core/model.js → modules/core/src/lib/model.js b/modules/core/src/core/model.js → modules/core/src/lib/model.js
diff --git a/modules/core/src/core/picking-colors.js → modules/core/src/lib/picking-colors.js b/modules/core/src/core/picking-colors.js → modules/core/src/lib/picking-colors.js
diff --git a/modules/core/src/core/shader-cache.js → modules/core/src/lib/shader-cache.js b/modules/core/src/core/shader-cache.js → modules/core/src/lib/shader-cache.js
diff --git a/...s/core/src/core/transform-shader-utils.js → ...es/core/src/lib/transform-shader-utils.js b/...s/core/src/core/transform-shader-utils.js → ...es/core/src/lib/transform-shader-utils.js
diff --git a/modules/core/src/core/transform.js → modules/core/src/lib/transform.js b/modules/core/src/core/transform.js → modules/core/src/lib/transform.js
diff --git a/modules/core/src/multipass/copy-pass.js b/modules/core/src/multipass/copy-pass.js
@@ -4,7 +4,7 @@
 // Attribution: This class and the multipass system were inspired by
 // the THREE.js EffectComposer and *Pass classes
 
-import ClipSpace from '../core/clip-space';
+import ClipSpace from '../lib/clip-space';
 import Pass from './pass';
 
 const fs = `\

diff --git a/modules/core/src/multipass/shader-module-pass.js b/modules/core/src/multipass/shader-module-pass.js
@@ -4,7 +4,7 @@
 
 import Pass from './pass';
 import CompositePass from './composite-pass';
-import ClipSpace from '../core/clip-space';
+import ClipSpace from '../lib/clip-space';
 
 import {normalizeShaderModule} from '@luma.gl/shadertools';
 

diff --git a/modules/core/src/multipass/texture-pass.js b/modules/core/src/multipass/texture-pass.js
@@ -4,7 +4,7 @@
 // Attribution: This class and the multipass system were inspired by
 // the THREE.js EffectComposer and *Pass classes
 
-import {default as ClipSpace} from '../core/clip-space';
+import {default as ClipSpace} from '../lib/clip-space';
 import Pass from './pass';
 
 const fs = `\

diff --git a/modules/core/src/scenegraph/nodes/model-node.js b/modules/core/src/scenegraph/nodes/model-node.js
@@ -1,4 +1,4 @@
-import Model from '../../core/model';
+import Model from '../../lib/model';
 import ScenegraphNode from './scenegraph-node';
 
 export default class ModelNode extends ScenegraphNode {

diff --git a/...re/test/core/animation-loop-proxy.spec.js → ...ore/test/lib/animation-loop-proxy.spec.js b/...re/test/core/animation-loop-proxy.spec.js → ...ore/test/lib/animation-loop-proxy.spec.js
diff --git a/...les/core/test/core/animation-loop.spec.js → modules/core/test/lib/animation-loop.spec.js b/...les/core/test/core/animation-loop.spec.js → modules/core/test/lib/animation-loop.spec.js
diff --git a/modules/core/test/core/index.js → modules/core/test/lib/index.js b/modules/core/test/core/index.js → modules/core/test/lib/index.js
diff --git a/modules/core/test/core/model.spec.js → modules/core/test/lib/model.spec.js b/modules/core/test/core/model.spec.js → modules/core/test/lib/model.spec.js
diff --git a/modules/core/test/core/shader-cache.spec.js → modules/core/test/lib/shader-cache.spec.js b/modules/core/test/core/shader-cache.spec.js → modules/core/test/lib/shader-cache.spec.js
diff --git a/modules/core/test/core/transform.spec.js → modules/core/test/lib/transform.spec.js b/modules/core/test/core/transform.spec.js → modules/core/test/lib/transform.spec.js
diff --git a/modules/core/test/webgl-dependent-tests.js b/modules/core/test/webgl-dependent-tests.js
@@ -1,2 +1,2 @@
-import './core';
+import './lib';
 import './debug/seer-integration';