|
|
@ -25,55 +25,128 @@ GLViewFunctionality simple_draw(std::function<void()> f){ |
|
|
|
@property GLViewFunctionality functionality; |
|
|
|
@end |
|
|
|
|
|
|
|
@interface MySlider : NSSlider |
|
|
|
- (instancetype) initWithFrame:(NSRect)frame; |
|
|
|
- (void)action:(MySlider*)sender; |
|
|
|
@property std::function<void(CGFloat)> callback; |
|
|
|
@end |
|
|
|
|
|
|
|
struct NSAppWrapperImpl { |
|
|
|
NSAppWrapperImpl() { |
|
|
|
app = [NSApplication sharedApplication]; |
|
|
|
app.activationPolicy = NSApplicationActivationPolicyRegular; |
|
|
|
appName = [[NSProcessInfo processInfo] processName]; |
|
|
|
} |
|
|
|
|
|
|
|
void set_up_menu() { |
|
|
|
NSMenu* appMenu = [NSMenu new]; |
|
|
|
[appMenu addItemWithTitle:[@"Quit " stringByAppendingString:appName] |
|
|
|
action:@selector(terminate:) |
|
|
|
keyEquivalent:@"q"]; |
|
|
|
|
|
|
|
NSMenuItem * menuItem = [NSMenuItem new]; |
|
|
|
menuItem.submenu = appMenu; |
|
|
|
|
|
|
|
app.mainMenu = [NSMenu new]; |
|
|
|
[app.mainMenu addItem:menuItem]; |
|
|
|
} |
|
|
|
|
|
|
|
void create_window(GLViewFunctionality const & f) { |
|
|
|
NSWindow * window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 500, 500) |
|
|
|
styleMask:NSTitledWindowMask | NSResizableWindowMask | NSMiniaturizableWindowMask |
|
|
|
backing:NSBackingStoreBuffered |
|
|
|
defer:YES]; |
|
|
|
window.title = appName; |
|
|
|
window.collectionBehavior |= NSWindowCollectionBehaviorFullScreenPrimary; |
|
|
|
[window center]; |
|
|
|
[window makeKeyAndOrderFront:nil]; |
|
|
|
|
|
|
|
NSRect frame = [window contentRectForFrameRect:window.frame]; |
|
|
|
frame.origin = {0, 0}; |
|
|
|
GLView * view = [[GLView alloc] initWithFrame:frame]; |
|
|
|
|
|
|
|
view.functionality = f; |
|
|
|
|
|
|
|
window.contentView = view; |
|
|
|
|
|
|
|
windows.push_back(window); |
|
|
|
} |
|
|
|
|
|
|
|
void run() { |
|
|
|
[app run]; |
|
|
|
} |
|
|
|
@implementation MySlider |
|
|
|
- (instancetype) initWithFrame:(NSRect)frame{ |
|
|
|
if(self = [super initWithFrame: frame]){ |
|
|
|
self.target = self; |
|
|
|
self.action = @selector(action:); |
|
|
|
} |
|
|
|
return self; |
|
|
|
} |
|
|
|
- (void)action:(MySlider*)sender{ |
|
|
|
if(self.callback){ |
|
|
|
self.callback(sender.doubleValue); |
|
|
|
} |
|
|
|
} |
|
|
|
@end |
|
|
|
|
|
|
|
NSApplication * app; |
|
|
|
std::vector<NSWindow *> windows; |
|
|
|
NSString * appName; |
|
|
|
struct NSAppWrapperImpl { |
|
|
|
NSAppWrapperImpl() { |
|
|
|
app = [NSApplication sharedApplication]; |
|
|
|
app.activationPolicy = NSApplicationActivationPolicyRegular; |
|
|
|
appName = [[NSProcessInfo processInfo] processName]; |
|
|
|
} |
|
|
|
|
|
|
|
void set_up_menu() { |
|
|
|
NSMenu* appMenu = [NSMenu new]; |
|
|
|
[appMenu addItemWithTitle:[@"Quit " stringByAppendingString:appName] |
|
|
|
action:@selector(terminate:) |
|
|
|
keyEquivalent:@"q"]; |
|
|
|
|
|
|
|
NSMenuItem * menuItem = [NSMenuItem new]; |
|
|
|
menuItem.submenu = appMenu; |
|
|
|
|
|
|
|
app.mainMenu = [NSMenu new]; |
|
|
|
[app.mainMenu addItem:menuItem]; |
|
|
|
} |
|
|
|
|
|
|
|
void create_window(GLViewFunctionality const & f) { |
|
|
|
NSWindow * window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 500, 500) |
|
|
|
styleMask:NSTitledWindowMask | NSResizableWindowMask | NSMiniaturizableWindowMask |
|
|
|
backing:NSBackingStoreBuffered |
|
|
|
defer:YES]; |
|
|
|
window.title = appName; |
|
|
|
window.collectionBehavior |= NSWindowCollectionBehaviorFullScreenPrimary; |
|
|
|
if(windows.empty()){ |
|
|
|
[window center]; |
|
|
|
} else { |
|
|
|
NSWindow * previous_window = windows.back(); |
|
|
|
NSPoint top_right = previous_window.frame.origin; |
|
|
|
top_right.x += previous_window.frame.size.width; |
|
|
|
top_right.y += previous_window.frame.size.height; |
|
|
|
[window setFrameTopLeftPoint: top_right]; |
|
|
|
} |
|
|
|
[window makeKeyAndOrderFront:nil]; |
|
|
|
|
|
|
|
NSRect frame = [window contentRectForFrameRect:window.frame]; |
|
|
|
frame.origin = {0, 0}; |
|
|
|
GLView * view = [[GLView alloc] initWithFrame:frame]; |
|
|
|
|
|
|
|
view.functionality = f; |
|
|
|
|
|
|
|
window.contentView = view; |
|
|
|
windows.push_back(window); |
|
|
|
} |
|
|
|
|
|
|
|
void create_window(ControlFunctionality const & f) { |
|
|
|
const CGFloat width = 200; |
|
|
|
NSWindow * window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, width, 500) |
|
|
|
styleMask:NSTitledWindowMask | NSResizableWindowMask | NSMiniaturizableWindowMask |
|
|
|
backing:NSBackingStoreBuffered |
|
|
|
defer:YES]; |
|
|
|
window.title = appName; |
|
|
|
if(windows.empty()){ |
|
|
|
[window center]; |
|
|
|
} else { |
|
|
|
NSWindow * previous_window = windows.back(); |
|
|
|
NSPoint top_right = previous_window.frame.origin; |
|
|
|
top_right.x += previous_window.frame.size.width; |
|
|
|
top_right.y += previous_window.frame.size.height; |
|
|
|
[window setFrameTopLeftPoint: top_right]; |
|
|
|
} |
|
|
|
[window makeKeyAndOrderFront:nil]; |
|
|
|
|
|
|
|
NSRect frame = [window contentRectForFrameRect:window.frame]; |
|
|
|
frame.origin = {0, 0}; |
|
|
|
NSView * view = [[NSView alloc] initWithFrame:frame]; |
|
|
|
|
|
|
|
CGFloat y = 0; |
|
|
|
CGFloat h = 20; |
|
|
|
CGFloat padding = 8; |
|
|
|
for(auto&& c : f.sliders){ |
|
|
|
NSTextField * label = [[NSTextField alloc] initWithFrame:{padding, y+padding, 20, h}]; |
|
|
|
label.editable = NO; |
|
|
|
label.bezeled = NO; |
|
|
|
label.drawsBackground = NO; |
|
|
|
label.stringValue = [NSString stringWithUTF8String: c.name.c_str()]; |
|
|
|
[view addSubview: label]; |
|
|
|
|
|
|
|
MySlider * slider = [[MySlider alloc] initWithFrame:{20+padding, y+padding, width-20-2*padding, h}]; |
|
|
|
slider.minValue = c.min; |
|
|
|
slider.maxValue = c.max; |
|
|
|
slider.doubleValue = c.start; |
|
|
|
slider.callback = c.callback; |
|
|
|
[view addSubview: slider]; |
|
|
|
y += h; |
|
|
|
} |
|
|
|
|
|
|
|
window.contentView = view; |
|
|
|
windows.push_back(window); |
|
|
|
} |
|
|
|
|
|
|
|
void run() { |
|
|
|
[app run]; |
|
|
|
} |
|
|
|
|
|
|
|
NSApplication * app; |
|
|
|
std::vector<NSWindow *> windows; |
|
|
|
NSString * appName; |
|
|
|
}; |
|
|
|
|
|
|
|
NSAppWrapper::NSAppWrapper() |
|
|
@ -88,7 +161,11 @@ void NSAppWrapper::run() { |
|
|
|
} |
|
|
|
|
|
|
|
void NSAppWrapper::create_window(GLViewFunctionality const & f){ |
|
|
|
impl->create_window(f); |
|
|
|
impl->create_window(f); |
|
|
|
} |
|
|
|
|
|
|
|
void NSAppWrapper::create_window(ControlFunctionality const & f){ |
|
|
|
impl->create_window(f); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -109,11 +186,11 @@ void NSAppWrapper::create_window(GLViewFunctionality const & f){ |
|
|
|
|
|
|
|
- (id) initWithFrame:(NSRect)frameRect { |
|
|
|
if(self = [super initWithFrame:frameRect]){ |
|
|
|
context = std::unique_ptr<GLContext>(new GLContext); |
|
|
|
context = std::unique_ptr<GLContext>(new GLContext); |
|
|
|
|
|
|
|
self.pixelFormat = [[NSOpenGLPixelFormat alloc] initWithCGLPixelFormatObj: context->pix]; |
|
|
|
self.openGLContext = [[NSOpenGLContext alloc] initWithCGLContextObj: context->ctx]; |
|
|
|
self.wantsBestResolutionOpenGLSurface = YES; // Opt-in for retina |
|
|
|
self.pixelFormat = [[NSOpenGLPixelFormat alloc] initWithCGLPixelFormatObj: context->pix]; |
|
|
|
self.openGLContext = [[NSOpenGLContext alloc] initWithCGLContextObj: context->ctx]; |
|
|
|
self.wantsBestResolutionOpenGLSurface = YES; // Opt-in for retina |
|
|
|
} |
|
|
|
|
|
|
|
return self; |
|
|
@ -129,16 +206,16 @@ void NSAppWrapper::create_window(GLViewFunctionality const & f){ |
|
|
|
[[self openGLContext] setValues:&swapInt forParameter:NSOpenGLCPSwapInterval]; |
|
|
|
|
|
|
|
if(functionality.initialize_callback){ |
|
|
|
functionality.initialize_callback({*context}); |
|
|
|
functionality.initialize_callback({*context, nullptr, nullptr}); |
|
|
|
} |
|
|
|
|
|
|
|
// Create a display link capable of being used with all active displays |
|
|
|
linky = std::unique_ptr<CVDisplayLinky>(new CVDisplayLinky(*context)); |
|
|
|
linky->callback = [=]{ |
|
|
|
// will be called in a different thread => need new autoreleasepool |
|
|
|
@autoreleasepool { |
|
|
|
[self drawView]; |
|
|
|
} |
|
|
|
// will be called in a different thread => need new autoreleasepool |
|
|
|
@autoreleasepool { |
|
|
|
[self drawView]; |
|
|
|
} |
|
|
|
}; |
|
|
|
linky->start(); |
|
|
|
|
|
|
@ -167,7 +244,7 @@ void NSAppWrapper::create_window(GLViewFunctionality const & f){ |
|
|
|
NSRect viewRectPixels = [self convertRectToBacking:self.bounds]; |
|
|
|
|
|
|
|
if(functionality.resize_callback){ |
|
|
|
functionality.resize_callback({*context}, viewRectPixels.size.width, viewRectPixels.size.height); |
|
|
|
functionality.resize_callback({*context, nullptr, nullptr}, viewRectPixels.size.width, viewRectPixels.size.height); |
|
|
|
} |
|
|
|
|
|
|
|
context->unlock(); |
|
|
@ -197,19 +274,22 @@ void NSAppWrapper::create_window(GLViewFunctionality const & f){ |
|
|
|
// When resizing the view, -reshape is called automatically on the main |
|
|
|
// thread. Add a mutex around to avoid the threads accessing the context |
|
|
|
// simultaneously when resizing |
|
|
|
context->lock(); |
|
|
|
|
|
|
|
NSRect viewRectPixels = [self convertRectToBacking:self.bounds]; |
|
|
|
|
|
|
|
glBindFramebuffer(GL_FRAMEBUFFER, 0); |
|
|
|
glViewport(0, 0, (int)viewRectPixels.size.width, (int)viewRectPixels.size.height); |
|
|
|
|
|
|
|
if(functionality.draw_callback){ |
|
|
|
functionality.draw_callback({*context}); |
|
|
|
} |
|
|
|
|
|
|
|
CGLFlushDrawable(context->ctx); |
|
|
|
context->unlock(); |
|
|
|
context->lock(); |
|
|
|
|
|
|
|
NSRect viewRectPixels = [self convertRectToBacking:self.bounds]; |
|
|
|
auto& ctx = context->ctx; |
|
|
|
|
|
|
|
if(functionality.draw_callback){ |
|
|
|
functionality.draw_callback({*context, [viewRectPixels]{ |
|
|
|
glBindFramebuffer(GL_FRAMEBUFFER, 0); |
|
|
|
glViewport(0, 0, (int)viewRectPixels.size.width, (int)viewRectPixels.size.height); |
|
|
|
}, [&ctx]{ |
|
|
|
CGLFlushDrawable(ctx); |
|
|
|
} |
|
|
|
}); |
|
|
|
} |
|
|
|
|
|
|
|
context->unlock(); |
|
|
|
} |
|
|
|
|
|
|
|
@end |
|
|
|