Sara/tunnel-strategy
1
0
Fork 0
Code Issues 1 Pull requests Actions Packages Projects Releases Wiki Activity

feat: projectile pool now uses projectile class

Browse source
This commit is contained in:
Sara 2024-03-20 09:48:19 +01:00
parent 9099d29672
commit 71de14003d
2 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/projectile_pool.cpp
View file

@ -1,5 +1,6 @@
#include "projectile_pool.hpp"
#include "projectile.hpp"
#include "weapon_data.hpp"
#include <godot_cpp/classes/scene_state.hpp>
#include <godot_cpp/variant/utility_functions.hpp>
@ -9,21 +10,20 @@ void ProjectilePool::_bind_methods() {
}
void ProjectilePool::_exit_tree() {
if(this->data.is_valid()) {
for(Node3D *node : this->inactive) {
node->queue_free();
}
for(Node3D *node : this->inactive) {
node->queue_free();
}
}
void ProjectilePool::set_data(Ref<PackedScene> data) {
void ProjectilePool::set_data(Ref<WeaponData> value) {
UtilityFunctions::print("ProjectilePool::set_data");
if(!this->data.is_null()) {
this->active.clear();
for(Node3D *node : this->inactive)
node->queue_free();
}
this->data = data;
if(!data.is_valid())
this->data = value;
if(!value.is_valid())
return;
this->count = this->data->get_projectile_count() * this->data->get_rounds_per_second() * 2;
for(size_t i{0}; i < this->count; ++i)
@ -48,26 +48,31 @@ Node3D *ProjectilePool::claim_projectile() {
void ProjectilePool::return_projectile(Node3D *node) {
if(this->active.has(node)) {
this->remove_child(node);
this->active.erase(node);
this->inactive.push_back(node);
node->get_parent()->remove_child(node);
} else {
// leftover from previous weapon, free
node->queue_free();
}
}
Node3D *ProjectilePool::instantiate_new() const {
Node3D *ProjectilePool::instantiate_new(bool active) {
Ref<PackedScene> scene = this->data->get_projectile_scene();
if(!scene.is_valid() || !ClassDB::is_parent_class("Node3D", scene->get_state()->get_node_type(0)))
if(!scene.is_valid() || !ClassDB::is_parent_class(scene->get_state()->get_node_type(0), "Projectile")) {
UtilityFunctions::push_error("Attempt to instantiate pooled projectile failed, scene is ", scene.is_valid() ? (scene->get_state()->get_node_type(0) + String(" not inherited from Projectile")) : "not a valid scene resource");
return nullptr;
Node3D *node = Object::cast_to<Node3D>(this->data->get_projectile_scene()->instantiate());
IProjectile *projectile = dynamic_cast<IProjectile*>(node);
if(projectile != nullptr) {
projectile->set_weapon_data(this->data);
} else {
UtilityFunctions::push_warning("Projectile scene ", scene->get_path(), "' root node does not implement IProjectile");
}
return node;
Projectile *projectile = Object::cast_to<Projectile>(this->data->get_projectile_scene()->instantiate());
if(!projectile) {
UtilityFunctions::push_error("Failed to instantiate projectile");
return nullptr;
}
if(active)
this->add_child(projectile);
projectile->set_weapon_data(this->data);
projectile->set_projectile_pool(this);
projectile->set_as_top_level(true);
return projectile;
}
}

4
src/projectile_pool.hpp
View file

@ -11,13 +11,13 @@ class ProjectilePool : public Node {
static void _bind_methods();
public:
virtual void _exit_tree() override;
void set_data(Ref<PackedScene> data);
void set_data(Ref<WeaponData> data);
Ref<WeaponData> get_data() const;
Node3D *claim_projectile();
void return_projectile(Node3D *node);
protected:
Node3D *instantiate_new() const;
Node3D *instantiate_new(bool active = false);
private:
Ref<WeaponData> data{};
size_t count{0};