Skip to content

Commit 551cf9d

Browse files
committed
Revert "cleaned up libsurvive tests."
This reverts commit 8e8aece.
1 parent 322d129 commit 551cf9d

2 files changed

Lines changed: 1 addition & 18 deletions

File tree

src/poser_mpfit.c

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -166,10 +166,6 @@ static size_t construct_input_from_scene(const MPFITData *d, survive_long_timeco
166166
continue;
167167
}
168168

169-
if (ctx->bsd[lh].disable) {
170-
continue;
171-
}
172-
173169
if (!ctx->bsd[lh].PositionSet && (!isStationary || !ctx->bsd[lh].OOTXSet)) {
174170
continue;
175171
}
@@ -676,9 +672,6 @@ static void handle_results(MPFITData *d, PoserDataLight *lightData, FLT error, S
676672
estimate->Pos[2] = 0;
677673

678674
for (int i = 0; i < so->ctx->activeLighthouses; i++) {
679-
if (so->ctx->bsd[i].disable) {
680-
continue;
681-
}
682675
SurvivePose new_pos = *survive_get_lighthouse_position(so->ctx, i);
683676
if (so->ctx->bsd[i].PositionSet) {
684677
new_pos.Pos[2] -= adjust;
@@ -848,9 +841,6 @@ bool solve_global_scene(struct SurviveContext *ctx, MPFITData *d, PoserDataGloba
848841
SV_VERBOSE(10, "Scene with pose (%s) " SurvivePose_format " %6.4f", mpfitctx.sos[i]->codename,
849842
SURVIVE_POSE_EXPAND(gss->scenes[i].pose), fabs(err_up[2] - 1.));
850843
for (int j = 0; j < gss->scenes[i].meas_cnt; j++) {
851-
if(ctx->bsd[gss->scenes[i].meas[j].lh].disable) {
852-
continue;
853-
}
854844
survive_optimizer_measurement *meas =
855845
survive_optimizer_emplace_meas(&mpfitctx, survive_optimizer_measurement_type_light);
856846
meas->light.object = i;
@@ -873,9 +863,6 @@ bool solve_global_scene(struct SurviveContext *ctx, MPFITData *d, PoserDataGloba
873863
}
874864

875865
for (int i = 0; i < ctx->activeLighthouses; i++) {
876-
if (ctx->bsd[i].disable) {
877-
continue;
878-
}
879866
if (lh_meas[i] > 0)
880867
SV_VERBOSE(10, "%d %d Measurements for %d", (int)lh_meas[i][0], (int)lh_meas[i][1], i);
881868

@@ -959,9 +946,6 @@ bool solve_global_scene(struct SurviveContext *ctx, MPFITData *d, PoserDataGloba
959946
}
960947

961948
for (int i = 0; i < ctx->activeLighthouses; i++) {
962-
if (ctx->bsd[i].disable) {
963-
continue;
964-
}
965949
if (quatiszero(survive_optimizer_get_camera(&mpfitctx)[i].Rot)) {
966950
// survive_optimizer_fix_camera(&mpfitctx, i);
967951
if (lh_meas[i][0] < 5 || lh_meas[i][1] < 5) {
@@ -1001,7 +985,7 @@ bool solve_global_scene(struct SurviveContext *ctx, MPFITData *d, PoserDataGloba
1001985
sensor_error, (int)mpfitctx.measurementsCnt, res, survive_optimizer_error(res));
1002986
/* Stagehand patch: notify agent so it can emit GSS_FAILURE LOG_EVENT.
1003987
* bestnorm * 100 clamped to u16 matches the SHTP data field spec. */
1004-
{ extern __attribute__((weak)) void (*stagehand_gss_failure_cb)(unsigned);
988+
{ extern void (*stagehand_gss_failure_cb)(unsigned);
1005989
if (stagehand_gss_failure_cb) {
1006990
double bn = result.bestnorm * 100.0;
1007991
stagehand_gss_failure_cb(bn > 65535.0 ? 65535u : (unsigned)bn);

src/survive_default_devices.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,6 @@ struct model_number_metadata model_number_subtypes[] = {
309309
{"Tundra Tracker", SURVIVE_OBJECT_SUBTYPE_TRACKER_GEN2, 1.},
310310
{"VIVE_Pro 2 MV", SURVIVE_OBJECT_TYPE_HMD, 1.},
311311
{"VIVE Controller Pro MV", SURVIVE_OBJECT_SUBTYPE_WAND, 1.},
312-
{"Beyond", SURVIVE_OBJECT_SUBTYPE_INDEX_HMD, 1.},
313312
};
314313

315314
static int process_jsontok(scratch_space_t *scratch, char *d, stack_entry_t *stack, jsmntok_t *t, int count) {

0 commit comments

Comments
 (0)