Skip to content

Commit d631a5a

Browse files
committed
Merge branch 'master' of https://github.com/raysan5/raylib
2 parents 5992929 + 3d64069 commit d631a5a

8 files changed

Lines changed: 18 additions & 18 deletions

File tree

src/raylib.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ typedef struct BoneInfo {
409409

410410
// Skeleton, animation bones hierarchy
411411
typedef struct ModelSkeleton {
412-
int boneCount; // Number of bones
412+
unsigned int boneCount; // Number of bones
413413
BoneInfo *bones; // Bones information (skeleton)
414414
ModelAnimPose bindPose; // Bones base transformation (Transform[])
415415
} ModelSkeleton;
@@ -436,7 +436,7 @@ typedef struct Model {
436436
typedef struct ModelAnimation {
437437
char name[32]; // Animation name
438438

439-
int boneCount; // Number of bones (per pose)
439+
unsigned int boneCount; // Number of bones (per pose)
440440
int keyframeCount; // Number of animation key frames
441441
ModelAnimPose *keyframePoses; // Animation sequence keyframe poses [keyframe][pose]
442442
} ModelAnimation;

src/rcore.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3378,10 +3378,10 @@ unsigned int *ComputeSHA1(const unsigned char *data, int dataSize)
33783378
unsigned int w[80] = { 0 };
33793379
for (int i = 0; i < 16; i++)
33803380
{
3381-
w[i] = (msg[offset + (i*4) + 0] << 24) |
3382-
(msg[offset + (i*4) + 1] << 16) |
3383-
(msg[offset + (i*4) + 2] << 8) |
3384-
(msg[offset + (i*4) + 3]);
3381+
w[i] = ((unsigned int)msg[offset + (i*4) + 0] << 24) |
3382+
((unsigned int)msg[offset + (i*4) + 1] << 16) |
3383+
((unsigned int)msg[offset + (i*4) + 2] << 8) |
3384+
((unsigned int)msg[offset + (i*4) + 3]);
33853385
}
33863386

33873387
// Message schedule: extend the sixteen 32-bit words into eighty 32-bit words:

src/rmodels.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5369,9 +5369,9 @@ static Image LoadImageFromCgltfImage(cgltf_image *cgltfImage, const char *texPat
53695369
}
53705370

53715371
// Load bone info from GLTF skin data
5372-
static BoneInfo *LoadBoneInfoGLTF(cgltf_skin skin, int *boneCount)
5372+
static BoneInfo *LoadBoneInfoGLTF(cgltf_skin skin, unsigned int *boneCount)
53735373
{
5374-
*boneCount = (int)skin.joints_count;
5374+
*boneCount = skin.joints_count;
53755375
BoneInfo *bones = (BoneInfo *)RL_CALLOC(skin.joints_count, sizeof(BoneInfo));
53765376

53775377
for (unsigned int i = 0; i < skin.joints_count; i++)

tools/rlparser/output/raylib_api.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -968,7 +968,7 @@
968968
"description": "Skeleton, animation bones hierarchy",
969969
"fields": [
970970
{
971-
"type": "int",
971+
"type": "unsigned int",
972972
"name": "boneCount",
973973
"description": "Number of bones"
974974
},
@@ -1045,7 +1045,7 @@
10451045
"description": "Animation name"
10461046
},
10471047
{
1048-
"type": "int",
1048+
"type": "unsigned int",
10491049
"name": "boneCount",
10501050
"description": "Number of bones (per pose)"
10511051
},

tools/rlparser/output/raylib_api.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -968,7 +968,7 @@ return {
968968
description = "Skeleton, animation bones hierarchy",
969969
fields = {
970970
{
971-
type = "int",
971+
type = "unsigned int",
972972
name = "boneCount",
973973
description = "Number of bones"
974974
},
@@ -1045,7 +1045,7 @@ return {
10451045
description = "Animation name"
10461046
},
10471047
{
1048-
type = "int",
1048+
type = "unsigned int",
10491049
name = "boneCount",
10501050
description = "Number of bones (per pose)"
10511051
},

tools/rlparser/output/raylib_api.sexpr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -611,7 +611,7 @@
611611
((name "ModelSkeleton")
612612
(description "Skeleton, animation bones hierarchy")
613613
(fields
614-
((type "int")
614+
((type "unsigned int")
615615
(name "boneCount")
616616
(description "Number of bones"))
617617
((type "BoneInfo *")
@@ -658,7 +658,7 @@
658658
((type "char[32]")
659659
(name "name")
660660
(description "Animation name"))
661-
((type "int")
661+
((type "unsigned int")
662662
(name "boneCount")
663663
(description "Number of bones (per pose)"))
664664
((type "int")

tools/rlparser/output/raylib_api.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ Struct 20: BoneInfo (2 fields)
448448
Struct 21: ModelSkeleton (3 fields)
449449
Name: ModelSkeleton
450450
Description: Skeleton, animation bones hierarchy
451-
Field[1]: int boneCount // Number of bones
451+
Field[1]: unsigned int boneCount // Number of bones
452452
Field[2]: BoneInfo * bones // Bones information (skeleton)
453453
Field[3]: ModelAnimPose bindPose // Bones base transformation (Transform[])
454454
Struct 22: Model (9 fields)
@@ -467,7 +467,7 @@ Struct 23: ModelAnimation (4 fields)
467467
Name: ModelAnimation
468468
Description: ModelAnimation, contains a full animation sequence
469469
Field[1]: char[32] name // Animation name
470-
Field[2]: int boneCount // Number of bones (per pose)
470+
Field[2]: unsigned int boneCount // Number of bones (per pose)
471471
Field[3]: int keyframeCount // Number of animation key frames
472472
Field[4]: ModelAnimPose * keyframePoses // Animation sequence keyframe poses [keyframe][pose]
473473
Struct 24: Ray (2 fields)

tools/rlparser/output/raylib_api.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@
201201
<Field type="int" name="parent" desc="Bone parent" />
202202
</Struct>
203203
<Struct name="ModelSkeleton" fieldCount="3" desc="Skeleton, animation bones hierarchy">
204-
<Field type="int" name="boneCount" desc="Number of bones" />
204+
<Field type="unsigned int" name="boneCount" desc="Number of bones" />
205205
<Field type="BoneInfo *" name="bones" desc="Bones information (skeleton)" />
206206
<Field type="ModelAnimPose" name="bindPose" desc="Bones base transformation (Transform[])" />
207207
</Struct>
@@ -218,7 +218,7 @@
218218
</Struct>
219219
<Struct name="ModelAnimation" fieldCount="4" desc="ModelAnimation, contains a full animation sequence">
220220
<Field type="char[32]" name="name" desc="Animation name" />
221-
<Field type="int" name="boneCount" desc="Number of bones (per pose)" />
221+
<Field type="unsigned int" name="boneCount" desc="Number of bones (per pose)" />
222222
<Field type="int" name="keyframeCount" desc="Number of animation key frames" />
223223
<Field type="ModelAnimPose *" name="keyframePoses" desc="Animation sequence keyframe poses [keyframe][pose]" />
224224
</Struct>

0 commit comments

Comments
 (0)