Skip to content

When setting material, match case sensitive first then ignore case #17

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 1 commit into
base: master
Choose a base branch
from
Open

When setting material, match case sensitive first then ignore case #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions source/CjClutter.ObjLoader.Loader/Common/StringExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ public static bool EqualsOrdinalIgnoreCase(this string str, string s)
return str.Equals(s, StringComparison.OrdinalIgnoreCase);
}

public static bool EqualsOrdinal(this string str, string s)
{
return str.Equals(s, StringComparison.Ordinal);
}

public static bool IsNullOrEmpty(this string str)
{
return string.IsNullOrEmpty(str);
Expand Down
3 changes: 2 additions & 1 deletion source/CjClutter.ObjLoader.Loader/Data/DataStore/DataStore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ public void Push(Material material)

public void SetMaterial(string materialName)
{
var material = _materials.SingleOrDefault(x => x.Name.EqualsOrdinalIgnoreCase(materialName));
var material = _materials.SingleOrDefault(x => x.Name.EqualsOrdinal(materialName)) ??
_materials.SingleOrDefault(x => x.Name.EqualsOrdinalIgnoreCase(materialName));
PushGroupIfNeeded();
_currentGroup.Material = material;
}
Expand Down