From dac8490106ebf344eb261141eab9285c1f067cf6 Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Sat, 17 Jan 2015 23:45:05 +0000 Subject: [PATCH] Changed VariableData classes back to using structs The Unity serialisation system is flaky at serialising non-Unity Object derived classes. It seems to handle structs with less issues. --- .../FungusScript/Scripts/VariableTypes/BooleanVariable.cs | 2 +- .../Fungus/FungusScript/Scripts/VariableTypes/ColorVariable.cs | 2 +- .../Fungus/FungusScript/Scripts/VariableTypes/FloatVariable.cs | 2 +- .../FungusScript/Scripts/VariableTypes/GameObjectVariable.cs | 2 +- .../FungusScript/Scripts/VariableTypes/IntegerVariable.cs | 2 +- .../FungusScript/Scripts/VariableTypes/MaterialVariable.cs | 2 +- .../Fungus/FungusScript/Scripts/VariableTypes/ObjectVariable.cs | 2 +- .../Fungus/FungusScript/Scripts/VariableTypes/SpriteVariable.cs | 2 +- .../Fungus/FungusScript/Scripts/VariableTypes/StringVariable.cs | 2 +- .../FungusScript/Scripts/VariableTypes/TextureVariable.cs | 2 +- .../FungusScript/Scripts/VariableTypes/Vector2Variable.cs | 2 +- .../FungusScript/Scripts/VariableTypes/Vector3Variable.cs | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Assets/Fungus/FungusScript/Scripts/VariableTypes/BooleanVariable.cs b/Assets/Fungus/FungusScript/Scripts/VariableTypes/BooleanVariable.cs index 7428ddaa..659c9c69 100644 --- a/Assets/Fungus/FungusScript/Scripts/VariableTypes/BooleanVariable.cs +++ b/Assets/Fungus/FungusScript/Scripts/VariableTypes/BooleanVariable.cs @@ -11,7 +11,7 @@ namespace Fungus {} [System.Serializable] - public class BooleanData + public struct BooleanData { [SerializeField] public BooleanVariable booleanRef; diff --git a/Assets/Fungus/FungusScript/Scripts/VariableTypes/ColorVariable.cs b/Assets/Fungus/FungusScript/Scripts/VariableTypes/ColorVariable.cs index 3fa89c1e..9f859fea 100644 --- a/Assets/Fungus/FungusScript/Scripts/VariableTypes/ColorVariable.cs +++ b/Assets/Fungus/FungusScript/Scripts/VariableTypes/ColorVariable.cs @@ -9,7 +9,7 @@ namespace Fungus {} [System.Serializable] - public class ColorData + public struct ColorData { [SerializeField] public ColorVariable colorRef; diff --git a/Assets/Fungus/FungusScript/Scripts/VariableTypes/FloatVariable.cs b/Assets/Fungus/FungusScript/Scripts/VariableTypes/FloatVariable.cs index ea737d05..879915a6 100644 --- a/Assets/Fungus/FungusScript/Scripts/VariableTypes/FloatVariable.cs +++ b/Assets/Fungus/FungusScript/Scripts/VariableTypes/FloatVariable.cs @@ -9,7 +9,7 @@ namespace Fungus {} [System.Serializable] - public class FloatData + public struct FloatData { [SerializeField] public FloatVariable floatRef; diff --git a/Assets/Fungus/FungusScript/Scripts/VariableTypes/GameObjectVariable.cs b/Assets/Fungus/FungusScript/Scripts/VariableTypes/GameObjectVariable.cs index 15d498e9..76f4859c 100644 --- a/Assets/Fungus/FungusScript/Scripts/VariableTypes/GameObjectVariable.cs +++ b/Assets/Fungus/FungusScript/Scripts/VariableTypes/GameObjectVariable.cs @@ -9,7 +9,7 @@ namespace Fungus {} [System.Serializable] - public class GameObjectData + public struct GameObjectData { [SerializeField] public GameObjectVariable gameObjectRef; diff --git a/Assets/Fungus/FungusScript/Scripts/VariableTypes/IntegerVariable.cs b/Assets/Fungus/FungusScript/Scripts/VariableTypes/IntegerVariable.cs index eafc8fe7..1d2b9a11 100644 --- a/Assets/Fungus/FungusScript/Scripts/VariableTypes/IntegerVariable.cs +++ b/Assets/Fungus/FungusScript/Scripts/VariableTypes/IntegerVariable.cs @@ -9,7 +9,7 @@ namespace Fungus {} [System.Serializable] - public class IntegerData + public struct IntegerData { [SerializeField] public IntegerVariable integerRef; diff --git a/Assets/Fungus/FungusScript/Scripts/VariableTypes/MaterialVariable.cs b/Assets/Fungus/FungusScript/Scripts/VariableTypes/MaterialVariable.cs index 3d31bf06..81d05a1e 100644 --- a/Assets/Fungus/FungusScript/Scripts/VariableTypes/MaterialVariable.cs +++ b/Assets/Fungus/FungusScript/Scripts/VariableTypes/MaterialVariable.cs @@ -9,7 +9,7 @@ namespace Fungus {} [System.Serializable] - public class MaterialData + public struct MaterialData { [SerializeField] public MaterialVariable materialRef; diff --git a/Assets/Fungus/FungusScript/Scripts/VariableTypes/ObjectVariable.cs b/Assets/Fungus/FungusScript/Scripts/VariableTypes/ObjectVariable.cs index bae4f56d..04d28a95 100644 --- a/Assets/Fungus/FungusScript/Scripts/VariableTypes/ObjectVariable.cs +++ b/Assets/Fungus/FungusScript/Scripts/VariableTypes/ObjectVariable.cs @@ -9,7 +9,7 @@ namespace Fungus {} [System.Serializable] - public class ObjectData + public struct ObjectData { [SerializeField] public ObjectVariable objectRef; diff --git a/Assets/Fungus/FungusScript/Scripts/VariableTypes/SpriteVariable.cs b/Assets/Fungus/FungusScript/Scripts/VariableTypes/SpriteVariable.cs index 69d7cde8..abe3203c 100644 --- a/Assets/Fungus/FungusScript/Scripts/VariableTypes/SpriteVariable.cs +++ b/Assets/Fungus/FungusScript/Scripts/VariableTypes/SpriteVariable.cs @@ -9,7 +9,7 @@ namespace Fungus {} [System.Serializable] - public class SpriteData + public struct SpriteData { [SerializeField] public SpriteVariable spriteRef; diff --git a/Assets/Fungus/FungusScript/Scripts/VariableTypes/StringVariable.cs b/Assets/Fungus/FungusScript/Scripts/VariableTypes/StringVariable.cs index 9907bbf1..08e7f907 100644 --- a/Assets/Fungus/FungusScript/Scripts/VariableTypes/StringVariable.cs +++ b/Assets/Fungus/FungusScript/Scripts/VariableTypes/StringVariable.cs @@ -10,7 +10,7 @@ namespace Fungus {} [System.Serializable] - public class StringData + public struct StringData { [SerializeField] public StringVariable stringRef; diff --git a/Assets/Fungus/FungusScript/Scripts/VariableTypes/TextureVariable.cs b/Assets/Fungus/FungusScript/Scripts/VariableTypes/TextureVariable.cs index 102d4679..a242491c 100644 --- a/Assets/Fungus/FungusScript/Scripts/VariableTypes/TextureVariable.cs +++ b/Assets/Fungus/FungusScript/Scripts/VariableTypes/TextureVariable.cs @@ -9,7 +9,7 @@ namespace Fungus {} [System.Serializable] - public class TextureData + public struct TextureData { [SerializeField] public TextureVariable textureRef; diff --git a/Assets/Fungus/FungusScript/Scripts/VariableTypes/Vector2Variable.cs b/Assets/Fungus/FungusScript/Scripts/VariableTypes/Vector2Variable.cs index 0f9b2a2c..b67f092f 100644 --- a/Assets/Fungus/FungusScript/Scripts/VariableTypes/Vector2Variable.cs +++ b/Assets/Fungus/FungusScript/Scripts/VariableTypes/Vector2Variable.cs @@ -9,7 +9,7 @@ namespace Fungus {} [System.Serializable] - public class Vector2Data + public struct Vector2Data { [SerializeField] public Vector2Variable vector2Ref; diff --git a/Assets/Fungus/FungusScript/Scripts/VariableTypes/Vector3Variable.cs b/Assets/Fungus/FungusScript/Scripts/VariableTypes/Vector3Variable.cs index b86a514e..baacea1c 100644 --- a/Assets/Fungus/FungusScript/Scripts/VariableTypes/Vector3Variable.cs +++ b/Assets/Fungus/FungusScript/Scripts/VariableTypes/Vector3Variable.cs @@ -9,7 +9,7 @@ namespace Fungus {} [System.Serializable] - public class Vector3Data + public struct Vector3Data { [SerializeField] public Vector3Variable vector3Ref;