PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

add UID usage check in Entites::spawn

Browse Source
This commit is contained in:
MihailRis 2024-07-15 02:04:53 +03:00
parent 904a33418f
commit 0e7f440a68
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/objects/Entities.cpp
View File

@ -17,6 +17,7 @@
#include "../logic/scripting/scripting.hpp" #include "../logic/scripting/scripting.hpp"
#include "../engine.hpp" #include "../engine.hpp"
#include <sstream>
#include <glm/ext/matrix_transform.hpp> #include <glm/ext/matrix_transform.hpp>
static debug::Logger logger("entities"); static debug::Logger logger("entities");
@ -75,13 +76,22 @@ entityid_t Entities::spawn(
if (skeleton == nullptr) { if (skeleton == nullptr) {
throw std::runtime_error("skeleton "+def.skeletonName+" not found"); throw std::runtime_error("skeleton "+def.skeletonName+" not found");
} }
auto entity = registry.create();
entityid_t id; entityid_t id;
if (uid == 0) { if (uid == 0) {
id = nextID++; id = nextID++;
} else { } else {
id = uid; id = uid;
if (auto found = get(uid)) {
std::stringstream ss;
ss << "UID #" << uid << " is already used by an entity ";
ss << found->getDef().name;
if (found->getID().destroyFlag) {
ss << " marked to destroy";
}
throw std::runtime_error(ss.str());
}
} }
auto entity = registry.create();
registry.emplace<EntityId>(entity, static_cast<entityid_t>(id), def); registry.emplace<EntityId>(entity, static_cast<entityid_t>(id), def);
const auto& tsf = registry.emplace<Transform>( const auto& tsf = registry.emplace<Transform>(
entity, position, glm::vec3(1.0f), glm::mat3(1.0f), glm::mat4(1.0f), true); entity, position, glm::vec3(1.0f), glm::mat3(1.0f), glm::mat4(1.0f), true);