twix/raylib
1
0
Fork 0
mirror of https://github.com/raysan5/raylib.git synced 2026-10-10 19:51:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: twix:f25c8241f393a81368a99a8d2e6babbc208e7d4b
Branches Tags
twix:master twix:patch-1
twix:6.0 twix:5.5 twix:5.0 twix:4.6-dev twix:4.5.0 twix:4.2.0 twix:4.0.0 twix:3.7.0 twix:3.5.0 twix:3.0.0 twix:2.6.0 twix:2.5.0 twix:2.0.0 twix:1.9.7-dev twix:1.9.4-dev twix:1.8.0 twix:1.7.0 twix:1.6.0 twix:1.5.0 twix:1.4.0 twix:1.3.0 twix:1.2.2 twix:1.1.1 twix:1.0.6 twix:1.0.4
...
compare: twix:c66c92962bfc9c5e5a90c5785e36114701328714
Branches Tags
twix:master twix:patch-1
twix:6.0 twix:5.5 twix:5.0 twix:4.6-dev twix:4.5.0 twix:4.2.0 twix:4.0.0 twix:3.7.0 twix:3.5.0 twix:3.0.0 twix:2.6.0 twix:2.5.0 twix:2.0.0 twix:1.9.7-dev twix:1.9.4-dev twix:1.8.0 twix:1.7.0 twix:1.6.0 twix:1.5.0 twix:1.4.0 twix:1.3.0 twix:1.2.2 twix:1.1.1 twix:1.0.6 twix:1.0.4

2 Commits
f25c8241f3 ... c66c92962b

Author SHA1 Message Date
Carlos GS
c66c92962b [raymath.h] Changed MatrixCompose to follow raymath conventions (#6133) 
Co-authored-by: Carlos GS <carlosgs161@proton.me>
 2026-09-10 15:14:32 +02:00
Max Freedom Pollard
94a69ad9e2 [rtext] Fix TextSplit() reading past its buffer on text of 1024 bytes or more (#6136) 
The copy loop filled all MAX_TEXT_BUFFER_LENGTH bytes, so the last substring
could come back with no terminator, and a delimiter on the last byte made
buffers[] point one past the end of the array. Stop one byte earlier so the
zero left by the memset() at the top of the function always terminates the
last substring.
 2026-09-10 15:13:05 +02:00
2 changed files with 24 additions and 8 deletions
Expand all files Collapse all files

29
src/raymath.h
View File

@ -2655,7 +2655,6 @@ RMAPI int QuaternionEquals(Quaternion p, Quaternion q)
}
// Compose a transformation matrix from rotational, translational and scaling components
// TODO: This function is not following raymath conventions defined in header: NOT self-contained
RMAPI Matrix MatrixCompose(Vector3 translation, Quaternion rotation, Vector3 scale)
{
// Initialize vectors
@ -2664,14 +2663,30 @@ RMAPI Matrix MatrixCompose(Vector3 translation, Quaternion rotation, Vector3 sca
Vector3 forward = { 0.0f, 0.0f, 1.0f };
// Scale vectors
right = Vector3Scale(right, scale.x);
up = Vector3Scale(up, scale.y);
forward = Vector3Scale(forward , scale.z);
right.x *= scale.x;
right.y *= scale.x;
right.z *= scale.x;
up.x *= scale.y;
up.y *= scale.y;
up.z *= scale.y;
forward.x *= scale.z;
forward.y *= scale.z;
forward.z *= scale.z;
// Rotate vectors
right = Vector3RotateByQuaternion(right, rotation);
up = Vector3RotateByQuaternion(up, rotation);
forward = Vector3RotateByQuaternion(forward, rotation);
right.x = right.x*(rotation.x*rotation.x + rotation.w*rotation.w - rotation.y*rotation.y - rotation.z*rotation.z) + right.y*(2*rotation.x*rotation.y - 2*rotation.w*rotation.z) + right.z*(2*rotation.x*rotation.z + 2*rotation.w*rotation.y);
right.y = right.x*(2*rotation.w*rotation.z + 2*rotation.x*rotation.y) + right.y*(rotation.w*rotation.w - rotation.x*rotation.x + rotation.y*rotation.y - rotation.z*rotation.z) + right.z*(-2*rotation.w*rotation.x + 2*rotation.y*rotation.z);
right.z = right.x*(-2*rotation.w*rotation.y + 2*rotation.x*rotation.z) + right.y*(2*rotation.w*rotation.x + 2*rotation.y*rotation.z)+ right.z*(rotation.w*rotation.w - rotation.x*rotation.x - rotation.y*rotation.y + rotation.z*rotation.z);
up.x = up.x*(rotation.x*rotation.x + rotation.w*rotation.w - rotation.y*rotation.y - rotation.z*rotation.z) + up.y*(2*rotation.x*rotation.y - 2*rotation.w*rotation.z) + up.z*(2*rotation.x*rotation.z + 2*rotation.w*rotation.y);
up.y = up.x*(2*rotation.w*rotation.z + 2*rotation.x*rotation.y) + up.y*(rotation.w*rotation.w - rotation.x*rotation.x + rotation.y*rotation.y - rotation.z*rotation.z) + up.z*(-2*rotation.w*rotation.x + 2*rotation.y*rotation.z);
up.z = up.x*(-2*rotation.w*rotation.y + 2*rotation.x*rotation.z) + up.y*(2*rotation.w*rotation.x + 2*rotation.y*rotation.z)+ up.z*(rotation.w*rotation.w - rotation.x*rotation.x - rotation.y*rotation.y + rotation.z*rotation.z);
forward.x = forward.x*(rotation.x*rotation.x + rotation.w*rotation.w - rotation.y*rotation.y - rotation.z*rotation.z) + forward.y*(2*rotation.x*rotation.y - 2*rotation.w*rotation.z) + forward.z*(2*rotation.x*rotation.z + 2*rotation.w*rotation.y);
forward.y = forward.x*(2*rotation.w*rotation.z + 2*rotation.x*rotation.y) + forward.y*(rotation.w*rotation.w - rotation.x*rotation.x + rotation.y*rotation.y - rotation.z*rotation.z) + forward.z*(-2*rotation.w*rotation.x + 2*rotation.y*rotation.z);
forward.z = forward.x*(-2*rotation.w*rotation.y + 2*rotation.x*rotation.z) + forward.y*(2*rotation.w*rotation.x + 2*rotation.y*rotation.z)+ forward.z*(rotation.w*rotation.w - rotation.x*rotation.x - rotation.y*rotation.y + rotation.z*rotation.z);
// Set result matrix output
Matrix result = {

3
src/rtext.c
View File

@ -2082,7 +2082,8 @@ char **TextSplit(const char *text, char delimiter, int *count)
counter = 1;
// Count how many substrings ar found on text and set pointers to every one
for (int i = 0; i < MAX_TEXT_BUFFER_LENGTH; i++)
// NOTE: Last buffer byte is reserved to terminate the last substring
for (int i = 0; i < MAX_TEXT_BUFFER_LENGTH - 1; i++)
{
buffer[i] = text[i];
if (buffer[i] == '\0') break;