print_n_panic/Microtransactions64
0
0
Fork 0
mirror of https://github.com/Print-and-Panic/Microtransactions64.git synced 2026-01-21 10:17:19 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #44 from aglab2/smooth-y-pupper

Browse Source 
Puppycam: use softer clamp for Y movement
This commit is contained in:
Fazana
2021-08-29 10:24:44 +01:00
committed by GitHub
parent 60612ff1ec 52f3b08a6f
commit 19b49f3f37
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/game/puppycam2.c
View File

@@ -27,6 +27,15 @@
#ifdef PUPPYCAM
static inline float smooth(float x) {
x = CLAMP(x, 0, 1);
return x * x * (3.f - 2.f * x);
}
static inline float softClamp(float x, float a, float b) {
return smooth((2.f / 3.f) * (x - a) / (b - a) + (1.f / 6.f)) * (b - a) + a;
}
#define DECELERATION 0.66f
#define DEADZONE 20
#define SCRIPT_MEMORY_POOL 0x1000
@@ -1164,8 +1173,8 @@ void puppycam_projection_behaviours(void)
if (!(gMarioState->action & ACT_FLAG_SWIMMING))
{
gPuppyCam.floorY[0] = CLAMP(gPuppyCam.targetObj->oPosY - gPuppyCam.lastTargetFloorHeight, -300, 300);
gPuppyCam.floorY[1] = CLAMP(gPuppyCam.targetObj->oPosY - gPuppyCam.lastTargetFloorHeight, -300, 350);
gPuppyCam.floorY[0] = softClamp(gPuppyCam.targetObj->oPosY - gPuppyCam.lastTargetFloorHeight, -180, 300);
gPuppyCam.floorY[1] = softClamp(gPuppyCam.targetObj->oPosY - gPuppyCam.lastTargetFloorHeight, -180, 350);
gPuppyCam.swimPitch = approach_f32_asymptotic(gPuppyCam.swimPitch,0,0.2f);
}
else