diff --git a/源代码/.vs/ProjectEvaluation/stgsharp.metadata.v5.1 b/源代码/.vs/ProjectEvaluation/stgsharp.metadata.v5.1 index 261cc103..e10b177c 100644 Binary files a/源代码/.vs/ProjectEvaluation/stgsharp.metadata.v5.1 and b/源代码/.vs/ProjectEvaluation/stgsharp.metadata.v5.1 differ diff --git a/源代码/.vs/ProjectEvaluation/stgsharp.projects.v5.1 b/源代码/.vs/ProjectEvaluation/stgsharp.projects.v5.1 index 751643ee..f0a0858d 100644 Binary files a/源代码/.vs/ProjectEvaluation/stgsharp.projects.v5.1 and b/源代码/.vs/ProjectEvaluation/stgsharp.projects.v5.1 differ diff --git a/源代码/.vs/StgSharp/DesignTimeBuild/.dtbcache.v2 b/源代码/.vs/StgSharp/DesignTimeBuild/.dtbcache.v2 index 0bcbc1a5..a5bb0a99 100644 Binary files a/源代码/.vs/StgSharp/DesignTimeBuild/.dtbcache.v2 and b/源代码/.vs/StgSharp/DesignTimeBuild/.dtbcache.v2 differ diff --git a/源代码/.vs/StgSharp/FileContentIndex/1f0de475-5018-4a96-928b-308327088021.vsidx b/源代码/.vs/StgSharp/FileContentIndex/1f0de475-5018-4a96-928b-308327088021.vsidx deleted file mode 100644 index 7965a6e5..00000000 Binary files a/源代码/.vs/StgSharp/FileContentIndex/1f0de475-5018-4a96-928b-308327088021.vsidx and /dev/null differ diff --git a/源代码/.vs/StgSharp/FileContentIndex/3088d0c6-a749-4e83-93f4-b3bcc537402c.vsidx b/源代码/.vs/StgSharp/FileContentIndex/3088d0c6-a749-4e83-93f4-b3bcc537402c.vsidx new file mode 100644 index 00000000..55545a34 Binary files /dev/null and b/源代码/.vs/StgSharp/FileContentIndex/3088d0c6-a749-4e83-93f4-b3bcc537402c.vsidx differ diff --git a/源代码/.vs/StgSharp/FileContentIndex/78b6b399-b415-41ca-80bd-ceb57e029f8f.vsidx b/源代码/.vs/StgSharp/FileContentIndex/78b6b399-b415-41ca-80bd-ceb57e029f8f.vsidx new file mode 100644 index 00000000..b7687963 Binary files /dev/null and b/源代码/.vs/StgSharp/FileContentIndex/78b6b399-b415-41ca-80bd-ceb57e029f8f.vsidx differ diff --git a/源代码/.vs/StgSharp/FileContentIndex/a089eeac-2ec9-4831-8a9e-b3d2a3c906b2.vsidx b/源代码/.vs/StgSharp/FileContentIndex/a089eeac-2ec9-4831-8a9e-b3d2a3c906b2.vsidx new file mode 100644 index 00000000..6586e121 Binary files /dev/null and b/源代码/.vs/StgSharp/FileContentIndex/a089eeac-2ec9-4831-8a9e-b3d2a3c906b2.vsidx differ diff --git a/源代码/.vs/StgSharp/FileContentIndex/d35b2eed-856f-44a1-b7ab-9a24e8bfc310.vsidx b/源代码/.vs/StgSharp/FileContentIndex/d35b2eed-856f-44a1-b7ab-9a24e8bfc310.vsidx new file mode 100644 index 00000000..2d71dc18 Binary files /dev/null and b/源代码/.vs/StgSharp/FileContentIndex/d35b2eed-856f-44a1-b7ab-9a24e8bfc310.vsidx differ diff --git a/源代码/.vs/StgSharp/FileContentIndex/e4b94b52-7234-4feb-aa8c-60c34ad71b89.vsidx b/源代码/.vs/StgSharp/FileContentIndex/e4b94b52-7234-4feb-aa8c-60c34ad71b89.vsidx deleted file mode 100644 index 67fa72c9..00000000 Binary files a/源代码/.vs/StgSharp/FileContentIndex/e4b94b52-7234-4feb-aa8c-60c34ad71b89.vsidx and /dev/null differ diff --git a/源代码/.vs/StgSharp/FileContentIndex/f0f528c2-9387-4d8e-b1b4-239b765802e5.vsidx b/源代码/.vs/StgSharp/FileContentIndex/f0f528c2-9387-4d8e-b1b4-239b765802e5.vsidx deleted file mode 100644 index 9ded3183..00000000 Binary files a/源代码/.vs/StgSharp/FileContentIndex/f0f528c2-9387-4d8e-b1b4-239b765802e5.vsidx and /dev/null differ diff --git a/源代码/.vs/StgSharp/FileContentIndex/f822d40d-2ea9-40cf-8f44-7ddb9bfb83c4.vsidx b/源代码/.vs/StgSharp/FileContentIndex/f822d40d-2ea9-40cf-8f44-7ddb9bfb83c4.vsidx deleted file mode 100644 index 265e4550..00000000 Binary files a/源代码/.vs/StgSharp/FileContentIndex/f822d40d-2ea9-40cf-8f44-7ddb9bfb83c4.vsidx and /dev/null differ diff --git a/源代码/.vs/StgSharp/v17/.futdcache.v2 b/源代码/.vs/StgSharp/v17/.futdcache.v2 index 06cff939..e51da03f 100644 Binary files a/源代码/.vs/StgSharp/v17/.futdcache.v2 and b/源代码/.vs/StgSharp/v17/.futdcache.v2 differ diff --git a/源代码/.vs/StgSharp/v17/.suo b/源代码/.vs/StgSharp/v17/.suo index bce387f4..d4768272 100644 Binary files a/源代码/.vs/StgSharp/v17/.suo and b/源代码/.vs/StgSharp/v17/.suo differ diff --git a/源代码/StgSharp/Vector/Array2x4.cs b/源代码/StgSharp/Vector/Array2x4.cs new file mode 100644 index 00000000..7de331bb --- /dev/null +++ b/源代码/StgSharp/Vector/Array2x4.cs @@ -0,0 +1,109 @@ +using System; +using System.Collections.Generic; +using System.Runtime.InteropServices; +using System.Text; + +namespace StgSharp.Math +{ + + [StructLayout(LayoutKind.Explicit)] + public struct Array2x4 : IEquatable + { + [FieldOffset(0)] + public Vec4D row1; + [FieldOffset(16)] + public Vec4D row2; + + public Array2x4(Vec4D r1,Vec4D r2) + { + row1 = r1; + row2 = r2; + } + + + + public bool Equals(Array2x4 other) + { + if (this.GetHashCode() != other.GetHashCode()) + { + return false; + } + else + { + return this.row1 == other.row1 + && this.row2 == other.row2; + } + } + + public override bool Equals(object obj) + { + if (obj == null) + { + return false; + } + else if (obj.GetType() != typeof(Array2x4)) + { + return false; + } + else + { + return this.Equals((Array2x4)obj); + } + } + + public override int GetHashCode() + { + return HashCode.Combine(this.row1, this.row2); + } + + public override string ToString() + { + return $"{this.row1}\n{this.row2}"; + } + + public static Array2x4 operator +(Array2x4 array1,Array2x4 array2) + { + return new Array2x4( + array1.row1 + array2.row1, + array1.row2 + array2.row2 + ) ; + } + + public static Array2x4 operator -(Array2x4 array1, Array2x4 array2) + { + return new Array2x4( + array1.row1 - array2.row1, + array1.row2 - array2.row2 + ); + } + + public static Array2x4 operator *(Array2x4 array, float x) + { + return new Array2x4( + array.row1 * x, + array.row2 * x + ); + } + + public static Array2x4 operator /(Array2x4 array, float x) + { + return new Array2x4( + array.row1 / x, + array.row2 / x + ); + } + + public static unsafe Array2x2 operator *(Array2x4 array1, Array4x2 array2) + { + float* p1 = &array1.row1.X; + float* p2 = &array2.row2.X; + + return new Array2x2( + *(p1 + 0) * *(p2 + 0)+ *(p1 + 1) * *(p2 + 2)+ *(p1 + 2) * *(p2 + 4)+ *(p1 + 3) * *(p2 + 6), + *(p1 + 0) * *(p2 + 1)+ *(p1 + 1) * *(p2 + 3)+ *(p1 + 2) * *(p2 + 5)+ *(p1 + 3) * *(p2 + 7), + *(p1 + 4) * *(p2 + 0)+ *(p1 + 5) * *(p2 + 2)+ *(p1 + 6) * *(p2 + 4)+ *(p1 + 7) * *(p2 + 6), + *(p1 + 4) * *(p2 + 1)+ *(p1 + 5) * *(p2 + 3)+ *(p1 + 6) * *(p2 + 5)+ *(p1 + 7) * *(p2 + 7) + ); + } + } +} diff --git a/源代码/StgSharp/Vector/Array4x2.cs b/源代码/StgSharp/Vector/Array4x2.cs new file mode 100644 index 00000000..6e369e56 --- /dev/null +++ b/源代码/StgSharp/Vector/Array4x2.cs @@ -0,0 +1,75 @@ +using System; +using System.Collections.Generic; +using System.Runtime.InteropServices; +using System.Text; + +namespace StgSharp.Math +{ + [StructLayout(LayoutKind.Explicit)] + public struct Array4x2:IEquatable + { + [FieldOffset(0)] + public Vec2D row1; + [FieldOffset(8)] + public Vec2D row2; + [FieldOffset(16)] + public Vec2D row3; + [FieldOffset(24)] + public Vec2D row4; + + public Array4x2(Vec2D r1, Vec2D r2, Vec2D r3, Vec2D r4) + { + row1 = r1; + row2 = r2; + row3 = r3; + row4 = r4; + } + + public override bool Equals(object obj) + { + if (obj == null) + { + return false; + } + else if (obj.GetType() == typeof(Array4x2)) + { + return false; + } + else + { + return this.Equals((Array4x2)obj); + } + } + + public override int GetHashCode() + { + return HashCode.Combine(row1, row2, row3, row4); + } + + public override string ToString() + { + return $"{row1}\n{row2}\n{row3}\n{row4}"; + } + + bool IEquatable.Equals(Array4x2 other) + { + if (this.GetHashCode() != other.GetHashCode()) + { + return false; + } + else + { + return this.row1 == other.row1 + && this.row2 == other.row2 + && this.row3 == other.row3 + && this.row4 == other.row4; + } + } + + public static Array4x4 operator *(Array4x2 array1, Array2x4 array2) + { + return default(Array4x4); + } + + } +} diff --git a/源代码/StgSharp/Vector/Array4x4.cs b/源代码/StgSharp/Vector/Array4x4.cs new file mode 100644 index 00000000..d2adb134 --- /dev/null +++ b/源代码/StgSharp/Vector/Array4x4.cs @@ -0,0 +1,74 @@ +using System; +using System.Collections.Generic; +using System.Runtime.InteropServices; +using System.Text; + +namespace StgSharp.Math +{ + [StructLayout(LayoutKind.Explicit)] + public struct Array4x4:IEquatable + { + [FieldOffset(0)] + public Vec4D row1; + [FieldOffset(16)] + public Vec4D row2; + [FieldOffset(32)] + public Vec4D row3; + [FieldOffset(48)] + public Vec4D row4; + + public Array4x4(Vec4D r1, Vec4D r2, Vec4D r3, Vec4D r4) + { + row1 = r1; + row2 = r2; + row3 = r3; + row4 = r4; + } + + public Array4x4( + float a11, float a12, float a13, float a14, + float a21, float a22, float a23, float a24, + float a31, float a32, float a33, float a34, + float a41, float a42, float a43, float a44 + ) + { + row1 = new Vec4D(a11, a12, a13, a14); + row2 = new Vec4D(a11, a12, a13, a14); + row3 = new Vec4D(a11, a12, a13, a14); + row4 = new Vec4D(a11, a12, a13, a14); + } + + public override bool Equals(object obj) + { + return base.Equals(obj); + } + + bool IEquatable.Equals(Array4x4 other) + { + if (this.GetHashCode() != other.GetHashCode()) + { + return false; + } + else + { + return this.row1 == other.row1 + && this.row2 == other.row2 + && this.row3 == other.row3 + && this.row4 == other.row4; + } + } + + public override int GetHashCode() + { + return HashCode.Combine(row1, row2, row3, row4); + } + + public override string ToString() + { + return $"{this.row1}\n{this.row2}\n{this.row3}\n{this.row4}"; + } + } + + + +} diff --git a/源代码/StgSharp/Vector/Cordination.cs b/源代码/StgSharp/Vector/Cordination.cs new file mode 100644 index 00000000..0178a991 --- /dev/null +++ b/源代码/StgSharp/Vector/Cordination.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace StgSharp.Math +{ + internal class Cordination + { + } + + public enum CordinatePlain + { + XY, + YZ, + XZ, + } +} diff --git a/源代码/StgSharp/Vector/Vec2D.cs b/源代码/StgSharp/Vector/Vec2D.cs index ae4fbc2a..be2d6e79 100644 --- a/源代码/StgSharp/Vector/Vec2D.cs +++ b/源代码/StgSharp/Vector/Vec2D.cs @@ -95,9 +95,6 @@ namespace StgSharp.Math return new Vec2D(vec.X/x, vec.Y/x); } - public Vec3D to3D() - { - return new Vec3D(this.X, this.Y, 0.0f); - } + } } diff --git a/源代码/StgSharp/Vector/Det.cs b/源代码/StgSharp/Vector/Vector.Det.cs similarity index 94% rename from 源代码/StgSharp/Vector/Det.cs rename to 源代码/StgSharp/Vector/Vector.Det.cs index d763451c..a832f6e1 100644 --- a/源代码/StgSharp/Vector/Det.cs +++ b/源代码/StgSharp/Vector/Vector.Det.cs @@ -4,7 +4,7 @@ using System.Text; namespace StgSharp.Math { - public static unsafe partial class VectorCalc + public static unsafe partial class Vector { public static float Det(Array2x2 array) diff --git a/源代码/StgSharp/Vector/GetAngle.cs b/源代码/StgSharp/Vector/Vector.GetAngle.cs similarity index 91% rename from 源代码/StgSharp/Vector/GetAngle.cs rename to 源代码/StgSharp/Vector/Vector.GetAngle.cs index c6eea97a..f8cdac41 100644 --- a/源代码/StgSharp/Vector/GetAngle.cs +++ b/源代码/StgSharp/Vector/Vector.GetAngle.cs @@ -4,7 +4,7 @@ using System.Text; namespace StgSharp.Math { - public static unsafe partial class VectorCalc + public static unsafe partial class Vector { public static float GetAngle(Vec2D vec1, Vec2D vec2) { diff --git a/源代码/StgSharp/Vector/GetLength.cs b/源代码/StgSharp/Vector/Vector.GetLength.cs similarity index 91% rename from 源代码/StgSharp/Vector/GetLength.cs rename to 源代码/StgSharp/Vector/Vector.GetLength.cs index 5bcda830..94984734 100644 --- a/源代码/StgSharp/Vector/GetLength.cs +++ b/源代码/StgSharp/Vector/Vector.GetLength.cs @@ -4,7 +4,7 @@ using System.Text; namespace StgSharp.Math { - public static unsafe partial class VectorCalc + public static unsafe partial class Vector { public static float GetLength(this Vec3D vec) { diff --git a/源代码/StgSharp/Vector/Vector.GetVector.cs b/源代码/StgSharp/Vector/Vector.GetVector.cs new file mode 100644 index 00000000..39668497 --- /dev/null +++ b/源代码/StgSharp/Vector/Vector.GetVector.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace StgSharp.Math +{ + public static unsafe partial class Vector + { + + public static Vec2D GetVector(Vec4D pointPair) + { + return pointPair.Point2-pointPair.Point1; + } + } +} diff --git a/源代码/StgSharp/Vector/Multiple.cs b/源代码/StgSharp/Vector/Vector.Multiple.cs similarity index 100% rename from 源代码/StgSharp/Vector/Multiple.cs rename to 源代码/StgSharp/Vector/Vector.Multiple.cs diff --git a/源代码/StgSharp/Vector/Vector.VectorTransform.cs b/源代码/StgSharp/Vector/Vector.VectorTransform.cs new file mode 100644 index 00000000..9e070bea --- /dev/null +++ b/源代码/StgSharp/Vector/Vector.VectorTransform.cs @@ -0,0 +1,48 @@ +using System; +using System.Collections.Generic; +using System.Runtime.CompilerServices; +using System.Text; + +namespace StgSharp.Math +{ + public static unsafe partial class Vector + { + public static Vec3D To3D(this Vec2D vec) + { + return new Vec3D(vec.X, vec.Y, 0.0f); + } + + public static Vec4D To4D(this Vec2D Vec) + { + return new Vec4D(Vec.X, Vec.Y, 0, 0); + } + + public static Vec4D To4D(this Vec3D vec) + { + return new Vec4D(vec.X, vec.Y, vec.Z, 0); + } + + public static Vec2D To2D(Vec3D vec, CordinatePlain plain) + { + switch (plain) + { + case CordinatePlain.XY: + return new Vec2D(vec.X, vec.Y); + break; + case CordinatePlain.YZ: + return new Vec2D(vec.Y, vec.Z); + break; + case CordinatePlain.XZ: + return new Vec2D(vec.X, vec.Z); + break; + default: + return default(Vec2D); + break; + } + } + + } + + + +} diff --git a/源代码/StgSharp/Vector/Cross.cs b/源代码/StgSharp/Vector/Verctor.Cross.cs similarity index 91% rename from 源代码/StgSharp/Vector/Cross.cs rename to 源代码/StgSharp/Vector/Verctor.Cross.cs index bdd10140..836fecf1 100644 --- a/源代码/StgSharp/Vector/Cross.cs +++ b/源代码/StgSharp/Vector/Verctor.Cross.cs @@ -4,7 +4,7 @@ using System.Text; namespace StgSharp.Math { - public static unsafe partial class VectorCalc + public static unsafe partial class Vector { public static float Cross(Vec2D vec1, Vec2D vec2) diff --git a/源代码/StgSharp/obj/Debug/netstandard2.1/StgSharp.GeneratedMSBuildEditorConfig.editorconfig b/源代码/StgSharp/obj/Debug/netstandard2.1/StgSharp.GeneratedMSBuildEditorConfig.editorconfig index c776abae..774bffa1 100644 --- a/源代码/StgSharp/obj/Debug/netstandard2.1/StgSharp.GeneratedMSBuildEditorConfig.editorconfig +++ b/源代码/StgSharp/obj/Debug/netstandard2.1/StgSharp.GeneratedMSBuildEditorConfig.editorconfig @@ -1,3 +1,3 @@ is_global = true build_property.RootNamespace = StgSharp -build_property.ProjectDir = D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\.Net\StgSharp\ +build_property.ProjectDir = D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\StgSharp\ diff --git a/源代码/StgSharp/obj/Debug/netstandard2.1/StgSharp.assets.cache b/源代码/StgSharp/obj/Debug/netstandard2.1/StgSharp.assets.cache index 00da35ca..106eef0f 100644 Binary files a/源代码/StgSharp/obj/Debug/netstandard2.1/StgSharp.assets.cache and b/源代码/StgSharp/obj/Debug/netstandard2.1/StgSharp.assets.cache differ diff --git a/源代码/StgSharp/obj/StgSharp.csproj.nuget.dgspec.json b/源代码/StgSharp/obj/StgSharp.csproj.nuget.dgspec.json index f0e5a258..870c716b 100644 --- a/源代码/StgSharp/obj/StgSharp.csproj.nuget.dgspec.json +++ b/源代码/StgSharp/obj/StgSharp.csproj.nuget.dgspec.json @@ -1,17 +1,17 @@ { "format": 1, "restore": { - "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\.Net\\StgSharp\\StgSharp.csproj": {} + "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\StgSharp\\StgSharp.csproj": {} }, "projects": { - "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\.Net\\StgSharp\\StgSharp.csproj": { + "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\StgSharp\\StgSharp.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\.Net\\StgSharp\\StgSharp.csproj", + "projectUniqueName": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\StgSharp\\StgSharp.csproj", "projectName": "StgSharp", - "projectPath": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\.Net\\StgSharp\\StgSharp.csproj", + "projectPath": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\StgSharp\\StgSharp.csproj", "packagesPath": "C:\\Users\\Nitlo\\.nuget\\packages\\", - "outputPath": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\.Net\\StgSharp\\obj\\", + "outputPath": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\StgSharp\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" diff --git a/源代码/StgSharp/obj/project.assets.json b/源代码/StgSharp/obj/project.assets.json index e8323367..8339c001 100644 --- a/源代码/StgSharp/obj/project.assets.json +++ b/源代码/StgSharp/obj/project.assets.json @@ -192,11 +192,11 @@ "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\.Net\\StgSharp\\StgSharp.csproj", + "projectUniqueName": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\StgSharp\\StgSharp.csproj", "projectName": "StgSharp", - "projectPath": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\.Net\\StgSharp\\StgSharp.csproj", + "projectPath": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\StgSharp\\StgSharp.csproj", "packagesPath": "C:\\Users\\Nitlo\\.nuget\\packages\\", - "outputPath": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\.Net\\StgSharp\\obj\\", + "outputPath": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\StgSharp\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" diff --git a/源代码/StgSharp/obj/project.nuget.cache b/源代码/StgSharp/obj/project.nuget.cache index fdd8fca1..cb1d0f76 100644 --- a/源代码/StgSharp/obj/project.nuget.cache +++ b/源代码/StgSharp/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "D2b6GMfOY4aZxUai0LnRuWyULH+CEG98xFRXi9OAg3hVh5QYpI8wa9Penb+96fBCHHpWEQ22IzA65zYWs4fy2g==", + "dgSpecHash": "5G3NWQf7wV5PLr5m1b580Wd0sIPC7CL1BaPzPPQflu8N6pnZ3hZTMxEXjj+C3TF5fOTJ1U9gMowOkb8ftV/V0g==", "success": true, - "projectFilePath": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\.Net\\StgSharp\\StgSharp.csproj", + "projectFilePath": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\StgSharp\\StgSharp.csproj", "expectedPackageFiles": [ "C:\\Users\\Nitlo\\.nuget\\packages\\glfwdotnet\\20.9.0\\glfwdotnet.20.9.0.nupkg.sha512", "C:\\Users\\Nitlo\\.nuget\\packages\\microsoft.csharp\\4.7.0\\microsoft.csharp.4.7.0.nupkg.sha512", diff --git a/源代码/StgSharpDebug/Program.cs b/源代码/StgSharpDebug/Program.cs index e52c8dae..eb61e573 100644 --- a/源代码/StgSharpDebug/Program.cs +++ b/源代码/StgSharpDebug/Program.cs @@ -7,14 +7,9 @@ internal class Program { private unsafe static void Main(string[] args) { - Array3x3 a1 = new Array3x3( - 1,2,3,4,5,6,7,8,9 - ); - Console.WriteLine(a1 * a1); + - Vec4D v = new Vec4D(1, 2, 3, 4); - Console.WriteLine(v.Point2); } } diff --git a/源代码/StgSharpDebug/obj/Debug/net6.0/StgSharpDebug.GeneratedMSBuildEditorConfig.editorconfig b/源代码/StgSharpDebug/obj/Debug/net6.0/StgSharpDebug.GeneratedMSBuildEditorConfig.editorconfig index 67b18853..6543a41b 100644 --- a/源代码/StgSharpDebug/obj/Debug/net6.0/StgSharpDebug.GeneratedMSBuildEditorConfig.editorconfig +++ b/源代码/StgSharpDebug/obj/Debug/net6.0/StgSharpDebug.GeneratedMSBuildEditorConfig.editorconfig @@ -8,4 +8,4 @@ build_property.PlatformNeutralAssembly = build_property.EnforceExtendedAnalyzerRules = build_property._SupportedPlatformList = Linux,macOS,Windows build_property.RootNamespace = StgSharpDebug -build_property.ProjectDir = D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\.Net\StgSharpDebug\ +build_property.ProjectDir = D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\StgSharpDebug\ diff --git a/源代码/StgSharpDebug/obj/Debug/net6.0/StgSharpDebug.assets.cache b/源代码/StgSharpDebug/obj/Debug/net6.0/StgSharpDebug.assets.cache index 3e1b4780..cc12d662 100644 Binary files a/源代码/StgSharpDebug/obj/Debug/net6.0/StgSharpDebug.assets.cache and b/源代码/StgSharpDebug/obj/Debug/net6.0/StgSharpDebug.assets.cache differ diff --git a/源代码/StgSharpDebug/obj/Debug/net6.0/StgSharpDebug.csproj.AssemblyReference.cache b/源代码/StgSharpDebug/obj/Debug/net6.0/StgSharpDebug.csproj.AssemblyReference.cache index 117e6151..0f3567fe 100644 Binary files a/源代码/StgSharpDebug/obj/Debug/net6.0/StgSharpDebug.csproj.AssemblyReference.cache and b/源代码/StgSharpDebug/obj/Debug/net6.0/StgSharpDebug.csproj.AssemblyReference.cache differ diff --git a/源代码/StgSharpDebug/obj/StgSharpDebug.csproj.nuget.dgspec.json b/源代码/StgSharpDebug/obj/StgSharpDebug.csproj.nuget.dgspec.json index 557f7295..870358f9 100644 --- a/源代码/StgSharpDebug/obj/StgSharpDebug.csproj.nuget.dgspec.json +++ b/源代码/StgSharpDebug/obj/StgSharpDebug.csproj.nuget.dgspec.json @@ -1,17 +1,17 @@ { "format": 1, "restore": { - "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\.Net\\StgSharpDebug\\StgSharpDebug.csproj": {} + "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\StgSharpDebug\\StgSharpDebug.csproj": {} }, "projects": { - "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\.Net\\StgSharpDebug\\StgSharpDebug.csproj": { + "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\StgSharpDebug\\StgSharpDebug.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\.Net\\StgSharpDebug\\StgSharpDebug.csproj", + "projectUniqueName": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\StgSharpDebug\\StgSharpDebug.csproj", "projectName": "StgSharpDebug", - "projectPath": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\.Net\\StgSharpDebug\\StgSharpDebug.csproj", + "projectPath": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\StgSharpDebug\\StgSharpDebug.csproj", "packagesPath": "C:\\Users\\Nitlo\\.nuget\\packages\\", - "outputPath": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\.Net\\StgSharpDebug\\obj\\", + "outputPath": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\StgSharpDebug\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -33,8 +33,8 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\.Net\\StgSharp\\StgSharp.csproj": { - "projectPath": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\.Net\\StgSharp\\StgSharp.csproj" + "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\StgSharp\\StgSharp.csproj": { + "projectPath": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\StgSharp\\StgSharp.csproj" } } } @@ -86,14 +86,14 @@ } } }, - "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\.Net\\StgSharp\\StgSharp.csproj": { + "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\StgSharp\\StgSharp.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\.Net\\StgSharp\\StgSharp.csproj", + "projectUniqueName": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\StgSharp\\StgSharp.csproj", "projectName": "StgSharp", - "projectPath": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\.Net\\StgSharp\\StgSharp.csproj", + "projectPath": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\StgSharp\\StgSharp.csproj", "packagesPath": "C:\\Users\\Nitlo\\.nuget\\packages\\", - "outputPath": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\.Net\\StgSharp\\obj\\", + "outputPath": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\StgSharp\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" diff --git a/源代码/StgSharpDebug/obj/project.assets.json b/源代码/StgSharpDebug/obj/project.assets.json index f1c92ff0..d5f91049 100644 --- a/源代码/StgSharpDebug/obj/project.assets.json +++ b/源代码/StgSharpDebug/obj/project.assets.json @@ -206,11 +206,11 @@ "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\.Net\\StgSharpDebug\\StgSharpDebug.csproj", + "projectUniqueName": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\StgSharpDebug\\StgSharpDebug.csproj", "projectName": "StgSharpDebug", - "projectPath": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\.Net\\StgSharpDebug\\StgSharpDebug.csproj", + "projectPath": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\StgSharpDebug\\StgSharpDebug.csproj", "packagesPath": "C:\\Users\\Nitlo\\.nuget\\packages\\", - "outputPath": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\.Net\\StgSharpDebug\\obj\\", + "outputPath": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\StgSharpDebug\\obj\\", "projectStyle": "PackageReference", "fallbackFolders": [ "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages" @@ -232,8 +232,8 @@ "net6.0": { "targetAlias": "net6.0", "projectReferences": { - "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\.Net\\StgSharp\\StgSharp.csproj": { - "projectPath": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\.Net\\StgSharp\\StgSharp.csproj" + "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\StgSharp\\StgSharp.csproj": { + "projectPath": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\StgSharp\\StgSharp.csproj" } } } diff --git a/源代码/StgSharpDebug/obj/project.nuget.cache b/源代码/StgSharpDebug/obj/project.nuget.cache index ae19e894..88b3ca7d 100644 --- a/源代码/StgSharpDebug/obj/project.nuget.cache +++ b/源代码/StgSharpDebug/obj/project.nuget.cache @@ -1,8 +1,8 @@ { "version": 2, - "dgSpecHash": "RNeBAbgPDjVoMN0wCgiHdKSZl7blbpi7QUVgjypq9m6PyL52Ykwxe7dj87SnWZKStz814Gbnc/IFL47A2sNS6Q==", + "dgSpecHash": "kvfMWwWBZa8ZFINA4TiAIk8Mt085m4zG5H1IsoWLTS0V2MbJByExbUuzWiErSpLuQwS4GRMy1TOBsIzk97duPQ==", "success": true, - "projectFilePath": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\.Net\\StgSharpDebug\\StgSharpDebug.csproj", + "projectFilePath": "D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\源代码\\StgSharpDebug\\StgSharpDebug.csproj", "expectedPackageFiles": [ "C:\\Users\\Nitlo\\.nuget\\packages\\glfwdotnet\\20.9.0\\glfwdotnet.20.9.0.nupkg.sha512", "C:\\Users\\Nitlo\\.nuget\\packages\\microsoft.csharp\\4.7.0\\microsoft.csharp.4.7.0.nupkg.sha512",