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

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

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

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

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

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

@@ -27,7 +27,7 @@ namespace EscapeRoomEngine.Engine.Runtime.Measurements
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)
{
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);
}

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
case DoorEventType.Unlocked when !LastRoom && door.Equals(exit.fromOut):
Engine.DefaultEngine.GenerateRoom();
Engine.Instance.GenerateRoom();
break;
// 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));
Engine.DefaultEngine.HidePreviousRoom();
Engine.Instance.HidePreviousRoom();
break;
}
};

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

@@ -46,8 +46,8 @@ namespace EscapeRoomEngine.Engine.Runtime
this.room = room;
rrPlacement = GenerateSpaceDimensions(
entrance,
Engine.DefaultEngine.theme.minRoomSize.ProjectAtFloor(),
Engine.DefaultEngine.theme.playSpace.ProjectAtFloor());
Engine.Theme.minRoomSize.ProjectAtFloor(),
Engine.Theme.playSpace.ProjectAtFloor());
// connect the space to its passage
entrance.PlaceEntrance(new DoorModule(this,
@@ -119,7 +119,7 @@ namespace EscapeRoomEngine.Engine.Runtime
else
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.showTile = location;
}

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

@@ -41,7 +41,7 @@ namespace EscapeRoomEngine.Engine.Runtime.UI
private void Awake()
{
_targetTime = Engine.DefaultEngine.initialTargetTime;
_targetTime = Engine.Instance.initialTargetTime;
}
private void Start()
@@ -82,7 +82,7 @@ namespace EscapeRoomEngine.Engine.Runtime.UI
_timeElapsed = 0;
// 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
Measure.StartSession();