Merge pull request #40364 from marstaik/alpha2coverage_up

Alpha Hash and Alpha2Coverage Implementation

1 files changed, 90 insertions, 48 deletions

diff --git a/scene/resources/material.h b/scene/resources/material.h
index b5bdd77eb5..da1808d348 100644
--- a/scene/resources/material.h
+++ b/scene/resources/material.h
@@ -145,17 +145,26 @@ public:
 
 	enum DetailUV {
 		DETAIL_UV_1,
-		DETAIL_UV_2
+		DETAIL_UV_2,
+		DETAIL_UV_MAX
 	};
 
 	enum Transparency {
 		TRANSPARENCY_DISABLED,
 		TRANSPARENCY_ALPHA,
 		TRANSPARENCY_ALPHA_SCISSOR,
+		TRANSPARENCY_ALPHA_HASH,
 		TRANSPARENCY_ALPHA_DEPTH_PRE_PASS,
 		TRANSPARENCY_MAX,
 	};
 
+	enum AlphaAntiAliasing {
+		ALPHA_ANTIALIASING_OFF,
+		ALPHA_ANTIALIASING_ALPHA_TO_COVERAGE,
+		ALPHA_ANTIALIASING_ALPHA_TO_COVERAGE_AND_TO_ONE,
+		ALPHA_ANTIALIASING_MAX
+	};
+
 	enum ShadingMode {
 		SHADING_MODE_UNSHADED,
 		SHADING_MODE_PER_PIXEL,
@@ -184,18 +193,21 @@ public:
 		BLEND_MODE_ADD,
 		BLEND_MODE_SUB,
 		BLEND_MODE_MUL,
+		BLEND_MODE_MAX
 	};
 
 	enum DepthDrawMode {
 		DEPTH_DRAW_OPAQUE_ONLY,
 		DEPTH_DRAW_ALWAYS,
 		DEPTH_DRAW_DISABLED,
+		DEPTH_DRAW_MAX
 	};
 
 	enum CullMode {
 		CULL_BACK,
 		CULL_FRONT,
-		CULL_DISABLED
+		CULL_DISABLED,
+		CULL_MAX
 	};
 
 	enum Flags {
@@ -227,6 +239,7 @@ public:
 		DIFFUSE_LAMBERT_WRAP,
 		DIFFUSE_OREN_NAYAR,
 		DIFFUSE_TOON,
+		DIFFUSE_MAX
 	};
 
 	enum SpecularMode {
@@ -235,6 +248,7 @@ public:
 		SPECULAR_PHONG,
 		SPECULAR_TOON,
 		SPECULAR_DISABLED,
+		SPECULAR_MAX
 	};
 
 	enum BillboardMode {
@@ -242,6 +256,7 @@ public:
 		BILLBOARD_ENABLED,
 		BILLBOARD_FIXED_Y,
 		BILLBOARD_PARTICLES,
+		BILLBOARD_MAX
 	};
 
 	enum TextureChannel {
@@ -249,12 +264,14 @@ public:
 		TEXTURE_CHANNEL_GREEN,
 		TEXTURE_CHANNEL_BLUE,
 		TEXTURE_CHANNEL_ALPHA,
-		TEXTURE_CHANNEL_GRAYSCALE
+		TEXTURE_CHANNEL_GRAYSCALE,
+		TEXTURE_CHANNEL_MAX
 	};
 
 	enum EmissionOperator {
 		EMISSION_OP_ADD,
-		EMISSION_OP_MULTIPLY
+		EMISSION_OP_MULTIPLY,
+		EMISSION_OP_MAX
 	};
 
 	enum DistanceFadeMode {
@@ -262,43 +279,47 @@ public:
 		DISTANCE_FADE_PIXEL_ALPHA,
 		DISTANCE_FADE_PIXEL_DITHER,
 		DISTANCE_FADE_OBJECT_DITHER,
+		DISTANCE_FADE_MAX
 	};
 
 private:
-	union MaterialKey {
-		struct {
-			uint64_t feature_mask : FEATURE_MAX;
-			uint64_t detail_uv : 1;
-			uint64_t blend_mode : 2;
-			uint64_t depth_draw_mode : 2;
-			uint64_t cull_mode : 2;
-			uint64_t flags : FLAG_MAX;
-			uint64_t detail_blend_mode : 2;
-			uint64_t diffuse_mode : 3;
-			uint64_t specular_mode : 3;
-			uint64_t invalid_key : 1;
-			uint64_t deep_parallax : 1;
-			uint64_t billboard_mode : 2;
-			uint64_t grow : 1;
-			uint64_t proximity_fade : 1;
-			uint64_t distance_fade : 2;
-			uint64_t emission_op : 1;
-			uint64_t texture_filter : 3;
-			uint64_t transparency : 2;
-			uint64_t shading_mode : 2;
-			uint64_t roughness_channel : 3;
-		};
-
-		struct {
-			uint64_t key0;
-			uint64_t key1;
-		};
+	struct MaterialKey {
+		// enum values
+		uint64_t texture_filter : get_num_bits(TEXTURE_FILTER_MAX - 1);
+		uint64_t detail_uv : get_num_bits(DETAIL_UV_MAX - 1);
+		uint64_t transparency : get_num_bits(TRANSPARENCY_MAX - 1);
+		uint64_t alpha_antialiasing_mode : get_num_bits(ALPHA_ANTIALIASING_MAX - 1);
+		uint64_t shading_mode : get_num_bits(SHADING_MODE_MAX - 1);
+		uint64_t blend_mode : get_num_bits(BLEND_MODE_MAX - 1);
+		uint64_t depth_draw_mode : get_num_bits(DEPTH_DRAW_MAX - 1);
+		uint64_t cull_mode : get_num_bits(CULL_MAX - 1);
+		uint64_t diffuse_mode : get_num_bits(DIFFUSE_MAX - 1);
+		uint64_t specular_mode : get_num_bits(SPECULAR_MAX - 1);
+		uint64_t billboard_mode : get_num_bits(BILLBOARD_MAX - 1);
+		uint64_t detail_blend_mode : get_num_bits(BLEND_MODE_MAX - 1);
+		uint64_t roughness_channel : get_num_bits(TEXTURE_CHANNEL_MAX - 1);
+		uint64_t emission_op : get_num_bits(EMISSION_OP_MAX - 1);
+		uint64_t distance_fade : get_num_bits(DISTANCE_FADE_MAX - 1);
+
+		// flag bitfield
+		uint64_t feature_mask : FEATURE_MAX - 1;
+		uint64_t flags : FLAG_MAX - 1;
+
+		// booleans
+		uint64_t deep_parallax : 1;
+		uint64_t grow : 1;
+		uint64_t proximity_fade : 1;
+
+		MaterialKey() {
+			memset(this, 0, sizeof(MaterialKey));
+		}
 
 		bool operator==(const MaterialKey &p_key) const {
-			return (key0 == p_key.key0) && (key1 == p_key.key1);
+			return memcmp(this, &p_key, sizeof(MaterialKey)) == 0;
 		}
+
 		bool operator<(const MaterialKey &p_key) const {
-			return (key0 == p_key.key0) ? (key1 < p_key.key1) : (key0 < p_key.key0);
+			return memcmp(this, &p_key, sizeof(MaterialKey)) < 0;
 		}
 	};
 
@@ -313,13 +334,7 @@ private:
 
 	_FORCE_INLINE_ MaterialKey _compute_key() const {
 		MaterialKey mk;
-		mk.key0 = 0;
-		mk.key1 = 0;
-		for (int i = 0; i < FEATURE_MAX; i++) {
-			if (features[i]) {
-				mk.feature_mask |= ((uint64_t)1 << i);
-			}
-		}
+
 		mk.detail_uv = detail_uv;
 		mk.blend_mode = blend_mode;
 		mk.depth_draw_mode = depth_draw_mode;
@@ -328,20 +343,28 @@ private:
 		mk.transparency = transparency;
 		mk.shading_mode = shading_mode;
 		mk.roughness_channel = roughness_texture_channel;
-		for (int i = 0; i < FLAG_MAX; i++) {
-			if (flags[i]) {
-				mk.flags |= ((uint64_t)1 << i);
-			}
-		}
 		mk.detail_blend_mode = detail_blend_mode;
 		mk.diffuse_mode = diffuse_mode;
 		mk.specular_mode = specular_mode;
 		mk.billboard_mode = billboard_mode;
-		mk.deep_parallax = deep_parallax ? 1 : 0;
+		mk.deep_parallax = deep_parallax;
 		mk.grow = grow_enabled;
 		mk.proximity_fade = proximity_fade_enabled;
 		mk.distance_fade = distance_fade;
 		mk.emission_op = emission_op;
+		mk.alpha_antialiasing_mode = alpha_antialiasing_mode;
+
+		for (int i = 0; i < FEATURE_MAX; i++) {
+			if (features[i]) {
+				mk.feature_mask |= ((uint64_t)1 << i);
+			}
+		}
+
+		for (int i = 0; i < FLAG_MAX; i++) {
+			if (flags[i]) {
+				mk.flags |= ((uint64_t)1 << i);
+			}
+		}
 
 		return mk;
 	}
@@ -392,9 +415,14 @@ private:
 		StringName rim_texture_channel;
 		StringName heightmap_texture_channel;
 		StringName refraction_texture_channel;
-		StringName alpha_scissor_threshold;
 
 		StringName texture_names[TEXTURE_MAX];
+
+		StringName alpha_scissor_threshold;
+		StringName alpha_hash_scale;
+
+		StringName alpha_antialiasing_edge;
+		StringName albedo_texture_size;
 	};
 
 	static Mutex material_mutex;
@@ -433,6 +461,8 @@ private:
 	float refraction;
 	float point_size;
 	float alpha_scissor_threshold;
+	float alpha_hash_scale;
+	float alpha_antialiasing_edge;
 	bool grow_enabled;
 	float ao_light_affect;
 	float grow;
@@ -482,6 +512,8 @@ private:
 	TextureChannel ao_texture_channel;
 	TextureChannel refraction_texture_channel;
 
+	AlphaAntiAliasing alpha_antialiasing_mode;
+
 	bool features[FEATURE_MAX];
 
 	Ref<Texture2D> textures[TEXTURE_MAX];
@@ -584,6 +616,12 @@ public:
 	void set_transparency(Transparency p_transparency);
 	Transparency get_transparency() const;
 
+	void set_alpha_antialiasing(AlphaAntiAliasing p_alpha_aa);
+	AlphaAntiAliasing get_alpha_antialiasing() const;
+
+	void set_alpha_antialiasing_edge(float p_edge);
+	float get_alpha_antialiasing_edge() const;
+
 	void set_shading_mode(ShadingMode p_shading_mode);
 	ShadingMode get_shading_mode() const;
 
@@ -660,6 +698,9 @@ public:
 	void set_alpha_scissor_threshold(float p_threshold);
 	float get_alpha_scissor_threshold() const;
 
+	void set_alpha_hash_scale(float p_scale);
+	float get_alpha_hash_scale() const;
+
 	void set_on_top_of_alpha();
 
 	void set_proximity_fade(bool p_enable);
@@ -707,6 +748,7 @@ VARIANT_ENUM_CAST(BaseMaterial3D::TextureParam)
 VARIANT_ENUM_CAST(BaseMaterial3D::TextureFilter)
 VARIANT_ENUM_CAST(BaseMaterial3D::ShadingMode)
 VARIANT_ENUM_CAST(BaseMaterial3D::Transparency)
+VARIANT_ENUM_CAST(BaseMaterial3D::AlphaAntiAliasing)
 VARIANT_ENUM_CAST(BaseMaterial3D::DetailUV)
 VARIANT_ENUM_CAST(BaseMaterial3D::Feature)
 VARIANT_ENUM_CAST(BaseMaterial3D::BlendMode)