MrMonopoly/raylib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Jon Daniel 2025-08-31 08:46:01 +02:00 committed by GitHub
commit a7275083bb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
35 changed files with 120 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/shaders/shaders_normal_map.c
View File

@ -15,7 +15,7 @@
* BSD-like license that allows static linking with closed source software * BSD-like license that allows static linking with closed source software
* *
* Copyright (c) 2025-2025 Jeremy Montgomery (@Sir_Irk) and Ramon Santamaria (@raysan5) * Copyright (c) 2025-2025 Jeremy Montgomery (@Sir_Irk) and Ramon Santamaria (@raysan5)
*k *
********************************************************************************************/ ********************************************************************************************/
#include <raylib.h> #include <raylib.h>

2
examples/shapes/shapes_double_pendulum.c
View File

@ -83,6 +83,7 @@ int main(void)
// Update // Update
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
float dt = GetFrameTime(); float dt = GetFrameTime();
float step = dt / SIMULATION_STEPS, step2 = step * step; float step = dt / SIMULATION_STEPS, step2 = step * step;
if(IsWindowResized()) if(IsWindowResized())
{ {
@ -160,6 +161,7 @@ int main(void)
(Vector2){0, lineThick * 0.5}, 90 - RAD2DEG * theta2, RAYWHITE); (Vector2){0, lineThick * 0.5}, 90 - RAD2DEG * theta2, RAYWHITE);
// Draw double pendulum // Draw double pendulum
DrawRectanglePro((Rectangle){ screenSize.x * 0.5, screenSize.y * 0.5 - 100, 10 * l1, lineThick }, DrawRectanglePro((Rectangle){ screenSize.x * 0.5, screenSize.y * 0.5 - 100, 10 * l1, lineThick },
(Vector2){0, lineThick * 0.5}, 90 - RAD2DEG * theta1, RAYWHITE); (Vector2){0, lineThick * 0.5}, 90 - RAD2DEG * theta1, RAYWHITE);

2
src/platforms/rcore_desktop_glfw.c
View File

@ -24,7 +24,7 @@
* Custom flag for rcore on target platform -not used- * Custom flag for rcore on target platform -not used-
* *
* DEPENDENCIES: * DEPENDENCIES:
* - rglfw: Manage graphic device, OpenGL context and inputs (Windows, Linux, OSX, FreeBSD...) * - rglfw: Manage graphic device, OpenGL context and inputs (Windows, Linux, OSX/macOS, FreeBSD...)
* - gestures: Gestures system for touch-ready devices (or simulated from mouse inputs) * - gestures: Gestures system for touch-ready devices (or simulated from mouse inputs)
* *
* *