From 8e9eec978dd9856a8400a300028219977b92cec2 Mon Sep 17 00:00:00 2001 From: milan Date: Thu, 24 Nov 2022 11:28:19 +0100 Subject: [PATCH] store module size in module state --- Assets/Engine/Runtime/Modules/DoorModule.cs | 5 +---- Assets/Engine/Runtime/Modules/ModuleState.cs | 2 ++ Assets/Engine/Runtime/Modules/PuzzleModule.cs | 5 +---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Assets/Engine/Runtime/Modules/DoorModule.cs b/Assets/Engine/Runtime/Modules/DoorModule.cs index 7b6cc8d..60bae77 100644 --- a/Assets/Engine/Runtime/Modules/DoorModule.cs +++ b/Assets/Engine/Runtime/Modules/DoorModule.cs @@ -17,10 +17,7 @@ namespace EscapeRoomEngine.Engine.Runtime.Modules internal DoorState DoorState => DoorState.FromState(State); - internal DoorModule(Space space, DoorModuleDescription description) : base(space, description) - { - srDimensions.Size = Vector2Int.one; // door always has size 1x1 - } + internal DoorModule(Space space, DoorModuleDescription description) : base(space, description) {} internal override void InstantiateModule(Transform parent) { diff --git a/Assets/Engine/Runtime/Modules/ModuleState.cs b/Assets/Engine/Runtime/Modules/ModuleState.cs index cd4ab7e..5578269 100644 --- a/Assets/Engine/Runtime/Modules/ModuleState.cs +++ b/Assets/Engine/Runtime/Modules/ModuleState.cs @@ -4,6 +4,8 @@ namespace EscapeRoomEngine.Engine.Runtime.Modules { public abstract class ModuleState : MonoBehaviour { + public Vector2Int size = Vector2Int.one; + public abstract void SetModule(Module module); public override string ToString() diff --git a/Assets/Engine/Runtime/Modules/PuzzleModule.cs b/Assets/Engine/Runtime/Modules/PuzzleModule.cs index 7b9087d..d3ef707 100644 --- a/Assets/Engine/Runtime/Modules/PuzzleModule.cs +++ b/Assets/Engine/Runtime/Modules/PuzzleModule.cs @@ -7,10 +7,7 @@ namespace EscapeRoomEngine.Engine.Runtime.Modules { internal PuzzleState PuzzleState => PuzzleState.FromState(State); - internal PuzzleModule(Space space, PuzzleModuleDescription description) : base(space, description) - { - srDimensions.Size = Vector2Int.one; // TODO: larger modules - } + internal PuzzleModule(Space space, PuzzleModuleDescription description) : base(space, description) {} internal override void InstantiateModule(Transform parent) {