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

rename DefaultEngine to be more readable

Browse Source
This commit is contained in:
milan
2022-12-14 20:07:25 +01:00
parent 65b4cecd9b
commit 22458e6d18
16 changed files with 40 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,12 +28,12 @@ namespace EscapeRoomEngine.Desert.Runtime.Dispenser
{ {
CloseHatch(); CloseHatch();
dispenseButton.Disable(); dispenseButton.Disable();
_light.color = Engine.Runtime.Engine.DefaultEngine.theme.solvedColor.hdr; _light.color = Engine.Runtime.Engine.Theme.solvedColor.hdr;
} }
else else
{ {
dispenseButton.Enable(); dispenseButton.Enable();
_light.color = Engine.Runtime.Engine.DefaultEngine.theme.puzzleColor.hdr; _light.color = Engine.Runtime.Engine.Theme.puzzleColor.hdr;
} }
} }
} }

6
Assets/Desert/Runtime/HoloButton.cs
View File

@@ -23,13 +23,13 @@ namespace EscapeRoomEngine.Desert.Runtime
ButtonEvent += (_, _) => ButtonEvent += (_, _) =>
{ {
var color = Engine.Runtime.Engine.DefaultEngine.theme.puzzleColor; var color = Engine.Runtime.Engine.Theme.puzzleColor;
if (!Active) if (!Active)
{ {
color = Engine.Runtime.Engine.DefaultEngine.theme.solvedColor; color = Engine.Runtime.Engine.Theme.solvedColor;
} else if (Pressed) } else if (Pressed)
{ {
color = Engine.Runtime.Engine.DefaultEngine.theme.activeColor; color = Engine.Runtime.Engine.Theme.activeColor;
} }
_material.SetColor(FresnelColor, color.hdr); _material.SetColor(FresnelColor, color.hdr);

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

@@ -28,12 +28,12 @@ namespace EscapeRoomEngine.Desert.Runtime
switch (type) switch (type)
{ {
case PuzzleEventType.Restarted: case PuzzleEventType.Restarted:
var color = Engine.Runtime.Engine.DefaultEngine.theme.puzzleColor; var color = Engine.Runtime.Engine.Theme.puzzleColor;
rings.ForEach(ring => ring.color = color.hdr); rings.ForEach(ring => ring.color = color.hdr);
_dispenser.Reset(); _dispenser.Reset();
break; break;
case PuzzleEventType.Solved: case PuzzleEventType.Solved:
color = Engine.Runtime.Engine.DefaultEngine.theme.solvedColor; color = Engine.Runtime.Engine.Theme.solvedColor;
rings.ForEach(ring => ring.color = color.hdr); rings.ForEach(ring => ring.color = color.hdr);
_dispenser.Solve(); _dispenser.Solve();
break; break;

4
Assets/Desert/Runtime/Portal/DesertPortal.cs
View File

@@ -20,10 +20,10 @@ namespace EscapeRoomEngine.Desert.Runtime.Portal
switch (type) switch (type)
{ {
case DoorEventType.Unlocked: case DoorEventType.Unlocked:
_emission.color = Engine.Runtime.Engine.DefaultEngine.theme.solvedColor.hdr; _emission.color = Engine.Runtime.Engine.Theme.solvedColor.hdr;
break; break;
case DoorEventType.Locked: case DoorEventType.Locked:
_emission.color = Engine.Runtime.Engine.DefaultEngine.theme.puzzleColor.hdr; _emission.color = Engine.Runtime.Engine.Theme.puzzleColor.hdr;
break; break;
} }
}; };

4
Assets/Desert/Runtime/Puzzle A/Ball.cs
View File

@@ -18,8 +18,8 @@ namespace EscapeRoomEngine.Desert.Runtime.Puzzle_A
set set
{ {
statusLight.color = value ? statusLight.color = value ?
Engine.Runtime.Engine.DefaultEngine.theme.puzzleColor.hdr Engine.Runtime.Engine.Theme.puzzleColor.hdr
: Engine.Runtime.Engine.DefaultEngine.theme.solvedColor.hdr; : Engine.Runtime.Engine.Theme.solvedColor.hdr;
ring.rotating = value; ring.rotating = value;
if (!value) if (!value)
{ {

4
Assets/Desert/Runtime/Puzzle A/Terminal.cs
View File

@@ -46,12 +46,12 @@ namespace EscapeRoomEngine.Desert.Runtime.Puzzle_A
{ {
case PuzzleEventType.Restarted: case PuzzleEventType.Restarted:
_ball.Active = true; _ball.Active = true;
terminalLight.color = Engine.Runtime.Engine.DefaultEngine.theme.puzzleColor.hdr; terminalLight.color = Engine.Runtime.Engine.Theme.puzzleColor.hdr;
symbols.ForEach(symbol => symbol.Enable()); symbols.ForEach(symbol => symbol.Enable());
break; break;
case PuzzleEventType.Solved: case PuzzleEventType.Solved:
_ball.Active = false; _ball.Active = false;
terminalLight.color = Engine.Runtime.Engine.DefaultEngine.theme.solvedColor.hdr; terminalLight.color = Engine.Runtime.Engine.Theme.solvedColor.hdr;
symbols.ForEach(symbol => symbol.Disable()); symbols.ForEach(symbol => symbol.Disable());
break; break;
case PuzzleEventType.WrongInput: case PuzzleEventType.WrongInput:

4
Assets/Desert/Runtime/Puzzle B/PuzzleB.cs
View File

@@ -42,14 +42,14 @@ namespace EscapeRoomEngine.Desert.Runtime.Puzzle_B
switch (type) switch (type)
{ {
case PuzzleEventType.Restarted: case PuzzleEventType.Restarted:
var color = Engine.Runtime.Engine.DefaultEngine.theme.puzzleColor; var color = Engine.Runtime.Engine.Theme.puzzleColor;
crystal.Color = color; crystal.Color = color;
lights.ForEach(emission => emission.color = color.hdr); lights.ForEach(emission => emission.color = color.hdr);
rotators.ForEach(rotator => rotator.Emission.color = color.hdr); rotators.ForEach(rotator => rotator.Emission.color = color.hdr);
buttonActions.ForEach(action => action.button.Enable()); buttonActions.ForEach(action => action.button.Enable());
break; break;
case PuzzleEventType.Solved: case PuzzleEventType.Solved:
color = Engine.Runtime.Engine.DefaultEngine.theme.solvedColor; color = Engine.Runtime.Engine.Theme.solvedColor;
crystal.Color = color; crystal.Color = color;
lights.ForEach(emission => emission.color = color.hdr); lights.ForEach(emission => emission.color = color.hdr);
rotators.ForEach(rotator => rotator.Emission.color = color.hdr); rotators.ForEach(rotator => rotator.Emission.color = color.hdr);

4
Assets/Desert/Runtime/Puzzle C/Hole.cs
View File

@@ -30,7 +30,7 @@ namespace EscapeRoomEngine.Desert.Runtime.Puzzle_C
{ {
if (Active) if (Active)
{ {
var color = Engine.Runtime.Engine.DefaultEngine.theme.activeColor; var color = Engine.Runtime.Engine.Theme.activeColor;
orb.Color = color.hdr; orb.Color = color.hdr;
Emission.color = color.hdr; Emission.color = color.hdr;
@@ -44,7 +44,7 @@ namespace EscapeRoomEngine.Desert.Runtime.Puzzle_C
var orb = other.GetComponent<DispenserOrb>(); var orb = other.GetComponent<DispenserOrb>();
if (orb != null) if (orb != null)
{ {
var color = Engine.Runtime.Engine.DefaultEngine.theme.puzzleColor; var color = Engine.Runtime.Engine.Theme.puzzleColor;
if (Active) if (Active)
{ {

6
Assets/Desert/Runtime/Puzzle C/Holes.cs
View File

@@ -31,7 +31,7 @@ namespace EscapeRoomEngine.Desert.Runtime.Puzzle_C
switch (type) switch (type)
{ {
case PuzzleEventType.Restarted: case PuzzleEventType.Restarted:
var color = Engine.Runtime.Engine.DefaultEngine.theme.puzzleColor; var color = Engine.Runtime.Engine.Theme.puzzleColor;
_holes.ForEach(hole => _holes.ForEach(hole =>
{ {
hole.Enable(); hole.Enable();
@@ -41,8 +41,8 @@ namespace EscapeRoomEngine.Desert.Runtime.Puzzle_C
_dispenser.Reset(); _dispenser.Reset();
break; break;
case PuzzleEventType.Solved: case PuzzleEventType.Solved:
var solvedColor = Engine.Runtime.Engine.DefaultEngine.theme.solvedColor; var solvedColor = Engine.Runtime.Engine.Theme.solvedColor;
var activeColor = Engine.Runtime.Engine.DefaultEngine.theme.activeColor; var activeColor = Engine.Runtime.Engine.Theme.activeColor;
_holes.ForEach(hole => _holes.ForEach(hole =>
{ {
hole.Disable(); hole.Disable();

16
Assets/Engine/Runtime/Editor/EngineEditor.cs
View File

@@ -43,7 +43,7 @@ namespace EscapeRoomEngine.Engine.Runtime.Editor
{ {
if (EditorApplication.isPlaying) if (EditorApplication.isPlaying)
{ {
Engine.DefaultEngine.CurrentRoom.Match(some: room => room.EnterRoom()); Engine.Instance.CurrentRoom.Match(some: room => room.EnterRoom());
UpdateUI(); UpdateUI();
} }
} }
@@ -52,7 +52,7 @@ namespace EscapeRoomEngine.Engine.Runtime.Editor
{ {
if (EditorApplication.isPlaying) if (EditorApplication.isPlaying)
{ {
Engine.DefaultEngine.CurrentRoom.Match(some: room => room.SkipRoom()); Engine.Instance.CurrentRoom.Match(some: room => room.SkipRoom());
UpdateUI(); UpdateUI();
} }
} }
@@ -61,8 +61,8 @@ namespace EscapeRoomEngine.Engine.Runtime.Editor
{ {
if (EditorApplication.isPlaying) if (EditorApplication.isPlaying)
{ {
Engine.DefaultEngine.CurrentRoom.Match(some: room => room.SkipRoom()); Engine.Instance.CurrentRoom.Match(some: room => room.SkipRoom());
Engine.DefaultEngine.CurrentRoom.Match(some: room => room.EnterRoom()); Engine.Instance.CurrentRoom.Match(some: room => room.EnterRoom());
UpdateUI(); UpdateUI();
} }
} }
@@ -73,7 +73,7 @@ namespace EscapeRoomEngine.Engine.Runtime.Editor
{ {
if (!_registeredUpdateEvent) if (!_registeredUpdateEvent)
{ {
Engine.DefaultEngine.UpdateUIEvent += UpdateUI; Engine.Instance.UpdateUIEvent += UpdateUI;
_registeredUpdateEvent = true; _registeredUpdateEvent = true;
} }
} }
@@ -82,9 +82,9 @@ namespace EscapeRoomEngine.Engine.Runtime.Editor
_registeredUpdateEvent = false; _registeredUpdateEvent = false;
} }
_passToNextRoomButton.SetEnabled(EditorApplication.isPlaying && Engine.DefaultEngine.NumberOfRooms > 1); _passToNextRoomButton.SetEnabled(EditorApplication.isPlaying && Engine.Instance.NumberOfRooms > 1);
_skipCurrentRoomButton.SetEnabled(EditorApplication.isPlaying && Engine.DefaultEngine.NumberOfRooms > 0); _skipCurrentRoomButton.SetEnabled(EditorApplication.isPlaying && Engine.Instance.NumberOfRooms > 0);
_skipAndPassButton.SetEnabled(EditorApplication.isPlaying && Engine.DefaultEngine.NumberOfRooms > 0); _skipAndPassButton.SetEnabled(EditorApplication.isPlaying && Engine.Instance.NumberOfRooms > 0);
} }
} }
#endif #endif

3
Assets/Engine/Runtime/Engine.cs
View File

@@ -12,7 +12,8 @@ namespace EscapeRoomEngine.Engine.Runtime
{ {
public class Engine : MonoBehaviour public class Engine : MonoBehaviour
{ {
public static Engine DefaultEngine public static EngineTheme Theme => Instance.theme;
public static Engine Instance
{ {
get get
{ {

2
Assets/Engine/Runtime/Measurements/Puzzle.cs
View File

@@ -27,7 +27,7 @@ namespace EscapeRoomEngine.Engine.Runtime.Measurements
public override string ToString() public override string ToString()
{ {
return $"{Engine.DefaultEngine.theme.GetPuzzle(ID)}: avg. {AverageTimeToSolve.ToTimeSpan():m':'ss} ({string.Join(", ", Measurements)})"; return $"{Engine.Theme.GetPuzzle(ID)}: avg. {AverageTimeToSolve.ToTimeSpan():m':'ss} ({string.Join(", ", Measurements)})";
} }
} }
} }

2
Assets/Engine/Runtime/Passage.cs
View File

@@ -12,7 +12,7 @@ namespace EscapeRoomEngine.Engine.Runtime
internal Passage(DoorModule from) internal Passage(DoorModule from)
{ {
if (!from.IsExit && !from.description.Equals(Engine.DefaultEngine.theme.spawnDoor)) if (!from.IsExit && !from.description.Equals(Engine.Theme.spawnDoor))
{ {
throw new WrongTypeException(DoorType.Exit, DoorType.Entrance); throw new WrongTypeException(DoorType.Exit, DoorType.Entrance);
} }

6
Assets/Engine/Runtime/Room.cs
View File

@@ -83,12 +83,12 @@ namespace EscapeRoomEngine.Engine.Runtime
{ {
// generate a new room as soon as the player completes all puzzles in this one // generate a new room as soon as the player completes all puzzles in this one
case DoorEventType.Unlocked when !LastRoom && door.Equals(exit.fromOut): case DoorEventType.Unlocked when !LastRoom && door.Equals(exit.fromOut):
Engine.DefaultEngine.GenerateRoom(); Engine.Instance.GenerateRoom();
break; break;
// start measurements on every puzzle as soon as the player enters the last room // start measurements on every puzzle as soon as the player enters the last room
case DoorEventType.ExitedFrom when door.Equals(entrance.toIn) && Engine.DefaultEngine.CurrentRoom.Contains(this): case DoorEventType.ExitedFrom when door.Equals(entrance.toIn) && Engine.Instance.CurrentRoom.Contains(this):
_puzzles.ForEach(puzzle => Measure.StartMeasuring((PuzzleModuleDescription)puzzle.description)); _puzzles.ForEach(puzzle => Measure.StartMeasuring((PuzzleModuleDescription)puzzle.description));
Engine.DefaultEngine.HidePreviousRoom(); Engine.Instance.HidePreviousRoom();
break; break;
} }
}; };

6
Assets/Engine/Runtime/Space.cs
View File

@@ -46,8 +46,8 @@ namespace EscapeRoomEngine.Engine.Runtime
this.room = room; this.room = room;
rrPlacement = GenerateSpaceDimensions( rrPlacement = GenerateSpaceDimensions(
entrance, entrance,
Engine.DefaultEngine.theme.minRoomSize.ProjectAtFloor(), Engine.Theme.minRoomSize.ProjectAtFloor(),
Engine.DefaultEngine.theme.playSpace.ProjectAtFloor()); Engine.Theme.playSpace.ProjectAtFloor());
// connect the space to its passage // connect the space to its passage
entrance.PlaceEntrance(new DoorModule(this, entrance.PlaceEntrance(new DoorModule(this,
@@ -119,7 +119,7 @@ namespace EscapeRoomEngine.Engine.Runtime
else else
location = left ? TileLocation.W : right ? TileLocation.E : TileLocation.C; location = left ? TileLocation.W : right ? TileLocation.E : TileLocation.C;
var tileObject = Object.Instantiate(Engine.DefaultEngine.theme.spaceTile, _spaceTiles.transform, false); var tileObject = Object.Instantiate(Engine.Theme.spaceTile, _spaceTiles.transform, false);
tileObject.transform.localPosition = new Vector3(x, 0, z); tileObject.transform.localPosition = new Vector3(x, 0, z);
tileObject.showTile = location; tileObject.showTile = location;
} }

4
Assets/Engine/Runtime/UI/GameControl.cs
View File

@@ -41,7 +41,7 @@ namespace EscapeRoomEngine.Engine.Runtime.UI
private void Awake() private void Awake()
{ {
_targetTime = Engine.DefaultEngine.initialTargetTime; _targetTime = Engine.Instance.initialTargetTime;
} }
private void Start() private void Start()
@@ -82,7 +82,7 @@ namespace EscapeRoomEngine.Engine.Runtime.UI
_timeElapsed = 0; _timeElapsed = 0;
// generate the first room if it hasn't been generated yet // generate the first room if it hasn't been generated yet
Engine.DefaultEngine.CurrentRoom.Match(none: () => Engine.DefaultEngine.GenerateRoom()); Engine.Instance.CurrentRoom.Match(none: () => Engine.Instance.GenerateRoom());
// start a new session // start a new session
Measure.StartSession(); Measure.StartSession();