Updated goldens.

FinModelUtility/Formats/Hsd/Hsd Tests/goldens/chibi_robo/jenny/output/0000CE08.fragment.glsl

@@ -30,7 +30,20 @@ layout (std140, binding = 2) uniform Lights {
 
 uniform vec3 cameraPosition;
 uniform float shininess;
-uniform sampler2D texture0;
+
+struct Texture {
+  sampler2D sampler;
+  mat4 transform3d;
+};
+
+vec2 transformUv3d(mat4 transform3d, vec2 inUv) {
+  vec4 rawTransformedUv = (transform3d * vec4(inUv, 0, 1));
+
+  // We need to manually divide by w for perspective correction!
+  return rawTransformedUv.xy / rawTransformedUv.w;
+}
+
+uniform Texture texture0;
 
 in vec3 vertexPosition;
 in vec3 vertexNormal;
@@ -129,7 +142,7 @@ void main() {
   vec4 mergedLightSpecularColor = vec4(0);
   getMergedLightColors(vertexPosition, fragNormal, shininess, mergedLightDiffuseColor, mergedLightSpecularColor);
 
-  vec3 colorComponent = mergedLightDiffuseColor.rgb*vec3(2)*texture(texture0, uv0).rgb;
+  vec3 colorComponent = mergedLightDiffuseColor.rgb*vec3(2)*texture(texture0.sampler, transformUv3d(texture0.transform3d, uv0)).rgb;
 
   float alphaComponent = 1;
 

FinModelUtility/Formats/Hsd/Hsd Tests/goldens/chibi_robo/jenny/output/0000CF48.fragment.glsl

@@ -30,7 +30,20 @@ layout (std140, binding = 2) uniform Lights {
 
 uniform vec3 cameraPosition;
 uniform float shininess;
-uniform sampler2D texture0;
+
+struct Texture {
+  sampler2D sampler;
+  mat4 transform3d;
+};
+
+vec2 transformUv3d(mat4 transform3d, vec2 inUv) {
+  vec4 rawTransformedUv = (transform3d * vec4(inUv, 0, 1));
+
+  // We need to manually divide by w for perspective correction!
+  return rawTransformedUv.xy / rawTransformedUv.w;
+}
+
+uniform Texture texture0;
 
 in vec3 vertexPosition;
 in vec3 vertexNormal;
@@ -129,7 +142,7 @@ void main() {
   vec4 mergedLightSpecularColor = vec4(0);
   getMergedLightColors(vertexPosition, fragNormal, shininess, mergedLightDiffuseColor, mergedLightSpecularColor);
 
-  vec3 colorComponent = mergedLightDiffuseColor.rgb*vec3(2)*texture(texture0, uv0).rgb;
+  vec3 colorComponent = mergedLightDiffuseColor.rgb*vec3(2)*texture(texture0.sampler, transformUv3d(texture0.transform3d, uv0)).rgb;
 
   float alphaComponent = 1;
 

FinModelUtility/Formats/Hsd/Hsd Tests/goldens/chibi_robo/jenny/output/0000D128.fragment.glsl

@@ -30,7 +30,20 @@ layout (std140, binding = 2) uniform Lights {
 
 uniform vec3 cameraPosition;
 uniform float shininess;
-uniform sampler2D texture0;
+
+struct Texture {
+  sampler2D sampler;
+  mat4 transform3d;
+};
+
+vec2 transformUv3d(mat4 transform3d, vec2 inUv) {
+  vec4 rawTransformedUv = (transform3d * vec4(inUv, 0, 1));
+
+  // We need to manually divide by w for perspective correction!
+  return rawTransformedUv.xy / rawTransformedUv.w;
+}
+
+uniform Texture texture0;
 
 in vec3 vertexPosition;
 in vec3 vertexNormal;
@@ -129,7 +142,7 @@ void main() {
   vec4 mergedLightSpecularColor = vec4(0);
   getMergedLightColors(vertexPosition, fragNormal, shininess, mergedLightDiffuseColor, mergedLightSpecularColor);
 
-  vec3 colorComponent = mergedLightDiffuseColor.rgb*vec3(2)*texture(texture0, uv0).rgb;
+  vec3 colorComponent = mergedLightDiffuseColor.rgb*vec3(2)*texture(texture0.sampler, transformUv3d(texture0.transform3d, uv0)).rgb;
 
   float alphaComponent = 1;
 

FinModelUtility/Formats/Hsd/Hsd Tests/goldens/chibi_robo/jenny/output/0000D4CC.fragment.glsl

@@ -1,14 +1,27 @@
 #version 430
 
-uniform sampler2D texture0;
+
+struct Texture {
+  sampler2D sampler;
+  mat4 transform3d;
+};
+
+vec2 transformUv3d(mat4 transform3d, vec2 inUv) {
+  vec4 rawTransformedUv = (transform3d * vec4(inUv, 0, 1));
+
+  // We need to manually divide by w for perspective correction!
+  return rawTransformedUv.xy / rawTransformedUv.w;
+}
+
+uniform Texture texture0;
 
 in vec4 vertexColor0;
 in vec2 uv0;
 
 out vec4 fragColor;
 
 void main() {
-  vec3 colorComponent = vec3(2)*vec3(1,0.20000000298023224,0)*vertexColor0.rgb*texture(texture0, uv0).rgb;
+  vec3 colorComponent = vec3(2)*vec3(1,0.20000000298023224,0)*vertexColor0.rgb*texture(texture0.sampler, transformUv3d(texture0.transform3d, uv0)).rgb;
 
   float alphaComponent = vertexColor0.a;
 

FinModelUtility/Formats/Hsd/Hsd Tests/goldens/chibi_robo/jenny/output/0000D6AC.fragment.glsl

@@ -1,14 +1,27 @@
 #version 430
 
-uniform sampler2D texture0;
+
+struct Texture {
+  sampler2D sampler;
+  mat4 transform3d;
+};
+
+vec2 transformUv3d(mat4 transform3d, vec2 inUv) {
+  vec4 rawTransformedUv = (transform3d * vec4(inUv, 0, 1));
+
+  // We need to manually divide by w for perspective correction!
+  return rawTransformedUv.xy / rawTransformedUv.w;
+}
+
+uniform Texture texture0;
 
 in vec4 vertexColor0;
 in vec2 uv0;
 
 out vec4 fragColor;
 
 void main() {
-  vec3 colorComponent = vec3(2)*vec3(1,0.20000000298023224,0)*vertexColor0.rgb*texture(texture0, uv0).rgb;
+  vec3 colorComponent = vec3(2)*vec3(1,0.20000000298023224,0)*vertexColor0.rgb*texture(texture0.sampler, transformUv3d(texture0.transform3d, uv0)).rgb;
 
   float alphaComponent = vertexColor0.a;
 

FinModelUtility/Formats/Hsd/Hsd Tests/goldens/chibi_robo/jenny/output/0000D74C.fragment.glsl

@@ -1,14 +1,27 @@
 #version 430
 
-uniform sampler2D texture0;
+
+struct Texture {
+  sampler2D sampler;
+  mat4 transform3d;
+};
+
+vec2 transformUv3d(mat4 transform3d, vec2 inUv) {
+  vec4 rawTransformedUv = (transform3d * vec4(inUv, 0, 1));
+
+  // We need to manually divide by w for perspective correction!
+  return rawTransformedUv.xy / rawTransformedUv.w;
+}
+
+uniform Texture texture0;
 
 in vec4 vertexColor0;
 in vec2 uv0;
 
 out vec4 fragColor;
 
 void main() {
-  vec3 colorComponent = vec3(2)*vec3(1,0.20000000298023224,0)*vertexColor0.rgb*texture(texture0, uv0).rgb;
+  vec3 colorComponent = vec3(2)*vec3(1,0.20000000298023224,0)*vertexColor0.rgb*texture(texture0.sampler, transformUv3d(texture0.transform3d, uv0)).rgb;
 
   float alphaComponent = vertexColor0.a;
 

FinModelUtility/Formats/Hsd/Hsd Tests/goldens/chibi_robo/jenny/output/0000D7EC.fragment.glsl

@@ -1,14 +1,27 @@
 #version 430
 
-uniform sampler2D texture0;
+
+struct Texture {
+  sampler2D sampler;
+  mat4 transform3d;
+};
+
+vec2 transformUv3d(mat4 transform3d, vec2 inUv) {
+  vec4 rawTransformedUv = (transform3d * vec4(inUv, 0, 1));
+
+  // We need to manually divide by w for perspective correction!
+  return rawTransformedUv.xy / rawTransformedUv.w;
+}
+
+uniform Texture texture0;
 
 in vec4 vertexColor0;
 in vec2 uv0;
 
 out vec4 fragColor;
 
 void main() {
-  vec3 colorComponent = vec3(2)*vec3(1,0.20000000298023224,0)*vertexColor0.rgb*texture(texture0, uv0).rgb;
+  vec3 colorComponent = vec3(2)*vec3(1,0.20000000298023224,0)*vertexColor0.rgb*texture(texture0.sampler, transformUv3d(texture0.transform3d, uv0)).rgb;
 
   float alphaComponent = vertexColor0.a;
 

FinModelUtility/Formats/Hsd/Hsd Tests/goldens/chibi_robo/jenny/output/0000D88C.fragment.glsl

@@ -1,14 +1,27 @@
 #version 430
 
-uniform sampler2D texture0;
+
+struct Texture {
+  sampler2D sampler;
+  mat4 transform3d;
+};
+
+vec2 transformUv3d(mat4 transform3d, vec2 inUv) {
+  vec4 rawTransformedUv = (transform3d * vec4(inUv, 0, 1));
+
+  // We need to manually divide by w for perspective correction!
+  return rawTransformedUv.xy / rawTransformedUv.w;
+}
+
+uniform Texture texture0;
 
 in vec4 vertexColor0;
 in vec2 uv0;
 
 out vec4 fragColor;
 
 void main() {
-  vec3 colorComponent = vec3(2)*vec3(1,0.20000000298023224,0)*vertexColor0.rgb*texture(texture0, uv0).rgb;
+  vec3 colorComponent = vec3(2)*vec3(1,0.20000000298023224,0)*vertexColor0.rgb*texture(texture0.sampler, transformUv3d(texture0.transform3d, uv0)).rgb;
 
   float alphaComponent = vertexColor0.a;
 

FinModelUtility/Formats/Hsd/Hsd Tests/goldens/chibi_robo/jenny/output/0000DA6C.fragment.glsl

@@ -1,14 +1,27 @@
 #version 430
 
-uniform sampler2D texture0;
+
+struct Texture {
+  sampler2D sampler;
+  mat4 transform3d;
+};
+
+vec2 transformUv3d(mat4 transform3d, vec2 inUv) {
+  vec4 rawTransformedUv = (transform3d * vec4(inUv, 0, 1));
+
+  // We need to manually divide by w for perspective correction!
+  return rawTransformedUv.xy / rawTransformedUv.w;
+}
+
+uniform Texture texture0;
 
 in vec4 vertexColor0;
 in vec2 uv0;
 
 out vec4 fragColor;
 
 void main() {
-  vec3 colorComponent = vec3(2)*vec3(0,0.800000011920929,0)*vertexColor0.rgb*texture(texture0, uv0).rgb;
+  vec3 colorComponent = vec3(2)*vec3(0,0.800000011920929,0)*vertexColor0.rgb*texture(texture0.sampler, transformUv3d(texture0.transform3d, uv0)).rgb;
 
   float alphaComponent = vertexColor0.a;
 

FinModelUtility/Formats/Hsd/Hsd Tests/goldens/chibi_robo/jenny/output/0000DBAC.fragment.glsl

@@ -1,14 +1,27 @@
 #version 430
 
-uniform sampler2D texture0;
+
+struct Texture {
+  sampler2D sampler;
+  mat4 transform3d;
+};
+
+vec2 transformUv3d(mat4 transform3d, vec2 inUv) {
+  vec4 rawTransformedUv = (transform3d * vec4(inUv, 0, 1));
+
+  // We need to manually divide by w for perspective correction!
+  return rawTransformedUv.xy / rawTransformedUv.w;
+}
+
+uniform Texture texture0;
 
 in vec4 vertexColor0;
 in vec2 uv0;
 
 out vec4 fragColor;
 
 void main() {
-  vec3 colorComponent = vec3(2)*vec3(0,0.800000011920929,0)*vertexColor0.rgb*texture(texture0, uv0).rgb;
+  vec3 colorComponent = vec3(2)*vec3(0,0.800000011920929,0)*vertexColor0.rgb*texture(texture0.sampler, transformUv3d(texture0.transform3d, uv0)).rgb;
 
   float alphaComponent = vertexColor0.a;
 

FinModelUtility/Formats/Hsd/Hsd Tests/goldens/super_smash_bros_melee/PlMr/output/00008F5C.fragment.glsl

@@ -30,7 +30,20 @@ layout (std140, binding = 2) uniform Lights {
 
 uniform vec3 cameraPosition;
 uniform float shininess;
-uniform sampler2D texture0;
+
+struct Texture {
+  sampler2D sampler;
+  mat4 transform3d;
+};
+
+vec2 transformUv3d(mat4 transform3d, vec2 inUv) {
+  vec4 rawTransformedUv = (transform3d * vec4(inUv, 0, 1));
+
+  // We need to manually divide by w for perspective correction!
+  return rawTransformedUv.xy / rawTransformedUv.w;
+}
+
+uniform Texture texture0;
 
 in vec3 vertexPosition;
 in vec3 vertexNormal;
@@ -129,7 +142,7 @@ void main() {
   vec4 mergedLightSpecularColor = vec4(0);
   getMergedLightColors(vertexPosition, fragNormal, shininess, mergedLightDiffuseColor, mergedLightSpecularColor);
 
-  vec3 colorComponent = mergedLightDiffuseColor.rgb*vec3(2)*texture(texture0, uv0).rgb;
+  vec3 colorComponent = mergedLightDiffuseColor.rgb*vec3(2)*texture(texture0.sampler, transformUv3d(texture0.transform3d, uv0)).rgb;
 
   float alphaComponent = 1;
 

FinModelUtility/Formats/Hsd/Hsd Tests/goldens/super_smash_bros_melee/PlMr/output/0000901C.fragment.glsl

@@ -30,7 +30,20 @@ layout (std140, binding = 2) uniform Lights {
 
 uniform vec3 cameraPosition;
 uniform float shininess;
-uniform sampler2D texture0;
+
+struct Texture {
+  sampler2D sampler;
+  mat4 transform3d;
+};
+
+vec2 transformUv3d(mat4 transform3d, vec2 inUv) {
+  vec4 rawTransformedUv = (transform3d * vec4(inUv, 0, 1));
+
+  // We need to manually divide by w for perspective correction!
+  return rawTransformedUv.xy / rawTransformedUv.w;
+}
+
+uniform Texture texture0;
 
 in vec3 vertexPosition;
 in vec3 vertexNormal;
@@ -129,7 +142,7 @@ void main() {
   vec4 mergedLightSpecularColor = vec4(0);
   getMergedLightColors(vertexPosition, fragNormal, shininess, mergedLightDiffuseColor, mergedLightSpecularColor);
 
-  vec3 colorComponent = mergedLightDiffuseColor.rgb*vec3(2)*texture(texture0, uv0).rgb;
+  vec3 colorComponent = mergedLightDiffuseColor.rgb*vec3(2)*texture(texture0.sampler, transformUv3d(texture0.transform3d, uv0)).rgb;
 
   float alphaComponent = 1;
 

FinModelUtility/Formats/Hsd/Hsd Tests/goldens/super_smash_bros_melee/PlMr/output/000090DC.fragment.glsl

@@ -30,7 +30,20 @@ layout (std140, binding = 2) uniform Lights {
 
 uniform vec3 cameraPosition;
 uniform float shininess;
-uniform sampler2D texture0;
+
+struct Texture {
+  sampler2D sampler;
+  mat4 transform3d;
+};
+
+vec2 transformUv3d(mat4 transform3d, vec2 inUv) {
+  vec4 rawTransformedUv = (transform3d * vec4(inUv, 0, 1));
+
+  // We need to manually divide by w for perspective correction!
+  return rawTransformedUv.xy / rawTransformedUv.w;
+}
+
+uniform Texture texture0;
 
 in vec3 vertexPosition;
 in vec3 vertexNormal;
@@ -129,7 +142,7 @@ void main() {
   vec4 mergedLightSpecularColor = vec4(0);
   getMergedLightColors(vertexPosition, fragNormal, shininess, mergedLightDiffuseColor, mergedLightSpecularColor);
 
-  vec3 colorComponent = mergedLightDiffuseColor.rgb*vec3(2)*texture(texture0, uv0).rgb;
+  vec3 colorComponent = mergedLightDiffuseColor.rgb*vec3(2)*texture(texture0.sampler, transformUv3d(texture0.transform3d, uv0)).rgb;
 
   float alphaComponent = 1;