diff options
| author | ExMix <rahuba.youri@mapswithme.com> | 2014-07-30 15:44:09 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 02:22:49 +0300 |
| commit | 64b07cb6dd0d2fe5685d89a73a4f51dafbdb4e11 (patch) | |
| tree | dd2cabb4af67306c44bf52ed72e840191bdf6592 | |
| parent | 7a3c714e48697e44f2be66d27e90981b59b06959 (diff) | |
[drape] move drape into dp namespace
116 files changed, 748 insertions, 385 deletions
diff --git a/drape/attribute_buffer_mutator.cpp b/drape/attribute_buffer_mutator.cpp index 88a2650179..465a25b78a 100644 --- a/drape/attribute_buffer_mutator.cpp +++ b/drape/attribute_buffer_mutator.cpp @@ -1,6 +1,11 @@ #include "attribute_buffer_mutator.hpp" +namespace dp +{ + void AttributeBufferMutator::AddMutation(BindingInfo const & info, MutateNode const & node) { m_data[info].push_back(node); } + +} // namespace dp diff --git a/drape/attribute_buffer_mutator.hpp b/drape/attribute_buffer_mutator.hpp index bc80b60196..150defcd64 100644 --- a/drape/attribute_buffer_mutator.hpp +++ b/drape/attribute_buffer_mutator.hpp @@ -6,6 +6,9 @@ #include "../std/stdint.hpp" #include "../std/map.hpp" +namespace dp +{ + struct MutateRegion { MutateRegion() : m_offset(0), m_count(0) {} @@ -35,3 +38,5 @@ private: private: TMutateData m_data; }; + +} // namespace dp diff --git a/drape/attribute_provider.cpp b/drape/attribute_provider.cpp index a832ed50f1..3efc106de0 100644 --- a/drape/attribute_provider.cpp +++ b/drape/attribute_provider.cpp @@ -12,6 +12,9 @@ #define INIT_STREAM(x) UNUSED_VALUE((x)) #endif +namespace dp +{ + AttributeProvider::AttributeProvider(uint8_t streamCount, uint16_t vertexCount) : m_vertexCount(vertexCount) { @@ -93,3 +96,5 @@ void AttributeProvider::InitCheckStream(uint8_t streamIndex) m_checkInfo[streamIndex] = true; } #endif + +} diff --git a/drape/attribute_provider.hpp b/drape/attribute_provider.hpp index 83658b5670..fb371a96f7 100644 --- a/drape/attribute_provider.hpp +++ b/drape/attribute_provider.hpp @@ -5,6 +5,9 @@ #include "../std/vector.hpp" +namespace dp +{ + class AttributeProvider { public: @@ -39,3 +42,5 @@ private: vector<bool> m_checkInfo; #endif }; + +} // namespace dp diff --git a/drape/batcher.cpp b/drape/batcher.cpp index b784b1bdfd..692f0a04ef 100644 --- a/drape/batcher.cpp +++ b/drape/batcher.cpp @@ -7,6 +7,9 @@ #include "../std/bind.hpp" +namespace dp +{ + class Batcher::CallbacksWrapper { public: @@ -219,3 +222,5 @@ void Batcher::InsertTriangles(GLState const & state, if (!handle.IsNull()) bucket->AddOverlayHandle(handle.Move()); } + +} // namespace dp
\ No newline at end of file diff --git a/drape/batcher.hpp b/drape/batcher.hpp index 584479d13f..01b11b5ad4 100644 --- a/drape/batcher.hpp +++ b/drape/batcher.hpp @@ -9,6 +9,10 @@ #include "../std/map.hpp" #include "../std/function.hpp" + +namespace dp +{ + class RenderBucket; class AttributeProvider; class OverlayHandle; @@ -65,3 +69,5 @@ private: uint32_t m_indexBufferSize; uint32_t m_vertexBufferSize; }; + +} // namespace dp diff --git a/drape/batcher_helpers.cpp b/drape/batcher_helpers.cpp index a1ae3f29a6..c92f9193b1 100644 --- a/drape/batcher_helpers.cpp +++ b/drape/batcher_helpers.cpp @@ -6,6 +6,9 @@ #include "../std/algorithm.hpp" +namespace dp +{ + namespace { @@ -449,3 +452,5 @@ void TriangleListOfStripBatch::GenerateIndexes(uint16_t * indexStorage, uint16_t uint8_t const vertexStride = GetVertexStride(); generate(indexStorage, indexStorage + count, ListOfStriptGenerator(startIndex, vertexStride, VtoICount(vertexStride))); } + +} // namespace dp
\ No newline at end of file diff --git a/drape/batcher_helpers.hpp b/drape/batcher_helpers.hpp index 914de48aed..844083c02b 100644 --- a/drape/batcher_helpers.hpp +++ b/drape/batcher_helpers.hpp @@ -4,6 +4,9 @@ #include "../std/function.hpp" +namespace dp +{ + class AttributeProvider; class BindingInfo; @@ -119,3 +122,5 @@ protected: virtual uint16_t AlignVCount(uint16_t vCount) const; virtual void GenerateIndexes(uint16_t * indexStorage, uint16_t count, uint16_t startIndex) const; }; + +} // namespace dp diff --git a/drape/binding_info.cpp b/drape/binding_info.cpp index 92aca9b9fa..95d5ce5624 100644 --- a/drape/binding_info.cpp +++ b/drape/binding_info.cpp @@ -2,6 +2,9 @@ #include "../base/assert.hpp" +namespace dp +{ + namespace { @@ -120,3 +123,5 @@ bool BindingInfo::operator<(BindingInfo const & other) const return false; } + +} // namespace dp diff --git a/drape/binding_info.hpp b/drape/binding_info.hpp index 026403c3ba..d334f6fbb6 100644 --- a/drape/binding_info.hpp +++ b/drape/binding_info.hpp @@ -5,6 +5,9 @@ #include "../std/string.hpp" #include "../std/shared_array.hpp" +namespace dp +{ + struct BindingDecl { string m_attributeName; @@ -37,3 +40,5 @@ protected: shared_array<BindingDecl> m_bindings; uint16_t m_info; }; + +} // namespace dp diff --git a/drape/buffer_base.cpp b/drape/buffer_base.cpp index c5e2774a74..7e97ca7cfa 100644 --- a/drape/buffer_base.cpp +++ b/drape/buffer_base.cpp @@ -1,6 +1,9 @@ #include "buffer_base.hpp" #include "../base/assert.hpp" +namespace dp +{ + BufferBase::BufferBase(uint8_t elementSize, uint16_t capacity) : m_elementSize(elementSize) , m_capacity(capacity) @@ -45,3 +48,5 @@ void BufferBase::UploadData(uint16_t elementCount) ASSERT(m_size + elementCount <= m_capacity, ()); m_size += elementCount; } + +} // namespace dp diff --git a/drape/buffer_base.hpp b/drape/buffer_base.hpp index bad4683305..a27f49f2cf 100644 --- a/drape/buffer_base.hpp +++ b/drape/buffer_base.hpp @@ -2,6 +2,9 @@ #include "../std/stdint.hpp" +namespace dp +{ + class BufferBase { public: @@ -22,3 +25,5 @@ private: uint16_t m_capacity; uint16_t m_size; }; + +} // namespace dp diff --git a/drape/color.cpp b/drape/color.cpp index 91b422558a..ad60134abf 100644 --- a/drape/color.cpp +++ b/drape/color.cpp @@ -1,5 +1,8 @@ #include "color.hpp" +namespace dp +{ + namespace { @@ -86,3 +89,30 @@ void Convert(Color const & c, float & r, float & g, float & b, float & a) b = c.m_blue / (float)MaxChannelValue; a = c.m_alfa / (float)MaxChannelValue; } + +ColorF::ColorF(Color const & clr) +{ + Convert(clr, m_r, m_g, m_b, m_a); +} + +bool ColorF::operator< (ColorF const & other) const +{ + if (other.m_r != m_r) + return m_r < other.m_r; + if (other.m_g != m_g) + return m_g < other.m_g; + if (other.m_b != m_b) + return m_b < other.m_b; + + return m_a < other.m_a; +} + +bool ColorF::operator== (ColorF const & other) const +{ + return m_r == other.m_r && + m_g == other.m_g && + m_b == other.m_b && + m_a == other.m_a; +} + +} // namespace dp diff --git a/drape/color.hpp b/drape/color.hpp index c96e5fdef2..fb71eafa2e 100644 --- a/drape/color.hpp +++ b/drape/color.hpp @@ -2,28 +2,32 @@ #include "../std/stdint.hpp" +namespace dp +{ + struct Color { Color(); Color(uint8_t red, uint8_t green, uint8_t blue, uint8_t alfa); + bool operator < (Color const & other) const; + bool operator == (Color const & other) const; + uint8_t m_red; uint8_t m_green; uint8_t m_blue; uint8_t m_alfa; - - bool operator < (Color const & other) const; - bool operator == (Color const & other) const; }; struct ColorF { ColorF() {} - ColorF(Color const & clr) - : m_r(clr.m_red / 255.0f), m_g(clr.m_green / 255.0f), - m_b(clr.m_blue / 255.0f), m_a(clr.m_alfa / 255.0f) {} + ColorF(Color const & clr); ColorF(float r, float g, float b, float a) : m_r (r), m_g (g), m_b (b), m_a (a) {} + bool operator < (ColorF const & other) const; + bool operator == (ColorF const & other) const; + float m_r; float m_g; float m_b; @@ -38,4 +42,4 @@ Color Extract(uint32_t argb); Color Extract(uint32_t xrgb, uint8_t a); void Convert(Color const & c, float & r, float & g, float & b, float & a); - +} diff --git a/drape/cpu_buffer.cpp b/drape/cpu_buffer.cpp index b011089ce2..3ba8abe26d 100644 --- a/drape/cpu_buffer.cpp +++ b/drape/cpu_buffer.cpp @@ -6,6 +6,9 @@ #include "../std/cstring.hpp" +namespace dp +{ + CPUBuffer::CPUBuffer(uint8_t elementSize, uint16_t capacity) : base_t(elementSize, capacity) { @@ -61,3 +64,5 @@ unsigned char * CPUBuffer::GetCursor() const { return m_memoryCursor; } + +} // namespace dp diff --git a/drape/cpu_buffer.hpp b/drape/cpu_buffer.hpp index d96b3dbf09..a0bff314b6 100644 --- a/drape/cpu_buffer.hpp +++ b/drape/cpu_buffer.hpp @@ -5,6 +5,9 @@ #include "../std/vector.hpp" #include "../std/shared_ptr.hpp" +namespace dp +{ + class CPUBuffer : public BufferBase { typedef BufferBase base_t; @@ -28,3 +31,5 @@ private: unsigned char * m_memoryCursor; shared_ptr<vector<unsigned char> > m_memory; }; + +} //namespace dp diff --git a/drape/data_buffer.cpp b/drape/data_buffer.cpp index 71acbb0392..961ed65412 100644 --- a/drape/data_buffer.cpp +++ b/drape/data_buffer.cpp @@ -1,6 +1,11 @@ #include "data_buffer.hpp" +namespace dp +{ + DataBuffer::DataBuffer(uint8_t elementSize, uint16_t capacity) : GPUBuffer(GPUBuffer::ElementBuffer, elementSize, capacity) { } + +} diff --git a/drape/data_buffer.hpp b/drape/data_buffer.hpp index ab241166ae..0607d6469a 100644 --- a/drape/data_buffer.hpp +++ b/drape/data_buffer.hpp @@ -2,9 +2,14 @@ #include "gpu_buffer.hpp" +namespace dp +{ + class DataBuffer : public GPUBuffer { public: DataBuffer(uint8_t elementSize, uint16_t capacity); }; +} // namespace dp + diff --git a/drape/drape_tests/attribute_provides_tests.cpp b/drape/drape_tests/attribute_provides_tests.cpp index 6ea7f94f8a..3713ea864b 100644 --- a/drape/drape_tests/attribute_provides_tests.cpp +++ b/drape/drape_tests/attribute_provides_tests.cpp @@ -4,6 +4,8 @@ #include <gmock/gmock.h> +using namespace dp; + UNIT_TEST(InitStreamsTest) { int const VERTEX_COUNT = 10; diff --git a/drape/drape_tests/batcher_tests.cpp b/drape/drape_tests/batcher_tests.cpp index 64801bfcc6..0ab82b4132 100644 --- a/drape/drape_tests/batcher_tests.cpp +++ b/drape/drape_tests/batcher_tests.cpp @@ -24,6 +24,7 @@ using testing::InSequence; using testing::Invoke; using testing::IgnoreResult; using testing::AnyOf; +using namespace dp; namespace { diff --git a/drape/drape_tests/bingind_info_tests.cpp b/drape/drape_tests/bingind_info_tests.cpp index 3b990a0377..d78231916d 100644 --- a/drape/drape_tests/bingind_info_tests.cpp +++ b/drape/drape_tests/bingind_info_tests.cpp @@ -2,6 +2,8 @@ #include "../../drape/binding_info.hpp" +using namespace dp; + UNIT_TEST(BindingInfoIDTest) { { diff --git a/drape/drape_tests/buffer_tests.cpp b/drape/drape_tests/buffer_tests.cpp index dbac3aae5a..21f2788eec 100644 --- a/drape/drape_tests/buffer_tests.cpp +++ b/drape/drape_tests/buffer_tests.cpp @@ -12,6 +12,7 @@ using namespace emul; using ::testing::_; using ::testing::Return; using ::testing::InSequence; +using namespace dp; UNIT_TEST(CreateDestroyDataBufferTest) { diff --git a/drape/drape_tests/font_texture_tests.cpp b/drape/drape_tests/font_texture_tests.cpp index 536b807b91..c7fe334078 100644 --- a/drape/drape_tests/font_texture_tests.cpp +++ b/drape/drape_tests/font_texture_tests.cpp @@ -14,6 +14,7 @@ using ::testing::_; using ::testing::Return; using ::testing::InSequence; using ::testing::AnyNumber; +using namespace dp; namespace { diff --git a/drape/drape_tests/pointers_tests.cpp b/drape/drape_tests/pointers_tests.cpp index 5715b8a6b3..6448cfc7cb 100644 --- a/drape/drape_tests/pointers_tests.cpp +++ b/drape/drape_tests/pointers_tests.cpp @@ -15,6 +15,7 @@ using ::testing::MatchResultListener; using ::testing::Matcher; using my::SrcPoint; +using namespace dp; namespace { @@ -48,6 +49,7 @@ void MyOnAssertFailed(SrcPoint const & src, string const & msg) g_asserter->Assert(src, msg); } +#if defined(CHECK_POINTERS) MockAssertExpector * InitAsserter() { if (g_asserter != NULL) @@ -66,6 +68,7 @@ void DestroyAsserter() delete g_asserter; g_asserter = NULL; } +#endif SrcPoint ConstructSrcPoint(char const * fileName, char const * function) { diff --git a/drape/drape_tests/uniform_value_tests.cpp b/drape/drape_tests/uniform_value_tests.cpp index d1aeb18b97..32fdf92738 100644 --- a/drape/drape_tests/uniform_value_tests.cpp +++ b/drape/drape_tests/uniform_value_tests.cpp @@ -17,6 +17,7 @@ using ::testing::AnyOf; using ::testing::IgnoreResult; using ::testing::Invoke; using ::testing::InSequence; +using namespace dp; namespace { diff --git a/drape/font_texture.cpp b/drape/font_texture.cpp index df87a1642e..1fe1b234eb 100644 --- a/drape/font_texture.cpp +++ b/drape/font_texture.cpp @@ -30,6 +30,9 @@ typedef gray8c_view_t const_view_t; typedef gray8_pixel_t pixel_t; typedef gray8c_pixel_t const_pixel_t; +namespace dp +{ + FontTexture::GlyphInfo::GlyphInfo(m2::RectF const & texRect, float xOffset, float yOffset, float advance) : ResourceInfo(texRect) @@ -251,3 +254,5 @@ void LoadFont(string const & resourcePrefix, vector<TransferPointer<Texture> > & grid.ParseMetrics(metrics); grid.GetTextures(textures); } + +} // namespace dp diff --git a/drape/font_texture.hpp b/drape/font_texture.hpp index 9edb92fc68..d3750d32da 100644 --- a/drape/font_texture.hpp +++ b/drape/font_texture.hpp @@ -7,6 +7,9 @@ #include "../std/vector.hpp" #include "../std/string.hpp" +namespace dp +{ + class FontTexture : public Texture { public: @@ -47,3 +50,5 @@ private: }; void LoadFont(string const & resourcePrefix, vector<TransferPointer<Texture> > & textures); + +} diff --git a/drape/glextensions_list.cpp b/drape/glextensions_list.cpp index e18bba571f..0f255ba868 100644 --- a/drape/glextensions_list.cpp +++ b/drape/glextensions_list.cpp @@ -5,6 +5,9 @@ #include "../std/string.hpp" +namespace dp +{ + #ifdef DEBUG #include "../std/map.hpp" @@ -85,3 +88,5 @@ bool GLExtensionsList::IsSupported(ExtensionName const & extName) const { return m_impl->IsSupported(extName); } + +} // namespace dp diff --git a/drape/glextensions_list.hpp b/drape/glextensions_list.hpp index 6aa9fb6e21..55f714cc83 100644 --- a/drape/glextensions_list.hpp +++ b/drape/glextensions_list.hpp @@ -2,6 +2,9 @@ #include "../std/noncopyable.hpp" +namespace dp +{ + class GLExtensionsList : private noncopyable { public: @@ -24,3 +27,5 @@ private: class Impl; Impl * m_impl; }; + +} // namespace dp diff --git a/drape/glfunctions.cpp b/drape/glfunctions.cpp index 5265d65a6e..3e1a694176 100644 --- a/drape/glfunctions.cpp +++ b/drape/glfunctions.cpp @@ -317,8 +317,7 @@ void * GLFunctions::glMapBuffer(glConst target) void GLFunctions::glUnmapBuffer(glConst target) { ASSERT(glUnmapBufferFn != NULL, ()); - GLboolean result = glUnmapBufferFn(target); - ASSERT(result == GL_TRUE, ()); + VERIFY(glUnmapBufferFn(target) == GL_TRUE, ()); GLCHECKCALL(); } diff --git a/drape/glstate.cpp b/drape/glstate.cpp index 60462af542..be5715b1d8 100644 --- a/drape/glstate.cpp +++ b/drape/glstate.cpp @@ -7,6 +7,9 @@ #define COLOR_BIT 0x1 #define TEXTURE_BIT 0x2 +namespace dp +{ + Blending::Blending(bool isEnabled) : m_isEnabled(isEnabled) , m_blendFunction(gl_const::GLAddBlend) @@ -129,7 +132,7 @@ void ApplyState(GLState state, RefPointer<GpuProgram> program, { int8_t location = program->GetUniformLocation("u_color"); float c[4]; - ::Convert(state.GetColor(), c[0], c[1], c[2], c[3]); + Convert(state.GetColor(), c[0], c[1], c[2], c[3]); GLFunctions::glUniformValuef(location, c[0], c[1], c[2], c[3]); } @@ -148,3 +151,5 @@ void ApplyState(GLState state, RefPointer<GpuProgram> program, state.GetBlending().Apply(); } + +} diff --git a/drape/glstate.hpp b/drape/glstate.hpp index eaa87ec014..f39781d4dc 100644 --- a/drape/glstate.hpp +++ b/drape/glstate.hpp @@ -5,6 +5,9 @@ #include "texture_set_controller.hpp" #include "color.hpp" +namespace dp +{ + struct Blending { Blending(bool isEnabled = false); @@ -61,3 +64,5 @@ private: void ApplyUniforms(UniformValuesStorage const & uniforms, RefPointer<GpuProgram> program); void ApplyState(GLState state, RefPointer<GpuProgram> program, RefPointer<TextureSetController> textures); + +} // namespace dp diff --git a/drape/gpu_buffer.cpp b/drape/gpu_buffer.cpp index e34e59175b..6c76f52d4d 100644 --- a/drape/gpu_buffer.cpp +++ b/drape/gpu_buffer.cpp @@ -6,6 +6,8 @@ #include "../std/cstring.hpp" +namespace dp +{ namespace { @@ -156,3 +158,5 @@ void GPUBufferMapper::UpdateData(void const * data, uint16_t elementOffset, uint uint32_t GPUBufferMapper::m_mappedDataBuffer; uint32_t GPUBufferMapper::m_mappedIndexBuffer; #endif + +} // namespace dp diff --git a/drape/gpu_buffer.hpp b/drape/gpu_buffer.hpp index 4593f1813d..572ab88403 100644 --- a/drape/gpu_buffer.hpp +++ b/drape/gpu_buffer.hpp @@ -3,6 +3,9 @@ #include "pointers.hpp" #include "buffer_base.hpp" +namespace dp +{ + class GPUBuffer : public BufferBase { typedef BufferBase base_t; @@ -55,3 +58,5 @@ private: RefPointer<GPUBuffer> m_buffer; void * m_gpuPtr; }; + +} // namespace dp diff --git a/drape/gpu_program.cpp b/drape/gpu_program.cpp index 81ea373d7c..b0e13f2bda 100644 --- a/drape/gpu_program.cpp +++ b/drape/gpu_program.cpp @@ -6,7 +6,12 @@ #ifdef DEBUG #include "../std/map.hpp" +#endif + +namespace dp +{ +#ifdef DEBUG class UniformValidator { private: @@ -92,3 +97,5 @@ int8_t GpuProgram::GetUniformLocation(string const & uniformName) const { return GLFunctions::glGetUniformLocation(m_programID, uniformName); } + +} // namespace dp diff --git a/drape/gpu_program.hpp b/drape/gpu_program.hpp index f10f2f7991..a6e65136ee 100644 --- a/drape/gpu_program.hpp +++ b/drape/gpu_program.hpp @@ -8,7 +8,12 @@ #ifdef DEBUG #include "../std/scoped_ptr.hpp" +#endif + +namespace dp +{ +#ifdef DEBUG class UniformValidator; typedef int32_t UniformSize; typedef pair<glConst, UniformSize> UniformTypeAndSize; @@ -37,3 +42,5 @@ public: bool HasUniform(string const & name, glConst type, UniformSize size); #endif }; + +} // namespace dp diff --git a/drape/gpu_program_manager.cpp b/drape/gpu_program_manager.cpp index c048ff3b08..71cb7c178d 100644 --- a/drape/gpu_program_manager.cpp +++ b/drape/gpu_program_manager.cpp @@ -4,6 +4,9 @@ #include "../base/stl_add.hpp" #include "../base/assert.hpp" +namespace dp +{ + namespace { @@ -67,3 +70,5 @@ RefPointer<Shader> GpuProgramManager::GetShader(int index, string const & source else return it->second.GetRefPointer(); } + +} // namespace dp diff --git a/drape/gpu_program_manager.hpp b/drape/gpu_program_manager.hpp index cf3aeb4ef4..e3d27dd04d 100644 --- a/drape/gpu_program_manager.hpp +++ b/drape/gpu_program_manager.hpp @@ -7,6 +7,9 @@ #include "../std/map.hpp" #include "../std/noncopyable.hpp" +namespace dp +{ + class GpuProgramManager : public noncopyable { public: @@ -23,3 +26,5 @@ private: program_map_t m_programs; shader_map_t m_shaders; }; + +} // namespace dp diff --git a/drape/index_buffer.cpp b/drape/index_buffer.cpp index 2d6dd0edf0..d2607123ea 100644 --- a/drape/index_buffer.cpp +++ b/drape/index_buffer.cpp @@ -1,5 +1,8 @@ #include "index_buffer.hpp" +namespace dp +{ + IndexBuffer::IndexBuffer(uint16_t capacity) : GPUBuffer(GPUBuffer::IndexBuffer, sizeof(uint16_t), capacity) { @@ -15,3 +18,5 @@ void IndexBuffer::UpdateData(uint16_t const * data, uint16_t size) GPUBuffer::Resize(size); UploadData(data, size); } + +} // namespace dp diff --git a/drape/index_buffer.hpp b/drape/index_buffer.hpp index 899a8c066d..14fe83b63c 100644 --- a/drape/index_buffer.hpp +++ b/drape/index_buffer.hpp @@ -2,6 +2,9 @@ #include "gpu_buffer.hpp" +namespace dp +{ + class IndexBuffer : public GPUBuffer { public: @@ -12,3 +15,5 @@ public: /// resize buffer to new size, and discard old data void UpdateData(uint16_t const * data, uint16_t size); }; + +} // namespace dp diff --git a/drape/index_buffer_mutator.cpp b/drape/index_buffer_mutator.cpp index 637c79b711..48a5e7876c 100644 --- a/drape/index_buffer_mutator.cpp +++ b/drape/index_buffer_mutator.cpp @@ -4,6 +4,9 @@ #include "../std/cstring.hpp" // for memcpy #include "../std/algorithm.hpp" // for max +namespace dp +{ + IndexBufferMutator::IndexBufferMutator(uint16_t baseSize) : m_activeSize(0) { @@ -30,3 +33,4 @@ uint16_t IndexBufferMutator::GetIndexCount() const return m_activeSize; } +} // namespace dp diff --git a/drape/index_buffer_mutator.hpp b/drape/index_buffer_mutator.hpp index 44884ff539..62fb81f57e 100644 --- a/drape/index_buffer_mutator.hpp +++ b/drape/index_buffer_mutator.hpp @@ -2,6 +2,9 @@ #include "pointers.hpp" +namespace dp +{ + class VertexArrayBuffer; class IndexBufferMutator @@ -20,3 +23,5 @@ private: vector<uint16_t> m_buffer; uint16_t m_activeSize; }; + +} // namespace dp diff --git a/drape/oglcontext.hpp b/drape/oglcontext.hpp index 942e3ef748..5581a75a0e 100644 --- a/drape/oglcontext.hpp +++ b/drape/oglcontext.hpp @@ -1,5 +1,8 @@ #pragma once +namespace dp +{ + class OGLContext { public: @@ -8,3 +11,5 @@ public: virtual void makeCurrent() = 0; virtual void setDefaultFramebuffer() = 0; }; + +} // namespace dp diff --git a/drape/oglcontextfactory.cpp b/drape/oglcontextfactory.cpp index 6a9aeb4a42..90665fd0d4 100644 --- a/drape/oglcontextfactory.cpp +++ b/drape/oglcontextfactory.cpp @@ -1,5 +1,7 @@ #include "oglcontextfactory.hpp" +namespace dp +{ ThreadSafeFactory::ThreadSafeFactory(OGLContextFactory * factory) : m_factory(factory) @@ -22,3 +24,5 @@ OGLContext *ThreadSafeFactory::getResourcesUploadContext() threads::MutexGuard lock(m_mutex); return m_factory->getResourcesUploadContext(); } + +} // namespace dp diff --git a/drape/oglcontextfactory.hpp b/drape/oglcontextfactory.hpp index 47730fa54a..0eae1995ad 100644 --- a/drape/oglcontextfactory.hpp +++ b/drape/oglcontextfactory.hpp @@ -4,6 +4,9 @@ #include "../base/mutex.hpp" +namespace dp +{ + class OGLContextFactory { public: @@ -24,3 +27,5 @@ private: OGLContextFactory * m_factory; threads::Mutex m_mutex; }; + +} // namespace dp diff --git a/drape/overlay_handle.cpp b/drape/overlay_handle.cpp index 4dc0e07588..f720bdc970 100644 --- a/drape/overlay_handle.cpp +++ b/drape/overlay_handle.cpp @@ -2,6 +2,9 @@ #include "../base/macros.hpp" +namespace dp +{ + struct OverlayHandle::OffsetNodeFinder { public: @@ -117,3 +120,5 @@ m2::RectD SquareHandle::GetPixelRect(ScreenBase const & screen) const result.Offset(offset); return result; } + +} // namespace dp diff --git a/drape/overlay_handle.hpp b/drape/overlay_handle.hpp index 41776b01b6..1106dffdc8 100644 --- a/drape/overlay_handle.hpp +++ b/drape/overlay_handle.hpp @@ -11,6 +11,8 @@ #include "../geometry/point2d.hpp" #include "../geometry/rect2d.hpp" +namespace dp +{ class OverlayHandle { @@ -78,3 +80,5 @@ private: m2::PointD m_gbPivot; m2::PointD m_pxHalfSize; }; + +} // namespace dp diff --git a/drape/overlay_tree.cpp b/drape/overlay_tree.cpp index 3fb4ccde64..172d69a1ef 100644 --- a/drape/overlay_tree.cpp +++ b/drape/overlay_tree.cpp @@ -2,6 +2,9 @@ #include "../std/bind.hpp" +namespace dp +{ + void OverlayTree::StartOverlayPlacing(ScreenBase const & screen, bool canOverlap) { m_modelView = screen; @@ -104,3 +107,5 @@ void OverlayTree::FindIntersectedFunctor::operator()(OverlayTree::Node const & n if (isIntersect) m_intersections.push_back(&node); } + +} // namespace dp diff --git a/drape/overlay_tree.hpp b/drape/overlay_tree.hpp index 6cfe68cd9b..29344086af 100644 --- a/drape/overlay_tree.hpp +++ b/drape/overlay_tree.hpp @@ -7,6 +7,9 @@ #include "../std/kdtree.hpp" +namespace dp +{ + class OverlayTree { public: @@ -59,3 +62,5 @@ private: find_result_t & m_intersections; }; }; + +} // namespace dp diff --git a/drape/pointers.cpp b/drape/pointers.cpp index 3ffdd24045..a59107e5c9 100644 --- a/drape/pointers.cpp +++ b/drape/pointers.cpp @@ -1,5 +1,8 @@ #include "pointers.hpp" +namespace dp +{ + PointerTracker::~PointerTracker() { ASSERT(m_countMap.empty(), ()); @@ -39,3 +42,5 @@ void PointerTracker::Destroy(void * p) #if defined(CHECK_POINTERS) PointerTracker g_tracker; #endif + +} // namespace dp diff --git a/drape/pointers.hpp b/drape/pointers.hpp index bf46924b91..6116bab638 100644 --- a/drape/pointers.hpp +++ b/drape/pointers.hpp @@ -5,6 +5,9 @@ #include "../std/map.hpp" +namespace dp +{ + class PointerTracker { public: @@ -282,3 +285,5 @@ private: value.Destroy(); } }; + +} // namespace dp diff --git a/drape/render_bucket.cpp b/drape/render_bucket.cpp index 8f50414aa0..9e627f1a73 100644 --- a/drape/render_bucket.cpp +++ b/drape/render_bucket.cpp @@ -8,6 +8,9 @@ #include "../base/stl_add.hpp" #include "../std/bind.hpp" +namespace dp +{ + RenderBucket::RenderBucket(TransferPointer<VertexArrayBuffer> buffer) : m_buffer(buffer) { @@ -67,3 +70,5 @@ void RenderBucket::Render() } m_buffer->Render(); } + +} // namespace dp diff --git a/drape/render_bucket.hpp b/drape/render_bucket.hpp index bcd778167c..0e6771f890 100644 --- a/drape/render_bucket.hpp +++ b/drape/render_bucket.hpp @@ -2,6 +2,10 @@ #include "pointers.hpp" + +namespace dp +{ + class OverlayHandle; class OverlayTree; class VertexArrayBuffer; @@ -23,3 +27,5 @@ private: vector<MasterPointer<OverlayHandle> > m_overlay; MasterPointer<VertexArrayBuffer> m_buffer; }; + +} // namespace dp diff --git a/drape/shader.cpp b/drape/shader.cpp index 77bd2b251b..ed27bdbdc6 100644 --- a/drape/shader.cpp +++ b/drape/shader.cpp @@ -3,6 +3,9 @@ #include "../base/assert.hpp" +namespace dp +{ + namespace { @@ -37,3 +40,5 @@ int Shader::GetID() const { return m_glID; } + +} // namespace dp diff --git a/drape/shader.hpp b/drape/shader.hpp index 2e4c482acc..31cdf02638 100644 --- a/drape/shader.hpp +++ b/drape/shader.hpp @@ -3,6 +3,9 @@ #include "../std/string.hpp" #include "../std/stdint.hpp" +namespace dp +{ + class Shader { public: @@ -22,3 +25,5 @@ private: Type m_type; uint32_t m_glID; }; + +} // namespace dp diff --git a/drape/symbols_texture.cpp b/drape/symbols_texture.cpp index c426c58b66..b1615f129b 100644 --- a/drape/symbols_texture.cpp +++ b/drape/symbols_texture.cpp @@ -8,6 +8,9 @@ #include "../base/string_utils.hpp" +namespace dp +{ + class SymbolsTexture::DefinitionLoader { public: @@ -176,3 +179,5 @@ void SymbolsTexture::Fail() int32_t alfaTexture = 0; Create(1, 1, Texture::RGBA8, MakeStackRefPointer(&alfaTexture)); } + +} // namespace dp diff --git a/drape/symbols_texture.hpp b/drape/symbols_texture.hpp index 349335f8f6..5fbc662c3e 100644 --- a/drape/symbols_texture.hpp +++ b/drape/symbols_texture.hpp @@ -5,6 +5,9 @@ #include "../std/string.hpp" #include "../std/map.hpp" +namespace dp +{ + class SymbolsTexture : public Texture { public: @@ -38,3 +41,5 @@ private: class DefinitionLoader; }; + +} // namespace dp diff --git a/drape/texture.cpp b/drape/texture.cpp index 06868277e4..b20f4f4fb9 100644 --- a/drape/texture.cpp +++ b/drape/texture.cpp @@ -7,6 +7,9 @@ #define ASSERT_ID ASSERT(GetID() != -1, ()) +namespace dp +{ + Texture::ResourceInfo::ResourceInfo(m2::RectF const & texRect) : m_texRect(texRect) {} @@ -144,3 +147,5 @@ int32_t Texture::GetID() const { return m_textureID; } + +} // namespace dp diff --git a/drape/texture.hpp b/drape/texture.hpp index fdf7f5073a..ed19b6f9b6 100644 --- a/drape/texture.hpp +++ b/drape/texture.hpp @@ -8,6 +8,9 @@ #include "../std/stdint.hpp" #include "../std/function.hpp" +namespace dp +{ + class Texture { public: @@ -76,3 +79,5 @@ private: uint32_t m_width; uint32_t m_height; }; + +} // namespace dp diff --git a/drape/texture_manager.cpp b/drape/texture_manager.cpp index 06b66686ab..14e9146ee8 100644 --- a/drape/texture_manager.cpp +++ b/drape/texture_manager.cpp @@ -12,6 +12,9 @@ #include "../std/vector.hpp" +namespace dp +{ + class TextureManager::TextureSet { public: @@ -168,3 +171,5 @@ uint32_t TextureSetBinder::GetTextureCount(uint32_t textureSet) const { return m_manager->GetTextureCount(textureSet); } + +} // namespace dp diff --git a/drape/texture_manager.hpp b/drape/texture_manager.hpp index 86402a8835..a733d92e63 100644 --- a/drape/texture_manager.hpp +++ b/drape/texture_manager.hpp @@ -6,6 +6,9 @@ #include "texture_set_holder.hpp" #include "texture_set_controller.hpp" +namespace dp +{ + class TextureManager : public TextureSetHolder { public: @@ -34,3 +37,5 @@ public: private: RefPointer<TextureManager> m_manager; }; + +} // namespace dp diff --git a/drape/texture_set_controller.hpp b/drape/texture_set_controller.hpp index 75ad546155..48e658472a 100644 --- a/drape/texture_set_controller.hpp +++ b/drape/texture_set_controller.hpp @@ -1,5 +1,8 @@ #pragma once +namespace dp +{ + class TextureSetController { public: @@ -7,3 +10,5 @@ public: virtual void BindTextureSet(uint32_t textureSet) const = 0; virtual uint32_t GetTextureCount(uint32_t textureSet) const = 0; }; + +} // namespace dp diff --git a/drape/texture_set_holder.cpp b/drape/texture_set_holder.cpp index 2eba7f56f8..3385693db3 100644 --- a/drape/texture_set_holder.cpp +++ b/drape/texture_set_holder.cpp @@ -2,6 +2,9 @@ #include "font_texture.hpp" +namespace dp +{ + TextureSetHolder::TextureNode::TextureNode() : m_width(-1) , m_height(-1) @@ -67,3 +70,5 @@ void TextureSetHolder::GlyphRegion::GetMetrics(float & xOffset, float & yOffset, FontTexture::GlyphInfo const * info = static_cast<FontTexture::GlyphInfo const *>(m_info); info->GetMetrics(xOffset, yOffset, advance); } + +} // namespace dp diff --git a/drape/texture_set_holder.hpp b/drape/texture_set_holder.hpp index 6d33bfe00d..c2ec0e0329 100644 --- a/drape/texture_set_holder.hpp +++ b/drape/texture_set_holder.hpp @@ -7,6 +7,9 @@ #include "../geometry/point2d.hpp" #include "../geometry/rect2d.hpp" +namespace dp +{ + class TextureSetHolder { public: @@ -60,3 +63,5 @@ public: virtual bool GetGlyphRegion(strings::UniChar charCode, GlyphRegion & region) const = 0; virtual int GetMaxTextureSet() const = 0; }; + +} // namespace dp diff --git a/drape/uniform_value.cpp b/drape/uniform_value.cpp index 32b766ec6c..3eb7c5f51a 100644 --- a/drape/uniform_value.cpp +++ b/drape/uniform_value.cpp @@ -3,6 +3,9 @@ #include "../base/assert.hpp" #include "../std/cstring.hpp" +namespace dp +{ + namespace { @@ -287,3 +290,5 @@ void UniformValue::Allocate(size_t byteCount) { m_values.reset(new uint8_t[byteCount]); } + +} // namespace dp diff --git a/drape/uniform_value.hpp b/drape/uniform_value.hpp index e8f1d80aaa..9307e2a879 100644 --- a/drape/uniform_value.hpp +++ b/drape/uniform_value.hpp @@ -7,6 +7,9 @@ #include "../std/shared_array.hpp" #include "../std/cstring.hpp" +namespace dp +{ + class UniformValue { public: @@ -87,3 +90,5 @@ private: shared_array<uint8_t> m_values; }; + +} // namespace dp diff --git a/drape/uniform_values_storage.cpp b/drape/uniform_values_storage.cpp index 492f897f96..2cbbc7645c 100644 --- a/drape/uniform_values_storage.cpp +++ b/drape/uniform_values_storage.cpp @@ -5,6 +5,9 @@ #include "../std/algorithm.hpp" #include "../std/bind.hpp" +namespace dp +{ + void UniformValuesStorage::SetIntValue(string const & name, int32_t v) { UniformValue * uniform = findByName(name); @@ -126,3 +129,5 @@ UniformValue * UniformValuesStorage::findByName(string const & name) return &(*it); } + +} // namespace dp diff --git a/drape/uniform_values_storage.hpp b/drape/uniform_values_storage.hpp index 1507387eda..7a319c64c9 100644 --- a/drape/uniform_values_storage.hpp +++ b/drape/uniform_values_storage.hpp @@ -6,6 +6,9 @@ #include "../std/string.hpp" #include "../std/function.hpp" +namespace dp +{ + class UniformValuesStorage { public: @@ -33,3 +36,5 @@ private: typedef vector<UniformValue> uniforms_t; uniforms_t m_uniforms; }; + +} // namespace dp diff --git a/drape/vertex_array_buffer.cpp b/drape/vertex_array_buffer.cpp index 4477fbb0af..b041a216a4 100644 --- a/drape/vertex_array_buffer.cpp +++ b/drape/vertex_array_buffer.cpp @@ -5,6 +5,9 @@ #include "../base/stl_add.hpp" #include "../base/assert.hpp" +namespace dp +{ + VertexArrayBuffer::VertexArrayBuffer(uint32_t indexBufferSize, uint32_t dataBufferSize) : m_VAO(0) , m_dataBufferSize(dataBufferSize) @@ -236,3 +239,5 @@ void VertexArrayBuffer::BindBuffers(TBuffersMap const & buffers) const } } } + +} // namespace dp diff --git a/drape/vertex_array_buffer.hpp b/drape/vertex_array_buffer.hpp index 90f09ebbf7..855ff32d56 100644 --- a/drape/vertex_array_buffer.hpp +++ b/drape/vertex_array_buffer.hpp @@ -10,6 +10,9 @@ #include "../std/map.hpp" +namespace dp +{ + class VertexArrayBuffer { typedef map<BindingInfo, MasterPointer<DataBuffer> > TBuffersMap; @@ -59,3 +62,5 @@ private: RefPointer<GpuProgram> m_program; }; + +} // namespace dp diff --git a/drape_frontend/apply_feature_functors.cpp b/drape_frontend/apply_feature_functors.cpp index 38ad5fd733..9398b7583f 100644 --- a/drape_frontend/apply_feature_functors.cpp +++ b/drape_frontend/apply_feature_functors.cpp @@ -24,9 +24,9 @@ namespace df namespace { -Color ToDrapeColor(uint32_t src) +dp::Color ToDrapeColor(uint32_t src) { - return Extract(src, 255 - (src >> 24)); + return dp::Extract(src, 255 - (src >> 24)); } void Extract(::LineDefProto const * lineRule, @@ -69,7 +69,7 @@ void CaptionDefProtoToFontDecl(CaptionDefProto const * capRule, df::FontDecl &pa if (capRule->has_stroke_color()) { params.m_needOutline = true; - params.m_outlineColor = Color(255, 255, 255, 255); + params.m_outlineColor = dp::Color(255, 255, 255, 255); } } @@ -163,7 +163,7 @@ void ApplyPointFeature::ProcessRule(Stylist::rule_wrapper_t const & rule) params.m_secondaryTextFont = auxDecl; } if(!params.m_primaryText.empty() || !params.m_secondaryText.empty()) - m_context.InsertShape(m_tileKey, MovePointer<MapShape>(new TextShape(m_centerPoint, params))); + m_context.InsertShape(m_tileKey, dp::MovePointer<MapShape>(new TextShape(m_centerPoint, params))); } SymbolRuleProto const * symRule = pRule->GetSymbol(); @@ -195,7 +195,7 @@ void ApplyPointFeature::Finish() params.m_radius = m_circleRule->radius(); CircleShape * shape = new CircleShape(m_centerPoint, params); - m_context.InsertShape(m_tileKey, MovePointer<MapShape>(shape)); + m_context.InsertShape(m_tileKey, dp::MovePointer<MapShape>(shape)); } else if (m_symbolRule) { @@ -204,7 +204,7 @@ void ApplyPointFeature::Finish() params.m_symbolName = m_symbolRule->name(); PoiSymbolShape * shape = new PoiSymbolShape(m_centerPoint, params); - m_context.InsertShape(m_tileKey, MovePointer<MapShape>(shape)); + m_context.InsertShape(m_tileKey, dp::MovePointer<MapShape>(shape)); } } @@ -236,7 +236,7 @@ void ApplyAreaFeature::ProcessRule(Stylist::rule_wrapper_t const & rule) params.m_color = ToDrapeColor(areaRule->color()); AreaShape * shape = new AreaShape(m_triangles, params); - m_context.InsertShape(m_tileKey, MovePointer<MapShape>(shape)); + m_context.InsertShape(m_tileKey, dp::MovePointer<MapShape>(shape)); } else base_t::ProcessRule(rule); @@ -291,14 +291,14 @@ void ApplyLineFeature::ProcessRule(Stylist::rule_wrapper_t const & rule) params.m_step = symRule.offset() * mainScale; params.m_offset = symRule.step() * mainScale; - m_context.InsertShape(m_tileKey, MovePointer<MapShape>(new PathSymbolShape(m_path, params, m_nextModelViewScale))); + m_context.InsertShape(m_tileKey, dp::MovePointer<MapShape>(new PathSymbolShape(m_path, params, m_nextModelViewScale))); } else { - LineViewParams params; - Extract(pRule, params); - params.m_depth = depth; - m_context.InsertShape(m_tileKey, MovePointer<MapShape>(new LineShape(m_path, params))); + LineViewParams params; + Extract(pRule, params); + params.m_depth = depth; + m_context.InsertShape(m_tileKey, dp::MovePointer<MapShape>(new LineShape(m_path, params))); } } } diff --git a/drape_frontend/area_shape.cpp b/drape_frontend/area_shape.cpp index d9b71fb674..38ec803683 100644 --- a/drape_frontend/area_shape.cpp +++ b/drape_frontend/area_shape.cpp @@ -17,24 +17,24 @@ AreaShape::AreaShape(vector<m2::PointF> const & triangleList, AreaViewParams con bind(&Point3D::From2D, _1, params.m_depth))); } -void AreaShape::Draw(RefPointer<Batcher> batcher, RefPointer<TextureSetHolder> /*textures*/) const +void AreaShape::Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<dp::TextureSetHolder> /*textures*/) const { - GLState state(gpu::SOLID_AREA_PROGRAM, GLState::GeometryLayer); + dp::GLState state(gpu::SOLID_AREA_PROGRAM, dp::GLState::GeometryLayer); state.SetColor(m_params.m_color); - AttributeProvider provider(1, m_vertexes.size()); + dp::AttributeProvider provider(1, m_vertexes.size()); { - BindingInfo info(1); - BindingDecl & decl = info.GetBindingDecl(0); + dp::BindingInfo info(1); + dp::BindingDecl & decl = info.GetBindingDecl(0); decl.m_attributeName = "a_position"; decl.m_componentCount = 3; decl.m_componentType = gl_const::GLFloatType; decl.m_offset = 0; decl.m_stride = 0; - provider.InitStream(0, info, MakeStackRefPointer((void *)&m_vertexes[0])); + provider.InitStream(0, info, dp::MakeStackRefPointer((void *)&m_vertexes[0])); } - batcher->InsertTriangleList(state, MakeStackRefPointer(&provider)); + batcher->InsertTriangleList(state, dp::MakeStackRefPointer(&provider)); } } // namespace df diff --git a/drape_frontend/area_shape.hpp b/drape_frontend/area_shape.hpp index 2dd3057ecf..bae7ec5a6c 100644 --- a/drape_frontend/area_shape.hpp +++ b/drape_frontend/area_shape.hpp @@ -18,7 +18,7 @@ class AreaShape : public MapShape public: AreaShape(vector<m2::PointF> const & triangleList, AreaViewParams const & params); - virtual void Draw(RefPointer<Batcher> batcher, RefPointer<TextureSetHolder> /*textures*/) const; + virtual void Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<dp::TextureSetHolder> /*textures*/) const; private: vector<Point3D> m_vertexes; diff --git a/drape_frontend/backend_renderer.cpp b/drape_frontend/backend_renderer.cpp index 643f97f6cf..90f5a4b034 100644 --- a/drape_frontend/backend_renderer.cpp +++ b/drape_frontend/backend_renderer.cpp @@ -18,9 +18,9 @@ namespace df { -BackendRenderer::BackendRenderer(RefPointer<ThreadsCommutator> commutator, - RefPointer<OGLContextFactory> oglcontextfactory, - RefPointer<TextureSetHolder> textureHolder) +BackendRenderer::BackendRenderer(dp::RefPointer<ThreadsCommutator> commutator, + dp::RefPointer<dp::OGLContextFactory> oglcontextfactory, + dp::RefPointer<dp::TextureSetHolder> textureHolder) : m_engineContext(commutator) , m_commutator(commutator) , m_contextFactory(oglcontextfactory) @@ -50,7 +50,7 @@ BackendRenderer::~BackendRenderer() ///////////////////////////////////////// // MessageAcceptor // ///////////////////////////////////////// -void BackendRenderer::AcceptMessage(RefPointer<Message> message) +void BackendRenderer::AcceptMessage(dp::RefPointer<Message> message) { switch (message->GetType()) { @@ -77,8 +77,8 @@ void BackendRenderer::AcceptMessage(RefPointer<Message> message) case Message::MapShapeReaded: { MapShapeReadedMessage * msg = df::CastMessage<MapShapeReadedMessage>(message); - RefPointer<Batcher> batcher = m_batchersPool->GetTileBatcher(msg->GetKey()); - MasterPointer<MapShape> shape(msg->GetShape()); + dp::RefPointer<dp::Batcher> batcher = m_batchersPool->GetTileBatcher(msg->GetKey()); + dp::MasterPointer<MapShape> shape(msg->GetShape()); shape->Draw(batcher, m_textures); shape.Destroy(); @@ -125,7 +125,7 @@ void BackendRenderer::ReleaseResources() m_batchersPool.Destroy(); m_textures->Release(); - m_textures = RefPointer<TextureSetHolder>(); + m_textures = dp::RefPointer<dp::TextureSetHolder>(); } void BackendRenderer::Do() @@ -138,7 +138,7 @@ void BackendRenderer::InitGLDependentResource() m_textures->Init(VisualParams::Instance().GetResourcePostfix()); } -void BackendRenderer::PostToRenderThreads(TransferPointer<Message> message) +void BackendRenderer::PostToRenderThreads(dp::TransferPointer<Message> message) { m_commutator->PostMessage(ThreadsCommutator::RenderThread, message); } diff --git a/drape_frontend/backend_renderer.hpp b/drape_frontend/backend_renderer.hpp index cc16489c7f..91d964cbf9 100644 --- a/drape_frontend/backend_renderer.hpp +++ b/drape_frontend/backend_renderer.hpp @@ -10,9 +10,14 @@ #include "../base/thread.hpp" +namespace dp +{ + class OGLContextFactory; class TextureSetHolder; +} + namespace df { @@ -25,23 +30,23 @@ class BackendRenderer : public MessageAcceptor, public threads::IRoutine { public: - BackendRenderer(RefPointer<ThreadsCommutator> commutator, - RefPointer<OGLContextFactory> oglcontextfactory, - RefPointer<TextureSetHolder> textureHolder); + BackendRenderer(dp::RefPointer<ThreadsCommutator> commutator, + dp::RefPointer<dp::OGLContextFactory> oglcontextfactory, + dp::RefPointer<dp::TextureSetHolder> textureHolder); ~BackendRenderer(); private: model::FeaturesFetcher m_model; EngineContext m_engineContext; - MasterPointer<BatchersPool> m_batchersPool; - MasterPointer<ReadManager> m_readManager; + dp::MasterPointer<BatchersPool> m_batchersPool; + dp::MasterPointer<ReadManager> m_readManager; ///////////////////////////////////////// // MessageAcceptor // ///////////////////////////////////////// private: - void AcceptMessage(RefPointer<Message> message); + void AcceptMessage(dp::RefPointer<Message> message); ///////////////////////////////////////// // ThreadPart // @@ -54,13 +59,13 @@ private: virtual void Do(); void InitGLDependentResource(); - void PostToRenderThreads(TransferPointer<Message> message); + void PostToRenderThreads(dp::TransferPointer<Message> message); private: threads::Thread m_selfThread; - RefPointer<ThreadsCommutator> m_commutator; - RefPointer<OGLContextFactory> m_contextFactory; - RefPointer<TextureSetHolder> m_textures; + dp::RefPointer<ThreadsCommutator> m_commutator; + dp::RefPointer<dp::OGLContextFactory> m_contextFactory; + dp::RefPointer<dp::TextureSetHolder> m_textures; }; } // namespace df diff --git a/drape_frontend/batchers_pool.cpp b/drape_frontend/batchers_pool.cpp index b555b2d6d7..629d36e681 100644 --- a/drape_frontend/batchers_pool.cpp +++ b/drape_frontend/batchers_pool.cpp @@ -15,11 +15,11 @@ namespace void FlushGeometry(BatchersPool::send_message_fn const & sendMessage, TileKey const & key, - GLState const & state, - TransferPointer<RenderBucket> buffer) + dp::GLState const & state, + dp::TransferPointer<dp::RenderBucket> buffer) { GLFunctions::glFlush(); - sendMessage(MovePointer<Message>(new FlushRenderBucketMessage(key, state, buffer))); + sendMessage(dp::MovePointer<Message>(new FlushRenderBucketMessage(key, state, buffer))); } } // namespace @@ -28,7 +28,7 @@ BatchersPool::BatchersPool(int initBatcherCount, send_message_fn const & sendMes : m_sendMessageFn(sendMessageFn) { for (int i = 0; i < initBatcherCount; ++i) - m_batchers.push(MasterPointer<Batcher>(new Batcher())); + m_batchers.push(dp::MasterPointer<dp::Batcher>(new dp::Batcher())); } BatchersPool::~BatchersPool() @@ -56,9 +56,9 @@ void BatchersPool::ReserveBatcher(TileKey const & key) return; } - MasterPointer<Batcher> reserved; + dp::MasterPointer<dp::Batcher> reserved; if (m_batchers.empty()) - reserved.Reset(new Batcher()); + reserved.Reset(new dp::Batcher()); else { reserved = m_batchers.top(); @@ -69,7 +69,7 @@ void BatchersPool::ReserveBatcher(TileKey const & key) VERIFY(m_reservedBatchers.insert(make_pair(key, make_pair(reserved, 1))).second, ()); } -RefPointer<Batcher> BatchersPool::GetTileBatcher(TileKey const & key) +dp::RefPointer<dp::Batcher> BatchersPool::GetTileBatcher(TileKey const & key) { reserved_batchers_t::iterator it = m_reservedBatchers.find(key); @@ -85,7 +85,7 @@ void BatchersPool::ReleaseBatcher(TileKey const & key) ASSERT_GREATER(it->second.second, 0, ()); if ((--it->second.second)== 0) { - MasterPointer<Batcher> batcher = it->second.first; + dp::MasterPointer<dp::Batcher> batcher = it->second.first; batcher->EndSession(); m_reservedBatchers.erase(it); m_batchers.push(batcher); diff --git a/drape_frontend/batchers_pool.hpp b/drape_frontend/batchers_pool.hpp index ecbd85c5fe..6e582a5a38 100644 --- a/drape_frontend/batchers_pool.hpp +++ b/drape_frontend/batchers_pool.hpp @@ -8,7 +8,7 @@ #include "../std/stack.hpp" #include "../std/function.hpp" -class Batcher; +namespace dp { class Batcher; } namespace df { @@ -18,17 +18,17 @@ class Message; class BatchersPool { public: - typedef function<void (TransferPointer<Message>)> send_message_fn; + typedef function<void (dp::TransferPointer<Message>)> send_message_fn; BatchersPool(int initBatcherCount, send_message_fn const & sendMessageFn); ~BatchersPool(); void ReserveBatcher(TileKey const & key); - RefPointer<Batcher> GetTileBatcher(TileKey const & key); + dp::RefPointer<dp::Batcher> GetTileBatcher(TileKey const & key); void ReleaseBatcher(TileKey const & key); private: - typedef MasterPointer<Batcher> batcher_ptr; + typedef dp::MasterPointer<dp::Batcher> batcher_ptr; typedef stack<batcher_ptr> batchers_pool_t; typedef pair<batcher_ptr, int> counted_batcher_t; typedef map<TileKey, counted_batcher_t> reserved_batchers_t; diff --git a/drape_frontend/circle_shape.cpp b/drape_frontend/circle_shape.cpp index 9bc598b94b..af3136bec2 100644 --- a/drape_frontend/circle_shape.cpp +++ b/drape_frontend/circle_shape.cpp @@ -35,7 +35,7 @@ CircleShape::CircleShape(m2::PointF const & mercatorPt, CircleViewParams const & { } -void CircleShape::Draw(RefPointer<Batcher> batcher, RefPointer<TextureSetHolder>) const +void CircleShape::Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<dp::TextureSetHolder>) const { double const TriangleCount = 20.0; double const etalonSector = (2.0 * math::pi) / TriangleCount; @@ -55,32 +55,32 @@ void CircleShape::Draw(RefPointer<Batcher> batcher, RefPointer<TextureSetHolder> AddPoint(stream, i + 1, m_pt.x, m_pt.y, m_params.m_depth, rotatedNormal.x, rotatedNormal.y); } - GLState state(gpu::SOLID_SHAPE_PROGRAM, GLState::OverlayLayer); + dp::GLState state(gpu::SOLID_SHAPE_PROGRAM, dp::GLState::OverlayLayer); state.SetColor(m_params.m_color); - AttributeProvider provider(1, TriangleCount + 2); - BindingInfo info(2); - BindingDecl & posDecl = info.GetBindingDecl(0); + dp::AttributeProvider provider(1, TriangleCount + 2); + dp::BindingInfo info(2); + dp::BindingDecl & posDecl = info.GetBindingDecl(0); posDecl.m_attributeName = "a_position"; posDecl.m_componentCount = 3; posDecl.m_componentType = gl_const::GLFloatType; posDecl.m_offset = 0; posDecl.m_stride = 5 * sizeof(float); - BindingDecl & normalDecl = info.GetBindingDecl(1); + dp::BindingDecl & normalDecl = info.GetBindingDecl(1); normalDecl.m_attributeName = "a_normal"; normalDecl.m_componentCount = 2; normalDecl.m_componentType = gl_const::GLFloatType; normalDecl.m_offset = 3 * sizeof(float); normalDecl.m_stride = 5 * sizeof(float); - OverlayHandle * overlay = new SquareHandle(m_params.m_id, - dp::Center, m_pt, - m2::PointD(m_params.m_radius, m_params.m_radius), - m_params.m_depth); + dp::OverlayHandle * overlay = new dp::SquareHandle(m_params.m_id, + dp::Center, m_pt, + m2::PointD(m_params.m_radius, m_params.m_radius), + m_params.m_depth); - provider.InitStream(0, info, MakeStackRefPointer<void>(&stream[0])); - batcher->InsertTriangleFan(state, MakeStackRefPointer(&provider), MovePointer(overlay)); + provider.InitStream(0, info, dp::MakeStackRefPointer<void>(&stream[0])); + batcher->InsertTriangleFan(state, dp::MakeStackRefPointer(&provider), dp::MovePointer(overlay)); } } // namespace df diff --git a/drape_frontend/circle_shape.hpp b/drape_frontend/circle_shape.hpp index ce20ca5f9b..b69a63519c 100644 --- a/drape_frontend/circle_shape.hpp +++ b/drape_frontend/circle_shape.hpp @@ -11,7 +11,7 @@ class CircleShape : public MapShape public: CircleShape(m2::PointF const & mercatorPt, CircleViewParams const & params); - virtual void Draw(RefPointer<Batcher> batcher, RefPointer<TextureSetHolder> /*textures*/) const; + virtual void Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<dp::TextureSetHolder> /*textures*/) const; private: m2::PointF m_pt; diff --git a/drape_frontend/drape_engine.cpp b/drape_frontend/drape_engine.cpp index d7faf6f512..ff42fb83c5 100644 --- a/drape_frontend/drape_engine.cpp +++ b/drape_frontend/drape_engine.cpp @@ -10,7 +10,7 @@ namespace df { -DrapeEngine::DrapeEngine(RefPointer<OGLContextFactory> contextfactory, double vs, Viewport const & viewport) +DrapeEngine::DrapeEngine(dp::RefPointer<dp::OGLContextFactory> contextfactory, double vs, Viewport const & viewport) : m_viewport(viewport) , m_navigator(m_scales) { @@ -19,20 +19,20 @@ DrapeEngine::DrapeEngine(RefPointer<OGLContextFactory> contextfactory, double vs m_navigator.LoadState(); m_navigator.OnSize(0, 0, m_viewport.GetWidth(), m_viewport.GetHeight()); - m_textures.Reset(new TextureManager()); - RefPointer<TextureSetHolder> textureHolder = m_textures.GetRefPointer(); - TextureSetBinder * binder = new TextureSetBinder(m_textures.GetRefPointer()); + m_textures.Reset(new dp::TextureManager()); + dp::RefPointer<dp::TextureSetHolder> textureHolder = m_textures.GetRefPointer(); + dp::TextureSetBinder * binder = new dp::TextureSetBinder(m_textures.GetRefPointer()); - m_threadCommutator = MasterPointer<ThreadsCommutator>(new ThreadsCommutator()); - RefPointer<ThreadsCommutator> commutatorRef = m_threadCommutator.GetRefPointer(); + m_threadCommutator = dp::MasterPointer<ThreadsCommutator>(new ThreadsCommutator()); + dp::RefPointer<ThreadsCommutator> commutatorRef = m_threadCommutator.GetRefPointer(); - m_frontend = MasterPointer<FrontendRenderer>(new FrontendRenderer(commutatorRef, - contextfactory, - MovePointer<TextureSetController>(binder), - m_viewport)); - m_backend = MasterPointer<BackendRenderer>(new BackendRenderer(commutatorRef, - contextfactory, - textureHolder)); + m_frontend = dp::MasterPointer<FrontendRenderer>(new FrontendRenderer(commutatorRef, + contextfactory, + dp::MovePointer<dp::TextureSetController>(binder), + m_viewport)); + m_backend = dp::MasterPointer<BackendRenderer>(new BackendRenderer(commutatorRef, + contextfactory, + textureHolder)); UpdateCoverage(); } @@ -54,7 +54,7 @@ void DrapeEngine::Resize(int w, int h) m_viewport.SetViewport(0, 0, w, h); m_navigator.OnSize(0, 0, w, h); m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread, - MovePointer<Message>(new ResizeMessage(m_viewport))); + dp::MovePointer<Message>(new ResizeMessage(m_viewport))); } void DrapeEngine::DragStarted(m2::PointF const & p) @@ -84,7 +84,7 @@ void DrapeEngine::Scale(m2::PointF const & p, double factor) void DrapeEngine::UpdateCoverage() { m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread, - MovePointer<Message>(new UpdateModelViewMessage(m_navigator.Screen()))); + dp::MovePointer<Message>(new UpdateModelViewMessage(m_navigator.Screen()))); } } // namespace df diff --git a/drape_frontend/drape_engine.hpp b/drape_frontend/drape_engine.hpp index 8a5de53881..0284c348ed 100644 --- a/drape_frontend/drape_engine.hpp +++ b/drape_frontend/drape_engine.hpp @@ -9,7 +9,7 @@ #include "../map/navigator.hpp" -class OGLContextFactory; +namespace dp { class OGLContextFactory; } namespace df { @@ -18,7 +18,7 @@ class Viewport; class DrapeEngine { public: - DrapeEngine(RefPointer<OGLContextFactory> oglcontextfactory, double vs, Viewport const & viewport); + DrapeEngine(dp::RefPointer<dp::OGLContextFactory> oglcontextfactory, double vs, Viewport const & viewport); ~DrapeEngine(); void Resize(int w, int h); @@ -31,11 +31,11 @@ private: void UpdateCoverage(); private: - MasterPointer<FrontendRenderer> m_frontend; - MasterPointer<BackendRenderer> m_backend; + dp::MasterPointer<FrontendRenderer> m_frontend; + dp::MasterPointer<BackendRenderer> m_backend; - MasterPointer<TextureManager> m_textures; - MasterPointer<ThreadsCommutator> m_threadCommutator; + dp::MasterPointer<dp::TextureManager> m_textures; + dp::MasterPointer<ThreadsCommutator> m_threadCommutator; ScalesProcessor m_scales; Viewport m_viewport; diff --git a/drape_frontend/engine_context.cpp b/drape_frontend/engine_context.cpp index b612d903b4..304f833087 100644 --- a/drape_frontend/engine_context.cpp +++ b/drape_frontend/engine_context.cpp @@ -6,7 +6,7 @@ namespace df { -EngineContext::EngineContext(RefPointer<ThreadsCommutator> commutator) +EngineContext::EngineContext(dp::RefPointer<ThreadsCommutator> commutator) : m_commutator(commutator) { } @@ -16,7 +16,7 @@ void EngineContext::BeginReadTile(TileKey const & key) PostMessage(new TileReadStartMessage(key)); } -void EngineContext::InsertShape(TileKey const & key, TransferPointer<MapShape> shape) +void EngineContext::InsertShape(TileKey const & key, dp::TransferPointer<MapShape> shape) { PostMessage(new MapShapeReadedMessage(key, shape)); } @@ -28,7 +28,7 @@ void EngineContext::EndReadTile(TileKey const & key) void EngineContext::PostMessage(Message * message) { - m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread, MovePointer(message)); + m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread, dp::MovePointer(message)); } } // namespace df diff --git a/drape_frontend/engine_context.hpp b/drape_frontend/engine_context.hpp index 4b62fb2c77..0bcf28a0d0 100644 --- a/drape_frontend/engine_context.hpp +++ b/drape_frontend/engine_context.hpp @@ -16,19 +16,19 @@ struct TileKey; class EngineContext { public: - EngineContext(RefPointer<ThreadsCommutator> commutator); + EngineContext(dp::RefPointer<ThreadsCommutator> commutator); void BeginReadTile(TileKey const & key); /// If you call this method, you may forget about shape. /// It will be proccessed and delete later - void InsertShape(TileKey const & key, TransferPointer<MapShape> shape); + void InsertShape(TileKey const & key, dp::TransferPointer<MapShape> shape); void EndReadTile(TileKey const & key); private: void PostMessage(Message * message); private: - RefPointer<ThreadsCommutator> m_commutator; + dp::RefPointer<ThreadsCommutator> m_commutator; }; } // namespace df diff --git a/drape_frontend/frontend_renderer.cpp b/drape_frontend/frontend_renderer.cpp index 8b34737590..78471de95b 100644 --- a/drape_frontend/frontend_renderer.cpp +++ b/drape_frontend/frontend_renderer.cpp @@ -39,14 +39,14 @@ void OrthoMatrix(float * m, float left, float right, float bottom, float top, fl } // namespace -FrontendRenderer::FrontendRenderer(RefPointer<ThreadsCommutator> commutator, - RefPointer<OGLContextFactory> oglcontextfactory, - TransferPointer<TextureSetController> textureController, +FrontendRenderer::FrontendRenderer(dp::RefPointer<ThreadsCommutator> commutator, + dp::RefPointer<dp::OGLContextFactory> oglcontextfactory, + dp::TransferPointer<dp::TextureSetController> textureController, Viewport viewport) : m_commutator(commutator) , m_contextFactory(oglcontextfactory) , m_textureController(textureController) - , m_gpuProgramManager(new GpuProgramManager()) + , m_gpuProgramManager(new dp::GpuProgramManager()) , m_viewport(viewport) { #ifdef DRAW_INFO @@ -93,17 +93,17 @@ void FrontendRenderer::AfterDrawFrame() } #endif -void FrontendRenderer::AcceptMessage(RefPointer<Message> message) +void FrontendRenderer::AcceptMessage(dp::RefPointer<Message> message) { switch (message->GetType()) { case Message::FlushTile: { FlushRenderBucketMessage * msg = df::CastMessage<FlushRenderBucketMessage>(message); - const GLState & state = msg->GetState(); - const TileKey & key = msg->GetKey(); - MasterPointer<RenderBucket> bucket(msg->AcceptBuffer()); - RefPointer<GpuProgram> program = m_gpuProgramManager->GetProgram(state.GetProgramIndex()); + dp::GLState const & state = msg->GetState(); + TileKey const & key = msg->GetKey(); + dp::MasterPointer<dp::RenderBucket> bucket(msg->AcceptBuffer()); + dp::RefPointer<dp::GpuProgram> program = m_gpuProgramManager->GetProgram(state.GetProgramIndex()); program->Bind(); bucket->GetBuffer()->Build(program); RenderGroup * group = new RenderGroup(state, key); @@ -121,7 +121,7 @@ void FrontendRenderer::AcceptMessage(RefPointer<Message> message) RefreshModelView(); ResolveTileKeys(); m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread, - MovePointer<Message>(new UpdateReadManagerMessage(m_view, m_tiles))); + dp::MovePointer<Message>(new UpdateReadManagerMessage(m_view, m_tiles))); break; } @@ -132,7 +132,7 @@ void FrontendRenderer::AcceptMessage(RefPointer<Message> message) RefreshModelView(); ResolveTileKeys(); m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread, - MovePointer<Message>(new UpdateReadManagerMessage(m_view, m_tiles))); + dp::MovePointer<Message>(new UpdateReadManagerMessage(m_view, m_tiles))); break; } @@ -145,7 +145,7 @@ void FrontendRenderer::AcceptMessage(RefPointer<Message> message) InvalidateRenderGroups(keyStorage); Message * msgToBackend = new InvalidateReadManagerRectMessage(keyStorage); - m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread, MovePointer(msgToBackend)); + m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread, dp::MovePointer(msgToBackend)); break; } @@ -177,8 +177,8 @@ void FrontendRenderer::RenderScene() continue; } - if (m_renderGroups[i]->GetState().GetDepthLayer() == GLState::OverlayLayer) - m_renderGroups[i]->CollectOverlay(MakeStackRefPointer(&m_overlayTree)); + if (m_renderGroups[i]->GetState().GetDepthLayer() == dp::GLState::OverlayLayer) + m_renderGroups[i]->CollectOverlay(dp::MakeStackRefPointer(&m_overlayTree)); } m_overlayTree.EndOverlayPlacing(); m_renderGroups.resize(m_renderGroups.size() - eraseCount); @@ -196,8 +196,8 @@ void FrontendRenderer::RenderScene() for (size_t i = 0; i < m_renderGroups.size(); ++i) { RenderGroup * group = m_renderGroups[i]; - GLState const & state = group->GetState(); - RefPointer<GpuProgram> program = m_gpuProgramManager->GetProgram(state.GetProgramIndex()); + dp::GLState const & state = group->GetState(); + dp::RefPointer<dp::GpuProgram> program = m_gpuProgramManager->GetProgram(state.GetProgramIndex()); program->Bind(); ApplyUniforms(m_generalUniforms, program); ApplyState(state, program, m_textureController.GetRefPointer()); @@ -293,7 +293,7 @@ void FrontendRenderer::StopThread() void FrontendRenderer::ThreadMain() { - OGLContext * context = m_contextFactory->getDrawContext(); + dp::OGLContext * context = m_contextFactory->getDrawContext(); context->makeCurrent(); my::Timer timer; diff --git a/drape_frontend/frontend_renderer.hpp b/drape_frontend/frontend_renderer.hpp index b81c0d47d3..771455581a 100644 --- a/drape_frontend/frontend_renderer.hpp +++ b/drape_frontend/frontend_renderer.hpp @@ -28,7 +28,7 @@ #include "../std/map.hpp" -class RenderBucket; +namespace dp { class RenderBucket; } namespace df { @@ -37,9 +37,9 @@ class FrontendRenderer : public MessageAcceptor, public threads::IRoutine { public: - FrontendRenderer(RefPointer<ThreadsCommutator> commutator, - RefPointer<OGLContextFactory> oglcontextfactory, - TransferPointer<TextureSetController> textureController, + FrontendRenderer(dp::RefPointer<ThreadsCommutator> commutator, + dp::RefPointer<dp::OGLContextFactory> oglcontextfactory, + dp::TransferPointer<dp::TextureSetController> textureController, Viewport viewport); ~FrontendRenderer(); @@ -58,7 +58,7 @@ public: #endif protected: - virtual void AcceptMessage(RefPointer<Message> message); + virtual void AcceptMessage(dp::RefPointer<Message> message); private: void RenderScene(); @@ -84,22 +84,22 @@ private: void DeleteRenderData(); private: - RefPointer<ThreadsCommutator> m_commutator; - RefPointer<OGLContextFactory> m_contextFactory; - MasterPointer<TextureSetController> m_textureController; - MasterPointer<GpuProgramManager> m_gpuProgramManager; + dp::RefPointer<ThreadsCommutator> m_commutator; + dp::RefPointer<dp::OGLContextFactory> m_contextFactory; + dp::MasterPointer<dp::TextureSetController> m_textureController; + dp::MasterPointer<dp::GpuProgramManager> m_gpuProgramManager; threads::Thread m_selfThread; private: vector<RenderGroup *> m_renderGroups; - UniformValuesStorage m_generalUniforms; + dp::UniformValuesStorage m_generalUniforms; Viewport m_viewport; ScreenBase m_view; set<TileKey> m_tiles; - OverlayTree m_overlayTree; + dp::OverlayTree m_overlayTree; }; } // namespace df diff --git a/drape_frontend/line_shape.cpp b/drape_frontend/line_shape.cpp index cbf6859427..3fa91ff6cd 100644 --- a/drape_frontend/line_shape.cpp +++ b/drape_frontend/line_shape.cpp @@ -146,7 +146,7 @@ LineShape::LineShape(vector<m2::PointF> const & points, m_points = points; } -void LineShape::Draw(RefPointer<Batcher> batcher, RefPointer<TextureSetHolder> /*textures*/) const +void LineShape::Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<dp::TextureSetHolder> /*textures*/) const { int size = m_points.size(); float const r = 1.0f; @@ -262,78 +262,78 @@ void LineShape::Draw(RefPointer<Batcher> batcher, RefPointer<TextureSetHolder> / SetColor(outlineColor, clr2, i); } - GLState state(gpu::SOLID_LINE_PROGRAM, GLState::GeometryLayer); - AttributeProvider provider(6, 6*(size-1)); + dp::GLState state(gpu::SOLID_LINE_PROGRAM, dp::GLState::GeometryLayer); + dp::AttributeProvider provider(6, 6*(size-1)); { - BindingInfo pos_dir(1); - BindingDecl & decl = pos_dir.GetBindingDecl(0); + dp::BindingInfo pos_dir(1); + dp::BindingDecl & decl = pos_dir.GetBindingDecl(0); decl.m_attributeName = "position"; decl.m_componentCount = 4; decl.m_componentType = gl_const::GLFloatType; decl.m_offset = 0; decl.m_stride = 0; - provider.InitStream(0, pos_dir, MakeStackRefPointer((void*)&vertex2[0])); + provider.InitStream(0, pos_dir, dp::MakeStackRefPointer((void*)&vertex2[0])); } { - BindingInfo deltas(1); - BindingDecl & decl = deltas.GetBindingDecl(0); + dp::BindingInfo deltas(1); + dp::BindingDecl & decl = deltas.GetBindingDecl(0); decl.m_attributeName = "deltas"; decl.m_componentCount = 3; decl.m_componentType = gl_const::GLFloatType; decl.m_offset = 0; decl.m_stride = 0; - provider.InitStream(1, deltas, MakeStackRefPointer((void*)&dxVals2[0])); + provider.InitStream(1, deltas, dp::MakeStackRefPointer((void*)&dxVals2[0])); } { - BindingInfo width_type(1); - BindingDecl & decl = width_type.GetBindingDecl(0); + dp::BindingInfo width_type(1); + dp::BindingDecl & decl = width_type.GetBindingDecl(0); decl.m_attributeName = "width_type"; decl.m_componentCount = 4; decl.m_componentType = gl_const::GLFloatType; decl.m_offset = 0; decl.m_stride = 0; - provider.InitStream(2, width_type, MakeStackRefPointer((void*)&widthType2[0])); + provider.InitStream(2, width_type, dp::MakeStackRefPointer((void*)&widthType2[0])); } { - BindingInfo centres(1); - BindingDecl & decl = centres.GetBindingDecl(0); + dp::BindingInfo centres(1); + dp::BindingDecl & decl = centres.GetBindingDecl(0); decl.m_attributeName = "centres"; decl.m_componentCount = 4; decl.m_componentType = gl_const::GLFloatType; decl.m_offset = 0; decl.m_stride = 0; - provider.InitStream(3, centres, MakeStackRefPointer((void*)¢ers2[0])); + provider.InitStream(3, centres, dp::MakeStackRefPointer((void*)¢ers2[0])); } { - BindingInfo clr1(1); - BindingDecl & decl = clr1.GetBindingDecl(0); + dp::BindingInfo clr1(1); + dp::BindingDecl & decl = clr1.GetBindingDecl(0); decl.m_attributeName = "color1"; decl.m_componentCount = 4; decl.m_componentType = gl_const::GLFloatType; decl.m_offset = 0; decl.m_stride = 0; - provider.InitStream(4, clr1, MakeStackRefPointer((void*)&baseColor[0])); + provider.InitStream(4, clr1, dp::MakeStackRefPointer((void*)&baseColor[0])); } { - BindingInfo clr2(1); - BindingDecl & decl = clr2.GetBindingDecl(0); + dp::BindingInfo clr2(1); + dp::BindingDecl & decl = clr2.GetBindingDecl(0); decl.m_attributeName = "color2"; decl.m_componentCount = 4; decl.m_componentType = gl_const::GLFloatType; decl.m_offset = 0; decl.m_stride = 0; - provider.InitStream(5, clr2, MakeStackRefPointer((void*)&outlineColor[0])); + provider.InitStream(5, clr2, dp::MakeStackRefPointer((void*)&outlineColor[0])); } - batcher->InsertTriangleList(state, MakeStackRefPointer(&provider)); + batcher->InsertTriangleList(state, dp::MakeStackRefPointer(&provider)); } } // namespace df diff --git a/drape_frontend/line_shape.hpp b/drape_frontend/line_shape.hpp index 1a5c595c67..efc90eb6ed 100644 --- a/drape_frontend/line_shape.hpp +++ b/drape_frontend/line_shape.hpp @@ -16,10 +16,10 @@ public: LineShape(vector<m2::PointF> const & points, LineViewParams const & params); - virtual void Draw(RefPointer<Batcher> batcher, RefPointer<TextureSetHolder> /*textures*/) const; + virtual void Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<dp::TextureSetHolder> /*textures*/) const; float GetWidth() const { return m_params.m_width; } - Color const & GetColor() const { return m_params.m_color; } + dp::Color const & GetColor() const { return m_params.m_color; } private: LineViewParams m_params; diff --git a/drape_frontend/map_shape.hpp b/drape_frontend/map_shape.hpp index a3058ff759..f1611402f4 100644 --- a/drape_frontend/map_shape.hpp +++ b/drape_frontend/map_shape.hpp @@ -5,8 +5,11 @@ #include "../drape/pointers.hpp" -class Batcher; -class TextureSetHolder; +namespace dp +{ + class Batcher; + class TextureSetHolder; +} namespace df { @@ -35,13 +38,13 @@ class MapShape { public: virtual ~MapShape(){} - virtual void Draw(RefPointer<Batcher> batcher, RefPointer<TextureSetHolder> textures) const = 0; + virtual void Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<dp::TextureSetHolder> textures) const = 0; }; class MapShapeReadedMessage : public Message { public: - MapShapeReadedMessage(TileKey const & key, TransferPointer<MapShape> shape) + MapShapeReadedMessage(TileKey const & key, dp::TransferPointer<MapShape> shape) : m_key(key), m_shape(shape) { SetType(MapShapeReaded); @@ -54,11 +57,11 @@ public: TileKey const & GetKey() const { return m_key; } /// return non const reference for correct construct MasterPointer - TransferPointer<MapShape> & GetShape() { return m_shape; } + dp::TransferPointer<MapShape> & GetShape() { return m_shape; } private: TileKey m_key; - TransferPointer<MapShape> m_shape; + dp::TransferPointer<MapShape> m_shape; }; } // namespace df diff --git a/drape_frontend/message_acceptor.cpp b/drape_frontend/message_acceptor.cpp index a26f6cd38d..529e74fbf6 100644 --- a/drape_frontend/message_acceptor.cpp +++ b/drape_frontend/message_acceptor.cpp @@ -7,8 +7,8 @@ namespace df void MessageAcceptor::ProcessSingleMessage(unsigned maxTimeWait) { - TransferPointer<Message> transferMessage = m_messageQueue.PopMessage(maxTimeWait); - MasterPointer<Message> message(transferMessage); + dp::TransferPointer<Message> transferMessage = m_messageQueue.PopMessage(maxTimeWait); + dp::MasterPointer<Message> message(transferMessage); if (message.IsNull()) return; @@ -16,7 +16,7 @@ void MessageAcceptor::ProcessSingleMessage(unsigned maxTimeWait) message.Destroy(); } -void MessageAcceptor::PostMessage(TransferPointer<Message> message) +void MessageAcceptor::PostMessage(dp::TransferPointer<Message> message) { m_messageQueue.PushMessage(message); } diff --git a/drape_frontend/message_acceptor.hpp b/drape_frontend/message_acceptor.hpp index e73fb25504..99360d727f 100644 --- a/drape_frontend/message_acceptor.hpp +++ b/drape_frontend/message_acceptor.hpp @@ -12,7 +12,7 @@ class Message; class MessageAcceptor { protected: - virtual void AcceptMessage(RefPointer<Message> message) = 0; + virtual void AcceptMessage(dp::RefPointer<Message> message) = 0; /// Must be called by subclass on message target thread void ProcessSingleMessage(unsigned maxTimeWait = -1); @@ -21,7 +21,7 @@ protected: private: friend class ThreadsCommutator; - void PostMessage(TransferPointer<Message> message); + void PostMessage(dp::TransferPointer<Message> message); private: MessageQueue m_messageQueue; diff --git a/drape_frontend/message_queue.cpp b/drape_frontend/message_queue.cpp index eaef5ece32..398f287ba6 100644 --- a/drape_frontend/message_queue.cpp +++ b/drape_frontend/message_queue.cpp @@ -12,7 +12,7 @@ MessageQueue::~MessageQueue() ClearQuery(); } -TransferPointer<Message> MessageQueue::PopMessage(unsigned maxTimeWait) +dp::TransferPointer<Message> MessageQueue::PopMessage(unsigned maxTimeWait) { threads::ConditionGuard guard(m_condition); @@ -21,19 +21,19 @@ TransferPointer<Message> MessageQueue::PopMessage(unsigned maxTimeWait) /// even waitNonEmpty == true m_messages can be empty after WaitMessage call /// if application preparing to close and CancelWait been called if (m_messages.empty()) - return MovePointer<Message>(NULL); + return dp::MovePointer<Message>(NULL); - MasterPointer<Message> msg = m_messages.front(); + dp::MasterPointer<Message> msg = m_messages.front(); m_messages.pop_front(); return msg.Move(); } -void MessageQueue::PushMessage(TransferPointer<Message> message) +void MessageQueue::PushMessage(dp::TransferPointer<Message> message) { threads::ConditionGuard guard(m_condition); bool wasEmpty = m_messages.empty(); - m_messages.push_back(MasterPointer<Message>(message)); + m_messages.push_back(dp::MasterPointer<Message>(message)); if (wasEmpty) guard.Signal(); @@ -52,7 +52,7 @@ void MessageQueue::CancelWait() void MessageQueue::ClearQuery() { - (void)GetRangeDeletor(m_messages, MasterPointerDeleter())(); + DeleteRange(m_messages, dp::MasterPointerDeleter()); } } // namespace df diff --git a/drape_frontend/message_queue.hpp b/drape_frontend/message_queue.hpp index 0467464f67..b676b1bd40 100644 --- a/drape_frontend/message_queue.hpp +++ b/drape_frontend/message_queue.hpp @@ -17,8 +17,8 @@ public: ~MessageQueue(); /// if queue is empty than return NULL - TransferPointer<Message> PopMessage(unsigned maxTimeWait); - void PushMessage(TransferPointer<Message> message); + dp::TransferPointer<Message> PopMessage(unsigned maxTimeWait); + void PushMessage(dp::TransferPointer<Message> message); void CancelWait(); void ClearQuery(); @@ -27,7 +27,7 @@ private: private: threads::Condition m_condition; - list<MasterPointer<Message> > m_messages; + list<dp::MasterPointer<Message> > m_messages; }; } // namespace df diff --git a/drape_frontend/message_subclasses.hpp b/drape_frontend/message_subclasses.hpp index 7fae215d57..12bb165979 100644 --- a/drape_frontend/message_subclasses.hpp +++ b/drape_frontend/message_subclasses.hpp @@ -49,7 +49,7 @@ public: class FlushRenderBucketMessage : public BaseTileMessage { public: - FlushRenderBucketMessage(TileKey const & key, GLState const & state, TransferPointer<RenderBucket> buffer) + FlushRenderBucketMessage(TileKey const & key, dp::GLState const & state, dp::TransferPointer<dp::RenderBucket> buffer) : BaseTileMessage(key, Message::FlushTile) , m_state(state) , m_buffer(buffer) @@ -61,12 +61,12 @@ public: m_buffer.Destroy(); } - GLState const & GetState() const { return m_state; } - MasterPointer<RenderBucket> AcceptBuffer() { return MasterPointer<RenderBucket>(m_buffer); } + dp::GLState const & GetState() const { return m_state; } + dp::MasterPointer<dp::RenderBucket> AcceptBuffer() { return dp::MasterPointer<dp::RenderBucket>(m_buffer); } private: - GLState m_state; - TransferPointer<RenderBucket> m_buffer; + dp::GLState m_state; + dp::TransferPointer<dp::RenderBucket> m_buffer; }; class ResizeMessage : public Message @@ -145,7 +145,7 @@ private: }; template <typename T> -T * CastMessage(RefPointer<Message> msg) +T * CastMessage(dp::RefPointer<Message> msg) { return static_cast<T *>(msg.GetRaw()); } diff --git a/drape_frontend/path_symbol_shape.cpp b/drape_frontend/path_symbol_shape.cpp index f6cef76ed4..8441b1307f 100644 --- a/drape_frontend/path_symbol_shape.cpp +++ b/drape_frontend/path_symbol_shape.cpp @@ -16,7 +16,7 @@ using m2::Spline; using glsl_types::vec2; using glsl_types::vec4; -class PathSymbolHandle : public OverlayHandle +class PathSymbolHandle : public dp::OverlayHandle { public: static const uint8_t PositionAttributeID = 1; @@ -62,16 +62,18 @@ public: itr.Step(m_params.m_step * m_scaleFactor); } } + virtual m2::RectD GetPixelRect(ScreenBase const & screen) const { return m2::RectD(0, 0, 0, 0); } - virtual void GetAttributeMutation(RefPointer<AttributeBufferMutator> mutator) const + + virtual void GetAttributeMutation(dp::RefPointer<dp::AttributeBufferMutator> mutator) const { TOffsetNode const & node = GetOffsetNode(PositionAttributeID); - MutateNode mutateNode; + dp::MutateNode mutateNode; mutateNode.m_region = node.second; - mutateNode.m_data = MakeStackRefPointer<void>(&m_positions[0]); + mutateNode.m_data = dp::MakeStackRefPointer<void>(&m_positions[0]); mutator->AddMutation(node.first, mutateNode); } @@ -91,7 +93,7 @@ PathSymbolShape::PathSymbolShape(vector<PointF> const & path, PathSymbolViewPara m_path.FromArray(path); } -void PathSymbolShape::Draw(RefPointer<Batcher> batcher, RefPointer<TextureSetHolder> textures) const +void PathSymbolShape::Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<dp::TextureSetHolder> textures) const { int maxCount = (m_path.GetLength() * m_maxScale - m_params.m_offset) / m_params.m_step + 1; if (maxCount <= 0) @@ -101,12 +103,12 @@ void PathSymbolShape::Draw(RefPointer<Batcher> batcher, RefPointer<TextureSetHol vector<vec2> positions(vertCnt, vec2(0.0f, 0.0f)); vector<vec4> uvs(vertCnt); vec4 * tc = &uvs[0]; - TextureSetHolder::SymbolRegion region; + dp::TextureSetHolder::SymbolRegion region; textures->GetSymbolRegion(m_params.m_symbolName, region); - GLState state(gpu::TEXTURING_PROGRAM, GLState::OverlayLayer); + dp::GLState state(gpu::TEXTURING_PROGRAM, dp::GLState::OverlayLayer); state.SetTextureSet(region.GetTextureNode().m_textureSet); - state.SetBlending(Blending(true)); + state.SetBlending(dp::Blending(true)); m2::RectF const & rect = region.GetTexRect(); float textureNum = (float)region.GetTextureNode().m_textureOffset; @@ -129,40 +131,40 @@ void PathSymbolShape::Draw(RefPointer<Batcher> batcher, RefPointer<TextureSetHol tc++; } - AttributeProvider provider(3, vertCnt); + dp::AttributeProvider provider(3, vertCnt); { - BindingInfo position(1, PathSymbolHandle::PositionAttributeID); - BindingDecl & decl = position.GetBindingDecl(0); + dp::BindingInfo position(1, PathSymbolHandle::PositionAttributeID); + dp::BindingDecl & decl = position.GetBindingDecl(0); decl.m_attributeName = "a_position"; decl.m_componentCount = 2; decl.m_componentType = gl_const::GLFloatType; decl.m_offset = 0; decl.m_stride = 0; - provider.InitStream(0, position, MakeStackRefPointer(&positions[0])); + provider.InitStream(0, position, dp::MakeStackRefPointer(&positions[0])); } { - BindingInfo normal(1); - BindingDecl & decl = normal.GetBindingDecl(0); + dp::BindingInfo normal(1); + dp::BindingDecl & decl = normal.GetBindingDecl(0); decl.m_attributeName = "a_normal"; decl.m_componentCount = 2; decl.m_componentType = gl_const::GLFloatType; decl.m_offset = 0; decl.m_stride = 0; - provider.InitStream(1, normal, MakeStackRefPointer(&positions[0])); + provider.InitStream(1, normal, dp::MakeStackRefPointer(&positions[0])); } { - BindingInfo texcoord(1); - BindingDecl & decl = texcoord.GetBindingDecl(0); + dp::BindingInfo texcoord(1); + dp::BindingDecl & decl = texcoord.GetBindingDecl(0); decl.m_attributeName = "a_texCoords"; decl.m_componentCount = 4; decl.m_componentType = gl_const::GLFloatType; decl.m_offset = 0; decl.m_stride = 0; - provider.InitStream(2, texcoord, MakeStackRefPointer(&uvs[0])); + provider.InitStream(2, texcoord, dp::MakeStackRefPointer(&uvs[0])); } - OverlayHandle * handle = new PathSymbolHandle(m_path, m_params, maxCount, pixelSize.x / 2.0f, pixelSize.y / 2.0f); - batcher->InsertTriangleList(state, MakeStackRefPointer(&provider), MovePointer(handle)); + dp::OverlayHandle * handle = new PathSymbolHandle(m_path, m_params, maxCount, pixelSize.x / 2.0f, pixelSize.y / 2.0f); + batcher->InsertTriangleList(state, dp::MakeStackRefPointer(&provider), dp::MovePointer(handle)); } } diff --git a/drape_frontend/path_symbol_shape.hpp b/drape_frontend/path_symbol_shape.hpp index eff982a919..7b9ad021a5 100644 --- a/drape_frontend/path_symbol_shape.hpp +++ b/drape_frontend/path_symbol_shape.hpp @@ -16,7 +16,7 @@ class PathSymbolShape : public MapShape { public: PathSymbolShape(vector<m2::PointF> const & path, PathSymbolViewParams const & params, float maxScale); - virtual void Draw(RefPointer<Batcher> batcher, RefPointer<TextureSetHolder> textures) const; + virtual void Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<dp::TextureSetHolder> textures) const; private: PathSymbolViewParams m_params; diff --git a/drape_frontend/path_text_shape.cpp b/drape_frontend/path_text_shape.cpp index 3b90b6f46e..91eb3229c9 100644 --- a/drape_frontend/path_text_shape.cpp +++ b/drape_frontend/path_text_shape.cpp @@ -46,8 +46,8 @@ namespace { vector<Position> m_pos; vector<TexCoord> m_uvs; - vector<ColorF> m_baseColor; - vector<ColorF> m_outlineColor; + vector<dp::ColorF> m_baseColor; + vector<dp::ColorF> m_outlineColor; vector<LetterInfo> m_info; float m_offset; float m_maxSize; @@ -68,7 +68,7 @@ PathTextShape::PathTextShape(vector<PointF> const & path, PathTextViewParams con m_path.FromArray(path); } -void PathTextShape::Draw(RefPointer<Batcher> batcher, RefPointer<TextureSetHolder> textures) const +void PathTextShape::Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<dp::TextureSetHolder> textures) const { strings::UniString const text = strings::MakeUniString(m_params.m_Text); float const fontSize = m_params.m_TextFont.m_size; @@ -81,7 +81,7 @@ void PathTextShape::Draw(RefPointer<Batcher> batcher, RefPointer<TextureSetHolde int textureSet; for (int i = 0; i < cnt; i++) { - TextureSetHolder::GlyphRegion region; + dp::TextureSetHolder::GlyphRegion region; textures->GetGlyphRegion(text[i], region); float xOffset, yOffset, advance; m2::PointU pixelSize; @@ -117,8 +117,8 @@ void PathTextShape::Draw(RefPointer<Batcher> batcher, RefPointer<TextureSetHolde m2::RectF const & rect = region.GetTexRect(); float const textureNum = (region.GetTextureNode().m_textureOffset << 1) + needOutline; - ColorF const base(m_params.m_TextFont.m_color); - ColorF const outline(m_params.m_TextFont.m_outlineColor); + dp::ColorF const base(m_params.m_TextFont.m_color); + dp::ColorF const outline(m_params.m_TextFont.m_outlineColor); curBuffer.m_uvs.push_back(TexCoord(rect.minX(), rect.minY(), textureNum, m_params.m_depth)); curBuffer.m_uvs.push_back(TexCoord(rect.minX(), rect.maxY(), textureNum, m_params.m_depth)); @@ -139,55 +139,55 @@ void PathTextShape::Draw(RefPointer<Batcher> batcher, RefPointer<TextureSetHolde if (buffers[i].m_pos.empty()) continue; - GLState state(gpu::PATH_FONT_PROGRAM, GLState::OverlayLayer); + dp::GLState state(gpu::PATH_FONT_PROGRAM, dp::GLState::OverlayLayer); state.SetTextureSet(i); - state.SetBlending(Blending(true)); + state.SetBlending(dp::Blending(true)); - AttributeProvider provider(4, buffers[i].m_pos.size()); + dp::AttributeProvider provider(4, buffers[i].m_pos.size()); { - BindingInfo position(1, PathTextHandle::DirectionAttributeID); - BindingDecl & decl = position.GetBindingDecl(0); + dp::BindingInfo position(1, PathTextHandle::DirectionAttributeID); + dp::BindingDecl & decl = position.GetBindingDecl(0); decl.m_attributeName = "a_position"; decl.m_componentCount = 2; decl.m_componentType = gl_const::GLFloatType; decl.m_offset = 0; decl.m_stride = 0; - provider.InitStream(0, position, MakeStackRefPointer(&buffers[i].m_pos[0])); + provider.InitStream(0, position, dp::MakeStackRefPointer(&buffers[i].m_pos[0])); } { - BindingInfo texcoord(1); - BindingDecl & decl = texcoord.GetBindingDecl(0); + dp::BindingInfo texcoord(1); + dp::BindingDecl & decl = texcoord.GetBindingDecl(0); decl.m_attributeName = "a_texcoord"; decl.m_componentCount = 4; decl.m_componentType = gl_const::GLFloatType; decl.m_offset = 0; decl.m_stride = 0; - provider.InitStream(1, texcoord, MakeStackRefPointer(&buffers[i].m_uvs[0])); + provider.InitStream(1, texcoord, dp::MakeStackRefPointer(&buffers[i].m_uvs[0])); } { - BindingInfo base_color(1); - BindingDecl & decl = base_color.GetBindingDecl(0); + dp::BindingInfo base_color(1); + dp::BindingDecl & decl = base_color.GetBindingDecl(0); decl.m_attributeName = "a_color"; decl.m_componentCount = 4; decl.m_componentType = gl_const::GLFloatType; decl.m_offset = 0; decl.m_stride = 0; - provider.InitStream(2, base_color, MakeStackRefPointer(&buffers[i].m_baseColor[0])); + provider.InitStream(2, base_color, dp::MakeStackRefPointer(&buffers[i].m_baseColor[0])); } { - BindingInfo outline_color(1); - BindingDecl & decl = outline_color.GetBindingDecl(0); + dp::BindingInfo outline_color(1); + dp::BindingDecl & decl = outline_color.GetBindingDecl(0); decl.m_attributeName = "a_outline_color"; decl.m_componentCount = 4; decl.m_componentType = gl_const::GLFloatType; decl.m_offset = 0; decl.m_stride = 0; - provider.InitStream(3, outline_color, MakeStackRefPointer(&buffers[i].m_outlineColor[0])); + provider.InitStream(3, outline_color, dp::MakeStackRefPointer(&buffers[i].m_outlineColor[0])); } - OverlayHandle * handle = new PathTextHandle(m_path, m_params, buffers[i].m_info, buffers[i].m_maxSize); + dp::OverlayHandle * handle = new PathTextHandle(m_path, m_params, buffers[i].m_info, buffers[i].m_maxSize); - batcher->InsertTriangleList(state, MakeStackRefPointer(&provider), MovePointer(handle)); + batcher->InsertTriangleList(state, dp::MakeStackRefPointer(&provider), dp::MovePointer(handle)); } } @@ -274,12 +274,12 @@ void PathTextHandle::Update(ScreenBase const & screen) } } -void PathTextHandle::GetAttributeMutation(RefPointer<AttributeBufferMutator> mutator) const +void PathTextHandle::GetAttributeMutation(dp::RefPointer<dp::AttributeBufferMutator> mutator) const { TOffsetNode const & node = GetOffsetNode(DirectionAttributeID); - MutateNode mutateNode; + dp::MutateNode mutateNode; mutateNode.m_region = node.second; - mutateNode.m_data = MakeStackRefPointer<void>(&m_positions[0]); + mutateNode.m_data = dp::MakeStackRefPointer<void>(&m_positions[0]); mutator->AddMutation(node.first, mutateNode); } diff --git a/drape_frontend/path_text_shape.hpp b/drape_frontend/path_text_shape.hpp index bc4c2bced7..6b6929189e 100644 --- a/drape_frontend/path_text_shape.hpp +++ b/drape_frontend/path_text_shape.hpp @@ -47,14 +47,14 @@ class PathTextShape : public MapShape { public: PathTextShape(vector<PointF> const & path, PathTextViewParams const & params); - virtual void Draw(RefPointer<Batcher> batcher, RefPointer<TextureSetHolder> textures) const; + virtual void Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<dp::TextureSetHolder> textures) const; private: PathTextViewParams m_params; m2::Spline m_path; }; -class PathTextHandle : public OverlayHandle +class PathTextHandle : public dp::OverlayHandle { public: static const uint8_t DirectionAttributeID = 1; @@ -66,7 +66,7 @@ public: virtual void Update(ScreenBase const & screen); virtual m2::RectD GetPixelRect(ScreenBase const & screen) const; - virtual void GetAttributeMutation(RefPointer<AttributeBufferMutator> mutator) const; + virtual void GetAttributeMutation(dp::RefPointer<dp::AttributeBufferMutator> mutator) const; private: PathTextViewParams m_params; diff --git a/drape_frontend/poi_symbol_shape.cpp b/drape_frontend/poi_symbol_shape.cpp index abb5c336e0..a556666748 100644 --- a/drape_frontend/poi_symbol_shape.cpp +++ b/drape_frontend/poi_symbol_shape.cpp @@ -16,80 +16,83 @@ PoiSymbolShape::PoiSymbolShape(m2::PointD const & mercatorPt, PoiSymbolViewParam { } -void PoiSymbolShape::Draw(RefPointer<Batcher> batcher, RefPointer<TextureSetHolder> textures) const +void PoiSymbolShape::Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<dp::TextureSetHolder> textures) const { - TextureSetHolder::SymbolRegion region; + dp::TextureSetHolder::SymbolRegion region; textures->GetSymbolRegion(m_params.m_symbolName, region); - GLState state(gpu::TEXTURING_PROGRAM, GLState::OverlayLayer); + dp::GLState state(gpu::TEXTURING_PROGRAM, dp::GLState::OverlayLayer); state.SetTextureSet(region.GetTextureNode().m_textureSet); - state.SetBlending(Blending(true)); + state.SetBlending(dp::Blending(true)); m2::PointU pixelSize; region.GetPixelSize(pixelSize); - m2::PointF halfSize(pixelSize.x / 2.0, pixelSize.y / 2.0); + m2::PointF const halfSize(pixelSize.x / 2.0, pixelSize.y / 2.0); m2::RectF const & texRect = region.GetTexRect(); - float depth = m_params.m_depth; - float texture = (float)region.GetTextureNode().m_textureOffset; + float const depth = m_params.m_depth; + float const texture = (float)region.GetTextureNode().m_textureOffset; - float positions[] = - { m_pt.x, m_pt.y, + float positions[] = { m_pt.x, m_pt.y, m_pt.x, m_pt.y, - m_pt.x, m_pt.y}; + m_pt.x, m_pt.y, + m_pt.x, m_pt.y + }; - float normals[] = - { -halfSize.x, halfSize.y, + float normals[] = { + -halfSize.x, halfSize.y, -halfSize.x, -halfSize.y, - halfSize.x, halfSize.y, - halfSize.x, -halfSize.y}; + halfSize.x, halfSize.y, + halfSize.x, -halfSize.y + }; - float uvs[] = - { texRect.minX(), texRect.maxY(), texture, depth, + float uvs[] = { + texRect.minX(), texRect.maxY(), texture, depth, texRect.minX(), texRect.minY(), texture, depth, texRect.maxX(), texRect.maxY(), texture, depth, - texRect.maxX(), texRect.minY(), texture, depth}; + texRect.maxX(), texRect.minY(), texture, depth + }; - AttributeProvider provider(3, 4); + dp::AttributeProvider provider(3, 4); { - BindingInfo position(1, 1); - BindingDecl & decl = position.GetBindingDecl(0); + dp::BindingInfo position(1, 1); + dp::BindingDecl & decl = position.GetBindingDecl(0); decl.m_attributeName = "a_position"; decl.m_componentCount = 2; decl.m_componentType = gl_const::GLFloatType; decl.m_offset = 0; decl.m_stride = 0; - provider.InitStream(0, position, MakeStackRefPointer<void>(positions)); + provider.InitStream(0, position, dp::MakeStackRefPointer<void>(positions)); } { - BindingInfo normal(1); - BindingDecl & decl = normal.GetBindingDecl(0); + dp::BindingInfo normal(1); + dp::BindingDecl & decl = normal.GetBindingDecl(0); decl.m_attributeName = "a_normal"; decl.m_componentCount = 2; decl.m_componentType = gl_const::GLFloatType; decl.m_offset = 0; decl.m_stride = 0; - provider.InitStream(1, normal, MakeStackRefPointer<void>(normals)); + provider.InitStream(1, normal, dp::MakeStackRefPointer<void>(normals)); } { - BindingInfo texcoord(1); - BindingDecl & decl = texcoord.GetBindingDecl(0); + dp::BindingInfo texcoord(1); + dp::BindingDecl & decl = texcoord.GetBindingDecl(0); decl.m_attributeName = "a_texCoords"; decl.m_componentCount = 4; decl.m_componentType = gl_const::GLFloatType; decl.m_offset = 0; decl.m_stride = 0; - provider.InitStream(2, texcoord, MakeStackRefPointer<void>(uvs)); + provider.InitStream(2, texcoord, dp::MakeStackRefPointer<void>(uvs)); } - OverlayHandle * handle = new SquareHandle(m_params.m_id, - dp::Center, - m_pt, - pixelSize, - m_params.m_depth); + dp::OverlayHandle * handle = new dp::SquareHandle(m_params.m_id, + dp::Center, + m_pt, + pixelSize, + depth); - batcher->InsertTriangleStrip(state, MakeStackRefPointer(&provider), MovePointer(handle)); + batcher->InsertTriangleStrip(state, dp::MakeStackRefPointer(&provider), dp::MovePointer(handle)); } } // namespace df diff --git a/drape_frontend/poi_symbol_shape.hpp b/drape_frontend/poi_symbol_shape.hpp index 42148b356b..91bcef5f90 100644 --- a/drape_frontend/poi_symbol_shape.hpp +++ b/drape_frontend/poi_symbol_shape.hpp @@ -11,7 +11,7 @@ class PoiSymbolShape : public MapShape public: PoiSymbolShape(m2::PointD const & mercatorPt, PoiSymbolViewParams const & params); - virtual void Draw(RefPointer<Batcher> batcher, RefPointer<TextureSetHolder> textures) const; + virtual void Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<dp::TextureSetHolder> textures) const; private: m2::PointD const m_pt; diff --git a/drape_frontend/read_manager.hpp b/drape_frontend/read_manager.hpp index 5b169e9b56..6b7b48597c 100644 --- a/drape_frontend/read_manager.hpp +++ b/drape_frontend/read_manager.hpp @@ -46,7 +46,7 @@ private: model::FeaturesFetcher & m_model; - MasterPointer<threads::ThreadPool> m_pool; + dp::MasterPointer<threads::ThreadPool> m_pool; ScreenBase m_currentViewport; diff --git a/drape_frontend/render_group.cpp b/drape_frontend/render_group.cpp index 3415bd9d4d..47dcd98b37 100644 --- a/drape_frontend/render_group.cpp +++ b/drape_frontend/render_group.cpp @@ -10,14 +10,14 @@ namespace df namespace { -RenderBucket * NonConstGetter(MasterPointer<RenderBucket> & p) +dp::RenderBucket * NonConstGetter(dp::MasterPointer<dp::RenderBucket> & p) { return p.GetRaw(); } } /// namespace -RenderGroup::RenderGroup(GLState const & state, df::TileKey const & tileKey) +RenderGroup::RenderGroup(dp::GLState const & state, df::TileKey const & tileKey) : m_state(state) , m_tileKey(tileKey) , m_pendingOnDelete(false) @@ -26,12 +26,12 @@ RenderGroup::RenderGroup(GLState const & state, df::TileKey const & tileKey) RenderGroup::~RenderGroup() { - (void)GetRangeDeletor(m_renderBuckets, MasterPointerDeleter())(); + DeleteRange(m_renderBuckets, dp::MasterPointerDeleter()); } -void RenderGroup::CollectOverlay(RefPointer<OverlayTree> tree) +void RenderGroup::CollectOverlay(dp::RefPointer<dp::OverlayTree> tree) { - for_each(m_renderBuckets.begin(), m_renderBuckets.end(), bind(&RenderBucket::CollectOverlayHandles, + for_each(m_renderBuckets.begin(), m_renderBuckets.end(), bind(&dp::RenderBucket::CollectOverlayHandles, bind(&NonConstGetter, _1), tree)); } @@ -39,7 +39,7 @@ void RenderGroup::CollectOverlay(RefPointer<OverlayTree> tree) void RenderGroup::Render() { ASSERT(m_pendingOnDelete == false, ()); - for_each(m_renderBuckets.begin(), m_renderBuckets.end(), bind(&RenderBucket::Render, + for_each(m_renderBuckets.begin(), m_renderBuckets.end(), bind(&dp::RenderBucket::Render, bind(&NonConstGetter, _1))); } @@ -48,9 +48,9 @@ void RenderGroup::PrepareForAdd(size_t countForAdd) m_renderBuckets.reserve(m_renderBuckets.size() + countForAdd); } -void RenderGroup::AddBucket(TransferPointer<RenderBucket> bucket) +void RenderGroup::AddBucket(dp::TransferPointer<dp::RenderBucket> bucket) { - m_renderBuckets.push_back(MasterPointer<RenderBucket>(bucket)); + m_renderBuckets.push_back(dp::MasterPointer<dp::RenderBucket>(bucket)); } bool RenderGroup::IsLess(RenderGroup const & other) const @@ -73,8 +73,8 @@ void RenderBucketComparator::ResetInternalState() bool RenderBucketComparator::operator()(RenderGroup const * l, RenderGroup const * r) { - GLState const & lState = l->GetState(); - GLState const & rState = r->GetState(); + dp::GLState const & lState = l->GetState(); + dp::GLState const & rState = r->GetState(); TileKey const & lKey = l->GetTileKey(); TileKey const & rKey = r->GetTileKey(); diff --git a/drape_frontend/render_group.hpp b/drape_frontend/render_group.hpp index a71b7e60f1..4dc2788de9 100644 --- a/drape_frontend/render_group.hpp +++ b/drape_frontend/render_group.hpp @@ -9,7 +9,7 @@ #include "../std/vector.hpp" #include "../std/set.hpp" -class OverlayTree; +namespace dp { class OverlayTree; } namespace df { @@ -17,16 +17,16 @@ namespace df class RenderGroup { public: - RenderGroup(GLState const & state, TileKey const & tileKey); + RenderGroup(dp::GLState const & state, TileKey const & tileKey); ~RenderGroup(); - void CollectOverlay(RefPointer<OverlayTree> tree); + void CollectOverlay(dp::RefPointer<dp::OverlayTree> tree); void Render(); void PrepareForAdd(size_t countForAdd); - void AddBucket(TransferPointer<RenderBucket> bucket); + void AddBucket(dp::TransferPointer<dp::RenderBucket> bucket); - GLState const & GetState() const { return m_state; } + dp::GLState const & GetState() const { return m_state; } TileKey const & GetTileKey() const { return m_tileKey; } bool IsEmpty() const { return m_renderBuckets.empty(); } @@ -36,9 +36,9 @@ public: bool IsLess(RenderGroup const & other) const; private: - GLState m_state; + dp::GLState m_state; TileKey m_tileKey; - vector<MasterPointer<RenderBucket> > m_renderBuckets; + vector<dp::MasterPointer<dp::RenderBucket> > m_renderBuckets; mutable bool m_pendingOnDelete; }; diff --git a/drape_frontend/shape_view_params.hpp b/drape_frontend/shape_view_params.hpp index 9405e4873e..a3f2d495b3 100644 --- a/drape_frontend/shape_view_params.hpp +++ b/drape_frontend/shape_view_params.hpp @@ -29,18 +29,18 @@ struct CircleViewParams : CommonViewParams CircleViewParams(FeatureID const & id) : m_id(id) {} FeatureID m_id; - Color m_color; + dp::Color m_color; float m_radius; }; struct AreaViewParams : CommonViewParams { - Color m_color; + dp::Color m_color; }; struct LineViewParams : CommonViewParams { - Color m_color; + dp::Color m_color; float m_width; dp::LineCap m_cap; dp::LineJoin m_join; @@ -48,8 +48,8 @@ struct LineViewParams : CommonViewParams struct FontDecl { - Color m_color; - Color m_outlineColor; + dp::Color m_color; + dp::Color m_outlineColor; float m_size; bool m_needOutline; }; diff --git a/drape_frontend/text_shape.cpp b/drape_frontend/text_shape.cpp index 9849f90440..0ee7287b9b 100644 --- a/drape_frontend/text_shape.cpp +++ b/drape_frontend/text_shape.cpp @@ -100,12 +100,13 @@ TextShape::TextShape(m2::PointF const & basePoint, TextViewParams const & params } void TextShape::AddGeometryWithTheSameTextureSet(int setNum, int letterCount, bool auxText, - float maxTextLength, PointF const & anchorDelta, - RefPointer<Batcher> batcher, RefPointer<TextureSetHolder> textures) const + float maxTextLength, PointF const & anchorDelta, + dp::RefPointer<dp::Batcher> batcher, + dp::RefPointer<dp::TextureSetHolder> textures) const { strings::UniString text; float fontSize; - Color base, outline; + dp::Color base, outline; float needOutline; if(auxText) { @@ -131,7 +132,7 @@ void TextShape::AddGeometryWithTheSameTextureSet(int setNum, int letterCount, bo float stride = 0.0f; int textureSet; - TextureSetHolder::GlyphRegion region; + dp::TextureSetHolder::GlyphRegion region; for(int i = 0, j = 0 ; i < text.size() ; i++) { textures->GetGlyphRegion(text[i], region); @@ -182,8 +183,8 @@ void TextShape::AddGeometryWithTheSameTextureSet(int setNum, int letterCount, bo vector<float> color2(numVert * 6); float clr1[4], clr2[4]; - Convert(base, clr1[0], clr1[1], clr1[2], clr1[3]); - Convert(outline, clr2[0], clr2[1], clr2[2], clr2[3]); + dp::Convert(base, clr1[0], clr1[1], clr1[2], clr1[3]); + dp::Convert(outline, clr2[0], clr2[1], clr2[2], clr2[3]); for(int i = 0; i < letterCount ; i++) { @@ -193,65 +194,63 @@ void TextShape::AddGeometryWithTheSameTextureSet(int setNum, int letterCount, bo SetColor(color2, clr2, i); } - GLState state(gpu::FONT_PROGRAM, GLState::OverlayLayer); + dp::GLState state(gpu::FONT_PROGRAM, dp::GLState::OverlayLayer); state.SetTextureSet(textureSet); - state.SetBlending(Blending(true)); + state.SetBlending(dp::Blending(true)); - AttributeProvider provider(4, 6*letterCount); + dp::AttributeProvider provider(4, 6 * letterCount); { - BindingInfo position(1); - BindingDecl & decl = position.GetBindingDecl(0); + dp::BindingInfo position(1); + dp::BindingDecl & decl = position.GetBindingDecl(0); decl.m_attributeName = "a_position"; decl.m_componentCount = 4; decl.m_componentType = gl_const::GLFloatType; decl.m_offset = 0; decl.m_stride = 0; - provider.InitStream(0, position, MakeStackRefPointer((void*)&vertex2[0])); + provider.InitStream(0, position, dp::MakeStackRefPointer((void*)&vertex2[0])); } { - BindingInfo texcoord(1); - BindingDecl & decl = texcoord.GetBindingDecl(0); + dp::BindingInfo texcoord(1); + dp::BindingDecl & decl = texcoord.GetBindingDecl(0); decl.m_attributeName = "a_texcoord"; decl.m_componentCount = 4; decl.m_componentType = gl_const::GLFloatType; decl.m_offset = 0; decl.m_stride = 0; - provider.InitStream(1, texcoord, MakeStackRefPointer((void*)&texture2[0])); + provider.InitStream(1, texcoord, dp::MakeStackRefPointer((void*)&texture2[0])); } { - BindingInfo base_color(1); - BindingDecl & decl = base_color.GetBindingDecl(0); + dp::BindingInfo base_color(1); + dp::BindingDecl & decl = base_color.GetBindingDecl(0); decl.m_attributeName = "a_color"; decl.m_componentCount = 4; decl.m_componentType = gl_const::GLFloatType; decl.m_offset = 0; decl.m_stride = 0; - provider.InitStream(2, base_color, MakeStackRefPointer((void*)&color[0])); + provider.InitStream(2, base_color, dp::MakeStackRefPointer((void*)&color[0])); } { - BindingInfo outline_color(1); - BindingDecl & decl = outline_color.GetBindingDecl(0); + dp::BindingInfo outline_color(1); + dp::BindingDecl & decl = outline_color.GetBindingDecl(0); decl.m_attributeName = "a_outline_color"; decl.m_componentCount = 4; decl.m_componentType = gl_const::GLFloatType; decl.m_offset = 0; decl.m_stride = 0; - provider.InitStream(3, outline_color, MakeStackRefPointer((void*)&color2[0])); + provider.InitStream(3, outline_color, dp::MakeStackRefPointer((void*)&color2[0])); } float const bbY = m_params.m_primaryTextFont.m_size + m_params.m_secondaryTextFont.m_size; - OverlayHandle * handle = new SquareHandle(m_params.m_featureID, - m_params.m_anchor, - m_basePoint, - m2::PointD(maxTextLength, bbY), - m_params.m_depth); + dp::OverlayHandle * handle = new dp::SquareHandle(m_params.m_featureID, + m_params.m_anchor, + m_basePoint, + m2::PointD(maxTextLength, bbY), + m_params.m_depth); - //handle->SetIsVisible(true); - - batcher->InsertTriangleList(state, MakeStackRefPointer(&provider), MovePointer(handle)); + batcher->InsertTriangleList(state, dp::MakeStackRefPointer(&provider), dp::MovePointer(handle)); } -void TextShape::Draw(RefPointer<Batcher> batcher, RefPointer<TextureSetHolder> textures) const +void TextShape::Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<dp::TextureSetHolder> textures) const { strings::UniString const text = strings::MakeUniString(m_params.m_primaryText); int const size = text.size(); @@ -262,7 +261,7 @@ void TextShape::Draw(RefPointer<Batcher> batcher, RefPointer<TextureSetHolder> t for (int i = 0 ; i < size ; i++) { - TextureSetHolder::GlyphRegion region; + dp::TextureSetHolder::GlyphRegion region; textures->GetGlyphRegion(text[i], region); ++sizes[region.GetTextureNode().m_textureSet]; float xOffset, yOffset, advance; @@ -289,7 +288,7 @@ void TextShape::Draw(RefPointer<Batcher> batcher, RefPointer<TextureSetHolder> t for (int i = 0 ; i < auxSize ; i++) { - TextureSetHolder::GlyphRegion region; + dp::TextureSetHolder::GlyphRegion region; textures->GetGlyphRegion(auxText[i], region); ++auxSizes[region.GetTextureNode().m_textureSet]; float xOffset, yOffset, advance; diff --git a/drape_frontend/text_shape.hpp b/drape_frontend/text_shape.hpp index 9a9e81cf12..b1b0ec3305 100644 --- a/drape_frontend/text_shape.hpp +++ b/drape_frontend/text_shape.hpp @@ -12,11 +12,13 @@ class TextShape : public MapShape public: TextShape(m2::PointF const & basePoint, TextViewParams const & params); - virtual void Draw(RefPointer<Batcher> batcher, RefPointer<TextureSetHolder> textures) const; + virtual void Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<dp::TextureSetHolder> textures) const; private: - void AddGeometryWithTheSameTextureSet(int setNum, int letterCount, bool auxText, float maxTextLength, m2::PointF const & anchorDelta, - RefPointer<Batcher> batcher, RefPointer<TextureSetHolder> textures) const; + void AddGeometryWithTheSameTextureSet(int setNum, int letterCount, bool auxText, + float maxTextLength, m2::PointF const & anchorDelta, + dp::RefPointer<dp::Batcher> batcher, + dp::RefPointer<dp::TextureSetHolder> textures) const; private: m2::PointF m_basePoint; diff --git a/drape_frontend/threads_commutator.cpp b/drape_frontend/threads_commutator.cpp index 902065184e..e5db0e10eb 100644 --- a/drape_frontend/threads_commutator.cpp +++ b/drape_frontend/threads_commutator.cpp @@ -12,7 +12,7 @@ void ThreadsCommutator::RegisterThread(ThreadName name, MessageAcceptor * accept VERIFY(m_acceptors.insert(make_pair(name, acceptor)).second, ()); } -void ThreadsCommutator::PostMessage(ThreadName name, TransferPointer<Message> message) +void ThreadsCommutator::PostMessage(ThreadName name, dp::TransferPointer<Message> message) { acceptors_map_t::iterator it = m_acceptors.find(name); ASSERT(it != m_acceptors.end(), ()); diff --git a/drape_frontend/threads_commutator.hpp b/drape_frontend/threads_commutator.hpp index 8ec1ca50c7..8f3f8dd278 100644 --- a/drape_frontend/threads_commutator.hpp +++ b/drape_frontend/threads_commutator.hpp @@ -19,7 +19,7 @@ public: }; void RegisterThread(ThreadName name, MessageAcceptor *acceptor); - void PostMessage(ThreadName name, TransferPointer<Message> message); + void PostMessage(ThreadName name, dp::TransferPointer<Message> message); private: typedef map<ThreadName, MessageAcceptor *> acceptors_map_t; diff --git a/drape_head/drape_surface.cpp b/drape_head/drape_surface.cpp index e19ba682c4..b27bcc7a76 100644 --- a/drape_head/drape_surface.cpp +++ b/drape_head/drape_surface.cpp @@ -37,8 +37,8 @@ void DrapeSurface::exposeEvent(QExposeEvent *e) { if (m_contextFactory.IsNull()) { - ThreadSafeFactory * factory = new ThreadSafeFactory(new QtOGLContextFactory(this)); - m_contextFactory = MasterPointer<OGLContextFactory>(factory); + dp::ThreadSafeFactory * factory = new dp::ThreadSafeFactory(new QtOGLContextFactory(this)); + m_contextFactory = dp::MasterPointer<dp::OGLContextFactory>(factory); CreateEngine(); } } @@ -95,11 +95,11 @@ void DrapeSurface::wheelEvent(QWheelEvent * e) void DrapeSurface::CreateEngine() { - RefPointer<OGLContextFactory> f(m_contextFactory.GetRefPointer()); + dp::RefPointer<dp::OGLContextFactory> f(m_contextFactory.GetRefPointer()); float pixelRatio = devicePixelRatio(); - m_drapeEngine = MasterPointer<df::DrapeEngine>( + m_drapeEngine = dp::MasterPointer<df::DrapeEngine>( new df::DrapeEngine(f , pixelRatio, df::Viewport(pixelRatio, 0, 0, width(), height()))); } diff --git a/drape_head/drape_surface.hpp b/drape_head/drape_surface.hpp index 901dabcd0f..57b4854a6f 100644 --- a/drape_head/drape_surface.hpp +++ b/drape_head/drape_surface.hpp @@ -42,6 +42,6 @@ private: bool m_dragState; private: - MasterPointer<OGLContextFactory> m_contextFactory; - MasterPointer<df::DrapeEngine> m_drapeEngine; + dp::MasterPointer<dp::OGLContextFactory> m_contextFactory; + dp::MasterPointer<df::DrapeEngine> m_drapeEngine; }; diff --git a/drape_head/qtoglcontext.hpp b/drape_head/qtoglcontext.hpp index 766f2676dd..aec0a1339b 100644 --- a/drape_head/qtoglcontext.hpp +++ b/drape_head/qtoglcontext.hpp @@ -5,7 +5,7 @@ #include <QtGui/QWindow> #include <QtGui/QOpenGLContext> -class QtOGLContext: public OGLContext +class QtOGLContext: public dp::OGLContext { public: QtOGLContext(QWindow * surface, QtOGLContext * contextToShareWith); diff --git a/drape_head/qtoglcontextfactory.cpp b/drape_head/qtoglcontextfactory.cpp index 551e1b23b5..33ad81691a 100644 --- a/drape_head/qtoglcontextfactory.cpp +++ b/drape_head/qtoglcontextfactory.cpp @@ -14,7 +14,7 @@ QtOGLContextFactory::~QtOGLContextFactory() delete m_uploadContext; } -OGLContext * QtOGLContextFactory::getDrawContext() +dp::OGLContext * QtOGLContextFactory::getDrawContext() { if (m_drawContext == NULL) m_drawContext = new QtOGLContext(m_surface, m_uploadContext); @@ -22,7 +22,7 @@ OGLContext * QtOGLContextFactory::getDrawContext() return m_drawContext; } -OGLContext * QtOGLContextFactory::getResourcesUploadContext() +dp::OGLContext * QtOGLContextFactory::getResourcesUploadContext() { if (m_uploadContext == NULL) m_uploadContext = new QtOGLContext(m_surface, m_drawContext); diff --git a/drape_head/qtoglcontextfactory.hpp b/drape_head/qtoglcontextfactory.hpp index 7fa9228340..4b65f12fe3 100644 --- a/drape_head/qtoglcontextfactory.hpp +++ b/drape_head/qtoglcontextfactory.hpp @@ -5,14 +5,14 @@ #include <QtGui/QWindow> -class QtOGLContextFactory : public OGLContextFactory +class QtOGLContextFactory : public dp::OGLContextFactory { public: QtOGLContextFactory(QWindow * surface); ~QtOGLContextFactory(); - virtual OGLContext * getDrawContext(); - virtual OGLContext * getResourcesUploadContext(); + virtual dp::OGLContext * getDrawContext(); + virtual dp::OGLContext * getResourcesUploadContext(); private: QWindow * m_surface; diff --git a/drape_head/testing_engine.cpp b/drape_head/testing_engine.cpp index f2adca662f..2413e9e187 100644 --- a/drape_head/testing_engine.cpp +++ b/drape_head/testing_engine.cpp @@ -29,7 +29,7 @@ namespace df { -class SquareHandle : public OverlayHandle +class SquareHandle : public dp::OverlayHandle { public: static const uint8_t NormalAttributeID = 1; @@ -42,7 +42,7 @@ public: virtual m2::RectD GetPixelRect(ScreenBase const & screen) const { return m2::RectD(); } - virtual void GetAttributeMutation(RefPointer<AttributeBufferMutator> mutator) const + virtual void GetAttributeMutation(dp::RefPointer<dp::AttributeBufferMutator> mutator) const { static const my::Timer timer; double const angle = timer.ElapsedSeconds(); @@ -54,9 +54,9 @@ public: data[i] = m_vectors[i] * m; TOffsetNode const & node = GetOffsetNode(NormalAttributeID); - MutateNode mutateNode; + dp::MutateNode mutateNode; mutateNode.m_region = node.second; - mutateNode.m_data = MakeStackRefPointer<void>(&data[0]); + mutateNode.m_data = dp::MakeStackRefPointer<void>(&data[0]); mutator->AddMutation(node.first, mutateNode); } @@ -73,7 +73,7 @@ public: { } - virtual void Draw(RefPointer<Batcher> batcher, RefPointer<TextureSetHolder> textures) const + virtual void Draw(dp::RefPointer<dp::Batcher> batcher, dp::RefPointer<dp::TextureSetHolder> textures) const { vector<m2::PointF> vertexes(4, m_center); @@ -83,34 +83,34 @@ public: formingVectors[2] = m2::PointF( m_radius, m_radius); formingVectors[3] = m2::PointF( m_radius, -m_radius); - AttributeProvider provider(2, 4); + dp::AttributeProvider provider(2, 4); { - BindingInfo info(1); - BindingDecl & decl = info.GetBindingDecl(0); + dp::BindingInfo info(1); + dp::BindingDecl & decl = info.GetBindingDecl(0); decl.m_attributeName = "a_position"; decl.m_componentCount = 2; decl.m_componentType = gl_const::GLFloatType; decl.m_offset = 0; decl.m_stride = 0; - provider.InitStream(0, info, MakeStackRefPointer<void>(&vertexes[0])); + provider.InitStream(0, info, dp::MakeStackRefPointer<void>(&vertexes[0])); } { - BindingInfo info(1, SquareHandle::NormalAttributeID); - BindingDecl & decl = info.GetBindingDecl(0); + dp::BindingInfo info(1, SquareHandle::NormalAttributeID); + dp::BindingDecl & decl = info.GetBindingDecl(0); decl.m_attributeName = "a_normal"; decl.m_componentCount = 2; decl.m_componentType = gl_const::GLFloatType; decl.m_offset = 0; decl.m_stride = 0; - provider.InitStream(1, info, MakeStackRefPointer<void>(&formingVectors[0])); + provider.InitStream(1, info, dp::MakeStackRefPointer<void>(&formingVectors[0])); } - GLState state(gpu::TEST_DYN_ATTR_PROGRAM, GLState::GeometryLayer); - state.SetColor(Color(150, 130, 120, 255)); + dp::GLState state(gpu::TEST_DYN_ATTR_PROGRAM, dp::GLState::GeometryLayer); + state.SetColor(dp::Color(150, 130, 120, 255)); - OverlayHandle * handle = new SquareHandle(formingVectors); + dp::OverlayHandle * handle = new SquareHandle(formingVectors); - batcher->InsertTriangleStrip(state, MakeStackRefPointer<AttributeProvider>(&provider), MovePointer(handle)); + batcher->InsertTriangleStrip(state, dp::MakeStackRefPointer<dp::AttributeProvider>(&provider), dp::MovePointer(handle)); } private: @@ -153,15 +153,14 @@ public: } private: - Color ParseColor(json_t * object) + dp::Color ParseColor(json_t * object) { - size_t const channelCount = json_array_size(object); - ASSERT(channelCount == 4, ()); + ASSERT(json_array_size(object) == 4, ()); int const r = json_integer_value(json_array_get(object, 0)); int const g = json_integer_value(json_array_get(object, 1)); int const b = json_integer_value(json_array_get(object, 2)); int const a = json_integer_value(json_array_get(object, 3)); - return Color(r, g, b, a); + return dp::Color(r, g, b, a); } float ParseCoord(json_t * object) @@ -247,7 +246,7 @@ private: TCreatorsMap m_creators; }; -TestingEngine::TestingEngine(RefPointer<OGLContextFactory> oglcontextfactory, +TestingEngine::TestingEngine(dp::RefPointer<dp::OGLContextFactory> oglcontextfactory, double vs, df::Viewport const & viewport) : m_contextFactory(oglcontextfactory) , m_viewport(viewport) @@ -256,10 +255,10 @@ TestingEngine::TestingEngine(RefPointer<OGLContextFactory> oglcontextfactory, df::VisualParams::Init(vs, df::CalculateTileSize(viewport.GetWidth(), viewport.GetHeight())); m_contextFactory->getDrawContext()->makeCurrent(); - m_textures.Reset(new TextureManager()); + m_textures.Reset(new dp::TextureManager()); m_textures->Init(df::VisualParams::Instance().GetResourcePostfix()); - m_batcher.Reset(new Batcher()); - m_programManager.Reset(new GpuProgramManager()); + m_batcher.Reset(new dp::Batcher()); + m_programManager.Reset(new dp::GpuProgramManager()); ModelViewInit(); ProjectionInit(); @@ -288,7 +287,7 @@ void TestingEngine::Draw() isInitialized = true; } - OGLContext * context = m_contextFactory->getDrawContext(); + dp::OGLContext * context = m_contextFactory->getDrawContext(); context->setDefaultFramebuffer(); m_viewport.Apply(); @@ -298,15 +297,15 @@ void TestingEngine::Draw() TScene::iterator it = m_scene.begin(); for(; it != m_scene.end(); ++it) { - GLState const & state = it->first; - RefPointer<GpuProgram> prg = m_programManager->GetProgram(state.GetProgramIndex()); + dp::GLState const & state = it->first; + dp::RefPointer<dp::GpuProgram> prg = m_programManager->GetProgram(state.GetProgramIndex()); prg->Bind(); - TextureSetBinder binder(m_textures.GetRefPointer()); - ApplyState(state, prg, MakeStackRefPointer<TextureSetController>(&binder)); + dp::TextureSetBinder binder(m_textures.GetRefPointer()); + ApplyState(state, prg, dp::MakeStackRefPointer<dp::TextureSetController>(&binder)); ApplyUniforms(m_generalUniforms, prg); - vector<MasterPointer<RenderBucket> > & buckets = it->second; - OverlayTree tree; + vector<dp::MasterPointer<dp::RenderBucket> > & buckets = it->second; + dp::OverlayTree tree; tree.StartOverlayPlacing(m_modelView, true); for (size_t i = 0; i < buckets.size(); ++i) buckets[i]->CollectOverlayHandles(MakeStackRefPointer(&tree)); @@ -362,14 +361,14 @@ void TestingEngine::DrawImpl() DeleteRange(shapes, DeleteFunctor()); FontDecl fd; - fd.m_color = Color(200, 80, 240, 255); + fd.m_color = dp::Color(200, 80, 240, 255); fd.m_needOutline = true; - fd.m_outlineColor = Color(255, 255, 255, 255); + fd.m_outlineColor = dp::Color(255, 255, 255, 255); fd.m_size = 60.0f; FontDecl auxFd; - auxFd.m_color = Color(0, 80, 240, 255); + auxFd.m_color = dp::Color(0, 80, 240, 255); auxFd.m_needOutline = false; - auxFd.m_outlineColor = Color(0, 255, 0, 255); + auxFd.m_outlineColor = dp::Color(0, 255, 0, 255); auxFd.m_size = 20.0f; TextViewParams params; @@ -417,8 +416,8 @@ void TestingEngine::DrawImpl() PathSymbolViewParams params4; params4.m_featureID = FeatureID(23, 78); params4.m_depth = 30.0f; - params4.m_Offset = 40.0f; - params4.m_OffsetStart = 0.0f; + params4.m_step = 40.0f; + params4.m_offset = 0.0f; params4.m_symbolName = "arrow"; PathSymbolShape sh4(path, params4, 10); sh4.Draw(m_batcher.GetRefPointer(), m_textures.GetRefPointer()); @@ -468,9 +467,9 @@ void TestingEngine::ProjectionInit() m_generalUniforms.SetMatrix4x4Value("projection", m); } -void TestingEngine::OnFlushData(GLState const & state, TransferPointer<RenderBucket> vao) +void TestingEngine::OnFlushData(dp::GLState const & state, dp::TransferPointer<dp::RenderBucket> vao) { - MasterPointer<RenderBucket> bucket(vao); + dp::MasterPointer<dp::RenderBucket> bucket(vao); bucket->GetBuffer()->Build(m_programManager->GetProgram(state.GetProgramIndex())); m_scene[state].push_back(bucket); } @@ -479,7 +478,7 @@ void TestingEngine::ClearScene() { TScene::iterator it = m_scene.begin(); for(; it != m_scene.end(); ++it) - DeleteRange(it->second, MasterPointerDeleter()); + DeleteRange(it->second, dp::MasterPointerDeleter()); } } // namespace df diff --git a/drape_head/testing_engine.hpp b/drape_head/testing_engine.hpp index 34b93ce723..66ed1c4358 100644 --- a/drape_head/testing_engine.hpp +++ b/drape_head/testing_engine.hpp @@ -20,7 +20,7 @@ namespace df class TestingEngine : public QObject { public: - TestingEngine(RefPointer<OGLContextFactory> oglcontextfactory, double vs, df::Viewport const & viewport); + TestingEngine(dp::RefPointer<dp::OGLContextFactory> oglcontextfactory, double vs, df::Viewport const & viewport); ~TestingEngine(); void Draw(); @@ -39,21 +39,21 @@ private: void DrawImpl(); void ModelViewInit(); void ProjectionInit(); - void OnFlushData(GLState const & state, TransferPointer<RenderBucket> vao); + void OnFlushData(dp::GLState const & state, dp::TransferPointer<dp::RenderBucket> vao); void ClearScene(); private: - RefPointer<OGLContextFactory> m_contextFactory; - MasterPointer<Batcher> m_batcher; - MasterPointer<GpuProgramManager> m_programManager; - MasterPointer<TextureManager> m_textures; + dp::RefPointer<dp::OGLContextFactory> m_contextFactory; + dp::MasterPointer<dp::Batcher> m_batcher; + dp::MasterPointer<dp::GpuProgramManager> m_programManager; + dp::MasterPointer<dp::TextureManager> m_textures; df::Viewport m_viewport; - typedef map<GLState, vector<MasterPointer<RenderBucket> > > TScene; + typedef map<dp::GLState, vector<dp::MasterPointer<dp::RenderBucket> > > TScene; TScene m_scene; ScreenBase m_modelView; - UniformValuesStorage m_generalUniforms; + dp::UniformValuesStorage m_generalUniforms; }; } // namespace df diff --git a/geometry/spline.cpp b/geometry/spline.cpp index f6702938df..c8482088de 100644 --- a/geometry/spline.cpp +++ b/geometry/spline.cpp @@ -31,6 +31,12 @@ Spline const & Spline::operator = (Spline const & spl) return *this; } +Spline::iterator::iterator() + : m_checker(false) + , m_spl(NULL) + , m_index(0) + , m_dist(0) {} + void Spline::iterator::Attach(Spline const & S) { m_spl = &S; diff --git a/geometry/spline.hpp b/geometry/spline.hpp index 2375eb656e..1f7f67c9f0 100644 --- a/geometry/spline.hpp +++ b/geometry/spline.hpp @@ -16,9 +16,7 @@ public: PointF m_pos; PointF m_dir; PointF m_avrDir; - iterator() - : m_pos(), m_dir(), m_avrDir(), - m_checker(false), m_spl(NULL), m_index(0), m_dist(0) {} + iterator(); void Attach(Spline const & S); void Step(float speed); bool BeginAgain(); |