From 614f07d3d53d33a527f471ab6b12b78158faa876 Mon Sep 17 00:00:00 2001
From: Joshua Granick <jgranick@users.noreply.github.com>
Date: Mon, 12 Dec 2016 16:47:07 -0800
Subject: [PATCH] Add more fields

---
 lime/utils/AssetManifest.hx | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/lime/utils/AssetManifest.hx b/lime/utils/AssetManifest.hx
index 695034841..9062ad25d 100644
--- a/lime/utils/AssetManifest.hx
+++ b/lime/utils/AssetManifest.hx
@@ -3,6 +3,7 @@ package lime.utils;
 
 import haxe.Serializer;
 import haxe.Unserializer;
+import lime.app.Future;
 import lime.utils.Bytes;
 
 #if !macro
@@ -28,9 +29,7 @@ class AssetManifest {
 	}
 	
 	
-	public static function fromFile (path:String):AssetManifest {
-		
-		var bytes = Bytes.fromFile (path);
+	public static function fromBytes (bytes:Bytes):AssetManifest {
 		
 		if (bytes != null) {
 			
@@ -45,6 +44,31 @@ class AssetManifest {
 	}
 	
 	
+	public static function fromFile (path:String):AssetManifest {
+		
+		return fromBytes (Bytes.fromFile (path));
+		
+	}
+	
+	
+	public static function loadFromBytes (bytes:Bytes):Future<AssetManifest> {
+		
+		return Future.withValue (fromBytes (bytes));
+		
+	}
+	
+	
+	public static function loadFromFile (path:String):Future<AssetManifest> {
+		
+		return Bytes.loadFromFile (path).then (function (bytes) {
+			
+			return Future.withValue (fromBytes (bytes));
+			
+		});
+		
+	}
+	
+	
 	public static function parse (data:String):AssetManifest {
 		
 		#if !macro