[darwin, ios, macos] Introduces an MGLRendererConfiguration class
Instructions for enabling client-side rendering of CJK glyphs live in this header, and this class provides the rest of the values needed for instantiating the renderer on iOS and macOS.
This commit is contained in:
Andrew Kitchen
committed by
Chris Loer
Chris Loer
parent
00ed34f7d7
commit
b2f06677a7
40
platform/darwin/src/MGLRendererConfiguration.h
Normal file
40
platform/darwin/src/MGLRendererConfiguration.h
Normal file
@@ -0,0 +1,40 @@
|
||||
#import <Foundation/Foundation.h>
|
||||
#import <mbgl/storage/default_file_source.hpp>
|
||||
#import <mbgl/renderer/mode.hpp>
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
/**
|
||||
The MGLRendererConfiguration object represents configuration values for the
|
||||
renderer.
|
||||
*/
|
||||
@interface MGLRendererConfiguration : NSObject
|
||||
|
||||
/** Returns an instance of the current renderer configuration. */
|
||||
+ (instancetype)currentConfiguration;
|
||||
|
||||
/** The file source to use. Defaults to `mbgl::DefaultFileSource` */
|
||||
@property (nonatomic, readonly) mbgl::DefaultFileSource *fileSource;
|
||||
|
||||
/** The GL context mode to use. Defaults to `mbgl::GLContextMode::Unique` */
|
||||
@property (nonatomic, readonly) mbgl::GLContextMode contextMode;
|
||||
|
||||
/** The scale factor to use.
|
||||
|
||||
Based on the native scale where available, otherwise the standard screen scale. */
|
||||
@property (nonatomic, readonly) const float scaleFactor;
|
||||
|
||||
/** The cache dir to use. */
|
||||
@property (nonatomic, readonly) mbgl::optional<std::string> cacheDir;
|
||||
|
||||
/** The name of the font family to use for client-side text rendering.
|
||||
|
||||
Currently only used for CJK glyphs. Changing this at run time is not currently
|
||||
supported. Enable client-side rendering of CJK glyphs by setting
|
||||
`MGLIdeographicFontFamilyName` in your containing app's Info.plist to a value
|
||||
which will be available at runtime, i.e. "Arial Unicode MS". */
|
||||
@property (nonatomic, readonly) mbgl::optional<std::string> localFontFamilyName;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
43
platform/darwin/src/MGLRendererConfiguration.mm
Normal file
43
platform/darwin/src/MGLRendererConfiguration.mm
Normal file
@@ -0,0 +1,43 @@
|
||||
#import "MGLRendererConfiguration.h"
|
||||
#import "MGLOfflineStorage_Private.h"
|
||||
|
||||
#if TARGET_OS_IPHONE
|
||||
#import <UIKit/UIKit.h>
|
||||
#else
|
||||
#import <AppKit/AppKit.h>
|
||||
#endif
|
||||
|
||||
|
||||
@implementation MGLRendererConfiguration
|
||||
|
||||
+ (instancetype)currentConfiguration {
|
||||
return [[self alloc] init];
|
||||
}
|
||||
|
||||
- (mbgl::DefaultFileSource *)fileSource {
|
||||
return [MGLOfflineStorage sharedOfflineStorage].mbglFileSource;
|
||||
}
|
||||
|
||||
- (mbgl::GLContextMode)contextMode {
|
||||
return mbgl::GLContextMode::Unique;
|
||||
}
|
||||
|
||||
- (const float)scaleFactor {
|
||||
#if TARGET_OS_IPHONE
|
||||
return [UIScreen instancesRespondToSelector:@selector(nativeScale)] ? [[UIScreen mainScreen] nativeScale] : [[UIScreen mainScreen] scale];
|
||||
#else
|
||||
return [NSScreen mainScreen].backingScaleFactor;
|
||||
#endif
|
||||
}
|
||||
|
||||
- (mbgl::optional<std::string>)cacheDir {
|
||||
return mbgl::optional<std::string>();
|
||||
}
|
||||
|
||||
- (mbgl::optional<std::string>)localFontFamilyName {
|
||||
NSString *fontFamilyName = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"MGLIdeographicFontFamilyName"];
|
||||
|
||||
return fontFamilyName ? std::string([fontFamilyName UTF8String]) : mbgl::optional<std::string>();
|
||||
}
|
||||
|
||||
@end
|
||||
@@ -158,6 +158,10 @@
|
||||
35E79F201D41266300957B9E /* MGLStyleLayer_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 35E79F1F1D41266300957B9E /* MGLStyleLayer_Private.h */; };
|
||||
35E79F211D41266300957B9E /* MGLStyleLayer_Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 35E79F1F1D41266300957B9E /* MGLStyleLayer_Private.h */; };
|
||||
36F1153D1D46080700878E1A /* libmbgl-core.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 36F1153B1D46080700878E1A /* libmbgl-core.a */; };
|
||||
3EA93369F61CF70AFA50465D /* MGLRendererConfiguration.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3EA931BC4F087E166D538F21 /* MGLRendererConfiguration.mm */; };
|
||||
3EA934623AD0000B7D99C3FB /* MGLRendererConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA9337830C7738BF7F5493C /* MGLRendererConfiguration.h */; };
|
||||
3EA9363147E77DD29FA06063 /* MGLRendererConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA9337830C7738BF7F5493C /* MGLRendererConfiguration.h */; };
|
||||
3EA9366247780E4F252652A8 /* MGLRendererConfiguration.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3EA931BC4F087E166D538F21 /* MGLRendererConfiguration.mm */; };
|
||||
400533011DB0862B0069F638 /* NSArray+MGLAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 400532FF1DB0862B0069F638 /* NSArray+MGLAdditions.h */; };
|
||||
400533021DB0862B0069F638 /* NSArray+MGLAdditions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 400533001DB0862B0069F638 /* NSArray+MGLAdditions.mm */; };
|
||||
400533031DB086490069F638 /* NSArray+MGLAdditions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 400533001DB0862B0069F638 /* NSArray+MGLAdditions.mm */; };
|
||||
@@ -676,6 +680,8 @@
|
||||
35E79F1F1D41266300957B9E /* MGLStyleLayer_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLStyleLayer_Private.h; sourceTree = "<group>"; };
|
||||
36F1153B1D46080700878E1A /* libmbgl-core.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libmbgl-core.a"; path = "build/Debug-iphoneos/libmbgl-core.a"; sourceTree = "<group>"; };
|
||||
36F1153C1D46080700878E1A /* libmbgl-platform-ios.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libmbgl-platform-ios.a"; path = "build/Debug-iphoneos/libmbgl-platform-ios.a"; sourceTree = "<group>"; };
|
||||
3EA931BC4F087E166D538F21 /* MGLRendererConfiguration.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLRendererConfiguration.mm; sourceTree = "<group>"; };
|
||||
3EA9337830C7738BF7F5493C /* MGLRendererConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLRendererConfiguration.h; sourceTree = "<group>"; };
|
||||
400532FF1DB0862B0069F638 /* NSArray+MGLAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSArray+MGLAdditions.h"; sourceTree = "<group>"; };
|
||||
400533001DB0862B0069F638 /* NSArray+MGLAdditions.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "NSArray+MGLAdditions.mm"; sourceTree = "<group>"; };
|
||||
4018B1C31CDC277F00F666AF /* MGLAnnotationView_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLAnnotationView_Private.h; sourceTree = "<group>"; };
|
||||
@@ -1419,6 +1425,7 @@
|
||||
DAD165801CF4CF9A001FF4B9 /* Formatters */,
|
||||
DAD165811CF4CFC4001FF4B9 /* Geometry */,
|
||||
DAD165821CF4CFE3001FF4B9 /* Offline Maps */,
|
||||
DA8848911CBB049300AB86E3 /* reachability */,
|
||||
DA8847DF1CBAFA5100AB86E3 /* MGLAccountManager.h */,
|
||||
DA8847FF1CBAFA6200AB86E3 /* MGLAccountManager_Private.h */,
|
||||
DA8848001CBAFA6200AB86E3 /* MGLAccountManager.m */,
|
||||
@@ -1434,13 +1441,14 @@
|
||||
927FBCFE1F4DB05500F8BF1F /* MGLMapSnapshotter.mm */,
|
||||
DD0902A41DB18F1B00C5BDCE /* MGLNetworkConfiguration.h */,
|
||||
DD0902A21DB18DE700C5BDCE /* MGLNetworkConfiguration.m */,
|
||||
3EA9337830C7738BF7F5493C /* MGLRendererConfiguration.h */,
|
||||
3EA931BC4F087E166D538F21 /* MGLRendererConfiguration.mm */,
|
||||
92F2C3EC1F0E3C3A00268EC0 /* MGLRendererFrontend.h */,
|
||||
DA8847EC1CBAFA5100AB86E3 /* MGLStyle.h */,
|
||||
35E0CFE51D3E501500188327 /* MGLStyle_Private.h */,
|
||||
DA88480F1CBAFA6200AB86E3 /* MGLStyle.mm */,
|
||||
DA8847EE1CBAFA5100AB86E3 /* MGLTypes.h */,
|
||||
DA8848111CBAFA6200AB86E3 /* MGLTypes.m */,
|
||||
DA8848911CBB049300AB86E3 /* reachability */,
|
||||
35E1A4D71D74336F007AA97F /* MGLValueEvaluator.h */,
|
||||
);
|
||||
name = Foundation;
|
||||
@@ -1869,6 +1877,7 @@
|
||||
DA8847F61CBAFA5100AB86E3 /* MGLOfflineStorage.h in Headers */,
|
||||
DAD1656E1CF41981001FF4B9 /* MGLFeature_Private.h in Headers */,
|
||||
DA88483C1CBAFB8500AB86E3 /* MGLMapView.h in Headers */,
|
||||
3EA9363147E77DD29FA06063 /* MGLRendererConfiguration.h in Headers */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
@@ -1962,6 +1971,7 @@
|
||||
DAF0D8191DFE6B2800B28378 /* MGLAttributionInfo_Private.h in Headers */,
|
||||
DABFB86A1CBE99E500D62B32 /* MGLStyle.h in Headers */,
|
||||
DA00FC8F1D5EEB0D009AABC8 /* MGLAttributionInfo.h in Headers */,
|
||||
3EA934623AD0000B7D99C3FB /* MGLRendererConfiguration.h in Headers */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
@@ -2412,6 +2422,7 @@
|
||||
DA8848581CBAFB9800AB86E3 /* MGLMapboxEvents.m in Sources */,
|
||||
35CE61841D4165D9004F2359 /* UIColor+MGLAdditions.mm in Sources */,
|
||||
DA8848561CBAFB9800AB86E3 /* MGLLocationManager.m in Sources */,
|
||||
3EA93369F61CF70AFA50465D /* MGLRendererConfiguration.mm in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
@@ -2502,6 +2513,7 @@
|
||||
DAA4E41C1CBB730400178DFB /* MGLAccountManager.m in Sources */,
|
||||
35CE61851D4165D9004F2359 /* UIColor+MGLAdditions.mm in Sources */,
|
||||
DAA4E4241CBB730400178DFB /* MGLPolyline.mm in Sources */,
|
||||
3EA9366247780E4F252652A8 /* MGLRendererConfiguration.mm in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
||||
@@ -43,6 +43,7 @@
|
||||
#import "MGLOfflineStorage_Private.h"
|
||||
#import "MGLFoundation_Private.h"
|
||||
#import "MGLRendererFrontend.h"
|
||||
#import "MGLRendererConfiguration.h"
|
||||
|
||||
#import "MGLVectorSource+MGLAdditions.h"
|
||||
#import "NSBundle+MGLAdditions.h"
|
||||
@@ -199,7 +200,6 @@ public:
|
||||
@property (nonatomic) NS_MUTABLE_ARRAY_OF(NSLayoutConstraint *) *attributionButtonConstraints;
|
||||
|
||||
@property (nonatomic, readwrite) MGLStyle *style;
|
||||
@property (nonatomic, readonly) NSString *ideographicFontFamilyName;
|
||||
|
||||
@property (nonatomic) UITapGestureRecognizer *singleTapGestureRecognizer;
|
||||
@property (nonatomic) UITapGestureRecognizer *doubleTap;
|
||||
@@ -324,7 +324,7 @@ public:
|
||||
|
||||
+ (void)initialize
|
||||
{
|
||||
if (self == [MGLMapView self])
|
||||
if (self == [MGLMapView class])
|
||||
{
|
||||
[MGLSDKUpdateChecker checkForUpdates];
|
||||
}
|
||||
@@ -407,14 +407,12 @@ public:
|
||||
[[NSFileManager defaultManager] removeItemAtPath:fileCachePath error:NULL];
|
||||
|
||||
// setup mbgl map
|
||||
mbgl::DefaultFileSource *mbglFileSource = [MGLOfflineStorage sharedOfflineStorage].mbglFileSource;
|
||||
const float scaleFactor = [UIScreen instancesRespondToSelector:@selector(nativeScale)] ? [[UIScreen mainScreen] nativeScale] : [[UIScreen mainScreen] scale];
|
||||
MGLRendererConfiguration *config = [MGLRendererConfiguration currentConfiguration];
|
||||
_mbglThreadPool = mbgl::sharedThreadPool();
|
||||
NSString *fontFamilyName = self.ideographicFontFamilyName;
|
||||
|
||||
auto renderer = std::make_unique<mbgl::Renderer>(*_mbglView, scaleFactor, *mbglFileSource, *_mbglThreadPool, mbgl::GLContextMode::Unique, mbgl::optional<std::string>(), fontFamilyName ? std::string([fontFamilyName UTF8String]) : mbgl::optional<std::string>());
|
||||
auto renderer = std::make_unique<mbgl::Renderer>(*_mbglView, config.scaleFactor, *config.fileSource, *_mbglThreadPool, config.contextMode, config.cacheDir, config.localFontFamilyName);
|
||||
_rendererFrontend = std::make_unique<MGLRenderFrontend>(std::move(renderer), self, *_mbglView);
|
||||
_mbglMap = new mbgl::Map(*_rendererFrontend, *_mbglView, self.size, scaleFactor, *mbglFileSource, *_mbglThreadPool, mbgl::MapMode::Continuous, mbgl::ConstrainMode::None, mbgl::ViewportMode::Default);
|
||||
_mbglMap = new mbgl::Map(*_rendererFrontend, *_mbglView, self.size, config.scaleFactor, *[config fileSource], *_mbglThreadPool, mbgl::MapMode::Continuous, mbgl::ConstrainMode::None, mbgl::ViewportMode::Default);
|
||||
|
||||
// start paused if in IB
|
||||
if (_isTargetingInterfaceBuilder || background) {
|
||||
@@ -3482,12 +3480,6 @@ public:
|
||||
[self.style removeStyleClass:styleClass];
|
||||
}
|
||||
|
||||
#pragma mark Ideographic Font Info
|
||||
|
||||
- (NSString *)ideographicFontFamilyName {
|
||||
return [[NSBundle mainBundle] objectForInfoDictionaryKey:@"MGLIdeographicFontFamilyName"];
|
||||
}
|
||||
|
||||
#pragma mark - Annotations -
|
||||
|
||||
- (nullable NS_ARRAY_OF(id <MGLAnnotation>) *)annotations
|
||||
|
||||
@@ -64,6 +64,8 @@
|
||||
35C6DF871E214C1800ACA483 /* MGLDistanceFormatterTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 35C6DF861E214C1800ACA483 /* MGLDistanceFormatterTests.m */; };
|
||||
35D65C5A1D65AD5500722C23 /* NSDate+MGLAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 35D65C581D65AD5500722C23 /* NSDate+MGLAdditions.h */; };
|
||||
35D65C5B1D65AD5500722C23 /* NSDate+MGLAdditions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 35D65C591D65AD5500722C23 /* NSDate+MGLAdditions.mm */; };
|
||||
3EA9317388DC9A0BF46B7674 /* MGLRendererConfiguration.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA9369A4C46957566058822 /* MGLRendererConfiguration.h */; };
|
||||
3EA93BA38DBB4B814B6C1FCC /* MGLRendererConfiguration.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3EA93B1B0864609938506E12 /* MGLRendererConfiguration.mm */; };
|
||||
4031ACFC1E9EB3C100A3EA26 /* MGLMapViewDelegateIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4031ACFB1E9EB3C100A3EA26 /* MGLMapViewDelegateIntegrationTests.swift */; };
|
||||
4031AD031E9FD6AA00A3EA26 /* MGLSDKTestHelpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4031AD011E9FD6A300A3EA26 /* MGLSDKTestHelpers.swift */; };
|
||||
4049C2A51DB6CE7F00B3F799 /* MGLPointCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = 4049C2A11DB6CE7800B3F799 /* MGLPointCollection.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
@@ -344,6 +346,8 @@
|
||||
35C6DF861E214C1800ACA483 /* MGLDistanceFormatterTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MGLDistanceFormatterTests.m; path = ../../darwin/test/MGLDistanceFormatterTests.m; sourceTree = "<group>"; };
|
||||
35D65C581D65AD5500722C23 /* NSDate+MGLAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDate+MGLAdditions.h"; sourceTree = "<group>"; };
|
||||
35D65C591D65AD5500722C23 /* NSDate+MGLAdditions.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "NSDate+MGLAdditions.mm"; sourceTree = "<group>"; };
|
||||
3EA9369A4C46957566058822 /* MGLRendererConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLRendererConfiguration.h; sourceTree = "<group>"; };
|
||||
3EA93B1B0864609938506E12 /* MGLRendererConfiguration.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MGLRendererConfiguration.mm; sourceTree = "<group>"; };
|
||||
4031ACFB1E9EB3C100A3EA26 /* MGLMapViewDelegateIntegrationTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MGLMapViewDelegateIntegrationTests.swift; sourceTree = "<group>"; };
|
||||
4031AD011E9FD6A300A3EA26 /* MGLSDKTestHelpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = MGLSDKTestHelpers.swift; path = ../../darwin/test/MGLSDKTestHelpers.swift; sourceTree = "<group>"; };
|
||||
4049C2A11DB6CE7800B3F799 /* MGLPointCollection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLPointCollection.h; sourceTree = "<group>"; };
|
||||
@@ -1100,6 +1104,8 @@
|
||||
92092EEF1F5EB10E00AF5130 /* MGLMapSnapshotter.mm */,
|
||||
DD0902B01DB1AC6400C5BDCE /* MGLNetworkConfiguration.h */,
|
||||
DD0902AF1DB1AC6400C5BDCE /* MGLNetworkConfiguration.m */,
|
||||
3EA9369A4C46957566058822 /* MGLRendererConfiguration.h */,
|
||||
3EA93B1B0864609938506E12 /* MGLRendererConfiguration.mm */,
|
||||
92F2C3EA1F0E3A1900268EC0 /* MGLRendererFrontend.h */,
|
||||
DAE6C3571CC31E0400DB3429 /* MGLStyle.h */,
|
||||
3537CA731D3F93A600380318 /* MGLStyle_Private.h */,
|
||||
@@ -1253,6 +1259,7 @@
|
||||
1F7454A41ECFB00300021D39 /* MGLLight.h in Headers */,
|
||||
408AA8671DAEEE3900022900 /* NSDictionary+MGLAdditions.h in Headers */,
|
||||
DAE6C3671CC31E0400DB3429 /* MGLStyle.h in Headers */,
|
||||
3EA9317388DC9A0BF46B7674 /* MGLRendererConfiguration.h in Headers */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
@@ -1528,6 +1535,7 @@
|
||||
3529039C1D6C63B80002C7DF /* NSPredicate+MGLAdditions.mm in Sources */,
|
||||
DA8F25981D51CAC70010E6B5 /* MGLVectorSource.mm in Sources */,
|
||||
352742A11D4C25BD00A1ECE6 /* MGLStyleValue.mm in Sources */,
|
||||
3EA93BA38DBB4B814B6C1FCC /* MGLRendererConfiguration.mm in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
#import "MGLOpenGLLayer.h"
|
||||
#import "MGLStyle.h"
|
||||
#import "MGLRendererFrontend.h"
|
||||
#import "MGLRendererConfiguration.h"
|
||||
|
||||
#import "MGLAnnotationImage_Private.h"
|
||||
#import "MGLAttributionInfo_Private.h"
|
||||
@@ -272,13 +273,12 @@ public:
|
||||
NSURL *legacyCacheURL = [cachesDirectoryURL URLByAppendingPathComponent:@"cache.db"];
|
||||
[[NSFileManager defaultManager] removeItemAtURL:legacyCacheURL error:NULL];
|
||||
|
||||
mbgl::DefaultFileSource* mbglFileSource = [MGLOfflineStorage sharedOfflineStorage].mbglFileSource;
|
||||
_mbglThreadPool = mbgl::sharedThreadPool();
|
||||
NSString *fontFamilyName = self.ideographicFontFamilyName;
|
||||
MGLRendererConfiguration *config = [MGLRendererConfiguration currentConfiguration];
|
||||
|
||||
auto renderer = std::make_unique<mbgl::Renderer>(*_mbglView, [NSScreen mainScreen].backingScaleFactor, *mbglFileSource, *_mbglThreadPool, mbgl::GLContextMode::Unique, mbgl::optional<std::string>(), fontFamilyName ? std::string([fontFamilyName UTF8String]) : mbgl::optional<std::string>());
|
||||
auto renderer = std::make_unique<mbgl::Renderer>(*_mbglView, config.scaleFactor, *config.fileSource, *_mbglThreadPool, config.contextMode, config.cacheDir, config.localFontFamilyName);
|
||||
_rendererFrontend = std::make_unique<MGLRenderFrontend>(std::move(renderer), self, *_mbglView, true);
|
||||
_mbglMap = new mbgl::Map(*_rendererFrontend, *_mbglView, self.size, [NSScreen mainScreen].backingScaleFactor, *mbglFileSource, *_mbglThreadPool, mbgl::MapMode::Continuous, mbgl::ConstrainMode::None, mbgl::ViewportMode::Default);
|
||||
_mbglMap = new mbgl::Map(*_rendererFrontend, *_mbglView, self.size, config.scaleFactor, *config.fileSource, *_mbglThreadPool, mbgl::MapMode::Continuous, mbgl::ConstrainMode::None, mbgl::ViewportMode::Default);
|
||||
|
||||
// Install the OpenGL layer. Interface Builder’s synchronous drawing means
|
||||
// we can’t display a map, so don’t even bother to have a map layer.
|
||||
|
||||
Reference in New Issue
Block a user