Commit Graph

1725 Commits

Author SHA1 Message Date
Mike Morris
0cdaf58027 add debugging 2014-09-24 14:40:49 -04:00
Mike Morris
8e1bbae81f bump mapnik-packaging 2014-09-22 18:06:24 -04:00
Mike Morris
96736d83df Merge branch 'master' into libuv010
Conflicts:
	setup-libraries.sh
2014-09-22 17:26:14 -04:00
Justin R. Miller
0039479d6e bump Cocoa one more time 2014-09-18 10:29:25 -07:00
Justin R. Miller
eb1f1a7052 bump Cocoa for location fixes 2014-09-18 09:57:33 -07:00
Justin R. Miller
647335c218 bump Cocoa 2014-09-17 18:51:55 -07:00
Justin R. Miller
5788714e3b fix 64-bit iOS builds 2014-09-17 18:26:33 -07:00
AJ Ashton
65185ca377 Update Ubuntu instructions in README [skip ci] 2014-09-17 14:10:40 -07:00
John Firebaugh
e26020ccac Add gcc back to build matrix (fixes #465) 2014-09-15 11:34:12 -07:00
Mike Morris
c836bc2b01 Revert "make context active before clearing buffers"
This reverts commit 636fedff12.
2014-09-10 15:11:17 -04:00
Mike Morris
636fedff12 make context active before clearing buffers 2014-09-10 14:53:31 -04:00
Mike Morris
4316d2c405 make context active before clearing buffers 2014-09-10 14:24:29 -04:00
Mike Morris
2e2c7befac bump MP_HASH 2014-09-09 17:09:03 -04:00
Mike Morris
c32bb85248 Merge branch 'master' into libuv010 2014-09-09 17:06:22 -04:00
John Firebaugh
2a50fccd24 Fix build on gcc (fixes #464) 2014-09-08 22:26:10 -07:00
John Firebaugh
eb4f53cbed SDF icon support (fixes #404) 2014-09-08 15:12:32 -07:00
John Firebaugh
2033eb9494 Don't overrotate line labels (fixes #462) 2014-09-08 11:22:54 -07:00
John Firebaugh
de720f3515 FrameHistory::getFadeProperties 2014-09-05 14:03:33 -07:00
John Firebaugh
4c0b4a7901 Match js attribute layout 2014-09-05 13:40:45 -07:00
John Firebaugh
9d5f02ccaa Match js shaders
The only non-incidental change is to revert portions
of d5b4c116 and 3a9a9043.

See d5b4c1162d (commitcomment-7668050)
2014-09-05 13:23:14 -07:00
John Firebaugh
7b9ad022a9 Implement text-rotation-alignment 2014-09-04 18:12:40 -07:00
John Firebaugh
f2391e25ea TextShader ⇢ SDFShader 2014-09-04 17:59:22 -07:00
John Firebaugh
1fedf0918a Less shader boilerplate 2014-09-04 16:22:25 -07:00
John Firebaugh
c14ae3c477 Fix text/icon-translate-anchor
These are style properties, not render properties.
2014-09-04 15:38:14 -07:00
John Firebaugh
4694aa40ad Add SpriteAtlas::getPosition() 2014-09-03 18:12:40 -07:00
John Firebaugh
586cb9144a Make renderLine more similar to JS 2014-09-03 18:12:40 -07:00
Lauren Budorick
71c31cee24 linepattern in progress 2014-09-03 18:12:40 -07:00
John Firebaugh
c1280f0b38 Revert "coalesce texture uploads at the beginning of a frame"
This reverts commit 8c2c7f769f.

See #454

Conflicts:
	src/geometry/glyph_atlas.cpp
	src/geometry/sprite_atlas.cpp
2014-09-03 18:12:39 -07:00
John Firebaugh
bb9a466adb Revert "Avoid zero size array warning"
This reverts commit d4fd57aae9.
2014-09-03 17:04:38 -07:00
Mike Morris
74c4f976d1 fix ios builds? 2014-09-03 19:05:07 -04:00
John Firebaugh
a634605176 Kill config.mk (fixes #456) 2014-09-03 14:59:18 -07:00
John Firebaugh
3eb05efde2 Also release the current context 2014-09-03 14:50:03 -07:00
Mike Morris
88ef2f23e5 cache linux deps builds on MP_HASH, DIR_HASH 2014-09-03 17:20:48 -04:00
John Firebaugh
01d9d43f01 glXDestroyContext, XFree, XCloseDisplay 2014-09-03 14:13:41 -07:00
Mike Morris
6e5308a61b uv_async_init &complete 2014-09-03 15:13:59 -04:00
Mike Morris
17b1e13f34 Merge branch 'master' into libuv010 2014-09-02 17:57:43 -04:00
Mike Morris
6b23d05a23 remove debugging 2014-09-02 17:48:34 -04:00
Mike Morris
b18cf767c0 use std::fopen/std::fread instead of libuv, thanks @springmeyer 2014-09-02 17:30:35 -04:00
Justin R. Miller
5cf1afa3d0 capitalization 2014-09-02 13:33:50 -07:00
Mike Morris
a8021e84f8 Merge branch 'master' into libuv010 2014-08-29 15:43:13 -04:00
John Firebaugh
eb1fbc542b Fix text-justify (fixes #444) 2014-08-29 12:25:17 -07:00
John Firebaugh
2e8fb5f667 Fix text-line-height 2014-08-28 18:44:11 -07:00
John Firebaugh
9d6c7685d0 Implement {text,icon}-translate[-anchor] 2014-08-28 17:24:29 -07:00
John Firebaugh
e71a1a9077 Simplify 2014-08-28 17:16:37 -07:00
John Firebaugh
bfa0b7f009 Remove vtxMatrix state 2014-08-28 17:13:55 -07:00
John Firebaugh
6855590548 Fix default text-size 2014-08-28 16:48:01 -07:00
John Firebaugh
c13cc4aa38 Record frame history in the correct place
Fixes numerous issues with rendering tests.
2014-08-28 16:43:03 -07:00
John Firebaugh
fd40bde612 Make Glyph and Sprite Atlases noncopyable 2014-08-28 13:40:17 -07:00
John Firebaugh
20762ee9f4 Use fresh map and view for each test 2014-08-28 13:09:15 -07:00
John Firebaugh
d4fd57aae9 Avoid zero size array warning 2014-08-28 12:23:44 -07:00