diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-05-23 15:39:47 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-05-25 21:37:22 -0700 |
| commit | 672eb610799c95aad37fe62eccdd11eca1e5e8f7 (patch) | |
| tree | db18ce6d036bc562b98b95a507829ea6f6e7fa32 /src | |
| parent | 30ec1c1fedf0f85de8d35c30238b0f9654059b7a (diff) | |
| download | qtlocation-mapboxgl-672eb610799c95aad37fe62eccdd11eca1e5e8f7.tar.gz | |
[core] box_shader ⇢ collision_box_shader
Diffstat (limited to 'src')
| -rw-r--r-- | src/mbgl/renderer/painter.cpp | 2 | ||||
| -rw-r--r-- | src/mbgl/renderer/painter_symbol.cpp | 2 | ||||
| -rw-r--r-- | src/mbgl/renderer/symbol_bucket.cpp | 2 | ||||
| -rw-r--r-- | src/mbgl/shader/collision_box_shader.cpp (renamed from src/mbgl/shader/box_shader.cpp) | 2 | ||||
| -rw-r--r-- | src/mbgl/shader/collision_box_shader.hpp (renamed from src/mbgl/shader/box_shader.hpp) | 0 |
5 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/renderer/painter.cpp b/src/mbgl/renderer/painter.cpp index 51c85b39b1..a3ca2b0858 100644 --- a/src/mbgl/renderer/painter.cpp +++ b/src/mbgl/renderer/painter.cpp @@ -27,7 +27,7 @@ #include <mbgl/shader/icon_shader.hpp> #include <mbgl/shader/raster_shader.hpp> #include <mbgl/shader/sdf_shader.hpp> -#include <mbgl/shader/box_shader.hpp> +#include <mbgl/shader/collision_box_shader.hpp> #include <mbgl/shader/circle_shader.hpp> #include <mbgl/algorithm/generate_clip_ids.hpp> diff --git a/src/mbgl/renderer/painter_symbol.cpp b/src/mbgl/renderer/painter_symbol.cpp index de3f109572..5e23a835dd 100644 --- a/src/mbgl/renderer/painter_symbol.cpp +++ b/src/mbgl/renderer/painter_symbol.cpp @@ -5,7 +5,7 @@ #include <mbgl/sprite/sprite_atlas.hpp> #include <mbgl/shader/sdf_shader.hpp> #include <mbgl/shader/icon_shader.hpp> -#include <mbgl/shader/box_shader.hpp> +#include <mbgl/shader/collision_box_shader.hpp> #include <mbgl/util/math.hpp> #include <cmath> diff --git a/src/mbgl/renderer/symbol_bucket.cpp b/src/mbgl/renderer/symbol_bucket.cpp index 3588b2ed51..aaaa6d21de 100644 --- a/src/mbgl/renderer/symbol_bucket.cpp +++ b/src/mbgl/renderer/symbol_bucket.cpp @@ -17,7 +17,7 @@ #include <mbgl/text/collision_tile.hpp> #include <mbgl/shader/sdf_shader.hpp> #include <mbgl/shader/icon_shader.hpp> -#include <mbgl/shader/box_shader.hpp> +#include <mbgl/shader/collision_box_shader.hpp> #include <mbgl/util/utf.hpp> #include <mbgl/util/token.hpp> diff --git a/src/mbgl/shader/box_shader.cpp b/src/mbgl/shader/collision_box_shader.cpp index 63f800ea69..7a4723dbb0 100644 --- a/src/mbgl/shader/box_shader.cpp +++ b/src/mbgl/shader/collision_box_shader.cpp @@ -1,4 +1,4 @@ -#include <mbgl/shader/box_shader.hpp> +#include <mbgl/shader/collision_box_shader.hpp> #include <mbgl/shader/box.vertex.hpp> #include <mbgl/shader/box.fragment.hpp> #include <mbgl/gl/gl.hpp> diff --git a/src/mbgl/shader/box_shader.hpp b/src/mbgl/shader/collision_box_shader.hpp index 5867a4896d..5867a4896d 100644 --- a/src/mbgl/shader/box_shader.hpp +++ b/src/mbgl/shader/collision_box_shader.hpp |