7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2025-04-04 01:01:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
HJfod 2023-03-18 21:01:48 +02:00
commit b191f8a583
6 changed files with 121 additions and 51 deletions
.gitignore
bindings
GeometryDash.bro
loader
include/Geode
DefaultInclude.hpp
src
platform
mac
util.mm
windows
util.cpp
utils
cocos.cpp

1
.gitignore vendored
View file

@ -40,6 +40,7 @@
# Ignore build folders
**/build
build
build2
build-docs/
bin

2
bindings/GeometryDash.bro
View file

@ -748,7 +748,7 @@ class ColorSelectLiveOverlay : FLAlertLayer {
}
class ColorSelectPopup : FLAlertLayer, cocos2d::extension::ColorPickerDelegate, TextInputDelegate, GJSpecialColorSelectDelegate {
virtual void colorValueChanged(cocos2d::ccColor3B color) = mac 0x423520, win 0x46ee0;
virtual void colorValueChanged(cocos2d::ccColor3B color) = mac 0x423320, win 0x46ee0;
ColorSelectPopup() {}
bool init(EffectGameObject* triggerObj, cocos2d::CCArray* triggerObjs, ColorAction* colorAction) = mac 0x41ee70, win 0x43ae0;
void updateColorValue() = win 0x46f30;

20
loader/include/Geode/DefaultInclude.hpp
View file

@ -76,15 +76,19 @@ namespace geode {
) {} \
Class_(geode::CutoffConstructorType, void*)
#define GEODE_CUTOFF_CONSTRUCTOR_BEGIN(Class_) \
GEODE_MACOS(GEODE_FILL_CONSTRUCTOR(Class_, 0){}) \
GEODE_IOS(GEODE_FILL_CONSTRUCTOR(Class_, 0){})
#define GEODE_CUTOFF_CONSTRUCTOR_BEGIN(Class_) \
GEODE_MACOS(GEODE_FILL_CONSTRUCTOR(Class_, 0){}) \
GEODE_IOS(GEODE_FILL_CONSTRUCTOR(Class_, 0){}) \
GEODE_WINDOWS(Class_(geode::CutoffConstructorType, size_t fill) \
: Class_() {})
#define GEODE_CUTOFF_CONSTRUCTOR_COCOS(Class_, Base_) \
GEODE_MACOS(Class_(geode::CutoffConstructorType, size_t fill) \
: Base_(geode::CutoffConstructor, fill){}) \
GEODE_IOS(Class_(geode::CutoffConstructorType, size_t fill) \
: Base_(geode::CutoffConstructor, fill){})
#define GEODE_CUTOFF_CONSTRUCTOR_COCOS(Class_, Base_) \
GEODE_MACOS(Class_(geode::CutoffConstructorType, size_t fill) \
: Base_(geode::CutoffConstructor, fill){}) \
GEODE_IOS(Class_(geode::CutoffConstructorType, size_t fill) \
: Base_(geode::CutoffConstructor, fill){}) \
GEODE_WINDOWS(Class_(geode::CutoffConstructorType, size_t fill) \
: Class_() {})
#define GEODE_CUTOFF_CONSTRUCTOR_GD(Class_, Base_) \
GEODE_WINDOWS(Class_(geode::CutoffConstructorType, size_t fill) \

125
loader/src/platform/mac/util.mm
View file

@ -8,6 +8,7 @@ using namespace geode::prelude;
#import <AppKit/AppKit.h>
#include <Geode/utils/web.hpp>
#include <Geode/utils/file.hpp>
#include <Geode/utils/cocos.hpp>
bool utils::clipboard::write(std::string const& data) {
[[NSPasteboard generalPasteboard] clearContents];
@ -36,47 +37,115 @@ void utils::web::openLinkInBrowser(std::string const& url) {
openURL:[NSURL URLWithString:[NSString stringWithUTF8String:url.c_str()]]];
}
// @interface FileDialog : NSObject
// + (Result<ghc::filesystem::path>)importDocumentWithMode:(file::PickMode)mode
// options:(file::FilePickOptions const&)options;
// + (Result<std::vector<ghc::filesystem::path>>)importDocumentsWithOptions:(file::FilePickOptions
// const&)options
// @end
/*@interface FileDialog : NSObject
+ (Result<ghc::filesystem::path>)importDocumentWithMode:(file::PickMode)mode options:(file::FilePickOptions const&)options mult:(bool)mult;
+ (Result<std::vector<ghc::filesystem::path>>)importDocumentsWithOptions:(file::FilePickOptions const&)options;
@end
// @implementation FileDialog
@implementation FileDialog
// + (Result<ghc::filesystem::path>)importDocumentWithMode:(file::PickMode)mode
// options:(file::FilePickOptions const&)options { NSOpenPanel* panel = [NSOpenPanel
// openPanel];
// // TODO: [panel setAllowedFileTypes:@[]];
+ (Result<ghc::filesystem::path>)importDocumentWithMode:(file::PickMode)mode options:(file::FilePickOptions const&)options mult:(bool)mult {
NSOpenPanel* panel = [NSOpenPanel openPanel];
// TODO: [panel setAllowedFileTypes:@[]];
// auto defaultPath = [NSString stringWithCString:options.defaultPath.c_str()
// encoding:NSUTF8StringEncoding]; [panel setDirectoryURL: [NSURL fileURLWithPath:
// defaultPath]]; [panel beginWithCompletionHandler:^(NSInteger result){ if (result ==
// NSFileHandlingPanelOKButton) { auto fileUrl = [[panel URLs] objectAtIndex:0]; auto path =
// std::string([[fileUrl path] UTF8String], [[fileUrl path]
// lengthOfBytesUsingEncoding:NSUTF8StringEncoding]); return Ok(path);
// }
// else {
// return Err(result);
// }
// }];
// }
if (options.defaultPath) {
auto defaultPath = [NSString stringWithCString:options.defaultPath->c_str() encoding:NSUTF8StringEncoding];
[panel setDirectoryURL: [NSURL fileURLWithPath: defaultPath]];
}
// @end
panel.allowsMultipleSelection = mult;
int result = [panel runModal];
if (result == NSFileHandlingPanelOKButton) {
auto fileUrl = [[panel URLs] objectAtIndex:0];
auto path = std::string([[fileUrl path] UTF8String], [[fileUrl path] lengthOfBytesUsingEncoding:NSUTF8StringEncoding]);
return Ok(ghc::filesystem::path(path));
} else {
return Err(result);
}
}
@end*/
@interface FileDialog : NSObject
+(Result<std::vector<ghc::filesystem::path>>) filePickerWithMode:(file::PickMode)mode options:(file::FilePickOptions const&)options multiple:(bool)mult;
@end
@implementation FileDialog
+(Result<std::vector<ghc::filesystem::path>>) filePickerWithMode:(file::PickMode)mode options:(file::FilePickOptions const&)options multiple:(bool)mult {
NSOpenPanel* panel = [NSOpenPanel openPanel];
// allowed files
NSMutableArray* allowed;
for (auto& f : options.filters) {
for (auto& i : f.files) {
auto nsstr = [NSString stringWithUTF8String: i.c_str()];
if (![allowed containsObject: nsstr])
[allowed addObject: nsstr];
}
}
if (options.filters.size())
[panel setAllowedFileTypes: allowed];
// multiple
[panel setAllowsMultipleSelection: mult];
// default path
if (options.defaultPath) {
auto defaultPath = [NSString stringWithUTF8String:options.defaultPath->c_str()];
[panel setDirectoryURL: [NSURL URLWithString: defaultPath]];
}
// other
[panel setCanChooseDirectories: NO];
[panel setCanChooseFiles: YES];
// run thing
int result = [panel runModal];
if (result == NSFileHandlingPanelOKButton) {
std::vector<ghc::filesystem::path> fileURLs;
for (NSURL* i in panel.URLs) {
fileURLs.push_back(std::string(i.path.UTF8String));
}
return Ok(fileURLs);
} else {
return Err("File picker cancelled");
}
}
@end
Result<ghc::filesystem::path> utils::file::pickFile(
file::PickMode mode, file::FilePickOptions const& options
) {
return Err<std::string>("utils::file::pickFile is not implemented");
// return [FileDialog importDocumentWithMode:mode options:options];
auto result = [FileDialog filePickerWithMode:mode options:options multiple: false];
if (result.isOk()) {
return Ok<ghc::filesystem::path>(std::move(result.unwrap()[0]));
} else {
return Err<>(result.unwrapErr());
}
}
Result<std::vector<ghc::filesystem::path>> utils::file::pickFiles(
file::FilePickOptions const& options
) {
return Err("utils::file::pickFiles is not implemented");
// return [FileDialog importDocumentWithOptions:options];
//return Err("utils::file::pickFiles is not implemented");
return [FileDialog filePickerWithMode: file::PickMode::OpenFile options:options multiple:true];
}
CCPoint cocos::getMousePos() {
auto frame = NSApp.mainWindow.frame;
auto scaleFactor = CCPoint(CCDirector::get()->getWinSize()) / ccp(frame.size.width, frame.size.height);
auto mouse = [NSEvent mouseLocation];
return ccp(mouse.x - frame.origin.x, mouse.y - frame.origin.y) * scaleFactor;
}
#endif

10
loader/src/platform/windows/util.cpp
View file

@ -13,6 +13,7 @@ using namespace geode::prelude;
#include <shobjidl.h>
#include <sstream>
#include <Geode/utils/web.hpp>
#include <Geode/utils/cocos.hpp>
bool utils::clipboard::write(std::string const& data) {
if (!OpenClipboard(nullptr)) return false;
@ -105,4 +106,13 @@ void utils::web::openLinkInBrowser(std::string const& url) {
ShellExecuteA(0, 0, url.c_str(), 0, 0, SW_SHOW);
}
CCPoint cocos::getMousePos() {
auto* director = CCDirector::get();
auto* gl = director->getOpenGLView();
auto winSize = director->getWinSize();
auto frameSize = gl->getFrameSize();
auto mouse = gl->getMousePosition() / frameSize;
return ccp(mouse.x, 1.f - mouse.y) * winSize;
}
#endif

14
loader/src/utils/cocos.cpp
View file

@ -330,20 +330,6 @@ CCScene* geode::cocos::switchToScene(CCLayer* layer) {
return scene;
}
CCPoint geode::cocos::getMousePos() {
#ifdef GEODE_IS_WINDOWS
auto* director = CCDirector::get();
auto* gl = director->getOpenGLView();
auto winSize = director->getWinSize();
auto frameSize = gl->getFrameSize();
auto mouse = gl->getMousePosition() / frameSize;
return ccp(mouse.x, 1.f - mouse.y) * winSize;
#else
// TODO: implement this for mac
return ccp(0, 0);
#endif
}
static CreateLayerFunc LOADING_FINISHED_SCENE = nullptr;
void geode::cocos::reloadTextures(CreateLayerFunc returnTo) {