transform => Transform
This commit is contained in:
@@ -50,7 +50,7 @@ private:
|
||||
|
||||
private:
|
||||
Settings& settings;
|
||||
transform *transform;
|
||||
Transform transform;
|
||||
Painter painter;
|
||||
|
||||
int32_t min_zoom;
|
||||
|
||||
@@ -12,17 +12,15 @@ namespace llmr {
|
||||
|
||||
struct box;
|
||||
|
||||
class tile;
|
||||
|
||||
class transform {
|
||||
class Transform {
|
||||
public:
|
||||
transform();
|
||||
Transform();
|
||||
|
||||
// Make noncopyable
|
||||
transform(const transform&) = delete;
|
||||
transform(const transform&&) = delete;
|
||||
transform &operator=(const transform&) = delete;
|
||||
transform &operator=(const transform&&) = delete;
|
||||
Transform(const Transform&) = delete;
|
||||
Transform(const Transform&&) = delete;
|
||||
Transform &operator=(const Transform&) = delete;
|
||||
Transform &operator=(const Transform&&) = delete;
|
||||
|
||||
// Animations
|
||||
bool needsAnimation() const;
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
#define LLMR_RENDERER_PAINTER
|
||||
|
||||
#include "../map/settings.hpp"
|
||||
#include "../map/transform.hpp"
|
||||
#include "shader-fill.hpp"
|
||||
#include "shader-line.hpp"
|
||||
#include "shader-outline.hpp"
|
||||
@@ -13,7 +14,7 @@ class tile;
|
||||
|
||||
class Painter {
|
||||
public:
|
||||
Painter(class transform *transform, Settings& settings);
|
||||
Painter(Transform& transform, Settings& settings);
|
||||
|
||||
// Make noncopyable
|
||||
Painter(const Painter&) = delete;
|
||||
@@ -39,7 +40,7 @@ private:
|
||||
public:
|
||||
|
||||
private:
|
||||
transform *transform;
|
||||
Transform& transform;
|
||||
Settings& settings;
|
||||
float matrix[16];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user