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

syntax changes

Browse source
This commit is contained in:
Roman Sorokin 2014-07-21 14:36:29 +03:00 • committed by Alex Zolotarev
parent 8d126335f5
commit d6dd015a1a
4 changed files with 102 additions and 129 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drape/shaders/font_fragment_shader.fsh
View file

@ -14,10 +14,10 @@ const int Index5 = 5;
const int Index6 = 6;
const int Index7 = 7;
const float OUTLINE_MIN_VALUE0 = 0.52;
const float OUTLINE_MIN_VALUE1 = 0.58;
const float OUTLINE_MAX_VALUE0 = 0.64;
const float OUTLINE_MAX_VALUE1 = 0.68;
const float OUTLINE_MIN_VALUE0 = 0.49;
const float OUTLINE_MIN_VALUE1 = 0.53;
const float OUTLINE_MAX_VALUE0 = 0.58;
const float OUTLINE_MAX_VALUE1 = 0.6;
vec4 colorize(vec4 baseColor)
{
@ -77,7 +77,7 @@ void main (void)
else if (textureIndex == Index7)
alpha = texture2D(u_textures[Index7], v_texcoord.xy).a;
float needOutline = (v_texcoord.z / 2.0 - floor(v_texcoord.z / 2.0)) * 2.0;
float needOutline = (fract(v_texcoord.z / 2.0)) * 2.0;
if (needOutline > 0.5)
gl_FragColor = colorize(vec4(v_color.rgb, v_color.a*alpha));
else

198
drape_frontend/text_shape.cpp
View file

@ -24,103 +24,83 @@ namespace
static uint32_t const ListStride = 24;
static int const maxTextureSetCount = 64;
static float const realFontSize = 20.0f;
void SetColor(vector<float> &dst, float const * ar, int index)
{
uint32_t const colorArraySize = 4;
uint32_t const baseListIndex = ListStride * index;
for (uint32_t i = 0; i < 6; ++i)
memcpy(&dst[baseListIndex + colorArraySize * i], ar, colorArraySize * sizeof(float));
}
template <typename T>
void QuadStripToList(vector<T> & dst, vector<T> & src, int32_t index)
{
static const int32_t dstStride = 6;
static const int32_t srcStride = 4;
const int32_t baseDstIndex = index * dstStride;
const int32_t baseSrcIndex = index * srcStride;
dst[baseDstIndex] = src[baseSrcIndex];
dst[baseDstIndex + 1] = src[baseSrcIndex + 1];
dst[baseDstIndex + 2] = src[baseSrcIndex + 2];
dst[baseDstIndex + 3] = src[baseSrcIndex + 1];
dst[baseDstIndex + 4] = src[baseSrcIndex + 3];
dst[baseDstIndex + 5] = src[baseSrcIndex + 2];
}
PointF GetShift(dp::Anchor anchor, float width, float height)
{
switch(anchor)
{
case dp::Center: return PointF(-width / 2.0f, -height / 2.0f);
case dp::Left: return PointF(0.0f, -height / 2.0f);
case dp::Right: return PointF(-width, -height / 2.0f);
case dp::Top: return PointF(-width / 2.0f, -height);
case dp::Bottom: return PointF(-width / 2.0f, 0);
case dp::LeftTop: return PointF(0.0f, -height);
case dp::RightTop: return PointF(-width, -height);
case dp::LeftBottom: return PointF(0.0f, 0.0f);
case dp::RightBottom: return PointF(-width, 0.0f);
default: return PointF(0.0f, 0.0f);
}
}
struct Vertex
{
Vertex() {}
Vertex(m2::PointF const & pos, m2::PointF const & dir)
: m_position(pos), m_direction(dir) {}
Vertex(float posX, float posY, float dirX = 0.0f, float dirY = 0.0f)
: m_position(posX, posY), m_direction(dirX, dirY) {}
m2::PointF m_position;
m2::PointF m_direction;
};
struct TexCoord
{
TexCoord() {}
TexCoord(m2::PointF const & tex, float index = 0.0f, float depth = 0.0f)
: m_texCoord(tex), m_index(index), m_depth(depth) {}
TexCoord(float texX, float texY, float index = 0.0f, float depth = 0.0f)
: m_texCoord(texX, texY), m_index(index), m_depth(depth) {}
m2::PointF m_texCoord;
float m_index;
float m_depth;
};
}
void SetColor(vector<float> &dst, float const * ar, int index)
{
uint32_t const colorArraySize = 4;
uint32_t const baseListIndex = ListStride * index;
for (uint32_t i = 0; i < 6; ++i)
memcpy(&dst[baseListIndex + colorArraySize * i], ar, colorArraySize * sizeof(float));
}
template <typename T>
void QuadStripToList(vector<T> & dst, vector<T> & src, int32_t index)
{
static const int32_t dstStride = 6;
static const int32_t srcStride = 4;
const int32_t baseDstIndex = index * dstStride;
const int32_t baseSrcIndex = index * srcStride;
dst[baseDstIndex] = src[baseSrcIndex];
dst[baseDstIndex + 1] = src[baseSrcIndex + 1];
dst[baseDstIndex + 2] = src[baseSrcIndex + 2];
dst[baseDstIndex + 3] = src[baseSrcIndex + 1];
dst[baseDstIndex + 4] = src[baseSrcIndex + 3];
dst[baseDstIndex + 5] = src[baseSrcIndex + 2];
}
struct Vertex
{
Vertex() {}
Vertex(m2::PointF const & pos, m2::PointF const & dir)
: m_position(pos), m_direction(dir) {}
Vertex(float posX, float posY, float dirX = 0.0f, float dirY = 0.0f)
: m_position(posX, posY), m_direction(dirX, dirY) {}
m2::PointF m_position;
m2::PointF m_direction;
};
struct Texture
{
Texture() {}
Texture(m2::PointF const & tex, float depth = 0.0f, float index = 0.0f)
: m_texCoord(tex), m_depth(depth), m_index(index) {}
Texture(float texX, float texY, float depth = 0.0f, float index = 0.0f)
: m_texCoord(texX, texY), m_depth(depth), m_index(index) {}
m2::PointF m_texCoord;
float m_depth;
float m_index;
};
TextShape::TextShape(m2::PointF const & basePoint, TextViewParams const & params)
: m_basePoint(basePoint),
m_params(params)
{
}
PointF getShift(dp::Anchor anchor, float width, float height)
{
switch(anchor)
{
case dp::Center:
return PointF(-width / 2.0f, -height / 2.0f);
break;
case dp::Left:
return PointF(0.0f, -height / 2.0f);
break;
case dp::Right:
return PointF(-width, -height / 2.0f);
break;
case dp::Top:
return PointF(-width / 2.0f, -height);
break;
case dp::Bottom:
return PointF(-width / 2.0f, 0);
break;
case dp::LeftTop:
return PointF(0.0f, -height);
break;
case dp::RightTop:
return PointF(-width, -height);
break;
case dp::LeftBottom:
return PointF(0.0f, 0.0f);
break;
case dp::RightBottom:
return PointF(-width, 0.0f);
break;
default:
return PointF(0.0f, 0.0f);
break;
}
}
void TextShape::addGeometryWithTheSameTextureSet(int setNum, int letterCount, bool auxText,
void TextShape::AddGeometryWithTheSameTextureSet(int setNum, int letterCount, bool auxText,
float maxTextLength, PointF const & anchorDelta,
RefPointer<Batcher> batcher, RefPointer<TextureSetHolder> textures) const
{
@ -147,7 +127,7 @@ void TextShape::addGeometryWithTheSameTextureSet(int setNum, int letterCount, bo
int const numVert = letterCount * 4;
vector<Vertex> vertex(numVert);
vector<Texture> texture(numVert);
vector<TexCoord> texture(numVert);
float stride = 0.0f;
int textureSet;
@ -168,12 +148,11 @@ void TextShape::addGeometryWithTheSameTextureSet(int setNum, int letterCount, bo
textureSet = region.GetTextureNode().m_textureSet;
m2::RectF const rect = region.GetTexRect();
float const textureNum = (float)region.GetTextureNode().m_textureOffset;
float const textureNum = (region.GetTextureNode().m_textureOffset << 1) + needOutline;
m2::PointU pixelSize;
region.GetPixelSize(pixelSize);
m2::PointF const halfSize(pixelSize.x / 2.0, pixelSize.y / 2.0);
float const h = fontSize;
float const w = fontSize * (halfSize.x / halfSize.y);
float const h = pixelSize.y * aspect;
float const w = pixelSize.x * aspect;
yOffset *= aspect;
xOffset *= aspect;
@ -189,17 +168,17 @@ void TextShape::addGeometryWithTheSameTextureSet(int setNum, int letterCount, bo
vertex[index++] = Vertex(m_basePoint, rightBottom);
index = j * 4;
texture[index++] = Texture(rect.minX(), rect.minY(), textureNum * 2.0 + needOutline, m_params.m_depth);
texture[index++] = Texture(rect.minX(), rect.maxY(), textureNum * 2.0 + needOutline, m_params.m_depth);
texture[index++] = Texture(rect.maxX(), rect.minY(), textureNum * 2.0 + needOutline, m_params.m_depth);
texture[index++] = Texture(rect.maxX(), rect.maxY(), textureNum * 2.0 + needOutline, m_params.m_depth);
texture[index++] = TexCoord(rect.minX(), rect.maxY(), textureNum, m_params.m_depth);
texture[index++] = TexCoord(rect.minX(), rect.minY(), textureNum, m_params.m_depth);
texture[index++] = TexCoord(rect.maxX(), rect.maxY(), textureNum, m_params.m_depth);
texture[index++] = TexCoord(rect.maxX(), rect.minY(), textureNum, m_params.m_depth);
j++;
stride += advance;
}
vector<Vertex> vertex2(numVert * 3 / 2);
vector<Texture> texture2(numVert * 3 / 2);
vector<TexCoord> texture2(numVert * 3 / 2);
vector<float> color(numVert * 6);
vector<float> color2(numVert * 6);
@ -268,8 +247,6 @@ void TextShape::addGeometryWithTheSameTextureSet(int setNum, int letterCount, bo
m2::PointD(maxTextLength, bbY),
m_params.m_depth);
handle->SetIsVisible(true);
batcher->InsertTriangleList(state, MakeStackRefPointer(&provider), MovePointer(handle));
}
@ -293,11 +270,11 @@ void TextShape::Draw(RefPointer<Batcher> batcher, RefPointer<TextureSetHolder> t
if (m_params.m_secondaryText.empty())
{
PointF const anchorDelta = getShift(m_params.m_anchor, textLength, fontSize);
PointF const anchorDelta = GetShift(m_params.m_anchor, textLength, fontSize) + m_params.m_primaryOffset;
for(int i = 0; i < maxTextureSetCount ; ++i)
{
if (sizes[i])
addGeometryWithTheSameTextureSet(i, sizes[i], false, textLength, anchorDelta, batcher, textures);
AddGeometryWithTheSameTextureSet(i, sizes[i], false, textLength, anchorDelta, batcher, textures);
}
return;
}
@ -318,22 +295,19 @@ void TextShape::Draw(RefPointer<Batcher> batcher, RefPointer<TextureSetHolder> t
auxTextLength += advance * auxFontSize / realFontSize;
}
float length = textLength > auxTextLength ? textLength : auxTextLength;
PointF const anchorDelta = getShift(m_params.m_anchor, length, fontSize + auxFontSize);
float const length = max(textLength, auxTextLength);
PointF const anchorDelta = GetShift(m_params.m_anchor, length, fontSize + auxFontSize);
float dx = textLength > auxTextLength ? 0.0f : (auxTextLength - textLength) / 2.0f;
PointF const textDelta = PointF(dx, auxFontSize) + anchorDelta;
PointF const textDelta = PointF(dx, auxFontSize) + anchorDelta + m_params.m_primaryOffset;
dx = textLength > auxTextLength ? (textLength - auxTextLength) / 2.0f : 0.0f;
PointF const auxTextDelta = PointF(dx, 0.0f) + anchorDelta;
PointF const auxTextDelta = PointF(dx, 0.0f) + anchorDelta + m_params.m_primaryOffset;
for (int i = 0; i < maxTextureSetCount ; ++i)
{
if (sizes[i])
addGeometryWithTheSameTextureSet(i, sizes[i], false, length, textDelta, batcher, textures);
}
for(int i = 0; i < maxTextureSetCount ; ++i)
{
AddGeometryWithTheSameTextureSet(i, sizes[i], false, length, textDelta, batcher, textures);
if (auxSizes[i])
addGeometryWithTheSameTextureSet(i, auxSizes[i], true, length, auxTextDelta, batcher, textures);
AddGeometryWithTheSameTextureSet(i, auxSizes[i], true, length, auxTextDelta, batcher, textures);
}
}

4
drape_frontend/text_shape.hpp
View file

@ -5,8 +5,6 @@
#include "../geometry/point2d.hpp"
#include "../std/vector.hpp"
namespace df
{
class TextShape : public MapShape
@ -17,7 +15,7 @@ public:
virtual void Draw(RefPointer<Batcher> batcher, RefPointer<TextureSetHolder> textures) const;
private:
void addGeometryWithTheSameTextureSet(int setNum, int letterCount, bool auxText, float maxTextLength, m2::PointF const & anchorDelta,
void AddGeometryWithTheSameTextureSet(int setNum, int letterCount, bool auxText, float maxTextLength, m2::PointF const & anchorDelta,
RefPointer<Batcher> batcher, RefPointer<TextureSetHolder> textures) const;
private:

19
drape_head/testing_engine.cpp
View file

@ -289,7 +289,7 @@ void TestingEngine::Draw()
context->setDefaultFramebuffer();
m_viewport.Apply();
GLFunctions::glClearColor(0.1f, 0.5f, 0.1f, 1.0f);
GLFunctions::glClearColor(0.65f, 0.65f, 0.65f, 1.0f);
GLFunctions::glClear();
TScene::iterator it = m_scene.begin();
@ -353,24 +353,25 @@ void TestingEngine::DrawImpl()
DeleteRange(shapes, DeleteFunctor());
FontDecl fd;
fd.m_color = Color(0, 255, 0, 255);
fd.m_color = Color(0, 80, 240, 255);
fd.m_needOutline = true;
fd.m_outlineColor = Color(255, 0, 0, 255);
fd.m_size = 80.0f;
fd.m_outlineColor = Color(255, 255, 255, 255);
fd.m_size = 40.0f;
FontDecl auxFd;
auxFd.m_color = Color(255, 0, 0, 255);
auxFd.m_needOutline = true;
auxFd.m_color = Color(0, 80, 240, 255);
auxFd.m_needOutline = false;
auxFd.m_outlineColor = Color(0, 255, 0, 255);
auxFd.m_size = 40.0f;
auxFd.m_size = 8.0f;
TextViewParams params;
params.m_featureID = FeatureID(23, 567);
params.m_depth = 10.0f;
params.m_anchor = dp::LeftBottom;
params.m_primaryText = "h";
params.m_primaryOffset = m2::PointF(0,0);
params.m_primaryText = "\u3832\u3830\u3829\u95B0\u95B3\uADAF\uADAA\u2793\u2794";
params.m_primaryTextFont = fd;
params.m_secondaryTextFont = auxFd;
params.m_secondaryText = "this is јџќ®†њѓѕѕў‘‘≠≈µи≠ђи~~™≤";
params.m_secondaryText = "\u3832\u3830\u3829\u95B0\u95B3\uADAF\uADAA\u2793\u2794";
TextShape sh1(m2::PointF(250.0f, 250.0f), params);
sh1.Draw(m_batcher.GetRefPointer(), m_textures.GetRefPointer());