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

fixed getOrthoMatrix, depth comparison and depth clear function.

Browse source
This commit is contained in:
rachytski 2013-02-18 18:18:50 +03:00 • committed by Alex Zolotarev
parent 63f32ba2b1
commit 227c0b868f
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
graphics/coordinates.cpp
View file

@ -12,7 +12,7 @@ namespace graphics
{
m(0, 0) = 2 / (r - l); m(0, 1) = 0; m(0, 2) = 0; m(0, 3) = -(r + l) / (r - l);
m(1, 0) = 0; m(1, 1) = 2 / (t - b);m(1, 2) = 0; m(1, 3) = -(t + b) / (t - b);
m(2, 0) = 0; m(2, 1) = 0; m(2, 2) = -2 / (f - n); m(2, 3) = - (f + n) / (f - n);
m(2, 0) = 0; m(2, 1) = 0; m(2, 2) = 2 / (f - n); m(2, 3) = - (f + n) / (f - n);
m(3, 0) = 0; m(3, 1) = 0; m(3, 2) = 0; m(3, 3) = 1;
}
}

2
graphics/geometry_batcher.hpp
View file

@ -85,7 +85,7 @@ namespace graphics
void enableClipRect(bool flag);
void setClipRect(m2::RectI const & rect);
void clear(Color const & c, bool clearRT = true, float depth = 1.0, bool clearDepth = true);
void clear(Color const & c, bool clearRT = true, float depth = -1.0, bool clearDepth = true);
/// @}
unsigned reservePipelines(vector<shared_ptr<ResourceCache> > const & caches,

4
graphics/opengl/geometry_renderer.cpp
View file

@ -394,7 +394,7 @@ namespace graphics
OGLCHECK(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR));
OGLCHECK(glEnable(GL_DEPTH_TEST));
OGLCHECK(glDepthFunc(GL_LEQUAL));
OGLCHECK(glDepthFunc(GL_GEQUAL));
OGLCHECK(glEnable(GL_BLEND));
OGLCHECK(glDepthMask(GL_TRUE));
@ -464,7 +464,7 @@ namespace graphics
OGLCHECK(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR));
OGLCHECK(glEnable(GL_DEPTH_TEST));
OGLCHECK(glDepthFunc(GL_LEQUAL));
OGLCHECK(glDepthFunc(GL_GEQUAL));
OGLCHECK(glEnable(GL_BLEND));
OGLCHECK(glDepthMask(GL_TRUE));

2
graphics/opengl/renderer.hpp
View file

@ -162,7 +162,7 @@ namespace graphics
/// @warning this function respects the clipping rect set and enabled(!)
/// by the setClipRect/enableClipRect. Whether the clipping is
/// not enabled - the entire currently bound render surface is used.
void clear(graphics::Color const & c, bool clearRT = true, float depth = 1.0, bool clearDepth = true);
void clear(graphics::Color const & c, bool clearRT = true, float depth = -1.0, bool clearDepth = true);
void onSize(unsigned width, unsigned height);

2
map/drawer.hpp
View file

@ -110,7 +110,7 @@ public:
void beginFrame();
void endFrame();
void clear(graphics::Color const & c = graphics::Color(187, 187, 187, 255), bool clearRT = true, float depth = 1.0f, bool clearDepth = true);
void clear(graphics::Color const & c = graphics::Color(187, 187, 187, 255), bool clearRT = true, float depth = -1.0f, bool clearDepth = true);
void onSize(int w, int h);