Merge dca4011 into f540408

visgl · Mar 27, 2019 · 5dfda01 · 5dfda01
2 parents f540408 + dca4011
commit 5dfda01
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/modules/core/src/core/base-model.js b/modules/core/src/core/base-model.js
@@ -9,7 +9,7 @@ import {
   getDebugTableForProgramConfiguration
 } from '@luma.gl/webgl';
 import {addModel, removeModel, logModel, getOverrides} from '../debug/seer-integration';
-import {log, isObjectEmpty, assert} from '../utils';
+import {log, isObjectEmpty, assert, uid} from '../utils';
 
 const LOG_DRAW_PRIORITY = 2;
 const LOG_DRAW_TIMEOUT = 10000;
@@ -24,6 +24,7 @@ export default class BaseModel {
   constructor(gl, props = {}) {
     assert(isWebGL(gl));
     this.gl = gl;
+    this.id = props.id || uid('Model');
     this.lastLogTime = 0; // TODO - move to probe.gl
     this.initialize(props);
     this._setBaseModelProps(props);

diff --git a/modules/core/test/core/model.spec.js b/modules/core/test/core/model.spec.js
@@ -16,6 +16,7 @@ test('Model#construct/destruct', t => {
   });
 
   t.ok(model, 'Model constructor does not throw errors');
+  t.ok(model.id, 'Model has an id');
   t.ok(model.program.handle, 'Created new program');
 
   model.delete();