add a pre-kP evaluation function in c

This commit is contained in:
Youmu Liu
2026-04-24 15:46:58 +08:00
parent 2f6617447c
commit 41350b0487
13 changed files with 169 additions and 154 deletions
@@ -36,12 +36,14 @@ namespace StgSharp.Geometries
private bool globalCoordAvailable;
private CoordinationBase localCoordination;
private Matrix44 coordMat;
private GraphicsMatrix coordMat;
public CoordinationBase(CoordinationBase localCoordination)
public CoordinationBase(
CoordinationBase localCoordination
)
{
this.localCoordination = localCoordination;
coordMat = new Matrix44();
coordMat = new GraphicsMatrix();
}
public virtual Point LocalOrigin
@@ -68,11 +70,7 @@ namespace StgSharp.Geometries
set => coordMat.column[3].XYZ = value;
}
protected ref Matrix44 CoordMat
{
[MethodImpl(MethodImplOptions.AggressiveInlining)]
get => ref coordMat;
}
protected ref GraphicsMatrix CoordMat => ref coordMat;
}
}
@@ -38,10 +38,15 @@ namespace StgSharp.Geometries
public class PlainCoordinate : CoordinationBase
{
public PlainCoordinate(CoordinationBase local, Point origin, Vec3 xAxis, Vec3 yAxis)
public PlainCoordinate(
CoordinationBase local,
Point origin,
Vec3 xAxis,
Vec3 yAxis
)
: base(local)
{
CoordMat = Matrix44.Unit;
CoordMat = GraphicsMatrix.Unit;
CoordMat.column[0] = new Vec4(xAxis, 0);
CoordMat.column[1] = new Vec4(yAxis, 0);
@@ -50,8 +55,10 @@ namespace StgSharp.Geometries
LocalOrigin = origin;
}
public static PlainCoordinate StandardPlainCoordination { get; } = new(null, new Point(0, 0, 0),
new Vec3(1, 0, 0), new Vec3(0, 1, 0));
public static PlainCoordinate StandardPlainCoordination { get; } = new(null,
new Point(0, 0, 0),
new Vec3(1, 0, 0),
new Vec3(0, 1, 0));
}
}
@@ -1,6 +1,6 @@
//-----------------------------------------------------------------------
// -----------------------------------------------------------------------
// file="Matrix44"
// file="GraphicsMatrix"
// Project: StgSharp
// AuthorGroup: Nitload
// Copyright (c) Nitload. All rights reserved.
@@ -38,8 +38,8 @@ using System.Runtime.Intrinsics.X86;
namespace StgSharp.Mathematics.Graphics
{
[StructLayout(LayoutKind.Explicit, Size = (16 * sizeof(float)), Pack = 16)]
public unsafe struct Matrix44 : IEquatable<Matrix44>
[StructLayout(LayoutKind.Explicit, Size = 16 * sizeof(float), Pack = 16)]
public unsafe struct GraphicsMatrix : IEquatable<GraphicsMatrix>
{
[FieldOffset(0 * sizeof(float))] internal Column column;
@@ -47,7 +47,7 @@ namespace StgSharp.Mathematics.Graphics
[FieldOffset(0)] internal ColumnSet4 mat;
[FieldOffset(0)] internal MatrixKernel<float> kernel;
internal Matrix44(
internal GraphicsMatrix(
ColumnSet4 mat
)
{
@@ -55,7 +55,7 @@ namespace StgSharp.Mathematics.Graphics
this.mat = mat;
}
internal Matrix44(
internal GraphicsMatrix(
Vector4 vec0,
Vector4 vec1,
Vector4 vec2,
@@ -69,12 +69,12 @@ namespace StgSharp.Mathematics.Graphics
mat.colum3 = vec3;
}
public Matrix44()
public GraphicsMatrix()
{
Unsafe.SkipInit(out this);
}
public unsafe Matrix44(
public unsafe GraphicsMatrix(
float a00,
float a01,
float a02,
@@ -116,7 +116,7 @@ namespace StgSharp.Mathematics.Graphics
throw new ArgumentOutOfRangeException(nameof(columNum));
}
#endif
return kernel[rowNum + 4 * columNum];
return kernel[rowNum + (4 * columNum)];
}
set
{
@@ -129,33 +129,34 @@ namespace StgSharp.Mathematics.Graphics
throw new ArgumentOutOfRangeException(nameof(columNum));
}
#endif
kernel[rowNum + 4 * columNum] = value;
kernel[rowNum + (4 * columNum)] = value;
}
}
public Matrix44 Transpose
public GraphicsMatrix Transpose
{
get
{
Matrix44 transpose = new();
GraphicsMatrix transpose = new();
InternalTranspose(ref transpose);
return transpose;
}
}
public static Matrix44 Unit => new Matrix44(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
public static GraphicsMatrix Unit => new GraphicsMatrix(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0,
0, 0, 0, 1);
public static Matrix44 WNegativeUnit => new Matrix44(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0,
0, 0, -1);
public static GraphicsMatrix WNegativeUnit => new GraphicsMatrix(1, 0, 0, 0, 0, 1, 0, 0, 0,
0, 1, 0, 0, 0, 0, -1);
public static Matrix44 XNegativeUnit => new Matrix44(-1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0,
0, 0, 1);
public static GraphicsMatrix XNegativeUnit => new GraphicsMatrix(-1, 0, 0, 0, 0, 1, 0, 0, 0,
0, 1, 0, 0, 0, 0, 1);
public static Matrix44 YNegativeUnit => new Matrix44(1, 0, 0, 0, 0, -1, 0, 0, 0, 0, 1, 0, 0,
0, 0, 1);
public static GraphicsMatrix YNegativeUnit => new GraphicsMatrix(1, 0, 0, 0, 0, -1, 0, 0, 0,
0, 1, 0, 0, 0, 0, 1);
public static Matrix44 ZNegativeUnit => new Matrix44(1, 0, 0, 0, 0, 1, 0, 0, 0, 0, -1, 0, 0,
0, 0, 1);
public static GraphicsMatrix ZNegativeUnit => new GraphicsMatrix(1, 0, 0, 0, 0, 1, 0, 0, 0,
0, -1, 0, 0, 0, 0, 1);
public ReadOnlySpan<float> AsSpan()
{
@@ -166,11 +167,11 @@ namespace StgSharp.Mathematics.Graphics
object? obj
)
{
return obj is Matrix44 x && Equals(x);
return (obj is GraphicsMatrix x) && Equals(x);
}
public bool Equals(
Matrix44 other
GraphicsMatrix other
)
{
return mat.Equals(other.mat);
@@ -184,7 +185,7 @@ namespace StgSharp.Mathematics.Graphics
[MethodImpl(MethodImplOptions.AggressiveInlining)]
internal unsafe void InternalTranspose(
ref Matrix44 transpose
ref GraphicsMatrix transpose
)
{
const int f32 = 0;
@@ -196,46 +197,46 @@ namespace StgSharp.Mathematics.Graphics
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static unsafe Matrix44 operator -(
Matrix44 left,
Matrix44 right
public static unsafe GraphicsMatrix operator -(
GraphicsMatrix left,
GraphicsMatrix right
)
{
Matrix44 ret = new();
GraphicsMatrix ret = new();
int f32 = MatrixElementType.F32.IntrinsicNode;
NumericalModule.GlobalContext.mat_sk[f32].Call(MatrixIntrinsicHandle.Sub,
(MatrixKernel*)&left,
(MatrixKernel*)&right,
(MatrixKernel*)&ret, 1);
(MatrixKernel*)&left.kernel,
(MatrixKernel*)&right.kernel,
(MatrixKernel*)&ret.kernel, 1);
return ret;
}
public static bool operator !=(
Matrix44 left,
Matrix44 right
GraphicsMatrix left,
GraphicsMatrix right
)
{
return !(left == right);
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static unsafe Matrix44 operator *(
Matrix44 mat,
float value
public static unsafe GraphicsMatrix operator *(
GraphicsMatrix mat,
float value
)
{
int f32 = MatrixElementType.F32.IntrinsicNode;
return new Matrix44(mat.mat.colum0 * value, mat.mat.colum1 * value,
mat.mat.colum2 * value, mat.mat.colum3 * value);
return new GraphicsMatrix(mat.mat.colum0 * value, mat.mat.colum1 * value,
mat.mat.colum2 * value, mat.mat.colum3 * value);
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Matrix44 operator *(
Matrix44 left,
Matrix44 right
public static GraphicsMatrix operator *(
GraphicsMatrix left,
GraphicsMatrix right
)
{
Matrix44 ret = new();
GraphicsMatrix ret = new();
int f32 = MatrixElementType.F32.IntrinsicNode;
NumericalModule.GlobalContext.mat_sk[f32].Call(MatrixIntrinsicHandle.Fma,
(MatrixKernel*)&left,
@@ -245,12 +246,12 @@ namespace StgSharp.Mathematics.Graphics
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static unsafe Matrix44 operator +(
Matrix44 left,
Matrix44 right
public static unsafe GraphicsMatrix operator +(
GraphicsMatrix left,
GraphicsMatrix right
)
{
Matrix44 ret = new();
GraphicsMatrix ret = new();
int f32 = MatrixElementType.F32.IntrinsicNode;
NumericalModule.GlobalContext.mat_sk[f32].Call(MatrixIntrinsicHandle.Add,
(MatrixKernel*)&left,
@@ -260,8 +261,8 @@ namespace StgSharp.Mathematics.Graphics
}
public static bool operator ==(
Matrix44 left,
Matrix44 right
GraphicsMatrix left,
GraphicsMatrix right
)
{
return left.Equals(right);
+5 -13
View File
@@ -122,17 +122,9 @@ namespace StgSharp.Mathematics.Graphics
}
}
public static Vec4 One
{
[MethodImpl(MethodImplOptions.AggressiveInlining)]
get => new Vec4(1, 1, 1, 1);
}
public static Vec4 One => new Vec4(1, 1, 1, 1);
public static Vec4 Zero
{
[MethodImpl(MethodImplOptions.AggressiveInlining)]
get => new Vec4(0, 0, 0, 0);
}
public static Vec4 Zero => new Vec4(0, 0, 0, 0);
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Vec4 Add(
@@ -152,7 +144,7 @@ namespace StgSharp.Mathematics.Graphics
object obj
)
{
return obj is Vec4 v && v == this;
return (obj is Vec4 v) && (v == this);
}
public static Vec4 FromSpan(
@@ -212,11 +204,11 @@ namespace StgSharp.Mathematics.Graphics
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public static Vec4 operator *(
Matrix44 mat,
GraphicsMatrix mat,
Vec4 vec
)
{
Matrix44 transpose = mat.Transpose;
GraphicsMatrix transpose = mat.Transpose;
return new Vec4(Vector4.Dot(transpose.mat.colum0, vec.vec),
Vector4.Dot(transpose.mat.colum1, vec.vec),
Vector4.Dot(transpose.mat.colum2, vec.vec),
@@ -66,7 +66,7 @@ namespace StgSharp.Mathematics.Numeric
for (int i = 0; i < _numaMeasurements.Length; i++)
{
MatrixParallelThread[] numa = _numaThreads[i];
if ((numa is null) | (numa.Length == 0))
if ((numa is null) || (numa.Length == 0))
{
continue;
}
@@ -30,7 +30,6 @@ using StgSharp.HighPerformance.ProcessorAbstraction;
using System.Collections.Generic;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Text.RegularExpressions;
namespace StgSharp.Mathematics.Numeric
{
@@ -81,7 +80,7 @@ namespace StgSharp.Mathematics.Numeric
}
contextMap = [];
int count = Environment.ProcessorCount;
SIMDID globalSimd = new SIMDID(0);
SIMDID globalSimd = new(0);
_retiredThreads = new(RESERVED_THREAD_COUNT);
// init thread on all logical cores