diff --git a/build_file.c b/build_file.c
index 107fcfd..70170aa 100644
--- a/build_file.c
+++ b/build_file.c
@@ -96,6 +96,7 @@ int main(int argc, char **argv) {
" -Wl,-export-dynamic,--allow-undefined,--import-memory,--no-entry,--initial-memory=131072000,--max-memory=4294967296"
);
os_copy("main.wasm", "../package/main.wasm", os_copy_overwrite);
+ os_copy("../src/app/app_wasm.html", "../package/index.html", os_copy_overwrite);
if (ok != 0) return ok;
}
return ok;
diff --git a/src/app/app_wasm.c b/src/app/app_wasm.c
index 57df9b9..8c68f34 100644
--- a/src/app/app_wasm.c
+++ b/src/app/app_wasm.c
@@ -36,6 +36,7 @@ while (true) {
}
*/
+fn_wasm_import f64 wasm_get_milliseconds(void);
gb_wasm_export char wasm_temp_buff1[128] = {[127] = 0x13};
gb_wasm_export i32 wasm_temp_buff1_len = 127;
diff --git a/src/app/app_wasm.html b/src/app/app_wasm.html
new file mode 100644
index 0000000..ada7752
--- /dev/null
+++ b/src/app/app_wasm.html
@@ -0,0 +1,161 @@
+
+
+
+
+
+
+
+ Document
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/core/core_log.c b/src/core/core_log.c
index 7c8eefc..3d9cfd6 100644
--- a/src/core/core_log.c
+++ b/src/core/core_log.c
@@ -23,26 +23,9 @@ fn void log_basef(i32 module, log_level_t level, s8_t file_and_line, const char
fn void default_log_proc(log_event_t ev) {
ma_temp_t scratch = ma_begin_scratch();
sb8_t *sb = sb8_serial_begin(scratch.arena);
- if (tcx.log.flags & log_flag_module_id) {
- sb8_printf(sb, "[%d] ", ev.module);
- }
if (tcx.log.flags & log_flag_level) {
sb8_printf(sb, "%-5s ", log_level_str(ev.level));
}
- date_t date = {0};
- {
- b32 bdate = (tcx.log.flags & log_flag_date);
- b32 btime = (tcx.log.flags & log_flag_time);
- if (bdate || btime) {
- date = os_date_now();
- }
- if (bdate) {
- sb8_printf(sb, "%04u.%02u.%02u ", date.year, date.month, date.day);
- }
- if (btime) {
- sb8_printf(sb, "%02u:%02u:%02u ", date.hour, date.min, date.sec);
- }
- }
if (tcx.log.flags & log_flag_file_path) {
sb8_printf(sb, "%S: ", ev.file_and_line);
}
diff --git a/src/core/core_log.h b/src/core/core_log.h
index dd8ac57..704f0a2 100644
--- a/src/core/core_log.h
+++ b/src/core/core_log.h
@@ -21,11 +21,8 @@ const i32 module_null = 0;
typedef enum {
log_flag_null = 0,
log_flag_level = 1,
- log_flag_date = 2,
- log_flag_time = 4,
log_flag_file_path = 8,
- log_flag_module_id = 16,
- log_flag_all = log_flag_level | log_flag_date | log_flag_time | log_flag_file_path | log_flag_module_id,
+ log_flag_all = log_flag_level | log_flag_file_path,
} log_flag_t;
typedef enum { // AFTER_CHANGING: modify type_info and log_level_str
diff --git a/src/core/core_platform.h b/src/core/core_platform.h
index 3fc4fd8..afd17d7 100644
--- a/src/core/core_platform.h
+++ b/src/core/core_platform.h
@@ -1,18 +1,5 @@
-typedef struct date_t date_t;
-struct date_t {
- u16 ms;
- u16 sec;
- u16 min;
- u16 hour;
- u16 day;
- u16 month;
- u16 year;
-};
-
fn void os_error_box(char *str);
fn void os_console_log(char *str);
-fn date_t os_date_now(void);
-fn f64 os_milliseconds_now(void);
fn void *os_vmem_reserve(usize size);
fn b32 os_vmem_commit(void *p, usize size);
diff --git a/src/core/core_platform_unix.c b/src/core/core_platform_unix.c
index 3d51c2d..9c67310 100644
--- a/src/core/core_platform_unix.c
+++ b/src/core/core_platform_unix.c
@@ -19,19 +19,6 @@ fn b32 os_vmem_decommit(void *p, usize size) {
return true;
}
-fn date_t os_date_now(void) {
- date_t result = {0};
- time_t time = time(NULL);
- struct tm *lt = localtime(&time);
- result.sec = lt->tm_sec;
- result.min = lt->tm_min;
- result.hour = lt->tm_hour;
- result.day = lt->tm_mday;
- result.month = lt->tm_month;
- result.year = lt->tm_year;
- return result;
-}
-
fn void os_error_box(char *str) {
fprintf(stderr, "%s", str);
}
diff --git a/src/core/core_platform_wasm.c b/src/core/core_platform_wasm.c
index eaaa7af..dbf3e8e 100644
--- a/src/core/core_platform_wasm.c
+++ b/src/core/core_platform_wasm.c
@@ -1,7 +1,6 @@
fn_wasm_import void wasm_alert(isize ptr, i32 len);
fn_wasm_import f64 wasm_parse_float(isize str, i32 len);
fn_wasm_import void wasm_write_to_console(isize str, i32 len);
-fn_wasm_import f64 wasm_get_milliseconds(void);
extern char __heap_base;
@@ -21,11 +20,6 @@ fn b32 os_vmem_decommit(void *p, usize size) {
return true;
}
-fn date_t os_date_now(void) {
- date_t result = {0}; // don't need timed logs in browser
- return result;
-}
-
fn void os_error_box(char *str) {
wasm_alert((isize)str, str_len(str));
}
diff --git a/src/core/core_platform_win32.c b/src/core/core_platform_win32.c
index b549692..092cc78 100644
--- a/src/core/core_platform_win32.c
+++ b/src/core/core_platform_win32.c
@@ -7,7 +7,6 @@ fn b32 os_vmem_commit(void *p, usize size) {
void *result = VirtualAlloc(p, size, MEM_COMMIT, PAGE_READWRITE);
return result ? true : false;
}
-
fn b32 os_vmem_release(void *p) {
BOOL result = VirtualFree(p, 0, MEM_RELEASE);
return result ? true : false;
@@ -18,20 +17,6 @@ fn b32 os_vmem_decommit(void *p, usize size) {
return result ? true : false;
}
-fn date_t os_date_now(void) {
- date_t result = {0};
- SYSTEMTIME lt;
- GetLocalTime(<);
- result.ms = lt.wMilliseconds;
- result.sec = lt.wSecond;
- result.min = lt.wMinute;
- result.hour = lt.wHour;
- result.day = lt.wDay;
- result.month = lt.wMonth;
- result.year = lt.wYear;
- return result;
-}
-
fn void os_error_box(char *str) {
MessageBoxA(NULL, str, "fatal error", MB_OK);
fprintf(stderr, "%s", str);
diff --git a/src/os/os.h b/src/os/os.h
index e69de29..5df63f3 100644
--- a/src/os/os.h
+++ b/src/os/os.h
@@ -0,0 +1,12 @@
+typedef struct os_date_t os_date_t;
+struct os_date_t {
+ u16 ms;
+ u16 sec;
+ u16 min;
+ u16 hour;
+ u16 day;
+ u16 month;
+ u16 year;
+};
+
+fn os_date_t os_date_now(void);
diff --git a/src/os/os_unix.c b/src/os/os_unix.c
index e69de29..529f381 100644
--- a/src/os/os_unix.c
+++ b/src/os/os_unix.c
@@ -0,0 +1,12 @@
+fn os_date_t os_date_now(void) {
+ os_date_t result = {0};
+ time_t time = time(NULL);
+ struct tm *lt = localtime(&time);
+ result.sec = lt->tm_sec;
+ result.min = lt->tm_min;
+ result.hour = lt->tm_hour;
+ result.day = lt->tm_mday;
+ result.month = lt->tm_month;
+ result.year = lt->tm_year;
+ return result;
+}
diff --git a/src/os/os_wasm.c b/src/os/os_wasm.c
index e69de29..13956fe 100644
--- a/src/os/os_wasm.c
+++ b/src/os/os_wasm.c
@@ -0,0 +1,4 @@
+fn os_date_t os_date_now(void) {
+ os_date_t result = {0}; // don't need timed logs in browser
+ return result;
+}
diff --git a/src/os/os_win32.c b/src/os/os_win32.c
index e69de29..c5e79d6 100644
--- a/src/os/os_win32.c
+++ b/src/os/os_win32.c
@@ -0,0 +1,13 @@
+fn os_date_t os_date_now(void) {
+ os_date_t result = {0};
+ SYSTEMTIME lt;
+ GetLocalTime(<);
+ result.ms = lt.wMilliseconds;
+ result.sec = lt.wSecond;
+ result.min = lt.wMinute;
+ result.hour = lt.wHour;
+ result.day = lt.wDay;
+ result.month = lt.wMonth;
+ result.year = lt.wYear;
+ return result;
+}
diff --git a/todo.txt b/todo.txt
index 20d7cea..6bfb012 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,8 +1,8 @@
[ ] platform
[ ] app
+ [ ] sleep
[ ] ui
[ ] event playback
- [ ] update should produce a straight struct result for render
[ ] how to fix variable scroll? or do we not care?
[ ] win32
[ ] hot reload / plugins
@@ -20,9 +20,9 @@
[ ] change name, hard to type
[ ] core
- [ ] add time stuff into core? app start time and stuff like that
+ [ ] remove dates and time from core
[ ] meta
- [ ] search for python snippets and execute meta.py script on that file
+ [x] search for python snippets and execute meta.py script on that file
[ ] new simple format with tags
[x] revisit api
[ ] s8_bin
@@ -40,14 +40,3 @@
bin_read_end
bin_read_...
-
-new format with tags:
-
-app_event_t: @struct {
- kind: app_event_kind_t
- key: app_key_t
- button: app_mouse_button_t
- delta_time: f64
-
- next: *app_event_t @dont_serialize
-}
\ No newline at end of file