Merge branch 'raysan5:master' into fix_zoom
This commit is contained in:
commit
bb4314c863
19 changed files with 1459 additions and 460 deletions
326
examples/core/core_automation_events.c
Normal file
326
examples/core/core_automation_events.c
Normal file
|
|
@ -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;
|
||||||
|
}
|
||||||
390
projects/VS2022/examples/core_automation_events.vcxproj
Normal file
390
projects/VS2022/examples/core_automation_events.vcxproj
Normal file
|
|
@ -0,0 +1,390 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup Label="ProjectConfigurations">
|
||||||
|
<ProjectConfiguration Include="Debug.DLL|Win32">
|
||||||
|
<Configuration>Debug.DLL</Configuration>
|
||||||
|
<Platform>Win32</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="Debug.DLL|x64">
|
||||||
|
<Configuration>Debug.DLL</Configuration>
|
||||||
|
<Platform>x64</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="Debug|Win32">
|
||||||
|
<Configuration>Debug</Configuration>
|
||||||
|
<Platform>Win32</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="Debug|x64">
|
||||||
|
<Configuration>Debug</Configuration>
|
||||||
|
<Platform>x64</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="Release.DLL|Win32">
|
||||||
|
<Configuration>Release.DLL</Configuration>
|
||||||
|
<Platform>Win32</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="Release.DLL|x64">
|
||||||
|
<Configuration>Release.DLL</Configuration>
|
||||||
|
<Platform>x64</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="Release|Win32">
|
||||||
|
<Configuration>Release</Configuration>
|
||||||
|
<Platform>Win32</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="Release|x64">
|
||||||
|
<Configuration>Release</Configuration>
|
||||||
|
<Platform>x64</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Label="Globals">
|
||||||
|
<ProjectGuid>{7AF97D44-707E-48DC-81CB-C9D8D7C9ED26}</ProjectGuid>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<RootNamespace>core_automation_events</RootNamespace>
|
||||||
|
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
|
||||||
|
<ProjectName>core_automation_events</ProjectName>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
|
<UseDebugLibraries>true</UseDebugLibraries>
|
||||||
|
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
|
<UseDebugLibraries>true</UseDebugLibraries>
|
||||||
|
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug.DLL|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
|
<UseDebugLibraries>true</UseDebugLibraries>
|
||||||
|
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug.DLL|x64'" Label="Configuration">
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
|
<UseDebugLibraries>true</UseDebugLibraries>
|
||||||
|
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
|
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
|
||||||
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
|
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
|
||||||
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release.DLL|Win32'" Label="Configuration">
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
|
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
|
||||||
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release.DLL|x64'" Label="Configuration">
|
||||||
|
<ConfigurationType>Application</ConfigurationType>
|
||||||
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
|
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
|
||||||
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||||
|
<ImportGroup Label="ExtensionSettings">
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Label="Shared">
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug.DLL|Win32'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug.DLL|x64'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release.DLL|Win32'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release.DLL|x64'" Label="PropertySheets">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<PropertyGroup Label="UserMacros" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
|
<LinkIncremental>true</LinkIncremental>
|
||||||
|
<OutDir>$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)\</OutDir>
|
||||||
|
<IntDir>$(SolutionDir)\build\$(ProjectName)\obj\$(Platform)\$(Configuration)\</IntDir>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
|
<LinkIncremental>true</LinkIncremental>
|
||||||
|
<OutDir>$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)\</OutDir>
|
||||||
|
<IntDir>$(SolutionDir)\build\$(ProjectName)\obj\$(Platform)\$(Configuration)\</IntDir>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug.DLL|Win32'">
|
||||||
|
<LinkIncremental>true</LinkIncremental>
|
||||||
|
<OutDir>$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)\</OutDir>
|
||||||
|
<IntDir>$(SolutionDir)\build\$(ProjectName)\obj\$(Platform)\$(Configuration)\</IntDir>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug.DLL|x64'">
|
||||||
|
<LinkIncremental>true</LinkIncremental>
|
||||||
|
<OutDir>$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)\</OutDir>
|
||||||
|
<IntDir>$(SolutionDir)\build\$(ProjectName)\obj\$(Platform)\$(Configuration)\</IntDir>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
|
<LinkIncremental>false</LinkIncremental>
|
||||||
|
<OutDir>$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)\</OutDir>
|
||||||
|
<IntDir>$(SolutionDir)\build\$(ProjectName)\obj\$(Platform)\$(Configuration)\</IntDir>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
<LinkIncremental>false</LinkIncremental>
|
||||||
|
<OutDir>$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)\</OutDir>
|
||||||
|
<IntDir>$(SolutionDir)\build\$(ProjectName)\obj\$(Platform)\$(Configuration)\</IntDir>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release.DLL|Win32'">
|
||||||
|
<LinkIncremental>false</LinkIncremental>
|
||||||
|
<OutDir>$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)\</OutDir>
|
||||||
|
<IntDir>$(SolutionDir)\build\$(ProjectName)\obj\$(Platform)\$(Configuration)\</IntDir>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release.DLL|x64'">
|
||||||
|
<LinkIncremental>false</LinkIncremental>
|
||||||
|
<OutDir>$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)\</OutDir>
|
||||||
|
<IntDir>$(SolutionDir)\build\$(ProjectName)\obj\$(Platform)\$(Configuration)\</IntDir>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug.DLL|Win32'">
|
||||||
|
<LocalDebuggerWorkingDirectory>$(SolutionDir)..\..\examples\core</LocalDebuggerWorkingDirectory>
|
||||||
|
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug.DLL|x64'">
|
||||||
|
<LocalDebuggerWorkingDirectory>$(SolutionDir)..\..\examples\core</LocalDebuggerWorkingDirectory>
|
||||||
|
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
|
<LocalDebuggerWorkingDirectory>$(SolutionDir)..\..\examples\core</LocalDebuggerWorkingDirectory>
|
||||||
|
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
|
<LocalDebuggerWorkingDirectory>$(SolutionDir)..\..\examples\core</LocalDebuggerWorkingDirectory>
|
||||||
|
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release.DLL|Win32'">
|
||||||
|
<LocalDebuggerWorkingDirectory>$(SolutionDir)..\..\examples\core</LocalDebuggerWorkingDirectory>
|
||||||
|
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
|
<LocalDebuggerWorkingDirectory>$(SolutionDir)..\..\examples\core</LocalDebuggerWorkingDirectory>
|
||||||
|
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
<LocalDebuggerWorkingDirectory>$(SolutionDir)..\..\examples\core</LocalDebuggerWorkingDirectory>
|
||||||
|
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release.DLL|x64'">
|
||||||
|
<LocalDebuggerWorkingDirectory>$(SolutionDir)..\..\examples\core</LocalDebuggerWorkingDirectory>
|
||||||
|
<DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
|
<ClCompile>
|
||||||
|
<PrecompiledHeader>
|
||||||
|
</PrecompiledHeader>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<Optimization>Disabled</Optimization>
|
||||||
|
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;PLATFORM_DESKTOP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<CompileAs>CompileAsC</CompileAs>
|
||||||
|
<AdditionalIncludeDirectories>$(SolutionDir)..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>Console</SubSystem>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<AdditionalLibraryDirectories>$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\</AdditionalLibraryDirectories>
|
||||||
|
<AdditionalDependencies>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)</AdditionalDependencies>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
|
<ClCompile>
|
||||||
|
<PrecompiledHeader>
|
||||||
|
</PrecompiledHeader>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<Optimization>Disabled</Optimization>
|
||||||
|
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;PLATFORM_DESKTOP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<CompileAs>CompileAsC</CompileAs>
|
||||||
|
<AdditionalIncludeDirectories>$(SolutionDir)..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
|
<AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>Console</SubSystem>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<AdditionalLibraryDirectories>$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\</AdditionalLibraryDirectories>
|
||||||
|
<AdditionalDependencies>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)</AdditionalDependencies>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug.DLL|Win32'">
|
||||||
|
<ClCompile>
|
||||||
|
<PrecompiledHeader>
|
||||||
|
</PrecompiledHeader>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<Optimization>Disabled</Optimization>
|
||||||
|
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;PLATFORM_DESKTOP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<CompileAs>CompileAsC</CompileAs>
|
||||||
|
<AdditionalIncludeDirectories>$(SolutionDir)..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>Console</SubSystem>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<AdditionalLibraryDirectories>$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\</AdditionalLibraryDirectories>
|
||||||
|
<AdditionalDependencies>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)</AdditionalDependencies>
|
||||||
|
</Link>
|
||||||
|
<PostBuildEvent>
|
||||||
|
<Command>xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)"</Command>
|
||||||
|
<Message>Copy Debug DLL to output directory</Message>
|
||||||
|
</PostBuildEvent>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug.DLL|x64'">
|
||||||
|
<ClCompile>
|
||||||
|
<PrecompiledHeader>
|
||||||
|
</PrecompiledHeader>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<Optimization>Disabled</Optimization>
|
||||||
|
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;PLATFORM_DESKTOP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<CompileAs>CompileAsC</CompileAs>
|
||||||
|
<AdditionalIncludeDirectories>$(SolutionDir)..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>Console</SubSystem>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<AdditionalLibraryDirectories>$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\</AdditionalLibraryDirectories>
|
||||||
|
<AdditionalDependencies>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)</AdditionalDependencies>
|
||||||
|
</Link>
|
||||||
|
<PostBuildEvent>
|
||||||
|
<Command>xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)"</Command>
|
||||||
|
<Message>Copy Debug DLL to output directory</Message>
|
||||||
|
</PostBuildEvent>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<PrecompiledHeader>
|
||||||
|
</PrecompiledHeader>
|
||||||
|
<Optimization>MaxSpeed</Optimization>
|
||||||
|
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||||
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
|
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);PLATFORM_DESKTOP</PreprocessorDefinitions>
|
||||||
|
<AdditionalIncludeDirectories>$(SolutionDir)..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
|
<CompileAs>CompileAsC</CompileAs>
|
||||||
|
<RemoveUnreferencedCodeData>true</RemoveUnreferencedCodeData>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>Console</SubSystem>
|
||||||
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<AdditionalDependencies>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)</AdditionalDependencies>
|
||||||
|
<AdditionalLibraryDirectories>$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\</AdditionalLibraryDirectories>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<PrecompiledHeader>
|
||||||
|
</PrecompiledHeader>
|
||||||
|
<Optimization>MaxSpeed</Optimization>
|
||||||
|
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||||
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
|
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);PLATFORM_DESKTOP</PreprocessorDefinitions>
|
||||||
|
<AdditionalIncludeDirectories>$(SolutionDir)..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
|
<CompileAs>CompileAsC</CompileAs>
|
||||||
|
<RemoveUnreferencedCodeData>true</RemoveUnreferencedCodeData>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>Console</SubSystem>
|
||||||
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<AdditionalDependencies>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)</AdditionalDependencies>
|
||||||
|
<AdditionalLibraryDirectories>$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\</AdditionalLibraryDirectories>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release.DLL|Win32'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<PrecompiledHeader>
|
||||||
|
</PrecompiledHeader>
|
||||||
|
<Optimization>MaxSpeed</Optimization>
|
||||||
|
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||||
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
|
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);PLATFORM_DESKTOP</PreprocessorDefinitions>
|
||||||
|
<AdditionalIncludeDirectories>$(SolutionDir)..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
|
<CompileAs>CompileAsC</CompileAs>
|
||||||
|
<RemoveUnreferencedCodeData>true</RemoveUnreferencedCodeData>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>Console</SubSystem>
|
||||||
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<AdditionalDependencies>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)</AdditionalDependencies>
|
||||||
|
<AdditionalLibraryDirectories>$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\</AdditionalLibraryDirectories>
|
||||||
|
</Link>
|
||||||
|
<PostBuildEvent>
|
||||||
|
<Command>xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)"</Command>
|
||||||
|
</PostBuildEvent>
|
||||||
|
<PostBuildEvent>
|
||||||
|
<Message>Copy Release DLL to output directory</Message>
|
||||||
|
</PostBuildEvent>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release.DLL|x64'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<PrecompiledHeader>
|
||||||
|
</PrecompiledHeader>
|
||||||
|
<Optimization>MaxSpeed</Optimization>
|
||||||
|
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||||
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
|
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);PLATFORM_DESKTOP</PreprocessorDefinitions>
|
||||||
|
<AdditionalIncludeDirectories>$(SolutionDir)..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
|
<CompileAs>CompileAsC</CompileAs>
|
||||||
|
<RemoveUnreferencedCodeData>true</RemoveUnreferencedCodeData>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>Console</SubSystem>
|
||||||
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<AdditionalDependencies>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)</AdditionalDependencies>
|
||||||
|
<AdditionalLibraryDirectories>$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\</AdditionalLibraryDirectories>
|
||||||
|
</Link>
|
||||||
|
<PostBuildEvent>
|
||||||
|
<Command>xcopy /y /d "$(SolutionDir)\build\raylib\bin\$(Platform)\$(Configuration)\raylib.dll" "$(SolutionDir)\build\$(ProjectName)\bin\$(Platform)\$(Configuration)"</Command>
|
||||||
|
</PostBuildEvent>
|
||||||
|
<PostBuildEvent>
|
||||||
|
<Message>Copy Release DLL to output directory</Message>
|
||||||
|
</PostBuildEvent>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="..\..\..\examples\core\core_automation_events.c" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ResourceCompile Include="..\..\..\src\raylib.rc" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\raylib\raylib.vcxproj">
|
||||||
|
<Project>{e89d61ac-55de-4482-afd4-df7242ebc859}</Project>
|
||||||
|
</ProjectReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
|
<ImportGroup Label="ExtensionTargets">
|
||||||
|
</ImportGroup>
|
||||||
|
</Project>
|
||||||
|
|
@ -273,6 +273,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "audio_sound_multi", "exampl
|
||||||
EndProject
|
EndProject
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core_2d_camera_split_screen", "examples\core_2d_camera_split_screen.vcxproj", "{CC62F7DB-D089-4677-8575-CAB7A7815C43}"
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core_2d_camera_split_screen", "examples\core_2d_camera_split_screen.vcxproj", "{CC62F7DB-D089-4677-8575-CAB7A7815C43}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core_automation_events", "examples\core_automation_events.vcxproj", "{7AF97D44-707E-48DC-81CB-C9D8D7C9ED26}"
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug.DLL|x64 = Debug.DLL|x64
|
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|x64.Build.0 = Release|x64
|
||||||
{CC62F7DB-D089-4677-8575-CAB7A7815C43}.Release|x86.ActiveCfg = Release|Win32
|
{CC62F7DB-D089-4677-8575-CAB7A7815C43}.Release|x86.ActiveCfg = Release|Win32
|
||||||
{CC62F7DB-D089-4677-8575-CAB7A7815C43}.Release|x86.Build.0 = 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
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
|
@ -2435,6 +2453,7 @@ Global
|
||||||
{3755E9F4-CB48-4EC3-B561-3B85964EBDEF} = {5317807F-61D4-4E0F-B6DC-2D9F12621ED9}
|
{3755E9F4-CB48-4EC3-B561-3B85964EBDEF} = {5317807F-61D4-4E0F-B6DC-2D9F12621ED9}
|
||||||
{F81C5819-85B4-4D2E-B6DC-104A7634461B} = {CC132A4D-D081-4C26-BFB9-AB11984054F8}
|
{F81C5819-85B4-4D2E-B6DC-104A7634461B} = {CC132A4D-D081-4C26-BFB9-AB11984054F8}
|
||||||
{CC62F7DB-D089-4677-8575-CAB7A7815C43} = {6C82BAAE-BDDF-457D-8FA8-7E2490B07035}
|
{CC62F7DB-D089-4677-8575-CAB7A7815C43} = {6C82BAAE-BDDF-457D-8FA8-7E2490B07035}
|
||||||
|
{7AF97D44-707E-48DC-81CB-C9D8D7C9ED26} = {6C82BAAE-BDDF-457D-8FA8-7E2490B07035}
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||||
SolutionGuid = {E926C768-6307-4423-A1EC-57E95B1FAB29}
|
SolutionGuid = {E926C768-6307-4423-A1EC-57E95B1FAB29}
|
||||||
|
|
|
||||||
|
|
@ -63,7 +63,7 @@
|
||||||
// Support CompressData() and DecompressData() functions
|
// Support CompressData() and DecompressData() functions
|
||||||
#define SUPPORT_COMPRESSION_API 1
|
#define SUPPORT_COMPRESSION_API 1
|
||||||
// Support automatic generated events, loading and recording of those events when required
|
// 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
|
// Support custom frame control, only for advance users
|
||||||
// By default EndDrawing() does this job: draws everything + SwapScreenBuffer() + manage frame timing + PollInputEvents()
|
// 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
|
// 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_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
|
// Module: rlgl - Configuration values
|
||||||
|
|
|
||||||
175
src/external/miniaudio.h
vendored
175
src/external/miniaudio.h
vendored
|
|
@ -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.
|
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
|
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.
|
// 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;
|
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
|
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
|
```c
|
||||||
ma_resource_manager_data_source_init(pResourceManager, "my_file", ..., &myDataBuffer0); // Refcount = 1. Initial load.
|
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_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
|
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:
|
example below:
|
||||||
|
|
||||||
```c
|
```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()`.
|
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
|
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.
|
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
|
```c
|
||||||
ma_audio_buffer_config config = ma_audio_buffer_config_init(
|
ma_audio_buffer_config config = ma_audio_buffer_config_init(
|
||||||
|
|
@ -3716,7 +3723,7 @@ extern "C" {
|
||||||
|
|
||||||
#define MA_VERSION_MAJOR 0
|
#define MA_VERSION_MAJOR 0
|
||||||
#define MA_VERSION_MINOR 11
|
#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)
|
#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__)
|
#if defined(_MSC_VER) && !defined(__clang__)
|
||||||
|
|
@ -4267,7 +4274,7 @@ typedef enum
|
||||||
ma_standard_sample_rate_192000 = 192000,
|
ma_standard_sample_rate_192000 = 192000,
|
||||||
|
|
||||||
ma_standard_sample_rate_16000 = 16000, /* Extreme lows */
|
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_8000 = 8000,
|
||||||
|
|
||||||
ma_standard_sample_rate_352800 = 352800, /* Extreme highs */
|
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.
|
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
|
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
|
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.
|
Do not call this in any callback.
|
||||||
|
|
||||||
This will be called implicitly by `ma_device_uninit()`.
|
|
||||||
|
|
||||||
|
|
||||||
See Also
|
See Also
|
||||||
--------
|
--------
|
||||||
|
|
@ -10171,7 +10176,7 @@ MA_API ma_noise_config ma_noise_config_init(ma_format format, ma_uint32 channels
|
||||||
|
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
ma_data_source_vtable ds;
|
ma_data_source_base ds;
|
||||||
ma_noise_config config;
|
ma_noise_config config;
|
||||||
ma_lcg lcg;
|
ma_lcg lcg;
|
||||||
union
|
union
|
||||||
|
|
@ -10569,7 +10574,7 @@ typedef struct
|
||||||
/*
|
/*
|
||||||
Extended processing callback. This callback is used for effects that process input and output
|
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
|
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
|
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`.
|
`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_abs(x) (((x) > 0) ? (x) : -(x))
|
||||||
#define ma_clamp(x, lo, hi) (ma_max(lo, ma_min(x, hi)))
|
#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_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_align_64(x) ma_align(x, 8)
|
||||||
|
|
||||||
#define ma_buffer_frame_capacity(buffer, channels, format) (sizeof(buffer) / ma_get_bytes_per_sample(format) / (channels))
|
#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. */
|
/* 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);
|
length = vsnprintf(pFormattedMessageStack, sizeof(pFormattedMessageStack), pFormat, args);
|
||||||
if (length < 0) {
|
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)) {
|
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)
|
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) {
|
if (result != 0) {
|
||||||
return ma_result_from_errno(result);
|
return ma_result_from_errno(result);
|
||||||
}
|
}
|
||||||
|
|
@ -18452,7 +18465,7 @@ Timing
|
||||||
*******************************************************************************/
|
*******************************************************************************/
|
||||||
#if defined(MA_WIN32) && !defined(MA_POSIX)
|
#if defined(MA_WIN32) && !defined(MA_POSIX)
|
||||||
static LARGE_INTEGER g_ma_TimerFrequency; /* <-- Initialized to zero since it's static. */
|
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;
|
LARGE_INTEGER counter;
|
||||||
|
|
||||||
|
|
@ -18464,7 +18477,7 @@ Timing
|
||||||
pTimer->counter = counter.QuadPart;
|
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;
|
LARGE_INTEGER counter;
|
||||||
if (!QueryPerformanceCounter(&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));
|
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));
|
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));
|
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));
|
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));
|
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)
|
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)
|
#if defined(MA_WIN32)
|
||||||
GUID MA_GUID_KSDATAFORMAT_SUBTYPE_PCM = {0x00000001, 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}};
|
||||||
GUID MA_GUID_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT = {0x00000003, 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}};
|
||||||
/*GUID MA_GUID_KSDATAFORMAT_SUBTYPE_ALAW = {0x00000006, 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}};*/
|
||||||
/*GUID MA_GUID_KSDATAFORMAT_SUBTYPE_MULAW = {0x00000007, 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
|
#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. */
|
/* At this point we should be able to loop back to the start of the loop and try retrieving a data buffer again. */
|
||||||
} else {
|
} 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);
|
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);
|
result = ma_result_from_HRESULT(hr);
|
||||||
break;
|
break;
|
||||||
|
|
@ -34834,7 +34853,7 @@ static ma_result ma_context_init__coreaudio(ma_context* pContext, const ma_conte
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !defined(MA_NO_RUNTIME_LINKING) && !defined(MA_APPLE_MOBILE)
|
#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) {
|
if (pContext->coreaudio.hCoreFoundation == NULL) {
|
||||||
return MA_API_NOT_FOUND;
|
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.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) {
|
if (pContext->coreaudio.hCoreAudio == NULL) {
|
||||||
ma_dlclose(ma_context_get_log(pContext), pContext->coreaudio.hCoreFoundation);
|
ma_dlclose(ma_context_get_log(pContext), pContext->coreaudio.hCoreFoundation);
|
||||||
return MA_API_NOT_FOUND;
|
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
|
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.
|
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) {
|
if (pContext->coreaudio.hAudioUnit == NULL) {
|
||||||
ma_dlclose(ma_context_get_log(pContext), pContext->coreaudio.hCoreAudio);
|
ma_dlclose(ma_context_get_log(pContext), pContext->coreaudio.hCoreAudio);
|
||||||
ma_dlclose(ma_context_get_log(pContext), pContext->coreaudio.hCoreFoundation);
|
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) {
|
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. */
|
/* Couldn't find the required symbols in AudioUnit, so fall back to AudioToolbox. */
|
||||||
ma_dlclose(ma_context_get_log(pContext), pContext->coreaudio.hAudioUnit);
|
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) {
|
if (pContext->coreaudio.hAudioUnit == NULL) {
|
||||||
ma_dlclose(ma_context_get_log(pContext), pContext->coreaudio.hCoreAudio);
|
ma_dlclose(ma_context_get_log(pContext), pContext->coreaudio.hCoreAudio);
|
||||||
ma_dlclose(ma_context_get_log(pContext), pContext->coreaudio.hCoreFoundation);
|
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. */
|
/* 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) {
|
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 getUserMediaResult = 0;
|
||||||
var audioWorklet = emscriptenGetAudioObject($0);
|
var audioWorklet = emscriptenGetAudioObject($0);
|
||||||
var audioContext = emscriptenGetAudioObject($1);
|
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 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) {
|
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 audioWorklet = emscriptenGetAudioObject($0);
|
||||||
var audioContext = emscriptenGetAudioObject($1);
|
var audioContext = emscriptenGetAudioObject($1);
|
||||||
audioWorklet.connect(audioContext.destination);
|
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. */
|
/* First thing we need is an AudioContext. */
|
||||||
var audioContextOptions = {};
|
var audioContextOptions = {};
|
||||||
if (deviceType == window.miniaudio.device_type.playback) {
|
if (deviceType == window.miniaudio.device_type.playback && sampleRate != 0) {
|
||||||
audioContextOptions.sampleRate = sampleRate;
|
audioContextOptions.sampleRate = sampleRate;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -40890,6 +40909,11 @@ static ma_thread_result MA_THREADCALL ma_worker_thread(void* pData)
|
||||||
ma_device__on_notification_stopped(pDevice);
|
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. */
|
/* 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_device__set_state(pDevice, ma_device_state_stopped);
|
||||||
ma_event_signal(&pDevice->stopEvent);
|
ma_event_signal(&pDevice->stopEvent);
|
||||||
|
|
@ -42100,10 +42124,23 @@ MA_API void ma_device_uninit(ma_device* pDevice)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
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. */
|
/* 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)) {
|
if (ma_device_is_started(pDevice)) {
|
||||||
ma_device_stop(pDevice);
|
ma_device_stop(pDevice);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Putting the device into an uninitialized state will make the worker thread return. */
|
/* Putting the device into an uninitialized state will make the worker thread return. */
|
||||||
ma_device__set_state(pDevice, ma_device_state_uninitialized);
|
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) {
|
for (iFrame = 0; iFrame < unrolledFrameCount; iFrame += 1) {
|
||||||
__m128 in0 = _mm_set1_ps(pFramesIn[iFrame*2 + 0]);
|
__m128 in0 = _mm_set1_ps(pFramesIn[iFrame*2 + 0]);
|
||||||
__m128 in1 = _mm_set1_ps(pFramesIn[iFrame*2 + 1]);
|
__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. */
|
/* 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]);
|
__m128 in1 = _mm_set1_ps(pFramesIn[iFrame*2 + 1]);
|
||||||
|
|
||||||
_mm_storeu_ps(&pFramesOut[iFrame*12 + 0], in0);
|
_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);
|
_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_XSTRINGIFY(x) MA_DR_WAV_STRINGIFY(x)
|
||||||
#define MA_DR_WAV_VERSION_MAJOR 0
|
#define MA_DR_WAV_VERSION_MAJOR 0
|
||||||
#define MA_DR_WAV_VERSION_MINOR 13
|
#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)
|
#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 <stddef.h>
|
#include <stddef.h>
|
||||||
#define MA_DR_WAVE_FORMAT_PCM 0x1
|
#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. */
|
/* Probably no implementation for loading from a file path. Use miniaudio's file IO instead. */
|
||||||
result = ma_decoder_init_vfs(NULL, pFilePath, pConfig, pDecoder);
|
result = ma_decoder_init_vfs(NULL, pFilePath, pConfig, pDecoder);
|
||||||
if (result != MA_SUCCESS) {
|
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. */
|
/* 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);
|
result = ma_decoder_init_vfs_w(NULL, pFilePath, pConfig, pDecoder);
|
||||||
if (result != MA_SUCCESS) {
|
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;
|
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
|
the node to ensure there's no holes where ma_fence_wait() could prematurely return before the
|
||||||
data buffer has completed initialization.
|
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) {
|
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 {
|
} else {
|
||||||
pNodeBase->pOutputBuses = pNodeBase->_outputBuses;
|
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
|
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.
|
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
|
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.
|
the stop time.
|
||||||
*/
|
*/
|
||||||
timeOffsetBeg = (globalTimeBeg < startTime) ? (ma_uint32)(globalTimeEnd - startTime) : 0;
|
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)) {
|
if (fadeStartOffsetInFrames == (ma_int64)(~(ma_uint64)0)) {
|
||||||
fadeStartOffsetInFrames = 0;
|
fadeStartOffsetInFrames = 0;
|
||||||
} else {
|
} 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);
|
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;
|
*pOuterGain = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (pEngine == NULL || listenerIndex >= pEngine->listenerCount) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
ma_spatializer_listener_get_cone(&pEngine->listeners[listenerIndex], pInnerAngleInRadians, pOuterAngleInRadians, pOuterGain);
|
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. */
|
/* 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;
|
return MA_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
@ -76476,6 +76517,10 @@ MA_API void ma_sound_get_cone(const ma_sound* pSound, float* pInnerAngleInRadian
|
||||||
*pOuterGain = 0;
|
*pOuterGain = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (pSound == NULL) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
ma_spatializer_get_cone(&pSound->engineNode.spatializer, pInnerAngleInRadians, pOuterAngleInRadians, pOuterGain);
|
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_API ma_result ma_sound_get_cursor_in_pcm_frames(ma_sound* pSound, ma_uint64* pCursor)
|
||||||
{
|
{
|
||||||
|
ma_uint64 seekTarget;
|
||||||
|
|
||||||
if (pSound == NULL) {
|
if (pSound == NULL) {
|
||||||
return MA_INVALID_ARGS;
|
return MA_INVALID_ARGS;
|
||||||
}
|
}
|
||||||
|
|
@ -76766,8 +76813,14 @@ MA_API ma_result ma_sound_get_cursor_in_pcm_frames(ma_sound* pSound, ma_uint64*
|
||||||
return MA_INVALID_OPERATION;
|
return MA_INVALID_OPERATION;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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);
|
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)
|
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)
|
MA_API ma_result ma_sound_get_cursor_in_seconds(ma_sound* pSound, float* pCursor)
|
||||||
{
|
{
|
||||||
if (pSound == NULL) {
|
ma_result result;
|
||||||
return MA_INVALID_ARGS;
|
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. */
|
result = ma_sound_get_cursor_in_pcm_frames(pSound, &cursorInPCMFrames);
|
||||||
if (pSound->pDataSource == NULL) {
|
if (result != MA_SUCCESS) {
|
||||||
return MA_INVALID_OPERATION;
|
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)
|
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_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_offset_ptr(p, offset) (((ma_uint8*)(p)) + (offset))
|
||||||
#define MA_DR_WAV_MAX_SIMD_VECTOR_SIZE 32
|
#define MA_DR_WAV_MAX_SIMD_VECTOR_SIZE 32
|
||||||
#define MA_DR_WAV_INT64_MIN ((ma_int64)0x80000000 << 32)
|
#define MA_DR_WAV_INT64_MIN ((ma_int64) ((ma_uint64)0x80000000 << 32))
|
||||||
#define MA_DR_WAV_INT64_MAX ((((ma_int64)0x7FFFFFFF) << 32) | 0xFFFFFFFF)
|
#define MA_DR_WAV_INT64_MAX ((ma_int64)(((ma_uint64)0x7FFFFFFF << 32) | 0xFFFFFFFF))
|
||||||
#if defined(_MSC_VER) && _MSC_VER >= 1400
|
#if defined(_MSC_VER) && _MSC_VER >= 1400
|
||||||
#define MA_DR_WAV_HAS_BYTESWAP16_INTRINSIC
|
#define MA_DR_WAV_HAS_BYTESWAP16_INTRINSIC
|
||||||
#define MA_DR_WAV_HAS_BYTESWAP32_INTRINSIC
|
#define MA_DR_WAV_HAS_BYTESWAP32_INTRINSIC
|
||||||
|
|
|
||||||
5
src/external/tinyobj_loader_c.h
vendored
5
src/external/tinyobj_loader_c.h
vendored
|
|
@ -1269,6 +1269,11 @@ int tinyobj_parse_obj(tinyobj_attrib_t *attrib, tinyobj_shape_t **shapes,
|
||||||
if (is_line_ending(buf, i, end_idx)) {
|
if (is_line_ending(buf, i, end_idx)) {
|
||||||
line_infos[line_no].pos = prev_pos;
|
line_infos[line_no].pos = prev_pos;
|
||||||
line_infos[line_no].len = i - 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;
|
prev_pos = i + 1;
|
||||||
line_no++;
|
line_no++;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -751,13 +751,19 @@ int GetCurrentMonitor(void)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
int x = 0;
|
int closestDist = 0x7FFFFFFF;
|
||||||
int y = 0;
|
|
||||||
|
|
||||||
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++)
|
for (int i = 0; i < monitorCount; i++)
|
||||||
{
|
{
|
||||||
|
// Monitor top-left position
|
||||||
int mx = 0;
|
int mx = 0;
|
||||||
int my = 0;
|
int my = 0;
|
||||||
|
|
||||||
|
|
@ -767,17 +773,46 @@ int GetCurrentMonitor(void)
|
||||||
|
|
||||||
if (mode)
|
if (mode)
|
||||||
{
|
{
|
||||||
const int width = mode->width;
|
const int right = mx + mode->width - 1;
|
||||||
const int height = mode->height;
|
const int bottom = my + mode->height - 1;
|
||||||
|
|
||||||
if ((x >= mx) &&
|
if ((wcx >= mx) &&
|
||||||
(x < (mx + width)) &&
|
(wcx <= right) &&
|
||||||
(y >= my) &&
|
(wcy >= my) &&
|
||||||
(y < (my + height)))
|
(wcy <= bottom))
|
||||||
{
|
{
|
||||||
index = i;
|
index = i;
|
||||||
break;
|
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");
|
else TRACELOG(LOG_WARNING, "GLFW: Failed to find video mode for selected monitor");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -999,6 +999,33 @@ void PollInputEvents(void)
|
||||||
{
|
{
|
||||||
case SDL_QUIT: CORE.Window.shouldClose = true; break;
|
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...)
|
// Window events are also polled (Minimized, maximized, close...)
|
||||||
case SDL_WINDOWEVENT:
|
case SDL_WINDOWEVENT:
|
||||||
{
|
{
|
||||||
|
|
@ -1247,6 +1274,8 @@ int InitPlatform(void)
|
||||||
SDL_Joystick *gamepad = SDL_JoystickOpen(0);
|
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());
|
//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
|
// Initialize timming system
|
||||||
|
|
|
||||||
|
|
@ -864,12 +864,12 @@ int InitPlatform(void)
|
||||||
glfwSetCursorEnterCallback(platform.handle, CursorEnterCallback);
|
glfwSetCursorEnterCallback(platform.handle, CursorEnterCallback);
|
||||||
|
|
||||||
glfwMakeContextCurrent(platform.handle);
|
glfwMakeContextCurrent(platform.handle);
|
||||||
result = glfwGetError(NULL);
|
result = true; // TODO: WARNING: glfwGetError(NULL); symbol can not be found in Web
|
||||||
|
|
||||||
// Check context activation
|
// 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 fbWidth = CORE.Window.screen.width;
|
||||||
int fbHeight = CORE.Window.screen.height;
|
int fbHeight = CORE.Window.screen.height;
|
||||||
|
|
|
||||||
24
src/raylib.h
24
src/raylib.h
|
|
@ -506,6 +506,20 @@ typedef struct FilePathList {
|
||||||
char **paths; // Filepaths entries
|
char **paths; // Filepaths entries
|
||||||
} FilePathList;
|
} 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
|
// 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 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()
|
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)
|
// Input Handling Functions (Module: core)
|
||||||
//------------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------------
|
||||||
|
|
|
||||||
751
src/rcore.c
751
src/rcore.c
|
|
@ -48,8 +48,8 @@
|
||||||
* provided by stb_image and stb_image_write libraries, so, those libraries must be enabled on textures module
|
* provided by stb_image and stb_image_write libraries, so, those libraries must be enabled on textures module
|
||||||
* for linkage
|
* for linkage
|
||||||
*
|
*
|
||||||
* #define SUPPORT_EVENTS_AUTOMATION
|
* #define SUPPORT_AUTOMATION_EVENTS
|
||||||
* Support automatic generated events, loading and recording of those events when required
|
* Support automatic events recording and playing, useful for automated testing systems or AI based game playing
|
||||||
*
|
*
|
||||||
* DEPENDENCIES:
|
* DEPENDENCIES:
|
||||||
* raymath - 3D math functionality (Vector2, Vector3, Matrix, Quaternion)
|
* raymath - 3D math functionality (Vector2, Vector3, Matrix, Quaternion)
|
||||||
|
|
@ -183,9 +183,8 @@ bool gifRecording = false; // GIF recording state
|
||||||
MsfGifState gifState = { 0 }; // MSGIF context state
|
MsfGifState gifState = { 0 }; // MSGIF context state
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(SUPPORT_EVENTS_AUTOMATION)
|
#if defined(SUPPORT_AUTOMATION_EVENTS)
|
||||||
#define MAX_CODE_AUTOMATION_EVENTS 16384
|
// Automation events type
|
||||||
|
|
||||||
typedef enum AutomationEventType {
|
typedef enum AutomationEventType {
|
||||||
EVENT_NONE = 0,
|
EVENT_NONE = 0,
|
||||||
// Input events
|
// Input events
|
||||||
|
|
@ -212,12 +211,12 @@ typedef enum AutomationEventType {
|
||||||
WINDOW_MINIMIZE, // no params
|
WINDOW_MINIMIZE, // no params
|
||||||
WINDOW_RESIZE, // param[0]: width, param[1]: height
|
WINDOW_RESIZE, // param[0]: width, param[1]: height
|
||||||
// Custom events
|
// Custom events
|
||||||
ACTION_TAKE_SCREENSHOT,
|
ACTION_TAKE_SCREENSHOT, // no params
|
||||||
ACTION_SETTARGETFPS
|
ACTION_SETTARGETFPS // param[0]: fps
|
||||||
} AutomationEventType;
|
} AutomationEventType;
|
||||||
|
|
||||||
// Event type
|
// Event type to config events flags
|
||||||
// Used to enable events flags
|
// TODO: Not used at the moment
|
||||||
typedef enum {
|
typedef enum {
|
||||||
EVENT_INPUT_KEYBOARD = 0,
|
EVENT_INPUT_KEYBOARD = 0,
|
||||||
EVENT_INPUT_MOUSE = 1,
|
EVENT_INPUT_MOUSE = 1,
|
||||||
|
|
@ -228,6 +227,7 @@ typedef enum {
|
||||||
EVENT_CUSTOM = 32
|
EVENT_CUSTOM = 32
|
||||||
} EventType;
|
} EventType;
|
||||||
|
|
||||||
|
// Event type name strings, required for export
|
||||||
static const char *autoEventTypeName[] = {
|
static const char *autoEventTypeName[] = {
|
||||||
"EVENT_NONE",
|
"EVENT_NONE",
|
||||||
"INPUT_KEY_UP",
|
"INPUT_KEY_UP",
|
||||||
|
|
@ -255,19 +255,19 @@ static const char *autoEventTypeName[] = {
|
||||||
"ACTION_SETTARGETFPS"
|
"ACTION_SETTARGETFPS"
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
// Automation event (24 bytes)
|
// Automation event (24 bytes)
|
||||||
typedef struct AutomationEvent {
|
// NOTE: Opaque struct, internal to raylib
|
||||||
|
struct AutomationEvent {
|
||||||
unsigned int frame; // Event frame
|
unsigned int frame; // Event frame
|
||||||
unsigned int type; // Event type (AutomationEventType)
|
unsigned int type; // Event type (AutomationEventType)
|
||||||
int params[4]; // Event parameters (if required)
|
int params[4]; // Event parameters (if required)
|
||||||
} AutomationEvent;
|
};
|
||||||
|
*/
|
||||||
|
|
||||||
static AutomationEvent *events = NULL; // Events array
|
static AutomationEventList *currentEventList = NULL; // Current automation events list, set by user, keep internal pointer
|
||||||
static unsigned int eventCount = 0; // Events count
|
static bool automationEventRecording = false; // Recording automation events flag
|
||||||
static bool eventsPlaying = false; // Play events
|
//static short automationEventEnabled = 0b0000001111111111; // TODO: Automation events enabled for recording/playing
|
||||||
static bool eventsRecording = false; // Record events
|
|
||||||
|
|
||||||
//static short eventsEnabled = 0b0000001111111111; // Events enabled for checking
|
|
||||||
#endif
|
#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 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
|
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)
|
#if defined(SUPPORT_AUTOMATION_EVENTS)
|
||||||
static void LoadAutomationEvents(const char *fileName); // Load automation events from file
|
static void RecordAutomationEvent(void); // Record frame events (to internal events array)
|
||||||
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)
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(_WIN32)
|
#if defined(_WIN32)
|
||||||
|
|
@ -485,9 +482,6 @@ void InitWindow(int width, int height, const char *title)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
CORE.Time.frameCounter = 0;
|
CORE.Time.frameCounter = 0;
|
||||||
#if defined(SUPPORT_EVENTS_AUTOMATION)
|
|
||||||
events = (AutomationEvent *)RL_CALLOC(MAX_CODE_AUTOMATION_EVENTS, sizeof(AutomationEvent));
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Initialize random seed
|
// Initialize random seed
|
||||||
SetRandomSeed((unsigned int)time(NULL));
|
SetRandomSeed((unsigned int)time(NULL));
|
||||||
|
|
@ -516,10 +510,6 @@ void CloseWindow(void)
|
||||||
ClosePlatform();
|
ClosePlatform();
|
||||||
//--------------------------------------------------------------
|
//--------------------------------------------------------------
|
||||||
|
|
||||||
#if defined(SUPPORT_EVENTS_AUTOMATION)
|
|
||||||
RL_FREE(events);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
CORE.Window.ready = false;
|
CORE.Window.ready = false;
|
||||||
TRACELOG(LOG_INFO, "Window closed successfully");
|
TRACELOG(LOG_INFO, "Window closed successfully");
|
||||||
}
|
}
|
||||||
|
|
@ -684,34 +674,6 @@ void EndDrawing(void)
|
||||||
}
|
}
|
||||||
#endif
|
#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)
|
#if !defined(SUPPORT_CUSTOM_FRAME_CONTROL)
|
||||||
SwapScreenBuffer(); // Copy back buffer to front buffer (screen)
|
SwapScreenBuffer(); // Copy back buffer to front buffer (screen)
|
||||||
|
|
||||||
|
|
@ -775,16 +737,9 @@ void EndDrawing(void)
|
||||||
}
|
}
|
||||||
#endif // SUPPORT_SCREEN_CAPTURE
|
#endif // SUPPORT_SCREEN_CAPTURE
|
||||||
|
|
||||||
#if defined(SUPPORT_EVENTS_AUTOMATION)
|
#if defined(SUPPORT_AUTOMATION_EVENTS)
|
||||||
// Events recording and playing logic
|
if (automationEventRecording) RecordAutomationEvent(); // Event recording
|
||||||
if (eventsRecording) RecordAutomationEvent(CORE.Time.frameCounter);
|
#endif
|
||||||
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
|
|
||||||
|
|
||||||
CORE.Time.frameCounter++;
|
CORE.Time.frameCounter++;
|
||||||
}
|
}
|
||||||
|
|
@ -2180,6 +2135,243 @@ unsigned char *DecodeDataBase64(const unsigned char *data, int *outputSize)
|
||||||
return decodedData;
|
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 <events_count>\n");
|
||||||
|
byteCount += sprintf(txtData + byteCount, "# e <frame> <event_type> <param0> <param1> <param2> <param3> // <event_type_name>\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
|
// 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);
|
else TRACELOG(LOG_WARNING, "FILEIO: Directory cannot be opened (%s)", basePath);
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(SUPPORT_EVENTS_AUTOMATION)
|
#if defined(SUPPORT_AUTOMATION_EVENTS)
|
||||||
// NOTE: Loading happens over AutomationEvent *events
|
// Automation event recording
|
||||||
// TODO: This system should probably be redesigned
|
// NOTE: Recording is by default done at EndDrawing(), after PollInputEvents()
|
||||||
static void LoadAutomationEvents(const char *fileName)
|
static void RecordAutomationEvent(void)
|
||||||
{
|
{
|
||||||
// Load events file (binary)
|
// Checking events in current frame and save them into currentEventList
|
||||||
/*
|
// TODO: How important is the current frame? Could it be modified?
|
||||||
FILE *repFile = fopen(fileName, "rb");
|
|
||||||
unsigned char fileId[4] = { 0 };
|
|
||||||
|
|
||||||
fread(fileId, 1, 4, repFile);
|
if (currentEventList->count == currentEventList->capacity) return; // Security check
|
||||||
|
|
||||||
if ((fileId[0] == 'r') && (fileId[1] == 'E') && (fileId[2] == 'P') && (fileId[1] == ' '))
|
// Keyboard input events recording
|
||||||
{
|
//-------------------------------------------------------------------------------------
|
||||||
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 <events_count>\n");
|
|
||||||
fprintf(repFile, "# e <frame> <event_type> <param0> <param1> <param2> // <event_type_name>\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)
|
|
||||||
{
|
|
||||||
for (int key = 0; key < MAX_KEYBOARD_KEYS; key++)
|
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])
|
if (CORE.Input.Keyboard.previousKeyState[key] && !CORE.Input.Keyboard.currentKeyState[key])
|
||||||
{
|
{
|
||||||
events[eventCount].frame = frame;
|
currentEventList->events[currentEventList->count].frame = CORE.Time.frameCounter;
|
||||||
events[eventCount].type = INPUT_KEY_UP;
|
currentEventList->events[currentEventList->count].type = INPUT_KEY_UP;
|
||||||
events[eventCount].params[0] = key;
|
currentEventList->events[currentEventList->count].params[0] = key;
|
||||||
events[eventCount].params[1] = 0;
|
currentEventList->events[currentEventList->count].params[1] = 0;
|
||||||
events[eventCount].params[2] = 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]);
|
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]);
|
||||||
eventCount++;
|
currentEventList->count++;
|
||||||
}
|
}
|
||||||
|
|
||||||
// INPUT_KEY_DOWN
|
if (currentEventList->count == currentEventList->capacity) return; // Security check
|
||||||
|
|
||||||
|
// Event type: INPUT_KEY_DOWN
|
||||||
if (CORE.Input.Keyboard.currentKeyState[key])
|
if (CORE.Input.Keyboard.currentKeyState[key])
|
||||||
{
|
{
|
||||||
events[eventCount].frame = frame;
|
currentEventList->events[currentEventList->count].frame = CORE.Time.frameCounter;
|
||||||
events[eventCount].type = INPUT_KEY_DOWN;
|
currentEventList->events[currentEventList->count].type = INPUT_KEY_DOWN;
|
||||||
events[eventCount].params[0] = key;
|
currentEventList->events[currentEventList->count].params[0] = key;
|
||||||
events[eventCount].params[1] = 0;
|
currentEventList->events[currentEventList->count].params[1] = 0;
|
||||||
events[eventCount].params[2] = 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]);
|
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]);
|
||||||
eventCount++;
|
currentEventList->count++;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (currentEventList->count == currentEventList->capacity) return; // Security check
|
||||||
|
}
|
||||||
|
//-------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
// Mouse input currentEventList->events recording
|
||||||
|
//-------------------------------------------------------------------------------------
|
||||||
for (int button = 0; button < MAX_MOUSE_BUTTONS; button++)
|
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])
|
if (CORE.Input.Mouse.previousButtonState[button] && !CORE.Input.Mouse.currentButtonState[button])
|
||||||
{
|
{
|
||||||
events[eventCount].frame = frame;
|
currentEventList->events[currentEventList->count].frame = CORE.Time.frameCounter;
|
||||||
events[eventCount].type = INPUT_MOUSE_BUTTON_UP;
|
currentEventList->events[currentEventList->count].type = INPUT_MOUSE_BUTTON_UP;
|
||||||
events[eventCount].params[0] = button;
|
currentEventList->events[currentEventList->count].params[0] = button;
|
||||||
events[eventCount].params[1] = 0;
|
currentEventList->events[currentEventList->count].params[1] = 0;
|
||||||
events[eventCount].params[2] = 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]);
|
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]);
|
||||||
eventCount++;
|
currentEventList->count++;
|
||||||
}
|
}
|
||||||
|
|
||||||
// INPUT_MOUSE_BUTTON_DOWN
|
if (currentEventList->count == currentEventList->capacity) return; // Security check
|
||||||
|
|
||||||
|
// Event type: INPUT_MOUSE_BUTTON_DOWN
|
||||||
if (CORE.Input.Mouse.currentButtonState[button])
|
if (CORE.Input.Mouse.currentButtonState[button])
|
||||||
{
|
{
|
||||||
events[eventCount].frame = frame;
|
currentEventList->events[currentEventList->count].frame = CORE.Time.frameCounter;
|
||||||
events[eventCount].type = INPUT_MOUSE_BUTTON_DOWN;
|
currentEventList->events[currentEventList->count].type = INPUT_MOUSE_BUTTON_DOWN;
|
||||||
events[eventCount].params[0] = button;
|
currentEventList->events[currentEventList->count].params[0] = button;
|
||||||
events[eventCount].params[1] = 0;
|
currentEventList->events[currentEventList->count].params[1] = 0;
|
||||||
events[eventCount].params[2] = 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]);
|
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]);
|
||||||
eventCount++;
|
currentEventList->count++;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// INPUT_MOUSE_POSITION (only saved if changed)
|
if (currentEventList->count == currentEventList->capacity) return; // Security check
|
||||||
|
}
|
||||||
|
|
||||||
|
// Event type: INPUT_MOUSE_POSITION (only saved if changed)
|
||||||
if (((int)CORE.Input.Mouse.currentPosition.x != (int)CORE.Input.Mouse.previousPosition.x) ||
|
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))
|
((int)CORE.Input.Mouse.currentPosition.y != (int)CORE.Input.Mouse.previousPosition.y))
|
||||||
{
|
{
|
||||||
events[eventCount].frame = frame;
|
currentEventList->events[currentEventList->count].frame = CORE.Time.frameCounter;
|
||||||
events[eventCount].type = INPUT_MOUSE_POSITION;
|
currentEventList->events[currentEventList->count].type = INPUT_MOUSE_POSITION;
|
||||||
events[eventCount].params[0] = (int)CORE.Input.Mouse.currentPosition.x;
|
currentEventList->events[currentEventList->count].params[0] = (int)CORE.Input.Mouse.currentPosition.x;
|
||||||
events[eventCount].params[1] = (int)CORE.Input.Mouse.currentPosition.y;
|
currentEventList->events[currentEventList->count].params[1] = (int)CORE.Input.Mouse.currentPosition.y;
|
||||||
events[eventCount].params[2] = 0;
|
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]);
|
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]);
|
||||||
eventCount++;
|
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) ||
|
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))
|
((int)CORE.Input.Mouse.currentWheelMove.y != (int)CORE.Input.Mouse.previousWheelMove.y))
|
||||||
{
|
{
|
||||||
events[eventCount].frame = frame;
|
currentEventList->events[currentEventList->count].frame = CORE.Time.frameCounter;
|
||||||
events[eventCount].type = INPUT_MOUSE_WHEEL_MOTION;
|
currentEventList->events[currentEventList->count].type = INPUT_MOUSE_WHEEL_MOTION;
|
||||||
events[eventCount].params[0] = (int)CORE.Input.Mouse.currentWheelMove.x;
|
currentEventList->events[currentEventList->count].params[0] = (int)CORE.Input.Mouse.currentWheelMove.x;
|
||||||
events[eventCount].params[1] = (int)CORE.Input.Mouse.currentWheelMove.y;;
|
currentEventList->events[currentEventList->count].params[1] = (int)CORE.Input.Mouse.currentWheelMove.y;;
|
||||||
events[eventCount].params[2] = 0;
|
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]);
|
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]);
|
||||||
eventCount++;
|
currentEventList->count++;
|
||||||
|
|
||||||
|
if (currentEventList->count == currentEventList->capacity) return; // Security check
|
||||||
}
|
}
|
||||||
|
//-------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
// Touch input currentEventList->events recording
|
||||||
|
//-------------------------------------------------------------------------------------
|
||||||
for (int id = 0; id < MAX_TOUCH_POINTS; id++)
|
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])
|
if (CORE.Input.Touch.previousTouchState[id] && !CORE.Input.Touch.currentTouchState[id])
|
||||||
{
|
{
|
||||||
events[eventCount].frame = frame;
|
currentEventList->events[currentEventList->count].frame = CORE.Time.frameCounter;
|
||||||
events[eventCount].type = INPUT_TOUCH_UP;
|
currentEventList->events[currentEventList->count].type = INPUT_TOUCH_UP;
|
||||||
events[eventCount].params[0] = id;
|
currentEventList->events[currentEventList->count].params[0] = id;
|
||||||
events[eventCount].params[1] = 0;
|
currentEventList->events[currentEventList->count].params[1] = 0;
|
||||||
events[eventCount].params[2] = 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]);
|
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]);
|
||||||
eventCount++;
|
currentEventList->count++;
|
||||||
}
|
}
|
||||||
|
|
||||||
// INPUT_TOUCH_DOWN
|
if (currentEventList->count == currentEventList->capacity) return; // Security check
|
||||||
|
|
||||||
|
// Event type: INPUT_TOUCH_DOWN
|
||||||
if (CORE.Input.Touch.currentTouchState[id])
|
if (CORE.Input.Touch.currentTouchState[id])
|
||||||
{
|
{
|
||||||
events[eventCount].frame = frame;
|
currentEventList->events[currentEventList->count].frame = CORE.Time.frameCounter;
|
||||||
events[eventCount].type = INPUT_TOUCH_DOWN;
|
currentEventList->events[currentEventList->count].type = INPUT_TOUCH_DOWN;
|
||||||
events[eventCount].params[0] = id;
|
currentEventList->events[currentEventList->count].params[0] = id;
|
||||||
events[eventCount].params[1] = 0;
|
currentEventList->events[currentEventList->count].params[1] = 0;
|
||||||
events[eventCount].params[2] = 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]);
|
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]);
|
||||||
eventCount++;
|
currentEventList->count++;
|
||||||
}
|
}
|
||||||
|
|
||||||
// INPUT_TOUCH_POSITION
|
if (currentEventList->count == currentEventList->capacity) return; // Security check
|
||||||
|
|
||||||
|
// Event type: INPUT_TOUCH_POSITION
|
||||||
// TODO: It requires the id!
|
// TODO: It requires the id!
|
||||||
/*
|
/*
|
||||||
if (((int)CORE.Input.Touch.currentPosition[id].x != (int)CORE.Input.Touch.previousPosition[id].x) ||
|
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))
|
((int)CORE.Input.Touch.currentPosition[id].y != (int)CORE.Input.Touch.previousPosition[id].y))
|
||||||
{
|
{
|
||||||
events[eventCount].frame = frame;
|
currentEventList->events[currentEventList->count].frame = CORE.Time.frameCounter;
|
||||||
events[eventCount].type = INPUT_TOUCH_POSITION;
|
currentEventList->events[currentEventList->count].type = INPUT_TOUCH_POSITION;
|
||||||
events[eventCount].params[0] = id;
|
currentEventList->events[currentEventList->count].params[0] = id;
|
||||||
events[eventCount].params[1] = (int)CORE.Input.Touch.currentPosition[id].x;
|
currentEventList->events[currentEventList->count].params[1] = (int)CORE.Input.Touch.currentPosition[id].x;
|
||||||
events[eventCount].params[2] = (int)CORE.Input.Touch.currentPosition[id].y;
|
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]);
|
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]);
|
||||||
eventCount++;
|
currentEventList->count++;
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
}
|
|
||||||
|
|
||||||
|
if (currentEventList->count == currentEventList->capacity) return; // Security check
|
||||||
|
}
|
||||||
|
//-------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
// Gamepad input currentEventList->events recording
|
||||||
|
//-------------------------------------------------------------------------------------
|
||||||
for (int gamepad = 0; gamepad < MAX_GAMEPADS; gamepad++)
|
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]) &&
|
if ((CORE.Input.Gamepad.currentState[gamepad] != CORE.Input.Gamepad.previousState[gamepad]) &&
|
||||||
(CORE.Input.Gamepad.currentState[gamepad])) // Check if changed to ready
|
(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]) &&
|
if ((CORE.Input.Gamepad.currentState[gamepad] != CORE.Input.Gamepad.previousState[gamepad]) &&
|
||||||
(!CORE.Input.Gamepad.currentState[gamepad])) // Check if changed to not-ready
|
(!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++)
|
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])
|
if (CORE.Input.Gamepad.previousButtonState[gamepad][button] && !CORE.Input.Gamepad.currentButtonState[gamepad][button])
|
||||||
{
|
{
|
||||||
events[eventCount].frame = frame;
|
currentEventList->events[currentEventList->count].frame = CORE.Time.frameCounter;
|
||||||
events[eventCount].type = INPUT_GAMEPAD_BUTTON_UP;
|
currentEventList->events[currentEventList->count].type = INPUT_GAMEPAD_BUTTON_UP;
|
||||||
events[eventCount].params[0] = gamepad;
|
currentEventList->events[currentEventList->count].params[0] = gamepad;
|
||||||
events[eventCount].params[1] = button;
|
currentEventList->events[currentEventList->count].params[1] = button;
|
||||||
events[eventCount].params[2] = 0;
|
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]);
|
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]);
|
||||||
eventCount++;
|
currentEventList->count++;
|
||||||
}
|
}
|
||||||
|
|
||||||
// INPUT_GAMEPAD_BUTTON_DOWN
|
if (currentEventList->count == currentEventList->capacity) return; // Security check
|
||||||
|
|
||||||
|
// Event type: INPUT_GAMEPAD_BUTTON_DOWN
|
||||||
if (CORE.Input.Gamepad.currentButtonState[gamepad][button])
|
if (CORE.Input.Gamepad.currentButtonState[gamepad][button])
|
||||||
{
|
{
|
||||||
events[eventCount].frame = frame;
|
currentEventList->events[currentEventList->count].frame = CORE.Time.frameCounter;
|
||||||
events[eventCount].type = INPUT_GAMEPAD_BUTTON_DOWN;
|
currentEventList->events[currentEventList->count].type = INPUT_GAMEPAD_BUTTON_DOWN;
|
||||||
events[eventCount].params[0] = gamepad;
|
currentEventList->events[currentEventList->count].params[0] = gamepad;
|
||||||
events[eventCount].params[1] = button;
|
currentEventList->events[currentEventList->count].params[1] = button;
|
||||||
events[eventCount].params[2] = 0;
|
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]);
|
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]);
|
||||||
eventCount++;
|
currentEventList->count++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (currentEventList->count == currentEventList->capacity) return; // Security check
|
||||||
}
|
}
|
||||||
|
|
||||||
for (int axis = 0; axis < MAX_GAMEPAD_AXIS; axis++)
|
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)
|
if (CORE.Input.Gamepad.axisState[gamepad][axis] > 0.1f)
|
||||||
{
|
{
|
||||||
events[eventCount].frame = frame;
|
currentEventList->events[currentEventList->count].frame = CORE.Time.frameCounter;
|
||||||
events[eventCount].type = INPUT_GAMEPAD_AXIS_MOTION;
|
currentEventList->events[currentEventList->count].type = INPUT_GAMEPAD_AXIS_MOTION;
|
||||||
events[eventCount].params[0] = gamepad;
|
currentEventList->events[currentEventList->count].params[0] = gamepad;
|
||||||
events[eventCount].params[1] = axis;
|
currentEventList->events[currentEventList->count].params[1] = axis;
|
||||||
events[eventCount].params[2] = (int)(CORE.Input.Gamepad.axisState[gamepad][axis]*32768.0f);
|
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]);
|
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]);
|
||||||
eventCount++;
|
currentEventList->count++;
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// INPUT_GESTURE
|
if (currentEventList->count == currentEventList->capacity) return; // Security check
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//-------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
// Gestures input currentEventList->events recording
|
||||||
|
//-------------------------------------------------------------------------------------
|
||||||
if (GESTURES.current != GESTURE_NONE)
|
if (GESTURES.current != GESTURE_NONE)
|
||||||
{
|
{
|
||||||
events[eventCount].frame = frame;
|
// Event type: INPUT_GESTURE
|
||||||
events[eventCount].type = INPUT_GESTURE;
|
currentEventList->events[currentEventList->count].frame = CORE.Time.frameCounter;
|
||||||
events[eventCount].params[0] = GESTURES.current;
|
currentEventList->events[currentEventList->count].type = INPUT_GESTURE;
|
||||||
events[eventCount].params[1] = 0;
|
currentEventList->events[currentEventList->count].params[0] = GESTURES.current;
|
||||||
events[eventCount].params[2] = 0;
|
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]);
|
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]);
|
||||||
eventCount++;
|
currentEventList->count++;
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Play automation event
|
if (currentEventList->count == currentEventList->capacity) return; // Security check
|
||||||
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
|
// Window events recording
|
||||||
case WINDOW_CLOSE: CORE.Window.shouldClose = true; break;
|
//-------------------------------------------------------------------------------------
|
||||||
case WINDOW_MAXIMIZE: MaximizeWindow(); break;
|
// TODO.
|
||||||
case WINDOW_MINIMIZE: MinimizeWindow(); break;
|
//-------------------------------------------------------------------------------------
|
||||||
case WINDOW_RESIZE: SetWindowSize(events[i].params[0], events[i].params[1]); break;
|
|
||||||
|
|
||||||
// Custom events
|
// Custom actions events recording
|
||||||
case ACTION_TAKE_SCREENSHOT:
|
//-------------------------------------------------------------------------------------
|
||||||
{
|
// TODO.
|
||||||
TakeScreenshot(TextFormat("screenshot%03i.png", screenshotCounter));
|
//-------------------------------------------------------------------------------------
|
||||||
screenshotCounter++;
|
|
||||||
} break;
|
|
||||||
case ACTION_SETTARGETFPS: SetTargetFPS(events[i].params[0]); break;
|
|
||||||
default: break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -89,6 +89,10 @@
|
||||||
#define MAX_DECOMPRESSION_SIZE 64 // Maximum size allocated for decompression in MB
|
#define MAX_DECOMPRESSION_SIZE 64 // Maximum size allocated for decompression in MB
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef MAX_AUTOMATION_EVENTS
|
||||||
|
#define MAX_AUTOMATION_EVENTS 16384 // Maximum number of automation events to record
|
||||||
|
#endif
|
||||||
|
|
||||||
// Flags operation macros
|
// Flags operation macros
|
||||||
#define FLAG_SET(n, f) ((n) |= (f))
|
#define FLAG_SET(n, f) ((n) |= (f))
|
||||||
#define FLAG_CLEAR(n, f) ((n) &= ~(f))
|
#define FLAG_CLEAR(n, f) ((n) &= ~(f))
|
||||||
|
|
|
||||||
|
|
@ -803,7 +803,7 @@ RLAPI void rlLoadDrawQuad(void); // Load and draw a quad
|
||||||
#if defined(GRAPHICS_API_OPENGL_ES2)
|
#if defined(GRAPHICS_API_OPENGL_ES2)
|
||||||
// NOTE: OpenGL ES 2.0 can be enabled on PLATFORM_DESKTOP,
|
// 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
|
// 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
|
#define GLAD_GLES2_IMPLEMENTATION
|
||||||
#include "external/glad_gles2.h"
|
#include "external/glad_gles2.h"
|
||||||
#else
|
#else
|
||||||
|
|
@ -2248,7 +2248,7 @@ void rlLoadExtensions(void *loader)
|
||||||
// RLGL.ExtSupported.maxAnisotropyLevel
|
// RLGL.ExtSupported.maxAnisotropyLevel
|
||||||
#elif defined(GRAPHICS_API_OPENGL_ES2)
|
#elif defined(GRAPHICS_API_OPENGL_ES2)
|
||||||
|
|
||||||
#if defined(PLATFORM_DESKTOP)
|
#if defined(PLATFORM_DESKTOP) || defined(PLATFORM_DESKTOP_SDL)
|
||||||
// TODO: Support OpenGL ES 3.0
|
// TODO: Support OpenGL ES 3.0
|
||||||
if (gladLoadGLES2((GLADloadfunc)loader) == 0) TRACELOG(RL_LOG_WARNING, "GLAD: Cannot load OpenGL ES2.0 functions");
|
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");
|
else TRACELOG(RL_LOG_INFO, "GLAD: OpenGL ES 2.0 loaded successfully");
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue