_enableOffsetModelMatrix to _composeModelMatrix for API audit (#3614)

visgl · Sep 17, 2019 · ced5c79 · ced5c79
1 parent b5e2233
commit ced5c79
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/modules/geo-layers/src/tile-3d-layer/tile-3d-layer.js b/modules/geo-layers/src/tile-3d-layer/tile-3d-layer.js
@@ -220,7 +220,7 @@ export default class Tile3DLayer extends CompositeLayer {
         coordinateSystem: COORDINATE_SYSTEM.METER_OFFSETS,
         coordinateOrigin: cartographicOrigin,
         modelMatrix,
-        _enableOffsetModelMatrix: true,
+        _composeModelMatrix: true,
         getTransformMatrix: instance => instance.modelMatrix,
         getPosition: instance => [0, 0, 0]
       }

diff --git a/modules/mesh-layers/src/scenegraph-layer/scenegraph-layer.js b/modules/mesh-layers/src/scenegraph-layer/scenegraph-layer.js
@@ -50,7 +50,7 @@ const defaultProps = {
 
   // flat or pbr
   _lighting: 'flat',
-  _enableOffsetModelMatrix: false,
+  _composeModelMatrix: false,
   // _lighting must be pbr for this to work
   _imageBasedLightingEnvironment: null,
 
@@ -249,7 +249,7 @@ export default class ScenegraphLayer extends Layer {
       this.state.animator.animate(context.animationProps.time);
     }
 
-    const {sizeScale, opacity, _enableOffsetModelMatrix} = this.props;
+    const {sizeScale, opacity, _composeModelMatrix} = this.props;
     const numInstances = this.getNumInstances();
     this.state.scenegraph.traverse((model, {worldMatrix}) => {
       model.model.setInstanceCount(numInstances);
@@ -259,7 +259,7 @@ export default class ScenegraphLayer extends Layer {
         uniforms: {
           sizeScale,
           opacity,
-          enableOffsetModelMatrix: _enableOffsetModelMatrix,
+          enableOffsetModelMatrix: _composeModelMatrix,
           sceneModelMatrix: worldMatrix,
           // Needed for PBR (TODO: find better way to get it)
           u_Camera: model.model.program.uniforms.project_uCameraPosition