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
Konstantin Käfer
a9198570ea
revert shader
2014-02-21 10:41:22 +01:00
Justin R. Miller
49f9439b07
add image debugging
2014-02-20 15:53:46 -08:00
Justin R. Miller
9e762f91eb
gl_pointCoord requires GL_POINT_SPRITE on OS X
2014-02-20 15:53:17 -08:00
Justin R. Miller
d94b8bbcec
make use of new tile-specific fetches to allow cancellation
2014-02-19 23:09:48 -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
2602774a9c
bind texture 0
2014-02-19 14:48:54 +01:00
Konstantin Käfer
06e23543cb
don't use degenerate vertices
2014-02-19 14:48:34 +01:00
Konstantin Käfer
8880379b31
set the point size
2014-02-19 14:47:58 +01:00
Konstantin Käfer
504b60b93e
don't used element arrays
2014-02-19 14:46:50 +01:00
Konstantin Käfer
420e534306
fix stride to avoid bogus points at 0/0
2014-02-19 14:43:57 +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
004ff9ea10
do not encode bogus indices
2014-02-18 13:27:31 +01:00
Konstantin Käfer
6a982b3934
render lines with the tessellated triangles
2014-02-18 11:59:19 +01:00
Konstantin Käfer
5e129c5f5a
add lines
2014-02-18 11:11:46 +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
9fb05741d6
make sure that mapView is initialized before referencing into it
2014-02-17 17:55:47 +01:00
Konstantin Käfer
fc29d2116b
render the actual polygons instead of the stencil buffer
2014-02-17 17:49:50 +01:00
Konstantin Käfer
3843bf1ce5
better allocator defaults
2014-02-17 16:35:12 +01:00
Ansis Brammanis
9d89bc0909
first attempt at linux wrapper
2014-02-17 10:27:31 -05: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
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
b0357e8ea7
move tile size to constants.hpp
2014-02-13 17:34:08 +01:00
Konstantin Käfer
2f32d1585d
make sure we don't encode the first vertex twice
2014-02-13 17:19:49 +01:00
Konstantin Käfer
1cab7f07bd
remove all mentions of degenerate things
2014-02-13 16:37:16 +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
artemp
db0e83fbbd
Merge branch 'master' into variant
2014-02-12 20:59:33 +00:00
Justin R. Miller
0005ca4eef
fixes #57 : flesh out remainder of getters & setters plus animation
2014-02-12 11:20:21 -08:00
artemp
0939acca30
custom variant type (replaces boost::variant and removes boost dependency altogether)
2014-02-12 14:32:54 +00: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
f4996046a2
common buffer implementation
2014-02-10 15:14:52 +01:00
artemp
5e87cfed5a
c++ - prefer switch over long-ish if/else (be nice to compiler)
2014-02-10 12:18:52 +00:00
Justin R. Miller
0bccb08028
clean up duplicate calculations on animation branching
2014-02-07 21:45:45 -05:00
Justin R. Miller
f6642766c1
expose transform animations cancel through map
2014-02-07 12:26:39 -05: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