From abafb52f37beb5659efc2105ccd1568e1f754898 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= Date: Thu, 4 Dec 2014 18:29:42 +0100 Subject: make most headers private --- .gitignore | 1 - config/constants.cpp | 27 - gyp/mbgl-core.gypi | 2 +- gyp/mbgl-headless.gypi | 1 - gyp/mbgl-ios.gypi | 1 - gyp/mbgl-linux.gypi | 1 - gyp/mbgl-osx.gypi | 1 - include/clipper/clipper.hpp | 398 ---------- include/csscolorparser/csscolorparser.hpp | 44 -- include/libtess2/LICENSE.txt | 25 - include/libtess2/tesselator.h | 209 ----- include/mbgl/geometry/anchor.hpp | 25 - include/mbgl/geometry/binpack.hpp | 100 --- include/mbgl/geometry/buffer.hpp | 118 --- include/mbgl/geometry/debug_font_buffer.hpp | 17 - include/mbgl/geometry/elements_buffer.hpp | 63 -- include/mbgl/geometry/fill_buffer.hpp | 21 - include/mbgl/geometry/geometry.hpp | 77 -- include/mbgl/geometry/glyph_atlas.hpp | 54 -- include/mbgl/geometry/icon_buffer.hpp | 22 - include/mbgl/geometry/line_buffer.hpp | 39 - include/mbgl/geometry/resample.hpp | 13 - include/mbgl/geometry/sprite_atlas.hpp | 81 -- include/mbgl/geometry/static_vertex_buffer.hpp | 26 - include/mbgl/geometry/text_buffer.hpp | 25 - include/mbgl/geometry/vao.hpp | 73 -- include/mbgl/map/map.hpp | 12 +- include/mbgl/map/raster_tile_data.hpp | 33 - include/mbgl/map/source.hpp | 86 --- include/mbgl/map/sprite.hpp | 79 -- include/mbgl/map/tile_data.hpp | 88 --- include/mbgl/map/tile_parser.hpp | 77 -- include/mbgl/map/transform_state.hpp | 1 - include/mbgl/map/vector_tile.hpp | 118 --- include/mbgl/map/vector_tile_data.hpp | 74 -- .../platform/default/caching_http_file_source.hpp | 52 -- include/mbgl/platform/gl.hpp | 4 +- include/mbgl/renderer/bucket.hpp | 24 - include/mbgl/renderer/debug_bucket.hpp | 35 - include/mbgl/renderer/fill_bucket.hpp | 88 --- include/mbgl/renderer/frame_history.hpp | 40 - include/mbgl/renderer/line_bucket.hpp | 62 -- include/mbgl/renderer/painter.hpp | 259 ------- include/mbgl/renderer/prerendered_texture.hpp | 37 - include/mbgl/renderer/raster_bucket.hpp | 38 - include/mbgl/renderer/symbol_bucket.hpp | 114 --- include/mbgl/shader/dot_shader.hpp | 26 - include/mbgl/shader/gaussian_shader.hpp | 25 - include/mbgl/shader/icon_shader.hpp | 41 - include/mbgl/shader/line_shader.hpp | 32 - include/mbgl/shader/linejoin_shader.hpp | 27 - include/mbgl/shader/linepattern_shader.hpp | 33 - include/mbgl/shader/outline_shader.hpp | 25 - include/mbgl/shader/pattern_shader.hpp | 29 - include/mbgl/shader/plain_shader.hpp | 24 - include/mbgl/shader/raster_shader.hpp | 31 - include/mbgl/shader/sdf_shader.hpp | 53 -- include/mbgl/shader/shader.hpp | 28 - include/mbgl/shader/uniform.hpp | 53 -- include/mbgl/storage/base_request.hpp | 62 -- include/mbgl/storage/caching_http_file_source.hpp | 52 ++ include/mbgl/storage/file_request.hpp | 27 - include/mbgl/storage/file_request_baton.hpp | 36 - include/mbgl/storage/file_source.hpp | 5 +- include/mbgl/storage/http_request.hpp | 58 -- include/mbgl/storage/http_request_baton.hpp | 2 +- include/mbgl/storage/request.hpp | 5 +- include/mbgl/storage/sqlite_store.hpp | 48 -- include/mbgl/style/applied_class_properties.hpp | 39 - include/mbgl/style/class_dictionary.hpp | 37 - include/mbgl/style/class_properties.hpp | 43 -- include/mbgl/style/filter_expression.hpp | 125 --- include/mbgl/style/filter_expression_private.hpp | 118 --- include/mbgl/style/function_properties.hpp | 55 -- include/mbgl/style/property_fallback.hpp | 29 - include/mbgl/style/property_key.hpp | 70 -- include/mbgl/style/property_transition.hpp | 15 - include/mbgl/style/property_value.hpp | 21 - include/mbgl/style/style.hpp | 68 -- include/mbgl/style/style_bucket.hpp | 112 --- include/mbgl/style/style_layer.hpp | 89 --- include/mbgl/style/style_layer_group.hpp | 23 - include/mbgl/style/style_parser.hpp | 113 --- include/mbgl/style/style_properties.hpp | 114 --- include/mbgl/style/style_source.hpp | 41 - include/mbgl/style/types.hpp | 196 ----- include/mbgl/style/value.hpp | 45 -- include/mbgl/style/value_comparison.hpp | 109 --- include/mbgl/text/collision.hpp | 58 -- include/mbgl/text/glyph.hpp | 60 -- include/mbgl/text/glyph_store.hpp | 99 --- include/mbgl/text/placement.hpp | 31 - include/mbgl/text/rotation_range.hpp | 54 -- include/mbgl/text/types.hpp | 113 --- include/mbgl/util/clip_ids.hpp | 38 - include/mbgl/util/compression.hpp | 15 - include/mbgl/util/constants.hpp | 33 - include/mbgl/util/error.hpp | 20 - include/mbgl/util/interpolate.hpp | 27 - include/mbgl/util/io.hpp | 15 - include/mbgl/util/mapbox.hpp | 17 - include/mbgl/util/mat3.hpp | 42 - include/mbgl/util/optional.hpp | 69 -- include/mbgl/util/pbf.hpp | 184 ----- include/mbgl/util/queue.h | 92 --- include/mbgl/util/raster.hpp | 74 -- include/mbgl/util/rect.hpp | 22 - include/mbgl/util/sqlite3.hpp | 74 -- include/mbgl/util/stopwatch.hpp | 40 - include/mbgl/util/texture_pool.hpp | 25 - include/mbgl/util/token.hpp | 50 -- include/mbgl/util/transition.hpp | 78 -- include/mbgl/util/unitbezier.hpp | 121 --- include/mbgl/util/url.hpp | 15 - include/mbgl/util/uv-channel.h | 29 - include/mbgl/util/uv-worker.h | 41 - include/mbgl/util/uv_detail.hpp | 177 ----- include/mbgl/util/vec.hpp | 5 - include/rapidjson/document.h | 821 -------------------- include/rapidjson/filestream.h | 46 -- include/rapidjson/internal/pow10.h | 54 -- include/rapidjson/internal/stack.h | 82 -- include/rapidjson/internal/strfunc.h | 24 - include/rapidjson/prettywriter.h | 156 ---- include/rapidjson/rapidjson.h | 525 ------------- include/rapidjson/reader.h | 692 ----------------- include/rapidjson/stringbuffer.h | 49 -- include/rapidjson/writer.h | 241 ------ ios/mapbox-gl-cocoa | 2 +- linux/main.cpp | 2 +- macosx/main.mm | 3 +- platform/default/caching_http_file_source.cpp | 115 --- src/clipper/clipper.cpp | 2 +- src/clipper/clipper.hpp | 398 ++++++++++ src/csscolorparser/csscolorparser.cpp | 2 +- src/csscolorparser/csscolorparser.hpp | 44 ++ src/geometry/debug_font_buffer.cpp | 42 - src/geometry/debug_font_data.hpp | 206 ----- src/geometry/elements_buffer.cpp | 21 - src/geometry/fill_buffer.cpp | 12 - src/geometry/glyph_atlas.cpp | 166 ---- src/geometry/icon_buffer.cpp | 35 - src/geometry/line_buffer.cpp | 23 - src/geometry/resample.cpp | 62 -- src/geometry/sprite_atlas.cpp | 261 ------- src/geometry/static_vertex_buffer.cpp | 14 - src/geometry/text_buffer.cpp | 33 - src/geometry/vao.cpp | 55 -- src/libtess2/bucketalloc.c | 2 +- src/libtess2/bucketalloc.h | 2 +- src/libtess2/dict.c | 2 +- src/libtess2/mesh.h | 2 +- src/libtess2/priorityq.c | 2 +- src/libtess2/tess.h | 2 +- src/libtess2/tesselator.h | 209 +++++ src/map/map.cpp | 647 ---------------- src/map/raster_tile_data.cpp | 34 - src/map/source.cpp | 369 --------- src/map/sprite.cpp | 152 ---- src/map/tile.cpp | 146 ---- src/map/tile_data.cpp | 104 --- src/map/tile_parser.cpp | 175 ----- src/map/transform.cpp | 472 ------------ src/map/transform_state.cpp | 171 ----- src/map/vector_tile.cpp | 214 ------ src/map/vector_tile_data.cpp | 78 -- src/mbgl/geometry/anchor.hpp | 25 + src/mbgl/geometry/binpack.hpp | 100 +++ src/mbgl/geometry/buffer.hpp | 118 +++ src/mbgl/geometry/debug_font_buffer.cpp | 42 + src/mbgl/geometry/debug_font_buffer.hpp | 17 + src/mbgl/geometry/debug_font_data.hpp | 206 +++++ src/mbgl/geometry/elements_buffer.cpp | 21 + src/mbgl/geometry/elements_buffer.hpp | 64 ++ src/mbgl/geometry/fill_buffer.cpp | 13 + src/mbgl/geometry/fill_buffer.hpp | 21 + src/mbgl/geometry/geometry.hpp | 77 ++ src/mbgl/geometry/glyph_atlas.cpp | 167 ++++ src/mbgl/geometry/glyph_atlas.hpp | 54 ++ src/mbgl/geometry/icon_buffer.cpp | 35 + src/mbgl/geometry/icon_buffer.hpp | 22 + src/mbgl/geometry/line_buffer.cpp | 23 + src/mbgl/geometry/line_buffer.hpp | 39 + src/mbgl/geometry/resample.cpp | 62 ++ src/mbgl/geometry/resample.hpp | 13 + src/mbgl/geometry/sprite_atlas.cpp | 261 +++++++ src/mbgl/geometry/sprite_atlas.hpp | 82 ++ src/mbgl/geometry/static_vertex_buffer.cpp | 14 + src/mbgl/geometry/static_vertex_buffer.hpp | 26 + src/mbgl/geometry/text_buffer.cpp | 33 + src/mbgl/geometry/text_buffer.hpp | 25 + src/mbgl/geometry/vao.cpp | 55 ++ src/mbgl/geometry/vao.hpp | 73 ++ src/mbgl/map/map.cpp | 654 ++++++++++++++++ src/mbgl/map/raster_tile_data.cpp | 34 + src/mbgl/map/raster_tile_data.hpp | 33 + src/mbgl/map/source.cpp | 370 +++++++++ src/mbgl/map/source.hpp | 86 +++ src/mbgl/map/sprite.cpp | 152 ++++ src/mbgl/map/sprite.hpp | 79 ++ src/mbgl/map/tile.cpp | 147 ++++ src/mbgl/map/tile_data.cpp | 104 +++ src/mbgl/map/tile_data.hpp | 88 +++ src/mbgl/map/tile_parser.cpp | 174 +++++ src/mbgl/map/tile_parser.hpp | 77 ++ src/mbgl/map/transform.cpp | 472 ++++++++++++ src/mbgl/map/transform_state.cpp | 172 +++++ src/mbgl/map/vector_tile.cpp | 214 ++++++ src/mbgl/map/vector_tile.hpp | 118 +++ src/mbgl/map/vector_tile_data.cpp | 78 ++ src/mbgl/map/vector_tile_data.hpp | 74 ++ src/mbgl/platform/gl.cpp | 95 +++ src/mbgl/platform/log.cpp | 7 + src/mbgl/renderer/bucket.hpp | 24 + src/mbgl/renderer/debug_bucket.cpp | 32 + src/mbgl/renderer/debug_bucket.hpp | 35 + src/mbgl/renderer/fill_bucket.cpp | 246 ++++++ src/mbgl/renderer/fill_bucket.hpp | 88 +++ src/mbgl/renderer/frame_history.cpp | 85 +++ src/mbgl/renderer/frame_history.hpp | 40 + src/mbgl/renderer/line_bucket.cpp | 403 ++++++++++ src/mbgl/renderer/line_bucket.hpp | 62 ++ src/mbgl/renderer/painter.cpp | 465 ++++++++++++ src/mbgl/renderer/painter.hpp | 259 +++++++ src/mbgl/renderer/painter_clipping.cpp | 39 + src/mbgl/renderer/painter_debug.cpp | 102 +++ src/mbgl/renderer/painter_fill.cpp | 122 +++ src/mbgl/renderer/painter_line.cpp | 101 +++ src/mbgl/renderer/painter_prerender.cpp | 45 ++ src/mbgl/renderer/painter_raster.cpp | 107 +++ src/mbgl/renderer/painter_symbol.cpp | 208 +++++ src/mbgl/renderer/prerendered_texture.cpp | 154 ++++ src/mbgl/renderer/prerendered_texture.hpp | 37 + src/mbgl/renderer/raster_bucket.cpp | 36 + src/mbgl/renderer/raster_bucket.hpp | 38 + src/mbgl/renderer/symbol_bucket.cpp | 427 +++++++++++ src/mbgl/renderer/symbol_bucket.hpp | 114 +++ src/mbgl/shader/dot.fragment.glsl | 9 + src/mbgl/shader/dot.vertex.glsl | 9 + src/mbgl/shader/dot_shader.cpp | 26 + src/mbgl/shader/dot_shader.hpp | 26 + src/mbgl/shader/gaussian.fragment.glsl | 11 + src/mbgl/shader/gaussian.vertex.glsl | 15 + src/mbgl/shader/gaussian_shader.cpp | 28 + src/mbgl/shader/gaussian_shader.hpp | 25 + src/mbgl/shader/icon.fragment.glsl | 8 + src/mbgl/shader/icon.vertex.glsl | 73 ++ src/mbgl/shader/icon_shader.cpp | 60 ++ src/mbgl/shader/icon_shader.hpp | 41 + src/mbgl/shader/line.fragment.glsl | 25 + src/mbgl/shader/line.vertex.glsl | 45 ++ src/mbgl/shader/line_shader.cpp | 34 + src/mbgl/shader/line_shader.hpp | 32 + src/mbgl/shader/linejoin.fragment.glsl | 14 + src/mbgl/shader/linejoin.vertex.glsl | 13 + src/mbgl/shader/linejoin_shader.cpp | 27 + src/mbgl/shader/linejoin_shader.hpp | 27 + src/mbgl/shader/linepattern.fragment.glsl | 37 + src/mbgl/shader/linepattern.vertex.glsl | 57 ++ src/mbgl/shader/linepattern_shader.cpp | 35 + src/mbgl/shader/linepattern_shader.hpp | 33 + src/mbgl/shader/outline.fragment.glsl | 9 + src/mbgl/shader/outline.vertex.glsl | 10 + src/mbgl/shader/outline_shader.cpp | 26 + src/mbgl/shader/outline_shader.hpp | 25 + src/mbgl/shader/pattern.fragment.glsl | 21 + src/mbgl/shader/pattern.vertex.glsl | 11 + src/mbgl/shader/pattern_shader.cpp | 26 + src/mbgl/shader/pattern_shader.hpp | 29 + src/mbgl/shader/plain.fragment.glsl | 5 + src/mbgl/shader/plain.vertex.glsl | 7 + src/mbgl/shader/plain_shader.cpp | 26 + src/mbgl/shader/plain_shader.hpp | 24 + src/mbgl/shader/raster.fragment.glsl | 36 + src/mbgl/shader/raster.vertex.glsl | 13 + src/mbgl/shader/raster_shader.cpp | 28 + src/mbgl/shader/raster_shader.hpp | 31 + src/mbgl/shader/sdf.fragment.glsl | 13 + src/mbgl/shader/sdf.vertex.glsl | 69 ++ src/mbgl/shader/sdf_shader.cpp | 91 +++ src/mbgl/shader/sdf_shader.hpp | 53 ++ src/mbgl/shader/shader.cpp | 133 ++++ src/mbgl/shader/shader.hpp | 28 + src/mbgl/shader/uniform.cpp | 47 ++ src/mbgl/shader/uniform.hpp | 53 ++ src/mbgl/storage/base_request.cpp | 87 +++ src/mbgl/storage/base_request.hpp | 62 ++ src/mbgl/storage/caching_http_file_source.cpp | 115 +++ src/mbgl/storage/file_request.cpp | 37 + src/mbgl/storage/file_request.hpp | 27 + src/mbgl/storage/file_request_baton.cpp | 160 ++++ src/mbgl/storage/file_request_baton.hpp | 36 + src/mbgl/storage/http_request.cpp | 279 +++++++ src/mbgl/storage/http_request.hpp | 58 ++ src/mbgl/storage/http_request_baton.cpp | 12 + src/mbgl/storage/request.cpp | 49 ++ src/mbgl/storage/response.cpp | 22 + src/mbgl/storage/sqlite_store.cpp | 228 ++++++ src/mbgl/storage/sqlite_store.hpp | 49 ++ src/mbgl/style/applied_class_properties.cpp | 52 ++ src/mbgl/style/applied_class_properties.hpp | 39 + src/mbgl/style/class_dictionary.cpp | 51 ++ src/mbgl/style/class_dictionary.hpp | 37 + src/mbgl/style/class_properties.cpp | 14 + src/mbgl/style/class_properties.hpp | 43 ++ src/mbgl/style/filter_expression.cpp | 123 +++ src/mbgl/style/filter_expression.hpp | 125 +++ src/mbgl/style/filter_expression_private.hpp | 118 +++ src/mbgl/style/function_properties.cpp | 68 ++ src/mbgl/style/function_properties.hpp | 55 ++ src/mbgl/style/property_fallback.cpp | 61 ++ src/mbgl/style/property_fallback.hpp | 29 + src/mbgl/style/property_key.hpp | 70 ++ src/mbgl/style/property_transition.hpp | 15 + src/mbgl/style/property_value.hpp | 21 + src/mbgl/style/style.cpp | 107 +++ src/mbgl/style/style.hpp | 68 ++ src/mbgl/style/style_bucket.cpp | 15 + src/mbgl/style/style_bucket.hpp | 112 +++ src/mbgl/style/style_layer.cpp | 284 +++++++ src/mbgl/style/style_layer.hpp | 89 +++ src/mbgl/style/style_layer_group.cpp | 34 + src/mbgl/style/style_layer_group.hpp | 23 + src/mbgl/style/style_parser.cpp | 845 +++++++++++++++++++++ src/mbgl/style/style_parser.hpp | 113 +++ src/mbgl/style/style_properties.cpp | 11 + src/mbgl/style/style_properties.hpp | 114 +++ src/mbgl/style/style_source.cpp | 77 ++ src/mbgl/style/style_source.hpp | 41 + src/mbgl/style/types.cpp | 0 src/mbgl/style/types.hpp | 196 +++++ src/mbgl/style/value.cpp | 60 ++ src/mbgl/style/value.hpp | 45 ++ src/mbgl/style/value_comparison.hpp | 109 +++ src/mbgl/text/collision.cpp | 297 ++++++++ src/mbgl/text/collision.hpp | 58 ++ src/mbgl/text/glyph.cpp | 14 + src/mbgl/text/glyph.hpp | 60 ++ src/mbgl/text/glyph_store.cpp | 294 +++++++ src/mbgl/text/glyph_store.hpp | 99 +++ src/mbgl/text/placement.cpp | 312 ++++++++ src/mbgl/text/placement.hpp | 31 + src/mbgl/text/rotation_range.cpp | 263 +++++++ src/mbgl/text/rotation_range.hpp | 54 ++ src/mbgl/text/types.hpp | 113 +++ src/mbgl/util/box.hpp | 15 + src/mbgl/util/clip_ids.cpp | 96 +++ src/mbgl/util/clip_ids.hpp | 38 + src/mbgl/util/compression.cpp | 81 ++ src/mbgl/util/compression.hpp | 15 + src/mbgl/util/constants.cpp | 27 + src/mbgl/util/constants.hpp | 31 + src/mbgl/util/error.hpp | 20 + src/mbgl/util/interpolate.hpp | 27 + src/mbgl/util/io.cpp | 34 + src/mbgl/util/io.hpp | 15 + src/mbgl/util/mapbox.cpp | 44 ++ src/mbgl/util/mapbox.hpp | 17 + src/mbgl/util/mat3.cpp | 95 +++ src/mbgl/util/mat3.hpp | 42 + src/mbgl/util/mat4.cpp | 198 +++++ src/mbgl/util/math.cpp | 25 + src/mbgl/util/optional.hpp | 69 ++ src/mbgl/util/parsedate.c | 689 +++++++++++++++++ src/mbgl/util/pbf.hpp | 184 +++++ src/mbgl/util/queue.h | 92 +++ src/mbgl/util/raster.cpp | 106 +++ src/mbgl/util/raster.hpp | 74 ++ src/mbgl/util/rect.hpp | 22 + src/mbgl/util/sqlite3.cpp | 165 ++++ src/mbgl/util/sqlite3.hpp | 74 ++ src/mbgl/util/stopwatch.cpp | 36 + src/mbgl/util/stopwatch.hpp | 40 + src/mbgl/util/texture_pool.cpp | 58 ++ src/mbgl/util/texture_pool.hpp | 25 + src/mbgl/util/time.cpp | 25 + src/mbgl/util/token.hpp | 50 ++ src/mbgl/util/transition.cpp | 26 + src/mbgl/util/transition.hpp | 77 ++ src/mbgl/util/unitbezier.hpp | 121 +++ src/mbgl/util/url.cpp | 51 ++ src/mbgl/util/url.hpp | 15 + src/mbgl/util/utf.hpp | 24 + src/mbgl/util/uv-channel.c | 69 ++ src/mbgl/util/uv-channel.h | 29 + src/mbgl/util/uv-messenger.c | 86 +++ src/mbgl/util/uv-worker.c | 170 +++++ src/mbgl/util/uv-worker.h | 41 + src/mbgl/util/uv.cpp | 25 + src/mbgl/util/uv_detail.hpp | 177 +++++ src/mbgl/util/vec.hpp | 15 + src/platform/gl.cpp | 95 --- src/platform/log.cpp | 7 - src/rapidjson/document.h | 821 ++++++++++++++++++++ src/rapidjson/filestream.h | 46 ++ src/rapidjson/internal/pow10.h | 54 ++ src/rapidjson/internal/stack.h | 82 ++ src/rapidjson/internal/strfunc.h | 24 + src/rapidjson/prettywriter.h | 156 ++++ src/rapidjson/rapidjson.h | 525 +++++++++++++ src/rapidjson/reader.h | 692 +++++++++++++++++ src/rapidjson/stringbuffer.h | 49 ++ src/rapidjson/writer.h | 241 ++++++ src/renderer/debug_bucket.cpp | 33 - src/renderer/fill_bucket.cpp | 246 ------ src/renderer/frame_history.cpp | 85 --- src/renderer/line_bucket.cpp | 403 ---------- src/renderer/painter.cpp | 465 ------------ src/renderer/painter_clipping.cpp | 39 - src/renderer/painter_debug.cpp | 102 --- src/renderer/painter_fill.cpp | 122 --- src/renderer/painter_line.cpp | 101 --- src/renderer/painter_prerender.cpp | 45 -- src/renderer/painter_raster.cpp | 107 --- src/renderer/painter_symbol.cpp | 208 ----- src/renderer/prerendered_texture.cpp | 154 ---- src/renderer/raster_bucket.cpp | 36 - src/renderer/symbol_bucket.cpp | 427 ----------- src/shader/dot.fragment.glsl | 9 - src/shader/dot.vertex.glsl | 9 - src/shader/dot_shader.cpp | 26 - src/shader/gaussian.fragment.glsl | 11 - src/shader/gaussian.vertex.glsl | 15 - src/shader/gaussian_shader.cpp | 28 - src/shader/icon.fragment.glsl | 8 - src/shader/icon.vertex.glsl | 73 -- src/shader/icon_shader.cpp | 60 -- src/shader/line.fragment.glsl | 25 - src/shader/line.vertex.glsl | 45 -- src/shader/line_shader.cpp | 34 - src/shader/linejoin.fragment.glsl | 14 - src/shader/linejoin.vertex.glsl | 13 - src/shader/linejoin_shader.cpp | 27 - src/shader/linepattern.fragment.glsl | 37 - src/shader/linepattern.vertex.glsl | 57 -- src/shader/linepattern_shader.cpp | 35 - src/shader/outline.fragment.glsl | 9 - src/shader/outline.vertex.glsl | 10 - src/shader/outline_shader.cpp | 26 - src/shader/pattern.fragment.glsl | 21 - src/shader/pattern.vertex.glsl | 11 - src/shader/pattern_shader.cpp | 26 - src/shader/plain.fragment.glsl | 5 - src/shader/plain.vertex.glsl | 7 - src/shader/plain_shader.cpp | 26 - src/shader/raster.fragment.glsl | 36 - src/shader/raster.vertex.glsl | 13 - src/shader/raster_shader.cpp | 28 - src/shader/sdf.fragment.glsl | 13 - src/shader/sdf.vertex.glsl | 69 -- src/shader/sdf_shader.cpp | 91 --- src/shader/shader.cpp | 133 ---- src/shader/uniform.cpp | 47 -- src/storage/base_request.cpp | 87 --- src/storage/file_request.cpp | 37 - src/storage/file_request_baton.cpp | 160 ---- src/storage/http_request.cpp | 279 ------- src/storage/http_request_baton.cpp | 12 - src/storage/request.cpp | 49 -- src/storage/response.cpp | 22 - src/storage/sqlite_store.cpp | 228 ------ src/style/applied_class_properties.cpp | 52 -- src/style/class_dictionary.cpp | 51 -- src/style/class_properties.cpp | 14 - src/style/filter_expression.cpp | 123 --- src/style/function_properties.cpp | 68 -- src/style/property_fallback.cpp | 61 -- src/style/style.cpp | 107 --- src/style/style_bucket.cpp | 15 - src/style/style_layer.cpp | 284 ------- src/style/style_layer_group.cpp | 35 - src/style/style_parser.cpp | 845 --------------------- src/style/style_properties.cpp | 11 - src/style/style_source.cpp | 77 -- src/style/types.cpp | 0 src/style/value.cpp | 60 -- src/text/collision.cpp | 297 -------- src/text/glyph.cpp | 14 - src/text/glyph_store.cpp | 294 ------- src/text/placement.cpp | 312 -------- src/text/rotation_range.cpp | 263 ------- src/util/clip_ids.cpp | 96 --- src/util/compression.cpp | 81 -- src/util/io.cpp | 34 - src/util/mapbox.cpp | 44 -- src/util/mat3.cpp | 95 --- src/util/mat4.cpp | 198 ----- src/util/math.cpp | 25 - src/util/parsedate.c | 689 ----------------- src/util/raster.cpp | 106 --- src/util/sqlite3.cpp | 165 ---- src/util/stopwatch.cpp | 36 - src/util/texture_pool.cpp | 58 -- src/util/time.cpp | 25 - src/util/transition.cpp | 26 - src/util/url.cpp | 51 -- src/util/uv-channel.c | 69 -- src/util/uv-messenger.c | 86 --- src/util/uv-worker.c | 170 ----- src/util/uv.cpp | 25 - test/headless.cpp | 4 +- test/test.gyp | 12 +- 502 files changed, 22678 insertions(+), 22638 deletions(-) delete mode 100644 config/constants.cpp delete mode 100755 include/clipper/clipper.hpp delete mode 100644 include/csscolorparser/csscolorparser.hpp delete mode 100644 include/libtess2/LICENSE.txt delete mode 100755 include/libtess2/tesselator.h delete mode 100644 include/mbgl/geometry/anchor.hpp delete mode 100644 include/mbgl/geometry/binpack.hpp delete mode 100644 include/mbgl/geometry/buffer.hpp delete mode 100644 include/mbgl/geometry/debug_font_buffer.hpp delete mode 100644 include/mbgl/geometry/elements_buffer.hpp delete mode 100644 include/mbgl/geometry/fill_buffer.hpp delete mode 100644 include/mbgl/geometry/geometry.hpp delete mode 100644 include/mbgl/geometry/glyph_atlas.hpp delete mode 100644 include/mbgl/geometry/icon_buffer.hpp delete mode 100644 include/mbgl/geometry/line_buffer.hpp delete mode 100644 include/mbgl/geometry/resample.hpp delete mode 100644 include/mbgl/geometry/sprite_atlas.hpp delete mode 100644 include/mbgl/geometry/static_vertex_buffer.hpp delete mode 100644 include/mbgl/geometry/text_buffer.hpp delete mode 100644 include/mbgl/geometry/vao.hpp delete mode 100644 include/mbgl/map/raster_tile_data.hpp delete mode 100644 include/mbgl/map/source.hpp delete mode 100644 include/mbgl/map/sprite.hpp delete mode 100644 include/mbgl/map/tile_data.hpp delete mode 100644 include/mbgl/map/tile_parser.hpp delete mode 100644 include/mbgl/map/vector_tile.hpp delete mode 100644 include/mbgl/map/vector_tile_data.hpp delete mode 100644 include/mbgl/platform/default/caching_http_file_source.hpp delete mode 100644 include/mbgl/renderer/bucket.hpp delete mode 100644 include/mbgl/renderer/debug_bucket.hpp delete mode 100644 include/mbgl/renderer/fill_bucket.hpp delete mode 100644 include/mbgl/renderer/frame_history.hpp delete mode 100644 include/mbgl/renderer/line_bucket.hpp delete mode 100644 include/mbgl/renderer/painter.hpp delete mode 100644 include/mbgl/renderer/prerendered_texture.hpp delete mode 100644 include/mbgl/renderer/raster_bucket.hpp delete mode 100644 include/mbgl/renderer/symbol_bucket.hpp delete mode 100644 include/mbgl/shader/dot_shader.hpp delete mode 100644 include/mbgl/shader/gaussian_shader.hpp delete mode 100644 include/mbgl/shader/icon_shader.hpp delete mode 100644 include/mbgl/shader/line_shader.hpp delete mode 100644 include/mbgl/shader/linejoin_shader.hpp delete mode 100644 include/mbgl/shader/linepattern_shader.hpp delete mode 100644 include/mbgl/shader/outline_shader.hpp delete mode 100644 include/mbgl/shader/pattern_shader.hpp delete mode 100644 include/mbgl/shader/plain_shader.hpp delete mode 100644 include/mbgl/shader/raster_shader.hpp delete mode 100644 include/mbgl/shader/sdf_shader.hpp delete mode 100644 include/mbgl/shader/shader.hpp delete mode 100644 include/mbgl/shader/uniform.hpp delete mode 100644 include/mbgl/storage/base_request.hpp create mode 100644 include/mbgl/storage/caching_http_file_source.hpp delete mode 100644 include/mbgl/storage/file_request.hpp delete mode 100644 include/mbgl/storage/file_request_baton.hpp delete mode 100644 include/mbgl/storage/http_request.hpp delete mode 100644 include/mbgl/storage/sqlite_store.hpp delete mode 100644 include/mbgl/style/applied_class_properties.hpp delete mode 100644 include/mbgl/style/class_dictionary.hpp delete mode 100644 include/mbgl/style/class_properties.hpp delete mode 100644 include/mbgl/style/filter_expression.hpp delete mode 100644 include/mbgl/style/filter_expression_private.hpp delete mode 100644 include/mbgl/style/function_properties.hpp delete mode 100644 include/mbgl/style/property_fallback.hpp delete mode 100644 include/mbgl/style/property_key.hpp delete mode 100644 include/mbgl/style/property_transition.hpp delete mode 100644 include/mbgl/style/property_value.hpp delete mode 100644 include/mbgl/style/style.hpp delete mode 100644 include/mbgl/style/style_bucket.hpp delete mode 100644 include/mbgl/style/style_layer.hpp delete mode 100644 include/mbgl/style/style_layer_group.hpp delete mode 100644 include/mbgl/style/style_parser.hpp delete mode 100644 include/mbgl/style/style_properties.hpp delete mode 100644 include/mbgl/style/style_source.hpp delete mode 100644 include/mbgl/style/types.hpp delete mode 100644 include/mbgl/style/value.hpp delete mode 100644 include/mbgl/style/value_comparison.hpp delete mode 100644 include/mbgl/text/collision.hpp delete mode 100644 include/mbgl/text/glyph.hpp delete mode 100644 include/mbgl/text/glyph_store.hpp delete mode 100644 include/mbgl/text/placement.hpp delete mode 100644 include/mbgl/text/rotation_range.hpp delete mode 100644 include/mbgl/text/types.hpp delete mode 100644 include/mbgl/util/clip_ids.hpp delete mode 100644 include/mbgl/util/compression.hpp delete mode 100644 include/mbgl/util/constants.hpp delete mode 100644 include/mbgl/util/error.hpp delete mode 100644 include/mbgl/util/interpolate.hpp delete mode 100644 include/mbgl/util/io.hpp delete mode 100644 include/mbgl/util/mapbox.hpp delete mode 100644 include/mbgl/util/mat3.hpp delete mode 100644 include/mbgl/util/optional.hpp delete mode 100644 include/mbgl/util/pbf.hpp delete mode 100644 include/mbgl/util/queue.h delete mode 100644 include/mbgl/util/raster.hpp delete mode 100644 include/mbgl/util/rect.hpp delete mode 100644 include/mbgl/util/sqlite3.hpp delete mode 100644 include/mbgl/util/stopwatch.hpp delete mode 100644 include/mbgl/util/texture_pool.hpp delete mode 100644 include/mbgl/util/token.hpp delete mode 100644 include/mbgl/util/transition.hpp delete mode 100644 include/mbgl/util/unitbezier.hpp delete mode 100644 include/mbgl/util/url.hpp delete mode 100644 include/mbgl/util/uv-channel.h delete mode 100644 include/mbgl/util/uv-worker.h delete mode 100644 include/mbgl/util/uv_detail.hpp delete mode 100755 include/rapidjson/document.h delete mode 100755 include/rapidjson/filestream.h delete mode 100755 include/rapidjson/internal/pow10.h delete mode 100755 include/rapidjson/internal/stack.h delete mode 100755 include/rapidjson/internal/strfunc.h delete mode 100755 include/rapidjson/prettywriter.h delete mode 100755 include/rapidjson/rapidjson.h delete mode 100755 include/rapidjson/reader.h delete mode 100755 include/rapidjson/stringbuffer.h delete mode 100755 include/rapidjson/writer.h delete mode 100644 platform/default/caching_http_file_source.cpp create mode 100755 src/clipper/clipper.hpp create mode 100644 src/csscolorparser/csscolorparser.hpp delete mode 100644 src/geometry/debug_font_buffer.cpp delete mode 100644 src/geometry/debug_font_data.hpp delete mode 100644 src/geometry/elements_buffer.cpp delete mode 100644 src/geometry/fill_buffer.cpp delete mode 100644 src/geometry/glyph_atlas.cpp delete mode 100644 src/geometry/icon_buffer.cpp delete mode 100644 src/geometry/line_buffer.cpp delete mode 100644 src/geometry/resample.cpp delete mode 100644 src/geometry/sprite_atlas.cpp delete mode 100644 src/geometry/static_vertex_buffer.cpp delete mode 100644 src/geometry/text_buffer.cpp delete mode 100644 src/geometry/vao.cpp create mode 100755 src/libtess2/tesselator.h delete mode 100644 src/map/map.cpp delete mode 100644 src/map/raster_tile_data.cpp delete mode 100644 src/map/source.cpp delete mode 100644 src/map/sprite.cpp delete mode 100644 src/map/tile.cpp delete mode 100644 src/map/tile_data.cpp delete mode 100644 src/map/tile_parser.cpp delete mode 100644 src/map/transform.cpp delete mode 100644 src/map/transform_state.cpp delete mode 100644 src/map/vector_tile.cpp delete mode 100644 src/map/vector_tile_data.cpp create mode 100644 src/mbgl/geometry/anchor.hpp create mode 100644 src/mbgl/geometry/binpack.hpp create mode 100644 src/mbgl/geometry/buffer.hpp create mode 100644 src/mbgl/geometry/debug_font_buffer.cpp create mode 100644 src/mbgl/geometry/debug_font_buffer.hpp create mode 100644 src/mbgl/geometry/debug_font_data.hpp create mode 100644 src/mbgl/geometry/elements_buffer.cpp create mode 100644 src/mbgl/geometry/elements_buffer.hpp create mode 100644 src/mbgl/geometry/fill_buffer.cpp create mode 100644 src/mbgl/geometry/fill_buffer.hpp create mode 100644 src/mbgl/geometry/geometry.hpp create mode 100644 src/mbgl/geometry/glyph_atlas.cpp create mode 100644 src/mbgl/geometry/glyph_atlas.hpp create mode 100644 src/mbgl/geometry/icon_buffer.cpp create mode 100644 src/mbgl/geometry/icon_buffer.hpp create mode 100644 src/mbgl/geometry/line_buffer.cpp create mode 100644 src/mbgl/geometry/line_buffer.hpp create mode 100644 src/mbgl/geometry/resample.cpp create mode 100644 src/mbgl/geometry/resample.hpp create mode 100644 src/mbgl/geometry/sprite_atlas.cpp create mode 100644 src/mbgl/geometry/sprite_atlas.hpp create mode 100644 src/mbgl/geometry/static_vertex_buffer.cpp create mode 100644 src/mbgl/geometry/static_vertex_buffer.hpp create mode 100644 src/mbgl/geometry/text_buffer.cpp create mode 100644 src/mbgl/geometry/text_buffer.hpp create mode 100644 src/mbgl/geometry/vao.cpp create mode 100644 src/mbgl/geometry/vao.hpp create mode 100644 src/mbgl/map/map.cpp create mode 100644 src/mbgl/map/raster_tile_data.cpp create mode 100644 src/mbgl/map/raster_tile_data.hpp create mode 100644 src/mbgl/map/source.cpp create mode 100644 src/mbgl/map/source.hpp create mode 100644 src/mbgl/map/sprite.cpp create mode 100644 src/mbgl/map/sprite.hpp create mode 100644 src/mbgl/map/tile.cpp create mode 100644 src/mbgl/map/tile_data.cpp create mode 100644 src/mbgl/map/tile_data.hpp create mode 100644 src/mbgl/map/tile_parser.cpp create mode 100644 src/mbgl/map/tile_parser.hpp create mode 100644 src/mbgl/map/transform.cpp create mode 100644 src/mbgl/map/transform_state.cpp create mode 100644 src/mbgl/map/vector_tile.cpp create mode 100644 src/mbgl/map/vector_tile.hpp create mode 100644 src/mbgl/map/vector_tile_data.cpp create mode 100644 src/mbgl/map/vector_tile_data.hpp create mode 100644 src/mbgl/platform/gl.cpp create mode 100644 src/mbgl/platform/log.cpp create mode 100644 src/mbgl/renderer/bucket.hpp create mode 100644 src/mbgl/renderer/debug_bucket.cpp create mode 100644 src/mbgl/renderer/debug_bucket.hpp create mode 100644 src/mbgl/renderer/fill_bucket.cpp create mode 100644 src/mbgl/renderer/fill_bucket.hpp create mode 100644 src/mbgl/renderer/frame_history.cpp create mode 100644 src/mbgl/renderer/frame_history.hpp create mode 100644 src/mbgl/renderer/line_bucket.cpp create mode 100644 src/mbgl/renderer/line_bucket.hpp create mode 100644 src/mbgl/renderer/painter.cpp create mode 100644 src/mbgl/renderer/painter.hpp create mode 100644 src/mbgl/renderer/painter_clipping.cpp create mode 100644 src/mbgl/renderer/painter_debug.cpp create mode 100644 src/mbgl/renderer/painter_fill.cpp create mode 100644 src/mbgl/renderer/painter_line.cpp create mode 100644 src/mbgl/renderer/painter_prerender.cpp create mode 100644 src/mbgl/renderer/painter_raster.cpp create mode 100644 src/mbgl/renderer/painter_symbol.cpp create mode 100644 src/mbgl/renderer/prerendered_texture.cpp create mode 100644 src/mbgl/renderer/prerendered_texture.hpp create mode 100644 src/mbgl/renderer/raster_bucket.cpp create mode 100644 src/mbgl/renderer/raster_bucket.hpp create mode 100644 src/mbgl/renderer/symbol_bucket.cpp create mode 100644 src/mbgl/renderer/symbol_bucket.hpp create mode 100644 src/mbgl/shader/dot.fragment.glsl create mode 100644 src/mbgl/shader/dot.vertex.glsl create mode 100644 src/mbgl/shader/dot_shader.cpp create mode 100644 src/mbgl/shader/dot_shader.hpp create mode 100644 src/mbgl/shader/gaussian.fragment.glsl create mode 100644 src/mbgl/shader/gaussian.vertex.glsl create mode 100644 src/mbgl/shader/gaussian_shader.cpp create mode 100644 src/mbgl/shader/gaussian_shader.hpp create mode 100644 src/mbgl/shader/icon.fragment.glsl create mode 100644 src/mbgl/shader/icon.vertex.glsl create mode 100644 src/mbgl/shader/icon_shader.cpp create mode 100644 src/mbgl/shader/icon_shader.hpp create mode 100644 src/mbgl/shader/line.fragment.glsl create mode 100644 src/mbgl/shader/line.vertex.glsl create mode 100644 src/mbgl/shader/line_shader.cpp create mode 100644 src/mbgl/shader/line_shader.hpp create mode 100644 src/mbgl/shader/linejoin.fragment.glsl create mode 100644 src/mbgl/shader/linejoin.vertex.glsl create mode 100644 src/mbgl/shader/linejoin_shader.cpp create mode 100644 src/mbgl/shader/linejoin_shader.hpp create mode 100644 src/mbgl/shader/linepattern.fragment.glsl create mode 100644 src/mbgl/shader/linepattern.vertex.glsl create mode 100644 src/mbgl/shader/linepattern_shader.cpp create mode 100644 src/mbgl/shader/linepattern_shader.hpp create mode 100644 src/mbgl/shader/outline.fragment.glsl create mode 100644 src/mbgl/shader/outline.vertex.glsl create mode 100644 src/mbgl/shader/outline_shader.cpp create mode 100644 src/mbgl/shader/outline_shader.hpp create mode 100644 src/mbgl/shader/pattern.fragment.glsl create mode 100644 src/mbgl/shader/pattern.vertex.glsl create mode 100644 src/mbgl/shader/pattern_shader.cpp create mode 100644 src/mbgl/shader/pattern_shader.hpp create mode 100644 src/mbgl/shader/plain.fragment.glsl create mode 100644 src/mbgl/shader/plain.vertex.glsl create mode 100644 src/mbgl/shader/plain_shader.cpp create mode 100644 src/mbgl/shader/plain_shader.hpp create mode 100644 src/mbgl/shader/raster.fragment.glsl create mode 100644 src/mbgl/shader/raster.vertex.glsl create mode 100644 src/mbgl/shader/raster_shader.cpp create mode 100644 src/mbgl/shader/raster_shader.hpp create mode 100644 src/mbgl/shader/sdf.fragment.glsl create mode 100644 src/mbgl/shader/sdf.vertex.glsl create mode 100644 src/mbgl/shader/sdf_shader.cpp create mode 100644 src/mbgl/shader/sdf_shader.hpp create mode 100644 src/mbgl/shader/shader.cpp create mode 100644 src/mbgl/shader/shader.hpp create mode 100644 src/mbgl/shader/uniform.cpp create mode 100644 src/mbgl/shader/uniform.hpp create mode 100644 src/mbgl/storage/base_request.cpp create mode 100644 src/mbgl/storage/base_request.hpp create mode 100644 src/mbgl/storage/caching_http_file_source.cpp create mode 100644 src/mbgl/storage/file_request.cpp create mode 100644 src/mbgl/storage/file_request.hpp create mode 100644 src/mbgl/storage/file_request_baton.cpp create mode 100644 src/mbgl/storage/file_request_baton.hpp create mode 100644 src/mbgl/storage/http_request.cpp create mode 100644 src/mbgl/storage/http_request.hpp create mode 100644 src/mbgl/storage/http_request_baton.cpp create mode 100644 src/mbgl/storage/request.cpp create mode 100644 src/mbgl/storage/response.cpp create mode 100644 src/mbgl/storage/sqlite_store.cpp create mode 100644 src/mbgl/storage/sqlite_store.hpp create mode 100644 src/mbgl/style/applied_class_properties.cpp create mode 100644 src/mbgl/style/applied_class_properties.hpp create mode 100644 src/mbgl/style/class_dictionary.cpp create mode 100644 src/mbgl/style/class_dictionary.hpp create mode 100644 src/mbgl/style/class_properties.cpp create mode 100644 src/mbgl/style/class_properties.hpp create mode 100644 src/mbgl/style/filter_expression.cpp create mode 100644 src/mbgl/style/filter_expression.hpp create mode 100644 src/mbgl/style/filter_expression_private.hpp create mode 100644 src/mbgl/style/function_properties.cpp create mode 100644 src/mbgl/style/function_properties.hpp create mode 100644 src/mbgl/style/property_fallback.cpp create mode 100644 src/mbgl/style/property_fallback.hpp create mode 100644 src/mbgl/style/property_key.hpp create mode 100644 src/mbgl/style/property_transition.hpp create mode 100644 src/mbgl/style/property_value.hpp create mode 100644 src/mbgl/style/style.cpp create mode 100644 src/mbgl/style/style.hpp create mode 100644 src/mbgl/style/style_bucket.cpp create mode 100644 src/mbgl/style/style_bucket.hpp create mode 100644 src/mbgl/style/style_layer.cpp create mode 100644 src/mbgl/style/style_layer.hpp create mode 100644 src/mbgl/style/style_layer_group.cpp create mode 100644 src/mbgl/style/style_layer_group.hpp create mode 100644 src/mbgl/style/style_parser.cpp create mode 100644 src/mbgl/style/style_parser.hpp create mode 100644 src/mbgl/style/style_properties.cpp create mode 100644 src/mbgl/style/style_properties.hpp create mode 100644 src/mbgl/style/style_source.cpp create mode 100644 src/mbgl/style/style_source.hpp create mode 100644 src/mbgl/style/types.cpp create mode 100644 src/mbgl/style/types.hpp create mode 100644 src/mbgl/style/value.cpp create mode 100644 src/mbgl/style/value.hpp create mode 100644 src/mbgl/style/value_comparison.hpp create mode 100644 src/mbgl/text/collision.cpp create mode 100644 src/mbgl/text/collision.hpp create mode 100644 src/mbgl/text/glyph.cpp create mode 100644 src/mbgl/text/glyph.hpp create mode 100644 src/mbgl/text/glyph_store.cpp create mode 100644 src/mbgl/text/glyph_store.hpp create mode 100644 src/mbgl/text/placement.cpp create mode 100644 src/mbgl/text/placement.hpp create mode 100644 src/mbgl/text/rotation_range.cpp create mode 100644 src/mbgl/text/rotation_range.hpp create mode 100644 src/mbgl/text/types.hpp create mode 100644 src/mbgl/util/box.hpp create mode 100644 src/mbgl/util/clip_ids.cpp create mode 100644 src/mbgl/util/clip_ids.hpp create mode 100644 src/mbgl/util/compression.cpp create mode 100644 src/mbgl/util/compression.hpp create mode 100644 src/mbgl/util/constants.cpp create mode 100644 src/mbgl/util/constants.hpp create mode 100644 src/mbgl/util/error.hpp create mode 100644 src/mbgl/util/interpolate.hpp create mode 100644 src/mbgl/util/io.cpp create mode 100644 src/mbgl/util/io.hpp create mode 100644 src/mbgl/util/mapbox.cpp create mode 100644 src/mbgl/util/mapbox.hpp create mode 100644 src/mbgl/util/mat3.cpp create mode 100644 src/mbgl/util/mat3.hpp create mode 100644 src/mbgl/util/mat4.cpp create mode 100644 src/mbgl/util/math.cpp create mode 100644 src/mbgl/util/optional.hpp create mode 100644 src/mbgl/util/parsedate.c create mode 100644 src/mbgl/util/pbf.hpp create mode 100644 src/mbgl/util/queue.h create mode 100644 src/mbgl/util/raster.cpp create mode 100644 src/mbgl/util/raster.hpp create mode 100644 src/mbgl/util/rect.hpp create mode 100644 src/mbgl/util/sqlite3.cpp create mode 100644 src/mbgl/util/sqlite3.hpp create mode 100644 src/mbgl/util/stopwatch.cpp create mode 100644 src/mbgl/util/stopwatch.hpp create mode 100644 src/mbgl/util/texture_pool.cpp create mode 100644 src/mbgl/util/texture_pool.hpp create mode 100644 src/mbgl/util/time.cpp create mode 100644 src/mbgl/util/token.hpp create mode 100644 src/mbgl/util/transition.cpp create mode 100644 src/mbgl/util/transition.hpp create mode 100644 src/mbgl/util/unitbezier.hpp create mode 100644 src/mbgl/util/url.cpp create mode 100644 src/mbgl/util/url.hpp create mode 100644 src/mbgl/util/utf.hpp create mode 100644 src/mbgl/util/uv-channel.c create mode 100644 src/mbgl/util/uv-channel.h create mode 100644 src/mbgl/util/uv-messenger.c create mode 100644 src/mbgl/util/uv-worker.c create mode 100644 src/mbgl/util/uv-worker.h create mode 100644 src/mbgl/util/uv.cpp create mode 100644 src/mbgl/util/uv_detail.hpp create mode 100644 src/mbgl/util/vec.hpp delete mode 100644 src/platform/gl.cpp delete mode 100644 src/platform/log.cpp create mode 100755 src/rapidjson/document.h create mode 100755 src/rapidjson/filestream.h create mode 100755 src/rapidjson/internal/pow10.h create mode 100755 src/rapidjson/internal/stack.h create mode 100755 src/rapidjson/internal/strfunc.h create mode 100755 src/rapidjson/prettywriter.h create mode 100755 src/rapidjson/rapidjson.h create mode 100755 src/rapidjson/reader.h create mode 100755 src/rapidjson/stringbuffer.h create mode 100755 src/rapidjson/writer.h delete mode 100644 src/renderer/debug_bucket.cpp delete mode 100644 src/renderer/fill_bucket.cpp delete mode 100644 src/renderer/frame_history.cpp delete mode 100644 src/renderer/line_bucket.cpp delete mode 100644 src/renderer/painter.cpp delete mode 100644 src/renderer/painter_clipping.cpp delete mode 100644 src/renderer/painter_debug.cpp delete mode 100644 src/renderer/painter_fill.cpp delete mode 100644 src/renderer/painter_line.cpp delete mode 100644 src/renderer/painter_prerender.cpp delete mode 100644 src/renderer/painter_raster.cpp delete mode 100644 src/renderer/painter_symbol.cpp delete mode 100644 src/renderer/prerendered_texture.cpp delete mode 100644 src/renderer/raster_bucket.cpp delete mode 100644 src/renderer/symbol_bucket.cpp delete mode 100644 src/shader/dot.fragment.glsl delete mode 100644 src/shader/dot.vertex.glsl delete mode 100644 src/shader/dot_shader.cpp delete mode 100644 src/shader/gaussian.fragment.glsl delete mode 100644 src/shader/gaussian.vertex.glsl delete mode 100644 src/shader/gaussian_shader.cpp delete mode 100644 src/shader/icon.fragment.glsl delete mode 100644 src/shader/icon.vertex.glsl delete mode 100644 src/shader/icon_shader.cpp delete mode 100644 src/shader/line.fragment.glsl delete mode 100644 src/shader/line.vertex.glsl delete mode 100644 src/shader/line_shader.cpp delete mode 100644 src/shader/linejoin.fragment.glsl delete mode 100644 src/shader/linejoin.vertex.glsl delete mode 100644 src/shader/linejoin_shader.cpp delete mode 100644 src/shader/linepattern.fragment.glsl delete mode 100644 src/shader/linepattern.vertex.glsl delete mode 100644 src/shader/linepattern_shader.cpp delete mode 100644 src/shader/outline.fragment.glsl delete mode 100644 src/shader/outline.vertex.glsl delete mode 100644 src/shader/outline_shader.cpp delete mode 100644 src/shader/pattern.fragment.glsl delete mode 100644 src/shader/pattern.vertex.glsl delete mode 100644 src/shader/pattern_shader.cpp delete mode 100644 src/shader/plain.fragment.glsl delete mode 100644 src/shader/plain.vertex.glsl delete mode 100644 src/shader/plain_shader.cpp delete mode 100644 src/shader/raster.fragment.glsl delete mode 100644 src/shader/raster.vertex.glsl delete mode 100644 src/shader/raster_shader.cpp delete mode 100644 src/shader/sdf.fragment.glsl delete mode 100644 src/shader/sdf.vertex.glsl delete mode 100644 src/shader/sdf_shader.cpp delete mode 100644 src/shader/shader.cpp delete mode 100644 src/shader/uniform.cpp delete mode 100644 src/storage/base_request.cpp delete mode 100644 src/storage/file_request.cpp delete mode 100644 src/storage/file_request_baton.cpp delete mode 100644 src/storage/http_request.cpp delete mode 100644 src/storage/http_request_baton.cpp delete mode 100644 src/storage/request.cpp delete mode 100644 src/storage/response.cpp delete mode 100644 src/storage/sqlite_store.cpp delete mode 100644 src/style/applied_class_properties.cpp delete mode 100644 src/style/class_dictionary.cpp delete mode 100644 src/style/class_properties.cpp delete mode 100644 src/style/filter_expression.cpp delete mode 100644 src/style/function_properties.cpp delete mode 100644 src/style/property_fallback.cpp delete mode 100644 src/style/style.cpp delete mode 100644 src/style/style_bucket.cpp delete mode 100644 src/style/style_layer.cpp delete mode 100644 src/style/style_layer_group.cpp delete mode 100644 src/style/style_parser.cpp delete mode 100644 src/style/style_properties.cpp delete mode 100644 src/style/style_source.cpp delete mode 100644 src/style/types.cpp delete mode 100644 src/style/value.cpp delete mode 100644 src/text/collision.cpp delete mode 100644 src/text/glyph.cpp delete mode 100644 src/text/glyph_store.cpp delete mode 100644 src/text/placement.cpp delete mode 100644 src/text/rotation_range.cpp delete mode 100644 src/util/clip_ids.cpp delete mode 100644 src/util/compression.cpp delete mode 100644 src/util/io.cpp delete mode 100644 src/util/mapbox.cpp delete mode 100644 src/util/mat3.cpp delete mode 100644 src/util/mat4.cpp delete mode 100644 src/util/math.cpp delete mode 100644 src/util/parsedate.c delete mode 100644 src/util/raster.cpp delete mode 100644 src/util/sqlite3.cpp delete mode 100644 src/util/stopwatch.cpp delete mode 100644 src/util/texture_pool.cpp delete mode 100644 src/util/time.cpp delete mode 100644 src/util/transition.cpp delete mode 100644 src/util/url.cpp delete mode 100644 src/util/uv-channel.c delete mode 100644 src/util/uv-messenger.c delete mode 100644 src/util/uv-worker.c delete mode 100644 src/util/uv.cpp diff --git a/.gitignore b/.gitignore index c907dbdec5..38dfa73076 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,6 @@ /mason_packages /config.gypi /config-ios.gypi -/config/constants_local.cpp /build /include/mbgl/shader/shaders.hpp /src/shader/shaders_gl.cpp diff --git a/config/constants.cpp b/config/constants.cpp deleted file mode 100644 index 3d1422e6c7..0000000000 --- a/config/constants.cpp +++ /dev/null @@ -1,27 +0,0 @@ -#include - -const float mbgl::util::tileSize = 512.0f; - -#if defined(DEBUG) -const bool mbgl::debug::tileParseWarnings = false; -const bool mbgl::debug::styleParseWarnings = false; -const bool mbgl::debug::spriteWarnings = false; -const bool mbgl::debug::renderWarnings = false; -const bool mbgl::debug::renderTree = false; -const bool mbgl::debug::labelTextMissingWarning = true; -const bool mbgl::debug::missingFontStackWarning = true; -const bool mbgl::debug::missingFontFaceWarning = true; -const bool mbgl::debug::glyphWarning = true; -const bool mbgl::debug::shapingWarning = true; -#else -const bool mbgl::debug::tileParseWarnings = false; -const bool mbgl::debug::styleParseWarnings = false; -const bool mbgl::debug::spriteWarnings = false; -const bool mbgl::debug::renderWarnings = false; -const bool mbgl::debug::renderTree = false; -const bool mbgl::debug::labelTextMissingWarning = false; -const bool mbgl::debug::missingFontStackWarning = false; -const bool mbgl::debug::missingFontFaceWarning = false; -const bool mbgl::debug::glyphWarning = false; -const bool mbgl::debug::shapingWarning = false; -#endif diff --git a/gyp/mbgl-core.gypi b/gyp/mbgl-core.gypi index 022480350a..279051968c 100644 --- a/gyp/mbgl-core.gypi +++ b/gyp/mbgl-core.gypi @@ -21,7 +21,6 @@ }, 'sources': [ ' -#include -#include -#include -#include -#include -#include - -namespace ClipperLib { - -enum ClipType { ctIntersection, ctUnion, ctDifference, ctXor }; -enum PolyType { ptSubject, ptClip }; -//By far the most widely used winding rules for polygon filling are -//EvenOdd & NonZero (GDI, GDI+, XLib, OpenGL, Cairo, AGG, Quartz, SVG, Gr32) -//Others rules include Positive, Negative and ABS_GTR_EQ_TWO (only in OpenGL) -//see http://glprogramming.com/red/chapter11.html -enum PolyFillType { pftEvenOdd, pftNonZero, pftPositive, pftNegative }; - -#ifdef use_int32 -typedef int cInt; -typedef unsigned int cUInt; -#else -typedef signed long long cInt; -typedef unsigned long long cUInt; -#endif - -struct IntPoint { - cInt X; - cInt Y; -#ifdef use_xyz - cInt Z; - IntPoint(cInt x = 0, cInt y = 0, cInt z = 0): X(x), Y(y), Z(z) {}; -#else - IntPoint(cInt x = 0, cInt y = 0): X(x), Y(y) {}; -#endif - - friend inline bool operator== (const IntPoint& a, const IntPoint& b) - { - return a.X == b.X && a.Y == b.Y; - } - friend inline bool operator!= (const IntPoint& a, const IntPoint& b) - { - return a.X != b.X || a.Y != b.Y; - } -}; -//------------------------------------------------------------------------------ - -typedef std::vector< IntPoint > Path; -typedef std::vector< Path > Paths; - -inline Path& operator <<(Path& poly, const IntPoint& p) {poly.push_back(p); return poly;} -inline Paths& operator <<(Paths& polys, const Path& p) {polys.push_back(p); return polys;} - -std::ostream& operator <<(std::ostream &s, const IntPoint &p); -std::ostream& operator <<(std::ostream &s, const Path &p); -std::ostream& operator <<(std::ostream &s, const Paths &p); - -struct DoublePoint -{ - double X; - double Y; - DoublePoint(double x = 0, double y = 0) : X(x), Y(y) {} - DoublePoint(IntPoint ip) : X((double)ip.X), Y((double)ip.Y) {} -}; -//------------------------------------------------------------------------------ - -#ifdef use_xyz -typedef void (*TZFillCallback)(IntPoint& z1, IntPoint& z2, IntPoint& pt); -#endif - -enum InitOptions {ioReverseSolution = 1, ioStrictlySimple = 2, ioPreserveCollinear = 4}; -enum JoinType {jtSquare, jtRound, jtMiter}; -enum EndType {etClosedPolygon, etClosedLine, etOpenButt, etOpenSquare, etOpenRound}; -#ifdef use_deprecated - enum EndType_ {etClosed, etButt = 2, etSquare, etRound}; -#endif - -class PolyNode; -typedef std::vector< PolyNode* > PolyNodes; - -class PolyNode -{ -public: - PolyNode(); - Path Contour; - PolyNodes Childs; - PolyNode* Parent; - PolyNode* GetNext() const; - bool IsHole() const; - bool IsOpen() const; - int ChildCount() const; -private: - unsigned Index; //node index in Parent.Childs - bool m_IsOpen; - JoinType m_jointype; - EndType m_endtype; - PolyNode* GetNextSiblingUp() const; - void AddChild(PolyNode& child); - friend class Clipper; //to access Index - friend class ClipperOffset; -}; - -class PolyTree: public PolyNode -{ -public: - ~PolyTree(){Clear();}; - PolyNode* GetFirst() const; - void Clear(); - int Total() const; -private: - PolyNodes AllNodes; - friend class Clipper; //to access AllNodes -}; - -bool Orientation(const Path &poly); -double Area(const Path &poly); -int PointInPolygon(const IntPoint &pt, const Path &path); - -#ifdef use_deprecated - void OffsetPaths(const Paths &in_polys, Paths &out_polys, - double delta, JoinType jointype, EndType_ endtype, double limit = 0); -#endif - -void SimplifyPolygon(const Path &in_poly, Paths &out_polys, PolyFillType fillType = pftEvenOdd); -void SimplifyPolygons(const Paths &in_polys, Paths &out_polys, PolyFillType fillType = pftEvenOdd); -void SimplifyPolygons(Paths &polys, PolyFillType fillType = pftEvenOdd); - -void CleanPolygon(const Path& in_poly, Path& out_poly, double distance = 1.415); -void CleanPolygon(Path& poly, double distance = 1.415); -void CleanPolygons(const Paths& in_polys, Paths& out_polys, double distance = 1.415); -void CleanPolygons(Paths& polys, double distance = 1.415); - -void MinkowskiSum(const Path& pattern, const Path& path, Paths& solution, bool pathIsClosed); -void MinkowskiSum(const Path& pattern, const Paths& paths, - Paths& solution, PolyFillType pathFillType, bool pathIsClosed); -void MinkowskiDiff(const Path& poly1, const Path& poly2, Paths& solution); - -void PolyTreeToPaths(const PolyTree& polytree, Paths& paths); -void ClosedPathsFromPolyTree(const PolyTree& polytree, Paths& paths); -void OpenPathsFromPolyTree(PolyTree& polytree, Paths& paths); - -void ReversePath(Path& p); -void ReversePaths(Paths& p); - -struct IntRect { cInt left; cInt top; cInt right; cInt bottom; }; - -//enums that are used internally ... -enum EdgeSide { esLeft = 1, esRight = 2}; - -//forward declarations (for stuff used internally) ... -struct TEdge; -struct IntersectNode; -struct LocalMinima; -struct Scanbeam; -struct OutPt; -struct OutRec; -struct Join; - -typedef std::vector < OutRec* > PolyOutList; -typedef std::vector < TEdge* > EdgeList; -typedef std::vector < Join* > JoinList; -typedef std::vector < IntersectNode* > IntersectList; - - -//------------------------------------------------------------------------------ - -//ClipperBase is the ancestor to the Clipper class. It should not be -//instantiated directly. This class simply abstracts the conversion of sets of -//polygon coordinates into edge objects that are stored in a LocalMinima list. -class ClipperBase -{ -public: - ClipperBase(); - virtual ~ClipperBase(); - bool AddPath(const Path &pg, PolyType PolyTyp, bool Closed); - bool AddPaths(const Paths &ppg, PolyType PolyTyp, bool Closed); - virtual void Clear(); - IntRect GetBounds(); - bool PreserveCollinear() {return m_PreserveCollinear;}; - void PreserveCollinear(bool value) {m_PreserveCollinear = value;}; -protected: - void DisposeLocalMinimaList(); - TEdge* AddBoundsToLML(TEdge *e, bool IsClosed); - void PopLocalMinima(); - virtual void Reset(); - TEdge* ProcessBound(TEdge* E, bool IsClockwise); - void InsertLocalMinima(LocalMinima *newLm); - void DoMinimaLML(TEdge* E1, TEdge* E2, bool IsClosed); - TEdge* DescendToMin(TEdge *&E); - void AscendToMax(TEdge *&E, bool Appending, bool IsClosed); - LocalMinima *m_CurrentLM; - LocalMinima *m_MinimaList; - bool m_UseFullRange; - EdgeList m_edges; - bool m_PreserveCollinear; - bool m_HasOpenPaths; -}; -//------------------------------------------------------------------------------ - -class Clipper : public virtual ClipperBase -{ -public: - Clipper(int initOptions = 0); - ~Clipper(); - bool Execute(ClipType clipType, - Paths &solution, - PolyFillType subjFillType = pftEvenOdd, - PolyFillType clipFillType = pftEvenOdd); - bool Execute(ClipType clipType, - PolyTree &polytree, - PolyFillType subjFillType = pftEvenOdd, - PolyFillType clipFillType = pftEvenOdd); - bool ReverseSolution() {return m_ReverseOutput;}; - void ReverseSolution(bool value) {m_ReverseOutput = value;}; - bool StrictlySimple() {return m_StrictSimple;}; - void StrictlySimple(bool value) {m_StrictSimple = value;}; - //set the callback function for z value filling on intersections (otherwise Z is 0) -#ifdef use_xyz - void ZFillFunction(TZFillCallback zFillFunc); -#endif -protected: - void Reset(); - virtual bool ExecuteInternal(); -private: - PolyOutList m_PolyOuts; - JoinList m_Joins; - JoinList m_GhostJoins; - IntersectList m_IntersectList; - ClipType m_ClipType; - std::set< cInt, std::greater > m_Scanbeam; - TEdge *m_ActiveEdges; - TEdge *m_SortedEdges; - bool m_ExecuteLocked; - PolyFillType m_ClipFillType; - PolyFillType m_SubjFillType; - bool m_ReverseOutput; - bool m_UsingPolyTree; - bool m_StrictSimple; -#ifdef use_xyz - TZFillCallback m_ZFill; //custom callback -#endif - void SetWindingCount(TEdge& edge); - bool IsEvenOddFillType(const TEdge& edge) const; - bool IsEvenOddAltFillType(const TEdge& edge) const; - void InsertScanbeam(const cInt Y); - cInt PopScanbeam(); - void InsertLocalMinimaIntoAEL(const cInt botY); - void InsertEdgeIntoAEL(TEdge *edge, TEdge* startEdge); - void AddEdgeToSEL(TEdge *edge); - void CopyAELToSEL(); - void DeleteFromSEL(TEdge *e); - void DeleteFromAEL(TEdge *e); - void UpdateEdgeIntoAEL(TEdge *&e); - void SwapPositionsInSEL(TEdge *edge1, TEdge *edge2); - bool IsContributing(const TEdge& edge) const; - bool IsTopHorz(const cInt XPos); - void SwapPositionsInAEL(TEdge *edge1, TEdge *edge2); - void DoMaxima(TEdge *e); - void PrepareHorzJoins(TEdge* horzEdge, bool isTopOfScanbeam); - void ProcessHorizontals(bool IsTopOfScanbeam); - void ProcessHorizontal(TEdge *horzEdge, bool isTopOfScanbeam); - void AddLocalMaxPoly(TEdge *e1, TEdge *e2, const IntPoint &pt); - OutPt* AddLocalMinPoly(TEdge *e1, TEdge *e2, const IntPoint &pt); - OutRec* GetOutRec(int idx); - void AppendPolygon(TEdge *e1, TEdge *e2); - void IntersectEdges(TEdge *e1, TEdge *e2, - const IntPoint &pt, bool protect = false); - OutRec* CreateOutRec(); - OutPt* AddOutPt(TEdge *e, const IntPoint &pt); - void DisposeAllOutRecs(); - void DisposeOutRec(PolyOutList::size_type index); - bool ProcessIntersections(const cInt botY, const cInt topY); - void BuildIntersectList(const cInt botY, const cInt topY); - void ProcessIntersectList(); - void ProcessEdgesAtTopOfScanbeam(const cInt topY); - void BuildResult(Paths& polys); - void BuildResult2(PolyTree& polytree); - void SetHoleState(TEdge *e, OutRec *outrec); - void DisposeIntersectNodes(); - bool FixupIntersectionOrder(); - void FixupOutPolygon(OutRec &outrec); - bool IsHole(TEdge *e); - bool FindOwnerFromSplitRecs(OutRec &outRec, OutRec *&currOrfl); - void FixHoleLinkage(OutRec &outrec); - void AddJoin(OutPt *op1, OutPt *op2, const IntPoint offPt); - void ClearJoins(); - void ClearGhostJoins(); - void AddGhostJoin(OutPt *op, const IntPoint offPt); - bool JoinPoints(Join *j, OutRec* outRec1, OutRec* outRec2); - void JoinCommonEdges(); - void DoSimplePolygons(); - void FixupFirstLefts1(OutRec* OldOutRec, OutRec* NewOutRec); - void FixupFirstLefts2(OutRec* OldOutRec, OutRec* NewOutRec); -#ifdef use_xyz - void SetZ(IntPoint& pt, TEdge& e); -#endif -}; -//------------------------------------------------------------------------------ - -class ClipperOffset -{ -public: - ClipperOffset(double miterLimit = 2.0, double roundPrecision = 0.25); - ~ClipperOffset(); - void AddPath(const Path& path, JoinType joinType, EndType endType); - void AddPaths(const Paths& paths, JoinType joinType, EndType endType); - void Execute(Paths& solution, double delta); - void Execute(PolyTree& solution, double delta); - void Clear(); - double MiterLimit; - double ArcTolerance; -private: - Paths m_destPolys; - Path m_srcPoly; - Path m_destPoly; - std::vector m_normals; - double m_delta, m_sinA, m_sin, m_cos; - double m_miterLim, m_StepsPerRad; - IntPoint m_lowest; - PolyNode m_polyNodes; - - void FixOrientations(); - void DoOffset(double delta); - void OffsetPoint(int j, int& k, JoinType jointype); - void DoSquare(int j, int k); - void DoMiter(int j, int k, double r); - void DoRound(int j, int k); -}; -//------------------------------------------------------------------------------ - -class clipperException : public std::exception -{ - public: - clipperException(const char* description): m_descr(description) {} - virtual ~clipperException() throw() {} - virtual const char* what() const throw() {return m_descr.c_str();} - private: - std::string m_descr; -}; -//------------------------------------------------------------------------------ - -} //ClipperLib namespace - -#endif //clipper_hpp - - diff --git a/include/csscolorparser/csscolorparser.hpp b/include/csscolorparser/csscolorparser.hpp deleted file mode 100644 index 6caf796943..0000000000 --- a/include/csscolorparser/csscolorparser.hpp +++ /dev/null @@ -1,44 +0,0 @@ -// (c) Dean McNamee , 2012. -// C++ port by Konstantin Käfer , 2014. -// -// https://github.com/deanm/css-color-parser-js -// https://github.com/kkaefer/css-color-parser-cpp -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. - -#ifndef CSS_COLOR_PARSER_CPP -#define CSS_COLOR_PARSER_CPP - -#include - -namespace CSSColorParser { - -struct Color { - inline Color() {} - inline Color(unsigned char r_, unsigned char g_, unsigned char b_, float a_) - : r(r_), g(g_), b(b_), a(a_) {} - unsigned char r = 0, g = 0, b = 0; - float a = 1.0f; -}; - -Color parse(const std::string& css_str); - -} - -#endif diff --git a/include/libtess2/LICENSE.txt b/include/libtess2/LICENSE.txt deleted file mode 100644 index 30133655cf..0000000000 --- a/include/libtess2/LICENSE.txt +++ /dev/null @@ -1,25 +0,0 @@ -** SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008) -** Copyright (C) [dates of first publication] Silicon Graphics, Inc. -** All Rights Reserved. -** -** Permission is hereby granted, free of charge, to any person obtaining a copy -** of this software and associated documentation files (the "Software"), to deal -** in the Software without restriction, including without limitation the rights -** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -** of the Software, and to permit persons to whom the Software is furnished to do so, -** subject to the following conditions: -** -** The above copyright notice including the dates of first publication and either this -** permission notice or a reference to http://oss.sgi.com/projects/FreeB/ shall be -** included in all copies or substantial portions of the Software. -** -** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -** INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A -** PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL SILICON GRAPHICS, INC. -** BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE -** OR OTHER DEALINGS IN THE SOFTWARE. -** -** Except as contained in this notice, the name of Silicon Graphics, Inc. shall not -** be used in advertising or otherwise to promote the sale, use or other dealings in -** this Software without prior written authorization from Silicon Graphics, Inc. diff --git a/include/libtess2/tesselator.h b/include/libtess2/tesselator.h deleted file mode 100755 index 74ca18e27d..0000000000 --- a/include/libtess2/tesselator.h +++ /dev/null @@ -1,209 +0,0 @@ -/* -** SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008) -** Copyright (C) [dates of first publication] Silicon Graphics, Inc. -** All Rights Reserved. -** -** Permission is hereby granted, free of charge, to any person obtaining a copy -** of this software and associated documentation files (the "Software"), to deal -** in the Software without restriction, including without limitation the rights -** to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -** of the Software, and to permit persons to whom the Software is furnished to do so, -** subject to the following conditions: -** -** The above copyright notice including the dates of first publication and either this -** permission notice or a reference to http://oss.sgi.com/projects/FreeB/ shall be -** included in all copies or substantial portions of the Software. -** -** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, -** INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A -** PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL SILICON GRAPHICS, INC. -** BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE -** OR OTHER DEALINGS IN THE SOFTWARE. -** -** Except as contained in this notice, the name of Silicon Graphics, Inc. shall not -** be used in advertising or otherwise to promote the sale, use or other dealings in -** this Software without prior written authorization from Silicon Graphics, Inc. -*/ -/* -** Author: Mikko Mononen, July 2009. -*/ - -#ifndef TESSELATOR_H -#define TESSELATOR_H - -#ifdef __cplusplus -extern "C" { -#endif - -// See OpenGL Red Book for description of the winding rules -// http://www.glprogramming.com/red/chapter11.html -enum TessWindingRule -{ - TESS_WINDING_ODD, - TESS_WINDING_NONZERO, - TESS_WINDING_POSITIVE, - TESS_WINDING_NEGATIVE, - TESS_WINDING_ABS_GEQ_TWO, -}; - -// The contents of the tessGetElements() depends on element type being passed to tessTesselate(). -// Tesselation result element types: -// TESS_POLYGONS -// Each element in the element array is polygon defined as 'polySize' number of vertex indices. -// If a polygon has than 'polySize' vertices, the remaining indices are stored as TESS_UNDEF. -// Example, drawing a polygon: -// const int nelems = tessGetElementCount(tess); -// const TESSindex* elems = tessGetElements(tess); -// for (int i = 0; i < nelems; i++) { -// const TESSindex* poly = &elems[i * polySize]; -// glBegin(GL_POLYGON); -// for (int j = 0; j < polySize; j++) { -// if (poly[j] == TESS_UNDEF) break; -// glVertex2fv(&verts[poly[j]*vertexSize]); -// } -// glEnd(); -// } -// -// TESS_CONNECTED_POLYGONS -// Each element in the element array is polygon defined as 'polySize' number of vertex indices, -// followed by 'polySize' indices to neighour polygons, that is each element is 'polySize' * 2 indices. -// If a polygon has than 'polySize' vertices, the remaining indices are stored as TESS_UNDEF. -// If a polygon edge is a boundary, that is, not connected to another polygon, the neighbour index is TESS_UNDEF. -// Example, flood fill based on seed polygon: -// const int nelems = tessGetElementCount(tess); -// const TESSindex* elems = tessGetElements(tess); -// unsigned char* visited = (unsigned char*)calloc(nelems); -// TESSindex stack[50]; -// int nstack = 0; -// stack[nstack++] = seedPoly; -// visited[startPoly] = 1; -// while (nstack > 0) { -// TESSindex idx = stack[--nstack]; -// const TESSindex* poly = &elems[idx * polySize * 2]; -// const TESSindex* nei = &poly[polySize]; -// for (int i = 0; i < polySize; i++) { -// if (poly[i] == TESS_UNDEF) break; -// if (nei[i] != TESS_UNDEF && !visited[nei[i]]) -// stack[nstack++] = nei[i]; -// visited[nei[i]] = 1; -// } -// } -// } -// -// TESS_BOUNDARY_CONTOURS -// Each element in the element array is [base index, count] pair defining a range of vertices for a contour. -// The first value is index to first vertex in contour and the second value is number of vertices in the contour. -// Example, drawing contours: -// const int nelems = tessGetElementCount(tess); -// const TESSindex* elems = tessGetElements(tess); -// for (int i = 0; i < nelems; i++) { -// const TESSindex base = elems[i * 2]; -// const TESSindex count = elems[i * 2 + 1]; -// glBegin(GL_LINE_LOOP); -// for (int j = 0; j < count; j++) { -// glVertex2fv(&verts[(base+count) * vertexSize]); -// } -// glEnd(); -// } -// -enum TessElementType -{ - TESS_POLYGONS, - TESS_CONNECTED_POLYGONS, - TESS_BOUNDARY_CONTOURS, -}; - -typedef float TESSreal; -typedef int TESSindex; -typedef struct TESStesselator TESStesselator; -typedef struct TESSalloc TESSalloc; - -#define TESS_UNDEF (~(TESSindex)0) - -// Custom memory allocator interface. -// The internal memory allocator allocates mesh edges, vertices and faces -// as well as dictionary nodes and active regions in buckets and uses simple -// freelist to speed up the allocation. The bucket size should roughly match your -// expected input data. For example if you process only hundreds of vertices, -// a bucket size of 128 might be ok, where as when processing thousands of vertices -// bucket size of 1024 might be approproate. The bucket size is a compromise between -// how often to allocate memory from the system versus how much extra space the system -// should allocate. Reasonable defaults are show in commects below, they will be used if -// the bucket sizes are zero. -// -// The use may left the memrealloc to be null. In that case, the tesselator will not try to -// dynamically grow int's internal arrays. The tesselator only needs the reallocation when it -// has found intersecting segments and needs to add new vertex. This defency can be cured by -// allocating some extra vertices beforehand. The 'extraVertices' variable allows to specify -// number of expected extra vertices. -struct TESSalloc -{ - void *(*memalloc)( void *userData, unsigned int size ); - void *(*memrealloc)( void *userData, void* ptr, unsigned int size ); - void (*memfree)( void *userData, void *ptr ); - void* userData; // User data passed to the allocator functions. - int meshEdgeBucketSize; // 512 - int meshVertexBucketSize; // 512 - int meshFaceBucketSize; // 256 - int dictNodeBucketSize; // 512 - int regionBucketSize; // 256 - int extraVertices; // Number of extra vertices allocated for the priority queue. -}; - -// tessNewTess() - Creates a new tesselator. -// Use tessDeleteTess() to delete the tesselator. -// Returns: -// new tesselator object. -TESStesselator* tessNewTess( TESSalloc* alloc ); - -// tessDeleteTess() - Deletes a tesselator. -// Parameters: -// tess - pointer to tesselator object to be deleted. -void tessDeleteTess( TESStesselator *tess ); - -// tessAddContour() - Adds a contour to be tesselated. -// The type of the vertex coordinates is assumed to be TESSreal. -// Parameters: -// tess - pointer to tesselator object. -// size - number of coordinates per vertex. Must be 2 or 3. -// pointer - pointer to the first coordinate of the first vertex in the array. -// stride - defines offset in bytes between consecutive vertices. -// count - number of vertices in contour. -void tessAddContour( TESStesselator *tess, int size, const void* pointer, int stride, int count ); - -// tessTesselate() - tesselate contours. -// Parameters: -// tess - pointer to tesselator object. -// windingRule - winding rules used for tesselation, must be one of TessWindingRule. -// elementType - defines the tesselation result element type, must be one of TessElementType. -// polySize - defines maximum vertices per polygons if output is polygons. -// vertexSize - defines the number of coordinates in tesselation result vertex, must be 2 or 3. -// normal - defines the normal of the input contours, of null the normal is calculated automatically. -// Returns: -// 1 if succeed, 0 if failed. -int tessTesselate( TESStesselator *tess, int windingRule, int elementType, int polySize, int vertexSize, const TESSreal* normal ); - -// tessGetVertexCount() - Returns number of vertices in the tesselated output. -int tessGetVertexCount( TESStesselator *tess ); - -// tessGetVertices() - Returns pointer to first coordinate of first vertex. -const TESSreal* tessGetVertices( TESStesselator *tess ); - -// tessGetVertexIndices() - Returns pointer to first vertex index. -// Vertex indices can be used to map the generated vertices to the original vertices. -// Every point added using tessAddContour() will get a new index starting at 0. -// New vertices generated at the intersections of segments are assigned value TESS_UNDEF. -const TESSindex* tessGetVertexIndices( TESStesselator *tess ); - -// tessGetElementCount() - Returns number of elements in the the tesselated output. -int tessGetElementCount( TESStesselator *tess ); - -// tessGetElements() - Returns pointer to the first element. -const TESSindex* tessGetElements( TESStesselator *tess ); - -#ifdef __cplusplus -} -#endif - -#endif // TESSELATOR_H diff --git a/include/mbgl/geometry/anchor.hpp b/include/mbgl/geometry/anchor.hpp deleted file mode 100644 index d30394f0b9..0000000000 --- a/include/mbgl/geometry/anchor.hpp +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef MBGL_GEOMETRY_ANCHOR -#define MBGL_GEOMETRY_ANCHOR - -#include - -namespace mbgl { - -struct Anchor { - float x = 0.0f; - float y = 0.0f; - float angle = 0.0f; - float scale = 0.0f; - int segment = -1; - - explicit Anchor(float x_, float y_, float angle_, float scale_) - : x(x_), y(y_), angle(angle_), scale(scale_) {} - explicit Anchor(float x_, float y_, float angle_, float scale_, int segment_) - : x(x_), y(y_), angle(angle_), scale(scale_), segment(segment_) {} -}; - -typedef std::vector Anchors; - -} - -#endif \ No newline at end of file diff --git a/include/mbgl/geometry/binpack.hpp b/include/mbgl/geometry/binpack.hpp deleted file mode 100644 index 9aadaa202c..0000000000 --- a/include/mbgl/geometry/binpack.hpp +++ /dev/null @@ -1,100 +0,0 @@ -#ifndef MBGL_GEOMETRY_BINPACK -#define MBGL_GEOMETRY_BINPACK - -#include -#include -#include -#include - -namespace mbgl { - -template -class BinPack : private util::noncopyable { -public: - BinPack(T width, T height) - : free(1, Rect{ 0, 0, width, height }) {} -public: - Rect allocate(T width, T height) { - // Find the smallest free rect angle - auto smallest = free.end(); - for (auto it = free.begin(); it != free.end(); ++it) { - const Rect& ref = *it; - const Rect& rect = *smallest; - if (width <= ref.w && height <= ref.h) { - if (smallest == free.end() || (ref.y <= rect.y && ref.x <= rect.x)) { - smallest = it; - } - } - } - - if (smallest == free.end()) { - // There's no space left for this char. - return Rect{ 0, 0, 0, 0 }; - } else { - Rect rect = *smallest; - free.erase(smallest); - - // Shorter/Longer Axis Split Rule (SAS) - // http://clb.demon.fi/files/RectangleBinPack.pdf p. 15 - // Ignore the dimension of R and just split long the shorter dimension - // See Also: http://www.cs.princeton.edu/~chazelle/pubs/blbinpacking.pdf - if (rect.w < rect.h) { - // split horizontally - // +--+---+ - // |__|___| <-- b1 - // +------+ <-- b2 - if (rect.w > width) free.emplace_back(rect.x + width, rect.y, rect.w - width, height); - if (rect.h > height) free.emplace_back(rect.x, rect.y + height, rect.w, rect.h - height); - } else { - // split vertically - // +--+---+ - // |__| | <-- b1 - // +--|---+ <-- b2 - if (rect.w > width) free.emplace_back(rect.x + width, rect.y, rect.w - width, rect.h); - if (rect.h > height) free.emplace_back(rect.x, rect.y + height, width, rect.h - height); - } - - return Rect{ rect.x, rect.y, width, height }; - } - } - - - void release(Rect rect) { - // Simple algorithm to recursively merge the newly released cell with its - // neighbor. This doesn't merge more than two cells at a time, and fails - // for complicated merges. - for (auto it = free.begin(); it != free.end(); ++it) { - Rect ref = *it; - if (ref.y == rect.y && ref.h == rect.h && ref.x + ref.w == rect.x) { - ref.w += rect.w; - } - else if (ref.x == rect.x && ref.w == rect.w && ref.y + ref.h == rect.y) { - ref.h += rect.h; - } - else if (rect.y == ref.y && rect.h == ref.h && rect.x + rect.w == ref.x) { - ref.x = rect.x; - ref.w += rect.w; - } - else if (rect.x == ref.x && rect.w == ref.w && rect.y + rect.h == ref.y) { - ref.y = rect.y; - ref.h += rect.h; - } else { - continue; - } - - free.erase(it); - release(ref); - return; - - } - - free.emplace_back(rect); - }; - -private: - std::list> free; -}; - -} - -#endif diff --git a/include/mbgl/geometry/buffer.hpp b/include/mbgl/geometry/buffer.hpp deleted file mode 100644 index 80cc6b9d1a..0000000000 --- a/include/mbgl/geometry/buffer.hpp +++ /dev/null @@ -1,118 +0,0 @@ -#ifndef MBGL_GEOMETRY_BUFFER -#define MBGL_GEOMETRY_BUFFER - -#include -#include - -#include -#include -#include - -namespace mbgl { - -template < - size_t item_size, - int bufferType = GL_ARRAY_BUFFER, - size_t defaultLength = 8192, - bool retainAfterUpload = false -> -class Buffer : private util::noncopyable { -public: - ~Buffer() { - cleanup(); - if (buffer != 0) { - glDeleteBuffers(1, &buffer); - buffer = 0; - } - } - - // Returns the number of elements in this buffer. This is not the number of - // bytes, but rather the number of coordinates with associated information. - inline size_t index() const { - return pos / itemSize; - } - - inline bool empty() const { - return pos == 0; - } - - // Transfers this buffer to the GPU and binds the buffer to the GL context. - void bind(bool force = false) { - if (buffer == 0) { - glGenBuffers(1, &buffer); - force = true; - } - glBindBuffer(bufferType, buffer); - if (force) { - if (array == nullptr) { - throw std::runtime_error("Buffer was already deleted or doesn't contain elements"); - } - - glBufferData(bufferType, pos, array, GL_STATIC_DRAW); - if (!retainAfterUpload) { - cleanup(); - } - } - } - - void cleanup() { - if (array) { - free(array); - array = nullptr; - } - } - - inline GLuint getID() const { - return buffer; - } - -protected: - // increase the buffer size by at least /required/ bytes. - inline void *addElement() { - if (buffer != 0) { - throw std::runtime_error("Can't add elements after buffer was bound to GPU"); - } - if (length < pos + itemSize) { - while (length < pos + itemSize) length += defaultLength; - array = realloc(array, length); - if (array == nullptr) { - throw std::runtime_error("Buffer reallocation failed"); - } - } - pos += itemSize; - return static_cast(array) + (pos - itemSize); - } - - // Get a pointer to the item at a given index. - inline void *getElement(size_t i) { - if (array == nullptr) { - throw std::runtime_error("Buffer was already deleted or doesn't contain elements"); - } - - if (i * itemSize >= pos) { - throw new std::runtime_error("Can't get element after array bounds"); - } else { - return static_cast(array) + (i * itemSize); - } - } - -public: - static const size_t itemSize = item_size; - -private: - // CPU buffer - void *array = nullptr; - - // Byte position where we are writing. - size_t pos = 0; - - // Number of bytes that are valid in this buffer. - size_t length = 0; - - // GL buffer ID - GLuint buffer = 0; -}; - -} - -#endif diff --git a/include/mbgl/geometry/debug_font_buffer.hpp b/include/mbgl/geometry/debug_font_buffer.hpp deleted file mode 100644 index 7cceb0f576..0000000000 --- a/include/mbgl/geometry/debug_font_buffer.hpp +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef MBGL_GEOMETRY_DEBUG_FONT_BUFFER -#define MBGL_GEOMETRY_DEBUG_FONT_BUFFER - -#include "buffer.hpp" - -namespace mbgl { - -class DebugFontBuffer : public Buffer< - 4 // 2 bytes per coordinate, 2 coordinates -> { -public: - void addText(const char *text, double left, double baseline, double scale = 1); -}; - -} - -#endif diff --git a/include/mbgl/geometry/elements_buffer.hpp b/include/mbgl/geometry/elements_buffer.hpp deleted file mode 100644 index 045560f9aa..0000000000 --- a/include/mbgl/geometry/elements_buffer.hpp +++ /dev/null @@ -1,63 +0,0 @@ -#ifndef MBGL_GEOMETRY_TRIANGLE_ELEMENTS_BUFFER -#define MBGL_GEOMETRY_TRIANGLE_ELEMENTS_BUFFER - -#include -#include -#include - -#include - -namespace mbgl { - -template -struct ElementGroup : public util::noncopyable { - std::array array; - uint32_t vertex_length; - uint32_t elements_length; - - ElementGroup() : vertex_length(0), elements_length(0) {} - ElementGroup(uint32_t vertex_length_, uint32_t elements_length_) - : vertex_length(vertex_length_), - elements_length(elements_length_) { - } - - ElementGroup(ElementGroup &&rhs) noexcept - : array(std::move(rhs.array)), - vertex_length(rhs.vertex_length), - elements_length(rhs.elements_length) {}; -}; - -class TriangleElementsBuffer : public Buffer< - 6, // bytes per triangle (3 * unsigned short == 6 bytes) - GL_ELEMENT_ARRAY_BUFFER -> { -public: - typedef uint16_t element_type; - - void add(element_type a, element_type b, element_type c); -}; - - -class LineElementsBuffer : public Buffer< - 4, // bytes per triangle (2 * unsigned short == 6 bytes) - GL_ELEMENT_ARRAY_BUFFER -> { -public: - typedef uint16_t element_type; - - void add(element_type a, element_type b); -}; - -class PointElementsBuffer : public Buffer< - 2, // bytes per point (1 unsigned short) - GL_ELEMENT_ARRAY_BUFFER -> { -public: - typedef uint16_t element_type; - - void add(element_type a); -}; - -} - -#endif diff --git a/include/mbgl/geometry/fill_buffer.hpp b/include/mbgl/geometry/fill_buffer.hpp deleted file mode 100644 index 4a3d5a5b38..0000000000 --- a/include/mbgl/geometry/fill_buffer.hpp +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef MBGL_GEOMETRY_FILL_BUFFER -#define MBGL_GEOMETRY_FILL_BUFFER - -#include "buffer.hpp" -#include -#include - -namespace mbgl { - -class FillVertexBuffer : public Buffer< - 4 // bytes per coordinates (2 * unsigned short == 4 bytes) -> { -public: - typedef int16_t vertex_type; - - void add(vertex_type x, vertex_type y); -}; - -} - -#endif diff --git a/include/mbgl/geometry/geometry.hpp b/include/mbgl/geometry/geometry.hpp deleted file mode 100644 index 484d17b36d..0000000000 --- a/include/mbgl/geometry/geometry.hpp +++ /dev/null @@ -1,77 +0,0 @@ -#ifndef MBGL_GEOMETRY_GEOMETRY -#define MBGL_GEOMETRY_GEOMETRY - -#include -#include - -#include - -namespace mbgl { - -class Geometry : private util::noncopyable { - -public: - inline explicit Geometry(pbf& data); - - enum command : uint8_t { - end = 0, - move_to = 1, - line_to = 2, - close = 7 - }; - - inline command next(int32_t &rx, int32_t &ry); - -private: - pbf& data; - uint8_t cmd; - uint32_t length; - int32_t x, y; - int32_t ox, oy; -}; - -Geometry::Geometry(pbf& data_) - : data(data_), - cmd(1), - length(0), - x(0), y(0), - ox(0), oy(0) {} - -Geometry::command Geometry::next(int32_t &rx, int32_t &ry) { - if (data.data < data.end) { - if (length == 0) { - uint32_t cmd_length = static_cast(data.varint()); - cmd = cmd_length & 0x7; - length = cmd_length >> 3; - } - - --length; - - if (cmd == move_to || cmd == line_to) { - rx = (x += data.svarint()); - ry = (y += data.svarint()); - - if (cmd == move_to) { - ox = x; - oy = y; - return move_to; - } else { - return line_to; - } - } else if (cmd == close) { - rx = ox; - ry = oy; - return close; - } else { - fprintf(stderr, "unknown command: %d\n", cmd); - // TODO: gracefully handle geometry parse failures - return end; - } - } else { - return end; - } -} - -} - -#endif diff --git a/include/mbgl/geometry/glyph_atlas.hpp b/include/mbgl/geometry/glyph_atlas.hpp deleted file mode 100644 index 7b3c223fe5..0000000000 --- a/include/mbgl/geometry/glyph_atlas.hpp +++ /dev/null @@ -1,54 +0,0 @@ -#ifndef MBGL_GEOMETRY_GLYPH_ATLAS -#define MBGL_GEOMETRY_GLYPH_ATLAS - -#include -#include -#include - -#include -#include -#include -#include -#include - -namespace mbgl { - -class GlyphAtlas : public util::noncopyable { -public: - -private: - struct GlyphValue { - GlyphValue(const Rect& rect_, uint64_t id) - : rect(rect_), ids({ id }) {} - Rect rect; - std::set ids; - }; - - Rect addGlyph_impl(uint64_t tile_id, const std::string& face_name, - const SDFGlyph& glyph); -public: - GlyphAtlas(uint16_t width, uint16_t height); - - Rect addGlyph(uint64_t tile_id, const std::string& face_name, - const SDFGlyph& glyph); - void addGlyphs(uint64_t tileid, std::u32string const& text, std::string const& stackname, - FontStack const& fontStack, GlyphPositions & face); - void removeGlyphs(uint64_t tile_id); - void bind(); - -public: - const uint16_t width = 0; - const uint16_t height = 0; - -private: - std::mutex mtx; - BinPack bin; - std::map> index; - std::unique_ptr data; - std::atomic dirty; - uint32_t texture = 0; -}; - -}; - -#endif diff --git a/include/mbgl/geometry/icon_buffer.hpp b/include/mbgl/geometry/icon_buffer.hpp deleted file mode 100644 index e7e5f40355..0000000000 --- a/include/mbgl/geometry/icon_buffer.hpp +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef MBGL_GEOMETRY_ICON_BUFFER -#define MBGL_GEOMETRY_ICON_BUFFER - -#include "buffer.hpp" - -#include - -namespace mbgl { - - class IconVertexBuffer : public Buffer< - 20 - > { - public: - static const double angleFactor; - - size_t add(int16_t x, int16_t y, float ox, float oy, int16_t tx, int16_t ty, float angle, float minzoom, std::array range, float maxzoom, float labelminzoom); - - }; - -} - -#endif diff --git a/include/mbgl/geometry/line_buffer.hpp b/include/mbgl/geometry/line_buffer.hpp deleted file mode 100644 index 5012bb12ac..0000000000 --- a/include/mbgl/geometry/line_buffer.hpp +++ /dev/null @@ -1,39 +0,0 @@ -#ifndef MBGL_GEOMETRY_LINE_BUFFER -#define MBGL_GEOMETRY_LINE_BUFFER - -#include "buffer.hpp" - -namespace mbgl { - -class LineVertexBuffer : public Buffer< - 8 // 2 coordinates per vertex + 1 linesofar + 1 extrude coord pair == 4 (== 8 bytes) -> { -public: - typedef int16_t vertex_type; - - /* - * Scale the extrusion vector so that the normal length is this value. - * Contains the "texture" normals (-1..1). This is distinct from the extrude - * normals for line joins, because the x-value remains 0 for the texture - * normal array, while the extrude normal actually moves the vertex to create - * the acute/bevelled line join. - */ - static const int8_t extrudeScale = 63; - - /* - * Add a vertex to this buffer - * - * @param {number} x vertex position - * @param {number} y vertex position - * @param {number} ex extrude normal - * @param {number} ey extrude normal - * @param {number} tx texture normal - * @param {number} ty texture normal - */ - size_t add(vertex_type x, vertex_type y, float ex, float ey, int8_t tx, int8_t ty, int32_t linesofar = 0); -}; - - -} - -#endif diff --git a/include/mbgl/geometry/resample.hpp b/include/mbgl/geometry/resample.hpp deleted file mode 100644 index bcfe4ca53d..0000000000 --- a/include/mbgl/geometry/resample.hpp +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef MBGL_GEOMETRY_INTERPOLATE -#define MBGL_GEOMETRY_INTERPOLATE - -#include -#include - -namespace mbgl { - -Anchors resample(const std::vector &vertices, float spacing, - float minScale, float maxScale, float tilePixelRatio, int start = 0); -} - -#endif diff --git a/include/mbgl/geometry/sprite_atlas.hpp b/include/mbgl/geometry/sprite_atlas.hpp deleted file mode 100644 index 9fb42a30b5..0000000000 --- a/include/mbgl/geometry/sprite_atlas.hpp +++ /dev/null @@ -1,81 +0,0 @@ -#ifndef MBGL_GEOMETRY_SPRITE_ATLAS -#define MBGL_GEOMETRY_SPRITE_ATLAS - -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -namespace mbgl { - -class Sprite; -class SpritePosition; - -struct SpriteAtlasPosition { - std::array size; - std::array tl; - std::array br; -}; - -class SpriteAtlas : public util::noncopyable { -public: - typedef uint16_t dimension; - - // Add way to construct this from another SpriteAtlas (e.g. with another pixelRatio) - SpriteAtlas(dimension width, dimension height); - ~SpriteAtlas(); - - // Changes the pixel ratio. - bool resize(float newRatio); - - // Changes the source sprite. - void setSprite(util::ptr sprite); - - // Returns the coordinates of an image that is sourced from the sprite image. - // This getter attempts to read the image from the sprite if it is already loaded. - // In that case, it copies it into the sprite atlas and returns the dimensions. - // Otherwise, it returns a 0/0/0/0 rect. - Rect getImage(const std::string& name); - - SpriteAtlasPosition getPosition(const std::string& name, bool repeating = false); - - // Binds the image buffer of this sprite atlas to the GPU, and uploads data if it is out - // of date. - void bind(bool linear = false); - - inline float getWidth() const { return width; } - inline float getHeight() const { return height; } - inline float getTextureWidth() const { return width * pixelRatio; } - inline float getTextureHeight() const { return height * pixelRatio; } - inline float getPixelRatio() const { return pixelRatio; } - - const dimension width = 0; - const dimension height = 0; - -private: - void allocate(); - Rect allocateImage(size_t width, size_t height); - void copy(const Rect& dst, const SpritePosition& src); - - std::recursive_mutex mtx; - float pixelRatio = 1.0f; - BinPack bin; - util::ptr sprite; - std::map> images; - std::set uninitialized; - uint32_t *data = nullptr; - std::atomic dirty; - uint32_t texture = 0; - uint32_t filter = 0; - static const int buffer = 1; -}; - -}; - -#endif diff --git a/include/mbgl/geometry/static_vertex_buffer.hpp b/include/mbgl/geometry/static_vertex_buffer.hpp deleted file mode 100644 index ce932269f0..0000000000 --- a/include/mbgl/geometry/static_vertex_buffer.hpp +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef MBGL_GEOMETRY_STATIC_VERTEX_BUFFER -#define MBGL_GEOMETRY_STATIC_VERTEX_BUFFER - -#include - -#include -#include -#include -#include - -namespace mbgl { - -class StaticVertexBuffer : public Buffer< - 4, // bytes per vertex (2 * signed short == 4 bytes) - GL_ARRAY_BUFFER, - 32 // default length -> { -public: - typedef int16_t vertex_type; - - StaticVertexBuffer(std::initializer_list> init); -}; - -} - -#endif diff --git a/include/mbgl/geometry/text_buffer.hpp b/include/mbgl/geometry/text_buffer.hpp deleted file mode 100644 index 159f3207a8..0000000000 --- a/include/mbgl/geometry/text_buffer.hpp +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef MBGL_GEOMETRY_TEXT_BUFFER -#define MBGL_GEOMETRY_TEXT_BUFFER - -#include "buffer.hpp" -#include - -namespace mbgl { - -class TextVertexBuffer : public Buffer < - 16, - GL_ARRAY_BUFFER, - 32768 -> { -public: - typedef int16_t vertex_type; - - static const double angleFactor; - - size_t add(int16_t x, int16_t y, float ox, float oy, uint16_t tx, uint16_t ty, float angle, float minzoom, std::array range, float maxzoom, float labelminzoom); -}; - - -} - -#endif diff --git a/include/mbgl/geometry/vao.hpp b/include/mbgl/geometry/vao.hpp deleted file mode 100644 index 2ecba731f7..0000000000 --- a/include/mbgl/geometry/vao.hpp +++ /dev/null @@ -1,73 +0,0 @@ -#ifndef MBGL_GEOMETRY_VAO -#define MBGL_GEOMETRY_VAO - -#include -#include -#include - -#include - -namespace mbgl { - -class VertexArrayObject : public util::noncopyable { -public: - inline VertexArrayObject() {}; - - inline VertexArrayObject(VertexArrayObject &&rhs) noexcept - : vao(rhs.vao), - bound_shader(rhs.bound_shader), - bound_shader_name(rhs.bound_shader_name), - bound_vertex_buffer(rhs.bound_vertex_buffer), - bound_elements_buffer(rhs.bound_elements_buffer), - bound_offset(rhs.bound_offset) {}; - - template - inline void bind(Shader& shader, VertexBuffer &vertexBuffer, char *offset) { - bindVertexArrayObject(); - if (bound_shader == 0) { - vertexBuffer.bind(); - shader.bind(offset); - if (vao) { - storeBinding(shader, vertexBuffer.getID(), 0, offset); - } - } else { - verifyBinding(shader, vertexBuffer.getID(), 0, offset); - } - } - - template - inline void bind(Shader& shader, VertexBuffer &vertexBuffer, ElementsBuffer &elementsBuffer, char *offset) { - bindVertexArrayObject(); - if (bound_shader == 0) { - vertexBuffer.bind(); - elementsBuffer.bind(); - shader.bind(offset); - if (vao) { - storeBinding(shader, vertexBuffer.getID(), elementsBuffer.getID(), offset); - } - } else { - verifyBinding(shader, vertexBuffer.getID(), elementsBuffer.getID(), offset); - } - } - - ~VertexArrayObject(); - -private: - void bindVertexArrayObject(); - void storeBinding(Shader &shader, GLuint vertexBuffer, GLuint elementsBuffer, char *offset); - void verifyBinding(Shader &shader, GLuint vertexBuffer, GLuint elementsBuffer, char *offset); - - GLuint vao = 0; - - // For debug reasons, we're storing the bind information so that we can - // detect errors and report - GLuint bound_shader = 0; - const char *bound_shader_name = ""; - GLuint bound_vertex_buffer = 0; - GLuint bound_elements_buffer = 0; - char *bound_offset = 0; -}; - -} - -#endif diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index 4e6eef89cf..3a50a70136 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -2,9 +2,6 @@ #define MBGL_MAP_MAP #include -#include -#include -#include #include #include #include @@ -19,6 +16,7 @@ namespace mbgl { +class Painter; class GlyphStore; class LayerDescription; class Sprite; @@ -29,6 +27,8 @@ class StyleSource; class TexturePool; class FileSource; class View; +class GlyphAtlas; +class SpriteAtlas; class Map : private util::noncopyable { typedef void (*stop_callback)(void *); @@ -182,13 +182,13 @@ private: FileSource& fileSource; util::ptr