diff options
| author | MegaMech <MegaMech@users.noreply.github.com> | 2025-11-09 19:07:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-09 19:07:44 -0700 |
| commit | de9c5d510175bba11ab8704e67be3a3a94f9149e (patch) | |
| tree | 34c42dbfe9f2a6eb5fbce5f6a31b532ff2a3f243 /src/camera.c | |
| parent | 760fa3bf5226c2a6052a5d4d53fd0e27f2911e60 (diff) | |
Implement SpawnParams struct (#536)
* Impl SpawnParams
* Added json submodule
* Update json
* Update
* Works
* Remove comment
* Works refactor
* Snowman and thwomp working
* Impl hot air balloon
* More progress
* All OObjects are done
* cleanup
* Refactor 2Dpath to normal path
* Update nlohmann json & fix compile
* Rest of actors
* MORE CHANGES
* Finish actors
* Done PR, some fix to collision viewer
* Impl falling rocks
* Add const
* wip editor refactor
* Property work
* continue
* Overridable editor properties
* Actor saving/loading works now
* Fix light alignment
* Clarification
* Impl penguin
* params impl signs
* properties impl falling rock
* More property impls
* impl air balloon
* Add spawnParams to OObject Translate
* Snowman translate better
* impl hedgehog properly
* properties impl trophy
* thwomp progress
* Finish impl properties
* Fix compile
* Fix cursor collisions
* Move registered actors
* Rename pathPoint XYZ to xyz
* Fix editor pause bug
* Clean up
* Review comments
* Remove SpawnParams struct from actor classes
* Rename
* Player Label First Iteration
* Work now
* Working 3d text
* Fix boo bug
* Finish AText actor
* Fix spawnparams compile
* Register AText
* Finish Text Actor
* Fix thwomp interpolation
* Fix compile
* Fix crab and hedgehog
* Fix loading flagpole
* Fix Hot Air Balloon
* Turn zbuffer on for AText
* Update
---------
Co-authored-by: MegaMech <7255464+MegaMech@users.noreply.github.com>
Diffstat (limited to 'src/camera.c')
| -rw-r--r-- | src/camera.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/camera.c b/src/camera.c index 0d61e54aa..ddae9302a 100644 --- a/src/camera.c +++ b/src/camera.c @@ -377,10 +377,10 @@ void func_8001CA78(UNUSED Player* player, Camera* camera, Vec3f arg2, f32* arg3, if (IsToadsTurnpike()) { var_f14 = sp5C[0]; } else { - var_f14 = sp5C[0] + temp_s2->posX; + var_f14 = sp5C[0] + temp_s2->x; } temp_f16 = D_80165230[7] + sp5C[2]; - temp_f18 = sp5C[1] + (temp_s2->posY + D_80164A30); + temp_f18 = sp5C[1] + (temp_s2->y + D_80164A30); arg2[0] += (var_f14 - camera->lookAt[0]) * 1; arg2[1] += (temp_f18 - camera->lookAt[1]) * 1; arg2[2] += (temp_f16 - camera->lookAt[2]) * 1; @@ -388,10 +388,10 @@ void func_8001CA78(UNUSED Player* player, Camera* camera, Vec3f arg2, f32* arg3, if (IsToadsTurnpike()) { var_f14 = sp68[0]; } else { - var_f14 = sp68[0] + temp_s2->posX; + var_f14 = sp68[0] + temp_s2->x; } temp_f16 = D_80165230[7] + sp68[2]; - temp_f18 = sp68[1] + (temp_s2->posY + D_80164A30 + 6.0f); + temp_f18 = sp68[1] + (temp_s2->y + D_80164A30 + 6.0f); move_f32_towards(&D_80164A30, 0, 0.02f); posX = camera->pos[0]; *arg3 = ((var_f14 - posX) * 1) + posX; @@ -1113,8 +1113,7 @@ void func_8001EE98(Player* player, Camera* camera, s8 index) { func_8001E8E8(camera, player, index); break; } - freecam(camera, player, index); // Runs func_8001E45C when freecam is disabled - //func_8001E45C(camera, player, index); + func_8001E45C(camera, player, index); break; case 8: // Transition start func_8001E0C4(camera, player, index); |