@luma.gl/shadertools 9.0.8 → 9.0.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/dist.dev.js +203 -79
- package/dist/dist.min.js +10 -8
- package/dist/index.cjs +2 -0
- package/dist/index.cjs.map +2 -2
- package/dist/modules/engine/picking/picking.js +2 -0
- package/package.json +2 -2
- package/src/modules/engine/picking/picking.ts +4 -4
|
@@ -35,7 +35,9 @@ void picking_setPickingColor(vec3 pickingColor) {
|
|
|
35
35
|
pickingColor = picking_normalizeColor(pickingColor);
|
|
36
36
|
if (bool(picking.isActive)) {
|
|
37
37
|
picking_vRGBcolor_Avalid.a = float(picking_isColorValid(pickingColor));
|
|
38
|
+
if (!bool(picking.isAttribute)) {
|
|
38
39
|
picking_vRGBcolor_Avalid.rgb = pickingColor;
|
|
40
|
+
}
|
|
39
41
|
} else {
|
|
40
42
|
picking_vRGBcolor_Avalid.a = float(isVertexHighlighted(pickingColor));
|
|
41
43
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@luma.gl/shadertools",
|
|
3
|
-
"version": "9.0.
|
|
3
|
+
"version": "9.0.9",
|
|
4
4
|
"description": "Shader module system for luma.gl",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"license": "MIT",
|
|
@@ -52,5 +52,5 @@
|
|
|
52
52
|
"@math.gl/core": "^4.0.0",
|
|
53
53
|
"@math.gl/types": "^4.0.0"
|
|
54
54
|
},
|
|
55
|
-
"gitHead": "
|
|
55
|
+
"gitHead": "1715a33d52c6d23227cd3f62e163a40ea9acec9e"
|
|
56
56
|
}
|
|
@@ -95,10 +95,10 @@ void picking_setPickingColor(vec3 pickingColor) {
|
|
|
95
95
|
// Use alpha as the validity flag. If pickingColor is [0, 0, 0] fragment is non-pickable
|
|
96
96
|
picking_vRGBcolor_Avalid.a = float(picking_isColorValid(pickingColor));
|
|
97
97
|
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
98
|
+
if (!bool(picking.isAttribute)) {
|
|
99
|
+
// Stores the picking color so that the fragment shader can render it during picking
|
|
100
|
+
picking_vRGBcolor_Avalid.rgb = pickingColor;
|
|
101
|
+
}
|
|
102
102
|
} else {
|
|
103
103
|
// Do the comparison with selected item color in vertex shader as it should mean fewer compares
|
|
104
104
|
picking_vRGBcolor_Avalid.a = float(isVertexHighlighted(pickingColor));
|