Skip to content

Commit 67b19c0

Browse files
committed
Upgraded to .Net 4.6
Replaced Datamodel Vector types with the new System.Numerics types Added AttributeList.OverrideType, which is used to differentiate Vector3/Angle and byte[]/binary. Added Datamodel.XAML namespace, which contains dummy Vector types with TypeConverter attributes. Use these in XAML instead of the old Vector types.
1 parent 0cc538a commit 67b19c0

File tree

11 files changed

+313
-663
lines changed

11 files changed

+313
-663
lines changed

Arrays.cs

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Collections.Specialized;
55
using System.Diagnostics;
66
using System.Linq;
7-
using System.Text;
7+
using System.Numerics;
88
using System.Drawing;
99
using System.Threading;
1010
using System.ComponentModel;
@@ -546,17 +546,6 @@ public Vector3Array(int capacity)
546546
{ }
547547
}
548548

549-
public class AngleArray : Array<Angle>
550-
{
551-
public AngleArray() { }
552-
public AngleArray(IEnumerable<Angle> enumerable)
553-
: base(enumerable)
554-
{ }
555-
public AngleArray(int capacity)
556-
: base(capacity)
557-
{ }
558-
}
559-
560549
public class Vector4Array : Array<Vector4>
561550
{
562551
public Vector4Array() { }
@@ -579,10 +568,10 @@ public QuaternionArray(int capacity)
579568
{ }
580569
}
581570

582-
public class MatrixArray : Array<Matrix>
571+
public class MatrixArray : Array<Matrix4x4>
583572
{
584573
public MatrixArray() { }
585-
public MatrixArray(IEnumerable<Matrix> enumerable)
574+
public MatrixArray(IEnumerable<Matrix4x4> enumerable)
586575
: base(enumerable)
587576
{ }
588577
public MatrixArray(int capacity)

0 commit comments

Comments
 (0)