|
@@ -146,6 +146,9 @@ void main(void) {
|
|
#ifdef TANGENT
|
|
#ifdef TANGENT
|
|
vec4 tangentUpdated = tangent;
|
|
vec4 tangentUpdated = tangent;
|
|
#endif
|
|
#endif
|
|
|
|
+#ifdef UV1
|
|
|
|
+ vec2 uvUpdated = uv;
|
|
|
|
+#endif
|
|
|
|
|
|
#include<morphTargetsVertex>[0..maxSimultaneousMorphTargets]
|
|
#include<morphTargetsVertex>[0..maxSimultaneousMorphTargets]
|
|
|
|
|
|
@@ -205,14 +208,14 @@ void main(void) {
|
|
|
|
|
|
// Texture coordinates
|
|
// Texture coordinates
|
|
#ifndef UV1
|
|
#ifndef UV1
|
|
- vec2 uv = vec2(0., 0.);
|
|
|
|
|
|
+ vec2 uvUpdated = vec2(0., 0.);
|
|
#endif
|
|
#endif
|
|
#ifndef UV2
|
|
#ifndef UV2
|
|
vec2 uv2 = vec2(0., 0.);
|
|
vec2 uv2 = vec2(0., 0.);
|
|
#endif
|
|
#endif
|
|
|
|
|
|
#ifdef MAINUV1
|
|
#ifdef MAINUV1
|
|
- vMainUV1 = uv;
|
|
|
|
|
|
+ vMainUV1 = uvUpdated;
|
|
#endif
|
|
#endif
|
|
|
|
|
|
#ifdef MAINUV2
|
|
#ifdef MAINUV2
|
|
@@ -222,7 +225,7 @@ void main(void) {
|
|
#if defined(ALBEDO) && ALBEDODIRECTUV == 0
|
|
#if defined(ALBEDO) && ALBEDODIRECTUV == 0
|
|
if (vAlbedoInfos.x == 0.)
|
|
if (vAlbedoInfos.x == 0.)
|
|
{
|
|
{
|
|
- vAlbedoUV = vec2(albedoMatrix * vec4(uv, 1.0, 0.0));
|
|
|
|
|
|
+ vAlbedoUV = vec2(albedoMatrix * vec4(uvUpdated, 1.0, 0.0));
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
@@ -233,7 +236,7 @@ void main(void) {
|
|
#if defined(AMBIENT) && AMBIENTDIRECTUV == 0
|
|
#if defined(AMBIENT) && AMBIENTDIRECTUV == 0
|
|
if (vAmbientInfos.x == 0.)
|
|
if (vAmbientInfos.x == 0.)
|
|
{
|
|
{
|
|
- vAmbientUV = vec2(ambientMatrix * vec4(uv, 1.0, 0.0));
|
|
|
|
|
|
+ vAmbientUV = vec2(ambientMatrix * vec4(uvUpdated, 1.0, 0.0));
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
@@ -244,7 +247,7 @@ void main(void) {
|
|
#if defined(OPACITY) && OPACITYDIRECTUV == 0
|
|
#if defined(OPACITY) && OPACITYDIRECTUV == 0
|
|
if (vOpacityInfos.x == 0.)
|
|
if (vOpacityInfos.x == 0.)
|
|
{
|
|
{
|
|
- vOpacityUV = vec2(opacityMatrix * vec4(uv, 1.0, 0.0));
|
|
|
|
|
|
+ vOpacityUV = vec2(opacityMatrix * vec4(uvUpdated, 1.0, 0.0));
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
@@ -255,7 +258,7 @@ void main(void) {
|
|
#if defined(EMISSIVE) && EMISSIVEDIRECTUV == 0
|
|
#if defined(EMISSIVE) && EMISSIVEDIRECTUV == 0
|
|
if (vEmissiveInfos.x == 0.)
|
|
if (vEmissiveInfos.x == 0.)
|
|
{
|
|
{
|
|
- vEmissiveUV = vec2(emissiveMatrix * vec4(uv, 1.0, 0.0));
|
|
|
|
|
|
+ vEmissiveUV = vec2(emissiveMatrix * vec4(uvUpdated, 1.0, 0.0));
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
@@ -266,7 +269,7 @@ void main(void) {
|
|
#if defined(LIGHTMAP) && LIGHTMAPDIRECTUV == 0
|
|
#if defined(LIGHTMAP) && LIGHTMAPDIRECTUV == 0
|
|
if (vLightmapInfos.x == 0.)
|
|
if (vLightmapInfos.x == 0.)
|
|
{
|
|
{
|
|
- vLightmapUV = vec2(lightmapMatrix * vec4(uv, 1.0, 0.0));
|
|
|
|
|
|
+ vLightmapUV = vec2(lightmapMatrix * vec4(uvUpdated, 1.0, 0.0));
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
@@ -277,7 +280,7 @@ void main(void) {
|
|
#if defined(REFLECTIVITY) && REFLECTIVITYDIRECTUV == 0
|
|
#if defined(REFLECTIVITY) && REFLECTIVITYDIRECTUV == 0
|
|
if (vReflectivityInfos.x == 0.)
|
|
if (vReflectivityInfos.x == 0.)
|
|
{
|
|
{
|
|
- vReflectivityUV = vec2(reflectivityMatrix * vec4(uv, 1.0, 0.0));
|
|
|
|
|
|
+ vReflectivityUV = vec2(reflectivityMatrix * vec4(uvUpdated, 1.0, 0.0));
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
@@ -288,7 +291,7 @@ void main(void) {
|
|
#if defined(MICROSURFACEMAP) && MICROSURFACEMAPDIRECTUV == 0
|
|
#if defined(MICROSURFACEMAP) && MICROSURFACEMAPDIRECTUV == 0
|
|
if (vMicroSurfaceSamplerInfos.x == 0.)
|
|
if (vMicroSurfaceSamplerInfos.x == 0.)
|
|
{
|
|
{
|
|
- vMicroSurfaceSamplerUV = vec2(microSurfaceSamplerMatrix * vec4(uv, 1.0, 0.0));
|
|
|
|
|
|
+ vMicroSurfaceSamplerUV = vec2(microSurfaceSamplerMatrix * vec4(uvUpdated, 1.0, 0.0));
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
@@ -299,7 +302,7 @@ void main(void) {
|
|
#if defined(BUMP) && BUMPDIRECTUV == 0
|
|
#if defined(BUMP) && BUMPDIRECTUV == 0
|
|
if (vBumpInfos.x == 0.)
|
|
if (vBumpInfos.x == 0.)
|
|
{
|
|
{
|
|
- vBumpUV = vec2(bumpMatrix * vec4(uv, 1.0, 0.0));
|
|
|
|
|
|
+ vBumpUV = vec2(bumpMatrix * vec4(uvUpdated, 1.0, 0.0));
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
@@ -311,7 +314,7 @@ void main(void) {
|
|
#if defined(CLEARCOAT_TEXTURE) && CLEARCOAT_TEXTUREDIRECTUV == 0
|
|
#if defined(CLEARCOAT_TEXTURE) && CLEARCOAT_TEXTUREDIRECTUV == 0
|
|
if (vClearCoatInfos.x == 0.)
|
|
if (vClearCoatInfos.x == 0.)
|
|
{
|
|
{
|
|
- vClearCoatUV = vec2(clearCoatMatrix * vec4(uv, 1.0, 0.0));
|
|
|
|
|
|
+ vClearCoatUV = vec2(clearCoatMatrix * vec4(uvUpdated, 1.0, 0.0));
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
@@ -322,7 +325,7 @@ void main(void) {
|
|
#if defined(CLEARCOAT_BUMP) && CLEARCOAT_BUMPDIRECTUV == 0
|
|
#if defined(CLEARCOAT_BUMP) && CLEARCOAT_BUMPDIRECTUV == 0
|
|
if (vClearCoatBumpInfos.x == 0.)
|
|
if (vClearCoatBumpInfos.x == 0.)
|
|
{
|
|
{
|
|
- vClearCoatBumpUV = vec2(clearCoatBumpMatrix * vec4(uv, 1.0, 0.0));
|
|
|
|
|
|
+ vClearCoatBumpUV = vec2(clearCoatBumpMatrix * vec4(uvUpdated, 1.0, 0.0));
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
@@ -333,7 +336,7 @@ void main(void) {
|
|
#if defined(CLEARCOAT_TINT_TEXTURE) && CLEARCOAT_TINT_TEXTUREDIRECTUV == 0
|
|
#if defined(CLEARCOAT_TINT_TEXTURE) && CLEARCOAT_TINT_TEXTUREDIRECTUV == 0
|
|
if (vClearCoatTintInfos.x == 0.)
|
|
if (vClearCoatTintInfos.x == 0.)
|
|
{
|
|
{
|
|
- vClearCoatTintUV = vec2(clearCoatTintMatrix * vec4(uv, 1.0, 0.0));
|
|
|
|
|
|
+ vClearCoatTintUV = vec2(clearCoatTintMatrix * vec4(uvUpdated, 1.0, 0.0));
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
@@ -346,7 +349,7 @@ void main(void) {
|
|
#if defined(SHEEN_TEXTURE) && SHEEN_TEXTUREDIRECTUV == 0
|
|
#if defined(SHEEN_TEXTURE) && SHEEN_TEXTUREDIRECTUV == 0
|
|
if (vSheenInfos.x == 0.)
|
|
if (vSheenInfos.x == 0.)
|
|
{
|
|
{
|
|
- vSheenUV = vec2(sheenMatrix * vec4(uv, 1.0, 0.0));
|
|
|
|
|
|
+ vSheenUV = vec2(sheenMatrix * vec4(uvUpdated, 1.0, 0.0));
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
@@ -359,7 +362,7 @@ void main(void) {
|
|
#if defined(ANISOTROPIC_TEXTURE) && ANISOTROPIC_TEXTUREDIRECTUV == 0
|
|
#if defined(ANISOTROPIC_TEXTURE) && ANISOTROPIC_TEXTUREDIRECTUV == 0
|
|
if (vAnisotropyInfos.x == 0.)
|
|
if (vAnisotropyInfos.x == 0.)
|
|
{
|
|
{
|
|
- vAnisotropyUV = vec2(anisotropyMatrix * vec4(uv, 1.0, 0.0));
|
|
|
|
|
|
+ vAnisotropyUV = vec2(anisotropyMatrix * vec4(uvUpdated, 1.0, 0.0));
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
@@ -372,7 +375,7 @@ void main(void) {
|
|
#if defined(SS_THICKNESSANDMASK_TEXTURE) && SS_THICKNESSANDMASK_TEXTUREDIRECTUV == 0
|
|
#if defined(SS_THICKNESSANDMASK_TEXTURE) && SS_THICKNESSANDMASK_TEXTUREDIRECTUV == 0
|
|
if (vThicknessInfos.x == 0.)
|
|
if (vThicknessInfos.x == 0.)
|
|
{
|
|
{
|
|
- vThicknessUV = vec2(thicknessMatrix * vec4(uv, 1.0, 0.0));
|
|
|
|
|
|
+ vThicknessUV = vec2(thicknessMatrix * vec4(uvUpdated, 1.0, 0.0));
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|