remove Settings object from Painter
This commit is contained in:
@@ -20,7 +20,6 @@
|
||||
namespace llmr {
|
||||
|
||||
class Transform;
|
||||
class Settings;
|
||||
class Style;
|
||||
class Tile;
|
||||
|
||||
@@ -32,7 +31,7 @@ class RasterBucket;
|
||||
|
||||
class Painter : private util::noncopyable {
|
||||
public:
|
||||
Painter(Transform& transform, Settings& settings, Style& style, GlyphAtlas& glyphAtlas);
|
||||
Painter(Transform& transform, Style& style, GlyphAtlas& glyphAtlas);
|
||||
|
||||
void setup();
|
||||
void clear();
|
||||
@@ -47,6 +46,9 @@ public:
|
||||
|
||||
void resize();
|
||||
|
||||
// Changes whether debug information is drawn onto the map
|
||||
void setDebug(bool enabled);
|
||||
|
||||
void prepareClippingMask();
|
||||
void drawClippingMask(const mat4& matrix, uint8_t clip_id);
|
||||
void finishClippingMask();
|
||||
@@ -70,12 +72,13 @@ public:
|
||||
|
||||
private:
|
||||
Transform& transform;
|
||||
Settings& settings;
|
||||
Style& style;
|
||||
GlyphAtlas& glyphAtlas;
|
||||
|
||||
FrameHistory frameHistory;
|
||||
|
||||
bool debug = false;
|
||||
|
||||
uint32_t gl_program = 0;
|
||||
float gl_lineWidth = 0;
|
||||
bool gl_depthMask = true;
|
||||
|
||||
Reference in New Issue
Block a user