aboutsummaryrefslogtreecommitdiff
path: root/scene/resources/material.h
diff options
context:
space:
mode:
Diffstat (limited to 'scene/resources/material.h')
-rw-r--r--scene/resources/material.h16
1 files changed, 14 insertions, 2 deletions
diff --git a/scene/resources/material.h b/scene/resources/material.h
index 0f0bf4802..35f01d475 100644
--- a/scene/resources/material.h
+++ b/scene/resources/material.h
@@ -132,6 +132,8 @@ public:
FLAG_UNSHADED,
FLAG_ONTOP,
FLAG_ALBEDO_FROM_VERTEX_COLOR,
+ FLAG_SRGB_VERTEX_COLOR,
+ FLAG_USE_POINT_SIZE,
FLAG_MAX
};
@@ -146,12 +148,12 @@ private:
union MaterialKey {
struct {
- uint32_t feature_mask : 16;
+ uint32_t feature_mask : 15;
uint32_t detail_uv : 1;
uint32_t blend_mode : 2;
uint32_t depth_draw_mode : 2;
uint32_t cull_mode : 2;
- uint32_t flags : 3;
+ uint32_t flags : 5;
uint32_t detail_blend_mode : 2;
uint32_t diffuse_mode : 2;
uint32_t invalid_key : 1;
@@ -213,7 +215,9 @@ private:
StringName subsurface_scattering;
StringName refraction;
StringName refraction_roughness;
+ StringName point_size;
StringName texture_names[TEXTURE_MAX];
+
};
static Mutex *material_mutex;
@@ -240,6 +244,8 @@ private:
float subsurface_scattering;
float refraction;
float refraction_roughness;
+ float line_width;
+ float point_size;
DetailUV detail_uv;
@@ -306,6 +312,12 @@ public:
void set_refraction_roughness(float p_refraction_roughness);
float get_refraction_roughness() const;
+ void set_line_width(float p_line_width);
+ float get_line_width() const;
+
+ void set_point_size(float p_point_size);
+ float get_point_size() const;
+
void set_detail_uv(DetailUV p_detail_uv);
DetailUV get_detail_uv() const;