Context cleanup (#1611)

visgl · Jan 24, 2022 · f96c784 · f96c784
1 parent aab1dbc
commit f96c784
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 76 deletions.
diff --git a/modules/gltools/src/classic/texture-cube.ts b/modules/gltools/src/classic/texture-cube.ts
@@ -4,7 +4,7 @@ import Texture, {TextureProps} from './texture';
 
 /**
  * Cube Texture
- * @deprecated Use device.createTexture({dimension: '3d'})
+ * @deprecated Use device.createTexture({dimension: 'cube'})
  */
 export default class TextureCube extends Texture {
   static FACES: number[] = [

diff --git a/modules/gltools/src/engine/classic-animation-loop.ts b/modules/gltools/src/engine/classic-animation-loop.ts
@@ -88,7 +88,10 @@ const DEFAULT_CLASSIC_ANIMATION_LOOP_PROPS: Required<ClassicAnimationLoopProps>
   createFramebuffer: false
 };
 
-/** Convenient animation loop */
+/** 
+ * Convenient animation loop 
+ * @deprecated Use `@luma.gl/engine` AnimationLoop
+ */
 export default class ClassicAnimationLoop {
   device: Device;
   canvas: HTMLCanvasElement | OffscreenCanvas;

diff --git a/modules/gltools/src/engine/classic-clip-space.ts b/modules/gltools/src/engine/classic-clip-space.ts
@@ -23,6 +23,7 @@ void main(void) {
 /* eslint-disable indent, no-multi-spaces */
 const POSITIONS = [-1, -1, 1, -1, -1, 1, 1, 1];
 
+/** @deprecated Use new class in `@luma.gl/engine` */
 
 export default class ClipSpace extends Model {
   constructor(gl: WebGLRenderingContext, opts?: ModelProps) {

diff --git a/modules/gltools/src/webgl-utils/texture-utils.ts b/modules/gltools/src/webgl-utils/texture-utils.ts
@@ -9,7 +9,10 @@ import Framebuffer, {ClassicFramebufferProps} from '../classic/framebuffer';
 
 type TextureType = Texture2D | TextureCube | Texture3D;
 
-/** Clone a new texture object from a reference texture object. */
+/** 
+ * Clone a new texture object from a reference texture object. 
+ * @deprecated
+ */
 export function cloneTextureFrom<T extends TextureType>(refTexture: T, overrides?: any): T {
   assert(
     refTexture instanceof Texture2D ||

diff --git a/modules/webgl/src/adapter/webgl-device.ts b/modules/webgl/src/adapter/webgl-device.ts
@@ -18,8 +18,8 @@ import {getDeviceInfo} from './device-helpers/get-device-info';
 import {getDeviceFeatures} from './device-helpers/device-features';
 import {getDeviceLimits, getWebGLLimits, WebGLLimits} from './device-helpers/device-limits';
 import WebGLCanvasContext from './webgl-canvas-context';
-import {loadSpectorJS, initializeSpectorJS} from '../debug/spector';
-import {loadWebGLDeveloperTools, makeDebugContext} from '../debug/webgl-developer-tools';
+import {loadSpectorJS, initializeSpectorJS} from '../context/debug/spector';
+import {loadWebGLDeveloperTools, makeDebugContext} from '../context/debug/webgl-developer-tools';
 import {
   isTextureFormatSupported,
   isTextureFormatRenderable,

diff --git a/modules/webgl/src/context/context/resize-context.ts b/modules/webgl/src/context/context/resize-context.ts
diff --git a/modules/webgl/src/debug/spector.ts → modules/webgl/src/context/debug/spector.ts b/modules/webgl/src/debug/spector.ts → modules/webgl/src/context/debug/spector.ts
@@ -1,6 +1,5 @@
 // luma.gl, MIT license
 import {log, loadScript} from '@luma.gl/api';
-import {document} from 'probe.gl/env';
 
 /** Spector debug initialization options */
 type SpectorProps = {

diff --git a/.../webgl/src/debug/webgl-developer-tools.ts → ...rc/context/debug/webgl-developer-tools.ts b/.../webgl/src/debug/webgl-developer-tools.ts → ...rc/context/debug/webgl-developer-tools.ts
diff --git a/modules/webgl/src/index.ts b/modules/webgl/src/index.ts
@@ -72,5 +72,4 @@ export {polyfillContext} from './context/polyfill/polyfill-context';
 
 // HELPERS - EXPERIMENTAL
 export {getProgramBindings} from './adapter/helpers/get-program-bindings';
-export {loadWebGLDeveloperTools} from './debug/webgl-developer-tools';
 export {_checkFloat32ColorAttachment} from './adapter/converters/texture-formats';
diff --git a/modules/webgl/src/types/accessor.d.ts b/modules/webgl/src/types/accessor.d.ts
diff --git a/test/modules.js b/test/modules.js
@@ -3,11 +3,9 @@
 
 // Make sure the WebGL developer tools are pre-loaded. Test contexts are created synchronously
 import '@luma.gl/debug';
-// import {loadWebGLDeveloperTools} from '@luma.gl/webgl';
-// await loadWebGLDeveloperTools(); - Doesn't work in Node.js
 
 // Shadertools is a GLSL textual processing library, no actual WebGL dependencies
-// import '../modules/shadertools/test';
+import '../modules/shadertools/test';
 
 // WEBGL-DEPENDENT TESTS