Merge branch 'master' of https://github.com/lonkaars/crepe into wouter/events

1 files changed, 12 insertions, 11 deletions

diff --git a/src/crepe/api/Transform.h b/src/crepe/api/Transform.h
index 51b0daa..18aa293 100644
--- a/src/crepe/api/Transform.h
+++ b/src/crepe/api/Transform.h
@@ -14,6 +14,14 @@ namespace crepe {
  */
 class Transform : public Component {
 public:
+	//! Translation (shift)
+	Vector2 position = {0, 0};
+	//! Rotation, in degrees
+	double rotation = 0;
+	//! Multiplication factor
+	double scale = 0;
+
+protected:
 	/**
 	 * \param id The id of the GameObject this component belongs to
 	 * \param point The position of the GameObject
@@ -22,19 +30,12 @@ public:
 	 */
 	Transform(game_object_id_t id, const Vector2 & point, double rotation, double scale);
 	/**
-	 * \brief Get the maximum number of instances for this component
-	 *
-	 * \return The maximum number of instances for this component
+	 * There is always exactly one transform component per entity
+	 * \return 1
 	 */
 	virtual int get_instances_max() const { return 1; }
-
-public:
-	//! Translation (shift)
-	Vector2 position;
-	//! Rotation, in degrees
-	double rotation;
-	//! Multiplication factor
-	double scale;
+	//! ComponentManager instantiates all components
+	friend class ComponentManager;
 };
 
 } // namespace crepe