Skip to content

Commit 79fffe4

Browse files
kcoleykcoley
committed
Merge branch 'develop'
2 parents d825a27 + c7e7670 commit 79fffe4

9 files changed

+44
-41
lines changed

‎Source/Common.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,16 @@ public static Runtime.GLTF SinglePlane()
7272
{
7373
new List<Vector2>
7474
{
75-
new Vector2(0.0f, 1.0f),
7675
new Vector2(1.0f, 1.0f),
77-
new Vector2(1.0f, 0.0f),
78-
new Vector2(0.0f, 0.0f)
76+
new Vector2(0.0f, 1.0f),
77+
new Vector2(0.0f, 0.0f),
78+
new Vector2(1.0f, 0.0f)
7979
},
8080
};
8181

8282
List<int> PlaneIndices = new List<int>
8383
{
84-
0, 1, 3, 1, 2, 3
84+
1, 0, 3, 1, 3, 2
8585
};
8686
Runtime.GLTF wrapper = new Runtime.GLTF();
8787
Runtime.Scene scene = new Runtime.Scene();

‎Source/Runtime/MeshPrimitive.cs

+13-13
Original file line numberDiff line numberDiff line change
@@ -307,12 +307,12 @@ public glTFLoader.Schema.MeshPrimitive ConvertToSchema(Runtime.GLTF gltf, List<g
307307

308308
foreach (Vector4 color in Colors)
309309
{
310-
geometryData.Writer.Write(Convert.ToByte(color.x));
311-
geometryData.Writer.Write(Convert.ToByte(color.y));
312-
geometryData.Writer.Write(Convert.ToByte(color.z));
310+
geometryData.Writer.Write(Convert.ToByte(Math.Round(color.x * byte.MaxValue)));
311+
geometryData.Writer.Write(Convert.ToByte(Math.Round(color.y * byte.MaxValue)));
312+
geometryData.Writer.Write(Convert.ToByte(Math.Round(color.z * byte.MaxValue)));
313313
if (colorAccessorType == glTFLoader.Schema.Accessor.TypeEnum.VEC4)
314314
{
315-
geometryData.Writer.Write(Convert.ToByte(color.w));
315+
geometryData.Writer.Write(Convert.ToByte(Math.Round(color.w * byte.MaxValue)));
316316
}
317317
}
318318
break;
@@ -322,12 +322,12 @@ public glTFLoader.Schema.MeshPrimitive ConvertToSchema(Runtime.GLTF gltf, List<g
322322

323323
foreach (Vector4 color in Colors)
324324
{
325-
geometryData.Writer.Write(Convert.ToUInt16(color.x));
326-
geometryData.Writer.Write(Convert.ToUInt16(color.y));
327-
geometryData.Writer.Write(Convert.ToUInt16(color.z));
325+
geometryData.Writer.Write(Convert.ToUInt16(Math.Round(color.x * ushort.MaxValue)));
326+
geometryData.Writer.Write(Convert.ToUInt16(Math.Round(color.y * ushort.MaxValue)));
327+
geometryData.Writer.Write(Convert.ToUInt16(Math.Round(color.z * ushort.MaxValue)));
328328
if (colorAccessorType == glTFLoader.Schema.Accessor.TypeEnum.VEC4)
329329
{
330-
geometryData.Writer.Write(Convert.ToUInt16(color.w));
330+
geometryData.Writer.Write(Convert.ToUInt16(Math.Round(color.w * ushort.MaxValue)));
331331
}
332332
}
333333
break;
@@ -412,16 +412,16 @@ public glTFLoader.Schema.MeshPrimitive ConvertToSchema(Runtime.GLTF gltf, List<g
412412
{
413413
foreach (Vector2 tcs in textureCoordSetArr)
414414
{
415-
geometryData.Writer.Write(Convert.ToByte(tcs.x));
416-
geometryData.Writer.Write(Convert.ToByte(tcs.y));
415+
geometryData.Writer.Write(Convert.ToByte(Math.Round(tcs.x * byte.MaxValue)));
416+
geometryData.Writer.Write(Convert.ToByte(Math.Round(tcs.y * byte.MaxValue)));
417417
}
418418
}
419419
else if (accessor.ComponentType == glTFLoader.Schema.Accessor.ComponentTypeEnum.UNSIGNED_SHORT)
420420
{
421-
foreach(Vector2 tcs in textureCoordSetArr)
421+
foreach (Vector2 tcs in textureCoordSetArr)
422422
{
423-
geometryData.Writer.Write(Convert.ToUInt16(tcs.x));
424-
geometryData.Writer.Write(Convert.ToUInt16(tcs.y));
423+
geometryData.Writer.Write(Convert.ToUInt16(Math.Round(tcs.x * ushort.MaxValue)));
424+
geometryData.Writer.Write(Convert.ToUInt16(Math.Round(tcs.y * ushort.MaxValue)));
425425
}
426426
}
427427
}

‎Source/Tests/Material.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ public Material()
2727
usedImages.Add(occlusionTexture);
2828
List<Vector3> planeNormals = new List<Vector3>()
2929
{
30-
new Vector3( 0.0f, 0.0f,-1.0f),
31-
new Vector3( 0.0f, 0.0f,-1.0f),
32-
new Vector3( 0.0f, 0.0f,-1.0f),
33-
new Vector3( 0.0f, 0.0f,-1.0f)
30+
new Vector3( 0.0f, 0.0f,1.0f),
31+
new Vector3( 0.0f, 0.0f,1.0f),
32+
new Vector3( 0.0f, 0.0f,1.0f),
33+
new Vector3( 0.0f, 0.0f,1.0f)
3434
};
3535
requiredProperty = new List<Property>
3636
{

‎Source/Tests/Material_Alpha.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ public Material_Alpha()
1717
usedImages.Add(baseColorTexture);
1818
List<Vector4> colorCoord = new List<Vector4>()
1919
{
20-
new Vector4( 0.3f, 0.3f, 0.3f, 0.2f),
2120
new Vector4( 0.3f, 0.3f, 0.3f, 0.4f),
22-
new Vector4( 0.3f, 0.3f, 0.3f, 0.6f),
23-
new Vector4( 0.3f, 0.3f, 0.3f, 0.8f)
21+
new Vector4( 0.3f, 0.3f, 0.3f, 0.2f),
22+
new Vector4( 0.3f, 0.3f, 0.3f, 0.8f),
23+
new Vector4( 0.3f, 0.3f, 0.3f, 0.6f)
2424
};
2525
properties = new List<Property>
2626
{

‎Source/Tests/Material_MetallicRoughness.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ public Material_MetallicRoughness()
2121
usedImages.Add(metallicRoughnessTexture);
2222
List<Vector4> colorCoord = new List<Vector4>()
2323
{
24-
new Vector4( 1.0f, 0.0f, 0.0f, 0.8f),
2524
new Vector4( 0.0f, 0.0f, 1.0f, 0.8f),
2625
new Vector4( 1.0f, 0.0f, 0.0f, 0.8f),
27-
new Vector4( 0.0f, 0.0f, 1.0f, 0.8f)
26+
new Vector4( 0.0f, 0.0f, 1.0f, 0.8f),
27+
new Vector4( 1.0f, 0.0f, 0.0f, 0.8f)
2828
};
2929
properties = new List<Property>
3030
{

‎Source/Tests/Material_SpecularGlossiness.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ public Material_SpecularGlossiness()
2121
usedImages.Add(specularGlossinessTexture);
2222
List<Vector4> colorCoord = new List<Vector4>()
2323
{
24-
new Vector4( 1.0f, 0.0f, 0.0f, 0.8f),
2524
new Vector4( 0.0f, 0.0f, 1.0f, 0.8f),
2625
new Vector4( 1.0f, 0.0f, 0.0f, 0.8f),
27-
new Vector4( 0.0f, 0.0f, 1.0f, 0.8f)
26+
new Vector4( 0.0f, 0.0f, 1.0f, 0.8f),
27+
new Vector4( 1.0f, 0.0f, 0.0f, 0.8f)
2828
};
2929
properties = new List<Property>
3030
{

‎Source/Tests/Primitive_Attribute.cs

+11-10
Original file line numberDiff line numberDiff line change
@@ -32,24 +32,25 @@ public Primitive_Attribute()
3232
usedImages.Add(uvIcon1);
3333
List<Vector3> planeNormals = new List<Vector3>()
3434
{
35-
new Vector3( 0.0f, 0.0f,-1.0f),
36-
new Vector3( 0.0f, 0.0f,-1.0f),
37-
new Vector3( 0.0f, 0.0f,-1.0f),
38-
new Vector3( 0.0f, 0.0f,-1.0f)
35+
new Vector3( 0.0f, 0.0f,1.0f),
36+
new Vector3( 0.0f, 0.0f,1.0f),
37+
new Vector3( 0.0f, 0.0f,1.0f),
38+
new Vector3( 0.0f, 0.0f,1.0f)
3939
};
4040
List<Vector2> uvCoord2 = new List<Vector2>()
4141
{
42-
new Vector2(0.5f, 0.5f),
4342
new Vector2(1.0f, 0.5f),
44-
new Vector2(1.0f, 0.0f),
45-
new Vector2(0.5f, 0.0f)
43+
new Vector2(0.5f, 0.5f),
44+
new Vector2(0.5f, 0.0f),
45+
new Vector2(1.0f, 0.0f)
4646
};
4747
List<Vector4> colorCoord = new List<Vector4>()
4848
{
49-
new Vector4( 1.0f, 0.0f, 0.0f, 0.2f),
5049
new Vector4( 0.0f, 1.0f, 0.0f, 0.2f),
51-
new Vector4( 0.0f, 0.0f, 1.0f, 0.2f),
52-
new Vector4( 1.0f, 1.0f, 0.0f, 0.2f)
50+
new Vector4( 1.0f, 0.0f, 0.0f, 0.2f),
51+
new Vector4( 1.0f, 1.0f, 0.0f, 0.2f),
52+
new Vector4( 0.0f, 0.0f, 1.0f, 0.2f)
53+
5354
};
5455
List<Vector4> tanCoord = new List<Vector4>()
5556
{

‎Source/Tests/Primitive_Attribute.md

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ No attributes are explicitly set in every model generated by this test, other th
22

33
If both Vertex UV 0 and 1 are set on a model, then all of the textures will use Vertex UV 1.
44

5+
All values of Byte and Short are normalized unsigned.
6+
57
Vertex UV 0 | Vertex UV 1
68
:---: | :---:
79
<img src="./UVspaceIcon-0.png" height="72" width="72" align="middle"> | <img src="./UVspaceIcon-1.png" height="72" width="72" align="middle">

‎Source/Tests/Texture_Sampler.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ public Texture_Sampler()
1919
usedImages.Add(baseColorTexture);
2020
List<Vector2> uvCoord = new List<Vector2>()
2121
{
22-
new Vector2(-0.3f, 1.3f),
2322
new Vector2( 1.3f, 1.3f),
24-
new Vector2( 1.3f,-0.3f),
25-
new Vector2(-0.3f,-0.3f)
23+
new Vector2(-0.3f, 1.3f),
24+
new Vector2(-0.3f,-0.3f),
25+
new Vector2( 1.3f,-0.3f)
2626
};
2727
requiredProperty = new List<Property>
2828
{

0 commit comments

Comments
 (0)