improvements

Author: Slushi-Github

README.md

@@ -53,23 +53,32 @@ class PlayState extends LfState {
 A code probably similar to one from [HaxeFlixel](https://haxeflixel.com/) right?
 
 ## Current status of the engine:
-- [x] Wii U Gamepad support (Touchscreen support partially)
-- [x] Sprites
-- [x] Texts
-- [x] buttons (Partially broken)
-- [x] Audio support (Only one music or sound at the same time)
+- [x] Wii U Gamepad support
+	- [x] Wii U Gamepad Buttons and sticks
+	- [x] Wii U Gamepad Rumble
+	- [x] Wii U Gamepad Accelerometer
+	- [x] Wii U Gamepad Gyroscope
+	- [x] Wii U Gamepad Touchscreen
+		- [x] Wii U Gamepad Touchscreen touch position and click
+		- [x] Wii U Gamepad Touchscreen LCD brightness control
+	- [] Wii U Gamepad Camera
+	- [] Wii U Gamepad Microphone
+- Objects
+	- [x] Sprites
+	- [x] Texts
+	- [x] buttons (Partially broken)
+- [x] Audio support with precise control (Only one music or sound at the same time)
 - [x] States 
+- [] Substates
 - [x] Collisions
 - [x] Sprites basic physics 
 - [x] Tweens and easing functions
 - [x] JSONs file support (Only decoding)
-- [x] Timers
+- [x] Timers (Using [``haxe.Timer``](https://api.haxe.org/haxe/Timer.html))
 - [x] HTTP requests (Via Curl)
 - [x] Multiple renders mode (``DRC``, ``TV`` and ``UNIQUE``)
 - [x] FileSystem manipulation
-- [ ] Cameras
-- [ ] Wii U Gamepad Camera support
-- [ ] Wii U Gamepad Microphone support
+- [] Engine cameras
 
 ## How?
 This engine uses [SDL2 (For the Wii U)](https://github.com/devkitPro/SDL/tree/wiiu-sdl2-2.28) as a base, along with other WUT functions. All the libraries are ported to Haxe to work through the ``@:native`` feature, to finally use [Reflaxe/C++](https://github.com/SomeRanDev/reflaxe.CPP) to generate the code in C++ and compile it through the [DevKitPPC](https://wiibrew.org/wiki/DevkitPPC) tools, although due to this mode, there are things that change and have more care in how the engine is used when you want to make a project with it. 

docs/wiki/sections/FolderSections/Audio.md

@@ -24,11 +24,11 @@ Leafy.audio.stop();
 // Toggle the loop of a sound or music
 Leafy.audio.toggleLoop();
 
-// Get the LfAudio object if is already created
-var audioObj:LfAudio = Leafy.audio.currentAudio;
+// Check if the audio is playing
+var isPlaying:Bool = Leafy.audio.playing;
 
-// Or get it as soon as you play the audio
-var audioObj:LfAudio = Leafy.audio.play("GAME_PATH/music.ogg", true);
+// Check if the audio is paused
+var isPaused:Bool = Leafy.audio.paused;
 
 // get the current time of the audio
 var currentTime:Float = Leafy.audio.getCurrentTime();

docs/wiki/sections/FolderSections/WiiU_Gamepad.md

@@ -9,7 +9,7 @@ Well, there is a way of use the gamepad buttons in the engine:
 import leafy.Leafy;
 
 // get if a button is pressed
-var isPressed:Bool = Leafy.gamepad.pressed(BUTTON_A);
+var isPressed:Bool = Leafy.wiiuGamepad.pressed(BUTTON_A);
 
 // Get if a button is released
 var isReleased:Bool = Leafy.wiiuGamepad.released(BUTTON_A);
@@ -99,4 +99,20 @@ Leafy.wiiuGamepad.stopRumble();
 
 --------
 
+For the screen brightness, it would be done in this way:
+```haxe
+// import the Leafy class
+import leafy.Leafy;
+
+// set the brightness of the screen
+Leafy.wiiuGamepad.setScreenBrightness(brightness:LfGamepadScreenBrightness);
+Leafy.wiiuGamepad.setScreenBrightness(BRIGHTNESS_3);
+
+// get the brightness of the screen
+var brightness:LfGamepadScreenBrightness = Leafy.wiiuGamepad.getScreenBrightness();
+```
+The brightness modes can be found on the enum [``leafy.gamepad.LfGamepad.LfGamepadScreenBrightness``](https://github.com/Slushi-Github/leafyEngine/blob/main/leafy/gamepad/LfGamepad.hx)
+
+--------
+
 See [``LfGamepad``](https://github.com/Slushi-Github/leafyEngine/blob/main/leafy/gamepad/LfGamepad.hx)

leafy/LfEngine.hx

@@ -30,7 +30,7 @@ class LfEngine {
     /**
      * The current version of the engine
      */
-    public static var version:String = "1.3.5";
+    public static var version:String = "1.3.7";
 
     /**
      * Function to be called when the engine exits
@@ -42,15 +42,20 @@ class LfEngine {
      */
     public static var windowMode:LfWindowType;
 
+    /**
+     * The initial state
+     */
+    public static var initState:LfState;
+
     /**
      * Is the engine running
      */
     private static var _isRunning:Bool = false;
 
     /**
-     * The initial state
+     * The initial DRC screen brightness level
      */
-    public static var initState:LfState;
+    public static var initBrightness:Int = -1;
 
     /**
      * Initialize the engine, and start the state
@@ -86,6 +91,9 @@ class LfEngine {
         // Initialize the Wii U Gamepad
         LfGamepadInternal.initDRC();
 
+        // Get the initial DRC screen brightness level
+        initBrightness = LfGamepadInternal.getDRCLCDBrightness();
+
         LeafyDebug.log("Leafy Engine " + Std.string(version) + " initialized", INFO);
 
         // Set and initialize the initial state
@@ -109,10 +117,17 @@ class LfEngine {
             onEngineExit();
         }
 
+        if (LfGamepadInternal.getDRCLCDBrightness() != initBrightness) {
+            // Restore the initial DRC screen brightness level
+            LfGamepadInternal.setDRCLCDBrightness(initBrightness);
+        }
+
         LfStateHandler.destroyCurrentState();
         SubEngines.shutdownSDL();
         LfSystemPaths.deinitFSSystem();
         Log_udp.WHBLogUdpDeinit();
         Proc.WHBProcShutdown();
+        LeafyDebug.log("Leafy Engine " + Std.string(version) + " shutdown", INFO);
+
     }
 }

leafy/audio/LfAudioEngine.hx

@@ -5,7 +5,7 @@
 
 package leafy.audio;
 
-import leafy.backend.internal.LfAudioManager;
+import leafy.backend.internal.LfAudioManagerInternal;
 
 /**
  * Audio engine, handles audio playback
@@ -14,59 +14,76 @@ import leafy.backend.internal.LfAudioManager;
  */
 class LfAudioEngine {
 
-    public var currentAudio:LfAudio;
+    /**
+     * Is the audio currently playing
+     */
+    public var playing:Bool = false;
+
+    /**
+     * Is the audio currently paused
+     */
+    public var paused:Bool = true;
+
+    // /**
+    //  * The current audio time
+    //  */
+    // public var currentTime:Float = 0;
+
+    // /**
+    //  * The current audio duration
+    //  */
+    // public var duration:Float = 0;
 
     /**
      * Plays an audio file
      * @param path The path to the audio file
      * @param loop Whether the audio should loop
      */
-    public function play(path:String, loop:Bool = false):LfAudio {
-        currentAudio = LfAudioManager.instance.play(path, loop);
-        return currentAudio;
+    public function play(path:String, loop:Bool = false):Void {
+        LfAudioManagerInternal.instance.play(path, loop);
     }
 
     /**
      * Pauses the currently playing audio
      */
     public function pause():Void {
-        LfAudioManager.instance.pause();
+        LfAudioManagerInternal.instance.pause();
     }
 
     /**
      * Resumes the currently paused audio
      */
     public function resume():Void {
-        LfAudioManager.instance.resume();
+        LfAudioManagerInternal.instance.resume();
     }
 
     /**
      * Stops the currently playing audio
      */
     public function stop():Void {
-        LfAudioManager.instance.stop();
+        LfAudioManagerInternal.instance.stop();
     }
 
     /**
      * Toggles the loop state of the currently playing audio
      */
     public function toggleLoop():Void {
-        LfAudioManager.toggleLoop();
+        LfAudioManagerInternal.toggleLoop();
     }
 
     /**
      * Gets the current audio time
      * @return Float
      */
     public function getCurrentTime():Float {
-        return LfAudioManager.getCurrentTime();
+        return LfAudioManagerInternal.getCurrentTime();
     }
 
     /**
      * Gets the current audio duration
      * @return Float
      */
     public function getDuration():Float {
-        return LfAudioManager.getDuration();
+        return LfAudioManagerInternal.getDuration();
     }
 }

leafy/backend/LeafyDebug.hx

@@ -14,9 +14,6 @@ import wiiu.SDCardUtil;
 import wut.coreinit.Time.OSCalendarTime;
 import wut.coreinit.Debug;
 
-import notifications.Notifications;
-import notifications.Notification_defines.NMColor;
-
 import leafy.filesystem.LfFile;
 import leafy.filesystem.LfSystemPaths;
 import leafy.utils.LfStringUtils;
@@ -93,16 +90,6 @@ class LeafyDebug {
      */
     private static var started:Bool = false;
 
-    /**
-     * The background color of the notification
-     */
-    private static var notificationBGColor:NMColor = new NMColor();
-
-    /**
-     * The text color of the notification
-     */
-    private static var notificationTextColor:NMColor = new NMColor();
-
     /**
      * // Log a message
      * @param msg The message
@@ -114,30 +101,6 @@ class LeafyDebug {
             return;
         }
 
-        switch (level) {
-            case LogLevel.INFO:
-                // Do nothing
-            case LogLevel.WARNING:
-                notificationBGColor.r = 152;
-                notificationBGColor.g = 93;
-                notificationBGColor.b = 0;
-                Notifications.NotificationModule_AddInfoNotificationEx(ConstCharPtr.fromString(msg), 3, notificationTextColor, notificationBGColor, untyped __cpp__("nullptr"), untyped __cpp__("nullptr"), false);
-            case LogLevel.ERROR:
-                notificationBGColor.r = 237;
-                notificationBGColor.g = 28;
-                notificationBGColor.b = 36;
-                Notifications.NotificationModule_AddErrorNotificationEx(ConstCharPtr.fromString(msg), 3, 0.8, notificationTextColor, notificationBGColor, untyped __cpp__("nullptr"), untyped __cpp__("nullptr"), false);
-            case LogLevel.DEBUG:
-                notificationBGColor.r = 104;
-                notificationBGColor.g = 0;
-                notificationBGColor.b = 93;
-                Notifications.NotificationModule_AddInfoNotificationEx(ConstCharPtr.fromString(msg), 3, notificationTextColor, notificationBGColor, untyped __cpp__("nullptr"), untyped __cpp__("nullptr"), false);
-            case LogLevel.CRITICAL:
-                // Do nothing
-            default:
-                // Do nothing
-        }
-
         var formattedMessage:String = prepareText(msg, level, pos);
 
         if (!started) {
@@ -172,11 +135,6 @@ class LeafyDebug {
                 LfSystemPaths.createDirectory(logsDir);
             }
 
-            notificationTextColor.r = 255;
-            notificationTextColor.g = 255;
-            notificationTextColor.b = 255;
-            notificationTextColor.a = 255;
-    
             var currentTimeStr:String = untyped __cpp__("CPP_getCurrentTime()");
             var currentTimeMod:String = currentTimeStr;
             currentTimeMod = LfStringUtils.stringReplacer(currentTimeMod, ":", "_");

leafy/backend/LfJson.hx

@@ -53,9 +53,13 @@ class LfJson {
      * @param jsonPath 
      * @return LeafyJson
      */
-    public static function parseJsonFile(jsonPath:String):LeafyJson {
-
-        var correctPath:String = LfSystemPaths.getConsolePath() + jsonPath;
+    public static function parseJsonFile(jsonPath:String, absolutePath:Bool = false):LeafyJson {
+        var correctPath:String = "";
+        if (absolutePath) {
+            correctPath = jsonPath;
+        } else {
+            correctPath = LfSystemPaths.getEngineMainPath() + jsonPath;
+        }
 
         if (jsonPath == null || jsonPath == "") {
             LeafyDebug.log("JSON file path cannot be null or empty", ERROR);
@@ -65,7 +69,6 @@ class LfJson {
         if (!LfSystemPaths.exists(correctPath) || !LfStringUtils.stringEndsWith(correctPath, ".json")) {
             LeafyDebug.log("JSON file does not exist or is not a valid JSON file", ERROR);
             return null;
-            
         }
 
         var rawJSONError:Json_error_t = new Json_error_t();

leafy/backend/SubEngines.hx

@@ -11,7 +11,7 @@ import sdl2.SDL_Error;
 import sdl2.SDL;
 
 import leafy.backend.sdl.LfWindow;
-import leafy.backend.internal.LfAudioManager;
+import leafy.backend.internal.LfAudioManagerInternal;
 
 /**
  * A class for initializing the SDL libraries
@@ -52,8 +52,8 @@ class SubEngines {
         }
 
         // Init SDL Audio Engine
-        new LfAudioManager();
-        LfAudioManager.init();
+        new LfAudioManagerInternal();
+        LfAudioManagerInternal.init();
 
         LeafyDebug.log("SDL_Audio initialized", INFO);
     }
@@ -65,7 +65,7 @@ class SubEngines {
      */
     public static function shutdownSDL():Void {
         LfWindow.closeEngineWindows();
-        LfAudioManager.shutdown();
+        LfAudioManagerInternal.shutdown();
 
         SDL_TTF.TTF_Quit();
         SDL_Image.IMG_Quit();