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

shadow

Browse Source
This commit is contained in:
Fazana
2021-09-27 14:14:23 +01:00
parent 39f92391f8
commit c69a7e1233
3 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/game/object_list_processor.c
View File

@@ -509,6 +509,7 @@ void spawn_objects_from_info(UNUSED s32 unused, struct SpawnInfo *spawnInfo) {
object->oMoveAnglePitch = spawnInfo->startAngle[0];
object->oMoveAngleYaw = spawnInfo->startAngle[1];
object->oMoveAngleRoll = spawnInfo->startAngle[2];
object->oFloorHeight = find_floor(object->oPosX, object->oPosY, object->oPosZ, &object->oFloor);
}
spawnInfo = spawnInfo->next;

1
src/game/rendering_graph_node.h
View File

@@ -11,6 +11,7 @@ extern struct GraphNodePerspective *gCurGraphNodeCamFrustum;
extern struct GraphNodeCamera *gCurGraphNodeCamera;
extern struct GraphNodeObject *gCurGraphNodeObject;
extern struct GraphNodeHeldObject *gCurGraphNodeHeldObject;
#define gCurGraphNodeObjectNode ((struct Object *)gCurGraphNodeObject)
extern u16 gAreaUpdateCounter;
extern f32 gWorldScale;

38
src/game/shadow.c
View File

@@ -159,7 +159,7 @@ f32 disable_shadow_with_distance(f32 shadowScale, f32 distFromFloor) {
/**
* Dim a shadow when its parent object is further from the ground.
*/
u8 dim_shadow_with_distance(u8 solidity, f32 distFromFloor) {
s32 dim_shadow_with_distance(u8 solidity, f32 distFromFloor) {
f32 ret;
if (solidity < 121) {
@@ -197,7 +197,7 @@ f32 get_water_level_below_shadow(struct Shadow *s, struct Surface **waterFloor)
* @param overwriteSolidity Flag for whether the existing shadow solidity should
* be dimmed based on its distance to the floor
*/
s8 init_shadow(struct Shadow *s, f32 xPos, f32 yPos, f32 zPos, s16 shadowScale, u8 overwriteSolidity) {
s32 init_shadow(struct Shadow *s, f32 xPos, f32 yPos, f32 zPos, s16 shadowScale, u8 overwriteSolidity) {
f32 waterLevel = FLOOR_LOWER_LIMIT_SHADOW;
f32 floorSteepness;
struct Surface *floor;
@@ -207,7 +207,16 @@ s8 init_shadow(struct Shadow *s, f32 xPos, f32 yPos, f32 zPos, s16 shadowScale,
s->parentY = yPos;
s->parentZ = zPos;
s->floorHeight = find_floor(s->parentX, s->parentY, s->parentZ, &floor);
if (gCurGraphNodeObjectNode->oFloor != NULL)
{
s->floorHeight = gCurGraphNodeObjectNode->oFloorHeight;
floor = gCurGraphNodeObjectNode->oFloor;
}
else
{
s->floorHeight = find_floor(s->parentX, s->parentY, s->parentZ, &floor);
}
waterLevel = get_water_level_below_shadow(s, &waterFloor);
@@ -531,7 +540,7 @@ void linearly_interpolate_solidity_negative(struct Shadow *s, u8 initialSolidity
/**
* Change a shadow's solidity based on the player's current animation frame.
*/
s8 correct_shadow_solidity_for_animations(s32 isLuigi, u8 initialSolidity, struct Shadow *shadow) {
s32 correct_shadow_solidity_for_animations(s32 isLuigi, u8 initialSolidity, struct Shadow *shadow) {
struct Object *player;
s8 ret;
s16 animFrame;
@@ -711,9 +720,18 @@ Gfx *create_shadow_circle_assuming_flat_ground(f32 xPos, f32 yPos, f32 zPos, s16
Vtx *verts;
Gfx *displayList;
f32 distBelowFloor;
f32 floorHeight = find_floor_height(xPos, yPos, zPos);
f32 floorHeight;
f32 radius = shadowScale / 2;
if (gCurGraphNodeObjectNode->oFloor != NULL)
{
floorHeight = gCurGraphNodeObjectNode->oFloorHeight;
}
else
{
floorHeight = find_floor_height(xPos, yPos, zPos);
}
if (floorHeight < FLOOR_LOWER_LIMIT_SHADOW) {
return NULL;
} else {
@@ -770,7 +788,15 @@ Gfx *create_shadow_rectangle(f32 halfWidth, f32 halfLength, f32 relY, u8 solidit
*/
s32 get_shadow_height_solidity(f32 xPos, f32 yPos, f32 zPos, f32 *shadowHeight, u8 *solidity) {
f32 waterLevel;
*shadowHeight = find_floor_height(xPos, yPos, zPos);
if (gCurGraphNodeObjectNode->oFloor != NULL)
{
*shadowHeight = gCurGraphNodeObjectNode->oFloorHeight;
}
else
{
*shadowHeight = find_floor_height(xPos, yPos, zPos);
}
if (*shadowHeight < FLOOR_LOWER_LIMIT_SHADOW) {
return 1;