From 1d3fdf9a06660550b693a227f01f70de9af3ed62 Mon Sep 17 00:00:00 2001 From: Christopher Date: Mon, 26 Sep 2016 16:10:35 +0100 Subject: [PATCH] Reverted IView interface --- Assets/Fungus/Scripts/Components/View.cs | 13 +++++++-- Assets/Fungus/Scripts/Interfaces/IView.cs | 29 ------------------- .../Fungus/Scripts/Interfaces/IView.cs.meta | 12 -------- 3 files changed, 11 insertions(+), 43 deletions(-) delete mode 100644 Assets/Fungus/Scripts/Interfaces/IView.cs delete mode 100644 Assets/Fungus/Scripts/Interfaces/IView.cs.meta diff --git a/Assets/Fungus/Scripts/Components/View.cs b/Assets/Fungus/Scripts/Components/View.cs index bebefd5a..2faa309b 100644 --- a/Assets/Fungus/Scripts/Components/View.cs +++ b/Assets/Fungus/Scripts/Components/View.cs @@ -10,7 +10,7 @@ namespace Fungus /// The position and rotation are specified using the game object's transform, so this class only needs to specify the ortographic view size. /// [ExecuteInEditMode] - public class View : MonoBehaviour, IView + public class View : MonoBehaviour { [Tooltip("Orthographic size of the camera view in world units.")] [SerializeField] protected float viewSize = 0.5f; @@ -27,12 +27,21 @@ namespace Fungus transform.localScale = new Vector3(1,1,1); } - #region IView implementation + #region Public methods + /// + /// Orthographic size of the camera view in world units. + /// public virtual float ViewSize { get { return viewSize; } set { viewSize = value; } } + /// + /// Aspect ratio of the primary view rectangle. e.g. a 4:3 aspect ratio = 1.333. + /// public virtual Vector2 PrimaryAspectRatio { get { return primaryAspectRatio; } set { primaryAspectRatio = value; } } + /// + /// Aspect ratio of the secondary view rectangle. e.g. a 2:1 aspect ratio = 2/1 = 2.0. + /// public virtual Vector2 SecondaryAspectRatio { get { return secondaryAspectRatio; } set { secondaryAspectRatio = value; } } #endregion diff --git a/Assets/Fungus/Scripts/Interfaces/IView.cs b/Assets/Fungus/Scripts/Interfaces/IView.cs deleted file mode 100644 index a1e55e97..00000000 --- a/Assets/Fungus/Scripts/Interfaces/IView.cs +++ /dev/null @@ -1,29 +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; - -namespace Fungus -{ - /// - /// Defines a camera view point. - /// The position and rotation are specified using the game object's transform, so this class only needs to specify the ortographic view size. - /// - public interface IView - { - /// - /// Orthographic size of the camera view in world units. - /// - float ViewSize { get; set; } - - /// - /// Aspect ratio of the primary view rectangle. e.g. a 4:3 aspect ratio = 1.333. - /// - Vector2 PrimaryAspectRatio { get; set; } - - /// - /// Aspect ratio of the secondary view rectangle. e.g. a 2:1 aspect ratio = 2/1 = 2.0. - /// - Vector2 SecondaryAspectRatio { get; set; } - } -} \ No newline at end of file diff --git a/Assets/Fungus/Scripts/Interfaces/IView.cs.meta b/Assets/Fungus/Scripts/Interfaces/IView.cs.meta deleted file mode 100644 index 9dde8775..00000000 --- a/Assets/Fungus/Scripts/Interfaces/IView.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: d50490011ddfc4e6ea394a4bfbf815e0 -timeCreated: 1473676064 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: