Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-29 20:11:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reuse old property enum slots

Browse source
This commit is contained in:
David Rowe 2015-09-18 13:06:18 -07:00
parent 03194437f5
commit ec146069b1
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/entities/src/EntityPropertyFlags.h
View file

@ -96,7 +96,7 @@ enum EntityPropertyList {
PROP_MAX_PARTICLES, PROP_MAX_PARTICLES,
PROP_LIFESPAN, PROP_LIFESPAN,
PROP_EMIT_RATE, PROP_EMIT_RATE,
PROP_EMIT_VELOCITY, PROP_EMIT_SPEED,
PROP_EMIT_STRENGTH, PROP_EMIT_STRENGTH,
PROP_EMIT_ACCELERATION, PROP_EMIT_ACCELERATION,
PROP_PARTICLE_RADIUS, PROP_PARTICLE_RADIUS,
@ -136,7 +136,7 @@ enum EntityPropertyList {
PROP_STROKE_WIDTHS, PROP_STROKE_WIDTHS,
// used by particles // used by particles
PROP_VELOCITY_SPREAD, PROP_SPEED_SPREAD,
PROP_ACCELERATION_SPREAD, PROP_ACCELERATION_SPREAD,
PROP_X_N_NEIGHBOR_ID, // used by PolyVox PROP_X_N_NEIGHBOR_ID, // used by PolyVox
@ -160,8 +160,6 @@ enum EntityPropertyList {
PROP_ALPHA_SPREAD, PROP_ALPHA_SPREAD,
PROP_ALPHA_START, PROP_ALPHA_START,
PROP_ALPHA_FINISH, PROP_ALPHA_FINISH,
PROP_EMIT_SPEED,
PROP_SPEED_SPREAD,
PROP_EMIT_ORIENTATION, PROP_EMIT_ORIENTATION,
PROP_EMIT_DIMENSIONS, PROP_EMIT_DIMENSIONS,
PROP_EMIT_RADIUS_START, PROP_EMIT_RADIUS_START,
@ -202,7 +200,7 @@ enum EntityPropertyList {
PROP_ATMOSPHERE_CENTER = PROP_MAX_PARTICLES, PROP_ATMOSPHERE_CENTER = PROP_MAX_PARTICLES,
PROP_ATMOSPHERE_INNER_RADIUS = PROP_LIFESPAN, PROP_ATMOSPHERE_INNER_RADIUS = PROP_LIFESPAN,
PROP_ATMOSPHERE_OUTER_RADIUS = PROP_EMIT_RATE, PROP_ATMOSPHERE_OUTER_RADIUS = PROP_EMIT_RATE,
PROP_ATMOSPHERE_MIE_SCATTERING = PROP_EMIT_VELOCITY, PROP_ATMOSPHERE_MIE_SCATTERING = PROP_EMIT_SPEED,
PROP_ATMOSPHERE_RAYLEIGH_SCATTERING = PROP_EMIT_STRENGTH, PROP_ATMOSPHERE_RAYLEIGH_SCATTERING = PROP_EMIT_STRENGTH,
PROP_ATMOSPHERE_SCATTERING_WAVELENGTHS = PROP_EMIT_ACCELERATION, PROP_ATMOSPHERE_SCATTERING_WAVELENGTHS = PROP_EMIT_ACCELERATION,
PROP_ATMOSPHERE_HAS_STARS = PROP_PARTICLE_RADIUS, PROP_ATMOSPHERE_HAS_STARS = PROP_PARTICLE_RADIUS,

6
libraries/entities/src/ParticleEffectEntityItem.cpp
View file

@ -289,7 +289,8 @@ int ParticleEffectEntityItem::readEntitySubclassDataFromBuffer(const unsigned ch
READ_ENTITY_PROPERTY(PROP_LIFESPAN, float, setLifespan); READ_ENTITY_PROPERTY(PROP_LIFESPAN, float, setLifespan);
READ_ENTITY_PROPERTY(PROP_EMIT_RATE, float, setEmitRate); READ_ENTITY_PROPERTY(PROP_EMIT_RATE, float, setEmitRate);
if (args.bitstreamVersion < VERSION_ENTITIES_PARTICLE_ELLIPSOID_EMITTER) { if (args.bitstreamVersion < VERSION_ENTITIES_PARTICLE_ELLIPSOID_EMITTER) {
SKIP_ENTITY_PROPERTY(PROP_EMIT_VELOCITY, glm::vec3); // OLD PROP_EMIT_VELOCITY FAKEOUT
SKIP_ENTITY_PROPERTY(PROP_EMIT_SPEED, glm::vec3);
} }
if (args.bitstreamVersion >= VERSION_ENTITIES_PARTICLE_MODIFICATIONS) { if (args.bitstreamVersion >= VERSION_ENTITIES_PARTICLE_MODIFICATIONS) {
@ -298,7 +299,8 @@ int ParticleEffectEntityItem::readEntitySubclassDataFromBuffer(const unsigned ch
READ_ENTITY_PROPERTY(PROP_PARTICLE_RADIUS, float, setParticleRadius); READ_ENTITY_PROPERTY(PROP_PARTICLE_RADIUS, float, setParticleRadius);
READ_ENTITY_PROPERTY(PROP_TEXTURES, QString, setTextures); READ_ENTITY_PROPERTY(PROP_TEXTURES, QString, setTextures);
if (args.bitstreamVersion < VERSION_ENTITIES_PARTICLE_ELLIPSOID_EMITTER) { if (args.bitstreamVersion < VERSION_ENTITIES_PARTICLE_ELLIPSOID_EMITTER) {
SKIP_ENTITY_PROPERTY(PROP_VELOCITY_SPREAD, glm::vec3); // OLD PROP_VELOCITY_SPREAD FAKEOUT
SKIP_ENTITY_PROPERTY(PROP_SPEED_SPREAD, glm::vec3);
} }
} else { } else {
// EMIT_ACCELERATION FAKEOUT // EMIT_ACCELERATION FAKEOUT