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

Adjust the material key bit size for ParticlesMaterial

Browse Source
This commit is contained in:
Yuri Sizov 2021-08-18 16:51:05 +03:00
parent ddfaf20f62
commit 29f0a0eebf
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scene/resources/particles_material.h
View File

@ -39,7 +39,6 @@ class ParticlesMaterial : public Material {
public: public:
enum Parameter { enum Parameter {
PARAM_INITIAL_LINEAR_VELOCITY, PARAM_INITIAL_LINEAR_VELOCITY,
PARAM_ANGULAR_VELOCITY, PARAM_ANGULAR_VELOCITY,
PARAM_ORBIT_VELOCITY, PARAM_ORBIT_VELOCITY,
@ -55,6 +54,7 @@ public:
PARAM_MAX PARAM_MAX
}; };
// When extending, make sure not to overflow the size of the MaterialKey below.
enum Flags { enum Flags {
FLAG_ALIGN_Y_TO_VELOCITY, FLAG_ALIGN_Y_TO_VELOCITY,
FLAG_ROTATE_Y, FLAG_ROTATE_Y,
@ -62,6 +62,7 @@ public:
FLAG_MAX 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,
@ -74,11 +75,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 Flags, or EmissionShape.
struct { struct {
uint32_t texture_mask : 16; uint32_t texture_mask : 16;
uint32_t texture_color : 1; uint32_t texture_color : 1;
uint32_t flags : 4; uint32_t flags : 4;
uint32_t emission_shape : 2; uint32_t emission_shape : 3;
uint32_t trail_size_texture : 1; uint32_t trail_size_texture : 1;
uint32_t trail_color_texture : 1; uint32_t trail_color_texture : 1;
uint32_t invalid_key : 1; uint32_t invalid_key : 1;