This commit is contained in:
Richard Davey
2013-09-01 22:02:42 +01:00
parent d31777972c
commit 6235f25184
5 changed files with 485 additions and 426 deletions
+419 -418
View File
@@ -523,39 +523,40 @@
"file": "src/gameobjects/Sprite.js",
"settings":
{
"buffer_size": 9167,
"buffer_size": 9442,
"line_ending": "Windows"
}
},
{
"file": "examples/camera4.php",
"file": "src/core/World.js",
"settings":
{
"buffer_size": 1166,
"buffer_size": 2868,
"line_ending": "Windows"
}
},
{
"file": "src/animation/Parser.js",
"file": "TS Source/math/QuadTree.js",
"settings":
{
"buffer_size": 8379,
"buffer_size": 18663,
"line_ending": "Windows"
}
},
{
"file": "src/animation/Frame.js",
"file": "src/math/QuadTree.js",
"settings":
{
"buffer_size": 3046,
"line_ending": "Windows"
"buffer_size": 1014,
"line_ending": "Windows",
"name": "Phaser.QuadTree = function () {"
}
},
{
"file": "src/animation/AnimationManager.js",
"file": "src/pixi/display/Sprite.js",
"settings":
{
"buffer_size": 6598,
"buffer_size": 4817,
"line_ending": "Windows"
}
}
@@ -588,6 +589,15 @@
},
"file_history":
[
"/D/wamp/www/phaser/src/math/LinkedList.js",
"/D/wamp/www/phaser/TS Source/math/LinkedList.js",
"/D/wamp/www/phaser/src/pixi/display/DisplayObject.js",
"/D/wamp/www/phaser/src/pixi/display/DisplayObjectContainer.js",
"/D/wamp/www/phaser/src/pixi/display/Sprite.js",
"/D/wamp/www/phaser/src/animation/AnimationManager.js",
"/D/wamp/www/phaser/src/animation/Frame.js",
"/D/wamp/www/phaser/src/animation/Parser.js",
"/D/wamp/www/phaser/examples/camera4.php",
"/D/wamp/www/phaser/src/core/Game.js",
"/D/wamp/www/phaser/examples/sprite3.php",
"/D/wamp/www/phaser/examples/camera5.php",
@@ -596,7 +606,6 @@
"/D/wamp/www/pixi.js/examples/example 6 - Interactivity/index.html",
"/D/wamp/www/phaser/src/pixi/renderers/canvas/CanvasRenderer.js",
"/D/wamp/www/phaser/src/core/World.js",
"/D/wamp/www/phaser/src/pixi/display/DisplayObject.js",
"/D/wamp/www/phaser/src/math/Math.js",
"/D/wamp/www/phaser/src/geom/Point.js",
"/D/wamp/www/phaser/src/input/Input.js",
@@ -606,7 +615,6 @@
"/D/wamp/www/phaser/src/core/Camera.js",
"/D/wamp/www/phaser/src/input/MSPointer.js",
"/D/wamp/www/phaser/src/core/StateManager.js",
"/D/wamp/www/phaser/src/pixi/display/Sprite.js",
"/D/wamp/www/phaser/TS Source/utils/DebugUtils.js",
"/D/wamp/www/phaser/examples/js.php",
"/D/wamp/www/phaser/TS Source/renderers/canvas/SpriteRenderer.ts",
@@ -647,11 +655,9 @@
"/D/wamp/www/phaser/src/tween/TweenManager.js",
"/D/wamp/www/phaser/TS Source/gameobjects/GameObjectFactory.ts",
"/C/Users/rich/Desktop/game.js",
"/D/wamp/www/phaser/src/animation/AnimationManager.js",
"/D/wamp/www/phaser/src/animation/Animation.js",
"/D/wamp/www/phaser/TS Source/animation/Animation.js",
"/D/wamp/www/phaser/TS Source/animation/AnimationManager.js",
"/D/wamp/www/phaser/src/animation/Parser.js",
"/D/wamp/www/phaser/src/loader/Cache.js",
"/D/wamp/www/phaser/TS Source/gameobjects/Sprite.js",
"/D/wamp/www/phaser/src/system/RequestAnimationFrame.js",
@@ -660,7 +666,6 @@
"/D/wamp/www/phaser/src/pixi/display/MovieClip.js",
"/D/wamp/www/phaser/src/pixi/loaders/ImageLoader.js",
"/D/wamp/www/phaser/src/animation/FrameData.js",
"/D/wamp/www/phaser/src/animation/Frame.js",
"/D/wamp/www/phaser/src/pixi/loaders/SpriteSheetLoader.js",
"/D/wamp/www/phaser/examples/assets/sprites/running_bot.json",
"/D/wamp/www/pixi.js/examples/example 2 - SpriteSheet/index.html",
@@ -673,7 +678,6 @@
"/D/wamp/www/phaser/src/Game.js",
"/D/wamp/www/phaser/src/Stage.js",
"/D/wamp/www/phaser/src/pixi/display/Stage.js",
"/D/wamp/www/phaser/src/pixi/display/DisplayObjectContainer.js",
"/D/wamp/www/phaser/examples/pixi 1.html",
"/D/wamp/www/phaser/src/system/Canvas.js",
"/D/wamp/www/phaser/src/Phaser.js",
@@ -712,10 +716,7 @@
"/D/wamp/www/phaser/TS Source/tweens/TweenManager.js",
"/D/wamp/www/phaser/TS Source/utils/RectangleUtils.js",
"/D/wamp/www/phaser/TS Source/geom/Rectangle.js",
"/D/wamp/www/phaser/examples/point.html",
"/D/wamp/www/phaser/src/geom/Circle.js",
"/D/wamp/www/phaser/TS Source/utils/PointUtils.js",
"/D/wamp/www/phaser/TS Source/geom/Point.js"
"/D/wamp/www/phaser/examples/point.html"
],
"find":
{
@@ -947,7 +948,7 @@
"groups":
[
{
"selected": 1,
"selected": 2,
"sheets":
[
{
@@ -955,268 +956,7 @@
"file": "src/gameobjects/Sprite.js",
"settings":
{
"buffer_size": 9167,
"regions":
{
},
"selection":
[
[
7118,
7118
]
],
"settings":
{
"codeintel": true,
"codeintel_config":
{
"JavaScript":
{
"codeintel_max_recursive_dir_depth": 2,
"codeintel_scan_files_in_project": false,
"javascriptExtraPaths":
[
]
},
"PHP":
{
"codeintel_max_recursive_dir_depth": 5,
"codeintel_scan_files_in_project": false,
"phpExtraPaths":
[
]
},
"Python":
{
"env":
{
}
}
},
"codeintel_enabled_languages":
[
"JavaScript",
"Mason",
"XBL",
"XUL",
"RHTML",
"SCSS",
"Python",
"HTML",
"Ruby",
"Python3",
"XML",
"Sass",
"XSLT",
"Django",
"HTML5",
"Perl",
"CSS",
"Twig",
"Less",
"Smarty",
"Node.js",
"Tcl",
"TemplateToolkit",
"PHP"
],
"codeintel_live": true,
"codeintel_live_enabled_languages":
[
"JavaScript",
"Mason",
"XBL",
"XUL",
"RHTML",
"SCSS",
"Python",
"HTML",
"Ruby",
"Python3",
"XML",
"Sass",
"XSLT",
"Django",
"HTML5",
"Perl",
"CSS",
"Twig",
"Less",
"Smarty",
"Node.js",
"Tcl",
"TemplateToolkit",
"PHP"
],
"codeintel_max_recursive_dir_depth": 10,
"codeintel_scan_exclude_dir":
{
"JavaScript":
[
"/build/",
"/min/"
]
},
"codeintel_scan_files_in_project": true,
"codeintel_selected_catalogs":
[
"PyWin32",
"jQuery",
"Rails"
],
"codeintel_snippets": true,
"codeintel_syntax_map":
{
"Python Django": "Python"
},
"sublime_auto_complete": true,
"syntax": "Packages/JavaScript/JavaScript.tmLanguage",
"tab_size": 4,
"translate_tabs_to_spaces": true
},
"translation.x": 0.0,
"translation.y": 3579.0,
"zoom_level": 1.0
},
"type": "text"
},
{
"buffer": 1,
"file": "examples/camera4.php",
"settings":
{
"buffer_size": 1166,
"regions":
{
},
"selection":
[
[
1089,
1089
]
],
"settings":
{
"codeintel": true,
"codeintel_config":
{
"JavaScript":
{
"codeintel_max_recursive_dir_depth": 2,
"codeintel_scan_files_in_project": false,
"javascriptExtraPaths":
[
]
},
"PHP":
{
"codeintel_max_recursive_dir_depth": 5,
"codeintel_scan_files_in_project": false,
"phpExtraPaths":
[
]
},
"Python":
{
"env":
{
}
}
},
"codeintel_enabled_languages":
[
"JavaScript",
"Mason",
"XBL",
"XUL",
"RHTML",
"SCSS",
"Python",
"HTML",
"Ruby",
"Python3",
"XML",
"Sass",
"XSLT",
"Django",
"HTML5",
"Perl",
"CSS",
"Twig",
"Less",
"Smarty",
"Node.js",
"Tcl",
"TemplateToolkit",
"PHP"
],
"codeintel_live": true,
"codeintel_live_enabled_languages":
[
"JavaScript",
"Mason",
"XBL",
"XUL",
"RHTML",
"SCSS",
"Python",
"HTML",
"Ruby",
"Python3",
"XML",
"Sass",
"XSLT",
"Django",
"HTML5",
"Perl",
"CSS",
"Twig",
"Less",
"Smarty",
"Node.js",
"Tcl",
"TemplateToolkit",
"PHP"
],
"codeintel_max_recursive_dir_depth": 10,
"codeintel_scan_exclude_dir":
{
"JavaScript":
[
"/build/",
"/min/"
]
},
"codeintel_scan_files_in_project": true,
"codeintel_selected_catalogs":
[
"PyWin32",
"jQuery",
"Rails"
],
"codeintel_snippets": true,
"codeintel_syntax_map":
{
"Python Django": "Python"
},
"sublime_auto_complete": true,
"syntax": "Packages/PHP/PHP.tmLanguage",
"translate_tabs_to_spaces": false
},
"translation.x": 0.0,
"translation.y": 0.0,
"zoom_level": 1.0
},
"type": "text"
},
{
"buffer": 2,
"file": "src/animation/Parser.js",
"settings":
{
"buffer_size": 8379,
"buffer_size": 9442,
"regions":
{
},
@@ -1343,149 +1083,19 @@
"type": "text"
},
{
"buffer": 3,
"file": "src/animation/Frame.js",
"buffer": 1,
"file": "src/core/World.js",
"settings":
{
"buffer_size": 3046,
"buffer_size": 2868,
"regions":
{
},
"selection":
[
[
538,
538
]
],
"settings":
{
"codeintel": true,
"codeintel_config":
{
"JavaScript":
{
"codeintel_max_recursive_dir_depth": 2,
"codeintel_scan_files_in_project": false,
"javascriptExtraPaths":
[
]
},
"PHP":
{
"codeintel_max_recursive_dir_depth": 5,
"codeintel_scan_files_in_project": false,
"phpExtraPaths":
[
]
},
"Python":
{
"env":
{
}
}
},
"codeintel_enabled_languages":
[
"JavaScript",
"Mason",
"XBL",
"XUL",
"RHTML",
"SCSS",
"Python",
"HTML",
"Ruby",
"Python3",
"XML",
"Sass",
"XSLT",
"Django",
"HTML5",
"Perl",
"CSS",
"Twig",
"Less",
"Smarty",
"Node.js",
"Tcl",
"TemplateToolkit",
"PHP"
],
"codeintel_live": true,
"codeintel_live_enabled_languages":
[
"JavaScript",
"Mason",
"XBL",
"XUL",
"RHTML",
"SCSS",
"Python",
"HTML",
"Ruby",
"Python3",
"XML",
"Sass",
"XSLT",
"Django",
"HTML5",
"Perl",
"CSS",
"Twig",
"Less",
"Smarty",
"Node.js",
"Tcl",
"TemplateToolkit",
"PHP"
],
"codeintel_max_recursive_dir_depth": 10,
"codeintel_scan_exclude_dir":
{
"JavaScript":
[
"/build/",
"/min/"
]
},
"codeintel_scan_files_in_project": true,
"codeintel_selected_catalogs":
[
"PyWin32",
"jQuery",
"Rails"
],
"codeintel_snippets": true,
"codeintel_syntax_map":
{
"Python Django": "Python"
},
"sublime_auto_complete": true,
"syntax": "Packages/JavaScript/JavaScript.tmLanguage",
"translate_tabs_to_spaces": false
},
"translation.x": 0.0,
"translation.y": 0.0,
"zoom_level": 1.0
},
"type": "text"
},
{
"buffer": 4,
"file": "src/animation/AnimationManager.js",
"settings":
{
"buffer_size": 6598,
"regions":
{
},
"selection":
[
[
603,
603
149,
149
]
],
"settings":
@@ -1600,6 +1210,397 @@
"zoom_level": 1.0
},
"type": "text"
},
{
"buffer": 2,
"file": "TS Source/math/QuadTree.js",
"settings":
{
"buffer_size": 18663,
"regions":
{
},
"selection":
[
[
1291,
1583
]
],
"settings":
{
"codeintel": true,
"codeintel_config":
{
"JavaScript":
{
"codeintel_max_recursive_dir_depth": 2,
"codeintel_scan_files_in_project": false,
"javascriptExtraPaths":
[
]
},
"PHP":
{
"codeintel_max_recursive_dir_depth": 5,
"codeintel_scan_files_in_project": false,
"phpExtraPaths":
[
]
},
"Python":
{
"env":
{
}
}
},
"codeintel_enabled_languages":
[
"JavaScript",
"Mason",
"XBL",
"XUL",
"RHTML",
"SCSS",
"Python",
"HTML",
"Ruby",
"Python3",
"XML",
"Sass",
"XSLT",
"Django",
"HTML5",
"Perl",
"CSS",
"Twig",
"Less",
"Smarty",
"Node.js",
"Tcl",
"TemplateToolkit",
"PHP"
],
"codeintel_live": true,
"codeintel_live_enabled_languages":
[
"JavaScript",
"Mason",
"XBL",
"XUL",
"RHTML",
"SCSS",
"Python",
"HTML",
"Ruby",
"Python3",
"XML",
"Sass",
"XSLT",
"Django",
"HTML5",
"Perl",
"CSS",
"Twig",
"Less",
"Smarty",
"Node.js",
"Tcl",
"TemplateToolkit",
"PHP"
],
"codeintel_max_recursive_dir_depth": 10,
"codeintel_scan_exclude_dir":
{
"JavaScript":
[
"/build/",
"/min/"
]
},
"codeintel_scan_files_in_project": true,
"codeintel_selected_catalogs":
[
"PyWin32",
"jQuery",
"Rails"
],
"codeintel_snippets": true,
"codeintel_syntax_map":
{
"Python Django": "Python"
},
"sublime_auto_complete": true,
"syntax": "Packages/JavaScript/JavaScript.tmLanguage",
"tab_size": 4,
"translate_tabs_to_spaces": true
},
"translation.x": 0.0,
"translation.y": 0.0,
"zoom_level": 1.0
},
"type": "text"
},
{
"buffer": 3,
"file": "src/math/QuadTree.js",
"settings":
{
"buffer_size": 1014,
"regions":
{
},
"selection":
[
[
829,
829
]
],
"settings":
{
"auto_name": "Phaser.QuadTree = function () {",
"codeintel": true,
"codeintel_config":
{
"JavaScript":
{
"codeintel_max_recursive_dir_depth": 2,
"codeintel_scan_files_in_project": false,
"javascriptExtraPaths":
[
]
},
"PHP":
{
"codeintel_max_recursive_dir_depth": 5,
"codeintel_scan_files_in_project": false,
"phpExtraPaths":
[
]
},
"Python":
{
"env":
{
}
}
},
"codeintel_enabled_languages":
[
"JavaScript",
"Mason",
"XBL",
"XUL",
"RHTML",
"SCSS",
"Python",
"HTML",
"Ruby",
"Python3",
"XML",
"Sass",
"XSLT",
"Django",
"HTML5",
"Perl",
"CSS",
"Twig",
"Less",
"Smarty",
"Node.js",
"Tcl",
"TemplateToolkit",
"PHP"
],
"codeintel_live": true,
"codeintel_live_enabled_languages":
[
"JavaScript",
"Mason",
"XBL",
"XUL",
"RHTML",
"SCSS",
"Python",
"HTML",
"Ruby",
"Python3",
"XML",
"Sass",
"XSLT",
"Django",
"HTML5",
"Perl",
"CSS",
"Twig",
"Less",
"Smarty",
"Node.js",
"Tcl",
"TemplateToolkit",
"PHP"
],
"codeintel_max_recursive_dir_depth": 10,
"codeintel_scan_exclude_dir":
{
"JavaScript":
[
"/build/",
"/min/"
]
},
"codeintel_scan_files_in_project": true,
"codeintel_selected_catalogs":
[
"PyWin32",
"jQuery",
"Rails"
],
"codeintel_snippets": true,
"codeintel_syntax_map":
{
"Python Django": "Python"
},
"sublime_auto_complete": true,
"syntax": "Packages/JavaScript/JavaScript.tmLanguage"
},
"translation.x": 0.0,
"translation.y": 0.0,
"zoom_level": 1.0
},
"type": "text"
},
{
"buffer": 4,
"file": "src/pixi/display/Sprite.js",
"settings":
{
"buffer_size": 4817,
"regions":
{
},
"selection":
[
[
1861,
1861
]
],
"settings":
{
"codeintel": true,
"codeintel_config":
{
"JavaScript":
{
"codeintel_max_recursive_dir_depth": 2,
"codeintel_scan_files_in_project": false,
"javascriptExtraPaths":
[
]
},
"PHP":
{
"codeintel_max_recursive_dir_depth": 5,
"codeintel_scan_files_in_project": false,
"phpExtraPaths":
[
]
},
"Python":
{
"env":
{
}
}
},
"codeintel_enabled_languages":
[
"JavaScript",
"Mason",
"XBL",
"XUL",
"RHTML",
"SCSS",
"Python",
"HTML",
"Ruby",
"Python3",
"XML",
"Sass",
"XSLT",
"Django",
"HTML5",
"Perl",
"CSS",
"Twig",
"Less",
"Smarty",
"Node.js",
"Tcl",
"TemplateToolkit",
"PHP"
],
"codeintel_live": true,
"codeintel_live_enabled_languages":
[
"JavaScript",
"Mason",
"XBL",
"XUL",
"RHTML",
"SCSS",
"Python",
"HTML",
"Ruby",
"Python3",
"XML",
"Sass",
"XSLT",
"Django",
"HTML5",
"Perl",
"CSS",
"Twig",
"Less",
"Smarty",
"Node.js",
"Tcl",
"TemplateToolkit",
"PHP"
],
"codeintel_max_recursive_dir_depth": 10,
"codeintel_scan_exclude_dir":
{
"JavaScript":
[
"/build/",
"/min/"
]
},
"codeintel_scan_files_in_project": true,
"codeintel_selected_catalogs":
[
"PyWin32",
"jQuery",
"Rails"
],
"codeintel_snippets": true,
"codeintel_syntax_map":
{
"Python Django": "Python"
},
"sublime_auto_complete": true,
"syntax": "Packages/JavaScript/JavaScript.tmLanguage",
"translate_tabs_to_spaces": false
},
"translation.x": 0.0,
"translation.y": 900.0,
"zoom_level": 1.0
},
"type": "text"
}
]
}
+1 -2
View File
@@ -40,12 +40,11 @@
function render() {
game.debug.renderRectangle(mummy.bounds, 'rgba(255,255,0,0.1)');
game.debug.renderPoint(mummy.topLeft, 'rgb(255,0,0)');
game.debug.renderPoint(mummy.topRight, 'rgb(0,255,0)');
game.debug.renderPoint(mummy.bottomLeft, 'rgb(0,0,255)');
game.debug.renderPoint(mummy.bottomRight, 'rgb(255,0,255)');
game.debug.renderPoint(mummy.center, 'rgb(255,255,0)');
game.debug.renderRectangle(mummy.bounds, 'rgba(255,255,0,0.1)');
}
-6
View File
@@ -59,12 +59,6 @@ Phaser.World.prototype = {
do
{
// if (!displayObject.active)
// {
// displayObject = displayObject.last._iNext;
// continue;
// }
if (displayObject['update'])
{
displayObject.update();
+31
View File
@@ -0,0 +1,31 @@
/**
* Phaser - LinkedList
*
* A miniature linked list class. Useful for optimizing time-critical or highly repetitive tasks!
*/
/**
* Creates a new link, and sets <code>object</code> and <code>next</code> to <code>null</code>.
*/
Phaser.LinkedList = function () {
this.object = null;
this.next = null;
};
Phaser.LinkedList.prototype = {
destroy: function () {
this.object = null;
if (this.next != null)
{
this.next.destroy();
}
this.next = null;
}
};
+34
View File
@@ -0,0 +1,34 @@
/**
* Phaser - QuadTree
*
* A fairly generic quad tree structure for rapid overlap checks. QuadTree is also configured for single or dual list operation.
* You can add items either to its A list or its B list. When you do an overlap check, you can compare the A list to itself,
* or the A list against the B list. Handy for different things!
*/
/**
* Instantiate a new Quad Tree node.
* @extends Rectangle
*
* @param {Number} x The X-coordinate of the point in space.
* @param {Number} y The Y-coordinate of the point in space.
* @param {Number} width Desired width of this node.
* @param {Number} height Desired height of this node.
* @param {Number} parent The parent branch or node. Pass null to create a root.
*/
Phaser.QuadTree = function (manager, x, y, width, height, parent) {
Phaser.Rectangle.call(this);
};
// constructor
Phaser.QuadTree.prototype = Object.create(Phaser.Rectangle.prototype);
Phaser.QuadTree.prototype.constructor = Phaser.Rectangle;
Phaser.QuadTree.prototype = {
};