matrixfurry.com / monado
The open source OpenXR runtime
fork atom

u/var: Add replace format with raw text

Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2619>

authored by

Jakob Bornecrantz and committed by
Marge Bot 3d57174e 50645b36

+7 -7
unified split
+4 -4
src/xrt/auxiliary/tracking/t_tracker_slam.cpp
··· 407 407 { 408 408 t.timing.enabled = false; 409 409 410 - u_var_add_ro_ftext(&t, "\n%s", "Tracker timing"); 410 + u_var_add_ro_raw_text(&t, "\nTracker timing", "Tracker timing"); 411 411 412 412 // Setup toggle button 413 413 static const char *msg[2] = {"[OFF] Enable timing", "[ON] Disable timing"}; ··· 527 527 { 528 528 t.features.enabled = false; 529 529 530 - u_var_add_ro_ftext(&t, "\n%s", "Tracker features"); 530 + u_var_add_ro_raw_text(&t, "\nTracker features", "Tracker features"); 531 531 532 532 // Setup toggle button 533 533 static const char *msg[2] = {"[OFF] Enable features info", "[ON] Disable features info"}; ··· 695 695 static void 696 696 gt_ui_setup(TrackerSlam &t) 697 697 { 698 - u_var_add_ro_ftext(&t, "\n%s", "Tracker groundtruth"); 698 + u_var_add_ro_raw_text(&t, "\nTracker groundtruth", "Tracker groundtruth"); 699 699 t.gt.diff_ui.values.data = t.gt.diffs_mm; 700 700 t.gt.diff_ui.values.length = UI_GTDIFF_POSE_COUNT; 701 701 t.gt.diff_ui.values.index_ptr = &t.gt.diff_idx; ··· 1081 1081 } 1082 1082 1083 1083 u_var_add_gui_header(&t, NULL, "Stats"); 1084 - u_var_add_ro_ftext(&t, "\n%s", "Record to CSV files"); 1084 + u_var_add_ro_raw_text(&t, "\nRecord to CSV files", "Record to CSV files"); 1085 1085 u_var_add_bool(&t, &t.slam_traj_writer->enabled, "Record tracked trajectory"); 1086 1086 u_var_add_bool(&t, &t.pred_traj_writer->enabled, "Record predicted trajectory"); 1087 1087 u_var_add_bool(&t, &t.filt_traj_writer->enabled, "Record filtered trajectory");
+2 -2
src/xrt/auxiliary/util/u_var.h
··· 236 236 U_VAR_KIND_NATIVE_IMAGES_DEBUG, 237 237 U_VAR_KIND_LOG_LEVEL, 238 238 U_VAR_KIND_RO_TEXT, 239 - U_VAR_KIND_RO_FTEXT, 239 + U_VAR_KIND_RO_RAW_TEXT, 240 240 U_VAR_KIND_RO_I16, 241 241 U_VAR_KIND_RO_I32, 242 242 U_VAR_KIND_RO_U16, ··· 396 396 ADD_FUNC(native_images_debug, struct u_native_images_debug, NATIVE_IMAGES_DEBUG) \ 397 397 ADD_FUNC(log_level, enum u_logging_level, LOG_LEVEL) \ 398 398 ADD_FUNC(ro_text, const char, RO_TEXT) \ 399 - ADD_FUNC(ro_ftext, const char, RO_FTEXT) \ 399 + ADD_FUNC(ro_raw_text, const char, RO_RAW_TEXT) \ 400 400 ADD_FUNC(ro_i16, int16_t, RO_I16) \ 401 401 ADD_FUNC(ro_i32, int32_t, RO_I32) \ 402 402 ADD_FUNC(ro_u16, uint16_t, RO_U16) \
+1 -1
src/xrt/state_trackers/gui/gui_scene_debug.c
··· 697 697 case U_VAR_KIND_POSE: on_pose(name, ptr); break; 698 698 case U_VAR_KIND_LOG_LEVEL: igCombo_Str(name, (int *)ptr, "Trace\0Debug\0Info\0Warn\0Error\0\0", 5); break; 699 699 case U_VAR_KIND_RO_TEXT: igText("%s: '%s'", name, (char *)ptr); break; 700 - case U_VAR_KIND_RO_FTEXT: igText(ptr ? (char *)ptr : "%s", name); break; 700 + case U_VAR_KIND_RO_RAW_TEXT: igText("%s", (char *)ptr); break; 701 701 case U_VAR_KIND_RO_I16: igInputScalar(name, ImGuiDataType_S16, ptr, NULL, NULL, NULL, ro_i_flags); break; 702 702 case U_VAR_KIND_RO_I32: igInputScalar(name, ImGuiDataType_S32, ptr, NULL, NULL, NULL, ro_i_flags); break; 703 703 case U_VAR_KIND_RO_U16: igInputScalar(name, ImGuiDataType_U16, ptr, NULL, NULL, NULL, ro_i_flags); break;