Drawable Renderer (#1570), warnings
This commit is contained in:
committed by
Bart Louwers
parent
61da26fe14
commit
8c749d155a
@@ -94,7 +94,7 @@ public:
|
||||
|
||||
protected:
|
||||
/// Create an instance of the appropriate drawable type
|
||||
virtual DrawablePtr createDrawable(std::string name) const = 0;
|
||||
virtual DrawablePtr createDrawable() const = 0;
|
||||
|
||||
/// Setup the SDK-specific aspects after all the values are present
|
||||
virtual void init() = 0;
|
||||
|
||||
@@ -20,7 +20,7 @@ public:
|
||||
void setVertexAttributes(VertexAttributeArrayGL&& value) { vertexAttributes = std::move(value); }
|
||||
|
||||
protected:
|
||||
gfx::DrawablePtr createDrawable(std::string name) const override;
|
||||
gfx::DrawablePtr createDrawable() const override;
|
||||
|
||||
/// Setup the SDK-specific aspects after all the values are present
|
||||
void init() override;
|
||||
|
||||
@@ -20,7 +20,7 @@ void DrawableBuilder::setColor(const Color& value) {
|
||||
|
||||
DrawablePtr DrawableBuilder::getCurrentDrawable(bool createIfNone) {
|
||||
if (!currentDrawable && createIfNone) {
|
||||
currentDrawable = createDrawable(drawableName.empty() ? name : drawableName);
|
||||
currentDrawable = createDrawable();
|
||||
}
|
||||
return currentDrawable;
|
||||
}
|
||||
|
||||
@@ -7,8 +7,8 @@
|
||||
namespace mbgl {
|
||||
namespace gl {
|
||||
|
||||
gfx::DrawablePtr DrawableGLBuilder::createDrawable(std::string name) const {
|
||||
return std::make_shared<DrawableGL>(std::move(name));
|
||||
gfx::DrawablePtr DrawableGLBuilder::createDrawable() const {
|
||||
return std::make_shared<DrawableGL>(drawableName.empty() ? name : drawableName);
|
||||
};
|
||||
|
||||
void DrawableGLBuilder::init() {
|
||||
|
||||
Reference in New Issue
Block a user