Skip to content

Commit

Permalink
fix website warnings (#2998)
Browse files Browse the repository at this point in the history
  • Loading branch information
jianhuang01 committed Apr 18, 2019
1 parent 3d0b5df commit 13bf96d
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 11 deletions.
4 changes: 2 additions & 2 deletions docs/developer-guide/custom-layers/subclassed-layers.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ RoundedRectangleLayer.defaultProps = {
}
```

Modified fragment shader that uses this uniform (learn more in [writing your own shaders](/docs/developer-guide/writing-shaders.md)):
Modified fragment shader that uses this uniform (learn more in [writing your own shaders](/docs/developer-guide/custom-layers/writing-shaders.md)):

```js
/// rounded-rectangle-layer-fragment.js
Expand Down Expand Up @@ -179,7 +179,7 @@ MyPointCloudLayer.defaultProps = {
};
```

Modified vertex shader that uses this attribute (learn more in [writing your own shaders](/docs/developer-guide/writing-shaders.md)):
Modified vertex shader that uses this attribute (learn more in [writing your own shaders](/docs/developer-guide/custom-layers/writing-shaders.md)):

```js
// my-point-cloud-layer-vertex.js
Expand Down
6 changes: 4 additions & 2 deletions examples/website/plot/plot-layer/axes-layer.js
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,10 @@ export default class AxesLayer extends Layer {
modelsByName.labels.updateModuleSettings(moduleParameters);
}

modelsByName.grids.render(Object.assign({}, uniforms, baseUniforms));
modelsByName.labels.render(Object.assign({}, uniforms, baseUniforms, labelTexture));
modelsByName.grids.setUniforms(Object.assign({}, uniforms, baseUniforms)).draw();
modelsByName.labels
.setUniforms(Object.assign({}, uniforms, baseUniforms, labelTexture))
.draw();
}
}

Expand Down
12 changes: 7 additions & 5 deletions examples/website/plot/plot-layer/surface-layer.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,13 @@ export default class SurfaceLayer extends Layer {
draw({uniforms}) {
const {lightStrength} = this.props;

this.state.model.render(
Object.assign({}, uniforms, {
lightStrength
})
);
this.state.model
.setUniforms(
Object.assign({}, uniforms, {
lightStrength
})
)
.draw();
}

/*
Expand Down
1 change: 0 additions & 1 deletion examples/website/trips/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ export class App extends Component {
data: buildings,
extruded: true,
wireframe: false,
fp64: true,
opacity: 0.5,
getPolygon: f => f.polygon,
getElevation: f => f.height,
Expand Down
2 changes: 1 addition & 1 deletion website/src/components/demos/layer-demos.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ export const PointCloudLayerDemo = createLayerDemoClass({
pickable: false,
coordinateSystem: COORDINATE_SYSTEM.METER_OFFSETS,
coordinateOrigin: [-122.4, 37.74],
radiusPixels: 2,
pointSize: 2,
getPosition: d => d.position,
getNormal: d => d.normal,
getColor: d => d.color
Expand Down

0 comments on commit 13bf96d

Please sign in to comment.