From 8b68796657ca917a5a2e578f60f60e0af2ae51c1 Mon Sep 17 00:00:00 2001
From: Xiaoji Chen <cxiaoji@gmail.com>
Date: Fri, 1 Mar 2024 22:02:45 -0800
Subject: [PATCH] Cherry pick luma global exports in core bundle

---
 .ocularrc.js                                  |  1 -
 modules/core/src/scripting/lumagl.ts          | 20 ++++++++++++++-----
 .../src/column-layer/column-geometry.ts       |  3 ---
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.ocularrc.js b/.ocularrc.js
index 12084deeabe..c36991594b1 100644
--- a/.ocularrc.js
+++ b/.ocularrc.js
@@ -35,7 +35,6 @@ const config = {
       '@deck.gl/*': 'globalThis.deck',
       '@luma.gl/core': 'globalThis.luma',
       '@luma.gl/engine': 'globalThis.luma',
-      '@luma.gl/webgl': 'globalThis.luma',
       '@loaders.gl/core': 'globalThis.loaders',
       'h3-js': 'globalThis.h3 || {}'
     }
diff --git a/modules/core/src/scripting/lumagl.ts b/modules/core/src/scripting/lumagl.ts
index b3501274647..999bebb2ec0 100644
--- a/modules/core/src/scripting/lumagl.ts
+++ b/modules/core/src/scripting/lumagl.ts
@@ -1,8 +1,18 @@
 /**
  * Re-exported luma.gl API in the pre-built bundle
- * TODO: Cherry-pick luma core exports that are relevant to deck
  */
-export * from '@luma.gl/core';
-export * from '@luma.gl/engine';
-// @ts-ignore Module '@luma.gl/core' has already exported a member named 'AccessorObject'
-export * from '@luma.gl/webgl';
+export {Device, Buffer, Texture, Framebuffer} from '@luma.gl/core';
+export {
+  Model,
+  TextureTransform,
+
+  // Geometry
+  Geometry,
+  CubeGeometry,
+  SphereGeometry,
+
+  // Scenegraph
+  ScenegraphNode,
+  GroupNode,
+  ModelNode
+} from '@luma.gl/engine';
diff --git a/modules/layers/src/column-layer/column-geometry.ts b/modules/layers/src/column-layer/column-geometry.ts
index 6cc08affe7f..a64bcf8c3ba 100644
--- a/modules/layers/src/column-layer/column-geometry.ts
+++ b/modules/layers/src/column-layer/column-geometry.ts
@@ -1,5 +1,4 @@
 import {log, BinaryAttribute} from '@deck.gl/core';
-import {uid} from '@luma.gl/core';
 import {Geometry} from '@luma.gl/engine';
 
 import {modifyPolygonWindingDirection, WINDING} from '@math.gl/polygon';
@@ -14,11 +13,9 @@ type ColumnGeometryProps = {
 
 export default class ColumnGeometry extends Geometry {
   constructor(props: ColumnGeometryProps) {
-    const {id = uid('column-geometry')} = props;
     const {indices, attributes} = tesselateColumn(props);
     super({
       ...props,
-      id,
       indices,
       // @ts-expect-error
       attributes