Skip to content

Commit ebf6a2f

Browse files
stephanheiglgithub-actions[bot]
authored andcommitted
Support string color definitions in model source model-color
GitOrigin-RevId: 8e75948c435a4d7b73f1079673af06e09cd34081
1 parent 958b2ce commit ebf6a2f

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

3d-style/source/model_source.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ class ModelSource extends Evented<SourceEvents> implements ISource {
261261
}
262262
Object.entries(overrides).forEach(([key, value]) => {
263263

264-
const modelColor = value['model-color'] as number[];
264+
const modelColor = ModelSource.arrayFromColorSpecification(value['model-color'] as ColorSpecification | undefined);
265265
const materialOverride: MaterialOverride = {
266266
color: modelColor !== undefined ? new Color(modelColor[0], modelColor[1], modelColor[2]) : new Color(1, 1, 1),
267267
colorMix: 0,

test/integration/render-tests/model-layer/model-state/model-source/style.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,16 @@
4040
"orientation": [0, 0, 0],
4141
"materialOverrides": {
4242
"body": {
43-
"model-color": [0.00775, 0.03458, 0.43854],
43+
"model-color": "rgba(2, 9, 112, 1)",
4444
"model-color-mix-intensity": 1.0
4545
},
4646
"lights_brakes": {
4747
"model-color": [0.88, 0.0, 0.0],
4848
"model-color-mix-intensity": 1.0,
4949
"model-emissive-strength": 0.8
5050
},
51-
"lights-brakes_reverse": {
52-
"model-color": [0.88, 0.0, 0.0],
51+
"lights-brakes_reverse": {
52+
"model-color": [0.88, 0.0, 0.0],
5353
"model-color-mix-intensity": 1.0,
5454
"model-emissive-strength": 0.8
5555
}

0 commit comments

Comments
 (0)