aboutsummaryrefslogtreecommitdiff
path: root/src/example
diff options
context:
space:
mode:
authorWBoerenkamps <wrj.boerenkamps@student.avans.nl>2024-12-04 10:27:42 +0100
committerWBoerenkamps <wrj.boerenkamps@student.avans.nl>2024-12-04 10:27:42 +0100
commit7d1f3b90a5d640e4ae23d6ff8f0bf1bf35b6e4cb (patch)
tree0697c269ce96e55c7841344ec426e0e3daa2c864 /src/example
parent5981ab2262a98b80a1339f86a6b71093576a9b35 (diff)
parentc7c4cc0e3b1a3152256bc8ebf6494c19519538db (diff)
merge 2 gameloop branches
Diffstat (limited to 'src/example')
-rw-r--r--src/example/rendering_particle.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/example/rendering_particle.cpp b/src/example/rendering_particle.cpp
index 3a12144..349d11e 100644
--- a/src/example/rendering_particle.cpp
+++ b/src/example/rendering_particle.cpp
@@ -28,7 +28,7 @@ int main(int argc, char * argv[]) {
ParticleSystem psys{mgr};
AnimatorSystem asys{mgr};
- Color color(255, 255, 255, 255);
+ Color color(255, 255, 255, 100);
auto img = Texture("asset/texture/test_ap43.png");
Sprite & test_sprite = game_object.add_component<Sprite>(
@@ -59,7 +59,7 @@ int main(int argc, char * argv[]) {
});
*/
- auto & cam = game_object.add_component<Camera>(Color::WHITE, ivec2{1080, 720},
+ auto & cam = game_object.add_component<Camera>(Color::RED, ivec2{1080, 720},
vec2{2000, 2000}, 1.0f);
/*