diff --git a/Assets/Fungus/Scripts/Components/Stage.cs b/Assets/Fungus/Scripts/Components/Stage.cs index fe796a82..fdc1188f 100644 --- a/Assets/Fungus/Scripts/Components/Stage.cs +++ b/Assets/Fungus/Scripts/Components/Stage.cs @@ -12,7 +12,7 @@ namespace Fungus /// Define a set of screen positions where character sprites can be displayed. /// [ExecuteInEditMode] - public class Stage : PortraitController, IStage + public class Stage : PortraitController { [Tooltip("Canvas object containing the stage positions.")] [SerializeField] protected Canvas portraitCanvas; @@ -76,26 +76,57 @@ namespace Fungus return Stage.activeStages[0]; } - #region IStage implementation + #region Public methods + /// + /// Canvas object containing the stage positions. + /// public virtual Canvas PortraitCanvas { get { return portraitCanvas; } } + /// + /// Dim portraits when a character is not speaking. + /// public virtual bool DimPortraits { get { return dimPortraits; } set { dimPortraits = value; } } + /// + /// Duration for fading character portraits in / out. + /// public virtual float FadeDuration { get { return fadeDuration; } set { fadeDuration = value; } } + /// + /// Duration for moving characters to a new position. + /// public virtual float MoveDuration { get { return moveDuration; } set { moveDuration = value; } } + /// + /// Ease type for the fade tween. + /// public virtual LeanTweenType FadeEaseType { get { return fadeEaseType; } } + /// + /// Constant offset to apply to portrait position. + /// public virtual Vector2 ShiftOffset { get { return shiftOffset; } } + /// + /// The position object where characters appear by default. + /// public virtual Image DefaultPosition { get { return defaultPosition; } } + /// + /// List of stage position rect transforms in the stage. + /// public virtual List Positions { get { return positions; } } + /// + /// List of currently active characters on the stage. + /// public virtual List CharactersOnStage { get { return charactersOnStage; } } + /// + /// Searches the stage's named positions + /// If none matches the string provided, give a warning and return a new RectTransform + /// public RectTransform GetPosition(string positionString) { if (string.IsNullOrEmpty(positionString)) diff --git a/Assets/Fungus/Scripts/Interfaces/IStage.cs b/Assets/Fungus/Scripts/Interfaces/IStage.cs deleted file mode 100644 index cb554b1c..00000000 --- a/Assets/Fungus/Scripts/Interfaces/IStage.cs +++ /dev/null @@ -1,66 +0,0 @@ -// This code is part of the Fungus library (http://fungusgames.com) maintained by Chris Gregan (http://twitter.com/gofungus). -// It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE) - -using UnityEngine; -using UnityEngine.UI; -using System.Collections.Generic; - -namespace Fungus -{ - /// - /// Define a set of screen positions where character sprites can be displayed. - /// - public interface IStage - { - /// - /// Canvas object containing the stage positions. - /// - Canvas PortraitCanvas { get; } - - /// - /// Dim portraits when a character is not speaking. - /// - bool DimPortraits { get; set; } - - /// - /// Duration for fading character portraits in / out. - /// - float FadeDuration { get; set; } - - /// - /// Duration for moving characters to a new position. - /// - float MoveDuration { get; set; } - - /// - /// Ease type for the fade tween. - /// - LeanTweenType FadeEaseType { get; } - - /// - /// Constant offset to apply to portrait position. - /// - Vector2 ShiftOffset { get; } - - /// - /// The position object where characters appear by default. - /// - Image DefaultPosition { get; } - - /// - /// List of stage position rect transforms in the stage. - /// - List Positions { get; } - - /// - /// List of currently active characters on the stage. - /// - List CharactersOnStage { get; } - - /// - /// Searches the stage's named positions - /// If none matches the string provided, give a warning and return a new RectTransform - /// - RectTransform GetPosition(string positionString); - } -} \ No newline at end of file diff --git a/Assets/Fungus/Scripts/Interfaces/IStage.cs.meta b/Assets/Fungus/Scripts/Interfaces/IStage.cs.meta deleted file mode 100644 index 55f45506..00000000 --- a/Assets/Fungus/Scripts/Interfaces/IStage.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: a88bde623f95a46e49febd46fe50b19c -timeCreated: 1473689190 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: