diff --git a/源代码/.vs/ProjectEvaluation/stgsharpdevelop.metadata.v7.bin b/源代码/.vs/ProjectEvaluation/stgsharpdevelop.metadata.v7.bin index 30eb866b..b3549526 100644 Binary files a/源代码/.vs/ProjectEvaluation/stgsharpdevelop.metadata.v7.bin and b/源代码/.vs/ProjectEvaluation/stgsharpdevelop.metadata.v7.bin differ diff --git a/源代码/.vs/ProjectEvaluation/stgsharpdevelop.projects.v7.bin b/源代码/.vs/ProjectEvaluation/stgsharpdevelop.projects.v7.bin index fa8202df..272ccbd6 100644 Binary files a/源代码/.vs/ProjectEvaluation/stgsharpdevelop.projects.v7.bin and b/源代码/.vs/ProjectEvaluation/stgsharpdevelop.projects.v7.bin differ diff --git a/源代码/.vs/StgSharpDevelop/DesignTimeBuild/.dtbcache.v2 b/源代码/.vs/StgSharpDevelop/DesignTimeBuild/.dtbcache.v2 index c1c9a52c..95b4c1cc 100644 Binary files a/源代码/.vs/StgSharpDevelop/DesignTimeBuild/.dtbcache.v2 and b/源代码/.vs/StgSharpDevelop/DesignTimeBuild/.dtbcache.v2 differ diff --git a/源代码/.vs/StgSharpDevelop/FileContentIndex/012f5c42-4f47-4f86-8a2d-6d2123d5518f.vsidx b/源代码/.vs/StgSharpDevelop/FileContentIndex/012f5c42-4f47-4f86-8a2d-6d2123d5518f.vsidx deleted file mode 100644 index 699641e0..00000000 Binary files a/源代码/.vs/StgSharpDevelop/FileContentIndex/012f5c42-4f47-4f86-8a2d-6d2123d5518f.vsidx and /dev/null differ diff --git a/源代码/.vs/StgSharpDevelop/FileContentIndex/78a70c7e-fd5e-4d31-8233-fd9a1ed5e19d.vsidx b/源代码/.vs/StgSharpDevelop/FileContentIndex/78a70c7e-fd5e-4d31-8233-fd9a1ed5e19d.vsidx deleted file mode 100644 index 18342757..00000000 Binary files a/源代码/.vs/StgSharpDevelop/FileContentIndex/78a70c7e-fd5e-4d31-8233-fd9a1ed5e19d.vsidx and /dev/null differ diff --git a/源代码/.vs/StgSharpDevelop/FileContentIndex/84bb6afb-790a-4bb7-b5ae-cb845012fc54.vsidx b/源代码/.vs/StgSharpDevelop/FileContentIndex/84bb6afb-790a-4bb7-b5ae-cb845012fc54.vsidx new file mode 100644 index 00000000..bcf7a8c6 Binary files /dev/null and b/源代码/.vs/StgSharpDevelop/FileContentIndex/84bb6afb-790a-4bb7-b5ae-cb845012fc54.vsidx differ diff --git a/源代码/.vs/StgSharpDevelop/FileContentIndex/985fde31-3660-4a13-950c-c3deaee96453.vsidx b/源代码/.vs/StgSharpDevelop/FileContentIndex/985fde31-3660-4a13-950c-c3deaee96453.vsidx new file mode 100644 index 00000000..677b15ca Binary files /dev/null and b/源代码/.vs/StgSharpDevelop/FileContentIndex/985fde31-3660-4a13-950c-c3deaee96453.vsidx differ diff --git a/源代码/.vs/StgSharpDevelop/FileContentIndex/9adac65a-2837-4bb2-962d-91ee56e61ef4.vsidx b/源代码/.vs/StgSharpDevelop/FileContentIndex/9adac65a-2837-4bb2-962d-91ee56e61ef4.vsidx new file mode 100644 index 00000000..fe3bcb81 Binary files /dev/null and b/源代码/.vs/StgSharpDevelop/FileContentIndex/9adac65a-2837-4bb2-962d-91ee56e61ef4.vsidx differ diff --git a/源代码/.vs/StgSharpDevelop/FileContentIndex/9d2832cd-d1af-4896-9cb9-01f8dc573541.vsidx b/源代码/.vs/StgSharpDevelop/FileContentIndex/9d2832cd-d1af-4896-9cb9-01f8dc573541.vsidx deleted file mode 100644 index 78b16717..00000000 Binary files a/源代码/.vs/StgSharpDevelop/FileContentIndex/9d2832cd-d1af-4896-9cb9-01f8dc573541.vsidx and /dev/null differ diff --git a/源代码/.vs/StgSharpDevelop/FileContentIndex/b82b616a-2bd9-4186-92c5-5b12a6371690.vsidx b/源代码/.vs/StgSharpDevelop/FileContentIndex/b82b616a-2bd9-4186-92c5-5b12a6371690.vsidx new file mode 100644 index 00000000..28a689d2 Binary files /dev/null and b/源代码/.vs/StgSharpDevelop/FileContentIndex/b82b616a-2bd9-4186-92c5-5b12a6371690.vsidx differ diff --git a/源代码/.vs/StgSharpDevelop/FileContentIndex/c39154a0-60b1-4e74-b0b1-933ef0d6b59a.vsidx b/源代码/.vs/StgSharpDevelop/FileContentIndex/c39154a0-60b1-4e74-b0b1-933ef0d6b59a.vsidx deleted file mode 100644 index 398abea3..00000000 Binary files a/源代码/.vs/StgSharpDevelop/FileContentIndex/c39154a0-60b1-4e74-b0b1-933ef0d6b59a.vsidx and /dev/null differ diff --git a/源代码/.vs/StgSharpDevelop/FileContentIndex/ea7e3872-fb73-4a12-83d7-2c676bb1b280.vsidx b/源代码/.vs/StgSharpDevelop/FileContentIndex/ea7e3872-fb73-4a12-83d7-2c676bb1b280.vsidx new file mode 100644 index 00000000..fa648f4b Binary files /dev/null and b/源代码/.vs/StgSharpDevelop/FileContentIndex/ea7e3872-fb73-4a12-83d7-2c676bb1b280.vsidx differ diff --git a/源代码/.vs/StgSharpDevelop/FileContentIndex/f85285df-91f0-4c0e-b260-e68ba001862c.vsidx b/源代码/.vs/StgSharpDevelop/FileContentIndex/f85285df-91f0-4c0e-b260-e68ba001862c.vsidx deleted file mode 100644 index 0b334e65..00000000 Binary files a/源代码/.vs/StgSharpDevelop/FileContentIndex/f85285df-91f0-4c0e-b260-e68ba001862c.vsidx and /dev/null differ diff --git a/源代码/.vs/StgSharpDevelop/v17/.futdcache.v2 b/源代码/.vs/StgSharpDevelop/v17/.futdcache.v2 index db35bf64..3c409ea9 100644 Binary files a/源代码/.vs/StgSharpDevelop/v17/.futdcache.v2 and b/源代码/.vs/StgSharpDevelop/v17/.futdcache.v2 differ diff --git a/源代码/.vs/StgSharpDevelop/v17/.suo b/源代码/.vs/StgSharpDevelop/v17/.suo index 17fdc7df..fc1ad384 100644 Binary files a/源代码/.vs/StgSharpDevelop/v17/.suo and b/源代码/.vs/StgSharpDevelop/v17/.suo differ diff --git a/源代码/.vs/StgSharpDevelop/v17/DocumentLayout.json b/源代码/.vs/StgSharpDevelop/v17/DocumentLayout.json index eee3b4ea..476e7402 100644 --- a/源代码/.vs/StgSharpDevelop/v17/DocumentLayout.json +++ b/源代码/.vs/StgSharpDevelop/v17/DocumentLayout.json @@ -3,29 +3,73 @@ "WorkspaceRootPath": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\", "Documents": [ { - "AbsoluteMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|d:\\nitloadindustry\\\u7814\u7A76\u9879\u76EE\\1-flagship\\th2020\\projectfile\\\u6E90\u4EE3\u7801\\stgsharpdebug\\environment\\globalkeystat.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|solutionrelative:stgsharpdebug\\environment\\globalkeystat.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|d:\\nitloadindustry\\\u7814\u7A76\u9879\u76EE\\1-flagship\\th2020\\projectfile\\\u6E90\u4EE3\u7801\\stgsharpdebug\\geometries\\coordination\\icoord.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|solutionrelative:stgsharpdebug\\geometries\\coordination\\icoord.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|d:\\nitloadindustry\\\u7814\u7A76\u9879\u76EE\\1-flagship\\th2020\\projectfile\\\u6E90\u4EE3\u7801\\stgsharpdebug\\graphics\\renderstream.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|solutionrelative:stgsharpdebug\\graphics\\renderstream.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|d:\\nitloadindustry\\\u7814\u7A76\u9879\u76EE\\1-flagship\\th2020\\projectfile\\\u6E90\u4EE3\u7801\\stgsharpdebug\\geometries\\coordination\\streamlocalcoordinate.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|solutionrelative:stgsharpdebug\\geometries\\coordination\\streamlocalcoordinate.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|d:\\nitloadindustry\\\u7814\u7A76\u9879\u76EE\\1-flagship\\th2020\\projectfile\\\u6E90\u4EE3\u7801\\stgsharpdebug\\graphics\\gl\\glrenderstream.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|solutionrelative:stgsharpdebug\\graphics\\gl\\glrenderstream.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|d:\\nitloadindustry\\\u7814\u7A76\u9879\u76EE\\1-flagship\\th2020\\projectfile\\\u6E90\u4EE3\u7801\\stgsharpdebug\\graphics\\form\\form.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|solutionrelative:stgsharpdebug\\graphics\\form\\form.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|d:\\nitloadindustry\\\u7814\u7A76\u9879\u76EE\\1-flagship\\th2020\\projectfile\\\u6E90\u4EE3\u7801\\stgsharpdebug\\graphics\\renderstream.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|solutionrelative:stgsharpdebug\\graphics\\renderstream.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|d:\\nitloadindustry\\\u7814\u7A76\u9879\u76EE\\1-flagship\\th2020\\projectfile\\\u6E90\u4EE3\u7801\\stgsharpdebug\\graphics\\gl\\glresourcegenrator.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|solutionrelative:stgsharpdebug\\graphics\\gl\\glresourcegenrator.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|d:\\nitloadindustry\\\u7814\u7A76\u9879\u76EE\\1-flagship\\th2020\\projectfile\\\u6E90\u4EE3\u7801\\stgsharpdebug\\math\\linear\\vec3d.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|solutionrelative:stgsharpdebug\\math\\linear\\vec3d.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|d:\\nitloadindustry\\\u7814\u7A76\u9879\u76EE\\1-flagship\\th2020\\projectfile\\\u6E90\u4EE3\u7801\\stgsharpdebug\\environment\\monitors.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|solutionrelative:stgsharpdebug\\environment\\monitors.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|d:\\nitloadindustry\\\u7814\u7A76\u9879\u76EE\\1-flagship\\th2020\\projectfile\\\u6E90\u4EE3\u7801\\stgsharpdebug\\graphics\\define\\structdefine.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|solutionrelative:stgsharpdebug\\graphics\\define\\structdefine.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, + { + "AbsoluteMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|d:\\nitloadindustry\\\u7814\u7A76\u9879\u76EE\\1-flagship\\th2020\\projectfile\\\u6E90\u4EE3\u7801\\stgsharpdebug\\graphics\\form\\form.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|solutionrelative:stgsharpdebug\\graphics\\form\\form.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|d:\\nitloadindustry\\\u7814\u7A76\u9879\u76EE\\1-flagship\\th2020\\projectfile\\\u6E90\u4EE3\u7801\\stgsharpdebug\\control\\processinput.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|solutionrelative:stgsharpdebug\\control\\processinput.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|d:\\nitloadindustry\\\u7814\u7A76\u9879\u76EE\\1-flagship\\th2020\\projectfile\\\u6E90\u4EE3\u7801\\stgsharpdebug\\math\\linear\\matrix44.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|solutionrelative:stgsharpdebug\\math\\linear\\matrix44.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|d:\\nitloadindustry\\\u7814\u7A76\u9879\u76EE\\1-flagship\\th2020\\projectfile\\\u6E90\u4EE3\u7801\\stgsharpdebug\\data\\m128.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|solutionrelative:stgsharpdebug\\data\\m128.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|d:\\nitloadindustry\\\u7814\u7A76\u9879\u76EE\\1-flagship\\th2020\\projectfile\\\u6E90\u4EE3\u7801\\stgsharpdebug\\data\\imemorytype.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|solutionrelative:stgsharpdebug\\data\\imemorytype.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|d:\\nitloadindustry\\\u7814\u7A76\u9879\u76EE\\1-flagship\\th2020\\projectfile\\\u6E90\u4EE3\u7801\\stgsharpdebug\\data\\m256.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|solutionrelative:stgsharpdebug\\data\\m256.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|d:\\nitloadindustry\\\u7814\u7A76\u9879\u76EE\\1-flagship\\th2020\\projectfile\\\u6E90\u4EE3\u7801\\stgsharpdebug\\math\\linear\\cordination.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|solutionrelative:stgsharpdebug\\math\\linear\\cordination.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|d:\\nitloadindustry\\\u7814\u7A76\u9879\u76EE\\1-flagship\\th2020\\projectfile\\\u6E90\u4EE3\u7801\\stgsharpdebug\\geometries\\spacegeometry\\spacecoordinate.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|solutionrelative:stgsharpdebug\\geometries\\spacegeometry\\spacecoordinate.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|d:\\nitloadindustry\\\u7814\u7A76\u9879\u76EE\\1-flagship\\th2020\\projectfile\\\u6E90\u4EE3\u7801\\stgsharpdebug\\environment\\globalkeystat.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|solutionrelative:stgsharpdebug\\environment\\globalkeystat.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|d:\\nitloadindustry\\\u7814\u7A76\u9879\u76EE\\1-flagship\\th2020\\projectfile\\\u6E90\u4EE3\u7801\\stgsharpdebug\\graphics\\gl\\glresourcegenrator.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|solutionrelative:stgsharpdebug\\graphics\\gl\\glresourcegenrator.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, { "AbsoluteMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|d:\\nitloadindustry\\\u7814\u7A76\u9879\u76EE\\1-flagship\\th2020\\projectfile\\\u6E90\u4EE3\u7801\\stgsharpdebug\\graphics\\define\\gltype.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|solutionrelative:stgsharpdebug\\graphics\\define\\gltype.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" @@ -58,36 +102,174 @@ "DocumentGroups": [ { "DockedWidth": 197, - "SelectedChildIndex": 0, + "SelectedChildIndex": 1, "Children": [ { "$type": "Document", - "DocumentIndex": 0, - "Title": "globalKeyStat.cs", - "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Environment\\globalKeyStat.cs", - "RelativeDocumentMoniker": "StgSharpDebug\\Environment\\globalKeyStat.cs", - "ToolTip": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Environment\\globalKeyStat.cs", - "RelativeToolTip": "StgSharpDebug\\Environment\\globalKeyStat.cs", - "ViewState": "AQIAAAMAAAAAAAAAAAAAABUAAAAjAAAA", + "DocumentIndex": 1, + "Title": "StreamLocalCoordinate.cs", + "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Geometries\\Coordination\\StreamLocalCoordinate.cs", + "RelativeDocumentMoniker": "StgSharpDebug\\Geometries\\Coordination\\StreamLocalCoordinate.cs", + "ToolTip": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Geometries\\Coordination\\StreamLocalCoordinate.cs", + "RelativeToolTip": "StgSharpDebug\\Geometries\\Coordination\\StreamLocalCoordinate.cs", + "ViewState": "AQIAAAAAAAAAAAAAAAAAAAoAAAAAAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-04-23T09:57:08.438Z", + "WhenOpened": "2024-04-25T01:09:03.638Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 0, + "Title": "ICoord.cs", + "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Geometries\\Coordination\\ICoord.cs", + "RelativeDocumentMoniker": "StgSharpDebug\\Geometries\\Coordination\\ICoord.cs", + "ToolTip": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Geometries\\Coordination\\ICoord.cs", + "RelativeToolTip": "StgSharpDebug\\Geometries\\Coordination\\ICoord.cs", + "ViewState": "AQIAABIAAAAAAAAAAAAywCEAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-04-25T01:07:46.041Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "Title": "vec3d.cs", + "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Math\\Linear\\vec3d.cs", + "RelativeDocumentMoniker": "StgSharpDebug\\Math\\Linear\\vec3d.cs", + "ToolTip": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Math\\Linear\\vec3d.cs", + "RelativeToolTip": "StgSharpDebug\\Math\\Linear\\vec3d.cs", + "ViewState": "AQIAAKkAAAAAAAAAAAAtwLkAAAAVAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-04-25T01:01:04.105Z", "EditorCaption": "" }, { "$type": "Document", "DocumentIndex": 5, + "Title": "Monitors.cs", + "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Environment\\Monitors.cs", + "RelativeDocumentMoniker": "StgSharpDebug\\Environment\\Monitors.cs", + "ToolTip": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Environment\\Monitors.cs", + "RelativeToolTip": "StgSharpDebug\\Environment\\Monitors.cs", + "ViewState": "AQIAAAsAAAAAAAAAAAAAAB8AAAAVAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-04-24T14:02:24.341Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 8, + "Title": "ProcessInput.cs", + "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Control\\ProcessInput.cs", + "RelativeDocumentMoniker": "StgSharpDebug\\Control\\ProcessInput.cs", + "ToolTip": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Control\\ProcessInput.cs", + "RelativeToolTip": "StgSharpDebug\\Control\\ProcessInput.cs", + "ViewState": "AQIAABAAAAAAAAAAAAAswCcAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-04-24T13:16:11.255Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 9, + "Title": "Matrix44.cs", + "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Math\\Linear\\Matrix44.cs", + "RelativeDocumentMoniker": "StgSharpDebug\\Math\\Linear\\Matrix44.cs", + "ToolTip": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Math\\Linear\\Matrix44.cs", + "RelativeToolTip": "StgSharpDebug\\Math\\Linear\\Matrix44.cs", + "ViewState": "AQIAACwAAAAAAAAAAAA2wDsAAAAJAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-04-24T01:37:17.613Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 10, + "Title": "M128.cs", + "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Data\\M128.cs", + "RelativeDocumentMoniker": "StgSharpDebug\\Data\\M128.cs", + "ToolTip": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Data\\M128.cs", + "RelativeToolTip": "StgSharpDebug\\Data\\M128.cs", + "ViewState": "AQIAACMAAAAAAAAAAAAAADEAAAAgAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-04-24T01:30:40.738Z" + }, + { + "$type": "Document", + "DocumentIndex": 11, + "Title": "IMemoryType.cs", + "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Data\\IMemoryType.cs", + "RelativeDocumentMoniker": "StgSharpDebug\\Data\\IMemoryType.cs", + "ToolTip": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Data\\IMemoryType.cs", + "RelativeToolTip": "StgSharpDebug\\Data\\IMemoryType.cs", + "ViewState": "AQIAACEAAAAAAAAAAAAuwDEAAAAVAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-04-24T01:29:08.67Z" + }, + { + "$type": "Document", + "DocumentIndex": 13, + "Title": "Cordination.cs", + "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Math\\Linear\\Cordination.cs", + "RelativeDocumentMoniker": "StgSharpDebug\\Math\\Linear\\Cordination.cs", + "ToolTip": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Math\\Linear\\Cordination.cs", + "RelativeToolTip": "StgSharpDebug\\Math\\Linear\\Cordination.cs", + "ViewState": "AQIAAB4AAAAAAAAAAAAAACEAAAAbAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-04-24T01:24:11.623Z" + }, + { + "$type": "Document", + "DocumentIndex": 12, + "Title": "M256.cs", + "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Data\\M256.cs", + "RelativeDocumentMoniker": "StgSharpDebug\\Data\\M256.cs", + "ToolTip": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Data\\M256.cs", + "RelativeToolTip": "StgSharpDebug\\Data\\M256.cs", + "ViewState": "AQIAABEAAAAAAAAAAAAcwCAAAAAtAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-04-24T01:23:22.557Z" + }, + { + "$type": "Document", + "DocumentIndex": 14, + "Title": "SpaceCoordinate.cs", + "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Geometries\\SpaceGeometry\\SpaceCoordinate.cs", + "RelativeDocumentMoniker": "StgSharpDebug\\Geometries\\SpaceGeometry\\SpaceCoordinate.cs", + "ToolTip": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Geometries\\SpaceGeometry\\SpaceCoordinate.cs", + "RelativeToolTip": "StgSharpDebug\\Geometries\\SpaceGeometry\\SpaceCoordinate.cs", + "ViewState": "AQIAABgAAAAAAAAAAAAAACYAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-04-24T00:56:41.545Z" + }, + { + "$type": "Document", + "DocumentIndex": 15, + "Title": "globalKeyStat.cs", + "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Environment\\globalKeyStat.cs", + "RelativeDocumentMoniker": "StgSharpDebug\\Environment\\globalKeyStat.cs", + "ToolTip": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Environment\\globalKeyStat.cs", + "RelativeToolTip": "StgSharpDebug\\Environment\\globalKeyStat.cs", + "ViewState": "AQIAAAMAAAAAAAAAAAAAABQAAAAAAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-04-23T09:57:08.438Z" + }, + { + "$type": "Document", + "DocumentIndex": 6, "Title": "StructDefine.cs", "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Graphics\\Define\\StructDefine.cs", "RelativeDocumentMoniker": "StgSharpDebug\\Graphics\\Define\\StructDefine.cs", "ToolTip": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Graphics\\Define\\StructDefine.cs", "RelativeToolTip": "StgSharpDebug\\Graphics\\Define\\StructDefine.cs", - "ViewState": "AQIAAP0AAAAAAAAAAAAswPYAAAAZAAAA", + "ViewState": "AQIAANwAAAAAAAAAAAAIwOAAAAAaAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-04-23T09:29:14.177Z" + "WhenOpened": "2024-04-23T09:29:14.177Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 6, + "DocumentIndex": 17, "Title": "glType.cs", "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Graphics\\Define\\glType.cs", "RelativeDocumentMoniker": "StgSharpDebug\\Graphics\\Define\\glType.cs", @@ -99,7 +281,7 @@ }, { "$type": "Document", - "DocumentIndex": 7, + "DocumentIndex": 18, "Title": "VBO.cs", "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Graphics\\GL\\Buffer\\VBO.cs", "RelativeDocumentMoniker": "StgSharpDebug\\Graphics\\GL\\Buffer\\VBO.cs", @@ -111,7 +293,7 @@ }, { "$type": "Document", - "DocumentIndex": 8, + "DocumentIndex": 19, "Title": "VAO.cs", "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Graphics\\GL\\Buffer\\VAO.cs", "RelativeDocumentMoniker": "StgSharpDebug\\Graphics\\GL\\Buffer\\VAO.cs", @@ -123,7 +305,7 @@ }, { "$type": "Document", - "DocumentIndex": 9, + "DocumentIndex": 20, "Title": "texture.cs", "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Graphics\\GL\\Buffer\\texture.cs", "RelativeDocumentMoniker": "StgSharpDebug\\Graphics\\GL\\Buffer\\texture.cs", @@ -135,7 +317,7 @@ }, { "$type": "Document", - "DocumentIndex": 11, + "DocumentIndex": 22, "Title": "FBO.cs", "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Graphics\\GL\\Buffer\\FBO.cs", "RelativeDocumentMoniker": "StgSharpDebug\\Graphics\\GL\\Buffer\\FBO.cs", @@ -147,7 +329,7 @@ }, { "$type": "Document", - "DocumentIndex": 10, + "DocumentIndex": 21, "Title": "EBO.cs", "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Graphics\\GL\\Buffer\\EBO.cs", "RelativeDocumentMoniker": "StgSharpDebug\\Graphics\\GL\\Buffer\\EBO.cs", @@ -159,7 +341,7 @@ }, { "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 16, "Title": "GLresourceGenrator.cs", "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Graphics\\GL\\GLresourceGenrator.cs", "RelativeDocumentMoniker": "StgSharpDebug\\Graphics\\GL\\GLresourceGenrator.cs", @@ -171,15 +353,16 @@ }, { "$type": "Document", - "DocumentIndex": 3, + "DocumentIndex": 7, "Title": "Form.cs", "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Graphics\\Form\\Form.cs", "RelativeDocumentMoniker": "StgSharpDebug\\Graphics\\Form\\Form.cs", "ToolTip": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Graphics\\Form\\Form.cs", "RelativeToolTip": "StgSharpDebug\\Graphics\\Form\\Form.cs", - "ViewState": "AQIAAJcAAAAAAAAAAAAgwKMAAAAAAAAA", + "ViewState": "AQIAAIYAAAAAAAAAAAAzwHMAAABGAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-04-23T09:01:45.978Z" + "WhenOpened": "2024-04-23T09:01:45.978Z", + "EditorCaption": "" }, { "$type": "Document", @@ -189,21 +372,23 @@ "RelativeDocumentMoniker": "StgSharpDebug\\Graphics\\GL\\glRenderStream.cs", "ToolTip": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Graphics\\GL\\glRenderStream.cs", "RelativeToolTip": "StgSharpDebug\\Graphics\\GL\\glRenderStream.cs", - "ViewState": "AQIAADkAAAAAAAAAAAAcwEIAAAAAAAAA", + "ViewState": "AQIAAAMAAAAAAAAAAIA0wBgAAAAAAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-04-23T08:59:46.546Z" + "WhenOpened": "2024-04-23T08:59:46.546Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 3, "Title": "RenderStream.cs", "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Graphics\\RenderStream.cs", "RelativeDocumentMoniker": "StgSharpDebug\\Graphics\\RenderStream.cs", "ToolTip": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Graphics\\RenderStream.cs", "RelativeToolTip": "StgSharpDebug\\Graphics\\RenderStream.cs", - "ViewState": "AQIAAEkAAAAAAAAAAIBBwF0AAAApAAAA", + "ViewState": "AQIAACcAAAAAAAAAAAAAACsAAAAzAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-04-23T08:54:34.159Z" + "WhenOpened": "2024-04-23T08:54:34.159Z", + "EditorCaption": "" } ] } diff --git a/源代码/.vs/StgSharpDevelop/v17/HierarchyCache.v1.txt b/源代码/.vs/StgSharpDevelop/v17/HierarchyCache.v1.txt new file mode 100644 index 00000000..c80e35e7 Binary files /dev/null and b/源代码/.vs/StgSharpDevelop/v17/HierarchyCache.v1.txt differ diff --git a/源代码/.vs/StgSharpDevelop/v17/fileList.bin b/源代码/.vs/StgSharpDevelop/v17/fileList.bin index ccff7ec1..52c70350 100644 Binary files a/源代码/.vs/StgSharpDevelop/v17/fileList.bin and b/源代码/.vs/StgSharpDevelop/v17/fileList.bin differ diff --git a/源代码/StgSharp/Control/ProcessInput.cs b/源代码/StgSharp/Control/ProcessInput.cs index d31e5b42..f91c2f4e 100644 --- a/源代码/StgSharp/Control/ProcessInput.cs +++ b/源代码/StgSharp/Control/ProcessInput.cs @@ -11,9 +11,7 @@ namespace StgSharp.Graphics public partial class Form { - Dictionary keyEventDictionary = new Dictionary(); - - + Dictionary keyEventDictionary = new Dictionary(); internal void InternalLoadInput(MethodInfo[] methods) { @@ -35,17 +33,15 @@ namespace StgSharp.Graphics } } - internal void InternalProcessInput() { } - } - public sealed class KeyEvent - { + public delegate void KeyBoardEvent(KeyboardKey key, KeyStatus status); + public delegate void MouseEvent(Mouse mouse, KeyStatus status); + public delegate void JoystickEvent(Joystick joystick, KeyStatus status); - } } diff --git a/源代码/StgSharp/Data/IMemoryType.cs b/源代码/StgSharp/Data/IMemoryType.cs new file mode 100644 index 00000000..f081841c --- /dev/null +++ b/源代码/StgSharp/Data/IMemoryType.cs @@ -0,0 +1,56 @@ +//----------------------------------------------------------------------- +//----------------------------------------------------------------------- +// file="IMemoryType.cs" +// Project: StgSharp +// AuthorGroup: Nitload Space +// Copyright (c) Nitload Space. All rights reserved. +// +// Permission is hereby granted, free of charge, to any person +// obtaining a copy of this software and associated documentation +// files (the “Software”), to deal in the Software without restriction, +// including without limitation the rights to use, copy, modify, merge, +// publish, distribute, sublicense, and/or sell copies of the Software, +// and to permit persons to whom the Software is furnished to do so, +// subject to the following conditions: +// +// The above copyright notice and +// this permission notice shall be included in all copies +// or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED “AS IS”, +// WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH +// THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// +//----------------------------------------------------------------------- +//----------------------------------------------------------------------- +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace StgSharp.Math +{ + public interface IMemoryType + { + + public T Read(int index) where T : struct +#if NET8_0_OR_GREATER + , INumber +#endif + ; + + public void Write(int index, T value) where T : struct +#if NET8_0_OR_GREATER + , INumber +#endif + ; + + + } +} diff --git a/源代码/StgSharp/Data/M128.cs b/源代码/StgSharp/Data/M128.cs index eb440110..061153fc 100644 --- a/源代码/StgSharp/Data/M128.cs +++ b/源代码/StgSharp/Data/M128.cs @@ -28,6 +28,8 @@ // //----------------------------------------------------------------------- //----------------------------------------------------------------------- +using StgSharp.Math; + using System; using System.Collections.Generic; using System.Numerics; @@ -41,7 +43,7 @@ using System.Text; namespace StgSharp.Data { [StructLayout(LayoutKind.Explicit, Pack = 16)] - public unsafe struct M128 + public unsafe struct M128:IMemoryType { [FieldOffset(0)] internal Vector4 vec; @@ -50,13 +52,6 @@ namespace StgSharp.Data vec = v; } - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public ulong GetLongHash() - { - return (Read(0) % 2147483647L) * (Read(1) % 2147483647L); - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] public T Read(int index) where T : struct { diff --git a/源代码/StgSharp/Data/M256.cs b/源代码/StgSharp/Data/M256.cs new file mode 100644 index 00000000..af2d8fb9 --- /dev/null +++ b/源代码/StgSharp/Data/M256.cs @@ -0,0 +1,37 @@ +using StgSharp.Data; + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; +using System.Text; +using System.Threading.Tasks; + +namespace StgSharp.Math.HighPrecession +{ + + [StructLayout(LayoutKind.Sequential)] + public unsafe struct M256:IMemoryType + { + private M128 v0; + private M128 v1; + + + T IMemoryType.Read(int index) + { + fixed (M128* mptr = &v0) + { + return *(((T*)mptr) + index); + } + } + + void IMemoryType.Write(int index, T value) + { + fixed (M128* mptr = &v0) + { + *(((T*)mptr) + index) = value; + } + } + } +} diff --git a/源代码/StgSharp/Environment/Monitors.cs b/源代码/StgSharp/Environment/Monitors.cs new file mode 100644 index 00000000..32eb723e --- /dev/null +++ b/源代码/StgSharp/Environment/Monitors.cs @@ -0,0 +1,42 @@ +using StgSharp.Graphics; + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.InteropServices; +using System.Text; +using System.Threading.Tasks; + +namespace StgSharp +{ + public static partial class StgSharp + { + private unsafe static IntPtr[] monitorsArray; + + public static unsafe IntPtr[] MonitorsHandleArray + { + get + { + if (monitorsArray == null) + { + int count = 0; + IntPtr* arrayhandle = InternalIO.glfwGetMonitors(&count); + monitorsArray = new IntPtr[count]; + Marshal.Copy((IntPtr)arrayhandle,monitorsArray,0,count); + Marshal.FreeHGlobal((IntPtr)arrayhandle); + } + return monitorsArray; + } + } + + public static IntPtr DefaultMonitor + { + get + { + return MonitorsHandleArray[0]; + } + } + } + + +} diff --git a/源代码/StgSharp/Environment/globalKeyStat.cs b/源代码/StgSharp/Environment/globalKeyStat.cs index 7dda8f90..e7318c70 100644 --- a/源代码/StgSharp/Environment/globalKeyStat.cs +++ b/源代码/StgSharp/Environment/globalKeyStat.cs @@ -10,17 +10,14 @@ namespace StgSharp public static partial class StgSharp { - private static ConcurrentDictionary keyListener = new ConcurrentDictionary(); + private static ConcurrentDictionary keyListener + = new ConcurrentDictionary(); public static KeyStatus CheckKey(KeyboardKey key) { - int keyId = (int)key; - if (keyListener.ContainsKey((int)keyId)) - { - return keyListener[(int)keyId]?KeyStatus.PRESS:KeyStatus.RELEASE; - } - keyListener.AddOrUpdate + return keyListener.GetOrAdd((int)key, KeyStatus.RELEASE); } + } } diff --git a/源代码/StgSharp/Geometries/Coordination/ICoord.cs b/源代码/StgSharp/Geometries/Coordination/ICoord.cs new file mode 100644 index 00000000..f9c6f5ec --- /dev/null +++ b/源代码/StgSharp/Geometries/Coordination/ICoord.cs @@ -0,0 +1,40 @@ +using StgSharp.Math; + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace StgSharp.Geometries +{ + public abstract class ICoord + { + protected Matrix44 coordMat; + + public abstract Matrix44 GlobalCoordTransformation + { + get; + } + + public abstract vec3d Center + { + get; + } + + public abstract vec3d X_axis + { + get; + } + + public abstract vec3d Y_axis + { + get; + } + + public abstract vec3d Z_axis + { + get; + } + } +} diff --git a/源代码/StgSharp/Geometries/Coordination/StreamLocalCoordinate.cs b/源代码/StgSharp/Geometries/Coordination/StreamLocalCoordinate.cs new file mode 100644 index 00000000..202c5f56 --- /dev/null +++ b/源代码/StgSharp/Geometries/Coordination/StreamLocalCoordinate.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace StgSharp.Geometries +{ + public class StreamLocalCoordinate:ICoord + { + + + } +} diff --git a/源代码/StgSharp/Geometries/SpaceGeometry/SpaceCoordinate.cs b/源代码/StgSharp/Geometries/SpaceGeometry/SpaceCoordinate.cs new file mode 100644 index 00000000..9da396b8 --- /dev/null +++ b/源代码/StgSharp/Geometries/SpaceGeometry/SpaceCoordinate.cs @@ -0,0 +1,42 @@ +//----------------------------------------------------------------------- +//----------------------------------------------------------------------- +// file="Class1.cs" +// Project: StgSharp +// AuthorGroup: Nitload Space +// Copyright (c) Nitload Space. All rights reserved. +// +// Permission is hereby granted, free of charge, to any person +// obtaining a copy of this software and associated documentation +// files (the “Software”), to deal in the Software without restriction, +// including without limitation the rights to use, copy, modify, merge, +// publish, distribute, sublicense, and/or sell copies of the Software, +// and to permit persons to whom the Software is furnished to do so, +// subject to the following conditions: +// +// The above copyright notice and +// this permission notice shall be included in all copies +// or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED “AS IS”, +// WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, +// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH +// THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// +//----------------------------------------------------------------------- +//----------------------------------------------------------------------- +using System; +using System.Collections.Generic; +using System.Text; + +namespace StgSharp.Geometries +{ + public class SpaceCoordinate + { + + + } +} diff --git a/源代码/StgSharp/Graphics/Define/StructDefine.cs b/源代码/StgSharp/Graphics/Define/StructDefine.cs index f9c8348c..ea6d2582 100644 --- a/源代码/StgSharp/Graphics/Define/StructDefine.cs +++ b/源代码/StgSharp/Graphics/Define/StructDefine.cs @@ -114,7 +114,7 @@ namespace StgSharp.Graphics } [StructLayout(LayoutKind.Sequential)] - public unsafe struct GLFWvidmode + public unsafe struct glfwVideomode { /*! The refresh rate, in Hz, of the video mode. @@ -140,7 +140,7 @@ namespace StgSharp.Graphics } [StructLayout(LayoutKind.Sequential)] - public unsafe struct GLFWgammaramp + public unsafe struct glfwGammaramp { /*! An array of value describing the response of the blue channel. @@ -166,13 +166,13 @@ namespace StgSharp.Graphics /*! The height, in pixels, of this image. */ private int height; + /*! The width, in pixels, of this image. + */ + private int width; /*! The pixel data of this image, arranged left-to-right, top-to-bottom. */ private byte* pixels; - /*! The width, in pixels, of this image. - */ - private int width; } @@ -210,35 +210,36 @@ namespace StgSharp.Graphics } [StructLayout(LayoutKind.Sequential)] - public unsafe struct GLFWmonitor + public unsafe struct glfwMonitor { - private GLFWvidmode currentMode; - private GLFWgammaramp currentRamp; + private fixed byte name[128]; + private IntPtr userPointer; + private int width, height; + + private glfwWindow* window; + + private glfwVideomode* modes; private int modeCount; + private glfwVideomode currentMode; - //GLFWvidmode* modes; - private IntPtr modes; + private glfwGammaramp originalRamp; + private glfwGammaramp currentRamp; - private byte[] name = new byte[128]; - - private GLFWgammaramp originalRamp; - private void* userPointer; - - // Physical dimensions in millimeters. - private int widthMM, heightMM; - - // The window whose video mode is current on this monitor - //glfwWindow* window; - private IntPtr window; - - // not transformed - //GLFW_PLATFORM_MONITOR_STATE; - - public GLFWmonitor() + public glfwMonitor() { } + public unsafe string Name + { + get + { + fixed (byte* cptr = name) + { + return Marshal.PtrToStringAnsi((IntPtr)cptr); + } + } + } } [StructLayout(LayoutKind.Sequential)] @@ -256,7 +257,7 @@ namespace StgSharp.Graphics int shouldClose; void* userPointer; int doublebuffer; - // GLFWvidmode videoMode; // 根据GLFWvidmode的定义转换 + // glfwVideomode videoMode; // 根据GLFWvidmode的定义转换 IntPtr monitor; // _GLFWmonitor* monitor; IntPtr cursor; // _GLFWcursor* cursor; @@ -819,10 +820,10 @@ namespace StgSharp.Graphics void (* getMonitorPos) (GLFWmonitor*, int*, int*); void (* getMonitorContentScale) (GLFWmonitor*, float*, float*); void (* getMonitorWorkarea) (GLFWmonitor*, int*, int*, int*, int*); - GLFWvidmode* (* getVideoModes) (GLFWmonitor*, int*); - void (* getVideoMode) (GLFWmonitor*, GLFWvidmode*); - GLFWbool(*getGammaRamp)(GLFWmonitor*, GLFWgammaramp*); - void (* setGammaRamp) (GLFWmonitor*,const GLFWgammaramp*); + glfwVideomode* (* getVideoModes) (GLFWmonitor*, int*); + void (* getVideoMode) (GLFWmonitor*, glfwVideomode*); + GLFWbool(*getGammaRamp)(GLFWmonitor*, glfwGammaramp*); + void (* setGammaRamp) (GLFWmonitor*,const glfwGammaramp*); // window GLFWbool(*createWindow)(glfwWindow*,const GLFWwndconfig*,const GLFWctxconfig*,const GLFWfbconfig*); void (* destroyWindow) (glfwWindow*); diff --git a/源代码/StgSharp/Graphics/Define/glApiDefine.cs b/源代码/StgSharp/Graphics/Define/glApiDefine.cs index ef41ebc2..e4dce01d 100644 --- a/源代码/StgSharp/Graphics/Define/glApiDefine.cs +++ b/源代码/StgSharp/Graphics/Define/glApiDefine.cs @@ -74,7 +74,7 @@ namespace StgSharp.Graphics [UnmanagedFunctionPointer(callingConvention: CallingConvention.StdCall, CharSet = CharSet.Ansi)] internal unsafe delegate void glfwGetFramebufferSize(IntPtr window, int* width, int* height); [UnmanagedFunctionPointer(callingConvention: CallingConvention.StdCall, CharSet = CharSet.Ansi)] internal unsafe delegate byte* glfwGetGamepadName(int jid); [UnmanagedFunctionPointer(callingConvention: CallingConvention.StdCall, CharSet = CharSet.Ansi)] internal unsafe delegate int glfwGetGamepadState(int jid, GLFWgamepadstate* state); - [UnmanagedFunctionPointer(callingConvention: CallingConvention.StdCall, CharSet = CharSet.Ansi)] internal unsafe delegate GLFWgammaramp* glfwGetGammaRamp(IntPtr monitor); + [UnmanagedFunctionPointer(callingConvention: CallingConvention.StdCall, CharSet = CharSet.Ansi)] internal unsafe delegate glfwGammaramp* glfwGetGammaRamp(IntPtr monitor); [UnmanagedFunctionPointer(callingConvention: CallingConvention.StdCall, CharSet = CharSet.Ansi)] internal unsafe delegate int glfwGetInputMode(IntPtr window, int mode); [UnmanagedFunctionPointer(callingConvention: CallingConvention.StdCall, CharSet = CharSet.Ansi)] internal unsafe delegate float* glfwGetJoystickAxes(int jid, int* count); [UnmanagedFunctionPointer(callingConvention: CallingConvention.StdCall, CharSet = CharSet.Ansi)] internal unsafe delegate byte* glfwGetJoystickButtons(int jid, int* count); @@ -101,8 +101,8 @@ namespace StgSharp.Graphics [UnmanagedFunctionPointer(callingConvention: CallingConvention.StdCall, CharSet = CharSet.Ansi)] internal unsafe delegate ulong* glfwGetTimerValue(); [UnmanagedFunctionPointer(callingConvention: CallingConvention.StdCall, CharSet = CharSet.Ansi)] internal unsafe delegate void glfwGetVersion(int* major, int* minor, int* rev); [UnmanagedFunctionPointer(callingConvention: CallingConvention.StdCall, CharSet = CharSet.Ansi)] internal unsafe delegate byte* glfwGetVersionString(); - [UnmanagedFunctionPointer(callingConvention: CallingConvention.StdCall, CharSet = CharSet.Ansi)] internal unsafe delegate GLFWvidmode* glfwGetVideoMode(IntPtr monitor); - [UnmanagedFunctionPointer(callingConvention: CallingConvention.StdCall, CharSet = CharSet.Ansi)] internal unsafe delegate GLFWvidmode* glfwGetVideoModes(IntPtr monitor, int* count); + [UnmanagedFunctionPointer(callingConvention: CallingConvention.StdCall, CharSet = CharSet.Ansi)] internal unsafe delegate glfwVideomode* glfwGetVideoMode(IntPtr monitor); + [UnmanagedFunctionPointer(callingConvention: CallingConvention.StdCall, CharSet = CharSet.Ansi)] internal unsafe delegate glfwVideomode* glfwGetVideoModes(IntPtr monitor, int* count); [UnmanagedFunctionPointer(callingConvention: CallingConvention.StdCall, CharSet = CharSet.Ansi)] internal unsafe delegate int glfwGetWindowAttrib(IntPtr window, int attrib); [UnmanagedFunctionPointer(callingConvention: CallingConvention.StdCall, CharSet = CharSet.Ansi)] internal unsafe delegate void glfwGetWindowContentScale(IntPtr window, float* xscale, float* yscale); [UnmanagedFunctionPointer(callingConvention: CallingConvention.StdCall, CharSet = CharSet.Ansi)] internal unsafe delegate void glfwGetWindowFrameSize(IntPtr window, int* left, int* top, int* right, int* bottom); @@ -135,7 +135,7 @@ namespace StgSharp.Graphics [UnmanagedFunctionPointer(callingConvention: CallingConvention.StdCall, CharSet = CharSet.Ansi)] internal unsafe delegate GLFWerrorfun glfwSetErrorCallback(GLFWerrorfun callback); [UnmanagedFunctionPointer(callingConvention: CallingConvention.StdCall, CharSet = CharSet.Ansi)] internal unsafe delegate FramebuffersizeHandler glfwSetFramebufferSizeCallback(IntPtr window, IntPtr callback); [UnmanagedFunctionPointer(callingConvention: CallingConvention.StdCall, CharSet = CharSet.Ansi)] internal unsafe delegate void glfwSetGamma(IntPtr monitor, float gamma); - [UnmanagedFunctionPointer(callingConvention: CallingConvention.StdCall, CharSet = CharSet.Ansi)] internal unsafe delegate void glfwSetGammaRamp(IntPtr monitor, GLFWgammaramp* ramp); + [UnmanagedFunctionPointer(callingConvention: CallingConvention.StdCall, CharSet = CharSet.Ansi)] internal unsafe delegate void glfwSetGammaRamp(IntPtr monitor, glfwGammaramp* ramp); [UnmanagedFunctionPointer(callingConvention: CallingConvention.StdCall, CharSet = CharSet.Ansi)] internal unsafe delegate void glfwSetInputMode(IntPtr window, int mode, int value); [UnmanagedFunctionPointer(callingConvention: CallingConvention.StdCall, CharSet = CharSet.Ansi)] internal unsafe delegate GLFWjoystickfun glfwSetJoystickCallback(GLFWjoystickfun callback); [UnmanagedFunctionPointer(callingConvention: CallingConvention.StdCall, CharSet = CharSet.Ansi)] internal unsafe delegate void glfwSetJoystickUserPointer(int jid, void* pointer); diff --git a/源代码/StgSharp/Graphics/Form/Form.cs b/源代码/StgSharp/Graphics/Form/Form.cs index 1cf825fa..a5de2ae7 100644 --- a/源代码/StgSharp/Graphics/Form/Form.cs +++ b/源代码/StgSharp/Graphics/Form/Form.cs @@ -90,7 +90,11 @@ namespace StgSharp.Graphics public int Height { get => height; - set => height = value; + set + { + height = value; + InternalIO.glfwSetWindowSize(windowID, Width, Height); + } } public bool ShouldClose @@ -109,6 +113,7 @@ namespace StgSharp.Graphics { width = (int)value.X; height = (int)value.Y; + InternalIO.glfwSetWindowSize(windowID, Width, Height); } } @@ -118,7 +123,11 @@ namespace StgSharp.Graphics public int Width { get => width; - set => width = value; + set + { + width = value; + InternalIO.glfwSetWindowSize(windowID, Width, Height); + } } @@ -206,18 +215,6 @@ namespace StgSharp.Graphics public void SetSizeLimit(int minWidth, int minHeight, int maxWidth, int maxHeight) { InternalIO.glfwSetWindowSizeLimits(this.windowID, minWidth, minHeight, maxWidth, maxHeight); } - #region form main - - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - internal void InternalDeInit() { DeInit(); } - - - unsafe ~Form() { Marshal.FreeHGlobal(graphicContextID); } - - #endregion form main - - } diff --git a/源代码/StgSharp/Graphics/GL/glRenderStream.cs b/源代码/StgSharp/Graphics/GL/glRenderStream.cs index 4b5c1184..e5e92d54 100644 --- a/源代码/StgSharp/Graphics/GL/glRenderStream.cs +++ b/源代码/StgSharp/Graphics/GL/glRenderStream.cs @@ -15,6 +15,16 @@ namespace StgSharp.Graphics set { ContextHandle = value; } } + internal sealed override void CreateCanvas((int width, int height, int depth) size, (int x_stretch, int y_stretch, int z_stretch) coordStrech, string name) + { + Width = size.width; Height = size.height; + Depth = size.depth; + _coordStretch = coordStrech; + Name = name; + + + } + /// /// Init an OpenGl context if current form has not been binded to any context. and set the context binded to /// current form as current OpenGL context. diff --git a/源代码/StgSharp/Graphics/RenderStream.cs b/源代码/StgSharp/Graphics/RenderStream.cs index 4e4c3c2f..5498b650 100644 --- a/源代码/StgSharp/Graphics/RenderStream.cs +++ b/源代码/StgSharp/Graphics/RenderStream.cs @@ -28,8 +28,11 @@ // //----------------------------------------------------------------------- //----------------------------------------------------------------------- +using StgSharp.Math; + using System; using System.Collections.Generic; +using System.ComponentModel; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -38,6 +41,9 @@ namespace StgSharp.Graphics { public abstract class RenderStream { + protected (int x, int y, int z) _coordStretch; + private int refDepth; + protected Camera NativeCamera; private IntPtr canvasHandle; private IntPtr contextHandle; @@ -59,12 +65,30 @@ namespace StgSharp.Graphics get => contextHandle; internal set => contextHandle = value; } + + public int Depth + { + get => refDepth; + internal set => refDepth = value; + } + public int Height { get => height; internal set => height = value; } + public vec3d GlobalCoordSize + { + get + { + return ( + Width * 1.0f / _coordStrech.x, + Height * 1.0f / _coordStrech.y, + refDepth * 1.0f / _coordStrech.z); + } + } + public IntPtr Monitor { get => monitor; @@ -89,6 +113,10 @@ namespace StgSharp.Graphics internal set => width = value; } + internal abstract void CreateCanvas( + (int width,int height,int depth) size, (int x_stretch,int y_stretch, int z_stretch) coordStrech, string name + ); + protected abstract void Init(); protected abstract void Main(); protected abstract void Deinit(); diff --git a/源代码/StgSharp/Graphics/framework.cs b/源代码/StgSharp/Graphics/framework.cs index d6d22f59..373e51ad 100644 --- a/源代码/StgSharp/Graphics/framework.cs +++ b/源代码/StgSharp/Graphics/framework.cs @@ -81,15 +81,15 @@ namespace StgSharp [DllImport(SSC_libname, EntryPoint = "glfwSetMonitorCallback")] internal static extern unsafe GLFWmonitorfun glfwSetMonitorCallback(GLFWmonitorfun callback); - [DllImport(SSC_libname, EntryPoint = "glfwGetVideoModes")] internal static extern unsafe GLFWvidmode* glfwGetVideoModes(IntPtr monitor, int* count); + [DllImport(SSC_libname, EntryPoint = "glfwGetVideoModes")] internal static extern unsafe glfwVideomode* glfwGetVideoModes(IntPtr monitor, int* count); - [DllImport(SSC_libname, EntryPoint = "glfwGetVideoMode")] internal static extern unsafe GLFWvidmode* glfwGetVideoMode(IntPtr monitor); + [DllImport(SSC_libname, EntryPoint = "glfwGetVideoMode")] internal static extern unsafe glfwVideomode* glfwGetVideoMode(IntPtr monitor); [DllImport(SSC_libname, EntryPoint = "glfwSetGamma")] internal static extern unsafe void glfwSetGamma(IntPtr monitor, float gamma); - [DllImport(SSC_libname, EntryPoint = "glfwGetGammaRamp")] internal static extern unsafe GLFWgammaramp* glfwGetGammaRamp(IntPtr monitor); + [DllImport(SSC_libname, EntryPoint = "glfwGetGammaRamp")] internal static extern unsafe glfwGammaramp* glfwGetGammaRamp(IntPtr monitor); - [DllImport(SSC_libname, EntryPoint = "glfwSetGammaRamp")] internal static extern unsafe void glfwSetGammaRamp(IntPtr monitor, GLFWgammaramp* ramp); + [DllImport(SSC_libname, EntryPoint = "glfwSetGammaRamp")] internal static extern unsafe void glfwSetGammaRamp(IntPtr monitor, glfwGammaramp* ramp); [DllImport(SSC_libname, EntryPoint = "glfwDefaultWindowHints")] internal static extern unsafe void glfwDefaultWindowHints(); diff --git a/源代码/StgSharp/Math/Linear/Cordination.cs b/源代码/StgSharp/Math/Linear/Cordination.cs index 33a976ed..d106fcce 100644 --- a/源代码/StgSharp/Math/Linear/Cordination.cs +++ b/源代码/StgSharp/Math/Linear/Cordination.cs @@ -31,11 +31,11 @@ namespace StgSharp.Math { - internal class Cordination + internal class Coordination { } - public enum CordinatePlain + public enum CoordinatePlain { XY, YZ, diff --git a/源代码/StgSharp/Math/Linear/Matrix44.cs b/源代码/StgSharp/Math/Linear/Matrix44.cs index 4fb91f8e..b238b0a3 100644 --- a/源代码/StgSharp/Math/Linear/Matrix44.cs +++ b/源代码/StgSharp/Math/Linear/Matrix44.cs @@ -145,7 +145,7 @@ namespace StgSharp.Math } public static Matrix44 Unit -=> new Matrix44( + => new Matrix44( 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, diff --git a/源代码/StgSharp/Math/Linear/Vector.VectorTransform.cs b/源代码/StgSharp/Math/Linear/Vector.VectorTransform.cs index 779f22c8..0124a8b5 100644 --- a/源代码/StgSharp/Math/Linear/Vector.VectorTransform.cs +++ b/源代码/StgSharp/Math/Linear/Vector.VectorTransform.cs @@ -36,17 +36,17 @@ namespace StgSharp.Math public static unsafe partial class VectorCalc { - public static vec2d To2D(vec3d vec, CordinatePlain plain) + public static vec2d To2D(vec3d vec, CoordinatePlain plain) { switch (plain) { - case CordinatePlain.XY: + case CoordinatePlain.XY: return new vec2d(vec.X, vec.Y); break; - case CordinatePlain.YZ: + case CoordinatePlain.YZ: return new vec2d(vec.Y, vec.Z); break; - case CordinatePlain.XZ: + case CoordinatePlain.XZ: return new vec2d(vec.X, vec.Z); break; default: diff --git a/源代码/StgSharp/Math/Linear/vec3d.cs b/源代码/StgSharp/Math/Linear/vec3d.cs index f87551c5..a46a0497 100644 --- a/源代码/StgSharp/Math/Linear/vec3d.cs +++ b/源代码/StgSharp/Math/Linear/vec3d.cs @@ -178,6 +178,13 @@ namespace StgSharp.Math return new vec3d(vec.v / value); } + [MethodImpl(MethodImplOptions.AggressiveInlining)] + public static unsafe implicit operator vec3d((float, float, float) tuple) + { + vec3d v = *(vec3d*)&tuple; + v.vec.W = 0.0f; + return v; + } [MethodImpl(MethodImplOptions.AggressiveInlining)] public static vec3d operator +(vec3d left, vec3d right) @@ -203,6 +210,7 @@ namespace StgSharp.Math return Cross(left,right) == Zero; } + [MethodImpl(MethodImplOptions.AggressiveInlining)] public static vec3d Cross(vec3d left, vec3d right) diff --git a/源代码/StgSharp/obj/Debug/netstandard2.1/StgSharp.AssemblyInfo.cs b/源代码/StgSharp/obj/Debug/netstandard2.1/StgSharp.AssemblyInfo.cs index 12d56099..13e4dad0 100644 --- a/源代码/StgSharp/obj/Debug/netstandard2.1/StgSharp.AssemblyInfo.cs +++ b/源代码/StgSharp/obj/Debug/netstandard2.1/StgSharp.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("StgSharp")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+915a560b4309adf0aa201a011f972121196e6b02")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+32c0a0f99bffeed87de8eedfd6d8a27bbcc94012")] [assembly: System.Reflection.AssemblyProductAttribute("StgSharp")] [assembly: System.Reflection.AssemblyTitleAttribute("StgSharp")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/源代码/StgSharpDebug/StgSharpDebug.csproj b/源代码/StgSharpDebug/StgSharpDebug.csproj index e078adec..4e8bfefc 100644 --- a/源代码/StgSharpDebug/StgSharpDebug.csproj +++ b/源代码/StgSharpDebug/StgSharpDebug.csproj @@ -88,6 +88,7 @@ + diff --git a/源代码/StgSharpDebug/obj/Debug/net6.0/StgSharpDebug.AssemblyInfo.cs b/源代码/StgSharpDebug/obj/Debug/net6.0/StgSharpDebug.AssemblyInfo.cs index b975b651..851cf7cf 100644 --- a/源代码/StgSharpDebug/obj/Debug/net6.0/StgSharpDebug.AssemblyInfo.cs +++ b/源代码/StgSharpDebug/obj/Debug/net6.0/StgSharpDebug.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("StgSharpDebug")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+915a560b4309adf0aa201a011f972121196e6b02")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+32c0a0f99bffeed87de8eedfd6d8a27bbcc94012")] [assembly: System.Reflection.AssemblyProductAttribute("StgSharpDebug")] [assembly: System.Reflection.AssemblyTitleAttribute("StgSharpDebug")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]