Commit Graph

43 Commits

Author SHA1 Message Date
Konstantin Käfer
51f523ec14 Merge branch 'master' into outdoors-style
Conflicts:
	bin/style.js
	include/llmr/map/transform.hpp
	src/renderer/painter.cpp
	src/text/placement.cpp
2014-05-14 17:42:10 +02:00
Konstantin Käfer
b167a79c22 always use std:: namespace for math functions
fixes #201
2014-05-14 16:40:24 +02:00
Eden Halperin
db013095e9 update style with labels 2014-05-09 16:51:09 -07:00
Konstantin Käfer
449f403e87 rename animation => transition 2014-04-30 14:46:28 +02:00
Konstantin Käfer
4afe20776d move animation time api to use nanoseconds 2014-04-30 14:20:15 +02:00
Konstantin Käfer
1216a061d3 move to libuv for the rendering loop 2014-04-30 12:01:26 +02:00
Konstantin Käfer
1b922e3a34 remove start_x/y variables, they're unused 2014-04-16 10:46:52 -04:00
Konstantin Käfer
78c10c0701 Merge remote-tracking branch 'remotes/origin/pr/127'
Conflicts:
	include/llmr/map/map.hpp
	src/map/map.cpp
	src/platform/platform.cpp
2014-04-15 12:46:19 -04:00
Konstantin Käfer
9bb88711b8 always start animations with a common start time
fixes #134
2014-04-14 19:30:09 -04:00
Konstantin Käfer
f18aa61e33 derive from GLKViewController
this handles resizing the view/framebuffer much better

fixes #130, #131, #133, #118
2014-04-14 18:50:17 -04:00
Konstantin Käfer
eb499e77c1 fix linejoin drawing on retina 2014-04-10 11:49:43 -04:00
Justin R. Miller
f60a46229d refs #101: first cut of basic hacky data sources 2014-04-02 11:07:22 -07:00
Konstantin Käfer
5c613b5455 normalizedZoom() == zoom level of the visual appearance 2014-03-24 14:44:44 +01:00
Konstantin Käfer
86e6e6bed8 use a custom struct for Tile IDs 2014-03-12 16:42:37 +01:00
Konstantin Käfer
ba5070bf52 Port scanline algorithm from _getCoveringTiles()
fixes #22
2014-03-04 14:50:17 +01:00
Konstantin Käfer
d5c611d707 add timeouts for panning,scaling,rotating 2014-02-21 11:31:24 +01:00
Konstantin Käfer
9710fbef99 enable texture interpolation during rotating and scaling 2014-02-19 15:39:44 +01:00
Konstantin Käfer
b0357e8ea7 move tile size to constants.hpp 2014-02-13 17:34:08 +01:00
Konstantin Käfer
da06a52056 cut down on redundant gl uniform changes 2014-02-13 16:21:51 +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
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
f756768c18 Merge remote-tracking branch 'origin/animated-scale' 2014-02-06 15:18:17 +01:00
artemp
d6654ccaed c++
* fix typedef's
* fix virtual dtor's
* make ctor's with one argument explicit
* util::noncopyable utility class  ( class my_object : private noncopyable {} )
* update kTileURL
2014-02-06 10:33:46 +00:00
Justin R. Miller
3ae58c53a2 refs #30: animated scaleBy
* add duration argument to scaleBy & setScale
 * add scale center arguments to setScale
 * add animation to Transform::setScale
2014-02-05 15:16:05 -05:00
Konstantin Käfer
2df45d0c4a refactor header includes 2014-02-04 14:07:56 +01:00
Konstantin Käfer
1233537713 float[16] => std::array<float, 16> 2014-01-29 15:09:00 +01:00
Konstantin Käfer
e359d697fb buggy line support 2014-01-28 18:40:17 +01:00
Konstantin Käfer
1538ebaf22 cascade styles 2014-01-27 17:21:48 +01:00
Konstantin Käfer
474fb42807 make it work on retina screens 2014-01-21 16:16:21 +01:00
Konstantin Käfer
0922e71f98 transform => Transform 2014-01-20 11:57:24 +01:00
Konstantin Käfer
ef15a1d1dc make objects noncopyable 2014-01-20 11:43:03 +01:00
Konstantin Käfer
15d4327229 rename + move to c++ 2014-01-20 11:35:29 +01:00
Konstantin Käfer
509b223fbf animate northing 2014-01-17 13:33:39 +01:00
Konstantin Käfer
c01719bc04 make bundle on mac os x and persist settings 2014-01-16 13:53:10 +01:00
Konstantin Käfer
44a0f98fe5 retain child tiles 2014-01-15 11:34:41 +01:00
Konstantin Käfer
654972bb3f cmake + tile loading 2014-01-13 18:07:13 +01:00
Konstantin Käfer
16d0c83df2 copy rotation behavior from js version 2014-01-09 11:04:56 +01:00
Konstantin Käfer
a7205b339e double click to zoom 2014-01-08 18:45:35 +01:00
Konstantin Käfer
04d9d6b9f9 rotation support 2014-01-08 17:31:35 +01:00
Konstantin Käfer
7526d681e2 calculate proper tile position 2014-01-08 14:32:58 +01:00
Konstantin Käfer
44b43fe5a6 glfw version of sample app 2014-01-07 12:10:14 +01:00