fix textarea::create and fix geodenodemetadata

This commit is contained in:
altalk23 2022-11-17 23:24:37 +03:00 committed by alk
parent b7bbee5669
commit a79a13c1ab
3 changed files with 41 additions and 40 deletions

View file

@ -5308,7 +5308,7 @@ class TextArea : cocos2d::CCSprite {
virtual void draw() {}
virtual void setOpacity(unsigned char) = mac 0x19f760, win 0x33800;
bool init(gd::string str, char const* font, float width, float height, cocos2d::CCPoint anchor, float scale, bool disableColor) = mac 0x19ec70, win 0x33370, ios 0x92444;
static TextArea* create(gd::string str, char const* font, float scale, float width, cocos2d::CCPoint const& anchor, float height, bool disableColor) = mac 0x19eb40, win 0x33270;
static TextArea* create(gd::string str, char const* font, float scale, float width, cocos2d::CCPoint anchor, float height, bool disableColor) = mac 0x19eb40, win 0x33270;
void colorAllCharactersTo(cocos2d::ccColor3B color) = win 0x33830;
void setString(gd::string str) = mac 0x19eda0, win 0x33480;

View file

@ -1,16 +1,16 @@
#pragma once
#include <broma.hpp>
#include <array>
#include <broma.hpp>
#include <fmt/format.h>
#include <fmt/ranges.h>
#include <fstream>
#include <fs/filesystem.hpp> // bruh
#include <fstream>
using std::istreambuf_iterator;
#ifdef _MSC_VER
#pragma warning(disable: 4996)
#pragma warning(disable : 4996)
#endif
#if _WIN32
@ -57,59 +57,57 @@ enum class BindStatus {
Unbindable
};
struct codegen_error : std::runtime_error {
inline codegen_error(char const* msg) : std::runtime_error(msg) {}
};
namespace codegen {
template <typename ...Args>
template <typename... Args>
inline codegen_error error(Args... args) {
return codegen_error(fmt::format(args...).c_str());
}
inline Platform platform;
inline Platform platform;
inline uintptr_t platformNumber(PlatformNumber const& p) {
inline uintptr_t platformNumber(PlatformNumber const& p) {
switch (codegen::platform) {
case Platform::Mac:
return p.mac;
case Platform::Windows:
return p.win;
case Platform::iOS:
return p.ios;
case Platform::Android:
return p.android;
case Platform::Mac: return p.mac;
case Platform::Windows: return p.win;
case Platform::iOS: return p.ios;
case Platform::Android: return p.android;
default: // unreachable
return p.win;
}
}
inline BindStatus getStatus(Field const& field) {
const FunctionBegin* fb;
FunctionBegin const* fb;
if (auto fn = field.get_as<FunctionBindField>()) {
if (platformNumber(fn->binds))
return BindStatus::NeedsBinding;
if (platformNumber(fn->binds)) return BindStatus::NeedsBinding;
fb = &fn->beginning;
} else if (auto fn = field.get_as<OutOfLineField>()) {
}
else if (auto fn = field.get_as<OutOfLineField>()) {
fb = &fn->beginning;
} else return BindStatus::Unbindable;
}
else return BindStatus::Unbindable;
if (field.parent.rfind("GDString", 0) == 0) return BindStatus::NeedsBinding;
if (platform == Platform::Android) {
for (auto& [type, name] : fb->args) {
if (type.name.find("gd::") != std::string::npos)
return BindStatus::NeedsBinding;
if (type.name.find("gd::") != std::string::npos) return BindStatus::NeedsBinding;
}
if (field.parent.rfind("cocos2d::CCEGLView", 0) == 0) return BindStatus::Unbindable;
return BindStatus::Binded;
}
if (fb->type == FunctionType::Normal) {
if (field.parent.rfind("fmod::", 0) == 0)
return BindStatus::Binded;
if (field.parent.rfind("fmod::", 0) == 0) return BindStatus::Binded;
if (field.parent.rfind("cocos2d::", 0) == 0 && platform == Platform::Windows)
return BindStatus::Binded;
}
@ -148,26 +146,24 @@ namespace codegen {
}
inline std::string getConvention(Field& f) {
if (codegen::platform != Platform::Windows)
return "DefaultConv";
if (codegen::platform != Platform::Windows) return "DefaultConv";
if (auto fn = f.get_fn()) {
auto status = getStatus(f);
if (fn->is_static) {
if (status == BindStatus::Binded)
return "x86::Cdecl";
else
return "x86::Optcall";
} else if (fn->is_virtual) {
return "x86::Thiscall";
} else {
if (status == BindStatus::Binded)
return "x86::Thiscall";
else
return "x86::Membercall";
if (status == BindStatus::Binded) return "x86::Cdecl";
else return "x86::Optcall";
}
} else throw codegen::error("Tried to get convention of non-function");
else if (fn->is_virtual) {
return "x86::Thiscall";
}
else {
if (status == BindStatus::Binded) return "x86::Thiscall";
else return "x86::Membercall";
}
}
else throw codegen::error("Tried to get convention of non-function");
}
inline std::string getUnqualifiedClassName(std::string const& s) {

View file

@ -64,6 +64,11 @@ public:
#include <Geode/modify/CCNode.hpp>
struct ProxyCCNode : Modify<ProxyCCNode, CCNode> {
virtual CCObject* getUserObject() {
if (static_cast<CCObject*>(this) == static_cast<CCObject*>(CCDirector::get())) {
// apparently this function is the same as
// CCDirector::getNextScene so yeah
return m_userObject;
}
return GeodeNodeMetadata::set(this)->m_userObject;
}
virtual void setUserObject(CCObject* obj) {