ihateninjas/OdysseyDecomp
1
0
Fork 0
mirror of https://github.com/MonsterDruide1/OdysseyDecomp synced 2026-04-23 09:04:21 +00:00
Code Issues Actions 17 Packages Projects Releases Wiki Activity

rebase

Browse source
This commit is contained in:
MonsterDruide1 2025-08-26 23:05:20 +02:00
parent 619243b240
commit 302a3e7851
3 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
data/file_list.yml
View file

@ -291011,35 +291011,35 @@ Project/Camera/CameraInterpole.o:
label: label:
- _ZN2al15CameraInterpoleC1Ev - _ZN2al15CameraInterpoleC1Ev
- _ZN2al15CameraInterpoleC2Ev - _ZN2al15CameraInterpoleC2Ev
status: NotDecompiled status: Matching
- offset: 0xa49e24 - offset: 0xa49e24
size: 1088 size: 1088
label: _ZN2al15CameraInterpole5startEPKNS_12CameraTicketEfi label: _ZN2al15CameraInterpole5startEPKNS_12CameraTicketEfi
status: NotDecompiled status: Matching
- offset: 0xa4a264 - offset: 0xa4a264
size: 1876 size: 1876
label: _ZN2al15CameraInterpole6updateERKN4sead12LookAtCameraE label: _ZN2al15CameraInterpole6updateERKN4sead12LookAtCameraE
status: NotDecompiled status: NonMatchingMajor
- offset: 0xa4a9b8 - offset: 0xa4a9b8
size: 36 size: 36
label: _ZNK2al15CameraInterpole8isActiveEv label: _ZNK2al15CameraInterpole8isActiveEv
status: NotDecompiled status: Matching
- offset: 0xa4a9dc - offset: 0xa4a9dc
size: 436 size: 436
label: _ZNK2al15CameraInterpole16makeLookAtCameraEPN4sead12LookAtCameraE label: _ZNK2al15CameraInterpole16makeLookAtCameraEPN4sead12LookAtCameraE
status: NotDecompiled status: Matching
- offset: 0xa4ab90 - offset: 0xa4ab90
size: 76 size: 76
label: _ZN2al15CameraInterpole14lerpFovyDegreeEf label: _ZN2al15CameraInterpole14lerpFovyDegreeEf
status: NotDecompiled status: Matching
- offset: 0xa4abdc - offset: 0xa4abdc
size: 108 size: 108
label: _ZN2al15CameraInterpole11exeDeactiveEv label: _ZN2al15CameraInterpole11exeDeactiveEv
status: NotDecompiled status: Matching
- offset: 0xa4ac48 - offset: 0xa4ac48
size: 360 size: 360
label: _ZN2al15CameraInterpole16exeActiveHermiteEv label: _ZN2al15CameraInterpole16exeActiveHermiteEv
status: NotDecompiled status: Matching
- offset: 0xa4adb0 - offset: 0xa4adb0
size: 520 size: 520
label: '' label: ''
@ -291047,24 +291047,24 @@ Project/Camera/CameraInterpole.o:
- offset: 0xa4afb8 - offset: 0xa4afb8
size: 996 size: 996
label: _ZN2al15CameraInterpole26exeActiveHermiteDistanceHVEv label: _ZN2al15CameraInterpole26exeActiveHermiteDistanceHVEv
status: NotDecompiled status: NonMatchingMajor
- offset: 0xa4b39c - offset: 0xa4b39c
size: 1164 size: 1164
label: _ZN2al15CameraInterpole20exeActiveRotateAxisYEv label: _ZN2al15CameraInterpole20exeActiveRotateAxisYEv
status: NotDecompiled status: NonMatchingMajor
- offset: 0xa4b828 - offset: 0xa4b828
size: 416 size: 416
label: _ZN2al15CameraInterpole16exeActiveBrigadeEv label: _ZN2al15CameraInterpole16exeActiveBrigadeEv
status: NotDecompiled status: Matching
- offset: 0xa4b9c8 - offset: 0xa4b9c8
size: 84 size: 84
label: _ZN2al15CameraInterpoleD2Ev label: _ZN2al15CameraInterpoleD2Ev
status: NotDecompiled status: Matching
lazy: true lazy: true
- offset: 0xa4ba1c - offset: 0xa4ba1c
size: 92 size: 92
label: _ZN2al15CameraInterpoleD0Ev label: _ZN2al15CameraInterpoleD0Ev
status: NotDecompiled status: Matching
lazy: true lazy: true
- offset: 0xa4ba78 - offset: 0xa4ba78
size: 112 size: 112

1
lib/al/Library/Camera/CameraInterpole.cpp
View file

@ -176,7 +176,6 @@ void CameraInterpole::update(const sead::LookAtCamera& camera) {
rotateVectorDegree(&v53, v53, a3, v54[i].x); rotateVectorDegree(&v53, v53, a3, v54[i].x);
rotateVectorDegree(&v53, v53, a1, v54[i].y); rotateVectorDegree(&v53, v53, a1, v54[i].y);
alCameraPoserFunction::CameraCollisionHitResult v52; alCameraPoserFunction::CameraCollisionHitResult v52;
memset(&v52, 0, 24);
v52.mCollisionLocation = 3; v52.mCollisionLocation = 3;
if (alCameraPoserFunction::checkFirstCameraCollisionArrow( if (alCameraPoserFunction::checkFirstCameraCollisionArrow(

6
lib/al/Library/Camera/CameraPoserFunction.h
View file

@ -15,9 +15,9 @@ class PlacementInfo;
namespace alCameraPoserFunction { namespace alCameraPoserFunction {
struct CameraCollisionHitResult { struct CameraCollisionHitResult {
sead::Vector3f mCollisionHitPos; sead::Vector3f mCollisionHitPos = {0.0f, 0.0f, 0.0f};
sead::Vector3f mTriangleNormal; sead::Vector3f mTriangleNormal = {0.0f, 0.0f, 0.0f};
int mCollisionLocation; int mCollisionLocation = 0;
}; };
void getViewIndex(const al::CameraPoser*); void getViewIndex(const al::CameraPoser*);