OSX Refactor -> renamed OSXViewController to OSXViewDelegate
This commit is contained in:
parent
80a7a33b7c
commit
51d00541e5
@ -38,8 +38,8 @@ set(SrcMacOSX
|
|||||||
src/macosx/OSXWindow.m
|
src/macosx/OSXWindow.m
|
||||||
src/macosx/OSXView.h
|
src/macosx/OSXView.h
|
||||||
src/macosx/OSXView.m
|
src/macosx/OSXView.m
|
||||||
src/macosx/OSXViewController.h
|
src/macosx/OSXViewDelegate.h
|
||||||
src/macosx/OSXViewController.m
|
src/macosx/OSXViewDelegate.m
|
||||||
src/macosx/WindowData_OSX.h
|
src/macosx/WindowData_OSX.h
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#include "OSXWindow.h"
|
#include "OSXWindow.h"
|
||||||
#include "OSXView.h"
|
#include "OSXView.h"
|
||||||
#include "OSXViewController.h"
|
#include "OSXViewDelegate.h"
|
||||||
#include "WindowData_OSX.h"
|
#include "WindowData_OSX.h"
|
||||||
#include <MiniFB.h>
|
#include <MiniFB.h>
|
||||||
#include <MiniFB_enums.h>
|
#include <MiniFB_enums.h>
|
||||||
@ -129,7 +129,7 @@ mfb_open_ex(const char *title, unsigned width, unsigned height, unsigned flags)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#if defined(USE_METAL_API)
|
#if defined(USE_METAL_API)
|
||||||
OSXViewController *viewController = [[OSXViewController alloc] initWithWindowData:window_data];
|
OSXViewDelegate *viewController = [[OSXViewDelegate alloc] initWithWindowData:window_data];
|
||||||
|
|
||||||
MTKView* view = [[MTKView alloc] initWithFrame:rectangle];
|
MTKView* view = [[MTKView alloc] initWithFrame:rectangle];
|
||||||
view.device = viewController->metal_device;
|
view.device = viewController->metal_device;
|
||||||
|
@ -10,7 +10,7 @@ enum { MaxBuffersInFlight = 3 };
|
|||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
@interface OSXViewController : NSViewController<MTKViewDelegate>
|
@interface OSXViewDelegate : NSViewController<MTKViewDelegate>
|
||||||
{
|
{
|
||||||
@public SWindowData *window_data;
|
@public SWindowData *window_data;
|
||||||
@public SWindowData_OSX *window_data_osx;
|
@public SWindowData_OSX *window_data_osx;
|
@ -1,4 +1,4 @@
|
|||||||
#include "OSXViewController.h"
|
#include "OSXViewDelegate.h"
|
||||||
|
|
||||||
#if defined(USE_METAL_API)
|
#if defined(USE_METAL_API)
|
||||||
|
|
||||||
@ -49,7 +49,7 @@ NSString *g_shader_src = kShader(
|
|||||||
);
|
);
|
||||||
|
|
||||||
//-------------------------------------
|
//-------------------------------------
|
||||||
@implementation OSXViewController
|
@implementation OSXViewDelegate
|
||||||
|
|
||||||
//-------------------------------------
|
//-------------------------------------
|
||||||
- (id) initWithWindowData:(SWindowData *) windowData {
|
- (id) initWithWindowData:(SWindowData *) windowData {
|
Loading…
Reference in New Issue
Block a user