voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-05 11:01:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: correct emission copy and cleanup Block code

Browse source
This commit is contained in:
Maghom1995 2026-09-10 20:34:54 +03:00
parent bb6bd27b94
commit e388fbf4f9
4 changed files with 8 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/voxels/Block.cpp
View file

@ -129,13 +129,6 @@ Block::Block(const std::string& name)
Block::~Block() = default;
Block::Block(std::string name, const std::string& texture)
: name(std::move(name)) {
for (int i = 0; i < defaults.textureFaces.size(); i++) {
defaults.textureFaces[i] = TEXTURE_NOTFOUND;
}
}
void Block::cloneTo(Block& dst) {
dst.caption = caption;
dst.defaults = defaults;
@ -143,7 +136,7 @@ void Block::cloneTo(Block& dst) {
dst.variants = std::make_unique<Variants>(*variants);
}
dst.material = material;
std::copy(&emission[0], &emission[3], dst.emission);
std::copy(&emission[0], &emission[4], dst.emission);
dst.size = size;
dst.lightPassing = lightPassing;
dst.skyLightPassing = skyLightPassing;
@ -165,7 +158,7 @@ void Block::cloneTo(Block& dst) {
dst.tickInterval = tickInterval;
dst.overlayTexture = overlayTexture;
dst.translucent = translucent;
dst.explictlySolid = explictlySolid;
dst.explicitlySolid = explicitlySolid;
dst.tags = tags;
if (dataStruct) {
dst.dataStruct = std::make_unique<data::StructLayout>(*dataStruct);
@ -174,10 +167,3 @@ void Block::cloneTo(Block& dst) {
dst.particles = std::make_unique<ParticlesPreset>(*particles);
}
}
static std::set<std::string, std::less<>> RESERVED_BLOCK_FIELDS {
};
bool Block::isReservedBlockField(std::string_view view) {
return RESERVED_BLOCK_FIELDS.find(view) != RESERVED_BLOCK_FIELDS.end();
}