Skip to content

Commit

Permalink
Merge a054a3d into 553ddff
Browse files Browse the repository at this point in the history
  • Loading branch information
@Pessimistress
Pessimistress committed Apr 13, 2024
2 parents 553ddff + a054a3d commit 4f276b7
Show file tree
Hide file tree
Showing 17 changed files with 64 additions and 63 deletions.
2 changes: 0 additions & 2 deletions examples/website/plot/plot-layer/surface-layer.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,6 @@ export default class SurfaceLayer<DataT = any> extends Layer<Required<_SurfaceLa
const {lightStrength} = this.props;
const {model} = this.state;

// This is a non-instanced model
model.setInstanceCount(0);
model.setUniforms(uniforms);
model.setUniforms({lightStrength});
model.draw(this.context.renderPass);
Expand Down
4 changes: 2 additions & 2 deletions modules/aggregation-layers/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
},
"dependencies": {
"@luma.gl/constants": "^9.0.9",
"@luma.gl/shadertools": "^9.0.9",
"@luma.gl/constants": "^9.0.10",
"@luma.gl/shadertools": "^9.0.10",
"@math.gl/web-mercator": "^4.0.0",
"d3-hexbin": "^0.2.1"
},
Expand Down
3 changes: 2 additions & 1 deletion modules/aggregation-layers/src/screen-grid-layer/screen-grid-cell-layer.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,8 @@ export default class ScreenGridCellLayer<DataT = any, ExtraPropsT extends {} = {
0, 1, 0,
])
}
})
}),
isInstanced: true
});
}

Expand Down
2 changes: 1 addition & 1 deletion modules/arcgis/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
},
"dependencies": {
"@luma.gl/constants": "^9.0.9",
"@luma.gl/constants": "^9.0.10",
"esri-loader": "^3.7.0"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion modules/carto/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@loaders.gl/mvt": "^4.2.0",
"@loaders.gl/schema": "^4.2.0",
"@loaders.gl/tiles": "^4.2.0",
"@luma.gl/constants": "^9.0.9",
"@luma.gl/constants": "^9.0.10",
"@math.gl/web-mercator": "^4.0.0",
"@types/d3-array": "^3.0.2",
"@types/d3-color": "^1.4.2",
Expand Down
10 changes: 5 additions & 5 deletions modules/core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@
"dependencies": {
"@loaders.gl/core": "^4.2.0",
"@loaders.gl/images": "^4.2.0",
"@luma.gl/constants": "^9.0.9",
"@luma.gl/core": "^9.0.9",
"@luma.gl/engine": "^9.0.9",
"@luma.gl/shadertools": "^9.0.9",
"@luma.gl/webgl": "^9.0.9",
"@luma.gl/constants": "^9.0.10",
"@luma.gl/core": "^9.0.10",
"@luma.gl/engine": "^9.0.10",
"@luma.gl/shadertools": "^9.0.10",
"@luma.gl/webgl": "^9.0.10",
"@math.gl/core": "^4.0.0",
"@math.gl/sun": "^4.0.0",
"@math.gl/web-mercator": "^4.0.0",
Expand Down
4 changes: 3 additions & 1 deletion modules/core/src/lib/layer.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1253,7 +1253,9 @@ export default abstract class Layer<PropsT extends {} = {}> extends Component<

// Note: Automatic instance count update only works for single layers
const model = this.state.model as Model | undefined;
model?.setInstanceCount(this.getNumInstances());
if (model?.isInstanced) {
model?.setInstanceCount(this.getNumInstances());
}

// Set picking module parameters to match props
const {autoHighlight, highlightedObjectIndex, highlightColor} = props;
Expand Down
4 changes: 2 additions & 2 deletions modules/extensions/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
},
"dependencies": {
"@luma.gl/constants": "^9.0.9",
"@luma.gl/shadertools": "^9.0.9",
"@luma.gl/constants": "^9.0.10",
"@luma.gl/shadertools": "^9.0.10",
"@math.gl/core": "^4.0.0"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions modules/geo-layers/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
"@loaders.gl/terrain": "^4.2.0",
"@loaders.gl/tiles": "^4.2.0",
"@loaders.gl/wms": "^4.2.0",
"@luma.gl/gltf": "^9.0.9",
"@luma.gl/shadertools": "^9.0.9",
"@luma.gl/gltf": "^9.0.10",
"@luma.gl/shadertools": "^9.0.10",
"@math.gl/core": "^4.0.0",
"@math.gl/culling": "^4.0.0",
"@math.gl/web-mercator": "^4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion modules/google-maps/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
},
"dependencies": {
"@luma.gl/constants": "^9.0.9",
"@luma.gl/constants": "^9.0.10",
"@math.gl/core": "^4.0.0",
"@types/google.maps": "^3.48.6"
},
Expand Down
2 changes: 1 addition & 1 deletion modules/jupyter-widget/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@loaders.gl/3d-tiles": "^4.2.0",
"@loaders.gl/core": "^4.2.0",
"@loaders.gl/csv": "^4.2.0",
"@luma.gl/core": "^9.0.9",
"@luma.gl/core": "^9.0.10",
"d3-dsv": "^1.0.8",
"mapbox-gl": "^1.13.2"
},
Expand Down
4 changes: 2 additions & 2 deletions modules/layers/src/solid-polygon-layer/solid-polygon-layer.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ export default class SolidPolygonLayer<DataT = any, ExtraPropsT extends {} = {}>
}
}
}),
isInstanced: 1,
isInstanced: true,
userData: {
excludeAttributes: {indices: true}
}
Expand All @@ -473,7 +473,7 @@ export default class SolidPolygonLayer<DataT = any, ExtraPropsT extends {} = {}>
}
}
}),
isInstanced: 1,
isInstanced: true,
userData: {
excludeAttributes: {indices: true}
}
Expand Down
2 changes: 1 addition & 1 deletion modules/mapbox/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
},
"dependencies": {
"@luma.gl/constants": "^9.0.9",
"@luma.gl/constants": "^9.0.10",
"@math.gl/web-mercator": "^4.0.0"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions modules/mesh-layers/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
},
"dependencies": {
"@loaders.gl/gltf": "^4.2.0",
"@luma.gl/gltf": "^9.0.9",
"@luma.gl/shadertools": "^9.0.9"
"@luma.gl/gltf": "^9.0.10",
"@luma.gl/shadertools": "^9.0.10"
},
"peerDependencies": {
"@deck.gl/core": "^9.0.0-beta",
Expand Down
2 changes: 1 addition & 1 deletion modules/test-utils/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"src"
],
"dependencies": {
"@luma.gl/test-utils": "^9.0.9"
"@luma.gl/test-utils": "^9.0.10"
},
"peerDependencies": {
"@deck.gl/core": "^9.0.0-beta",
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"devDependencies": {
"@loaders.gl/csv": "^4.2.0",
"@loaders.gl/polyfills": "^4.2.0",
"@luma.gl/webgpu": "^9.0.9",
"@luma.gl/webgpu": "^9.0.10",
"@math.gl/proj4": "^4.0.0",
"@probe.gl/bench": "^4.0.9",
"jsdom": "^20.0.0",
Expand Down
74 changes: 37 additions & 37 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2524,7 +2524,7 @@
"@loaders.gl/schema" "4.2.0"
"@mapbox/martini" "^0.2.0"

"@loaders.gl/textures@4.2.0", "@loaders.gl/textures@^4.1.0":
"@loaders.gl/textures@4.2.0", "@loaders.gl/textures@^4.2.0":
version "4.2.0"
resolved "https://registry.yarnpkg.com/@loaders.gl/textures/-/textures-4.2.0.tgz#d1473e3b4933725ef130c66ec18502bd810d79ec"
integrity sha512-T+MoSyVCUQAjPTbDRnEXhQxyn5iU5nMzYiMI59VElp43WkShU3s7k4OB6HhAFPfIeqlD0ZPnm3ecgYZ/BZbZ6w==
Expand Down Expand Up @@ -2587,69 +2587,69 @@
jszip "^3.1.5"
md5 "^2.3.0"

"@luma.gl/constants@9.0.9", "@luma.gl/constants@^9.0.9":
version "9.0.9"
resolved "https://registry.yarnpkg.com/@luma.gl/constants/-/constants-9.0.9.tgz#4fdb735c4b78f09aa92db2b8020b0175ed279bb9"
integrity sha512-o8NgH4F//e2wVWyZoYmaoopoTejDEITBP78fJtU2ivmCW1viCvByUawEXISPzsekHosDYo9q1/XFjmusXZa3fQ==
"@luma.gl/constants@9.0.10", "@luma.gl/constants@^9.0.10":
version "9.0.10"
resolved "https://registry.yarnpkg.com/@luma.gl/constants/-/constants-9.0.10.tgz#98de7f268091a992aa2f10532f8428581125e713"
integrity sha512-ZaNaDxWr0RXQq8rh4GnPOfhacZPtTTTwS4h5iIEU/VcCoEZps3joTkqJLYlleRD2GcZu4LtJzQOWi/Pt7zmSVA==

"@luma.gl/core@^9.0.9":
version "9.0.9"
resolved "https://registry.yarnpkg.com/@luma.gl/core/-/core-9.0.9.tgz#1199400c94d60171875dcbbaa3d2ed2579607df1"
integrity sha512-G0N4+bSWLU6gt3grgzF5xf+vMnfYaryHFLDkAeZV5kJ2helnfzUsjwUKCEYk36V2vygu7TEXlByYgwestB7+Ew==
"@luma.gl/core@^9.0.10":
version "9.0.10"
resolved "https://registry.yarnpkg.com/@luma.gl/core/-/core-9.0.10.tgz#fa362ac622f2b7babd9f5a87b3207d5e0223e369"
integrity sha512-TyJd/DC07CTcLvLD5TnmEqXn5i2RiKDZ00jndtussLV/rY04foGLju2+p0Evt/khk6wZjOFKkEhQxwMCi+57xQ==
dependencies:
"@math.gl/types" "^4.0.0"
"@probe.gl/env" "^4.0.2"
"@probe.gl/log" "^4.0.2"
"@probe.gl/stats" "^4.0.2"
"@types/offscreencanvas" "^2019.6.4"

"@luma.gl/engine@^9.0.9":
version "9.0.9"
resolved "https://registry.yarnpkg.com/@luma.gl/engine/-/engine-9.0.9.tgz#5eaeb784a4731969eca62acf4cf8fdb4d0d239ab"
integrity sha512-4qW4OCYaGZJ/iGqerAtnP8FzcNtnXvv+aShLkE4ay2D4zdOIML5kZSLslmU/ByZ3FR606k0c5AjTBOgZ77lkiQ==
"@luma.gl/engine@^9.0.10":
version "9.0.10"
resolved "https://registry.yarnpkg.com/@luma.gl/engine/-/engine-9.0.10.tgz#c9fd0bc972c14976087e6ffaed93c30db173813e"
integrity sha512-UhZtlaS+rzLx1C97JM/vmNxGL1hFqRO3xueyaJzO2kcfzMSM5EFM+7k18fwbigOjIi20GtyBqJcH8mAtttdz1A==
dependencies:
"@luma.gl/shadertools" "9.0.9"
"@luma.gl/shadertools" "9.0.10"
"@math.gl/core" "^4.0.0"
"@probe.gl/log" "^4.0.2"
"@probe.gl/stats" "^4.0.2"

"@luma.gl/gltf@^9.0.9":
version "9.0.9"
resolved "https://registry.yarnpkg.com/@luma.gl/gltf/-/gltf-9.0.9.tgz#9c326e066cd73806b01bf8f79b46c0b942b9cf74"
integrity sha512-QuV4gbxIZ8qGOmZsf9DGvavogQUyplpDVAs38eczBBqIKCGFq2d+mOIQMmn1SWFF0RjicjyjnQ2KAFWgdy2jIQ==
"@luma.gl/gltf@^9.0.10":
version "9.0.10"
resolved "https://registry.yarnpkg.com/@luma.gl/gltf/-/gltf-9.0.10.tgz#2cd3d645e0fb4639c0b2218c0d60fe72cc6cf88c"
integrity sha512-FT7L+NvnSUb6m1XUdmBwSeI2lk27cjBAEXYcbUxoSZlHdzp5Ihl27cTT38sAs2gNWFVEfs1choq96It+Ji9vEw==
dependencies:
"@loaders.gl/textures" "^4.1.0"
"@luma.gl/shadertools" "9.0.9"
"@loaders.gl/textures" "^4.2.0"
"@luma.gl/shadertools" "9.0.10"
"@math.gl/core" "^4.0.0"

"@luma.gl/shadertools@9.0.9", "@luma.gl/shadertools@^9.0.9":
version "9.0.9"
resolved "https://registry.yarnpkg.com/@luma.gl/shadertools/-/shadertools-9.0.9.tgz#88269c9889a32cd8636e7bb2351fe8d5d8b77ba9"
integrity sha512-99wfDMtkIeWziAf96UrqXteJi4uBFvMN0TdU8TvTv0V6BJRjd1xZVWnF9Xx2D+DPH9Mmn4q/hQH0NJ0sQlYeHw==
"@luma.gl/shadertools@9.0.10", "@luma.gl/shadertools@^9.0.10":
version "9.0.10"
resolved "https://registry.yarnpkg.com/@luma.gl/shadertools/-/shadertools-9.0.10.tgz#224b8618960414cefd89b8753631474854b27bb5"
integrity sha512-kxipEgvO2StU8gG68V+3/SbLytmA91M3froewpr/8vn9hcl1ycUvIDF71ViX/9eOhpJhkM0EVMDdFQI/nWT/GQ==
dependencies:
"@math.gl/core" "^4.0.0"
"@math.gl/types" "^4.0.0"

"@luma.gl/test-utils@^9.0.9":
version "9.0.9"
resolved "https://registry.yarnpkg.com/@luma.gl/test-utils/-/test-utils-9.0.9.tgz#1687d87e1bf070d1cfe145b3c7e77045a0dc875f"
integrity sha512-oMRl3ede73pp4KGvzJHhkk/QusrBoOj+PHaQ/X78ULoutAAqZpNLpiL2EkJOk3otkZMzePOW4RZeviHj0/McKQ==
"@luma.gl/test-utils@^9.0.10":
version "9.0.10"
resolved "https://registry.yarnpkg.com/@luma.gl/test-utils/-/test-utils-9.0.10.tgz#fed992bb4a3d4b7549e048d8e8925925ac89a184"
integrity sha512-qnpjZpYST3u35+SR9LTHAg74jV4NgxrKT0TtuAz+lGQcSfTPi5q6Z0kU6s7C4godQl7DAeRLLKBINK4AUispqg==
dependencies:
"@probe.gl/env" "^4.0.2"
"@probe.gl/stats" "^4.0.2"

"@luma.gl/webgl@^9.0.9":
version "9.0.9"
resolved "https://registry.yarnpkg.com/@luma.gl/webgl/-/webgl-9.0.9.tgz#c8d9563a0e45bef2a2cb3ddfc9efbff558e3f954"
integrity sha512-dP91Md5u6OnK3PFt0h1uqcxWh3T/COBHyZ5OcAirRUB1laFdzhdXUWbtuvLgpF6b7o0MsaEUcXaAbYf+e7lEzA==
"@luma.gl/webgl@^9.0.10":
version "9.0.10"
resolved "https://registry.yarnpkg.com/@luma.gl/webgl/-/webgl-9.0.10.tgz#07bef5fc47cc4562570869e4b343566bc42559ae"
integrity sha512-Iec0J6FBZUn7tmcp8UZJvXjYhxMM9QmSC6PuB33zoHBuCPgOxCmBZNKrnVXeu7jCI3YF9TrIUa1OeW7Okzd0aw==
dependencies:
"@luma.gl/constants" "9.0.9"
"@luma.gl/constants" "9.0.10"
"@probe.gl/env" "^4.0.2"

"@luma.gl/webgpu@^9.0.9":
version "9.0.9"
resolved "https://registry.yarnpkg.com/@luma.gl/webgpu/-/webgpu-9.0.9.tgz#9e61ade913e4dced18cd18f36bae3fd90e4d4f26"
integrity sha512-HaGbab8EKMy33NKQqTqPMT1eq0dOSY2A4QoS24AXn9i7NODBgP540he1VA5fj2tmDuVzyNgzh2/EHuFKbDk0Sg==
"@luma.gl/webgpu@^9.0.10":
version "9.0.10"
resolved "https://registry.yarnpkg.com/@luma.gl/webgpu/-/webgpu-9.0.10.tgz#b01fb60d5726657afdad99e8490093f87c3de23b"
integrity sha512-EWdYe7M1t8iWzulMvCjttXudvjOjgDU89Sg1znX8Cq2N5tB7XFPeyGL7/MKu7fliT+zGumQoFh1NDyzef+r0zQ==
dependencies:
"@probe.gl/env" "^4.0.2"
"@webgpu/types" "^0.1.34"
Expand Down

0 comments on commit 4f276b7

Please sign in to comment.