Commit Graph

24 Commits

Author SHA1 Message Date
Dane Springmeyer
d7b0a34bdd mason-based android port 2014-11-01 22:41:40 -04:00
John Firebaugh
4f7bc80664 Hold internal reference to Sprite in SpriteAtlas 2014-10-29 09:58:03 -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
10cb83579f gcc fixes 2014-10-23 02:46:15 -07:00
Konstantin Käfer
214f99673f fix variable shadowing 2014-10-22 18:19:01 +02:00
John Firebaugh
4694aa40ad Add SpriteAtlas::getPosition() 2014-09-03 18:12:40 -07:00
John Firebaugh
c1280f0b38 Revert "coalesce texture uploads at the beginning of a frame"
This reverts commit 8c2c7f769f.

See #454

Conflicts:
	src/geometry/glyph_atlas.cpp
	src/geometry/sprite_atlas.cpp
2014-09-03 18:12:39 -07:00
John Firebaugh
fd40bde612 Make Glyph and Sprite Atlases noncopyable 2014-08-28 13:40:17 -07: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
42d0740ef0 VertexArrayObject and ElementGroup should be noncopyable 2014-08-26 14:43:56 -07:00
John Firebaugh
2660b7bd1b Rename existing interpolate -> resample 2014-08-20 13:52:39 -07: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
22e179aa37 remove trailing whitespace
[skip ci]
2014-08-12 16:30:27 +02:00
Konstantin Käfer
a790e080a5 include <array> 2014-08-05 15:03:01 +02: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
4ea281c750 rename llmr => mbgl 2014-07-16 18:53:56 -07:00