Merge remote-tracking branch 'origin/master' into max/game

1 files changed, 6 insertions, 29 deletions

diff --git a/src/example/rendering_particle.cpp b/src/example/rendering_particle.cpp
index 8be781a..c28d6a0 100644
--- a/src/example/rendering_particle.cpp
+++ b/src/example/rendering_particle.cpp
@@ -27,7 +27,7 @@ public:
 
 		Color color(255, 255, 255, 255);
 
-		Asset img {"asset/texture/square.png"};
+		Asset img {"asset/spritesheet/pokemon_spritesheet.png"};
 
 		Sprite & test_sprite = game_object.add_component<Sprite>(
 			img,
@@ -36,21 +36,17 @@ public:
 				.flip = Sprite::FlipSettings {false, false},
 				.sorting_in_layer = 2,
 				.order_in_layer = 2,
-				.size = {1, 1},
+				.size = {1, 0},
 				.angle_offset = 0,
 				.position_offset = {0, 1},
 				.world_space = false,
 			}
 		);
-		//auto & emitter			= game_object.add_component<ParticleEmitter>(test_sprite, ParticleEmitter::Data{});
 
-		Sprite & test_sprite1 = game_object.add_component<Sprite>(
-			img,
-			Sprite::Data {
-				.color = color,
-				.size = {1, 1},
-				.position_offset = {0, -1},
-				.world_space = false,
+		game_object.add_component<Animator>(
+			test_sprite, ivec2 {56, 56}, uvec2 {4, 4},
+			Animator::Data {
+				.looping = false,
 			}
 		);
 
@@ -61,25 +57,6 @@ public:
 				.postion_offset = {1000, 1000},
 			}
 		);
-
-		game_object.add_component<Text>(
-			vec2 {1, 1}, vec2 {0, -1}, "ComicSansMS",
-			Text::Data {
-				.text_color = Color::RED,
-			},
-			"test TEST"
-		);
-
-		game_object
-			.add_component<Text>(
-				vec2 {1, 1}, vec2 {0, 1}, "Ariel",
-				Text::Data {
-					.text_color = Color::BLACK,
-				},
-				"TEST test"
-			)
-			.world_space
-			= true;
 	}
 
 	string get_name() const { return "TestScene"; };