falso
/
dethrace
mirror of https://github.com/dethrace-labs/dethrace.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

RecordNextTrailNode effectively matching

This commit is contained in:
Dethrace Labs 2025-09-23 20:44:10 +12:00
parent bc6efbcd74
commit 2cd72fabaa
2 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/DETHRACE/common/opponent.c
View File

@ -917,14 +917,14 @@ void ProcessCompleteRace(tOpponent_spec* pOpponent_spec, tProcess_objective_comm
if (pOpponent_spec->nnext_sections != 0) {
res = ProcessFollowPath(pOpponent_spec, ePOC_run, 0, 0, 0);
if (res != eFPR_end_of_path) {
goto next;
goto skip_new_objective;
}
}
dr_dprintf("%s: Giving up following race path because ran out of race path", pOpponent_spec->car_spec->driver_name);
NewObjective(pOpponent_spec, eOOT_get_near_player);
next:
skip_new_objective:
if (res != eFPR_OK) {
if (res == eFPR_given_up) {
@ -981,41 +981,42 @@ void RecordNextTrailNode(tCar_spec* pPursuee) {
int visible;
trail = &pPursuee->my_trail;
if (trail->time_of_next_recording >= gTime_stamp_for_this_munging) {
return;
}
trail->time_of_next_recording = gTime_stamp_for_this_munging + 500;
trail->nodes_shifted_this_frame = 0;
if (BrVector3Dot(&trail->base_heading, &pPursuee->direction) < FastScalarCos(30)) {
trail->has_deviated_recently = 1;
}
BrVector3Sub(&car_to_last_point_v, &trail->trail_nodes[trail->number_of_nodes - 2], &pPursuee->car_master_actor->t.t.translate.t);
length = BrVector3Length(&car_to_last_point_v);
if (length < 0.3f) {
return;
}
CalcNegativeXVector(&offset_v, &trail->trail_nodes[trail->number_of_nodes - 2], &pPursuee->car_master_actor->t.t.translate.t, 0.5f);
BrVector3Add(&start1, &trail->trail_nodes[trail->number_of_nodes - 2], &offset_v);
BrVector3Add(&finish1, &pPursuee->car_master_actor->t.t.translate.t, &offset_v);
BrVector3Sub(&start2, &trail->trail_nodes[trail->number_of_nodes - 2], &offset_v);
BrVector3Sub(&finish2, &pPursuee->car_master_actor->t.t.translate.t, &offset_v);
visible = 1;
if ((trail->has_deviated_recently
|| !(visible = PointVisibleFromHere(&start1, &finish1))
|| !(visible = PointVisibleFromHere(&start2, &finish2))
|| !(visible = PointVisibleFromHere(&trail->trail_nodes[trail->number_of_nodes - 2], &pPursuee->car_master_actor->t.t.translate.t)))
&& ((visible && length > 2.0f) || (!visible && length > 1.5f))) {
if (trail->number_of_nodes >= COUNT_OF(trail->trail_nodes)) {
memmove(trail->trail_nodes, &trail->trail_nodes[1], (COUNT_OF(trail->trail_nodes) - 1) * sizeof(trail->trail_nodes[0]));
trail->nodes_shifted_this_frame = 1;
} else {
trail->number_of_nodes++;
trail->nodes_shifted_this_frame = 0;
if (trail->time_of_next_recording < gTime_stamp_for_this_munging) {
trail->time_of_next_recording = gTime_stamp_for_this_munging + 500;
if (BrVector3Dot(&pPursuee->direction, &trail->base_heading) < FastScalarCos(30)) {
trail->has_deviated_recently = 1;
}
trail->has_deviated_recently = 0;
BrVector3Copy(&trail->base_heading, &pPursuee->direction);
BrVector3Sub(&car_to_last_point_v, &trail->trail_nodes[trail->number_of_nodes - 2], &pPursuee->car_master_actor->t.t.translate.t);
length = BrVector3Length(&car_to_last_point_v);
if (length < 0.3f) {
return;
}
CalcNegativeXVector(&offset_v, &trail->trail_nodes[trail->number_of_nodes - 2], &pPursuee->car_master_actor->t.t.translate.t, 0.5f);
BrVector3Add(&start1, &trail->trail_nodes[trail->number_of_nodes - 2], &offset_v);
BrVector3Add(&finish1, &pPursuee->car_master_actor->t.t.translate.t, &offset_v);
BrVector3Sub(&start2, &trail->trail_nodes[trail->number_of_nodes - 2], &offset_v);
BrVector3Sub(&finish2, &pPursuee->car_master_actor->t.t.translate.t, &offset_v);
if ((trail->has_deviated_recently
|| !(visible = PointVisibleFromHere(&start1, &finish1))
|| !(visible = PointVisibleFromHere(&start2, &finish2))
|| !(visible = PointVisibleFromHere(&trail->trail_nodes[trail->number_of_nodes - 2], &pPursuee->car_master_actor->t.t.translate.t)))
&& ((visible && length > 2.0f) || (!visible && length > 1.5f))) {
if (trail->number_of_nodes < COUNT_OF(trail->trail_nodes)) {
trail->number_of_nodes++;
} else {
memmove(trail->trail_nodes, &trail->trail_nodes[1], (COUNT_OF(trail->trail_nodes) - 1) * sizeof(trail->trail_nodes[0]));
trail->nodes_shifted_this_frame = 1;
}
trail->has_deviated_recently = 0;
BrVector3Copy(&trail->base_heading, &pPursuee->direction);
}
BrVector3Copy(&trail->trail_nodes[trail->number_of_nodes - 1], &pPursuee->car_master_actor->t.t.translate.t);
}
BrVector3Copy(&trail->trail_nodes[trail->number_of_nodes - 1], &pPursuee->car_master_actor->t.t.translate.t);
}
// IDA: tS16 __usercall FindNearestTrailSection@<AX>(tOpponent_spec *pOpponent_spec@<EAX>, tCar_spec *pPursuee@<EDX>, br_vector3 *pSection_v@<EBX>, br_vector3 *pIntersect@<ECX>, br_scalar *pDistance)

16
src/DETHRACE/dr_types.h
View File

@ -589,14 +589,14 @@ typedef struct tJoystick {
tS32 dec;
} tJoystick;
typedef struct tPursuee_trail {
br_vector3 trail_nodes[25];
br_vector3 base_heading;
tU32 time_of_next_recording;
tU32 end_of_deviation;
tU8 number_of_nodes;
tU8 has_deviated_recently;
tU8 nodes_shifted_this_frame;
typedef struct tPursuee_trail { // size: 0x144
br_vector3 trail_nodes[25]; // @0x0
br_vector3 base_heading; // @0x12c
tU32 time_of_next_recording; // @0x138
tU32 end_of_deviation; // @0x13c
tU8 number_of_nodes; // @0x140
tU8 has_deviated_recently; // @0x141
tU8 nodes_shifted_this_frame; // @0x142
} tPursuee_trail;
typedef struct tCar_spec_struct { // size: 0x1a9c