youmuliu/stgsharp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New IO structure, unexpexted error in C code

Browse Source
This commit is contained in:
Nitload
2023-06-22 03:33:24 +08:00
parent 50b4965e54
commit ee8132c149
172 changed files with 1344 additions and 4023 deletions
Download Patch File Download Diff File Expand all files Collapse all files
源代码/StgSharp/Math/Linear/Vector.Multiple.cs
+40 -45
View File
@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Security.Cryptography.X509Certificates;
using System.Text;
namespace StgSharp.Math
namespace StgSharp.Math
{
public static unsafe partial class VectorCalc
{
@@ -131,7 +126,7 @@ namespace StgSharp.Math
*(p1 + 2) * *(p2 + 0) + *(p1 + 3) * *(p2 + 1)
);
}
/// <summary>
///
/// </summary>
@@ -373,8 +368,8 @@ namespace StgSharp.Math
var c2 = a1.multiple(b12) + a2.multiple(b22);
return new matrix2x4(
new vec4d(c1.row1,c2.row1),
new vec4d(c1.row2,c2.row2)
new vec4d(c1.row1, c2.row1),
new vec4d(c1.row2, c2.row2)
);
}
@@ -448,11 +443,11 @@ namespace StgSharp.Math
float* p2 = &matrix2.row1.X;
return new matrix2x3(
getMatrixMember(p1,p2), getMatrixMember(p1, p2+1), getMatrixMember(p1, p2+2),
getMatrixMember(p1+4, p2), getMatrixMember(p1+4, p2+1), getMatrixMember(p1+4, p2 + 2)
getMatrixMember(p1, p2), getMatrixMember(p1, p2 + 1), getMatrixMember(p1, p2 + 2),
getMatrixMember(p1 + 4, p2), getMatrixMember(p1 + 4, p2 + 1), getMatrixMember(p1 + 4, p2 + 2)
);
}
/// <summary>
@@ -464,19 +459,19 @@ namespace StgSharp.Math
public static unsafe matrix2x4 multiple(this matrix2x4 matrix1, matrix4x4 matrix2)
{
matrix2x2 a1 = new matrix2x2(matrix1.row1.Point1,matrix1.row2.Point1);
matrix2x2 a1 = new matrix2x2(matrix1.row1.Point1, matrix1.row2.Point1);
matrix2x2 a2 = new matrix2x2(matrix1.row1.Point2, matrix1.row2.Point2);
matrix2x2 b11 = new matrix2x2(matrix2.row1.Point1, matrix2.row2.Point1);
matrix2x2 b12 = new matrix2x2(matrix2.row1.Point2, matrix2.row2.Point2);
matrix2x2 b21 = new matrix2x2(matrix2.row3.Point1, matrix2.row4.Point1);
matrix2x2 b22 = new matrix2x2(matrix2.row3.Point2, matrix2.row4.Point2);
var c1 = a1.multiple(b11) + a2.multiple(b21);
var c2 = a1.multiple(b12) + a2.multiple(b22);
return new matrix2x4(
new vec4d(c1.row1, c2.row1),
new vec4d(c1.row1, c2.row1),
new vec4d(c1.row2, c2.row2));
}
@@ -533,9 +528,9 @@ namespace StgSharp.Math
float* p3 = &m11.row1.X;
return new matrix3x3(
*(p3 + 0), *(p3 + 1),m12.X,
*(p3 + 2), *(p3 + 3),m12.Y,
m21.X, m21.Y, m22
*(p3 + 0), *(p3 + 1), m12.X,
*(p3 + 2), *(p3 + 3), m12.Y,
m21.X, m21.Y, m22
);
}
@@ -547,7 +542,7 @@ namespace StgSharp.Math
/// <returns></returns>
public static unsafe matrix3x4 multiple(this matrix3x2 matrix1, matrix2x4 matrix2)
{
var a1 = new matrix2x2(matrix1.row1,matrix1.row2);
var a1 = new matrix2x2(matrix1.row1, matrix1.row2);
var a2 = matrix1.row3;
var b1 = new matrix2x2(matrix2.row1.Point1, matrix2.row2.Point1);
@@ -589,13 +584,13 @@ namespace StgSharp.Math
var a21 = new vec2d(*(p1 + 6), *(p1 + 7));
var a22 = *(p1 + 8);
var b1 = new matrix2x2(matrix2.row1,matrix2.row2);
var b1 = new matrix2x2(matrix2.row1, matrix2.row2);
var b2 = matrix2.row3;
var c1 = a11.multiple(b1) + a12.multiple(b2);
var c2 = a21.multiple(b1) + b2 * a22;
return new matrix3x2(c1.row1,c1.row2,c2);
return new matrix3x2(c1.row1, c1.row2, c2);
}
/// <summary>
@@ -655,9 +650,9 @@ namespace StgSharp.Math
return new matrix3x4(
new vec4d(c11.row1,c12.row1),
new vec4d(c11.row2,c12.row2),
new vec4d(c21,c22)
new vec4d(c11.row1, c12.row1),
new vec4d(c11.row2, c12.row2),
new vec4d(c21, c22)
);
}
@@ -693,7 +688,7 @@ namespace StgSharp.Math
var c1 = a11.multiple(b1) + a12.multiple(b2);
var c2 = a21.multiple(b1) + a22.multiple(b2);
return new matrix3x2(c1.row1,c1.row2,c2);
return new matrix3x2(c1.row1, c1.row2, c2);
}
/// <summary>
@@ -750,8 +745,8 @@ namespace StgSharp.Math
float* p1 = &matrix1.row1.X;
float* p2 = &matrix2.row1.X;
var a11 = new matrix2x2(matrix1.row1.Point1,matrix1.row2.Point1);
var a12 = new matrix2x2(matrix1.row1.Point2,matrix1.row2.Point2);
var a11 = new matrix2x2(matrix1.row1.Point1, matrix1.row2.Point1);
var a12 = new matrix2x2(matrix1.row1.Point2, matrix1.row2.Point2);
var a21 = matrix1.row3.Point1;
var a22 = matrix1.row3.Point2;
@@ -766,10 +761,10 @@ namespace StgSharp.Math
var c4 = a21.multiple(b12) + a22.multiple(b22);
return new matrix3x4(
new vec4d(c1.row1,c2.row1),
new vec4d(c1.row2,c2.row2),
new vec4d(c3,c4)
) ;
new vec4d(c1.row1, c2.row1),
new vec4d(c1.row2, c2.row2),
new vec4d(c3, c4)
);
}
@@ -813,10 +808,10 @@ namespace StgSharp.Math
var u7 = u3 + m5;
return new matrix4x2(
new vec2d(u1.X,u5.X),
new vec2d(u1.Y,u5.Y),
new vec2d(u6.X,u7.X),
new vec2d(u6.Y,u7.Y)
new vec2d(u1.X, u5.X),
new vec2d(u1.Y, u5.Y),
new vec2d(u6.X, u7.X),
new vec2d(u6.Y, u7.Y)
);
}
@@ -839,10 +834,10 @@ namespace StgSharp.Math
float* pc2 = &c21.row1.X;
return new matrix4x3(
*(pc1 + 0), *(pc1 + 1),c12.X,
*(pc1 + 2), *(pc1 + 3),c12.Y,
*(pc2 + 0), *(pc2 + 1),c22.X,
*(pc2 + 2), *(pc2 + 3),c22.Y
*(pc1 + 0), *(pc1 + 1), c12.X,
*(pc1 + 2), *(pc1 + 3), c12.Y,
*(pc2 + 0), *(pc2 + 1), c22.X,
*(pc2 + 2), *(pc2 + 3), c22.Y
);
}
@@ -917,7 +912,7 @@ namespace StgSharp.Math
var c1 = a11.multiple(b1) + a12.multiple(b2);
var c2 = a21.multiple(b1) + a22.multiple(b2);
return new matrix4x2(c1.row1,c1.row2,c2.row1,c2.row2);
return new matrix4x2(c1.row1, c1.row2, c2.row1, c2.row2);
}
@@ -945,10 +940,10 @@ namespace StgSharp.Math
float* p4 = &c21.row1.X;
return new matrix4x3(
*(p3 + 0), *(p3 + 1),c12.X,
*(p3 + 2), *(p3 + 3),c12.Y,
*(p4 + 0), *(p4 + 1),c22.X,
*(p4 + 2), *(p4 + 3),c22.Y
*(p3 + 0), *(p3 + 1), c12.X,
*(p3 + 2), *(p3 + 3), c12.Y,
*(p4 + 0), *(p4 + 1), c22.X,
*(p4 + 2), *(p4 + 3), c22.Y
);
}
@@ -962,7 +957,7 @@ namespace StgSharp.Math
var a21 = new matrix2x2(*(p1 + 6), *(p1 + 7), *(p1 + 9), *(p1 + 10));
var a22 = new colum2(*(p1 + 8), *(p1 + 11));
var b11 = new matrix2x2 (*(p2 + 0), *(p2 + 1), *(p2 + 4), *(p2 + 5));
var b11 = new matrix2x2(*(p2 + 0), *(p2 + 1), *(p2 + 4), *(p2 + 5));
var b12 = new matrix2x2(*(p2 + 2), *(p2 + 3), *(p2 + 6), *(p2 + 7));
var b21 = matrix2.row3.Point1;
var b22 = matrix2.row3.Point2;