7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2024-11-27 09:55:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'main' of https://github.com/geode-sdk/geode into main

Browse source
This commit is contained in:
HJfod 2023-03-13 18:08:36 +02:00
commit e0a69e11c8
1 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
loader/include/Geode/modify/Modify.hpp
View file

@ -123,6 +123,12 @@ namespace geode::modifier {
namespace geode { namespace geode {
// The intellisense compiler is quite dumb, and will very often error on modify classes
// with an error of "incomplete type is not allowed", despite not being an issue in actual compilation.
// So as a workaround use the compiler defined "__INTELLISENSE__" macro, which gets set to 1 on the intellisense pass.
// See https://learn.microsoft.com/en-us/cpp/preprocessor/predefined-macros?view=msvc-170#microsoft-specific-predefined-macros
#if __INTELLISENSE__ != 1
template <class Derived, class Base> template <class Derived, class Base>
class Modify : public Base { class Modify : public Base {
private: private:
@ -150,6 +156,16 @@ namespace geode {
static void onModify(auto& self) {} static void onModify(auto& self) {}
}; };
#else
template <class Derived, class Base>
class Modify : public Base {
public:
modifier::FieldIntermediate<Derived, Base> m_fields;
};
#endif
} }
/** /**
@ -170,6 +186,8 @@ namespace geode {
* I am bad at this stuff * I am bad at this stuff
*/ */
#if __INTELLISENSE__ != 1
#define GEODE_MODIFY_DECLARE_ANONYMOUS(base, derived) \ #define GEODE_MODIFY_DECLARE_ANONYMOUS(base, derived) \
derived##Dummy; \ derived##Dummy; \
template <class> \ template <class> \
@ -184,6 +202,18 @@ namespace geode {
derived##Dummy; \ derived##Dummy; \
struct GEODE_HIDDEN derived : geode::Modify<derived, base> struct GEODE_HIDDEN derived : geode::Modify<derived, base>
#else
// Simplify the modify macro for intellisense, to hopefully help perfomance a bit
#define GEODE_MODIFY_DECLARE(base, derived) \
derived##Dummy; \
struct derived : geode::Modify<derived, base>
#define GEODE_MODIFY_DECLARE_ANONYMOUS(base, derived) GEODE_MODIFY_DECLARE(base, derived)
#endif
#define GEODE_MODIFY_REDIRECT4(base, derived) GEODE_MODIFY_DECLARE(base, derived) #define GEODE_MODIFY_REDIRECT4(base, derived) GEODE_MODIFY_DECLARE(base, derived)
#define GEODE_MODIFY_REDIRECT3(base, derived) GEODE_MODIFY_DECLARE_ANONYMOUS(base, derived) #define GEODE_MODIFY_REDIRECT3(base, derived) GEODE_MODIFY_DECLARE_ANONYMOUS(base, derived)
#define GEODE_MODIFY_REDIRECT2(base) GEODE_MODIFY_REDIRECT3(base, GEODE_CONCAT(hook, __LINE__)) #define GEODE_MODIFY_REDIRECT2(base) GEODE_MODIFY_REDIRECT3(base, GEODE_CONCAT(hook, __LINE__))