hackern64/HackerSM64
0
0
Fork 0
mirror of https://github.com/HackerN64/HackerSM64.git synced 2026-01-21 10:35:32 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #88 from Reonu/fix_redundant_geo_process_animated_part_translation_set

Browse Source 
Fix geo_process_animated_part setting translation twice
This commit is contained in:
Arceveti
2021-10-20 15:01:29 -07:00
committed by GitHub
parent 110efebb24 f6a2999134
commit 82aa19e4cc
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/game/rendering_graph_node.c
View File

@@ -672,9 +672,8 @@ void geo_process_background(struct GraphNodeBackground *node) {
*/
void geo_process_animated_part(struct GraphNodeAnimatedPart *node) {
Vec3s rotation = { 0, 0, 0 };
Vec3f translation = {node->translation[0], node->translation[1], node->translation[2]};
Vec3f translation = { node->translation[0], node->translation[1], node->translation[2] };
vec3f_set(translation, node->translation[0], node->translation[1], node->translation[2]);
if (gCurrAnimType == ANIM_TYPE_TRANSLATION) {
translation[0] += gCurrAnimData[retrieve_animation_index(gCurrAnimFrame, &gCurrAnimAttribute)] * gCurrAnimTranslationMultiplier;
translation[1] += gCurrAnimData[retrieve_animation_index(gCurrAnimFrame, &gCurrAnimAttribute)] * gCurrAnimTranslationMultiplier;
@@ -712,8 +711,8 @@ void geo_process_animated_part(struct GraphNodeAnimatedPart *node) {
* Render an animated part that has an initial rotation value
*/
void geo_process_bone(struct GraphNodeBone *node) {
Vec3s rotation = {node->rotation[0], node->rotation[1], node->rotation[2] };
Vec3f translation = {node->translation[0], node->translation[1], node->translation[2]};
Vec3s rotation = { node->rotation[0], node->rotation[1], node->rotation[2] };
Vec3f translation = { node->translation[0], node->translation[1], node->translation[2] };
if (gCurrAnimType == ANIM_TYPE_TRANSLATION) {
translation[0] += gCurrAnimData[retrieve_animation_index(gCurrAnimFrame, &gCurrAnimAttribute)] * gCurrAnimTranslationMultiplier;