[core] Eliminate use of ClassProperties for layout

This commit is contained in:
John Firebaugh
2015-10-26 10:14:24 -07:00
parent 728a9858ea
commit a562567589
33 changed files with 237 additions and 323 deletions

View File

@@ -24,10 +24,6 @@ public:
}
};
class FillLayoutProperties {
public:
};
class LinePaintProperties {
public:
float opacity = 1.0f;
@@ -46,14 +42,6 @@ public:
}
};
class LineLayoutProperties {
public:
CapType cap = CapType::Butt;
JoinType join = JoinType::Miter;
float miter_limit = 2.0f;
float round_limit = 1.0f;
};
class SymbolPaintProperties {
public:
struct {
@@ -84,50 +72,6 @@ public:
}
};
class SymbolLayoutProperties {
public:
PlacementType placement = PlacementType::Point;
float spacing = 250.0f;
bool avoid_edges = false;
struct {
bool allow_overlap = false;
bool ignore_placement = false;
bool optional = false;
RotationAlignmentType rotation_alignment = RotationAlignmentType::Viewport;
float size = 1.0f;
float max_size = 1.0f;
std::string image;
float rotate = 0.0f;
float padding = 2.0f;
bool keep_upright = false;
std::array<float, 2> offset = {{ 0, 0 }};
} icon;
struct {
RotationAlignmentType rotation_alignment = RotationAlignmentType::Viewport;
std::string field;
std::string font = "Open Sans Regular, Arial Unicode MS Regular";
float size = 16.0f;
float max_size = 16.0f;
float max_width = 15.0f /* em */;
float line_height = 1.2f /* em */;
float letter_spacing = 0.0f /* em */;
TextJustifyType justify = TextJustifyType::Center;
TextAnchorType anchor = TextAnchorType::Center;
float max_angle = 45.0f /* degrees */;
float rotate = 0.0f;
float padding = 2.0f;
bool keep_upright = true;
TextTransformType transform = TextTransformType::None;
std::array<float, 2> offset = {{ 0, 0 }};
bool allow_overlap = false;
bool ignore_placement = false;
bool optional = false;
} text;
};
class CirclePaintProperties {
public:
float radius = 5.0f;
@@ -156,10 +100,6 @@ public:
}
};
class RasterLayoutProperties {
public:
};
class BackgroundPaintProperties {
public:
float opacity = 1.0f;
@@ -171,10 +111,6 @@ public:
}
};
class BackgroundLayoutProperties {
public:
};
}
#endif