mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 14:20:11 +00:00
Code Issues Projects Releases Wiki Activity

z_bgcheck.c, 800430A0.c, 80043480.c (#256)

Browse source 
* beginning of migrating changes

* got matching

* changed order a bit

* clean up bgcheck

* fix conflict

* fix conflict again

* first stab at identifying types, some oks

* Clean up most bad structs/pointer math, move relevant structs to z64bgcheck.h, get some OKs

* more OKs, z_bgcheck.bss migration, update some sys_math3d.c args

* couple more OKs

* pushing some OKs

* fix compilation issues

* code_800430A0.c OK, more files decomp'd

* 8003A3E0 big OK :)

* Decomp most of func_8003C614, decomp helper funcs

* Decomp SurfaceType, CamData, and WaterBox property related functions

* more OKs, big OK in 8003C078

* more OKs, more progress, move a function definition in z_collision_check to functions.h

* more clean-ups, more OKs, dyn_vtx is now defined as u8*

* 8003A5B8, 8003A7D8, 8003C614, 8003DD6C OK, document function args better

* data migrated, more OKs

* 80041240 OK, func_8003B3C8 and func_8003BB18 disassembled

* func_80040284, 800409A8 non_matching, add IS_ZERO macro

* All asm files have C representations, some big OKs, lots of minor tweaks

* More OKs, non-matching code cleanup

* 8003FBF4 and 80040BE4 OK, improve codegen for most functions

* format z_bgcheck.c

* fix warnings, compile errors on NON_MATCHING

* func_8003EE80 is now NON_MATCHING

* begin documenting some functions

* formatting

* more documentation, func_8003A95C OK

* fix PHYSICAL_TO_VIRTUAL changes

* fix var rename

* More documentation, functions 80040E40, 80041648 OK, change types to not be compatible with ZAP

* func_8004239C ok, more NON_MATCHING improvements, more documentation

* Implement most suggested changes

* Convert comments to slower comments

* /**

* Implement ZAP2 changes

* my anti-virus ate my format.sh results

* Rename a couple hundred functions, fix minor stuff

* rename var so that clang formats correctly

* run format.sh

* implement Petrie's matches/suggestions

* format

* matches

* and the asm

* slight error

* Add SSList

* two more matches

* stuff

* implement code changes

* clean up Petrie's matchings

Co-authored-by: Arthur <arthurtilly413@gmail.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
This commit is contained in:
mzxrules 2021-01-08 06:12:58 -05:00 • committed by GitHub
parent 209f0d21b8
commit 3cef03f5ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
416 changed files with 6610 additions and 13487 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c
View file

@ -313,7 +313,7 @@ void MirRay_SetupReflectionPolys(MirRay* this, GlobalContext* globalCtx, MirRayS
posB.x = sp60.x + posA.x;
posB.y = sp60.y + posA.y;
posB.z = sp60.z + posA.z;
if (func_8003E0B8(&globalCtx->colCtx, &posA, &posB, &posResult, &outPoly, 1)) {
if (BgCheck_AnyLineTest1(&globalCtx->colCtx, &posA, &posB, &posResult, &outPoly, 1)) {
reflection[i].reflectionPoly = outPoly;
} else {
reflection[i].reflectionPoly = NULL;
@ -330,9 +330,9 @@ void MirRay_RemoveSimilarReflections(MirRayShieldReflection* reflection) {
for (j = i + 1; j < 6; j++) {
if (reflection[i].reflectionPoly != NULL) {
if ((reflection[j].reflectionPoly != NULL) &&
(ABS(reflection[i].reflectionPoly->norm.x - reflection[j].reflectionPoly->norm.x) < 100) &&
(ABS(reflection[i].reflectionPoly->norm.y - reflection[j].reflectionPoly->norm.y) < 100) &&
(ABS(reflection[i].reflectionPoly->norm.z - reflection[j].reflectionPoly->norm.z) < 100) &&
(ABS(reflection[i].reflectionPoly->normal.x - reflection[j].reflectionPoly->normal.x) < 100) &&
(ABS(reflection[i].reflectionPoly->normal.y - reflection[j].reflectionPoly->normal.y) < 100) &&
(ABS(reflection[i].reflectionPoly->normal.z - reflection[j].reflectionPoly->normal.z) < 100) &&
(reflection[i].reflectionPoly->dist == reflection[j].reflectionPoly->dist)) {
reflection[j].reflectionPoly = NULL;
}
@ -386,9 +386,9 @@ void MirRay_ReflectedBeam(MirRay* this, GlobalContext* globalCtx, MirRayShieldRe
for (i = 0; i < 6; i++) {
currentReflection = &reflection[i];
if (currentReflection->reflectionPoly != NULL) {
normalVec.x = currentReflection->reflectionPoly->norm.x * COLPOLY_NORM_FRAC;
normalVec.y = currentReflection->reflectionPoly->norm.y * COLPOLY_NORM_FRAC;
normalVec.z = currentReflection->reflectionPoly->norm.z * COLPOLY_NORM_FRAC;
normalVec.x = COLPOLY_GET_NORMAL(currentReflection->reflectionPoly->normal.x);
normalVec.y = COLPOLY_GET_NORMAL(currentReflection->reflectionPoly->normal.y);
normalVec.z = COLPOLY_GET_NORMAL(currentReflection->reflectionPoly->normal.z);
if (Math3D_LineSegVsPlane(normalVec.x, normalVec.y, normalVec.z, currentReflection->reflectionPoly->dist,
&vecB, &vecD, &sp118, 1)) {