diff --git a/src/Arduboy2.cpp b/src/Arduboy2.cpp index 5d59b55..d6cdcd4 100644 --- a/src/Arduboy2.cpp +++ b/src/Arduboy2.cpp @@ -8,6 +8,24 @@ #include "ab_logo.c" #include "glcdfont.c" +//================================ +//========== class Rect ========== +//================================ + +Rect::Rect(int16_t x, int16_t y, uint8_t width, uint8_t height) + : x(x), y(y), width(width), height(height) +{ +} + +//================================= +//========== class Point ========== +//================================= + +Point::Point(int16_t x, int16_t y) + : x(x), y(y) +{ +} + //======================================== //========== class Arduboy2Base ========== //======================================== diff --git a/src/Arduboy2.h b/src/Arduboy2.h index a445059..cdbbc25 100644 --- a/src/Arduboy2.h +++ b/src/Arduboy2.h @@ -103,6 +103,10 @@ struct Rect int16_t y; /**< The Y coordinate of the top left corner */ uint8_t width; /**< The width of the rectangle */ uint8_t height; /**< The height of the rectangle */ + + Rect() = default; /**< The default constructor of the point */ + + Rect(int16_t x, int16_t y, uint8_t width, uint8_t height); /**< The fully initialising constructor of the point */ }; /** \brief @@ -117,6 +121,10 @@ struct Point { int16_t x; /**< The X coordinate of the point */ int16_t y; /**< The Y coordinate of the point */ + + Point() = default; /**< The default constructor of the point */ + + Point(int16_t x, int16_t y); /**< The fully initialising constructor of the point */ }; //================================== @@ -1018,7 +1026,7 @@ class Arduboy2Base : public Arduboy2Core * * \see Point Rect */ - bool collide(Point point, Rect rect); + static bool collide(Point point, Rect rect); /** \brief * Test if a rectangle is intersecting with another rectangle. @@ -1035,7 +1043,7 @@ class Arduboy2Base : public Arduboy2Core * * \see Rect */ - bool collide(Rect rect1, Rect rect2); + static bool collide(Rect rect1, Rect rect2); /** \brief * Read the unit ID from system EEPROM. diff --git a/src/Arduboy2Core.cpp b/src/Arduboy2Core.cpp index 0635cd6..64c5471 100644 --- a/src/Arduboy2Core.cpp +++ b/src/Arduboy2Core.cpp @@ -6,6 +6,8 @@ #include "Arduboy2Core.h" +#include + const uint8_t PROGMEM lcdBootProgram[] = { // boot defaults are commented out but left here in case they // might prove useful for reference diff --git a/src/Arduboy2Core.h b/src/Arduboy2Core.h index 19d051a..9165b9e 100644 --- a/src/Arduboy2Core.h +++ b/src/Arduboy2Core.h @@ -10,7 +10,6 @@ #include #include #include -#include // main hardware compile flags