Merge remote-tracking branch 'origin' into screen-space-related-functions-consistency
This commit is contained in:
commit
946593c6f3
34 changed files with 523 additions and 460 deletions
12
.github/workflows/android.yml
vendored
12
.github/workflows/android.yml
vendored
|
|
@ -88,13 +88,9 @@ jobs:
|
||||||
path: ./build/${{ env.RELEASE_NAME }}.tar.gz
|
path: ./build/${{ env.RELEASE_NAME }}.tar.gz
|
||||||
|
|
||||||
- name: Upload Artifact to Release
|
- name: Upload Artifact to Release
|
||||||
uses: actions/upload-release-asset@v1.0.1
|
uses: softprops/action-gh-release@v1
|
||||||
|
with:
|
||||||
|
files: ./build/${{ env.RELEASE_NAME }}.tar.gz
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
with:
|
if: github.event_name == 'release' && github.event.action == 'published'
|
||||||
upload_url: ${{ github.event.release.upload_url }}
|
|
||||||
asset_path: ./build/${{ env.RELEASE_NAME }}.tar.gz
|
|
||||||
asset_name: ${{ env.RELEASE_NAME }}.tar.gz
|
|
||||||
asset_content_type: application/gzip
|
|
||||||
if: github.event_name == 'release' && github.event.action == 'published'
|
|
||||||
|
|
||||||
|
|
|
||||||
4
.github/workflows/cmake.yml
vendored
4
.github/workflows/cmake.yml
vendored
|
|
@ -36,7 +36,7 @@ jobs:
|
||||||
runs-on: windows-latest
|
runs-on: windows-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Create Build Environment
|
- name: Create Build Environment
|
||||||
# Some projects don't allow in-source building, so create a separate build directory
|
# Some projects don't allow in-source building, so create a separate build directory
|
||||||
|
|
@ -75,7 +75,7 @@ jobs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Create Build Environment
|
- name: Create Build Environment
|
||||||
# Some projects don't allow in-source building, so create a separate build directory
|
# Some projects don't allow in-source building, so create a separate build directory
|
||||||
|
|
|
||||||
2
.github/workflows/codeql.yml
vendored
2
.github/workflows/codeql.yml
vendored
|
|
@ -44,7 +44,7 @@ jobs:
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
submodules: recursive
|
submodules: recursive
|
||||||
|
|
||||||
|
|
|
||||||
11
.github/workflows/linux.yml
vendored
11
.github/workflows/linux.yml
vendored
|
|
@ -100,12 +100,9 @@ jobs:
|
||||||
path: ./build/${{ env.RELEASE_NAME }}.tar.gz
|
path: ./build/${{ env.RELEASE_NAME }}.tar.gz
|
||||||
|
|
||||||
- name: Upload Artifact to Release
|
- name: Upload Artifact to Release
|
||||||
uses: actions/upload-release-asset@v1.0.1
|
uses: softprops/action-gh-release@v1
|
||||||
|
with:
|
||||||
|
files: ./build/${{ env.RELEASE_NAME }}.tar.gz
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
with:
|
if: github.event_name == 'release' && github.event.action == 'published'
|
||||||
upload_url: ${{ github.event.release.upload_url }}
|
|
||||||
asset_path: ./build/${{ env.RELEASE_NAME }}.tar.gz
|
|
||||||
asset_name: ${{ env.RELEASE_NAME }}.tar.gz
|
|
||||||
asset_content_type: application/gzip
|
|
||||||
if: github.event_name == 'release' && github.event.action == 'published'
|
|
||||||
|
|
|
||||||
2
.github/workflows/linux_examples.yml
vendored
2
.github/workflows/linux_examples.yml
vendored
|
|
@ -22,7 +22,7 @@ jobs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Setup Environment
|
- name: Setup Environment
|
||||||
run: |
|
run: |
|
||||||
|
|
|
||||||
9
.github/workflows/macos.yml
vendored
9
.github/workflows/macos.yml
vendored
|
|
@ -105,12 +105,9 @@ jobs:
|
||||||
path: ./build/${{ env.RELEASE_NAME }}.tar.gz
|
path: ./build/${{ env.RELEASE_NAME }}.tar.gz
|
||||||
|
|
||||||
- name: Upload Artifact to Release
|
- name: Upload Artifact to Release
|
||||||
uses: actions/upload-release-asset@v1.0.1
|
uses: softprops/action-gh-release@v1
|
||||||
|
with:
|
||||||
|
files: ./build/${{ env.RELEASE_NAME }}.tar.gz
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
with:
|
|
||||||
upload_url: ${{ github.event.release.upload_url }}
|
|
||||||
asset_path: ./build/${{ env.RELEASE_NAME }}.tar.gz
|
|
||||||
asset_name: ${{ env.RELEASE_NAME }}.tar.gz
|
|
||||||
asset_content_type: application/gzip
|
|
||||||
if: github.event_name == 'release' && github.event.action == 'published'
|
if: github.event_name == 'release' && github.event.action == 'published'
|
||||||
|
|
|
||||||
2
.github/workflows/parse.yml
vendored
2
.github/workflows/parse.yml
vendored
|
|
@ -11,7 +11,7 @@ jobs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Update parse files
|
- name: Update parse files
|
||||||
working-directory: parser
|
working-directory: parser
|
||||||
|
|
|
||||||
13
.github/workflows/webassembly.yml
vendored
13
.github/workflows/webassembly.yml
vendored
|
|
@ -27,9 +27,9 @@ jobs:
|
||||||
uses: actions/checkout@master
|
uses: actions/checkout@master
|
||||||
|
|
||||||
- name: Setup emsdk
|
- name: Setup emsdk
|
||||||
uses: mymindstorm/setup-emsdk@v12
|
uses: mymindstorm/setup-emsdk@v14
|
||||||
with:
|
with:
|
||||||
version: 3.1.30
|
version: 3.1.54
|
||||||
actions-cache-folder: 'emsdk-cache'
|
actions-cache-folder: 'emsdk-cache'
|
||||||
|
|
||||||
- name: Setup Release Version
|
- name: Setup Release Version
|
||||||
|
|
@ -75,12 +75,9 @@ jobs:
|
||||||
path: ./build/${{ env.RELEASE_NAME }}.zip
|
path: ./build/${{ env.RELEASE_NAME }}.zip
|
||||||
|
|
||||||
- name: Upload Artifact to Release
|
- name: Upload Artifact to Release
|
||||||
uses: actions/upload-release-asset@v1.0.1
|
uses: softprops/action-gh-release@v1
|
||||||
|
with:
|
||||||
|
files: ./build/${{ env.RELEASE_NAME }}.zip
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
with:
|
|
||||||
upload_url: ${{ github.event.release.upload_url }}
|
|
||||||
asset_path: ./build/${{ env.RELEASE_NAME }}.zip
|
|
||||||
asset_name: ${{ env.RELEASE_NAME }}.zip
|
|
||||||
asset_content_type: application/zip
|
|
||||||
if: github.event_name == 'release' && github.event.action == 'published'
|
if: github.event_name == 'release' && github.event.action == 'published'
|
||||||
|
|
|
||||||
11
.github/workflows/windows.yml
vendored
11
.github/workflows/windows.yml
vendored
|
|
@ -74,7 +74,7 @@ jobs:
|
||||||
|
|
||||||
# Setup MSBuild.exe path if required
|
# Setup MSBuild.exe path if required
|
||||||
- name: Setup MSBuild
|
- name: Setup MSBuild
|
||||||
uses: microsoft/setup-msbuild@v1.1
|
uses: microsoft/setup-msbuild@v2
|
||||||
if: matrix.compiler == 'msvc16'
|
if: matrix.compiler == 'msvc16'
|
||||||
|
|
||||||
- name: Build Library (MinGW-w64 32bit)
|
- name: Build Library (MinGW-w64 32bit)
|
||||||
|
|
@ -139,12 +139,9 @@ jobs:
|
||||||
path: ./build/${{ env.RELEASE_NAME }}.zip
|
path: ./build/${{ env.RELEASE_NAME }}.zip
|
||||||
|
|
||||||
- name: Upload Artifact to Release
|
- name: Upload Artifact to Release
|
||||||
uses: actions/upload-release-asset@v1.0.1
|
uses: softprops/action-gh-release@v1
|
||||||
|
with:
|
||||||
|
files: ./build/${{ env.RELEASE_NAME }}.zip
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
with:
|
|
||||||
upload_url: ${{ github.event.release.upload_url }}
|
|
||||||
asset_path: ./build/${{ env.RELEASE_NAME }}.zip
|
|
||||||
asset_name: ${{ env.RELEASE_NAME }}.zip
|
|
||||||
asset_content_type: application/zip
|
|
||||||
if: github.event_name == 'release' && github.event.action == 'published'
|
if: github.event_name == 'release' && github.event.action == 'published'
|
||||||
|
|
|
||||||
2
.github/workflows/windows_examples.yml
vendored
2
.github/workflows/windows_examples.yml
vendored
|
|
@ -22,7 +22,7 @@ jobs:
|
||||||
runs-on: windows-latest
|
runs-on: windows-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v3
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Add MSBuild to PATH
|
- name: Add MSBuild to PATH
|
||||||
uses: microsoft/setup-msbuild@v1
|
uses: microsoft/setup-msbuild@v1
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
include(CMakeDependentOption)
|
include(CMakeDependentOption)
|
||||||
include(EnumOption)
|
include(EnumOption)
|
||||||
|
|
||||||
enum_option(PLATFORM "Desktop;Web;Android;Raspberry Pi;DRM" "Platform to build for.")
|
enum_option(PLATFORM "Desktop;Web;Android;Raspberry Pi;DRM;SDL" "Platform to build for.")
|
||||||
|
|
||||||
enum_option(OPENGL_VERSION "OFF;4.3;3.3;2.1;1.1;ES 2.0;ES 3.0" "Force a specific OpenGL Version?")
|
enum_option(OPENGL_VERSION "OFF;4.3;3.3;2.1;1.1;ES 2.0;ES 3.0" "Force a specific OpenGL Version?")
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -91,6 +91,11 @@ elseif ("${PLATFORM}" MATCHES "DRM")
|
||||||
endif ()
|
endif ()
|
||||||
set(LIBS_PRIVATE ${GLESV2} ${EGL} ${DRM} ${GBM} atomic pthread m dl)
|
set(LIBS_PRIVATE ${GLESV2} ${EGL} ${DRM} ${GBM} atomic pthread m dl)
|
||||||
|
|
||||||
|
elseif ("${PLATFORM}" MATCHES "SDL")
|
||||||
|
find_package(SDL2 REQUIRED)
|
||||||
|
set(PLATFORM_CPP "PLATFORM_DESKTOP_SDL")
|
||||||
|
set(LIBS_PRIVATE SDL2::SDL2)
|
||||||
|
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
if (NOT ${OPENGL_VERSION} MATCHES "OFF")
|
if (NOT ${OPENGL_VERSION} MATCHES "OFF")
|
||||||
|
|
|
||||||
|
|
@ -71,8 +71,8 @@ USE_EXTERNAL_GLFW ?= FALSE
|
||||||
|
|
||||||
# PLATFORM_DESKTOP_SDL: It requires SDL library to be provided externally
|
# PLATFORM_DESKTOP_SDL: It requires SDL library to be provided externally
|
||||||
# WARNING: Library is not included in raylib, it MUST be configured by users
|
# WARNING: Library is not included in raylib, it MUST be configured by users
|
||||||
SDL_INCLUDE_PATH ?= $(RAYLIB_SRC_PATH)/external/SDL2-2.28.4/include
|
SDL_INCLUDE_PATH ?= $(RAYLIB_SRC_PATH)/external/SDL2/include
|
||||||
SDL_LIBRARY_PATH ?= $(RAYLIB_SRC_PATH)/external/SDL2-2.28.4/lib/x64
|
SDL_LIBRARY_PATH ?= $(RAYLIB_SRC_PATH)/external/SDL2/lib
|
||||||
|
|
||||||
# Use Wayland display server protocol on Linux desktop (by default it uses X11 windowing system)
|
# Use Wayland display server protocol on Linux desktop (by default it uses X11 windowing system)
|
||||||
# NOTE: This variable is only used for PLATFORM_OS: LINUX
|
# NOTE: This variable is only used for PLATFORM_OS: LINUX
|
||||||
|
|
|
||||||
|
|
@ -55,7 +55,6 @@ fn add_module(comptime module: []const u8, b: *std.Build, target: anytype, optim
|
||||||
exe.linkSystemLibrary("winmm");
|
exe.linkSystemLibrary("winmm");
|
||||||
exe.linkSystemLibrary("gdi32");
|
exe.linkSystemLibrary("gdi32");
|
||||||
exe.linkSystemLibrary("opengl32");
|
exe.linkSystemLibrary("opengl32");
|
||||||
exe.addIncludePath(.{ .path = "external/glfw/deps/mingw" });
|
|
||||||
|
|
||||||
exe.defineCMacro("PLATFORM_DESKTOP", null);
|
exe.defineCMacro("PLATFORM_DESKTOP", null);
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@
|
||||||
|
|
||||||
#include "raylib.h"
|
#include "raylib.h"
|
||||||
|
|
||||||
#define NUM_TEXTURES 9 // Currently we have 8 generation algorithms but some are have multiple purposes (Linear and Square Gradients)
|
#define NUM_TEXTURES 9 // Currently we have 8 generation algorithms but some have multiple purposes (Linear and Square Gradients)
|
||||||
|
|
||||||
//------------------------------------------------------------------------------------
|
//------------------------------------------------------------------------------------
|
||||||
// Program main entry point
|
// Program main entry point
|
||||||
|
|
|
||||||
|
|
@ -4918,6 +4918,25 @@
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "SetGamepadVibration",
|
||||||
|
"description": "Set gamepad vibration for both motors",
|
||||||
|
"returnType": "void",
|
||||||
|
"params": [
|
||||||
|
{
|
||||||
|
"type": "int",
|
||||||
|
"name": "gamepad"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "float",
|
||||||
|
"name": "leftMotor"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "float",
|
||||||
|
"name": "rightMotor"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "IsMouseButtonPressed",
|
"name": "IsMouseButtonPressed",
|
||||||
"description": "Check if a mouse button has been pressed once",
|
"description": "Check if a mouse button has been pressed once",
|
||||||
|
|
|
||||||
|
|
@ -4342,6 +4342,16 @@ return {
|
||||||
{type = "const char *", name = "mappings"}
|
{type = "const char *", name = "mappings"}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name = "SetGamepadVibration",
|
||||||
|
description = "Set gamepad vibration for both motors",
|
||||||
|
returnType = "void",
|
||||||
|
params = {
|
||||||
|
{type = "int", name = "gamepad"},
|
||||||
|
{type = "float", name = "leftMotor"},
|
||||||
|
{type = "float", name = "rightMotor"}
|
||||||
|
}
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name = "IsMouseButtonPressed",
|
name = "IsMouseButtonPressed",
|
||||||
description = "Check if a mouse button has been pressed once",
|
description = "Check if a mouse button has been pressed once",
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -669,7 +669,7 @@
|
||||||
<Param type="unsigned int" name="frames" desc="" />
|
<Param type="unsigned int" name="frames" desc="" />
|
||||||
</Callback>
|
</Callback>
|
||||||
</Callbacks>
|
</Callbacks>
|
||||||
<Functions count="559">
|
<Functions count="560">
|
||||||
<Function name="InitWindow" retType="void" paramCount="3" desc="Initialize window and OpenGL context">
|
<Function name="InitWindow" retType="void" paramCount="3" desc="Initialize window and OpenGL context">
|
||||||
<Param type="int" name="width" desc="" />
|
<Param type="int" name="width" desc="" />
|
||||||
<Param type="int" name="height" desc="" />
|
<Param type="int" name="height" desc="" />
|
||||||
|
|
@ -1193,6 +1193,11 @@
|
||||||
<Function name="SetGamepadMappings" retType="int" paramCount="1" desc="Set internal gamepad mappings (SDL_GameControllerDB)">
|
<Function name="SetGamepadMappings" retType="int" paramCount="1" desc="Set internal gamepad mappings (SDL_GameControllerDB)">
|
||||||
<Param type="const char *" name="mappings" desc="" />
|
<Param type="const char *" name="mappings" desc="" />
|
||||||
</Function>
|
</Function>
|
||||||
|
<Function name="SetGamepadVibration" retType="void" paramCount="3" desc="Set gamepad vibration for both motors">
|
||||||
|
<Param type="int" name="gamepad" desc="" />
|
||||||
|
<Param type="float" name="leftMotor" desc="" />
|
||||||
|
<Param type="float" name="rightMotor" desc="" />
|
||||||
|
</Function>
|
||||||
<Function name="IsMouseButtonPressed" retType="bool" paramCount="1" desc="Check if a mouse button has been pressed once">
|
<Function name="IsMouseButtonPressed" retType="bool" paramCount="1" desc="Check if a mouse button has been pressed once">
|
||||||
<Param type="int" name="button" desc="" />
|
<Param type="int" name="button" desc="" />
|
||||||
</Function>
|
</Function>
|
||||||
|
|
|
||||||
|
|
@ -438,7 +438,7 @@ INCLUDE_PATHS = -I.
|
||||||
|
|
||||||
# Define additional directories containing required header files
|
# Define additional directories containing required header files
|
||||||
ifeq ($(PLATFORM),PLATFORM_DESKTOP)
|
ifeq ($(PLATFORM),PLATFORM_DESKTOP)
|
||||||
INCLUDE_PATHS += -Iexternal/glfw/include -Iexternal/glfw/deps/mingw
|
INCLUDE_PATHS += -Iexternal/glfw/include
|
||||||
ifeq ($(PLATFORM_OS),BSD)
|
ifeq ($(PLATFORM_OS),BSD)
|
||||||
INCLUDE_PATHS += -I/usr/local/include
|
INCLUDE_PATHS += -I/usr/local/include
|
||||||
endif
|
endif
|
||||||
|
|
@ -447,7 +447,7 @@ ifeq ($(PLATFORM),PLATFORM_DESKTOP_SDL)
|
||||||
INCLUDE_PATHS += -I$(SDL_INCLUDE_PATH)
|
INCLUDE_PATHS += -I$(SDL_INCLUDE_PATH)
|
||||||
endif
|
endif
|
||||||
ifeq ($(PLATFORM),PLATFORM_WEB)
|
ifeq ($(PLATFORM),PLATFORM_WEB)
|
||||||
INCLUDE_PATHS += -Iexternal/glfw/include -Iexternal/glfw/deps/mingw
|
INCLUDE_PATHS += -Iexternal/glfw/include
|
||||||
endif
|
endif
|
||||||
ifeq ($(PLATFORM),PLATFORM_DRM)
|
ifeq ($(PLATFORM),PLATFORM_DRM)
|
||||||
INCLUDE_PATHS += -I/usr/include/libdrm
|
INCLUDE_PATHS += -I/usr/include/libdrm
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue