diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/crepe/api/Button.cpp | 2 | ||||
| -rw-r--r-- | src/crepe/api/Button.h | 4 | ||||
| -rw-r--r-- | src/crepe/api/Text.cpp | 5 | ||||
| -rw-r--r-- | src/crepe/api/Text.h | 5 | ||||
| -rw-r--r-- | src/crepe/api/UIObject.h | 2 | 
5 files changed, 11 insertions, 7 deletions
| diff --git a/src/crepe/api/Button.cpp b/src/crepe/api/Button.cpp index c4f7f2d..8eadd89 100644 --- a/src/crepe/api/Button.cpp +++ b/src/crepe/api/Button.cpp @@ -3,7 +3,7 @@  namespace crepe {  Button::Button( -	game_object_id_t id, const vec2 & dimensions, const vec2 & offset, const Data & data +	game_object_id_t id, const vec2 & dimensions, const Data & data, const vec2 & offset  )  	: UIObject(id, dimensions, offset),  	  data(data) {} diff --git a/src/crepe/api/Button.h b/src/crepe/api/Button.h index f6d363a..d7dc747 100644 --- a/src/crepe/api/Button.h +++ b/src/crepe/api/Button.h @@ -1,6 +1,7 @@  #pragma once  #include "UIObject.h" +#include "types.h"  namespace crepe { @@ -33,7 +34,8 @@ public:  	 * \param data additional data the button has  	 */  	Button( -		game_object_id_t id, const vec2 & dimensions, const vec2 & offset, const Data & data +		game_object_id_t id, const vec2 & dimensions, const Data & data, +		const vec2 & offset = {0, 0}  	);  	/**  	 * \brief Get the maximum number of instances for this component diff --git a/src/crepe/api/Text.cpp b/src/crepe/api/Text.cpp index b24f0ac..29e36f1 100644 --- a/src/crepe/api/Text.cpp +++ b/src/crepe/api/Text.cpp @@ -1,10 +1,11 @@  #include "Text.h" +#include "types.h"  using namespace crepe;  Text::Text( -	game_object_id_t id, const vec2 & dimensions, const vec2 & offset, -	const std::string & font_family, const Data & data, const std::string & text +	game_object_id_t id, const vec2 & dimensions, const std::string & font_family, +	const Data & data, const vec2 & offset, const std::string & text  )  	: UIObject(id, dimensions, offset),  	  text(text), diff --git a/src/crepe/api/Text.h b/src/crepe/api/Text.h index 0163bbb..37d86b4 100644 --- a/src/crepe/api/Text.h +++ b/src/crepe/api/Text.h @@ -6,6 +6,7 @@  #include "Asset.h"  #include "Color.h"  #include "UIObject.h" +#include "types.h"  namespace crepe {  /** @@ -35,8 +36,8 @@ public:  	 * \param font Optional font asset that can be passed or left empty.  	 */  	Text( -		game_object_id_t id, const vec2 & dimensions, const vec2 & offset, -		const std::string & font_family, const Data & data, const std::string & text = "" +		game_object_id_t id, const vec2 & dimensions, const std::string & font_family, +		const Data & data, const vec2 & offset = {0, 0}, const std::string & text = ""  	);  	//! Label text. diff --git a/src/crepe/api/UIObject.h b/src/crepe/api/UIObject.h index f7f4fba..5c1fdf7 100644 --- a/src/crepe/api/UIObject.h +++ b/src/crepe/api/UIObject.h @@ -15,7 +15,7 @@ public:  	 * \param dimensions width and height of the UIObject  	 * \param offset Offset relative to the GameObject Transform  	 */ -	UIObject(game_object_id_t id, const vec2 & dimensions, const vec2 & offset); +	UIObject(game_object_id_t id, const vec2 & dimensions, const vec2 & offset = {0,0});  	//! Width and height of the UIObject  	vec2 dimensions;  	//! Position offset relative to this GameObjects Transform |