Skip to content

Commit 876e9d9

Browse files
kalwaltkalwalt
committed
new logs for errors
1 parent dc61878 commit 876e9d9

2 files changed

Lines changed: 124 additions & 20 deletions

File tree

‎include/WebARKit/WebARKitLog.h‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,17 @@ void webarkitLOGi(char* message, const char * format);
1515

1616
void webarkitLOGi(char* message, int format);
1717

18+
void webarkitLOGe(char* message);
19+
20+
void webarkitLOGe(char* message, double * format);
21+
22+
void webarkitLOGe(char* message, float * format);
23+
24+
void webarkitLOGe(char* message, char * format);
25+
26+
void webarkitLOGe(char* message, const char * format);
27+
28+
void webarkitLOGe(char* message, int format);
29+
1830

1931
#endif // #ifndef WEBARKIT_LOG_H

‎lib/SRC/WebARKit/WebARKitLog.cpp‎

Lines changed: 112 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,88 +1,180 @@
11
#include <WebARKit/WebARKitLog.h>
22

3-
const char * WARKTinfo = "%c[webarkit-info]: ";
4-
const char * WARKTstyle = "color: #664400; background-color: #ffff99; border-radius: 4px; padding: 2px";
3+
const char * WARKTinfo = "%cℹ️[webarkit-info:]";
4+
const char * WARKTinfoStyle = "color: #664400; background-color: #ffff99; border-radius: 4px; padding: 2px";
5+
const char * WARKTerror = "%c🚩[webarkit-error:]";
6+
const char * WARKTerrorStyle = "color: #ffffff; background-color: #ff0101; border-radius: 4px; padding: 2px";
57

68
void webarkitLOGi(char* message) {
79
EM_ASM ({
810
var message = UTF8ToString($0);
9-
var info = UTF8ToString($1);
11+
var infoHead = UTF8ToString($1);
1012
var style = UTF8ToString($2);
11-
console.log(info + message, style);
13+
console.log(infoHead + message, style);
1214
},
1315
message,
1416
WARKTinfo,
15-
WARKTstyle
17+
WARKTinfoStyle
1618
);
1719
}
1820

1921
void webarkitLOGi(char* message, double * format) {
2022
EM_ASM ({
2123
var message = UTF8ToString($0);
22-
var info = UTF8ToString($1);
24+
var infoHead = UTF8ToString($1);
2325
var style = UTF8ToString($2);
24-
console.log(info + message, style, $3);
26+
var format = UTF8ToString($3);
27+
console.log(infoHead + message, style, format);
2528
},
2629
message,
2730
WARKTinfo,
28-
WARKTstyle,
31+
WARKTinfoStyle,
2932
format
3033
);
3134
}
3235

3336
void webarkitLOGi(char* message, float * format) {
3437
EM_ASM ({
3538
var message = UTF8ToString($0);
36-
var info = UTF8ToString($1);
39+
var infoHead = UTF8ToString($1);
3740
var style = UTF8ToString($2);
38-
console.log(info + message, style, $3);
41+
var format = UTF8ToString($3);
42+
console.log(infoHead + message, style, format);
3943
},
4044
message,
4145
WARKTinfo,
42-
WARKTstyle,
46+
WARKTinfoStyle,
4347
format
4448
);
4549
}
4650

4751
void webarkitLOGi(char* message, char * format) {
4852
EM_ASM ({
4953
var message = UTF8ToString($0);
50-
var info = UTF8ToString($1);
54+
var infoHead = UTF8ToString($1);
5155
var style = UTF8ToString($2);
52-
console.log(info + message, style, $3);
56+
var format = UTF8ToString($3);
57+
console.log(infoHead + message, style, format);
5358
},
5459
message,
5560
WARKTinfo,
56-
WARKTstyle,
61+
WARKTinfoStyle,
5762
format
5863
);
5964
}
6065

6166
void webarkitLOGi(char* message, const char * format) {
6267
EM_ASM ({
6368
var message = UTF8ToString($0);
64-
var info = UTF8ToString($1);
69+
var infoHead = UTF8ToString($1);
6570
var style = UTF8ToString($2);
6671
var format = UTF8ToString($3);
67-
console.log(info + message, style, format);
72+
console.log(infoHead + message, style, format);
6873
},
6974
message,
7075
WARKTinfo,
71-
WARKTstyle,
76+
WARKTinfoStyle,
7277
format
7378
);
7479
}
7580

7681
void webarkitLOGi(char* message, int format) {
7782
EM_ASM ({
7883
var message = UTF8ToString($0);
79-
var info = UTF8ToString($1);
84+
var infoHead = UTF8ToString($1);
8085
var style = UTF8ToString($2);
81-
console.log(info + message, style, $3);
86+
console.log(infoHead + message, style, $3);
8287
},
8388
message,
8489
WARKTinfo,
85-
WARKTstyle,
90+
WARKTinfoStyle,
91+
format
92+
);
93+
}
94+
95+
void webarkitLOGe(char* message) {
96+
EM_ASM ({
97+
var message = UTF8ToString($0);
98+
var errorHead = UTF8ToString($1);
99+
var style = UTF8ToString($2);
100+
console.error(errorHead + message, style);
101+
},
102+
message,
103+
WARKTerror,
104+
WARKTerrorStyle
105+
);
106+
}
107+
108+
void webarkitLOGe(char* message, double * format) {
109+
EM_ASM ({
110+
var message = UTF8ToString($0);
111+
var errorHead = UTF8ToString($1);
112+
var style = UTF8ToString($2);
113+
var format = UTF8ToString($3);
114+
console.log(errorHead + message, style, format);
115+
},
116+
message,
117+
WARKTerror,
118+
WARKTerrorStyle,
119+
format
120+
);
121+
}
122+
123+
void webarkitLOGe(char* message, float * format) {
124+
EM_ASM ({
125+
var message = UTF8ToString($0);
126+
var errorHead = UTF8ToString($1);
127+
var style = UTF8ToString($2);
128+
var format = UTF8ToString($3);
129+
console.log(errorHead + message, style, format);
130+
},
131+
message,
132+
WARKTerror,
133+
WARKTerrorStyle,
134+
format
135+
);
136+
}
137+
138+
void webarkitLOGe(char* message, char * format) {
139+
EM_ASM ({
140+
var message = UTF8ToString($0);
141+
var errorHead = UTF8ToString($1);
142+
var style = UTF8ToString($2);
143+
var format = UTF8ToString($3);
144+
console.log(errorHead + message, style, format);
145+
},
146+
message,
147+
WARKTerror,
148+
WARKTerrorStyle,
149+
format
150+
);
151+
}
152+
153+
void webarkitLOGe(char* message, const char * format) {
154+
EM_ASM ({
155+
var message = UTF8ToString($0);
156+
var errorHead = UTF8ToString($1);
157+
var style = UTF8ToString($2);
158+
var format = UTF8ToString($3);
159+
console.log(errorHead + message, style, format);
160+
},
161+
message,
162+
WARKTerror,
163+
WARKTerrorStyle,
164+
format
165+
);
166+
}
167+
168+
void webarkitLOGe(char* message, int format) {
169+
EM_ASM ({
170+
var message = UTF8ToString($0);
171+
var errorHead = UTF8ToString($1);
172+
var style = UTF8ToString($2);
173+
console.log(errorHead + message, style, $3);
174+
},
175+
message,
176+
WARKTerror,
177+
WARKTerrorStyle,
86178
format
87179
);
88180
}

0 commit comments

Comments
 (0)