Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

modify texture coordinate scaling #9153

Merged
merged 1 commit into from
Jul 27, 2017
Merged

modify texture coordinate scaling #9153

merged 1 commit into from
Jul 27, 2017

Conversation

mollymerp
Copy link
Contributor

corresponding PR to mapbox/mapbox-gl-js#4770

currently the commit in gl-js includes some breaking changes so I'll have to rebase against mapbox/mapbox-gl-js@ca1e1cf or wait til the text scaling work lands in native.

@mollymerp mollymerp requested a review from kkaefer May 31, 2017 14:49
@mollymerp mollymerp added rendering Core The cross-platform C++ core, aka mbgl labels May 31, 2017
Copy link
Contributor

@jfirebaugh jfirebaugh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should include a mapbox-gl-js submodule update too, right?

@mollymerp
Copy link
Contributor Author

@jfirebaugh yes sorry, that's what I meant by

currently the commit in gl-js includes some breaking changes [for native]

so I didn't add the submodule bump yet bc the current gl-js commit breaks the tests because it includes has chris' text-pitch changes which are not yet incorporated into native it seems

@mollymerp mollymerp added the ⚠️ DO NOT MERGE Work in progress, proof of concept, or on hold label May 31, 2017
@mollymerp mollymerp force-pushed the texture-pos-scaling branch 2 times, most recently from c4e5721 to e7efc2a Compare July 11, 2017 20:29
@mollymerp mollymerp force-pushed the texture-pos-scaling branch 2 times, most recently from fc09695 to 0339534 Compare July 25, 2017 00:14
@mollymerp
Copy link
Contributor Author

mollymerp commented Jul 25, 2017

😅 this is finally ready to 🎸 I think


I missed that one of them was uint16 and the other was int16 🤦‍♀️ 

@mollymerp mollymerp removed the ⚠️ DO NOT MERGE Work in progress, proof of concept, or on hold label Jul 25, 2017
@mollymerp mollymerp force-pushed the texture-pos-scaling branch 5 times, most recently from af54b4c to f6d77e4 Compare July 25, 2017 20:41
ignore unsupported dds property tests

fix tests

remove unneeded texture extent variable

bump gl-js to master
@mollymerp mollymerp merged commit ba7574e into master Jul 27, 2017
@mollymerp mollymerp deleted the texture-pos-scaling branch July 27, 2017 21:54
@vans88
Copy link

vans88 commented Jul 28, 2017

@mollymerp Can you give me some suggestions about the following error:
#9614
I have upload the detailed information in the above link. Many thanks.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Core The cross-platform C++ core, aka mbgl rendering
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants