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
|
ae3bd04171
|
fix include
|
2014-02-27 16:07:17 +01:00 |
|
Konstantin Käfer
|
eadafede08
|
use clipper and add missing vertices to avoid missing triangles
|
2014-02-27 16:00:49 +01:00 |
|
Justin R. Miller
|
675b8eb1fe
|
refs #60: size POIs properly based on pixel ratio
|
2014-02-21 16:25:42 -08:00 |
|
Justin R. Miller
|
7a48e8ddce
|
move to linear properties for POI opacity
|
2014-02-21 16:22:45 -08:00 |
|
Justin R. Miller
|
b6d7169b83
|
refs #60: add support for point colorization & opacity
|
2014-02-21 16:00:55 -08:00 |
|
Justin R. Miller
|
495d47ab42
|
refs #60: add some more point styles
|
2014-02-21 16:00:01 -08:00 |
|
Konstantin Käfer
|
32da0768b7
|
add missing include for size_t
|
2014-02-21 13:12:31 +01:00 |
|
Konstantin Käfer
|
54735ddd9e
|
rename -osx project to -x86
|
2014-02-21 13:08:25 +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 |
|
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
|
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 |
|
Justin R. Miller
|
9fbe5b2ece
|
properly deregister render observers
|
2014-02-19 17:51:30 -08:00 |
|
Justin R. Miller
|
0f2beb6992
|
refs #72: clarity around bg/fg functions
|
2014-02-19 12:45:05 -08:00 |
|
Justin R. Miller
|
cfbb8e9f7d
|
minor objc style stuff
|
2014-02-19 12:44:47 -08:00 |
|
Justin R. Miller
|
2989b456a4
|
properly make use of platform::restart on iOS
|
2014-02-19 12:41:57 -08:00 |
|
Justin R. Miller
|
3a5dbdb5cc
|
iOS stylistic changes
|
2014-02-19 12:41:35 -08:00 |
|
Justin R. Miller
|
73f06b39bc
|
fixes #72: clean up & make callbacks clearer
|
2014-02-19 12:41:15 -08:00 |
|
Justin R. Miller
|
cbf96ba1c6
|
minor formatting
|
2014-02-19 12:27:23 -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
|
dcb6c2b787
|
calculate the proper pixelRatio
|
2014-02-19 14:47:26 +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 |
|
Ansis Brammanis
|
baa4981c3b
|
persist settings to /tmp/llmr-native.json
|
2014-02-18 08:40:14 -05:00 |
|
Konstantin Käfer
|
004ff9ea10
|
do not encode bogus indices
|
2014-02-18 13:27:31 +01:00 |
|
Ansis Brammanis
|
c4313c25ae
|
async http requests for linux wrapper
|
2014-02-18 06:40:05 -05: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
|
f7485577e8
|
try to properly pass the c++ flags only for c++ files
|
2014-02-17 18:21:58 +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
|
f83837d48a
|
switch to cppflags, because c files can't take -std=c++11
|
2014-02-17 12:51:57 +01:00 |
|
Konstantin Käfer
|
b087c35c98
|
add tessellation library
|
2014-02-17 12:45:57 +01:00 |
|