making struct constructors

2 files changed, 12 insertions, 10 deletions

diff --git a/src/crepe/system/AnimatorSystem.cpp b/src/crepe/system/AnimatorSystem.cpp
index 1650b3d..b1f23d1 100644
--- a/src/crepe/system/AnimatorSystem.cpp
+++ b/src/crepe/system/AnimatorSystem.cpp
@@ -17,20 +17,21 @@ void AnimatorSystem::update() {
 
 	for (Animator & a : animations) {
 		if (!a.active) continue;
+		
+		Animator::Data & ctx = a.data;
+		double frame_duration = 1.0f / ctx.fps;
 
-		double frame_duration = 1.0f / a.fps;
-
-		int cycle_end = (a.cycle_end == -1) ? a.row : cycle_end;
-		int total_frames = cycle_end - a.cycle_start;
+		int cycle_end = (ctx.cycle_end == -1) ? ctx.row : cycle_end;
+		int total_frames = cycle_end - ctx.cycle_start;
 
 		int curr_frame = static_cast<int>(elapsed_time / frame_duration) % total_frames;
 
-		a.curr_row = a.cycle_start + curr_frame;
-		a.spritesheet.mask.x = a.curr_row * a.spritesheet.mask.w;
-		a.spritesheet.mask.y = (a.curr_col * a.spritesheet.mask.h);
+		ctx.curr_row = ctx.cycle_start + curr_frame;
+		ctx.spritesheet.mask.x = ctx.curr_row * ctx.spritesheet.mask.w;
+		ctx.spritesheet.mask.y = (ctx.curr_col * ctx.spritesheet.mask.h);
 	
 		std::cout << curr_frame << " " << total_frames << std::endl;
-		if (!a.looping && curr_frame == 0) {
+		if (!ctx.looping && curr_frame == 0) {
 			a.active = false;
 		}
 	}
diff --git a/src/crepe/system/RenderSystem.cpp b/src/crepe/system/RenderSystem.cpp
index 944ac86..08f254f 100644
--- a/src/crepe/system/RenderSystem.cpp
+++ b/src/crepe/system/RenderSystem.cpp
@@ -40,8 +40,9 @@ const Camera & RenderSystem::update_camera() {
 }
 
 bool sorting_comparison(const Sprite & a, const Sprite & b) {
-	if (a.sorting_in_layer < b.sorting_in_layer) return true;
-	if (a.sorting_in_layer == b.sorting_in_layer) return a.order_in_layer < b.order_in_layer;
+	if (a.data.sorting_in_layer < b.data.sorting_in_layer) return true;
+	if (a.data.sorting_in_layer == b.data.sorting_in_layer)
+		return a.data.order_in_layer < b.data.order_in_layer;
 
 	return false;
 }