diff options
author | r.kuznetsov <r.kuznetsov@corp.mail.ru> | 2016-09-06 11:43:03 +0300 |
---|---|---|
committer | r.kuznetsov <r.kuznetsov@corp.mail.ru> | 2016-09-06 15:12:30 +0300 |
commit | b3752b5aacda9fb4b383ee2933467a7bd2f69cf6 (patch) | |
tree | 391789097e2cf38668df3633b6016f1f5f6170c3 /drape | |
parent | feda627f30fd97b62f904c43ca3c8f3f1e608ca0 (diff) |
Added tile-based model view for user marks
Diffstat (limited to 'drape')
-rw-r--r-- | drape/batcher.cpp | 2 | ||||
-rw-r--r-- | drape/shaders/user_mark.vsh | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/drape/batcher.cpp b/drape/batcher.cpp index 0153267db0..ea72fe4f88 100644 --- a/drape/batcher.cpp +++ b/drape/batcher.cpp @@ -262,7 +262,7 @@ Batcher * BatcherFactory::GetNew() const return new Batcher(kIndexBufferSize, kVertexBufferSize); } -SessionGuard::SessionGuard(Batcher & batcher, const Batcher::TFlushFn & flusher) +SessionGuard::SessionGuard(Batcher & batcher, Batcher::TFlushFn const & flusher) : m_batcher(batcher) { m_batcher.StartSession(flusher); diff --git a/drape/shaders/user_mark.vsh b/drape/shaders/user_mark.vsh index d5ab17330f..0fce199d47 100644 --- a/drape/shaders/user_mark.vsh +++ b/drape/shaders/user_mark.vsh @@ -16,10 +16,8 @@ void main(void) if (a_animate > 0.0) normal = u_interpolationT * normal; - // Here we intentionally decrease precision of 'pos' calculation - // to eliminate jittering effect in process of billboard reconstruction. - lowp vec4 p = vec4(a_position, 1) * modelView; - highp vec4 pos = vec4(normal, 0, 0) + p; + vec4 p = vec4(a_position, 1) * modelView; + vec4 pos = vec4(normal, 0, 0) + p; pos = pos * projection; float w = pos.w; pos.xyw = (pivotTransform * vec4(pos.xy, 0.0, w)).xyw; |