Skip to content

Commit 7e402f1

Browse files
bgulanowskibgulanowski
committed
Initial working macOS version of view.
1 parent 7ad250f commit 7e402f1

File tree

4 files changed

+97
-11
lines changed

4 files changed

+97
-11
lines changed

‎objc/03-DrawingIn2D/DrawingIn2D-Mac/Base.lproj/Main.storyboard‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="11134" systemVersion="15F34" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
33
<dependencies>
4-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11134"/>
4+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14113"/>
5+
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
56
</dependencies>
67
<scenes>
78
<!--Application-->
@@ -673,7 +674,7 @@
673674
<outlet property="delegate" destination="Voe-Tx-rLC" id="PrD-fu-P6m"/>
674675
</connections>
675676
</application>
676-
<customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModuleProvider=""/>
677+
<customObject id="Voe-Tx-rLC" customClass="AppDelegate"/>
677678
<customObject id="YLy-65-1bz" customClass="NSFontManager"/>
678679
<customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
679680
</objects>
@@ -688,7 +689,7 @@
688689
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
689690
<rect key="contentRect" x="196" y="240" width="480" height="270"/>
690691
<rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
691-
<connections>
692+
<connections>
692693
<outlet property="delegate" destination="B8D-0N-5wS" id="98r-iN-zZc"/>
693694
</connections>
694695
</window>
@@ -703,8 +704,8 @@
703704
<!--View Controller-->
704705
<scene sceneID="hIz-AP-VOD">
705706
<objects>
706-
<viewController id="XfG-lQ-9wD" customClass="ViewController" customModuleProvider="" sceneMemberID="viewController">
707-
<view key="view" wantsLayer="YES" id="m2S-Jp-Qdl">
707+
<viewController id="XfG-lQ-9wD" customClass="ViewController" sceneMemberID="viewController">
708+
<view key="view" wantsLayer="YES" id="m2S-Jp-Qdl" customClass="MBEMetalView">
708709
<rect key="frame" x="0.0" y="0.0" width="480" height="270"/>
709710
<autoresizingMask key="autoresizingMask"/>
710711
</view>

‎objc/03-DrawingIn2D/DrawingIn2D.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
845182CB20D808C800BF473E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 845182CA20D808C800BF473E /* Assets.xcassets */; };
2121
845182CE20D808C800BF473E /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 845182CC20D808C800BF473E /* Main.storyboard */; };
2222
845182D120D808C800BF473E /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 845182D020D808C800BF473E /* main.m */; };
23+
845182D620D8096300BF473E /* MBEMetalView.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E2D77F1BD188710006DDD8 /* MBEMetalView.m */; };
24+
845182DC20D80E3E00BF473E /* Shaders.metal in Sources */ = {isa = PBXBuildFile; fileRef = 83E2D7801BD188710006DDD8 /* Shaders.metal */; };
2325
/* End PBXBuildFile section */
2426

2527
/* Begin PBXFileReference section */
@@ -243,6 +245,8 @@
243245
845182C920D808C700BF473E /* ViewController.m in Sources */,
244246
845182D120D808C800BF473E /* main.m in Sources */,
245247
845182C620D808C700BF473E /* AppDelegate.m in Sources */,
248+
845182D620D8096300BF473E /* MBEMetalView.m in Sources */,
249+
845182DC20D80E3E00BF473E /* Shaders.metal in Sources */,
246250
);
247251
runOnlyForDeploymentPostprocessing = 0;
248252
};

‎objc/03-DrawingIn2D/DrawingIn2D/MBEMetalView.h‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
1+
#import <TargetConditionals.h>
2+
3+
#if TARGET_OS_IPHONE
14
@import UIKit;
5+
#define NSUIView UIView
6+
#else
7+
@import AppKit;
8+
@import QuartzCore;
9+
#define NSUIView NSView
10+
#endif
211

3-
@interface MBEMetalView : UIView
12+
@interface MBEMetalView : NSUIView
413

514
@property (readonly) CAMetalLayer *metalLayer;
615

‎objc/03-DrawingIn2D/DrawingIn2D/MBEMetalView.m‎

Lines changed: 75 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#import "MBEMetalView.h"
22
@import Metal;
33
@import simd;
4+
@import CoreVideo;
45

56
typedef struct
67
{
@@ -9,17 +10,40 @@
910
} MBEVertex;
1011

1112
@interface MBEMetalView ()
13+
#if TARGET_OS_IPHONE
1214
@property (nonatomic, strong) CADisplayLink *displayLink;
15+
#else
16+
@property (nonatomic) CVDisplayLinkRef displayLink;
17+
@property (nonatomic, strong) CAMetalLayer *metalLayer;
18+
#endif
1319
@property (nonatomic, strong) id<MTLDevice> device;
1420
@property (nonatomic, strong) id<MTLRenderPipelineState> pipeline;
1521
@property (nonatomic, strong) id<MTLCommandQueue> commandQueue;
1622
@property (nonatomic, strong) id<MTLBuffer> vertexBuffer;
23+
24+
- (void)redraw;
1725
@end
1826

27+
#if TARGET_OS_OSX
28+
static CVReturn C3DViewDisplayLink(CVDisplayLinkRef displayLink,
29+
const CVTimeStamp *inNow,
30+
const CVTimeStamp *inOutputTime,
31+
CVOptionFlags flagsIn,
32+
CVOptionFlags *flagsOut,
33+
void *view) {
34+
@autoreleasepool {
35+
[(__bridge MBEMetalView *)view redraw];
36+
}
37+
38+
return kCVReturnSuccess;
39+
}
40+
#endif
41+
1942
@implementation MBEMetalView
2043

2144
@synthesize device=device;
2245

46+
#if TARGET_OS_IPHONE
2347
+ (Class)layerClass
2448
{
2549
return [CAMetalLayer class];
@@ -56,11 +80,49 @@ - (void)didMoveToSuperview
5680
self.displayLink = nil;
5781
}
5882
}
83+
#else
84+
85+
- (CALayer *)makeBackingLayer
86+
{
87+
CAMetalLayer *layer = [[CAMetalLayer alloc] init];
88+
_metalLayer = layer;
89+
return layer;
90+
}
91+
92+
- (void)viewDidMoveToSuperview
93+
{
94+
[super viewDidMoveToSuperview];
95+
96+
if (!self.device) {
97+
[self makeDevice];
98+
[self makeBuffers];
99+
[self makePipeline];
100+
}
101+
102+
if (self.superview) {
103+
CVDisplayLinkCreateWithActiveCGDisplays(&_displayLink);
104+
CVDisplayLinkSetOutputCallback(_displayLink, C3DViewDisplayLink, (__bridge void *)(self));
105+
CVDisplayLinkStart(_displayLink);
106+
}
107+
else {
108+
CVDisplayLinkStop(_displayLink);
109+
CVDisplayLinkRelease(_displayLink);
110+
_displayLink = NULL;
111+
}
112+
}
113+
#endif
59114

60115
- (void)setFrame:(CGRect)frame
61116
{
62117
[super setFrame:frame];
118+
self.metalLayer.drawableSize = self.drawableSize;
119+
}
120+
121+
#if TARGET_OS_IPHONE
122+
- (CGSize)drawableSize {
63123

124+
CGSize drawableSize = self.bounds.size;
125+
64126
// During the first layout pass, we will not be in a view hierarchy, so we guess our scale
65127
CGFloat scale = [UIScreen mainScreen].scale;
66128

@@ -70,17 +132,25 @@ - (void)setFrame:(CGRect)frame
70132
scale = self.window.screen.scale;
71133
}
72134

73-
CGSize drawableSize = self.bounds.size;
74-
75135
// Since drawable size is in pixels, we need to multiply by the scale to move from points to pixels
76136
drawableSize.width *= scale;
77137
drawableSize.height *= scale;
78138

79-
self.metalLayer.drawableSize = drawableSize;
139+
return drawableSize;
140+
}
141+
142+
#else
143+
- (CGSize)drawableSize {
144+
return self.bounds.size;
80145
}
146+
#endif
81147

82148
- (CAMetalLayer *)metalLayer {
149+
#if TARGET_OS_IPHONE
83150
return (CAMetalLayer *)self.layer;
151+
#else
152+
return _metalLayer;
153+
#endif
84154
}
85155

86156
- (void)makeDevice
@@ -154,9 +224,11 @@ - (void)redraw
154224
}
155225
}
156226

227+
#if TARGET_OS_IPHONE
157228
- (void)displayLinkDidFire:(CADisplayLink *)displayLink
158229
{
159230
[self redraw];
160231
}
232+
#endif
161233

162234
@end

0 commit comments

Comments
 (0)