projects
/
vg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
getting stuff working on windows again
[vg.git]
/
vg_log.h
diff --git
a/vg_log.h
b/vg_log.h
index d30e7ba330bb827d9884a63c1acf05a53bebf477..b28cefbe1ec8bf671af453872794684d8d861d6f 100644
(file)
--- a/
vg_log.h
+++ b/
vg_log.h
@@
-7,7
+7,19
@@
#include "vg_stdint.h"
#include "vg_platform.h"
#include "vg_stdint.h"
#include "vg_platform.h"
+#ifdef _WIN32
+#define KNRM ""
+#define KBLK ""
+#define KRED ""
+#define KGRN ""
+#define KYEL ""
+#define KBLU ""
+#define KMAG ""
+#define KCYN ""
+#define KWHT ""
+#else
#define KNRM "\x1B[0m"
#define KNRM "\x1B[0m"
+#define KBLK "\x1B[30m"
#define KRED "\x1B[31m"
#define KGRN "\x1B[32m"
#define KYEL "\x1B[33m"
#define KRED "\x1B[31m"
#define KGRN "\x1B[32m"
#define KYEL "\x1B[33m"
@@
-15,10
+27,17
@@
#define KMAG "\x1B[35m"
#define KCYN "\x1B[36m"
#define KWHT "\x1B[37m"
#define KMAG "\x1B[35m"
#define KCYN "\x1B[36m"
#define KWHT "\x1B[37m"
+#endif
+
+#define PRINTF_v2f( V2 ) "%.4f %.4f\n", V2[0], V2[1]
+#define PRINTF_v3f( V3 ) "%.4f %.4f %.4f\n", V3[0], V3[1], V3[2]
+#define PRINTF_v4f( V4 ) "%.4f %.4f %.4f %.4f\n", V4[0], V4[1], V4[2], V4[3]
-#define PRINTF_v2f( V2 ) "%.2f %.2f\n", V2[0], V2[1]
-#define PRINTF_v3f( V3 ) "%.2f %.2f %.2f\n", V3[0], V3[1], V3[2]
-#define PRINTF_v4f( V4 ) "%.2f %.2f %.2f %.2f\n", V4[0], V4[1], V4[2], V4[3]
+#ifdef _WIN32
+ #define PRINTF_U64 "%llu"
+#else
+ #define PRINTF_U64 "%lu"
+#endif
#ifdef VG_GAME
static SDL_SpinLock log_print_sl;
#ifdef VG_GAME
static SDL_SpinLock log_print_sl;
@@
-38,10
+57,8
@@
void _vg_console_append_to_log( const char *str )
char *dest = vg_log.buffer[ vg_log.buffer_line_current ++ ];
char *dest = vg_log.buffer[ vg_log.buffer_line_current ++ ];
- for( int i=0; i<vg_list_size( vg_log.buffer[0] ); i++ )
- {
- if( !str[i] || ( i == vg_list_size(vg_log.buffer[0])-1 ) )
- {
+ for( int i=0; i<vg_list_size( vg_log.buffer[0] ); i++ ){
+ if( !str[i] || ( i == vg_list_size(vg_log.buffer[0])-1 ) ){
dest[i] = '\0';
break;
}
dest[i] = '\0';
break;
}
@@
-63,8
+80,7
@@
VG_STATIC void _vg_log_write( FILE *file, const char *prefix,
char buffer[ 4096 ];
int i, j;
char buffer[ 4096 ];
int i, j;
- for( i=0; i<vg_list_size( buffer ); i ++ )
- {
+ for( i=0; i<vg_list_size( buffer ); i ++ ){
if( prefix[i] )
buffer[i] = prefix[i];
else
if( prefix[i] )
buffer[i] = prefix[i];
else
@@
-82,10
+98,6
@@
VG_STATIC void _vg_log_write( FILE *file, const char *prefix,
#endif
}
#endif
}
-VG_STATIC void _vg_log_init(void)
-{
-}
-
#define VG_LOGX( NAME, PIPE, PFX ) \
VG_STATIC void NAME(const char *fmt, ...) \
{ \
#define VG_LOGX( NAME, PIPE, PFX ) \
VG_STATIC void NAME(const char *fmt, ...) \
{ \