Commit Graph

4631 Commits

Author SHA1 Message Date
John Firebaugh
958142c512 Clean up Sprite
* Provide a callback so MapContext can re-render when it loads.
* Cancel in-progress loading rather than relying on keeping it
  alive with a shared_ptr.
* Remove / privatize as much as possible.
2015-04-28 14:32:23 -04:00
John Firebaugh
ec7588f1fd Implement Style::isLoaded 2015-04-28 14:32:22 -04:00
John Firebaugh
6c7a01a503 Following kkaefer's view changes 2015-04-28 14:32:22 -04:00
John Firebaugh
75ae956b0e WIP: Use Thread<MapContext> 2015-04-28 14:32:22 -04:00
John Firebaugh
32c818feea Provide Thread objects with access to loop 2015-04-28 14:32:22 -04:00
John Firebaugh
41a44280ca Prepare for using Thread<MapContext> 2015-04-28 14:32:22 -04:00
John Firebaugh
fc9b958bb8 updateAnnotationTiles is called within invoke* 2015-04-28 14:32:22 -04:00
John Firebaugh
025eb013d7 Privatize remaining MapContext members 2015-04-28 14:32:21 -04:00
John Firebaugh
424dae0a2c Move run() to MapContext 2015-04-28 14:32:21 -04:00
John Firebaugh
7bd735220d Fix build 2015-04-28 14:32:21 -04:00
John Firebaugh
d67f862400 #include <atomic> 2015-04-28 14:32:21 -04:00
Konstantin Käfer
dae18cc7bc remove some unused includes 2015-04-28 14:32:21 -04:00
Konstantin Käfer
6081941662 move uv version check to uv.cpp 2015-04-28 14:32:21 -04:00
Konstantin Käfer
b0a30943b4 move most private Map code to MapContext 2015-04-28 14:32:20 -04:00
Konstantin Käfer
9dc51e7f80 move rendering mode enum to MapData object 2015-04-28 14:32:20 -04:00
Konstantin Käfer
fa272b3aaa move asyncRender to MapContext 2015-04-28 14:32:20 -04:00
Konstantin Käfer
f8600d8d97 move getSprite to MapContext 2015-04-28 14:32:20 -04:00
Konstantin Käfer
9580ec7b08 move Style to MapContext 2015-04-28 14:32:20 -04:00
Konstantin Käfer
f272d13dea move worker to MapContext 2015-04-28 14:32:19 -04:00
Konstantin Käfer
67fa80f5e9 move MapContext to its own file 2015-04-28 14:32:19 -04:00
Konstantin Käfer
849febbfc4 remove unneeded headers 2015-04-28 14:32:19 -04:00
Konstantin Käfer
07525d5d50 move Sprite to MapContext 2015-04-28 14:32:19 -04:00
Konstantin Käfer
9af7af3109 move GlyphStore to MapContext 2015-04-28 14:32:19 -04:00
Konstantin Käfer
63acd5b0a1 move texturepool to context 2015-04-28 14:32:19 -04:00
Konstantin Käfer
9b64edd712 remove unused reference 2015-04-28 14:32:18 -04:00
Konstantin Käfer
ad0178fd45 move atlas/painter to map context 2015-04-28 14:32:18 -04:00
Konstantin Käfer
c88a60b1e5 remove unused includes 2015-04-28 14:32:18 -04:00
Konstantin Käfer
7c8c45edab move activeSources to internal Map context 2015-04-28 14:32:18 -04:00
Konstantin Käfer
89167cbf8c move Transform into MapData and make source unaware of the Map object 2015-04-28 14:32:18 -04:00
Konstantin Käfer
cc8f440c84 move TransformState to MapData object 2015-04-28 14:32:17 -04:00
Konstantin Käfer
c58c734ea0 Merge pull request #1359 from mapbox/1359-ios-meta-target
Make iOS meta-target
2015-04-28 18:22:07 +02:00
Konstantin Käfer
473aa281c7 make meta-target for all iOS targets too and split up project.gyp
this will make it easier to add more targets to iOS builds in the future. It'll also help by having Xcode files named after the platform they're for, so it's easier to distinguish windows
2015-04-28 16:16:09 +02:00
John Firebaugh
e4fd967d18 Merge remote-tracking branch 'origin/file-source' 2015-04-28 09:39:47 -04:00
John Firebaugh
c0b75f1af7 Remove Environment::terminate and associated code
Fixes #1336
2015-04-28 09:16:26 -04:00
John Firebaugh
8e5fa341eb Remove RequestBase::start
Requests are always started immediately upon construction.

While here, use typed pointers, not void*.
2015-04-28 09:16:26 -04:00
John Firebaugh
cdd8f3ac32 Separate RequestBase from DefaultFileSource internals
SharedRequestBase was trying to do two different jobs: be a base class
for Asset/HttpRequest and track internal state for DefaultFileSource.

Now we have RequestBase for the former, and DefaultFileRequest for the
latter.
2015-04-28 09:16:26 -04:00
John Firebaugh
359aca6624 Privatize SharedRequestBase::source 2015-04-28 09:16:26 -04:00
John Firebaugh
b61cc6433b Make subscribe and unsubscribe parallel 2015-04-28 09:16:25 -04:00
John Firebaugh
ea73c99faa Assert that notify gets a response 2015-04-28 09:16:25 -04:00
John Firebaugh
2a8ddc9f27 Keep observers encapsulated 2015-04-28 09:16:25 -04:00
John Firebaugh
f4adef1889 pointer ⇢ reference 2015-04-28 09:16:25 -04:00
John Firebaugh
9a0005fdea Remove unnecessary moves / casts 2015-04-28 09:16:25 -04:00
Konstantin Käfer
9dbd09da15 Merge pull request #1339 from mapbox/1339-travis-ci-docker
Move Travis CI to Docker machines
2015-04-28 11:53:13 +02:00
Konstantin Käfer
844b9b9149 move ios_test.sh to ios folder 2015-04-28 11:19:38 +02:00
Konstantin Käfer
fe85bcd737 bump up the number of concurrent jobs on iOS builds 2015-04-28 11:11:33 +02:00
Konstantin Käfer
b0bf80e79c correctly execute after_failure script 2015-04-28 10:43:13 +02:00
Konstantin Käfer
8758500ff6 only install required deps 2015-04-28 10:43:13 +02:00
Konstantin Käfer
8482df62e8 use custom boost 2015-04-28 10:43:13 +02:00
Konstantin Käfer
2b633cc51c build on Travis' sudo: false infrastructure 2015-04-28 10:43:13 +02:00
Minh Nguyễn
67fdfbadb3 Merge pull request #1357 from mapbox/1ec5-view-controller
Automatically find view controller for layout guides
2015-04-27 22:28:06 -07:00