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

Implemented oval clipping suggestions, and player boundry

Browse source
This commit is contained in:
Weston Salinas 2023-03-27 16:10:32 -05:00
parent e654225970
commit 0642146034
2 changed files with 37 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/physics/rigid_body.c
View file

@ -109,9 +109,20 @@ int rigidBodyCheckPortals(struct RigidBody* rigidBody) {
int mask = (RigidBodyFlagsInFrontPortal0 << i); int mask = (RigidBodyFlagsInFrontPortal0 << i);
if (localPoint.z < 0.0f) { if (rigidBody->flags & RigidBodyIsPlayer){
newFlags |= mask; if (localPoint.z < -PLAYER_PORTAL_ENTRY_Z_DISTANCE && i==0) {
newFlags |= mask;
}
else if (localPoint.z < PLAYER_PORTAL_ENTRY_Z_DISTANCE && i==1) {
newFlags |= mask;
}
} }
else{
if (localPoint.z < 0.0f) {
newFlags |= mask;
}
}
if (!((RigidBodyIsTouchingPortalA << i) & rigidBody->flags) && !((RigidBodyWasTouchingPortalA << i) & rigidBody->flags)) { if (!((RigidBodyIsTouchingPortalA << i) & rigidBody->flags) && !((RigidBodyWasTouchingPortalA << i) & rigidBody->flags)) {
continue; continue;
@ -177,8 +188,26 @@ void rigidBodyTeleport(struct RigidBody* rigidBody, struct Transform* from, stru
transformPointInverseNoScale(from, &rigidBody->transform.position, &localPoint); transformPointInverseNoScale(from, &rigidBody->transform.position, &localPoint);
localPoint.x = clampf(localPoint.x, -0.1, 0.1); //clamping the x and y of local point to a slightly smaller oval on the output portal
localPoint.y = clampf(localPoint.y, -0.2, 0.2); struct Vector3 clampedLocalPoint;
clampedLocalPoint = localPoint;
clampedLocalPoint.y /= 2.0f;
clampedLocalPoint.z = 0.0f;
while(sqrtf(vector3MagSqrd(&clampedLocalPoint))>PORTAL_EXIT_XY_CLAMP_DISTANCE){
vector3Scale(&clampedLocalPoint, &clampedLocalPoint, 0.90f);
}
clampedLocalPoint.y *= 2.0f;
localPoint.y = clampedLocalPoint.y;
localPoint.x = clampedLocalPoint.x;
//the to portal will teleport the player slightly in front of it. (altering the z)
if (rigidBody->flags & RigidBodyIsPlayer){
if (localPoint.z >= 0){
localPoint.z = minf(localPoint.z, -PLAYER_PORTAL_EXIT_Z_DISTANCE);
}else{
localPoint.z = maxf(localPoint.z, PLAYER_PORTAL_EXIT_Z_DISTANCE);
}
}
transformPoint(to, &localPoint, &rigidBody->transform.position); transformPoint(to, &localPoint, &rigidBody->transform.position);

5
src/physics/rigid_body.h
View file

@ -10,7 +10,10 @@
#define RIGID_BODY_NO_ROOM 0xFFFF #define RIGID_BODY_NO_ROOM 0xFFFF
#define MAX_PORTAL_SPEED (1000.0f / 64.0f) #define MAX_PORTAL_SPEED (500.0f / 64.0f)
#define PLAYER_PORTAL_ENTRY_Z_DISTANCE (0.05f)
#define PLAYER_PORTAL_EXIT_Z_DISTANCE (0.07f)
#define PORTAL_EXIT_XY_CLAMP_DISTANCE (0.07f)
enum RigidBodyFlags { enum RigidBodyFlags {
RigidBodyFlagsInFrontPortal0 = (1 << 0), RigidBodyFlagsInFrontPortal0 = (1 << 0),