From 7c927de22d6c7341a0ca70ed026778d5fd228128 Mon Sep 17 00:00:00 2001 From: Kirill Nepomnyaschiy Date: Sun, 2 Jun 2013 19:24:18 +0400 Subject: [PATCH 1/6] Allow tilemap layers to have different x/y --- src/org/ivar/leveltools/DameLevel.hx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/org/ivar/leveltools/DameLevel.hx b/src/org/ivar/leveltools/DameLevel.hx index 252cddf..18ee971 100644 --- a/src/org/ivar/leveltools/DameLevel.hx +++ b/src/org/ivar/leveltools/DameLevel.hx @@ -122,7 +122,8 @@ class DameLevel extends Level Std.parseInt(mapNode.att.drawIdx), Std.parseInt(mapNode.att.collIdx)); map.setSolid(mapNode.has.hasHits && mapNode.att.hasHits == "true"); - + map.x = Std.parseInt( mapNode.att.x); + map.y = Std.parseInt( mapNode.att.y); tilemaps.set(layerNode.att.name, map); group.add(map); if (tilemapAddCallback != null) From 417a2e7b56ebc6a1200751a13bdf7ad38e757999 Mon Sep 17 00:00:00 2001 From: Kirill Nepomnyaschiy Date: Thu, 13 Jun 2013 21:59:12 +0400 Subject: [PATCH 2/6] Haxe 3 compatibility --- src/org/ivar/leveltools/DameLevel.hx | 65 ++++++++++++++++----------- src/org/ivar/leveltools/Level.hx | 16 +++---- src/org/ivar/leveltools/Properties.hx | 29 +++++++++--- src/org/ivar/leveltools/TiledLevel.hx | 18 ++++---- 4 files changed, 79 insertions(+), 49 deletions(-) diff --git a/src/org/ivar/leveltools/DameLevel.hx b/src/org/ivar/leveltools/DameLevel.hx index 18ee971..ba8fd7d 100644 --- a/src/org/ivar/leveltools/DameLevel.hx +++ b/src/org/ivar/leveltools/DameLevel.hx @@ -8,7 +8,7 @@ import org.flixel.FlxTilemap; import org.flixel.FlxPath; import org.flixel.FlxPoint; import org.ivar.leveltools.Level; -import nme.installer.Assets; +import openfl.Assets; /** @@ -19,21 +19,29 @@ typedef LinkAddCallback = FlxSprite -> FlxSprite -> Properties -> Void; /** * @author Nemanja Stojanovic * This class deals with loading levels exported from DAME. It currently supports - * loading tilemap layers, sprite layers, paths layers and links between sprites. - * Properties are loaded into a key-value structure and passed as arguments to callbacks, + * loading tilemap layers, sprite layers, paths layers and links between sprites. + * Properties are loaded into a key-value structure and passed as arguments to callbacks, * however, individual tile properties are not yet supported. */ class DameLevel extends Level { + + /** + * World bounds provided by DAME + */ + public var boundsMinX:Int; + public var boundsMaxX:Int; + public var boundsMinY:Int; + public var boundsMaxY:Int; /** * A table of registered link IDs used to link sprites. */ - private var linkIds:Hash; + private var linkIds:Map; /** * A table of parsed paths, stored by name. */ - private var paths:Hash; + private var paths:Map; /** * A callback that is called whenever a link is loaded. @@ -48,12 +56,12 @@ class DameLevel extends Level * @param objectAddCallback a callback that is called every time an object (sprite) is loaded. * @param linkAddCallback a callback that is called every time a link is loaded. */ - public function new(assetsPath:String, tilemapAddCallback:TilemapAddCallback, objectAddCallback:ObjectAddCallback, linkAddCallback:LinkAddCallback) + public function new(assetsPath:String, tilemapAddCallback:TilemapAddCallback, objectAddCallback:ObjectAddCallback, linkAddCallback:LinkAddCallback) { super(assetsPath, tilemapAddCallback, objectAddCallback); this.linkAddCallback = linkAddCallback; - linkIds = new Hash(); - paths = new Hash(); + linkIds = new Map(); + paths = new Map(); } /** @@ -72,7 +80,12 @@ class DameLevel extends Level parseLinks(xml.node.links); if (addToScene) - FlxG.getState().add(masterLayer); + FlxG.state.add(masterLayer); + + boundsMaxX = Std.parseInt(xml.att.maxx); + boundsMinY = Std.parseInt(xml.att.minx); + boundsMaxY = Std.parseInt(xml.att.maxy); + boundsMinY = Std.parseInt(xml.att.miny); } /** @@ -103,7 +116,7 @@ class DameLevel extends Level } /** - * Loads a tilemap and adds it to the layer group. + * Loads a tilemap and adds it to the layer group. * If specified, the tilemapAddCallback is called with the loaded tilemap as argument. * @param group The group of the layer this map belongs to * @param mapNode The node that contains tilemap data @@ -121,7 +134,7 @@ class DameLevel extends Level 0, 0, Std.parseInt(mapNode.att.drawIdx), Std.parseInt(mapNode.att.collIdx)); - map.setSolid(mapNode.has.hasHits && mapNode.att.hasHits == "true"); + map.solid = mapNode.has.hasHits && mapNode.att.hasHits == "true"; map.x = Std.parseInt( mapNode.att.x); map.y = Std.parseInt( mapNode.att.y); tilemaps.set(layerNode.att.name, map); @@ -131,9 +144,9 @@ class DameLevel extends Level } /** - * Loads a sprite and adds it to the layer group. The sprite is created using reflection, - * from the class name specified in Dame (the class name should contain the whole package). - * If the class doesn't exist, it is simply skipped. If the objectAddCallback is specified, + * Loads a sprite and adds it to the layer group. The sprite is created using reflection, + * from the class name specified in Dame (the class name should contain the whole package). + * If the class doesn't exist, it is simply skipped. If the objectAddCallback is specified, * it is called with the loaded sprite and it's properties as arguments. * @todo Maybe throw an exception when the sprite doesn't exist? * @param group The group of the layer this sprite belongs to. @@ -146,15 +159,17 @@ class DameLevel extends Level var spriteClass = Type.resolveClass(spriteNode.x.get("class")); if (spriteClass == null) return; - //Since Type.createInstance can't deal with optional args, we have to pass all - //declared arguments manually. - var constructor = Std.string(Reflect.field(spriteClass, "new")); - var arity = Std.parseInt(constructor.substr(constructor.indexOf(":") + 1)); - var args = []; - for(i in 0 ... arity) - args.push(null); + + // TODO: the following code doesn't work with haxe3, + // needs to be replaced by macro + + //var constructor = Std.string(Reflect.field(spriteClass, "new")); + //var arity = Std.parseInt(constructor.substr(constructor.indexOf(":") + 1)); + //var args = []; + //for(i in 0 ... arity) + //args.push(null); - var sprite:FlxSprite = cast(Type.createInstance(spriteClass, args), FlxSprite); + var sprite:FlxSprite = cast(Type.createInstance(spriteClass, []), FlxSprite); sprite.x = Std.parseFloat(spriteNode.att.x); sprite.y = Std.parseFloat(spriteNode.att.y); sprite.angle = Std.parseFloat(spriteNode.att.angle); @@ -177,7 +192,7 @@ class DameLevel extends Level } /** - * Loads a path and adds it to the paths table under the name of the layer. Currently, + * Loads a path and adds it to the paths table under the name of the layer. Currently, * only one path per layer is supported, until I find a better way to do this. * @todo Find a way around the path naming issue * @param group The group of the layer this path belongs to. @@ -198,7 +213,7 @@ class DameLevel extends Level } /** - * Loads a link and calls the LinkAddCallback, passing the two linked sprites and the properties + * Loads a link and calls the LinkAddCallback, passing the two linked sprites and the properties * of the link. If the sprites the link references do not exist, the link is simply skipped. * @param linkNode The node that contains link data * @return Nothing. @@ -208,7 +223,7 @@ class DameLevel extends Level for (link in linkNode.nodes.link) { var fromId:String = link.att.from; - var toId:String = link.att.to; + var toId:String = link.att.to; if (linkIds.exists(fromId) && linkIds.exists(toId)) { var properties:Properties; diff --git a/src/org/ivar/leveltools/Level.hx b/src/org/ivar/leveltools/Level.hx index 46292fe..9d5b426 100644 --- a/src/org/ivar/leveltools/Level.hx +++ b/src/org/ivar/leveltools/Level.hx @@ -3,7 +3,7 @@ import org.flixel.FlxGroup; import org.flixel.FlxObject; import org.flixel.FlxSprite; import org.flixel.FlxTilemap; -import nme.installer.Assets; +import openfl.Assets; /** * A function type used as a callback for adding objects. @@ -19,7 +19,7 @@ typedef TilemapAddCallback = FlxTilemap -> Void; * @author Nemanja Stojanovic * The base class of other level loaders. */ -class Level +class Level { /** * The group that contains all other groups. @@ -29,12 +29,12 @@ class Level /** * A table that contains the loaded tilemaps stored by name of the layer. */ - private var tilemaps:Hash; + private var tilemaps:Map; /** * A table that contains all the layers regardless of type, by the name of the layer. */ - private var layers:Hash; + private var layers:Map; /** * Name of the level. @@ -43,7 +43,7 @@ class Level /** * Path to the assets directory. - */ + */ private var assetsPath:String = "assets/"; /** @@ -62,13 +62,13 @@ class Level * @param tilemapAddCallback a callback that is called every time a tilemap is loaded. * @param objectAddCallback a callback that is called every time an object (sprite) is loaded. */ - private function new(assetsPath:String, tilemapAddCallback:TilemapAddCallback, objectAddCallback:ObjectAddCallback) + private function new(assetsPath:String, tilemapAddCallback:TilemapAddCallback, objectAddCallback:ObjectAddCallback) { this.tilemapAddCallback = tilemapAddCallback; this.objectAddCallback = objectAddCallback; masterLayer = new FlxGroup(); - tilemaps = new Hash(); - layers = new Hash(); + tilemaps = new Map(); + layers = new Map(); this.assetsPath = assetsPath; } diff --git a/src/org/ivar/leveltools/Properties.hx b/src/org/ivar/leveltools/Properties.hx index d70d431..c9bf9cd 100644 --- a/src/org/ivar/leveltools/Properties.hx +++ b/src/org/ivar/leveltools/Properties.hx @@ -3,25 +3,25 @@ import haxe.xml.Fast; /** * @author Nemanja Stojanovic - * This class is used to easily parse key-value properties exported from Dame and Tiled. - * It provides some useful methods for retreiving values and allows the user to specify + * This class is used to easily parse key-value properties exported from Dame and Tiled. + * It provides some useful methods for retreiving values and allows the user to specify * default values for properties. */ -class Properties extends Hash +class Properties { - + private var _map:Map; /** * Constructs the object and loads all the properties into the hash table. * Both keys and values are strings (as this class extends Hash), but helper methods * provide conversions to other basic types. It treats all nodes named prop and - * property as properties and reads their name and value + * property as properties and reads their name and value * attributes. * @param node The node that contains all the properties. * @return Nothing. */ - public function new(?node:Fast = null) + public function new(?node:Fast = null) { - super(); + _map = new Map(); if (node == null) return; for (property in node.nodes.property) @@ -105,4 +105,19 @@ class Properties extends Hash return def; } } + + private inline function get(key:String):Dynamic + { + return _map[key]; + } + + private inline function set(key:String, value:String):Void + { + _map[key] = value; + } + + private inline function exists(key:String):Bool + { + return _map[key] != null; + } } \ No newline at end of file diff --git a/src/org/ivar/leveltools/TiledLevel.hx b/src/org/ivar/leveltools/TiledLevel.hx index 4d2a01e..68153ee 100644 --- a/src/org/ivar/leveltools/TiledLevel.hx +++ b/src/org/ivar/leveltools/TiledLevel.hx @@ -1,6 +1,6 @@ package org.ivar.leveltools; import haxe.xml.Fast; -import nme.Assets; +import openfl.Assets; import org.flixel.FlxState; import org.ivar.leveltools.Level; import org.flixel.FlxG; @@ -46,7 +46,7 @@ private class Tileset * @author Nemanja Stojanovic * This class deals with loading levels created with Tiled Editor. So far, only loading tilesets * is supported and that's a bit experimental too. The problem is that Tiled uses idx 0 when there is no tile - * and flixel uses 0 to index the first tile, and this doesn't play well with Haxe/Flixel at least. + * and flixel uses 0 to index the first tile, and this doesn't play well with Haxe/Flixel at least. * The current solution is to decrement the index of all tiles (except zeros), but hopefully this is just * a temporary solution. */ @@ -55,7 +55,7 @@ class TiledLevel extends Level /** * A table of tilesets */ - private var tilesets:Hash; + private var tilesets:Map; /** * The default tileset (will be set to the first tileset loaded) @@ -70,10 +70,10 @@ class TiledLevel extends Level * @param linkAddCallback a callback that is called every time a link is loaded. * @return Nothing. */ - public function new(assetsPath:String, tilemapAddCallback:TilemapAddCallback, objectAddCallback:ObjectAddCallback) + public function new(assetsPath:String, tilemapAddCallback:TilemapAddCallback, objectAddCallback:ObjectAddCallback) { super(assetsPath, tilemapAddCallback, objectAddCallback); - tilesets = new Hash(); + tilesets = new Map(); } /** @@ -116,7 +116,7 @@ class TiledLevel extends Level tileset = tilesets.get(tilesetName); else tileset = defaultTileset; - addTilemap(name, + addTilemap(name, width, height, tileset.tileWidth, tileset.tileHeight, csv, tileset.imagePath, properties); @@ -124,7 +124,7 @@ class TiledLevel extends Level /** * Loads a tileset and stores it into the tilesets table. Used internally. - * @param tilesetNode + * @param tilesetNode * @return Nothing. */ private function parseTileset(tilesetNode:Fast):Void @@ -144,7 +144,7 @@ class TiledLevel extends Level /** * Tiled editor exports csv that contains an extra ',' every line (as well as a few extra newlines), * which flixel refuses to parse. - * This method parses the csv, changes the values (decrements all indexes) and generates a csv + * This method parses the csv, changes the values (decrements all indexes) and generates a csv * string flixel can parse. * @param csv the csv string. * @return parsed csv string. @@ -203,7 +203,7 @@ class TiledLevel extends Level var map:FlxTilemap = new FlxTilemap(); tilemaps.set(name, map); - map.loadMap(csv, assetsPath + tilesetPath, + map.loadMap(csv, assetsPath + tilesetPath, tileWidth, tileHeight, 0, properties.getInt("startindex", 0), properties.getInt("drawindex", 1), From 3db9949713f1ba72e2b6241cddedc0823d2ec402 Mon Sep 17 00:00:00 2001 From: Kirill Nepomnyaschiy Date: Wed, 3 Jul 2013 10:24:29 +0400 Subject: [PATCH 3/6] Latest HaxeFlixel compatibility --- src/org/ivar/leveltools/DameLevel.hx | 16 ++++++++-------- src/org/ivar/leveltools/Level.hx | 8 ++++---- src/org/ivar/leveltools/LevelTools.hx | 2 +- src/org/ivar/leveltools/TiledLevel.hx | 6 +++--- src/org/ivar/leveltools/TilemapIterator.hx | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/org/ivar/leveltools/DameLevel.hx b/src/org/ivar/leveltools/DameLevel.hx index ba8fd7d..92bdb85 100644 --- a/src/org/ivar/leveltools/DameLevel.hx +++ b/src/org/ivar/leveltools/DameLevel.hx @@ -1,12 +1,12 @@ package org.ivar.leveltools; +import flixel.group.FlxGroup; +import flixel.tile.FlxTilemap; import haxe.xml.Fast; -import org.flixel.FlxG; -import org.flixel.FlxGroup; -import org.flixel.FlxSprite; -import org.flixel.FlxObject; -import org.flixel.FlxTilemap; -import org.flixel.FlxPath; -import org.flixel.FlxPoint; +import flixel.FlxG; +import flixel.FlxSprite; +import flixel.FlxObject; +import flixel.FlxPath; +import flixel.util.FlxPoint; import org.ivar.leveltools.Level; import openfl.Assets; @@ -125,7 +125,7 @@ class DameLevel extends Level */ private function parseTilemap(group:FlxGroup, mapNode:Fast, layerNode:Fast):Void { - var map:FlxTilemap = new FlxTilemap(); + var map:FlxTilemap = new FlxTilemapEx(); map.loadMap( Assets.getText(assetsPath + mapNode.att.csv), assetsPath + mapNode.att.tiles, diff --git a/src/org/ivar/leveltools/Level.hx b/src/org/ivar/leveltools/Level.hx index 9d5b426..b6785fc 100644 --- a/src/org/ivar/leveltools/Level.hx +++ b/src/org/ivar/leveltools/Level.hx @@ -1,8 +1,8 @@ package org.ivar.leveltools; -import org.flixel.FlxGroup; -import org.flixel.FlxObject; -import org.flixel.FlxSprite; -import org.flixel.FlxTilemap; +import flixel.tile.FlxTilemap; +import flixel.group.FlxGroup; +import flixel.FlxObject; +import flixel.FlxSprite; import openfl.Assets; /** diff --git a/src/org/ivar/leveltools/LevelTools.hx b/src/org/ivar/leveltools/LevelTools.hx index a9d0304..c88c803 100644 --- a/src/org/ivar/leveltools/LevelTools.hx +++ b/src/org/ivar/leveltools/LevelTools.hx @@ -1,5 +1,5 @@ package org.ivar.leveltools; -import org.flixel.FlxTilemap; +import flixel.FlxTilemap; import org.ivar.leveltools.TilemapIterator; /** diff --git a/src/org/ivar/leveltools/TiledLevel.hx b/src/org/ivar/leveltools/TiledLevel.hx index 68153ee..f116d40 100644 --- a/src/org/ivar/leveltools/TiledLevel.hx +++ b/src/org/ivar/leveltools/TiledLevel.hx @@ -1,10 +1,10 @@ package org.ivar.leveltools; import haxe.xml.Fast; import openfl.Assets; -import org.flixel.FlxState; +import flixel.FlxState; import org.ivar.leveltools.Level; -import org.flixel.FlxG; -import org.flixel.FlxTilemap; +import flixel.FlxG; +import flixel.FlxTilemap; /** * @author Nemanja Stojanovic diff --git a/src/org/ivar/leveltools/TilemapIterator.hx b/src/org/ivar/leveltools/TilemapIterator.hx index 0d9b41a..bd807eb 100644 --- a/src/org/ivar/leveltools/TilemapIterator.hx +++ b/src/org/ivar/leveltools/TilemapIterator.hx @@ -1,5 +1,5 @@ package org.ivar.leveltools; -import org.flixel.FlxTilemap; +import flixel.FlxTilemap; using org.ivar.leveltools.LevelTools; From 74df95769fd98993fe8e14292d2123c24f6a752f Mon Sep 17 00:00:00 2001 From: Kirill Nepomnyaschiy Date: Wed, 3 Jul 2013 10:25:14 +0400 Subject: [PATCH 4/6] Support colored tilemaps --- src/org/ivar/leveltools/FlxTilemapEx.hx | 31 +++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/org/ivar/leveltools/FlxTilemapEx.hx diff --git a/src/org/ivar/leveltools/FlxTilemapEx.hx b/src/org/ivar/leveltools/FlxTilemapEx.hx new file mode 100644 index 0000000..f28d3fd --- /dev/null +++ b/src/org/ivar/leveltools/FlxTilemapEx.hx @@ -0,0 +1,31 @@ +package org.ivar.leveltools; +import flash.geom.ColorTransform; +import flixel.tile.FlxTilemap; + +/** + * ... + * @author k.nepomnyaschiy + */ +class FlxTilemapEx extends FlxTilemap +{ + + + public var color(default, set_color):UInt = 0; + + private function set_color(Color:UInt):UInt + { + _tiles.colorTransform(_tiles.rect, intToColorTransform(Color)); + return Color; + } + + private inline static function intToColorTransform(Color:UInt):ColorTransform + { + var colorTransform:ColorTransform = new ColorTransform(); + colorTransform.redMultiplier = (Color >> 16) / 255; + colorTransform.greenMultiplier = (Color >> 8 & 0xff) / 255; + colorTransform.blueMultiplier = (Color & 0xff) / 255; + + return colorTransform; + } + +} \ No newline at end of file From 219bd2cd9c8371fe6d1c553fb7c7e0d627ec789f Mon Sep 17 00:00:00 2001 From: Kirill Nepomnyaschiy Date: Thu, 4 Jul 2013 21:51:21 +0400 Subject: [PATCH 5/6] flixel compatibility --- src/org/ivar/leveltools/DameLevel.hx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/ivar/leveltools/DameLevel.hx b/src/org/ivar/leveltools/DameLevel.hx index 92bdb85..14760ce 100644 --- a/src/org/ivar/leveltools/DameLevel.hx +++ b/src/org/ivar/leveltools/DameLevel.hx @@ -1,11 +1,11 @@ package org.ivar.leveltools; import flixel.group.FlxGroup; import flixel.tile.FlxTilemap; +import flixel.util.FlxPath; import haxe.xml.Fast; import flixel.FlxG; import flixel.FlxSprite; import flixel.FlxObject; -import flixel.FlxPath; import flixel.util.FlxPoint; import org.ivar.leveltools.Level; import openfl.Assets; From 7379dca5282119682696073355556db727df5f35 Mon Sep 17 00:00:00 2001 From: Florian DORMONT Date: Wed, 31 Jul 2013 12:19:48 +0200 Subject: [PATCH 6/6] Fixed imports for Flixel 2.55 + Haxe 3 --- src/org/ivar/leveltools/DameLevel.hx | 14 +++++++------- src/org/ivar/leveltools/FlxTilemapEx.hx | 2 +- src/org/ivar/leveltools/Level.hx | 8 ++++---- src/org/ivar/leveltools/LevelTools.hx | 2 +- src/org/ivar/leveltools/TiledLevel.hx | 6 +++--- src/org/ivar/leveltools/TilemapIterator.hx | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/org/ivar/leveltools/DameLevel.hx b/src/org/ivar/leveltools/DameLevel.hx index 14760ce..00d7033 100644 --- a/src/org/ivar/leveltools/DameLevel.hx +++ b/src/org/ivar/leveltools/DameLevel.hx @@ -1,12 +1,12 @@ package org.ivar.leveltools; -import flixel.group.FlxGroup; -import flixel.tile.FlxTilemap; -import flixel.util.FlxPath; +import org.flixel.FlxGroup; +import org.flixel.FlxTilemap; +import org.flixel.FlxPath; import haxe.xml.Fast; -import flixel.FlxG; -import flixel.FlxSprite; -import flixel.FlxObject; -import flixel.util.FlxPoint; +import org.flixel.FlxG; +import org.flixel.FlxSprite; +import org.flixel.FlxObject; +import org.flixel.FlxPoint; import org.ivar.leveltools.Level; import openfl.Assets; diff --git a/src/org/ivar/leveltools/FlxTilemapEx.hx b/src/org/ivar/leveltools/FlxTilemapEx.hx index f28d3fd..f9f2097 100644 --- a/src/org/ivar/leveltools/FlxTilemapEx.hx +++ b/src/org/ivar/leveltools/FlxTilemapEx.hx @@ -1,6 +1,6 @@ package org.ivar.leveltools; import flash.geom.ColorTransform; -import flixel.tile.FlxTilemap; +import org.flixel.FlxTilemap; /** * ... diff --git a/src/org/ivar/leveltools/Level.hx b/src/org/ivar/leveltools/Level.hx index b6785fc..ea837b6 100644 --- a/src/org/ivar/leveltools/Level.hx +++ b/src/org/ivar/leveltools/Level.hx @@ -1,8 +1,8 @@ package org.ivar.leveltools; -import flixel.tile.FlxTilemap; -import flixel.group.FlxGroup; -import flixel.FlxObject; -import flixel.FlxSprite; +import org.flixel.FlxTilemap; +import org.flixel.FlxGroup; +import org.flixel.FlxObject; +import org.flixel.FlxSprite; import openfl.Assets; /** diff --git a/src/org/ivar/leveltools/LevelTools.hx b/src/org/ivar/leveltools/LevelTools.hx index c88c803..a9d0304 100644 --- a/src/org/ivar/leveltools/LevelTools.hx +++ b/src/org/ivar/leveltools/LevelTools.hx @@ -1,5 +1,5 @@ package org.ivar.leveltools; -import flixel.FlxTilemap; +import org.flixel.FlxTilemap; import org.ivar.leveltools.TilemapIterator; /** diff --git a/src/org/ivar/leveltools/TiledLevel.hx b/src/org/ivar/leveltools/TiledLevel.hx index f116d40..68153ee 100644 --- a/src/org/ivar/leveltools/TiledLevel.hx +++ b/src/org/ivar/leveltools/TiledLevel.hx @@ -1,10 +1,10 @@ package org.ivar.leveltools; import haxe.xml.Fast; import openfl.Assets; -import flixel.FlxState; +import org.flixel.FlxState; import org.ivar.leveltools.Level; -import flixel.FlxG; -import flixel.FlxTilemap; +import org.flixel.FlxG; +import org.flixel.FlxTilemap; /** * @author Nemanja Stojanovic diff --git a/src/org/ivar/leveltools/TilemapIterator.hx b/src/org/ivar/leveltools/TilemapIterator.hx index bd807eb..0d9b41a 100644 --- a/src/org/ivar/leveltools/TilemapIterator.hx +++ b/src/org/ivar/leveltools/TilemapIterator.hx @@ -1,5 +1,5 @@ package org.ivar.leveltools; -import flixel.FlxTilemap; +import org.flixel.FlxTilemap; using org.ivar.leveltools.LevelTools;