John Firebaugh
551ff954a5
Remove unused
2014-11-01 11:53:04 -04:00
Konstantin Käfer
930d063259
Merge branch 'master' into platform-image
...
Conflicts:
gyp/install.gypi
2014-10-30 15:44:09 -04:00
Konstantin Käfer
592ed57d09
use more modern libpng version instead of the system-provided one and fix compile errors
2014-10-30 12:40:16 -07:00
Dane Springmeyer
c40a85587b
attemp to fix #525
2014-10-30 13:37:10 -04:00
Konstantin Käfer
8f1c2b3bce
remove regex/boost regex usage
2014-10-30 11:34:14 -04:00
Dane Springmeyer
152545d33a
fix xtest target - closes #520 - longer term fix at #519
2014-10-30 11:24:28 -04:00
Dane Springmeyer
d8a93dbb95
use stable cross-generator direction for referencing standalone lib + other minor fixups
2014-10-29 18:13:25 -04:00
Dane Springmeyer
cefa3462f8
linux test build fixes
2014-10-29 16:34:53 -04:00
Dane Springmeyer
1069e3b4e9
fix tests
2014-10-29 16:29:48 -04:00
Konstantin Käfer
293b291b80
rename mbgl to mbgl-core
2014-10-29 11:59:24 -04:00
Konstantin Käfer
dbddd3c904
gyp fixes
2014-10-28 12:47:58 -04:00
Konstantin Käfer
84700fce90
allow installing the library
2014-10-27 10:12:30 -04:00
Konstantin Käfer
0e928b5204
make tests work
2014-10-24 17:44:51 +02:00
Konstantin Käfer
d299e58088
Merge remote-tracking branch 'origin/headless-display' into gyp-restructuring
...
Conflicts:
Makefile
ios/mapbox-gl-cocoa
2014-10-24 16:41:04 +02:00
Konstantin Käfer
cd9a89257a
restructure gyp files
2014-10-24 16:40:08 +02:00
Konstantin Käfer
905c4294be
Merge branch 'libuv-0.10-headless-display' into mason
...
Conflicts:
common/http_request_baton_curl.cpp
include/mbgl/map/map.hpp
include/mbgl/util/uv_detail.hpp
scripts/travis_before_install.sh
setup-libraries.sh
src/map/map.cpp
src/storage/file_request_baton.cpp
src/storage/http_request.cpp
src/util/uv-messenger.c
2014-10-22 15:14:21 +02:00
Konstantin Käfer
2f3952b305
fix compile warnings
2014-10-22 11:00:34 +02:00
Konstantin Käfer
b9d422ebc3
use glfw3 libs instead of manually linking OpenGL frameworks on OS X
...
[skip ci]
2014-10-22 10:45:50 +02:00
Mike Morris
0f1d33f5ee
break out HeadlessDisplay from HeadlessView, ref #478
2014-10-03 18:31:38 -04:00
Konstantin Käfer
b68a2a4f76
add uppercase/lowercase symbols to headless test
2014-08-22 14:54:09 +02:00
Konstantin Käfer
9b9ad20a90
Merge branch 'master' into style-parser-test
...
Conflicts:
mapboxgl.gyp
2014-08-12 13:16:20 +02:00
Konstantin Käfer
367b35998d
fix gyp builds
2014-08-12 12:26:00 +02:00
Mike Morris
fae1c157f6
build fixes
2014-08-11 13:24:25 -04:00
Mike Morris
a79afb78d8
Merge branch 'master' into style-parser-test
...
Conflicts:
bin/build-style.js
bin/default.style.json
mapboxgl.gyp
src/style/style_parser.cpp
test/test.gyp
2014-08-11 12:42:49 -04:00
Konstantin Käfer
eef51a8679
fix test gyp file
2014-08-11 13:00:15 +02:00
Mike Morris
54a81d0f9b
migrate style_parser tests to use info and style json fixtures
2014-07-18 14:09:33 -04:00
Mike Morris
7fab02d6bd
split stylesheet fixtures into separate gyp action
2014-07-17 16:49:30 -04:00
Mike Morris
4cb9972278
Merge branch 'master' into fuzz-pipe
...
Conflicts:
bin/package.json
src/style/style_parser.cpp
test/fixtures/fixture_log.cpp
test/test.gyp
2014-07-17 12:44:45 -04:00
Konstantin Käfer
55dce57896
rename a few things from mbgl => mapboxgl
2014-07-16 19:00:49 -07:00
Konstantin Käfer
4ea281c750
rename llmr => mbgl
2014-07-16 18:53:56 -07:00
Konstantin Käfer
4d1d2c5d5d
separate comparisons and expressions
2014-07-16 18:26:35 -07:00
Konstantin Käfer
17b1c6fd41
update value semanatics to be closer to js and add filter expression tests
2014-07-16 14:39:19 -07:00
Mike Morris
d1977dc53f
Merge branch 'master' into fuzz-pipe
...
Conflicts:
test/test.gyp
2014-07-15 11:16:54 -04:00
Konstantin Käfer
bdc97d55d2
add enum class to unify parsing/stringification
2014-07-14 16:33:02 -07:00
Mike Morris
b327a2cb34
hook up style_parser to new log backend
2014-07-14 18:46:34 -04:00
Mike Morris
43726dbf22
Merge branch 'stylesource' into fuzz-pipe
2014-07-11 16:50:04 -07:00
Konstantin Käfer
f3c55eba9d
add logging facility and check logs in tests
2014-07-11 13:55:18 -07:00
Mike Morris
d230b9a587
remove link_gl from test/style gyp
2014-07-10 17:29:07 -07:00
Mike Morris
5e85324c38
link_gl
2014-07-10 10:50:41 -07:00
Mike Morris
28f4635959
Merge branch 'master' into malformed
2014-07-09 12:57:54 -07:00
Konstantin Käfer
49b0f098c2
add test fixture and image comparison
2014-07-07 20:31:42 -07:00
Mike Morris
bc30a9b8cd
test Style.loadJSON directly, drop headless view
2014-07-07 19:13:32 -07:00
Mike Morris
5ae5d7cbc0
run fuzzed stylesheet test with malformed color strings
2014-07-07 18:12:33 -07:00
Mike Morris
dc3c26294a
Merge branch 'master' into malformed
...
Conflicts:
llmr.gyp
2014-07-07 17:26:37 -07:00
Mike Morris
6f112849be
first attempt at testing malformed style parsing
2014-07-07 17:25:15 -07:00
Konstantin Käfer
501af4a380
fix headless rendering on travis and actually execute the headless test
...
fixes #357
2014-07-07 16:52:23 -07:00
Konstantin Käfer
9b61e39ef3
move headless to their own files
...
[skip ci]
2014-07-07 13:51:06 -07:00
Konstantin Käfer
f86fd2f610
add function tests
2014-05-20 12:05:25 +02:00
Konstantin Käfer
0bfd7b0f43
Calculate clip IDs with a huffman prefix tree
...
This changes the clip IDs from sequential to a huffman prefix tree, meaning that
parent tiles share the same prefix with child tiles (but are shorter). This allows
us to use the same checkerboard pattern to draw all tiles.
TODO:
- make sure we're not overflowing the 8 bit limit of the stencil buffer
- draw all checkerboard fields at the same time, with one draw call
- fix raster drawing (fading, clipping)
refs #132
2014-05-09 18:10:28 +02:00
Konstantin Käfer
93e0c49faa
add variant test
2014-05-02 13:41:45 +02:00
