From 4d592193a610b209c626bdcd37f0bb4f22468ab1 Mon Sep 17 00:00:00 2001 From: Adam Atomic Date: Sun, 9 May 2010 01:29:45 -0500 Subject: [PATCH] v2.36, worked on collisions, bounding box display and tilemap stuff --- docs/all-index-A.html | 6 + docs/all-index-B.html | 38 +++++ docs/all-index-D.html | 12 ++ docs/all-index-F.html | 11 +- docs/all-index-G.html | 14 ++ docs/all-index-I.html | 7 + docs/all-index-P.html | 7 - docs/all-index-S.html | 43 +++++- docs/org/flixel/FlxButton.html | 74 +++++++++- docs/org/flixel/FlxEmitter.html | 74 +++++++++- docs/org/flixel/FlxG.html | 21 ++- docs/org/flixel/FlxGroup.html | 170 +++++++++++++++++++++- docs/org/flixel/FlxObject.html | 87 ++++++++++-- docs/org/flixel/FlxSound.html | 22 ++- docs/org/flixel/FlxSprite.html | 66 ++++++++- docs/org/flixel/FlxText.html | 56 ++++++-- docs/org/flixel/FlxTileblock.html | 41 +++++- docs/org/flixel/FlxTilemap.html | 221 ++++++++++++++++++++++------- docs/org/flixel/data/FlxFade.html | 37 ++++- docs/org/flixel/data/FlxFlash.html | 37 ++++- docs/org/flixel/data/FlxPanel.html | 22 ++- docs/org/flixel/data/FlxPause.html | 74 +++++++++- org/flixel/FlxG.as | 68 ++++----- org/flixel/FlxGame.as | 1 - org/flixel/FlxObject.as | 10 +- org/flixel/FlxSprite.as | 9 +- org/flixel/FlxTilemap.as | 38 +++-- org/flixel/FlxU.as | 57 +++++--- 28 files changed, 1123 insertions(+), 200 deletions(-) diff --git a/docs/all-index-A.html b/docs/all-index-A.html index 71c5baaf..e23b271f 100644 --- a/docs/all-index-A.html +++ b/docs/all-index-A.html @@ -249,6 +249,12 @@ The ID3 artist name. +ASCENDING — Constant static property in class org.flixel.FlxGroup + + + + + at(Object:org.flixel:FlxObject) — Method in class org.flixel.FlxEmitter diff --git a/docs/all-index-B.html b/docs/all-index-B.html index 12198042..ef67d419 100644 --- a/docs/all-index-B.html +++ b/docs/all-index-B.html @@ -65,6 +65,31 @@ +_bbb — Property in class org.flixel.FlxSprite + + + + + +_bbKey — Property in class org.flixel.FlxTilemap + + + + + +_bbPixels — Property in class org.flixel.FlxTilemap + + + + + +_bbRect — Property in class org.flixel.FlxTileblock + + + + Bounding box rendering helper. + + bgColor — Static property in class org.flixel.FlxState @@ -80,6 +105,13 @@ Automatically creates or reconnects to locally saved data. +bitmapToCSV(bitmapData, Invert, Scale) — Static method in class org.flixel.FlxTilemap + + + + Converts a BitmapData object to a comma-separated string. + + blend — Property in class org.flixel.FlxSprite @@ -108,6 +140,12 @@ The Y coordinate of the bottom of the rectangle. +_boundsVisible — Property in class org.flixel.FlxSprite + + + + + buffer — Static property in class org.flixel.FlxG diff --git a/docs/all-index-D.html b/docs/all-index-D.html index 2b18f23c..5059c0f8 100644 --- a/docs/all-index-D.html +++ b/docs/all-index-D.html @@ -117,6 +117,12 @@ +DESCENDING — Constant static property in class org.flixel.FlxGroup + + + + + destroy() — Method in class org.flixel.FlxButton @@ -204,6 +210,12 @@ This function draws or stamps one FlxSprite onto another. +drawBounds() — Method in class org.flixel.FlxSprite + + + + + drawIndex — Property in class org.flixel.FlxTilemap diff --git a/docs/all-index-F.html b/docs/all-index-F.html index 1d07a70e..62fddc0e 100644 --- a/docs/all-index-F.html +++ b/docs/all-index-F.html @@ -200,11 +200,18 @@ +_fixed — Property in class org.flixel.FlxObject + + + + Internal tracker for whether an object will move/alter position after a collision (see fixed). + + fixed — Property in class org.flixel.FlxObject - If an object is 'fixed' in space, it will not budge when it collides with a not-fixed object. + Set fixed to true if you want the object to stay in place during collisions. flash — Static property in class org.flixel.FlxG @@ -671,7 +678,7 @@ Extends FlxSprite to support rendering text. -FlxText(X, Y, Width, Text) — Constructor in class org.flixel.FlxText +FlxText(X, Y, Width, Text, EmbeddedFont) — Constructor in class org.flixel.FlxText diff --git a/docs/all-index-G.html b/docs/all-index-G.html index c3676c85..a1658dd4 100644 --- a/docs/all-index-G.html +++ b/docs/all-index-G.html @@ -61,6 +61,13 @@ +generateBoundingTiles() — Method in class org.flixel.FlxTilemap + + + + Generates a bounding box version of the tiles, flixel should call this automatically when necessary. + + getAngle(X, Y) — Static method in class org.flixel.FlxU @@ -68,6 +75,13 @@ Calculates the angle between a point and the origin (0,0). +getBoundingColor() — Method in class org.flixel.FlxObject + + + + Returns the appropriate color for the bounding box depending on object state. + + getClass(Name) — Static method in class org.flixel.FlxU diff --git a/docs/all-index-I.html b/docs/all-index-I.html index 433c1b96..b59647f2 100644 --- a/docs/all-index-I.html +++ b/docs/all-index-I.html @@ -41,6 +41,13 @@ +imageToCSV(ImageFile, Invert, Scale) — Static method in class org.flixel.FlxTilemap + + + + Converts a resource image file to a comma-separated string. + + ImgAuto — Static property in class org.flixel.FlxTilemap diff --git a/docs/all-index-P.html b/docs/all-index-P.html index b9debc62..09666808 100644 --- a/docs/all-index-P.html +++ b/docs/all-index-P.html @@ -203,13 +203,6 @@ -pngToCSV(PNGFile, Invert, Scale) — Static method in class org.flixel.FlxTilemap - - - - Converts a PNG file to a comma-separated string. - - _point — Property in class org.flixel.FlxObject diff --git a/docs/all-index-S.html b/docs/all-index-S.html index 7022aa04..f8823109 100644 --- a/docs/all-index-S.html +++ b/docs/all-index-S.html @@ -294,6 +294,13 @@ Show the support panel. +showBounds — Static property in class org.flixel.FlxG + + + + Set showBounds to true to display the bounding boxes of the in-game objects. + + showSoundTray(Silent) — Method in class org.flixel.FlxGame @@ -346,11 +353,18 @@ The local shared object itself. +_solid — Property in class org.flixel.FlxObject + + + + Internal tracker for whether or not the object collides (see solid). + + solid — Property in class org.flixel.FlxObject - If an object is dead, the functions that automate collisions will skip it (see FlxG.overlapArrays() and FlxG.collideArrays()). + Set solid to true if you want to collide this object. solveXCollision(Object1:org.flixel:FlxObject, Object2:org.flixel:FlxObject) — Static method in class org.flixel.FlxU @@ -367,6 +381,33 @@ This quad tree callback function can be used externally as well. +sort(Index, Order) — Method in class org.flixel.FlxGroup + + + + Call this function to sort the group according to a particular value and order. + + +sortHandler(Obj1:org.flixel:FlxObject, Obj2:org.flixel:FlxObject) — Method in class org.flixel.FlxGroup + + + + Helper function for the sort process. + + +_sortIndex — Property in class org.flixel.FlxGroup + + + + Helpers for sorting members. + + +_sortOrder — Property in class org.flixel.FlxGroup + + + + + _sound — Property in class org.flixel.FlxSound diff --git a/docs/org/flixel/FlxButton.html b/docs/org/flixel/FlxButton.html index c6a7e0d9..40872744 100644 --- a/docs/org/flixel/FlxButton.html +++ b/docs/org/flixel/FlxButton.html @@ -161,7 +161,7 @@  Inheritedfixed : Boolean
- If an object is 'fixed' in space, it will not budge when it collides with a not-fixed object.
+ Set fixed to true if you want the object to stay in place during collisions. FlxObject @@ -242,7 +242,7 @@  Inheritedsolid : Boolean
- If an object is dead, the functions that automate collisions will skip it (see FlxG.overlapArrays() and FlxG.collideArrays()).
+ Set solid to true if you want to collide this object. FlxObject @@ -309,6 +309,11 @@ FlxGroup + Inherited_fixed : Boolean
+ Internal tracker for whether an object will move/alter position after a collision (see fixed).
+FlxObject + +  Inherited_flashPoint : Point
This is a pre-allocated Flash Point object, which is useful for certain Flash graphics API calls
@@ -389,6 +394,20 @@ Helper variable for correcting its members' scrollFactor objects. FlxButton + + Inherited_solid : Boolean
+ Internal tracker for whether or not the object collides (see solid).
+FlxObject + + + Inherited_sortIndex : String
+ Helpers for sorting members.
+FlxGroup + + + Inherited_sortOrder : int
+FlxGroup + @@ -485,6 +504,14 @@  Inherited
+getBoundingColor():uint
+
+ Returns the appropriate color for the bounding box depending on object state.
+FlxObject + + + Inherited +
getFirstAlive():FlxObject
@@ -698,6 +725,14 @@  Inherited
+sort(Index:String = "y", Order:int):void
+
+ Call this function to sort the group according to a particular value and order.
+FlxGroup + + + Inherited +
toString():String
Convert object to readable string name.
@@ -771,6 +806,14 @@  Inherited
+sortHandler(Obj1:FlxObject, Obj2:FlxObject):int
+
+ Helper function for the sort process.
+FlxGroup + + + Inherited +
updateFlickering():void
Just updates the retro-style flickering.
@@ -802,7 +845,32 @@
- + +
+
Public Constants
+
+ + +
+ + + + + + + + + + +
 ConstantDefined by
 InheritedASCENDING : int = -1
[static]
+		FlxGroup
 InheritedDESCENDING : int = 1
[static]
+		FlxGroup
+
+
Protected Constants
diff --git a/docs/org/flixel/FlxEmitter.html b/docs/org/flixel/FlxEmitter.html index 627ef7e5..85481143 100644 --- a/docs/org/flixel/FlxEmitter.html +++ b/docs/org/flixel/FlxEmitter.html @@ -173,7 +173,7 @@  Inheritedfixed : Boolean
- If an object is 'fixed' in space, it will not budge when it collides with a not-fixed object.
+ Set fixed to true if you want the object to stay in place during collisions.
FlxObject @@ -292,7 +292,7 @@  Inheritedsolid : Boolean
- If an object is dead, the functions that automate collisions will skip it (see FlxG.overlapArrays() and FlxG.collideArrays()).
+ Set solid to true if you want to collide this object.
FlxObject @@ -364,6 +364,11 @@ FlxGroup + Inherited_fixed : Boolean
+ Internal tracker for whether an object will move/alter position after a collision (see fixed).
+FlxObject + +  Inherited_flashPoint : Point
This is a pre-allocated Flash Point object, which is useful for certain Flash graphics API calls
@@ -404,6 +409,20 @@ FlxObject + + Inherited_solid : Boolean
+ Internal tracker for whether or not the object collides (see solid).
+FlxObject + + + Inherited_sortIndex : String
+ Helpers for sorting members.
+FlxGroup + + + Inherited_sortOrder : int
+FlxGroup +   _timer : Number
Internal helper for deciding when to launch particles or kill them.
@@ -529,6 +548,14 @@  Inherited
+getBoundingColor():uint
+
+ Returns the appropriate color for the bounding box depending on object state.
+FlxObject + + + Inherited +
getFirstAlive():FlxObject
@@ -753,6 +780,14 @@ A more compact way of setting the Y velocity range of the emitter.
FlxEmitter + + Inherited +
+sort(Index:String = "y", Order:int):void
+
+ Call this function to sort the group according to a particular value and order.
+FlxGroup +   
@@ -834,6 +869,14 @@ Internal function, helps with the moving/updating of group members.
FlxGroup + + Inherited +
+sortHandler(Obj1:FlxObject, Obj2:FlxObject):int
+
+ Helper function for the sort process.
+FlxGroup +   
@@ -868,7 +911,32 @@
- + +
+
Public Constants
+
+ + +
+ + + + + + + + + + +
 ConstantDefined by
 InheritedASCENDING : int = -1
[static]
+		FlxGroup
 InheritedDESCENDING : int = 1
[static]
+		FlxGroup
+
+
Protected Constants
diff --git a/docs/org/flixel/FlxG.html b/docs/org/flixel/FlxG.html index 49139f33..5256ee07 100644 --- a/docs/org/flixel/FlxG.html +++ b/docs/org/flixel/FlxG.html @@ -4,7 +4,7 @@ - + org.flixel.FlxG @@ -148,7 +148,7 @@ FlxG -  LIBRARY_MINOR_VERSION : uint = 34
[static] +  LIBRARY_MINOR_VERSION : uint = 36
[static] Assign a minor version to your library.
FlxG @@ -222,6 +222,11 @@ FlxG +  showBounds : Boolean
[static] + Set showBounds to true to display the bounding boxes of the in-game objects.
+FlxG + +   sounds : Array
[static] A list of all the sounds being played in the game.
FlxG @@ -716,7 +721,7 @@
-public static var LIBRARY_MINOR_VERSION:uint = 34

+public static var LIBRARY_MINOR_VERSION:uint = 36

Assign a minor version to your library. Appears after the decimal in the console.

@@ -893,6 +898,16 @@ protected static var _scrollTarget:Point

Internal, used to assist camera and scrolling.

+ + + + + +
showBoundsproperty 
+
+public static var showBounds:Boolean

+ Set showBounds to true to display the bounding boxes of the in-game objects. +

diff --git a/docs/org/flixel/FlxGroup.html b/docs/org/flixel/FlxGroup.html index 0ec8cb7e..f55c779d 100644 --- a/docs/org/flixel/FlxGroup.html +++ b/docs/org/flixel/FlxGroup.html @@ -4,7 +4,7 @@ - +org.flixel.FlxGroup @@ -165,7 +165,7 @@ @@ -241,7 +241,7 @@ @@ -303,6 +303,11 @@ + + + + + + + + + + + +
 Inheritedfixed : Boolean
- If an object is 'fixed' in space, it will not budge when it collides with a not-fixed object.
+ Set fixed to true if you want the object to stay in place during collisions. 		FlxObject
 Inheritedsolid : Boolean
- If an object is dead, the functions that automate collisions will skip it (see FlxG.overlapArrays() and FlxG.collideArrays()).
+ Set solid to true if you want to collide this object. 		FlxObject
FlxGroup
 Inherited_fixed : Boolean
+ Internal tracker for whether an object will move/alter position after a collision (see fixed).
+		FlxObject
 Inherited_flashPoint : Point
This is a pre-allocated Flash Point object, which is useful for certain Flash graphics API calls
@@ -338,6 +343,20 @@ 		FlxObject
 Inherited_solid : Boolean
+ Internal tracker for whether or not the object collides (see solid).
+		FlxObject
  _sortIndex : String
+ Helpers for sorting members.
+		FlxGroup
  _sortOrder : int
+		FlxGroup
@@ -431,6 +450,14 @@ Check to see if the object is still flickering.
FlxObject + + Inherited +
+getBoundingColor():uint
+
+ Returns the appropriate color for the bounding box depending on object state.
+FlxObject +   
@@ -626,6 +653,14 @@ Finds the first object with exists == false and calls reset on it.
FlxGroup + +   +
+sort(Index:String = "y", Order:int):void
+
+ Call this function to sort the group according to a particular value and order.
+FlxGroup +  Inherited
@@ -692,6 +727,14 @@ Internal function, helps with the moving/updating of group members.
FlxGroup + +   +
+sortHandler(Obj1:FlxObject, Obj2:FlxObject):int
+
+ Helper function for the sort process.
+FlxGroup +  Inherited
@@ -718,7 +761,24 @@
- + +
+
Public Constants
+ + + + + + + + + + +
 ConstantDefined by
  ASCENDING : int = -1
[static]
+		FlxGroup
  DESCENDING : int = 1
[static]
+		FlxGroup
+
+
Protected Constants
@@ -778,6 +838,25 @@ public var members:Array

Array of all the FlxObjects that exist in this layer.

+ + + + + +
_sortIndexproperty 
+
+protected var _sortIndex:String

+ Helpers for sorting members. +

+ + + + + +
_sortOrderproperty 
+
+protected var _sortOrder:int +
Constructor detail
@@ -1223,6 +1302,69 @@ protected function saveOldPosition():void

Internal function, helps with the moving/updating of group members.

+ + + + + +
sort()method 
+
+public function sort(Index:String = "y", Order:int):void

+ Call this function to sort the group according to a particular value and order. + For example, to sort game objects for Zelda-style overlaps you might call + myGroup.sort("y",ASCENDING) at the bottom of your + FlxState.update() override. To sort all existing objects after + a big explosion or bomb attack, you might call myGroup.sort("exists",DESCENDING). + +

Parameters + + + + + + + + + + +
Index:String (default = "y") — The String name of the member variable you want to sort on. Default value is "y". +
 
Order:int — A FlxGroup constant that defines the sort order. Possible values are ASCENDING and DESCENDING. Default value is ASCENDING. +
+
+ + + + + +
sortHandler()method 
+
+protected function sortHandler(Obj1:FlxObject, Obj2:FlxObject):int

+ Helper function for the sort process. + +

Parameters + + + + + + + + + + +
Obj1:FlxObject — Obj1 The first object being sorted. +
 
Obj2:FlxObject — The second object being sorted. + +
+

+Returns + + + + +
int — An integer value: -1 (Obj1 before Obj2), 0 (same), or 1 (Obj1 after Obj2). +
+
@@ -1245,6 +1387,26 @@ Internal function that actually goes through and updates all the group members. Depends on saveOldPosition() to set up the correct values in _last in order to work properly.

+ +
Constant detail
+ +
+ + + +
ASCENDINGconstant
+
+public static const ASCENDING:int = -1 +
+ + + + + +
DESCENDINGconstant 
+
+public static const DESCENDING:int = 1 +


diff --git a/docs/org/flixel/FlxObject.html b/docs/org/flixel/FlxObject.html index 51da9b2c..e6da0b8d 100644 --- a/docs/org/flixel/FlxObject.html +++ b/docs/org/flixel/FlxObject.html @@ -4,7 +4,7 @@ - + org.flixel.FlxObject @@ -165,7 +165,7 @@   fixed : Boolean
- If an object is 'fixed' in space, it will not budge when it collides with a not-fixed object.
+ Set fixed to true if you want the object to stay in place during collisions. FlxObject @@ -236,7 +236,7 @@   solid : Boolean
- If an object is dead, the functions that automate collisions will skip it (see FlxG.overlapArrays() and FlxG.collideArrays()).
+ Set solid to true if you want to collide this object. FlxObject @@ -286,6 +286,11 @@  PropertyDefined by +  _fixed : Boolean
+ Internal tracker for whether an object will move/alter position after a collision (see fixed).
+FlxObject + +   _flashPoint : Point
This is a pre-allocated Flash Point object, which is useful for certain Flash graphics API calls
@@ -315,6 +320,11 @@ FlxObject + +  _solid : Boolean
+ Internal tracker for whether or not the object collides (see solid).
+FlxObject + @@ -375,6 +385,14 @@   
+getBoundingColor():uint
+
+ Returns the appropriate color for the bounding box depending on object state.
+FlxObject + + +   +
getScreenXY(Point:FlxPoint = null):FlxPoint
@@ -728,6 +746,16 @@ public var exists:Boolean

Kind of a global on/off switch for any objects descended from FlxObject.

+ + + + + +
_fixedproperty 
+
+protected var _fixed:Boolean

+ Internal tracker for whether an object will move/alter position after a collision (see fixed). +

@@ -735,10 +763,16 @@
-public var fixed:Boolean

- If an object is 'fixed' in space, it will not budge when it collides with a not-fixed object. - Fixed objects also shortcut out of updateMotion by default. -

+fixed:Boolean  [read-write]

+ Set fixed to true if you want the object to stay in place during collisions. + Useful for levels and other environmental objects. +

Implementation +
+    public function get fixed():Boolean +
+    public function set fixed(value:Boolean):void +
+ @@ -889,6 +923,16 @@ 1 means it scrolls along a the same speed as the foreground layer. scrollFactor is initialized as (1,1) by default.

+ +
+ + + +
_solidproperty 
+
+protected var _solid:Boolean

+ Internal tracker for whether or not the object collides (see solid). +

@@ -896,9 +940,15 @@
-public var solid:Boolean

- If an object is dead, the functions that automate collisions will skip it (see FlxG.overlapArrays() and FlxG.collideArrays()). -

+solid:Boolean  [read-write]

+ Set solid to true if you want to collide this object. +

Implementation +
+    public function get solid():Boolean +
+    public function set solid(value:Boolean):void +
+ @@ -1047,6 +1097,23 @@
+ + + + + +
getBoundingColor()method 
+
+public function getBoundingColor():uint

+ Returns the appropriate color for the bounding box depending on object state. +

+Returns + + + + +
uint
+
diff --git a/docs/org/flixel/FlxSound.html b/docs/org/flixel/FlxSound.html index 335749b6..c33074bb 100644 --- a/docs/org/flixel/FlxSound.html +++ b/docs/org/flixel/FlxSound.html @@ -165,7 +165,7 @@ @@ -246,7 +246,7 @@ @@ -339,6 +339,11 @@ + + + + + + @@ -490,6 +500,14 @@ + + + @@ -300,7 +300,7 @@ @@ -370,6 +370,14 @@ + + + + + + @@ -399,6 +407,11 @@ + + + + + +
 Inheritedfixed : Boolean
- If an object is 'fixed' in space, it will not budge when it collides with a not-fixed object.
+ Set fixed to true if you want the object to stay in place during collisions. 		FlxObject
 Inheritedsolid : Boolean
- If an object is dead, the functions that automate collisions will skip it (see FlxG.overlapArrays() and FlxG.collideArrays()).
+ Set solid to true if you want to collide this object. 		FlxObject
FlxSound
 Inherited_fixed : Boolean
+ Internal tracker for whether an object will move/alter position after a collision (see fixed).
+		FlxObject
 Inherited_flashPoint : Point
This is a pre-allocated Flash Point object, which is useful for certain Flash graphics API calls
@@ -397,6 +402,11 @@ 		FlxObject
 Inherited_solid : Boolean
+ Internal tracker for whether or not the object collides (see solid).
+		FlxObject
  _sound : Sound
FlxSound
 Inherited
+getBoundingColor():uint
+
+ Returns the appropriate color for the bounding box depending on object state.
+		FlxObject
 Inherited +
getScreenXY(Point:FlxPoint = null):FlxPoint
diff --git a/docs/org/flixel/FlxSprite.html b/docs/org/flixel/FlxSprite.html index 16df64c9..0bb2845e 100644 --- a/docs/org/flixel/FlxSprite.html +++ b/docs/org/flixel/FlxSprite.html @@ -4,7 +4,7 @@ - + org.flixel.FlxSprite @@ -196,7 +196,7 @@
 Inheritedfixed : Boolean
- If an object is 'fixed' in space, it will not budge when it collides with a not-fixed object.
+ Set fixed to true if you want the object to stay in place during collisions. 		FlxObject
 Inheritedsolid : Boolean
- If an object is dead, the functions that automate collisions will skip it (see FlxG.overlapArrays() and FlxG.collideArrays()).
+ Set solid to true if you want to collide this object. 		FlxObject
FlxSprite
  _bbb : BitmapData
+		FlxSprite
  _boundsVisible : Boolean
+		FlxSprite
  _caf : uint
FlxSprite
FlxSprite
 Inherited_fixed : Boolean
+ Internal tracker for whether an object will move/alter position after a collision (see fixed).
+		FlxObject
 Inherited_flashPoint : Point
This is a pre-allocated Flash Point object, which is useful for certain Flash graphics API calls
@@ -460,6 +473,11 @@ 		FlxObject
 Inherited_solid : Boolean
+ Internal tracker for whether or not the object collides (see solid).
+		FlxObject
@@ -558,6 +576,14 @@ Check to see if the object is still flickering. FlxObject + + Inherited +
+getBoundingColor():uint
+
+ Returns the appropriate color for the bounding box depending on object state.
+FlxObject +   
@@ -769,6 +795,13 @@   
+drawBounds():void
+
+FlxSprite + + +   +
renderSprite():void
Internal function that performs the actual sprite rendering, called by render().
@@ -922,6 +955,15 @@
protected var _bakedRotation:Number
+ + + + + +
_bbbproperty 
+
+protected var _bbb:BitmapData +
@@ -934,6 +976,15 @@ E.g. "multiply", "screen", etc.

The default value is null.

+ +
+ + + +
_boundsVisibleproperty 
+
+protected var _boundsVisible:Boolean +
@@ -1390,6 +1441,15 @@
+ + + + + +
drawBounds()method 
+
+protected function drawBounds():void +
diff --git a/docs/org/flixel/FlxText.html b/docs/org/flixel/FlxText.html index 394ccb14..5b85b602 100644 --- a/docs/org/flixel/FlxText.html +++ b/docs/org/flixel/FlxText.html @@ -202,7 +202,7 @@ @@ -321,7 +321,7 @@ @@ -396,6 +396,14 @@ + + + + + + @@ -425,6 +433,11 @@ + + + + + + @@ -518,7 +536,7 @@ @@ -599,6 +617,14 @@ + + + + + +
 Inheritedfixed : Boolean
- If an object is 'fixed' in space, it will not budge when it collides with a not-fixed object.
+ Set fixed to true if you want the object to stay in place during collisions. 		FlxObject
 Inheritedsolid : Boolean
- If an object is dead, the functions that automate collisions will skip it (see FlxG.overlapArrays() and FlxG.collideArrays()).
+ Set solid to true if you want to collide this object. 		FlxObject
FlxSprite
 Inherited_bbb : BitmapData
+		FlxSprite
 Inherited_boundsVisible : Boolean
+		FlxSprite
 Inherited_caf : uint
FlxSprite
FlxSprite
 Inherited_fixed : Boolean
+ Internal tracker for whether an object will move/alter position after a collision (see fixed).
+		FlxObject
 Inherited_flashPoint : Point
This is a pre-allocated Flash Point object, which is useful for certain Flash graphics API calls
@@ -494,6 +507,11 @@ 		  _shadow : uint
FlxText
 Inherited_solid : Boolean
+ Internal tracker for whether or not the object collides (see solid).
+		FlxObject
  _tf : TextField
FlxText
  
-FlxText(X:Number, Y:Number, Width:uint, Text:String = null)
+FlxText(X:Number, Y:Number, Width:uint, Text:String = null, EmbeddedFont:Boolean = true)
Creates a new FlxText object at the specified position.
FlxText
 Inherited
+getBoundingColor():uint
+
+ Returns the appropriate color for the bounding box depending on object state.
+		FlxObject
 Inherited +
getScreenXY(Point:FlxPoint = null):FlxPoint
@@ -814,6 +840,13 @@ Internal function to update the current animation frame.
FlxText
 Inherited +
+drawBounds():void
+
+		FlxSprite
  
@@ -1064,34 +1097,41 @@
-public function FlxText(X:Number, Y:Number, Width:uint, Text:String = null)

+public function FlxText(X:Number, Y:Number, Width:uint, Text:String = null, EmbeddedFont:Boolean = true)

Creates a new FlxText object at the specified position.

Parameters - + + + + + + - - -
X:Number — The X position of the text. +X:Number — The X position of the text. +
 
Y:Number — The Y position of the text.
 
Y:Number — The Y position of the text. +Width:uint — The width of the text object (height is determined automatically).
 
Width:uint — The width of the text object (height is determined automatically). +Text:String (default = null) — The actual text you would like to display initially.
 
Text:String (default = null) — The actual text you would like to display initially. +EmbeddedFont:Boolean (default = true) — Whether this text field uses embedded fonts or nto
diff --git a/docs/org/flixel/FlxTileblock.html b/docs/org/flixel/FlxTileblock.html index 334da770..bde180ad 100644 --- a/docs/org/flixel/FlxTileblock.html +++ b/docs/org/flixel/FlxTileblock.html @@ -4,7 +4,7 @@ - + org.flixel.FlxTileblock @@ -161,7 +161,7 @@  Inheritedfixed : Boolean
- If an object is 'fixed' in space, it will not budge when it collides with a not-fixed object.
+ Set fixed to true if you want the object to stay in place during collisions.
FlxObject @@ -232,7 +232,7 @@  Inheritedsolid : Boolean
- If an object is dead, the functions that automate collisions will skip it (see FlxG.overlapArrays() and FlxG.collideArrays()).
+ Set solid to true if you want to collide this object. FlxObject @@ -289,6 +289,16 @@  PropertyDefined by + +  _bbRect : Rectangle
+ Bounding box rendering helper.
+FlxTileblock + + + Inherited_fixed : Boolean
+ Internal tracker for whether an object will move/alter position after a collision (see fixed).
+FlxObject +  Inherited_flashPoint : Point
This is a pre-allocated Flash Point object, which is useful for certain Flash graphics API calls @@ -334,6 +344,11 @@ Array of rectangles used to quickly blit the tiles to the screen.
FlxTileblock + + Inherited_solid : Boolean
+ Internal tracker for whether or not the object collides (see solid).
+FlxObject +   _tileSize : uint
The size of the tiles (e.g.
@@ -399,6 +414,14 @@  Inherited
+getBoundingColor():uint
+
+ Returns the appropriate color for the bounding box depending on object state.
+FlxObject + + + Inherited +
getScreenXY(Point:FlxPoint = null):FlxPoint
@@ -611,10 +634,20 @@
Property detail
+ + + + + +
_bbRectproperty
+
+protected var _bbRect:Rectangle

+ Bounding box rendering helper. +

- +
_flashRectproperty_flashRectproperty 
diff --git a/docs/org/flixel/FlxTilemap.html b/docs/org/flixel/FlxTilemap.html index da98e0d4..e89c95ff 100644 --- a/docs/org/flixel/FlxTilemap.html +++ b/docs/org/flixel/FlxTilemap.html @@ -4,7 +4,7 @@ - + org.flixel.FlxTilemap @@ -179,7 +179,7 @@  Inheritedfixed : Boolean
- If an object is 'fixed' in space, it will not budge when it collides with a not-fixed object.
+ Set fixed to true if you want the object to stay in place during collisions.
FlxObject @@ -264,7 +264,7 @@  Inheritedsolid : Boolean
- If an object is dead, the functions that automate collisions will skip it (see FlxG.overlapArrays() and FlxG.collideArrays()).
+ Set solid to true if you want to collide this object.
FlxObject @@ -339,6 +339,14 @@  PropertyDefined by +  _bbKey : String
+FlxTilemap + + +  _bbPixels : BitmapData
+FlxTilemap + +   _block : FlxObject
FlxTilemap @@ -352,6 +360,11 @@ FlxTilemap + Inherited_fixed : Boolean
+ Internal tracker for whether an object will move/alter position after a collision (see fixed).
+FlxObject + +  Inherited_flashPoint : Point
This is a pre-allocated Flash Point object, which is useful for certain Flash graphics API calls
@@ -402,6 +415,11 @@   _screenRows : uint
FlxTilemap + + Inherited_solid : Boolean
+ Internal tracker for whether or not the object collides (see solid).
+FlxObject +   _tileHeight : uint
FlxTilemap @@ -443,6 +461,14 @@ Converts a one-dimensional array of tile data to a comma-separated string.
FlxTilemap + +   +
+bitmapToCSV(bitmapData:BitmapData, Invert:Boolean = false, Scale:uint = 1):String
+
[static] + Converts a BitmapData object to a comma-separated string.
+FlxTilemap +  Inherited
@@ -486,6 +512,14 @@  Inherited
+getBoundingColor():uint
+
+ Returns the appropriate color for the bounding box depending on object state.
+FlxObject + + + Inherited +
getScreenXY(Point:FlxPoint = null):FlxPoint
@@ -548,6 +582,14 @@ Call this function to "damage" (or give health bonus) to this sprite.
FlxObject + +   +
+imageToCSV(ImageFile:Class, Invert:Boolean = false, Scale:uint = 1):String
+
[static] + Converts a resource image file to a comma-separated string.
+FlxTilemap +  Inherited
@@ -592,14 +634,6 @@   
-pngToCSV(PNGFile:Class, Invert:Boolean = false, Scale:uint = 1):String
-
[static] - Converts a PNG file to a comma-separated string.
-FlxTilemap - - -   -
preCollide(Object:FlxObject):void
FlxU.collide() (and thus FlxObject.collide()) call @@ -708,6 +742,14 @@   
+generateBoundingTiles():void
+
+ Generates a bounding box version of the tiles, flixel should call this automatically when necessary.
+FlxTilemap + + +   +
renderTilemap():void
Internal function that actually renders the tilemap.
@@ -804,6 +846,24 @@ public var auto:uint

Set this flag to use one of the 16-tile binary auto-tile algorithms (OFF, AUTO, or ALT).

+ + + + + +
_bbKeyproperty 
+
+protected var _bbKey:String +
+ + + + + +
_bbPixelsproperty 
+
+protected var _bbPixels:BitmapData +
@@ -1040,6 +1100,49 @@
+ + + + + +
bitmapToCSV()method 
+
+public static function bitmapToCSV(bitmapData:BitmapData, Invert:Boolean = false, Scale:uint = 1):String

+ Converts a BitmapData object to a comma-separated string. + Black pixels are flagged as 'solid' by default, + non-black pixels are set as non-colliding. + Black pixels must be PURE BLACK. + +

Parameters + + + + + + + + + + + + + + + + +
bitmapData:BitmapData — An embedded graphic, preferably black and white. +
 
Invert:Boolean (default = false) — Load white pixels as solid instead. + +
 
Scale:uint (default = 1)
+

+Returns + + + + +
String — A comma-separated string containing the level data in a FlxTilemap-friendly format. +
+
@@ -1058,6 +1161,16 @@
+ + + + + +
generateBoundingTiles()method 
+
+protected function generateBoundingTiles():void

+ Generates a bounding box version of the tiles, flixel should call this automatically when necessary. +

@@ -1119,6 +1232,49 @@
+ + + + + +
imageToCSV()method 
+
+public static function imageToCSV(ImageFile:Class, Invert:Boolean = false, Scale:uint = 1):String

+ Converts a resource image file to a comma-separated string. + Black pixels are flagged as 'solid' by default, + non-black pixels are set as non-colliding. + Black pixels must be PURE BLACK. + +

Parameters + + + + + + + + + + + + + + + + +
ImageFile:Class — An embedded graphic, preferably black and white. +
 
Invert:Boolean (default = false) — Load white pixels as solid instead. + +
 
Scale:uint (default = 1)
+

+Returns + + + + +
String — A comma-separated string containing the level data in a FlxTilemap-friendly format. +
+
@@ -1195,49 +1351,6 @@
- - - - - -
pngToCSV()method 
-
-public static function pngToCSV(PNGFile:Class, Invert:Boolean = false, Scale:uint = 1):String

- Converts a PNG file to a comma-separated string. - Black pixels are flagged as 'solid' by default, - non-black pixels are set as non-colliding. - Black pixels must be PURE BLACK. - -

Parameters - - - - - - - - - - - - - - - - -
PNGFile:Class — An embedded graphic, preferably black and white. -
 
Invert:Boolean (default = false) — Load white pixels as solid instead. - -
 
Scale:uint (default = 1)
-

-Returns - - - - -
String — A comma-separated string containing the level data in a FlxTilemap-friendly format. -
-
diff --git a/docs/org/flixel/data/FlxFade.html b/docs/org/flixel/data/FlxFade.html index b6258e5f..e74f37ca 100644 --- a/docs/org/flixel/data/FlxFade.html +++ b/docs/org/flixel/data/FlxFade.html @@ -193,7 +193,7 @@ @@ -297,7 +297,7 @@ @@ -367,6 +367,14 @@ + + + + + + @@ -406,6 +414,11 @@ + + + + + +
 Inheritedfixed : Boolean
- If an object is 'fixed' in space, it will not budge when it collides with a not-fixed object.
+ Set fixed to true if you want the object to stay in place during collisions. 		FlxObject
 Inheritedsolid : Boolean
- If an object is dead, the functions that automate collisions will skip it (see FlxG.overlapArrays() and FlxG.collideArrays()).
+ Set solid to true if you want to collide this object. 		FlxObject
FlxSprite
 Inherited_bbb : BitmapData
+		FlxSprite
 Inherited_boundsVisible : Boolean
+		FlxSprite
 Inherited_caf : uint
FlxSprite
FlxSprite
 Inherited_fixed : Boolean
+ Internal tracker for whether an object will move/alter position after a collision (see fixed).
+		FlxObject
 Inherited_flashPoint : Point
This is a pre-allocated Flash Point object, which is useful for certain Flash graphics API calls
@@ -467,6 +480,11 @@ 		FlxObject
 Inherited_solid : Boolean
+ Internal tracker for whether or not the object collides (see solid).
+		FlxObject
@@ -569,6 +587,14 @@  Inherited
+getBoundingColor():uint
+
+ Returns the appropriate color for the bounding box depending on object state.
+FlxObject + + + Inherited +
getScreenXY(Point:FlxPoint = null):FlxPoint
@@ -796,6 +822,13 @@  Inherited
+drawBounds():void
+
+FlxSprite + + + Inherited +
renderSprite():void
Internal function that performs the actual sprite rendering, called by render().
diff --git a/docs/org/flixel/data/FlxFlash.html b/docs/org/flixel/data/FlxFlash.html index 34c12cd5..d22e95ba 100644 --- a/docs/org/flixel/data/FlxFlash.html +++ b/docs/org/flixel/data/FlxFlash.html @@ -193,7 +193,7 @@  Inheritedfixed : Boolean
- If an object is 'fixed' in space, it will not budge when it collides with a not-fixed object.
+ Set fixed to true if you want the object to stay in place during collisions.
FlxObject @@ -297,7 +297,7 @@  Inheritedsolid : Boolean
- If an object is dead, the functions that automate collisions will skip it (see FlxG.overlapArrays() and FlxG.collideArrays()).
+ Set solid to true if you want to collide this object. FlxObject @@ -367,6 +367,14 @@ FlxSprite + Inherited_bbb : BitmapData
+FlxSprite + + + Inherited_boundsVisible : Boolean
+FlxSprite + +  Inherited_caf : uint
FlxSprite @@ -406,6 +414,11 @@ FlxSprite + Inherited_fixed : Boolean
+ Internal tracker for whether an object will move/alter position after a collision (see fixed).
+FlxObject + +  Inherited_flashPoint : Point
This is a pre-allocated Flash Point object, which is useful for certain Flash graphics API calls
@@ -467,6 +480,11 @@ FlxObject + + Inherited_solid : Boolean
+ Internal tracker for whether or not the object collides (see solid).
+FlxObject + @@ -569,6 +587,14 @@  Inherited
+getBoundingColor():uint
+
+ Returns the appropriate color for the bounding box depending on object state.
+FlxObject + + + Inherited +
getScreenXY(Point:FlxPoint = null):FlxPoint
@@ -796,6 +822,13 @@  Inherited
+drawBounds():void
+
+FlxSprite + + + Inherited +
renderSprite():void
Internal function that performs the actual sprite rendering, called by render().
diff --git a/docs/org/flixel/data/FlxPanel.html b/docs/org/flixel/data/FlxPanel.html index 3df46967..be841907 100644 --- a/docs/org/flixel/data/FlxPanel.html +++ b/docs/org/flixel/data/FlxPanel.html @@ -164,7 +164,7 @@  Inheritedfixed : Boolean
- If an object is 'fixed' in space, it will not budge when it collides with a not-fixed object.
+ Set fixed to true if you want the object to stay in place during collisions.
FlxObject @@ -235,7 +235,7 @@  Inheritedsolid : Boolean
- If an object is dead, the functions that automate collisions will skip it (see FlxG.overlapArrays() and FlxG.collideArrays()).
+ Set solid to true if you want to collide this object. FlxObject @@ -293,6 +293,11 @@  PropertyDefined by + Inherited_fixed : Boolean
+ Internal tracker for whether an object will move/alter position after a collision (see fixed).
+FlxObject + +  Inherited_flashPoint : Point
This is a pre-allocated Flash Point object, which is useful for certain Flash graphics API calls
@@ -322,6 +327,11 @@ FlxObject + + Inherited_solid : Boolean
+ Internal tracker for whether or not the object collides (see solid).
+FlxObject + @@ -382,6 +392,14 @@  Inherited
+getBoundingColor():uint
+
+ Returns the appropriate color for the bounding box depending on object state.
+FlxObject + + + Inherited +
getScreenXY(Point:FlxPoint = null):FlxPoint
diff --git a/docs/org/flixel/data/FlxPause.html b/docs/org/flixel/data/FlxPause.html index 8548b792..8dcf5a03 100644 --- a/docs/org/flixel/data/FlxPause.html +++ b/docs/org/flixel/data/FlxPause.html @@ -161,7 +161,7 @@  Inheritedfixed : Boolean
- If an object is 'fixed' in space, it will not budge when it collides with a not-fixed object.
+ Set fixed to true if you want the object to stay in place during collisions.
FlxObject @@ -237,7 +237,7 @@  Inheritedsolid : Boolean
- If an object is dead, the functions that automate collisions will skip it (see FlxG.overlapArrays() and FlxG.collideArrays()).
+ Set solid to true if you want to collide this object. FlxObject @@ -299,6 +299,11 @@ FlxGroup + Inherited_fixed : Boolean
+ Internal tracker for whether an object will move/alter position after a collision (see fixed).
+FlxObject + +  Inherited_flashPoint : Point
This is a pre-allocated Flash Point object, which is useful for certain Flash graphics API calls
@@ -334,6 +339,20 @@ FlxObject + + Inherited_solid : Boolean
+ Internal tracker for whether or not the object collides (see solid).
+FlxObject + + + Inherited_sortIndex : String
+ Helpers for sorting members.
+FlxGroup + + + Inherited_sortOrder : int
+FlxGroup + @@ -429,6 +448,14 @@  Inherited
+getBoundingColor():uint
+
+ Returns the appropriate color for the bounding box depending on object state.
+FlxObject + + + Inherited +
getFirstAlive():FlxObject
@@ -624,6 +651,14 @@  Inherited
+sort(Index:String = "y", Order:int):void
+
+ Call this function to sort the group according to a particular value and order.
+FlxGroup + + + Inherited +
toString():String
Convert object to readable string name.
@@ -690,6 +725,14 @@  Inherited
+sortHandler(Obj1:FlxObject, Obj2:FlxObject):int
+
+ Helper function for the sort process.
+FlxGroup + + + Inherited +
updateFlickering():void
Just updates the retro-style flickering.
@@ -713,7 +756,32 @@
- + +
+
Public Constants
+
+ + +
+ + + + + + + + + + +
 ConstantDefined by
 InheritedASCENDING : int = -1
[static]
+		FlxGroup
 InheritedDESCENDING : int = 1
[static]
+		FlxGroup
+
+
Protected Constants
diff --git a/org/flixel/FlxG.as b/org/flixel/FlxG.as index e2d88875..aae2f996 100755 --- a/org/flixel/FlxG.as +++ b/org/flixel/FlxG.as @@ -27,7 +27,7 @@ package org.flixel * Assign a minor version to your library. * Appears after the decimal in the console. */ - static public var LIBRARY_MINOR_VERSION:uint = 35; + static public var LIBRARY_MINOR_VERSION:uint = 36; /** * Internal tracker for game object (so we can pause & unpause) @@ -43,9 +43,9 @@ package org.flixel */ static public var debug:Boolean; /** - * Internal tracker for bounding box visibility. + * Set showBounds to true to display the bounding boxes of the in-game objects. */ - static protected var _showBounds:Boolean; + static public var showBounds:Boolean; /** * Represents the amount of time in seconds that passed since last frame. @@ -210,25 +210,6 @@ package org.flixel } } - /** - * Set showBounds to true to display the bounding boxes of the in-game objects. - */ - static public function get showBounds():Boolean - { - return _showBounds; - } - - /** - * @private - */ - static public function set showBounds(ShowBounds:Boolean):void - { - var osb:Boolean = _showBounds; - _showBounds = ShowBounds; - if(_showBounds != osb) - FlxObject._refreshBounds = true; - } - /** * The game and SWF framerate; default is 60. */ @@ -648,6 +629,26 @@ package org.flixel { _game.switchState(State); } + + /** + * Stops and resets the camera. + */ + static public function unfollow():void + { + followTarget = null; + followLead = null; + followLerp = 1; + followMin = null; + followMax = null; + if(scroll == null) + scroll = new Point(); + else + scroll.x = scroll.y = 0; + if(_scrollTarget == null) + _scrollTarget = new Point(); + else + _scrollTarget.x = _scrollTarget.y = 0; + } /** * Called by FlxGame to set up FlxG during FlxGame's constructor. @@ -678,8 +679,7 @@ package org.flixel frameratePaused = 10; maxElapsed = 0.0333333; FlxG.elapsed = 0; - _showBounds = false; - FlxObject._refreshBounds = false; + showBounds = false; panel = new FlxPanel(); quake = new FlxQuake(Zoom); @@ -724,26 +724,6 @@ package org.flixel } } - /** - * Stops and resets the camera. - */ - static internal function unfollow():void - { - followTarget = null; - followLead = null; - followLerp = 1; - followMin = null; - followMax = null; - if(scroll == null) - scroll = new Point(); - else - scroll.x = scroll.y = 0; - if(_scrollTarget == null) - _scrollTarget = new Point(); - else - _scrollTarget.x = _scrollTarget.y = 0; - } - /** * Calls update on the keyboard and mouse input tracking objects. */ diff --git a/org/flixel/FlxGame.as b/org/flixel/FlxGame.as index 71f49cf9..120280ca 100755 --- a/org/flixel/FlxGame.as +++ b/org/flixel/FlxGame.as @@ -321,7 +321,6 @@ package org.flixel _console.update(); //State updating - FlxObject._refreshBounds = false; FlxG.updateInput(); FlxG.updateSounds(); if(_paused) diff --git a/org/flixel/FlxObject.as b/org/flixel/FlxObject.as index bdec0392..64411d32 100644 --- a/org/flixel/FlxObject.as +++ b/org/flixel/FlxObject.as @@ -174,10 +174,6 @@ package org.flixel * Flag for direction collision resolution. */ public var collideBottom:Boolean; - /** - * Flag for whether the bounding box visuals need to be refreshed. - */ - static internal var _refreshBounds:Boolean; /** * Creates a new FlxObject. @@ -480,7 +476,7 @@ package org.flixel */ public function hitLeft(Contact:FlxObject,Velocity:Number):void { - if(!fixed) + if(!fixed || (Contact.fixed && ((velocity.y != 0) || (velocity.x != 0)))) velocity.x = Velocity; } @@ -503,7 +499,7 @@ package org.flixel */ public function hitTop(Contact:FlxObject,Velocity:Number):void { - if(!fixed) + if(!fixed || (Contact.fixed && ((velocity.y != 0) || (velocity.x != 0)))) velocity.y = Velocity; } @@ -516,7 +512,7 @@ package org.flixel public function hitBottom(Contact:FlxObject,Velocity:Number):void { onFloor = true; - if(!fixed) + if(!fixed || (Contact.fixed && ((velocity.y != 0) || (velocity.x != 0)))) velocity.y = Velocity; } diff --git a/org/flixel/FlxSprite.as b/org/flixel/FlxSprite.as index fb0240d0..0e049450 100755 --- a/org/flixel/FlxSprite.as +++ b/org/flixel/FlxSprite.as @@ -91,6 +91,7 @@ package org.flixel protected var _ct:ColorTransform; protected var _mtx:Matrix; protected var _bbb:BitmapData; + protected var _boundsVisible:Boolean; /** * Creates a white 8x8 square FlxSprite at the specified position. @@ -304,6 +305,7 @@ package org.flixel */ protected function resetHelpers():void { + _boundsVisible = false; _flashRect.x = 0; _flashRect.y = 0; _flashRect.width = frameWidth; @@ -319,6 +321,7 @@ package org.flixel origin.x = frameWidth/2; origin.y = frameHeight/2; _framePixels.copyPixels(_pixels,_flashRect,_flashPointZero); + if(_ct != null) _framePixels.colorTransform(_flashRect,_ct); if(FlxG.showBounds) drawBounds(); _caf = 0; @@ -514,7 +517,7 @@ package org.flixel */ protected function renderSprite():void { - if(_refreshBounds) + if(FlxG.showBounds != _boundsVisible) calcFrame(); getScreenXY(_point); @@ -675,6 +678,7 @@ package org.flixel */ protected function calcFrame():void { + _boundsVisible = false; var rx:uint = _caf*frameWidth; var ry:uint = 0; @@ -703,6 +707,9 @@ package org.flixel protected function drawBounds():void { + _boundsVisible = true; + if((_bbb == null) || (_bbb.width != width) || (_bbb.height != height)) + _bbb = new BitmapData(width,height); var bbbc:uint = getBoundingColor(); _bbb.fillRect(_flashRect,0); var ofrw:uint = _flashRect.width; diff --git a/org/flixel/FlxTilemap.as b/org/flixel/FlxTilemap.as index bab59d03..afb7710d 100644 --- a/org/flixel/FlxTilemap.as +++ b/org/flixel/FlxTilemap.as @@ -665,7 +665,7 @@ package org.flixel } /** - * Converts a PNG file to a comma-separated string. + * Converts a BitmapData object to a comma-separated string. * Black pixels are flagged as 'solid' by default, * non-black pixels are set as non-colliding. * Black pixels must be PURE BLACK. @@ -675,35 +675,31 @@ package org.flixel * * @return A comma-separated string containing the level data in a FlxTilemap-friendly format. */ - static public function pngToCSV(PNGFile:Class,Invert:Boolean=false,Scale:uint=1):String + static public function bitmapToCSV(bitmapData:BitmapData,Invert:Boolean=false,Scale:uint=1):String { //Import and scale image if necessary - var layout:Bitmap; - if(Scale <= 1) - layout = new PNGFile; - else + if(Scale > 1) { - var tmp:Bitmap = new PNGFile; - layout = new Bitmap(new BitmapData(tmp.width*Scale,tmp.height*Scale)); + var bd:BitmapData = bitmapData; + bitmapData = new BitmapData(bitmapData.width*Scale,bitmapData.height*Scale); var mtx:Matrix = new Matrix(); mtx.scale(Scale,Scale); - layout.bitmapData.draw(tmp,mtx); + bitmapData.draw(bd,mtx); } - var bd:BitmapData = layout.bitmapData; //Walk image and export pixel values var r:uint; var c:uint; var p:uint; var csv:String; - var w:uint = layout.width; - var h:uint = layout.height; + var w:uint = bitmapData.width; + var h:uint = bitmapData.height; for(r = 0; r < h; r++) { for(c = 0; c < w; c++) { //Decide if this pixel/tile is solid (1) or not (0) - p = bd.getPixel(c,r); + p = bitmapData.getPixel(c,r); if((Invert && (p > 0)) || (!Invert && (p == 0))) p = 1; else @@ -724,6 +720,22 @@ package org.flixel return csv; } + /** + * Converts a resource image file to a comma-separated string. + * Black pixels are flagged as 'solid' by default, + * non-black pixels are set as non-colliding. + * Black pixels must be PURE BLACK. + * + * @param PNGFile An embedded graphic, preferably black and white. + * @param Invert Load white pixels as solid instead. + * + * @return A comma-separated string containing the level data in a FlxTilemap-friendly format. + */ + static public function imageToCSV(ImageFile:Class,Invert:Boolean=false,Scale:uint=1):String + { + return bitmapToCSV((new ImageFile).bitmapData,Invert,Scale); + } + /** * An internal function used by the binary auto-tilers. * diff --git a/org/flixel/FlxU.as b/org/flixel/FlxU.as index ec3fcc94..4fee372b 100644 --- a/org/flixel/FlxU.as +++ b/org/flixel/FlxU.as @@ -136,11 +136,6 @@ package org.flixel static public function startProfile():uint { return getTimer(); - retur - _elapsed = (t-_total)/1000; - if(_created) - _console.lastElapsed = _elapsed; - _total = t; } /** @@ -448,11 +443,20 @@ package org.flixel r2 = -obj1Hull.x - obj1Hull.width + Object1.colHullY.width; } overlap = r1 - r2; + + //Slightly smarter version of checking if objects are 'fixed' in space or not + f1 = Object1.fixed; + f2 = Object2.fixed; + if(f1 && f2) + { + f1 &&= (Object1.colVector.x == 0) && (o1 == 0); + f2 &&= (Object2.colVector.x == 0) && (o2 == 0); + } //Last chance to skip out on a bogus collision resolution if( (overlap == 0) || - ((!Object1.fixed && ((overlap>0)?overlap:-overlap) > obj1Hull.width*0.8)) || - ((!Object2.fixed && ((overlap>0)?overlap:-overlap) > obj2Hull.width*0.8)) ) + ((!f1 && ((overlap>0)?overlap:-overlap) > obj1Hull.width*0.8)) || + ((!f2 && ((overlap>0)?overlap:-overlap) > obj2Hull.width*0.8)) ) { obj2Hull.x -= ox2; obj2Hull.y -= oy2; @@ -463,21 +467,21 @@ package org.flixel //Adjust the objects according to their flags and stuff sv1 = Object2.velocity.x; sv2 = Object1.velocity.x; - if(!Object1.fixed && Object2.fixed) + if(!f1 && f2) { if(Object1._group) Object1.reset(Object1.x - overlap,Object1.y); else Object1.x -= overlap; } - else if(Object1.fixed && !Object2.fixed) + else if(f1 && !f2) { if(Object2._group) Object2.reset(Object2.x + overlap,Object2.y); else Object2.x += overlap; } - else if(!Object1.fixed && !Object2.fixed) + else if(!f1 && !f2) { overlap /= 2; if(Object1._group) @@ -503,7 +507,7 @@ package org.flixel } //Adjust collision hulls if necessary - if(!Object1.fixed && (overlap != 0)) + if(!f1 && (overlap != 0)) { if(p1hn2) obj1Hull.width -= overlap; @@ -514,7 +518,7 @@ package org.flixel } Object1.colHullY.x -= overlap; } - if(!Object2.fixed && (overlap != 0)) + if(!f2 && (overlap != 0)) { if(p1hn2) { @@ -555,6 +559,8 @@ package org.flixel Object2.preCollide(Object1); //Basic resolution variables + var f1:Boolean; + var f2:Boolean; var overlap:Number; var hit:Boolean = false; var p1hn2:Boolean; @@ -644,10 +650,19 @@ package org.flixel } overlap = r1 - r2; + //Slightly smarter version of checking if objects are 'fixed' in space or not + f1 = Object1.fixed; + f2 = Object2.fixed; + if(f1 && f2) + { + f1 &&= (Object1.colVector.x == 0) && (o1 == 0); + f2 &&= (Object2.colVector.x == 0) && (o2 == 0); + } + //Last chance to skip out on a bogus collision resolution if( (overlap == 0) || - ((!Object1.fixed && ((overlap>0)?overlap:-overlap) > obj1Hull.height*0.8)) || - ((!Object2.fixed && ((overlap>0)?overlap:-overlap) > obj2Hull.height*0.8)) ) + ((!f1 && ((overlap>0)?overlap:-overlap) > obj1Hull.height*0.8)) || + ((!f2 && ((overlap>0)?overlap:-overlap) > obj2Hull.height*0.8)) ) { obj2Hull.x -= ox2; obj2Hull.y -= oy2; @@ -658,21 +673,21 @@ package org.flixel //Adjust the objects according to their flags and stuff sv1 = Object2.velocity.y; sv2 = Object1.velocity.y; - if(!Object1.fixed && Object2.fixed) + if(!f1 && f2) { if(Object1._group) Object1.reset(Object1.x, Object1.y - overlap); else Object1.y -= overlap; } - else if(Object1.fixed && !Object2.fixed) + else if(f1 && !f2) { if(Object2._group) Object2.reset(Object2.x, Object2.y + overlap); else Object2.y += overlap; } - else if(!Object1.fixed && !Object2.fixed) + else if(!f1 && !f2) { overlap /= 2; if(Object1._group) @@ -698,14 +713,14 @@ package org.flixel } //Adjust collision hulls if necessary - if(!Object1.fixed && (overlap != 0)) + if(!f1 && (overlap != 0)) { if(p1hn2) { obj1Hull.y -= overlap; //This code helps stuff ride horizontally moving platforms. - if(Object2.fixed && Object2.moves) + if(f2 && Object2.moves) { sv1 = Object2.colVector.x; Object1.x += sv1; @@ -719,7 +734,7 @@ package org.flixel obj1Hull.height += overlap; } } - if(!Object2.fixed && (overlap != 0)) + if(!f2 && (overlap != 0)) { if(p1hn2) { @@ -731,7 +746,7 @@ package org.flixel obj2Hull.height += overlap; //This code helps stuff ride horizontally moving platforms. - if(Object1.fixed && Object1.moves) + if(f1 && Object1.moves) { sv2 = Object1.colVector.x; Object2.x += sv2;