Merge with base

This commit is contained in:
Krzosa Karol
2022-02-21 17:39:19 +01:00
parent 4b6cd41c01
commit fd8ce7d1a9
7 changed files with 6200 additions and 6589 deletions

View File

@@ -1,10 +1,10 @@
#include "main.h"
// #include "main.h"
struct Image {
U32* pixels;
I64 x;
I64 y;
};
#if 0
struct OSInitArgs {
int window_x;
@@ -29,4 +29,5 @@ struct OS {
OS() = default;
OS(OSInitArgs args) { init(args); }
char os_internal_data[1024];
};
};
#endif