From 5425d6dc9ac0485eb6bcc0a3b93b1ad3eb7a3838 Mon Sep 17 00:00:00 2001 From: apistol78 Date: Tue, 9 Jan 2024 14:13:21 +0100 Subject: [PATCH] Traktor: Removed per-particle color value. --- code/Spray/Point.h | 3 +- code/Spray/PointRenderer.cpp | 7 +- code/Spray/Sources/BoxSource.cpp | 12 +- code/Spray/Sources/BoxSource.h | 10 +- code/Spray/Sources/BoxSourceData.cpp | 7 +- code/Spray/Sources/BoxSourceData.h | 8 +- code/Spray/Sources/ConeSource.cpp | 38 +- code/Spray/Sources/ConeSource.h | 10 +- code/Spray/Sources/ConeSourceData.cpp | 7 +- code/Spray/Sources/ConeSourceData.h | 8 +- code/Spray/Sources/DirectionalPointSource.cpp | 12 +- code/Spray/Sources/DirectionalPointSource.h | 10 +- .../Sources/DirectionalPointSourceData.cpp | 7 +- .../Sources/DirectionalPointSourceData.h | 8 +- code/Spray/Sources/DiscSource.cpp | 22 +- code/Spray/Sources/DiscSource.h | 10 +- code/Spray/Sources/DiscSourceData.cpp | 7 +- code/Spray/Sources/DiscSourceData.h | 8 +- code/Spray/Sources/LineSource.cpp | 18 +- code/Spray/Sources/LineSource.h | 10 +- code/Spray/Sources/LineSourceData.cpp | 7 +- code/Spray/Sources/LineSourceData.h | 8 +- code/Spray/Sources/PointSetSource.cpp | 12 +- code/Spray/Sources/PointSetSource.h | 10 +- code/Spray/Sources/PointSetSourceData.cpp | 7 +- code/Spray/Sources/PointSetSourceData.h | 8 +- code/Spray/Sources/PointSource.cpp | 10 +- code/Spray/Sources/PointSource.h | 10 +- code/Spray/Sources/PointSourceData.cpp | 7 +- code/Spray/Sources/PointSourceData.h | 8 +- code/Spray/Sources/QuadSource.cpp | 20 +- code/Spray/Sources/QuadSource.h | 10 +- code/Spray/Sources/QuadSourceData.cpp | 7 +- code/Spray/Sources/QuadSourceData.h | 8 +- code/Spray/Sources/SphereSource.cpp | 12 +- code/Spray/Sources/SphereSource.h | 10 +- code/Spray/Sources/SphereSourceData.cpp | 7 +- code/Spray/Sources/SphereSourceData.h | 8 +- code/Spray/Sources/VirtualSource.cpp | 7 +- code/Spray/Sources/VirtualSource.h | 10 +- code/Spray/Sources/VirtualSourceData.cpp | 7 +- code/Spray/Sources/VirtualSourceData.h | 8 +- code/Spray/Vertex.h | 3 +- .../System/Spray/Examples/Shaders/Nozzle.xdi | 7 +- .../System/Spray/Examples/Shaders/Point.xdi | 4 - .../System/Spray/Examples/Shaders/Surface.xdi | 7 +- .../System/Spray/Examples/Shaders/XZ.xdi | 7 +- .../System/Spray/Shaders/EmitterNozzle.xdi | 272 ++++++-------- .../System/Spray/Shaders/EmitterPoint.xdi | 233 +++++------- .../System/Spray/Shaders/EmitterSurface.xdi | 349 +++++++----------- .../Source/System/Spray/Shaders/EmitterXZ.xdi | 258 +++++-------- .../Spray/Shaders/Private/GetAttributes.xdi | 246 ++++-------- 52 files changed, 654 insertions(+), 1155 deletions(-) diff --git a/code/Spray/Point.h b/code/Spray/Point.h index 01fa554d5d..3f6bcc60ab 100644 --- a/code/Spray/Point.h +++ b/code/Spray/Point.h @@ -21,14 +21,13 @@ struct T_MATH_ALIGN16 Point { Vector4 position; Vector4 velocity; - Vector4 color; // 48 float orientation; float angularVelocity; float inverseMass; float age; float maxAge; float size; - float random; // 28 + float random; }; /*! Array of particles. diff --git a/code/Spray/PointRenderer.cpp b/code/Spray/PointRenderer.cpp index 2cd865ceff..dc65c1c51d 100644 --- a/code/Spray/PointRenderer.cpp +++ b/code/Spray/PointRenderer.cpp @@ -166,12 +166,11 @@ void PointRenderer::render( // \note We're assuming locked vertex buffer is 16-aligned. position.storeAligned(m_point->positionAndOrientation); point.velocity.storeAligned(m_point->velocityAndRandom); - point.color.storeAligned(m_point->colorAndAge); m_point->positionAndOrientation[3] = point.orientation; m_point->velocityAndRandom[3] = point.random; - m_point->alphaAndSize[0] = alpha; - m_point->alphaAndSize[1] = point.size; - m_point->colorAndAge[3] = age; + m_point->alphaSizeAge[0] = alpha; + m_point->alphaSizeAge[1] = point.size; + m_point->alphaSizeAge[2] = age; m_point++; back.distance = min(back.distance, distance); diff --git a/code/Spray/Sources/BoxSource.cpp b/code/Spray/Sources/BoxSource.cpp index 5b472ba42f..1b86a1bc4c 100644 --- a/code/Spray/Sources/BoxSource.cpp +++ b/code/Spray/Sources/BoxSource.cpp @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -10,10 +10,8 @@ #include "Spray/Types.h" #include "Spray/Sources/BoxSource.h" -namespace traktor +namespace traktor::spray { - namespace spray - { T_IMPLEMENT_RTTI_CLASS(L"traktor.spray.BoxSource", BoxSource, Source) @@ -49,19 +47,18 @@ void BoxSource::emit( EmitterInstance& emitterInstance ) const { - Vector4 position = transform * m_position - m_extent * Scalar(0.5f); + const Vector4 position = transform * m_position - m_extent * 0.5_simd; Point* point = emitterInstance.addPoints(emitCount); while (emitCount-- > 0) { - Vector4 direction = context.random.nextUnit(); + const Vector4 direction = context.random.nextUnit(); point->position = position + m_extent * Vector4(context.random.nextFloat(), context.random.nextFloat(), context.random.nextFloat(), 0.0f); point->velocity = direction * Scalar(m_velocity.random(context.random)); point->orientation = m_orientation.random(context.random); point->angularVelocity = m_angularVelocity.random(context.random); - point->color = Vector4::one(); point->age = 0.0f; point->maxAge = m_age.random(context.random); point->inverseMass = 1.0f / (m_mass.random(context.random)); @@ -72,5 +69,4 @@ void BoxSource::emit( } } - } } diff --git a/code/Spray/Sources/BoxSource.h b/code/Spray/Sources/BoxSource.h index 5d3c43f4c4..20c7adbc5b 100644 --- a/code/Spray/Sources/BoxSource.h +++ b/code/Spray/Sources/BoxSource.h @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -20,10 +20,8 @@ # define T_DLLCLASS T_DLLIMPORT #endif -namespace traktor +namespace traktor::spray { - namespace spray - { /*! Box particle source. * \ingroup Spray @@ -33,7 +31,7 @@ class T_DLLCLASS BoxSource : public Source T_RTTI_CLASS; public: - BoxSource( + explicit BoxSource( float constantRate, float velocityRate, const Vector4& position, @@ -69,6 +67,4 @@ class T_DLLCLASS BoxSource : public Source Range< float > m_size; }; - } } - diff --git a/code/Spray/Sources/BoxSourceData.cpp b/code/Spray/Sources/BoxSourceData.cpp index 6427ec1123..093d40e806 100644 --- a/code/Spray/Sources/BoxSourceData.cpp +++ b/code/Spray/Sources/BoxSourceData.cpp @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -14,10 +14,8 @@ #include "Spray/Sources/BoxSource.h" #include "Spray/Sources/BoxSourceData.h" -namespace traktor +namespace traktor::spray { - namespace spray - { T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.spray.BoxSourceData", 0, BoxSourceData, SourceData) @@ -64,5 +62,4 @@ void BoxSourceData::serialize(ISerializer& s) s >> MemberComposite< Range< float > >(L"size", m_size); } - } } diff --git a/code/Spray/Sources/BoxSourceData.h b/code/Spray/Sources/BoxSourceData.h index cc6da313e3..b4107f70f4 100644 --- a/code/Spray/Sources/BoxSourceData.h +++ b/code/Spray/Sources/BoxSourceData.h @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -20,10 +20,8 @@ # define T_DLLCLASS T_DLLIMPORT #endif -namespace traktor +namespace traktor::spray { - namespace spray - { /*! Box particle source persistent data. * \ingroup Spray @@ -52,6 +50,4 @@ class T_DLLCLASS BoxSourceData : public SourceData Range< float > m_size; }; - } } - diff --git a/code/Spray/Sources/ConeSource.cpp b/code/Spray/Sources/ConeSource.cpp index fdee17a3de..046b15db06 100644 --- a/code/Spray/Sources/ConeSource.cpp +++ b/code/Spray/Sources/ConeSource.cpp @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -10,10 +10,8 @@ #include "Spray/Types.h" #include "Spray/Sources/ConeSource.h" -namespace traktor +namespace traktor::spray { - namespace spray - { T_IMPLEMENT_RTTI_CLASS(L"traktor.spray.ConeSource", ConeSource, Source) @@ -55,38 +53,37 @@ void ConeSource::emit( EmitterInstance& emitterInstance ) const { - Vector4 position = transform * m_position; - Vector4 normal = transform * m_normal; + const Vector4 position = transform * m_position; + const Vector4 normal = transform * m_normal; - Scalar dT(context.deltaTime); + const Scalar dT(context.deltaTime); - Vector4 deltaVelocity = -deltaMotion / dT; + const Vector4 deltaVelocity = -deltaMotion / dT; - Vector4 tx = transform.axisX() * m_angle1s; - Vector4 tz = transform.axisZ() * m_angle2s; + const Vector4 tx = transform.axisX() * m_angle1s; + const Vector4 tz = transform.axisZ() * m_angle2s; Point* point = emitterInstance.addPoints(emitCount); while (emitCount-- > 0) { - float phi = context.random.nextFloat() * 2.0f * PI; + const float phi = context.random.nextFloat() * 2.0f * PI; - Scalar gamma(context.random.nextFloat()); - Scalar beta(context.random.nextFloat()); + const Scalar gamma(context.random.nextFloat()); + const Scalar beta(context.random.nextFloat()); - Scalar x(traktor::sinf(phi + HALF_PI)); - Scalar z(traktor::sinf(phi)); + const Scalar x(traktor::sinf(phi + HALF_PI)); + const Scalar z(traktor::sinf(phi)); - Vector4 ax = tx * x; - Vector4 az = tz * z; + const Vector4 ax = tx * x; + const Vector4 az = tz * z; - Vector4 extent = ax + az; - Vector4 direction = (normal + extent * gamma).normalized(); + const Vector4 extent = ax + az; + const Vector4 direction = (normal + extent * gamma).normalized(); point->velocity = direction * Scalar(m_velocity.random(context.random)) + deltaVelocity * Scalar(m_inheritVelocity.random(context.random)); point->position = position + point->velocity * beta * dT; point->orientation = m_orientation.random(context.random); point->angularVelocity = m_angularVelocity.random(context.random); - point->color = Vector4::one(); point->age = beta; point->maxAge = m_age.random(context.random); point->inverseMass = 1.0f / m_mass.random(context.random); @@ -97,5 +94,4 @@ void ConeSource::emit( } } - } } diff --git a/code/Spray/Sources/ConeSource.h b/code/Spray/Sources/ConeSource.h index 1536d84ec8..57a8d56f86 100644 --- a/code/Spray/Sources/ConeSource.h +++ b/code/Spray/Sources/ConeSource.h @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -20,10 +20,8 @@ # define T_DLLCLASS T_DLLIMPORT #endif -namespace traktor +namespace traktor::spray { - namespace spray - { /*! Cone particle source. * \ingroup Spray @@ -33,7 +31,7 @@ class T_DLLCLASS ConeSource : public Source T_RTTI_CLASS; public: - ConeSource( + explicit ConeSource( float constantRate, float velocityRate, const Vector4& position, @@ -79,6 +77,4 @@ class T_DLLCLASS ConeSource : public Source Range< float > m_size; }; - } } - diff --git a/code/Spray/Sources/ConeSourceData.cpp b/code/Spray/Sources/ConeSourceData.cpp index 0822b35c19..9c018d3ec4 100644 --- a/code/Spray/Sources/ConeSourceData.cpp +++ b/code/Spray/Sources/ConeSourceData.cpp @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -16,10 +16,8 @@ #include "Spray/Sources/ConeSource.h" #include "Spray/Sources/ConeSourceData.h" -namespace traktor +namespace traktor::spray { - namespace spray - { T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.spray.ConeSourceData", 1, ConeSourceData, SourceData) @@ -78,5 +76,4 @@ void ConeSourceData::serialize(ISerializer& s) s >> MemberComposite< Range< float > >(L"size", m_size); } - } } diff --git a/code/Spray/Sources/ConeSourceData.h b/code/Spray/Sources/ConeSourceData.h index 09343ad405..24321f7a90 100644 --- a/code/Spray/Sources/ConeSourceData.h +++ b/code/Spray/Sources/ConeSourceData.h @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -20,10 +20,8 @@ # define T_DLLCLASS T_DLLIMPORT #endif -namespace traktor +namespace traktor::spray { - namespace spray - { /*! Cone particle source persistent data. * \ingroup Spray @@ -55,6 +53,4 @@ class T_DLLCLASS ConeSourceData : public SourceData Range< float > m_size; }; - } } - diff --git a/code/Spray/Sources/DirectionalPointSource.cpp b/code/Spray/Sources/DirectionalPointSource.cpp index aa488f67ca..85d1ed2803 100644 --- a/code/Spray/Sources/DirectionalPointSource.cpp +++ b/code/Spray/Sources/DirectionalPointSource.cpp @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -10,10 +10,8 @@ #include "Spray/Types.h" #include "Spray/Sources/DirectionalPointSource.h" -namespace traktor +namespace traktor::spray { - namespace spray - { T_IMPLEMENT_RTTI_CLASS(L"traktor.spray.DirectionalPointSource", DirectionalPointSource, Source) @@ -49,8 +47,8 @@ void DirectionalPointSource::emit( EmitterInstance& emitterInstance ) const { - Vector4 position = transform * m_position; - Vector4 direction = transform * m_direction; + const Vector4 position = transform * m_position; + const Vector4 direction = transform * m_direction; Point* point = emitterInstance.addPoints(emitCount); @@ -60,7 +58,6 @@ void DirectionalPointSource::emit( point->velocity = direction * Scalar(m_velocity.random(context.random)); point->orientation = m_orientation.random(context.random); point->angularVelocity = m_angularVelocity.random(context.random); - point->color = Vector4::one(); point->age = 0.0f; point->maxAge = m_age.random(context.random); point->inverseMass = 1.0f / (m_mass.random(context.random)); @@ -71,5 +68,4 @@ void DirectionalPointSource::emit( } } - } } diff --git a/code/Spray/Sources/DirectionalPointSource.h b/code/Spray/Sources/DirectionalPointSource.h index 942b856156..e16f6ddd94 100644 --- a/code/Spray/Sources/DirectionalPointSource.h +++ b/code/Spray/Sources/DirectionalPointSource.h @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -20,10 +20,8 @@ # define T_DLLCLASS T_DLLIMPORT #endif -namespace traktor +namespace traktor::spray { - namespace spray - { /*! Directional point particle source. * \ingroup Spray @@ -33,7 +31,7 @@ class T_DLLCLASS DirectionalPointSource : public Source T_RTTI_CLASS; public: - DirectionalPointSource( + explicit DirectionalPointSource( float constantRate, float velocityRate, const Vector4& position, @@ -69,6 +67,4 @@ class T_DLLCLASS DirectionalPointSource : public Source Range< float > m_size; }; - } } - diff --git a/code/Spray/Sources/DirectionalPointSourceData.cpp b/code/Spray/Sources/DirectionalPointSourceData.cpp index 86e9a46946..17090e8ab4 100644 --- a/code/Spray/Sources/DirectionalPointSourceData.cpp +++ b/code/Spray/Sources/DirectionalPointSourceData.cpp @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -14,10 +14,8 @@ #include "Spray/Sources/DirectionalPointSource.h" #include "Spray/Sources/DirectionalPointSourceData.h" -namespace traktor +namespace traktor::spray { - namespace spray - { T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.spray.DirectionalPointSourceData", 0, DirectionalPointSourceData, SourceData) @@ -64,5 +62,4 @@ void DirectionalPointSourceData::serialize(ISerializer& s) s >> MemberComposite< Range< float > >(L"size", m_size); } - } } diff --git a/code/Spray/Sources/DirectionalPointSourceData.h b/code/Spray/Sources/DirectionalPointSourceData.h index 431ff01c7c..e6bd248a8e 100644 --- a/code/Spray/Sources/DirectionalPointSourceData.h +++ b/code/Spray/Sources/DirectionalPointSourceData.h @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -20,10 +20,8 @@ # define T_DLLCLASS T_DLLIMPORT #endif -namespace traktor +namespace traktor::spray { - namespace spray - { /*! Directional point particle source persistent data. * \ingroup Spray @@ -50,6 +48,4 @@ class T_DLLCLASS DirectionalPointSourceData : public SourceData Range< float > m_size; }; - } } - diff --git a/code/Spray/Sources/DiscSource.cpp b/code/Spray/Sources/DiscSource.cpp index 38f683b605..274f151244 100644 --- a/code/Spray/Sources/DiscSource.cpp +++ b/code/Spray/Sources/DiscSource.cpp @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -10,10 +10,8 @@ #include "Spray/Types.h" #include "Spray/Sources/DiscSource.h" -namespace traktor +namespace traktor::spray { - namespace spray - { T_IMPLEMENT_RTTI_CLASS(L"traktor.spray.DiscSource", DiscSource, Source) @@ -53,25 +51,24 @@ void DiscSource::emit( { const Vector4 axisZ(0.0f, 0.0f, 1.0f, 0.0f); - Vector4 wx = cross(m_normal, axisZ); - Vector4 wz = cross(wx, m_normal); + const Vector4 wx = cross(m_normal, axisZ); + const Vector4 wz = cross(wx, m_normal); - Vector4 position = transform * m_position; - Vector4 x = transform * wx; - Vector4 y = transform * m_normal; - Vector4 z = transform * wz; + const Vector4 position = transform * m_position; + const Vector4 x = transform * wx; + const Vector4 y = transform * m_normal; + const Vector4 z = transform * wz; Point* point = emitterInstance.addPoints(emitCount); while (emitCount-- > 0) { - Vector4 direction = (x * Scalar(context.random.nextFloat() * 2.0f - 1.0f) + z * Scalar(context.random.nextFloat() * 2.0f - 1.0f)).normalized(); + const Vector4 direction = (x * Scalar(context.random.nextFloat() * 2.0f - 1.0f) + z * Scalar(context.random.nextFloat() * 2.0f - 1.0f)).normalized(); point->position = position + direction * Scalar(m_radius.random(context.random)); point->velocity = y * Scalar(m_velocity.random(context.random)); point->orientation = m_orientation.random(context.random); point->angularVelocity = m_angularVelocity.random(context.random); - point->color = Vector4::one(); point->age = 0.0f; point->maxAge = m_age.random(context.random); point->inverseMass = 1.0f / (m_mass.random(context.random)); @@ -82,5 +79,4 @@ void DiscSource::emit( } } - } } diff --git a/code/Spray/Sources/DiscSource.h b/code/Spray/Sources/DiscSource.h index 1580323b63..736327fdf1 100644 --- a/code/Spray/Sources/DiscSource.h +++ b/code/Spray/Sources/DiscSource.h @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -20,10 +20,8 @@ # define T_DLLCLASS T_DLLIMPORT #endif -namespace traktor +namespace traktor::spray { - namespace spray - { /*! Disc particle source. * \ingroup Spray @@ -33,7 +31,7 @@ class T_DLLCLASS DiscSource : public Source T_RTTI_CLASS; public: - DiscSource( + explicit DiscSource( float constantRate, float velocityRate, const Vector4& position, @@ -73,6 +71,4 @@ class T_DLLCLASS DiscSource : public Source Range< float > m_size; }; - } } - diff --git a/code/Spray/Sources/DiscSourceData.cpp b/code/Spray/Sources/DiscSourceData.cpp index 4c0f32474c..87bdbff7fa 100644 --- a/code/Spray/Sources/DiscSourceData.cpp +++ b/code/Spray/Sources/DiscSourceData.cpp @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -14,10 +14,8 @@ #include "Spray/Sources/DiscSource.h" #include "Spray/Sources/DiscSourceData.h" -namespace traktor +namespace traktor::spray { - namespace spray - { T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.spray.DiscSourceData", 0, DiscSourceData, SourceData) @@ -67,5 +65,4 @@ void DiscSourceData::serialize(ISerializer& s) s >> MemberComposite< Range< float > >(L"size", m_size); } - } } diff --git a/code/Spray/Sources/DiscSourceData.h b/code/Spray/Sources/DiscSourceData.h index 35aa483736..baecf97ff9 100644 --- a/code/Spray/Sources/DiscSourceData.h +++ b/code/Spray/Sources/DiscSourceData.h @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -20,10 +20,8 @@ # define T_DLLCLASS T_DLLIMPORT #endif -namespace traktor +namespace traktor::spray { - namespace spray - { /*! Disc particle source persistent data. * \ingroup Spray @@ -53,6 +51,4 @@ class T_DLLCLASS DiscSourceData : public SourceData Range< float > m_size; }; - } } - diff --git a/code/Spray/Sources/LineSource.cpp b/code/Spray/Sources/LineSource.cpp index 013bc70b4c..7f4c28692e 100644 --- a/code/Spray/Sources/LineSource.cpp +++ b/code/Spray/Sources/LineSource.cpp @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -10,10 +10,8 @@ #include "Spray/Types.h" #include "Spray/Sources/LineSource.h" -namespace traktor +namespace traktor::spray { - namespace spray - { T_IMPLEMENT_RTTI_CLASS(L"traktor.spray.LineSource", LineSource, Source) @@ -51,23 +49,22 @@ void LineSource::emit( EmitterInstance& emitterInstance ) const { - Vector4 startPosition = transform * m_startPosition; - Vector4 endPosition = transform * m_endPosition; - Vector4 direction = (endPosition - startPosition).normalized(); + const Vector4 startPosition = transform * m_startPosition; + const Vector4 endPosition = transform * m_endPosition; + const Vector4 direction = (endPosition - startPosition).normalized(); - int32_t npoints = 2 + m_segments; + const int32_t npoints = 2 + m_segments; Point* point = emitterInstance.addPoints(npoints); for (int32_t i = 0; i < npoints; ++i) { - Vector4 position = lerp(startPosition, endPosition, Scalar(float(i) / (npoints - 1))); + const Vector4 position = lerp(startPosition, endPosition, Scalar(float(i) / (npoints - 1))); point->position = position; point->velocity = direction * Scalar(m_velocity.random(context.random)); point->orientation = m_orientation.random(context.random); point->angularVelocity = m_angularVelocity.random(context.random); - point->color = Vector4::one(); point->age = 0.0f; point->maxAge = m_age.random(context.random); point->inverseMass = 1.0f / (m_mass.random(context.random)); @@ -78,5 +75,4 @@ void LineSource::emit( } } - } } diff --git a/code/Spray/Sources/LineSource.h b/code/Spray/Sources/LineSource.h index aafbfc278b..7fd3d6f8cf 100644 --- a/code/Spray/Sources/LineSource.h +++ b/code/Spray/Sources/LineSource.h @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -20,10 +20,8 @@ # define T_DLLCLASS T_DLLIMPORT #endif -namespace traktor +namespace traktor::spray { - namespace spray - { /*! Line particle source. * \ingroup Spray @@ -33,7 +31,7 @@ class T_DLLCLASS LineSource : public Source T_RTTI_CLASS; public: - LineSource( + explicit LineSource( float constantRate, float velocityRate, const Vector4& startPosition, @@ -73,6 +71,4 @@ class T_DLLCLASS LineSource : public Source Range< float > m_size; }; - } } - diff --git a/code/Spray/Sources/LineSourceData.cpp b/code/Spray/Sources/LineSourceData.cpp index 5a112097de..0e0b23efa6 100644 --- a/code/Spray/Sources/LineSourceData.cpp +++ b/code/Spray/Sources/LineSourceData.cpp @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -14,10 +14,8 @@ #include "Spray/Sources/LineSource.h" #include "Spray/Sources/LineSourceData.h" -namespace traktor +namespace traktor::spray { - namespace spray - { T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.spray.LineSourceData", 0, LineSourceData, SourceData) @@ -67,5 +65,4 @@ void LineSourceData::serialize(ISerializer& s) s >> MemberComposite< Range< float > >(L"size", m_size); } - } } diff --git a/code/Spray/Sources/LineSourceData.h b/code/Spray/Sources/LineSourceData.h index a442be258b..da1a16e87f 100644 --- a/code/Spray/Sources/LineSourceData.h +++ b/code/Spray/Sources/LineSourceData.h @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -20,10 +20,8 @@ # define T_DLLCLASS T_DLLIMPORT #endif -namespace traktor +namespace traktor::spray { - namespace spray - { /*! Line particle source persistent data. * \ingroup Spray @@ -53,6 +51,4 @@ class T_DLLCLASS LineSourceData : public SourceData Range< float > m_size; }; - } } - diff --git a/code/Spray/Sources/PointSetSource.cpp b/code/Spray/Sources/PointSetSource.cpp index a3dd8ba07c..0aade84f11 100644 --- a/code/Spray/Sources/PointSetSource.cpp +++ b/code/Spray/Sources/PointSetSource.cpp @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -11,10 +11,8 @@ #include "Spray/PointSet.h" #include "Spray/Sources/PointSetSource.h" -namespace traktor +namespace traktor::spray { - namespace spray - { T_IMPLEMENT_RTTI_CLASS(L"traktor.spray.PointSetSource", PointSetSource, Source) @@ -58,14 +56,13 @@ void PointSetSource::emit( for (uint32_t i = 0; i < uint32_t(points.size()); ++i) { - Vector4 position = transform * (points[i].position + m_offset).xyz1(); - Vector4 normal = transform * points[i].normal.xyz0(); + const Vector4 position = transform * (points[i].position + m_offset).xyz1(); + const Vector4 normal = transform * points[i].normal.xyz0(); point->position = position; point->velocity = normal * Scalar(m_velocity.random(context.random)); point->orientation = m_orientation.random(context.random); point->angularVelocity = m_angularVelocity.random(context.random); - point->color = points[i].color; point->age = 0.0f; point->maxAge = m_age.random(context.random); point->inverseMass = 1.0f / (m_mass.random(context.random)); @@ -76,5 +73,4 @@ void PointSetSource::emit( } } - } } diff --git a/code/Spray/Sources/PointSetSource.h b/code/Spray/Sources/PointSetSource.h index 2eb5873557..a036aad70b 100644 --- a/code/Spray/Sources/PointSetSource.h +++ b/code/Spray/Sources/PointSetSource.h @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -20,10 +20,8 @@ # define T_DLLCLASS T_DLLIMPORT #endif -namespace traktor +namespace traktor::spray { - namespace spray - { class PointSet; @@ -35,7 +33,7 @@ class T_DLLCLASS PointSetSource : public Source T_RTTI_CLASS; public: - PointSetSource( + explicit PointSetSource( float constantRate, float velocityRate, const resource::Proxy< PointSet >& pointSet, @@ -71,6 +69,4 @@ class T_DLLCLASS PointSetSource : public Source Range< float > m_size; }; - } } - diff --git a/code/Spray/Sources/PointSetSourceData.cpp b/code/Spray/Sources/PointSetSourceData.cpp index 532bac3e6a..68d79ab4db 100644 --- a/code/Spray/Sources/PointSetSourceData.cpp +++ b/code/Spray/Sources/PointSetSourceData.cpp @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -17,10 +17,8 @@ #include "Spray/Sources/PointSetSource.h" #include "Spray/Sources/PointSetSourceData.h" -namespace traktor +namespace traktor::spray { - namespace spray - { T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.spray.PointSetSourceData", 0, PointSetSourceData, SourceData) @@ -70,5 +68,4 @@ void PointSetSourceData::serialize(ISerializer& s) s >> MemberComposite< Range< float > >(L"size", m_size); } - } } diff --git a/code/Spray/Sources/PointSetSourceData.h b/code/Spray/Sources/PointSetSourceData.h index 844802ea17..487c786ab4 100644 --- a/code/Spray/Sources/PointSetSourceData.h +++ b/code/Spray/Sources/PointSetSourceData.h @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -21,10 +21,8 @@ # define T_DLLCLASS T_DLLIMPORT #endif -namespace traktor +namespace traktor::spray { - namespace spray - { class PointSet; @@ -55,6 +53,4 @@ class T_DLLCLASS PointSetSourceData : public SourceData Range< float > m_size; }; - } } - diff --git a/code/Spray/Sources/PointSource.cpp b/code/Spray/Sources/PointSource.cpp index 8cd030f599..bba7202f23 100644 --- a/code/Spray/Sources/PointSource.cpp +++ b/code/Spray/Sources/PointSource.cpp @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -10,10 +10,8 @@ #include "Spray/Types.h" #include "Spray/Sources/PointSource.h" -namespace traktor +namespace traktor::spray { - namespace spray - { T_IMPLEMENT_RTTI_CLASS(L"traktor.spray.PointSource", PointSource, Source) @@ -47,7 +45,7 @@ void PointSource::emit( EmitterInstance& emitterInstance ) const { - Vector4 position = transform * m_position; + const Vector4 position = transform * m_position; Point* point = emitterInstance.addPoints(emitCount); @@ -57,7 +55,6 @@ void PointSource::emit( point->velocity = context.random.nextUnit().xyz0() * Scalar(m_velocity.random(context.random)); point->orientation = m_orientation.random(context.random); point->angularVelocity = m_angularVelocity.random(context.random); - point->color = Vector4::one(); point->age = 0.0f; point->maxAge = m_age.random(context.random); point->inverseMass = 1.0f / (m_mass.random(context.random)); @@ -68,5 +65,4 @@ void PointSource::emit( } } - } } diff --git a/code/Spray/Sources/PointSource.h b/code/Spray/Sources/PointSource.h index 52a0bd70d1..ea9560df91 100644 --- a/code/Spray/Sources/PointSource.h +++ b/code/Spray/Sources/PointSource.h @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -20,10 +20,8 @@ # define T_DLLCLASS T_DLLIMPORT #endif -namespace traktor +namespace traktor::spray { - namespace spray - { /*! Point particle source. * \ingroup Spray @@ -33,7 +31,7 @@ class T_DLLCLASS PointSource : public Source T_RTTI_CLASS; public: - PointSource( + explicit PointSource( float constantRate, float velocityRate, const Vector4& position, @@ -65,6 +63,4 @@ class T_DLLCLASS PointSource : public Source Range< float > m_size; }; - } } - diff --git a/code/Spray/Sources/PointSourceData.cpp b/code/Spray/Sources/PointSourceData.cpp index a43cbeb1e2..554404c93f 100644 --- a/code/Spray/Sources/PointSourceData.cpp +++ b/code/Spray/Sources/PointSourceData.cpp @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -13,10 +13,8 @@ #include "Spray/Sources/PointSource.h" #include "Spray/Sources/PointSourceData.h" -namespace traktor +namespace traktor::spray { - namespace spray - { T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.spray.PointSourceData", 0, PointSourceData, SourceData) @@ -60,5 +58,4 @@ void PointSourceData::serialize(ISerializer& s) s >> MemberComposite< Range< float > >(L"size", m_size); } - } } diff --git a/code/Spray/Sources/PointSourceData.h b/code/Spray/Sources/PointSourceData.h index 36211ed2d2..36afc78d1c 100644 --- a/code/Spray/Sources/PointSourceData.h +++ b/code/Spray/Sources/PointSourceData.h @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -20,10 +20,8 @@ # define T_DLLCLASS T_DLLIMPORT #endif -namespace traktor +namespace traktor::spray { - namespace spray - { /*! Point particle source persistent data. * \ingroup Spray @@ -51,6 +49,4 @@ class T_DLLCLASS PointSourceData : public SourceData Range< float > m_size; }; - } } - diff --git a/code/Spray/Sources/QuadSource.cpp b/code/Spray/Sources/QuadSource.cpp index 26dae8875d..5631876ead 100644 --- a/code/Spray/Sources/QuadSource.cpp +++ b/code/Spray/Sources/QuadSource.cpp @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -10,10 +10,8 @@ #include "Spray/Types.h" #include "Spray/Sources/QuadSource.h" -namespace traktor +namespace traktor::spray { - namespace spray - { T_IMPLEMENT_RTTI_CLASS(L"traktor.spray.QuadSource", QuadSource, Source) @@ -53,23 +51,22 @@ void QuadSource::emit( EmitterInstance& emitterInstance ) const { - Vector4 center = transform * m_center; - Vector4 axis1 = transform * m_axis1; - Vector4 axis2 = transform * m_axis2; - Vector4 normal = transform * m_normal; + const Vector4 center = transform * m_center; + const Vector4 axis1 = transform * m_axis1; + const Vector4 axis2 = transform * m_axis2; + const Vector4 normal = transform * m_normal; Point* point = emitterInstance.addPoints(emitCount); while (emitCount-- > 0) { - Scalar u = Scalar(float(context.random.nextDouble()) * 2.0f - 1.0f); - Scalar v = Scalar(float(context.random.nextDouble()) * 2.0f - 1.0f); + const Scalar u = Scalar(float(context.random.nextDouble()) * 2.0f - 1.0f); + const Scalar v = Scalar(float(context.random.nextDouble()) * 2.0f - 1.0f); point->position = center + u * axis1 + v * axis2; point->velocity = normal * Scalar(m_velocity.random(context.random)); point->orientation = m_orientation.random(context.random); point->angularVelocity = m_angularVelocity.random(context.random); - point->color = Vector4::one(); point->age = 0.0f; point->maxAge = m_age.random(context.random); point->inverseMass = 1.0f / (m_mass.random(context.random)); @@ -80,5 +77,4 @@ void QuadSource::emit( } } - } } diff --git a/code/Spray/Sources/QuadSource.h b/code/Spray/Sources/QuadSource.h index 735d39bef0..741fbcd2cf 100644 --- a/code/Spray/Sources/QuadSource.h +++ b/code/Spray/Sources/QuadSource.h @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -20,10 +20,8 @@ # define T_DLLCLASS T_DLLIMPORT #endif -namespace traktor +namespace traktor::spray { - namespace spray - { /*! Quad particle source. * \ingroup Spray @@ -33,7 +31,7 @@ class T_DLLCLASS QuadSource : public Source T_RTTI_CLASS; public: - QuadSource( + explicit QuadSource( float constantRate, float velocityRate, const Vector4& center, @@ -77,6 +75,4 @@ class T_DLLCLASS QuadSource : public Source Range< float > m_size; }; - } } - diff --git a/code/Spray/Sources/QuadSourceData.cpp b/code/Spray/Sources/QuadSourceData.cpp index d6212cecd6..acc96413ff 100644 --- a/code/Spray/Sources/QuadSourceData.cpp +++ b/code/Spray/Sources/QuadSourceData.cpp @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -14,10 +14,8 @@ #include "Spray/Sources/QuadSource.h" #include "Spray/Sources/QuadSourceData.h" -namespace traktor +namespace traktor::spray { - namespace spray - { T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.spray.QuadSourceData", 0, QuadSourceData, SourceData) @@ -70,5 +68,4 @@ void QuadSourceData::serialize(ISerializer& s) s >> MemberComposite< Range< float > >(L"size", m_size); } - } } diff --git a/code/Spray/Sources/QuadSourceData.h b/code/Spray/Sources/QuadSourceData.h index 32d69ba0f2..be0620ad55 100644 --- a/code/Spray/Sources/QuadSourceData.h +++ b/code/Spray/Sources/QuadSourceData.h @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -20,10 +20,8 @@ # define T_DLLCLASS T_DLLIMPORT #endif -namespace traktor +namespace traktor::spray { - namespace spray - { /*! Quad particle source persistent data. * \ingroup Spray @@ -54,6 +52,4 @@ class T_DLLCLASS QuadSourceData : public SourceData Range< float > m_size; }; - } } - diff --git a/code/Spray/Sources/SphereSource.cpp b/code/Spray/Sources/SphereSource.cpp index 256d4383cb..14b20a6a44 100644 --- a/code/Spray/Sources/SphereSource.cpp +++ b/code/Spray/Sources/SphereSource.cpp @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -10,10 +10,8 @@ #include "Spray/Types.h" #include "Spray/Sources/SphereSource.h" -namespace traktor +namespace traktor::spray { - namespace spray - { T_IMPLEMENT_RTTI_CLASS(L"traktor.spray.SphereSource", SphereSource, Source) @@ -49,19 +47,18 @@ void SphereSource::emit( EmitterInstance& emitterInstance ) const { - Vector4 position = transform * m_position; + const Vector4 position = transform * m_position; Point* point = emitterInstance.addPoints(emitCount); while (emitCount-- > 0) { - Vector4 direction = context.random.nextUnit(); + const Vector4 direction = context.random.nextUnit(); point->position = position - deltaMotion * Scalar(context.random.nextFloat()) + direction * Scalar(m_radius.random(context.random)); point->velocity = direction * Scalar(m_velocity.random(context.random)); point->orientation = m_orientation.random(context.random); point->angularVelocity = m_angularVelocity.random(context.random); - point->color = Vector4::one(); point->age = 0.0f; point->maxAge = m_age.random(context.random); point->inverseMass = 1.0f / (m_mass.random(context.random)); @@ -72,5 +69,4 @@ void SphereSource::emit( } } - } } diff --git a/code/Spray/Sources/SphereSource.h b/code/Spray/Sources/SphereSource.h index 089fc627ec..5e04d0d41f 100644 --- a/code/Spray/Sources/SphereSource.h +++ b/code/Spray/Sources/SphereSource.h @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -20,10 +20,8 @@ # define T_DLLCLASS T_DLLIMPORT #endif -namespace traktor +namespace traktor::spray { - namespace spray - { /*! Sphere particle source. * \ingroup Spray @@ -33,7 +31,7 @@ class T_DLLCLASS SphereSource : public Source T_RTTI_CLASS; public: - SphereSource( + explicit SphereSource( float constantRate, float velocityRate, const Vector4& position, @@ -69,6 +67,4 @@ class T_DLLCLASS SphereSource : public Source Range< float > m_size; }; - } } - diff --git a/code/Spray/Sources/SphereSourceData.cpp b/code/Spray/Sources/SphereSourceData.cpp index 1ba719cbd6..2b040fe6ff 100644 --- a/code/Spray/Sources/SphereSourceData.cpp +++ b/code/Spray/Sources/SphereSourceData.cpp @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -14,10 +14,8 @@ #include "Spray/Sources/SphereSource.h" #include "Spray/Sources/SphereSourceData.h" -namespace traktor +namespace traktor::spray { - namespace spray - { T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.spray.SphereSourceData", 0, SphereSourceData, SourceData) @@ -64,5 +62,4 @@ void SphereSourceData::serialize(ISerializer& s) s >> MemberComposite< Range< float > >(L"size", m_size); } - } } diff --git a/code/Spray/Sources/SphereSourceData.h b/code/Spray/Sources/SphereSourceData.h index afa82e6851..3e6c301de2 100644 --- a/code/Spray/Sources/SphereSourceData.h +++ b/code/Spray/Sources/SphereSourceData.h @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -20,10 +20,8 @@ # define T_DLLCLASS T_DLLIMPORT #endif -namespace traktor +namespace traktor::spray { - namespace spray - { /*! Sphere particle source persistent data. * \ingroup Spray @@ -52,6 +50,4 @@ class T_DLLCLASS SphereSourceData : public SourceData Range< float > m_size; }; - } } - diff --git a/code/Spray/Sources/VirtualSource.cpp b/code/Spray/Sources/VirtualSource.cpp index 8fc4998e45..e2d9d761fe 100644 --- a/code/Spray/Sources/VirtualSource.cpp +++ b/code/Spray/Sources/VirtualSource.cpp @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -9,10 +9,8 @@ #include "Spray/Types.h" #include "Spray/Sources/VirtualSource.h" -namespace traktor +namespace traktor::spray { - namespace spray - { T_IMPLEMENT_RTTI_CLASS(L"traktor.spray.VirtualSource", VirtualSource, Source) @@ -55,5 +53,4 @@ void VirtualSource::emit( ); } - } } diff --git a/code/Spray/Sources/VirtualSource.h b/code/Spray/Sources/VirtualSource.h index d8605b8e8a..bc315cd8b4 100644 --- a/code/Spray/Sources/VirtualSource.h +++ b/code/Spray/Sources/VirtualSource.h @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -19,10 +19,8 @@ # define T_DLLCLASS T_DLLIMPORT #endif -namespace traktor +namespace traktor::spray { - namespace spray - { /*! Point particle source. * \ingroup Spray @@ -32,7 +30,7 @@ class T_DLLCLASS VirtualSource : public Source T_RTTI_CLASS; public: - VirtualSource( + explicit VirtualSource( float constantRate, float velocityRate, const Range< float >& velocity, @@ -72,6 +70,4 @@ class T_DLLCLASS VirtualSource : public Source Range< float > m_size; }; - } } - diff --git a/code/Spray/Sources/VirtualSourceData.cpp b/code/Spray/Sources/VirtualSourceData.cpp index eeb8044028..f2dea3e06e 100644 --- a/code/Spray/Sources/VirtualSourceData.cpp +++ b/code/Spray/Sources/VirtualSourceData.cpp @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -12,10 +12,8 @@ #include "Spray/Sources/VirtualSource.h" #include "Spray/Sources/VirtualSourceData.h" -namespace traktor +namespace traktor::spray { - namespace spray - { T_IMPLEMENT_RTTI_FACTORY_CLASS(L"traktor.spray.VirtualSourceData", 0, VirtualSourceData, SourceData) @@ -56,5 +54,4 @@ void VirtualSourceData::serialize(ISerializer& s) s >> MemberComposite< Range< float > >(L"size", m_size); } - } } diff --git a/code/Spray/Sources/VirtualSourceData.h b/code/Spray/Sources/VirtualSourceData.h index 7585c7cc15..f3ddbd5cc6 100644 --- a/code/Spray/Sources/VirtualSourceData.h +++ b/code/Spray/Sources/VirtualSourceData.h @@ -1,6 +1,6 @@ /* * TRAKTOR - * Copyright (c) 2022 Anders Pistol. + * Copyright (c) 2022-2024 Anders Pistol. * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this @@ -18,10 +18,8 @@ # define T_DLLCLASS T_DLLIMPORT #endif -namespace traktor +namespace traktor::spray { - namespace spray - { /*! Virtual particle source persistent data. * \ingroup Spray @@ -46,6 +44,4 @@ class T_DLLCLASS VirtualSourceData : public SourceData Range< float > m_size; }; - } } - diff --git a/code/Spray/Vertex.h b/code/Spray/Vertex.h index 655dfc7473..728ab430dd 100644 --- a/code/Spray/Vertex.h +++ b/code/Spray/Vertex.h @@ -26,8 +26,7 @@ struct EmitterPoint { float positionAndOrientation[4]; float velocityAndRandom[4]; - float alphaAndSize[4]; - float colorAndAge[4]; + float alphaSizeAge[4]; }; #pragma pack() diff --git a/data/Source/System/Spray/Examples/Shaders/Nozzle.xdi b/data/Source/System/Spray/Examples/Shaders/Nozzle.xdi index f646cf7a65..23088262cd 100644 --- a/data/Source/System/Spray/Examples/Shaders/Nozzle.xdi +++ b/data/Source/System/Spray/Examples/Shaders/Nozzle.xdi @@ -1,5 +1,5 @@ - + {1EB5AB5E-E639-F24F-B955-7F72B2B1804D} @@ -114,10 +114,6 @@ {2D21FC9C-162F-2841-90BA-0083FA361CD8} Alpha - - {7517B7F0-6583-914A-A000-3DD34E3B677B} - Color - {A1768EF8-3129-DE48-95DD-C775AC7C3CD2} Orientation @@ -173,4 +169,5 @@ + diff --git a/data/Source/System/Spray/Examples/Shaders/Point.xdi b/data/Source/System/Spray/Examples/Shaders/Point.xdi index aa7f7ebc00..fcbc75743b 100644 --- a/data/Source/System/Spray/Examples/Shaders/Point.xdi +++ b/data/Source/System/Spray/Examples/Shaders/Point.xdi @@ -104,10 +104,6 @@ {E1EB522D-D1A2-BF48-8008-505ED5C42AB2} Alpha - - {45D99DA9-94A3-2D4D-9606-962DAE3E9393} - Color - {0718D78A-0A9B-264A-A468-E65D5527F7EA} Orientation diff --git a/data/Source/System/Spray/Examples/Shaders/Surface.xdi b/data/Source/System/Spray/Examples/Shaders/Surface.xdi index 2dd3807dac..aac705b190 100644 --- a/data/Source/System/Spray/Examples/Shaders/Surface.xdi +++ b/data/Source/System/Spray/Examples/Shaders/Surface.xdi @@ -1,5 +1,5 @@ - + {F5BC103A-0BA4-FA4F-85E7-FB88A6531C44} @@ -114,10 +114,6 @@ {DC176513-4BFD-F742-BF44-AFD4F4348014} Alpha - - {B9162B82-E1B1-7D47-915F-CFCE9EC690A8} - Color - {E75AC79D-AB14-2F49-8752-4B8B8744DE17} Orientation @@ -173,4 +169,5 @@ + diff --git a/data/Source/System/Spray/Examples/Shaders/XZ.xdi b/data/Source/System/Spray/Examples/Shaders/XZ.xdi index aafff1bd9a..d484bd6a46 100644 --- a/data/Source/System/Spray/Examples/Shaders/XZ.xdi +++ b/data/Source/System/Spray/Examples/Shaders/XZ.xdi @@ -1,5 +1,5 @@ - + {25BAA32B-50BE-764D-87B9-649F126A5FDD} @@ -114,10 +114,6 @@ {15E40FD3-8AB2-554E-ADB2-A71C618CDA7E} Alpha - - {C885C8FB-6D63-E348-B3B5-BA20E306F143} - Color - {CB05D996-CF34-CE40-99E8-2733C0709C71} Orientation @@ -173,4 +169,5 @@ + diff --git a/data/Source/System/Spray/Shaders/EmitterNozzle.xdi b/data/Source/System/Spray/Shaders/EmitterNozzle.xdi index fc436f5f1e..0bff7147e7 100644 --- a/data/Source/System/Spray/Shaders/EmitterNozzle.xdi +++ b/data/Source/System/Spray/Shaders/EmitterNozzle.xdi @@ -1,7 +1,7 @@ - + {3BDBD78A-BE19-834D-9293-01C35F29B214} @@ -10,6 +10,12 @@ OrthogonalFrame + + 1 + 1 + 1 + + {C0BEEBB6-B494-374A-82E4-5737FA445077} @@ -60,7 +66,7 @@ $V.w = 0.0f; 0 - + {D850D0A4-60EC-D547-B22C-7886827D6BA3} @@ -68,7 +74,6 @@ $V.w = 0.0f; 555 L_Velocity - false {9A319768-1CF2-FF48-B2B8-CB09802AFBBE} @@ -289,21 +294,12 @@ Position xyz1 - - {38023DEA-5E44-184E-AD80-7046E5ED2423} - - - -27 - -459 - - Color - {BB908425-B3D7-A947-9D24-1E288FF9BACF} -27 - -402 + -461 Age @@ -363,7 +359,7 @@ Position true 0 - + {F8607E97-76DA-AC47-9CF2-033FCA0F68E1} @@ -371,9 +367,8 @@ Position -137 L_TexCoord - false - + {925E53B3-682B-6E41-BE8C-E21E8AA229AB} @@ -381,9 +376,8 @@ Position 22 L_ViewPosition - false - + {E27CB6B7-2842-3344-B7E3-3C1100047203} @@ -391,9 +385,8 @@ Position -164 L_ViewPosition - false - + {4D0F2A85-7656-1C49-A474-8169DD9CC4FA} @@ -401,9 +394,8 @@ Position 1380 L_ViewPosition - false - + {17502D50-04CE-2646-B371-7265B105DDA5} @@ -411,9 +403,8 @@ Position -583 L_Orientation - false - + {1F0694D1-B63B-9C47-A4CF-6644FACE0E40} @@ -421,9 +412,8 @@ Position -10 L_Orientation - false - + {01FB3DAC-641F-DF4C-BEFA-1FE758C81DF2} @@ -431,7 +421,6 @@ Position 1273 L_Alpha - false {71F24E52-9B5A-CA4F-B718-FE71A226FC0B} @@ -441,87 +430,70 @@ Position 1285 - + {32387E6A-4D39-CF49-B87D-239F87C7CA1D} - -631 - -304 + -632 + -346 L_Position - false - + {7C32E7BC-4AB4-C74B-9C77-3129B6855572} - -631 - -346 + -632 + -388 L_Orientation - false - + {1B34CF68-2925-394A-9076-B1EAE481ED49} - -631 - -178 + -632 + -220 L_Velocity - false - + {F94CB689-E16E-AB4B-8DCE-D177E7845978} - -631 - -262 + -632 + -304 L_Random - false - + {6C88F06C-72B8-794B-B749-ED8FB4BEECB7} - -631 + -632 -430 L_Alpha - false - + {AB9BF435-93CB-6248-96FB-E002C4469D8F} - -631 - -220 + -632 + -262 L_Size - false - - - {A857AEF4-66A0-B144-BE6B-51C37249417A} - - - -631 - -388 - - L_Color - false - + {282AA5C0-A376-A842-8D2F-D6832F49DFE1} - -631 + -632 -472 L_Age - false - + {CCDAA368-5208-C94A-81D7-B6C48A6D1D11} @@ -529,9 +501,8 @@ Position 4 L_Position - false - + {22900FD7-89F7-0441-90F3-38CA3880CC5D} @@ -539,29 +510,17 @@ Position -524 L_Random - false - + {42CCF7E8-9FCF-5842-9916-91C0D29E68A5} -195 - -406 - - L_Age - false - - - {C2D1136F-50BE-9641-98EB-1C9EC3EE972A} - - - -203 -465 - L_Color - false + L_Age - + {5D59EFBF-E7F9-1345-8BFA-63AD6D6946DB} @@ -569,7 +528,6 @@ Position 243 L_Size - false {CE1A20A1-7D6A-F445-A9AC-E93C16237DC8} @@ -597,10 +555,6 @@ Position {4880205E-CB64-4149-8639-29ED8C62343B} Alpha - - {3DE204A0-3457-7A47-89A8-24CF0F67FF8B} - Color - {0B58B458-24AC-B14B-8384-DECF2E7A05F9} Orientation @@ -826,7 +780,7 @@ Particle extent - + {9AE16BB1-EB68-45A0-A878-8D01C210082B} @@ -840,13 +794,13 @@ Particle extent {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} - + {93DEEDC9-D4C7-47F8-8D6A-A79DABD6BA6A} - + {8FFB3BDB-A00E-4406-994C-0D52FAF04871} @@ -860,13 +814,13 @@ Particle extent {29BA4386-B838-4550-93DF-F53D8B812C88} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {84BF3C26-64A7-4032-B775-1D369052B243} @@ -876,7 +830,7 @@ Particle extent - + {84BF3C26-64A7-4032-B775-1D369052B243} @@ -886,7 +840,7 @@ Particle extent - + {84BF3C26-64A7-4032-B775-1D369052B243} @@ -896,11 +850,11 @@ Particle extent - + {84BF3C26-64A7-4032-B775-1D369052B243} - + {69997292-C813-490C-910C-620B9AD3A2BB} @@ -910,23 +864,23 @@ Particle extent {8F2140B5-F4E2-4E8F-8121-13C980250D3C} - + {D2D716D6-C4A1-471F-894A-D718515F6281} - + {84BF3C26-64A7-4032-B775-1D369052B243} - + {731844D4-AFDC-4EAA-8B41-C4BA2455898F} - + {84BF3C26-64A7-4032-B775-1D369052B243} @@ -936,7 +890,7 @@ Particle extent - + {84BF3C26-64A7-4032-B775-1D369052B243} @@ -946,17 +900,7 @@ Particle extent - - {84BF3C26-64A7-4032-B775-1D369052B243} - - - - {731844D4-AFDC-4EAA-8B41-C4BA2455898F} - - - - - + {9E839249-E9B9-4736-8BDD-A95A1C892B42} @@ -976,97 +920,87 @@ Particle extent - + {9AE16BB1-EB68-45A0-A878-8D01C210082B} - + {D2D716D6-C4A1-471F-894A-D718515F6281} - + {3EA3EB7D-4B37-624C-8FE4-4E25883C09CE} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {EC897B23-BDDE-7B44-8DF3-52F4B25880E5} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {4880205E-CB64-4149-8639-29ED8C62343B} - - {11585EBC-914D-4E6D-A10D-D01694FF9840} - - - - - - {3DE204A0-3457-7A47-89A8-24CF0F67FF8B} - - - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {0B58B458-24AC-B14B-8384-DECF2E7A05F9} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {A8C7B910-EE6B-5B4A-88C0-56149293A2BD} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {3F032D46-8764-254F-84AB-2F5954612FD6} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {CD9DE318-3A97-8642-B700-3D618587A78A} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {84BF3C26-64A7-4032-B775-1D369052B243} @@ -1110,27 +1044,27 @@ Particle extent {70C35B91-1C36-454C-98EC-7514AACF73C8} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {D51E6077-37E9-4B1C-86D2-92DA544DC613} - + {F95D9BA4-88CC-4001-9948-B8173FDDE6F0} - + {D51E6077-37E9-4B1C-86D2-92DA544DC613} - + {567A2DC4-F113-4DE2-917A-791917DA5DA5} @@ -1140,67 +1074,67 @@ Particle extent {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} - + {4067F6C8-9404-45CA-9359-D9E2456F7431} - + {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} - + {69997292-C813-490C-910C-620B9AD3A2BB} - + {29BA4386-B838-4550-93DF-F53D8B812C88} - + {F2E22CA6-DFF3-4B20-A70A-0D7A44EACD8C} - + {84BF3C26-64A7-4032-B775-1D369052B243} - + {69997292-C813-490C-910C-620B9AD3A2BB} - + {9E839249-E9B9-4736-8BDD-A95A1C892B42} - + {D2D716D6-C4A1-471F-894A-D718515F6281} - + {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} - + {3DE04294-4DEA-4A13-A460-2274647357EA} - + {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} - + {9F45B2C3-B513-4646-B0C1-663748FD169C} @@ -1210,13 +1144,13 @@ Particle extent {F78C1D3D-284D-0941-BB2A-27E07F798F8A} - + {F2E22CA6-DFF3-4B20-A70A-0D7A44EACD8C} - + {9E839249-E9B9-4736-8BDD-A95A1C892B42} @@ -1226,11 +1160,11 @@ Particle extent - + {9E839249-E9B9-4736-8BDD-A95A1C892B42} - + {F2E22CA6-DFF3-4B20-A70A-0D7A44EACD8C} @@ -1240,7 +1174,7 @@ Particle extent {3A632B69-2AD5-CC4E-A477-426C76644A43} - + {06867C72-4921-4EB8-8806-EFCF09BD0C34} @@ -1250,7 +1184,7 @@ Particle extent {BC2C2E07-270E-43FD-8856-1DD7F9834B97} - + {6A074E66-11A2-4867-A53C-8165AE05CB3B} @@ -1260,33 +1194,33 @@ Particle extent {84BF3C26-64A7-4032-B775-1D369052B243} - + {CB2AD645-8548-45AA-8E8F-FB5226460883} - + {32FD3DAA-16C1-44C8-8A1E-E9ECF97F31D2} - + {345BDBFA-3326-40BF-B9DE-8ECA78A3EEF4} - + {585541AA-7E7B-44C5-B872-328289FB4854} - + {71A0310C-3928-44C3-8D4F-7D9AFF9EAE70} - + {70C35B91-1C36-454C-98EC-7514AACF73C8} @@ -1296,7 +1230,7 @@ Particle extent - + {D51E6077-37E9-4B1C-86D2-92DA544DC613} diff --git a/data/Source/System/Spray/Shaders/EmitterPoint.xdi b/data/Source/System/Spray/Shaders/EmitterPoint.xdi index 253e83a097..41f53d2ab8 100644 --- a/data/Source/System/Spray/Shaders/EmitterPoint.xdi +++ b/data/Source/System/Spray/Shaders/EmitterPoint.xdi @@ -218,7 +218,7 @@ Extent 8 - -471 + -469 Random @@ -235,21 +235,12 @@ Position xyz1 - - {45D99DA9-94A3-2D4D-9606-962DAE3E9393} - - - 8 - -414 - - Color - {F748575D-5DA4-1949-80AF-73A153DE1191} 8 - -357 + -410 Age @@ -365,8 +356,8 @@ Position {906677EA-F822-4D12-A255-4077EABDB38A} - -596 - -259 + -597 + -304 L_Position @@ -374,8 +365,8 @@ Position {FF8C62E4-0870-4928-9664-1364E13299D0} - -596 - -301 + -597 + -345 L_Orientation @@ -383,8 +374,8 @@ Position {D92C3CA0-4332-4E5B-9EF2-3D954C0A263F} - -596 - -133 + -597 + -181 L_Velocity @@ -392,8 +383,8 @@ Position {45BA4BAD-F588-49C7-A36D-81253DF288FF} - -596 - -217 + -597 + -263 L_Random @@ -401,8 +392,8 @@ Position {FDFD793D-C0FC-49DA-9CE3-69263C2DC853} - -596 - -385 + -597 + -386 L_Alpha @@ -410,25 +401,16 @@ Position {F5257BE2-FBC6-4BB1-A313-F2F8296F819B} - -596 - -175 + -597 + -222 L_Size - - {B0589D13-439E-44D9-A41E-274FA3287069} - - - -596 - -343 - - L_Color - {14B59D3A-8B06-43E7-B75A-D202B9F2B96F} - -596 + -597 -427 L_Age @@ -447,7 +429,7 @@ Position -184 - -479 + -476 L_Random @@ -456,19 +438,10 @@ Position -160 - -361 + -414 L_Age - - {78327294-D22E-4CC0-A6C1-61390977FCBC} - - - -168 - -420 - - L_Color - {AD0CCD6A-43E1-48F5-8C2C-0629A882504D} @@ -490,8 +463,8 @@ Position {0DCE7D62-CFCD-DC48-98EB-E72645E09ABA} - -924 - -348 + -937 + -374 {050B4D1D-B503-564D-BB6B-F6C7457E6782} @@ -890,7 +863,7 @@ World - + {9AE16BB1-EB68-45A0-A878-8D01C210082B} @@ -904,13 +877,13 @@ World {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} - + {93DEEDC9-D4C7-47F8-8D6A-A79DABD6BA6A} - + {8FFB3BDB-A00E-4406-994C-0D52FAF04871} @@ -924,13 +897,13 @@ World {29BA4386-B838-4550-93DF-F53D8B812C88} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {84BF3C26-64A7-4032-B775-1D369052B243} @@ -940,21 +913,21 @@ World - + {9AE16BB1-EB68-45A0-A878-8D01C210082B} - + {9F45B2C3-B513-4646-B0C1-663748FD169C} - + {84BF3C26-64A7-4032-B775-1D369052B243} - + {69997292-C813-490C-910C-620B9AD3A2BB} @@ -964,23 +937,23 @@ World {8F2140B5-F4E2-4E8F-8121-13C980250D3C} - + {D2D716D6-C4A1-471F-894A-D718515F6281} - + {84BF3C26-64A7-4032-B775-1D369052B243} - + {731844D4-AFDC-4EAA-8B41-C4BA2455898F} - + {84BF3C26-64A7-4032-B775-1D369052B243} @@ -990,7 +963,7 @@ World - + {84BF3C26-64A7-4032-B775-1D369052B243} @@ -1000,7 +973,7 @@ World - + {84BF3C26-64A7-4032-B775-1D369052B243} @@ -1010,17 +983,7 @@ World - - {84BF3C26-64A7-4032-B775-1D369052B243} - - - - {731844D4-AFDC-4EAA-8B41-C4BA2455898F} - - - - - + {9E839249-E9B9-4736-8BDD-A95A1C892B42} @@ -1040,7 +1003,7 @@ World - + {32FD3DAA-16C1-44C8-8A1E-E9ECF97F31D2} @@ -1054,13 +1017,13 @@ World {9E839249-E9B9-4736-8BDD-A95A1C892B42} - + {3DE04294-4DEA-4A13-A460-2274647357EA} - + {84BF3C26-64A7-4032-B775-1D369052B243} @@ -1080,7 +1043,7 @@ World - + {9E839249-E9B9-4736-8BDD-A95A1C892B42} @@ -1094,137 +1057,127 @@ World {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} - + {69997292-C813-490C-910C-620B9AD3A2BB} - + {9AE16BB1-EB68-45A0-A878-8D01C210082B} - + {D2D716D6-C4A1-471F-894A-D718515F6281} - + {3EA3EB7D-4B37-624C-8FE4-4E25883C09CE} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {EC897B23-BDDE-7B44-8DF3-52F4B25880E5} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {4880205E-CB64-4149-8639-29ED8C62343B} - - {11585EBC-914D-4E6D-A10D-D01694FF9840} - - - - - - {3DE204A0-3457-7A47-89A8-24CF0F67FF8B} - - - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {0B58B458-24AC-B14B-8384-DECF2E7A05F9} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {A8C7B910-EE6B-5B4A-88C0-56149293A2BD} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {3F032D46-8764-254F-84AB-2F5954612FD6} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {CD9DE318-3A97-8642-B700-3D618587A78A} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {EEB495BD-DE7F-4DE8-993A-7E9B220B927F} - + {731844D4-AFDC-4EAA-8B41-C4BA2455898F} - + {84BF3C26-64A7-4032-B775-1D369052B243} - + {EEB495BD-DE7F-4DE8-943A-7E9B220B927F} - + {EEB495BD-DE7F-4DE8-993A-7E9B220B927F} - + {731844D4-AFDC-4EAA-8B41-C4BA2455898F} - + {84BF3C26-64A7-4032-B775-1D369052B243} - + {EEB495BD-DE7F-4DE8-943A-7E9B220B927F} @@ -1234,13 +1187,13 @@ World {32FD3DAA-16C1-44C8-8A1E-E9ECF97F31D2} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {84BF3C26-64A7-4032-B775-1D369052B243} @@ -1250,7 +1203,7 @@ World - + {84BF3C26-64A7-4032-B775-1D369052B243} @@ -1270,131 +1223,131 @@ World - + {1E6639B6-8B58-4694-99E7-C058E3583522} - + {71A0310C-3928-44C3-8D4F-7D9AFF9EAE70} - + {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} - + {345BDBFA-3326-40BF-B9DE-8ECA78A3EEF4} - + {70C35B91-1C36-454C-98EC-7514AACF73C8} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {84BF3C26-64A7-4032-B775-1D369052B243} - + {F2E22CA6-DFF3-4B20-A70A-0D7A44EACD8C} - + {1E6639B6-8B58-4694-99E7-C058E3583522} - + {71A0310C-3928-44C3-8D4F-7D9AFF9EAE70} - + {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} - + {345BDBFA-3326-40BF-B9DE-8ECA78A3EEF4} - + {70C35B91-1C36-454C-98EC-7514AACF73C8} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {84BF3C26-64A7-4032-B775-1D369052B243} - + {EEB495BD-DE7F-4DE8-953A-7E9B220B927F} - + {84BF3C26-64A7-4032-B775-1D369052B243} - + {98BF7CC4-A80C-43DA-B7FD-21BA4C039E28} - + {D74E3627-9E70-4BAD-A6CE-2087D41D6ED7} - + {FE413452-19EB-4DC9-B724-2984FA17CC20} - + {8591EE56-8A3E-41CF-8E98-8F8DB26AABDC} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {84BF3C26-64A7-4032-B775-1D369052B243} - + {EEB495BD-DE7F-4DE8-953A-7E9B220B927F} - + {84BF3C26-64A7-4032-B775-1D369052B243} - + {F2E22CA6-DFF3-4B20-A70A-0D7A44EACD8C} diff --git a/data/Source/System/Spray/Shaders/EmitterSurface.xdi b/data/Source/System/Spray/Shaders/EmitterSurface.xdi index 82d1d8992d..885488178a 100644 --- a/data/Source/System/Spray/Shaders/EmitterSurface.xdi +++ b/data/Source/System/Spray/Shaders/EmitterSurface.xdi @@ -1,5 +1,5 @@ - + {46889F0B-0FF7-2740-90EA-FD05A514348B} @@ -19,10 +19,6 @@ {4880205E-CB64-4149-8639-29ED8C62343B} Alpha - - {3DE204A0-3457-7A47-89A8-24CF0F67FF8B} - Color - {0B58B458-24AC-B14B-8384-DECF2E7A05F9} Orientation @@ -54,7 +50,7 @@ 436 - + {F6CE6B0F-446A-3D40-BDE3-C2D0526A3CD9} @@ -62,39 +58,26 @@ 534 L_Size - false - - {6C0588F7-30F4-3043-A6C8-19242DB4135B} - - - 977 - -304 - - L_Color - false - - + {496932DD-F35C-1E4C-94D8-AB1750FE6B04} 985 - -245 + -300 L_Age - false - + {8471EB23-E059-CA44-8ECD-D5BD105D89A1} 961 - -363 + -361 L_Random - false - + {E3F0A950-628B-0D42-839B-1525DF63C728} @@ -102,87 +85,69 @@ 488 L_Position - false - + {05383084-4455-BB41-B6C4-B6082808F626} - 549 - -311 + 547 + -294 L_Age - false - - - {A97AD0D3-D6C6-1840-8F8D-894DFF442A52} - - - 549 - -227 - - L_Color - false - + {BC46ADAD-193B-3244-A868-3616DA52F1EB} - 549 - -59 + 547 + -84 L_Size - false - + {97D1E159-0CA3-CC41-BEBC-DA3EE18EDDC7} - 549 - -269 + 547 + -252 L_Alpha - false - + {0685FC48-0853-CC4F-86BF-17EA05C0CF33} - 549 - -101 + 547 + -126 L_Random - false - + {35088EE2-43B4-F44B-8364-CBBF784F9223} - 549 - -17 + 547 + -42 L_Velocity - false - + {25AF1E9E-3B35-054B-84EC-E05E5BCF9B5D} - 549 - -185 + 547 + -210 L_Orientation - false - + {5E1A7E18-FC48-434C-9F75-210A0DD20E95} - 549 - -143 + 547 + -168 L_Position - false {50DD2D39-5355-CC43-B577-DE1B07C38E49} @@ -192,7 +157,7 @@ 1446 - + {10FF2244-86BA-9145-B41D-08557AD0099B} @@ -200,9 +165,8 @@ 1434 L_Alpha - false - + {A6818157-81C6-714D-B862-EBD94D9A261C} @@ -210,9 +174,8 @@ 441 L_Orientation - false - + {BE3DC9EA-A296-1342-95B5-4597C2D0A19F} @@ -220,9 +183,8 @@ -422 L_Orientation - false - + {5C350258-3C6F-204E-A542-5EBE38668A1F} @@ -230,9 +192,8 @@ 1541 L_ViewPosition - false - + {28972BE6-5538-5944-8E1E-18C82429D645} @@ -240,9 +201,8 @@ -3 L_ViewPosition - false - + {7C9F1320-5757-6648-A19A-98BEA1EF3F70} @@ -250,9 +210,8 @@ 367 L_ViewPosition - false - + {42572527-5CFA-E544-8859-D47FAF34E1A3} @@ -260,7 +219,6 @@ 373 L_TexCoord - false {AF319BCA-46D3-4E41-A93D-1DEAA6777E61} @@ -321,7 +279,7 @@ {E75AC79D-AB14-2F49-8752-4B8B8744DE17} - 1153 + 1148 -412 Orientation @@ -330,20 +288,11 @@ {7AB455EF-9233-E54D-85C7-48C717CF67E0} - 1153 - -241 + 1148 + -296 Age - - {3EB68FEF-3EB2-2F42-8983-94D4667B7563} - - - 1153 - -298 - - Color - {940EFBB3-3C12-8046-A95A-411F97BF5F95} @@ -370,8 +319,8 @@ Position {BAFFB45B-D9A0-1240-88D9-7C8E584B9A25} - 1153 - -355 + 1148 + -354 Random @@ -575,7 +524,7 @@ Particle extent DtFloat4 0 - + {9607ED21-92D4-D74E-82EF-3E6DED5E5BBB} @@ -583,7 +532,6 @@ Particle extent 634 L_Velocity - false {0BD1E922-CD00-A84A-976B-E0655681022A} @@ -635,7 +583,7 @@ Particle extent 484 - + {C22A7978-B7DC-E54A-ADC7-CFC9437BA367} @@ -644,6 +592,12 @@ Particle extent OrthogonalFrame + + 1 + 1 + 1 + + {C0BEEBB6-B494-374A-82E4-5737FA445077} @@ -690,237 +644,227 @@ $V.w = 0.0f; - + {1E6639B6-8B58-4694-99E7-C058E3583522} - + {71A0310C-3928-44C3-8D4F-7D9AFF9EAE70} - + {1E6639B6-8B58-4694-99E7-C058E3583522} - + {71A0310C-3928-44C3-8D4F-7D9AFF9EAE70} - + {70C35B91-1C36-454C-98EC-7514AACF73C8} - + {BFBE8191-F6E6-4A4F-A2CC-6CBC1D19BF70} - + {D33F8931-C90C-4EBA-8A04-A31D3E08FAB7} - + {F95D9BA4-88CC-4001-9948-B8173FDDE6F0} - + {D33F8931-C90C-4EBA-8A04-A31D3E08FAB7} - + {567A2DC4-F113-4DE2-917A-791917DA5DA5} - + {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} - + {4067F6C8-9404-45CA-9359-D9E2456F7431} - + {9E839249-E9B9-4736-8BDD-A95A1C892B42} - + {9BA81525-6E53-498C-AA97-B31FB48F3A50} - + {2D90AB77-694C-4586-AA05-5CF062EFFFAB} - + {69997292-C813-490C-910C-620B9AD3A2BB} - + {A8A5B244-60B8-694D-B957-7F4E53EA9C65} - + {AA571ACC-7699-4D10-BCD7-4E857EFB35EA} - + {29BA4386-B838-4550-93DF-F53D8B812C88} - + {731844D4-AFDC-4EAA-8B41-C4BA2455898F} - + {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} - + {345BDBFA-3326-40BF-B9DE-8ECA78A3EEF4} - + {9AE16BB1-EB68-45A0-A878-8D01C210082B} - + {D2D716D6-C4A1-471F-894A-D718515F6281} - + {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} - + {93DEEDC9-D4C7-47F8-8D6A-A79DABD6BA6A} - + {8FFB3BDB-A00E-4406-994C-0D52FAF04871} - + {8C41D88A-1D17-4237-B720-CCC0B7FF71B9} - + {29BA4386-B838-4550-93DF-F53D8B812C88} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {84BF3C26-64A7-4032-B775-1D369052B243} - + {345BDBFA-3326-40BF-B9DE-8ECA78A3EEF4} - + {84BF3C26-64A7-4032-B775-1D369052B243} - + {F2E22CA6-DFF3-4B20-A70A-0D7A44EACD8C} - + {84BF3C26-64A7-4032-B775-1D369052B243} - + {ED32B114-1165-E341-92C9-BD684C26B19A} - + {9AE16BB1-EB68-45A0-A878-8D01C210082B} - + {9F45B2C3-B513-4646-B0C1-663748FD169C} - + {84BF3C26-64A7-4032-B775-1D369052B243} - + {69997292-C813-490C-910C-620B9AD3A2BB} - + {8F2140B5-F4E2-4E8F-8121-13C980250D3C} - + {D2D716D6-C4A1-471F-894A-D718515F6281} - - {84BF3C26-64A7-4032-B775-1D369052B243} - - - - {731844D4-AFDC-4EAA-8B41-C4BA2455898F} - - - - - + {84BF3C26-64A7-4032-B775-1D369052B243} - + {731844D4-AFDC-4EAA-8B41-C4BA2455898F} - + {84BF3C26-64A7-4032-B775-1D369052B243} @@ -930,41 +874,41 @@ $V.w = 0.0f; - + {84BF3C26-64A7-4032-B775-1D369052B243} - + {731844D4-AFDC-4EAA-8B41-C4BA2455898F} - + {9E839249-E9B9-4736-8BDD-A95A1C892B42} - + {731844D4-AFDC-4EAA-8B41-C4BA2455898F} - + {32FD3DAA-16C1-44C8-8A1E-E9ECF97F31D2} - + {DE25C017-660D-654C-91C2-EB740BFAD5DD} - + {9E839249-E9B9-4736-8BDD-A95A1C892B42} - + {3DE04294-4DEA-4A13-A460-2274647357EA} @@ -974,17 +918,17 @@ $V.w = 0.0f; {84BF3C26-64A7-4032-B775-1D369052B243} - + {D2D716D6-C4A1-471F-894A-D718515F6281} - + {BD91C9E9-9950-4EC8-BAD2-60D2E8699107} - + {F2E22CA6-DFF3-4B20-A70A-0D7A44EACD8C} @@ -994,13 +938,13 @@ $V.w = 0.0f; {9E839249-E9B9-4736-8BDD-A95A1C892B42} - + {69997292-C813-490C-910C-620B9AD3A2BB} - + {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} @@ -1010,7 +954,7 @@ $V.w = 0.0f; - + {9AE16BB1-EB68-45A0-A878-8D01C210082B} @@ -1024,7 +968,7 @@ $V.w = 0.0f; {3EA3EB7D-4B37-624C-8FE4-4E25883C09CE} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} @@ -1034,7 +978,7 @@ $V.w = 0.0f; {EC897B23-BDDE-7B44-8DF3-52F4B25880E5} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} @@ -1043,16 +987,6 @@ $V.w = 0.0f; {4880205E-CB64-4149-8639-29ED8C62343B} - - - {11585EBC-914D-4E6D-A10D-D01694FF9840} - - - - - - {3DE204A0-3457-7A47-89A8-24CF0F67FF8B} - {11585EBC-914D-4E6D-A10D-D01694FF9840} @@ -1064,7 +998,7 @@ $V.w = 0.0f; {0B58B458-24AC-B14B-8384-DECF2E7A05F9} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} @@ -1074,7 +1008,7 @@ $V.w = 0.0f; {A8C7B910-EE6B-5B4A-88C0-56149293A2BD} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} @@ -1084,7 +1018,7 @@ $V.w = 0.0f; {3F032D46-8764-254F-84AB-2F5954612FD6} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} @@ -1094,149 +1028,150 @@ $V.w = 0.0f; {CD9DE318-3A97-8642-B700-3D618587A78A} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} - + {69997292-C813-490C-910C-620B9AD3A2BB} - + {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} - + {69997292-C813-490C-910C-620B9AD3A2BB} - + {9E839249-E9B9-4736-8BDD-A95A1C892B42} - + {3DE04294-4DEA-4A13-A460-2274647357EA} - + {9E839249-E9B9-4736-8BDD-A95A1C892B42} - + {9F45B2C3-B513-4646-B0C1-663748FD169C} - + {84BF3C26-64A7-4032-B775-1D369052B243} - + {3DE04294-4DEA-4A13-A460-2274647357EA} - + {32FD3DAA-16C1-44C8-8A1E-E9ECF97F31D2} - + {9F45B2C3-B513-4646-B0C1-663748FD169C} - + {32FD3DAA-16C1-44C8-8A1E-E9ECF97F31D2} - + {F2E22CA6-DFF3-4B20-A70A-0D7A44EACD8C} - + {84BF3C26-64A7-4032-B775-1D369052B243} - + {C0BEEBB6-B494-374A-82E4-5737FA445077} - + {75E5E4E0-A2EA-4CD5-8BDC-E47901B3A6EA} - + {D2D716D6-C4A1-471F-894A-D718515F6281} - + {70C35B91-1C36-454C-98EC-7514AACF73C8} - + {731844D4-AFDC-4EAA-8B41-C4BA2455898F} - + {70C35B91-1C36-454C-98EC-7514AACF73C8} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {F78C1D3D-284D-0941-BB2A-27E07F798F8A} - + {F2E22CA6-DFF3-4B20-A70A-0D7A44EACD8C} - + {F78C1D3D-284D-0941-BB2A-27E07F798F8A} - + {F2E22CA6-DFF3-4B20-A70A-0D7A44EACD8C} - + {3A632B69-2AD5-CC4E-A477-426C76644A43} - + {D2D716D6-C4A1-471F-894A-D718515F6281} + diff --git a/data/Source/System/Spray/Shaders/EmitterXZ.xdi b/data/Source/System/Spray/Shaders/EmitterXZ.xdi index de7a28c06e..4be377455a 100644 --- a/data/Source/System/Spray/Shaders/EmitterXZ.xdi +++ b/data/Source/System/Spray/Shaders/EmitterXZ.xdi @@ -1,5 +1,5 @@ - + {A51C57AD-14BF-9846-9C7A-40C3CF1E5A1C} @@ -165,8 +165,8 @@ Extent {EE945694-ECCE-0F44-A83C-DFFA8ADF9F90} - 159 - -668 + 158 + -666 Random @@ -183,21 +183,12 @@ Position xyz1 - - {3E1F036C-F624-3140-8CF0-FE65D63410B7} - - - 159 - -611 - - Color - {558FBFD7-285B-7C4A-861B-34C6EB389C6F} - 159 - -554 + 158 + -607 Age @@ -205,7 +196,7 @@ Position {5D6FDC14-8F9A-7543-AA53-6C3798BC4A16} - 159 + 158 -725 Orientation @@ -265,7 +256,7 @@ Position 201 - + {7A8596E5-E5B3-B848-9EB1-2119FB846943} @@ -273,9 +264,8 @@ Position 60 L_TexCoord - false - + {94F4DF86-7284-2046-B29B-350085379EF4} @@ -283,9 +273,8 @@ Position 51 L_ViewPosition - false - + {A167251B-32AD-5045-B4F8-8F9F0D8A93C7} @@ -293,9 +282,8 @@ Position -316 L_ViewPosition - false - + {7EFB48F1-D5AD-B14F-AD32-7357801F35D9} @@ -303,9 +291,8 @@ Position 1228 L_ViewPosition - false - + {F467CFD2-721A-9C4B-BE55-095CAE6C06F7} @@ -313,9 +300,8 @@ Position -735 L_Orientation - false - + {58A2E0B1-E819-5745-9A3A-EA89B157BB34} @@ -323,9 +309,8 @@ Position 128 L_Orientation - false - + {A81CD73E-5C41-7A4F-B7FB-EC6686942FA5} @@ -333,7 +318,6 @@ Position 1121 L_Alpha - false {D21D07CB-9669-FE49-A66A-1351F6417A38} @@ -343,87 +327,70 @@ Position 1133 - + {CF175BD6-7809-074E-9A55-81B07D5407C4} - -445 - -456 + -454 + -487 L_Position - false - + {737D17DA-9E47-5F4C-996E-BE0DD6D5FB82} - -445 - -498 + -454 + -529 L_Orientation - false - + {34DE1E09-6A77-4C49-839C-CD57478B3EC4} - -445 - -330 + -454 + -361 L_Velocity - false - + {B0C9CBA1-C5BE-774B-BAD1-24FE1855528A} - -445 - -414 + -454 + -445 L_Random - false - + {D02292CE-238C-734E-969C-1018E0404940} - -445 - -582 + -454 + -571 L_Alpha - false - + {76D3658A-4A2C-E042-97C4-797840826873} - -445 - -372 + -454 + -403 L_Size - false - - {63F2BBFC-8C60-9A47-A587-99DB2E9096FA} - - - -445 - -540 - - L_Color - false - - + {5904E561-7D45-BC43-907A-6025D4ECC931} - -445 - -624 + -454 + -613 L_Age - false - + {E16F761E-7D9E-A44D-90E2-EFF2C60ED3A3} @@ -431,39 +398,26 @@ Position 41 L_Position - false - + {D1B8A9A3-5666-B048-B86F-556EB6CE0CC6} -33 - -676 + -673 L_Random - false - + {954B51A6-5236-434A-B3DA-0B20FDAA4074} -9 - -558 + -611 L_Age - false - - - {22E2101D-913B-E24B-993D-CF232022C168} - - - -17 - -617 - - L_Color - false - + {3DDB39AA-9C3D-E045-B5FD-D1E5A9A6D76E} @@ -471,7 +425,6 @@ Position 221 L_Size - false {069571FA-3359-CA4C-9F5B-C7AA6117F39D} @@ -499,10 +452,6 @@ Position {4880205E-CB64-4149-8639-29ED8C62343B} Alpha - - {3DE204A0-3457-7A47-89A8-24CF0F67FF8B} - Color - {0B58B458-24AC-B14B-8384-DECF2E7A05F9} Orientation @@ -600,7 +549,7 @@ Particle extent {1E6639B6-8B58-4694-99E7-C058E3583522} - + {71A0310C-3928-44C3-8D4F-7D9AFF9EAE70} @@ -700,13 +649,13 @@ Particle extent {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} - + {345BDBFA-3326-40BF-B9DE-8ECA78A3EEF4} - + {9AE16BB1-EB68-45A0-A878-8D01C210082B} @@ -720,13 +669,13 @@ Particle extent {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} - + {93DEEDC9-D4C7-47F8-8D6A-A79DABD6BA6A} - + {8FFB3BDB-A00E-4406-994C-0D52FAF04871} @@ -740,13 +689,13 @@ Particle extent {29BA4386-B838-4550-93DF-F53D8B812C88} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {84BF3C26-64A7-4032-B775-1D369052B243} @@ -756,7 +705,7 @@ Particle extent - + {84BF3C26-64A7-4032-B775-1D369052B243} @@ -766,31 +715,31 @@ Particle extent - + {84BF3C26-64A7-4032-B775-1D369052B243} - + {ED32B114-1165-E341-92C9-BD684C26B19A} - + {9AE16BB1-EB68-45A0-A878-8D01C210082B} - + {9F45B2C3-B513-4646-B0C1-663748FD169C} - + {84BF3C26-64A7-4032-B775-1D369052B243} - + {69997292-C813-490C-910C-620B9AD3A2BB} @@ -800,23 +749,23 @@ Particle extent {8F2140B5-F4E2-4E8F-8121-13C980250D3C} - + {D2D716D6-C4A1-471F-894A-D718515F6281} - + {84BF3C26-64A7-4032-B775-1D369052B243} - + {731844D4-AFDC-4EAA-8B41-C4BA2455898F} - + {84BF3C26-64A7-4032-B775-1D369052B243} @@ -826,7 +775,7 @@ Particle extent - + {84BF3C26-64A7-4032-B775-1D369052B243} @@ -836,17 +785,7 @@ Particle extent - - {84BF3C26-64A7-4032-B775-1D369052B243} - - - - {731844D4-AFDC-4EAA-8B41-C4BA2455898F} - - - - - + {9E839249-E9B9-4736-8BDD-A95A1C892B42} @@ -856,31 +795,31 @@ Particle extent - + {32FD3DAA-16C1-44C8-8A1E-E9ECF97F31D2} - + {DE25C017-660D-654C-91C2-EB740BFAD5DD} - + {9E839249-E9B9-4736-8BDD-A95A1C892B42} - + {3DE04294-4DEA-4A13-A460-2274647357EA} - + {84BF3C26-64A7-4032-B775-1D369052B243} - + {D2D716D6-C4A1-471F-894A-D718515F6281} @@ -896,11 +835,11 @@ Particle extent - + {9E839249-E9B9-4736-8BDD-A95A1C892B42} - + {69997292-C813-490C-910C-620B9AD3A2BB} @@ -910,103 +849,93 @@ Particle extent {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} - + {69997292-C813-490C-910C-620B9AD3A2BB} - + {9AE16BB1-EB68-45A0-A878-8D01C210082B} - + {D2D716D6-C4A1-471F-894A-D718515F6281} - + {3EA3EB7D-4B37-624C-8FE4-4E25883C09CE} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {EC897B23-BDDE-7B44-8DF3-52F4B25880E5} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {4880205E-CB64-4149-8639-29ED8C62343B} - - {11585EBC-914D-4E6D-A10D-D01694FF9840} - - - - - - {3DE204A0-3457-7A47-89A8-24CF0F67FF8B} - - - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {0B58B458-24AC-B14B-8384-DECF2E7A05F9} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {A8C7B910-EE6B-5B4A-88C0-56149293A2BD} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {3F032D46-8764-254F-84AB-2F5954612FD6} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {CD9DE318-3A97-8642-B700-3D618587A78A} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {84BF3C26-64A7-4032-B775-1D369052B243} @@ -1026,37 +955,37 @@ Particle extent - + {70C35B91-1C36-454C-98EC-7514AACF73C8} - + {731844D4-AFDC-4EAA-8B41-C4BA2455898F} - + {70C35B91-1C36-454C-98EC-7514AACF73C8} - + {11585EBC-914D-4E6D-A10D-D01694FF9840} - + {F78C1D3D-284D-0941-BB2A-27E07F798F8A} - + {F2E22CA6-DFF3-4B20-A70A-0D7A44EACD8C} - + {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} @@ -1065,4 +994,5 @@ Particle extent + diff --git a/data/Source/System/Spray/Shaders/Private/GetAttributes.xdi b/data/Source/System/Spray/Shaders/Private/GetAttributes.xdi index 08c830eee5..54e5f1e15a 100644 --- a/data/Source/System/Spray/Shaders/Private/GetAttributes.xdi +++ b/data/Source/System/Spray/Shaders/Private/GetAttributes.xdi @@ -1,11 +1,11 @@ - + {13B76CCD-A69F-3D4F-840F-FB4E85BF839A} - 952 + 957 153 @@ -13,56 +13,48 @@ {5517A722-C0C4-FC4F-821D-4BE3084040F9} - 952 - 207 + 957 + 208 {4EED43EF-7F2E-F146-AA22-0708FF61867E} - 952 - 261 + 957 + 263 {15823736-3FBF-DC4F-B33E-FDE032E4AC74} - 952 - 531 - - - - {EE5C3012-AC26-9942-94A1-4D7725A348F5} - - - 952 - 477 + 957 + 483 {00906B9F-D8A2-E94E-B4F0-E3DE81C7C1B9} - 952 - 423 + 957 + 428 {B9289786-112A-6541-BEC6-A5645BB4350B} - 952 - 315 + 957 + 318 {896550AC-17E6-5840-AC92-7D1A083B09E1} - 952 - 369 + 957 + 373 @@ -70,25 +62,16 @@ 802 - 555 - - w - - - {DA634195-54B1-9F4B-AFA2-0FDB8364A8DF} - - - 802 - 494 + 482 - xyz + z {0D50BA0C-4982-854C-AB62-22930A5C0D7A} 802 - 433 + 423 y @@ -97,7 +80,7 @@ 802 - 372 + 364 x @@ -106,7 +89,7 @@ 802 - 311 + 305 w @@ -115,7 +98,7 @@ 802 - 250 + 246 xyz @@ -124,7 +107,7 @@ 802 - 189 + 187 w @@ -137,15 +120,6 @@ xyz - - {E6DE1437-B25B-5A43-8157-88C3954FFA6D} - - - 562 - 489 - - colorAndAge - {C543084F-5EEF-DA41-AB16-B69EE45E9E64} @@ -153,7 +127,7 @@ 562 378 - alphaAndSize + alphaSizeAge {9F631682-E824-1C45-8702-04015EB90C97} @@ -194,7 +168,7 @@ 152 - 301 + 278 Spray_Points @@ -207,11 +181,7 @@ DtFloat4 - alphaAndSize - DtFloat4 - - - colorAndAge + alphaSizeAge DtFloat4 @@ -241,7 +211,7 @@ 1070 - 171 + 170 Orientation @@ -250,7 +220,7 @@ 1070 - 239 + 237 Velocity @@ -259,7 +229,7 @@ 1070 - 307 + 304 Random @@ -268,7 +238,7 @@ 1070 - 375 + 371 Alpha @@ -277,25 +247,16 @@ 1070 - 443 + 438 Size - - {3DE204A0-3457-7A47-89A8-24CF0F67FF8B} - - - 1070 - 511 - - Color - {EC897B23-BDDE-7B44-8DF3-52F4B25880E5} 1070 - 579 + 505 Age @@ -311,117 +272,77 @@ - + {61C214E2-B4D2-4905-A50C-7C38F98E8F91} - + {9F45B2C3-B513-4646-B0C1-663748FD169C} - + {32FD3DAA-16C1-44C8-8A1E-E9ECF97F31D2} - + {4FD10E49-F598-45AB-9E40-5ABA13905D14} - + {ACC77B35-91B5-4405-ABC8-D0DA24D68178} - + {3B445686-9AD9-4A7E-8C09-C92EDB98EFEF} - + {ACC77B35-91B5-4405-ABC8-D0DA24D68178} - + {3B445686-9AD9-4A7E-8C09-C92EDB98EFEF} - + {32FD3DAA-16C1-44C8-8A1E-E9ECF97F31D2} - + {4FD10E49-F598-45AB-9E40-5ABA13905D14} - + {ACC77B35-91B5-4405-ABC8-D0DA24D68178} - + {3B445686-9AD9-4A7E-8C09-C92EDB98EFEF} - - {ACC77B35-91B5-4405-ABC8-D0DA24D68178} - - - {3B445686-9AD9-4A7E-8C09-C92EDB98EFEF} - - - - - {32FD3DAA-16C1-44C8-8A1E-E9ECF97F31D2} - - - {4FD10E49-F598-45AB-9E40-5ABA13905D14} - - - - - - {32FD3DAA-16C1-44C8-8A1E-E9ECF97F31D2} - - - - {4FD10E49-F598-45AB-9E40-5ABA13905D14} - - - - - - {DD079887-A171-407B-AD10-E0CE5B164BC1} - - - - {F2E22CA6-DFF3-4B20-A70A-0D7A44EACD8C} - - - - - - {DD079887-A171-407B-AD10-E0CE5B164BC1} - - {F2E22CA6-DFF3-4B20-A70A-0D7A44EACD8C} + {4FD10E49-F598-45AB-9E40-5ABA13905D14} - + {DD079887-A171-407B-AD10-E0CE5B164BC1} @@ -431,7 +352,7 @@ - + {DD079887-A171-407B-AD10-E0CE5B164BC1} @@ -441,7 +362,7 @@ - + {DD079887-A171-407B-AD10-E0CE5B164BC1} @@ -451,7 +372,7 @@ - + {DD079887-A171-407B-AD10-E0CE5B164BC1} @@ -461,7 +382,7 @@ - + {DD079887-A171-407B-AD10-E0CE5B164BC1} @@ -471,7 +392,7 @@ - + {DD079887-A171-407B-AD10-E0CE5B164BC1} @@ -481,17 +402,7 @@ - - {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} - - - - {93DEEDC9-D4C7-47F8-8D6A-A79DABD6BA6A} - - - - - + {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} @@ -511,7 +422,7 @@ - + {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} @@ -521,7 +432,7 @@ - + {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} @@ -531,7 +442,7 @@ - + {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} @@ -541,7 +452,7 @@ - + {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} @@ -551,7 +462,7 @@ - + {ADB4FC1D-3726-4CC5-B4D5-1E2468274325} @@ -565,7 +476,7 @@ {8FFB3BDB-A00E-4406-994C-0D52FAF04871} - + {731844D4-AFDC-4EAA-8B41-C4BA2455898F} @@ -575,7 +486,7 @@ {8FFB3BDB-A00E-4406-994C-0D52FAF04871} - + {731844D4-AFDC-4EAA-8B41-C4BA2455898F} @@ -585,37 +496,27 @@ {8FFB3BDB-A00E-4406-994C-0D52FAF04871} - - {731844D4-AFDC-4EAA-8B41-C4BA2455898F} - - - - - - {8FFB3BDB-A00E-4406-994C-0D52FAF04871} - - - + {731844D4-AFDC-4EAA-8B41-C4BA2455898F} - + {8FFB3BDB-A00E-4406-994C-0D52FAF04871} - + {731844D4-AFDC-4EAA-8B41-C4BA2455898F} - + {8FFB3BDB-A00E-4406-994C-0D52FAF04871} - + {731844D4-AFDC-4EAA-8B41-C4BA2455898F} @@ -625,7 +526,7 @@ {8FFB3BDB-A00E-4406-994C-0D52FAF04871} - + {731844D4-AFDC-4EAA-8B41-C4BA2455898F} @@ -635,29 +536,40 @@ {8FFB3BDB-A00E-4406-994C-0D52FAF04871} - + {731844D4-AFDC-4EAA-8B41-C4BA2455898F} - + {1E6639B6-8B58-4694-99E7-C058E3583522} - + {58E01BB0-182E-4FF2-8629-A1EA043A57F1} - + {7E002805-FA4B-4EEE-9D3B-6FA3AB0B2DAB} - + {3DE04294-4DEA-4A13-A460-2274647357EA} + + + + {DD079887-A171-407B-AD10-E0CE5B164BC1} + + + + {F2E22CA6-DFF3-4B20-A70A-0D7A44EACD8C} + + +