Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-23 16:13:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix new texture properties not being sent for minetest.add_particle (#14760)

Browse Source 
Co-authored-by: Lars Müller <appgurulars@gmx.de>
This commit is contained in:
grorp 2024-07-01 20:41:54 +02:00 committed by GitHub
parent 95e77bd7cb
commit ea827e4c5d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/lua_api.md
View File

@ -10657,7 +10657,10 @@ Used by `minetest.add_particle`.
texture = "image.png", texture = "image.png",
-- The texture of the particle -- The texture of the particle
-- v5.6.0 and later: also supports the table format described in the -- v5.6.0 and later: also supports the table format described in the
-- following section -- following section, but due to a bug this did not take effect
-- (beyond the texture name).
-- v5.9.0 and later: fixes the bug.
-- Note: "texture.animation" is ignored here. Use "animation" below instead.
playername = "singleplayer", playername = "singleplayer",
-- Optional, if specified spawns particle only on the player's client -- Optional, if specified spawns particle only on the player's client

16
src/particles.cpp
View File

@ -197,7 +197,8 @@ enum class ParticleTextureFlags : u8 {
* decltype everywhere */ * decltype everywhere */
using FlagT = std::underlying_type_t<ParticleTextureFlags>; using FlagT = std::underlying_type_t<ParticleTextureFlags>;
void ServerParticleTexture::serialize(std::ostream &os, u16 protocol_ver, bool newPropertiesOnly) const void ServerParticleTexture::serialize(std::ostream &os, u16 protocol_ver,
bool newPropertiesOnly, bool skipAnimation) const
{ {
/* newPropertiesOnly is used to de/serialize parameters of the legacy texture /* newPropertiesOnly is used to de/serialize parameters of the legacy texture
* field, which are encoded separately from the texspec string */ * field, which are encoded separately from the texspec string */
@ -213,14 +214,19 @@ void ServerParticleTexture::serialize(std::ostream &os, u16 protocol_ver, bool n
if (!newPropertiesOnly) if (!newPropertiesOnly)
os << serializeString32(string); os << serializeString32(string);
if (animated) if (!skipAnimation && animated)
animation.serialize(os, protocol_ver); animation.serialize(os, protocol_ver);
} }
void ServerParticleTexture::deSerialize(std::istream &is, u16 protocol_ver, bool newPropertiesOnly) void ServerParticleTexture::deSerialize(std::istream &is, u16 protocol_ver,
bool newPropertiesOnly, bool skipAnimation)
{ {
FlagT flags = 0; FlagT flags = 0;
deSerializeParameterValue(is, flags); deSerializeParameterValue(is, flags);
// new texture properties were missing in ParticleParameters::serialize
// before Minetest 5.9.0
if (is.eof())
return;
animated = !!(flags & FlagT(ParticleTextureFlags::animated)); animated = !!(flags & FlagT(ParticleTextureFlags::animated));
blendmode = BlendMode((flags & FlagT(ParticleTextureFlags::blend)) >> 1); blendmode = BlendMode((flags & FlagT(ParticleTextureFlags::blend)) >> 1);
@ -230,7 +236,7 @@ void ServerParticleTexture::deSerialize(std::istream &is, u16 protocol_ver, bool
if (!newPropertiesOnly) if (!newPropertiesOnly)
string = deSerializeString32(is); string = deSerializeString32(is);
if (animated) if (!skipAnimation && animated)
animation.deSerialize(is, protocol_ver); animation.deSerialize(is, protocol_ver);
} }
@ -254,6 +260,7 @@ void ParticleParameters::serialize(std::ostream &os, u16 protocol_ver) const
writeV3F32(os, drag); writeV3F32(os, drag);
jitter.serialize(os); jitter.serialize(os);
bounce.serialize(os); bounce.serialize(os);
texture.serialize(os, protocol_ver, true, true);
} }
template <typename T, T (reader)(std::istream& is)> template <typename T, T (reader)(std::istream& is)>
@ -291,4 +298,5 @@ void ParticleParameters::deSerialize(std::istream &is, u16 protocol_ver)
return; return;
jitter.deSerialize(is); jitter.deSerialize(is);
bounce.deSerialize(is); bounce.deSerialize(is);
texture.deSerialize(is, protocol_ver, true, true);
} }

6
src/particles.h
View File

@ -276,8 +276,10 @@ struct ParticleTexture
struct ServerParticleTexture : public ParticleTexture struct ServerParticleTexture : public ParticleTexture
{ {
std::string string; std::string string;
void serialize(std::ostream &os, u16 protocol_ver, bool newPropertiesOnly = false) const; void serialize(std::ostream &os, u16 protocol_ver, bool newPropertiesOnly = false,
void deSerialize(std::istream &is, u16 protocol_ver, bool newPropertiesOnly = false); bool skipAnimation = false) const;
void deSerialize(std::istream &is, u16 protocol_ver, bool newPropertiesOnly = false,
bool skipAnimation = false);
}; };
struct CommonParticleParams struct CommonParticleParams