mirrors/raylib
1
0
Fork 0
mirror of https://github.com/raysan5/raylib.git synced 2025-10-06 18:06:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Review latest PRs formatting

Browse Source
This commit is contained in:
Ray
2025-09-26 22:26:19 +02:00
parent f6c07099af
commit 87f758f9b4
2 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/platforms/rcore_android.c
View File

@@ -447,8 +447,8 @@ int GetMonitorCount(void)
int GetCurrentMonitor(void) int GetCurrentMonitor(void)
{ {
int displayId = -1; int displayId = -1;
JNIEnv* env = NULL; JNIEnv *env = NULL;
JavaVM* vm = platform.app->activity->vm; JavaVM *vm = platform.app->activity->vm;
(*vm)->AttachCurrentThread(vm, &env, NULL); (*vm)->AttachCurrentThread(vm, &env, NULL);
jobject activity = platform.app->activity->clazz; jobject activity = platform.app->activity->clazz;
@@ -458,12 +458,15 @@ int GetCurrentMonitor(void)
jobject display = (*env)->CallObjectMethod(env, activity, getDisplayMethod); jobject display = (*env)->CallObjectMethod(env, activity, getDisplayMethod);
if (display == NULL) { if (display == NULL)
{
TRACELOG(LOG_ERROR, "GetCurrentMonitor() couldn't get the display object"); TRACELOG(LOG_ERROR, "GetCurrentMonitor() couldn't get the display object");
} else { }
else
{
jclass displayClass = (*env)->FindClass(env, "android/view/Display"); jclass displayClass = (*env)->FindClass(env, "android/view/Display");
jmethodID getDisplayIdMethod = (*env)->GetMethodID(env, displayClass, "getDisplayId", "()I"); jmethodID getDisplayIdMethod = (*env)->GetMethodID(env, displayClass, "getDisplayId", "()I");
displayId = (int) (*env)->CallIntMethod(env, display, getDisplayIdMethod); displayId = (int)(*env)->CallIntMethod(env, display, getDisplayIdMethod);
(*env)->DeleteLocalRef(env, displayClass); (*env)->DeleteLocalRef(env, displayClass);
} }

10
src/rmodels.c
View File

@@ -6239,10 +6239,9 @@ static ModelAnimation *LoadModelAnimationsGLTF(const char *fileName, int *animCo
*animCount = (int)data->animations_count; *animCount = (int)data->animations_count;
animations = (ModelAnimation *)RL_CALLOC(data->animations_count, sizeof(ModelAnimation)); animations = (ModelAnimation *)RL_CALLOC(data->animations_count, sizeof(ModelAnimation));
Transform worldTransform; Transform worldTransform = { 0 };
{ cgltf_float cgltf_worldTransform[16] = { 0 };
cgltf_float cgltf_worldTransform[16]; cgltf_node *node = skin.joints[0];
cgltf_node* node = skin.joints[0];
cgltf_node_transform_world(node->parent, cgltf_worldTransform); cgltf_node_transform_world(node->parent, cgltf_worldTransform);
Matrix worldMatrix = { Matrix worldMatrix = {
cgltf_worldTransform[0], cgltf_worldTransform[4], cgltf_worldTransform[8], cgltf_worldTransform[12], cgltf_worldTransform[0], cgltf_worldTransform[4], cgltf_worldTransform[8], cgltf_worldTransform[12],
@@ -6250,8 +6249,7 @@ static ModelAnimation *LoadModelAnimationsGLTF(const char *fileName, int *animCo
cgltf_worldTransform[2], cgltf_worldTransform[6], cgltf_worldTransform[10], cgltf_worldTransform[14], cgltf_worldTransform[2], cgltf_worldTransform[6], cgltf_worldTransform[10], cgltf_worldTransform[14],
cgltf_worldTransform[3], cgltf_worldTransform[7], cgltf_worldTransform[11], cgltf_worldTransform[15] cgltf_worldTransform[3], cgltf_worldTransform[7], cgltf_worldTransform[11], cgltf_worldTransform[15]
}; };
MatrixDecompose(worldMatrix, &(worldTransform.translation), &(worldTransform.rotation), &(worldTransform.scale)); MatrixDecompose(worldMatrix, &worldTransform.translation, &worldTransform.rotation, &worldTransform.scale);
}
for (unsigned int i = 0; i < data->animations_count; i++) for (unsigned int i = 0; i < data->animations_count; i++)
{ {