- Unity PackageManager support; package.json, *.asmdef for Package an…

…d its Editor folder

- SoVariableReference handles null variable value
- .editorconfig with Unix style newlines (due to format of where Shawn is currently working)

Assets/SoArchitecture/.editorconfig

@@ -0,0 +1,11 @@
+# The purpose of .editorconfig files are explained on https://docs.microsoft.com/en-us/visualstudio/ide/create-portable-custom-editor-options
+
+# top-most EditorConfig file
+root = false
+
+# Phab forced formatting is UTF-8/ASCII Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+trim_trailing_whitespace = true
+insert_final_newline = true
+charset = utf-8

Assets/SoArchitecture/Editor/EditorSoArchitecture.asmdef

@@ -0,0 +1,12 @@
+{
+    "name": "EditorSoArchitecture",
+    "references": [
+        "SoArchitecture"
+    ],
+    "optionalUnityReferences": [],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false
+}

Assets/SoArchitecture/Events/Editor/EventEditor.cs → Assets/SoArchitecture/Editor/Events/EditorEvent.cs

@@ -1,4 +1,4 @@
-// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 // Unite 2017 - Game Architecture with Scriptable Objects
 // 
 // Author: Ryan Hipple
@@ -12,7 +12,7 @@
 namespace SoArchitecture
 {
     [CustomEditor(typeof(GameEvent))]
-    public class EventEditor : Editor
+    public class EditorSoEvent : Editor
     {
         public override void OnInspectorGUI()
         {
@@ -27,21 +27,21 @@ public override void OnInspectorGUI()
     }
 
     [CustomEditor(typeof(GameEventBool))]
-    public class EventBoolEditor : EventPayloadEditor<bool, GameEventBool>
+    public class EditorSoEventBool : EditorSoEventPayload<bool, GameEventBool>
     {
     }
 
     [CustomEditor(typeof(GameEventFloat))]
-    public class EventFloatEditor : EventPayloadEditor<float, GameEventFloat>
+    public class EditorSoEventFloat : EditorSoEventPayload<float, GameEventFloat>
     {
     }
 
     [CustomEditor(typeof(GameEventInt))]
-    public class EventIntEditor : EventPayloadEditor<int, GameEventInt>
+    public class EditorSoEventInt : EditorSoEventPayload<int, GameEventInt>
     {
     }
 
-    public class EventPayloadEditor<TPayload, TGameEvent> : Editor
+    public class EditorSoEventPayload<TPayload, TGameEvent> : Editor
         where TGameEvent : class, IGameEvent<TPayload>
     {
         public override void OnInspectorGUI()
@@ -57,4 +57,4 @@ public override void OnInspectorGUI()
             GUILayout.Label("LastPayload: " + e.LastPayload.ToString());
         }
     }
-}
+}

Assets/SoArchitecture/Variables/Editor/SoReferenceDrawer.cs → Assets/SoArchitecture/Editor/Variables/DrawerSoReference.cs

@@ -1,4 +1,4 @@
-using UnityEditor;
+using UnityEditor;
 using UnityEngine;
 
 /// <summary>
@@ -11,7 +11,7 @@ namespace SoArchitecture
     [CustomPropertyDrawer(typeof(FloatReference))]
     [CustomPropertyDrawer(typeof(IntReference))]
     [CustomPropertyDrawer(typeof(StringReference))]
-    public class SoReferenceDrawer : PropertyDrawer
+    public class DrawerSoReference : PropertyDrawer
     {
         /// <summary>
         /// Options to display in the popup to select constant or variable.
@@ -118,4 +118,4 @@ SerializedProperty watchValue(SerializedProperty property)
             return asSerializedObject.FindProperty("Value");
         }
     }
-}
+}

Assets/SoArchitecture/Events/GameEvent.cs

@@ -1,4 +1,4 @@
-// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 // Unite 2017 - Game Architecture with Scriptable Objects
 // 
 // Author: Ryan Hipple
@@ -38,4 +38,4 @@ public void UnregisterListener(GameEventListener listener)
                 eventListeners.Remove(listener);
         }
     }
-}
+}

Assets/SoArchitecture/Events/GameEventBool.cs

@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 

Assets/SoArchitecture/Events/GameEventFloat.cs

@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 

Assets/SoArchitecture/Events/GameEventInt.cs

@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 

Assets/SoArchitecture/Events/GameEventListener.cs

@@ -1,4 +1,4 @@
-// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 // Unite 2017 - Game Architecture with Scriptable Objects
 // 
 // Author: Ryan Hipple
@@ -34,4 +34,4 @@ public void OnEventRaised()
             Response.Invoke();
         }
     }
-}
+}

Assets/SoArchitecture/Events/GameEventListenerBool.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;

Assets/SoArchitecture/Events/GameEventListenerFloat.cs

@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.Events;

Assets/SoArchitecture/Events/GameEventListenerInt.cs

@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.Events;

Assets/SoArchitecture/Events/GameEventPayload.cs

@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 

Assets/SoArchitecture/Events/UnityEventRaiser.cs

@@ -1,4 +1,4 @@
-// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 // Unite 2017 - Game Architecture with Scriptable Objects
 // 
 // Author: Ryan Hipple
@@ -19,4 +19,4 @@ public void OnEnable()
             OnEnableEvent.Invoke();
         }
     }
-}
+}

Assets/SoArchitecture/Readme.md

@@ -0,0 +1,31 @@
+# Goal
+
+ScriptableObjects used for variables and events
+
+# Inspiration
+
+Ryan Hippies' Unite Austin 2017 talk
+* [The video for the talk is posted on Unity's YouTube page.](https://www.youtube.com/watch?v=raQ3iHhE_Kk)
+* [Here is a blog post he did about the talk](http://www.roboryantron.com/2017/10/unite-2017-game-architecture-with.html)
+* [The slides are on slideshare.](https://www.slideshare.net/RyanHipple/game-architecture-with-scriptable-objects)
+
+# Setup
+
+### Installation
+
+These steps require Unity 2018.1.x or greater.
+
+1. Download a release SoArchitecture0.0.x.zip from https://github.com/Feddas/SoArchitecture/releases
+
+2. Unzip SoArchitecture0.0.x.zip into your projects Packages folder while Unity is closed. If Unity is open during the file transfer, Unity needs to be restarted to recognize the package.
+
+```
+ProjectFolder <- This should match the name of your Unity project
+ + Assets folder
+ + Packages folder <- Unzip into this folder
+     + SoArchitecture0.0.x <- This folder should be created from unzipping
+```
+
+3. Start Unity
+
+[Official package manager info](https://blogs.unity3d.com/2018/05/09/unity-packages-life-cycle/).

Assets/SoArchitecture/SoArchitecture.asmdef

@@ -0,0 +1,3 @@
+{
+	"name": "SoArchitecture"
+}

Assets/SoArchitecture/Variables/BoolVariable.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using UnityEngine;
 
 /// <summary>
@@ -15,4 +15,4 @@ public void Toggle()
             Value = Value == false;
         }
     }
-}
+}

Assets/SoArchitecture/Variables/FloatVariable.cs

@@ -1,4 +1,4 @@
-// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 // Unite 2017 - Game Architecture with Scriptable Objects
 // 
 // Author: Ryan Hipple
@@ -24,4 +24,4 @@ public void ApplyChange(FloatVariable amount)
             Value += amount.Value;
         }
     }
-}
+}

Assets/SoArchitecture/Variables/IntVariable.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using UnityEngine;
 
 /// <summary>
@@ -20,4 +20,4 @@ public void ApplyChange(IntVariable amount)
             Value += amount.Value;
         }
     }
-}
+}

Assets/SoArchitecture/Variables/SoVariableBase.cs

@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
@@ -58,4 +58,4 @@ public void SetValue(SoVariableBase<T> value)
             Value = value.Value;
         }
     }
-}
+}

Assets/SoArchitecture/Variables/SoVariableReference.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 
 /// <summary>
 /// Scriptable Objects fork https://github.com/Feddas/Unite2017SoArchitecture
@@ -54,7 +54,9 @@ public T StartingValue
         {
             get
             {
-                return UseConstant ? startingConstant : Variable.StartingValue;
+                return UseConstant || Variable == null
+                    ? startingConstant
+                    : Variable.StartingValue;
             }
         }
 
@@ -92,9 +94,14 @@ public T Value
                 }
                 else
                 {
+                    if (Variable == null)
+                    {
+                        throw new Exception("SoVariable has not been set. If you don't want to use one, click the dropdown and set 'Use Constant'");
+                    }
+
                     Variable.Value = value;
                 }
             }
         }
     }
-}
+}

Assets/SoArchitecture/Variables/StringVariable.cs

@@ -1,4 +1,4 @@
-// ----------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
 // Unite 2017 - Game Architecture with Scriptable Objects
 // 
 // Author: Ryan Hipple

Assets/SoArchitecture/package.json

@@ -0,0 +1,13 @@
+{
+    "packageId": "",
+    "version": "0.0.1",
+    "resolvedPath": "",
+    "name": "com.feddas.soarchitecture",
+    "displayName": "ScriptableObject Architecture",
+    "category": "",
+    "description": "ScriptableObjects used for variables and events",
+    "unity": "2018.2.0f2",
+    "keywords": [
+        "architecture"
+    ]
+}

README.md

@@ -6,3 +6,7 @@ This is the source for the sample project I presented at Unite 2017. It features
 * [The video for the talk is posted on Unity's YouTube page.](https://www.youtube.com/watch?v=raQ3iHhE_Kk)
 * [Here is a blog post I did about the talk](http://www.roboryantron.com/2017/10/unite-2017-game-architecture-with.html)
 * [The slides are on slideshare.](https://www.slideshare.net/RyanHipple/game-architecture-with-scriptable-objects)
+
+# Package Manager
+
+Releases of SoArchitecture are meant to be used with the Unity3D Package Manager. Instructions for using SoArchitecture as a Unity Package: [SoArchitecture/Readme.md](/Assets/SoArchitecture/Readme.md)