Added Substates

Author: Slushi-Github

HxCU_Meta.json

@@ -1,5 +1,6 @@
 {
-    "libVersion": "1.5.5",
+    "libVersion": "1.5.7",
+    "customUDPPort": "",
     "haxeLibs": [
         "hxu_sdl2",
         "hxu_jansson",

README.md

@@ -78,7 +78,7 @@ A code probably similar to one from [HaxeFlixel](https://haxeflixel.com) right?
 	- [x] buttons (Partially broken)
 - [x] Audio support with precise control (Only one music or sound at the same time)
 - [x] States 
-- [ ] Substates
+- [x] Substates
 - [x] Collisions
 - [x] Sprites basic physics
 - [x] Tweens and easing functions

leafy/LfEngine.hx

@@ -43,7 +43,7 @@ class LfEngine {
     /**
      * The current version of the engine
      */
-    public static final VERSION:String = "1.5.6";
+    public static final VERSION:String = "1.5.8";
 
     /**
      * Function to be called when the engine exits
@@ -78,14 +78,13 @@ class LfEngine {
     /**
      * Initialize the engine, and start the state
      * 
+     *  Example:
+     * 
+     *      LfEngine.initEngine("LEAFY_GAME", LfRenderType.DRC, new MyGameState());
+     * 
      * @param gamePath The path to the game folder ("LEAFY_GAME" by default)
      * @param renderMode The render mode of the engine
      * @param state The initial state
-     * 
-     * Example:
-     * ```
-     * LfEngine.initEngine("LEAFY_GAME", LfRenderType.DRC, new MyGameState());
-     * ```
      */
     public static function initEngine(gamePath:String, renderMode:LfRenderType = LfRenderType.DRC, state:LfState):Void {
         #if !disableHxCrashHandler

leafy/backend/LfJson.hx

@@ -19,12 +19,12 @@ class LfJson {
     /**
      * Pointer to the JSON object
      */
-    private var jsonPtr:Ptr<Json_t>;
+    public var jsonPtr:Ptr<Json_t>;
 
     /**
      * JSON error object
      */
-    private var jsonError:Json_error_t;
+    public var jsonError:Json_error_t;
 
     /**
      * Constructor for LfJson

leafy/objects/LfObject.hx

@@ -8,8 +8,9 @@ package leafy.objects;
 import Std;
 
 import sdl2.SDL_Render.SDL_Texture;
-import sdl2.SDL_Pixels.SDL_Color;
 import sdl2.SDL_Render;
+import sdl2.SDL_Render.SDL_RendererFlip;
+import sdl2.SDL_Pixels.SDL_Color;
 import sdl2.SDL_Rect;
 import sdl2.SDL_Surface.SDL_Surface;
 import sdl2.SDL_Image;
@@ -18,7 +19,6 @@ import leafy.backend.sdl.LfWindow;
 import leafy.utils.LfUtils.LfVector2D;
 import leafy.utils.LfUtils;
 
-
 /**
  * Type of the object
  */
@@ -37,12 +37,24 @@ enum CenterMode {
     CENTER_XY;
 }
 
+/**
+ * Scale mode of the object
+ */
 enum ScaleMode {
     NEAREST;
     LINEAR;
     BEST;
 }
 
+/**
+ * Flip mode of the object
+ */
+enum FlipMode {
+    NONE;
+    HORIZONTAL;
+    VERTICAL;
+}
+
 /**
  * Base class for all objects
  * 
@@ -183,6 +195,11 @@ class LfObject extends LfBase {
      */
     public var scaleMode:ScaleMode = null;
 
+    /**
+     * Flip mode of the object
+     */
+    public var flipMode:FlipMode = FlipMode.NONE;
+
     ////////////////////////////////
 
     override public function update(elapsed:Float):Void {
@@ -241,7 +258,7 @@ class LfObject extends LfBase {
         // }
 
         SDL_Render.SDL_SetTextureAlphaMod(this.sdlTexturePtr, Std.int(this.alpha * 255));
-        SDL_Render.SDL_RenderCopyEx(LfWindow.currentRenderer, this.sdlTexturePtr, null, this.sdlRect, this.angle, null, SDL_FLIP_NONE);
+        SDL_Render.SDL_RenderCopyEx(LfWindow.currentRenderer, this.sdlTexturePtr, null, this.sdlRect, this.angle, null, convertFlipModeToSDL(this.flipMode));
     }
 
     /**
@@ -373,6 +390,18 @@ class LfObject extends LfBase {
         this.scaleMode = scaleMode;
     }
 
+    /**
+     * Set the flip mode of the object texture
+     * @param flipMode
+     */
+    public function setFlipMode(flipMode:FlipMode):Void {
+        if (this.sdlTexturePtr == null) {
+            LeafyDebug.log("Failed to set flip mode for object: [" + this.name + "] - Texture is null (" + SDL_Image.IMG_GetError().toString() + ")", ERROR);
+            return;
+        }
+        this.flipMode = flipMode;
+    }
+
     /**
      * Convert a Leafy object scale mode to an SDL scale mode
      * @param scaleMode 
@@ -391,6 +420,24 @@ class LfObject extends LfBase {
         }
     }
 
+    /**
+     * Convert a Leafy object flip mode to an SDL flip mode
+     * @param flipMode 
+     * @return SDL_Render.SDL_RendererFlip
+     */
+    private function convertFlipModeToSDL(flipMode:FlipMode):SDL_RendererFlip {
+        switch (flipMode) {
+            case FlipMode.NONE:
+                return SDL_RendererFlip.SDL_FLIP_NONE;
+            case FlipMode.HORIZONTAL:
+                return SDL_RendererFlip.SDL_FLIP_HORIZONTAL;
+            case FlipMode.VERTICAL:
+                return SDL_RendererFlip.SDL_FLIP_VERTICAL;
+            default:
+                return SDL_RendererFlip.SDL_FLIP_NONE;
+        }
+    }
+
     /**
      * Update the SDL rect of the object
      */

leafy/states/LfState.hx

@@ -5,10 +5,10 @@
 
 package leafy.states;
 
-import haxe.ds.List;
+import haxe.Unserializer.TypeResolver;
 import Std;
+
 import leafy.objects.LfObject;
-import leafy.gamepad.LfGamepad;
 
 /**
  * Base class for Leafy states
@@ -21,6 +21,21 @@ class LfState extends LfBase {
      */
     public var stateObjects:Array<LfObject> = new Array<LfObject>();
 
+    /**
+     * The sub-state of the state
+     */
+    public var subState:LfSubState = null;
+
+    // /**
+    //  * Whether the state should keep updating
+    //  */
+    // public var keepUpdating:Bool = true;
+
+    // /**
+    //  * Whether the state should keep rendering
+    //  */
+    // public var keepRendering:Bool = true;
+
     public function new() {
         super();
     }
@@ -41,16 +56,27 @@ class LfState extends LfBase {
      * @param elapsed The elapsed time
      */
     override public function update(elapsed:Float):Void {
+        // if (!keepUpdating) {
+        //     return;
+        // }
+
         for (object in this.stateObjects) {
             object.update(elapsed);
         }
-    }
 
+        if (this.subState != null) {
+            this.subState.update(elapsed);
+        }
+    }
 
     /**
-     * /* Function called when the state is rendered
+     * Function called when the state is rendered
      */
     override public function render():Void {
+        // if (!keepRendering) {
+        //     return;
+        // }
+
         if (this.stateObjects == []) {
             return;
         }
@@ -60,6 +86,10 @@ class LfState extends LfBase {
                 obj.render();
             }
         }
+
+        if (this.subState != null) {
+            this.subState.render();
+        }
     }
 
     /**
@@ -78,6 +108,10 @@ class LfState extends LfBase {
             object.destroy();
         }
 
+        if (this.subState != null) {
+            this.subState.destroy();
+        }
+
         this.stateObjects.pop();
     }
 
@@ -109,7 +143,30 @@ for (size_t i = 0; i < stateObjects->size(); i++) {
     }
 }
         ");
+    }
+
+    /**
+     * Function to set the sub-state of the state
+     * @param newSubState The new sub-state to set
+     */
+    public function setSubState(newSubState:LfSubState):Void {
+        if (newSubState == null) {
+            return;
+        }
 
-        
+        if (this.subState != null) {
+            this.subState.destroy();
+        }
+
+        this.subState = newSubState;
+        this.subState.create();
+    }
+
+    /**
+     * Function to get the sub-state of the state
+     * @return The current sub-state
+     */
+    public function getSubState():LfSubState {
+        return this.subState;
     }
 }