From 7743e5a2c4b6d01c847dea8929c707e65e5e18b3 Mon Sep 17 00:00:00 2001 From: Tharo <17233964+Thar0@users.noreply.github.com> Date: Wed, 4 Aug 2021 04:21:31 +0100 Subject: Overhaul the build system (#234) * wip * fix * add disassembler * Disasm builds OK * Variable addends * More wip * Rodata migration implemented * Cleanup old tools * Try fix submodule -> subrepo merge * git subrepo pull --force --remote=https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "602e609" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "602e609" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Builds again but assets are totally broken * git subrepo pull --force tools/asm-processor subrepo: subdir: "tools/asm-processor" merged: "1ffdb08a" upstream: origin: "https://github.com/simonlindholm/asm-processor.git" branch: "master" commit: "1ffdb08a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * More cleanup, move functions.txt and variables.txt to tools/disasm and rm tables * rm z64compress in preparation for subrepo * git subrepo clone (merge) https://github.com/z64me/z64compress.git tools/z64compress subrepo: subdir: "tools/z64compress" merged: "eb11085c" upstream: origin: "https://github.com/z64me/z64compress.git" branch: "main" commit: "eb11085c" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Fix asset extraction * Fix diff-init make rule * Split code bss * Split assumed linker bug padding from assembly files * add filelists for mm.us.rev1 * Maybe working, but I'm not sure * add overlays to spec * Add rodata to actos * Everything compiles * Make a lot of C files for code * Add almost every file in code to spec * whoops * 3 code files left * add scenes to spec * More progress on progress.py * Fix skelanime in spec * audio files! * Fix merge issues * Fix some C files in code * Fix remaining code files * Use existing O1 C files in spec * reorder boot order in spec * update spec * fault.c * Convert relocs on completed actors, fixbaserom uses current rom name * more boot files * Add VT macros and script * finish already existing boot files * most of libultra * fix 64bits libultra files * Use C files for libultra, wrap some functions in NON_MATCHING * Remove duplicate of OS_CLOCK_RATE from fault.c * C files for fbdemos * delete dumb files * bootstrap C files, still need to add them to the spec * update fixbaserom * boot OK? * I forgot to commit the spec * C for gamestates * C for kaleido * Change all includes to "" * copy actor sizes script from oot * I forgot to delete those files * Basic C files for effects * Add effects initvars names * Remove mislabelled boot functions from header/txt * Begin porting bootstrap_fx, some sizes * Fix <> * Fix enum * Fix diff.py * fix libultra stuff * update regconvert * update setup warnings * add some missing ; * Fix some makefile stuff and other fixes on some non_matching functions * add executable flag in extract_baserom and fixbaserom * fix relative path * copy assist from oot * fix map path * another assist path fix * Delete C files for handwritten files * add code_801A51F0 to spec * add gfxbuffers to spec * Move rodata to top of each file when possible * UNK_TYPEs for func_801A51F0 * Remove kaleido rodata from spec * Update spec and undefined_syms for recent merge * GCC warnings and fix errors in nonmatchings, * round percentage numbers * progress script: format changes * progress: error on non-existing files * fix warning in z_scene_table * Match 2 nonmatchings in z_actor * Warnings in lightswitch and invadepoh * Fix warning in z_actor_dlftbls * I though I fixed this one * whoops * Comment out CC_CHECK * Removed redundant ultra64.h includes * Update asm_processor, sorted boot_O1 into other folders, completed the fbdemo bootstrap, cleaned up undefined_syms * Completed gamestates bootstrap * Split kaleido_scope * Remove section.h and segment.h, move keep object externs to a common location in variables.h * Completed effects bootstrap * Segmented address externs for effects, fbdemos, gamestates and kaleido * Move actor data externs out of the if 0 * Segmented address externs for actors * Prepare actionfunc detection * fix script, how did it even work before * Fix actionfunc script again, re-introduce some more intermediate prints to the disassembler * Automated actionFunc detection in actors * Segmented addresses from player .text * rm old segment addrs script and fix build * Move sizes folder to tools * Make build.py executable * New Jenkinsfile Prayge * Remove numpy dependencies * Add warnings_disasm_current.txt * my bad * Update spec and undefined_syms * Add z_eff_ss_hahen to pametfrog * git subrepo pull (merge) --force tools/z64compress subrepo: subdir: "tools/z64compress" merged: "163ca2af" upstream: origin: "https://github.com/z64me/z64compress.git" branch: "main" commit: "163ca2af" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Make z64compress print to stdout * sneeky commit to update warnings tooling * test * Another test * Mark fixing overlay reloc generating as a TODO * Update warnings stuff * Communicate the return code from running z64compress back to the Makefile through the wrapper * Run formatter, remove extra commented copy of function * Re-fix some includes * Convert atan to hex to conform to decided style * Some tidying up, remove c for fp and the other two handwritten code files * BSS in z_collision_check & z_scene_proc * add static back in * Fix timerintr bss, add file to spec, some cleanup * Remove externs * Newline * Readd enums * Typo * Colours * Comments for hitmark enum values Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Improvements and suggestions * Organize and remove unused imports and use env for python3 scripts, delete unused overlay.py Co-authored-by: angie Co-authored-by: Elliptic Ellipsis Co-authored-by: engineer124 Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> --- src/code/sys_math3d.c | 189 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 189 insertions(+) create mode 100644 src/code/sys_math3d.c (limited to 'src/code/sys_math3d.c') diff --git a/src/code/sys_math3d.c b/src/code/sys_math3d.c new file mode 100644 index 000000000..f607295c1 --- /dev/null +++ b/src/code/sys_math3d.c @@ -0,0 +1,189 @@ +#include "global.h" + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_Normalize.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_80179678.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_80179798.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_80179A44.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_80179B34.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_80179B94.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_80179D74.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_ScaleAndAdd.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_Lerp.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_Parallel.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_AngleBetweenVectors.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_80179F64.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_XZBoundCheck.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017A09C.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017A1D0.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017A304.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017A438.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_XZLengthSquared.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_XZLength.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_XZDistanceSquared.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_XZDistance.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_LengthSquared.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_Vec3fMagnitude.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_DistanceSquared.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_Distance.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_DistanceS.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017A7B8.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017A7F8.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017A838.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_CrossProduct.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_NormalVector.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017A954.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017AA0C.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017ABBC.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017AD38.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017B68C.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017B7F8.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_UnitNormalVector.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_SignedDistanceFromPlane.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017B9D8.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_NormalizedDistanceFromPlane.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_NormalizedSignedDistanceFromPlane.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017BAD0.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017BD98.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017BDE0.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017BE30.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017BEE0.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017BF8C.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017C008.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017C17C.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017C1F0.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017C494.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017C540.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017C808.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017C850.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017C904.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017C980.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017CB08.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017CB7C.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017CEA8.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017CEF0.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017CFA4.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017D020.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017D1AC.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017D220.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017D2FC.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017D404.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_TriSetCoords.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_IsPointInSphere.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017D668.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017D7C0.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017D814.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017D91C.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017DA24.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_ColSphereLineSeg.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017DD34.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_ColSphereTri.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017E294.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017E350.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_ColCylinderTri.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017F1A0.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_ColSphereSphere.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_ColSphereSphereIntersect.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_ColSphereSphereIntersectAndDistance.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_ColSphereCylinderDistance.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_ColSphereCylinderDistanceAndAmount.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_ColCylinderCylinderAmount.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3D_ColCylinderCylinderAmountAndDistance.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/Math3d_ColTriTri.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017F9C0.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017FA34.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017FAA8.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017FB1C.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/sys_math3d/func_8017FD44.s") -- cgit v1.2.3