mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-27 23:36:22 +00:00
Code Issues Projects Releases Wiki Activity

Restructuring Camera Structs and Related Macros (#1108)

Browse source 
* Proof-of-concept

* small cleanup

* static to fixed

* Update to new names

* Use full names for structs

* Update comments

* PR 1

* More macro changes

* More PR Suggestions

* Use a union for funcData

* Apply change to all cam structs

* typedef union outside of cam struct

* Add size

* typedef union, not struct

* funcData -> paramData

* Better manage doorParams
This commit is contained in:
engineer124 2022-05-09 07:35:54 +10:00 committed by GitHub
parent 74bed3ec9b
commit 7da841fcc9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2000 additions and 1765 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

708
include/z64camera.h
View file

File diff suppressed because it is too large Load diff

3053
src/code/z_camera.c
View file

File diff suppressed because it is too large Load diff

4
src/code/z_onepointdemo.c
View file

@ -48,7 +48,7 @@ f32 OnePointCutscene_RaycastFloor(CollisionContext* colCtx, Vec3f* pos) {
void OnePointCutscene_SetCsCamPoints(Camera* camera, s16 actionParameters, s16 initTimer, CutsceneCameraPoint* atPoints,
CutsceneCameraPoint* eyePoints) {
OnePointCsCamera* onePointCamData = (OnePointCsCamera*)&camera->paramData;
OnePointCamData* onePointCamData = &camera->paramData.demo9.onePointCamData;
onePointCamData->atPoints = atPoints;
onePointCamData->eyePoints = eyePoints;
@ -68,7 +68,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act
PosRot spA0;
PosRot sp8C;
f32 tempRand;
Unique9OnePointCs* csInfo = ONEPOINT_CS_INFO(csCam);
OnePointCsInfo* csInfo = &csCam->paramData.uniq9.csInfo;
switch (csId) {
case 1020: