The open source OpenXR runtime
st/gui: More consistent variable names in tracking overrides
authored by
Christoph Haag
and committed by
Jakob Bornecrantz
8da1b100
9f7ef734
+19
-19
+19
-19
src/xrt/state_trackers/gui/gui_scene_tracking_overrides.c
+19
-19
src/xrt/state_trackers/gui/gui_scene_tracking_overrides.c
···
27
27
{
28
28
struct gui_scene base;
29
29
30
-
int editing_override;
30
+
int gui_edit_override_index;
31
31
32
-
bool add_one;
32
+
bool gui_add_override_active;
33
33
int add_target;
34
34
int add_tracker;
35
35
···
138
138
.orientation = {.x = 0, .y = 0, .z = 0, .w = 1}};
139
139
140
140
static void
141
-
add_one(struct gui_program *p, struct gui_tracking_overrides *ts)
141
+
gui_add_override(struct gui_program *p, struct gui_tracking_overrides *ts)
142
142
{
143
143
igBegin("Target Device", NULL, 0);
144
144
for (int i = 0; i < 8; i++) {
···
193
193
ts->add_target = -1;
194
194
ts->add_tracker = -1;
195
195
196
-
ts->add_one = false;
196
+
ts->gui_add_override_active = false;
197
197
198
198
// immediately open for editing
199
-
ts->editing_override = ts->num_overrides - 1;
199
+
ts->gui_edit_override_index = ts->num_overrides - 1;
200
200
}
201
201
}
202
202
···
206
206
struct gui_tracking_overrides *ts = (struct gui_tracking_overrides *)scene;
207
207
208
208
// don't edit and add at the same time
209
-
if (ts->add_one) {
210
-
ts->editing_override = -1;
209
+
if (ts->gui_add_override_active) {
210
+
ts->gui_edit_override_index = -1;
211
211
}
212
212
213
-
if (ts->editing_override >= 0) {
214
-
struct xrt_tracking_override *o = &ts->overrides[ts->editing_override];
213
+
if (ts->gui_edit_override_index >= 0) {
214
+
struct xrt_tracking_override *o = &ts->overrides[ts->gui_edit_override_index];
215
215
216
216
igBegin("Tracker Device Offset", NULL, 0);
217
217
int target = -1, tracker = -1;
···
250
250
}
251
251
}
252
252
253
-
if (ts->add_one) {
254
-
add_one(p, ts);
253
+
if (ts->gui_add_override_active) {
254
+
gui_add_override(p, ts);
255
255
}
256
256
257
257
igBegin("Tracking Overrides", NULL, 0);
···
263
263
264
264
igSeparator();
265
265
266
-
bool checked = ts->editing_override == (int)i;
266
+
bool checked = ts->gui_edit_override_index == (int)i;
267
267
268
268
char buf[XRT_DEVICE_NAME_LEN * 2 + 10];
269
269
snprintf(buf, sizeof(buf), "%s <- %s", ts->overrides[i].target_device_serial,
···
271
271
if (igCheckbox(buf, &checked)) {
272
272
273
273
// abort adding override when clicking to edit one
274
-
ts->add_one = false;
274
+
ts->gui_add_override_active = false;
275
275
276
-
ts->editing_override = i;
276
+
ts->gui_edit_override_index = i;
277
277
ts->reset_offset = ts->overrides[i].offset;
278
278
}
279
279
if (igButton("Delete this override", button_dims)) {
···
281
281
ts->overrides[j] = ts->overrides[j + 1];
282
282
}
283
283
ts->num_overrides--;
284
-
if (ts->editing_override >= (int)i) {
285
-
ts->editing_override -= 1;
284
+
if (ts->gui_edit_override_index >= (int)i) {
285
+
ts->gui_edit_override_index -= 1;
286
286
}
287
287
}
288
288
···
295
295
296
296
if (igButton("Add one", button_dims)) {
297
297
if (ts->num_overrides < XRT_MAX_TRACKING_OVERRIDES) {
298
-
ts->add_one = true;
298
+
ts->gui_add_override_active = true;
299
299
}
300
300
}
301
301
···
330
330
ts->base.render = scene_render;
331
331
ts->base.destroy = scene_destroy;
332
332
333
-
ts->editing_override = -1;
334
-
ts->add_one = false;
333
+
ts->gui_edit_override_index = -1;
334
+
ts->gui_add_override_active = false;
335
335
ts->add_target = -1;
336
336
ts->add_tracker = -1;
337
337