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

Finished CElementGen virtual method imps

This commit is contained in:
Jack Andersen 2016-02-12 19:16:39 -10:00
parent 7c5e8d37df
commit 5f4eee538d
7 changed files with 295 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
DataSpec/DNACommon/PART.hpp
View File

@ -23,7 +23,7 @@ struct GPSM : BigYAML
IntElementFactory x10_PSWT; IntElementFactory x10_PSWT;
RealElementFactory x14_PSTS; RealElementFactory x14_PSTS;
VectorElementFactory x18_POFS; VectorElementFactory x18_POFS;
IntElementFactory x1c_PMED; IntElementFactory x1c_SEED;
RealElementFactory x20_LENG; RealElementFactory x20_LENG;
RealElementFactory x24_WIDT; RealElementFactory x24_WIDT;
IntElementFactory x28_MAXP; IntElementFactory x28_MAXP;
@ -83,7 +83,6 @@ struct GPSM : BigYAML
RealElementFactory x11c_LSLA; RealElementFactory x11c_LSLA;
/* 0-00 additions */ /* 0-00 additions */
IntElementFactory x10_SEED;
ChildResourceFactory<IDType> xd8_SELC; ChildResourceFactory<IDType> xd8_SELC;
union union
{ {
@ -271,8 +270,8 @@ struct GPSM : BigYAML
case SBIG('PMLC'): case SBIG('PMLC'):
xec_PMLC.read(r); xec_PMLC.read(r);
break; break;
case SBIG('PMED'): case SBIG('SEED'):
x1c_PMED.read(r); x1c_SEED.read(r);
break; break;
case SBIG('PMOO'): case SBIG('PMOO'):
x45_25_PMOO = r.readBool(nullptr); x45_25_PMOO = r.readBool(nullptr);
@ -337,9 +336,6 @@ struct GPSM : BigYAML
case SBIG('RSOP'): case SBIG('RSOP'):
x30_31_RSOP = r.readBool(nullptr); x30_31_RSOP = r.readBool(nullptr);
break; break;
case SBIG('SEED'):
x10_SEED.read(r);
break;
case SBIG('ADV1'): case SBIG('ADV1'):
x10c_ADV1.read(r); x10c_ADV1.read(r);
break; break;
@ -396,12 +392,6 @@ struct GPSM : BigYAML
xc_PSLT.write(w); xc_PSLT.write(w);
w.leaveSubRecord(); w.leaveSubRecord();
} }
if (x10_SEED)
{
w.enterSubRecord("SEED");
x10_SEED.write(w);
w.leaveSubRecord();
}
if (x10_PSWT) if (x10_PSWT)
{ {
w.enterSubRecord("PSWT"); w.enterSubRecord("PSWT");
@ -420,10 +410,10 @@ struct GPSM : BigYAML
x18_POFS.write(w); x18_POFS.write(w);
w.leaveSubRecord(); w.leaveSubRecord();
} }
if (x1c_PMED) if (x1c_SEED)
{ {
w.enterSubRecord("PMED"); w.enterSubRecord("SEED");
x1c_PMED.write(w); x1c_SEED.write(w);
w.leaveSubRecord(); w.leaveSubRecord();
} }
if (x20_LENG) if (x20_LENG)
@ -804,16 +794,14 @@ struct GPSM : BigYAML
__isz = x8_PSOV.binarySize(__isz + 4); __isz = x8_PSOV.binarySize(__isz + 4);
if (xc_PSLT) if (xc_PSLT)
__isz = xc_PSLT.binarySize(__isz + 4); __isz = xc_PSLT.binarySize(__isz + 4);
if (x10_SEED)
__isz = x10_SEED.binarySize(__isz + 4);
if (x10_PSWT) if (x10_PSWT)
__isz = x10_PSWT.binarySize(__isz + 4); __isz = x10_PSWT.binarySize(__isz + 4);
if (x14_PSTS) if (x14_PSTS)
__isz = x14_PSTS.binarySize(__isz + 4); __isz = x14_PSTS.binarySize(__isz + 4);
if (x18_POFS) if (x18_POFS)
__isz = x18_POFS.binarySize(__isz + 4); __isz = x18_POFS.binarySize(__isz + 4);
if (x1c_PMED) if (x1c_SEED)
__isz = x1c_PMED.binarySize(__isz + 4); __isz = x1c_SEED.binarySize(__isz + 4);
if (x20_LENG) if (x20_LENG)
__isz = x20_LENG.binarySize(__isz + 4); __isz = x20_LENG.binarySize(__isz + 4);
if (x24_WIDT) if (x24_WIDT)
@ -1135,8 +1123,8 @@ struct GPSM : BigYAML
case SBIG('PMLC'): case SBIG('PMLC'):
xec_PMLC.read(r); xec_PMLC.read(r);
break; break;
case SBIG('PMED'): case SBIG('SEED'):
x1c_PMED.read(r); x1c_SEED.read(r);
break; break;
case SBIG('PMOO'): case SBIG('PMOO'):
r.readUint32Big(); r.readUint32Big();
@ -1210,9 +1198,6 @@ struct GPSM : BigYAML
r.readUint32Big(); r.readUint32Big();
x30_31_RSOP = r.readBool(); x30_31_RSOP = r.readBool();
break; break;
case SBIG('SEED'):
x10_SEED.read(r);
break;
case SBIG('ADV1'): case SBIG('ADV1'):
x10c_ADV1.read(r); x10c_ADV1.read(r);
break; break;
@ -1270,11 +1255,6 @@ struct GPSM : BigYAML
w.writeBytes((atInt8*)"PSLT", 4); w.writeBytes((atInt8*)"PSLT", 4);
xc_PSLT.write(w); xc_PSLT.write(w);
} }
if (x10_SEED)
{
w.writeBytes((atInt8*)"SEED", 4);
x10_SEED.write(w);
}
if (x10_PSWT) if (x10_PSWT)
{ {
w.writeBytes((atInt8*)"PSWT", 4); w.writeBytes((atInt8*)"PSWT", 4);
@ -1290,10 +1270,10 @@ struct GPSM : BigYAML
w.writeBytes((atInt8*)"POFS", 4); w.writeBytes((atInt8*)"POFS", 4);
x18_POFS.write(w); x18_POFS.write(w);
} }
if (x1c_PMED) if (x1c_SEED)
{ {
w.writeBytes((atInt8*)"PMED", 4); w.writeBytes((atInt8*)"SEED", 4);
x1c_PMED.write(w); x1c_SEED.write(w);
} }
if (x20_LENG) if (x20_LENG)
{ {

24
Runtime/CLight.cpp
View File

@ -0,0 +1,24 @@
#include "CLight.hpp"
namespace Retro
{
CLight CLight::BuildDirectional(const Zeus::CVector3f& dir, const Zeus::CColor& color)
{
return {};
}
CLight CLight::BuildSpot(const Zeus::CVector3f& pos, const Zeus::CVector3f& dir,
const Zeus::CColor& color, float angle)
{
return {};
}
CLight CLight::BuildCustom(const Zeus::CVector3f& pos, const Zeus::CVector3f& dir,
const Zeus::CColor& color, float constAtt, float linearAtt, float quadAtt,
float intensity, float, float)
{
return {};
}
}

10
Runtime/CLight.hpp
View File

@ -1,6 +1,9 @@
#ifndef __RETRO_CLIGHT_HPP__ #ifndef __RETRO_CLIGHT_HPP__
#define __RETRO_CLIGHT_HPP__ #define __RETRO_CLIGHT_HPP__
#include "CVector3f.hpp"
#include "CColor.hpp"
namespace Retro namespace Retro
{ {
@ -23,7 +26,12 @@ enum class EFalloffType
class CLight class CLight
{ {
public: public:
static CLight BuildDirectional(const Zeus::CVector3f& dir, const Zeus::CColor& color);
static CLight BuildSpot(const Zeus::CVector3f& pos, const Zeus::CVector3f& dir,
const Zeus::CColor& color, float angle);
static CLight BuildCustom(const Zeus::CVector3f& pos, const Zeus::CVector3f& dir,
const Zeus::CColor& color, float constAtt, float linearAtt, float quadAtt,
float intensity, float, float);
}; };
} }

292
Runtime/Particle/CElementGen.cpp
View File

@ -46,24 +46,24 @@ void CElementGen::Initialize()
g_StaticListInitialized = true; g_StaticListInitialized = true;
} }
CElementGen::CElementGen(const TToken<IGenDescription>& gen) : x1c_genDesc(gen), x230_randState(x74) {} CElementGen::CElementGen(const TToken<IGenDescription>& gen) : x1c_genDesc(gen), x230_randState(x74_randomSeed) {}
CElementGen::CElementGen(const TToken<CGenDescription>& gen, CElementGen::CElementGen(const TToken<CGenDescription>& gen,
EModelOrientationType orientType, EModelOrientationType orientType,
EOptionalSystemFlags flags) EOptionalSystemFlags flags)
: x1c_genDesc(gen), x28_orientType(orientType), : x1c_genDesc(gen), x28_orientType(orientType),
x226((flags & EOptionalSystemFlags::Two) != EOptionalSystemFlags::None), x230_randState(x74) x226_enableOPTS((flags & EOptionalSystemFlags::Two) != EOptionalSystemFlags::None), x230_randState(x74_randomSeed)
{ {
CGenDescription* desc = x1c_genDesc.CastObj<CGenDescription>(); CGenDescription* desc = x1c_genDesc.CastObj<CGenDescription>();
CIntElement* pmedElem = desc->x1c_PMED.get(); CIntElement* seedElem = desc->x1c_SEED.get();
if (pmedElem) if (seedElem)
{ {
int pmedVal; int seedVal;
pmedElem->GetValue(x50_curFrame, pmedVal); seedElem->GetValue(x50_curFrame, seedVal);
x74 = pmedVal; x74_randomSeed = seedVal;
} }
x230_randState.SetSeed(x74); x230_randState.SetSeed(x74_randomSeed);
++g_ParticleSystemAliveCount; ++g_ParticleSystemAliveCount;
x224_25_LIT_ = desc->x44_29_LIT_; x224_25_LIT_ = desc->x44_29_LIT_;
x224_26_AAPH = desc->x44_26_AAPH; x224_26_AAPH = desc->x44_26_AAPH;
@ -94,11 +94,11 @@ CElementGen::CElementGen(const TToken<CGenDescription>& gen,
for (int i=0 ; i<ndsyVal ; ++i) for (int i=0 ; i<ndsyVal ; ++i)
{ {
CGenDescription* chDesc = desc->xa4_IDTS.m_gen.GetObj(); CGenDescription* chDesc = desc->xa4_IDTS.m_gen.GetObj();
if (x226 && chDesc->x45_31_OPTS) if (x226_enableOPTS && chDesc->x45_31_OPTS)
break; break;
x248_finishPartChildren.emplace_back(new CElementGen(desc->xa4_IDTS.m_gen, x248_finishPartChildren.emplace_back(new CElementGen(desc->xa4_IDTS.m_gen,
EModelOrientationType::Normal, EModelOrientationType::Normal,
x226 ? EOptionalSystemFlags::Two : EOptionalSystemFlags::One)); x226_enableOPTS ? EOptionalSystemFlags::Two : EOptionalSystemFlags::One));
} }
} }
@ -161,20 +161,20 @@ CElementGen::CElementGen(const TToken<CGenDescription>& gen,
{ {
int ltyp; int ltyp;
ltypElem->GetValue(x50_curFrame, ltyp); ltypElem->GetValue(x50_curFrame, ltyp);
switch (ELightType(ltyp)) switch (LightType(ltyp))
{ {
case ELightType::LocalAmbient: case LightType::None:
default: default:
x2dc_lightType = ELightType::LocalAmbient; x2dc_lightType = LightType::None;
break; break;
case ELightType::Directional: case LightType::Directional:
x2dc_lightType = ELightType::Directional; x2dc_lightType = LightType::Directional;
break; break;
case ELightType::Custom: case LightType::Custom:
x2dc_lightType = ELightType::Custom; x2dc_lightType = LightType::Custom;
break; break;
case ELightType::Spot: case LightType::Spot:
x2dc_lightType = ELightType::Spot; x2dc_lightType = LightType::Spot;
break; break;
} }
} }
@ -292,7 +292,7 @@ bool CElementGen::InternalUpdate(double dt)
UpdatePSTranslationAndOrientation(); UpdatePSTranslationAndOrientation();
UpdateChildParticleSystems(1 / 60.0); UpdateChildParticleSystems(1 / 60.0);
if (x2dc_lightType != ELightType::LocalAmbient) if (x2dc_lightType != LightType::None)
UpdateLightParameters(); UpdateLightParameters();
++frameUpdateCount; ++frameUpdateCount;
@ -305,10 +305,10 @@ bool CElementGen::InternalUpdate(double dt)
x58_curSeconds = t; x58_curSeconds = t;
BuildParticleSystemBounds(); BuildParticleSystemBounds();
x224_24 = false; x224_24_translationDirty = false;
double passedTime = t - x58_curSeconds; double passedTime = t - x58_curSeconds;
x60 = 1.0 - passedTime * 60.0; x60_timeDeltaScale = 1.0 - passedTime * 60.0;
return false; return false;
} }
@ -336,7 +336,6 @@ void CElementGen::UpdateExistingParticles()
CElementGen::CParticle& particle = g_StaticParticleList[p->x0_partIdx]; CElementGen::CParticle& particle = g_StaticParticleList[p->x0_partIdx];
if (particle.x0_endFrame < x50_curFrame) if (particle.x0_endFrame < x50_curFrame)
{ {
--g_ParticleAliveCount;
g_StaticFreeList[++g_FreeIndex] = p->x0_partIdx; g_StaticFreeList[++g_FreeIndex] = p->x0_partIdx;
if (p+1 == x2c_particleLists.end()) if (p+1 == x2c_particleLists.end())
{ {
@ -374,8 +373,8 @@ void CElementGen::UpdateExistingParticles()
{ {
if (x224_30_VMD1) if (x224_30_VMD1)
{ {
Zeus::CVector3f xfVel = x1a8 * particle.x1c_vel; Zeus::CVector3f xfVel = x1a8_orientationInverse * particle.x1c_vel;
Zeus::CVector3f xfPos = x1a8 * (particle.x4_pos - x7c_translation); Zeus::CVector3f xfPos = x1a8_orientationInverse * (particle.x4_pos - x7c_translation);
err = vel1->GetValue(particleFrame, xfVel, xfPos); err = vel1->GetValue(particleFrame, xfVel, xfPos);
particle.x1c_vel = x178_orientation * xfVel; particle.x1c_vel = x178_orientation * xfVel;
particle.x4_pos = x178_orientation * xfPos + x7c_translation; particle.x4_pos = x178_orientation * xfPos + x7c_translation;
@ -391,8 +390,8 @@ void CElementGen::UpdateExistingParticles()
{ {
if (x224_31_VMD2) if (x224_31_VMD2)
{ {
Zeus::CVector3f xfVel = x1a8 * particle.x1c_vel; Zeus::CVector3f xfVel = x1a8_orientationInverse * particle.x1c_vel;
Zeus::CVector3f xfPos = x1a8 * (particle.x4_pos - x7c_translation); Zeus::CVector3f xfPos = x1a8_orientationInverse * (particle.x4_pos - x7c_translation);
err |= vel2->GetValue(particleFrame, xfVel, xfPos); err |= vel2->GetValue(particleFrame, xfVel, xfPos);
particle.x1c_vel = x178_orientation * xfVel; particle.x1c_vel = x178_orientation * xfVel;
particle.x4_pos = x178_orientation * xfPos + x7c_translation; particle.x4_pos = x178_orientation * xfPos + x7c_translation;
@ -408,8 +407,8 @@ void CElementGen::UpdateExistingParticles()
{ {
if (x225_24_VMD3) if (x225_24_VMD3)
{ {
Zeus::CVector3f xfVel = x1a8 * particle.x1c_vel; Zeus::CVector3f xfVel = x1a8_orientationInverse * particle.x1c_vel;
Zeus::CVector3f xfPos = x1a8 * (particle.x4_pos - x7c_translation); Zeus::CVector3f xfPos = x1a8_orientationInverse * (particle.x4_pos - x7c_translation);
err |= vel3->GetValue(particleFrame, xfVel, xfPos); err |= vel3->GetValue(particleFrame, xfVel, xfPos);
particle.x1c_vel = x178_orientation * xfVel; particle.x1c_vel = x178_orientation * xfVel;
particle.x4_pos = x178_orientation * xfPos + x7c_translation; particle.x4_pos = x178_orientation * xfPos + x7c_translation;
@ -425,8 +424,8 @@ void CElementGen::UpdateExistingParticles()
{ {
if (x225_25_VMD4) if (x225_25_VMD4)
{ {
Zeus::CVector3f xfVel = x1a8 * particle.x1c_vel; Zeus::CVector3f xfVel = x1a8_orientationInverse * particle.x1c_vel;
Zeus::CVector3f xfPos = x1a8 * (particle.x4_pos - x7c_translation); Zeus::CVector3f xfPos = x1a8_orientationInverse * (particle.x4_pos - x7c_translation);
err |= vel4->GetValue(particleFrame, xfVel, xfPos); err |= vel4->GetValue(particleFrame, xfVel, xfPos);
particle.x1c_vel = x178_orientation * xfVel; particle.x1c_vel = x178_orientation * xfVel;
particle.x4_pos = x178_orientation * xfPos + x7c_translation; particle.x4_pos = x178_orientation * xfPos + x7c_translation;
@ -488,7 +487,7 @@ void CElementGen::CreateNewParticles(int count)
return; return;
s16 staticIdx = g_StaticFreeList[g_FreeIndex]; s16 staticIdx = g_StaticFreeList[g_FreeIndex];
x2c_particleLists.push_back(staticIdx); x2c_particleLists.emplace_back(staticIdx);
++x208_activeParticleCount; ++x208_activeParticleCount;
if (x28_orientType == EModelOrientationType::One) if (x28_orientType == EModelOrientationType::One)
x3c_parentMatrices[x2c_particleLists.size()-1] = x178_orientation.buildMatrix3f(); x3c_parentMatrices[x2c_particleLists.size()-1] = x178_orientation.buildMatrix3f();
@ -512,14 +511,14 @@ void CElementGen::CreateNewParticles(int count)
if (emtr) if (emtr)
{ {
emtr->GetValue(x210_curEmitterFrame, particle.x4_pos, particle.x1c_vel); emtr->GetValue(x210_curEmitterFrame, particle.x4_pos, particle.x1c_vel);
Zeus::CVector3f compXf1 = (xdc * x148) * x7c_translation; Zeus::CVector3f compXf1 = (xdc_globalScaleTransformInverse * x148_localScaleTransformInverse) * x7c_translation;
Zeus::CVector3f compXf2 = x178_orientation * particle.x4_pos; Zeus::CVector3f compXf2 = x178_orientation * particle.x4_pos;
particle.x4_pos = compXf1 + compXf2 + x94_POFS; particle.x4_pos = compXf1 + compXf2 + x94_POFS;
particle.x1c_vel = x178_orientation * particle.x1c_vel; particle.x1c_vel = x178_orientation * particle.x1c_vel;
} }
else else
{ {
Zeus::CVector3f compXf1 = (xdc * x148) * x7c_translation; Zeus::CVector3f compXf1 = (xdc_globalScaleTransformInverse * x148_localScaleTransformInverse) * x7c_translation;
particle.x4_pos = compXf1 + x94_POFS; particle.x4_pos = compXf1 + x94_POFS;
particle.x1c_vel.zeroOut(); particle.x1c_vel.zeroOut();
} }
@ -575,14 +574,14 @@ void CElementGen::UpdatePSTranslationAndOrientation()
psvm->GetValue(x50_curFrame, x218_PSIV, vel); psvm->GetValue(x50_curFrame, x218_PSIV, vel);
if (vel != x7c_translation) if (vel != x7c_translation)
{ {
x224_24 = true; x224_24_translationDirty = true;
x7c_translation = vel; x7c_translation = vel;
} }
} }
Zeus::CVector3f v = x178_orientation * x218_PSIV; Zeus::CVector3f v = x178_orientation * x218_PSIV;
if (v != Zeus::CVector3f::skZero) if (v != Zeus::CVector3f::skZero)
x224_24 = true; x224_24_translationDirty = true;
x7c_translation += v; x7c_translation += v;
CVectorElement* psov = desc->x8_PSOV.get(); CVectorElement* psov = desc->x8_PSOV.get();
@ -613,7 +612,7 @@ void CElementGen::UpdatePSTranslationAndOrientation()
CElementGen* CElementGen::ConstructChildParticleSystem(const TToken<CGenDescription>& desc) CElementGen* CElementGen::ConstructChildParticleSystem(const TToken<CGenDescription>& desc)
{ {
CElementGen* ret = new CElementGen(desc, EModelOrientationType::Normal, CElementGen* ret = new CElementGen(desc, EModelOrientationType::Normal,
x226 ? EOptionalSystemFlags::Two : EOptionalSystemFlags::One); x226_enableOPTS ? EOptionalSystemFlags::Two : EOptionalSystemFlags::One);
ret->SetGlobalTranslation(x88_globalTranslation); ret->SetGlobalTranslation(x88_globalTranslation);
ret->SetGlobalOrientation(x1d8_globalOrientation); ret->SetGlobalOrientation(x1d8_globalOrientation);
ret->SetGlobalScale(xa0_globalScale); ret->SetGlobalScale(xa0_globalScale);
@ -639,7 +638,7 @@ void CElementGen::UpdateChildParticleSystems(double dt)
ncsy->GetValue(x50_curFrame, ncsyVal); ncsy->GetValue(x50_curFrame, ncsyVal);
CGenDescription* ictsDesc = icts.m_gen.GetObj(); CGenDescription* ictsDesc = icts.m_gen.GetObj();
if (!(x226 && ictsDesc->x45_31_OPTS)) if (!(x226_enableOPTS && ictsDesc->x45_31_OPTS))
{ {
x234_activePartChildren.reserve(ncsyVal + x234_activePartChildren.size()); x234_activePartChildren.reserve(ncsyVal + x234_activePartChildren.size());
for (int i=0 ; i<ncsyVal ; ++i) for (int i=0 ; i<ncsyVal ; ++i)
@ -656,7 +655,7 @@ void CElementGen::UpdateChildParticleSystems(double dt)
((x50_curFrame - x258_SISY) % x25c_PISY) == 0) ((x50_curFrame - x258_SISY) % x25c_PISY) == 0)
{ {
CGenDescription* iitsDesc = iits.m_gen.GetObj(); CGenDescription* iitsDesc = iits.m_gen.GetObj();
if (!(x226 && iitsDesc->x45_31_OPTS)) if (!(x226_enableOPTS && iitsDesc->x45_31_OPTS))
{ {
CElementGen* chGen = ConstructChildParticleSystem(iits.m_gen); CElementGen* chGen = ConstructChildParticleSystem(iits.m_gen);
x234_activePartChildren.emplace_back(chGen); x234_activePartChildren.emplace_back(chGen);
@ -672,7 +671,7 @@ void CElementGen::UpdateChildParticleSystems(double dt)
for (CSpawnSystemKeyframeData::CSpawnSystemKeyframeInfo& system : systems) for (CSpawnSystemKeyframeData::CSpawnSystemKeyframeInfo& system : systems)
{ {
TLockedToken<CGenDescription>& token = system.GetToken(); TLockedToken<CGenDescription>& token = system.GetToken();
if (!(x226 && token.GetObj()->x45_31_OPTS)) if (!(x226_enableOPTS && token.GetObj()->x45_31_OPTS))
{ {
CElementGen* chGen = ConstructChildParticleSystem(token); CElementGen* chGen = ConstructChildParticleSystem(token);
x234_activePartChildren.emplace_back(chGen); x234_activePartChildren.emplace_back(chGen);
@ -708,7 +707,7 @@ void CElementGen::UpdateChildParticleSystems(double dt)
{ {
std::unique_ptr<CElementGen>& ch = *p; std::unique_ptr<CElementGen>& ch = *p;
if ((x50_curFrame == x4c || x224_24) && x64_prevFrame != x50_curFrame) if ((x50_curFrame == x4c_internalStartFrame || x224_24_translationDirty) && x64_prevFrame != x50_curFrame)
{ {
ch->SetTranslation(x7c_translation); ch->SetTranslation(x7c_translation);
ch->SetOrientation(x178_orientation); ch->SetOrientation(x178_orientation);
@ -751,7 +750,7 @@ void CElementGen::UpdateChildParticleSystems(double dt)
{ {
std::unique_ptr<CParticleSwoosh>& ch = *p; std::unique_ptr<CParticleSwoosh>& ch = *p;
if ((x50_curFrame == x270_SSSD || x224_24) && x64_prevFrame != x50_curFrame) if ((x50_curFrame == x270_SSSD || x224_24_translationDirty) && x64_prevFrame != x50_curFrame)
{ {
Zeus::CVector3f trans = x7c_translation + x274_SSPO; Zeus::CVector3f trans = x7c_translation + x274_SSPO;
ch->SetTranslation(trans); ch->SetTranslation(trans);
@ -772,7 +771,7 @@ void CElementGen::UpdateChildParticleSystems(double dt)
{ {
std::unique_ptr<CParticleElectric>& ch = *p; std::unique_ptr<CParticleElectric>& ch = *p;
if ((x50_curFrame == x290_SESD || x224_24) && x64_prevFrame != x50_curFrame) if ((x50_curFrame == x290_SESD || x224_24_translationDirty) && x64_prevFrame != x50_curFrame)
{ {
Zeus::CVector3f trans = x7c_translation + x294_SEPO; Zeus::CVector3f trans = x7c_translation + x294_SEPO;
ch->SetTranslation(trans); ch->SetTranslation(trans);
@ -807,9 +806,9 @@ void CElementGen::UpdateLightParameters()
switch (x2dc_lightType) switch (x2dc_lightType)
{ {
default: default:
case ELightType::LocalAmbient: case LightType::None:
case ELightType::Directional: case LightType::Custom:
case ELightType::Spot: case LightType::Spot:
{ {
CVectorElement* loff = desc->x10c_LOFF.get(); CVectorElement* loff = desc->x10c_LOFF.get();
if (loff) if (loff)
@ -819,16 +818,16 @@ void CElementGen::UpdateLightParameters()
if (lfor) if (lfor)
lfor->GetValue(x50_curFrame, x304_LFOR); lfor->GetValue(x50_curFrame, x304_LFOR);
if (x2dc_lightType == ELightType::Spot) if (x2dc_lightType == LightType::Spot)
{ {
CRealElement* lsla = desc->x11c_LSLA.get(); CRealElement* lsla = desc->x11c_LSLA.get();
if (lsla) if (lsla)
lsla->GetValue(x50_curFrame, x308_LSLA); lsla->GetValue(x50_curFrame, x308_LSLA);
} }
} }
case ELightType::Custom: case LightType::Directional:
{ {
if (x2dc_lightType != ELightType::Directional) if (x2dc_lightType != LightType::Custom)
{ {
CVectorElement* ldir = desc->x110_LDIR.get(); CVectorElement* ldir = desc->x110_LDIR.get();
if (ldir) if (ldir)
@ -900,7 +899,7 @@ void CElementGen::BuildParticleSystemBounds()
if (GetParticleCount()) if (GetParticleCount())
{ {
Zeus::CVector3f scale = xa0_globalScale * x2c0_maxSize; Zeus::CVector3f scale = xa0_globalScale * x2c0_maxSize;
Zeus::CTransform xf = (xac * x1d8_globalOrientation) * x118; Zeus::CTransform xf = (xac_globalScaleTransform * x1d8_globalOrientation) * x118_localScaleTransform;
Zeus::CAABox box = Zeus::CAABox(x2a8_aabbMin, x2b4_aabbMax).getTransformedAABox(xf); Zeus::CAABox box = Zeus::CAABox(x2a8_aabbMin, x2b4_aabbMax).getTransformedAABox(xf);
Zeus::CVector3f min = box.m_min + x88_globalTranslation - scale; Zeus::CVector3f min = box.m_min + x88_globalTranslation - scale;
Zeus::CVector3f max = box.m_max + x88_globalTranslation + scale; Zeus::CVector3f max = box.m_max + x88_globalTranslation + scale;
@ -1020,7 +1019,7 @@ void CElementGen::RenderModels()
if (pmrt) if (pmrt)
pmrtConst = pmrt->IsFastConstant(); pmrtConst = pmrt->IsFastConstant();
Zeus::CVector3f trans = (xdc * x148) * x88_globalTranslation; Zeus::CVector3f trans = (xdc_globalScaleTransformInverse * x148_localScaleTransformInverse) * x88_globalTranslation;
Zeus::CTransform rot = Zeus::CTransform::Identity(); Zeus::CTransform rot = Zeus::CTransform::Identity();
if (pmrtConst) if (pmrtConst)
@ -1099,7 +1098,7 @@ void CElementGen::RenderModels()
if (pmcl) if (pmcl)
pmcl->GetValue(partFrame, col); pmcl->GetValue(partFrame, col);
CGraphics::SetModelMatrix((xac * partTrans) * x118); CGraphics::SetModelMatrix((xac_globalScaleTransform * partTrans) * x118_localScaleTransform);
if (desc->x45_24_PMUS) if (desc->x45_24_PMUS)
{ {
@ -1181,7 +1180,7 @@ void CElementGen::RenderParticles()
Zeus::CTransform xf(CGraphics::g_ViewMatrix); Zeus::CTransform xf(CGraphics::g_ViewMatrix);
Zeus::CTransform xf2 = xf.inverse() * x1d8_globalOrientation; Zeus::CTransform xf2 = xf.inverse() * x1d8_globalOrientation;
xf = ((Zeus::CTransform::Translate(x88_globalTranslation) * xac) * xf) * x118; xf = ((Zeus::CTransform::Translate(x88_globalTranslation) * xac_globalScaleTransform) * xf) * x118_localScaleTransform;
CGraphics::SetModelMatrix(xf); CGraphics::SetModelMatrix(xf);
CGraphics::SetAlphaCompare(ERglAlphaFunc::Always, 0, ERglAlphaOp::And, ERglAlphaFunc::Always, 0); CGraphics::SetAlphaCompare(ERglAlphaFunc::Always, 0, ERglAlphaOp::And, ERglAlphaFunc::Always, 0);
@ -1220,7 +1219,7 @@ void CElementGen::RenderParticles()
for (CParticleListItem& item : x2c_particleLists) for (CParticleListItem& item : x2c_particleLists)
{ {
CParticle& particle = g_StaticParticleList[item.x0_partIdx]; CParticle& particle = g_StaticParticleList[item.x0_partIdx];
item.x4_viewPoint = xf2 * ((particle.x4_pos - particle.x10_prevPos) * x60 + particle.x10_prevPos); item.x4_viewPoint = xf2 * ((particle.x4_pos - particle.x10_prevPos) * x60_timeDeltaScale + particle.x10_prevPos);
} }
std::sort(x2c_particleLists.begin(), x2c_particleLists.end(), std::sort(x2c_particleLists.begin(), x2c_particleLists.end(),
@ -1303,7 +1302,7 @@ void CElementGen::RenderParticles()
if (desc->x44_28_SORT) if (desc->x44_28_SORT)
viewPoint = item.x4_viewPoint; viewPoint = item.x4_viewPoint;
else else
viewPoint = xf2 * ((particle.x4_pos - particle.x10_prevPos) * x60 + particle.x10_prevPos); viewPoint = xf2 * ((particle.x4_pos - particle.x10_prevPos) * x60_timeDeltaScale + particle.x10_prevPos);
if (!constTexr) if (!constTexr)
{ {
@ -1383,7 +1382,7 @@ void CElementGen::RenderParticles()
} }
Zeus::CVector3f dVec = particle.x4_pos - particle.x10_prevPos; Zeus::CVector3f dVec = particle.x4_pos - particle.x10_prevPos;
Zeus::CVector3f vec = dVec * x60 + particle.x10_prevPos; Zeus::CVector3f vec = dVec * x60_timeDeltaScale + particle.x10_prevPos;
Zeus::CVector3f mbspVec = dVec * mbspFac; Zeus::CVector3f mbspVec = dVec * mbspFac;
float size = 0.5f * particle.x2c_lineLengthOrSize; float size = 0.5f * particle.x2c_lineLengthOrSize;
if (0.f == particle.x30_lineWidthOrRota) if (0.f == particle.x30_lineWidthOrRota)
@ -1439,38 +1438,141 @@ void CElementGen::RenderParticles()
void CElementGen::RenderParticlesIndirectTexture() void CElementGen::RenderParticlesIndirectTexture()
{ {
CGenDescription* desc = x1c_genDesc.CastObj<CGenDescription>();
} }
void CElementGen::SetOrientation(const Zeus::CTransform&) void CElementGen::SetOrientation(const Zeus::CTransform& orientation)
{ {
x178_orientation = orientation;
x1a8_orientationInverse = x178_orientation.inverse();
for (const std::unique_ptr<CElementGen>& ch : x234_activePartChildren)
ch->SetOrientation(orientation);
for (const std::unique_ptr<CElementGen>& ch : x248_finishPartChildren)
ch->SetOrientation(orientation);
for (const std::unique_ptr<CParticleSwoosh>& ch : x260_swhcChildren)
ch->SetOrientation(orientation);
for (const std::unique_ptr<CParticleElectric>& ch : x280_elscChildren)
ch->SetOrientation(orientation);
} }
void CElementGen::SetTranslation(const Zeus::CVector3f&) void CElementGen::SetTranslation(const Zeus::CVector3f& translation)
{ {
x7c_translation = translation;
for (const std::unique_ptr<CElementGen>& ch : x234_activePartChildren)
ch->SetTranslation(translation);
for (const std::unique_ptr<CElementGen>& ch : x248_finishPartChildren)
ch->SetTranslation(translation);
for (const std::unique_ptr<CParticleSwoosh>& ch : x260_swhcChildren)
ch->SetTranslation(translation + x274_SSPO);
for (const std::unique_ptr<CParticleElectric>& ch : x280_elscChildren)
ch->SetTranslation(translation + x294_SEPO);
} }
void CElementGen::SetGlobalOrientation(const Zeus::CTransform&) void CElementGen::SetGlobalOrientation(const Zeus::CTransform& rotation)
{ {
x1d8_globalOrientation.setRotation(rotation);
for (const std::unique_ptr<CElementGen>& ch : x234_activePartChildren)
ch->SetGlobalOrientation(x1d8_globalOrientation);
for (const std::unique_ptr<CElementGen>& ch : x248_finishPartChildren)
ch->SetGlobalOrientation(x1d8_globalOrientation);
for (const std::unique_ptr<CParticleElectric>& ch : x280_elscChildren)
ch->SetGlobalOrientation(x1d8_globalOrientation);
} }
void CElementGen::SetGlobalTranslation(const Zeus::CVector3f&) void CElementGen::SetGlobalTranslation(const Zeus::CVector3f& translation)
{ {
x88_globalTranslation = translation;
for (const std::unique_ptr<CElementGen>& ch : x234_activePartChildren)
ch->SetGlobalTranslation(translation);
for (const std::unique_ptr<CElementGen>& ch : x248_finishPartChildren)
ch->SetGlobalTranslation(translation);
for (const std::unique_ptr<CParticleSwoosh>& ch : x260_swhcChildren)
ch->SetGlobalTranslation(translation);
for (const std::unique_ptr<CParticleElectric>& ch : x280_elscChildren)
ch->SetGlobalTranslation(translation);
} }
void CElementGen::SetGlobalScale(const Zeus::CVector3f&) void CElementGen::SetGlobalScale(const Zeus::CVector3f& scale)
{ {
xa0_globalScale = scale;
xac_globalScaleTransform = Zeus::CTransform::Scale(scale);
xdc_globalScaleTransformInverse = Zeus::CTransform::Scale(Zeus::CVector3f::skOne / scale);
for (const std::unique_ptr<CElementGen>& ch : x234_activePartChildren)
ch->SetGlobalScale(scale);
for (const std::unique_ptr<CElementGen>& ch : x248_finishPartChildren)
ch->SetGlobalScale(scale);
for (const std::unique_ptr<CParticleSwoosh>& ch : x260_swhcChildren)
ch->SetGlobalScale(scale);
for (const std::unique_ptr<CParticleElectric>& ch : x280_elscChildren)
ch->SetGlobalScale(scale);
} }
void CElementGen::SetLocalScale(const Zeus::CVector3f&) void CElementGen::SetLocalScale(const Zeus::CVector3f& scale)
{ {
x10c_localScale = scale;
x118_localScaleTransform = Zeus::CTransform::Scale(scale);
x148_localScaleTransformInverse = Zeus::CTransform::Scale(Zeus::CVector3f::skOne / scale);
for (const std::unique_ptr<CElementGen>& ch : x234_activePartChildren)
ch->SetLocalScale(scale);
for (const std::unique_ptr<CElementGen>& ch : x248_finishPartChildren)
ch->SetLocalScale(scale);
} }
void CElementGen::SetParticleEmission(bool) void CElementGen::SetParticleEmission(bool enabled)
{ {
x68_particleEmission = enabled;
for (const std::unique_ptr<CElementGen>& ch : x234_activePartChildren)
ch->SetParticleEmission(enabled);
for (const std::unique_ptr<CElementGen>& ch : x248_finishPartChildren)
ch->SetParticleEmission(enabled);
for (const std::unique_ptr<CParticleSwoosh>& ch : x260_swhcChildren)
ch->SetParticleEmission(enabled);
for (const std::unique_ptr<CParticleElectric>& ch : x280_elscChildren)
ch->SetParticleEmission(enabled);
} }
void CElementGen::SetModulationColor(const Zeus::CColor&) void CElementGen::SetModulationColor(const Zeus::CColor& color)
{ {
x30c_moduColor = color;
for (const std::unique_ptr<CElementGen>& ch : x234_activePartChildren)
ch->SetModulationColor(color);
for (const std::unique_ptr<CElementGen>& ch : x248_finishPartChildren)
ch->SetModulationColor(color);
for (const std::unique_ptr<CParticleSwoosh>& ch : x260_swhcChildren)
ch->SetModulationColor(color);
for (const std::unique_ptr<CParticleElectric>& ch : x280_elscChildren)
ch->SetModulationColor(color);
} }
const Zeus::CTransform& CElementGen::GetOrientation() const const Zeus::CTransform& CElementGen::GetOrientation() const
@ -1485,38 +1587,96 @@ const Zeus::CVector3f& CElementGen::GetTranslation() const
const Zeus::CVector3f& CElementGen::GetGlobalScale() const const Zeus::CVector3f& CElementGen::GetGlobalScale() const
{ {
return xa0_globalScale;
} }
const Zeus::CColor& CElementGen::GetModulationColor() const const Zeus::CColor& CElementGen::GetModulationColor() const
{ {
return x30c_moduColor;
} }
bool CElementGen::IsSystemDeletable() const bool CElementGen::IsSystemDeletable() const
{ {
for (const std::unique_ptr<CElementGen>& ch : x234_activePartChildren)
if (!ch->IsSystemDeletable())
return false;
for (const std::unique_ptr<CElementGen>& ch : x248_finishPartChildren)
if (!ch->IsSystemDeletable())
return false;
for (const std::unique_ptr<CParticleSwoosh>& ch : x260_swhcChildren)
if (!ch->IsSystemDeletable())
return false;
for (const std::unique_ptr<CParticleElectric>& ch : x280_elscChildren)
if (!ch->IsSystemDeletable())
return false;
if (x214_PSLT < x50_curFrame && x208_activeParticleCount == 0)
return true;
return false;
} }
std::pair<Zeus::CAABox, bool> CElementGen::GetBounds() const std::pair<Zeus::CAABox, bool> CElementGen::GetBounds() const
{ {
if (GetParticleCountAll() == 0)
return {Zeus::CAABox(), false};
else
return {x2c4_systemBounds, true};
} }
u32 CElementGen::GetParticleCount() const u32 CElementGen::GetParticleCount() const
{ {
return x208_activeParticleCount;
} }
bool CElementGen::SystemHasLight() const bool CElementGen::SystemHasLight() const
{ {
return x2dc_lightType != LightType::None;
} }
CLight CElementGen::GetLight() const CLight CElementGen::GetLight() const
{ {
switch (x2dc_lightType)
{
case LightType::Directional:
return CLight::BuildDirectional(x2f4_LDIR.normalized(), x2e0_LCLR * x2e4_LINT);
case LightType::Spot:
return CLight::BuildSpot(x2e8_LOFF, x2f4_LDIR.normalized(), x2e0_LCLR * x2e4_LINT, x308_LSLA);
default:
{
float quad = x300_falloffType == EFalloffType::Quadratic ? x304_LFOR : 0.f;
float linear = x300_falloffType == EFalloffType::Linear ? x304_LFOR : 0.f;
float constant = x300_falloffType == EFalloffType::Constant ? 1.f : 0.f;
return CLight::BuildCustom(x2e8_LOFF, {1.f, 0.f, 0.f}, x2e0_LCLR,
constant, linear, quad, x2e4_LINT, 0.f, 0.f);
}
}
} }
void CElementGen::DestroyParticles() void CElementGen::DestroyParticles()
{ {
for (CParticleListItem& p : x2c_particleLists)
{
g_StaticFreeList[++g_FreeIndex] = p.x0_partIdx;
g_StaticParticleList[p.x0_partIdx].x0_endFrame = -1;
}
x2c_particleLists.clear();
x3c_parentMatrices.clear();
for (const std::unique_ptr<CElementGen>& ch : x234_activePartChildren)
ch->DestroyParticles();
for (const std::unique_ptr<CElementGen>& ch : x248_finishPartChildren)
ch->DestroyParticles();
} }
void CElementGen::AddModifier(CWarp*) void CElementGen::AddModifier(CWarp* mod)
{ {
x8_modifierList.push_back(mod);
} }
} }

31
Runtime/Particle/CElementGen.hpp
View File

@ -10,6 +10,7 @@
#include "CLight.hpp" #include "CLight.hpp"
#include "CGraphics.hpp" #include "CGraphics.hpp"
#include "CRandom16.hpp" #include "CRandom16.hpp"
#include "CWarp.hpp"
namespace Retro namespace Retro
{ {
@ -34,6 +35,13 @@ public:
One, One,
Two Two
}; };
enum class LightType
{
None = 0,
Custom = 1,
Directional = 2,
Spot = 3
};
class CParticleListItem class CParticleListItem
{ {
friend class CElementGen; friend class CElementGen;
@ -64,38 +72,39 @@ public:
}; };
protected: protected:
CElementGen(const TToken<IGenDescription>& gen); CElementGen(const TToken<IGenDescription>& gen);
std::list<CWarp*> x8_modifierList;
TLockedToken<IGenDescription> x1c_genDesc; TLockedToken<IGenDescription> x1c_genDesc;
EModelOrientationType x28_orientType; EModelOrientationType x28_orientType;
std::vector<CParticleListItem> x2c_particleLists; std::vector<CParticleListItem> x2c_particleLists;
std::vector<Zeus::CMatrix3f> x3c_parentMatrices; std::vector<Zeus::CMatrix3f> x3c_parentMatrices;
u32 x4c = 0; u32 x4c_internalStartFrame = 0;
u32 x50_curFrame = 0; u32 x50_curFrame = 0;
double x58_curSeconds = 0.f; double x58_curSeconds = 0.f;
float x60; float x60_timeDeltaScale;
u32 x64_prevFrame = -1; u32 x64_prevFrame = -1;
bool x68_particleEmission = true; bool x68_particleEmission = true;
float x6c_generatorRemainder = 0.f; float x6c_generatorRemainder = 0.f;
int x70_MAXP = 0; int x70_MAXP = 0;
u16 x74 = 99; u16 x74_randomSeed = 99;
float x78_generatorRate = 1.f; float x78_generatorRate = 1.f;
Zeus::CVector3f x7c_translation; Zeus::CVector3f x7c_translation;
Zeus::CVector3f x88_globalTranslation; Zeus::CVector3f x88_globalTranslation;
Zeus::CVector3f x94_POFS; Zeus::CVector3f x94_POFS;
Zeus::CVector3f xa0_globalScale = {1.f, 1.f, 1.f}; Zeus::CVector3f xa0_globalScale = {1.f, 1.f, 1.f};
Zeus::CTransform xac = Zeus::CTransform::Identity(); Zeus::CTransform xac_globalScaleTransform = Zeus::CTransform::Identity();
Zeus::CTransform xdc = Zeus::CTransform::Identity(); Zeus::CTransform xdc_globalScaleTransformInverse = Zeus::CTransform::Identity();
Zeus::CVector3f x10c_localScale = {1.f, 1.f, 1.f}; Zeus::CVector3f x10c_localScale = {1.f, 1.f, 1.f};
Zeus::CTransform x118 = Zeus::CTransform::Identity(); Zeus::CTransform x118_localScaleTransform = Zeus::CTransform::Identity();
Zeus::CTransform x148 = Zeus::CTransform::Identity(); Zeus::CTransform x148_localScaleTransformInverse = Zeus::CTransform::Identity();
Zeus::CTransform x178_orientation = Zeus::CTransform::Identity(); Zeus::CTransform x178_orientation = Zeus::CTransform::Identity();
Zeus::CTransform x1a8 = Zeus::CTransform::Identity(); Zeus::CTransform x1a8_orientationInverse = Zeus::CTransform::Identity();
Zeus::CTransform x1d8_globalOrientation = Zeus::CTransform::Identity(); Zeus::CTransform x1d8_globalOrientation = Zeus::CTransform::Identity();
u32 x208_activeParticleCount = 0; u32 x208_activeParticleCount = 0;
u32 x20c_recursiveParticleCount = 0; u32 x20c_recursiveParticleCount = 0;
u32 x210_curEmitterFrame = 0; u32 x210_curEmitterFrame = 0;
int x214_PSLT = 0x7fffff; int x214_PSLT = 0x7fffff;
Zeus::CVector3f x218_PSIV; Zeus::CVector3f x218_PSIV;
bool x224_24 = false; bool x224_24_translationDirty = false;
bool x224_25_LIT_; bool x224_25_LIT_;
bool x224_26_AAPH; bool x224_26_AAPH;
bool x224_27_ZBUF; bool x224_27_ZBUF;
@ -109,7 +118,7 @@ protected:
bool x225_27_FXLL; bool x225_27_FXLL;
bool x225_28_warmedUp = false; bool x225_28_warmedUp = false;
bool x225_29_modelsUseLights = false; bool x225_29_modelsUseLights = false;
bool x226; bool x226_enableOPTS;
int x228_MBSP; int x228_MBSP;
ERglLight x22c_backupLightActive = ERglLight::None; ERglLight x22c_backupLightActive = ERglLight::None;
CRandom16 x230_randState; CRandom16 x230_randState;
@ -130,7 +139,7 @@ protected:
Zeus::CVector3f x2b4_aabbMax; Zeus::CVector3f x2b4_aabbMax;
float x2c0_maxSize = 0.f; float x2c0_maxSize = 0.f;
Zeus::CAABox x2c4_systemBounds = Zeus::CAABox::skInvertedBox; Zeus::CAABox x2c4_systemBounds = Zeus::CAABox::skInvertedBox;
ELightType x2dc_lightType; LightType x2dc_lightType;
Zeus::CColor x2e0_LCLR = Zeus::CColor::skWhite; Zeus::CColor x2e0_LCLR = Zeus::CColor::skWhite;
float x2e4_LINT = 1.f; float x2e4_LINT = 1.f;
Zeus::CVector3f x2e8_LOFF; Zeus::CVector3f x2e8_LOFF;

3
Runtime/Particle/CGenDescription.hpp
View File

@ -25,7 +25,7 @@ public:
std::unique_ptr<CIntElement> x10_PSWT; std::unique_ptr<CIntElement> x10_PSWT;
std::unique_ptr<CRealElement> x14_PSTS; std::unique_ptr<CRealElement> x14_PSTS;
std::unique_ptr<CVectorElement> x18_POFS; std::unique_ptr<CVectorElement> x18_POFS;
std::unique_ptr<CIntElement> x1c_PMED; std::unique_ptr<CIntElement> x1c_SEED;
std::unique_ptr<CRealElement> x20_LENG; std::unique_ptr<CRealElement> x20_LENG;
std::unique_ptr<CRealElement> x24_WIDT; std::unique_ptr<CRealElement> x24_WIDT;
std::unique_ptr<CIntElement> x28_MAXP; std::unique_ptr<CIntElement> x28_MAXP;
@ -86,7 +86,6 @@ public:
std::unique_ptr<CRealElement> x11c_LSLA; std::unique_ptr<CRealElement> x11c_LSLA;
/* 0-00 additions */ /* 0-00 additions */
std::unique_ptr<CIntElement> x10_SEED;
union union
{ {
struct struct

7
Runtime/Particle/CParticleDataFactory.cpp
View File

@ -1011,8 +1011,8 @@ bool CParticleDataFactory::CreateGPSM(CGenDescription* fillDesc, CInputStream& i
case SBIG('PMLC'): case SBIG('PMLC'):
fillDesc->xec_PMLC = GetChildGeneratorDesc(in, resPool, tracker); fillDesc->xec_PMLC = GetChildGeneratorDesc(in, resPool, tracker);
break; break;
case SBIG('PMED'): case SBIG('SEED'):
fillDesc->x1c_PMED.reset(GetIntElement(in)); fillDesc->x1c_SEED.reset(GetIntElement(in));
break; break;
case SBIG('PMOO'): case SBIG('PMOO'):
fillDesc->x45_25_PMOO = GetBool(in); fillDesc->x45_25_PMOO = GetBool(in);
@ -1077,9 +1077,6 @@ bool CParticleDataFactory::CreateGPSM(CGenDescription* fillDesc, CInputStream& i
case SBIG('RSOP'): case SBIG('RSOP'):
fillDesc->x30_31_RSOP = GetBool(in); fillDesc->x30_31_RSOP = GetBool(in);
break; break;
case SBIG('SEED'):
fillDesc->x10_SEED.reset(GetIntElement(in));
break;
case SBIG('ADV1'): case SBIG('ADV1'):
fillDesc->x10c_ADV1.reset(GetRealElement(in)); fillDesc->x10c_ADV1.reset(GetRealElement(in));
break; break;