Archive/Portal64
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix portal being placed outside of surfaces

Browse source
This commit is contained in:
James Lambert 2023-12-04 19:49:30 -07:00
parent 45e0ba4176
commit a42f8d154c
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main.c
View file

@ -247,7 +247,7 @@ static void gameProc(void* arg) {
savefileLoad();
levelLoadWithCallbacks(INTRO_MENU);
levelLoadWithCallbacks(1);
gCurrentTestSubject = 0;
cutsceneRunnerReset();
controllersInit();

20
src/scene/portal_surface.c
View file

@ -272,7 +272,8 @@ int portalSurfaceAdjustPosition(struct PortalSurface* surface, struct Transform*
for (iteration = 0; iteration < MAX_POS_ADJUST_ITERATIONS; ++iteration) {
int minOverlap = PORTAL_SURFACE_OVERLAP;
struct Vector2s16 minOverlapOffset;
int minIsOutside = 0;
struct Vector2s16 minOverlapOffset = {{{0, 0}}};
struct Vector2s16 portalMin;
portalMin.x = output->x - halfSize.x;
@ -310,40 +311,49 @@ int portalSurfaceAdjustPosition(struct PortalSurface* surface, struct Transform*
vector2s16Sub(&b, &a, &edgeDir);
struct Vector2s16 offset;
int distance = edgeDir.y >= 0 ? portalMax.x - edgeMin.x : PORTAL_SURFACE_OVERLAP;
int distance = portalMax.x - edgeMin.x;
int isOutside = edgeDir.y < 0;
offset.x = -distance;
offset.y = 0;
int distanceCheck = edgeMax.x - portalMin.x;
if (distanceCheck < distance && edgeDir.y <= 0) {
if (distanceCheck < distance) {
distance = distanceCheck;
offset.x = distance;
offset.y = 0;
isOutside = edgeDir.y > 0;
}
distanceCheck = portalMax.y - edgeMin.y;
if (distanceCheck < distance && edgeDir.x <= 0) {
if (distanceCheck < distance) {
distance = distanceCheck;
offset.x = 0;
offset.y = -distance;
isOutside = edgeDir.x > 0;
}
distanceCheck = edgeMax.y - portalMin.y;
if (distanceCheck < distance && edgeDir.x >= 0) {
if (distanceCheck < distance) {
distance = distanceCheck;
offset.x = 0;
offset.y = distance;
isOutside = edgeDir.x < 0;
}
if (distance < minOverlap) {
minOverlap = distance;
minIsOutside = isOutside;
minOverlapOffset = offset;
}
}
if (minIsOutside) {
return 0;
}
if (minOverlap == PORTAL_SURFACE_OVERLAP) {
break;
}