From 5cbff06ff9153f7a7958202a777d98ebeae59393 Mon Sep 17 00:00:00 2001
From: dec05eba <dec05eba@protonmail.com>
Date: Sat, 16 Oct 2021 08:54:21 +0200
Subject: Cursor motion

---
 include/mgl/graphics/rectangle.h |  2 +-
 include/mgl/graphics/sprite.h    |  2 +-
 include/mgl/graphics/vec.h       |  8 --------
 include/mgl/system/vec.h         | 12 ++++++++++++
 include/mgl/window.h             |  6 ++++--
 5 files changed, 18 insertions(+), 12 deletions(-)
 delete mode 100644 include/mgl/graphics/vec.h
 create mode 100644 include/mgl/system/vec.h

(limited to 'include')

diff --git a/include/mgl/graphics/rectangle.h b/include/mgl/graphics/rectangle.h
index 7c2403b..5bcc521 100644
--- a/include/mgl/graphics/rectangle.h
+++ b/include/mgl/graphics/rectangle.h
@@ -1,8 +1,8 @@
 #ifndef MGL_RECTANGLE_H
 #define MGL_RECTANGLE_H
 
+#include "../system/vec.h"
 #include "color.h"
-#include "vec.h"
 
 typedef struct mgl_context mgl_context;
 
diff --git a/include/mgl/graphics/sprite.h b/include/mgl/graphics/sprite.h
index 045da19..ea40b21 100644
--- a/include/mgl/graphics/sprite.h
+++ b/include/mgl/graphics/sprite.h
@@ -1,8 +1,8 @@
 #ifndef MGL_SPRITE_H
 #define MGL_SPRITE_H
 
+#include "../system/vec.h"
 #include "color.h"
-#include "vec.h"
 
 typedef struct mgl_context mgl_context;
 typedef struct mgl_texture mgl_texture;
diff --git a/include/mgl/graphics/vec.h b/include/mgl/graphics/vec.h
deleted file mode 100644
index 562f560..0000000
--- a/include/mgl/graphics/vec.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef MGL_VEC_H
-#define MGL_VEC_H
-
-typedef struct {
-    float x, y;
-} mgl_vec2f;
-
-#endif /* MGL_VEC_H */
diff --git a/include/mgl/system/vec.h b/include/mgl/system/vec.h
new file mode 100644
index 0000000..8b87376
--- /dev/null
+++ b/include/mgl/system/vec.h
@@ -0,0 +1,12 @@
+#ifndef MGL_VEC_H
+#define MGL_VEC_H
+
+typedef struct {
+    float x, y;
+} mgl_vec2f;
+
+typedef struct {
+    int x, y;
+} mgl_vec2i;
+
+#endif /* MGL_VEC_H */
diff --git a/include/mgl/window.h b/include/mgl/window.h
index 34920a8..0184577 100644
--- a/include/mgl/window.h
+++ b/include/mgl/window.h
@@ -1,6 +1,8 @@
 #ifndef MGL_WINDOW_H
 #define MGL_WINDOW_H
 
+#include "system/vec.h"
+
 typedef struct mgl_window mgl_window;
 
 typedef struct {
@@ -11,8 +13,8 @@ typedef struct {
 struct mgl_window {
     unsigned long window;
     mgl_window_callback callback;
-    int width;
-    int height;
+    mgl_vec2i size;
+    mgl_vec2i cursor_position;
 };
 
 int mgl_window_create(mgl_window *self, const char *title, int width, int height, mgl_window_callback *callback);
-- 
cgit v1.2.3