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

split normal_fragment to normal_fragment_begin and normal_fragment_maps #13360

Merged
merged 2 commits into from
Feb 19, 2018

Conversation

sunag
Copy link
Collaborator

@sunag sunag commented Feb 19, 2018

Follow the same logic of this PR #13277

The problem happen when I use the properties normalMap and/or bumpMap with other code but needing the normal core code.

normal_fragment.glsl -> normal_fragment_begin.glsl + normal_fragment_maps.glsl

@sunag
Copy link
Collaborator Author

sunag commented Feb 19, 2018

/cc @WestLangley @bhouston

@WestLangley
Copy link
Collaborator

This looks OK to me.

@mrdoob As before, it is important that this change be listed in the migration notes.

@sunag
Copy link
Collaborator Author

sunag commented Feb 19, 2018

Apparently they are the latest split changes. I test with others properties names and work done.

material.alphaMap =
material.aoMap = 
material.aoMapIntensity = 
material.bumpMap = 
material.bumpScale = 
material.emissiveMap = 
material.color =
material.displacementMap = 
material.displacementScale =
material.displacementBias = 
material.emissive = 
material.emissiveMap = 
material.emissiveIntensity = 
material.envMap = 
material.envMapIntensity =
material.lightMap = 
material.lightMapIntensity = 
material.map = 
material.metalness =
material.metalnessMap =
material.normalMap = 
material.normalScale =
material.refractionRatio = 
material.roughness =
material.roughnessMap = 
material.gradientMap = map;

Repository owner deleted a comment from Kan0001 Feb 19, 2018
Repository owner deleted a comment from Kan0001 Feb 19, 2018
@mrdoob mrdoob merged commit 79c7493 into mrdoob:dev Feb 19, 2018
@mrdoob mrdoob added this to the r91 milestone Feb 19, 2018
@mrdoob
Copy link
Owner

mrdoob commented Feb 19, 2018

Thanks!

@mrdoob
Copy link
Owner

mrdoob commented Feb 19, 2018

@WestLangley Done!

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.

3 participants