Merge branch 'master' into mikes-input
This commit is contained in:
commit
32576c398c
1 changed files with 11187 additions and 3879 deletions
|
|
@ -127,8 +127,6 @@ typedef struct CoreData {
|
|||
Point renderOffset; // Offset from render area (must be divided by 2)
|
||||
Size screenMin; // Screen minimum width and height (for resizable window)
|
||||
Size screenMax; // Screen maximum width and height (for resizable window)
|
||||
Size windowMin; // Window minimum width and height
|
||||
Size windowMax; // Window maximum width and height
|
||||
Matrix screenScale; // Matrix to scale screen (framebuffer rendering)
|
||||
|
||||
char **dropFilepaths; // Store dropped files paths pointers (provided by GLFW)
|
||||
|
|
|
|||
Loading…
Reference in a new issue