tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,070 Commits 3 Branches 22 Tags
01f70f5db043cccdc4efdfd40ded68d7fea90853
Commit Graph

144 Commits

Author SHA1 Message Date
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
10cb83579f gcc fixes 2014-10-23 02:46:15 -07:00
Konstantin Käfer
214f99673f fix variable shadowing 2014-10-22 18:19:01 +02:00
Konstantin Käfer
02e88e445d fixes for libuv 0.11 2014-10-22 15:29:28 +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
1da471abba curl fixes 
[skip ci]
 2014-10-20 18:21:21 +02:00
Konstantin Käfer
97986f603f we don't need a root_fbo function anymore 
[skip ci]
 2014-10-16 04:27:30 -07:00
Konstantin Käfer
4bc56eac24 we now always use the fbo 
[skip ci]
 2014-10-16 04:26:50 -07:00
Konstantin Käfer
8b08772d33 first attempt to create an opengl core profile version before falling back to legacy opengl contexts 2014-10-16 03:49:29 -07:00
Konstantin Käfer
ee54220c7d lower our expectations towards the pbuffer and use framebuffers instead 2014-10-15 09:56:57 -07:00
Konstantin Käfer
5f40d27256 cast to correct int type 2014-10-15 14:31:19 +00:00
Konstantin Käfer
8eda68dd8a fix errors that prevented compilation/running 2014-10-15 14:20:28 +00:00
Konstantin Käfer
9ff1d9e3bd experimental pbuffer support 
[skip ci]
 2014-10-15 16:08:36 +02:00
Mike Morris
6e8e50e371 call on_timeout with status 0 (success) 2014-10-10 14:47:33 -04:00
Mike Morris
35f2c7fe23 switch http_request_baton_curl to libuv 0.10 api 2014-10-10 14:37:10 -04:00
Mike Morris
2d1219fa51 Merge branch 'master' into libuv-0.10-headless-display 
Conflicts:
	common/curl_request.cpp
	common/glfw_view.cpp
	common/glfw_view.hpp
	include/mbgl/platform/request.hpp
	ios/mapbox-gl-cocoa
	setup-libraries.sh
	src/map/map.cpp
	src/platform/request.cpp
	test/fixtures/fixture_request.cpp
 2014-10-10 12:24:45 -04:00
Mike Morris
356cf956f4 XInitThreads 2014-10-09 15:16:01 -04:00
Mike Morris
dfb81fe9ce fix HeadlessView::readPixels return value, ref #480 2014-10-08 16:04:19 -04:00
Mike Morris
a1bc8c766d add HeadlessView::readPixels, fixes #480 2014-10-08 15:31:41 -04:00
Mike Morris
7aea160760 throw std::runtime_error instead of fprintf in HeadlessView, closes #481 2014-10-08 14:47:41 -04:00
Konstantin Käfer
f807926f5e report a permanent error instead of aborting on unknown error codes 
fixes #479
 2014-10-08 16:05:27 +02:00
Mike Morris
36b7bb0c09 clean up shared_ptr usage in HeadlessView 2014-10-07 16:26:21 -04:00
Mike Morris
5cc6b26229 clean up shared_ptr usage 2014-10-06 18:24:01 -04:00
Mike Morris
41dac96408 use shared_ptr for HeadlessDisplay in HeadlessView 2014-10-06 18:05:10 -04:00
Mike Morris
8b06b65f35 wrap GL/glx.h with undef None, use 0 instead, h/t @jfirebaugh 2014-10-06 16:53:57 -04:00
Mike Morris
170ce422ce forward declare HeadlessDisplay in headless_view.hpp 2014-10-06 15:45:14 -04:00
Mike Morris
0f1d33f5ee break out HeadlessDisplay from HeadlessView, ref #478 2014-10-03 18:31:38 -04:00
Mike Morris
c4c4b3318a log CGLErrorString for CGLChoosePixelFormat, enable OpenGL 
multithreading

https://developer.apple.com/library/mac/technotes/tn2085/_index.html
 2014-09-30 17:42:27 -04:00
Mike Morris
848dccbcae make view active/inactive around Map::setup, don't leave active after view.resize() 2014-09-30 12:06:51 -04:00
Konstantin Käfer
8fcc74e253 fix headless tests 2014-09-30 17:29:10 +02:00
Konstantin Käfer
5d34c18c80 disable URLcache for NSURLRequests 2014-09-30 17:29:09 +02:00
Mike Morris
8ebe1bc360 add more possible errors returned by glCheckFramebufferStatusEXT 
from https://www.opengl.org/registry/specs/EXT/framebuffer_object.txt
 2014-09-29 16:33:26 -04:00
Konstantin Käfer
5c6863c540 add missing include 2014-09-29 08:10:31 -07:00
Konstantin Käfer
9e44c0eae8 add reachability 2014-09-29 14:02:42 +02:00
Konstantin Käfer
b9628c8654 add etag support and if-none-match/if-modified-since to cocoa http handling 2014-09-26 16:10:39 +02:00
Mike Morris
8e6967669a make inactive at end of clear_buffers() 2014-09-25 18:06:55 -04:00
Mike Morris
dffeaa0787 make active after resize 2014-09-24 23:03:50 -04:00
Mike Morris
11f9081274 Merge branch 'libuv010' into libuv-0.10-fix-context-shutdown 
Conflicts:
	common/headless_view.cpp
 2014-09-24 22:40:07 -04:00
Mike Morris
86b7367994 Revert "add debugging" 
This reverts commit 0cdaf58027.
 2014-09-24 16:30:01 -04:00
Mike Morris
3dec4933a9 Merge branch 'libuv010' into libuv-0.10-fix-context-shutdown 
Conflicts:
	common/headless_view.cpp
	test/headless.cpp
 2014-09-24 15:58:52 -04:00
Mike Morris
8a19896c3a Merge branch 'master' into libuv010 2014-09-24 15:40:08 -04:00
Mike Morris
c5a7738dd6 move make_active call into MBGL_USE_CGL block 2014-09-24 15:17:42 -04:00
Mike Morris
0cdaf58027 add debugging 2014-09-24 14:40:49 -04:00
Konstantin Käfer
1209744b38 use the default cache location on ios to avoid writing to unwritable file system locations 2014-09-24 17:08:44 +02:00
Konstantin Käfer
992d9ff051 add back CURL requesting 2014-09-24 16:19:47 +02:00
Konstantin Käfer
0fc1f66868 whitespace fixes 2014-09-24 16:16:30 +02:00
Konstantin Käfer
ec3183754e move cocoa nsurlrequest code to common folder 2014-09-24 16:16:30 +02:00
Konstantin Käfer
111fccb76c option to pass data parameter, and add more explanation 2014-09-24 16:14:10 +02:00