Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'drape_frontend/frontend_renderer.cpp')
-rw-r--r--drape_frontend/frontend_renderer.cpp24
1 files changed, 7 insertions, 17 deletions
diff --git a/drape_frontend/frontend_renderer.cpp b/drape_frontend/frontend_renderer.cpp
index 13218f7249..8d0c1ccb27 100644
--- a/drape_frontend/frontend_renderer.cpp
+++ b/drape_frontend/frontend_renderer.cpp
@@ -2,12 +2,14 @@
#include "drape_frontend/message_subclasses.hpp"
#include "drape_frontend/visual_params.hpp"
+#include "drape/utils/projection.hpp"
+
+#include "geometry/any_rect2d.hpp"
+
#include "base/timer.hpp"
#include "base/assert.hpp"
#include "base/stl_add.hpp"
-#include "geometry/any_rect2d.hpp"
-
#include "std/bind.hpp"
#include "std/cmath.hpp"
@@ -25,18 +27,6 @@ const double VSyncInterval = 0.014;
//const double InitAvarageTimePerMessage = 0.001;
#endif
-void OrthoMatrix(float * m, float left, float right, float bottom, float top, float nearClip, float farClip)
-{
- memset(m, 0, 16 * sizeof(float));
- m[0] = 2.0f / (right - left);
- m[3] = - (right + left) / (right - left);
- m[5] = 2.0f / (top - bottom);
- m[7] = - (top + bottom) / (top - bottom);
- m[10] = -2.0f / (farClip - nearClip);
- m[11] = - (farClip + nearClip) / (farClip - nearClip);
- m[15] = 1.0;
-}
-
} // namespace
FrontendRenderer::FrontendRenderer(dp::RefPointer<ThreadsCommutator> commutator,
@@ -230,10 +220,10 @@ void FrontendRenderer::RenderScene()
void FrontendRenderer::RefreshProjection()
{
- float m[4*4];
+ array<float, 16> m;
- OrthoMatrix(m, 0.0f, m_viewport.GetWidth(), m_viewport.GetHeight(), 0.0f, -20000.0f, 20000.0f);
- m_generalUniforms.SetMatrix4x4Value("projection", m);
+ dp::MakeProjection(m, 0.0f, m_viewport.GetWidth(), m_viewport.GetHeight(), 0.0f);
+ m_generalUniforms.SetMatrix4x4Value("projection", m.data());
}
void FrontendRenderer::RefreshModelView()