John Firebaugh
7caac537b8
Fix variable shadowing
2014-10-29 10:12:41 -04:00
John Firebaugh
da8aa391d0
Render map with a copy of TransformState
2014-10-29 09:58:56 -04:00
artemp
9364fd7322
make addGlyphsToAtlas static method of SymbolBucket + add addGlyphs method to minimise number of mutex locking
2014-10-27 14:18:11 -04:00
Konstantin Käfer
214f99673f
fix variable shadowing
2014-10-22 18:19:01 +02:00
Mike Morris
2d1219fa51
Merge branch 'master' into libuv-0.10-headless-display
...
Conflicts:
common/curl_request.cpp
common/glfw_view.cpp
common/glfw_view.hpp
include/mbgl/platform/request.hpp
ios/mapbox-gl-cocoa
setup-libraries.sh
src/map/map.cpp
src/platform/request.cpp
test/fixtures/fixture_request.cpp
2014-10-10 12:24:45 -04:00
Konstantin Käfer
f26bb724dc
use util::ptr as a wrapper around std::shared_ptr that asserts nonemptiness
2014-09-24 16:14:09 +02:00
Leith Bade
71549e7b93
Adds the function Map::terminate() to allow all GL resources held
...
by the map to be released immediately.
Map::terminate() will call any GL functions on the current thread
without blocking or defering to the rendering thread.
This function allows a GL context to be destroyed and recreated
safely without having to delete the Map object.
Fixes mapbox/mapbox-gl-native#341
Conflicts:
include/llmr/renderer/painter.hpp
test/headless.cpp
2014-09-10 18:31:20 -04:00
John Firebaugh
eb4f53cbed
SDF icon support ( fixes #404 )
2014-09-08 15:12:32 -07:00
John Firebaugh
de720f3515
FrameHistory::getFadeProperties
2014-09-05 14:03:33 -07:00
John Firebaugh
f2391e25ea
TextShader ⇢ SDFShader
2014-09-04 17:59:22 -07:00
John Firebaugh
1fedf0918a
Less shader boilerplate
2014-09-04 16:22:25 -07:00
John Firebaugh
c14ae3c477
Fix text/icon-translate-anchor
...
These are style properties, not render properties.
2014-09-04 15:38:14 -07:00
Lauren Budorick
71c31cee24
linepattern in progress
2014-09-03 18:12:40 -07:00
John Firebaugh
e71a1a9077
Simplify
2014-08-28 17:16:37 -07:00
John Firebaugh
bfa0b7f009
Remove vtxMatrix state
2014-08-28 17:13:55 -07:00
John Firebaugh
c13cc4aa38
Record frame history in the correct place
...
Fixes numerous issues with rendering tests.
2014-08-28 16:43:03 -07:00
John Firebaugh
e2c2ab843e
Render background with plain shader
2014-08-27 18:22:20 -07:00
Konstantin Käfer
312cae1a05
Merge pull request #451 from mapbox/noncopyable-vao
...
VertexArrayObject and ElementGroup should be noncopyable
2014-08-27 12:36:48 +02:00
Konstantin Käfer
c3cb458225
make ElementGroup and VertexArrayObject movable to avoid using unique_ptrs
2014-08-27 12:08:21 +02:00
John Firebaugh
489b664232
Remove unused
2014-08-26 15:15:33 -07:00
John Firebaugh
42d0740ef0
VertexArrayObject and ElementGroup should be noncopyable
2014-08-26 14:43:56 -07:00
Ansis Brammanis
32a1711d8c
remove support for composite layers
2014-08-15 15:52:53 +02:00
Konstantin Käfer
8c3675755e
base static vertexbuffer on buffer object
2014-08-15 13:39:49 +02:00
Konstantin Käfer
d6bfb4be65
fix binding to vaos
2014-08-14 18:30:45 +02:00
Konstantin Käfer
bfd1281285
only set changed glDepthRange values
2014-08-14 12:58:41 +02: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
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
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
36181b0922
update symbol placement to be more like js
2014-08-04 18:24:22 +02:00
Konstantin Käfer
9dd50a29e1
update shaders and backport some collision changes
2014-08-04 12:59:22 +02:00
Konstantin Käfer
75c079adb1
move sprite to a use future loading
2014-07-31 18:14:26 +02:00
Konstantin Käfer
fa3a41136c
merge text and icon buckets/styles
...
(we're not yet placing together!)
2014-07-29 18:27:59 +02:00
Konstantin Käfer
d47f11574e
do not explicitly render matte; we already cleared the background with glClear
2014-07-22 17:18:38 +02:00
Konstantin Käfer
4ea281c750
rename llmr => mbgl
2014-07-16 18:53:56 -07:00
