Added ReflectEnumType helper

Author: GuusKemperman

Include/Core/Input.h

@@ -300,7 +300,7 @@ namespace CE
     private:
         bool HasFocus(bool checkFocus) const;
 
-        inline static constexpr float sTriggerThreshold = 0.15f;
+        static constexpr float sTriggerThreshold = 0.15f;
 
         friend ReflectAccess;
         static MetaType Reflect();

Include/Meta/ReflectedTypes/ReflectEnums.h

@@ -1,18 +1,23 @@
 #pragma once
+#include "magic_enum/magic_enum.hpp"
 #include "Utilities/Reflect/ReflectFieldType.h"
 
 namespace CE
 {
 	template<typename T>
-	void ReflectEnumType(MetaType& type)
+	MetaType ReflectEnumType(bool isScriptable) requires magic_enum::detail::is_enum_v<T>
 	{
-		ASSERT(MakeTypeId<T>() == type.GetTypeId());
+		MetaType type{ MetaType::T<T>{}, magic_enum::enum_type_name<T>() };
 
-		if (type.GetProperties().Has(Props::sIsScriptableTag))
+		if (isScriptable)
 		{
-			type.GetProperties().Add(Props::sIsScriptOwnableTag);
+			type.GetProperties().Add(Props::sIsScriptableTag).Add(Props::sIsScriptOwnableTag);
+
+			type.AddFunc(std::equal_to<T>(), OperatorType::equal).GetProperties().Add(Props::sIsScriptableTag);
+			type.AddFunc(std::not_equal_to<T>(), OperatorType::inequal).GetProperties().Add(Props::sIsScriptableTag);
 		}
 
 		ReflectFieldType<T>(type);
+		return type;
 	}
 }

Include/Utilities/Reflect/ReflectFieldType.h

@@ -25,9 +25,10 @@ namespace CE
 			return;
 		}
 
-		MetaProps& equalFuncProps = type.AddFunc([](const T& lhs, const T& rhs) {  return lhs == rhs; }, OperatorType::equal).GetProperties();
+		MetaProps& equalFuncProps = type.AddFunc(std::equal_to<T>(), OperatorType::equal).GetProperties();
 
-		if (type.GetProperties().Has(Props::sIsScriptableTag))
+		if (type.GetProperties().Has(Props::sIsScriptableTag)
+			&& !equalFuncProps.Has(Props::sIsScriptableTag))
 		{
 			equalFuncProps.Add(Props::sIsScriptableTag);
 		}

Source/BasicDataTypes/CollisionRules.cpp

@@ -3,6 +3,7 @@
 
 #include "Meta/MetaType.h"
 #include "Meta/MetaProps.h"
+#include "Meta/ReflectedTypes/ReflectEnums.h"
 #include "Utilities/Reflect/ReflectComponentType.h"
 #include "Utilities/Reflect/ReflectFieldType.h"
 
@@ -77,16 +78,7 @@ void CE::CollisionRules::DisplayWidget(const std::string& name)
 
 CE::MetaType Reflector<CE::CollisionLayer>::Reflect()
 {
-	using namespace CE;
-	using T = CollisionLayer;
-	MetaType type{ MetaType::T<T>{}, "CollisionLayer" };
-
-	type.GetProperties().Add(Props::sIsScriptableTag).Add(Props::sIsScriptOwnableTag);
-	type.AddFunc(std::equal_to<T>(), OperatorType::equal).GetProperties().Add(Props::sIsScriptableTag);
-	type.AddFunc(std::not_equal_to<T>(), OperatorType::inequal).GetProperties().Add(Props::sIsScriptableTag);
-	ReflectFieldType<T>(type);
-
-	return type;
+	return CE::ReflectEnumType<CE::CollisionLayer>(true);
 }
 
 CE::MetaType Reflector<CE::CollisionRules>::Reflect()

Source/Core/Input.cpp

@@ -3,6 +3,7 @@
 
 #include "Meta/MetaType.h"
 #include "Meta/MetaProps.h"
+#include "Meta/ReflectedTypes/ReflectEnums.h"
 #include "Utilities/Reflect/ReflectFieldType.h"
 
 CE::MetaType CE::Input::Reflect()
@@ -33,53 +34,20 @@ CE::MetaType CE::Input::Reflect()
 
 CE::MetaType Reflector<CE::Input::KeyboardKey>::Reflect()
 {
-	using namespace CE;
-	using T = Input::KeyboardKey;
-	MetaType type{ MetaType::T<T>{}, "KeyboardKey" };
-
-	type.GetProperties().Add(Props::sIsScriptableTag).Add(Props::sIsScriptOwnableTag);
-	type.AddFunc(std::equal_to<T>(), OperatorType::equal).GetProperties().Add(Props::sIsScriptableTag);
-	type.AddFunc(std::not_equal_to<T>(), OperatorType::inequal).GetProperties().Add(Props::sIsScriptableTag);
-	ReflectFieldType<T>(type);
-
-	return type;
+	return CE::ReflectEnumType<CE::Input::KeyboardKey>(true);
 }
 
 CE::MetaType Reflector<CE::Input::GamepadAxis>::Reflect()
 {
-	using namespace CE;
-	using T = Input::GamepadAxis;
-	MetaType type{ MetaType::T<T>{}, "GamepadAxis" };
-
-	type.GetProperties().Add(Props::sIsScriptableTag).Add(Props::sIsScriptOwnableTag);
-	ReflectFieldType<T>(type);
-	return type;
+	return CE::ReflectEnumType<CE::Input::GamepadAxis>(true);
 }
 
 CE::MetaType Reflector<CE::Input::GamepadButton>::Reflect()
 {
-	using namespace CE;
-	using T = Input::GamepadButton;
-	MetaType type{ MetaType::T<T>{}, "GamepadButton" };
-
-	type.GetProperties().Add(Props::sIsScriptableTag).Add(Props::sIsScriptOwnableTag);
-	type.AddFunc(std::equal_to<T>(), OperatorType::equal).GetProperties().Add(Props::sIsScriptableTag);
-	type.AddFunc(std::not_equal_to<T>(), OperatorType::inequal).GetProperties().Add(Props::sIsScriptableTag);
-	ReflectFieldType<T>(type);
-
-	return type;
+	return CE::ReflectEnumType<CE::Input::GamepadButton>(true);
 }
 
 CE::MetaType Reflector<CE::Input::MouseButton>::Reflect()
 {
-	using namespace CE;
-	using T = Input::MouseButton;
-	MetaType type{ MetaType::T<T>{}, "MouseButton" };
-
-	type.GetProperties().Add(Props::sIsScriptableTag).Add(Props::sIsScriptOwnableTag);
-	type.AddFunc(std::equal_to<T>(), OperatorType::equal).GetProperties().Add(Props::sIsScriptableTag);
-	type.AddFunc(std::not_equal_to<T>(), OperatorType::inequal).GetProperties().Add(Props::sIsScriptableTag);
-	ReflectFieldType<T>(type);
-
-	return type;
+	return CE::ReflectEnumType<CE::Input::MouseButton>(true);
 }