vrmiguel
/
sm64pc
mirror of https://github.com/sm64pc/sm64pc.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge b71d7d96e1 into 951389ca84

This commit is contained in:
Mips96 2023-12-19 11:30:41 -06:00 committed by GitHub
parent 951389ca84 b71d7d96e1
commit d9244aaf4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 133 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/text_options_strings.h.in
View File

@ -56,6 +56,7 @@
#define TEXT_OPT_AUTO _("AUTO")
#define TEXT_OPT_HUD _("HUD")
#define TEXT_OPT_THREEPT _("THREE POINT")
#define TEXT_OPT_DRAWDIST _("DRAW DISTANCE")
#define TEXT_OPT_APPLY _("APPLY")
#define TEXT_OPT_RESETWND _("RESET WINDOW")
@ -120,6 +121,7 @@
#define TEXT_OPT_AUTO _("Auto")
#define TEXT_OPT_HUD _("HUD")
#define TEXT_OPT_THREEPT _("Three-point")
#define TEXT_OPT_DRAWDIST _("Draw Distance")
#define TEXT_OPT_APPLY _("Apply")
#define TEXT_OPT_RESETWND _("Reset Window")

5
src/engine/behavior_script.c
View File

@ -13,6 +13,9 @@
#include "game/object_list_processor.h"
#include "graph_node.h"
#include "surface_collision.h"
#ifndef NODRAWINGDISTANCE
#include "pc/configfile.h"
#endif
// Macros for retrieving arguments from behavior scripts.
#define BHV_CMD_GET_1ST_U8(index) (u8)((gCurBhvCommand[index] >> 24) & 0xFF) // unused
@ -999,7 +1002,7 @@ void cur_obj_update(void) {
if (!(objFlags & OBJ_FLAG_ACTIVE_FROM_AFAR)) {
// If the object has a render distance, check if it should be shown.
#ifndef NODRAWINGDISTANCE
if (distanceFromMario > gCurrentObject->oDrawingDistance) {
if (distanceFromMario > gCurrentObject->oDrawingDistance * configDrawDistance / 100.0f) {
// Out of render distance, hide the object.
gCurrentObject->header.gfx.node.flags &= ~GRAPH_RENDER_ACTIVE;
gCurrentObject->activeFlags |= ACTIVE_FLAG_FAR_AWAY;

5
src/engine/surface_load.c
View File

@ -14,6 +14,9 @@
#include "game/mario.h"
#include "game/object_list_processor.h"
#include "surface_load.h"
#ifndef NODRAWINGDISTANCE
#include "pc/configfile.h"
#endif
s32 unused8038BE90;
@ -786,7 +789,7 @@ void load_object_collision_model(void) {
}
#ifndef NODRAWINGDISTANCE
if (marioDist < gCurrentObject->oDrawingDistance) {
if (marioDist < gCurrentObject->oDrawingDistance * configDrawDistance / 100.0f) {
#endif
gCurrentObject->header.gfx.node.flags |= GRAPH_RENDER_ACTIVE;
#ifndef NODRAWINGDISTANCE

6
src/game/behaviors/bub.inc.c
View File

@ -1,3 +1,7 @@
#ifndef NODRAWINGDISTANCE
#include "pc/configfile.h"
#endif
// bub.c.inc
// NOTE: These first set of functions spawn a school of bub depending on objF4's
@ -9,7 +13,7 @@ void bub_spawner_act_0(void) {
s32 i;
s32 sp18 = o->oBirdChirpChirpUnkF4;
#ifndef NODRAWINGDISTANCE
if (o->oDistanceToMario < 1500.0f) {
if (o->oDistanceToMario < 15 * configDrawDistance) {
#endif
for (i = 0; i < sp18; i++)
spawn_object(o, MODEL_BUB, bhvBub);

8
src/game/behaviors/chain_chomp.inc.c
View File

@ -1,3 +1,7 @@
#ifndef NODRAWINGDISTANCE
#include "pc/configfile.h"
#endif
/**
* Behavior for bhvChainChomp, bhvChainChompChainPart, bhvWoodenPost, and bhvChainChompGate.
@ -54,7 +58,7 @@ static void chain_chomp_act_uninitialized(void) {
s32 i;
#ifndef NODRAWINGDISTANCE
if (o->oDistanceToMario < 3000.0f) {
if (o->oDistanceToMario < 30 * configDrawDistance) {
#endif
segments = mem_pool_alloc(gObjectMemoryPool, 5 * sizeof(struct ChainSegment));
if (segments != NULL) {
@ -364,7 +368,7 @@ static void chain_chomp_act_move(void) {
// Unload chain if mario is far enough
#ifndef NODRAWINGDISTANCE
if (o->oChainChompReleaseStatus == CHAIN_CHOMP_NOT_RELEASED && o->oDistanceToMario > 4000.0f) {
if (o->oChainChompReleaseStatus == CHAIN_CHOMP_NOT_RELEASED && o->oDistanceToMario > 40 * configDrawDistance) {
o->oAction = CHAIN_CHOMP_ACT_UNLOAD_CHAIN;
o->oForwardVel = o->oVelY = 0.0f;
} else {

8
src/game/behaviors/cloud.inc.c
View File

@ -1,3 +1,7 @@
#ifndef NODRAWINGDISTANCE
#include "pc/configfile.h"
#endif
/**
* Behavior for bhvCloud and bhvCloudPart.
@ -48,7 +52,7 @@ static void cloud_act_spawn_parts(void) {
*/
static void cloud_act_fwoosh_hidden(void) {
#ifndef NODRAWINGDISTANCE
if (o->oDistanceToMario < 2000.0f) {
if (o->oDistanceToMario < 20 * configDrawDistance) {
#endif
cur_obj_unhide();
o->oAction = CLOUD_ACT_SPAWN_PARTS;
@ -63,7 +67,7 @@ static void cloud_act_fwoosh_hidden(void) {
*/
static void cloud_fwoosh_update(void) {
#ifndef NODRAWINGDISTANCE
if (o->oDistanceToMario > 2500.0f) {
if (o->oDistanceToMario > 25 * configDrawDistance) {
o->oAction = CLOUD_ACT_UNLOAD;
} else {
#endif

8
src/game/behaviors/coin.inc.c
View File

@ -1,3 +1,7 @@
#ifndef NODRAWINGDISTANCE
#include "pc/configfile.h"
#endif
// coin.c.inc
struct ObjectHitbox sYellowCoinHitbox = {
@ -185,7 +189,7 @@ void bhv_coin_formation_loop(void) {
switch (o->oAction) {
case 0:
#ifndef NODRAWINGDISTANCE
if (o->oDistanceToMario < 2000.0f) {
if (o->oDistanceToMario < 20 * configDrawDistance) {
#endif
for (bitIndex = 0; bitIndex < 8; bitIndex++) {
if (!(o->oCoinUnkF4 & (1 << bitIndex)))
@ -198,7 +202,7 @@ void bhv_coin_formation_loop(void) {
break;
case 1:
#ifndef NODRAWINGDISTANCE
if (o->oDistanceToMario > 2100.0f)
if (o->oDistanceToMario > 21 * configDrawDistance)
o->oAction++;
#endif
break;

6
src/game/behaviors/enemy_lakitu.inc.c
View File

@ -1,3 +1,7 @@
#ifndef NODRAWINGDISTANCE
#include "pc/configfile.h"
#endif
/**
* Behavior for bhvEnemyLakitu.
@ -25,7 +29,7 @@ static struct ObjectHitbox sEnemyLakituHitbox = {
*/
static void enemy_lakitu_act_uninitialized(void) {
#ifndef NODRAWINGDISTANCE
if (o->oDistanceToMario < 2000.0f) {
if (o->oDistanceToMario < 20 * configDrawDistance) {
#endif
spawn_object_relative_with_scale(CLOUD_BP_LAKITU_CLOUD, 0, 0, 0, 2.0f, o, MODEL_MIST, bhvCloud);

8
src/game/behaviors/fish.inc.c
View File

@ -1,3 +1,7 @@
#ifndef NODRAWINGDISTANCE
#include "pc/configfile.h"
#endif
/**
* @file fish.inc.c
* Implements behaviour and spawning for fish located in the Secret Aquarium and other levels.
@ -43,7 +47,7 @@ void fish_act_spawn(void) {
* Fish moves at random with a max-range of 700.0f.
*/
#ifndef NODRAWINGDISTANCE
if (o->oDistanceToMario < minDistToMario || gCurrLevelNum == LEVEL_SA) {
if (o->oDistanceToMario < minDistToMario * configDrawDistance / 100 || gCurrLevelNum == LEVEL_SA) {
#endif
for (i = 0; i < schoolQuantity; i++) {
fishObject = spawn_object(o, model, bhvFish);
@ -64,7 +68,7 @@ void fish_act_spawn(void) {
void fish_act_respawn(void) {
#ifndef NODRAWINGDISTANCE
if (gCurrLevelNum != LEVEL_SA) {
if (gMarioObject->oPosY - o->oPosY > 2000.0f) {
if (gMarioObject->oPosY - o->oPosY > 20 * configDrawDistance) {
o->oAction = FISH_ACT_RESPAWN;
}
}

8
src/game/behaviors/goomba.inc.c
View File

@ -1,3 +1,7 @@
#ifndef NODRAWINGDISTANCE
#include "pc/configfile.h"
#endif
/**
* Behavior for bhvGoomba and bhvGoombaTripletSpawner,
@ -79,7 +83,7 @@ void bhv_goomba_triplet_spawner_update(void) {
// spawn them
if (o->oAction == GOOMBA_TRIPLET_SPAWNER_ACT_UNLOADED) {
#ifndef NODRAWINGDISTANCE
if (o->oDistanceToMario < 3000.0f) {
if (o->oDistanceToMario < 30 * configDrawDistance) {
#endif
// The spawner is capable of spawning more than 3 goombas, but this
// is not used in the game
@ -102,7 +106,7 @@ void bhv_goomba_triplet_spawner_update(void) {
o->oAction += 1;
#ifndef NODRAWINGDISTANCE
}
} else if (o->oDistanceToMario > 4000.0f) {
} else if (o->oDistanceToMario > 40 * configDrawDistance) {
// If mario is too far away, enter the unloaded action. The goombas
// will detect this and unload themselves
o->oAction = GOOMBA_TRIPLET_SPAWNER_ACT_UNLOADED;

6
src/game/behaviors/heave_ho.inc.c
View File

@ -1,3 +1,7 @@
#ifndef NODRAWINGDISTANCE
#include "pc/configfile.h"
#endif
// heave_ho.c.inc
s16 D_8032F460[][2] = { { 30, 0 }, { 42, 1 }, { 52, 0 }, { 64, 1 }, { 74, 0 },
@ -73,7 +77,7 @@ void heave_ho_act_3(void) {
void heave_ho_act_0(void) {
#ifndef NODRAWINGDISTANCE
if (find_water_level(o->oPosX, o->oPosZ) < o->oPosY && o->oDistanceToMario < 4000.0f) {
if (find_water_level(o->oPosX, o->oPosZ) < o->oPosY && o->oDistanceToMario < 40 * configDrawDistance) {
#else
if (find_water_level(o->oPosX, o->oPosZ) < (o->oPosY - 50.0f)) {
#endif

6
src/game/behaviors/king_bobomb.inc.c
View File

@ -1,3 +1,7 @@
#ifndef NODRAWINGDISTANCE
#include "pc/configfile.h"
#endif
// king_bobomb.c.inc
// Copy of geo_update_projectile_pos_from_parent
@ -296,7 +300,7 @@ void king_bobomb_move(void) {
cur_obj_call_action_function(sKingBobombActions);
exec_anim_sound_state(sKingBobombSoundStates);
#ifndef NODRAWINGDISTANCE
if (o->oDistanceToMario < 5000.0f)
if (o->oDistanceToMario < 50 * configDrawDistance)
#endif
cur_obj_enable_rendering();
#ifndef NODRAWINGDISTANCE

8
src/game/behaviors/lll_floating_wood_piece.inc.c
View File

@ -1,5 +1,9 @@
// lll_floating_wood_piece.c.inc
#ifndef NODRAWINGDISTANCE
#include "pc/configfile.h"
#endif
void bhv_lll_wood_piece_loop(void) {
if (o->oTimer == 0)
o->oPosY -= 100.0f;
@ -15,7 +19,7 @@ void bhv_lll_floating_wood_bridge_loop(void) {
switch (o->oAction) {
case 0:
#ifndef NODRAWINGDISTANCE
if (o->oDistanceToMario < 2500.0f) {
if (o->oDistanceToMario < 25 * configDrawDistance) {
#endif
for (i = 1; i < 4; i++) {
sp3C = spawn_object_relative(0, (i - 2) * 300, 0, 0, o, MODEL_LLL_WOOD_BRIDGE,
@ -29,7 +33,7 @@ void bhv_lll_floating_wood_bridge_loop(void) {
break;
case 1:
#ifndef NODRAWINGDISTANCE
if (o->oDistanceToMario > 2600.0f)
if (o->oDistanceToMario > 26 * configDrawDistance)
o->oAction = 2;
#endif
break;

8
src/game/behaviors/lll_rotating_hex_flame.inc.c
View File

@ -1,5 +1,9 @@
// lll_rotating_hex_flame.c.inc
#ifndef NODRAWINGDISTANCE
#include "pc/configfile.h"
#endif
void bhv_lll_rotating_hex_flame_loop(void) {
f32 sp24 = o->oLllRotatingHexFlameUnkF4;
f32 sp20 = o->oLllRotatingHexFlameUnkF8;
@ -31,7 +35,7 @@ void fire_bar_spawn_flames(s16 a0) {
void fire_bar_act_0(void) {
#ifndef NODRAWINGDISTANCE
if (o->oDistanceToMario < 3000.0f)
if (o->oDistanceToMario < 30 * configDrawDistance)
#endif
o->oAction = 1;
}
@ -48,7 +52,7 @@ void fire_bar_act_2(void) {
o->oAngleVelYaw = -0x100;
o->oMoveAngleYaw += o->oAngleVelYaw;
#ifndef NODRAWINGDISTANCE
if (o->oDistanceToMario > 3200.0f)
if (o->oDistanceToMario > 32 * configDrawDistance)
o->oAction = 3;
#endif
}

6
src/game/behaviors/piranha_plant.inc.c
View File

@ -1,3 +1,7 @@
#ifndef NODRAWINGDISTANCE
#include "pc/configfile.h"
#endif
/**
* Behavior for bhvPiranhaPlant.
* This controls Piranha Plants, which alternate between sleeping, attacking,
@ -331,7 +335,7 @@ void bhv_piranha_plant_loop(void) {
#ifndef NODRAWINGDISTANCE
// In WF, hide all Piranha Plants once high enough up.
if (gCurrLevelNum == LEVEL_WF) {
if (gMarioObject->oPosY > 3400.0f)
if (gMarioObject->oPosY > 34 * configDrawDistance)
cur_obj_hide();
else
cur_obj_unhide();

8
src/game/behaviors/pokey.inc.c
View File

@ -1,3 +1,7 @@
#ifndef NODRAWINGDISTANCE
#include "pc/configfile.h"
#endif
/**
* Behavior for bhvPokey and bhvPokeyBodyPart.
@ -152,7 +156,7 @@ static void pokey_act_uninitialized(void) {
s16 partModel;
#ifndef NODRAWINGDISTANCE
if (o->oDistanceToMario < 2000.0f) {
if (o->oDistanceToMario < 20 * configDrawDistance) {
#endif
partModel = MODEL_POKEY_HEAD;
@ -190,7 +194,7 @@ static void pokey_act_wander(void) {
if (o->oPokeyNumAliveBodyParts == 0) {
obj_mark_for_deletion(o);
#ifndef NODRAWINGDISTANCE
} else if (o->oDistanceToMario > 2500.0f) {
} else if (o->oDistanceToMario > 25 * configDrawDistance) {
o->oAction = POKEY_ACT_UNLOAD_PARTS;
o->oForwardVel = 0.0f;
#endif

6
src/game/behaviors/sl_walking_penguin.inc.c
View File

@ -1,3 +1,7 @@
#ifndef NODRAWINGDISTANCE
#include "pc/configfile.h"
#endif
// sl_walking_penguin.c.inc
struct SLWalkingPenguinStep {
@ -98,7 +102,7 @@ void bhv_sl_walking_penguin_loop(void) {
cur_obj_move_standard(-78);
#ifndef NODRAWINGDISTANCE
if (!cur_obj_hide_if_mario_far_away_y(1000.0f))
if (!cur_obj_hide_if_mario_far_away_y(10 * configDrawDistance))
#endif
play_penguin_walking_sound(PENGUIN_WALK_BIG);

6
src/game/behaviors/snufit.inc.c
View File

@ -1,3 +1,7 @@
#ifndef NODRAWINGDISTANCE
#include "pc/configfile.h"
#endif
/**
* Behavior file for bhvSnufit and bhvSnufitBalls.
* Snufits are present in HMC and CotMC, and are the fly guy
@ -181,7 +185,7 @@ void bhv_snufit_balls_loop(void) {
// If far from Mario or in a different room, despawn.
if ((o->activeFlags & ACTIVE_FLAG_IN_DIFFERENT_ROOM)
#ifndef NODRAWINGDISTANCE
|| (o->oTimer != 0 && o->oDistanceToMario > 1500.0f)
|| (o->oTimer != 0 && o->oDistanceToMario > 15 * configDrawDistance)
#endif
){
obj_mark_for_deletion(o);

6
src/game/behaviors/triplet_butterfly.inc.c
View File

@ -1,3 +1,7 @@
#ifndef NODRAWINGDISTANCE
#include "pc/configfile.h"
#endif
struct TripletButterflyActivationData {
s32 model;
const BehaviorScript *behavior;
@ -55,7 +59,7 @@ static void triplet_butterfly_act_init(void) {
static void triplet_butterfly_act_wander(void) {
#ifndef NODRAWINGDISTANCE
if (o->oDistanceToMario > 1500.0f) {
if (o->oDistanceToMario > 15 * configDrawDistance) {
obj_mark_for_deletion(o);
} else {
#endif

8
src/game/behaviors/water_bomb_cannon.inc.c
View File

@ -1,5 +1,9 @@
// water_bomb_cannon.inc.c
#ifndef NODRAWINGDISTANCE
#include "pc/configfile.h"
#endif
void bhv_bubble_cannon_barrel_loop(void) {
struct Object *val04;
@ -39,7 +43,7 @@ void bhv_bubble_cannon_barrel_loop(void) {
void water_bomb_cannon_act_0(void) {
#ifndef NODRAWINGDISTANCE
if (o->oDistanceToMario < 2000.0f) {
if (o->oDistanceToMario < 20 * configDrawDistance) {
#endif
spawn_object(o, MODEL_CANNON_BARREL, bhvCannonBarrelBubbles);
cur_obj_unhide();
@ -53,7 +57,7 @@ void water_bomb_cannon_act_0(void) {
void water_bomb_cannon_act_1(void) {
#ifndef NODRAWINGDISTANCE
if (o->oDistanceToMario > 2500.0f) {
if (o->oDistanceToMario > 25 * configDrawDistance) {
o->oAction = 2;
} else if (o->oBehParams2ndByte == 0) {
#else

6
src/game/behaviors/whirlpool.inc.c
View File

@ -1,3 +1,7 @@
#ifndef NODRAWINGDISTANCE
#include "pc/configfile.h"
#endif
// whirlpool.c.inc
static struct ObjectHitbox sWhirlpoolHitbox = {
@ -36,7 +40,7 @@ void whirpool_orient_graph(void) {
void bhv_whirlpool_loop(void) {
#ifndef NODRAWINGDISTANCE
if (o->oDistanceToMario < 5000.0f) {
if (o->oDistanceToMario < 50 * configDrawDistance) {
#endif
o->header.gfx.node.flags &= ~GRAPH_RENDER_INVISIBLE;

8
src/game/behaviors/whomp.inc.c
View File

@ -1,3 +1,7 @@
#ifndef NODRAWINGDISTANCE
#include "pc/configfile.h"
#endif
// whomp.c.inc
void whomp_play_sfx_from_pound_animation(void) {
@ -250,9 +254,9 @@ void bhv_whomp_loop(void) {
// o->oBehParams2ndByte here seems to be a flag
// indicating whether this is a normal or king whomp
if (o->oBehParams2ndByte != 0)
cur_obj_hide_if_mario_far_away_y(2000.0f);
cur_obj_hide_if_mario_far_away_y(20 * configDrawDistance);
else
cur_obj_hide_if_mario_far_away_y(1000.0f);
cur_obj_hide_if_mario_far_away_y(10 * configDrawDistance);
#endif
load_object_collision_model();
}

5
src/game/obj_behaviors.c
View File

@ -27,6 +27,9 @@
#include "obj_behaviors.h"
#include "object_helpers.h"
#include "object_list_processor.h"
#ifndef NODRAWINGDISTANCE
#include "pc/configfile.h"
#endif
#include "rendering_graph_node.h"
#include "save_file.h"
#include "spawn_object.h"
@ -531,7 +534,7 @@ void set_object_visibility(struct Object *obj, s32 dist) {
f32 objZ = obj->oPosZ;
#ifndef NODRAWINGDISTANCE
if (is_point_within_radius_of_mario(objX, objY, objZ, dist) == TRUE) {
if (is_point_within_radius_of_mario(objX, objY, objZ, dist * configDrawDistance / 100) == TRUE) {
#endif
obj->header.gfx.node.flags &= ~GRAPH_RENDER_INVISIBLE;
#ifndef NODRAWINGDISTANCE

6
src/game/options_menu.c
View File

@ -85,6 +85,7 @@ static const u8 optsVideoStr[][32] = {
{ TEXT_OPT_AUTO },
{ TEXT_OPT_HUD },
{ TEXT_OPT_THREEPT },
{ TEXT_OPT_DRAWDIST },
{ TEXT_OPT_APPLY },
};
@ -261,8 +262,11 @@ static struct Option optsVideo[] = {
DEF_OPT_TOGGLE( optsVideoStr[5], &configWindow.vsync ),
DEF_OPT_CHOICE( optsVideoStr[1], &configFiltering, filterChoices ),
DEF_OPT_TOGGLE( optsVideoStr[7], &configHUD ),
#ifndef NODRAWINGDISTANCE
DEF_OPT_SCROLL( optsVideoStr[9], &configDrawDistance, 50, 509, 10 ),
#endif
DEF_OPT_BUTTON( optsVideoStr[4], optvideo_reset_window ),
DEF_OPT_BUTTON( optsVideoStr[9], optvideo_apply ),
DEF_OPT_BUTTON( optsVideoStr[10], optvideo_apply ),
};
static struct Option optsAudio[] = {

6
src/pc/configfile.c
View File

@ -90,6 +90,9 @@ bool configCameraMouse = false;
#endif
bool configSkipIntro = 0;
bool configHUD = true;
#ifndef NODRAWINGDISTANCE
unsigned int configDrawDistance = 100;
#endif
#ifdef DISCORDRPC
bool configDiscordRPC = true;
#endif
@ -102,6 +105,9 @@ static const struct ConfigOption options[] = {
{.name = "window_h", .type = CONFIG_TYPE_UINT, .uintValue = &configWindow.h},
{.name = "vsync", .type = CONFIG_TYPE_BOOL, .boolValue = &configWindow.vsync},
{.name = "texture_filtering", .type = CONFIG_TYPE_UINT, .uintValue = &configFiltering},
#ifndef NODRAWINGDISTANCE
{.name = "drawing_distance", .type = CONFIG_TYPE_UINT, .uintValue = &configDrawDistance},
#endif
{.name = "master_volume", .type = CONFIG_TYPE_UINT, .uintValue = &configMasterVolume},
{.name = "music_volume", .type = CONFIG_TYPE_UINT, .uintValue = &configMusicVolume},
{.name = "sfx_volume", .type = CONFIG_TYPE_UINT, .uintValue = &configSfxVolume},

3
src/pc/configfile.h
View File

@ -55,6 +55,9 @@ extern bool configCameraMouse;
extern bool configCameraAnalog;
#endif
extern bool configHUD;
#ifndef NODRAWINGDISTANCE
extern unsigned int configDrawDistance;
#endif
extern bool configSkipIntro;
#ifdef DISCORDRPC
extern bool configDiscordRPC;