Merge pull request #117 from modjke/dev

Updates for Texture, Resource, ResourceLoader

src/pixi/core/textures/Texture.hx

@@ -89,13 +89,6 @@ extern class Texture extends EventEmitter {
 	 */
 	var crop:Rectangle;
 
-	/**
-	 * The pivot point to used for a sprite this texture belongs to.
-	 *
-	 * @member {Point}
-	 */
-	var spritePivot:Point;
-
 	/**
 	 * The rotation value of the texture, copied to a sprite when assigned to it.
 	 *

src/pixi/loaders/Resource.hx

@@ -1,5 +1,6 @@
 package pixi.loaders;
 
+import pixi.core.textures.Spritesheet;
 import pixi.core.textures.Texture;
 
 extern class Resource {
@@ -23,6 +24,8 @@ extern class Resource {
 
 	var textures:Dynamic<Texture>;
 
+	var spritesheet:Spritesheet;
+
 	var bitmapFont:Dynamic;
 
 	/**

src/pixi/loaders/ResourceLoader.hx

@@ -106,7 +106,7 @@ extern class ResourceLoader extends EventEmitter {
 	 * @param middleware {function} The middleware function to register.
 	 * @return {Loader}
 	 */
-	function after(fn:Resource -> Dynamic -> Void):ResourceLoader;
+	function after(fn:Resource -> (Void->Void) -> Void):ResourceLoader;
 
 	/**
 	 * Sets up a middleware function that will run *before* the
@@ -116,7 +116,7 @@ extern class ResourceLoader extends EventEmitter {
 	 * @param middleware {function} The middleware function to register.
 	 * @return {Loader}
 	 */
-	function before(fn:Resource -> Dynamic -> Void):ResourceLoader;
+	function before(fn:Resource -> (Void->Void) -> Void):ResourceLoader;
 
 	/**
 	 * Resets the queue of the loader to prepare for a new load.
@@ -147,14 +147,14 @@ extern class ResourceLoader extends EventEmitter {
 	 *
 	 * @param {function} function to call
 	 */
-	function use(fn:Resource -> Dynamic -> Void):Void;
+	function use(fn:Resource -> (Void->Void) -> Void):Void;
 
 	/**
 	 * Middleware function
 	 *
 	 * @param {function} function to call
 	 */
-	function pre(fn:Resource -> Dynamic -> Void):ResourceLoader;
+	function pre(fn:Resource -> (Void->Void) -> Void):ResourceLoader;
 }
 
 typedef ResourceObject = {