epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix color picker again

Browse Source
This commit is contained in:
Chris Forbes
2010-08-12 19:35:32 +12:00
parent 7cd9afb6d2
commit 4328fbc350
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Game/Graphics/Viewport.cs
View File

@@ -73,12 +73,16 @@ namespace OpenRA.Graphics
Timer.Time( "endFrame: {0}" ); Timer.Time( "endFrame: {0}" );
} }
public void RefreshPalette()
{
Game.world.WorldRenderer.palette.Update(
Game.world.WorldActor.traits.WithInterface<IPaletteModifier>());
}
public void Tick() public void Tick()
{ {
cursorFrame += 0.5f; cursorFrame += 0.5f;
RefreshPalette();
Game.world.WorldRenderer.palette.Update(
Game.world.WorldActor.traits.WithInterface<IPaletteModifier>());
} }
public float2 ViewToWorld(int2 loc) public float2 ViewToWorld(int2 loc)

2
OpenRA.Game/Widgets/Delegates/LobbyDelegate.cs
View File

@@ -148,6 +148,7 @@ namespace OpenRA.Widgets.Delegates
colorChooser.GetWidget<ButtonWidget>("BUTTON_OK").OnMouseUp = mi => colorChooser.GetWidget<ButtonWidget>("BUTTON_OK").OnMouseUp = mi =>
{ {
colorChooser.IsVisible = () => false; colorChooser.IsVisible = () => false;
UpdateColorPreview(hueSlider.GetOffset(), satSlider.GetOffset(), lumSlider.GetOffset(), rangeSlider.GetOffset());
UpdatePlayerColor(hueSlider.GetOffset(), satSlider.GetOffset(), lumSlider.GetOffset(), rangeSlider.GetOffset()); UpdatePlayerColor(hueSlider.GetOffset(), satSlider.GetOffset(), lumSlider.GetOffset(), rangeSlider.GetOffset());
return true; return true;
}; };
@@ -175,6 +176,7 @@ namespace OpenRA.Widgets.Delegates
var c1 = ColorFromHSL(hf, sf, lf); var c1 = ColorFromHSL(hf, sf, lf);
var c2 = ColorFromHSL(hf, sf, r*lf); var c2 = ColorFromHSL(hf, sf, r*lf);
Game.world.WorldRenderer.UpdatePalette("colorpicker", new Palette(BasePlayerPalette, new PlayerColorRemap(c1, c2, SplitPlayerPalette))); Game.world.WorldRenderer.UpdatePalette("colorpicker", new Palette(BasePlayerPalette, new PlayerColorRemap(c1, c2, SplitPlayerPalette)));
Game.viewport.RefreshPalette();
} }
// hk is hue in the range [0,1] instead of [0,360] // hk is hue in the range [0,1] instead of [0,360]