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

move default block material name to defaults.toml

Browse source
This commit is contained in:
MihailRis 2026-07-28 23:18:41 +03:00
parent 8a40bf4fcd
commit 383dcde2e7
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
res/content/base/config/defaults.toml
View file

@ -1,3 +1,4 @@
generator = "base:demo" generator = "base:demo"
player-entity = "base:player" player-entity = "base:player"
hand-skeleton = "base:hand" hand-skeleton = "base:hand"
block-material = "base:stone"

3
src/content/ContentBuilder.cpp
View file

@ -39,6 +39,9 @@ std::unique_ptr<Content> ContentBuilder::build() {
} else { } else {
def.defaults.rt.solid = isSolid(def.defaults) || def.explictlySolid; def.defaults.rt.solid = isSolid(def.defaults) || def.explictlySolid;
} }
if (def.material.empty()) {
defaults.at("block-material").get(def.material);
}
const float EPSILON = 0.01f; const float EPSILON = 0.01f;
def.rt.solid = def.rt.solid =

4
src/voxels/Block.hpp
View file

@ -37,8 +37,6 @@ inline constexpr size_t MAX_USER_BLOCK_FIELDS_SIZE = 240;
inline constexpr int BLOCK_MAX_VARIANTS = 16; inline constexpr int BLOCK_MAX_VARIANTS = 16;
inline std::string DEFAULT_MATERIAL = "base:stone";
struct BlockFuncsSet { struct BlockFuncsSet {
bool init : 1; bool init : 1;
bool update : 1; bool update : 1;
@ -206,7 +204,7 @@ public:
dv::value properties = nullptr; dv::value properties = nullptr;
/// @brief id of used BlockMaterial, may specify non-existing material /// @brief id of used BlockMaterial, may specify non-existing material
std::string material = DEFAULT_MATERIAL; std::string material;
/// @brief Light emission R, G, B, S (sky lights: sun, moon, radioactive /// @brief Light emission R, G, B, S (sky lights: sun, moon, radioactive
/// clouds) /// clouds)