Skip to content

Commit dfb372e

Browse files
committed
Update to raylib 5.5
1 parent 8535f5c commit dfb372e

29 files changed

+7897
-3300
lines changed

app/src/main/cpp/deps/raylib/config.h

Lines changed: 59 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* LICENSE: zlib/libpng
88
*
9-
* Copyright (c) 2018-2023 Ahmad Fatoum & Ramon Santamaria (@raysan5)
9+
* Copyright (c) 2018-2024 Ahmad Fatoum & Ramon Santamaria (@raysan5)
1010
*
1111
* This software is provided "as-is", without any express or implied warranty. In no event
1212
* will the authors be held liable for any damages arising from the use of this software.
@@ -66,11 +66,12 @@
6666
#define SUPPORT_COMPRESSION_API 1
6767
// Support automatic generated events, loading and recording of those events when required
6868
#define SUPPORT_AUTOMATION_EVENTS 1
69-
// Support custom frame control, only for advance users
69+
// Support custom frame control, only for advanced users
7070
// By default EndDrawing() does this job: draws everything + SwapScreenBuffer() + manage frame timing + PollInputEvents()
7171
// Enabling this flag allows manual control of the frame processes, use at your own risk
7272
//#define SUPPORT_CUSTOM_FRAME_CONTROL 1
7373

74+
7475
// rcore: Configuration values
7576
//------------------------------------------------------------------------------------
7677
#define MAX_FILEPATH_CAPACITY 8192 // Maximum file paths capacity
@@ -81,6 +82,7 @@
8182
#define MAX_GAMEPADS 4 // Maximum number of gamepads supported
8283
#define MAX_GAMEPAD_AXIS 8 // Maximum number of axis supported (per gamepad)
8384
#define MAX_GAMEPAD_BUTTONS 32 // Maximum number of buttons supported (per gamepad)
85+
#define MAX_GAMEPAD_VIBRATION_TIME 2.0f // Maximum vibration time in seconds
8486
#define MAX_TOUCH_POINTS 8 // Maximum number of touch points supported
8587
#define MAX_KEY_PRESSED_QUEUE 16 // Maximum number of keys in the key input queue
8688
#define MAX_CHAR_PRESSED_QUEUE 16 // Maximum number of characters in the char input queue
@@ -99,6 +101,8 @@
99101
// Show OpenGL extensions and capabilities detailed logs on init
100102
//#define RLGL_SHOW_GL_DETAILS_INFO 1
101103

104+
#define RL_SUPPORT_MESH_GPU_SKINNING 1 // GPU skinning, comment if your GPU does not support more than 8 VBOs
105+
102106
//#define RL_DEFAULT_BATCH_BUFFER_ELEMENTS 4096 // Default internal render batch elements limits
103107
#define RL_DEFAULT_BATCH_BUFFERS 1 // Default number of batch buffers (multi-buffering)
104108
#define RL_DEFAULT_BATCH_DRAWCALLS 256 // Default number of batch draw calls (by state changes: mode, texture)
@@ -111,14 +115,27 @@
111115
#define RL_CULL_DISTANCE_NEAR 0.01 // Default projection matrix near cull distance
112116
#define RL_CULL_DISTANCE_FAR 1000.0 // Default projection matrix far cull distance
113117

118+
// Default shader vertex attribute locations
119+
#define RL_DEFAULT_SHADER_ATTRIB_LOCATION_POSITION 0
120+
#define RL_DEFAULT_SHADER_ATTRIB_LOCATION_TEXCOORD 1
121+
#define RL_DEFAULT_SHADER_ATTRIB_LOCATION_NORMAL 2
122+
#define RL_DEFAULT_SHADER_ATTRIB_LOCATION_COLOR 3
123+
#define RL_DEFAULT_SHADER_ATTRIB_LOCATION_TANGENT 4
124+
#define RL_DEFAULT_SHADER_ATTRIB_LOCATION_TEXCOORD2 5
125+
#define RL_DEFAULT_SHADER_ATTRIB_LOCATION_INDICES 6
126+
#if defined(RL_SUPPORT_MESH_GPU_SKINNING)
127+
#define RL_DEFAULT_SHADER_ATTRIB_LOCATION_BONEIDS 7
128+
#define RL_DEFAULT_SHADER_ATTRIB_LOCATION_BONEWEIGHTS 8
129+
#endif
130+
114131
// Default shader vertex attribute names to set location points
115132
// NOTE: When a new shader is loaded, the following locations are tried to be set for convenience
116-
#define RL_DEFAULT_SHADER_ATTRIB_NAME_POSITION "vertexPosition" // Bound by default to shader location: 0
117-
#define RL_DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD "vertexTexCoord" // Bound by default to shader location: 1
118-
#define RL_DEFAULT_SHADER_ATTRIB_NAME_NORMAL "vertexNormal" // Bound by default to shader location: 2
119-
#define RL_DEFAULT_SHADER_ATTRIB_NAME_COLOR "vertexColor" // Bound by default to shader location: 3
120-
#define RL_DEFAULT_SHADER_ATTRIB_NAME_TANGENT "vertexTangent" // Bound by default to shader location: 4
121-
#define RL_DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD2 "vertexTexCoord2" // Bound by default to shader location: 5
133+
#define RL_DEFAULT_SHADER_ATTRIB_NAME_POSITION "vertexPosition" // Bound by default to shader location: RL_DEFAULT_SHADER_ATTRIB_LOCATION_POSITION
134+
#define RL_DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD "vertexTexCoord" // Bound by default to shader location: RL_DEFAULT_SHADER_ATTRIB_LOCATION_TEXCOORD
135+
#define RL_DEFAULT_SHADER_ATTRIB_NAME_NORMAL "vertexNormal" // Bound by default to shader location: RL_DEFAULT_SHADER_ATTRIB_LOCATION_NORMAL
136+
#define RL_DEFAULT_SHADER_ATTRIB_NAME_COLOR "vertexColor" // Bound by default to shader location: RL_DEFAULT_SHADER_ATTRIB_LOCATION_COLOR
137+
#define RL_DEFAULT_SHADER_ATTRIB_NAME_TANGENT "vertexTangent" // Bound by default to shader location: RL_DEFAULT_SHADER_ATTRIB_LOCATION_TANGENT
138+
#define RL_DEFAULT_SHADER_ATTRIB_NAME_TEXCOORD2 "vertexTexCoord2" // Bound by default to shader location: RL_DEFAULT_SHADER_ATTRIB_LOCATION_TEXCOORD2
122139

123140
#define RL_DEFAULT_SHADER_UNIFORM_NAME_MVP "mvp" // model-view-projection matrix
124141
#define RL_DEFAULT_SHADER_UNIFORM_NAME_VIEW "matView" // view matrix
@@ -161,7 +178,6 @@
161178
//#define SUPPORT_FILEFORMAT_ASTC 1
162179
//#define SUPPORT_FILEFORMAT_PKM 1
163180
//#define SUPPORT_FILEFORMAT_PVR 1
164-
//#define SUPPORT_FILEFORMAT_SVG 1
165181

166182
// Support image export functionality (.png, .bmp, .tga, .jpg, .qoi)
167183
#define SUPPORT_IMAGE_EXPORT 1
@@ -179,8 +195,9 @@
179195
// NOTE: If enabled, uses external module functions to load default raylib font
180196
#define SUPPORT_DEFAULT_FONT 1
181197
// Selected desired font fileformats to be supported for loading
182-
#define SUPPORT_FILEFORMAT_FNT 1
183198
#define SUPPORT_FILEFORMAT_TTF 1
199+
#define SUPPORT_FILEFORMAT_FNT 1
200+
//#define SUPPORT_FILEFORMAT_BDF 1
184201

185202
// Support text management functions
186203
// If not defined, still some functions are supported: TextLength(), TextFormat()
@@ -215,7 +232,12 @@
215232
// rmodels: Configuration values
216233
//------------------------------------------------------------------------------------
217234
#define MAX_MATERIAL_MAPS 12 // Maximum number of shader maps supported
235+
236+
#ifdef RL_SUPPORT_MESH_GPU_SKINNING
237+
#define MAX_MESH_VERTEX_BUFFERS 9 // Maximum vertex buffers (VBO) per mesh
238+
#else
218239
#define MAX_MESH_VERTEX_BUFFERS 7 // Maximum vertex buffers (VBO) per mesh
240+
#endif
219241

220242
//------------------------------------------------------------------------------------
221243
// Module: raudio - Configuration Flags
@@ -251,4 +273,31 @@
251273
//------------------------------------------------------------------------------------
252274
#define MAX_TRACELOG_MSG_LENGTH 256 // Max length of one trace-log message
253275

276+
277+
// Enable partial support for clipboard image, only working on SDL3 or
278+
// being on both Windows OS + GLFW or Windows OS + RGFW
279+
#define SUPPORT_CLIPBOARD_IMAGE 1
280+
281+
#if defined(SUPPORT_CLIPBOARD_IMAGE)
282+
#ifndef STBI_REQUIRED
283+
#define STBI_REQUIRED
284+
#endif
285+
286+
#ifndef SUPPORT_FILEFORMAT_BMP // For clipboard image on Windows
287+
#define SUPPORT_FILEFORMAT_BMP 1
288+
#endif
289+
290+
#ifndef SUPPORT_FILEFORMAT_PNG // Wayland uses png for prints, at least it was on 22 LTS ubuntu
291+
#define SUPPORT_FILEFORMAT_PNG 1
292+
#endif
293+
294+
#ifndef SUPPORT_FILEFORMAT_JPG
295+
#define SUPPORT_FILEFORMAT_JPG 1
296+
#endif
297+
298+
#ifndef SUPPORT_MODULE_RTEXTURES
299+
#define SUPPORT_MODULE_RTEXTURES 1
300+
#endif
301+
#endif
302+
254303
#endif // CONFIG_H

0 commit comments

Comments
 (0)