diff options
| author | mattias-blum <142374929+mattias-blum@users.noreply.github.com> | 2025-03-28 14:17:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-28 14:17:21 -0400 |
| commit | d945c14cacc7ab92f903d623c8dabafb53481933 (patch) | |
| tree | cebc43d9a10b1c2bc4ccb0683928d6f22c260c77 /src/d/d_particle.cpp | |
| parent | 4a2d7dd320bb9d5b479d58dfe2338f34f1cf4dc5 (diff) | |
d_a_ship 95% (#706)
* Initial Progress
Basic functions at 100% matching
100% Matching:
- `daShip_Draw`
- `daShip_Execute`
- `daShip_IsDelete`
- `daShip_Delete`
- `daShip_createHeap`
- `daShip_Create`
* implemented `getJointPos` inlines in `daTornado_c` needed for d_a_ship
* implemented `Center()` inline in `dCamera_c` needed for d_a_ship
* added `setTranslationX` inline to `J3DTexMtx` needed for match in d_a_ship
* parameters set to `const` for certain inlines in `m_Do_mtx.h`
* added `dComIfGp_onMenuCollect` inline
* changed `shipSpecialDemoStart` return type to `BOOL`
* added member functions to `dPa_waveEcallBack`, `dPa_splashEcallBack `, `dPa_trackEcallBack`
also modified member type of `mRotMtx` of `dPa_waveEcallBack` and `mPos` of `dPa_trackEcallBack`
* added member to `daGrid_c` that is used in d_a_ship
* added `mDoAud_setShipSailState` and `mDoAud_shipCruiseSePlay` inline functions
* added `fopAcM_seenPlayerAngleY` inline
* d_a_ship mostly matching
approx. 90% matching, mostly regalloc issues. , `checkNextMode`, `setRopePos`, `setHeadAnm`, and `execute` need to have their logic fixer
* replace `unknown_inline_TODO ` from `daShip_c` with `checkForceMove`
* .data match
* .rodata matching
* more inline return type changes from `bool` to `BOOL`
Also changed the array size of `mPlayerStatus`
* implemented `force_calc_wind_rel_angle` inline in `daGrid_c`
* fix `d_a_ship_static`
* fixed `getEmitterAxis`, might need review but works for now
* more progress
* reverted change to `getEmitterAxis`, moved casts to function call in `dPa_waveEcallBack::executeAfter`
* more progress
* change return types of certain inlines from `BOOL` to `u32`
`dComIfGp_checkCameraAttentionStatus`, `dComIfGp_checkPlayerStatus0`, `dComIfGp_checkPlayerStatus1` needed for match in d_a_ship
* fixed memory addresses in `daGrid_c`
* more progress
* resolving symbols
* Initial PR changes
* Removed unnecessary cast
* replaced instances of `PSVECSquareMag` with corresponding inline functions
* update memory layout in `d_a_grid` for consistency
* More PR changes
`checkNextMode` and `procZevDemo` now at 100% matching
Diffstat (limited to 'src/d/d_particle.cpp')
| -rw-r--r-- | src/d/d_particle.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/d/d_particle.cpp b/src/d/d_particle.cpp index 3bc9ff02..e81e5b8a 100644 --- a/src/d/d_particle.cpp +++ b/src/d/d_particle.cpp @@ -984,7 +984,7 @@ void dPa_waveEcallBack::remove() { /* 8007E2BC-8007E484 .text executeAfter__17dPa_waveEcallBackFP14JPABaseEmitter */ void dPa_waveEcallBack::executeAfter(JPABaseEmitter* emitter) { - emitter->getEmitterAxis(mRotMtx[0], mRotMtx[1], mRotMtx[2]); + emitter->getEmitterAxis(reinterpret_cast<JGeometry::TVec3<f32>&>(mRotMtx[0]), reinterpret_cast<JGeometry::TVec3<f32>&>(mRotMtx[1]), reinterpret_cast<JGeometry::TVec3<f32>&>(mRotMtx[2])); if (mState != 0) { emitter->setDirectionalSpeed(0.0f); |
