gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Adds fixed orientation to particles

Browse Source 
New features:

* Relative position
* Relative and absolute fixed axis
* Local space
* Axis along velocity vector
This commit is contained in:
Vladislav Belov
2026-02-17 19:33:26 +01:00
parent 4dff44ac9b
commit aae957ec7b
11 changed files with 228 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/graphics/ParticleEmitter.cpp
+25 -1
View File
@@ -107,6 +107,12 @@ CParticleEmitter::CParticleEmitter(const CParticleEmitterTypePtr& type) :
m_AttributeColor.format = Renderer::Backend::Format::R8G8B8A8_UNORM;
m_VertexArray.AddAttribute(&m_AttributeColor);
m_AttributeAxisX.format = Renderer::Backend::Format::R32G32B32_SFLOAT;
m_VertexArray.AddAttribute(&m_AttributeAxisX);
m_AttributeAxisY.format = Renderer::Backend::Format::R32G32B32_SFLOAT;
m_VertexArray.AddAttribute(&m_AttributeAxisY);
m_VertexArray.SetNumberOfVertices(m_Type->m_MaxParticles * 4);
m_VertexArray.Layout();
@@ -126,7 +132,7 @@ CParticleEmitter::CParticleEmitter(const CParticleEmitterTypePtr& type) :
m_IndexArray.FreeBackingStore();
const uint32_t stride = m_VertexArray.GetStride();
const std::array<Renderer::Backend::SVertexAttributeFormat, 4> attributes{{
const std::array<Renderer::Backend::SVertexAttributeFormat, 6> attributes{{
{Renderer::Backend::VertexAttributeStream::POSITION,
m_AttributePos.format, m_AttributePos.offset, stride,
Renderer::Backend::VertexAttributeRate::PER_VERTEX, 0},
@@ -139,6 +145,12 @@ CParticleEmitter::CParticleEmitter(const CParticleEmitterTypePtr& type) :
{Renderer::Backend::VertexAttributeStream::UV1,
m_AttributeAxis.format, m_AttributeAxis.offset, stride,
Renderer::Backend::VertexAttributeRate::PER_VERTEX, 0},
{Renderer::Backend::VertexAttributeStream::UV2,
m_AttributeAxisX.format, m_AttributeAxisX.offset, stride,
Renderer::Backend::VertexAttributeRate::PER_VERTEX, 0},
{Renderer::Backend::VertexAttributeStream::UV3,
m_AttributeAxisY.format, m_AttributeAxisY.offset, stride,
Renderer::Backend::VertexAttributeRate::PER_VERTEX, 0},
}};
m_VertexInputLayout = g_Renderer.GetVertexInputLayout(attributes);
}
@@ -165,6 +177,8 @@ void CParticleEmitter::UpdateArrayData(int frameNumber)
VertexArrayIterator<float[2]> attrAxis = m_AttributeAxis.GetIterator<float[2]>();
VertexArrayIterator<float[2]> attrUV = m_AttributeUV.GetIterator<float[2]>();
VertexArrayIterator<SColor4ub> attrColor = m_AttributeColor.GetIterator<SColor4ub>();
VertexArrayIterator<CVector3D> attrAxisX = m_AttributeAxisX.GetIterator<CVector3D>();
VertexArrayIterator<CVector3D> attrAxisY = m_AttributeAxisY.GetIterator<CVector3D>();
ENSURE(m_Particles.size() <= m_Type->m_MaxParticles);
@@ -255,6 +269,16 @@ void CParticleEmitter::UpdateArrayData(int frameNumber)
*attrColor++ = color;
*attrColor++ = color;
*attrColor++ = color;
*attrAxisX++ = particle.axisX;
*attrAxisX++ = particle.axisX;
*attrAxisX++ = particle.axisX;
*attrAxisX++ = particle.axisX;
*attrAxisY++ = particle.axisY;
*attrAxisY++ = particle.axisY;
*attrAxisY++ = particle.axisY;
*attrAxisY++ = particle.axisY;
}
m_ParticleBounds = bounds;
source/graphics/ParticleEmitter.h
+3 -1
View File
@@ -1,4 +1,4 @@
/* Copyright (C) 2025 Wildfire Games.
/* Copyright (C) 2026 Wildfire Games.
* This file is part of 0 A.D.
*
* 0 A.D. is free software: you can redistribute it and/or modify
@@ -52,6 +52,7 @@ struct SParticle
SColor4ub color;
float age;
float maxAge;
CVector3D axisX, axisY;
};
typedef std::shared_ptr<CParticleEmitter> CParticleEmitterPtr;
@@ -187,6 +188,7 @@ private:
VertexArray::Attribute m_AttributeAxis;
VertexArray::Attribute m_AttributeUV;
VertexArray::Attribute m_AttributeColor;
VertexArray::Attribute m_AttributeAxisX, m_AttributeAxisY;
Renderer::Backend::IVertexInputLayout* m_VertexInputLayout = nullptr;
source/graphics/ParticleEmitterType.cpp
+85 -22
View File
@@ -368,6 +368,8 @@ bool CParticleEmitterType::LoadXML(const VfsPath& path)
m_BlendMode = BlendMode::ADD;
m_SortMode = SortMode::UNSPECIFIED;
m_StartFull = false;
m_UseLocalSpace = false;
m_UseRelativePosition = false;
m_UseRelativeVelocity = false;
m_Texture = g_Renderer.GetTextureManager().GetErrorTexture();
@@ -379,23 +381,27 @@ bool CParticleEmitterType::LoadXML(const VfsPath& path)
// Define all the elements and attributes used in the XML file
#define EL(x) int el_##x = XeroFile.GetElementID(#x)
#define AT(x) int at_##x = XeroFile.GetAttributeID(#x)
EL(texture);
EL(blend);
EL(start_full);
EL(use_relative_velocity);
EL(constant);
EL(sort);
EL(uniform);
EL(copy);
EL(expr);
EL(force);
EL(fixed_orientation);
EL(particle);
EL(sort);
EL(start_full);
EL(texture);
EL(uniform);
EL(use_local_space);
EL(use_relative_position);
EL(use_relative_velocity);
AT(from);
AT(max);
AT(min);
AT(mode);
AT(mul);
AT(name);
AT(value);
AT(min);
AT(max);
AT(mul);
AT(from);
AT(x);
AT(y);
AT(z);
@@ -439,6 +445,14 @@ bool CParticleEmitterType::LoadXML(const VfsPath& path)
{
m_StartFull = true;
}
else if (Child.GetNodeName() == el_use_local_space)
{
m_UseLocalSpace = true;
}
else if (Child.GetNodeName() == el_use_relative_position)
{
m_UseRelativePosition = true;
}
else if (Child.GetNodeName() == el_use_relative_velocity)
{
m_UseRelativeVelocity = true;
@@ -490,6 +504,36 @@ bool CParticleEmitterType::LoadXML(const VfsPath& path)
float z = Child.GetAttributes().GetNamedItem(at_z).ToFloat();
m_Effectors.push_back(IParticleEffectorPtr(new CParticleEffectorForce(x, y, z)));
}
else if (Child.GetNodeName() == el_particle)
{
XERO_ITER_EL(Child, particleChild)
{
if (particleChild.GetNodeName() == el_fixed_orientation)
{
CVector3D axis{
particleChild.GetAttributes().GetNamedItem(at_x).ToFloat(),
particleChild.GetAttributes().GetNamedItem(at_y).ToFloat(),
particleChild.GetAttributes().GetNamedItem(at_z).ToFloat()};
// The axis must be a non-zero vector else it's not valid.
const float axisLength{axis.Length()};
if (axisLength > 0.0f)
axis *= 1.0f / axisLength;
else
axis = CVector3D{0.0f, 0.0f, 0.0f};
if (particleChild.GetAttributes().GetNamedItem(at_name) == "axisX")
{
m_AxisX = axis;
m_UseRelativeAxisX = particleChild.GetAttributes().GetNamedItem(at_mode) == "relative";
m_UseVelocityAsAxisX = particleChild.GetAttributes().GetNamedItem(at_mode) == "velocity";
}
else if (particleChild.GetAttributes().GetNamedItem(at_name) == "axisY")
{
m_AxisY = axis;
m_UseRelativeAxisY = particleChild.GetAttributes().GetNamedItem(at_mode) == "relative";
}
}
}
}
}
return true;
@@ -533,6 +577,10 @@ void CParticleEmitterType::UpdateEmitterStep(CParticleEmitter& emitter, float dt
// we'll immediately overwrite, so clamp it
newParticles = std::min(newParticles, (int)m_MaxParticles);
const CMatrix3D rotationMatrix{emitter.GetRotation().ToMatrix()};
const CVector3D axisX{!m_UseLocalSpace && m_UseRelativeAxisX ? rotationMatrix.Transform(m_AxisX) : m_AxisX};
const CVector3D axisY{!m_UseLocalSpace && m_UseRelativeAxisY ? rotationMatrix.Transform(m_AxisY) : m_AxisY};
for (int i = 0; i < newParticles; ++i)
{
// Compute new particle state based on variables
@@ -541,22 +589,20 @@ void CParticleEmitterType::UpdateEmitterStep(CParticleEmitter& emitter, float dt
particle.pos.X = m_Variables[VAR_POSITION_X]->Evaluate(emitter);
particle.pos.Y = m_Variables[VAR_POSITION_Y]->Evaluate(emitter);
particle.pos.Z = m_Variables[VAR_POSITION_Z]->Evaluate(emitter);
particle.pos += emitter.m_Pos;
if (m_UseRelativeVelocity)
particle.velocity.X = m_Variables[VAR_VELOCITY_X]->Evaluate(emitter);
particle.velocity.Y = m_Variables[VAR_VELOCITY_Y]->Evaluate(emitter);
particle.velocity.Z = m_Variables[VAR_VELOCITY_Z]->Evaluate(emitter);
if (!m_UseLocalSpace)
{
float xVel = m_Variables[VAR_VELOCITY_X]->Evaluate(emitter);
float yVel = m_Variables[VAR_VELOCITY_Y]->Evaluate(emitter);
float zVel = m_Variables[VAR_VELOCITY_Z]->Evaluate(emitter);
CVector3D EmitterAngle = emitter.GetRotation().ToMatrix().Transform(CVector3D(xVel,yVel,zVel));
particle.velocity.X = EmitterAngle.X;
particle.velocity.Y = EmitterAngle.Y;
particle.velocity.Z = EmitterAngle.Z;
} else {
particle.velocity.X = m_Variables[VAR_VELOCITY_X]->Evaluate(emitter);
particle.velocity.Y = m_Variables[VAR_VELOCITY_Y]->Evaluate(emitter);
particle.velocity.Z = m_Variables[VAR_VELOCITY_Z]->Evaluate(emitter);
if (m_UseRelativeVelocity)
particle.velocity = rotationMatrix.Transform(particle.velocity);
if (m_UseRelativePosition)
particle.pos = rotationMatrix.Transform(particle.pos);
particle.pos += emitter.m_Pos;
}
particle.angle = m_Variables[VAR_ANGLE]->Evaluate(emitter);
particle.angleSpeed = m_Variables[VAR_VELOCITY_ANGLE]->Evaluate(emitter);
@@ -572,6 +618,16 @@ void CParticleEmitterType::UpdateEmitterStep(CParticleEmitter& emitter, float dt
particle.age = 0.f;
particle.maxAge = m_Variables[VAR_LIFETIME]->Evaluate(emitter);
particle.axisX = axisX;
particle.axisY = axisY;
if (m_UseVelocityAsAxisX)
{
const float velocityLength{particle.velocity.Length()};
if (velocityLength > 1e-3f)
particle.axisX = particle.velocity * (1.0f / velocityLength);
}
emitter.AddParticle(particle);
}
}
@@ -590,6 +646,13 @@ void CParticleEmitterType::UpdateEmitterStep(CParticleEmitter& emitter, float dt
p.age += dt;
p.size += p.sizeGrowthRate * dt;
if (m_UseVelocityAsAxisX)
{
const float velocityLength{p.velocity.Length()};
if (velocityLength > 1e-3f)
p.axisX = p.velocity * (1.0f / velocityLength);
}
// Make alpha fade in/out nicely
// TODO: this should probably be done as a variable or something,
// instead of hardcoding
source/graphics/ParticleEmitterType.h
+8 -1
View File
@@ -117,7 +117,14 @@ private:
BlendMode m_BlendMode{BlendMode::ADD};
SortMode m_SortMode{SortMode::UNSPECIFIED};
bool m_StartFull;
bool m_UseRelativeVelocity;
bool m_UseLocalSpace{false};
bool m_UseRelativePosition{false}, m_UseRelativeVelocity{false};
// A non-zero vector in case of a fixed axis for the corresponding direction.
CVector3D m_AxisX{}, m_AxisY{};
bool m_UseRelativeAxisX{false}, m_UseRelativeAxisY{false};
bool m_UseVelocityAsAxisX{false};
float m_MaxLifetime;
u16 m_MaxParticles;
source/ps/CStrInternStatic.h
+1
View File
@@ -163,6 +163,7 @@ X(skyBoxRot)
X(skyCube)
X(sky_simple)
X(solid)
X(spaceTransform)
X(sunColor)
X(sunDir)
X(terrain_base)
source/renderer/ParticleRenderer.cpp
+22 -4
View File
@@ -181,15 +181,33 @@ void ParticleRenderer::RenderParticles(
deviceCommandContext->BeginPass();
Renderer::Backend::IShaderProgram* shader = lastTech->GetShader();
const CMatrix3D transform =
g_Renderer.GetSceneRenderer().GetViewCamera().GetViewProjection();
const CMatrix3D modelViewMatrix =
g_Renderer.GetSceneRenderer().GetViewCamera().GetOrientation().GetInverse();
const CCamera& viewCamera{g_Renderer.GetSceneRenderer().GetViewCamera()};
const CMatrix3D transform{viewCamera.GetViewProjection()};
const CMatrix3D modelViewMatrix{viewCamera.GetOrientation().GetInverse()};
deviceCommandContext->SetUniform(
shader->GetBindingSlot(str_transform), transform.AsFloatArray());
deviceCommandContext->SetUniform(
shader->GetBindingSlot(str_modelViewMatrix), modelViewMatrix.AsFloatArray());
deviceCommandContext->SetUniform(
shader->GetBindingSlot(str_cameraPos),
viewCamera.GetOrientation().GetTranslation().AsFloatArray());
}
const CMatrix3D rotationMatrix{emitter->GetRotation().ToMatrix()};
CMatrix3D spaceTransform;
if (emitter->m_Type->m_UseLocalSpace)
{
spaceTransform = rotationMatrix;
spaceTransform.Translate(emitter->GetPosition());
}
else
spaceTransform.SetIdentity();
Renderer::Backend::IShaderProgram* shader = lastTech->GetShader();
deviceCommandContext->SetUniform(
shader->GetBindingSlot(str_spaceTransform), spaceTransform.AsFloatArray());
emitter->Bind(deviceCommandContext, lastTech->GetShader());
emitter->RenderArray(deviceCommandContext);
}