Ansis Brammanis
|
32a1711d8c
|
remove support for composite layers
|
2014-08-15 15:52:53 +02:00 |
|
Konstantin Käfer
|
478a1dae67
|
Merge pull request #419 from mapbox/crosstile
allow crosstile labels and add `symbol-avoid-edges`
|
2014-08-15 15:50:36 +02:00 |
|
Konstantin Käfer
|
937f82fcda
|
use pimpl for collision in tile_parser
|
2014-08-15 15:18:29 +02:00 |
|
Ansis Brammanis
|
6c45972502
|
allow crosstile labels and add symbol-avoid-edges
|
2014-08-15 15:18:29 +02:00 |
|
Konstantin Käfer
|
8c2c7f769f
|
coalesce texture uploads at the beginning of a frame
|
2014-08-15 15:10:49 +02:00 |
|
Konstantin Käfer
|
8c3675755e
|
base static vertexbuffer on buffer object
|
2014-08-15 13:39:49 +02:00 |
|
Konstantin Käfer
|
ba67fcd830
|
refactor vao object to use acutal OpenGL IDs rather than object pointers
|
2014-08-15 13:37:19 +02:00 |
|
Konstantin Käfer
|
a81c2efba2
|
don't replace shaders on duplicate setup() call
fixes #408
|
2014-08-15 13:36:14 +02:00 |
|
Konstantin Käfer
|
d6bfb4be65
|
fix binding to vaos
|
2014-08-14 18:30:45 +02:00 |
|
Konstantin Käfer
|
1799c1b04c
|
fix image pattern rendering
|
2014-08-14 12:58:41 +02:00 |
|
Konstantin Käfer
|
bfd1281285
|
only set changed glDepthRange values
|
2014-08-14 12:58:41 +02:00 |
|
Lauren Budorick
|
badc1ea28b
|
Merge pull request #418 from mapbox/raster-styling
Raster styling
|
2014-08-13 11:00:04 -07:00 |
|
Lauren Budorick
|
8a9a43af7f
|
fix std::sqrt
|
2014-08-13 09:52:54 -07:00 |
|
Konstantin Käfer
|
3492a55f97
|
remove unnecessary variable
[skip ci]
|
2014-08-13 10:44:44 +02:00 |
|
Lauren Budorick
|
b2aa60baac
|
std namespacing trig fns
|
2014-08-12 22:56:16 -07:00 |
|
Lauren Budorick
|
4de2aafd30
|
rm commented line [skip ci]
|
2014-08-12 19:01:40 -07:00 |
|
Lauren Budorick
|
adb04662f9
|
parsing brightness correctly
|
2014-08-12 18:56:42 -07:00 |
|
Lauren Budorick
|
0d2724dec4
|
Raster styling all functional except brightness -- need to rework parsing
|
2014-08-12 18:27:35 -07:00 |
|
Konstantin Käfer
|
22e179aa37
|
remove trailing whitespace
[skip ci]
|
2014-08-12 16:30:27 +02:00 |
|
Konstantin Käfer
|
18b1469e9e
|
use unified RenderPass type
|
2014-08-12 15:24:02 +02:00 |
|
Konstantin Käfer
|
64d5cea94f
|
Merge branch 'master' into rasterize
[skip ci]
|
2014-08-12 15:15:05 +02:00 |
|
Konstantin Käfer
|
213b6ad4dc
|
Merge branch 'master' into rasterize
[skip ci]
|
2014-08-12 15:12:31 +02:00 |
|
Konstantin Käfer
|
df47a7be90
|
explicitly define destructor to avoid destructing with forward declaration
|
2014-08-12 13:35:04 +02:00 |
|
Konstantin Käfer
|
9b9ad20a90
|
Merge branch 'master' into style-parser-test
Conflicts:
mapboxgl.gyp
|
2014-08-12 13:16:20 +02:00 |
|
Konstantin Käfer
|
6f80264291
|
remove uv.h dependency from header files
|
2014-08-12 11:45:30 +02:00 |
|
Lauren Budorick
|
0263a9ffb7
|
minor access changes etc
|
2014-08-11 15:42:09 -07:00 |
|
Lauren Budorick
|
41165452bc
|
some cleaning up, raster spin->hue-rotate rename
|
2014-08-11 12:13:24 -07:00 |
|
Lauren Budorick
|
1ad2f26b9d
|
VICTORY
|
2014-08-11 12:13:23 -07:00 |
|
Lauren Budorick
|
510aaef07f
|
render single tile in source.cpp
|
2014-08-11 12:13:23 -07:00 |
|
Lauren Budorick
|
4083b534d7
|
committing so as to be revertable when i accidentally destroy the painter fns
|
2014-08-11 12:13:23 -07:00 |
|
Lauren Budorick
|
2be006fb00
|
unnecessary include
|
2014-08-11 12:13:23 -07:00 |
|
Lauren Budorick
|
fb5c3a888d
|
textures binding to map, just the wrong textures -- but so much closer
|
2014-08-11 12:13:23 -07:00 |
|
Lauren Budorick
|
54ed547f90
|
need to figure out how to use modified matrix in drawing prerendered textures
|
2014-08-11 12:13:22 -07:00 |
|
Lauren Budorick
|
ec7f7de5c4
|
still not working
|
2014-08-11 12:13:22 -07:00 |
|
Lauren Budorick
|
560cc112e1
|
rm rasterize_properties, should be close to working...doesn't work
|
2014-08-11 12:13:22 -07:00 |
|
Lauren Budorick
|
9e1156d660
|
take 2, still not working
|
2014-08-11 12:13:22 -07:00 |
|
Lauren Budorick
|
df925fe0e5
|
nonworking prerendering attempts
|
2014-08-11 12:12:43 -07:00 |
|
Mike Morris
|
a79afb78d8
|
Merge branch 'master' into style-parser-test
Conflicts:
bin/build-style.js
bin/default.style.json
mapboxgl.gyp
src/style/style_parser.cpp
test/test.gyp
|
2014-08-11 12:42:49 -04:00 |
|
Konstantin Käfer
|
e4c311a864
|
remove uv.h dependency in util/time.hpp
|
2014-08-11 17:41:08 +02:00 |
|
Konstantin Käfer
|
7a98ad4cf9
|
Merge pull request #407 from mapbox/filesource
Use style.json directory as base path for loading sprite images
|
2014-08-11 16:57:33 +02:00 |
|
Konstantin Käfer
|
225b5e01cb
|
don't automatically move back to main thread
|
2014-08-11 07:41:52 -07:00 |
|
Justin R. Miller
|
e39ae931b9
|
Merge branch 'master' of github.com:mapbox/mapbox-gl-native
|
2014-08-08 12:29:56 -07:00 |
|
Konstantin Käfer
|
4657e6e023
|
use a file source object to abstract loading of resources
|
2014-08-08 18:25:45 +02:00 |
|
Konstantin Käfer
|
a045d9c9d4
|
use filesource object for loading all http stuff
|
2014-08-08 15:08:41 +02:00 |
|
John Firebaugh
|
70a31baf5c
|
Eliminate warnings
|
2014-08-07 13:02:40 -07:00 |
|
Justin R. Miller
|
73db681d1e
|
redo of 2397019347
|
2014-08-06 15:53:37 -07:00 |
|
Konstantin Käfer
|
9dc48b773f
|
fix crash bug for styles that have no glyph url specified
|
2014-08-06 18:33:21 +02:00 |
|
Konstantin Käfer
|
915e89bee8
|
Merge branch 'master' into symbols
Conflicts:
src/renderer/painter_text.cpp
|
2014-08-06 15:32:48 +02:00 |
|
Konstantin Käfer
|
1f992b1de8
|
fix icons on retina screens
|
2014-08-06 14:54:37 +02:00 |
|
Konstantin Käfer
|
3043b5608f
|
fix black border around icon
|
2014-08-06 14:35:57 +02:00 |
|