diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2019-02-16 06:48:41 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2019-02-16 06:48:41 +0000 |
| commit | e33d94fecd272db4bf542541c069e9e2c168c1d5 (patch) | |
| tree | c4c33fe97b817ed67fc505059a6323336660311f /Common/NativeApp/Apple/Source | |
| parent | Updated samples (fixed linux/max build error) (diff) | |
| download | DiligentEngine-e33d94fecd272db4bf542541c069e9e2c168c1d5.tar.gz DiligentEngine-e33d94fecd272db4bf542541c069e9e2c168c1d5.zip | |
Moved NativeApp to Diligent namespace
Diffstat (limited to 'Common/NativeApp/Apple/Source')
| -rw-r--r-- | Common/NativeApp/Apple/Source/Classes/OSX/ViewBase.h | 2 | ||||
| -rw-r--r-- | Common/NativeApp/Apple/Source/Classes/OSX/ViewBase.m | 6 | ||||
| -rw-r--r-- | Common/NativeApp/Apple/Source/Classes/iOS/EAGLView.m | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Common/NativeApp/Apple/Source/Classes/OSX/ViewBase.h b/Common/NativeApp/Apple/Source/Classes/OSX/ViewBase.h index 1931c69..ed9ebe4 100644 --- a/Common/NativeApp/Apple/Source/Classes/OSX/ViewBase.h +++ b/Common/NativeApp/Apple/Source/Classes/OSX/ViewBase.h @@ -34,7 +34,7 @@ -(void)initApp:(NSView*) view; -(void)destroyApp; -(NSString*)getError; --(NativeAppBase*)lockApp; +-(Diligent::NativeAppBase*)lockApp; -(void)unlockApp; -(void)stopDisplayLink; -(void)startDisplayLink; diff --git a/Common/NativeApp/Apple/Source/Classes/OSX/ViewBase.m b/Common/NativeApp/Apple/Source/Classes/OSX/ViewBase.m index 6f138c7..4e8d292 100644 --- a/Common/NativeApp/Apple/Source/Classes/OSX/ViewBase.m +++ b/Common/NativeApp/Apple/Source/Classes/OSX/ViewBase.m @@ -28,7 +28,7 @@ @implementation ViewBase { - std::unique_ptr<NativeAppBase> _theApp; + std::unique_ptr<Diligent::NativeAppBase> _theApp; std::string _error; NSRecursiveLock* appLock; } @@ -41,7 +41,7 @@ { [super awakeFromNib]; - _theApp.reset(CreateApplication()); + _theApp.reset(Diligent::CreateApplication()); // [self window] is nil here auto* mainWindow = [[NSApplication sharedApplication] mainWindow]; @@ -66,7 +66,7 @@ } } --(NativeAppBase*)lockApp +-(Diligent::NativeAppBase*)lockApp { [appLock lock]; return _theApp.get(); diff --git a/Common/NativeApp/Apple/Source/Classes/iOS/EAGLView.m b/Common/NativeApp/Apple/Source/Classes/iOS/EAGLView.m index 9ddb5f4..9120e99 100644 --- a/Common/NativeApp/Apple/Source/Classes/iOS/EAGLView.m +++ b/Common/NativeApp/Apple/Source/Classes/iOS/EAGLView.m @@ -14,7 +14,7 @@ @interface EAGLView () { - std::unique_ptr<NativeAppBase> _theApp; + std::unique_ptr<Diligent::NativeAppBase> _theApp; EAGLContext* _context; NSInteger _animationFrameInterval; CADisplayLink* _displayLink; @@ -52,7 +52,7 @@ try { - _theApp.reset(CreateApplication()); + _theApp.reset(Diligent::CreateApplication()); // Init our renderer. _theApp->OnGLContextCreated((__bridge void*)self.layer); } |