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

add standard 'particles' atlas

Browse source
This commit is contained in:
MihailRis 2024-11-03 19:51:59 +03:00
parent b9b122dc83
commit f1dc983766
2 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
res/preload.json
View file

@ -27,6 +27,7 @@
], ],
"atlases": [ "atlases": [
"blocks", "blocks",
"items" "items",
"particles"
] ]
} }

19
src/presets/ParticlesPreset.cpp
View file

@ -23,25 +23,27 @@ ParticleSpawnShape ParticleSpawnShape_from(std::string_view s) {
dv::value ParticlesPreset::serialize() const { dv::value ParticlesPreset::serialize() const {
auto root = dv::object(); auto root = dv::object();
root["texture"] = texture; if (frames.empty()) {
root["texture"] = texture;
} else {
auto& arr = root.list("animation");
for (const auto& frame : frames) {
arr.add(frame);
}
}
root["collision"] = collision; root["collision"] = collision;
root["lighting"] = lighting; root["lighting"] = lighting;
root["max_distance"] = maxDistance; root["max_distance"] = maxDistance;
root["spawn_interval"] = spawnInterval; root["spawn_interval"] = spawnInterval;
root["lifetime"] = lifetime; root["lifetime"] = lifetime;
root["lifetime_spread"] = lifetimeSpread; root["lifetime_spread"] = lifetimeSpread;
root["velocity"] = dv::to_value(velocity);
root["acceleration"] = dv::to_value(acceleration); root["acceleration"] = dv::to_value(acceleration);
root["explosion"] = dv::to_value(explosion); root["explosion"] = dv::to_value(explosion);
root["size"] = dv::to_value(size); root["size"] = dv::to_value(size);
root["spawn_spread"] = dv::to_value(size); root["spawn_spread"] = dv::to_value(size);
root["spawn_shape"] = to_string(spawnShape); root["spawn_shape"] = to_string(spawnShape);
root["random_sub_uv"] = randomSubUV; root["random_sub_uv"] = randomSubUV;
if (!frames.empty()) {
auto& arr = root.list("animation");
for (const auto& frame : frames) {
arr.add(frame);
}
}
return root; return root;
} }
@ -54,6 +56,9 @@ void ParticlesPreset::deserialize(const dv::value& src) {
src.at("lifetime").get(lifetime); src.at("lifetime").get(lifetime);
src.at("lifetime_spread").get(lifetimeSpread); src.at("lifetime_spread").get(lifetimeSpread);
src.at("random_sub_uv").get(randomSubUV); src.at("random_sub_uv").get(randomSubUV);
if (src.has("velocity")) {
dv::get_vec(src["velocity"], velocity);
}
if (src.has("acceleration")) { if (src.has("acceleration")) {
dv::get_vec(src["acceleration"], acceleration); dv::get_vec(src["acceleration"], acceleration);
} }