Archive/TRX
0
0
Fork 0
mirror of https://github.com/LostArtefacts/TRX.git synced 2025-04-28 12:47:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

lara-hair: simplify pointer usage

Browse source
This commit is contained in:
Marcin Kurczewski 2024-08-30 18:09:35 +02:00
parent 9ddc3a2433
commit 641824b5b4
No known key found for this signature in database
GPG key ID: CC65E6FD28CAE42A
1 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/game/lara/lara_hair.c
View file

@ -142,12 +142,12 @@ void Lara_Hair_Control(void)
// hips // hips
Matrix_Push_I(); Matrix_Push_I();
objptr = mesh_base[LM_HIPS]; objptr = mesh_base[LM_HIPS];
Matrix_TranslateRel_I(*objptr, *(objptr + 1), *(objptr + 2)); Matrix_TranslateRel_I(objptr[0], objptr[1], objptr[2]);
Matrix_Interpolate(); Matrix_Interpolate();
sphere[0].x = g_MatrixPtr->_03 >> W2V_SHIFT; sphere[0].x = g_MatrixPtr->_03 >> W2V_SHIFT;
sphere[0].y = g_MatrixPtr->_13 >> W2V_SHIFT; sphere[0].y = g_MatrixPtr->_13 >> W2V_SHIFT;
sphere[0].z = g_MatrixPtr->_23 >> W2V_SHIFT; sphere[0].z = g_MatrixPtr->_23 >> W2V_SHIFT;
sphere[0].r = (int32_t) * (objptr + 3); sphere[0].r = objptr[3];
Matrix_Pop_I(); Matrix_Pop_I();
// torso // torso
@ -160,12 +160,12 @@ void Lara_Hair_Control(void)
g_Lara.interp.result.torso_rot.z); g_Lara.interp.result.torso_rot.z);
Matrix_Push_I(); Matrix_Push_I();
objptr = g_Meshes[object->mesh_index + LM_TORSO]; // ignore shotgun objptr = g_Meshes[object->mesh_index + LM_TORSO]; // ignore shotgun
Matrix_TranslateRel_I(*objptr, *(objptr + 1), *(objptr + 2)); Matrix_TranslateRel_I(objptr[0], objptr[1], objptr[2]);
Matrix_Interpolate(); Matrix_Interpolate();
sphere[1].x = g_MatrixPtr->_03 >> W2V_SHIFT; sphere[1].x = g_MatrixPtr->_03 >> W2V_SHIFT;
sphere[1].y = g_MatrixPtr->_13 >> W2V_SHIFT; sphere[1].y = g_MatrixPtr->_13 >> W2V_SHIFT;
sphere[1].z = g_MatrixPtr->_23 >> W2V_SHIFT; sphere[1].z = g_MatrixPtr->_23 >> W2V_SHIFT;
sphere[1].r = (int32_t) * (objptr + 3); sphere[1].r = objptr[3];
Matrix_Pop_I(); Matrix_Pop_I();
// right arm // right arm
@ -175,12 +175,12 @@ void Lara_Hair_Control(void)
Matrix_RotYXZpack_I( Matrix_RotYXZpack_I(
packed_rotation1[LM_UARM_R], packed_rotation2[LM_UARM_R]); packed_rotation1[LM_UARM_R], packed_rotation2[LM_UARM_R]);
objptr = mesh_base[LM_UARM_R]; objptr = mesh_base[LM_UARM_R];
Matrix_TranslateRel_I(*objptr, *(objptr + 1), *(objptr + 2)); Matrix_TranslateRel_I(objptr[0], objptr[1], objptr[2]);
Matrix_Interpolate(); Matrix_Interpolate();
sphere[3].x = g_MatrixPtr->_03 >> W2V_SHIFT; sphere[3].x = g_MatrixPtr->_03 >> W2V_SHIFT;
sphere[3].y = g_MatrixPtr->_13 >> W2V_SHIFT; sphere[3].y = g_MatrixPtr->_13 >> W2V_SHIFT;
sphere[3].z = g_MatrixPtr->_23 >> W2V_SHIFT; sphere[3].z = g_MatrixPtr->_23 >> W2V_SHIFT;
sphere[3].r = (int32_t) * (objptr + 3) * 3 / 2; sphere[3].r = (int32_t)objptr[3] * 3 / 2;
Matrix_Pop_I(); Matrix_Pop_I();
// left arm // left arm
@ -190,12 +190,12 @@ void Lara_Hair_Control(void)
Matrix_RotYXZpack_I( Matrix_RotYXZpack_I(
packed_rotation1[LM_UARM_L], packed_rotation2[LM_UARM_L]); packed_rotation1[LM_UARM_L], packed_rotation2[LM_UARM_L]);
objptr = mesh_base[LM_UARM_L]; objptr = mesh_base[LM_UARM_L];
Matrix_TranslateRel_I(*objptr, *(objptr + 1), *(objptr + 2)); Matrix_TranslateRel_I(objptr[0], objptr[1], objptr[2]);
Matrix_Interpolate(); Matrix_Interpolate();
sphere[4].x = g_MatrixPtr->_03 >> W2V_SHIFT; sphere[4].x = g_MatrixPtr->_03 >> W2V_SHIFT;
sphere[4].y = g_MatrixPtr->_13 >> W2V_SHIFT; sphere[4].y = g_MatrixPtr->_13 >> W2V_SHIFT;
sphere[4].z = g_MatrixPtr->_23 >> W2V_SHIFT; sphere[4].z = g_MatrixPtr->_23 >> W2V_SHIFT;
sphere[4].r = (int32_t) * (objptr + 3) * 3 / 2; sphere[4].r = (int32_t)objptr[3] * 3 / 2;
Matrix_Pop_I(); Matrix_Pop_I();
// head // head
@ -208,12 +208,12 @@ void Lara_Hair_Control(void)
g_Lara.interp.result.head_rot.z); g_Lara.interp.result.head_rot.z);
Matrix_Push_I(); Matrix_Push_I();
objptr = mesh_base[LM_HEAD]; objptr = mesh_base[LM_HEAD];
Matrix_TranslateRel_I(*objptr, *(objptr + 1), *(objptr + 2)); Matrix_TranslateRel_I(objptr[0], objptr[1], objptr[2]);
Matrix_Interpolate(); Matrix_Interpolate();
sphere[2].x = g_MatrixPtr->_03 >> W2V_SHIFT; sphere[2].x = g_MatrixPtr->_03 >> W2V_SHIFT;
sphere[2].y = g_MatrixPtr->_13 >> W2V_SHIFT; sphere[2].y = g_MatrixPtr->_13 >> W2V_SHIFT;
sphere[2].z = g_MatrixPtr->_23 >> W2V_SHIFT; sphere[2].z = g_MatrixPtr->_23 >> W2V_SHIFT;
sphere[2].r = (int32_t) * (objptr + 3); sphere[2].r = objptr[3];
Matrix_Pop_I(); Matrix_Pop_I();
Matrix_TranslateRel_I(HAIR_OFFSET_X, HAIR_OFFSET_Y, HAIR_OFFSET_Z); Matrix_TranslateRel_I(HAIR_OFFSET_X, HAIR_OFFSET_Y, HAIR_OFFSET_Z);
@ -227,11 +227,11 @@ void Lara_Hair_Control(void)
// hips // hips
Matrix_Push(); Matrix_Push();
objptr = mesh_base[LM_HIPS]; objptr = mesh_base[LM_HIPS];
Matrix_TranslateRel(*objptr, *(objptr + 1), *(objptr + 2)); Matrix_TranslateRel(objptr[0], objptr[1], objptr[2]);
sphere[0].x = g_MatrixPtr->_03 >> W2V_SHIFT; sphere[0].x = g_MatrixPtr->_03 >> W2V_SHIFT;
sphere[0].y = g_MatrixPtr->_13 >> W2V_SHIFT; sphere[0].y = g_MatrixPtr->_13 >> W2V_SHIFT;
sphere[0].z = g_MatrixPtr->_23 >> W2V_SHIFT; sphere[0].z = g_MatrixPtr->_23 >> W2V_SHIFT;
sphere[0].r = (int32_t) * (objptr + 3); sphere[0].r = objptr[3];
Matrix_Pop(); Matrix_Pop();
// torso // torso
@ -243,11 +243,11 @@ void Lara_Hair_Control(void)
g_Lara.interp.result.torso_rot.z); g_Lara.interp.result.torso_rot.z);
Matrix_Push(); Matrix_Push();
objptr = g_Meshes[object->mesh_index + LM_TORSO]; // ignore shotgun objptr = g_Meshes[object->mesh_index + LM_TORSO]; // ignore shotgun
Matrix_TranslateRel(*objptr, *(objptr + 1), *(objptr + 2)); Matrix_TranslateRel(objptr[0], objptr[1], objptr[2]);
sphere[1].x = g_MatrixPtr->_03 >> W2V_SHIFT; sphere[1].x = g_MatrixPtr->_03 >> W2V_SHIFT;
sphere[1].y = g_MatrixPtr->_13 >> W2V_SHIFT; sphere[1].y = g_MatrixPtr->_13 >> W2V_SHIFT;
sphere[1].z = g_MatrixPtr->_23 >> W2V_SHIFT; sphere[1].z = g_MatrixPtr->_23 >> W2V_SHIFT;
sphere[1].r = (int32_t) * (objptr + 3); sphere[1].r = objptr[3];
Matrix_Pop(); Matrix_Pop();
// right arm // right arm
@ -256,11 +256,11 @@ void Lara_Hair_Control(void)
*(bone + 1 + 28), *(bone + 2 + 28), *(bone + 3 + 28)); *(bone + 1 + 28), *(bone + 2 + 28), *(bone + 3 + 28));
Matrix_RotYXZpack(packed_rotation[LM_UARM_R]); Matrix_RotYXZpack(packed_rotation[LM_UARM_R]);
objptr = mesh_base[LM_UARM_R]; objptr = mesh_base[LM_UARM_R];
Matrix_TranslateRel(*objptr, *(objptr + 1), *(objptr + 2)); Matrix_TranslateRel(objptr[0], objptr[1], objptr[2]);
sphere[3].x = g_MatrixPtr->_03 >> W2V_SHIFT; sphere[3].x = g_MatrixPtr->_03 >> W2V_SHIFT;
sphere[3].y = g_MatrixPtr->_13 >> W2V_SHIFT; sphere[3].y = g_MatrixPtr->_13 >> W2V_SHIFT;
sphere[3].z = g_MatrixPtr->_23 >> W2V_SHIFT; sphere[3].z = g_MatrixPtr->_23 >> W2V_SHIFT;
sphere[3].r = (int32_t) * (objptr + 3) * 3 / 2; sphere[3].r = (int32_t)objptr[3] * 3 / 2;
Matrix_Pop(); Matrix_Pop();
// left arm // left arm
@ -269,11 +269,11 @@ void Lara_Hair_Control(void)
*(bone + 1 + 40), *(bone + 2 + 40), *(bone + 3 + 40)); *(bone + 1 + 40), *(bone + 2 + 40), *(bone + 3 + 40));
Matrix_RotYXZpack(packed_rotation[LM_UARM_L]); Matrix_RotYXZpack(packed_rotation[LM_UARM_L]);
objptr = mesh_base[LM_UARM_L]; objptr = mesh_base[LM_UARM_L];
Matrix_TranslateRel(*objptr, *(objptr + 1), *(objptr + 2)); Matrix_TranslateRel(objptr[0], objptr[1], objptr[2]);
sphere[4].x = g_MatrixPtr->_03 >> W2V_SHIFT; sphere[4].x = g_MatrixPtr->_03 >> W2V_SHIFT;
sphere[4].y = g_MatrixPtr->_13 >> W2V_SHIFT; sphere[4].y = g_MatrixPtr->_13 >> W2V_SHIFT;
sphere[4].z = g_MatrixPtr->_23 >> W2V_SHIFT; sphere[4].z = g_MatrixPtr->_23 >> W2V_SHIFT;
sphere[4].r = (int32_t) * (objptr + 3) * 3 / 2; sphere[4].r = (int32_t)objptr[3] * 3 / 2;
Matrix_Pop(); Matrix_Pop();
// head // head
@ -285,11 +285,11 @@ void Lara_Hair_Control(void)
g_Lara.interp.result.head_rot.z); g_Lara.interp.result.head_rot.z);
Matrix_Push(); Matrix_Push();
objptr = mesh_base[LM_HEAD]; objptr = mesh_base[LM_HEAD];
Matrix_TranslateRel(*objptr, *(objptr + 1), *(objptr + 2)); Matrix_TranslateRel(objptr[0], objptr[1], objptr[2]);
sphere[2].x = g_MatrixPtr->_03 >> W2V_SHIFT; sphere[2].x = g_MatrixPtr->_03 >> W2V_SHIFT;
sphere[2].y = g_MatrixPtr->_13 >> W2V_SHIFT; sphere[2].y = g_MatrixPtr->_13 >> W2V_SHIFT;
sphere[2].z = g_MatrixPtr->_23 >> W2V_SHIFT; sphere[2].z = g_MatrixPtr->_23 >> W2V_SHIFT;
sphere[2].r = (int32_t) * (objptr + 3); sphere[2].r = objptr[3];
Matrix_Pop(); Matrix_Pop();
Matrix_TranslateRel(HAIR_OFFSET_X, HAIR_OFFSET_Y, HAIR_OFFSET_Z); Matrix_TranslateRel(HAIR_OFFSET_X, HAIR_OFFSET_Y, HAIR_OFFSET_Z);