Commit Graph

247 Commits

Author SHA1 Message Date
Konstantin Käfer
3ec48b1030 allow passing --debug to view tile boundaries in mbgl-render 2015-05-13 10:39:22 +02:00
Konstantin Käfer
bb33493710 use boost_program_options from mason 2015-05-12 15:10:03 +02:00
Thiago Marcos P. Santos
77795d4ee9 Update the 'render' to reflect recent API changes
We don't call start/stop anymore and the resize is done via the
map object.
2015-05-08 15:40:30 +03:00
Konstantin Käfer
0d5568f724 merge build targets so we only have one build file per platform
previously, we used multiple different projects for various targets (app, test, render) that overwrote each other, so it was impossible to have one project to build them all, one project to compile them, one project to run them all and in the darkness bind them
2015-04-24 11:50:50 +02:00
Konstantin Käfer
71d127220b rename Mode::Static => Mode::Still 2015-04-17 17:55:24 +02:00
Konstantin Käfer
46bf226910 align static render mode and still image render mode
- static rendering now also runs in a separate thread; you have to start it with map.start(Map::Mode::Static) and join the thread with map.stop() before destructing the Map object
- map.renderStill() takes a callback with will be invoked on the *map* thread, so you'll have to figure out your own method of dispatching back to the main thread.
2015-04-17 13:40:42 +02:00
Konstantin Käfer
452d12e6e6 make implementation files private headers 2015-04-13 18:28:18 +02:00
Konstantin Käfer
16849a341b hide Thread<> and separate the Implementation object 2015-04-13 17:57:45 +02:00
Konstantin Käfer
bba3d9838a add Thread<T> and RunLoop
Thread<T> is a generic thread management object that starts a thread, creates an object T in that thread and calls its .start() function. When the Thread<T> object is destructed (which must happen in the thread that created it), it'll call the object's .stop() function, and wait for thread termination. The .stop() function must somehow get the thread to terminate. Note that object T's constructor/destructor/start()/stop() must be protected/private, and Thread<T> must be declared as a friend class. All public functions may be called from any thread and are exposed through operator->().

RunLoop encapsulates a libuv runloop and has a facility of dispatching function objects to the thread. It can be used either as a worker thread class by itself, or it can be derived from. This commit converts SQLiteCache to derive from RunLoop and removes the custom code used previously for managing the cache thread.
2015-04-10 15:36:32 +02:00
Thiago Marcos P. Santos
51bc265db3 Make the logging system static
No initialization is needed anymore and we can use the logging functions
safely at any point of the code (threading is not handled though, so you
might get multiplexed messages if you log from two threads
simultaneously).
2015-03-12 13:28:41 +02:00
Thiago Marcos P. Santos
71ccb7b013 Trivial build fix, do not call private method
Resize is internally called by the view now.
2015-03-11 14:40:05 +02:00
Thiago Marcos P. Santos
f3f8e348a1 Fix build warnings on GCC
Apperently boost has a few quirks on its headers.
2015-03-11 14:37:28 +02:00
Konstantin Käfer
8e42582c52 update static image rendering executable 2015-03-06 12:41:00 +01:00
Justin R. Miller
6e41664cb0 fixes #476 & #853: pixel/meter/latlng conversion routines in core & iOS 2015-02-16 09:52:36 -08:00
Konstantin Käfer
73f7db9af2 cleanup makefiles 2015-02-04 11:54:01 +01:00
Konstantin Käfer
29baacf3a5 refactor makefile 2015-02-04 10:49:09 +01:00
Konstantin Käfer
272fa8935e make storage lib separate so we can build without storage libs 2015-02-04 10:49:07 +01:00
Mike Morris
9b2c8d0391 update bin/render for recent changes 2015-01-16 11:42:42 -05:00
Konstantin Käfer
e57c57516f automatically copy the certificate bundle 2014-12-16 12:17:40 +01:00
Konstantin Käfer
9082a83d6a don't assing nullptr to std::string 2014-12-16 11:42:58 +01:00
Konstantin Käfer
a4ce5152e8 don't provide a default value for the stylesheet file 2014-12-11 18:32:09 +01:00
Konstantin Käfer
343fd4bcac allow setting the cache database 2014-12-11 18:31:56 +01:00
Konstantin Käfer
41d9e7730f add xcode project for render cli util 2014-12-11 18:31:32 +01:00
Konstantin Käfer
8b5bba08b3 show default values and allow setting the output filename 2014-12-11 18:02:24 +01:00
Konstantin Käfer
a81e822ef0 add cli tool for rendering a map to an image 2014-12-11 17:58:36 +01:00
Konstantin Käfer
080c185ea1 remove dependency on node 2014-10-31 16:02:41 -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
4657e6e023 use a file source object to abstract loading of resources 2014-08-08 18:25:45 +02:00
Konstantin Käfer
02526f49f2 use debug style (currently not using layer compositing) 2014-08-06 15:26:37 +02:00
Konstantin Käfer
d01b996acd better warning messages 2014-07-31 18:55:48 +02:00
Konstantin Käfer
fa3a41136c merge text and icon buckets/styles
(we're not yet placing together!)
2014-07-29 18:27:59 +02:00
Mike Morris
d0f6a87c1c stray comma 2014-07-18 14:15:15 -04:00
Mike Morris
1ba3c54abe clean up package.json 2014-07-18 14:13:25 -04:00
Mike Morris
db14cdbd1a purge fuzz fixture pipeline 2014-07-18 14:12:29 -04: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
4d4fd3155c update test fixtures 2014-07-17 17:58:29 -04:00
Mike Morris
4b9e299d06 Merge branch 'master' into fuzz-pipe
Conflicts:
	src/style/style_parser.cpp
2014-07-17 17:58:13 -04:00
Konstantin Käfer
afe069df2b remove stops from demo stylesheet 2014-07-17 14:33:06 -07:00
Mike Morris
50d9e6d845 Merge branch 'master' into fuzz-pipe
Conflicts:
	bin/package.json
2014-07-17 17:12:44 -04:00
Mike Morris
e052d847f9 switch to mapbox-glsl-optimizer for node-pre-gyp 2014-07-17 17:08:52 -04:00
Mike Morris
7fab02d6bd split stylesheet fixtures into separate gyp action 2014-07-17 16:49:30 -04:00
Konstantin Käfer
d44742f115 switch to published npm version 2014-07-17 13:27:33 -07: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
4ea281c750 rename llmr => mbgl 2014-07-16 18:53:56 -07:00
Mike Morris
97ec376614 C++ exception with description "array value has unexpected number of elements" thrown in the test body. 2014-07-14 16:16:20 -04:00
Mike Morris
97486f3e0d Merge branch 'stylesource' into fuzz-pipe
Conflicts:
	src/map/source.cpp
	src/style/style_layer.cpp
2014-07-10 17:24:50 -07:00
Konstantin Käfer
c272ba7a47 convert stylesheet to use the correct stop values
[skip ci]
2014-07-10 16:05:16 -07:00
Konstantin Käfer
a8e71bcb7b change line width and add line-width test 2014-07-10 14:54:43 -07:00
Mike Morris
ee7b51c942 Merge branch 'master' into fuzz-pipe 2014-07-09 19:28:52 -07:00
Mike Morris
529277b0a2 fix invalid json 2014-07-09 19:28:35 -07:00