Skip to content

Added MaterialPropertyBlock scale/offset, NormalMap fix #31

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.

Sign up for GitHub

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

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Added MaterialPropertyBlock scale/offset, NormalMap fix #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7924d20
Added MaterialPropertyBlock scale/offset
chrPetry Oct 19, 2021
250347a
Fixed normal map interpretation on export
chrPetry Oct 19, 2021
145fef1
Fixed linear/gamma colorspace color evaluation
chrPetry Oct 20, 2021
9c2b835
Added fix for invalid file names (files with a '.' )
chrPetry Oct 20, 2021
a421576
fixed normal channel shader
chrPetry Oct 20, 2021
975577d
Fixed nan values and refactored min/max searching
chrPetry Oct 20, 2021
c6e1df8
Fixed colors on linear workflow
cpetry Oct 20, 2021
9af6444
Fixed TextureNames being equal but have different content. Removed un…
cpetry Oct 20, 2021
324b4bc
Wrote custom hashcode creator for textures
cpetry Oct 20, 2021
51b96a5
Fixed hash check
cpetry Oct 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion UnityGLTF/Assets/UnityGLTF/Runtime/Resources/NormalChannel.shader
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@
// unpacked.xyz = LinearToGammaSpace(unpacked.xyz);
float4 result = float4(unpacked * 0.5f + 0.5f, 1);
#ifdef UNITY_COLORSPACE_GAMMA
#else
// hack for linear color space, need to figure out
// right way to sample textures.
result.xyz = GammaToLinearSpace(result.xyz);
#else
#endif
return result;
}
Expand Down
28 changes: 19 additions & 9 deletions UnityGLTF/Assets/UnityGLTF/Runtime/Scripts/Extensions/SchemaExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,14 @@ public static UnityEngine.Color ToUnityColorLinear(this GLTF.Math.Color color)
return c;
}

public static GLTF.Math.Color ToNumericsColor(this UnityEngine.Color color)
{
if (QualitySettings.activeColorSpace == ColorSpace.Linear)
return color.ToNumericsColorLinear();
else
return color.ToNumericsColorRaw();
}

public static GLTF.Math.Color ToNumericsColorRaw(this UnityEngine.Color color)
{
var c = color;
Expand Down Expand Up @@ -436,8 +444,10 @@ public static UnityEngine.Vector2[] FlipTexCoordArrayVAndCopy(UnityEngine.Vector

for (var i = 0; i < array.Length; i++)
{
returnArray[i].x = array[i].x;
returnArray[i].y = 1.0f - array[i].y;
var x = array[i].x;
var y = 1.0f - array[i].y;
returnArray[i].x = float.IsNaN(x) ? 0 : x;
returnArray[i].y = float.IsNaN(y) ? 0 : y;
}

return returnArray;
Expand Down Expand Up @@ -470,9 +480,9 @@ public static UnityEngine.Vector3[] ConvertVector3CoordinateSpaceAndCopy(Vector3

for (int i = 0; i < array.Length; i++)
{
returnArray[i].x = array[i].x * coordinateSpaceCoordinateScale.X;
returnArray[i].y = array[i].y * coordinateSpaceCoordinateScale.Y;
returnArray[i].z = array[i].z * coordinateSpaceCoordinateScale.Z;
returnArray[i].x = (float.IsNaN(array[i].x) ? 0 : array[i].x) * coordinateSpaceCoordinateScale.X;
returnArray[i].y = (float.IsNaN(array[i].y) ? 0 : array[i].y) * coordinateSpaceCoordinateScale.Y;
returnArray[i].z = (float.IsNaN(array[i].z) ? 0 : array[i].z) * coordinateSpaceCoordinateScale.Z;
}

return returnArray;
Expand Down Expand Up @@ -506,10 +516,10 @@ public static Vector4[] ConvertVector4CoordinateSpaceAndCopy(Vector4[] array, GL

for (var i = 0; i < array.Length; i++)
{
returnArray[i].x = array[i].x * coordinateSpaceCoordinateScale.X;
returnArray[i].y = array[i].y * coordinateSpaceCoordinateScale.Y;
returnArray[i].z = array[i].z * coordinateSpaceCoordinateScale.Z;
returnArray[i].w = array[i].w * coordinateSpaceCoordinateScale.W;
returnArray[i].x = (float.IsNaN(array[i].x) ? 0 : array[i].x) * coordinateSpaceCoordinateScale.X;
returnArray[i].y = (float.IsNaN(array[i].y) ? 0 : array[i].y) * coordinateSpaceCoordinateScale.Y;
returnArray[i].z = (float.IsNaN(array[i].z) ? 0 : array[i].z) * coordinateSpaceCoordinateScale.Z;
returnArray[i].w = (float.IsNaN(array[i].w) ? 0 : array[i].w) * coordinateSpaceCoordinateScale.W;
}

return returnArray;
Expand Down
Loading