dll fixes and remove __PRETTY_FUNCTION__

Steve987321 · Steve987321 · commit da66f61d983d · 2025-11-15T23:41:47.000+01:00
diff --git a/Engine/src/engine/systems/Reflection.h b/Engine/src/engine/systems/Reflection.h
@@ -11,7 +11,7 @@
 
 namespace Toad
 {
-
+    
 using json = nlohmann::ordered_json;
 
 // Define string identifier for type X
@@ -25,7 +25,7 @@ inline std::string_view type_name()
     return "Unknown";
 }
 
-struct SerializedEnum
+struct ENGINE_API SerializedEnum
 {
     union Data
     {    
@@ -63,7 +63,7 @@ SERIALIZABLE_TYPE(std::string*)
 #define ReflectTypes SerializedEnum, bool*, int8_t*, int16_t*, int32_t*, int64_t*, float*, std::string*
 
 template<typename T>
-struct ReflectVarsOfT
+struct ENGINE_API ReflectVarsOfT
 {
     std::unordered_map<std::string, T> data;
 
@@ -100,28 +100,28 @@ struct ReflectVarsOfT
 };
 
 template<typename... Ts>
-struct ReflectVarsCopy : ReflectVarsOfT<std::remove_pointer_t<Ts>>...
+struct ENGINE_API ReflectVarsCopy : ReflectVarsOfT<std::remove_pointer_t<Ts>>...
 {
     template<typename T>
-    ENGINE_API ReflectVarsOfT<T>& Get()
+    ReflectVarsOfT<T>& Get()
     {
         return static_cast<ReflectVarsOfT<T>&>(*this);
     }
 
     template<typename T>
-    ENGINE_API const ReflectVarsOfT<T>& GetCRef() const 
+    const ReflectVarsOfT<T>& GetCRef() const 
     {
         return static_cast<const ReflectVarsOfT<T>&>(*this);
     }
 
     template<typename T>
-    ENGINE_API T& GetVar(const std::string& name)
+    T& GetVar(const std::string& name)
     {
         return Get<T>().data[name];
     }
 
     template<typename T>
-    ENGINE_API void Add(const std::string& name, T value)
+    void Add(const std::string& name, T value)
     {
         if (std::is_enum_v<T>)
             AddEnum(name, value);
@@ -130,33 +130,33 @@ struct ReflectVarsCopy : ReflectVarsOfT<std::remove_pointer_t<Ts>>...
     }
 
     template<typename T>
-    ENGINE_API void Add(const ReflectVarsOfT<T>& vars)
+    void Add(const ReflectVarsOfT<T>& vars)
     {
         ReflectVarsOfT<T>::data.insert(vars.data.begin(), vars.data.end());
     }
 };
 
 template<typename... Ts>
-struct ReflectVars : ReflectVarsOfT<Ts>...
+struct ENGINE_API ReflectVars : ReflectVarsOfT<Ts>...
 {
     ReflectVars()
         : ReflectVarsOfT<Ts>()...
     {}
 
     template<typename T>
-    ENGINE_API ReflectVarsOfT<T>& Get()
+    ReflectVarsOfT<T>& Get()
     {
         return (ReflectVarsOfT<T>&)(*this);
     }
 
     template<typename T>
-    ENGINE_API T& GetVar(const std::string& name)
+    T& GetVar(const std::string& name)
     {
         return Get<T>().data[name];
     }
 
     template<typename T>
-    ENGINE_API void Add(const std::string& name, T value)
+    void Add(const std::string& name, T value)
     {
         if constexpr (std::is_enum_v<std::remove_pointer_t<T>>)
             AddEnum(name, value);
@@ -165,7 +165,7 @@ struct ReflectVars : ReflectVarsOfT<Ts>...
     }
 
     template<typename T>
-    ENGINE_API void AddEnum(const std::string& name, T value)
+    void AddEnum(const std::string& name, T value)
     {
         SerializedEnum serialized;
         serialized.enum_name = magic_enum::enum_type_name<decltype(*value)>();
@@ -182,7 +182,7 @@ struct ReflectVars : ReflectVarsOfT<Ts>...
     }
 
     template<typename T>
-    ENGINE_API ReflectVarsOfT<std::remove_pointer_t<T>> CopyVars() const 
+    ReflectVarsOfT<std::remove_pointer_t<T>> CopyVars() const 
     {
         ReflectVarsOfT<std::remove_pointer_t<T>> res;
         for (const auto& [n, v] : ReflectVarsOfT<T>::data)
@@ -200,27 +200,27 @@ struct ReflectVars : ReflectVarsOfT<Ts>...
         return res;
     }
 
-    ENGINE_API ReflectVarsCopy<Ts...> Copy() const 
+    ReflectVarsCopy<Ts...> Copy() const 
     {
         ReflectVarsCopy<Ts...> res;
         (res.template Add<std::remove_pointer_t<Ts>>(CopyVars<Ts>()), ...);
         return res; 
     }
 
-    ENGINE_API void Clear()
+    void Clear()
     {
         (ReflectVarsOfT<Ts>::data.clear(), ...);
     }
 
-    ENGINE_API json Serialize() 
+    json Serialize() 
     {
         json res; 
         (res.push_back(Get<Ts>().Serialize()), ...);
         return res;
     }
 
     // update overlapping vars 
-    ENGINE_API void Update(const ReflectVarsCopy<Ts...>& reflection)
+    void Update(const ReflectVarsCopy<Ts...>& reflection)
     {
         (std::for_each(Get<Ts>().data.begin(), Get<Ts>().data.end(),
             [&reflection](auto& e)
diff --git a/Engine/src/engine/systems/Scene.cpp b/Engine/src/engine/systems/Scene.cpp
@@ -104,7 +104,7 @@ static void UpdateVarsOnScript(Script* new_script, Reflection& reflection, const
                     if (var)
                         *var = new_value.template get<std::remove_pointer_t<Ts>>();
                     else 
-                        LOGWARNF("[Scene] Script variable {} for script {} is null and is getting disabled, make sure it's exposed. At {}", key, script_name.c_str(), __PRETTY_FUNCTION__);
+                        LOGWARNF("[Scene] Script variable {} for script {} is null and is getting disabled, make sure it's exposed.", key, script_name.c_str());
                 }
             } 
         }
diff --git a/Engine/src/engine/systems/Timer.h b/Engine/src/engine/systems/Timer.h
@@ -16,7 +16,7 @@ class Timer
 	ENGINE_API void Start();
 
 	template<typename TDur = std::chrono::milliseconds>
-	ENGINE_API float Elapsed() const
+	float Elapsed() const
 	{
 		return (float)std::chrono::duration_cast<TDur>(TClock::now() - m_start).count();
 	}
diff --git a/Engine/src/engine/utils/Helpers.h b/Engine/src/engine/utils/Helpers.h
@@ -50,7 +50,7 @@ namespace Toad
     ENGINE_API void PathToPreferred(std::string& path_str);
 
 	template<typename T>
-	ENGINE_API inline bool GetJsonElement(T& val, const nlohmann::ordered_json& data, std::string_view key, std::string error_msg = "") noexcept
+	inline bool GetJsonElement(T& val, const nlohmann::ordered_json& data, std::string_view key, std::string error_msg = "") noexcept
 	{
 		if (data.contains(key) && !data.at(key).is_null())
 		{
@@ -75,13 +75,13 @@ namespace Toad
 	ENGINE_API std::string GetFileContents(const char* file);
 
 	template<class T>
-	ENGINE_API T* GetObjectAsType(Object* obj)
+	T* GetObjectAsType(Object* obj)
 	{
 		return dynamic_cast<T*>(obj);
 	}
 
 	template<class T>
-	ENGINE_API T* GetScriptAsType(Script* script)
+	T* GetScriptAsType(Script* script)
 	{
 		return dynamic_cast<T*>(script);
 	}

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace Toad`
`13`	`13`	`{`
`14`		`-`
	`14`	`+`
`15`	`15`	`using json = nlohmann::ordered_json;`
`16`	`16`
`17`	`17`	`// Define string identifier for type X`
`@@ -25,7 +25,7 @@ inline std::string_view type_name()`
`25`	`25`	`return "Unknown";`
`26`	`26`	`}`
`27`	`27`
`28`		`-struct SerializedEnum`
	`28`	`+struct ENGINE_API SerializedEnum`
`29`	`29`	`{`
`30`	`30`	`union Data`
`31`	`31`	`{`
`@@ -63,7 +63,7 @@ SERIALIZABLE_TYPE(std::string*)`
`63`	`63`	`#define ReflectTypes SerializedEnum, bool, int8_t, int16_t, int32_t, int64_t, float, std::string*`
`64`	`64`
`65`	`65`	`template<typename T>`
`66`		`-struct ReflectVarsOfT`
	`66`	`+struct ENGINE_API ReflectVarsOfT`
`67`	`67`	`{`
`68`	`68`	`std::unordered_map<std::string, T> data;`
`69`	`69`
`@@ -100,28 +100,28 @@ struct ReflectVarsOfT`
`100`	`100`	`};`
`101`	`101`
`102`	`102`	`template<typename... Ts>`
`103`		`-struct ReflectVarsCopy : ReflectVarsOfT<std::remove_pointer_t<Ts>>...`
	`103`	`+struct ENGINE_API ReflectVarsCopy : ReflectVarsOfT<std::remove_pointer_t<Ts>>...`
`104`	`104`	`{`
`105`	`105`	`template<typename T>`
`106`		`- ENGINE_API ReflectVarsOfT<T>& Get()`
	`106`	`+ ReflectVarsOfT<T>& Get()`
`107`	`107`	`{`
`108`	`108`	`return static_cast<ReflectVarsOfT<T>&>(*this);`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`template<typename T>`
`112`		`- ENGINE_API const ReflectVarsOfT<T>& GetCRef() const`
	`112`	`+ const ReflectVarsOfT<T>& GetCRef() const`
`113`	`113`	`{`
`114`	`114`	`return static_cast<const ReflectVarsOfT<T>&>(*this);`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`template<typename T>`
`118`		`- ENGINE_API T& GetVar(const std::string& name)`
	`118`	`+ T& GetVar(const std::string& name)`
`119`	`119`	`{`
`120`	`120`	`return Get<T>().data[name];`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`template<typename T>`
`124`		`- ENGINE_API void Add(const std::string& name, T value)`
	`124`	`+ void Add(const std::string& name, T value)`
`125`	`125`	`{`
`126`	`126`	`if (std::is_enum_v<T>)`
`127`	`127`	`AddEnum(name, value);`
`@@ -130,33 +130,33 @@ struct ReflectVarsCopy : ReflectVarsOfT<std::remove_pointer_t<Ts>>...`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`template<typename T>`
`133`		`- ENGINE_API void Add(const ReflectVarsOfT<T>& vars)`
	`133`	`+ void Add(const ReflectVarsOfT<T>& vars)`
`134`	`134`	`{`
`135`	`135`	`ReflectVarsOfT<T>::data.insert(vars.data.begin(), vars.data.end());`
`136`	`136`	`}`
`137`	`137`	`};`
`138`	`138`
`139`	`139`	`template<typename... Ts>`
`140`		`-struct ReflectVars : ReflectVarsOfT<Ts>...`
	`140`	`+struct ENGINE_API ReflectVars : ReflectVarsOfT<Ts>...`
`141`	`141`	`{`
`142`	`142`	`ReflectVars()`
`143`	`143`	`: ReflectVarsOfT<Ts>()...`
`144`	`144`	`{}`
`145`	`145`
`146`	`146`	`template<typename T>`
`147`		`- ENGINE_API ReflectVarsOfT<T>& Get()`
	`147`	`+ ReflectVarsOfT<T>& Get()`
`148`	`148`	`{`
`149`	`149`	`return (ReflectVarsOfT<T>&)(*this);`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`template<typename T>`
`153`		`- ENGINE_API T& GetVar(const std::string& name)`
	`153`	`+ T& GetVar(const std::string& name)`
`154`	`154`	`{`
`155`	`155`	`return Get<T>().data[name];`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`template<typename T>`
`159`		`- ENGINE_API void Add(const std::string& name, T value)`
	`159`	`+ void Add(const std::string& name, T value)`
`160`	`160`	`{`
`161`	`161`	`if constexpr (std::is_enum_v<std::remove_pointer_t<T>>)`
`162`	`162`	`AddEnum(name, value);`
`@@ -165,7 +165,7 @@ struct ReflectVars : ReflectVarsOfT<Ts>...`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`template<typename T>`
`168`		`- ENGINE_API void AddEnum(const std::string& name, T value)`
	`168`	`+ void AddEnum(const std::string& name, T value)`
`169`	`169`	`{`
`170`	`170`	`SerializedEnum serialized;`
`171`	`171`	`serialized.enum_name = magic_enum::enum_type_name<decltype(*value)>();`
`@@ -182,7 +182,7 @@ struct ReflectVars : ReflectVarsOfT<Ts>...`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`template<typename T>`
`185`		`- ENGINE_API ReflectVarsOfT<std::remove_pointer_t<T>> CopyVars() const`
	`185`	`+ ReflectVarsOfT<std::remove_pointer_t<T>> CopyVars() const`
`186`	`186`	`{`
`187`	`187`	`ReflectVarsOfT<std::remove_pointer_t<T>> res;`
`188`	`188`	`for (const auto& [n, v] : ReflectVarsOfT<T>::data)`
`@@ -200,27 +200,27 @@ struct ReflectVars : ReflectVarsOfT<Ts>...`
`200`	`200`	`return res;`
`201`	`201`	`}`
`202`	`202`
`203`		`- ENGINE_API ReflectVarsCopy<Ts...> Copy() const`
	`203`	`+ ReflectVarsCopy<Ts...> Copy() const`
`204`	`204`	`{`
`205`	`205`	`ReflectVarsCopy<Ts...> res;`
`206`	`206`	`(res.template Add<std::remove_pointer_t<Ts>>(CopyVars<Ts>()), ...);`
`207`	`207`	`return res;`
`208`	`208`	`}`
`209`	`209`
`210`		`- ENGINE_API void Clear()`
	`210`	`+ void Clear()`
`211`	`211`	`{`
`212`	`212`	`(ReflectVarsOfT<Ts>::data.clear(), ...);`
`213`	`213`	`}`
`214`	`214`
`215`		`- ENGINE_API json Serialize()`
	`215`	`+ json Serialize()`
`216`	`216`	`{`
`217`	`217`	`json res;`
`218`	`218`	`(res.push_back(Get<Ts>().Serialize()), ...);`
`219`	`219`	`return res;`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`// update overlapping vars`
`223`		`- ENGINE_API void Update(const ReflectVarsCopy<Ts...>& reflection)`
	`223`	`+ void Update(const ReflectVarsCopy<Ts...>& reflection)`
`224`	`224`	`{`
`225`	`225`	`(std::for_each(Get<Ts>().data.begin(), Get<Ts>().data.end(),`
`226`	`226`	`[&reflection](auto& e)`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ static void UpdateVarsOnScript(Script* new_script, Reflection& reflection, const`
`104`	`104`	`if (var)`
`105`	`105`	`*var = new_value.template get<std::remove_pointer_t<Ts>>();`
`106`	`106`	`else`
`107`		`- LOGWARNF("[Scene] Script variable {} for script {} is null and is getting disabled, make sure it's exposed. At {}", key, script_name.c_str(), __PRETTY_FUNCTION__);`
	`107`	`+ LOGWARNF("[Scene] Script variable {} for script {} is null and is getting disabled, make sure it's exposed.", key, script_name.c_str());`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ class Timer`
`16`	`16`	`ENGINE_API void Start();`
`17`	`17`
`18`	`18`	`template<typename TDur = std::chrono::milliseconds>`
`19`		`- ENGINE_API float Elapsed() const`
	`19`	`+ float Elapsed() const`
`20`	`20`	`{`
`21`	`21`	`return (float)std::chrono::duration_cast<TDur>(TClock::now() - m_start).count();`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ namespace Toad`
`50`	`50`	`ENGINE_API void PathToPreferred(std::string& path_str);`
`51`	`51`
`52`	`52`	`template<typename T>`
`53`		`- ENGINE_API inline bool GetJsonElement(T& val, const nlohmann::ordered_json& data, std::string_view key, std::string error_msg = "") noexcept`
	`53`	`+ inline bool GetJsonElement(T& val, const nlohmann::ordered_json& data, std::string_view key, std::string error_msg = "") noexcept`
`54`	`54`	`{`
`55`	`55`	`if (data.contains(key) && !data.at(key).is_null())`
`56`	`56`	`{`
`@@ -75,13 +75,13 @@ namespace Toad`
`75`	`75`	`ENGINE_API std::string GetFileContents(const char* file);`
`76`	`76`
`77`	`77`	`template<class T>`
`78`		`- ENGINE_API T* GetObjectAsType(Object* obj)`
	`78`	`+ T* GetObjectAsType(Object* obj)`
`79`	`79`	`{`
`80`	`80`	`return dynamic_cast<T*>(obj);`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`template<class T>`
`84`		`- ENGINE_API T* GetScriptAsType(Script* script)`
	`84`	`+ T* GetScriptAsType(Script* script)`
`85`	`85`	`{`
`86`	`86`	`return dynamic_cast<T*>(script);`
`87`	`87`	`}`