@@ -601,124 +601,99 @@ void main() {
601601
602602// ********************* #include <uv_vertex>
603603#if defined( USE_UV ) || defined( USE_ANISOTROPY )
604-
605604 vUv = vec3 (uv, 1 ).xy;
606-
607605#endif
608- #ifdef USE_MAP
609606
607+ #ifdef USE_MAP
610608 vMapUv = (mapTransform * vec3 (MAP_UV, 1 )).xy;
611-
612609#endif
613- #ifdef USE_ALPHAMAP
614610
611+ #ifdef USE_ALPHAMAP
615612 vAlphaMapUv = (alphaMapTransform * vec3 (ALPHAMAP_UV, 1 )).xy;
616-
617613#endif
618- #ifdef USE_LIGHTMAP
619614
615+ #ifdef USE_LIGHTMAP
620616 vLightMapUv = (lightMapTransform * vec3 (LIGHTMAP_UV, 1 )).xy;
621-
622617#endif
623- #ifdef USE_AOMAP
624618
619+ #ifdef USE_AOMAP
625620 vAoMapUv = (aoMapTransform * vec3 (AOMAP_UV, 1 )).xy;
626-
627621#endif
628- #ifdef USE_BUMPMAP
629622
623+ #ifdef USE_BUMPMAP
630624 vBumpMapUv = (bumpMapTransform * vec3 (BUMPMAP_UV, 1 )).xy;
631-
632625#endif
633- #ifdef USE_NORMALMAP
634626
627+ #ifdef USE_NORMALMAP
635628 vNormalMapUv = (normalMapTransform * vec3 (NORMALMAP_UV, 1 )).xy;
636-
637629#endif
638- #ifdef USE_DISPLACEMENTMAP
639630
631+ #ifdef USE_DISPLACEMENTMAP
640632 vDisplacementMapUv = (displacementMapTransform * vec3 (DISPLACEMENTMAP_UV, 1 )).xy;
641-
642633#endif
643- #ifdef USE_EMISSIVEMAP
644634
635+ #ifdef USE_EMISSIVEMAP
645636 vEmissiveMapUv = (emissiveMapTransform * vec3 (EMISSIVEMAP_UV, 1 )).xy;
646-
647637#endif
648- #ifdef USE_METALNESSMAP
649638
639+ #ifdef USE_METALNESSMAP
650640 vMetalnessMapUv = (metalnessMapTransform * vec3 (METALNESSMAP_UV, 1 )).xy;
651-
652641#endif
653- #ifdef USE_ROUGHNESSMAP
654642
643+ #ifdef USE_ROUGHNESSMAP
655644 vRoughnessMapUv = (roughnessMapTransform * vec3 (ROUGHNESSMAP_UV, 1 )).xy;
656-
657645#endif
658- #ifdef USE_ANISOTROPYMAP
659646
647+ #ifdef USE_ANISOTROPYMAP
660648 vAnisotropyMapUv = (anisotropyMapTransform * vec3 (ANISOTROPYMAP_UV, 1 )).xy;
661-
662649#endif
663- #ifdef USE_CLEARCOATMAP
664650
651+ #ifdef USE_CLEARCOATMAP
665652 vClearcoatMapUv = (clearcoatMapTransform * vec3 (CLEARCOATMAP_UV, 1 )).xy;
666-
667653#endif
668- #ifdef USE_CLEARCOAT_NORMALMAP
669654
655+ #ifdef USE_CLEARCOAT_NORMALMAP
670656 vClearcoatNormalMapUv = (clearcoatNormalMapTransform * vec3 (CLEARCOAT_NORMALMAP_UV, 1 )).xy;
671-
672657#endif
673- #ifdef USE_CLEARCOAT_ROUGHNESSMAP
674658
659+ #ifdef USE_CLEARCOAT_ROUGHNESSMAP
675660 vClearcoatRoughnessMapUv = (clearcoatRoughnessMapTransform * vec3 (CLEARCOAT_ROUGHNESSMAP_UV, 1 )).xy;
676-
677661#endif
678- #ifdef USE_IRIDESCENCEMAP
679662
663+ #ifdef USE_IRIDESCENCEMAP
680664 vIridescenceMapUv = (iridescenceMapTransform * vec3 (IRIDESCENCEMAP_UV, 1 )).xy;
681-
682665#endif
683- #ifdef USE_IRIDESCENCE_THICKNESSMAP
684666
667+ #ifdef USE_IRIDESCENCE_THICKNESSMAP
685668 vIridescenceThicknessMapUv = (iridescenceThicknessMapTransform * vec3 (IRIDESCENCE_THICKNESSMAP_UV, 1 )).xy;
686-
687669#endif
688- #ifdef USE_SHEEN_COLORMAP
689670
671+ #ifdef USE_SHEEN_COLORMAP
690672 vSheenColorMapUv = (sheenColorMapTransform * vec3 (SHEEN_COLORMAP_UV, 1 )).xy;
691-
692673#endif
693- #ifdef USE_SHEEN_ROUGHNESSMAP
694674
675+ #ifdef USE_SHEEN_ROUGHNESSMAP
695676 vSheenRoughnessMapUv = (sheenRoughnessMapTransform * vec3 (SHEEN_ROUGHNESSMAP_UV, 1 )).xy;
696-
697677#endif
698- #ifdef USE_SPECULARMAP
699678
679+ #ifdef USE_SPECULARMAP
700680 vSpecularMapUv = (specularMapTransform * vec3 (SPECULARMAP_UV, 1 )).xy;
701-
702681#endif
703- #ifdef USE_SPECULAR_COLORMAP
704682
683+ #ifdef USE_SPECULAR_COLORMAP
705684 vSpecularColorMapUv = (specularColorMapTransform * vec3 (SPECULAR_COLORMAP_UV, 1 )).xy;
706-
707685#endif
708- #ifdef USE_SPECULAR_INTENSITYMAP
709686
687+ #ifdef USE_SPECULAR_INTENSITYMAP
710688 vSpecularIntensityMapUv = (specularIntensityMapTransform * vec3 (SPECULAR_INTENSITYMAP_UV, 1 )).xy;
711-
712689#endif
713- #ifdef USE_TRANSMISSIONMAP
714690
691+ #ifdef USE_TRANSMISSIONMAP
715692 vTransmissionMapUv = (transmissionMapTransform * vec3 (TRANSMISSIONMAP_UV, 1 )).xy;
716-
717693#endif
718- #ifdef USE_THICKNESSMAP
719694
695+ #ifdef USE_THICKNESSMAP
720696 vThicknessMapUv = (thicknessMapTransform * vec3 (THICKNESSMAP_UV, 1 )).xy;
721-
722697#endif
723698
724699// ********************* #include <color_vertex>
0 commit comments