Move getShaderAttributes to AttributeManager

visgl · Nov 5, 2019 · 35163e3 · 35163e3
1 parent 105d0af
commit 35163e3
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 14 deletions.
diff --git a/modules/aggregation-layers/src/aggregation-layer.js b/modules/aggregation-layers/src/aggregation-layer.js
@@ -66,9 +66,7 @@ export default class AggregationLayer extends CompositeLayer {
   }
 
   getAttributes() {
-    const attributes = this.getAttributeManager().getAttributes();
-    // call  Layer method to get shader attributes
-    return this._getShaderAttributes(attributes);
+    return this.getAttributeManager().getShaderAttributes();
   }
 
   getModuleSettings() {

diff --git a/modules/core/src/lib/attribute-manager.js b/modules/core/src/lib/attribute-manager.js
@@ -310,6 +310,20 @@ export default class AttributeManager {
     return changedAttributes;
   }
 
+  // Returns shader attributes
+  getShaderAttributes(attributes, excludeAttributes = {}) {
+    if (!attributes) {
+      attributes = this.getAttributes();
+    }
+    const shaderAttributes = {};
+    for (const attributeName in attributes) {
+      if (!excludeAttributes[attributeName]) {
+        Object.assign(shaderAttributes, attributes[attributeName].getShaderAttributes());
+      }
+    }
+    return shaderAttributes;
+  }
+
   // PROTECTED METHODS - Only to be used by collaborating classes, not by apps
 
   // Returns object containing all accessors as keys, with non-null values

diff --git a/modules/core/src/lib/layer.js b/modules/core/src/lib/layer.js
@@ -494,19 +494,13 @@ export default class Layer extends Component {
     value.set(pickingColorCache.subarray(startRow * size, endRow * size), startRow * size);
   }
 
-  _getShaderAttributes(attributes, excludeAttributes = {}) {
-    const shaderAttributes = {};
-    for (const attributeName in attributes) {
-      if (!excludeAttributes[attributeName]) {
-        Object.assign(shaderAttributes, attributes[attributeName].getShaderAttributes());
-      }
-    }
-    return shaderAttributes;
-  }
-
   _setModelAttributes(model, changedAttributes) {
+    const attributeManager = this.getAttributeManager();
     const excludeAttributes = model.userData.excludeAttributes || {};
-    const shaderAttributes = this._getShaderAttributes(changedAttributes, excludeAttributes);
+    const shaderAttributes = attributeManager.getShaderAttributes(
+      changedAttributes,
+      excludeAttributes
+    );
 
     model.setAttributes(shaderAttributes);
   }