diff --git a/HISTORY.md b/HISTORY.md
index 735e66514..0a0b1ce2b 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -379,13 +379,13 @@ Some numbers to start with:
Highlights for `raylib 4.2`:
- **raylib extra libraries cleanup**: raylib has been on diet and all the _extra_ libraries included on previous releases have been removed from raylib. Now raylib only includes the original **7** raylib modules: `rcore`, `rlgl`, `rshapes`, `rtextures`, `rtext`, `rmodels` and `raudio`. But no worries, _extra_ libraries have not been deleted, they have been moved to their own repos for better maintainability and more focus on its functionality. The libraries moved out from raylib repo are: [`raygui`](https://github.com/raysan5/raygui), [`physac`](https://github.com/raysan5/physac), [`rmem`](https://github.com/raylib-extras/rmem), [`reasings`](https://github.com/raylib-extras/reasings) and [`raudio`](https://github.com/raysan5/raudio) (standalone mode). On that same line, a new **amazing GitHub group:** [`raylib-extras`](https://github.com/raylib-extras) has been created by @JeffM2501 to contain raylib extra libraries as well as other raylib add-ons provided by the community. Jeff has done an amazing work on that line, providing multiple libraries and examples for raylib, like [custom first-person and third person camera systems](https://github.com/raylib-extras/extras-c/tree/main/cameras), [Dear ImGui raylib integration](https://github.com/raylib-extras/rlImGui), [multiple specific examples](https://github.com/raylib-extras/examples-c) and even a complete [RPG Game Example](https://github.com/raylib-extras/RPGExample)! Great work Jeff! :D
-
- - **raylib examples review**: The +120 raylib examples have been reviewed to add clearer information about when the were first created (raylib version used) and when they were updated for the last time. But the greatest improvement for users has been the **addition of an estimated difficulty level** for every example, [web has been updated accordingly](https://www.raylib.com/examples.html) to reflect those difficulty levels. Now examples are classified with **1 to 4 stars** depending on difficulty to help users with their learning process. Personally, I think this "small" addition could be a game-changer to better guide new users on the library adoption! Additionally, this new raylib release includes 7 new examples; the most interesting one: [`text_codepoints_loading`](https://www.raylib.com/examples/text/loader.html?name=text_codepoints_loading) that illustrates how to load and draw custom codepoints from a font file, very useful for Asian languages.
+
+ - **raylib examples review**: The +120 raylib examples have been reviewed to add clearer information about when the were first created (raylib version used) and when they were updated for the last time. But the greatest improvement for users has been the **addition of an estimated difficulty level** for every example, [web has been updated accordingly](https://www.raylib.com/examples.html) to reflect those difficulty levels. Now examples are classified with **1 to 4 stars** depending on difficulty to help users with their learning process. Personally, I think this "small" addition could be a game-changer to better guide new users on the library adoption! Additionally, this new raylib release includes 7 new examples; the most interesting one: [`text_codepoints_loading`](https://www.raylib.com/examples/text/loader.html?name=text_codepoints_loading) that illustrates how to load and draw custom codepoints from a font file, very useful for Asian languages.
- [**`rres 1.0`**](https://github.com/raysan5/rres): New `rres` **resources packaging file-format**, including a [`rres-raylib`](https://github.com/raysan5/rres/blob/master/src/rres-raylib.h) library implementation and [`rrespacker`](https://raylibtech.itch.io/rrespacker) tool. `rres` file format has been [under development for +8 years](https://github.com/raysan5/rres#design-history) and it was originally created to be part of raylib. It was highly inspired by _XNA XNB_ resources file format but design has changed a lot along the years. This first release of the format specs is engine-agnostic and has been designed to be portable to any engine, including lots of professional features like data processing, compression and encryption.
- [**`raygui 3.2`**](https://github.com/raysan5/raygui): The **official raylib immediate-mode gui library** designed for tools development has been updated to a new version aligned with raylib 4.2. Multiple controls have been reviewed for library consistency, now all controls follow a similar function signature. It has been battle-tested with the development of +8 published tools in the last months. The tools can be seen and used for free in the [raylib technologies tools page](https://raylibtech.itch.io/). Worth mentioning that several of those **tools have been open sourced** for anyone to use, compile, contribute or learn how the code works.
-
+
- [**`raylib_parser`**](https://github.com/raysan5/raylib/tree/master/parser): Multiple contributors **using the tool to automatize bindings creation** have contributed with improvements of this **tool to parse `raylib.h`** (and other raylib-style headers) to tokenize its enums, structs and functions. Processed data can be exported to custom file formats (i.e XML, JSON, LUA) for bindings generation or even docs generation if required.
- **New file system API**: Current API has been redesigned to be more comprehensive and better aligned with raylib naming conventions, two new functions are provided `LoadDirectoryFiles()`/`LoadDirectoryFilesEx()` to load a `FilePathList` for provided path, supporting extension filtering and recursive directory scan. `LoadDroppedFiles()` has been renamed to better reflect its internal functionality. Now, all raylib functions that start with `Load*()` allocate memory internally and a equivalent `Unload*()` function is defined to take care of that memory internally when not required any more!
@@ -414,21 +414,21 @@ Highlights for `raylib 4.5`:
- **`NEW` Improved ANGLE support on Desktop platforms**: Support for OpenGL ES 2.0 on Desktop platforms (Windows, Linux, macOS) has been reviewed by @wtnbgo GitHub user. Now raylib can be compiled on desktop for OpenGL ES 2.0 and linked against [`ANGLE`](https://github.com/google/angle). This _small_ addition open the door to building raylib for all **ANGLE supported backends: Direct3D 11, Vulkan and Metal**. Please note that this new feature is still experimental and requires further testing!
- **`NEW` Camera module**: A brand new implementation from scratch for `rcamera` module, contributed by @Crydsch GitHub user! **New camera system is simpler, more flexible, more granular and more extendable**. Specific camera math transformations (movement/rotation) have been moved to individual functions, exposing them to users if required. Global state has been removed from the module and standalone usage has been greatly improved; now `rcamera.h` single-file header-only library can be used externally, independently of raylib. A new `UpdateCameraPro()` function has been added to address input-dependency of `UpdateCamera()`, now advance users have **full control over camera inputs and movement/rotation speeds**!
-
+
- **`NEW` Support for M3D models and M3D/GLTF animations**: 3d models animations support has been a limited aspect of raylib for long time, some versions ago IQM animations were supported but raylib 4.5 also adds support for the brand new [M3D file format](https://bztsrc.gitlab.io/model3d/), including animations and the long expected support for **GLTF animations**! The new M3D file format is **simple, portable, feature complete, extensible and open source**. It also provides a complete set of tools to export/visualize M3D models from/to Blender! Now raylib supports up to **3 model file-formats with animations**: `IQM`, `GLTF` and `M3D`.
-
+
- **`NEW` Support QOA audio format (import/export)**: Just a couple of months ago the new [QOA file format](https://qoaformat.org/) was published, a very simple, portable and open source quite-ok-audio file format. raylib already supports it, added to `raudio` module and including audio loading from file, loading from memory, streaming from file, streaming from memory and **exporting to QOA** audio format. **Because simplicity really matters to raylib!**
-
+
- **`NEW` Module for compressed textures loading**: [`rl_gputex`](https://github.com/raysan5/raylib/blob/master/src/external/rl_gputex.h), a portable single-file header-only small library to load compressed texture file-formats (DDS, PKM, KTX, PVR, ASTC). Provided functionality is not new to raylib but it was part of the raylib `rtextures` module, now it has been moved into a separate self-contained library, **improving portability**. Note that this module is only intended to **load compressed data from files, ready to be uploaded to GPU**, no compression/decompression functionality is provided. This change is a first step towards a better modularization of raylib library.
-
+
- **Reviewed `rlgl` module for automatic limits checking**: Again, [`rlgl`](https://github.com/raysan5/raylib/blob/master/src/rlgl.h) has been reviewed to simplify usage. Now users do not need to worry about reaching the internal render-batch limits when they send their triangles to draw 2d/3d, `rlgl` manages it automatically! This change allows a **great simplification for other modules** like `rshapes`, `rtextures` and `rmodels` that do not need to worry about bufffer overflows and can just define as many vertex as desired!
-
- - **Reviewed `rshapes` module to minimize the rlgl dependency**: Now `rshapes` 2d shapes drawing functions **only depend on 6 low-level functions**: `rlBegin()`, `rlEnd()`, `rlVertex3f()`, `rlTexCoord2f()`, `rlNormal3f()`, `rlSetTexture()`. With only those pseudo-OpenGl 1.1 minimal functionality, everything can be drawn! This improvement converts `rshapes` module in a **self-contained, portable shapes-drawing library that can be used independently of raylib**, as far as entry points for those 6 functions are provided by the user. It even allows to be used for software rendering, with the proper backend!
+
+ - **Reviewed `rshapes` module to minimize the rlgl dependency**: Now `rshapes` 2d shapes drawing functions **only depend on 6 low-level functions**: `rlBegin()`, `rlEnd()`, `rlVertex3f()`, `rlTexCoord2f()`, `rlNormal3f()`, `rlSetTexture()`. With only those pseudo-OpenGl 1.1 minimal functionality, everything can be drawn! This improvement converts `rshapes` module in a **self-contained, portable shapes-drawing library that can be used independently of raylib**, as far as entry points for those 6 functions are provided by the user. It even allows to be used for software rendering, with the proper backend!
- **Added data structures validation functions**: Multiple functions have been added by @RobLoach GitHub user to ease the validation of raylib data structures: `IsImageReady()`, `IsTextureReady()`, `IsSoundReady()`... Now users have a simple mechanism to **make sure data has been correctly loaded**, instead of checking internal structure values by themselfs.
-
+
As usual, those are only some highlights but there is much more! New image generators, new color transformation functionality, improved blending support for color/alpha, etc... Make sure to check raylib [CHANGELOG]([CHANGELOG](https://github.com/raysan5/raylib/blob/master/CHANGELOG)) for a detailed list of changes! Please, note that all breaking changes have been flagged with a `WARNING` in the CHANGELOG, specially useful for binding creators!
-**raylib keeps improving one more version** with a special focus on maintainability and sustainability. Always working towards making the library more **simple and easy-to-use**.
+**raylib keeps improving one more version** with a special focus on maintainability and sustainability. Always working towards making the library more **simple and easy-to-use**.
Let's keep **enjoying games/tools/graphics programming!** :)
diff --git a/examples/core/core_automation_events.c b/examples/core/core_automation_events.c
new file mode 100644
index 000000000..27711b39d
--- /dev/null
+++ b/examples/core/core_automation_events.c
@@ -0,0 +1,326 @@
+/*******************************************************************************************
+*
+* raylib [core] example - automation events
+*
+* Example originally created with raylib 5.0, last time updated with raylib 5.0
+*
+* Example based on 2d_camera_platformer example by arvyy (@arvyy)
+*
+* Example licensed under an unmodified zlib/libpng license, which is an OSI-certified,
+* BSD-like license that allows static linking with closed source software
+*
+* Copyright (c) 2023 Ramon Santamaria (@raysan5)
+*
+********************************************************************************************/
+
+#include "raylib.h"
+#include "raymath.h"
+
+#define GRAVITY 400
+#define PLAYER_JUMP_SPD 350.0f
+#define PLAYER_HOR_SPD 200.0f
+
+#define MAX_ENVIRONMENT_ELEMENTS 5
+
+typedef struct Player {
+ Vector2 position;
+ float speed;
+ bool canJump;
+} Player;
+
+typedef struct EnvElement {
+ Rectangle rect;
+ int blocking;
+ Color color;
+} EnvElement;
+
+
+//------------------------------------------------------------------------------------
+// Program main entry point
+//------------------------------------------------------------------------------------
+int main(void)
+{
+ // Initialization
+ //--------------------------------------------------------------------------------------
+ const int screenWidth = 800;
+ const int screenHeight = 450;
+
+ InitWindow(screenWidth, screenHeight, "raylib [core] example - automation events");
+
+ // Define player
+ Player player = { 0 };
+ player.position = (Vector2){ 400, 280 };
+ player.speed = 0;
+ player.canJump = false;
+
+ // Define environment elements (platforms)
+ EnvElement envElements[MAX_ENVIRONMENT_ELEMENTS] = {
+ {{ 0, 0, 1000, 400 }, 0, LIGHTGRAY },
+ {{ 0, 400, 1000, 200 }, 1, GRAY },
+ {{ 300, 200, 400, 10 }, 1, GRAY },
+ {{ 250, 300, 100, 10 }, 1, GRAY },
+ {{ 650, 300, 100, 10 }, 1, GRAY }
+ };
+
+ // Define camera
+ Camera2D camera = { 0 };
+ camera.target = player.position;
+ camera.offset = (Vector2){ screenWidth/2.0f, screenHeight/2.0f };
+ camera.rotation = 0.0f;
+ camera.zoom = 1.0f;
+
+ // Automation events
+ AutomationEventList aelist = LoadAutomationEventList(0); // Initialize list of automation events to record new events
+ SetAutomationEventList(&aelist);
+ bool eventRecording = false;
+ bool eventPlaying = false;
+
+ int frameCounter = 0;
+ int playFrameCounter = 0;
+ int currentPlayFrame = 0;
+
+ SetTargetFPS(60);
+ //--------------------------------------------------------------------------------------
+
+ // Main game loop
+ while (!WindowShouldClose())
+ {
+ // Update
+ //----------------------------------------------------------------------------------
+ float deltaTime = 0.015f;//GetFrameTime();
+
+ // Dropped files logic
+ //----------------------------------------------------------------------------------
+ if (IsFileDropped())
+ {
+ FilePathList droppedFiles = LoadDroppedFiles();
+
+ // Supports loading .rgs style files (text or binary) and .png style palette images
+ if (IsFileExtension(droppedFiles.paths[0], ".txt;.rae"))
+ {
+ UnloadAutomationEventList(&aelist);
+ aelist = LoadAutomationEventList(droppedFiles.paths[0]);
+
+ eventRecording = false;
+
+ // Reset scene state to play
+ eventPlaying = true;
+ playFrameCounter = 0;
+ currentPlayFrame = 0;
+
+ player.position = (Vector2){ 400, 280 };
+ player.speed = 0;
+ player.canJump = false;
+
+ camera.target = player.position;
+ camera.offset = (Vector2){ screenWidth/2.0f, screenHeight/2.0f };
+ camera.rotation = 0.0f;
+ camera.zoom = 1.0f;
+ }
+
+ UnloadDroppedFiles(droppedFiles); // Unload filepaths from memory
+ }
+ //----------------------------------------------------------------------------------
+
+ // Update player
+ //----------------------------------------------------------------------------------
+ if (IsKeyDown(KEY_LEFT)) player.position.x -= PLAYER_HOR_SPD*deltaTime;
+ if (IsKeyDown(KEY_RIGHT)) player.position.x += PLAYER_HOR_SPD*deltaTime;
+ if (IsKeyDown(KEY_SPACE) && player.canJump)
+ {
+ player.speed = -PLAYER_JUMP_SPD;
+ player.canJump = false;
+ }
+
+ int hitObstacle = 0;
+ for (int i = 0; i < MAX_ENVIRONMENT_ELEMENTS; i++)
+ {
+ EnvElement *element = &envElements[i];
+ Vector2 *p = &(player.position);
+ if (element->blocking &&
+ element->rect.x <= p->x &&
+ element->rect.x + element->rect.width >= p->x &&
+ element->rect.y >= p->y &&
+ element->rect.y <= p->y + player.speed*deltaTime)
+ {
+ hitObstacle = 1;
+ player.speed = 0.0f;
+ p->y = element->rect.y;
+ }
+ }
+
+ if (!hitObstacle)
+ {
+ player.position.y += player.speed*deltaTime;
+ player.speed += GRAVITY*deltaTime;
+ player.canJump = false;
+ }
+ else player.canJump = true;
+
+ camera.zoom += ((float)GetMouseWheelMove()*0.05f);
+
+ if (camera.zoom > 3.0f) camera.zoom = 3.0f;
+ else if (camera.zoom < 0.25f) camera.zoom = 0.25f;
+
+ if (IsKeyPressed(KEY_R))
+ {
+ // Reset game state
+ player.position = (Vector2){ 400, 280 };
+ player.speed = 0;
+ player.canJump = false;
+
+ camera.target = player.position;
+ camera.offset = (Vector2){ screenWidth/2.0f, screenHeight/2.0f };
+ camera.rotation = 0.0f;
+ camera.zoom = 1.0f;
+ }
+ //----------------------------------------------------------------------------------
+
+ // Update camera
+ //----------------------------------------------------------------------------------
+ camera.target = player.position;
+ camera.offset = (Vector2){ screenWidth/2.0f, screenHeight/2.0f };
+ float minX = 1000, minY = 1000, maxX = -1000, maxY = -1000;
+
+ for (int i = 0; i < MAX_ENVIRONMENT_ELEMENTS; i++)
+ {
+ EnvElement *element = &envElements[i];
+ minX = fminf(element->rect.x, minX);
+ maxX = fmaxf(element->rect.x + element->rect.width, maxX);
+ minY = fminf(element->rect.y, minY);
+ maxY = fmaxf(element->rect.y + element->rect.height, maxY);
+ }
+
+ Vector2 max = GetWorldToScreen2D((Vector2){ maxX, maxY }, camera);
+ Vector2 min = GetWorldToScreen2D((Vector2){ minX, minY }, camera);
+
+ if (max.x < screenWidth) camera.offset.x = screenWidth - (max.x - screenWidth/2);
+ if (max.y < screenHeight) camera.offset.y = screenHeight - (max.y - screenHeight/2);
+ if (min.x > 0) camera.offset.x = screenWidth/2 - min.x;
+ if (min.y > 0) camera.offset.y = screenHeight/2 - min.y;
+ //----------------------------------------------------------------------------------
+
+ // Toggle events recording
+ if (IsKeyPressed(KEY_F2))
+ {
+ if (!eventPlaying)
+ {
+ if (eventRecording)
+ {
+ StopAutomationEventRecording();
+ eventRecording = false;
+
+ ExportAutomationEventList(aelist, "automation.rae");
+ }
+ else
+ {
+ SetAutomationEventBaseFrame(180);
+ StartAutomationEventRecording();
+ eventRecording = true;
+ }
+ }
+ }
+ else if (IsKeyPressed(KEY_F3))
+ {
+ if (!eventRecording && (aelist.count > 0))
+ {
+ // Reset scene state to play
+ eventPlaying = true;
+ playFrameCounter = 0;
+ currentPlayFrame = 0;
+
+ player.position = (Vector2){ 400, 280 };
+ player.speed = 0;
+ player.canJump = false;
+
+ camera.target = player.position;
+ camera.offset = (Vector2){ screenWidth/2.0f, screenHeight/2.0f };
+ camera.rotation = 0.0f;
+ camera.zoom = 1.0f;
+ }
+ }
+
+ if (eventPlaying)
+ {
+ // NOTE: Multiple events could be executed in a single frame
+ while (playFrameCounter == aelist.events[currentPlayFrame].frame)
+ {
+ PlayAutomationEvent(aelist.events[currentPlayFrame]);
+ currentPlayFrame++;
+
+ if (currentPlayFrame == aelist.count)
+ {
+ eventPlaying = false;
+ currentPlayFrame = 0;
+ playFrameCounter = 0;
+ }
+ }
+
+ playFrameCounter++;
+ }
+
+ if (eventRecording || eventPlaying) frameCounter++;
+ else frameCounter = 0;
+ //----------------------------------------------------------------------------------
+
+ // Draw
+ //----------------------------------------------------------------------------------
+ BeginDrawing();
+
+ ClearBackground(LIGHTGRAY);
+
+ BeginMode2D(camera);
+
+ // Draw environment elements
+ for (int i = 0; i < MAX_ENVIRONMENT_ELEMENTS; i++)
+ {
+ DrawRectangleRec(envElements[i].rect, envElements[i].color);
+ }
+
+ // Draw player rectangle
+ DrawRectangleRec((Rectangle){ player.position.x - 20, player.position.y - 40, 40, 40 }, RED);
+
+ EndMode2D();
+
+ // Draw game controls
+ DrawRectangle(10, 10, 290, 145, Fade(SKYBLUE, 0.5f));
+ DrawRectangleLines(10, 10, 290, 145, Fade(BLUE, 0.8f));
+
+ DrawText("Controls:", 20, 20, 10, BLACK);
+ DrawText("- RIGHT | LEFT: Player movement", 30, 40, 10, DARKGRAY);
+ DrawText("- SPACE: Player jump", 30, 60, 10, DARKGRAY);
+ DrawText("- R: Reset game state", 30, 80, 10, DARKGRAY);
+
+ DrawText("- F2: START/STOP RECORDING INPUT EVENTS", 30, 110, 10, BLACK);
+ DrawText("- F3: REPLAY LAST RECORDED INPUT EVENTS", 30, 130, 10, BLACK);
+
+ // Draw automation events recording indicator
+ if (eventRecording)
+ {
+ DrawRectangle(10, 160, 290, 30, Fade(RED, 0.3f));
+ DrawRectangleLines(10, 160, 290, 30, Fade(MAROON, 0.8f));
+ DrawCircle(30, 175, 10, MAROON);
+
+ if (((frameCounter/15)%2) == 1) DrawText(TextFormat("RECORDING EVENTS... [%i]", aelist.count), 50, 170, 10, MAROON);
+ }
+ else if (eventPlaying)
+ {
+ DrawRectangle(10, 160, 290, 30, Fade(LIME, 0.3f));
+ DrawRectangleLines(10, 160, 290, 30, Fade(DARKGREEN, 0.8f));
+ DrawTriangle((Vector2){ 20, 155 + 10 }, (Vector2){ 20, 155 + 30 }, (Vector2){ 40, 155 + 20 }, DARKGREEN);
+
+ if (((frameCounter/15)%2) == 1) DrawText(TextFormat("PLAYING RECORDED EVENTS... [%i]", currentPlayFrame), 50, 170, 10, DARKGREEN);
+ }
+
+
+ EndDrawing();
+ //----------------------------------------------------------------------------------
+ }
+
+ // De-Initialization
+ //--------------------------------------------------------------------------------------
+ CloseWindow(); // Close window and OpenGL context
+ //--------------------------------------------------------------------------------------
+
+ return 0;
+}
diff --git a/projects/VS2022/examples/core_automation_events.vcxproj b/projects/VS2022/examples/core_automation_events.vcxproj
new file mode 100644
index 000000000..e70a6b1ea
--- /dev/null
+++ b/projects/VS2022/examples/core_automation_events.vcxproj
@@ -0,0 +1,390 @@
+
+
+
+
+ Debug.DLL
+ Win32
+
+
+ Debug.DLL
+ x64
+
+
+ Debug
+ Win32
+
+
+ Debug
+ x64
+
+
+ Release.DLL
+ Win32
+
+
+ Release.DLL
+ x64
+
+
+ Release
+ Win32
+
+
+ Release
+ x64
+
+
+
+ {7AF97D44-707E-48DC-81CB-C9D8D7C9ED26}
+ Win32Proj
+ core_automation_events
+ 10.0
+ core_automation_events
+
+
+
+ Application
+ true
+ $(DefaultPlatformToolset)
+ Unicode
+
+
+ Application
+ true
+ $(DefaultPlatformToolset)
+ Unicode
+
+
+ Application
+ true
+ $(DefaultPlatformToolset)
+ Unicode
+
+
+ Application
+ true
+ $(DefaultPlatformToolset)
+ Unicode
+
+
+ Application
+ false
+ $(DefaultPlatformToolset)
+ true
+ Unicode
+
+
+ Application
+ false
+ $(DefaultPlatformToolset)
+ true
+ Unicode
+
+
+ Application
+ false
+ $(DefaultPlatformToolset)
+ true
+ Unicode
+
+
+ Application
+ false
+ $(DefaultPlatformToolset)
+ true
+ Unicode
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+ $(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)\
+ $(SolutionDir)\build\$(ProjectName)\obj\$(Platform)\$(Configuration)\
+
+
+ true
+ $(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)\
+ $(SolutionDir)\build\$(ProjectName)\obj\$(Platform)\$(Configuration)\
+
+
+ true
+ $(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)\
+ $(SolutionDir)\build\$(ProjectName)\obj\$(Platform)\$(Configuration)\
+
+
+ true
+ $(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)\
+ $(SolutionDir)\build\$(ProjectName)\obj\$(Platform)\$(Configuration)\
+
+
+ false
+ $(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)\
+ $(SolutionDir)\build\$(ProjectName)\obj\$(Platform)\$(Configuration)\
+
+
+ false
+ $(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)\
+ $(SolutionDir)\build\$(ProjectName)\obj\$(Platform)\$(Configuration)\
+
+
+ false
+ $(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)\
+ $(SolutionDir)\build\$(ProjectName)\obj\$(Platform)\$(Configuration)\
+
+
+ false
+ $(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)\
+ $(SolutionDir)\build\$(ProjectName)\obj\$(Platform)\$(Configuration)\
+
+
+ $(SolutionDir)..\..\examples\core
+ WindowsLocalDebugger
+
+
+ $(SolutionDir)..\..\examples\core
+ WindowsLocalDebugger
+
+
+ $(SolutionDir)..\..\examples\core
+ WindowsLocalDebugger
+
+
+ $(SolutionDir)..\..\examples\core
+ WindowsLocalDebugger
+
+
+ $(SolutionDir)..\..\examples\core
+ WindowsLocalDebugger
+
+
+ $(SolutionDir)..\..\examples\core
+ WindowsLocalDebugger
+
+
+ $(SolutionDir)..\..\examples\core
+ WindowsLocalDebugger
+
+
+ $(SolutionDir)..\..\examples\core
+ WindowsLocalDebugger
+
+
+
+
+
+ Level3
+ Disabled
+ WIN32;_DEBUG;_CONSOLE;PLATFORM_DESKTOP;%(PreprocessorDefinitions)
+ CompileAsC
+ $(SolutionDir)..\..\src;%(AdditionalIncludeDirectories)
+
+
+ Console
+ true
+ $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\
+ raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+
+
+
+
+
+
+ Level3
+ Disabled
+ WIN32;_DEBUG;_CONSOLE;PLATFORM_DESKTOP;%(PreprocessorDefinitions)
+ CompileAsC
+ $(SolutionDir)..\..\src;%(AdditionalIncludeDirectories)
+ /FS %(AdditionalOptions)
+
+
+ Console
+ true
+ $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\
+ raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+
+
+
+
+
+
+ Level3
+ Disabled
+ WIN32;_DEBUG;_CONSOLE;PLATFORM_DESKTOP;%(PreprocessorDefinitions)
+ CompileAsC
+ $(SolutionDir)..\..\src;%(AdditionalIncludeDirectories)
+
+
+ Console
+ true
+ $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\
+ raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+
+
+ xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)"
+ Copy Debug DLL to output directory
+
+
+
+
+
+
+ Level3
+ Disabled
+ WIN32;_DEBUG;_CONSOLE;PLATFORM_DESKTOP;%(PreprocessorDefinitions)
+ CompileAsC
+ $(SolutionDir)..\..\src;%(AdditionalIncludeDirectories)
+
+
+ Console
+ true
+ $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\
+ raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+
+
+ xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)"
+ Copy Debug DLL to output directory
+
+
+
+
+ Level3
+
+
+ MaxSpeed
+ true
+ true
+ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);PLATFORM_DESKTOP
+ $(SolutionDir)..\..\src;%(AdditionalIncludeDirectories)
+ CompileAsC
+ true
+
+
+ Console
+ true
+ true
+ true
+ raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+ $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\
+
+
+
+
+ Level3
+
+
+ MaxSpeed
+ true
+ true
+ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);PLATFORM_DESKTOP
+ $(SolutionDir)..\..\src;%(AdditionalIncludeDirectories)
+ CompileAsC
+ true
+
+
+ Console
+ true
+ true
+ true
+ raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+ $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\
+
+
+
+
+ Level3
+
+
+ MaxSpeed
+ true
+ true
+ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);PLATFORM_DESKTOP
+ $(SolutionDir)..\..\src;%(AdditionalIncludeDirectories)
+ CompileAsC
+ true
+
+
+ Console
+ true
+ true
+ true
+ raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+ $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\
+
+
+ xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)"
+
+
+ Copy Release DLL to output directory
+
+
+
+
+ Level3
+
+
+ MaxSpeed
+ true
+ true
+ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);PLATFORM_DESKTOP
+ $(SolutionDir)..\..\src;%(AdditionalIncludeDirectories)
+ CompileAsC
+ true
+
+
+ Console
+ true
+ true
+ true
+ raylib.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winmm.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+ $(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\
+
+
+ xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)"
+
+
+ Copy Release DLL to output directory
+
+
+
+
+
+
+
+
+
+
+ {e89d61ac-55de-4482-afd4-df7242ebc859}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/projects/VS2022/raylib.sln b/projects/VS2022/raylib.sln
index 007f796f9..167c60f3f 100644
--- a/projects/VS2022/raylib.sln
+++ b/projects/VS2022/raylib.sln
@@ -273,6 +273,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "audio_sound_multi", "exampl
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core_2d_camera_split_screen", "examples\core_2d_camera_split_screen.vcxproj", "{CC62F7DB-D089-4677-8575-CAB7A7815C43}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core_automation_events", "examples\core_automation_events.vcxproj", "{7AF97D44-707E-48DC-81CB-C9D8D7C9ED26}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug.DLL|x64 = Debug.DLL|x64
@@ -2297,6 +2299,22 @@ Global
{CC62F7DB-D089-4677-8575-CAB7A7815C43}.Release|x64.Build.0 = Release|x64
{CC62F7DB-D089-4677-8575-CAB7A7815C43}.Release|x86.ActiveCfg = Release|Win32
{CC62F7DB-D089-4677-8575-CAB7A7815C43}.Release|x86.Build.0 = Release|Win32
+ {7AF97D44-707E-48DC-81CB-C9D8D7C9ED26}.Debug.DLL|x64.ActiveCfg = Debug.DLL|x64
+ {7AF97D44-707E-48DC-81CB-C9D8D7C9ED26}.Debug.DLL|x64.Build.0 = Debug.DLL|x64
+ {7AF97D44-707E-48DC-81CB-C9D8D7C9ED26}.Debug.DLL|x86.ActiveCfg = Debug.DLL|Win32
+ {7AF97D44-707E-48DC-81CB-C9D8D7C9ED26}.Debug.DLL|x86.Build.0 = Debug.DLL|Win32
+ {7AF97D44-707E-48DC-81CB-C9D8D7C9ED26}.Debug|x64.ActiveCfg = Debug|x64
+ {7AF97D44-707E-48DC-81CB-C9D8D7C9ED26}.Debug|x64.Build.0 = Debug|x64
+ {7AF97D44-707E-48DC-81CB-C9D8D7C9ED26}.Debug|x86.ActiveCfg = Debug|Win32
+ {7AF97D44-707E-48DC-81CB-C9D8D7C9ED26}.Debug|x86.Build.0 = Debug|Win32
+ {7AF97D44-707E-48DC-81CB-C9D8D7C9ED26}.Release.DLL|x64.ActiveCfg = Release.DLL|x64
+ {7AF97D44-707E-48DC-81CB-C9D8D7C9ED26}.Release.DLL|x64.Build.0 = Release.DLL|x64
+ {7AF97D44-707E-48DC-81CB-C9D8D7C9ED26}.Release.DLL|x86.ActiveCfg = Release.DLL|Win32
+ {7AF97D44-707E-48DC-81CB-C9D8D7C9ED26}.Release.DLL|x86.Build.0 = Release.DLL|Win32
+ {7AF97D44-707E-48DC-81CB-C9D8D7C9ED26}.Release|x64.ActiveCfg = Release|x64
+ {7AF97D44-707E-48DC-81CB-C9D8D7C9ED26}.Release|x64.Build.0 = Release|x64
+ {7AF97D44-707E-48DC-81CB-C9D8D7C9ED26}.Release|x86.ActiveCfg = Release|Win32
+ {7AF97D44-707E-48DC-81CB-C9D8D7C9ED26}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -2435,6 +2453,7 @@ Global
{3755E9F4-CB48-4EC3-B561-3B85964EBDEF} = {5317807F-61D4-4E0F-B6DC-2D9F12621ED9}
{F81C5819-85B4-4D2E-B6DC-104A7634461B} = {CC132A4D-D081-4C26-BFB9-AB11984054F8}
{CC62F7DB-D089-4677-8575-CAB7A7815C43} = {6C82BAAE-BDDF-457D-8FA8-7E2490B07035}
+ {7AF97D44-707E-48DC-81CB-C9D8D7C9ED26} = {6C82BAAE-BDDF-457D-8FA8-7E2490B07035}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {E926C768-6307-4423-A1EC-57E95B1FAB29}
diff --git a/src/config.h b/src/config.h
index 7886aeeba..96fdd065f 100644
--- a/src/config.h
+++ b/src/config.h
@@ -63,7 +63,7 @@
// Support CompressData() and DecompressData() functions
#define SUPPORT_COMPRESSION_API 1
// Support automatic generated events, loading and recording of those events when required
-//#define SUPPORT_EVENTS_AUTOMATION 1
+#define SUPPORT_AUTOMATION_EVENTS 1
// Support custom frame control, only for advance users
// By default EndDrawing() does this job: draws everything + SwapScreenBuffer() + manage frame timing + PollInputEvents()
// Enabling this flag allows manual control of the frame processes, use at your own risk
@@ -85,6 +85,7 @@
#define MAX_DECOMPRESSION_SIZE 64 // Max size allocated for decompression in MB
+#define MAX_AUTOMATION_EVENTS 16384 // Maximum number of automation events to record
//------------------------------------------------------------------------------------
// Module: rlgl - Configuration values
diff --git a/src/external/miniaudio.h b/src/external/miniaudio.h
index 181f45289..ac2da690d 100644
--- a/src/external/miniaudio.h
+++ b/src/external/miniaudio.h
@@ -1,6 +1,6 @@
/*
Audio playback and capture library. Choice of public domain or MIT-0. See license statements at the end of this file.
-miniaudio - v0.11.18 - 2023-08-07
+miniaudio - v0.11.19 - TBD
David Reid - mackron@gmail.com
@@ -87,7 +87,7 @@ device on the stack, but you could allocate it on the heap if that suits your si
// Do something here. Probably your program's main loop.
- ma_device_uninit(&device); // This will stop the device so no need to do that manually.
+ ma_device_uninit(&device);
return 0;
}
```
@@ -1675,7 +1675,7 @@ an example for initializing a data source:
// ...
- ma_resource_manager_data_source_uninit(pResourceManager, &dataSource);
+ ma_resource_manager_data_source_uninit(&dataSource);
```
The `flags` parameter specifies how you want to perform loading of the sound file. It can be a
@@ -1912,10 +1912,10 @@ once after the other:
```c
ma_resource_manager_data_source_init(pResourceManager, "my_file", ..., &myDataBuffer0); // Refcount = 1. Initial load.
- ma_resource_manager_data_source_uninit(pResourceManager, &myDataBuffer0); // Refcount = 0. Unloaded.
+ ma_resource_manager_data_source_uninit(&myDataBuffer0); // Refcount = 0. Unloaded.
ma_resource_manager_data_source_init(pResourceManager, "my_file", ..., &myDataBuffer1); // Refcount = 1. Reloaded because previous uninit() unloaded it.
- ma_resource_manager_data_source_uninit(pResourceManager, &myDataBuffer1); // Refcount = 0. Unloaded.
+ ma_resource_manager_data_source_uninit(&myDataBuffer1); // Refcount = 0. Unloaded.
```
A binary search tree (BST) is used for storing data buffers as it has good balance between
@@ -2675,9 +2675,16 @@ outputting any audio data. To output audio data, use `ma_encoder_write_pcm_frame
example below:
```c
- framesWritten = ma_encoder_write_pcm_frames(&encoder, pPCMFramesToWrite, framesToWrite);
+ ma_uint64 framesWritten;
+ result = ma_encoder_write_pcm_frames(&encoder, pPCMFramesToWrite, framesToWrite, &framesWritten);
+ if (result != MA_SUCCESS) {
+ ... handle error ...
+ }
```
+The `framesWritten` variable will contain the number of PCM frames that were actually written. This
+is optionally and you can pass in `NULL` if you need this.
+
Encoders must be uninitialized with `ma_encoder_uninit()`.
@@ -3409,7 +3416,7 @@ miniaudio supports reading from a buffer of raw audio data via the `ma_audio_buf
read from memory that's managed by the application, but can also handle the memory management for
you internally. Memory management is flexible and should support most use cases.
-Audio buffers are initialised using the standard configuration system used everywhere in miniaudio:
+Audio buffers are initialized using the standard configuration system used everywhere in miniaudio:
```c
ma_audio_buffer_config config = ma_audio_buffer_config_init(
@@ -3716,7 +3723,7 @@ extern "C" {
#define MA_VERSION_MAJOR 0
#define MA_VERSION_MINOR 11
-#define MA_VERSION_REVISION 18
+#define MA_VERSION_REVISION 19
#define MA_VERSION_STRING MA_XSTRINGIFY(MA_VERSION_MAJOR) "." MA_XSTRINGIFY(MA_VERSION_MINOR) "." MA_XSTRINGIFY(MA_VERSION_REVISION)
#if defined(_MSC_VER) && !defined(__clang__)
@@ -4267,7 +4274,7 @@ typedef enum
ma_standard_sample_rate_192000 = 192000,
ma_standard_sample_rate_16000 = 16000, /* Extreme lows */
- ma_standard_sample_rate_11025 = 11250,
+ ma_standard_sample_rate_11025 = 11025,
ma_standard_sample_rate_8000 = 8000,
ma_standard_sample_rate_352800 = 352800, /* Extreme highs */
@@ -5390,7 +5397,7 @@ MA_API void ma_resampler_uninit(ma_resampler* pResampler, const ma_allocation_ca
/*
Converts the given input data.
-Both the input and output frames must be in the format specified in the config when the resampler was initilized.
+Both the input and output frames must be in the format specified in the config when the resampler was initialized.
On input, [pFrameCountOut] contains the number of output frames to process. On output it contains the number of output frames that
were actually processed, which may be less than the requested amount which will happen if there's not enough input data. You can use
@@ -9133,8 +9140,6 @@ speakers or received from the microphone which can in turn result in de-syncs.
Do not call this in any callback.
-This will be called implicitly by `ma_device_uninit()`.
-
See Also
--------
@@ -10171,7 +10176,7 @@ MA_API ma_noise_config ma_noise_config_init(ma_format format, ma_uint32 channels
typedef struct
{
- ma_data_source_vtable ds;
+ ma_data_source_base ds;
ma_noise_config config;
ma_lcg lcg;
union
@@ -10569,7 +10574,7 @@ typedef struct
/*
Extended processing callback. This callback is used for effects that process input and output
at different rates (i.e. they perform resampling). This is similar to the simple version, only
- they take two seperate frame counts: one for input, and one for output.
+ they take two separate frame counts: one for input, and one for output.
On input, `pFrameCountOut` is equal to the capacity of the output buffer for each bus, whereas
`pFrameCountIn` will be equal to the number of PCM frames in each of the buffers in `ppFramesIn`.
@@ -12238,7 +12243,7 @@ static MA_INLINE void ma_zero_memory_default(void* p, size_t sz)
#define ma_abs(x) (((x) > 0) ? (x) : -(x))
#define ma_clamp(x, lo, hi) (ma_max(lo, ma_min(x, hi)))
#define ma_offset_ptr(p, offset) (((ma_uint8*)(p)) + (offset))
-#define ma_align(x, a) ((x + (a-1)) & ~(a-1))
+#define ma_align(x, a) (((x) + ((a)-1)) & ~((a)-1))
#define ma_align_64(x) ma_align(x, 8)
#define ma_buffer_frame_capacity(buffer, channels, format) (sizeof(buffer) / ma_get_bytes_per_sample(format) / (channels))
@@ -13639,7 +13644,7 @@ MA_API ma_result ma_log_postv(ma_log* pLog, ma_uint32 level, const char* pFormat
/* First try formatting into our fixed sized stack allocated buffer. If this is too small we'll fallback to a heap allocation. */
length = vsnprintf(pFormattedMessageStack, sizeof(pFormattedMessageStack), pFormat, args);
if (length < 0) {
- return MA_INVALID_OPERATION; /* An error occured when trying to convert the buffer. */
+ return MA_INVALID_OPERATION; /* An error occurred when trying to convert the buffer. */
}
if ((size_t)length < sizeof(pFormattedMessageStack)) {
@@ -16180,7 +16185,15 @@ static void ma_thread_wait__posix(ma_thread* pThread)
static ma_result ma_mutex_init__posix(ma_mutex* pMutex)
{
- int result = pthread_mutex_init((pthread_mutex_t*)pMutex, NULL);
+ int result;
+
+ if (pMutex == NULL) {
+ return MA_INVALID_ARGS;
+ }
+
+ MA_ZERO_OBJECT(pMutex);
+
+ result = pthread_mutex_init((pthread_mutex_t*)pMutex, NULL);
if (result != 0) {
return ma_result_from_errno(result);
}
@@ -18452,7 +18465,7 @@ Timing
*******************************************************************************/
#if defined(MA_WIN32) && !defined(MA_POSIX)
static LARGE_INTEGER g_ma_TimerFrequency; /* <-- Initialized to zero since it's static. */
- void ma_timer_init(ma_timer* pTimer)
+ static void ma_timer_init(ma_timer* pTimer)
{
LARGE_INTEGER counter;
@@ -18464,7 +18477,7 @@ Timing
pTimer->counter = counter.QuadPart;
}
- double ma_timer_get_time_in_seconds(ma_timer* pTimer)
+ static double ma_timer_get_time_in_seconds(ma_timer* pTimer)
{
LARGE_INTEGER counter;
if (!QueryPerformanceCounter(&counter)) {
@@ -18637,30 +18650,36 @@ static void ma_device__on_notification(ma_device_notification notification)
}
}
-void ma_device__on_notification_started(ma_device* pDevice)
+static void ma_device__on_notification_started(ma_device* pDevice)
{
ma_device__on_notification(ma_device_notification_init(pDevice, ma_device_notification_type_started));
}
-void ma_device__on_notification_stopped(ma_device* pDevice)
+static void ma_device__on_notification_stopped(ma_device* pDevice)
{
ma_device__on_notification(ma_device_notification_init(pDevice, ma_device_notification_type_stopped));
}
-void ma_device__on_notification_rerouted(ma_device* pDevice)
+/* Not all platforms support reroute notifications. */
+#if !defined(MA_EMSCRIPTEN)
+static void ma_device__on_notification_rerouted(ma_device* pDevice)
{
ma_device__on_notification(ma_device_notification_init(pDevice, ma_device_notification_type_rerouted));
}
+#endif
-void ma_device__on_notification_interruption_began(ma_device* pDevice)
+/* Interruptions are only used on some platforms. */
+#if defined(MA_APPLE_MOBILE)
+static void ma_device__on_notification_interruption_began(ma_device* pDevice)
{
ma_device__on_notification(ma_device_notification_init(pDevice, ma_device_notification_type_interruption_began));
}
-void ma_device__on_notification_interruption_ended(ma_device* pDevice)
+static void ma_device__on_notification_interruption_ended(ma_device* pDevice)
{
ma_device__on_notification(ma_device_notification_init(pDevice, ma_device_notification_type_interruption_ended));
}
+#endif
static void ma_device__on_data_inner(ma_device* pDevice, void* pFramesOut, const void* pFramesIn, ma_uint32 frameCount)
@@ -19115,10 +19134,10 @@ static MA_INLINE void ma_device__set_state(ma_device* pDevice, ma_device_state n
#if defined(MA_WIN32)
- GUID MA_GUID_KSDATAFORMAT_SUBTYPE_PCM = {0x00000001, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
- GUID MA_GUID_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT = {0x00000003, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
- /*GUID MA_GUID_KSDATAFORMAT_SUBTYPE_ALAW = {0x00000006, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};*/
- /*GUID MA_GUID_KSDATAFORMAT_SUBTYPE_MULAW = {0x00000007, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};*/
+ static GUID MA_GUID_KSDATAFORMAT_SUBTYPE_PCM = {0x00000001, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
+ static GUID MA_GUID_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT = {0x00000003, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
+ /*static GUID MA_GUID_KSDATAFORMAT_SUBTYPE_ALAW = {0x00000006, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};*/
+ /*static GUID MA_GUID_KSDATAFORMAT_SUBTYPE_MULAW = {0x00000007, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};*/
#endif
@@ -23270,7 +23289,7 @@ static ma_result ma_device_read__wasapi(ma_device* pDevice, void* pFrames, ma_ui
/* At this point we should be able to loop back to the start of the loop and try retrieving a data buffer again. */
} else {
- /* An error occured and we need to abort. */
+ /* An error occurred and we need to abort. */
ma_log_postf(ma_device_get_log(pDevice), MA_LOG_LEVEL_ERROR, "[WASAPI] Failed to retrieve internal buffer from capture device in preparation for reading from the device. HRESULT = %d. Stopping device.\n", (int)hr);
result = ma_result_from_HRESULT(hr);
break;
@@ -34834,7 +34853,7 @@ static ma_result ma_context_init__coreaudio(ma_context* pContext, const ma_conte
#endif
#if !defined(MA_NO_RUNTIME_LINKING) && !defined(MA_APPLE_MOBILE)
- pContext->coreaudio.hCoreFoundation = ma_dlopen(ma_context_get_log(pContext), "CoreFoundation.framework/CoreFoundation");
+ pContext->coreaudio.hCoreFoundation = ma_dlopen(ma_context_get_log(pContext), "/System/Library/Frameworks/CoreFoundation.framework/CoreFoundation");
if (pContext->coreaudio.hCoreFoundation == NULL) {
return MA_API_NOT_FOUND;
}
@@ -34843,7 +34862,7 @@ static ma_result ma_context_init__coreaudio(ma_context* pContext, const ma_conte
pContext->coreaudio.CFRelease = ma_dlsym(ma_context_get_log(pContext), pContext->coreaudio.hCoreFoundation, "CFRelease");
- pContext->coreaudio.hCoreAudio = ma_dlopen(ma_context_get_log(pContext), "CoreAudio.framework/CoreAudio");
+ pContext->coreaudio.hCoreAudio = ma_dlopen(ma_context_get_log(pContext), "/System/Library/Frameworks/CoreAudio.framework/CoreAudio");
if (pContext->coreaudio.hCoreAudio == NULL) {
ma_dlclose(ma_context_get_log(pContext), pContext->coreaudio.hCoreFoundation);
return MA_API_NOT_FOUND;
@@ -34861,7 +34880,7 @@ static ma_result ma_context_init__coreaudio(ma_context* pContext, const ma_conte
The way it'll work is that it'll first try AudioUnit, and if the required symbols are not present there we'll fall back to
AudioToolbox.
*/
- pContext->coreaudio.hAudioUnit = ma_dlopen(ma_context_get_log(pContext), "AudioUnit.framework/AudioUnit");
+ pContext->coreaudio.hAudioUnit = ma_dlopen(ma_context_get_log(pContext), "/System/Library/Frameworks/AudioUnit.framework/AudioUnit");
if (pContext->coreaudio.hAudioUnit == NULL) {
ma_dlclose(ma_context_get_log(pContext), pContext->coreaudio.hCoreAudio);
ma_dlclose(ma_context_get_log(pContext), pContext->coreaudio.hCoreFoundation);
@@ -34871,7 +34890,7 @@ static ma_result ma_context_init__coreaudio(ma_context* pContext, const ma_conte
if (ma_dlsym(ma_context_get_log(pContext), pContext->coreaudio.hAudioUnit, "AudioComponentFindNext") == NULL) {
/* Couldn't find the required symbols in AudioUnit, so fall back to AudioToolbox. */
ma_dlclose(ma_context_get_log(pContext), pContext->coreaudio.hAudioUnit);
- pContext->coreaudio.hAudioUnit = ma_dlopen(ma_context_get_log(pContext), "AudioToolbox.framework/AudioToolbox");
+ pContext->coreaudio.hAudioUnit = ma_dlopen(ma_context_get_log(pContext), "/System/Library/Frameworks/AudioToolbox.framework/AudioToolbox");
if (pContext->coreaudio.hAudioUnit == NULL) {
ma_dlclose(ma_context_get_log(pContext), pContext->coreaudio.hCoreAudio);
ma_dlclose(ma_context_get_log(pContext), pContext->coreaudio.hCoreFoundation);
@@ -39956,7 +39975,7 @@ static void ma_audio_worklet_processor_created__webaudio(EMSCRIPTEN_WEBAUDIO_T a
/* With the audio worklet initialized we can now attach it to the graph. */
if (pParameters->pConfig->deviceType == ma_device_type_capture || pParameters->pConfig->deviceType == ma_device_type_duplex) {
- ma_result attachmentResult = EM_ASM_INT({
+ ma_result attachmentResult = (ma_result)EM_ASM_INT({
var getUserMediaResult = 0;
var audioWorklet = emscriptenGetAudioObject($0);
var audioContext = emscriptenGetAudioObject($1);
@@ -39987,7 +40006,7 @@ static void ma_audio_worklet_processor_created__webaudio(EMSCRIPTEN_WEBAUDIO_T a
/* If it's playback only we can now attach the worklet node to the graph. This has already been done for the duplex case. */
if (pParameters->pConfig->deviceType == ma_device_type_playback) {
- ma_result attachmentResult = EM_ASM_INT({
+ ma_result attachmentResult = (ma_result)EM_ASM_INT({
var audioWorklet = emscriptenGetAudioObject($0);
var audioContext = emscriptenGetAudioObject($1);
audioWorklet.connect(audioContext.destination);
@@ -40202,7 +40221,7 @@ static ma_result ma_device_init__webaudio(ma_device* pDevice, const ma_device_co
/* First thing we need is an AudioContext. */
var audioContextOptions = {};
- if (deviceType == window.miniaudio.device_type.playback) {
+ if (deviceType == window.miniaudio.device_type.playback && sampleRate != 0) {
audioContextOptions.sampleRate = sampleRate;
}
@@ -40890,6 +40909,11 @@ static ma_thread_result MA_THREADCALL ma_worker_thread(void* pData)
ma_device__on_notification_stopped(pDevice);
}
+ /* If we stopped because the device has been uninitialized, abort now. */
+ if (ma_device_get_state(pDevice) == ma_device_state_uninitialized) {
+ break;
+ }
+
/* A function somewhere is waiting for the device to have stopped for real so we need to signal an event to allow it to continue. */
ma_device__set_state(pDevice, ma_device_state_stopped);
ma_event_signal(&pDevice->stopEvent);
@@ -42100,10 +42124,23 @@ MA_API void ma_device_uninit(ma_device* pDevice)
return;
}
- /* Make sure the device is stopped first. The backends will probably handle this naturally, but I like to do it explicitly for my own sanity. */
- if (ma_device_is_started(pDevice)) {
- ma_device_stop(pDevice);
+ /*
+ It's possible for the miniaudio side of the device and the backend to not be in sync due to
+ system-level situations such as the computer being put into sleep mode and the backend not
+ notifying miniaudio of the fact the device has stopped. It's possible for this to result in a
+ deadlock due to miniaudio thinking the device is in a running state, when in fact it's not
+ running at all. For this reason I am no longer explicitly stopping the device. I don't think
+ this should affect anyone in practice since uninitializing the backend will naturally stop the
+ device anyway.
+ */
+ #if 0
+ {
+ /* Make sure the device is stopped first. The backends will probably handle this naturally, but I like to do it explicitly for my own sanity. */
+ if (ma_device_is_started(pDevice)) {
+ ma_device_stop(pDevice);
+ }
}
+ #endif
/* Putting the device into an uninitialized state will make the worker thread return. */
ma_device__set_state(pDevice, ma_device_state_uninitialized);
@@ -52835,7 +52872,7 @@ static ma_result ma_channel_map_apply_mono_in_f32(float* MA_RESTRICT pFramesOut,
for (iFrame = 0; iFrame < unrolledFrameCount; iFrame += 1) {
__m128 in0 = _mm_set1_ps(pFramesIn[iFrame*2 + 0]);
__m128 in1 = _mm_set1_ps(pFramesIn[iFrame*2 + 1]);
- _mm_storeu_ps(&pFramesOut[iFrame*4 + 0], _mm_shuffle_ps(in1, in0, _MM_SHUFFLE(0, 0, 0, 0)));
+ _mm_storeu_ps(&pFramesOut[iFrame*4 + 0], _mm_shuffle_ps(in0, in1, _MM_SHUFFLE(0, 0, 0, 0)));
}
/* Tail. */
@@ -52861,7 +52898,7 @@ static ma_result ma_channel_map_apply_mono_in_f32(float* MA_RESTRICT pFramesOut,
__m128 in1 = _mm_set1_ps(pFramesIn[iFrame*2 + 1]);
_mm_storeu_ps(&pFramesOut[iFrame*12 + 0], in0);
- _mm_storeu_ps(&pFramesOut[iFrame*12 + 4], _mm_shuffle_ps(in1, in0, _MM_SHUFFLE(0, 0, 0, 0)));
+ _mm_storeu_ps(&pFramesOut[iFrame*12 + 4], _mm_shuffle_ps(in0, in1, _MM_SHUFFLE(0, 0, 0, 0)));
_mm_storeu_ps(&pFramesOut[iFrame*12 + 8], in1);
}
@@ -59701,7 +59738,7 @@ extern "C" {
#define MA_DR_WAV_XSTRINGIFY(x) MA_DR_WAV_STRINGIFY(x)
#define MA_DR_WAV_VERSION_MAJOR 0
#define MA_DR_WAV_VERSION_MINOR 13
-#define MA_DR_WAV_VERSION_REVISION 12
+#define MA_DR_WAV_VERSION_REVISION 13
#define MA_DR_WAV_VERSION_STRING MA_DR_WAV_XSTRINGIFY(MA_DR_WAV_VERSION_MAJOR) "." MA_DR_WAV_XSTRINGIFY(MA_DR_WAV_VERSION_MINOR) "." MA_DR_WAV_XSTRINGIFY(MA_DR_WAV_VERSION_REVISION)
#include
#define MA_DR_WAVE_FORMAT_PCM 0x1
@@ -64826,7 +64863,7 @@ MA_API ma_result ma_decoder_init_file(const char* pFilePath, const ma_decoder_co
/* Probably no implementation for loading from a file path. Use miniaudio's file IO instead. */
result = ma_decoder_init_vfs(NULL, pFilePath, pConfig, pDecoder);
if (result != MA_SUCCESS) {
- return MA_SUCCESS;
+ return result;
}
}
@@ -64976,7 +65013,7 @@ MA_API ma_result ma_decoder_init_file_w(const wchar_t* pFilePath, const ma_decod
/* Probably no implementation for loading from a file path. Use miniaudio's file IO instead. */
result = ma_decoder_init_vfs_w(NULL, pFilePath, pConfig, pDecoder);
if (result != MA_SUCCESS) {
- return MA_SUCCESS;
+ return result;
}
}
@@ -68744,7 +68781,7 @@ static ma_result ma_resource_manager_data_buffer_init_ex_internal(ma_resource_ma
async = (flags & MA_RESOURCE_MANAGER_DATA_SOURCE_FLAG_ASYNC) != 0;
/*
- Fences need to be acquired before doing anything. These must be aquired and released outside of
+ Fences need to be acquired before doing anything. These must be acquired and released outside of
the node to ensure there's no holes where ma_fence_wait() could prematurely return before the
data buffer has completed initialization.
@@ -72016,7 +72053,7 @@ MA_API ma_result ma_node_init_preallocated(ma_node_graph* pNodeGraph, const ma_n
}
if (heapLayout.outputBusOffset != MA_SIZE_MAX) {
- pNodeBase->pOutputBuses = (ma_node_output_bus*)ma_offset_ptr(pHeap, heapLayout.inputBusOffset);
+ pNodeBase->pOutputBuses = (ma_node_output_bus*)ma_offset_ptr(pHeap, heapLayout.outputBusOffset);
} else {
pNodeBase->pOutputBuses = pNodeBase->_outputBuses;
}
@@ -72507,11 +72544,11 @@ static ma_result ma_node_read_pcm_frames(ma_node* pNode, ma_uint32 outputBusInde
/*
At this point we know that we are inside our start/stop times. However, we may need to adjust
- our frame count and output pointer to accomodate since we could be straddling the time period
+ our frame count and output pointer to accommodate since we could be straddling the time period
that this function is getting called for.
It's possible (and likely) that the start time does not line up with the output buffer. We
- therefore need to offset it by a number of frames to accomodate. The same thing applies for
+ therefore need to offset it by a number of frames to accommodate. The same thing applies for
the stop time.
*/
timeOffsetBeg = (globalTimeBeg < startTime) ? (ma_uint32)(globalTimeEnd - startTime) : 0;
@@ -74097,7 +74134,7 @@ static void ma_engine_node_process_pcm_frames__general(ma_engine_node* pEngineNo
if (fadeStartOffsetInFrames == (ma_int64)(~(ma_uint64)0)) {
fadeStartOffsetInFrames = 0;
} else {
- fadeStartOffsetInFrames -= ma_engine_get_time(pEngineNode->pEngine);
+ fadeStartOffsetInFrames -= ma_engine_get_time_in_pcm_frames(pEngineNode->pEngine);
}
ma_fader_set_fade_ex(&pEngineNode->fader, fadeVolumeBeg, fadeVolumeEnd, fadeLengthInFrames, fadeStartOffsetInFrames);
@@ -75534,6 +75571,10 @@ MA_API void ma_engine_listener_get_cone(const ma_engine* pEngine, ma_uint32 list
*pOuterGain = 0;
}
+ if (pEngine == NULL || listenerIndex >= pEngine->listenerCount) {
+ return;
+ }
+
ma_spatializer_listener_get_cone(&pEngine->listeners[listenerIndex], pInnerAngleInRadians, pOuterAngleInRadians, pOuterGain);
}
@@ -76103,7 +76144,7 @@ MA_API ma_result ma_sound_stop_with_fade_in_pcm_frames(ma_sound* pSound, ma_uint
}
/* Stopping with a fade out requires us to schedule the stop into the future by the fade length. */
- ma_sound_set_stop_time_with_fade_in_pcm_frames(pSound, ma_engine_get_time(ma_sound_get_engine(pSound)) + fadeLengthInFrames, fadeLengthInFrames);
+ ma_sound_set_stop_time_with_fade_in_pcm_frames(pSound, ma_engine_get_time_in_pcm_frames(ma_sound_get_engine(pSound)) + fadeLengthInFrames, fadeLengthInFrames);
return MA_SUCCESS;
}
@@ -76476,6 +76517,10 @@ MA_API void ma_sound_get_cone(const ma_sound* pSound, float* pInnerAngleInRadian
*pOuterGain = 0;
}
+ if (pSound == NULL) {
+ return;
+ }
+
ma_spatializer_get_cone(&pSound->engineNode.spatializer, pInnerAngleInRadians, pOuterAngleInRadians, pOuterGain);
}
@@ -76757,6 +76802,8 @@ MA_API ma_result ma_sound_get_data_format(ma_sound* pSound, ma_format* pFormat,
MA_API ma_result ma_sound_get_cursor_in_pcm_frames(ma_sound* pSound, ma_uint64* pCursor)
{
+ ma_uint64 seekTarget;
+
if (pSound == NULL) {
return MA_INVALID_ARGS;
}
@@ -76766,7 +76813,13 @@ MA_API ma_result ma_sound_get_cursor_in_pcm_frames(ma_sound* pSound, ma_uint64*
return MA_INVALID_OPERATION;
}
- return ma_data_source_get_cursor_in_pcm_frames(pSound->pDataSource, pCursor);
+ seekTarget = ma_atomic_load_64(&pSound->seekTarget);
+ if (seekTarget != MA_SEEK_TARGET_NONE) {
+ *pCursor = seekTarget;
+ return MA_SUCCESS;
+ } else {
+ return ma_data_source_get_cursor_in_pcm_frames(pSound->pDataSource, pCursor);
+ }
}
MA_API ma_result ma_sound_get_length_in_pcm_frames(ma_sound* pSound, ma_uint64* pLength)
@@ -76785,16 +76838,28 @@ MA_API ma_result ma_sound_get_length_in_pcm_frames(ma_sound* pSound, ma_uint64*
MA_API ma_result ma_sound_get_cursor_in_seconds(ma_sound* pSound, float* pCursor)
{
- if (pSound == NULL) {
- return MA_INVALID_ARGS;
+ ma_result result;
+ ma_uint64 cursorInPCMFrames;
+ ma_uint32 sampleRate;
+
+ if (pCursor != NULL) {
+ *pCursor = 0;
}
- /* The notion of a cursor is only valid for sounds that are backed by a data source. */
- if (pSound->pDataSource == NULL) {
- return MA_INVALID_OPERATION;
+ result = ma_sound_get_cursor_in_pcm_frames(pSound, &cursorInPCMFrames);
+ if (result != MA_SUCCESS) {
+ return result;
}
- return ma_data_source_get_cursor_in_seconds(pSound->pDataSource, pCursor);
+ result = ma_sound_get_data_format(pSound, NULL, NULL, &sampleRate, NULL, 0);
+ if (result != MA_SUCCESS) {
+ return result;
+ }
+
+ /* VC6 does not support division of unsigned 64-bit integers with floating point numbers. Need to use a signed number. This shouldn't effect anything in practice. */
+ *pCursor = (ma_int64)cursorInPCMFrames / (float)sampleRate;
+
+ return MA_SUCCESS;
}
MA_API ma_result ma_sound_get_length_in_seconds(ma_sound* pSound, float* pLength)
@@ -77193,8 +77258,8 @@ code below please report the bug to the respective repository for the relevant p
#define ma_dr_wav_clamp(x, lo, hi) (ma_dr_wav_max((lo), ma_dr_wav_min((hi), (x))))
#define ma_dr_wav_offset_ptr(p, offset) (((ma_uint8*)(p)) + (offset))
#define MA_DR_WAV_MAX_SIMD_VECTOR_SIZE 32
-#define MA_DR_WAV_INT64_MIN ((ma_int64)0x80000000 << 32)
-#define MA_DR_WAV_INT64_MAX ((((ma_int64)0x7FFFFFFF) << 32) | 0xFFFFFFFF)
+#define MA_DR_WAV_INT64_MIN ((ma_int64) ((ma_uint64)0x80000000 << 32))
+#define MA_DR_WAV_INT64_MAX ((ma_int64)(((ma_uint64)0x7FFFFFFF << 32) | 0xFFFFFFFF))
#if defined(_MSC_VER) && _MSC_VER >= 1400
#define MA_DR_WAV_HAS_BYTESWAP16_INTRINSIC
#define MA_DR_WAV_HAS_BYTESWAP32_INTRINSIC
diff --git a/src/external/tinyobj_loader_c.h b/src/external/tinyobj_loader_c.h
index 502a55a7e..55d595a69 100644
--- a/src/external/tinyobj_loader_c.h
+++ b/src/external/tinyobj_loader_c.h
@@ -1269,6 +1269,11 @@ int tinyobj_parse_obj(tinyobj_attrib_t *attrib, tinyobj_shape_t **shapes,
if (is_line_ending(buf, i, end_idx)) {
line_infos[line_no].pos = prev_pos;
line_infos[line_no].len = i - prev_pos;
+
+// ---- QUICK BUG FIX : https://github.com/raysan5/raylib/issues/3473
+ if ( i > 0 && buf[i-1] == '\r' ) line_infos[line_no].len--;
+// --------
+
prev_pos = i + 1;
line_no++;
}
diff --git a/src/platforms/rcore_android.c b/src/platforms/rcore_android.c
index 4faf73b7d..83450bb0a 100644
--- a/src/platforms/rcore_android.c
+++ b/src/platforms/rcore_android.c
@@ -547,7 +547,7 @@ int InitPlatform(void)
//AConfiguration_getKeyboard(platform.app->config);
//AConfiguration_getScreenSize(platform.app->config);
//AConfiguration_getScreenLong(platform.app->config);
-
+
// Set some default window flags
CORE.Window.flags &= ~FLAG_WINDOW_HIDDEN; // false
CORE.Window.flags &= ~FLAG_WINDOW_MINIMIZED; // false
@@ -569,7 +569,7 @@ int InitPlatform(void)
// Initialize storage system
//----------------------------------------------------------------------------
InitAssetManager(platform.app->activity->assetManager, platform.app->activity->internalDataPath); // Initialize assets manager
-
+
CORE.Storage.basePath = platform.app->activity->internalDataPath; // Define base path for storage
//----------------------------------------------------------------------------
diff --git a/src/platforms/rcore_desktop.c b/src/platforms/rcore_desktop.c
index b43a6b5ae..f60a0e56c 100644
--- a/src/platforms/rcore_desktop.c
+++ b/src/platforms/rcore_desktop.c
@@ -751,13 +751,19 @@ int GetCurrentMonitor(void)
}
else
{
- int x = 0;
- int y = 0;
+ int closestDist = 0x7FFFFFFF;
- glfwGetWindowPos(platform.handle, &x, &y);
+ // Window center position
+ int wcx = 0;
+ int wcy = 0;
+
+ glfwGetWindowPos(platform.handle, &wcx, &wcy);
+ wcx += (int)CORE.Window.screen.width / 2;
+ wcy += (int)CORE.Window.screen.height / 2;
for (int i = 0; i < monitorCount; i++)
{
+ // Monitor top-left position
int mx = 0;
int my = 0;
@@ -767,17 +773,46 @@ int GetCurrentMonitor(void)
if (mode)
{
- const int width = mode->width;
- const int height = mode->height;
+ const int right = mx + mode->width - 1;
+ const int bottom = my + mode->height - 1;
- if ((x >= mx) &&
- (x < (mx + width)) &&
- (y >= my) &&
- (y < (my + height)))
+ if ((wcx >= mx) &&
+ (wcx <= right) &&
+ (wcy >= my) &&
+ (wcy <= bottom))
{
index = i;
break;
}
+
+ int xclosest = wcx;
+ if (wcx < mx)
+ {
+ xclosest = mx;
+ }
+ else if (wcx > right)
+ {
+ xclosest = right;
+ }
+
+ int yclosest = wcy;
+ if (wcy < my)
+ {
+ yclosest = my;
+ }
+ else if (wcy > bottom)
+ {
+ yclosest = bottom;
+ }
+
+ int dx = wcx - xclosest;
+ int dy = wcy - yclosest;
+ int dist = (dx * dx) + (dy * dy);
+ if (dist < closestDist)
+ {
+ index = i;
+ closestDist = dist;
+ }
}
else TRACELOG(LOG_WARNING, "GLFW: Failed to find video mode for selected monitor");
}
diff --git a/src/platforms/rcore_desktop_sdl.c b/src/platforms/rcore_desktop_sdl.c
index ccc2acf0a..8543c751c 100644
--- a/src/platforms/rcore_desktop_sdl.c
+++ b/src/platforms/rcore_desktop_sdl.c
@@ -998,6 +998,33 @@ void PollInputEvents(void)
switch (event.type)
{
case SDL_QUIT: CORE.Window.shouldClose = true; break;
+
+ case SDL_DROPFILE: // Dropped file
+ {
+ if (CORE.Window.dropFileCount == 0)
+ {
+ // When a new file is dropped, we reserve a fixed number of slots for all possible dropped files
+ // at the moment we limit the number of drops at once to 1024 files but this behaviour should probably be reviewed
+ // TODO: Pointers should probably be reallocated for any new file added...
+ CORE.Window.dropFilepaths = (char **)RL_CALLOC(1024, sizeof(char *));
+
+ CORE.Window.dropFilepaths[CORE.Window.dropFileCount] = (char *)RL_CALLOC(MAX_FILEPATH_LENGTH, sizeof(char));
+ strcpy(CORE.Window.dropFilepaths[CORE.Window.dropFileCount], event.drop.file);
+ SDL_free(event.drop.file);
+
+ CORE.Window.dropFileCount++;
+ }
+ else if (CORE.Window.dropFileCount < 1024)
+ {
+ CORE.Window.dropFilepaths[CORE.Window.dropFileCount] = (char *)RL_CALLOC(MAX_FILEPATH_LENGTH, sizeof(char));
+ strcpy(CORE.Window.dropFilepaths[CORE.Window.dropFileCount], event.drop.file);
+ SDL_free(event.drop.file);
+
+ CORE.Window.dropFileCount++;
+ }
+ else TRACELOG(LOG_WARNING, "FILE: Maximum drag and drop files at once is limited to 1024 files!");
+
+ } break;
// Window events are also polled (Minimized, maximized, close...)
case SDL_WINDOWEVENT:
@@ -1247,6 +1274,8 @@ int InitPlatform(void)
SDL_Joystick *gamepad = SDL_JoystickOpen(0);
//if (SDL_Joystick *gamepad == NULL) SDL_Log("WARNING: Unable to open game controller! SDL Error: %s\n", SDL_GetError());
}
+
+ SDL_EventState(SDL_DROPFILE, SDL_ENABLE);
//----------------------------------------------------------------------------
// Initialize timming system
diff --git a/src/platforms/rcore_drm.c b/src/platforms/rcore_drm.c
index 9609c50d2..6f459b1af 100644
--- a/src/platforms/rcore_drm.c
+++ b/src/platforms/rcore_drm.c
@@ -864,14 +864,14 @@ int InitPlatform(void)
// There must be at least one frame displayed before the buffers are swapped
//eglSwapInterval(platform.device, 1);
-
+
EGLBoolean result = eglMakeCurrent(platform.device, platform.surface, platform.surface, platform.context);
// Check surface and context activation
if (result != EGL_FALSE)
{
CORE.Window.ready = true;
-
+
CORE.Window.render.width = CORE.Window.screen.width;
CORE.Window.render.height = CORE.Window.screen.height;
CORE.Window.currentFbo.width = CORE.Window.render.width;
@@ -883,9 +883,9 @@ int InitPlatform(void)
TRACELOG(LOG_INFO, " > Render size: %i x %i", CORE.Window.render.width, CORE.Window.render.height);
TRACELOG(LOG_INFO, " > Viewport offsets: %i, %i", CORE.Window.renderOffset.x, CORE.Window.renderOffset.y);
}
- else
- {
- TRACELOG(LOG_FATAL, "PLATFORM: Failed to initialize graphics device");
+ else
+ {
+ TRACELOG(LOG_FATAL, "PLATFORM: Failed to initialize graphics device");
return -1;
}
@@ -905,7 +905,7 @@ int InitPlatform(void)
// NOTE: GL procedures address loader is required to load extensions
rlLoadExtensions(eglGetProcAddress);
//----------------------------------------------------------------------------
-
+
// Initialize input events system
//----------------------------------------------------------------------------
InitEvdevInput(); // Evdev inputs initialization
@@ -922,7 +922,7 @@ int InitPlatform(void)
//----------------------------------------------------------------------------
CORE.Storage.basePath = GetWorkingDirectory();
//----------------------------------------------------------------------------
-
+
TRACELOG(LOG_INFO, "PLATFORM: DRM: Initialized successfully");
return 0;
diff --git a/src/platforms/rcore_template.c b/src/platforms/rcore_template.c
index 11ce45c1e..1cebfa798 100644
--- a/src/platforms/rcore_template.c
+++ b/src/platforms/rcore_template.c
@@ -522,7 +522,7 @@ int InitPlatform(void)
if (result != EGL_FALSE)
{
CORE.Window.ready = true;
-
+
CORE.Window.render.width = CORE.Window.screen.width;
CORE.Window.render.height = CORE.Window.screen.height;
CORE.Window.currentFbo.width = CORE.Window.render.width;
@@ -534,13 +534,13 @@ int InitPlatform(void)
TRACELOG(LOG_INFO, " > Render size: %i x %i", CORE.Window.render.width, CORE.Window.render.height);
TRACELOG(LOG_INFO, " > Viewport offsets: %i, %i", CORE.Window.renderOffset.x, CORE.Window.renderOffset.y);
}
- else
- {
- TRACELOG(LOG_FATAL, "PLATFORM: Failed to initialize graphics device");
+ else
+ {
+ TRACELOG(LOG_FATAL, "PLATFORM: Failed to initialize graphics device");
return -1;
}
//----------------------------------------------------------------------------
-
+
// If everything work as expected, we can continue
CORE.Window.render.width = CORE.Window.screen.width;
CORE.Window.render.height = CORE.Window.screen.height;
@@ -558,7 +558,7 @@ int InitPlatform(void)
//----------------------------------------------------------------------------
rlLoadExtensions(eglGetProcAddress);
//----------------------------------------------------------------------------
-
+
// TODO: Initialize input events system
// It could imply keyboard, mouse, gamepad, touch...
// Depending on the platform libraries/SDK it could use a callbacks mechanims
@@ -576,7 +576,7 @@ int InitPlatform(void)
//----------------------------------------------------------------------------
CORE.Storage.basePath = GetWorkingDirectory();
//----------------------------------------------------------------------------
-
+
TRACELOG(LOG_INFO, "PLATFORM: CUSTOM: Initialized successfully");
return 0;
diff --git a/src/platforms/rcore_web.c b/src/platforms/rcore_web.c
index 3da23a054..d797d99d7 100644
--- a/src/platforms/rcore_web.c
+++ b/src/platforms/rcore_web.c
@@ -864,12 +864,12 @@ int InitPlatform(void)
glfwSetCursorEnterCallback(platform.handle, CursorEnterCallback);
glfwMakeContextCurrent(platform.handle);
- result = glfwGetError(NULL);
-
+ result = true; // TODO: WARNING: glfwGetError(NULL); symbol can not be found in Web
+
// Check context activation
- if ((result != GLFW_NO_WINDOW_CONTEXT) && (result != GLFW_PLATFORM_ERROR))
+ if (result == true) //(result != GLFW_NO_WINDOW_CONTEXT) && (result != GLFW_PLATFORM_ERROR))
{
- CORE.Window.ready = true; // TODO: Proper validation on windows/context creation
+ CORE.Window.ready = true;
int fbWidth = CORE.Window.screen.width;
int fbHeight = CORE.Window.screen.height;
@@ -885,9 +885,9 @@ int InitPlatform(void)
TRACELOG(LOG_INFO, " > Render size: %i x %i", CORE.Window.render.width, CORE.Window.render.height);
TRACELOG(LOG_INFO, " > Viewport offsets: %i, %i", CORE.Window.renderOffset.x, CORE.Window.renderOffset.y);
}
- else
- {
- TRACELOG(LOG_FATAL, "PLATFORM: Failed to initialize graphics device");
+ else
+ {
+ TRACELOG(LOG_FATAL, "PLATFORM: Failed to initialize graphics device");
return -1;
}
@@ -896,12 +896,12 @@ int InitPlatform(void)
// If graphic device is no properly initialized, we end program
if (!CORE.Window.ready) { TRACELOG(LOG_FATAL, "PLATFORM: Failed to initialize graphic device"); return -1; }
else SetWindowPosition(GetMonitorWidth(GetCurrentMonitor())/2 - CORE.Window.screen.width/2, GetMonitorHeight(GetCurrentMonitor())/2 - CORE.Window.screen.height/2);
-
+
// Load OpenGL extensions
// NOTE: GL procedures address loader is required to load extensions
rlLoadExtensions(glfwGetProcAddress);
//----------------------------------------------------------------------------
-
+
// Initialize input events callbacks
//----------------------------------------------------------------------------
// Setup callback functions for the DOM events
diff --git a/src/raylib.h b/src/raylib.h
index b172562d0..d8bf1e07c 100644
--- a/src/raylib.h
+++ b/src/raylib.h
@@ -506,6 +506,20 @@ typedef struct FilePathList {
char **paths; // Filepaths entries
} FilePathList;
+// Automation event (opaque struct)
+typedef struct AutomationEvent {
+ unsigned int frame; // Event frame
+ unsigned int type; // Event type (AutomationEventType)
+ int params[4]; // Event parameters (if required)
+} AutomationEvent;
+
+// Automation event list
+typedef struct AutomationEventList {
+ unsigned int capacity; // Events max entries (MAX_AUTOMATION_EVENTS)
+ unsigned int count; // Events entries count
+ AutomationEvent *events; // Events entries
+} AutomationEventList;
+
//----------------------------------------------------------------------------------
// Enumerators Definition
//----------------------------------------------------------------------------------
@@ -1114,6 +1128,16 @@ RLAPI unsigned char *DecompressData(const unsigned char *compData, int compDataS
RLAPI char *EncodeDataBase64(const unsigned char *data, int dataSize, int *outputSize); // Encode data to Base64 string, memory must be MemFree()
RLAPI unsigned char *DecodeDataBase64(const unsigned char *data, int *outputSize); // Decode Base64 string data, memory must be MemFree()
+// Automation events functionality
+RLAPI AutomationEventList LoadAutomationEventList(const char *fileName); // Load automation events list from file, NULL for empty list, capacity = MAX_AUTOMATION_EVENTS
+RLAPI void UnloadAutomationEventList(AutomationEventList *list); // Unload automation events list from file
+RLAPI bool ExportAutomationEventList(AutomationEventList list, const char *fileName); // Export automation events list as text file
+RLAPI void SetAutomationEventList(AutomationEventList *list); // Set automation event list to record to
+RLAPI void SetAutomationEventBaseFrame(int frame); // Set automation event internal base frame to start recording
+RLAPI void StartAutomationEventRecording(void); // Start recording automation events (AutomationEventList must be set)
+RLAPI void StopAutomationEventRecording(void); // Stop recording automation events
+RLAPI void PlayAutomationEvent(AutomationEvent event); // Play a recorded automation event
+
//------------------------------------------------------------------------------------
// Input Handling Functions (Module: core)
//------------------------------------------------------------------------------------
diff --git a/src/rcore.c b/src/rcore.c
index ef3beaee3..c3b69ae88 100644
--- a/src/rcore.c
+++ b/src/rcore.c
@@ -3,17 +3,17 @@
* rcore - Window/display management, Graphic device/context management and input management
*
* PLATFORMS SUPPORTED:
-* - PLATFORM_DESKTOP:
+* - PLATFORM_DESKTOP:
* > Windows (Win32, Win64)
* > Linux (X11/Wayland desktop mode)
* > macOS/OSX (x64, arm64)
* > FreeBSD, OpenBSD, NetBSD, DragonFly (X11 desktop)
-* - PLATFORM_WEB:
+* - PLATFORM_WEB:
* > HTML5 (WebAssembly)
-* - PLATFORM_DRM:
+* - PLATFORM_DRM:
* > Raspberry Pi 0-5
* > Linux native mode (KMS driver)
-* - PLATFORM_ANDROID:
+* - PLATFORM_ANDROID:
* > Android (ARM, ARM64)
*
* CONFIGURATION:
@@ -48,8 +48,8 @@
* provided by stb_image and stb_image_write libraries, so, those libraries must be enabled on textures module
* for linkage
*
-* #define SUPPORT_EVENTS_AUTOMATION
-* Support automatic generated events, loading and recording of those events when required
+* #define SUPPORT_AUTOMATION_EVENTS
+* Support automatic events recording and playing, useful for automated testing systems or AI based game playing
*
* DEPENDENCIES:
* raymath - 3D math functionality (Vector2, Vector3, Matrix, Quaternion)
@@ -183,9 +183,8 @@ bool gifRecording = false; // GIF recording state
MsfGifState gifState = { 0 }; // MSGIF context state
#endif
-#if defined(SUPPORT_EVENTS_AUTOMATION)
-#define MAX_CODE_AUTOMATION_EVENTS 16384
-
+#if defined(SUPPORT_AUTOMATION_EVENTS)
+// Automation events type
typedef enum AutomationEventType {
EVENT_NONE = 0,
// Input events
@@ -212,12 +211,12 @@ typedef enum AutomationEventType {
WINDOW_MINIMIZE, // no params
WINDOW_RESIZE, // param[0]: width, param[1]: height
// Custom events
- ACTION_TAKE_SCREENSHOT,
- ACTION_SETTARGETFPS
+ ACTION_TAKE_SCREENSHOT, // no params
+ ACTION_SETTARGETFPS // param[0]: fps
} AutomationEventType;
-// Event type
-// Used to enable events flags
+// Event type to config events flags
+// TODO: Not used at the moment
typedef enum {
EVENT_INPUT_KEYBOARD = 0,
EVENT_INPUT_MOUSE = 1,
@@ -228,6 +227,7 @@ typedef enum {
EVENT_CUSTOM = 32
} EventType;
+// Event type name strings, required for export
static const char *autoEventTypeName[] = {
"EVENT_NONE",
"INPUT_KEY_UP",
@@ -255,19 +255,19 @@ static const char *autoEventTypeName[] = {
"ACTION_SETTARGETFPS"
};
+/*
// Automation event (24 bytes)
-typedef struct AutomationEvent {
+// NOTE: Opaque struct, internal to raylib
+struct AutomationEvent {
unsigned int frame; // Event frame
unsigned int type; // Event type (AutomationEventType)
int params[4]; // Event parameters (if required)
-} AutomationEvent;
+};
+*/
-static AutomationEvent *events = NULL; // Events array
-static unsigned int eventCount = 0; // Events count
-static bool eventsPlaying = false; // Play events
-static bool eventsRecording = false; // Record events
-
-//static short eventsEnabled = 0b0000001111111111; // Events enabled for checking
+static AutomationEventList *currentEventList = NULL; // Current automation events list, set by user, keep internal pointer
+static bool automationEventRecording = false; // Recording automation events flag
+//static short automationEventEnabled = 0b0000001111111111; // TODO: Automation events enabled for recording/playing
#endif
//-----------------------------------------------------------------------------------
@@ -291,11 +291,8 @@ static void SetupViewport(int width, int height); // Set viewport for
static void ScanDirectoryFiles(const char *basePath, FilePathList *list, const char *filter); // Scan all files and directories in a base path
static void ScanDirectoryFilesRecursively(const char *basePath, FilePathList *list, const char *filter); // Scan all files and directories recursively from a base path
-#if defined(SUPPORT_EVENTS_AUTOMATION)
-static void LoadAutomationEvents(const char *fileName); // Load automation events from file
-static void ExportAutomationEvents(const char *fileName); // Export recorded automation events into a file
-static void RecordAutomationEvent(unsigned int frame); // Record frame events (to internal events array)
-static void PlayAutomationEvent(unsigned int frame); // Play frame events (from internal events array)
+#if defined(SUPPORT_AUTOMATION_EVENTS)
+static void RecordAutomationEvent(void); // Record frame events (to internal events array)
#endif
#if defined(_WIN32)
@@ -304,14 +301,14 @@ void __stdcall Sleep(unsigned long msTimeout); // Required for: Wai
#endif
#if !defined(SUPPORT_MODULE_RTEXT)
-const char *TextFormat(const char *text, ...); // Formatting of text with variables to 'embed'
+const char *TextFormat(const char *text, ...); // Formatting of text with variables to 'embed'
#endif // !SUPPORT_MODULE_RTEXT
// Include platform-specific submodules
#if defined(PLATFORM_DESKTOP)
#include "platforms/rcore_desktop.c"
#elif defined(PLATFORM_DESKTOP_SDL)
- #include "platforms/rcore_desktop_sdl.c"
+ #include "platforms/rcore_desktop_sdl.c"
#elif defined(PLATFORM_WEB)
#include "platforms/rcore_web.c"
#elif defined(PLATFORM_DRM)
@@ -434,12 +431,12 @@ void InitWindow(int width, int height, const char *title)
CORE.Input.Mouse.scale = (Vector2){ 1.0f, 1.0f };
CORE.Input.Mouse.cursor = MOUSE_CURSOR_ARROW;
CORE.Input.Gamepad.lastButtonPressed = GAMEPAD_BUTTON_UNKNOWN;
-
+
// Initialize platform
- //--------------------------------------------------------------
+ //--------------------------------------------------------------
InitPlatform();
//--------------------------------------------------------------
-
+
// Initialize rlgl default data (buffers and shaders)
// NOTE: CORE.Window.currentFbo.width and CORE.Window.currentFbo.height not used, just stored as globals in rlgl
rlglInit(CORE.Window.currentFbo.width, CORE.Window.currentFbo.height);
@@ -485,9 +482,6 @@ void InitWindow(int width, int height, const char *title)
#endif
CORE.Time.frameCounter = 0;
-#if defined(SUPPORT_EVENTS_AUTOMATION)
- events = (AutomationEvent *)RL_CALLOC(MAX_CODE_AUTOMATION_EVENTS, sizeof(AutomationEvent));
-#endif
// Initialize random seed
SetRandomSeed((unsigned int)time(NULL));
@@ -512,14 +506,10 @@ void CloseWindow(void)
rlglClose(); // De-init rlgl
// De-initialize platform
- //--------------------------------------------------------------
+ //--------------------------------------------------------------
ClosePlatform();
//--------------------------------------------------------------
-#if defined(SUPPORT_EVENTS_AUTOMATION)
- RL_FREE(events);
-#endif
-
CORE.Window.ready = false;
TRACELOG(LOG_INFO, "Window closed successfully");
}
@@ -684,34 +674,6 @@ void EndDrawing(void)
}
#endif
-#if defined(SUPPORT_EVENTS_AUTOMATION)
- // Draw record/play indicator
- if (eventsRecording)
- {
- gifFrameCounter++;
-
- if (((gifFrameCounter/15)%2) == 1)
- {
- DrawCircle(30, CORE.Window.screen.height - 20, 10, MAROON);
- DrawText("EVENTS RECORDING", 50, CORE.Window.screen.height - 25, 10, RED);
- }
-
- rlDrawRenderBatchActive(); // Update and draw internal render batch
- }
- else if (eventsPlaying)
- {
- gifFrameCounter++;
-
- if (((gifFrameCounter/15)%2) == 1)
- {
- DrawCircle(30, CORE.Window.screen.height - 20, 10, LIME);
- DrawText("EVENTS PLAYING", 50, CORE.Window.screen.height - 25, 10, GREEN);
- }
-
- rlDrawRenderBatchActive(); // Update and draw internal render batch
- }
-#endif
-
#if !defined(SUPPORT_CUSTOM_FRAME_CONTROL)
SwapScreenBuffer(); // Copy back buffer to front buffer (screen)
@@ -775,16 +737,9 @@ void EndDrawing(void)
}
#endif // SUPPORT_SCREEN_CAPTURE
-#if defined(SUPPORT_EVENTS_AUTOMATION)
- // Events recording and playing logic
- if (eventsRecording) RecordAutomationEvent(CORE.Time.frameCounter);
- else if (eventsPlaying)
- {
- // TODO: When should we play? After/before/replace PollInputEvents()?
- if (CORE.Time.frameCounter >= eventCount) eventsPlaying = false;
- PlayAutomationEvent(CORE.Time.frameCounter);
- }
-#endif // SUPPORT_EVENTS_AUTOMATION
+#if defined(SUPPORT_AUTOMATION_EVENTS)
+ if (automationEventRecording) RecordAutomationEvent(); // Event recording
+#endif
CORE.Time.frameCounter++;
}
@@ -1470,7 +1425,7 @@ float GetFrameTime(void)
//----------------------------------------------------------------------------------
// NOTE: Functions with a platform-specific implementation on rcore_.c
-//void SwapScreenBuffer(void);
+//void SwapScreenBuffer(void);
//void PollInputEvents(void);
// Wait for some time (stop program execution)
@@ -1481,7 +1436,7 @@ float GetFrameTime(void)
void WaitTime(double seconds)
{
if (seconds < 0) return;
-
+
#if defined(SUPPORT_BUSY_WAIT_LOOP) || defined(SUPPORT_PARTIALBUSY_WAIT_LOOP)
double destinationTime = GetTime() + seconds;
#endif
@@ -2180,6 +2135,243 @@ unsigned char *DecodeDataBase64(const unsigned char *data, int *outputSize)
return decodedData;
}
+//----------------------------------------------------------------------------------
+// Module Functions Definition: Automation Events Recording and Playing
+//----------------------------------------------------------------------------------
+
+// Load automation events list from file, NULL for empty list, capacity = MAX_AUTOMATION_EVENTS
+AutomationEventList LoadAutomationEventList(const char *fileName)
+{
+ AutomationEventList list = { 0 };
+
+ // Allocate and empty automation event list, ready to record new events
+ list.events = (AutomationEvent *)RL_CALLOC(MAX_AUTOMATION_EVENTS, sizeof(AutomationEvent));
+ list.capacity = MAX_AUTOMATION_EVENTS;
+
+#if defined(SUPPORT_AUTOMATION_EVENTS)
+ if (fileName == NULL) TRACELOG(LOG_INFO, "AUTOMATION: New empty events list loaded successfully");
+ else
+ {
+ // Load automation events file (binary)
+ /*
+ //int dataSize = 0;
+ //unsigned char *data = LoadFileData(fileName, &dataSize);
+
+ FILE *raeFile = fopen(fileName, "rb");
+ unsigned char fileId[4] = { 0 };
+
+ fread(fileId, 1, 4, raeFile);
+
+ if ((fileId[0] == 'r') && (fileId[1] == 'A') && (fileId[2] == 'E') && (fileId[1] == ' '))
+ {
+ fread(&eventCount, sizeof(int), 1, raeFile);
+ TRACELOG(LOG_WARNING, "Events loaded: %i\n", eventCount);
+ fread(events, sizeof(AutomationEvent), eventCount, raeFile);
+ }
+
+ fclose(raeFile);
+ */
+
+ // Load events file (text)
+ //unsigned char *buffer = LoadFileText(fileName);
+ FILE *raeFile = fopen(fileName, "rt");
+
+ if (raeFile != NULL)
+ {
+ unsigned int counter = 0;
+ char buffer[256] = { 0 };
+ char eventDesc[64] = { 0 };
+
+ fgets(buffer, 256, raeFile);
+
+ while (!feof(raeFile))
+ {
+ switch (buffer[0])
+ {
+ case 'c': sscanf(buffer, "c %i", &list.count); break;
+ case 'e':
+ {
+ sscanf(buffer, "e %d %d %d %d %d %d %[^\n]s", &list.events[counter].frame, &list.events[counter].type,
+ &list.events[counter].params[0], &list.events[counter].params[1], &list.events[counter].params[2], &list.events[counter].params[3], eventDesc);
+
+ counter++;
+ } break;
+ default: break;
+ }
+
+ fgets(buffer, 256, raeFile);
+ }
+
+ if (counter != list.count)
+ {
+ TRACELOG(LOG_WARNING, "AUTOMATION: Events read from file [%i] do not mach event count specified [%i]", counter, list.count);
+ list.count = counter;
+ }
+
+ fclose(raeFile);
+
+ TRACELOG(LOG_INFO, "AUTOMATION: Events file loaded successfully");
+ }
+
+ TRACELOG(LOG_INFO, "AUTOMATION: Events loaded from file: %i", list.count);
+ }
+#endif
+ return list;
+}
+
+// Unload automation events list from file
+void UnloadAutomationEventList(AutomationEventList *list)
+{
+#if defined(SUPPORT_AUTOMATION_EVENTS)
+ RL_FREE(list->events);
+ list->events = NULL;
+ list->count = 0;
+ list->capacity = 0;
+#endif
+}
+
+// Export automation events list as text file
+bool ExportAutomationEventList(AutomationEventList list, const char *fileName)
+{
+ bool success = false;
+
+#if defined(SUPPORT_AUTOMATION_EVENTS)
+ // Export events as binary file
+ // TODO: Save to memory buffer and SaveFileData()
+ /*
+ unsigned char fileId[4] = "rAE ";
+ FILE *raeFile = fopen(fileName, "wb");
+ fwrite(fileId, sizeof(unsigned char), 4, raeFile);
+ fwrite(&eventCount, sizeof(int), 1, raeFile);
+ fwrite(events, sizeof(AutomationEvent), eventCount, raeFile);
+ fclose(raeFile);
+ */
+
+ // Export events as text
+ // TODO: Save to memory buffer and SaveFileText()
+ char *txtData = (char *)RL_CALLOC(256*list.count + 2048, sizeof(char)); // 256 characters per line plus some header
+
+ int byteCount = 0;
+ byteCount += sprintf(txtData + byteCount, "#\n");
+ byteCount += sprintf(txtData + byteCount, "# Automation events exporter v1.0 - raylib automation events list\n");
+ byteCount += sprintf(txtData + byteCount, "#\n");
+ byteCount += sprintf(txtData + byteCount, "# c \n");
+ byteCount += sprintf(txtData + byteCount, "# e // \n");
+ byteCount += sprintf(txtData + byteCount, "#\n");
+ byteCount += sprintf(txtData + byteCount, "# more info and bugs-report: github.com/raysan5/raylib\n");
+ byteCount += sprintf(txtData + byteCount, "# feedback and support: ray[at]raylib.com\n");
+ byteCount += sprintf(txtData + byteCount, "#\n");
+ byteCount += sprintf(txtData + byteCount, "# Copyright (c) 2023-2024 Ramon Santamaria (@raysan5)\n");
+ byteCount += sprintf(txtData + byteCount, "#\n\n");
+
+ // Add events data
+ byteCount += sprintf(txtData + byteCount, "c %i\n", list.count);
+ for (int i = 0; i < list.count; i++)
+ {
+ byteCount += sprintf(txtData + byteCount, "e %i %i %i %i %i %i // Event: %s\n", list.events[i].frame, list.events[i].type,
+ list.events[i].params[0], list.events[i].params[1], list.events[i].params[2], list.events[i].params[3], autoEventTypeName[list.events[i].type]);
+ }
+
+ // NOTE: Text data size exported is determined by '\0' (NULL) character
+ success = SaveFileText(fileName, txtData);
+
+ RL_FREE(txtData);
+#endif
+
+ return success;
+}
+
+// Setup automation event list to record to
+void SetAutomationEventList(AutomationEventList *list)
+{
+#if defined(SUPPORT_AUTOMATION_EVENTS)
+ currentEventList = list;
+#endif
+}
+
+// Set automation event internal base frame to start recording
+void SetAutomationEventBaseFrame(int frame)
+{
+ CORE.Time.frameCounter = frame;
+}
+
+// Start recording automation events (AutomationEventList must be set)
+void StartAutomationEventRecording(void)
+{
+#if defined(SUPPORT_AUTOMATION_EVENTS)
+ automationEventRecording = true;
+#endif
+}
+
+// Stop recording automation events
+void StopAutomationEventRecording(void)
+{
+#if defined(SUPPORT_AUTOMATION_EVENTS)
+ automationEventRecording = false;
+#endif
+}
+
+// Play a recorded automation event
+void PlayAutomationEvent(AutomationEvent event)
+{
+#if defined(SUPPORT_AUTOMATION_EVENTS)
+ // WARNING: When should event be played? After/before/replace PollInputEvents()? -> Up to the user!
+
+ if (!automationEventRecording) // TODO: Allow recording events while playing?
+ {
+ switch (event.type)
+ {
+ // Input event
+ case INPUT_KEY_UP: CORE.Input.Keyboard.currentKeyState[event.params[0]] = false; break; // param[0]: key
+ case INPUT_KEY_DOWN: CORE.Input.Keyboard.currentKeyState[event.params[0]] = true; break; // param[0]: key
+ case INPUT_MOUSE_BUTTON_UP: CORE.Input.Mouse.currentButtonState[event.params[0]] = false; break; // param[0]: key
+ case INPUT_MOUSE_BUTTON_DOWN: CORE.Input.Mouse.currentButtonState[event.params[0]] = true; break; // param[0]: key
+ case INPUT_MOUSE_POSITION: // param[0]: x, param[1]: y
+ {
+ CORE.Input.Mouse.currentPosition.x = (float)event.params[0];
+ CORE.Input.Mouse.currentPosition.y = (float)event.params[1];
+ } break;
+ case INPUT_MOUSE_WHEEL_MOTION: // param[0]: x delta, param[1]: y delta
+ {
+ CORE.Input.Mouse.currentWheelMove.x = (float)event.params[0]; break;
+ CORE.Input.Mouse.currentWheelMove.y = (float)event.params[1]; break;
+ } break;
+ case INPUT_TOUCH_UP: CORE.Input.Touch.currentTouchState[event.params[0]] = false; break; // param[0]: id
+ case INPUT_TOUCH_DOWN: CORE.Input.Touch.currentTouchState[event.params[0]] = true; break; // param[0]: id
+ case INPUT_TOUCH_POSITION: // param[0]: id, param[1]: x, param[2]: y
+ {
+ CORE.Input.Touch.position[event.params[0]].x = (float)event.params[1];
+ CORE.Input.Touch.position[event.params[0]].y = (float)event.params[2];
+ } break;
+ case INPUT_GAMEPAD_CONNECT: CORE.Input.Gamepad.ready[event.params[0]] = true; break; // param[0]: gamepad
+ case INPUT_GAMEPAD_DISCONNECT: CORE.Input.Gamepad.ready[event.params[0]] = false; break; // param[0]: gamepad
+ case INPUT_GAMEPAD_BUTTON_UP: CORE.Input.Gamepad.currentButtonState[event.params[0]][event.params[1]] = false; break; // param[0]: gamepad, param[1]: button
+ case INPUT_GAMEPAD_BUTTON_DOWN: CORE.Input.Gamepad.currentButtonState[event.params[0]][event.params[1]] = true; break; // param[0]: gamepad, param[1]: button
+ case INPUT_GAMEPAD_AXIS_MOTION: // param[0]: gamepad, param[1]: axis, param[2]: delta
+ {
+ CORE.Input.Gamepad.axisState[event.params[0]][event.params[1]] = ((float)event.params[2]/32768.0f);
+ } break;
+ case INPUT_GESTURE: GESTURES.current = event.params[0]; break; // param[0]: gesture (enum Gesture) -> rgestures.h: GESTURES.current
+
+ // Window event
+ case WINDOW_CLOSE: CORE.Window.shouldClose = true; break;
+ case WINDOW_MAXIMIZE: MaximizeWindow(); break;
+ case WINDOW_MINIMIZE: MinimizeWindow(); break;
+ case WINDOW_RESIZE: SetWindowSize(event.params[0], event.params[1]); break;
+
+ // Custom event
+ case ACTION_TAKE_SCREENSHOT:
+ {
+ TakeScreenshot(TextFormat("screenshot%03i.png", screenshotCounter));
+ screenshotCounter++;
+ } break;
+ case ACTION_SETTARGETFPS: SetTargetFPS(event.params[0]); break;
+ default: break;
+ }
+ }
+#endif
+}
+
//----------------------------------------------------------------------------------
// Module Functions Definition: Input Handling: Keyboard
//----------------------------------------------------------------------------------
@@ -2793,233 +2985,180 @@ static void ScanDirectoryFilesRecursively(const char *basePath, FilePathList *fi
else TRACELOG(LOG_WARNING, "FILEIO: Directory cannot be opened (%s)", basePath);
}
-#if defined(SUPPORT_EVENTS_AUTOMATION)
-// NOTE: Loading happens over AutomationEvent *events
-// TODO: This system should probably be redesigned
-static void LoadAutomationEvents(const char *fileName)
+#if defined(SUPPORT_AUTOMATION_EVENTS)
+// Automation event recording
+// NOTE: Recording is by default done at EndDrawing(), after PollInputEvents()
+static void RecordAutomationEvent(void)
{
- // Load events file (binary)
- /*
- FILE *repFile = fopen(fileName, "rb");
- unsigned char fileId[4] = { 0 };
+ // Checking events in current frame and save them into currentEventList
+ // TODO: How important is the current frame? Could it be modified?
+
+ if (currentEventList->count == currentEventList->capacity) return; // Security check
- fread(fileId, 1, 4, repFile);
-
- if ((fileId[0] == 'r') && (fileId[1] == 'E') && (fileId[2] == 'P') && (fileId[1] == ' '))
- {
- fread(&eventCount, sizeof(int), 1, repFile);
- TRACELOG(LOG_WARNING, "Events loaded: %i\n", eventCount);
- fread(events, sizeof(AutomationEvent), eventCount, repFile);
- }
-
- fclose(repFile);
- */
-
- // Load events file (text)
- FILE *repFile = fopen(fileName, "rt");
-
- if (repFile != NULL)
- {
- unsigned int count = 0;
- char buffer[256] = { 0 };
-
- fgets(buffer, 256, repFile);
-
- while (!feof(repFile))
- {
- if (buffer[0] == 'c') sscanf(buffer, "c %i", &eventCount);
- else if (buffer[0] == 'e')
- {
- sscanf(buffer, "e %d %d %d %d %d", &events[count].frame, &events[count].type,
- &events[count].params[0], &events[count].params[1], &events[count].params[2]);
-
- count++;
- }
-
- fgets(buffer, 256, repFile);
- }
-
- if (count != eventCount) TRACELOG(LOG_WARNING, "Events count provided is different than count");
-
- fclose(repFile);
- }
-
- TRACELOG(LOG_WARNING, "Events loaded: %i", eventCount);
-}
-
-// Export recorded events into a file
-static void ExportAutomationEvents(const char *fileName)
-{
- unsigned char fileId[4] = "rEP ";
-
- // Save as binary
- /*
- FILE *repFile = fopen(fileName, "wb");
- fwrite(fileId, sizeof(unsigned char), 4, repFile);
- fwrite(&eventCount, sizeof(int), 1, repFile);
- fwrite(events, sizeof(AutomationEvent), eventCount, repFile);
- fclose(repFile);
- */
-
- // Export events as text
- FILE *repFile = fopen(fileName, "wt");
-
- if (repFile != NULL)
- {
- fprintf(repFile, "# Automation events list\n");
- fprintf(repFile, "# c \n");
- fprintf(repFile, "# e // \n");
-
- fprintf(repFile, "c %i\n", eventCount);
- for (int i = 0; i < eventCount; i++)
- {
- fprintf(repFile, "e %i %i %i %i %i // %s\n", events[i].frame, events[i].type,
- events[i].params[0], events[i].params[1], events[i].params[2], autoEventTypeName[events[i].type]);
- }
-
- fclose(repFile);
- }
-}
-
-// EndDrawing() -> After PollInputEvents()
-// Check event in current frame and save into the events[i] array
-static void RecordAutomationEvent(unsigned int frame)
-{
+ // Keyboard input events recording
+ //-------------------------------------------------------------------------------------
for (int key = 0; key < MAX_KEYBOARD_KEYS; key++)
{
- // INPUT_KEY_UP (only saved once)
+ // Event type: INPUT_KEY_UP (only saved once)
if (CORE.Input.Keyboard.previousKeyState[key] && !CORE.Input.Keyboard.currentKeyState[key])
{
- events[eventCount].frame = frame;
- events[eventCount].type = INPUT_KEY_UP;
- events[eventCount].params[0] = key;
- events[eventCount].params[1] = 0;
- events[eventCount].params[2] = 0;
+ currentEventList->events[currentEventList->count].frame = CORE.Time.frameCounter;
+ currentEventList->events[currentEventList->count].type = INPUT_KEY_UP;
+ currentEventList->events[currentEventList->count].params[0] = key;
+ currentEventList->events[currentEventList->count].params[1] = 0;
+ currentEventList->events[currentEventList->count].params[2] = 0;
- TRACELOG(LOG_INFO, "[%i] INPUT_KEY_UP: %i, %i, %i", events[eventCount].frame, events[eventCount].params[0], events[eventCount].params[1], events[eventCount].params[2]);
- eventCount++;
+ TRACELOG(LOG_INFO, "AUTOMATION: Frame: %i | Event type: INPUT_KEY_UP | Event parameters: %i, %i, %i", currentEventList->events[currentEventList->count].frame, currentEventList->events[currentEventList->count].params[0], currentEventList->events[currentEventList->count].params[1], currentEventList->events[currentEventList->count].params[2]);
+ currentEventList->count++;
}
+
+ if (currentEventList->count == currentEventList->capacity) return; // Security check
- // INPUT_KEY_DOWN
+ // Event type: INPUT_KEY_DOWN
if (CORE.Input.Keyboard.currentKeyState[key])
{
- events[eventCount].frame = frame;
- events[eventCount].type = INPUT_KEY_DOWN;
- events[eventCount].params[0] = key;
- events[eventCount].params[1] = 0;
- events[eventCount].params[2] = 0;
+ currentEventList->events[currentEventList->count].frame = CORE.Time.frameCounter;
+ currentEventList->events[currentEventList->count].type = INPUT_KEY_DOWN;
+ currentEventList->events[currentEventList->count].params[0] = key;
+ currentEventList->events[currentEventList->count].params[1] = 0;
+ currentEventList->events[currentEventList->count].params[2] = 0;
- TRACELOG(LOG_INFO, "[%i] INPUT_KEY_DOWN: %i, %i, %i", events[eventCount].frame, events[eventCount].params[0], events[eventCount].params[1], events[eventCount].params[2]);
- eventCount++;
+ TRACELOG(LOG_INFO, "AUTOMATION: Frame: %i | Event type: INPUT_KEY_DOWN | Event parameters: %i, %i, %i", currentEventList->events[currentEventList->count].frame, currentEventList->events[currentEventList->count].params[0], currentEventList->events[currentEventList->count].params[1], currentEventList->events[currentEventList->count].params[2]);
+ currentEventList->count++;
}
+
+ if (currentEventList->count == currentEventList->capacity) return; // Security check
}
+ //-------------------------------------------------------------------------------------
+ // Mouse input currentEventList->events recording
+ //-------------------------------------------------------------------------------------
for (int button = 0; button < MAX_MOUSE_BUTTONS; button++)
{
- // INPUT_MOUSE_BUTTON_UP
+ // Event type: INPUT_MOUSE_BUTTON_UP
if (CORE.Input.Mouse.previousButtonState[button] && !CORE.Input.Mouse.currentButtonState[button])
{
- events[eventCount].frame = frame;
- events[eventCount].type = INPUT_MOUSE_BUTTON_UP;
- events[eventCount].params[0] = button;
- events[eventCount].params[1] = 0;
- events[eventCount].params[2] = 0;
+ currentEventList->events[currentEventList->count].frame = CORE.Time.frameCounter;
+ currentEventList->events[currentEventList->count].type = INPUT_MOUSE_BUTTON_UP;
+ currentEventList->events[currentEventList->count].params[0] = button;
+ currentEventList->events[currentEventList->count].params[1] = 0;
+ currentEventList->events[currentEventList->count].params[2] = 0;
- TRACELOG(LOG_INFO, "[%i] INPUT_MOUSE_BUTTON_UP: %i, %i, %i", events[eventCount].frame, events[eventCount].params[0], events[eventCount].params[1], events[eventCount].params[2]);
- eventCount++;
+ TRACELOG(LOG_INFO, "AUTOMATION: Frame: %i | Event type: INPUT_MOUSE_BUTTON_UP | Event parameters: %i, %i, %i", currentEventList->events[currentEventList->count].frame, currentEventList->events[currentEventList->count].params[0], currentEventList->events[currentEventList->count].params[1], currentEventList->events[currentEventList->count].params[2]);
+ currentEventList->count++;
}
+
+ if (currentEventList->count == currentEventList->capacity) return; // Security check
- // INPUT_MOUSE_BUTTON_DOWN
+ // Event type: INPUT_MOUSE_BUTTON_DOWN
if (CORE.Input.Mouse.currentButtonState[button])
{
- events[eventCount].frame = frame;
- events[eventCount].type = INPUT_MOUSE_BUTTON_DOWN;
- events[eventCount].params[0] = button;
- events[eventCount].params[1] = 0;
- events[eventCount].params[2] = 0;
+ currentEventList->events[currentEventList->count].frame = CORE.Time.frameCounter;
+ currentEventList->events[currentEventList->count].type = INPUT_MOUSE_BUTTON_DOWN;
+ currentEventList->events[currentEventList->count].params[0] = button;
+ currentEventList->events[currentEventList->count].params[1] = 0;
+ currentEventList->events[currentEventList->count].params[2] = 0;
- TRACELOG(LOG_INFO, "[%i] INPUT_MOUSE_BUTTON_DOWN: %i, %i, %i", events[eventCount].frame, events[eventCount].params[0], events[eventCount].params[1], events[eventCount].params[2]);
- eventCount++;
+ TRACELOG(LOG_INFO, "AUTOMATION: Frame: %i | Event type: INPUT_MOUSE_BUTTON_DOWN | Event parameters: %i, %i, %i", currentEventList->events[currentEventList->count].frame, currentEventList->events[currentEventList->count].params[0], currentEventList->events[currentEventList->count].params[1], currentEventList->events[currentEventList->count].params[2]);
+ currentEventList->count++;
}
+
+ if (currentEventList->count == currentEventList->capacity) return; // Security check
}
- // INPUT_MOUSE_POSITION (only saved if changed)
+ // Event type: INPUT_MOUSE_POSITION (only saved if changed)
if (((int)CORE.Input.Mouse.currentPosition.x != (int)CORE.Input.Mouse.previousPosition.x) ||
((int)CORE.Input.Mouse.currentPosition.y != (int)CORE.Input.Mouse.previousPosition.y))
{
- events[eventCount].frame = frame;
- events[eventCount].type = INPUT_MOUSE_POSITION;
- events[eventCount].params[0] = (int)CORE.Input.Mouse.currentPosition.x;
- events[eventCount].params[1] = (int)CORE.Input.Mouse.currentPosition.y;
- events[eventCount].params[2] = 0;
+ currentEventList->events[currentEventList->count].frame = CORE.Time.frameCounter;
+ currentEventList->events[currentEventList->count].type = INPUT_MOUSE_POSITION;
+ currentEventList->events[currentEventList->count].params[0] = (int)CORE.Input.Mouse.currentPosition.x;
+ currentEventList->events[currentEventList->count].params[1] = (int)CORE.Input.Mouse.currentPosition.y;
+ currentEventList->events[currentEventList->count].params[2] = 0;
- TRACELOG(LOG_INFO, "[%i] INPUT_MOUSE_POSITION: %i, %i, %i", events[eventCount].frame, events[eventCount].params[0], events[eventCount].params[1], events[eventCount].params[2]);
- eventCount++;
+ TRACELOG(LOG_INFO, "AUTOMATION: Frame: %i | Event type: INPUT_MOUSE_POSITION | Event parameters: %i, %i, %i", currentEventList->events[currentEventList->count].frame, currentEventList->events[currentEventList->count].params[0], currentEventList->events[currentEventList->count].params[1], currentEventList->events[currentEventList->count].params[2]);
+ currentEventList->count++;
+
+ if (currentEventList->count == currentEventList->capacity) return; // Security check
}
- // INPUT_MOUSE_WHEEL_MOTION
+ // Event type: INPUT_MOUSE_WHEEL_MOTION
if (((int)CORE.Input.Mouse.currentWheelMove.x != (int)CORE.Input.Mouse.previousWheelMove.x) ||
((int)CORE.Input.Mouse.currentWheelMove.y != (int)CORE.Input.Mouse.previousWheelMove.y))
{
- events[eventCount].frame = frame;
- events[eventCount].type = INPUT_MOUSE_WHEEL_MOTION;
- events[eventCount].params[0] = (int)CORE.Input.Mouse.currentWheelMove.x;
- events[eventCount].params[1] = (int)CORE.Input.Mouse.currentWheelMove.y;;
- events[eventCount].params[2] = 0;
+ currentEventList->events[currentEventList->count].frame = CORE.Time.frameCounter;
+ currentEventList->events[currentEventList->count].type = INPUT_MOUSE_WHEEL_MOTION;
+ currentEventList->events[currentEventList->count].params[0] = (int)CORE.Input.Mouse.currentWheelMove.x;
+ currentEventList->events[currentEventList->count].params[1] = (int)CORE.Input.Mouse.currentWheelMove.y;;
+ currentEventList->events[currentEventList->count].params[2] = 0;
- TRACELOG(LOG_INFO, "[%i] INPUT_MOUSE_WHEEL_MOTION: %i, %i, %i", events[eventCount].frame, events[eventCount].params[0], events[eventCount].params[1], events[eventCount].params[2]);
- eventCount++;
+ TRACELOG(LOG_INFO, "AUTOMATION: Frame: %i | Event type: INPUT_MOUSE_WHEEL_MOTION | Event parameters: %i, %i, %i", currentEventList->events[currentEventList->count].frame, currentEventList->events[currentEventList->count].params[0], currentEventList->events[currentEventList->count].params[1], currentEventList->events[currentEventList->count].params[2]);
+ currentEventList->count++;
+
+ if (currentEventList->count == currentEventList->capacity) return; // Security check
}
+ //-------------------------------------------------------------------------------------
+ // Touch input currentEventList->events recording
+ //-------------------------------------------------------------------------------------
for (int id = 0; id < MAX_TOUCH_POINTS; id++)
{
- // INPUT_TOUCH_UP
+ // Event type: INPUT_TOUCH_UP
if (CORE.Input.Touch.previousTouchState[id] && !CORE.Input.Touch.currentTouchState[id])
{
- events[eventCount].frame = frame;
- events[eventCount].type = INPUT_TOUCH_UP;
- events[eventCount].params[0] = id;
- events[eventCount].params[1] = 0;
- events[eventCount].params[2] = 0;
+ currentEventList->events[currentEventList->count].frame = CORE.Time.frameCounter;
+ currentEventList->events[currentEventList->count].type = INPUT_TOUCH_UP;
+ currentEventList->events[currentEventList->count].params[0] = id;
+ currentEventList->events[currentEventList->count].params[1] = 0;
+ currentEventList->events[currentEventList->count].params[2] = 0;
- TRACELOG(LOG_INFO, "[%i] INPUT_TOUCH_UP: %i, %i, %i", events[eventCount].frame, events[eventCount].params[0], events[eventCount].params[1], events[eventCount].params[2]);
- eventCount++;
+ TRACELOG(LOG_INFO, "AUTOMATION: Frame: %i | Event type: INPUT_TOUCH_UP | Event parameters: %i, %i, %i", currentEventList->events[currentEventList->count].frame, currentEventList->events[currentEventList->count].params[0], currentEventList->events[currentEventList->count].params[1], currentEventList->events[currentEventList->count].params[2]);
+ currentEventList->count++;
}
+
+ if (currentEventList->count == currentEventList->capacity) return; // Security check
- // INPUT_TOUCH_DOWN
+ // Event type: INPUT_TOUCH_DOWN
if (CORE.Input.Touch.currentTouchState[id])
{
- events[eventCount].frame = frame;
- events[eventCount].type = INPUT_TOUCH_DOWN;
- events[eventCount].params[0] = id;
- events[eventCount].params[1] = 0;
- events[eventCount].params[2] = 0;
+ currentEventList->events[currentEventList->count].frame = CORE.Time.frameCounter;
+ currentEventList->events[currentEventList->count].type = INPUT_TOUCH_DOWN;
+ currentEventList->events[currentEventList->count].params[0] = id;
+ currentEventList->events[currentEventList->count].params[1] = 0;
+ currentEventList->events[currentEventList->count].params[2] = 0;
- TRACELOG(LOG_INFO, "[%i] INPUT_TOUCH_DOWN: %i, %i, %i", events[eventCount].frame, events[eventCount].params[0], events[eventCount].params[1], events[eventCount].params[2]);
- eventCount++;
+ TRACELOG(LOG_INFO, "AUTOMATION: Frame: %i | Event type: INPUT_TOUCH_DOWN | Event parameters: %i, %i, %i", currentEventList->events[currentEventList->count].frame, currentEventList->events[currentEventList->count].params[0], currentEventList->events[currentEventList->count].params[1], currentEventList->events[currentEventList->count].params[2]);
+ currentEventList->count++;
}
+
+ if (currentEventList->count == currentEventList->capacity) return; // Security check
- // INPUT_TOUCH_POSITION
+ // Event type: INPUT_TOUCH_POSITION
// TODO: It requires the id!
/*
if (((int)CORE.Input.Touch.currentPosition[id].x != (int)CORE.Input.Touch.previousPosition[id].x) ||
((int)CORE.Input.Touch.currentPosition[id].y != (int)CORE.Input.Touch.previousPosition[id].y))
{
- events[eventCount].frame = frame;
- events[eventCount].type = INPUT_TOUCH_POSITION;
- events[eventCount].params[0] = id;
- events[eventCount].params[1] = (int)CORE.Input.Touch.currentPosition[id].x;
- events[eventCount].params[2] = (int)CORE.Input.Touch.currentPosition[id].y;
+ currentEventList->events[currentEventList->count].frame = CORE.Time.frameCounter;
+ currentEventList->events[currentEventList->count].type = INPUT_TOUCH_POSITION;
+ currentEventList->events[currentEventList->count].params[0] = id;
+ currentEventList->events[currentEventList->count].params[1] = (int)CORE.Input.Touch.currentPosition[id].x;
+ currentEventList->events[currentEventList->count].params[2] = (int)CORE.Input.Touch.currentPosition[id].y;
- TRACELOG(LOG_INFO, "[%i] INPUT_TOUCH_POSITION: %i, %i, %i", events[eventCount].frame, events[eventCount].params[0], events[eventCount].params[1], events[eventCount].params[2]);
- eventCount++;
+ TRACELOG(LOG_INFO, "AUTOMATION: Frame: %i | Event type: INPUT_TOUCH_POSITION | Event parameters: %i, %i, %i", currentEventList->events[currentEventList->count].frame, currentEventList->events[currentEventList->count].params[0], currentEventList->events[currentEventList->count].params[1], currentEventList->events[currentEventList->count].params[2]);
+ currentEventList->count++;
}
*/
+
+ if (currentEventList->count == currentEventList->capacity) return; // Security check
}
+ //-------------------------------------------------------------------------------------
+ // Gamepad input currentEventList->events recording
+ //-------------------------------------------------------------------------------------
for (int gamepad = 0; gamepad < MAX_GAMEPADS; gamepad++)
{
- // INPUT_GAMEPAD_CONNECT
+ // Event type: INPUT_GAMEPAD_CONNECT
/*
if ((CORE.Input.Gamepad.currentState[gamepad] != CORE.Input.Gamepad.previousState[gamepad]) &&
(CORE.Input.Gamepad.currentState[gamepad])) // Check if changed to ready
@@ -3028,7 +3167,7 @@ static void RecordAutomationEvent(unsigned int frame)
}
*/
- // INPUT_GAMEPAD_DISCONNECT
+ // Event type: INPUT_GAMEPAD_DISCONNECT
/*
if ((CORE.Input.Gamepad.currentState[gamepad] != CORE.Input.Gamepad.previousState[gamepad]) &&
(!CORE.Input.Gamepad.currentState[gamepad])) // Check if changed to not-ready
@@ -3039,122 +3178,84 @@ static void RecordAutomationEvent(unsigned int frame)
for (int button = 0; button < MAX_GAMEPAD_BUTTONS; button++)
{
- // INPUT_GAMEPAD_BUTTON_UP
+ // Event type: INPUT_GAMEPAD_BUTTON_UP
if (CORE.Input.Gamepad.previousButtonState[gamepad][button] && !CORE.Input.Gamepad.currentButtonState[gamepad][button])
{
- events[eventCount].frame = frame;
- events[eventCount].type = INPUT_GAMEPAD_BUTTON_UP;
- events[eventCount].params[0] = gamepad;
- events[eventCount].params[1] = button;
- events[eventCount].params[2] = 0;
+ currentEventList->events[currentEventList->count].frame = CORE.Time.frameCounter;
+ currentEventList->events[currentEventList->count].type = INPUT_GAMEPAD_BUTTON_UP;
+ currentEventList->events[currentEventList->count].params[0] = gamepad;
+ currentEventList->events[currentEventList->count].params[1] = button;
+ currentEventList->events[currentEventList->count].params[2] = 0;
- TRACELOG(LOG_INFO, "[%i] INPUT_GAMEPAD_BUTTON_UP: %i, %i, %i", events[eventCount].frame, events[eventCount].params[0], events[eventCount].params[1], events[eventCount].params[2]);
- eventCount++;
+ TRACELOG(LOG_INFO, "AUTOMATION: Frame: %i | Event type: INPUT_GAMEPAD_BUTTON_UP | Event parameters: %i, %i, %i", currentEventList->events[currentEventList->count].frame, currentEventList->events[currentEventList->count].params[0], currentEventList->events[currentEventList->count].params[1], currentEventList->events[currentEventList->count].params[2]);
+ currentEventList->count++;
}
+
+ if (currentEventList->count == currentEventList->capacity) return; // Security check
- // INPUT_GAMEPAD_BUTTON_DOWN
+ // Event type: INPUT_GAMEPAD_BUTTON_DOWN
if (CORE.Input.Gamepad.currentButtonState[gamepad][button])
{
- events[eventCount].frame = frame;
- events[eventCount].type = INPUT_GAMEPAD_BUTTON_DOWN;
- events[eventCount].params[0] = gamepad;
- events[eventCount].params[1] = button;
- events[eventCount].params[2] = 0;
+ currentEventList->events[currentEventList->count].frame = CORE.Time.frameCounter;
+ currentEventList->events[currentEventList->count].type = INPUT_GAMEPAD_BUTTON_DOWN;
+ currentEventList->events[currentEventList->count].params[0] = gamepad;
+ currentEventList->events[currentEventList->count].params[1] = button;
+ currentEventList->events[currentEventList->count].params[2] = 0;
- TRACELOG(LOG_INFO, "[%i] INPUT_GAMEPAD_BUTTON_DOWN: %i, %i, %i", events[eventCount].frame, events[eventCount].params[0], events[eventCount].params[1], events[eventCount].params[2]);
- eventCount++;
+ TRACELOG(LOG_INFO, "AUTOMATION: Frame: %i | Event type: INPUT_GAMEPAD_BUTTON_DOWN | Event parameters: %i, %i, %i", currentEventList->events[currentEventList->count].frame, currentEventList->events[currentEventList->count].params[0], currentEventList->events[currentEventList->count].params[1], currentEventList->events[currentEventList->count].params[2]);
+ currentEventList->count++;
}
+
+ if (currentEventList->count == currentEventList->capacity) return; // Security check
}
for (int axis = 0; axis < MAX_GAMEPAD_AXIS; axis++)
{
- // INPUT_GAMEPAD_AXIS_MOTION
+ // Event type: INPUT_GAMEPAD_AXIS_MOTION
if (CORE.Input.Gamepad.axisState[gamepad][axis] > 0.1f)
{
- events[eventCount].frame = frame;
- events[eventCount].type = INPUT_GAMEPAD_AXIS_MOTION;
- events[eventCount].params[0] = gamepad;
- events[eventCount].params[1] = axis;
- events[eventCount].params[2] = (int)(CORE.Input.Gamepad.axisState[gamepad][axis]*32768.0f);
+ currentEventList->events[currentEventList->count].frame = CORE.Time.frameCounter;
+ currentEventList->events[currentEventList->count].type = INPUT_GAMEPAD_AXIS_MOTION;
+ currentEventList->events[currentEventList->count].params[0] = gamepad;
+ currentEventList->events[currentEventList->count].params[1] = axis;
+ currentEventList->events[currentEventList->count].params[2] = (int)(CORE.Input.Gamepad.axisState[gamepad][axis]*32768.0f);
- TRACELOG(LOG_INFO, "[%i] INPUT_GAMEPAD_AXIS_MOTION: %i, %i, %i", events[eventCount].frame, events[eventCount].params[0], events[eventCount].params[1], events[eventCount].params[2]);
- eventCount++;
+ TRACELOG(LOG_INFO, "AUTOMATION: Frame: %i | Event type: INPUT_GAMEPAD_AXIS_MOTION | Event parameters: %i, %i, %i", currentEventList->events[currentEventList->count].frame, currentEventList->events[currentEventList->count].params[0], currentEventList->events[currentEventList->count].params[1], currentEventList->events[currentEventList->count].params[2]);
+ currentEventList->count++;
}
+
+ if (currentEventList->count == currentEventList->capacity) return; // Security check
}
}
+ //-------------------------------------------------------------------------------------
- // INPUT_GESTURE
+ // Gestures input currentEventList->events recording
+ //-------------------------------------------------------------------------------------
if (GESTURES.current != GESTURE_NONE)
{
- events[eventCount].frame = frame;
- events[eventCount].type = INPUT_GESTURE;
- events[eventCount].params[0] = GESTURES.current;
- events[eventCount].params[1] = 0;
- events[eventCount].params[2] = 0;
+ // Event type: INPUT_GESTURE
+ currentEventList->events[currentEventList->count].frame = CORE.Time.frameCounter;
+ currentEventList->events[currentEventList->count].type = INPUT_GESTURE;
+ currentEventList->events[currentEventList->count].params[0] = GESTURES.current;
+ currentEventList->events[currentEventList->count].params[1] = 0;
+ currentEventList->events[currentEventList->count].params[2] = 0;
- TRACELOG(LOG_INFO, "[%i] INPUT_GESTURE: %i, %i, %i", events[eventCount].frame, events[eventCount].params[0], events[eventCount].params[1], events[eventCount].params[2]);
- eventCount++;
+ TRACELOG(LOG_INFO, "AUTOMATION: Frame: %i | Event type: INPUT_GESTURE | Event parameters: %i, %i, %i", currentEventList->events[currentEventList->count].frame, currentEventList->events[currentEventList->count].params[0], currentEventList->events[currentEventList->count].params[1], currentEventList->events[currentEventList->count].params[2]);
+ currentEventList->count++;
+
+ if (currentEventList->count == currentEventList->capacity) return; // Security check
}
-}
+ //-------------------------------------------------------------------------------------
-// Play automation event
-static void PlayAutomationEvent(unsigned int frame)
-{
- for (unsigned int i = 0; i < eventCount; i++)
- {
- if (events[i].frame == frame)
- {
- switch (events[i].type)
- {
- // Input events
- case INPUT_KEY_UP: CORE.Input.Keyboard.currentKeyState[events[i].params[0]] = false; break; // param[0]: key
- case INPUT_KEY_DOWN: CORE.Input.Keyboard.currentKeyState[events[i].params[0]] = true; break; // param[0]: key
- case INPUT_MOUSE_BUTTON_UP: CORE.Input.Mouse.currentButtonState[events[i].params[0]] = false; break; // param[0]: key
- case INPUT_MOUSE_BUTTON_DOWN: CORE.Input.Mouse.currentButtonState[events[i].params[0]] = true; break; // param[0]: key
- case INPUT_MOUSE_POSITION: // param[0]: x, param[1]: y
- {
- CORE.Input.Mouse.currentPosition.x = (float)events[i].params[0];
- CORE.Input.Mouse.currentPosition.y = (float)events[i].params[1];
- } break;
- case INPUT_MOUSE_WHEEL_MOTION: // param[0]: x delta, param[1]: y delta
- {
- CORE.Input.Mouse.currentWheelMove.x = (float)events[i].params[0]; break;
- CORE.Input.Mouse.currentWheelMove.y = (float)events[i].params[1]; break;
- } break;
- case INPUT_TOUCH_UP: CORE.Input.Touch.currentTouchState[events[i].params[0]] = false; break; // param[0]: id
- case INPUT_TOUCH_DOWN: CORE.Input.Touch.currentTouchState[events[i].params[0]] = true; break; // param[0]: id
- case INPUT_TOUCH_POSITION: // param[0]: id, param[1]: x, param[2]: y
- {
- CORE.Input.Touch.position[events[i].params[0]].x = (float)events[i].params[1];
- CORE.Input.Touch.position[events[i].params[0]].y = (float)events[i].params[2];
- } break;
- case INPUT_GAMEPAD_CONNECT: CORE.Input.Gamepad.ready[events[i].params[0]] = true; break; // param[0]: gamepad
- case INPUT_GAMEPAD_DISCONNECT: CORE.Input.Gamepad.ready[events[i].params[0]] = false; break; // param[0]: gamepad
- case INPUT_GAMEPAD_BUTTON_UP: CORE.Input.Gamepad.currentButtonState[events[i].params[0]][events[i].params[1]] = false; break; // param[0]: gamepad, param[1]: button
- case INPUT_GAMEPAD_BUTTON_DOWN: CORE.Input.Gamepad.currentButtonState[events[i].params[0]][events[i].params[1]] = true; break; // param[0]: gamepad, param[1]: button
- case INPUT_GAMEPAD_AXIS_MOTION: // param[0]: gamepad, param[1]: axis, param[2]: delta
- {
- CORE.Input.Gamepad.axisState[events[i].params[0]][events[i].params[1]] = ((float)events[i].params[2]/32768.0f);
- } break;
- case INPUT_GESTURE: GESTURES.current = events[i].params[0]; break; // param[0]: gesture (enum Gesture) -> rgestures.h: GESTURES.current
+ // Window events recording
+ //-------------------------------------------------------------------------------------
+ // TODO.
+ //-------------------------------------------------------------------------------------
- // Window events
- case WINDOW_CLOSE: CORE.Window.shouldClose = true; break;
- case WINDOW_MAXIMIZE: MaximizeWindow(); break;
- case WINDOW_MINIMIZE: MinimizeWindow(); break;
- case WINDOW_RESIZE: SetWindowSize(events[i].params[0], events[i].params[1]); break;
-
- // Custom events
- case ACTION_TAKE_SCREENSHOT:
- {
- TakeScreenshot(TextFormat("screenshot%03i.png", screenshotCounter));
- screenshotCounter++;
- } break;
- case ACTION_SETTARGETFPS: SetTargetFPS(events[i].params[0]); break;
- default: break;
- }
- }
- }
+ // Custom actions events recording
+ //-------------------------------------------------------------------------------------
+ // TODO.
+ //-------------------------------------------------------------------------------------
}
#endif
diff --git a/src/rcore.h b/src/rcore.h
index 1127585a0..a6955f8cc 100644
--- a/src/rcore.h
+++ b/src/rcore.h
@@ -89,6 +89,10 @@
#define MAX_DECOMPRESSION_SIZE 64 // Maximum size allocated for decompression in MB
#endif
+#ifndef MAX_AUTOMATION_EVENTS
+ #define MAX_AUTOMATION_EVENTS 16384 // Maximum number of automation events to record
+#endif
+
// Flags operation macros
#define FLAG_SET(n, f) ((n) |= (f))
#define FLAG_CLEAR(n, f) ((n) &= ~(f))
diff --git a/src/rlgl.h b/src/rlgl.h
index e38642ec9..7c93bf929 100644
--- a/src/rlgl.h
+++ b/src/rlgl.h
@@ -803,7 +803,7 @@ RLAPI void rlLoadDrawQuad(void); // Load and draw a quad
#if defined(GRAPHICS_API_OPENGL_ES2)
// NOTE: OpenGL ES 2.0 can be enabled on PLATFORM_DESKTOP,
// in that case, functions are loaded from a custom glad for OpenGL ES 2.0
- #if defined(PLATFORM_DESKTOP)
+ #if defined(PLATFORM_DESKTOP) || defined(PLATFORM_DESKTOP_SDL)
#define GLAD_GLES2_IMPLEMENTATION
#include "external/glad_gles2.h"
#else
@@ -2248,7 +2248,7 @@ void rlLoadExtensions(void *loader)
// RLGL.ExtSupported.maxAnisotropyLevel
#elif defined(GRAPHICS_API_OPENGL_ES2)
- #if defined(PLATFORM_DESKTOP)
+ #if defined(PLATFORM_DESKTOP) || defined(PLATFORM_DESKTOP_SDL)
// TODO: Support OpenGL ES 3.0
if (gladLoadGLES2((GLADloadfunc)loader) == 0) TRACELOG(RL_LOG_WARNING, "GLAD: Cannot load OpenGL ES2.0 functions");
else TRACELOG(RL_LOG_INFO, "GLAD: OpenGL ES 2.0 loaded successfully");
diff --git a/src/rshapes.c b/src/rshapes.c
index de64f1593..e8e533d30 100644
--- a/src/rshapes.c
+++ b/src/rshapes.c
@@ -190,7 +190,7 @@ void DrawLineEx(Vector2 startPos, Vector2 endPos, float thick, Color color)
if ((length > 0) && (thick > 0))
{
float scale = thick/(2*length);
-
+
Vector2 radius = { -scale*delta.y, scale*delta.x };
Vector2 strip[4] = {
{ startPos.x - radius.x, startPos.y - radius.y },
@@ -255,7 +255,7 @@ void DrawLineBezierQuad(Vector2 startPos, Vector2 endPos, Vector2 controlPos, fl
for (int i = 1; i <= SPLINE_LINE_DIVISIONS; i++)
{
t = step*i;
-
+
float a = powf(1.0f - t, 2);
float b = 2.0f*(1.0f - t)*t;
float c = powf(t, 2);
@@ -301,7 +301,7 @@ void DrawLineBezierCubic(Vector2 startPos, Vector2 endPos, Vector2 startControlP
for (int i = 1; i <= SPLINE_LINE_DIVISIONS; i++)
{
t = step*i;
-
+
float a = powf(1.0f - t, 3);
float b = 3.0f*powf(1.0f - t, 2)*t;
float c = 3.0f*(1.0f - t)*powf(t, 2);
diff --git a/src/rtext.c b/src/rtext.c
index 5b43bfb92..b83eb171b 100644
--- a/src/rtext.c
+++ b/src/rtext.c
@@ -1349,7 +1349,7 @@ unsigned int TextLength(const char *text)
if (text != NULL)
{
// NOTE: Alternative: use strlen(text)
-
+
while (*text++) length++;
}
@@ -1418,7 +1418,7 @@ int TextCopy(char *dst, const char *src)
if ((src != NULL) && (dst != NULL))
{
// NOTE: Alternative: use strcpy(dst, src)
-
+
while (*src != '\0')
{
*dst = *src;
@@ -1463,7 +1463,7 @@ const char *TextSubtext(const char *text, int position, int length)
}
if (length >= textLength) length = textLength;
-
+
// NOTE: Alternative: memcpy(buffer, text + position, length)
for (int c = 0 ; c < length ; c++)