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

Added special visualization for deleted POI

Browse source
This commit is contained in:
r.kuznetsov 2016-05-17 10:10:18 +03:00
parent fc90275630
commit c3680e03ad
11 changed files with 238 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drape/drape.pro
View file

@ -25,6 +25,9 @@ OTHER_FILES += \
shaders/debug_rect_vertex_shader.vsh \
shaders/line_fragment_shader.fsh \
shaders/line_vertex_shader.vsh \
shaders/masked_texturing_billboard_vertex_shader.vsh \
shaders/masked_texturing_fragment_shader.fsh \
shaders/masked_texturing_vertex_shader.vsh \
shaders/my_position_shader.vsh \
shaders/path_symbol_vertex_shader.vsh \
shaders/position_accuracy3d_shader.vsh \

32
drape/shaders/masked_texturing_billboard_vertex_shader.vsh Normal file
View file

@ -0,0 +1,32 @@
attribute vec4 a_position;
attribute vec2 a_normal;
attribute vec2 a_colorTexCoords;
attribute vec2 a_maskTexCoords;
uniform mat4 modelView;
uniform mat4 projection;
uniform mat4 pivotTransform;
uniform float zScale;
varying vec2 v_colorTexCoords;
varying vec2 v_maskTexCoords;
void main(void)
{
// Here we intentionally decrease precision of 'pivot' calculation
// to eliminate jittering effect in process of billboard reconstruction.
lowp vec4 pivot = vec4(a_position.xyz, 1.0) * modelView;
vec4 offset = vec4(a_normal, 0.0, 0.0) * projection;
float pivotZ = a_position.w;
vec4 projectedPivot = pivot * projection;
float logicZ = projectedPivot.z / projectedPivot.w;
vec4 transformedPivot = pivotTransform * vec4(projectedPivot.xy, pivotZ * zScale, projectedPivot.w);
vec4 scale = pivotTransform * vec4(1.0, -1.0, 0.0, 1.0);
gl_Position = vec4(transformedPivot.xy / transformedPivot.w, logicZ, 1.0) + vec4(offset.xy / scale.w * scale.x, 0.0, 0.0);
v_colorTexCoords = a_colorTexCoords;
v_maskTexCoords = a_maskTexCoords;
}

13
drape/shaders/masked_texturing_fragment_shader.fsh Normal file
View file

@ -0,0 +1,13 @@
uniform sampler2D u_colorTex;
uniform sampler2D u_maskTex;
uniform float u_opacity;
varying vec2 v_colorTexCoords;
varying vec2 v_maskTexCoords;
void main(void)
{
vec4 finalColor = texture2D(u_colorTex, v_colorTexCoords) * texture2D(u_maskTex, v_maskTexCoords);
finalColor.a *= u_opacity;
gl_FragColor = finalColor;
}

26
drape/shaders/masked_texturing_vertex_shader.vsh Normal file
View file

@ -0,0 +1,26 @@
attribute vec4 a_position;
attribute vec2 a_normal;
attribute vec2 a_colorTexCoords;
attribute vec2 a_maskTexCoords;
uniform mat4 modelView;
uniform mat4 projection;
uniform mat4 pivotTransform;
varying vec2 v_colorTexCoords;
varying vec2 v_maskTexCoords;
void main(void)
{
// Here we intentionally decrease precision of 'pos' calculation
// to eliminate jittering effect in process of billboard reconstruction.
lowp vec4 pos = vec4(a_position.xyz, 1) * modelView;
highp vec4 shiftedPos = vec4(a_normal, 0, 0) + pos;
shiftedPos = shiftedPos * projection;
float w = shiftedPos.w;
shiftedPos.xyw = (pivotTransform * vec4(shiftedPos.xy, 0.0, w)).xyw;
shiftedPos.z *= shiftedPos.w / w;
gl_Position = shiftedPos;
v_colorTexCoords = a_colorTexCoords;
v_maskTexCoords = a_maskTexCoords;
}

2
drape/shaders/shader_index.txt
View file

@ -4,6 +4,7 @@ TEXT_OUTLINED_GUI_PROGRAM text_outlined_gui_vertex_shader.vsh text_fragment_shad
AREA_PROGRAM area_vertex_shader.vsh solid_color_fragment_shader.fsh
AREA_3D_PROGRAM area3d_vertex_shader.vsh texturing3d_fragment_shader.fsh
TEXTURING_PROGRAM texturing_vertex_shader.vsh texturing_fragment_shader.fsh
MASKED_TEXTURING_PROGRAM masked_texturing_vertex_shader.vsh masked_texturing_fragment_shader.fsh
LINE_PROGRAM line_vertex_shader.vsh line_fragment_shader.fsh
CAP_JOIN_PROGRAM circle_shader.vsh circle_shader.fsh
DASHED_LINE_PROGRAM dashed_vertex_shader.vsh dashed_fragment_shader.fsh
@ -20,6 +21,7 @@ DEBUG_RECT_PROGRAM debug_rect_vertex_shader.vsh debug_rect_fragment_shader.fsh
TRANSPARENT_LAYER_PROGRAM transparent_layer_vertex_shader.vsh transparent_layer_fragment_shader.fsh
ARROW_3D_PROGRAM arrow3d_vertex_shader.vsh arrow3d_fragment_shader.fsh
TEXTURING_BILLBOARD_PROGRAM texturing_billboard_vertex_shader.vsh texturing_fragment_shader.fsh
MASKED_TEXTURING_BILLBOARD_PROGRAM masked_texturing_billboard_vertex_shader.vsh masked_texturing_fragment_shader.fsh
TEXT_OUTLINED_BILLBOARD_PROGRAM text_outlined_billboard_vertex_shader.vsh text_fragment_shader.fsh
TEXT_BILLBOARD_PROGRAM text_billboard_vertex_shader.vsh text_fragment_shader.fsh
BOOKMARK_BILLBOARD_PROGRAM user_mark_billboard.vsh texturing_fragment_shader.fsh

42
drape/utils/vertex_decl.cpp
View file

@ -11,6 +11,7 @@ enum VertexType
Area,
Area3d,
SolidTexturing,
MaskedTexturing,
TextStatic,
TextOutlinedStatic,
TextDynamic,
@ -68,6 +69,22 @@ dp::BindingInfo SolidTexturingBindingInit()
return filler.m_info;
}
dp::BindingInfo MaskedTexturingBindingInit()
{
static_assert(sizeof(MaskedTexturingVertex) == (sizeof(MaskedTexturingVertex::TPosition3d) +
sizeof(MaskedTexturingVertex::TNormal) +
sizeof(MaskedTexturingVertex::TTexCoord) +
sizeof(MaskedTexturingVertex::TTexCoord)), "");
dp::BindingFiller<MaskedTexturingVertex> filler(4);
filler.FillDecl<SolidTexturingVertex::TPosition3d>("a_position");
filler.FillDecl<SolidTexturingVertex::TNormal>("a_normal");
filler.FillDecl<SolidTexturingVertex::TTexCoord>("a_colorTexCoords");
filler.FillDecl<SolidTexturingVertex::TTexCoord>("a_maskTexCoords");
return filler.m_info;
}
dp::BindingInfo TextStaticBindingInit()
{
static_assert(sizeof(TextStaticVertex) == (2 * sizeof(TextStaticVertex::TTexCoord)), "");
@ -152,6 +169,7 @@ TInitFunction g_initFunctions[TypeCount] =
&AreaBindingInit,
&Area3dBindingInit,
&SolidTexturingBindingInit,
&MaskedTexturingBindingInit,
&TextStaticBindingInit,
&TextOutlinedStaticBindingInit,
&TextDynamicBindingInit,
@ -218,7 +236,7 @@ SolidTexturingVertex::SolidTexturingVertex()
{
}
SolidTexturingVertex::SolidTexturingVertex(const TPosition3d & position, TNormal const & normal,
SolidTexturingVertex::SolidTexturingVertex(TPosition3d const & position, TNormal const & normal,
TTexCoord const & colorTexCoord)
: m_position(position)
, m_normal(normal)
@ -231,6 +249,28 @@ dp::BindingInfo const & SolidTexturingVertex::GetBindingInfo()
return GetBinding(SolidTexturing);
}
MaskedTexturingVertex::MaskedTexturingVertex()
: m_position(0.0, 0.0, 0.0, 0.0)
, m_normal(0.0, 0.0)
, m_colorTexCoord(0.0, 0.0)
, m_maskTexCoord(0.0, 0.0)
{
}
MaskedTexturingVertex::MaskedTexturingVertex(TPosition3d const & position, TNormal const & normal,
TTexCoord const & colorTexCoord, TTexCoord const & maskTexCoord)
: m_position(position)
, m_normal(normal)
, m_colorTexCoord(colorTexCoord)
, m_maskTexCoord(maskTexCoord)
{
}
dp::BindingInfo const & MaskedTexturingVertex::GetBindingInfo()
{
return GetBinding(MaskedTexturing);
}
TextOutlinedStaticVertex::TextOutlinedStaticVertex()
: m_colorTexCoord(0.0, 0.0)
, m_outlineTexCoord(0.0, 0.0)

21
drape/utils/vertex_decl.hpp
View file

@ -52,7 +52,20 @@ struct SolidTexturingVertex : BaseVertex
static dp::BindingInfo const & GetBindingInfo();
};
typedef buffer_vector<SolidTexturingVertex, 128> TSolidTexVertexBuffer;
using TSolidTexVertexBuffer = buffer_vector<SolidTexturingVertex, 128>;
struct MaskedTexturingVertex : BaseVertex
{
MaskedTexturingVertex();
MaskedTexturingVertex(TPosition3d const & position, TNormal const & normal,
TTexCoord const & colorTexCoord, TTexCoord const & maskTexCoord);
TPosition3d m_position;
TNormal m_normal;
TTexCoord m_colorTexCoord;
TTexCoord m_maskTexCoord;
static dp::BindingInfo const & GetBindingInfo();
};
struct TextStaticVertex : BaseVertex
{
@ -65,7 +78,7 @@ struct TextStaticVertex : BaseVertex
static dp::BindingInfo const & GetBindingInfo();
};
typedef buffer_vector<TextStaticVertex, 128> TTextStaticVertexBuffer;
using TTextStaticVertexBuffer = buffer_vector<TextStaticVertex, 128>;
struct TextOutlinedStaticVertex : BaseVertex
{
@ -81,7 +94,7 @@ public:
static dp::BindingInfo const & GetBindingInfo();
};
typedef buffer_vector<TextOutlinedStaticVertex, 128> TTextOutlinedStaticVertexBuffer;
using TTextOutlinedStaticVertexBuffer = buffer_vector<TextOutlinedStaticVertex, 128>;
struct TextDynamicVertex : BaseVertex
{
@ -95,7 +108,7 @@ struct TextDynamicVertex : BaseVertex
static uint32_t GetDynamicStreamID();
};
typedef buffer_vector<TextDynamicVertex, 128> TTextDynamicVertexBuffer;
using TTextDynamicVertexBuffer = buffer_vector<TextDynamicVertex, 128>;
struct LineVertex : BaseVertex
{

7
drape_frontend/apply_feature_functors.cpp
View file

@ -269,10 +269,11 @@ ApplyPointFeature::ApplyPointFeature(TInsertShapeFn const & insertShape, Feature
, m_hasPoint(false)
, m_hasArea(false)
, m_createdByEditor(false)
, m_deletedInEditor(false)
, m_symbolDepth(dp::minDepth)
, m_circleDepth(dp::minDepth)
, m_symbolRule(NULL)
, m_circleRule(NULL)
, m_symbolRule(nullptr)
, m_circleRule(nullptr)
{
}
@ -281,6 +282,7 @@ void ApplyPointFeature::operator()(m2::PointD const & point, bool hasArea)
m_hasPoint = true;
m_hasArea = hasArea;
m_createdByEditor = osm::Editor::IsCreatedFeature(m_id);
m_deletedInEditor = false; //TODO: implement
m_centerPoint = point;
}
@ -376,6 +378,7 @@ void ApplyPointFeature::Finish()
params.m_posZ = m_posZ;
params.m_hasArea = m_hasArea;
params.m_createdByEditor = m_createdByEditor;
params.m_deletedInEditor = m_deletedInEditor;
m_insertShape(make_unique_dp<PoiSymbolShape>(m_centerPoint, params));
}
}

1
drape_frontend/apply_feature_functors.hpp
View file

@ -80,6 +80,7 @@ private:
bool m_hasPoint;
bool m_hasArea;
bool m_createdByEditor;
bool m_deletedInEditor;
double m_symbolDepth;
double m_circleDepth;
SymbolRuleProto const * m_symbolRule;

127
drape_frontend/poi_symbol_shape.cpp
View file

@ -8,6 +8,91 @@
#include "drape/shader_def.hpp"
namespace
{
dp::Color const kDeletedColorMask = dp::Color(255, 255, 255, 76);
using SV = gpu::SolidTexturingVertex;
using MV = gpu::MaskedTexturingVertex;
template<typename TVertex>
void Batch(ref_ptr<dp::Batcher> batcher, drape_ptr<dp::OverlayHandle> && handle,
glsl::vec4 const & position,
dp::TextureManager::SymbolRegion const & symbolRegion,
dp::TextureManager::ColorRegion const & colorRegion)
{
ASSERT(0, ("Can not be used without specialization"));
}
template<>
void Batch<SV>(ref_ptr<dp::Batcher> batcher, drape_ptr<dp::OverlayHandle> && handle,
glsl::vec4 const & position,
dp::TextureManager::SymbolRegion const & symbolRegion,
dp::TextureManager::ColorRegion const & colorRegion)
{
m2::PointU const pixelSize = symbolRegion.GetPixelSize();
m2::PointF const halfSize(pixelSize.x * 0.5f, pixelSize.y * 0.5f);
m2::RectF const & texRect = symbolRegion.GetTexRect();
SV vertexes[] =
{
SV{ position, glsl::vec2(-halfSize.x, halfSize.y),
glsl::vec2(texRect.minX(), texRect.maxY()) },
SV{ position, glsl::vec2(-halfSize.x, -halfSize.y),
glsl::vec2(texRect.minX(), texRect.minY()) },
SV{ position, glsl::vec2(halfSize.x, halfSize.y),
glsl::vec2(texRect.maxX(), texRect.maxY()) },
SV{ position, glsl::vec2(halfSize.x, -halfSize.y),
glsl::vec2(texRect.maxX(), texRect.minY()) },
};
dp::GLState state(gpu::TEXTURING_PROGRAM, dp::GLState::OverlayLayer);
state.SetProgram3dIndex(gpu::TEXTURING_BILLBOARD_PROGRAM);
state.SetColorTexture(symbolRegion.GetTexture());
state.SetTextureFilter(gl_const::GLNearest);
dp::AttributeProvider provider(1 /* streamCount */, ARRAY_SIZE(vertexes));
provider.InitStream(0 /* streamIndex */, SV::GetBindingInfo(), make_ref(vertexes));
batcher->InsertTriangleStrip(state, make_ref(&provider), move(handle));
}
template<>
void Batch<MV>(ref_ptr<dp::Batcher> batcher, drape_ptr<dp::OverlayHandle> && handle,
glsl::vec4 const & position,
dp::TextureManager::SymbolRegion const & symbolRegion,
dp::TextureManager::ColorRegion const & colorRegion)
{
m2::PointU const pixelSize = symbolRegion.GetPixelSize();
m2::PointF const halfSize(pixelSize.x * 0.5f, pixelSize.y * 0.5f);
m2::RectF const & texRect = symbolRegion.GetTexRect();
glsl::vec2 const maskColorCoords = glsl::ToVec2(colorRegion.GetTexRect().Center());
MV vertexes[] =
{
MV{ position, glsl::vec2(-halfSize.x, halfSize.y),
glsl::vec2(texRect.minX(), texRect.maxY()), maskColorCoords },
MV{ position, glsl::vec2(-halfSize.x, -halfSize.y),
glsl::vec2(texRect.minX(), texRect.minY()), maskColorCoords },
MV{ position, glsl::vec2(halfSize.x, halfSize.y),
glsl::vec2(texRect.maxX(), texRect.maxY()), maskColorCoords },
MV{ position, glsl::vec2(halfSize.x, -halfSize.y),
glsl::vec2(texRect.maxX(), texRect.minY()), maskColorCoords },
};
dp::GLState state(gpu::MASKED_TEXTURING_PROGRAM, dp::GLState::OverlayLayer);
state.SetProgram3dIndex(gpu::MASKED_TEXTURING_BILLBOARD_PROGRAM);
state.SetColorTexture(symbolRegion.GetTexture());
state.SetMaskTexture(colorRegion.GetTexture()); // Here mask is a color.
state.SetTextureFilter(gl_const::GLNearest);
dp::AttributeProvider provider(1 /* streamCount */, ARRAY_SIZE(vertexes));
provider.InitStream(0 /* streamIndex */, MV::GetBindingInfo(), make_ref(vertexes));
batcher->InsertTriangleStrip(state, make_ref(&provider), move(handle));
}
} // namespace
namespace df
{
@ -21,36 +106,8 @@ void PoiSymbolShape::Draw(ref_ptr<dp::Batcher> batcher, ref_ptr<dp::TextureManag
dp::TextureManager::SymbolRegion region;
textures->GetSymbolRegion(m_params.m_symbolName, region);
glsl::vec4 const position = glsl::vec4(glsl::ToVec2(m_pt), m_params.m_depth, -m_params.m_posZ);
m2::PointU const pixelSize = region.GetPixelSize();
m2::PointF const halfSize(pixelSize.x / 2.0, pixelSize.y / 2.0);
m2::RectF const & texRect = region.GetTexRect();
glsl::vec4 position = glsl::vec4(glsl::ToVec2(m_pt), m_params.m_depth, -m_params.m_posZ);
gpu::SolidTexturingVertex vertexes[] =
{
gpu::SolidTexturingVertex{ position,
glsl::vec2(-halfSize.x, halfSize.y),
glsl::vec2(texRect.minX(), texRect.maxY())},
gpu::SolidTexturingVertex{ position,
glsl::vec2(-halfSize.x, -halfSize.y),
glsl::vec2(texRect.minX(), texRect.minY())},
gpu::SolidTexturingVertex{ position,
glsl::vec2(halfSize.x, halfSize.y),
glsl::vec2(texRect.maxX(), texRect.maxY())},
gpu::SolidTexturingVertex{ position,
glsl::vec2(halfSize.x, -halfSize.y),
glsl::vec2(texRect.maxX(), texRect.minY())},
};
dp::GLState state(gpu::TEXTURING_PROGRAM, dp::GLState::OverlayLayer);
state.SetProgram3dIndex(gpu::TEXTURING_BILLBOARD_PROGRAM);
state.SetColorTexture(region.GetTexture());
state.SetTextureFilter(gl_const::GLNearest);
dp::AttributeProvider provider(1, 4);
provider.InitStream(0, gpu::SolidTexturingVertex::GetBindingInfo(), make_ref(vertexes));
drape_ptr<dp::OverlayHandle> handle = make_unique_dp<dp::SquareHandle>(m_params.m_id,
dp::Center,
m_pt, pixelSize,
@ -59,7 +116,17 @@ void PoiSymbolShape::Draw(ref_ptr<dp::Batcher> batcher, ref_ptr<dp::TextureManag
true);
handle->SetPivotZ(m_params.m_posZ);
handle->SetExtendingSize(m_params.m_extendingSize);
batcher->InsertTriangleStrip(state, make_ref(&provider), move(handle));
if (m_params.m_deletedInEditor)
{
dp::TextureManager::ColorRegion maskColorRegion;
textures->GetColorRegion(kDeletedColorMask, maskColorRegion);
Batch<MV>(batcher, move(handle), position, region, maskColorRegion);
}
else
{
Batch<SV>(batcher, move(handle), position, region, dp::TextureManager::ColorRegion());
}
}
uint64_t PoiSymbolShape::GetOverlayPriority() const

1
drape_frontend/shape_view_params.hpp
View file

@ -29,6 +29,7 @@ struct PoiSymbolViewParams : CommonViewParams
float m_posZ = 0.0f;
bool m_hasArea = false;
bool m_createdByEditor = false;
bool m_deletedInEditor = false;
};
struct CircleViewParams : CommonViewParams