Merge branch 'master' of https://github.com/elraccoone/unity-entity-component-system

Author: jeffreylanters

README.md

@@ -136,7 +136,7 @@ public abstract class Controller {
   /// Check whether this controller has a service.
   public bool HasService<S> () where S : IService, new();
   /// Gets an asset from this controller.
-  public UnityEngine.Object GetAsset (string name);
+  public AssetType GetAsset<AssetType> (string name);
   /// Check whether this controller has an asset.
   public bool HasAsset (string name);
 }

Runtime/Controller.cs

@@ -216,10 +216,10 @@ public System.Object GetService (System.Type typeOf) {
     }
 
     /// Gets an asset from this controller.
-    public UnityEngine.Object GetAsset (string name) {
+    public AssetType GetAsset<AssetType> (string name) where AssetType : UnityEngine.Object {
       for (var _i = 0; _i < this.assets.Length; _i++)
         if (this.assets[_i].name == name)
-          return this.assets[_i];
+          return this.assets[_i] as AssetType;
       throw new System.Exception ("Unable to get asset, it was not added to the controller");
     }
 

Runtime/EntityComponent.cs

@@ -55,7 +55,7 @@ public UnityEngine.Object AddAsset (UnityEngine.Object asset) =>
 
     /// Loads a asset from the controller and adds it as an asset to the entity.
     public UnityEngine.Object AddAsset (string name) =>
-      this.AddAsset (Controller.Instance.GetAsset (name));
+      this.AddAsset (Controller.Instance.GetAsset<UnityEngine.Object> (name));
 
     /// Sets the position of an entity.
     public void SetPosition (float x, float y, float z = 0) =>