mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-09-21 12:54:51 +00:00
Code Issues Projects Releases Wiki Activity

better match (#1409)

Browse Source
This commit is contained in:
engineer124 2022-10-14 18:53:11 -04:00 committed by GitHub
parent f82b9bd208
commit d624733bf9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c
View File

@ -375,7 +375,6 @@ void MirRay_ReflectedBeam(MirRay* this, PlayState* play, MirRayShieldReflection*
MtxF* shieldMtx; MtxF* shieldMtx;
Vec3f vecA; Vec3f vecA;
Vec3f vecC; Vec3f vecC;
MirRayShieldReflection* currentReflection;
shieldMtx = &player->shieldMf; shieldMtx = &player->shieldMf;
@ -402,25 +401,24 @@ void MirRay_ReflectedBeam(MirRay* this, PlayState* play, MirRayShieldReflection*
Collider_SetQuadVertices(&this->shieldRay, &vecA, &vecB, &vecC, &vecD); Collider_SetQuadVertices(&this->shieldRay, &vecA, &vecB, &vecC, &vecD);
for (i = 0; i < 6; i++) { for (i = 0; i < 6; i++) {
currentReflection = &reflection[i]; if (reflection[i].reflectionPoly != NULL) {
if (currentReflection->reflectionPoly != NULL) { polyNormal[0] = COLPOLY_GET_NORMAL(reflection[i].reflectionPoly->normal.x);
polyNormal[0] = COLPOLY_GET_NORMAL(currentReflection->reflectionPoly->normal.x); polyNormal[1] = COLPOLY_GET_NORMAL(reflection[i].reflectionPoly->normal.y);
polyNormal[1] = COLPOLY_GET_NORMAL(currentReflection->reflectionPoly->normal.y); polyNormal[2] = COLPOLY_GET_NORMAL(reflection[i].reflectionPoly->normal.z);
polyNormal[2] = COLPOLY_GET_NORMAL(currentReflection->reflectionPoly->normal.z);
if (Math3D_LineSegVsPlane(polyNormal[0], polyNormal[1], polyNormal[2], if (Math3D_LineSegVsPlane(polyNormal[0], polyNormal[1], polyNormal[2], reflection[i].reflectionPoly->dist,
currentReflection->reflectionPoly->dist, &vecB, &vecD, &sp118, 1)) { &vecB, &vecD, &sp118, 1)) {
currentReflection->pos.x = sp118.x; reflection[i].pos.x = sp118.x;
currentReflection->pos.y = sp118.y; reflection[i].pos.y = sp118.y;
currentReflection->pos.z = sp118.z; reflection[i].pos.z = sp118.z;
temp_f0 = sqrtf(SQ(sp118.x - vecB.x) + SQ(sp118.y - vecB.y) + SQ(sp118.z - vecB.z)); temp_f0 = sqrtf(SQ(sp118.x - vecB.x) + SQ(sp118.y - vecB.y) + SQ(sp118.z - vecB.z));
if (temp_f0 < (this->reflectIntensity * 600.0f)) { if (temp_f0 < (this->reflectIntensity * 600.0f)) {
currentReflection->opacity = 200; reflection[i].opacity = 200;
} else { } else {
currentReflection->opacity = (s32)(800.0f - temp_f0); reflection[i].opacity = (s32)(800.0f - temp_f0);
} }
sp10C.x = (shieldMtx->xx * 100.0f) + vecB.x; sp10C.x = (shieldMtx->xx * 100.0f) + vecB.x;
@ -431,25 +429,18 @@ void MirRay_ReflectedBeam(MirRay* this, PlayState* play, MirRayShieldReflection*
sp100.y = (spE8[1] * 4.0f) + sp10C.y; sp100.y = (spE8[1] * 4.0f) + sp10C.y;
sp100.z = (spE8[2] * 4.0f) + sp10C.z; sp100.z = (spE8[2] * 4.0f) + sp10C.z;
currentReflection->mtx.zw = 0.0f; reflection[i].mtx.zw = 0.0f;
if (1) {} reflection[i].mtx.xx = reflection[i].mtx.yy = reflection[i].mtx.zz = reflection[i].mtx.ww = 1.0f;
if (1) {} reflection[i].mtx.yx = reflection[i].mtx.zx = reflection[i].mtx.wx = reflection[i].mtx.xy =
if (1) {} reflection[i].mtx.zy = reflection[i].mtx.wy = reflection[i].mtx.xz = reflection[i].mtx.yz =
if (1) {} // All four required to match reflection[i].mtx.wz = reflection[i].mtx.xw = reflection[i].mtx.yw = reflection[i].mtx.zw;
currentReflection->mtx.xx = currentReflection->mtx.yy = currentReflection->mtx.zz =
currentReflection->mtx.ww = 1.0f;
currentReflection->mtx.yx = currentReflection->mtx.zx = currentReflection->mtx.wx =
currentReflection->mtx.xy = currentReflection->mtx.zy = currentReflection->mtx.wy =
currentReflection->mtx.xz = currentReflection->mtx.yz = currentReflection->mtx.wz =
currentReflection->mtx.xw = currentReflection->mtx.yw = currentReflection->mtx.zw;
if (Math3D_LineSegVsPlane(polyNormal[0], polyNormal[1], polyNormal[2], if (Math3D_LineSegVsPlane(polyNormal[0], polyNormal[1], polyNormal[2],
currentReflection->reflectionPoly->dist, &sp10C, &sp100, &intersection, 1)) { reflection[i].reflectionPoly->dist, &sp10C, &sp100, &intersection, 1)) {
currentReflection->mtx.xx = intersection.x - sp118.x; reflection[i].mtx.xx = intersection.x - sp118.x;
currentReflection->mtx.yx = intersection.y - sp118.y; reflection[i].mtx.yx = intersection.y - sp118.y;
currentReflection->mtx.zx = intersection.z - sp118.z; reflection[i].mtx.zx = intersection.z - sp118.z;
} }
sp10C.x = (shieldMtx->xy * 100.0f) + vecB.x; sp10C.x = (shieldMtx->xy * 100.0f) + vecB.x;
@ -461,13 +452,13 @@ void MirRay_ReflectedBeam(MirRay* this, PlayState* play, MirRayShieldReflection*
sp100.z = (spE8[2] * 4.0f) + sp10C.z; sp100.z = (spE8[2] * 4.0f) + sp10C.z;
if (Math3D_LineSegVsPlane(polyNormal[0], polyNormal[1], polyNormal[2], if (Math3D_LineSegVsPlane(polyNormal[0], polyNormal[1], polyNormal[2],
currentReflection->reflectionPoly->dist, &sp10C, &sp100, &intersection, 1)) { reflection[i].reflectionPoly->dist, &sp10C, &sp100, &intersection, 1)) {
currentReflection->mtx.xy = intersection.x - sp118.x; reflection[i].mtx.xy = intersection.x - sp118.x;
currentReflection->mtx.yy = intersection.y - sp118.y; reflection[i].mtx.yy = intersection.y - sp118.y;
currentReflection->mtx.zy = intersection.z - sp118.z; reflection[i].mtx.zy = intersection.z - sp118.z;
} }
} else { } else {
currentReflection->reflectionPoly = NULL; reflection[i].reflectionPoly = NULL;
} }
} }
} }