Konstantin Käfer
4e73a4d47c
Merge branch 'master' into tessellation
...
Conflicts:
include/llmr/renderer/fill_bucket.hpp
src/renderer/fill_bucket.cpp
src/renderer/painter.cpp
2014-02-28 12:25:45 +01:00
Konstantin Käfer
eadafede08
use clipper and add missing vertices to avoid missing triangles
2014-02-27 16:00:49 +01:00
Konstantin Käfer
32da0768b7
add missing include for size_t
2014-02-21 13:12:31 +01:00
Konstantin Käfer
e382cab17d
make implicit type conversions explicit
2014-02-21 13:08:13 +01:00
Konstantin Käfer
4418f2d1c8
remove remnants of emscripten
2014-02-21 12:34:39 +01:00
Konstantin Käfer
5f64ecc3cc
Merge branch 'master' into linux-wrapper
...
Conflicts:
include/llmr/style/sprite.hpp
2014-02-21 12:26:16 +01:00
Konstantin Käfer
0306e77ff0
remove void* parameter from platform::restart()
2014-02-21 12:18:11 +01:00
Konstantin Käfer
1fb4451192
Merge pull request #68 from mapbox/poi-render
...
refs #60 : first cut of POI rendering
2014-02-21 12:07:46 +01:00
Konstantin Käfer
bd2d865fc4
trigger a bogus mouse move event to interrupt glfwWaitEvents()
...
see https://github.com/glfw/glfw/issues/218
2014-02-21 12:05:27 +01:00
Konstantin Käfer
d5c611d707
add timeouts for panning,scaling,rotating
2014-02-21 11:31:24 +01:00
Justin R. Miller
66a2c994ac
clean up platform comments
2014-02-19 17:54:00 -08:00
Justin R. Miller
1f2150fcd7
add argument clarity to platform::request_http declaration
2014-02-19 17:53:45 -08:00
Konstantin Käfer
7f5a674a91
add texture settings
2014-02-19 18:14:42 +01:00
Konstantin Käfer
9710fbef99
enable texture interpolation during rotating and scaling
2014-02-19 15:39:44 +01:00
Konstantin Käfer
504b60b93e
don't used element arrays
2014-02-19 14:46:50 +01:00
Konstantin Käfer
ea80daa129
allow switching the vao if we switch the style from plain color to pattern fill
2014-02-18 15:56:23 +01:00
Konstantin Käfer
c0997961aa
don't use std::string to hold the image
2014-02-17 17:58:34 +01:00
Konstantin Käfer
3843bf1ce5
better allocator defaults
2014-02-17 16:35:12 +01:00
Konstantin Käfer
b087c35c98
add tessellation library
2014-02-17 12:45:57 +01:00
Justin R. Miller
828d8ba26f
refs #60 : first cut of POI rendering
...
* add basic marker style to stylesheet
* pass through marker style to PBF conversion
* marker/point tile parsing, bucket, buffer, shaders, etc.
* new sprite hosting for 1x/2x variants
* sprite load accepts screen scale argument
2014-02-14 18:13:12 -08:00
Konstantin Käfer
d1910f0e04
Merge branch 'master' of https://github.com/mapbox/llmr-native
2014-02-14 11:27:46 +01:00
Justin R. Miller
257ccd16bb
clean up settings mechanism ( fixes #9 & #62 )
...
* init, load, persist, sync, clear
* clean up frequent disk syncs which impacted iOS performance
* insert disk sync into various iOS/OS X lifecycle events
* implement clear
* implement save on iOS
* cleaner dictionary syntax
2014-02-13 12:21:35 -08:00
Konstantin Käfer
a868602069
use proper tile size
2014-02-13 17:37:32 +01:00
Konstantin Käfer
b0357e8ea7
move tile size to constants.hpp
2014-02-13 17:34:08 +01:00
Konstantin Käfer
51f526dd6a
remove addDegenerate()
2014-02-13 16:36:30 +01:00
Konstantin Käfer
da06a52056
cut down on redundant gl uniform changes
2014-02-13 16:21:51 +01:00
Konstantin Käfer
f5846e1ebb
change line_strip drawing for outlines to indexed lines
2014-02-13 15:32:25 +01:00
Konstantin Käfer
54454ed66a
optimizations + reorder vertex index
2014-02-13 14:10:04 +01:00
Konstantin Käfer
1a05832a93
Merge branch 'master' of https://github.com/mapbox/llmr-native
2014-02-13 12:15:27 +01:00
Konstantin Käfer
565a23785c
remove unused functions and run http_request in other operation queue
2014-02-13 12:15:01 +01:00
Justin R. Miller
0005ca4eef
fixes #57 : flesh out remainder of getters & setters plus animation
2014-02-12 11:20:21 -08:00
Konstantin Käfer
02f2dea807
get point shader to work on ios
2014-02-11 17:58:33 +01:00
Konstantin Käfer
662a61a396
split line vertices into multiple buffer groups if elements overflow
2014-02-11 17:34:46 +01:00
Konstantin Käfer
eb8e5fcf15
move group struct to shared file
2014-02-11 16:00:40 +01:00
Konstantin Käfer
bec0ad10c4
drawing lines with triangles
2014-02-11 15:51:54 +01:00
Konstantin Käfer
eb9a6b7068
add more docs
2014-02-10 15:20:46 +01:00
Konstantin Käfer
4c6dc54352
add missing buffer.hpp
2014-02-10 15:18:24 +01:00
Konstantin Käfer
f4996046a2
common buffer implementation
2014-02-10 15:14:52 +01:00
artemp
0157e4f140
c++ - change types order in boost::variant to move std::string to the end
...
("By default, a variant default-constructs its first bounded type..")
2014-02-10 12:24:48 +00:00
Justin R. Miller
f6642766c1
expose transform animations cancel through map
2014-02-07 12:26:39 -05:00
Konstantin Käfer
cbe70c7648
use a publicly accessible sprite image
2014-02-07 17:54:27 +01:00
Konstantin Käfer
9cef72fadb
Merge branch 'master' of https://github.com/mapbox/llmr-native
...
Conflicts:
src/map/transform.cpp
2014-02-07 16:10:00 +01:00
Konstantin Käfer
28ee5968f8
add cancelAnimations() function
...
refs #34
2014-02-07 16:08:17 +01:00
Justin R. Miller
e48207a4ef
allow for animated moves
2014-02-06 16:08:44 -05:00
Konstantin Käfer
828240565b
add cstring header
2014-02-06 15:46:12 +01:00
Konstantin Käfer
dd6d040cda
render updates if tiles changed after movements
2014-02-06 15:44:50 +01:00
Konstantin Käfer
f756768c18
Merge remote-tracking branch 'origin/animated-scale'
2014-02-06 15:18:17 +01:00
artemp
7d271cca02
c++
...
* store commands in uint8_t
2014-02-06 12:23:07 +00:00
artemp
8703b69151
c++
...
* use c++ style casts
* remove unused includes
2014-02-06 12:09:13 +00:00
artemp
2d3abf36b1
c++
...
* prefer prefix increment operator unless logically necessary
(it doesn't make any diff foro built-in type but good practice)
2014-02-06 10:50:31 +00:00
