voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-06 19:41:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge pull request #299 from REDxEYE/definition_clone

Browse source 
Add support for `parent` field in block/item/entity json definitions
This commit is contained in:
MihailRis 2024-08-22 23:52:28 +03:00 • committed by GitHub
commit 5500fe34ac
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 262 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/objects/EntityDef.cpp Normal file
View file

@ -0,0 +1,12 @@
#include "EntityDef.hpp"
void EntityDef::cloneTo(EntityDef& dst) {
dst.components = components;
dst.bodyType = bodyType;
dst.hitbox = hitbox;
dst.boxSensors = boxSensors;
dst.radialSensors = radialSensors;
dst.skeletonName = skeletonName;
dst.blocking = blocking;
dst.save = save;
}

6
src/objects/EntityDef.hpp
View file

@ -24,12 +24,12 @@ struct EntityDef {
/// @brief Hitbox size
glm::vec3 hitbox {0.25f};
/// @brief 'aabb' sensors
std::vector<std::pair<size_t, AABB>> boxSensors {};
/// @brief 'radius' sensors
std::vector<std::pair<size_t, float>> radialSensors {};
/// @brief Skeleton ID
std::string skeletonName = name;
@ -56,4 +56,6 @@ struct EntityDef {
EntityDef(const std::string& name) : name(name) {}
EntityDef(const EntityDef&) = delete;
void cloneTo(EntityDef& dst);
};