matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Comply with another MSVC weirdness (see https://tpt.io/:24744)

Browse Source
This commit is contained in:
Tamás Bálint Misius 2021-01-03 00:02:48 +01:00
parent 88b9084267
commit 8e21dc2646
No known key found for this signature in database
GPG Key ID: 5B472A12F6ECA9F2
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/simulation/Particle.cpp
View File

@ -4,20 +4,20 @@
std::vector<StructProperty> const &Particle::GetProperties() std::vector<StructProperty> const &Particle::GetProperties()
{ {
static std::vector<StructProperty> properties = { static std::vector<StructProperty> properties = {
{ "type" , StructProperty::ParticleType, offsetof(Particle, type ) }, { "type" , StructProperty::ParticleType, (intptr_t)(offsetof(Particle, type )) },
{ "life" , StructProperty::ParticleType, offsetof(Particle, life ) }, { "life" , StructProperty::ParticleType, (intptr_t)(offsetof(Particle, life )) },
{ "ctype" , StructProperty::ParticleType, offsetof(Particle, ctype ) }, { "ctype" , StructProperty::ParticleType, (intptr_t)(offsetof(Particle, ctype )) },
{ "x" , StructProperty::Float , offsetof(Particle, x ) }, { "x" , StructProperty::Float , (intptr_t)(offsetof(Particle, x )) },
{ "y" , StructProperty::Float , offsetof(Particle, y ) }, { "y" , StructProperty::Float , (intptr_t)(offsetof(Particle, y )) },
{ "vx" , StructProperty::Float , offsetof(Particle, vx ) }, { "vx" , StructProperty::Float , (intptr_t)(offsetof(Particle, vx )) },
{ "vy" , StructProperty::Float , offsetof(Particle, vy ) }, { "vy" , StructProperty::Float , (intptr_t)(offsetof(Particle, vy )) },
{ "temp" , StructProperty::Float , offsetof(Particle, temp ) }, { "temp" , StructProperty::Float , (intptr_t)(offsetof(Particle, temp )) },
{ "flags" , StructProperty::UInteger , offsetof(Particle, flags ) }, { "flags" , StructProperty::UInteger , (intptr_t)(offsetof(Particle, flags )) },
{ "tmp" , StructProperty::Integer , offsetof(Particle, tmp ) }, { "tmp" , StructProperty::Integer , (intptr_t)(offsetof(Particle, tmp )) },
{ "tmp2" , StructProperty::Integer , offsetof(Particle, tmp2 ) }, { "tmp2" , StructProperty::Integer , (intptr_t)(offsetof(Particle, tmp2 )) },
{ "dcolour", StructProperty::UInteger , offsetof(Particle, dcolour) }, { "dcolour", StructProperty::UInteger , (intptr_t)(offsetof(Particle, dcolour)) },
{ "pavg0" , StructProperty::Float , offsetof(Particle, pavg[0]) }, { "pavg0" , StructProperty::Float , (intptr_t)(offsetof(Particle, pavg[0])) },
{ "pavg1" , StructProperty::Float , offsetof(Particle, pavg[1]) }, { "pavg1" , StructProperty::Float , (intptr_t)(offsetof(Particle, pavg[1])) },
}; };
return properties; return properties;
} }