Move to OpenFL. Fix for latest Haxe3 release. Remove unused imports h…

…ere and there.
ramsestom · Jun 4, 2013 · 38ee562 · 38ee562
1 parent 311bf45
commit 38ee562
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 77 deletions.
diff --git a/project.nmml → project.xml b/project.nmml → project.xml
@@ -5,12 +5,10 @@
 
     <source path="src"/>
 
-    <haxelib name="nme"/>
+    <haxelib name="openfl"/>
     <haxelib name="HaxePunk"/>
     <haxelib name="HaxePunk-gui"/>
     <haxelib name="ash"/>
 
-    <ndll name="nme" haxelib="nme"/>
-
     <assets path="assets" rename=""/>
 </project>
diff --git a/src/dungeons/AssetFactory.hx b/src/dungeons/AssetFactory.hx
@@ -4,10 +4,10 @@ import com.haxepunk.graphics.Spritemap;
 import com.haxepunk.Graphic;
 import haxe.Json;
 
-import nme.geom.Rectangle;
-import nme.geom.Matrix;
-import nme.display.BitmapData;
-import nme.Assets;
+import flash.geom.Rectangle;
+import flash.geom.Matrix;
+import flash.display.BitmapData;
+import openfl.Assets;
 
 import com.haxepunk.HXP;
 import com.haxepunk.graphics.Image;

diff --git a/src/dungeons/EntityCreator.hx b/src/dungeons/EntityCreator.hx
@@ -5,7 +5,7 @@ import haxe.Json;
 import ash.core.Engine;
 import ash.core.Entity;
 
-import nme.Assets;
+import openfl.Assets;
 
 import com.haxepunk.HXP;
 

diff --git a/src/dungeons/GameScene.hx b/src/dungeons/GameScene.hx
@@ -2,56 +2,26 @@ package dungeons;
 
 import Lambda;
 
-import com.haxepunk.graphics.Image;
-import com.haxepunk.graphics.Graphiclist;
-import com.haxepunk.graphics.Spritemap;
-import com.haxepunk.graphics.Tilemap;
-import com.haxepunk.Graphic;
 import com.haxepunk.HXP;
 import com.haxepunk.Scene;
 
-import haxe.Json;
-
-import nme.display.Bitmap;
-import nme.display.DisplayObjectContainer;
-import nme.events.KeyboardEvent;
-import nme.ui.Keyboard;
-import nme.display.Shape;
-import nme.Assets;
-import nme.geom.Point;
-import nme.geom.Rectangle;
-import nme.geom.Matrix;
-import nme.events.Event;
-import nme.display.BitmapData;
-import nme.display.StageScaleMode;
-import nme.display.Sprite;
-import nme.text.TextFormat;
-import nme.text.TextField;
-import nme.Lib;
+import openfl.Assets;
+import flash.text.TextFormat;
+import flash.text.TextField;
 
 import ash.core.Engine;
 import ash.core.Entity;
 
-import dungeons.components.HealthRegen;
 import dungeons.components.Key;
-import dungeons.components.Health;
 import dungeons.components.Description;
-import dungeons.components.MonsterAI;
 import dungeons.components.Obstacle;
-import dungeons.components.FOV;
-import dungeons.components.CameraFocus;
-import dungeons.components.Actor;
-import dungeons.components.PlayerControls;
 import dungeons.components.Position;
 import dungeons.components.LightOccluder;
 import dungeons.components.DoorRenderable;
 import dungeons.components.Door;
-import dungeons.components.Fighter;
 import dungeons.components.Renderable;
 import dungeons.components.Item;
-import dungeons.components.Inventory;
 import dungeons.components.TimeTicker;
-import dungeons.components.Equipment;
 
 import dungeons.systems.MessageLogSystem;
 import dungeons.systems.FightSystem;
@@ -72,8 +42,6 @@ import dungeons.systems.ScheduleSystem;
 import dungeons.systems.HealthRegenSystem;
 
 import dungeons.mapgen.Dungeon;
-import dungeons.utils.ShadowCaster;
-import dungeons.utils.TransitionTileHelper;
 import dungeons.utils.MapGrid;
 import dungeons.utils.Vector;
 import dungeons.utils.Scheduler;
@@ -188,7 +156,7 @@ class GameScene extends Scene
                         door.add(new Position(x, y));
                         door.add(new dungeons.components.Door(open, level));
                         var type:String = doorTypes[level % doorTypes.length];
-                        door.add(new DoorRenderable("door_"+type+"_open", "door_"+type+"_closed"), Renderable);
+                        door.add(new DoorRenderable("door_" + type + "_open", "door_" + type + "_closed"), Renderable);
                         engine.addEntity(door);
                     default:
                         continue;
@@ -199,14 +167,15 @@ class GameScene extends Scene
         for (keyLevel in 0...dungeon.keyLevel)
         {
             var rooms = Lambda.array(dungeon.getLevelRooms(keyLevel));
-            rooms.sort(function (a, b) { return Math.round(a.intensity - b.intensity); });
+            rooms.sort(function(a, b)
+            { return Math.round(a.intensity - b.intensity); });
 
             var room:Room = rooms[0];
             var point:Vector = getRandomRoomPoint(room);
 
             var key:Entity = new Entity();
             key.add(new Position(point.x, point.y));
-            key.add(new Item("key"+(keyLevel + 1), false, 1));
+            key.add(new Item("key" + (keyLevel + 1), false, 1));
             key.add(new Description("Key " + (keyLevel + 1)));
             key.add(new Key(keyLevel + 1));
 
@@ -272,7 +241,7 @@ class GameScene extends Scene
                         shelf.add(obstacle);
                         var type:String = HXP.random < 0.5 ? "bookshelf_ransacked" : "bookshelf";
                         var variant:Int = HXP.rand(3);
-                        shelf.add(new Renderable(type+variant, RenderLayers.OBJECT));
+                        shelf.add(new Renderable(type + variant, RenderLayers.OBJECT));
                         engine.addEntity(shelf);
                     }
                 case Fountain:
@@ -336,8 +305,8 @@ class GameScene extends Scene
     private static function getRandomRoomPoint(room:Room):Vector
     {
         return {
-            x: room.x + 1 + HXP.rand(room.grid.width - 2),
-            y: room.y + 1 + HXP.rand(room.grid.height - 2)
+        x: room.x + 1 + HXP.rand(room.grid.width - 2),
+        y: room.y + 1 + HXP.rand(room.grid.height - 2)
         };
     }
 

diff --git a/src/dungeons/components/Renderable.hx b/src/dungeons/components/Renderable.hx
@@ -1,8 +1,5 @@
 package dungeons.components;
 
-import com.haxepunk.HXP;
-import com.haxepunk.Graphic;
-
 import dungeons.systems.RenderSystem.RenderLayers;
 
 class Renderable

diff --git a/src/dungeons/systems/FOVSystem.hx b/src/dungeons/systems/FOVSystem.hx
@@ -1,9 +1,6 @@
 package dungeons.systems;
 
 import dungeons.utils.MapGrid;
-import nme.display.BitmapData;
-
-import com.haxepunk.graphics.Image;
 
 import ash.core.NodeList;
 import ash.core.Engine;

diff --git a/src/dungeons/systems/MessageLogSystem.hx b/src/dungeons/systems/MessageLogSystem.hx
@@ -1,6 +1,6 @@
 package dungeons.systems;
 
-import nme.text.TextField;
+import flash.text.TextField;
 
 import ash.core.System;
 

diff --git a/src/dungeons/systems/RenderSystem.hx b/src/dungeons/systems/RenderSystem.hx
@@ -1,8 +1,7 @@
 package dungeons.systems;
 
-import nme.geom.Rectangle;
-import nme.display.BitmapData;
-import nme.Lib;
+import flash.geom.Rectangle;
+import flash.display.BitmapData;
 
 import com.haxepunk.tweens.misc.NumTween;
 import com.haxepunk.tweens.motion.LinearMotion;
@@ -29,12 +28,10 @@ import dungeons.components.Item;
 import dungeons.components.Inventory;
 import dungeons.components.Position.PositionChangeListener;
 import dungeons.components.Health;
-import dungeons.components.Fighter;
 import dungeons.components.Renderable;
 import dungeons.mapgen.Dungeon;
 import dungeons.nodes.PlayerInventoryNode;
 import dungeons.nodes.TimeTickerNode;
-import dungeons.nodes.PlayerStatsNode;
 import dungeons.utils.Grid;
 import dungeons.utils.MapGrid;
 import dungeons.utils.TransitionTileHelper;
@@ -101,7 +98,7 @@ class RenderSystem extends System
         fovOverlayImage = new Image(fovOverlayData);
         fovOverlayImage.scale = assetFactory.tileSize;
         fovOverlayEntity = scene.addGraphic(fovOverlayImage, RenderLayers.FOV);
-//        fovOverlayEntity.visible = false;
+        //        fovOverlayEntity.visible = false;
 
         fovOverlayDirty = true;
 

diff --git a/src/dungeons/utils/Direction.hx b/src/dungeons/utils/Direction.hx
@@ -14,42 +14,40 @@ enum Direction
 
 class DirectionUtil
 {
-    public static inline function fromOffset(dx:Int, dy:Int):Direction
+    public static function fromOffset(dx:Int, dy:Int):Direction
     {
-        return if (dx == 0)
+        if (dx == 0)
         {
             if (dy < 0)
-                North;
+                return North;
             else if (dy > 0)
-                South;
+                return South;
         }
         else if (dy == 0)
         {
             if (dx < 0)
-                West;
+                return West;
             else if (dx > 0)
-                East;
+                return East;
         }
         else if (dy < 0 && dx < 0)
         {
-            NorthWest;
+            return NorthWest;
         }
         else if (dy < 0 && dx > 0)
         {
-            NorthEast;
+            return NorthEast;
         }
         else if (dy > 0 && dx < 0)
         {
-            SouthWest;
+            return SouthWest;
         }
         else if (dy > 0 && dx > 0)
         {
-            SouthEast;
-        }
-        else
-        {
-            throw "unknown direction for offset " + dx + "x" + dy;
+            return SouthEast;
         }
+
+        throw "unknown direction for offset " + dx + "x" + dy;
     }
 
     public static inline function offset(dir:Direction):Vector

diff --git a/src/dungeons/utils/TransitionTileHelper.hx b/src/dungeons/utils/TransitionTileHelper.hx
@@ -2,7 +2,7 @@ package dungeons.utils;
 
 import haxe.Json;
 
-import nme.Assets;
+import openfl.Assets;
 
 /**
  * Helper class for getting a wall transition tile number