m-vz/modular-vr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

correctly colour SymbolButton by button state, independently of event order

Browse Source
This commit is contained in:
milan
2022-11-22 11:54:20 +01:00
parent 2833c4d897
commit bc95843f44
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Desert/Runtime/Button.cs
View File

@@ -35,7 +35,7 @@ namespace EscapeRoomEngine.Desert.Runtime
public event ButtonEventHandler ButtonEvent; public event ButtonEventHandler ButtonEvent;
[ShowNativeProperty] [ShowNativeProperty]
private bool Active protected bool Active
{ {
get => _active; get => _active;
set set
@@ -51,7 +51,7 @@ namespace EscapeRoomEngine.Desert.Runtime
} }
[ShowNativeProperty] [ShowNativeProperty]
private bool Pressed protected bool Pressed
{ {
get => _pressed; get => _pressed;
set set

14
Assets/Desert/Runtime/Puzzle A/SymbolButton.cs
View File

@@ -24,14 +24,16 @@ namespace EscapeRoomEngine.Desert.Runtime.Puzzle_A
{ {
base.Start(); base.Start();
ButtonEvent += (_, type) => ButtonEvent += (_, _) =>
{ {
var color = type switch var color = theme.puzzleColor;
if (!Active)
{ {
ButtonEventType.Pressed => theme.activeColor, color = theme.solvedColor;
ButtonEventType.Deactivated => theme.solvedColor, } else if (Pressed)
_ => theme.puzzleColor {
}; color = theme.activeColor;
}
_material.SetColor(FresnelColor, color); _material.SetColor(FresnelColor, color);
_material.SetColor(Color, color); _material.SetColor(Color, color);