Skip to content

Commit fdf9fb4

Browse files
committed
Merge branch 'dev/transparent-rendering'
2 parents 607d1cf + a1e2481 commit fdf9fb4

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

source/Extensions/ShaderVertexInputAttributeExtensions.cs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ namespace Rendering
1010
[SkipLocalsInit]
1111
public static class ShaderVertexInputAttributeExtensions
1212
{
13-
private static readonly Types.Type vector2Type;
14-
private static readonly Types.Type vector3Type;
15-
private static readonly Types.Type vector4Type;
13+
private static readonly TypeMetadata vector2Type;
14+
private static readonly TypeMetadata vector3Type;
15+
private static readonly TypeMetadata vector4Type;
1616

1717
static ShaderVertexInputAttributeExtensions()
1818
{
@@ -35,16 +35,15 @@ public static bool TryDeduceMeshChannel(this ShaderVertexInputAttribute attribut
3535
nameBuffer[i] = char.ToLower(nameBuffer[i]);
3636
}
3737

38-
Types.Type attributeType = attribute.Type;
39-
if (attributeType == vector2Type)
38+
if (attribute.type == vector2Type)
4039
{
4140
if (nameBuffer.IndexOf("uv") != -1)
4241
{
4342
meshChannel = MeshChannel.UV;
4443
return true;
4544
}
4645
}
47-
else if (attributeType == vector3Type)
46+
else if (attribute.type == vector3Type)
4847
{
4948
if (nameBuffer.IndexOf("normal") != -1)
5049
{
@@ -67,7 +66,7 @@ public static bool TryDeduceMeshChannel(this ShaderVertexInputAttribute attribut
6766
return true;
6867
}
6968
}
70-
else if (attributeType == vector4Type)
69+
else if (attribute.type == vector4Type)
7170
{
7271
if (nameBuffer.IndexOf("color") != -1)
7372
{

tests/RenderingTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ public abstract class RenderingTests : WorldTests
1212
{
1313
static RenderingTests()
1414
{
15-
MetadataRegistry.Load<DataTypeBank>();
16-
MetadataRegistry.Load<MeshesTypeBank>();
17-
MetadataRegistry.Load<MaterialsTypeBank>();
18-
MetadataRegistry.Load<RenderingTypeBank>();
19-
MetadataRegistry.Load<ShadersTypeBank>();
15+
MetadataRegistry.Load<DataMetadataBank>();
16+
MetadataRegistry.Load<MeshesMetadataBank>();
17+
MetadataRegistry.Load<MaterialsMetadataBank>();
18+
MetadataRegistry.Load<RenderingMetadataBank>();
19+
MetadataRegistry.Load<ShadersMetadataBank>();
2020
}
2121

2222
protected override Schema CreateSchema()

0 commit comments

Comments
 (0)