Pilz.NET/Pilz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update MaterialCompareTo to compare the reference hash code instead of equaling the reference

Browse Source
This commit is contained in:
Pascal
2020-12-03 08:09:32 +01:00
parent 0ce9f04fc5
commit af10069fc0
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Pilz.Simple3DFileParser/Model/Material.vb
View File

@@ -1,7 +1,7 @@
Imports System.Numerics Imports System.Numerics
Public Class Material Public Class Material
Implements IComparable Implements IComparable(Of Material)
Public Property Image As Image = Nothing Public Property Image As Image = Nothing
Public Property Color As Color? = Nothing Public Property Color As Color? = Nothing
@@ -10,16 +10,11 @@ Public Class Material
Public Property Scale As New Vector2(1.0F, 1.0F) Public Property Scale As New Vector2(1.0F, 1.0F)
Public Property Tag As Object = Nothing Public Property Tag As Object = Nothing
Public Function CompareTo(obj As Object) As Integer Implements IComparable.CompareTo Public Function CompareTo(obj As Material) As Integer Implements IComparable(Of Material).CompareTo
If obj IsNot Nothing Then 'If obj Is Me Then Return 0
If obj Is Me Then 'If obj Is Nothing Then Return 1
Return 0 'Return -1
Else Return GetHashCode() - If(obj?.GetHashCode, 0)
Return -1
End If
Else
Return 1
End If
End Function End Function
End Class End Class