Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement support for texture matrix for uv2 #18099

Merged
merged 1 commit into from
Dec 7, 2019
Merged

Implement support for texture matrix for uv2 #18099

merged 1 commit into from
Dec 7, 2019

Conversation

zeux
Copy link
Contributor

@zeux zeux commented Dec 7, 2019

Before this change, we only supported one texture matrix for the
material that was applied to uv data based on the first texture, in
priority order, that needed it.

This change adds equivalent support for uv2 - we now transform second UV
channel with a second UV transform that is grabbed from aoMap or
lightMap (that are the only two textures using it atm).

This fixes glTF rendering for files that use KHR_texture_transform on
the occlusion texture, including ones produced by gltfpack.

Fixes #18088.

Before this change, we only supported one texture matrix for the
material that was applied to uv data based on the first texture, in
priority order, that needed it.

This change adds equivalent support for uv2 - we now transform second UV
channel with a second UV transform that is grabbed from aoMap or
lightMap (that are the only two textures using it atm).

This fixes glTF rendering for files that use KHR_texture_transform on
the occlusion texture, including ones produced by gltfpack.
@mrdoob mrdoob added this to the r112 milestone Dec 7, 2019
@mrdoob mrdoob merged commit f8f6265 into mrdoob:dev Dec 7, 2019
@mrdoob
Copy link
Owner

mrdoob commented Dec 7, 2019

Thanks!

@zeux
Copy link
Contributor Author

zeux commented Dec 7, 2019

Oops I didn't notice the lint whitespace error; would you like me to open another PR to fix this?

@zeux
Copy link
Contributor Author

zeux commented Dec 7, 2019

Oh never mind, you've fixed this in dev :) Thanks! Sorry about that.

@mrdoob
Copy link
Owner

mrdoob commented Dec 7, 2019

It's all good! :D

@mrdoob
Copy link
Owner

mrdoob commented Dec 7, 2019

FYI 2332bfd

@zeux zeux deleted the uv2-matrix branch December 8, 2019 03:38
@WestLangley
Copy link
Collaborator

The docs need to be updated, too.

@zeux
Copy link
Contributor Author

zeux commented Dec 8, 2019

Thanks! I didn't realize the docs called this out specifically. Submitted #18102.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

aoMap UVs are not transformed by texture matrix
3 participants