github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-26 16:15:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'actor-accessibility-experiments' of https://www.github.com/caturria/shipwright into actor-accessibility-experiments

Browse source
This commit is contained in:
Caturria 2023-08-29 00:03:47 -04:00
commit 4f8491af12
1 changed files with 196 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

210
soh/soh/Enhancements/accessible-actors/accessibility_cues.cpp
View file

@ -26,7 +26,7 @@ DISCOVERED_LEDGE,
DISCOVERED_WALL, DISCOVERED_WALL,
DISCOVERED_SPIKE, DISCOVERED_SPIKE,
DISCOVERED_WATER, DISCOVERED_WATER,
DISCOVERED_CLIMABLE, DISCOVERED_GROUND,
}; };
//Abstract class for terrain cue sound handling. Implementations should not allocate memory. These are always in-place constructed in static memory owned by the TerrainCueDirection object. //Abstract class for terrain cue sound handling. Implementations should not allocate memory. These are always in-place constructed in static memory owned by the TerrainCueDirection object.
class TerrainCueSound { class TerrainCueSound {
@ -162,6 +162,7 @@ class Decline : protected TerrainCueSound {
pitchModifier = mod; pitchModifier = mod;
} }
}; };
class Ledge :protected TerrainCueSound { class Ledge :protected TerrainCueSound {
bool climbable;//Distinguishes between a ledge link can fall from and one he can climb up. bool climbable;//Distinguishes between a ledge link can fall from and one he can climb up.
@ -285,14 +286,16 @@ class Water : protected TerrainCueSound {
} }
}; };
class Climable : protected TerrainCueSound { class Ground : protected TerrainCueSound {
float pitchModifier;
public: public:
Climable(AccessibleActor* actor, Vec3f pos) : TerrainCueSound(actor, pos) { Ground(AccessibleActor* actor, Vec3f pos, float pitchModifier) : TerrainCueSound(actor, pos) {
currentPitch = 0.5; currentPitch = 1.0;
currentSFX = NA_SE_PL_LAND_LADDER; currentSFX = NA_SE_EV_WOOD_BOUND;
this->pitchModifier = 0.0;
play(); play();
} }
virtual ~Climable() { virtual ~Ground() {
} }
void run() { void run() {
if (restFrames == 0) { if (restFrames == 0) {
@ -300,8 +303,12 @@ class Climable : protected TerrainCueSound {
restFrames = 10; restFrames = 10;
return; return;
} }
ActorAccessibility_SetSoundPitch(this, 0, 1.0 + (2*pitchModifier));
restFrames--; restFrames--;
} }
void setPitchModifier(float modifier) {
pitchModifier = modifier;
}
}; };
class TerrainCueDirection { class TerrainCueDirection {
@ -338,7 +345,7 @@ class Climable : protected TerrainCueSound {
Wall wall; Wall wall;
Spike spike; Spike spike;
Water water; Water water;
Climable climable; Ground ground;
}; };
Platform platform; Platform platform;
@ -431,13 +438,18 @@ class Climable : protected TerrainCueSound {
terrainDiscovered = DISCOVERED_WATER; terrainDiscovered = DISCOVERED_WATER;
} }
void discoverClimable(Vec3f pos) { void discoverGround(Vec3f pos, float pitchModifier = 0) {
if (terrainDiscovered == DISCOVERED_CLIMABLE) if (terrainDiscovered == DISCOVERED_GROUND) {
ground.setPitchModifier(pitchModifier);
return; return;
}
destroyCurrentSound(); destroyCurrentSound();
new (&climable) Climable(actor, pos);
currentSound = (TerrainCueSound*)&climable; new (&ground) Ground(actor, pos, pitchModifier);
terrainDiscovered = DISCOVERED_CLIMABLE; currentSound = (TerrainCueSound*)&ground;
terrainDiscovered = DISCOVERED_GROUND;
} }
// Find out how high a wall goes. // Find out how high a wall goes.
f32 findWallHeight(Vec3f& pos, CollisionPoly* poly) { f32 findWallHeight(Vec3f& pos, CollisionPoly* poly) {
@ -618,11 +630,18 @@ class Climable : protected TerrainCueSound {
// Move a probe to its next point along a line, ensuring that it remains on the floor. Returns false if the move // Move a probe to its next point along a line, ensuring that it remains on the floor. Returns false if the move
// would put the probe out of bounds. Does not take walls into account. // would put the probe out of bounds. Does not take walls into account.
bool move(s8 gravity = true) { bool move(s8 gravity = true) {
if (gravity == 2) {
pos.y += probeSpeed;
if (!BgCheck_PosInStaticBoundingBox(&actor->play->colCtx, &pos))
return false; // Out of bounds.
return true;
}
pos.x += velocity.x; pos.x += velocity.x;
pos.y += velocity.y;
pos.z += velocity.z; pos.z += velocity.z;
if (gravity) { if (gravity == 1) {
pos.y += velocity.y;
f32 floorHeight = 0; f32 floorHeight = 0;
floorHeight = BgCheck_EntityRaycastFloor3(&actor->play->colCtx, &floorPoly, &floorBgId, &pos); floorHeight = BgCheck_EntityRaycastFloor3(&actor->play->colCtx, &floorPoly, &floorBgId, &pos);
if (floorHeight == BGCHECK_Y_MIN) if (floorHeight == BGCHECK_Y_MIN)
@ -808,7 +827,170 @@ class Climable : protected TerrainCueSound {
discoverWall(pos); discoverWall(pos);
break; break;
} }
//link is climbing
} else if (player->stateFlags1 == PLAYER_STATE1_CLIMBING_LADDER) {
f32 playerHeight = BgCheck_EntityRaycastFloor3(&actor->play->colCtx, &floorPoly, &floorBgId, &player->actor.world.pos);
f32 floorHeight;
s8 moveMethod = false;
Vec3s_ ogRot = rot;
if (ogRot.y == player->actor.world.rot.y) {
moveMethod = 2;
}
player->actor.world.rot.y = player->actor.shape.rot.y;
if (!move(moveMethod)) {
destroyCurrentSound();
break; // Probe is out of bounds.
}
Vec3f wallPos;
CollisionPoly* wallPoly = checkWall(pos, prevPos, wallPos);
if (wallPoly != NULL) {
if ((func_80041DB8(&actor->play->colCtx, wallPoly, BGCHECK_SCENE) != 8 &&
func_80041DB8(&actor->play->colCtx, wallPoly, BGCHECK_SCENE) != 3)) {
discoverLedge(pos, false);
break;
} else {
rot = ogRot;
floorHeight = BgCheck_EntityRaycastFloor3(&actor->play->colCtx, &floorPoly, &floorBgId,
&pos);
if ((floorHeight - playerHeight) > 100.0) {
destroyCurrentSound();
pos.y - floorHeight;
platform.setPosition(pos);
platform.run();
break;
}
continue;
}
}
prevPos = pos;
rot.y = player->actor.shape.rot.y;
int i = 0;
while (wallPoly == NULL && i < 4) {
if (!move(moveMethod)) {
destroyCurrentSound();
break; // Probe is out of bounds.
}
wallPoly = checkWall(pos, prevPos, wallPos);
i += 1;
}
if (wallPoly != NULL) {
if ((func_80041DB8(&actor->play->colCtx, wallPoly, BGCHECK_SCENE) != 8 &&
func_80041DB8(&actor->play->colCtx, wallPoly, BGCHECK_SCENE) != 3)) {
discoverLedge(pos, false);
break;
} else {
rot = ogRot;
floorHeight = BgCheck_EntityRaycastFloor3(&actor->play->colCtx, &floorPoly, &floorBgId, &pos);
if ((floorHeight - playerHeight) > 100.0) {
destroyCurrentSound();
pos.y - floorHeight;
platform.setPosition(pos);
platform.run();
break;
}
continue;
}
}
Vec3f_ forwardPos = pos;
pos = prevPos;
rot.y = player->actor.shape.rot.y;
rot.y += 16384;
rot.y += 16384;
i = 0;
while (wallPoly == NULL && i < 4) {
if (!move(moveMethod)) {
destroyCurrentSound();
break; // Probe is out of bounds.
}
i += 1;
wallPoly = checkWall(pos, prevPos, wallPos);
}
if (wallPoly != NULL) {
if ((func_80041DB8(&actor->play->colCtx, wallPoly, BGCHECK_SCENE) != 8 &&
func_80041DB8(&actor->play->colCtx, wallPoly, BGCHECK_SCENE) != 3)) {
discoverLedge(pos, false);
break;
} else {
rot = ogRot;
floorHeight = BgCheck_EntityRaycastFloor3(&actor->play->colCtx, &floorPoly, &floorBgId, &pos);
if ((floorHeight - playerHeight) > 100.0) {
pos.y - floorHeight;
platform.setPosition(pos);
platform.run();
break;
}
continue;
}
}
Vec3f_ backPos = pos;
pos = prevPos;
rot = ogRot;
wallPoly = checkWall(backPos, forwardPos, wallPos);
if (wallPoly != NULL) {
if ((func_80041DB8(&actor->play->colCtx, wallPoly, BGCHECK_SCENE) != 8 &&
func_80041DB8(&actor->play->colCtx, wallPoly, BGCHECK_SCENE) != 3)) {
discoverLedge(pos, false);
break;
} else {
rot = ogRot;
floorHeight = BgCheck_EntityRaycastFloor3(&actor->play->colCtx, &floorPoly, &floorBgId, &pos);
if ((floorHeight - playerHeight) > 100.0) {
pos.y - floorHeight;
platform.setPosition(pos);
platform.run();
break;
}
continue;
}
}
if (moveMethod == 2) {
rot.y = player->actor.shape.rot.y;
rot.y += 16384;
rot.y += 16384;
if (!move(moveMethod)) {
destroyCurrentSound();
break; // Probe is out of bounds.
}
prevPos = pos;
//pos.y += 200;
f32 checkHeight = fabs(player->actor.world.pos.y - pos.y);
f32 ceilingPos;
if (BgCheck_AnyCheckCeiling(&actor->play->colCtx, &ceilingPos, &player->actor.world.pos, checkHeight+30)){
pos.y = ceilingPos;
if (checkHeight < 100) {
discoverWall(pos);
break;
}
} /*else {
if (checkHeight < 200) {
discoverLedge(pos, true);
break;
}
}*///not needed?
}
// discoverLedge(pos, false);
break;
} }
//link isn't in the water //link isn't in the water
else { else {