AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

ParticleCommon: Fix IESampleAndHold element ordering

This commit is contained in:
Luke Street 2020-09-24 03:17:17 -04:00
parent 6e3d94483c
commit 8b597112be
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DataSpec/DNACommon/ParticleCommon.hpp
View File

@ -917,9 +917,9 @@ struct IEMultiply : IIntElement {
struct IESampleAndHold : IIntElement { struct IESampleAndHold : IIntElement {
AT_DECL_DNA_YAMLV_NO_TYPE AT_DECL_DNA_YAMLV_NO_TYPE
IntElementFactory val;
IntElementFactory waitMin; IntElementFactory waitMin;
IntElementFactory waitMax; IntElementFactory waitMax;
IntElementFactory val;
std::string_view ClassID() const override { return "SPAH"sv; } std::string_view ClassID() const override { return "SPAH"sv; }
}; };

2
Runtime/Particle/CParticleDataFactory.cpp
View File

@ -662,7 +662,7 @@ std::unique_ptr<CIntElement> CParticleDataFactory::GetIntElement(CInputStream& i
auto a = GetIntElement(in); auto a = GetIntElement(in);
auto b = GetIntElement(in); auto b = GetIntElement(in);
auto c = GetIntElement(in); auto c = GetIntElement(in);
return std::make_unique<CIESampleAndHold>(std::move(a), std::move(b), std::move(c)); return std::make_unique<CIESampleAndHold>(std::move(c), std::move(a), std::move(b));
} }
case SBIG('RAND'): { case SBIG('RAND'): {
auto a = GetIntElement(in); auto a = GetIntElement(in);