kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[ANDROID] fixed text drawing and opengl state applying.

Browse source
This commit is contained in:
rachytski 2011-07-22 00:00:50 +03:00 • committed by Alex Zolotarev
parent e5f6e76b37
commit 66abb8ada5
11 changed files with 20 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
map/framework.cpp
View file

@ -88,8 +88,8 @@ Framework<TModel>::Framework(shared_ptr<WindowHandle> windowHandle,
m_centeringMode(EDoNothing),
m_tileSize(GetPlatform().TileSize())
{
SetRenderPolicy(make_shared_ptr(new RenderPolicyST(windowHandle, bind(&this_type::DrawModel, this, _1, _2, _3, _4))));
//SetRenderPolicy(make_shared_ptr(new TilingRenderPolicyMT(windowHandle, bind(&this_type::DrawModel, this, _1, _2, _3, _4))));
// SetRenderPolicy(make_shared_ptr(new RenderPolicyST(windowHandle, bind(&this_type::DrawModel, this, _1, _2, _3, _4))));
SetRenderPolicy(make_shared_ptr(new TilingRenderPolicyMT(windowHandle, bind(&this_type::DrawModel, this, _1, _2, _3, _4))));
m_informationDisplay.setBottomShift(bottomShift);
#ifdef DRAW_TOUCH_POINTS
m_informationDisplay.enableDebugPoints(true);

4
yg/base_texture.cpp
View file

@ -71,7 +71,9 @@ namespace yg
void BaseTexture::makeCurrent()
{
//if (current() != m_id)
#ifndef OMIM_OS_ANDROID
if (current() != m_id)
#endif
OGLCHECK(glBindTexture(GL_TEXTURE_2D, m_id));
}

19
yg/framebuffer.cpp
View file

@ -25,21 +25,6 @@ namespace yg
return id;
}
void FrameBuffer::pushCurrent()
{
//frameBufferStack.push_back(current());
}
void FrameBuffer::popCurrent()
{
//#ifdef OMIM_GL_ES
// OGLCHECK(glBindFramebufferOES(GL_FRAMEBUFFER_OES, frameBufferStack.back()));
//#else
// OGLCHECK(glBindFramebuffer(GL_FRAMEBUFFER_EXT, frameBufferStack.back()));
//#endif
// frameBufferStack.pop_back();
}
FrameBuffer::FrameBuffer(bool defaultFB /*= false*/) : m_width(0), m_height(0)
{
if (defaultFB)
@ -68,7 +53,9 @@ namespace yg
void FrameBuffer::makeCurrent()
{
//if (m_id != current())
#ifndef OMIM_OS_ANDROID
if (m_id != current())
#endif
{
#ifdef OMIM_GL_ES
OGLCHECK(glBindFramebufferOES(GL_FRAMEBUFFER_OES, m_id));

2
yg/framebuffer.hpp
View file

@ -45,8 +45,6 @@ namespace yg
unsigned height() const;
static unsigned current();
static void pushCurrent();
static void popCurrent();
void checkStatus();
};

4
yg/glyph_layout.cpp
View file

@ -9,6 +9,7 @@
#include "../geometry/angles.hpp"
#include "../geometry/aa_rect2d.hpp"
#include "../base/thread.hpp"
namespace yg
{
@ -81,7 +82,7 @@ namespace yg
m_pivot(pt)
{
m2::RectD limitRect;
m2::PointD curPt;
m2::PointD curPt(0, 0);
bool isFirst = true;
@ -90,6 +91,7 @@ namespace yg
GlyphKey glyphKey(visText[i], fontDesc.m_size, fontDesc.m_isMasked, fontDesc.m_color);
GlyphMetrics const m = glyphCache->getGlyphMetrics(glyphKey);
if (isFirst)
{
limitRect = m2::RectD(m.m_xOffset,

16
yg/indexbuffer.cpp
View file

@ -20,18 +20,6 @@ namespace yg
return id;
}
void IndexBuffer::pushCurrent()
{
// indexBufferStack.push_back(current());
}
void IndexBuffer::popCurrent()
{
// if (indexBufferStack.back() != (unsigned int)-1)
// OGLCHECK(glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indexBufferStack.back()));
// indexBufferStack.pop_back();
}
IndexBuffer::IndexBuffer(bool useVA)
: m_size(0), m_gpuData(0), m_useVA(useVA)
{
@ -114,7 +102,9 @@ namespace yg
if (m_useVA)
return;
//if (m_id != current())
#ifndef OMIM_OS_ANDROID
if (m_id != current())
#endif
OGLCHECK(glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, m_id));
}

3
yg/indexbuffer.hpp
View file

@ -28,10 +28,7 @@ namespace yg
void * glPtr();
static void pushCurrent();
static void popCurrent();
static int current();
};
}
}

21
yg/renderbuffer.cpp
View file

@ -25,25 +25,9 @@ namespace yg
return id;
}
void RenderBuffer::pushCurrent()
{
// renderBufferStack.push_back(current());
}
void RenderBuffer::popCurrent()
{
//#ifdef OMIM_GL_ES
// OGLCHECK(glBindRenderbufferOES(GL_RENDERBUFFER_OES, renderBufferStack.back()));
//#else
// OGLCHECK(glBindRenderbufferEXT(GL_RENDERBUFFER_EXT, renderBufferStack.back()));
//#endif
// renderBufferStack.pop_back();
}
RenderBuffer::RenderBuffer(size_t width, size_t height, bool isDepthBuffer)
: m_isDepthBuffer(isDepthBuffer), m_width(width), m_height(height)
{
pushCurrent();
#ifdef OMIM_GL_ES
OGLCHECK(glGenRenderbuffersOES(1, &m_id));
makeCurrent();
@ -68,7 +52,6 @@ namespace yg
height));
#endif
popCurrent();
}
RenderBuffer::~RenderBuffer()
@ -109,7 +92,9 @@ namespace yg
void RenderBuffer::makeCurrent()
{
//if (m_id != current())
#ifndef OMIM_OS_ANDROID
if (m_id != current())
#endif
{
#ifdef OMIM_GL_ES
OGLCHECK(glBindRenderbufferOES(GL_RENDERBUFFER_OES, m_id));

3
yg/renderbuffer.hpp
View file

@ -33,9 +33,6 @@ namespace yg
unsigned width() const;
unsigned height() const;
static void pushCurrent();
static void popCurrent();
};
}
}

16
yg/vertexbuffer.cpp
View file

@ -20,18 +20,6 @@ namespace yg
return id;
}
void VertexBuffer::pushCurrent()
{
// vertexBufferStack.push_back(current());
}
void VertexBuffer::popCurrent()
{
// if (vertexBufferStack.back() != (unsigned int)-1)
// OGLCHECK(glBindBuffer(GL_ARRAY_BUFFER, vertexBufferStack.back()));
// vertexBufferStack.pop_back();
}
VertexBuffer::VertexBuffer(bool useVA)
: m_size(0), m_gpuData(0), m_useVA(useVA)
{
@ -123,7 +111,9 @@ namespace yg
if (m_useVA)
return;
//if (m_id != current())
#ifndef OMIM_OS_ANDROID
if (m_id != current())
#endif
OGLCHECK(glBindBuffer(GL_ARRAY_BUFFER, m_id));
}

2
yg/vertexbuffer.hpp
View file

@ -30,8 +30,6 @@ namespace yg
void * glPtr() const;
static unsigned current();
static void pushCurrent();
static void popCurrent();
};
}
}