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

renamed screen to geometry_batcher and introduced text_renderer.

Browse source
This commit is contained in:
rachytski 2010-12-28 23:18:29 +02:00 • committed by Alex Zolotarev
parent b301b209c1
commit 4a6c966291
7 changed files with 236 additions and 194 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
omim.pro
View file

@ -19,7 +19,7 @@ SUBDIRS = 3party \
indexer/indexer_tool \
qt_tstfrm \
indexer/indexer_tests \
# yg/yg_tests \
yg/yg_tests \
qt
}

2
qt_tstfrm/tstwidgets.cpp
View file

@ -57,7 +57,7 @@ void GLDrawWidget::initializeGL()
20,
256, 256, 10));*/
m_p = make_shared_ptr(new yg::gl::Screen(m_resourceManager));
m_p = make_shared_ptr(new yg::gl::Screen(m_resourceManager, false));
m_primaryFrameBuffer = make_shared_ptr(new yg::gl::FrameBuffer(true));

58
yg/screen.cpp → yg/geometry_batcher.cpp
View file

@ -1,6 +1,6 @@
#include "../base/SRC_FIRST.hpp"
#include "screen.hpp"
#include "geometry_batcher.hpp"
#include "skin.hpp"
#include "memento.hpp"
#include "color.hpp"
@ -28,7 +28,7 @@ namespace yg
{
namespace gl
{
Screen::Screen(shared_ptr<ResourceManager> const & resourceManager, bool isAntiAliased)
GeometryBatcher::GeometryBatcher(shared_ptr<ResourceManager> const & resourceManager, bool isAntiAliased)
: m_resourceManager(resourceManager), m_isAntiAliased(isAntiAliased)
{
reset(-1);
@ -39,7 +39,7 @@ namespace yg
m_aaShift = m_isAntiAliased ? 1 : 2;
}
void Screen::applyStates()
void GeometryBatcher::applyStates()
{
OGLCHECK(glEnable(GL_TEXTURE_2D));
@ -55,10 +55,10 @@ namespace yg
OGLCHECK(glColor4f(1.0f, 1.0f, 1.0f, 1.0f));
}
Screen::~Screen()
GeometryBatcher::~GeometryBatcher()
{}
void Screen::reset(int pageID)
void GeometryBatcher::reset(int pageID)
{
for (size_t i = 0; i < m_pipelines.size(); ++i)
{
@ -70,17 +70,17 @@ namespace yg
}
}
void Screen::setSkin(shared_ptr<Skin> skin)
void GeometryBatcher::setSkin(shared_ptr<Skin> skin)
{
m_skin = skin;
if (m_skin != 0)
{
m_pipelines.resize(m_skin->pages().size());
m_skin->addOverflowFn(bind(&Screen::flush, this, _1), 100);
m_skin->addOverflowFn(bind(&GeometryBatcher::flush, this, _1), 100);
m_skin->addClearPageFn(bind(&Screen::flush, this, _1), 100);
m_skin->addClearPageFn(bind(&Screen::switchTextures, this, _1), 99);
m_skin->addClearPageFn(bind(&GeometryBatcher::flush, this, _1), 100);
m_skin->addClearPageFn(bind(&GeometryBatcher::switchTextures, this, _1), 99);
for (size_t i = 0; i < m_pipelines.size(); ++i)
{
@ -98,24 +98,24 @@ namespace yg
}
}
shared_ptr<Skin> Screen::skin() const
shared_ptr<Skin> GeometryBatcher::skin() const
{
return m_skin;
}
void Screen::beginFrame()
void GeometryBatcher::beginFrame()
{
base_t::beginFrame();
reset(-1);
}
void Screen::clear(yg::Color const & c, bool clearRT, float depth, bool clearDepth)
void GeometryBatcher::clear(yg::Color const & c, bool clearRT, float depth, bool clearDepth)
{
flush(-1);
base_t::clear(c, clearRT, depth, clearDepth);
}
void Screen::endFrame()
void GeometryBatcher::endFrame()
{
flush(-1);
/// Syncronization point.
@ -124,23 +124,23 @@ namespace yg
base_t::endFrame();
}
bool Screen::hasRoom(size_t verticesCount, size_t indicesCount, int pageID) const
bool GeometryBatcher::hasRoom(size_t verticesCount, size_t indicesCount, int pageID) const
{
return ((m_pipelines[pageID].m_currentVertex + verticesCount <= m_pipelines[pageID].m_maxVertices)
&& (m_pipelines[pageID].m_currentIndex + indicesCount <= m_pipelines[pageID].m_maxIndices));
}
size_t Screen::verticesLeft(int pageID)
size_t GeometryBatcher::verticesLeft(int pageID)
{
return m_pipelines[pageID].m_maxVertices - m_pipelines[pageID].m_currentVertex;
}
size_t Screen::indicesLeft(int pageID)
size_t GeometryBatcher::indicesLeft(int pageID)
{
return m_pipelines[pageID].m_maxIndices - m_pipelines[pageID].m_currentIndex;
}
void Screen::flush(int pageID)
void GeometryBatcher::flush(int pageID)
{
bool renderedData = false;
@ -188,7 +188,7 @@ namespace yg
}
}
void Screen::switchTextures(int pageID)
void GeometryBatcher::switchTextures(int pageID)
{
// if (m_pipelines[pageID].m_currentIndex > 0)
// {
@ -198,7 +198,7 @@ namespace yg
// }
}
void Screen::drawPoint(m2::PointD const & pt, uint32_t styleID, double depth)
void GeometryBatcher::drawPoint(m2::PointD const & pt, uint32_t styleID, double depth)
{
ResourceStyle const * style(m_skin->fromID(styleID));
@ -223,7 +223,7 @@ namespace yg
style->m_pageID);
}
void Screen::drawPath(m2::PointD const * points, size_t pointsCount, uint32_t styleID, double depth)
void GeometryBatcher::drawPath(m2::PointD const * points, size_t pointsCount, uint32_t styleID, double depth)
{
#ifdef PROFILER_YG
prof::block<prof::yg_draw_path> draw_path_block;
@ -373,7 +373,7 @@ namespace yg
}
}
void Screen::drawTriangles(m2::PointD const * points, size_t pointsCount, uint32_t styleID, double depth)
void GeometryBatcher::drawTriangles(m2::PointD const * points, size_t pointsCount, uint32_t styleID, double depth)
{
ResourceStyle const * style = m_skin->fromID(styleID);
if (!hasRoom(pointsCount, (pointsCount - 2) * 3, style->m_pageID))
@ -430,7 +430,7 @@ namespace yg
}
}
void Screen::drawTexturedPolygon(
void GeometryBatcher::drawTexturedPolygon(
m2::PointD const & ptShift,
float angle,
float tx0, float ty0, float tx1, float ty1,
@ -489,7 +489,7 @@ namespace yg
addTexturedVertices(coords, texCoords, 4, depth, pageID);
}
void Screen::addTexturedVertices(m2::PointF const * coords, m2::PointF const * texCoords, unsigned size, double depth, int pageID)
void GeometryBatcher::addTexturedVertices(m2::PointF const * coords, m2::PointF const * texCoords, unsigned size, double depth, int pageID)
{
if (!hasRoom(size, (size - 2) * 3, pageID))
flush(pageID);
@ -519,7 +519,7 @@ namespace yg
m_pipelines[pageID].m_currentIndex += (size - 2) * 3;
}
void Screen::drawGlyph(m2::PointD const & ptOrg, m2::PointD const & ptGlyph, float angle, float blOffset, CharStyle const * p, double depth)
void GeometryBatcher::drawGlyph(m2::PointD const & ptOrg, m2::PointD const & ptGlyph, float angle, float blOffset, CharStyle const * p, double depth)
{
float x0 = ptGlyph.x + (p->m_xOffset - 1);
float y1 = ptGlyph.y - (p->m_yOffset - 1) - blOffset;
@ -537,7 +537,7 @@ namespace yg
p->m_pageID);
}
void Screen::drawText(m2::PointD const & pt, float angle, uint8_t fontSize, string const & utf8Text, double depth)
void GeometryBatcher::drawText(m2::PointD const & pt, float angle, uint8_t fontSize, string const & utf8Text, double depth)
{
wstring text = FromUtf8(utf8Text);
@ -626,7 +626,7 @@ namespace yg
return true;
}
void Screen::drawPathText(m2::PointD const * path, size_t s, uint8_t fontSize, string const & utf8Text,
void GeometryBatcher::drawPathText(m2::PointD const * path, size_t s, uint8_t fontSize, string const & utf8Text,
double pathLength, TextPos pos, bool isMasked, double depth)
{
if (isMasked)
@ -634,7 +634,7 @@ namespace yg
drawPathTextImpl(path, s, fontSize, utf8Text, pathLength, pos, false, depth);
}
void Screen::drawPathTextImpl(m2::PointD const * path, size_t s, uint8_t fontSize, string const & utf8Text,
void GeometryBatcher::drawPathTextImpl(m2::PointD const * path, size_t s, uint8_t fontSize, string const & utf8Text,
double pathLength, TextPos pos, bool fromMask, double depth)
{
pts_array arrPath(path, s);
@ -686,13 +686,13 @@ namespace yg
}
}
void Screen::enableClipRect(bool flag)
void GeometryBatcher::enableClipRect(bool flag)
{
flush(-1);
base_t::enableClipRect(flag);
}
void Screen::setClipRect(m2::RectI const & rect)
void GeometryBatcher::setClipRect(m2::RectI const & rect)
{
flush(-1);
base_t::setClipRect(rect);

173
yg/geometry_batcher.hpp Normal file
View file

@ -0,0 +1,173 @@
#pragma once
#include "vertex.hpp"
#include "texture.hpp"
#include "vertexbuffer.hpp"
#include "indexbuffer.hpp"
#include "renderbuffer.hpp"
#include "framebuffer.hpp"
#include "render_state_updater.hpp"
#include "storage.hpp"
#include "../std/vector.hpp"
#include "../std/string.hpp"
#include "../std/list.hpp"
#include "../std/function.hpp"
#include "../base/matrix.hpp"
#include "../base/start_mem_debug.hpp"
namespace threads
{
class Mutex;
}
namespace yg
{
class Skin;
struct CharStyle;
class ResourceManager;
namespace gl
{
class GeometryBatcher : public RenderStateUpdater
{
public:
typedef function<void()> onFlushFinishedFn;
enum TextPos { under_line, middle_line, above_line };
private:
typedef RenderStateUpdater base_t;
shared_ptr<yg::Skin> m_skin;
struct GeometryPipeline
{
size_t m_currentVertex;
size_t m_currentIndex;
size_t m_maxVertices;
size_t m_maxIndices;
Storage m_storage;
Vertex * m_vertices;
unsigned short * m_indices;
size_t verticesLeft();
size_t indicesLeft();
};
vector<GeometryPipeline> m_pipelines;
bool hasRoom(size_t verticesCount, size_t indicesCount, int pageID) const;
size_t verticesLeft(int pageID);
size_t indicesLeft(int pageID);
void reset(int pageID);
void flush(int pageID);
void switchTextures(int pageID);
/// Apply all states needed for rendering a batch of geometry.
void applyStates();
shared_ptr<ResourceManager> m_resourceManager;
bool m_isAntiAliased;
int m_aaShift;
void drawPathTextImpl(m2::PointD const * path,
size_t s,
uint8_t fontSize,
string const & utf8Text,
double pathLength,
TextPos pos,
bool fromMask,
double depth);
public:
GeometryBatcher(shared_ptr<ResourceManager> const & resourceManager, bool isAntiAliased = false);
~GeometryBatcher();
void setSkin(shared_ptr<Skin> skin);
shared_ptr<Skin> skin() const;
void beginFrame();
void endFrame();
void drawPoint(m2::PointD const & pt,
uint32_t styleID,
double depth);
void drawPath(m2::PointD const * points,
size_t pointsCount,
uint32_t styleID,
double depth);
void drawTriangles(m2::PointD const * points,
size_t pointsCount,
uint32_t styleID,
double depth);
/// Drawing text from point rotated by the angle.
void drawText(m2::PointD const & pt,
float angle,
uint8_t fontSize,
string const & utf8Text,
double depth);
/// Drawing text in the middle of the path.
void drawPathText(m2::PointD const * path,
size_t s,
uint8_t fontSize,
string const & utf8Text,
double pathLength,
TextPos pos,
bool isMasked,
double depth);
/// This functions hide the base_t functions with the same name and signature
/// to flush(-1) upon calling them
/// @{
void enableClipRect(bool flag);
void setClipRect(m2::RectI const & rect);
void clear(yg::Color const & c = yg::Color(192, 192, 192, 255), bool clearRT = true, float depth = 1.0, bool clearDepth = true);
/// @}
private:
void drawGlyph(m2::PointD const & ptOrg,
m2::PointD const & ptGlyph,
float angle,
float blOffset,
CharStyle const * p,
double depth);
/// drawing textured polygon with antialiasing
/// we assume that the (tx0, ty0, tx1, ty1) area on texture is surrounded by (0, 0, 0, 0) pixels,
/// and the 1px interior area is also (0, 0, 0, 0).
void drawTexturedPolygon(
m2::PointD const & ptWhere,
float angle,
float tx0, float ty0, float tx1, float ty1,
float x0, float y0, float x1, float y1,
double depth,
int pageID);
void addTexturedVertices(m2::PointF const * coords,
m2::PointF const * texCoords,
unsigned size,
double depth,
int pageID);
};
}
}
#include "../base/stop_mem_debug.hpp"

165
yg/screen.hpp
View file

@ -1,173 +1,20 @@
#pragma once
#include "vertex.hpp"
#include "texture.hpp"
#include "vertexbuffer.hpp"
#include "indexbuffer.hpp"
#include "renderbuffer.hpp"
#include "framebuffer.hpp"
#include "render_state_updater.hpp"
#include "storage.hpp"
#include "../std/vector.hpp"
#include "../std/string.hpp"
#include "../std/list.hpp"
#include "../std/function.hpp"
#include "../base/matrix.hpp"
#include "../base/start_mem_debug.hpp"
namespace threads
{
class Mutex;
}
#include "text_renderer.hpp"
#include "../std/shared_ptr.hpp"
namespace yg
{
class Skin;
struct CharStyle;
class ResourceManager;
namespace gl
{
class Screen : public RenderStateUpdater
class Screen : public TextRenderer
{
public:
typedef function<void()> onFlushFinishedFn;
enum TextPos { under_line, middle_line, above_line };
private:
typedef RenderStateUpdater base_t;
shared_ptr<yg::Skin> m_skin;
struct GeometryPipeline
{
size_t m_currentVertex;
size_t m_currentIndex;
size_t m_maxVertices;
size_t m_maxIndices;
Storage m_storage;
Vertex * m_vertices;
unsigned short * m_indices;
size_t verticesLeft();
size_t indicesLeft();
};
vector<GeometryPipeline> m_pipelines;
bool hasRoom(size_t verticesCount, size_t indicesCount, int pageID) const;
size_t verticesLeft(int pageID);
size_t indicesLeft(int pageID);
void reset(int pageID);
void flush(int pageID);
void switchTextures(int pageID);
/// Apply all states needed for rendering a batch of geometry.
void applyStates();
shared_ptr<ResourceManager> m_resourceManager;
bool m_isAntiAliased;
int m_aaShift;
void drawPathTextImpl(m2::PointD const * path,
size_t s,
uint8_t fontSize,
string const & utf8Text,
double pathLength,
TextPos pos,
bool fromMask,
double depth);
public:
Screen(shared_ptr<ResourceManager> const & resourceManager, bool isAntiAliased = false);
~Screen();
void setSkin(shared_ptr<Skin> skin);
shared_ptr<Skin> skin() const;
void beginFrame();
void endFrame();
void drawPoint(m2::PointD const & pt,
uint32_t styleID,
double depth);
void drawPath(m2::PointD const * points,
size_t pointsCount,
uint32_t styleID,
double depth);
void drawTriangles(m2::PointD const * points,
size_t pointsCount,
uint32_t styleID,
double depth);
/// Drawing text from point rotated by the angle.
void drawText(m2::PointD const & pt,
float angle,
uint8_t fontSize,
string const & utf8Text,
double depth);
/// Drawing text in the middle of the path.
void drawPathText(m2::PointD const * path,
size_t s,
uint8_t fontSize,
string const & utf8Text,
double pathLength,
TextPos pos,
bool isMasked,
double depth);
/// This functions hide the base_t functions with the same name and signature
/// to flush(-1) upon calling them
/// @{
void enableClipRect(bool flag);
void setClipRect(m2::RectI const & rect);
void clear(yg::Color const & c = yg::Color(192, 192, 192, 255), bool clearRT = true, float depth = 1.0, bool clearDepth = true);
/// @}
private:
void drawGlyph(m2::PointD const & ptOrg,
m2::PointD const & ptGlyph,
float angle,
float blOffset,
CharStyle const * p,
double depth);
/// drawing textured polygon with antialiasing
/// we assume that the (tx0, ty0, tx1, ty1) area on texture is surrounded by (0, 0, 0, 0) pixels,
/// and the 1px interior area is also (0, 0, 0, 0).
void drawTexturedPolygon(
m2::PointD const & ptWhere,
float angle,
float tx0, float ty0, float tx1, float ty1,
float x0, float y0, float x1, float y1,
double depth,
int pageID);
void addTexturedVertices(m2::PointF const * coords,
m2::PointF const * texCoords,
unsigned size,
double depth,
int pageID);
Screen(shared_ptr<yg::ResourceManager> const & rm, bool isAntiAliased)
: TextRenderer(rm, isAntiAliased)
{}
};
}
}
#include "../base/stop_mem_debug.hpp"

20
yg/text_renderer.hpp Normal file
View file

@ -0,0 +1,20 @@
#pragma once
#include "geometry_batcher.hpp"
#include "../std/shared_ptr.hpp"
namespace yg
{
class ResourceManager;
namespace gl
{
class TextRenderer : public GeometryBatcher
{
private:
public:
TextRenderer(shared_ptr<ResourceManager> const & rm, bool isAntiAliased)
: GeometryBatcher(rm, isAntiAliased)
{}
};
}
}

10
yg/yg.pro
View file

@ -30,7 +30,6 @@ SOURCES += \
vertex.cpp \
resource_manager.cpp \
skin.cpp \
screen.cpp \
pen_info.cpp \
resource_style.cpp \
color.cpp \
@ -56,7 +55,8 @@ SOURCES += \
render_state_updater.cpp \
glyph_cache.cpp \
glyph_cache_impl.cpp \
ft2_debug.cpp
ft2_debug.cpp \
geometry_batcher.cpp
HEADERS += \
internal/opengl.hpp \
@ -66,7 +66,6 @@ HEADERS += \
texture.hpp \
skin.hpp \
skin_loader.hpp \
screen.hpp \
pen_info.hpp \
resource_style.hpp \
color.hpp \
@ -95,7 +94,10 @@ HEADERS += \
glyph_cache.hpp \
data_formats.hpp \
glyph_cache_impl.hpp \
ft2_debug.hpp
ft2_debug.hpp \
text_renderer.hpp \
geometry_batcher.hpp \
screen.hpp
!iphonesimulator-g++42 {
!iphonedevice-g++42 {