diff --git a/源代码/.vs/ProjectEvaluation/stgsharpdevelop.metadata.v7.bin b/源代码/.vs/ProjectEvaluation/stgsharpdevelop.metadata.v7.bin index 70f16aca..544f3bdf 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 1c24d2c6..e3342c70 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 9212583a..6e566c5f 100644 Binary files a/源代码/.vs/StgSharpDevelop/DesignTimeBuild/.dtbcache.v2 and b/源代码/.vs/StgSharpDevelop/DesignTimeBuild/.dtbcache.v2 differ diff --git a/源代码/.vs/StgSharpDevelop/FileContentIndex/09af57cc-309a-4f71-bcb0-1d5f61778d9f.vsidx b/源代码/.vs/StgSharpDevelop/FileContentIndex/09af57cc-309a-4f71-bcb0-1d5f61778d9f.vsidx new file mode 100644 index 00000000..301d1e5b Binary files /dev/null and b/源代码/.vs/StgSharpDevelop/FileContentIndex/09af57cc-309a-4f71-bcb0-1d5f61778d9f.vsidx differ diff --git a/源代码/.vs/StgSharpDevelop/FileContentIndex/0dff1a08-76e6-47ad-a5f6-674abf144f9f.vsidx b/源代码/.vs/StgSharpDevelop/FileContentIndex/0dff1a08-76e6-47ad-a5f6-674abf144f9f.vsidx deleted file mode 100644 index 01324994..00000000 Binary files a/源代码/.vs/StgSharpDevelop/FileContentIndex/0dff1a08-76e6-47ad-a5f6-674abf144f9f.vsidx and /dev/null differ diff --git a/源代码/.vs/StgSharpDevelop/FileContentIndex/16634008-7375-45d5-99ee-694c4d92c41b.vsidx b/源代码/.vs/StgSharpDevelop/FileContentIndex/16634008-7375-45d5-99ee-694c4d92c41b.vsidx deleted file mode 100644 index 47e9be4e..00000000 Binary files a/源代码/.vs/StgSharpDevelop/FileContentIndex/16634008-7375-45d5-99ee-694c4d92c41b.vsidx and /dev/null differ diff --git a/源代码/.vs/StgSharpDevelop/FileContentIndex/417e7f54-4f13-4e1a-ac32-3392bab10d4e.vsidx b/源代码/.vs/StgSharpDevelop/FileContentIndex/417e7f54-4f13-4e1a-ac32-3392bab10d4e.vsidx new file mode 100644 index 00000000..e809c453 Binary files /dev/null and b/源代码/.vs/StgSharpDevelop/FileContentIndex/417e7f54-4f13-4e1a-ac32-3392bab10d4e.vsidx differ diff --git a/源代码/.vs/StgSharpDevelop/FileContentIndex/93719fce-ba59-485f-88a5-aef8b309864c.vsidx b/源代码/.vs/StgSharpDevelop/FileContentIndex/93719fce-ba59-485f-88a5-aef8b309864c.vsidx new file mode 100644 index 00000000..cc1adade Binary files /dev/null and b/源代码/.vs/StgSharpDevelop/FileContentIndex/93719fce-ba59-485f-88a5-aef8b309864c.vsidx differ diff --git a/源代码/.vs/StgSharpDevelop/FileContentIndex/9c92e083-2162-4881-a68a-2ea2b9f35f59.vsidx b/源代码/.vs/StgSharpDevelop/FileContentIndex/9c92e083-2162-4881-a68a-2ea2b9f35f59.vsidx new file mode 100644 index 00000000..698ad8cc Binary files /dev/null and b/源代码/.vs/StgSharpDevelop/FileContentIndex/9c92e083-2162-4881-a68a-2ea2b9f35f59.vsidx differ diff --git a/源代码/.vs/StgSharpDevelop/FileContentIndex/c3cabf48-fea0-4a62-ac08-335f24f557d2.vsidx b/源代码/.vs/StgSharpDevelop/FileContentIndex/c3cabf48-fea0-4a62-ac08-335f24f557d2.vsidx deleted file mode 100644 index 10dfc36b..00000000 Binary files a/源代码/.vs/StgSharpDevelop/FileContentIndex/c3cabf48-fea0-4a62-ac08-335f24f557d2.vsidx and /dev/null differ diff --git a/源代码/.vs/StgSharpDevelop/FileContentIndex/e3fbaa32-3574-4a69-ba6a-2660ae8d00ee.vsidx b/源代码/.vs/StgSharpDevelop/FileContentIndex/e3fbaa32-3574-4a69-ba6a-2660ae8d00ee.vsidx deleted file mode 100644 index 14d419ed..00000000 Binary files a/源代码/.vs/StgSharpDevelop/FileContentIndex/e3fbaa32-3574-4a69-ba6a-2660ae8d00ee.vsidx and /dev/null differ diff --git a/源代码/.vs/StgSharpDevelop/FileContentIndex/f33e2262-0e3d-43ce-b7dd-eb19763372e6.vsidx b/源代码/.vs/StgSharpDevelop/FileContentIndex/f33e2262-0e3d-43ce-b7dd-eb19763372e6.vsidx new file mode 100644 index 00000000..58118550 Binary files /dev/null and b/源代码/.vs/StgSharpDevelop/FileContentIndex/f33e2262-0e3d-43ce-b7dd-eb19763372e6.vsidx differ diff --git a/源代码/.vs/StgSharpDevelop/FileContentIndex/fdaf367b-1a97-440e-a25c-6b919482fe75.vsidx b/源代码/.vs/StgSharpDevelop/FileContentIndex/fdaf367b-1a97-440e-a25c-6b919482fe75.vsidx deleted file mode 100644 index 466c482b..00000000 Binary files a/源代码/.vs/StgSharpDevelop/FileContentIndex/fdaf367b-1a97-440e-a25c-6b919482fe75.vsidx and /dev/null differ diff --git a/源代码/.vs/StgSharpDevelop/v17/.futdcache.v2 b/源代码/.vs/StgSharpDevelop/v17/.futdcache.v2 index 950213d1..b0f60788 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 217c6640..b7b13d27 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 a3b43dab..6cebb047 100644 --- a/源代码/.vs/StgSharpDevelop/v17/DocumentLayout.json +++ b/源代码/.vs/StgSharpDevelop/v17/DocumentLayout.json @@ -3,13 +3,53 @@ "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\\graphics\\gl\\shaderedit\\shader.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|solutionrelative:stgsharpdebug\\graphics\\gl\\shaderedit\\shader.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\\logic\\bluepaint.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|solutionrelative:stgsharpdebug\\logic\\bluepaint.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{3EAF2EE6-FA9E-4F57-951F-7E6F8125DFBF}|StgSharp\\StgSharp.csproj|d:\\nitloadindustry\\\u7814\u7A76\u9879\u76EE\\1-flagship\\th2020\\projectfile\\\u6E90\u4EE3\u7801\\stgsharp\\data\\ssd\\ssd.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{3EAF2EE6-FA9E-4F57-951F-7E6F8125DFBF}|StgSharp\\StgSharp.csproj|solutionrelative:stgsharp\\data\\ssd\\ssd.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{3EAF2EE6-FA9E-4F57-951F-7E6F8125DFBF}|StgSharp\\StgSharp.csproj|d:\\nitloadindustry\\\u7814\u7A76\u9879\u76EE\\1-flagship\\th2020\\projectfile\\\u6E90\u4EE3\u7801\\stgsharp\\logic\\bluepaintnode.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{3EAF2EE6-FA9E-4F57-951F-7E6F8125DFBF}|StgSharp\\StgSharp.csproj|solutionrelative:stgsharp\\logic\\bluepaintnode.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\\test\\mainrenderstream.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|solutionrelative:stgsharpdebug\\test\\mainrenderstream.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\\ssd\\area.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|solutionrelative:stgsharpdebug\\data\\ssd\\area.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\\formthreading.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|solutionrelative:stgsharpdebug\\graphics\\form\\formthreading.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\\ssd\\ssdraw.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|solutionrelative:stgsharpdebug\\data\\ssd\\ssdraw.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\\ssd\\ssd.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|solutionrelative:stgsharpdebug\\data\\ssd\\ssd.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\\ssd\\ssdvirtualfolder.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|solutionrelative:stgsharpdebug\\data\\ssd\\ssdvirtualfolder.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\\globaldata\\idprovider.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|solutionrelative:stgsharpdebug\\data\\globaldata\\idprovider.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\\logic\\bluepaintnode.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|solutionrelative:stgsharpdebug\\logic\\bluepaintnode.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\\shaderedit\\shader.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|solutionrelative:stgsharpdebug\\graphics\\gl\\shaderedit\\shader.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, { "AbsoluteMoniker": "D:0:0:{183AA95A-FEBD-42A5-A205-AB7048678251}|OEM\\OEM.csproj|d:\\nitloadindustry\\\u7814\u7A76\u9879\u76EE\\1-flagship\\th2020\\projectfile\\\u6E90\u4EE3\u7801\\oem\\mainform.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{183AA95A-FEBD-42A5-A205-AB7048678251}|OEM\\OEM.csproj|solutionrelative:oem\\mainform.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" @@ -18,18 +58,6 @@ "AbsoluteMoniker": "D:0:0:{3EAF2EE6-FA9E-4F57-951F-7E6F8125DFBF}|StgSharp\\StgSharp.csproj|d:\\nitloadindustry\\\u7814\u7A76\u9879\u76EE\\1-flagship\\th2020\\projectfile\\\u6E90\u4EE3\u7801\\stgsharp\\graphics\\gl\\glrenderstream.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{3EAF2EE6-FA9E-4F57-951F-7E6F8125DFBF}|StgSharp\\StgSharp.csproj|solutionrelative:stgsharp\\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\\logic\\bluepaintnode.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|solutionrelative:stgsharpdebug\\logic\\bluepaintnode.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\\logic\\bluepaint.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|solutionrelative:stgsharpdebug\\logic\\bluepaint.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\\test\\mainrenderstream.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|solutionrelative:stgsharpdebug\\test\\mainrenderstream.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}" @@ -50,10 +78,6 @@ "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\\data\\ssd\\ssdraw.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|solutionrelative:stgsharpdebug\\data\\ssd\\ssdraw.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\\test\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{610B992B-BB34-49C3-9993-676C595FC12E}|StgSharpDebug\\StgSharpDebug.csproj|solutionrelative:stgsharpdebug\\test\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" @@ -186,11 +210,89 @@ "DocumentGroups": [ { "DockedWidth": 197, - "SelectedChildIndex": 10, + "SelectedChildIndex": 8, "Children": [ { "$type": "Document", "DocumentIndex": 2, + "Title": "BluePaintNode.cs", + "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharp\\Logic\\BluePaintNode.cs", + "RelativeDocumentMoniker": "StgSharp\\Logic\\BluePaintNode.cs", + "ToolTip": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharp\\Logic\\BluePaintNode.cs", + "RelativeToolTip": "StgSharp\\Logic\\BluePaintNode.cs", + "ViewState": "AQIAAE0AAAAAAAAAAIAzwF0AAAAWAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-04-27T17:53:16.369Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 1, + "Title": "SSD.cs", + "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharp\\Data\\SSD\\SSD.cs", + "RelativeDocumentMoniker": "StgSharp\\Data\\SSD\\SSD.cs", + "ToolTip": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharp\\Data\\SSD\\SSD.cs", + "RelativeToolTip": "StgSharp\\Data\\SSD\\SSD.cs", + "ViewState": "AQIAABMAAAAAAAAAAIAzwCIAAAAQAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-04-27T17:53:00.869Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 4, + "Title": "Area.cs", + "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Data\\SSD\\Area.cs", + "RelativeDocumentMoniker": "StgSharpDebug\\Data\\SSD\\Area.cs", + "ToolTip": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Data\\SSD\\Area.cs", + "RelativeToolTip": "StgSharpDebug\\Data\\SSD\\Area.cs", + "ViewState": "AQIAAAUAAAAAAAAAAIA0wBUAAAAxAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-04-27T17:35:18.56Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 7, + "Title": "SSD.cs", + "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Data\\SSD\\SSD.cs", + "RelativeDocumentMoniker": "StgSharpDebug\\Data\\SSD\\SSD.cs", + "ToolTip": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Data\\SSD\\SSD.cs", + "RelativeToolTip": "StgSharpDebug\\Data\\SSD\\SSD.cs", + "ViewState": "AQIAACMAAAAAAAAAAAAWwD0AAAAeAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-04-27T17:37:00.277Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 9, + "Title": "idProvider.cs", + "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Data\\GlobalData\\idProvider.cs", + "RelativeDocumentMoniker": "StgSharpDebug\\Data\\GlobalData\\idProvider.cs", + "ToolTip": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Data\\GlobalData\\idProvider.cs", + "RelativeToolTip": "StgSharpDebug\\Data\\GlobalData\\idProvider.cs", + "ViewState": "AQIAABoAAAAAAAAAAAAWwCYAAAAPAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-04-27T17:35:00.506Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 8, + "Title": "SSDVirtualFolder.cs", + "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Data\\SSD\\SSDVirtualFolder.cs", + "RelativeDocumentMoniker": "StgSharpDebug\\Data\\SSD\\SSDVirtualFolder.cs", + "ToolTip": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Data\\SSD\\SSDVirtualFolder.cs", + "RelativeToolTip": "StgSharpDebug\\Data\\SSD\\SSDVirtualFolder.cs", + "ViewState": "AQIAAFkAAAAAAAAAAAAMwGkAAAANAAAA", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2024-04-27T17:33:22.495Z", + "EditorCaption": "" + }, + { + "$type": "Document", + "DocumentIndex": 12, "Title": "MainForm.cs", "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\OEM\\MainForm.cs", "RelativeDocumentMoniker": "OEM\\MainForm.cs", @@ -198,12 +300,11 @@ "RelativeToolTip": "OEM\\MainForm.cs", "ViewState": "AQIAAAcAAAAAAAAAAIAzwAsAAAAFAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-04-26T21:06:53.667Z", - "EditorCaption": "" + "WhenOpened": "2024-04-26T21:06:53.667Z" }, { "$type": "Document", - "DocumentIndex": 3, + "DocumentIndex": 13, "Title": "glRenderStream.cs", "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharp\\Graphics\\GL\\glRenderStream.cs", "RelativeDocumentMoniker": "StgSharp\\Graphics\\GL\\glRenderStream.cs", @@ -211,38 +312,37 @@ "RelativeToolTip": "StgSharp\\Graphics\\GL\\glRenderStream.cs", "ViewState": "AQIAAAYAAAAAAAAAAIAzwBYAAAAxAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-04-26T21:06:09.909Z", - "EditorCaption": "" + "WhenOpened": "2024-04-26T21:06:09.909Z" }, { "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 0, "Title": "BluePaint.cs", "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Logic\\BluePaint.cs", "RelativeDocumentMoniker": "StgSharpDebug\\Logic\\BluePaint.cs", "ToolTip": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Logic\\BluePaint.cs", "RelativeToolTip": "StgSharpDebug\\Logic\\BluePaint.cs", - "ViewState": "AQIAACEAAAAAAAAAAAAAAC4AAAAUAAAA", + "ViewState": "AQIAACEAAAAAAAAAAAAAADMAAAAJAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-04-26T20:20:31.076Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 10, "Title": "BluePaintNode.cs", "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Logic\\BluePaintNode.cs", "RelativeDocumentMoniker": "StgSharpDebug\\Logic\\BluePaintNode.cs", "ToolTip": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Logic\\BluePaintNode.cs", "RelativeToolTip": "StgSharpDebug\\Logic\\BluePaintNode.cs", - "ViewState": "AQIAAFMAAAAAAAAAAAAMwGkAAAAyAAAA", + "ViewState": "AQIAACAAAAAAAAAAAAAQwDYAAAAdAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-04-26T20:15:50.576Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 9, + "DocumentIndex": 16, "Title": "Camera.cs", "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Math\\Graphic\\Camera.cs", "RelativeDocumentMoniker": "StgSharpDebug\\Math\\Graphic\\Camera.cs", @@ -250,12 +350,11 @@ "RelativeToolTip": "StgSharpDebug\\Math\\Graphic\\Camera.cs", "ViewState": "AQIAACYAAAAAAAAAAIAzwC0AAAAQAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-04-26T18:08:00.666Z", - "EditorCaption": "" + "WhenOpened": "2024-04-26T18:08:00.666Z" }, { "$type": "Document", - "DocumentIndex": 16, + "DocumentIndex": 22, "Title": "FormThreading.cs", "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharp\\Graphics\\Form\\FormThreading.cs", "RelativeDocumentMoniker": "StgSharp\\Graphics\\Form\\FormThreading.cs", @@ -267,7 +366,7 @@ }, { "$type": "Document", - "DocumentIndex": 17, + "DocumentIndex": 23, "Title": "Area.cs", "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharp\\Data\\SSD\\Area.cs", "RelativeDocumentMoniker": "StgSharp\\Data\\SSD\\Area.cs", @@ -279,20 +378,20 @@ }, { "$type": "Document", - "DocumentIndex": 12, + "DocumentIndex": 6, "Title": "SSDraw.cs", "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Data\\SSD\\SSDraw.cs", "RelativeDocumentMoniker": "StgSharpDebug\\Data\\SSD\\SSDraw.cs", "ToolTip": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Data\\SSD\\SSDraw.cs", "RelativeToolTip": "StgSharpDebug\\Data\\SSD\\SSDraw.cs", - "ViewState": "AQIAAC0AAAAAAAAAAAArwEEAAAAJAAAA", + "ViewState": "AQIAAEsAAAAAAAAAAIAzwGYAAAAXAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-04-25T19:33:32.378Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 20, + "DocumentIndex": 26, "Title": "Program.cs", "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgsharpEnvDebug\\Program.cs", "RelativeDocumentMoniker": "StgsharpEnvDebug\\Program.cs", @@ -304,7 +403,7 @@ }, { "$type": "Document", - "DocumentIndex": 22, + "DocumentIndex": 28, "Title": "Polygon4.cs", "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Geometries\\PlainGeometry\\Polygon4.cs", "RelativeDocumentMoniker": "StgSharpDebug\\Geometries\\PlainGeometry\\Polygon4.cs", @@ -316,33 +415,33 @@ }, { "$type": "Document", - "DocumentIndex": 0, + "DocumentIndex": 11, "Title": "Shader.cs", "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Graphics\\GL\\ShaderEdit\\Shader.cs", "RelativeDocumentMoniker": "StgSharpDebug\\Graphics\\GL\\ShaderEdit\\Shader.cs", "ToolTip": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Graphics\\GL\\ShaderEdit\\Shader.cs", "RelativeToolTip": "StgSharpDebug\\Graphics\\GL\\ShaderEdit\\Shader.cs", - "ViewState": "AQIAABkAAAAAAAAAAIAzwCoAAAAFAAAA", + "ViewState": "AQIAAF8AAAAAAAAAAIAwwHEAAAAJAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-04-25T19:16:18.922Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 1, + "DocumentIndex": 5, "Title": "FormThreading.cs", "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Graphics\\Form\\FormThreading.cs", "RelativeDocumentMoniker": "StgSharpDebug\\Graphics\\Form\\FormThreading.cs", "ToolTip": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Graphics\\Form\\FormThreading.cs", "RelativeToolTip": "StgSharpDebug\\Graphics\\Form\\FormThreading.cs", - "ViewState": "AQIAAEsAAAAAAAAAAIAzwFsAAAAcAAAA", + "ViewState": "AQIAADMAAAAAAAAAAIA7wEsAAAASAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-04-25T19:29:47.069Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 23, + "DocumentIndex": 29, "Title": "Uniform.cs", "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Graphics\\GL\\ShaderEdit\\Uniform.cs", "RelativeDocumentMoniker": "StgSharpDebug\\Graphics\\GL\\ShaderEdit\\Uniform.cs", @@ -354,20 +453,20 @@ }, { "$type": "Document", - "DocumentIndex": 6, + "DocumentIndex": 3, "Title": "MainRenderStream.cs", "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Test\\MainRenderStream.cs", "RelativeDocumentMoniker": "StgSharpDebug\\Test\\MainRenderStream.cs", "ToolTip": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Test\\MainRenderStream.cs", "RelativeToolTip": "StgSharpDebug\\Test\\MainRenderStream.cs", - "ViewState": "AQIAAHoAAAAAAAAAAAASwIwAAAAMAAAA", + "ViewState": "AQIAAH4AAAAAAAAAAIAzwI4AAAA7AAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-04-25T19:10:03.206Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 13, + "DocumentIndex": 19, "Title": "Program.cs", "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Test\\Program.cs", "RelativeDocumentMoniker": "StgSharpDebug\\Test\\Program.cs", @@ -375,12 +474,11 @@ "RelativeToolTip": "StgSharpDebug\\Test\\Program.cs", "ViewState": "AQIAAAkAAAAAAAAAAAAAAAwAAAAAAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-04-25T18:53:26.174Z", - "EditorCaption": "" + "WhenOpened": "2024-04-25T18:53:26.174Z" }, { "$type": "Document", - "DocumentIndex": 15, + "DocumentIndex": 21, "Title": "glApiManager.cs", "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharp\\Graphics\\GL\\glApiManager.cs", "RelativeDocumentMoniker": "StgSharp\\Graphics\\GL\\glApiManager.cs", @@ -392,7 +490,7 @@ }, { "$type": "Document", - "DocumentIndex": 24, + "DocumentIndex": 30, "Title": "PlainGeometry.cs", "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharp\\Geometries\\PlainGeometry\\PlainGeometry.cs", "RelativeDocumentMoniker": "StgSharp\\Geometries\\PlainGeometry\\PlainGeometry.cs", @@ -404,7 +502,7 @@ }, { "$type": "Document", - "DocumentIndex": 14, + "DocumentIndex": 20, "Title": "glApiManager.cs", "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Graphics\\GL\\glApiManager.cs", "RelativeDocumentMoniker": "StgSharpDebug\\Graphics\\GL\\glApiManager.cs", @@ -416,7 +514,7 @@ }, { "$type": "Document", - "DocumentIndex": 26, + "DocumentIndex": 32, "Title": "Arc.cs", "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Geometries\\PlainGeometry\\Arc.cs", "RelativeDocumentMoniker": "StgSharpDebug\\Geometries\\PlainGeometry\\Arc.cs", @@ -428,7 +526,7 @@ }, { "$type": "Document", - "DocumentIndex": 27, + "DocumentIndex": 33, "Title": "Vec4d.cs", "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Math\\Linear\\Vec4d.cs", "RelativeDocumentMoniker": "StgSharpDebug\\Math\\Linear\\Vec4d.cs", @@ -440,7 +538,7 @@ }, { "$type": "Document", - "DocumentIndex": 31, + "DocumentIndex": 37, "Title": "PlainGeometry.cs", "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Geometries\\PlainGeometry\\PlainGeometry.cs", "RelativeDocumentMoniker": "StgSharpDebug\\Geometries\\PlainGeometry\\PlainGeometry.cs", @@ -452,7 +550,7 @@ }, { "$type": "Document", - "DocumentIndex": 30, + "DocumentIndex": 36, "Title": "IGeometry.cs", "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Geometries\\IGeometry.cs", "RelativeDocumentMoniker": "StgSharpDebug\\Geometries\\IGeometry.cs", @@ -464,7 +562,7 @@ }, { "$type": "Document", - "DocumentIndex": 18, + "DocumentIndex": 24, "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", @@ -476,7 +574,7 @@ }, { "$type": "Document", - "DocumentIndex": 25, + "DocumentIndex": 31, "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", @@ -488,7 +586,7 @@ }, { "$type": "Document", - "DocumentIndex": 28, + "DocumentIndex": 34, "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", @@ -500,7 +598,7 @@ }, { "$type": "Document", - "DocumentIndex": 32, + "DocumentIndex": 38, "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", @@ -512,7 +610,7 @@ }, { "$type": "Document", - "DocumentIndex": 33, + "DocumentIndex": 39, "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", @@ -524,7 +622,7 @@ }, { "$type": "Document", - "DocumentIndex": 29, + "DocumentIndex": 35, "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", @@ -536,7 +634,7 @@ }, { "$type": "Document", - "DocumentIndex": 34, + "DocumentIndex": 40, "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", @@ -548,7 +646,7 @@ }, { "$type": "Document", - "DocumentIndex": 35, + "DocumentIndex": 41, "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", @@ -560,7 +658,7 @@ }, { "$type": "Document", - "DocumentIndex": 37, + "DocumentIndex": 43, "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", @@ -572,7 +670,7 @@ }, { "$type": "Document", - "DocumentIndex": 36, + "DocumentIndex": 42, "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", @@ -584,7 +682,7 @@ }, { "$type": "Document", - "DocumentIndex": 38, + "DocumentIndex": 44, "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", @@ -596,7 +694,7 @@ }, { "$type": "Document", - "DocumentIndex": 11, + "DocumentIndex": 18, "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", @@ -604,12 +702,11 @@ "RelativeToolTip": "StgSharpDebug\\Graphics\\Define\\StructDefine.cs", "ViewState": "AQIAAPMAAAAAAAAAAAAIwBkBAAARAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-04-23T09:29:14.177Z", - "EditorCaption": "" + "WhenOpened": "2024-04-23T09:29:14.177Z" }, { "$type": "Document", - "DocumentIndex": 21, + "DocumentIndex": 27, "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", @@ -621,7 +718,7 @@ }, { "$type": "Document", - "DocumentIndex": 39, + "DocumentIndex": 45, "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", @@ -633,7 +730,7 @@ }, { "$type": "Document", - "DocumentIndex": 40, + "DocumentIndex": 46, "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", @@ -645,7 +742,7 @@ }, { "$type": "Document", - "DocumentIndex": 41, + "DocumentIndex": 47, "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", @@ -657,7 +754,7 @@ }, { "$type": "Document", - "DocumentIndex": 43, + "DocumentIndex": 49, "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", @@ -669,7 +766,7 @@ }, { "$type": "Document", - "DocumentIndex": 42, + "DocumentIndex": 48, "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", @@ -681,7 +778,7 @@ }, { "$type": "Document", - "DocumentIndex": 10, + "DocumentIndex": 17, "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", @@ -689,12 +786,11 @@ "RelativeToolTip": "StgSharpDebug\\Graphics\\GL\\GLresourceGenrator.cs", "ViewState": "AQIAACIAAAAAAAAAAAAzwFYAAAAIAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-04-23T09:02:18.829Z", - "EditorCaption": "" + "WhenOpened": "2024-04-23T09:02:18.829Z" }, { "$type": "Document", - "DocumentIndex": 19, + "DocumentIndex": 25, "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", @@ -706,7 +802,7 @@ }, { "$type": "Document", - "DocumentIndex": 8, + "DocumentIndex": 15, "Title": "glRenderStream.cs", "DocumentMoniker": "D:\\NitloadIndustry\\\u7814\u7A76\u9879\u76EE\\1-Flagship\\TH2020\\ProjectFile\\\u6E90\u4EE3\u7801\\StgSharpDebug\\Graphics\\GL\\glRenderStream.cs", "RelativeDocumentMoniker": "StgSharpDebug\\Graphics\\GL\\glRenderStream.cs", @@ -714,12 +810,11 @@ "RelativeToolTip": "StgSharpDebug\\Graphics\\GL\\glRenderStream.cs", "ViewState": "AQIAAAMAAAAAAAAAAIA0wBAAAAAzAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-04-23T08:59:46.546Z", - "EditorCaption": "" + "WhenOpened": "2024-04-23T08:59:46.546Z" }, { "$type": "Document", - "DocumentIndex": 7, + "DocumentIndex": 14, "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", @@ -727,8 +822,7 @@ "RelativeToolTip": "StgSharpDebug\\Graphics\\RenderStream.cs", "ViewState": "AQIAALMAAAAAAAAAAAAWwDcAAAAPAAAA", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2024-04-23T08:54:34.159Z", - "EditorCaption": "" + "WhenOpened": "2024-04-23T08:54:34.159Z" } ] } diff --git a/源代码/.vs/StgSharpDevelop/v17/fileList.bin b/源代码/.vs/StgSharpDevelop/v17/fileList.bin index 54fb6949..a8808792 100644 Binary files a/源代码/.vs/StgSharpDevelop/v17/fileList.bin and b/源代码/.vs/StgSharpDevelop/v17/fileList.bin differ diff --git a/源代码/Output/Debug/net6.0/Shader/fragment.frag b/源代码/Output/Debug/net6.0/Shader/fragment.frag new file mode 100644 index 00000000..8f7c2f89 --- /dev/null +++ b/源代码/Output/Debug/net6.0/Shader/fragment.frag @@ -0,0 +1,17 @@ +#version 330 core + +in vec4 TexColor; +in vec2 TexCoord; + +out vec4 FragColor; + +uniform sampler2D ourTexture; +uniform sampler2D ourTexture2; + +void main() +{ + vec4 tex1 = texture(ourTexture, TexCoord); + vec4 tex2 = texture(ourTexture2,TexCoord); + FragColor = mix(tex1 * vec4( TexColor.xyz, 1.0), tex2, 0.2) /* *vec4( TexColor,1.0) /**/; +} + diff --git a/源代码/Output/Debug/net6.0/Shader/vertex.vert b/源代码/Output/Debug/net6.0/Shader/vertex.vert new file mode 100644 index 00000000..d9e33113 --- /dev/null +++ b/源代码/Output/Debug/net6.0/Shader/vertex.vert @@ -0,0 +1,32 @@ +#version 330 core + +layout(location = 0) in vec3 aPos; +layout(location = 1) in vec3 aColor; +layout(location = 2) in vec2 aTextCoord; + +out vec4 TexColor; +out vec2 TexCoord; + +uniform vec4 color; +uniform mat4x4 camera; + +void main() +{ + float as = sin( color.w ); + float ac = cos( color.w ); + mat4x4 rotation = mat4x4( + ac,-as,0,0, + as,ac,0,0, + 0,0,1,0, + 0,0,0,1 + ); + TexColor = color; + TexCoord = aTextCoord; + vec4 temp = vec4(aPos.xyz,1.0); + gl_Position = /**/ camera * /**/ temp; +} + +//struct + + + diff --git a/源代码/Output/Debug/net6.0/StgSharpDebug.deps.json b/源代码/Output/Debug/net6.0/StgSharpDebug.deps.json new file mode 100644 index 00000000..3ae4a3fa --- /dev/null +++ b/源代码/Output/Debug/net6.0/StgSharpDebug.deps.json @@ -0,0 +1,86 @@ +{ + "runtimeTarget": { + "name": ".NETCoreApp,Version=v6.0", + "signature": "" + }, + "compilationOptions": {}, + "targets": { + ".NETCoreApp,Version=v6.0": { + "StgSharpDebug/1.0.0": { + "dependencies": { + "Microsoft.Windows.CsWin32": "0.3.49-beta" + }, + "runtime": { + "StgSharpDebug.dll": {} + } + }, + "Microsoft.Windows.CsWin32/0.3.49-beta": { + "dependencies": { + "Microsoft.Windows.SDK.Win32Docs": "0.1.42-alpha", + "Microsoft.Windows.SDK.Win32Metadata": "55.0.45-preview", + "Microsoft.Windows.WDK.Win32Metadata": "0.9.9-experimental", + "System.Memory": "4.5.5", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" + } + }, + "Microsoft.Windows.SDK.Win32Docs/0.1.42-alpha": {}, + "Microsoft.Windows.SDK.Win32Metadata/55.0.45-preview": {}, + "Microsoft.Windows.WDK.Win32Metadata/0.9.9-experimental": { + "dependencies": { + "Microsoft.Windows.SDK.Win32Metadata": "55.0.45-preview" + } + }, + "System.Memory/4.5.5": {}, + "System.Runtime.CompilerServices.Unsafe/6.0.0": {} + } + }, + "libraries": { + "StgSharpDebug/1.0.0": { + "type": "project", + "serviceable": false, + "sha512": "" + }, + "Microsoft.Windows.CsWin32/0.3.49-beta": { + "type": "package", + "serviceable": true, + "sha512": "sha512-/iAXplVDKESFyLz/MShuVYVx62YFvFePpq3qrzREl8KScQqG6Z2kV7r9UJTjQS1g+hfy3V+e4m1x9lsu24YNSg==", + "path": "microsoft.windows.cswin32/0.3.49-beta", + "hashPath": "microsoft.windows.cswin32.0.3.49-beta.nupkg.sha512" + }, + "Microsoft.Windows.SDK.Win32Docs/0.1.42-alpha": { + "type": "package", + "serviceable": true, + "sha512": "sha512-Z/9po23gUA9aoukirh2ItMU2ZS9++Js9Gdds9fu5yuMojDrmArvY2y+tq9985tR3cxFxpZO1O35Wjfo0khj5HA==", + "path": "microsoft.windows.sdk.win32docs/0.1.42-alpha", + "hashPath": "microsoft.windows.sdk.win32docs.0.1.42-alpha.nupkg.sha512" + }, + "Microsoft.Windows.SDK.Win32Metadata/55.0.45-preview": { + "type": "package", + "serviceable": true, + "sha512": "sha512-2i1kVIk8rMuMCYtoeYeWbmCRLqNgb63Berac3Gv+J/pjp0oucopasKgLQNslryhsgBl4xex9ENhJX2MXEW5vdA==", + "path": "microsoft.windows.sdk.win32metadata/55.0.45-preview", + "hashPath": "microsoft.windows.sdk.win32metadata.55.0.45-preview.nupkg.sha512" + }, + "Microsoft.Windows.WDK.Win32Metadata/0.9.9-experimental": { + "type": "package", + "serviceable": true, + "sha512": "sha512-cncPlxLqR25mFOuvpxZPgXgJqRmXyV5eTULj/9w8AQvO/c1xJDEapohRsWkYaia7hCR/EwEzBHr7RU9u93T03w==", + "path": "microsoft.windows.wdk.win32metadata/0.9.9-experimental", + "hashPath": "microsoft.windows.wdk.win32metadata.0.9.9-experimental.nupkg.sha512" + }, + "System.Memory/4.5.5": { + "type": "package", + "serviceable": true, + "sha512": "sha512-XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==", + "path": "system.memory/4.5.5", + "hashPath": "system.memory.4.5.5.nupkg.sha512" + }, + "System.Runtime.CompilerServices.Unsafe/6.0.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==", + "path": "system.runtime.compilerservices.unsafe/6.0.0", + "hashPath": "system.runtime.compilerservices.unsafe.6.0.0.nupkg.sha512" + } + } +} \ No newline at end of file diff --git a/源代码/Output/Debug/net6.0/StgSharpDebug.runtimeconfig.json b/源代码/Output/Debug/net6.0/StgSharpDebug.runtimeconfig.json new file mode 100644 index 00000000..4986d16e --- /dev/null +++ b/源代码/Output/Debug/net6.0/StgSharpDebug.runtimeconfig.json @@ -0,0 +1,9 @@ +{ + "runtimeOptions": { + "tfm": "net6.0", + "framework": { + "name": "Microsoft.NETCore.App", + "version": "6.0.0" + } + } +} \ No newline at end of file diff --git a/源代码/StgSharp/Data/GlobalData/idProvider.cs b/源代码/StgSharp/Data/GlobalData/idProvider.cs index 4232fa56..8c2b5c82 100644 --- a/源代码/StgSharp/Data/GlobalData/idProvider.cs +++ b/源代码/StgSharp/Data/GlobalData/idProvider.cs @@ -23,9 +23,9 @@ namespace StgSharp.Data leastUnusedDisc = 0; } - private static int leastUnusedID; + private int leastUnusedID; - public static int NewID() + public int NewID() { int ret = leastUnusedID; if (ret == int.MaxValue) @@ -36,7 +36,7 @@ namespace StgSharp.Data return ret; } - public static void ClearIDBuffer() + public void ClearIDBuffer() { leastUnusedID = 1; } diff --git a/源代码/StgSharp/Data/SSD/Area.cs b/源代码/StgSharp/Data/SSD/Area.cs index 8cb7333d..a663ed69 100644 --- a/源代码/StgSharp/Data/SSD/Area.cs +++ b/源代码/StgSharp/Data/SSD/Area.cs @@ -19,7 +19,7 @@ namespace StgSharp.Data public SSDSegment FindSegment(int id, byte SSD) { - + return discList[SSD].FindSegment(id); } } } diff --git a/源代码/StgSharp/Data/SSD/SSD.cs b/源代码/StgSharp/Data/SSD/SSD.cs index d4c78e32..64aa5b42 100644 --- a/源代码/StgSharp/Data/SSD/SSD.cs +++ b/源代码/StgSharp/Data/SSD/SSD.cs @@ -32,7 +32,7 @@ using StgSharp.Data.FileIO; using System; using System.Collections.Generic; -using System.Reflection.Metadata.Ecma335; +using System.IO; using System.Text; namespace StgSharp.Data @@ -52,10 +52,18 @@ namespace StgSharp.Data public SSDSegment FindSegment(int id) { SSDSegment s = segments[id]; - if (s.) + if (s.ID != id) { - + foreach (var item in segments) + { + if (item.ID == id) + { + s = item; + break; + } + } } + return s; } } diff --git a/源代码/StgSharp/Data/SSD/SSDVirtualFolder.cs b/源代码/StgSharp/Data/SSD/SSDVirtualFolder.cs index 4aa4d012..bfbe0a50 100644 --- a/源代码/StgSharp/Data/SSD/SSDVirtualFolder.cs +++ b/源代码/StgSharp/Data/SSD/SSDVirtualFolder.cs @@ -39,7 +39,7 @@ namespace StgSharp.Data { public class SSDFolder : SSDSerializable, IEnumerable { - private SSD local; + private Area local; private SSDrawHead _head; internal int _folderID; internal string _name; @@ -110,7 +110,8 @@ namespace StgSharp.Data public SSDraw CreateFile(string name, byte type) { SSDraw ret = new SSDraw(name + SerializableTypeCode.GetNameTail(type)); - ret.ID = local. + ret.ID = local.NewID(); + return ret; } //TODO 虚拟文件夹的GetBytes好难写 @@ -122,7 +123,7 @@ namespace StgSharp.Data fileid.Add(4); foreach (var item in files) { - fileid.Add(item.); + fileid.Add(item.Value.ID); } return rawBytes.ToArray(); } diff --git a/源代码/StgSharp/Data/SSD/SSDraw.cs b/源代码/StgSharp/Data/SSD/SSDraw.cs index 819a825a..bef20132 100644 --- a/源代码/StgSharp/Data/SSD/SSDraw.cs +++ b/源代码/StgSharp/Data/SSD/SSDraw.cs @@ -100,6 +100,7 @@ namespace StgSharp.Data.FileIO { } + return ret; } public void CreateRawFile(string outputFolder, bool rewrite) diff --git a/源代码/StgSharp/Graphics/Form/FormThreading.cs b/源代码/StgSharp/Graphics/Form/FormThreading.cs index cefe3d1e..1faf38c8 100644 --- a/源代码/StgSharp/Graphics/Form/FormThreading.cs +++ b/源代码/StgSharp/Graphics/Form/FormThreading.cs @@ -30,6 +30,8 @@ //----------------------------------------------------------------------- using StgSharp.Math; +using StgSharpDebug.Logic; + using System; using System.Collections.Generic; using System.Linq; @@ -42,133 +44,14 @@ namespace StgSharp.Graphics { public abstract partial class Form { - - - private List multiFrameAsyncThreadList = new List(); - private List singleFrameAsyncThreadList = new List(); + private BluePaint renderLogic; /// /// Init this form and render it on screen, and respond with operation /// public unsafe void Show() { - Init(); - frameTimeProvider = new TimeSpanProvider(1 / 60.0, TimeSpanProvider.DefaultProvider); - MethodInfo[] methods = this.GetType().GetMethods( - BindingFlags.Public | - BindingFlags.Instance | - BindingFlags.DeclaredOnly); - GahterSignleFrameAsyncThread(methods); - GatherMultiFrameAsyncThread(methods); - //if no other operation - if (singleFrameAsyncThreadList.Count == 0) - { - while (!ShouldClose) - { - ProcessInput(); - Main( ); - InternalIO.glfwSwapBuffers(windowID); - InternalIO.glfwPollEvents(); - frameTimeProvider.WaitNextSpan(); - Interlocked.Add(ref _frameCount, 1); - } - return; - } - - List> threadGroup = singleFrameAsyncThreadList.GroupBy((t) => t.Priority).ToList(); - - if (threadGroup.Count == 1) - { - int p = threadGroup.First().Key; - (Barrier, Barrier) bPair = FrameAsyncThread.CombineAsync(true, singleFrameAsyncThreadList); - FrameAsyncThread.AsyncStartAll(singleFrameAsyncThreadList); - switch (Scaler.SignOf(p)) - { - case 0: - while (!ShouldClose) - { - bPair.Item1.SignalAndWait(); - ProcessInput(); - Main( ); - InternalIO.glfwSwapBuffers(windowID); - InternalIO.glfwPollEvents(); - bPair.Item2.SignalAndWait(); - Interlocked.Add(ref _frameCount, 1); - frameTimeProvider.WaitNextSpan(); - } - break; - case 1: - while (!ShouldClose) - { - bPair.Item1.SignalAndWait(); - bPair.Item2.SignalAndWait(); - ProcessInput(); - Main( ); - InternalIO.glfwSwapBuffers(windowID); - InternalIO.glfwPollEvents(); - Interlocked.Add(ref _frameCount, 1); - frameTimeProvider.WaitNextSpan(); - } - break; - case -1: - while (!ShouldClose) - { - ProcessInput(); - Main( ); - InternalIO.glfwSwapBuffers(windowID); - InternalIO.glfwPollEvents(); - bPair.Item1.SignalAndWait(); - bPair.Item2.SignalAndWait(); - Interlocked.Add(ref _frameCount, 1); - frameTimeProvider.WaitNextSpan(); - } - break; - default: - return; - } - - FrameAsyncThread.TerminateAll(singleFrameAsyncThreadList); - bPair.Item1.SignalAndWait(); - return; - } - - threadGroup.Sort(); - int priority = threadGroup.Count; //rearrange priority label - (Barrier, Barrier)[] barrierList = new (Barrier, Barrier)[priority]; - for (int i = 0; i < priority; i++) - { - var group = threadGroup[i].ToList(); - foreach (var t in group) - { - t.Priority = priority; - } - barrierList[i] = FrameAsyncThread.CombineAsync(true, group); - //setting thread sync - } - FrameAsyncThread.AsyncStartAll(singleFrameAsyncThreadList); - while (!ShouldClose) - { - barrierList[0].Item1.SignalAndWait(); - int i = 0; - while (i < priority - 1) - { - barrierList[i].Item2.SignalAndWait(); - barrierList[i + 1].Item1.SignalAndWait(); - } - barrierList[priority - 1].Item1.SignalAndWait(); - InternalIO.glfwSwapBuffers(windowID); - InternalIO.glfwPollEvents(); - frameTimeProvider.WaitNextSpan(); - Interlocked.Add(ref _frameCount, 1); - } - FrameAsyncThread.TerminateAll(singleFrameAsyncThreadList); - foreach ((Barrier, Barrier) bPair in barrierList) - { - bPair.Item1.SignalAndWait(); - bPair.Item2.SignalAndWait(); - } - FrameAsyncThread.WaitAll(singleFrameAsyncThreadList); - //InternalDeinit(); + } private void GahterSignleFrameAsyncThread(MethodInfo[] methods) @@ -190,32 +73,10 @@ namespace StgSharp.Graphics } ThreadStart s = (ThreadStart)Delegate.CreateDelegate(typeof(ThreadStart), this, m); FrameAsyncThread thread = new(s, attr._priority); - singleFrameAsyncThreadList.Add(thread); + //singleFrameAsyncThreadList.Add(thread); } } - private void GatherMultiFrameAsyncThread(MethodInfo[] methods) - { - if (methods.Length == 0) - { - return; - } - foreach (MethodInfo m in methods) //find all methods decorated by RenderActivityAttribute - { - MultiFrameActivityAttribute attr = m.GetCustomAttribute(false); - if (attr == null) - { - continue; - } - if (!m.IsStatic && (m.GetParameters().Length != 0) && (m.ReturnType != typeof(void))) - { - throw new NotSupportedException("A render activity cannot have parameters, returning value or be static."); - } - ThreadStart s = (ThreadStart)Delegate.CreateDelegate(typeof(ThreadStart), this, m); - FrameAsyncThread thread = new(s, 0); - multiFrameAsyncThreadList.Add(thread); - } - } } } diff --git a/源代码/StgSharp/Logic/BluePaint.cs b/源代码/StgSharp/Logic/BluePaint.cs index 790f6ecc..771822d9 100644 --- a/源代码/StgSharp/Logic/BluePaint.cs +++ b/源代码/StgSharp/Logic/BluePaint.cs @@ -53,7 +53,11 @@ namespace StgSharpDebug.Logic public void Start() { + foreach (var pipeline in beginNode.OutputInterface) + { + + } } } diff --git a/源代码/StgSharp/Logic/BluePaintNode.cs b/源代码/StgSharp/Logic/BluePaintNode.cs index 6a5ee718..c7014a5b 100644 --- a/源代码/StgSharp/Logic/BluePaintNode.cs +++ b/源代码/StgSharp/Logic/BluePaintNode.cs @@ -34,6 +34,7 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; +using System.Threading; using System.Threading.Tasks; namespace StgSharp.Logic @@ -44,24 +45,28 @@ namespace StgSharp.Logic public abstract class BluePaintNode { - private BluePaintNodeAction mainOperation; private BluePaint local; - private bool survivalTask; private Dictionary inputInterfaces; private Dictionary outputInterface; + private bool running; + private string name; - private Task mainTask; + + internal Dictionary InputInterfaces => inputInterfaces; + internal Dictionary OutputInterface => outputInterface; internal BluePaintNode(string name, bool isTaskSurvival) { this.name = name; - SurvivalTask = isTaskSurvival; + SurvivalTask = isTaskSurvival; } + + protected BluePaintNode(string name, BluePaintNodeAction operation) { this.name = name; @@ -75,35 +80,35 @@ namespace StgSharp.Logic public void Run() { - if (survivalTask) + foreach (var item in inputInterfaces) { - if (mainTask == null) - { - mainTask = new Task( - () => - { - while (local.IsRunning) - { - mainOperation(in inputInterfaces, in outputInterface); - } - } - ); - } - return; + item.Value.WaitForStart(); } + mainOperation(in inputInterfaces, in outputInterface); }//--------------------------------- end of class ----------------------------- } public class BluePaintPipeline { - private Barrier formerCompleteBarrier; + private SemaphoreSlim formerCompleteSemaphore; private BluePaintPipelineArgs args; + public BluePaintPipeline() + { + formerCompleteSemaphore = new SemaphoreSlim(initialCount: 0,maxCount:1); + } + public void CompleteAndWriteData(BluePaintPipelineArgs args) { - formerCompleteBarrier.SignalAndWait(); + formerCompleteSemaphore.Release(); + this.args = args; + } + + public void WaitForStart() + { + formerCompleteSemaphore.Release(); } } diff --git a/源代码/StgSharp/obj/Debug/netstandard2.1/StgSharp.AssemblyInfo.cs b/源代码/StgSharp/obj/Debug/netstandard2.1/StgSharp.AssemblyInfo.cs index 31c5314f..b1a6d966 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+dd6e8247bf5c1a1ddc9401e652ebeee72ff913e1")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+f83a130074f9a4a253b83ad3df194f5811b18e95")] [assembly: System.Reflection.AssemblyProductAttribute("StgSharp")] [assembly: System.Reflection.AssemblyTitleAttribute("StgSharp")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/源代码/StgSharp/obj/Debug/netstandard2.1/StgSharp.sourcelink.json b/源代码/StgSharp/obj/Debug/netstandard2.1/StgSharp.sourcelink.json index 47739479..0aff02fb 100644 --- a/源代码/StgSharp/obj/Debug/netstandard2.1/StgSharp.sourcelink.json +++ b/源代码/StgSharp/obj/Debug/netstandard2.1/StgSharp.sourcelink.json @@ -1 +1 @@ -{"documents":{"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\*":"https://raw.githubusercontent.com/Nitload-NSI/CCD_Github/dd6e8247bf5c1a1ddc9401e652ebeee72ff913e1/*"}} \ No newline at end of file +{"documents":{"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\*":"https://raw.githubusercontent.com/Nitload-NSI/CCD_Github/f83a130074f9a4a253b83ad3df194f5811b18e95/*"}} \ No newline at end of file diff --git a/源代码/StgSharpDebug/Test/MainRenderStream.cs b/源代码/StgSharpDebug/Test/MainRenderStream.cs index 2d50bea6..14fdefa6 100644 --- a/源代码/StgSharpDebug/Test/MainRenderStream.cs +++ b/源代码/StgSharpDebug/Test/MainRenderStream.cs @@ -11,6 +11,7 @@ using System.Threading.Tasks; namespace StgSharpDebug { + public sealed class MainRenderStream : glRenderStream { private Uniform color; @@ -22,6 +23,11 @@ namespace StgSharpDebug private VertexArray vao; private VertexBuffer vbo; + protected MainRenderStream(RenderStreamConstructArgs args) : base(args) + { + + } + protected override void Deinit() { /**/ @@ -134,7 +140,7 @@ namespace StgSharpDebug /**/ /**/ - float time = CurrentFrameCount / 60.0f; + float time = /* CurrentFrameCount / /**/ 60.0f; diff --git a/源代码/StgSharpDebug/obj/Debug/net6.0/StgSharpDebug.AssemblyInfo.cs b/源代码/StgSharpDebug/obj/Debug/net6.0/StgSharpDebug.AssemblyInfo.cs index fb8d3e0c..88173a2e 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+dd6e8247bf5c1a1ddc9401e652ebeee72ff913e1")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+f83a130074f9a4a253b83ad3df194f5811b18e95")] [assembly: System.Reflection.AssemblyProductAttribute("StgSharpDebug")] [assembly: System.Reflection.AssemblyTitleAttribute("StgSharpDebug")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/源代码/StgSharpDebug/obj/Debug/net6.0/StgSharpDebug.csproj.FileListAbsolute.txt b/源代码/StgSharpDebug/obj/Debug/net6.0/StgSharpDebug.csproj.FileListAbsolute.txt index 350c5b7a..8be8a5a0 100644 --- a/源代码/StgSharpDebug/obj/Debug/net6.0/StgSharpDebug.csproj.FileListAbsolute.txt +++ b/源代码/StgSharpDebug/obj/Debug/net6.0/StgSharpDebug.csproj.FileListAbsolute.txt @@ -7,3 +7,22 @@ D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\StgSharp D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\StgSharpDebug\bin\Debug\net6.0\StgSharpDebug.dll D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\StgSharpDebug\bin\Debug\net6.0\StgSharpDebug.pdb D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\StgSharpDebug\bin\Debug\net6.0\StgSharpDebug.xml +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\Output\Debug\net6.0\StgSharpDebug.exe +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\Output\Debug\net6.0\Shader\awesomeface.png +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\Output\Debug\net6.0\Shader\fragment.frag +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\Output\Debug\net6.0\Shader\Image1.png +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\Output\Debug\net6.0\Shader\vertex.vert +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\Output\Debug\net6.0\StgSharpDebug.deps.json +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\Output\Debug\net6.0\StgSharpDebug.runtimeconfig.json +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\Output\Debug\net6.0\StgSharpDebug.dll +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\Output\Debug\net6.0\StgSharpDebug.pdb +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\Output\Debug\net6.0\StgSharpDebug.xml +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\StgSharpDebug\obj\Debug\net6.0\StgSharpDebug.GeneratedMSBuildEditorConfig.editorconfig +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\StgSharpDebug\obj\Debug\net6.0\StgSharpDebug.AssemblyInfoInputs.cache +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\StgSharpDebug\obj\Debug\net6.0\StgSharpDebug.AssemblyInfo.cs +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\StgSharpDebug\obj\Debug\net6.0\StgSharpDebug.csproj.CoreCompileInputs.cache +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\StgSharpDebug\obj\Debug\net6.0\StgSharpDebug.sourcelink.json +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\StgSharpDebug\obj\Debug\net6.0\StgSharpDebug.dll +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\StgSharpDebug\obj\Debug\net6.0\StgSharpDebug.xml +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\StgSharpDebug\obj\Debug\net6.0\StgSharpDebug.pdb +D:\NitloadIndustry\研究项目\1-Flagship\TH2020\ProjectFile\源代码\StgSharpDebug\obj\Debug\net6.0\StgSharpDebug.genruntimeconfig.cache diff --git a/源代码/StgSharpDebug/obj/Debug/net6.0/StgSharpDebug.sourcelink.json b/源代码/StgSharpDebug/obj/Debug/net6.0/StgSharpDebug.sourcelink.json new file mode 100644 index 00000000..0aff02fb --- /dev/null +++ b/源代码/StgSharpDebug/obj/Debug/net6.0/StgSharpDebug.sourcelink.json @@ -0,0 +1 @@ +{"documents":{"D:\\NitloadIndustry\\研究项目\\1-Flagship\\TH2020\\ProjectFile\\*":"https://raw.githubusercontent.com/Nitload-NSI/CCD_Github/f83a130074f9a4a253b83ad3df194f5811b18e95/*"}} \ No newline at end of file