From 2e123f194e36bb5e63a0c1d3af0ab2eace522fe2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?No=C3=A9?= <noe.artru@polytechnique.org>
Date: Thu, 4 May 2023 14:48:01 +0200
Subject: [PATCH] Projectiles structure with elemental types
---
projet-code/scenes_inf443/base/src/scene.cpp | 3 ++-
projet-code/scenes_inf443/base/src/scene.hpp | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/projet-code/scenes_inf443/base/src/scene.cpp b/projet-code/scenes_inf443/base/src/scene.cpp
index 2502873..980410e 100644
--- a/projet-code/scenes_inf443/base/src/scene.cpp
+++ b/projet-code/scenes_inf443/base/src/scene.cpp
@@ -6,6 +6,7 @@
#include "bird.hpp"
#include "bat.hpp"
#include "terrain.hpp"
+#include "projectile.hpp"
using namespace cgp;
int num_trees = 200;
@@ -95,7 +96,7 @@ void scene_structure::initialize()
chain1.initialize();
bouncing.initialize(10); //10 balls
bat1.initialize_bat();
- projectiles.initialize(0);
+ projectiles.initialize();
}
void scene_structure::initialize_mvt()
diff --git a/projet-code/scenes_inf443/base/src/scene.hpp b/projet-code/scenes_inf443/base/src/scene.hpp
index 08c7976..c46e155 100644
--- a/projet-code/scenes_inf443/base/src/scene.hpp
+++ b/projet-code/scenes_inf443/base/src/scene.hpp
@@ -8,6 +8,7 @@
#include "bird.hpp"
#include "chain.hpp"
#include "bat.hpp"
+#include "projectile.hpp"
// This definitions allow to use the structures: mesh, mesh_drawable, etc. without mentionning explicitly cgp::
@@ -71,7 +72,7 @@ struct scene_structure : cgp::scene_inputs_generic {
bird bird1;
chain chain1;
bat bat1;
- ball projectiles;
+ projectile projectiles;
// ****************************** //
// Functions
--
GitLab