Move hooks from Application into Module class

openfl · Mar 4, 2015 · 3811e90 · 3811e90
1 parent cbf2386
commit 3811e90
Show file tree

Hide file tree

Showing 2 changed files with 165 additions and 163 deletions.
diff --git a/lime/app/Application.hx b/lime/app/Application.hx
@@ -1,10 +1,7 @@
 package lime.app;
 
 
-import lime.graphics.RenderContext;
 import lime.graphics.Renderer;
-import lime.ui.KeyCode;
-import lime.ui.KeyModifier;
 import lime.ui.Window;
 
 
@@ -128,152 +125,6 @@ class Application extends Module {
 	}
 
 
-	/**
-	 * The init() method is called once before the first render()
-	 * call. This can be used to do initial set-up for the current
-	 * render context
-	 * @param	context The current render context
-	 */
-	public function init (context:RenderContext):Void { }
-
-
-	/**
-	 * Called when a key down event is fired
-	 * @param	keyCode	The code of the key that was pressed
-	 * @param	modifier	The modifier of the key that was pressed
-	 */
-	public function onKeyDown (keyCode:KeyCode, modifier:KeyModifier):Void { }
-
-
-	/**
-	 * Called when a key up event is fired
-	 * @param	keyCode	The code of the key that was released
-	 * @param	modifier	The modifier of the key that was released
-	 */
-	public function onKeyUp (keyCode:KeyCode, modifier:KeyModifier):Void { }
-
-
-	/**
-	 * Called when a mouse down event is fired
-	 * @param	x	The current x coordinate of the mouse
-	 * @param	y	The current y coordinate of the mouse
-	 * @param	button	The ID of the mouse button that was pressed
-	 */
-	public function onMouseDown (x:Float, y:Float, button:Int):Void { }
-
-
-	/**
-	 * Called when a mouse move event is fired
-	 * @param	x	The current x coordinate of the mouse
-	 * @param	y	The current y coordinate of the mouse
-	 * @param	button	The ID of the mouse button that was pressed
-	 */
-	public function onMouseMove (x:Float, y:Float, button:Int):Void { }
-
-
-	/**
-	 * Called when a mouse up event is fired
-	 * @param	x	The current x coordinate of the mouse
-	 * @param	y	The current y coordinate of the mouse
-	 * @param	button	The ID of the button that was released
-	 */
-	public function onMouseUp (x:Float, y:Float, button:Int):Void { }
-
-
-	/**
-	 * Called when a mouse wheel event is fired
-	 * @param	deltaX	The amount of horizontal scrolling (if applicable)
-	 * @param	deltaY	The amount of vertical scrolling (if applicable)
-	 */
-	public function onMouseWheel (deltaX:Float, deltaY:Float):Void { }
-
-
-	/**
-	 * Called when a render context is lost
-	 */
-	public function onRenderContextLost ():Void { }
-
-
-	/**
-	 * Called when a render context is restored
-	 * @param	context	The current render context
-	 */
-	public function onRenderContextRestored (context:RenderContext):Void { }
-
-
-	/**
-	 * Called when a touch end event is fired
-	 * @param	x	The current x coordinate of the touch point
-	 * @param	y	The current y coordinate of the touch point
-	 * @param	id	The ID of the touch point
-	 */
-	public function onTouchEnd (x:Float, y:Float, id:Int):Void { }
-
-
-	/**
-	 * Called when a touch move event is fired
-	 * @param	x	The current x coordinate of the touch point
-	 * @param	y	The current y coordinate of the touch point
-	 * @param	id	The ID of the touch point
-	 */
-	public function onTouchMove (x:Float, y:Float, id:Int):Void { }
-
-
-	/**
-	 * Called when a touch start event is fired
-	 * @param	x	The current x coordinate of the touch point
-	 * @param	y	The current y coordinate of the touch point
-	 * @param	id	The ID of the touch point
-	 */
-	public function onTouchStart (x:Float, y:Float, id:Int):Void { }
-
-
-	/**
-	 * Called when a window activate event is fired
-	 */
-	public function onWindowActivate ():Void { }
-
-
-	/**
-	 * Called when a window close event is fired
-	 */
-	public function onWindowClose ():Void { }
-
-
-	/**
-	 * Called when a window deactivate event is fired
-	 */
-	public function onWindowDeactivate ():Void { }
-
-
-	/**
-	 * Called when a window focus in event is fired
-	 */
-	public function onWindowFocusIn ():Void { }
-
-
-	/**
-	 * Called when a window focus out event is fired
-	 */
-	public function onWindowFocusOut ():Void { }
-
-
-	/**
-	 * Called when a window move event is fired
-	 * @param	x	The x position of the window
-	 * @param	y	The y position of the window
-	 */
-	public function onWindowMove (x:Float, y:Float):Void { }
-
-
-	/**
-	 * Called when a window resize event is fired
-	 * @param	width	The width of the window
-	 * @param	height	The height of the window
-	 */
-	public function onWindowResize (width:Int, height:Int):Void {}
-
-
 	/**
 	 * Removes a Renderer from the Application
 	 * @param	renderer	A Renderer object to add
@@ -305,20 +156,6 @@ class Application extends Module {
 	}
 
 
-	/**
-	 * Called when a render event is fired
-	 * @param	context	The current render context
-	 */
-	public function render (context:RenderContext):Void { }
-
-
-	/**
-	 * Called when an update event is fired
-	 * @param	deltaTime	The amount of time in milliseconds that has elapsed since the last update
-	 */
-	public function update (deltaTime:Int):Void { }
-
-
 
 
 	// Get & Set Methods

diff --git a/lime/app/Module.hx b/lime/app/Module.hx
@@ -1,6 +1,11 @@
 package lime.app;
 
 
+import lime.graphics.RenderContext;
+import lime.ui.KeyCode;
+import lime.ui.KeyModifier;
+
+
 class Module {
 
 
@@ -11,4 +16,164 @@ class Module {
 	}
 
 
+	/**
+	 * The init() method is called once before the first render()
+	 * call. This can be used to do initial set-up for the current
+	 * render context
+	 * @param	context The current render context
+	 */
+	public function init (context:RenderContext):Void { }
+
+
+	/**
+	 * Called when a key down event is fired
+	 * @param	keyCode	The code of the key that was pressed
+	 * @param	modifier	The modifier of the key that was pressed
+	 */
+	public function onKeyDown (keyCode:KeyCode, modifier:KeyModifier):Void { }
+
+
+	/**
+	 * Called when a key up event is fired
+	 * @param	keyCode	The code of the key that was released
+	 * @param	modifier	The modifier of the key that was released
+	 */
+	public function onKeyUp (keyCode:KeyCode, modifier:KeyModifier):Void { }
+
+
+	/**
+	 * Called when a mouse down event is fired
+	 * @param	x	The current x coordinate of the mouse
+	 * @param	y	The current y coordinate of the mouse
+	 * @param	button	The ID of the mouse button that was pressed
+	 */
+	public function onMouseDown (x:Float, y:Float, button:Int):Void { }
+
+
+	/**
+	 * Called when a mouse move event is fired
+	 * @param	x	The current x coordinate of the mouse
+	 * @param	y	The current y coordinate of the mouse
+	 * @param	button	The ID of the mouse button that was pressed
+	 */
+	public function onMouseMove (x:Float, y:Float, button:Int):Void { }
+
+
+	/**
+	 * Called when a mouse up event is fired
+	 * @param	x	The current x coordinate of the mouse
+	 * @param	y	The current y coordinate of the mouse
+	 * @param	button	The ID of the button that was released
+	 */
+	public function onMouseUp (x:Float, y:Float, button:Int):Void { }
+
+
+	/**
+	 * Called when a mouse wheel event is fired
+	 * @param	deltaX	The amount of horizontal scrolling (if applicable)
+	 * @param	deltaY	The amount of vertical scrolling (if applicable)
+	 */
+	public function onMouseWheel (deltaX:Float, deltaY:Float):Void { }
+
+
+	/**
+	 * Called when a render context is lost
+	 */
+	public function onRenderContextLost ():Void { }
+
+
+	/**
+	 * Called when a render context is restored
+	 * @param	context	The current render context
+	 */
+	public function onRenderContextRestored (context:RenderContext):Void { }
+
+
+	/**
+	 * Called when a touch end event is fired
+	 * @param	x	The current x coordinate of the touch point
+	 * @param	y	The current y coordinate of the touch point
+	 * @param	id	The ID of the touch point
+	 */
+	public function onTouchEnd (x:Float, y:Float, id:Int):Void { }
+
+
+	/**
+	 * Called when a touch move event is fired
+	 * @param	x	The current x coordinate of the touch point
+	 * @param	y	The current y coordinate of the touch point
+	 * @param	id	The ID of the touch point
+	 */
+	public function onTouchMove (x:Float, y:Float, id:Int):Void { }
+
+
+	/**
+	 * Called when a touch start event is fired
+	 * @param	x	The current x coordinate of the touch point
+	 * @param	y	The current y coordinate of the touch point
+	 * @param	id	The ID of the touch point
+	 */
+	public function onTouchStart (x:Float, y:Float, id:Int):Void { }
+
+
+	/**
+	 * Called when a window activate event is fired
+	 */
+	public function onWindowActivate ():Void { }
+
+
+	/**
+	 * Called when a window close event is fired
+	 */
+	public function onWindowClose ():Void { }
+
+
+	/**
+	 * Called when a window deactivate event is fired
+	 */
+	public function onWindowDeactivate ():Void { }
+
+
+	/**
+	 * Called when a window focus in event is fired
+	 */
+	public function onWindowFocusIn ():Void { }
+
+
+	/**
+	 * Called when a window focus out event is fired
+	 */
+	public function onWindowFocusOut ():Void { }
+
+
+	/**
+	 * Called when a window move event is fired
+	 * @param	x	The x position of the window
+	 * @param	y	The y position of the window
+	 */
+	public function onWindowMove (x:Float, y:Float):Void { }
+
+
+	/**
+	 * Called when a window resize event is fired
+	 * @param	width	The width of the window
+	 * @param	height	The height of the window
+	 */
+	public function onWindowResize (width:Int, height:Int):Void { }
+
+
+	/**
+	 * Called when a render event is fired
+	 * @param	context	The current render context
+	 */
+	public function render (context:RenderContext):Void { }
+
+
+	/**
+	 * Called when an update event is fired
+	 * @param	deltaTime	The amount of time in milliseconds that has elapsed since the last update
+	 */
+	public function update (deltaTime:Int):Void { }
+
+
 }