diff --git a/Assets/Fungus/Scripts/Components/Variable.cs b/Assets/Fungus/Scripts/Components/Variable.cs
index 6f8969d1..9c4cb9e3 100644
--- a/Assets/Fungus/Scripts/Components/Variable.cs
+++ b/Assets/Fungus/Scripts/Components/Variable.cs
@@ -6,6 +6,36 @@ using System;
namespace Fungus
{
+ ///
+ /// Standard comparison operators.
+ ///
+ public enum CompareOperator
+ {
+ /// == mathematical operator.
+ Equals,
+ /// != mathematical operator.
+ NotEquals,
+ /// < mathematical operator.
+ LessThan,
+ /// > mathematical operator.
+ GreaterThan,
+ /// <= mathematical operator.
+ LessThanOrEquals,
+ /// >= mathematical operator.
+ GreaterThanOrEquals
+ }
+
+ ///
+ /// Scope types for Variables.
+ ///
+ public enum VariableScope
+ {
+ /// Can only be accessed by commands in the same Flowchart.
+ Private,
+ /// Can be accessed from any command in any Flowchart.
+ Public
+ }
+
///
/// Attribute class for variables.
///
@@ -48,18 +78,27 @@ namespace Fungus
/// Abstract base class for variables.
///
[RequireComponent(typeof(Flowchart))]
- public abstract class Variable : MonoBehaviour, IVariable
+ public abstract class Variable : MonoBehaviour
{
[SerializeField] protected VariableScope scope;
[SerializeField] protected string key = "";
- #region IVariable implementation
+ #region Public methods
+ ///
+ /// Visibility scope for the variable.
+ ///
public virtual VariableScope Scope { get { return scope; } }
+ ///
+ /// String identifier for the variable.
+ ///
public virtual string Key { get { return key; } set { key = value; } }
+ ///
+ /// Callback to reset the variable if the Flowchart is reset.
+ ///
public abstract void OnReset();
#endregion
diff --git a/Assets/Fungus/Scripts/Interfaces/IVariable.cs b/Assets/Fungus/Scripts/Interfaces/IVariable.cs
deleted file mode 100644
index 38ef0bb1..00000000
--- a/Assets/Fungus/Scripts/Interfaces/IVariable.cs
+++ /dev/null
@@ -1,56 +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)
-
-namespace Fungus
-{
- ///
- /// Standard comparison operators.
- ///
- public enum CompareOperator
- {
- /// == mathematical operator.
- Equals,
- /// != mathematical operator.
- NotEquals,
- /// < mathematical operator.
- LessThan,
- /// > mathematical operator.
- GreaterThan,
- /// <= mathematical operator.
- LessThanOrEquals,
- /// >= mathematical operator.
- GreaterThanOrEquals
- }
-
- ///
- /// Scope types for Variables.
- ///
- public enum VariableScope
- {
- /// Can only be accessed by commands in the same Flowchart.
- Private,
- /// Can be accessed from any command in any Flowchart.
- Public
- }
-
- ///
- /// A Fungus variable that can be used with Commands.
- ///
- public interface IVariable
- {
- ///
- /// Visibility scope for the variable.
- ///
- VariableScope Scope { get; }
-
- ///
- /// String identifier for the variable.
- ///
- string Key { get; set; }
-
- ///
- /// Callback to reset the variable if the Flowchart is reset.
- ///
- void OnReset();
- }
-}
diff --git a/Assets/Fungus/Scripts/Interfaces/IVariable.cs.meta b/Assets/Fungus/Scripts/Interfaces/IVariable.cs.meta
deleted file mode 100644
index 29e4d18f..00000000
--- a/Assets/Fungus/Scripts/Interfaces/IVariable.cs.meta
+++ /dev/null
@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 75ff90e0b811142d39cc9031dbf4b992
-timeCreated: 1473856441
-licenseType: Free
-MonoImporter:
- serializedVersion: 2
- defaultReferences: []
- executionOrder: 0
- icon: {instanceID: 0}
- userData:
- assetBundleName:
- assetBundleVariant: