Fix animated particle discrepancies vs vanilla
This commit is contained in:
parent
84a2d8f7f8
commit
78d5561db3
@ -70,7 +70,7 @@ Drawable Animation::drawable(float pixelSize) const {
|
|||||||
baseFrame += ":" + toString(m_frame);
|
baseFrame += ":" + toString(m_frame);
|
||||||
|
|
||||||
Drawable drawable = Drawable::makeImage(std::move(baseFrame), pixelSize, m_centered, m_offset);
|
Drawable drawable = Drawable::makeImage(std::move(baseFrame), pixelSize, m_centered, m_offset);
|
||||||
drawable.imagePart().addDirectivesGroup(m_processing);
|
drawable.imagePart().addDirectivesGroup(m_processing, true);
|
||||||
drawable.rotate(m_angle);
|
drawable.rotate(m_angle);
|
||||||
drawable.color = m_color;
|
drawable.color = m_color;
|
||||||
return drawable;
|
return drawable;
|
||||||
|
@ -219,7 +219,7 @@ void WorldPainter::renderParticles(WorldRenderData& renderData, Particle::Layer
|
|||||||
|
|
||||||
if (particle.flip && particle.flippable)
|
if (particle.flip && particle.flippable)
|
||||||
drawable.scale(Vec2F(-1, 1));
|
drawable.scale(Vec2F(-1, 1));
|
||||||
if (drawable.isImage())
|
if (drawable.isImage() && particle.type != Particle::Type::Animated)
|
||||||
drawable.imagePart().addDirectivesGroup(particle.directives, true);
|
drawable.imagePart().addDirectivesGroup(particle.directives, true);
|
||||||
drawable.fullbright = particle.fullbright;
|
drawable.fullbright = particle.fullbright;
|
||||||
drawable.color = particle.color;
|
drawable.color = particle.color;
|
||||||
|
Loading…
Reference in New Issue
Block a user