godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #51837 from pycbouh/particles-adjust-material-bit-size

Browse Source
This commit is contained in:
Rémi Verschelde 2021-08-18 17:28:04 +02:00 committed by GitHub
commit 01675eb75a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scene/resources/particles_material.h
View File

@ -61,6 +61,7 @@ public:
PARAM_MAX PARAM_MAX
}; };
// When extending, make sure not to overflow the size of the MaterialKey below.
enum ParticleFlags { enum ParticleFlags {
PARTICLE_FLAG_ALIGN_Y_TO_VELOCITY, PARTICLE_FLAG_ALIGN_Y_TO_VELOCITY,
PARTICLE_FLAG_ROTATE_Y, PARTICLE_FLAG_ROTATE_Y,
@ -68,6 +69,7 @@ public:
PARTICLE_FLAG_MAX PARTICLE_FLAG_MAX
}; };
// When extending, make sure not to overflow the size of the MaterialKey below.
enum EmissionShape { enum EmissionShape {
EMISSION_SHAPE_POINT, EMISSION_SHAPE_POINT,
EMISSION_SHAPE_SPHERE, EMISSION_SHAPE_SPHERE,
@ -78,6 +80,7 @@ public:
EMISSION_SHAPE_MAX EMISSION_SHAPE_MAX
}; };
// When extending, make sure not to overflow the size of the MaterialKey below.
enum SubEmitterMode { enum SubEmitterMode {
SUB_EMITTER_DISABLED, SUB_EMITTER_DISABLED,
SUB_EMITTER_CONSTANT, SUB_EMITTER_CONSTANT,
@ -88,11 +91,13 @@ public:
private: private:
union MaterialKey { union MaterialKey {
// The bit size of the struct must be kept below or equal to 32 bits.
// Consider this when extending ParticleFlags, EmissionShape, or SubEmitterMode.
struct { struct {
uint32_t texture_mask : 16; uint32_t texture_mask : 16;
uint32_t texture_color : 1; uint32_t texture_color : 1;
uint32_t particle_flags : 4; uint32_t particle_flags : 4;
uint32_t emission_shape : 2; uint32_t emission_shape : 3;
uint32_t invalid_key : 1; uint32_t invalid_key : 1;
uint32_t has_emission_color : 1; uint32_t has_emission_color : 1;
uint32_t sub_emitter : 2; uint32_t sub_emitter : 2;