Mike Morris
|
af35a6cdfa
|
Merge branch 'master' into libuv010
|
2014-08-19 14:16:01 -04:00 |
|
Konstantin Käfer
|
d147e18153
|
update mapbox/variant
|
2014-08-19 11:38:26 +02:00 |
|
Konstantin Käfer
|
5a59b5f5fc
|
fix warnings
|
2014-08-18 14:05:52 +02:00 |
|
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
|
3ec4446ee6
|
add missing include
|
2014-08-15 11:11:37 +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
|
a0e8851530
|
use vaos only when the value is 1, not when it is merely defined
|
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 |
|
Mike Morris
|
6408e40a60
|
revert 992815cc3d
|
2014-08-13 16:04:53 -04: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
|
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
|
1bd704ced7
|
rebase fix
|
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
|
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 |
|
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 |
|
Konstantin Käfer
|
bff4f4b334
|
skip null byte
|
2014-08-11 12:15:42 +02:00 |
|
John Firebaugh
|
d53bc57f50
|
Support dashes in tokens
https://github.com/mapbox/mapbox-gl-js/issues/678
|
2014-08-08 11:17:07 -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 |
|
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
|
625ad1efe2
|
fix icon rendering
|
2014-08-06 12:36:19 +02:00 |
|
Ansis Brammanis
|
4220bfcb6c
|
implement line-blur and fix retina antialiasing
|
2014-08-05 14:17:00 -07:00 |
|
Konstantin Käfer
|
898c5dc7c3
|
port text alignment algorithm
|
2014-08-05 16:18:23 +02:00 |
|
Konstantin Käfer
|
a790e080a5
|
include <array>
|
2014-08-05 15:03:01 +02:00 |
|