Merge branch 'wouter/text-component' into niels/UI

4 files changed, 10 insertions, 13 deletions

diff --git a/src/crepe/api/LoopManager.h b/src/crepe/api/LoopManager.h
index 1725810..1d23cbf 100644
--- a/src/crepe/api/LoopManager.h
+++ b/src/crepe/api/LoopManager.h
@@ -71,7 +71,7 @@ private:
 private:
 	//! Global context
 	Mediator mediator;
-	
+
 	//! SDLContext instance
 	SDLContext sdl_context{mediator};
 	//! Component manager instance
@@ -86,7 +86,6 @@ private:
 	ResourceManager resource_manager{mediator};
 	//! Save manager instance
 	SaveManager save_manager{mediator};
-	
 
 private:
 	/**
diff --git a/src/crepe/api/Script.h b/src/crepe/api/Script.h
index 4503525..8bca38a 100644
--- a/src/crepe/api/Script.h
+++ b/src/crepe/api/Script.h
@@ -156,7 +156,6 @@ private:
 	void subscribe_internal(const EventHandler<EventType> & callback, event_channel_t channel);
 
 protected:
-	
 	// NOTE: This must be the only constructor on Script, see "Late references" below
 	Script() = default;
 	//! Only \c BehaviorScript instantiates Script
diff --git a/src/crepe/api/Text.cpp b/src/crepe/api/Text.cpp
index 1620247..2e248de 100644
--- a/src/crepe/api/Text.cpp
+++ b/src/crepe/api/Text.cpp
@@ -5,11 +5,11 @@
 
 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, std::optional<Asset> font)
+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,
+		   std::optional<Asset> font)
 	: UIObject(id, dimensions, offset),
 	  text(text),
 	  data(data),
 	  font_family(font_family),
-	  font(font) {
-}
+	  font(font) {}
diff --git a/src/crepe/api/Text.h b/src/crepe/api/Text.h
index ab72bc0..92cca18 100644
--- a/src/crepe/api/Text.h
+++ b/src/crepe/api/Text.h
@@ -1,7 +1,7 @@
 #pragma once
 
+#include <optional>
 #include <string>
-#include <optional> 
 
 #include "../Component.h"
 
@@ -50,10 +50,10 @@ public:
 	 * \param data Data struct containing extra text parameters.
 	 * \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 = "", std::optional<Asset> font = std::nullopt);
-	
+	Text(game_object_id_t id, const vec2 & dimensions, const vec2 & offset,
+		 const std::string & font_family, const Data & data, const std::string & text = "",
+		 std::optional<Asset> font = std::nullopt);
+
 	//! Label text.
 	std::string text = "";
 	//! font family name
@@ -62,7 +62,6 @@ public:
 	std::optional<Asset> font;
 	//! Data instance
 	Data data;
-	
 };
 
 } // namespace crepe