[core] Get FileSource via UpdateParameters in Renderer::Impl
This commit is contained in:
@@ -31,12 +31,11 @@ public abstract class MapRenderer implements MapRendererScheduler {
|
||||
private MapboxMap.OnFpsChangedListener onFpsChangedListener;
|
||||
|
||||
public MapRenderer(@NonNull Context context, String localIdeographFontFamily) {
|
||||
FileSource fileSource = FileSource.getInstance(context);
|
||||
float pixelRatio = context.getResources().getDisplayMetrics().density;
|
||||
String programCacheDir = FileSource.getInternalCachePath(context);
|
||||
|
||||
// Initialise native peer
|
||||
nativeInitialize(this, fileSource, pixelRatio, programCacheDir, localIdeographFontFamily);
|
||||
nativeInitialize(this, pixelRatio, programCacheDir, localIdeographFontFamily);
|
||||
}
|
||||
|
||||
public void onStart() {
|
||||
@@ -115,7 +114,6 @@ public abstract class MapRenderer implements MapRendererScheduler {
|
||||
}
|
||||
|
||||
private native void nativeInitialize(MapRenderer self,
|
||||
FileSource fileSource,
|
||||
float pixelRatio,
|
||||
String programCacheDir,
|
||||
String localIdeographFontFamily);
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
#include <mbgl/actor/scheduler.hpp>
|
||||
#include <mbgl/renderer/renderer.hpp>
|
||||
#include <mbgl/renderer/renderer_observer.hpp>
|
||||
#include <mbgl/storage/file_source.hpp>
|
||||
#include <mbgl/util/async_task.hpp>
|
||||
#include <mbgl/util/thread.hpp>
|
||||
#include <mbgl/util/run_loop.hpp>
|
||||
|
||||
@@ -9,20 +9,17 @@
|
||||
#include "attach_env.hpp"
|
||||
#include "android_renderer_backend.hpp"
|
||||
#include "map_renderer_runnable.hpp"
|
||||
#include "file_source.hpp"
|
||||
|
||||
namespace mbgl {
|
||||
namespace android {
|
||||
|
||||
MapRenderer::MapRenderer(jni::JNIEnv& _env,
|
||||
const jni::Object<MapRenderer>& obj,
|
||||
const jni::Object<FileSource>& _fileSource,
|
||||
jni::jfloat pixelRatio_,
|
||||
const jni::String& programCacheDir_,
|
||||
const jni::String& localIdeographFontFamily_)
|
||||
: javaPeer(_env, obj)
|
||||
, pixelRatio(pixelRatio_)
|
||||
, fileSource(FileSource::getDefaultFileSource(_env, _fileSource))
|
||||
, programCacheDir(jni::Make<std::string>(_env, programCacheDir_))
|
||||
, localIdeographFontFamily(localIdeographFontFamily_ ? jni::Make<std::string>(_env, localIdeographFontFamily_) : optional<std::string>{})
|
||||
, threadPool(sharedThreadPool())
|
||||
@@ -174,7 +171,7 @@ void MapRenderer::onSurfaceCreated(JNIEnv&) {
|
||||
|
||||
// Create the new backend and renderer
|
||||
backend = std::make_unique<AndroidRendererBackend>();
|
||||
renderer = std::make_unique<Renderer>(*backend, pixelRatio, fileSource, *threadPool,
|
||||
renderer = std::make_unique<Renderer>(*backend, pixelRatio, *threadPool,
|
||||
GLContextMode::Unique, programCacheDir, localIdeographFontFamily);
|
||||
rendererRef = std::make_unique<ActorRef<Renderer>>(*renderer, mailbox);
|
||||
|
||||
@@ -211,7 +208,7 @@ void MapRenderer::registerNative(jni::JNIEnv& env) {
|
||||
|
||||
// Register the peer
|
||||
jni::RegisterNativePeer<MapRenderer>(env, javaClass, "nativePtr",
|
||||
jni::MakePeer<MapRenderer, const jni::Object<MapRenderer>&, const jni::Object<FileSource>&, jni::jfloat, const jni::String&, const jni::String&>,
|
||||
jni::MakePeer<MapRenderer, const jni::Object<MapRenderer>&, jni::jfloat, const jni::String&, const jni::String&>,
|
||||
"nativeInitialize", "finalize",
|
||||
METHOD(&MapRenderer::render, "nativeRender"),
|
||||
METHOD(&MapRenderer::onSurfaceCreated,
|
||||
|
||||
@@ -23,7 +23,6 @@ class UpdateParameters;
|
||||
namespace android {
|
||||
|
||||
class AndroidRendererBackend;
|
||||
class FileSource;
|
||||
|
||||
/**
|
||||
* The MapRenderer is a peer class that encapsulates the actions
|
||||
@@ -42,7 +41,6 @@ public:
|
||||
|
||||
MapRenderer(jni::JNIEnv& _env,
|
||||
const jni::Object<MapRenderer>&,
|
||||
const jni::Object<FileSource>&,
|
||||
jni::jfloat pixelRatio,
|
||||
const jni::String& programCacheDir,
|
||||
const jni::String& localIdeographFontFamily);
|
||||
@@ -103,7 +101,6 @@ private:
|
||||
jni::WeakReference<jni::Object<MapRenderer>, jni::EnvAttachingDeleter> javaPeer;
|
||||
|
||||
float pixelRatio;
|
||||
DefaultFileSource& fileSource;
|
||||
std::string programCacheDir;
|
||||
optional<std::string> localIdeographFontFamily;
|
||||
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
|
||||
namespace mbgl {
|
||||
|
||||
class FileSource;
|
||||
class Scheduler;
|
||||
class Renderer;
|
||||
class RendererBackend;
|
||||
@@ -20,8 +19,8 @@ class TransformState;
|
||||
|
||||
class HeadlessFrontend : public RendererFrontend {
|
||||
public:
|
||||
HeadlessFrontend(float pixelRatio_, FileSource&, Scheduler&, const optional<std::string> programCacheDir = {}, GLContextMode mode = GLContextMode::Unique, const optional<std::string> localFontFamily = {});
|
||||
HeadlessFrontend(Size, float pixelRatio_, FileSource&, Scheduler&, const optional<std::string> programCacheDir = {}, GLContextMode mode = GLContextMode::Unique, const optional<std::string> localFontFamily = {});
|
||||
HeadlessFrontend(float pixelRatio_, Scheduler&, const optional<std::string> programCacheDir = {}, GLContextMode mode = GLContextMode::Unique, const optional<std::string> localFontFamily = {});
|
||||
HeadlessFrontend(Size, float pixelRatio_, Scheduler&, const optional<std::string> programCacheDir = {}, GLContextMode mode = GLContextMode::Unique, const optional<std::string> localFontFamily = {});
|
||||
~HeadlessFrontend() override;
|
||||
|
||||
void reset() override;
|
||||
|
||||
@@ -8,11 +8,11 @@
|
||||
|
||||
namespace mbgl {
|
||||
|
||||
HeadlessFrontend::HeadlessFrontend(float pixelRatio_, FileSource& fileSource, Scheduler& scheduler, const optional<std::string> programCacheDir, GLContextMode mode, const optional<std::string> localFontFamily)
|
||||
: HeadlessFrontend({ 256, 256 }, pixelRatio_, fileSource, scheduler, programCacheDir, mode, localFontFamily) {
|
||||
HeadlessFrontend::HeadlessFrontend(float pixelRatio_, Scheduler& scheduler, const optional<std::string> programCacheDir, GLContextMode mode, const optional<std::string> localFontFamily)
|
||||
: HeadlessFrontend({ 256, 256 }, pixelRatio_, scheduler, programCacheDir, mode, localFontFamily) {
|
||||
}
|
||||
|
||||
HeadlessFrontend::HeadlessFrontend(Size size_, float pixelRatio_, FileSource& fileSource, Scheduler& scheduler, const optional<std::string> programCacheDir, GLContextMode mode, const optional<std::string> localFontFamily)
|
||||
HeadlessFrontend::HeadlessFrontend(Size size_, float pixelRatio_, Scheduler& scheduler, const optional<std::string> programCacheDir, GLContextMode mode, const optional<std::string> localFontFamily)
|
||||
: size(size_),
|
||||
pixelRatio(pixelRatio_),
|
||||
backend({ static_cast<uint32_t>(size.width * pixelRatio),
|
||||
@@ -23,7 +23,7 @@ HeadlessFrontend::HeadlessFrontend(Size size_, float pixelRatio_, FileSource& fi
|
||||
renderer->render(*updateParameters);
|
||||
}
|
||||
}),
|
||||
renderer(std::make_unique<Renderer>(backend, pixelRatio, fileSource, scheduler, mode, programCacheDir, localFontFamily)) {
|
||||
renderer(std::make_unique<Renderer>(backend, pixelRatio, scheduler, mode, programCacheDir, localFontFamily)) {
|
||||
}
|
||||
|
||||
HeadlessFrontend::~HeadlessFrontend() = default;
|
||||
|
||||
@@ -57,7 +57,7 @@ MapSnapshotter::Impl::Impl(FileSource* fileSource,
|
||||
const optional<std::string> programCacheDir,
|
||||
const optional<std::string> localFontFamily)
|
||||
: scheduler(std::move(scheduler_))
|
||||
, frontend(size, pixelRatio, *fileSource, *scheduler, programCacheDir, GLContextMode::Unique, localFontFamily)
|
||||
, frontend(size, pixelRatio, *scheduler, programCacheDir, GLContextMode::Unique, localFontFamily)
|
||||
, map(frontend, MapObserver::nullObserver(), size, pixelRatio, *fileSource, *scheduler, MapOptions().withMapMode(MapMode::Static)) {
|
||||
|
||||
if (style.first) {
|
||||
|
||||
@@ -108,7 +108,7 @@ int main(int argc, char *argv[]) {
|
||||
}
|
||||
|
||||
mbgl::ThreadPool threadPool(4);
|
||||
GLFWRendererFrontend rendererFrontend { std::make_unique<mbgl::Renderer>(backend, view->getPixelRatio(), fileSource, threadPool), backend };
|
||||
GLFWRendererFrontend rendererFrontend { std::make_unique<mbgl::Renderer>(backend, view->getPixelRatio(), threadPool), backend };
|
||||
mbgl::Map map(rendererFrontend, backend, view->getSize(), view->getPixelRatio(), fileSource, threadPool, mbgl::MapOptions());
|
||||
|
||||
backend.setMap(&map);
|
||||
|
||||
@@ -473,7 +473,7 @@ public:
|
||||
MGLRendererConfiguration *config = [MGLRendererConfiguration currentConfiguration];
|
||||
_mbglThreadPool = mbgl::sharedThreadPool();
|
||||
|
||||
auto renderer = std::make_unique<mbgl::Renderer>(*_mbglView, config.scaleFactor, *config.fileSource, *_mbglThreadPool, config.contextMode, config.cacheDir, config.localFontFamilyName);
|
||||
auto renderer = std::make_unique<mbgl::Renderer>(*_mbglView, config.scaleFactor, *_mbglThreadPool, config.contextMode, config.cacheDir, config.localFontFamilyName);
|
||||
BOOL enableCrossSourceCollisions = !config.perSourceCollisions;
|
||||
_rendererFrontend = std::make_unique<MGLRenderFrontend>(std::move(renderer), self, *_mbglView);
|
||||
|
||||
|
||||
@@ -286,7 +286,7 @@ public:
|
||||
_mbglThreadPool = mbgl::sharedThreadPool();
|
||||
MGLRendererConfiguration *config = [MGLRendererConfiguration currentConfiguration];
|
||||
|
||||
auto renderer = std::make_unique<mbgl::Renderer>(*_mbglView, config.scaleFactor, *config.fileSource, *_mbglThreadPool, config.contextMode, config.cacheDir, config.localFontFamilyName);
|
||||
auto renderer = std::make_unique<mbgl::Renderer>(*_mbglView, config.scaleFactor, *_mbglThreadPool, config.contextMode, config.cacheDir, config.localFontFamilyName);
|
||||
BOOL enableCrossSourceCollisions = !config.perSourceCollisions;
|
||||
_rendererFrontend = std::make_unique<MGLRenderFrontend>(std::move(renderer), self, *_mbglView, true);
|
||||
|
||||
|
||||
@@ -620,7 +620,7 @@ void NodeMap::cancel() {
|
||||
reinterpret_cast<NodeMap *>(h->data)->renderFinished();
|
||||
});
|
||||
|
||||
frontend = std::make_unique<mbgl::HeadlessFrontend>(mbgl::Size{ 256, 256 }, pixelRatio, fileSource, threadpool);
|
||||
frontend = std::make_unique<mbgl::HeadlessFrontend>(mbgl::Size{ 256, 256 }, pixelRatio, threadpool);
|
||||
mbgl::MapOptions options;
|
||||
options.withMapMode(mode)
|
||||
.withConstrainMode(mbgl::ConstrainMode::HeightOnly)
|
||||
@@ -1206,7 +1206,7 @@ NodeMap::NodeMap(v8::Local<v8::Object> options)
|
||||
}())
|
||||
, mapObserver(NodeMapObserver())
|
||||
, fileSource(this)
|
||||
, frontend(std::make_unique<mbgl::HeadlessFrontend>(mbgl::Size { 256, 256 }, pixelRatio, fileSource, threadpool))
|
||||
, frontend(std::make_unique<mbgl::HeadlessFrontend>(mbgl::Size { 256, 256 }, pixelRatio, threadpool))
|
||||
, map(std::make_unique<mbgl::Map>(*frontend,
|
||||
mapObserver,
|
||||
frontend->getSize(),
|
||||
|
||||
@@ -1828,7 +1828,6 @@ void QMapboxGLPrivate::createRenderer()
|
||||
|
||||
m_mapRenderer = std::make_unique<QMapboxGLMapRenderer>(
|
||||
m_pixelRatio,
|
||||
*m_fileSourceObj,
|
||||
*m_threadPool,
|
||||
m_mode,
|
||||
m_localFontFamily
|
||||
|
||||
@@ -24,9 +24,8 @@ static auto *getScheduler() {
|
||||
return scheduler.localData().get();
|
||||
};
|
||||
|
||||
QMapboxGLMapRenderer::QMapboxGLMapRenderer(qreal pixelRatio,
|
||||
mbgl::DefaultFileSource &fs, mbgl::ThreadPool &tp, QMapboxGLSettings::GLContextMode mode, const QString &localFontFamily)
|
||||
: m_renderer(std::make_unique<mbgl::Renderer>(m_backend, pixelRatio, fs, tp, static_cast<mbgl::GLContextMode>(mode), mbgl::optional<std::string> {},
|
||||
QMapboxGLMapRenderer::QMapboxGLMapRenderer(qreal pixelRatio, mbgl::ThreadPool &tp, QMapboxGLSettings::GLContextMode mode, const QString &localFontFamily)
|
||||
: m_renderer(std::make_unique<mbgl::Renderer>(m_backend, pixelRatio, tp, static_cast<mbgl::GLContextMode>(mode), mbgl::optional<std::string> {},
|
||||
localFontFamily.isEmpty() ? mbgl::nullopt : mbgl::optional<std::string> { localFontFamily.toStdString() }))
|
||||
, m_forceScheduler(needsToForceScheduler())
|
||||
{
|
||||
|
||||
@@ -6,7 +6,6 @@
|
||||
#include <mbgl/renderer/renderer.hpp>
|
||||
#include <mbgl/renderer/renderer_backend.hpp>
|
||||
#include <mbgl/renderer/renderer_observer.hpp>
|
||||
#include <mbgl/storage/default_file_source.hpp>
|
||||
#include <mbgl/util/shared_thread_pool.hpp>
|
||||
#include <mbgl/util/util.hpp>
|
||||
|
||||
@@ -27,9 +26,7 @@ class QMapboxGLMapRenderer : public QObject
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
QMapboxGLMapRenderer(qreal pixelRatio, mbgl::DefaultFileSource &,
|
||||
mbgl::ThreadPool &, QMapboxGLSettings::GLContextMode,
|
||||
const QString &localFontFamily);
|
||||
QMapboxGLMapRenderer(qreal pixelRatio, mbgl::ThreadPool &, QMapboxGLSettings::GLContextMode, const QString &localFontFamily);
|
||||
virtual ~QMapboxGLMapRenderer();
|
||||
|
||||
void render();
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
#include "qmapboxgl.hpp"
|
||||
|
||||
#include <mbgl/renderer/renderer_backend.hpp>
|
||||
#include <mbgl/storage/default_file_source.hpp>
|
||||
#include <mbgl/util/shared_thread_pool.hpp>
|
||||
|
||||
class QMapboxGLRendererBackend : public mbgl::RendererBackend
|
||||
|
||||
Reference in New Issue
Block a user