sm64-mirrors/sm64ex-alo
1
0
Fork 0
mirror of https://github.com/AloUltraExt/sm64ex-alo.git synced 2025-01-23 08:02:14 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

puppycamera jittering fix, disable mouse by default

Browse source
This commit is contained in:
AloXado320 2021-09-06 19:38:02 -05:00
parent 38ccdd05a0
commit 8cae89c374
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/extras/bettercamera.c
View file

@ -1097,8 +1097,10 @@ void puppycam_projection_behaviours(void)
//This is the base floor height when stood on the ground. It's used to set a baseline for where the camera sits while Mario remains a height from this point, so it keeps a consistent motion.
gPuppyCam.targetFloorHeight = CLAMP(find_floor_height(gPuppyCam.targetObj->oPosX, gPuppyCam.targetObj->oPosY, gPuppyCam.targetObj->oPosZ), gPuppyCam.targetObj->oPosY-PUPPYCAM_FLOOR_DIST_DOWN, gPuppyCam.targetObj->oPosY+PUPPYCAM_FLOOR_DIST_UP);
//if (gMarioState->vel[1] <= 0.0f)
gPuppyCam.lastTargetFloorHeight = CLAMP(approach_f32_asymptotic(gPuppyCam.lastTargetFloorHeight,gPuppyCam.targetFloorHeight, 0.1f), gPuppyCam.targetObj->oPosY-PUPPYCAM_FLOOR_DIST_DOWN, gPuppyCam.targetObj->oPosY+PUPPYCAM_FLOOR_DIST_UP);
gPuppyCam.lastTargetFloorHeight = approach_f32_asymptotic(gPuppyCam.lastTargetFloorHeight
, gPuppyCam.targetFloorHeight
, CLAMP((absf(gMarioState->vel[1]) - 17.f) / 200.f, 0, 0.1f)
+ CLAMP((absf(gPuppyCam.targetFloorHeight - gPuppyCam.lastTargetFloorHeight) - 30.f) / 300.f, 0, 0.1f));
if (gMarioState->action == ACT_SLEEPING || gMarioState->action == ACT_START_SLEEPING)
gPuppyCam.zoom = approach_f32_asymptotic(gPuppyCam.zoom,gPuppyCam.zoomPoints[0],0.01f);

4
src/pc/configfile.c
View file

@ -93,7 +93,7 @@ bool configPrecacheRes = true;
#endif
#ifdef MOUSE_ACTIONS
bool configMouse = true;
bool configMouse = false;
#endif
#ifdef DISCORDRPC
@ -108,7 +108,7 @@ bool configHUD = true;
bool configEnableCamera = true;
bool configCameraAnalog = false;
#ifdef MOUSE_ACTIONS
bool configCameraMouse = true;
bool configCameraMouse = false;
#endif
bool configCameraInvertX = true;
bool configCameraInvertY = true;