Commit Graph

82 Commits

Author SHA1 Message Date
artemp
95213cd382 c++ style memory allocations/deallocations 2014-10-27 14:18:11 -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
4c0b4a7901 Match js attribute layout 2014-09-05 13:40:45 -07:00
John Firebaugh
9d5f02ccaa Match js shaders
The only non-incidental change is to revert portions
of d5b4c116 and 3a9a9043.

See d5b4c1162d (commitcomment-7668050)
2014-09-05 13:23:14 -07: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
b9c7e1bdd9 Consolidate duplicate interpolation definitions
While here, do not interpolate style properties that
are not transitionable. The previous behavior was to
switch from old to new value halfway through the transition;
now the new value is used immediately, as in JS.
2014-08-20 13:58:37 -07:00
John Firebaugh
2660b7bd1b Rename existing interpolate -> resample 2014-08-20 13:52:39 -07:00
Konstantin Käfer
598c755cbd use texsubimage2d to avoid texture memory reallocation 2014-08-18 15:19:52 +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
John Firebaugh
70a31baf5c Eliminate warnings 2014-08-07 13:02:40 -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
4ea281c750 rename llmr => mbgl 2014-07-16 18:53:56 -07:00
Konstantin Käfer
7810548409 correctly cast buffer 2014-07-15 17:18:05 -07:00
Konstantin Käfer
066fa64dad make icons work again 2014-07-15 17:17:37 -07:00
Konstantin Käfer
c2efeaf876 do not reallocate the texture data on every update; use glTexSubImage2D instead 2014-07-15 17:01:00 -07:00
Konstantin Käfer
8b775573c1 move std::erase_if => util::erase_if 2014-07-14 15:01:45 -07:00
Mike Morris
356c9ce7e4 move sprite class to map directory 2014-07-10 16:30:48 -07:00
Konstantin Käfer
3e7f801de1 mark all sprites as uninitialized on pixelRatio changes
fixes #226
2014-05-30 14:28:42 +02:00
Konstantin Käfer
3a8b88dbbd fix nearest neighbor image scaling
refs #226
2014-05-30 14:26:26 +02:00
Konstantin Käfer
ca41046dff Merge pull request #275 from mapbox/correct-calloc
Correct calloc
2014-05-30 11:26:19 +02:00
Dane Springmeyer
f5394a7638 release mode: silent debug output + ifdef any potentially expensive calls 2014-05-29 18:07:19 -07:00
Dane Springmeyer
30a34d73f8 fix static analyzer warning: Result of 'calloc' is converted to a pointer of type 'char', which is incompatible with sizeof operand type 'uint32_t' 2014-05-29 13:23:00 -07:00
Young Hahn
d82acee8c7 Stash. 2014-05-29 05:05:48 -04:00
Konstantin Käfer
084e7af377 better sprite warnings 2014-05-22 15:19:51 +02:00
Konstantin Käfer
53a6992728 fix alpha blending + add depth/stencil buffers 2014-05-21 18:34:41 +02:00
Konstantin Käfer
a33d334169 incorporate the color and draw circle dots if we don't have an icon
Conflicts:
	bin/style.js
2014-05-19 16:20:51 +02:00
Konstantin Käfer
ee82986717 disable debug image 2014-05-19 14:21:57 +02:00
Konstantin Käfer
92706445d9 init glfw for debug images + actually copy images over 2014-05-19 14:21:15 +02:00
Konstantin Käfer
f848868c16 fix texture binding 2014-05-19 14:18:29 +02:00
Konstantin Käfer
898c6d6714 fix for retina screens 2014-05-19 11:13:22 +02:00
Konstantin Käfer
13575330f7 use sprite atlas 2014-05-19 10:48:36 +02:00
Konstantin Käfer
27f8ed29e4 encode icon texture coordinate in buffer so we can render all pois with 1 draw call 2014-05-19 10:48:36 +02:00
Konstantin Käfer
fda64b67af rename point => icon 2014-05-15 14:51:02 +02:00
Konstantin Käfer
b167a79c22 always use std:: namespace for math functions
fixes #201
2014-05-14 16:40:24 +02:00
Konstantin Käfer
25e2d8504b debug changes 2014-03-25 12:24:56 +01:00
Konstantin Käfer
3a9a904378 reorder vertices 2014-03-25 12:14:33 +01:00
Konstantin Käfer
d5b4c1162d add shader optimizer and reorder components 2014-03-25 12:10:19 +01:00
Konstantin Käfer
8b573f9fa2 fix glyphs that have no pixels but an advance (e.g. spaces) 2014-03-24 15:19:39 +01:00
Konstantin Käfer
4ee0cf1791 port remainder of the the placement algorithm 2014-03-19 18:58:50 +01:00
Konstantin Käfer
3c5bac0f6b add debug window showing the glyph atlas 2014-03-14 12:43:42 +01:00
Konstantin Käfer
be44b6b31f add glyph atlas to map 2014-03-14 11:36:10 +01:00
Konstantin Käfer
117078270d add text buffer code 2014-03-14 11:36:10 +01:00
Konstantin Käfer
f0b821dff9 add glyph atlas class 2014-03-14 11:36:09 +01:00