AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Review fixes.

Browse source
This commit is contained in:
Daria Volvenkova 2017-07-28 11:44:11 +03:00 • committed by Roman Kuznetsov
parent 6e39853c8d
commit 74035a007d
10 changed files with 8 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drape_frontend/drape_engine.cpp
View file

@ -243,7 +243,7 @@ void DrapeEngine::UpdateUserMarksGroup(MarkGroupID groupId, UserMarksProvider *
renderInfo->m_hasTitlePriority = mark->HasTitlePriority();
renderInfo->m_priority = mark->GetPriority();
renderInfo->m_featureId = mark->GetFeatureID();
renderInfo->m_runCreationAnim = mark->RunCreationAnim();
renderInfo->m_hasCreationAnimation = mark->HasCreationAnimation();
marksRenderCollection->emplace(mark->GetId(), std::move(renderInfo));
mark->AcceptChanges();

1
drape_frontend/message.hpp
View file

@ -24,7 +24,6 @@ public:
ClearUserMarkGroup,
ChangeUserMarkGroupVisibility,
UpdateUserMarks,
SetCreatedUserMarks,
InvalidateUserMarks,
FlushUserMarks,
GuiLayerRecached,

15
drape_frontend/message_subclasses.hpp
View file

@ -231,21 +231,6 @@ private:
bool m_isVisible;
};
class AnimateUserMarksMessage : public Message
{
public:
AnimateUserMarksMessage(drape_ptr<MarkIDCollection> && ids)
: m_ids(std::move(ids))
{}
Type GetType() const override { return Message::SetCreatedUserMarks; }
drape_ptr<MarkIDCollection> && AcceptIds() { return std::move(m_ids); }
private:
drape_ptr<MarkIDCollection> m_ids;
};
class UpdateUserMarksMessage : public Message
{
public:

5
drape_frontend/user_mark_generator.cpp
View file

@ -46,10 +46,7 @@ void UserMarkGenerator::SetCreatedUserMarks(drape_ptr<MarkIDCollection> && ids)
if (ids == nullptr)
return;
for (auto const & id : ids->m_marksID)
{
UserMarkRenderParams & params = *m_marks[id].get();
params.m_justCreated = true;
}
m_marks[id].get()->m_justCreated = true;
}
void UserMarkGenerator::SetUserMarks(drape_ptr<UserMarksRenderCollection> && marks)

2
drape_frontend/user_mark_shapes.cpp
View file

@ -132,7 +132,7 @@ void CacheUserMarks(TileKey const & tileKey, ref_ptr<dp::TextureManager> texture
m2::PointD const pt = MapShape::ConvertToLocal(renderInfo.m_pivot, tileCenter,
kShapeCoordScalar);
glsl::vec3 const pos = glsl::vec3(glsl::ToVec2(pt), renderInfo.m_depth);
bool const runAnim = renderInfo.m_runCreationAnim && renderInfo.m_justCreated;
bool const runAnim = renderInfo.m_hasCreationAnimation && renderInfo.m_justCreated;
isAnimated |= runAnim;
glsl::vec2 left, right, up, down;

2
drape_frontend/user_mark_shapes.hpp
View file

@ -26,7 +26,7 @@ struct UserMarkRenderParams
uint16_t m_priority = 0;
float m_depth = 0.0;
dp::GLState::DepthLayer m_depthLayer = dp::GLState::UserMarkLayer;
bool m_runCreationAnim = false;
bool m_hasCreationAnimation = false;
bool m_justCreated = false;
bool m_isVisible = true;
FeatureID m_featureId;

2
drape_frontend/user_marks_provider.hpp
View file

@ -61,7 +61,7 @@ public:
virtual bool HasTitlePriority() const = 0;
virtual int GetMinZoom() const = 0;
virtual FeatureID GetFeatureID() const = 0;
virtual bool RunCreationAnim() const = 0;
virtual bool HasCreationAnimation() const = 0;
private:
MarkID m_id;

2
map/bookmark.cpp
View file

@ -60,7 +60,7 @@ std::string Bookmark::GetSymbolName() const
return GetType();
}
bool Bookmark::RunCreationAnim() const
bool Bookmark::HasCreationAnimation() const
{
return true;
}

2
map/bookmark.hpp
View file

@ -83,7 +83,7 @@ public:
dp::Anchor GetAnchor() const override;
std::string GetSymbolName() const override;
bool RunCreationAnim() const override;
bool HasCreationAnimation() const override;
Type GetMarkType() const override;

2
map/user_mark.hpp
View file

@ -52,7 +52,7 @@ public:
bool HasTitlePriority() const override { return false; }
int GetMinZoom() const override { return 1; }
FeatureID GetFeatureID() const override { return FeatureID(); }
bool RunCreationAnim() const override { return false; }
bool HasCreationAnimation() const override { return false; }
UserMarkContainer const * GetContainer() const;
ms::LatLon GetLatLon() const;