Newer
Older
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
--- trackable_origin.c 2024-05-28 14:41:34.877357153 +0200
+++ trackable.c 2024-05-22 18:50:02.874278000 +0200
@@ -3,42 +3,6 @@
#include <stdio.h>
#include "trackable.h"
-
-char* trackable_trackable_type_ToString(world_storage_api_trackable__e trackable_type) {
- char* trackable_typeArray[] = { "NULL", "FIDUCIAL_MARKER", "IMAGE_MARKER", "MESH", "MAP", "GEOPOSE", "OTHER" };
- return trackable_typeArray[trackable_type];
-}
-
-world_storage_api_trackable__e trackable_trackable_type_FromString(char* trackable_type){
- int stringToReturn = 0;
- char *trackable_typeArray[] = { "NULL", "FIDUCIAL_MARKER", "IMAGE_MARKER", "MESH", "MAP", "GEOPOSE", "OTHER" };
- size_t sizeofArray = sizeof(trackable_typeArray) / sizeof(trackable_typeArray[0]);
- while(stringToReturn < sizeofArray) {
- if(strcmp(trackable_type, trackable_typeArray[stringToReturn]) == 0) {
- return stringToReturn;
- }
- stringToReturn++;
- }
- return 0;
-}
-char* trackable_unit_ToString(world_storage_api_trackable__e unit) {
- char* unitArray[] = { "NULL", "MM", "CM", "DM", "M", "DAM", "HM", "KM", "INCH", "FOOT", "YARD", "MILE" };
- return unitArray[unit];
-}
-
-world_storage_api_trackable__e trackable_unit_FromString(char* unit){
- int stringToReturn = 0;
- char *unitArray[] = { "NULL", "MM", "CM", "DM", "M", "DAM", "HM", "KM", "INCH", "FOOT", "YARD", "MILE" };
- size_t sizeofArray = sizeof(unitArray) / sizeof(unitArray[0]);
- while(stringToReturn < sizeofArray) {
- if(strcmp(unit, unitArray[stringToReturn]) == 0) {
- return stringToReturn;
- }
- stringToReturn++;
- }
- return 0;
-}
-
trackable_t *trackable_create(
char *uuid,
char *name,
@@ -162,10 +126,10 @@
// trackable->trackable_type
- if (world_storage_api_trackable__NULL == trackable->trackable_type) {
+ if (world_storage_api_trackable_type__NULL == trackable->trackable_type) {
goto fail;
}
- cJSON *trackable_type_local_JSON = trackable_type_convertToJSON(trackable->trackable_type);
+ cJSON *trackable_type_local_JSON = trackable_type_trackable_type_convertToJSON(*trackable->trackable_type);
if(trackable_type_local_JSON == NULL) {
goto fail; // custom
}
@@ -217,10 +181,10 @@
// trackable->unit
- if (world_storage_api_trackable__NULL == trackable->unit) {
+ if (world_storage_api_unit_system__NULL == trackable->unit) {
goto fail;
}
- cJSON *unit_local_JSON = unit_system_convertToJSON(trackable->unit);
+ cJSON *unit_local_JSON = unit_system_unit_system_convertToJSON(*trackable->unit);
if(unit_local_JSON == NULL) {
goto fail; // custom
}
@@ -342,7 +306,7 @@
}
- trackable_type_local_nonprim = trackable_type_parseFromJSON(trackable_type); //custom
+ *trackable_type_local_nonprim = trackable_type_trackable_type_parseFromJSON(trackable_type); //custom
// trackable->trackable_encoding_information
cJSON *trackable_encoding_information = cJSON_GetObjectItemCaseSensitive(trackableJSON, "trackableEncodingInformation");
@@ -400,7 +364,7 @@
}
- unit_local_nonprim = unit_system_parseFromJSON(unit); //custom
+ *unit_local_nonprim = unit_system_unit_system_parseFromJSON(unit); //custom
// trackable->trackable_size
cJSON *trackable_size = cJSON_GetObjectItemCaseSensitive(trackableJSON, "trackableSize");