mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-06-21 08:00:43 +00:00
Classic icons: darken player color for icon glyph instead of black (#4246)
## Summary The "classic icons" graphics setting currently renders structure icon glyphs as flat black. In the v0.31 canvas renderer, classic icons used `structureColors().dark` — a darkened version of the owning player's territory color. This PR restores that look in the WebGL renderer. - New `structure.iconDarken` render setting (HSV value multiplier on the player fill color; `0` = off, default). - New `uIconDarken` uniform in `structure.frag.glsl`: when > 0, the glyph color is `darken(playerFill, uIconDarken)` instead of the flat `uIconColor`. - Classic mode (`classicIcons: true`) now sets `iconDarken = 0.45` instead of `iconR/G/B = 0`. Border darken, fill, and the 0.75 translucency are unchanged. - Default (non-classic) icons are unaffected (white glyph, `iconDarken = 0`). Under-construction structures keep the gray fill, so their glyph darkens to a darker gray — matching v31's construction styling. ## Verification Drove a solo game headlessly with classic icons on and built structures: glyphs render as darkened versions of each player's color (dark purple on a purple player, per-bot hues on bot structures). Pixel-sampled the screenshot: glyph measured `rgb(89,58,142)` vs `rgb(84,50,139)` predicted for the 0.45-darkened player color at 0.75 alpha (flat black would measure `rgb(38,26,60)`). Control run with classic off shows the unchanged white glyph. `tests/GraphicsOverrides.test.ts` updated; all pass. 🤖 Generated with [Claude Code](https://claude.com/claude-code) --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
@@ -211,19 +211,17 @@ describe("applyGraphicsOverrides", () => {
|
||||
expect(s.structure).toEqual(defaults.structure);
|
||||
});
|
||||
|
||||
test("classicIcons=true → light shape + dark icon + 0.75 alpha", () => {
|
||||
test("classicIcons=true → light shape + dark icon + 0.9 alpha", () => {
|
||||
const s = gen({
|
||||
structure: { classicIcons: true },
|
||||
}).structure;
|
||||
// Shape (circle behind) is mostly player color, lightly darkened.
|
||||
expect(s.fillDarken).toBe(1.0);
|
||||
expect(s.borderDarken).toBe(0.7);
|
||||
// Icon glyph itself is black.
|
||||
expect(s.iconR).toBe(0);
|
||||
expect(s.iconG).toBe(0);
|
||||
expect(s.iconB).toBe(0);
|
||||
// Icon glyph is a darkened version of the player color.
|
||||
expect(s.iconDarken).toBe(0.3);
|
||||
// Slightly translucent in classic mode.
|
||||
expect(s.iconAlpha).toBe(0.75);
|
||||
expect(s.iconAlpha).toBe(0.9);
|
||||
});
|
||||
|
||||
test("classicIcons=false or absent → keeps render-settings.json defaults (fully opaque)", () => {
|
||||
@@ -233,12 +231,12 @@ describe("applyGraphicsOverrides", () => {
|
||||
}).structure;
|
||||
expect(off.borderDarken).toBe(defaults.borderDarken);
|
||||
expect(off.fillDarken).toBe(defaults.fillDarken);
|
||||
expect(off.iconR).toBe(defaults.iconR);
|
||||
expect(off.iconDarken).toBe(0);
|
||||
expect(off.iconAlpha).toBe(1);
|
||||
const absent = gen({ structure: {} }).structure;
|
||||
expect(absent.borderDarken).toBe(defaults.borderDarken);
|
||||
expect(absent.fillDarken).toBe(defaults.fillDarken);
|
||||
expect(absent.iconR).toBe(defaults.iconR);
|
||||
expect(absent.iconDarken).toBe(0);
|
||||
expect(absent.iconAlpha).toBe(1);
|
||||
});
|
||||
|
||||
@@ -303,6 +301,6 @@ describe("applyGraphicsOverrides", () => {
|
||||
expect(s.name.nameScaleFactor).toBe(0.9);
|
||||
expect(s.structure.borderDarken).toBe(0.7);
|
||||
expect(s.structure.fillDarken).toBe(1.0);
|
||||
expect(s.structure.iconAlpha).toBe(0.75);
|
||||
expect(s.structure.iconAlpha).toBe(0.9);
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user