remove ghostlib dep from sample

AustinEast · AustinEast · commit 794b0ee61648 · 2021-02-02T16:00:35.000-05:00
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,6 @@ install:
  - haxelib git dox https://github.com/HaxeFoundation/dox.git
  - haxelib git hxmath https://github.com/tbrosman/hxmath.git
  - haxelib git heaps https://github.com/HeapsIO/heaps.git
- - haxelib install ghostlib
  - haxelib dev echo .
 
 script:
diff --git a/sample-hl.hxml b/sample-hl.hxml
@@ -9,13 +9,13 @@
 -lib heaps
 -lib hlsdl
 # -lib hldx
--lib ghostlib
 
 #flags
 -dce full
 -D windowSize=1280x720
 # -D HXMATH_USE_HEAPS_STRUCTURES
 # -D hl-profile
+# -D hl-ver=1.11.0
 # -D dump=pretty
 
 # output
diff --git a/sample.hxml b/sample.hxml
@@ -7,10 +7,9 @@
 # libraries
 -lib echo
 -lib heaps
--lib ghostlib
 
 # copy assets
---macro ghost.Assets.copyProjectAssets()
+--macro util.Assets.copyProjectAssets()
 
 # flags 
 # use Heaps math structures with hxmath
diff --git a/sample/BaseApp.hx b/sample/BaseApp.hx
@@ -2,7 +2,7 @@ package;
 
 import echo.World;
 import echo.util.Debug;
-import ghost.FSM;
+import util.FSM;
 
 class BaseApp extends hxd.App {
   public var debug:HeapsDebug;
diff --git a/sample/Main.hx b/sample/Main.hx
@@ -4,7 +4,7 @@ import hxd.Key;
 import echo.Echo;
 import echo.World;
 import echo.util.Debug;
-import ghost.FSM;
+import util.FSM;
 import state.*;
 
 class Main extends BaseApp {
diff --git a/sample/build.hxml b/sample/build.hxml
@@ -1,7 +1,6 @@
 -lib heaps
 -lib hlsdl
 -lib echo
--lib ghostlib
 
 -main Main
 
diff --git a/sample/state/BaseState.hx b/sample/state/BaseState.hx
@@ -2,7 +2,7 @@ package state;
 
 import echo.Body;
 import echo.World;
-import ghost.FSM;
+import util.FSM;
 
 class BaseState extends State<World> {
   override public function exit(world:World) world.clear();
diff --git a/sample/state/GroupsState.hx b/sample/state/GroupsState.hx
@@ -2,7 +2,7 @@ package state;
 
 import echo.Body;
 import echo.World;
-import ghost.Random;
+import util.Random;
 
 class GroupsState extends BaseState {
   var body_count:Int = 50;
diff --git a/sample/state/Linecast2State.hx b/sample/state/Linecast2State.hx
@@ -5,7 +5,7 @@ import hxmath.math.Vector2;
 import echo.Line;
 import echo.Body;
 import echo.World;
-import ghost.Random;
+import util.Random;
 
 class Linecast2State extends BaseState {
   var body_count:Int = 50;
diff --git a/sample/state/LinecastState.hx b/sample/state/LinecastState.hx
@@ -3,7 +3,7 @@ package state;
 import echo.Line;
 import echo.Body;
 import echo.World;
-import ghost.Random;
+import util.Random;
 
 class LinecastState extends BaseState {
   var body_count:Int = 30;
diff --git a/sample/state/MultiShapeState.hx b/sample/state/MultiShapeState.hx
@@ -2,7 +2,7 @@ package state;
 
 import echo.Body;
 import echo.World;
-import ghost.Random;
+import util.Random;
 
 class MultiShapeState extends BaseState {
   var body_count:Int = 49;
diff --git a/sample/state/PolygonState.hx b/sample/state/PolygonState.hx
@@ -2,7 +2,7 @@ package state;
 
 import echo.Body;
 import echo.World;
-import ghost.Random;
+import util.Random;
 
 class PolygonState extends BaseState {
   var body_count:Int = 100;
diff --git a/sample/state/ShapesState.hx b/sample/state/ShapesState.hx
@@ -2,7 +2,7 @@ package state;
 
 import echo.Body;
 import echo.World;
-import ghost.Random;
+import util.Random;
 
 class ShapesState extends BaseState {
   var body_count:Int = 100;
diff --git a/sample/state/StackingState.hx b/sample/state/StackingState.hx
@@ -2,7 +2,7 @@ package state;
 
 import echo.Body;
 import echo.World;
-import ghost.Random;
+import util.Random;
 
 class StackingState extends BaseState {
   var body_count:Int = 149;
diff --git a/sample/state/StaticState.hx b/sample/state/StaticState.hx
@@ -2,7 +2,7 @@ package state;
 
 import echo.Body;
 import echo.World;
-import ghost.Random;
+import util.Random;
 
 class StaticState extends BaseState {
   var dynamics:Array<Body>;
diff --git a/sample/state/TileMapState.hx b/sample/state/TileMapState.hx
@@ -2,7 +2,7 @@ package state;
 
 import echo.Body;
 import echo.World;
-import ghost.Random;
+import util.Random;
 
 class TileMapState extends BaseState {
   var cursor:Body;
diff --git a/sample/state/TileMapState2.hx b/sample/state/TileMapState2.hx
@@ -2,7 +2,7 @@ package state;
 
 import echo.Body;
 import echo.World;
-import ghost.Random;
+import util.Random;
 
 class TileMapState2 extends BaseState {
   var cursor:Body;
diff --git a/sample/util/Assets.hx b/sample/util/Assets.hx
@@ -0,0 +1,40 @@
+package util;
+
+import haxe.io.Path;
+/**
+ * Macro for copying assets from one folder to another
+ */
+class Assets {
+  #if macro
+  private static function copy(sourceDir:String, targetDir:String):Int {
+    var numCopied:Int = 0;
+
+    if (!sys.FileSystem.exists(targetDir)) sys.FileSystem.createDirectory(targetDir);
+
+    for (entry in sys.FileSystem.readDirectory(sourceDir)) {
+      var srcFile:String = Path.join([sourceDir, entry]);
+      var dstFile:String = Path.join([targetDir, entry]);
+
+      if (sys.FileSystem.isDirectory(srcFile)) numCopied += copy(srcFile, dstFile);
+      else {
+        sys.io.File.copy(srcFile, dstFile);
+        numCopied++;
+      }
+    }
+    return numCopied;
+  }
+
+  public static function copyProjectAssets() {
+    var cwd:String = Sys.getCwd();
+    var assetSrcFolder = Path.join([cwd, "assets"]);
+    var assetsDstFolder = Path.join([cwd, "bin"]);
+
+    // make sure the assets folder exists
+    if (!sys.FileSystem.exists(assetsDstFolder)) sys.FileSystem.createDirectory(assetsDstFolder);
+
+    // copy it!
+    var numCopied = copy(assetSrcFolder, assetsDstFolder);
+    Sys.println('Copied ${numCopied} project assets to ${assetsDstFolder}!');
+  }
+  #end
+}
diff --git a/sample/util/FSM.hx b/sample/util/FSM.hx
@@ -0,0 +1,37 @@
+package util;
+
+class State<T> {
+  public function new() {}
+
+  public function enter(parent:T) {}
+
+  public function step(parent:T, dt:Float) {}
+
+  public function exit(parent:T) {}
+}
+
+class FSM<T> {
+  var parent:T;
+  var current:State<T>;
+  var requested:State<T>;
+
+  public function new(parent:T, initialState:State<T>) {
+    this.parent = parent;
+    requested = initialState;
+  }
+
+  public function set(state:State<T>):State<T> return requested = state;
+
+  public function step(dt:Float) {
+    if (requested != null) {
+      if (current != null) {
+        current.exit(parent);
+      }
+      current = requested;
+      current.enter(parent);
+      requested = null;
+    }
+
+    current.step(parent, dt);
+  }
+}
diff --git a/sample/util/Random.hx b/sample/util/Random.hx
@@ -0,0 +1,17 @@
+package util;
+
+class Random {
+  /**
+   * Takes a minimum and maximum Float and returns a random value bewteen them.
+   * Leave blank to return a value between -1 and 1
+   * @param	min	Minimum desired result
+   * @param	max	Maximum desired result
+   */
+  public static inline function range(?min:Float = -1, ?max:Float = 1):Float return min + Math.random() * (max - min);
+
+  public static inline function range_int(?min:Float = -1, ?max:Float = 1):Int return Std.int(range(min, max));
+
+  public static inline function range_int_to_string(?min:Float, ?max:Float):String return "" + Math.floor(range_int(min, max));
+
+  public static inline function chance(percent:Float = 50):Bool return Math.random() < percent / 100;
+}
