From 512b1814e106937cb533f87724aab39870cf3f42 Mon Sep 17 00:00:00 2001 From: 2509_92447106 <2509_92447106@noreply.gitcode.com> Date: Sat, 14 Nov 2026 12:42:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=83=A8=E5=88=86=E5=8A=9F?= =?UTF-8?q?=E8=83=BD,=E4=BB=A5=E5=8F=8A=E7=AD=89=E9=AB=98=E7=BA=BF?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Directory.Build.props | 6 ++-- .../EarthModelStudio => GC-BOOT}/App.axaml | 8 ++--- .../EarthModelStudio => GC-BOOT}/App.axaml.cs | 10 +++--- .../Assets/i18n/en.json | 0 .../Assets/i18n/zh-CN.json | 0 .../Assets/icon-1024.png | Bin .../Assets/icon-128.png | Bin .../Assets/icon-256.png | Bin .../Assets/icon-32.png | Bin .../Assets/icon-512.png | Bin .../Assets/icon-64.png | Bin .../Assets/icon.ico | Bin .../Assets/icon.png | Bin .../GC.csproj | 7 ++-- .../Models/AppSettings.cs | 2 +- .../Models/ModelManifest.cs | 2 +- .../EarthModelStudio => GC-BOOT}/Program.cs | 4 +-- .../Services/AppPaths.cs | 22 +++++++----- .../Services/AppServices.cs | 2 +- .../Services/ContributorsService.cs | 4 +-- .../Services/DirectoryRemote.cs | 2 +- .../Services/DownloadCenter.cs | 4 +-- .../Services/GitCodeReleaseRemote.cs | 4 +-- .../Services/GitCodeRemote.cs | 6 ++-- .../Services/GiteaRemote.cs | 4 +-- .../Services/Json.cs | 2 +- .../Services/LauncherUpdateFlow.cs | 4 +-- .../Services/LauncherUpdater.cs | 12 +++---- .../Services/Localization.cs | 4 +-- .../Services/MemoryBudget.cs | 6 ++-- .../Services/ModelHost.cs | 8 ++--- .../Services/ModelInstaller.cs | 4 +-- .../Services/ModelRepository.cs | 5 +-- .../Services/ModelScanner.cs | 4 +-- .../Services/ModelSourceClient.cs | 6 ++-- .../Services/ReleaseModels.cs | 2 +- .../Services/SettingsService.cs | 4 +-- .../Services/Shell.cs | 2 +- .../Services/SourcePreset.cs | 2 +- .../Services/SourceSelector.cs | 4 +-- .../Services/UpdateModels.cs | 2 +- .../Services/UpdateService.cs | 4 +-- .../Services/VersionUtil.cs | 2 +- .../Services/ZipSafety.cs | 2 +- .../Styles/AppTheme.axaml | 0 .../ViewModels/AboutViewModel.cs | 4 +-- .../ViewModels/DownloadViewModel.cs | 6 ++-- .../ViewModels/HomeViewModel.cs | 6 ++-- .../ViewModels/MainViewModel.cs | 6 ++-- .../ViewModels/SettingsViewModel.cs | 10 +++--- .../Views/AboutView.axaml | 6 ++-- .../Views/AboutView.axaml.cs | 2 +- .../Views/ConfirmWindow.axaml | 4 +-- .../Views/ConfirmWindow.axaml.cs | 2 +- .../Views/DownloadView.axaml | 4 +-- .../Views/DownloadView.axaml.cs | 2 +- .../Views/HomeView.axaml | 6 ++-- .../Views/HomeView.axaml.cs | 2 +- .../Views/LoadingWindow.cs | 2 +- .../Views/MainWindow.axaml | 4 +-- .../Views/MainWindow.axaml.cs | 8 ++--- .../Views/SettingsView.axaml | 4 +-- .../Views/SettingsView.axaml.cs | 2 +- .../Views/UpdaterWindow.cs | 4 +-- .../EarthModelStudio => GC-BOOT}/app.manifest | 2 +- .../Views => GC-DRAW}/PlayerWindow.cs | 6 ++-- EarthModelStudio.sln => GC.sln | 21 ++++-------- .../src/test/dotnet/GC.Tests/GC.Tests.csproj | 6 ++-- .../src/test/dotnet/GC.Tests}/Program.cs | 16 ++++----- README.md | 32 +++++++++--------- build.ps1 | 8 ++--- build.sh | 8 ++--- buildsh/build.sh | 2 +- buildsh/lib/build_funcs.sh | 22 ++++++------ model/README.md | 4 +-- model/_engine/PreviewGen/PreviewGen.csproj | 2 +- model/_engine/PreviewGen/Program.cs | 4 +-- model/_engine/src/CelestialView.cs | 2 +- model/_engine/src/EarthModelView.cs | 4 +-- model/_engine/src/EngineEntry.cs | 4 +-- .../GC.ModelSdk.csproj} | 4 +-- .../IModelContracts.cs | 2 +- model/contour-map/contour-map.json | 4 +-- .../contour-map.model/ContourMapModel.dll | Bin 46592 -> 46592 bytes model/contour-map/src/ContourMapModel.csproj | 2 +- model/contour-map/src/ContourMapRuntime.cs | 4 +-- model/earth-geography/earth-geography.json | 4 +-- .../EarthGeographyModel.dll | Bin 46592 -> 46592 bytes .../src/EarthGeographyModel.csproj | 2 +- model/earth-geography/src/GeographyRuntime.cs | 4 +-- model/earth-geography/src/GeographyView.cs | 2 +- model/earth-revolution/earth-revolution.json | 4 +-- .../EarthRevolutionModel.dll | Bin 86016 -> 86528 bytes .../src/EarthRevolutionModel.csproj | 2 +- .../src/RevolutionModelFactory.cs | 2 +- model/earth-rotation/earth-rotation.json | 4 +-- .../EarthRotationModel.dll | Bin 86016 -> 86528 bytes .../src/EarthRotationModel.csproj | 2 +- .../src/RotationModelFactory.cs | 2 +- model/scale-calculator/scale-calculator.json | 4 +-- .../ScaleCalculatorModel.dll | Bin 58368 -> 58368 bytes .../scale-calculator.model/preview.png | Bin 59835 -> 57544 bytes .../src/ScaleCalculatorFactory.cs | 2 +- .../src/ScaleCalculatorModel.csproj | 2 +- .../src/ScaleCalculatorRuntime.cs | 4 +-- .../src/ScaleCalculatorView.cs | 2 +- model/version.json | 14 ++++---- version.json | 14 ++++---- 108 files changed, 239 insertions(+), 240 deletions(-) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/App.axaml (89%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/App.axaml.cs (96%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Assets/i18n/en.json (100%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Assets/i18n/zh-CN.json (100%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Assets/icon-1024.png (100%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Assets/icon-128.png (100%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Assets/icon-256.png (100%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Assets/icon-32.png (100%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Assets/icon-512.png (100%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Assets/icon-64.png (100%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Assets/icon.ico (100%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Assets/icon.png (100%) rename src/main/dotnet/EarthModelStudio/EarthModelStudio.csproj => GC-BOOT/GC.csproj (83%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Models/AppSettings.cs (98%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Models/ModelManifest.cs (99%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Program.cs (91%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Services/AppPaths.cs (94%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Services/AppServices.cs (98%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Services/ContributorsService.cs (97%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Services/DirectoryRemote.cs (99%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Services/DownloadCenter.cs (98%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Services/GitCodeReleaseRemote.cs (98%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Services/GitCodeRemote.cs (98%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Services/GiteaRemote.cs (98%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Services/Json.cs (96%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Services/LauncherUpdateFlow.cs (98%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Services/LauncherUpdater.cs (98%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Services/Localization.cs (97%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Services/MemoryBudget.cs (92%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Services/ModelHost.cs (98%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Services/ModelInstaller.cs (98%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Services/ModelRepository.cs (94%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Services/ModelScanner.cs (97%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Services/ModelSourceClient.cs (98%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Services/ReleaseModels.cs (99%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Services/SettingsService.cs (97%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Services/Shell.cs (97%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Services/SourcePreset.cs (98%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Services/SourceSelector.cs (97%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Services/UpdateModels.cs (98%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Services/UpdateService.cs (99%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Services/VersionUtil.cs (97%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Services/ZipSafety.cs (97%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Styles/AppTheme.axaml (100%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/ViewModels/AboutViewModel.cs (97%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/ViewModels/DownloadViewModel.cs (99%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/ViewModels/HomeViewModel.cs (97%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/ViewModels/MainViewModel.cs (98%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/ViewModels/SettingsViewModel.cs (97%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Views/AboutView.axaml (97%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Views/AboutView.axaml.cs (86%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Views/ConfirmWindow.axaml (89%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Views/ConfirmWindow.axaml.cs (98%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Views/DownloadView.axaml (98%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Views/DownloadView.axaml.cs (83%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Views/HomeView.axaml (97%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Views/HomeView.axaml.cs (82%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Views/LoadingWindow.cs (98%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Views/MainWindow.axaml (98%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Views/MainWindow.axaml.cs (98%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Views/SettingsView.axaml (98%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Views/SettingsView.axaml.cs (83%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/Views/UpdaterWindow.cs (98%) rename {src/main/dotnet/EarthModelStudio => GC-BOOT}/app.manifest (90%) rename {src/main/dotnet/EarthModelStudio/Views => GC-DRAW}/PlayerWindow.cs (99%) rename EarthModelStudio.sln => GC.sln (84%) rename src/test/dotnet/EarthModelStudio.Tests/EarthModelStudio.Tests.csproj => GC/src/test/dotnet/GC.Tests/GC.Tests.csproj (66%) rename {src/test/dotnet/EarthModelStudio.Tests => GC/src/test/dotnet/GC.Tests}/Program.cs (98%) rename model/_sdk/{EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj => GC.ModelSdk/GC.ModelSdk.csproj} (79%) rename model/_sdk/{EarthModelStudio.ModelSdk => GC.ModelSdk}/IModelContracts.cs (98%) diff --git a/Directory.Build.props b/Directory.Build.props index cf52dd2..4026545 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,8 +1,8 @@ @@ -23,7 +23,7 @@ 8.2.2 1.0.7 NeoRF - Earth Model Studio + GC zh-Hans diff --git a/src/main/dotnet/EarthModelStudio/App.axaml b/GC-BOOT/App.axaml similarity index 89% rename from src/main/dotnet/EarthModelStudio/App.axaml rename to GC-BOOT/App.axaml index 925611b..5128788 100644 --- a/src/main/dotnet/EarthModelStudio/App.axaml +++ b/GC-BOOT/App.axaml @@ -1,8 +1,8 @@ @@ -43,6 +43,6 @@ - + diff --git a/src/main/dotnet/EarthModelStudio/App.axaml.cs b/GC-BOOT/App.axaml.cs similarity index 96% rename from src/main/dotnet/EarthModelStudio/App.axaml.cs rename to GC-BOOT/App.axaml.cs index 9d82968..91db551 100644 --- a/src/main/dotnet/EarthModelStudio/App.axaml.cs +++ b/GC-BOOT/App.axaml.cs @@ -4,11 +4,11 @@ using Avalonia; using Avalonia.Controls; using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Markup.Xaml; -using EarthModelStudio.Services; -using EarthModelStudio.ViewModels; -using EarthModelStudio.Views; +using GC.Services; +using GC.ViewModels; +using GC.Views; -namespace EarthModelStudio; +namespace GC; public partial class App : Application { @@ -56,7 +56,7 @@ public partial class App : Application try { using var iconStream = Avalonia.Platform.AssetLoader.Open( - new Uri("avares://EarthModelStudio/Assets/icon.png")); + new Uri("avares://GC/Assets/icon.png")); window.Icon = new Avalonia.Controls.WindowIcon(iconStream); } catch { /* 图标缺失不影响启动 */ } diff --git a/src/main/dotnet/EarthModelStudio/Assets/i18n/en.json b/GC-BOOT/Assets/i18n/en.json similarity index 100% rename from src/main/dotnet/EarthModelStudio/Assets/i18n/en.json rename to GC-BOOT/Assets/i18n/en.json diff --git a/src/main/dotnet/EarthModelStudio/Assets/i18n/zh-CN.json b/GC-BOOT/Assets/i18n/zh-CN.json similarity index 100% rename from src/main/dotnet/EarthModelStudio/Assets/i18n/zh-CN.json rename to GC-BOOT/Assets/i18n/zh-CN.json diff --git a/src/main/dotnet/EarthModelStudio/Assets/icon-1024.png b/GC-BOOT/Assets/icon-1024.png similarity index 100% rename from src/main/dotnet/EarthModelStudio/Assets/icon-1024.png rename to GC-BOOT/Assets/icon-1024.png diff --git a/src/main/dotnet/EarthModelStudio/Assets/icon-128.png b/GC-BOOT/Assets/icon-128.png similarity index 100% rename from src/main/dotnet/EarthModelStudio/Assets/icon-128.png rename to GC-BOOT/Assets/icon-128.png diff --git a/src/main/dotnet/EarthModelStudio/Assets/icon-256.png b/GC-BOOT/Assets/icon-256.png similarity index 100% rename from src/main/dotnet/EarthModelStudio/Assets/icon-256.png rename to GC-BOOT/Assets/icon-256.png diff --git a/src/main/dotnet/EarthModelStudio/Assets/icon-32.png b/GC-BOOT/Assets/icon-32.png similarity index 100% rename from src/main/dotnet/EarthModelStudio/Assets/icon-32.png rename to GC-BOOT/Assets/icon-32.png diff --git a/src/main/dotnet/EarthModelStudio/Assets/icon-512.png b/GC-BOOT/Assets/icon-512.png similarity index 100% rename from src/main/dotnet/EarthModelStudio/Assets/icon-512.png rename to GC-BOOT/Assets/icon-512.png diff --git a/src/main/dotnet/EarthModelStudio/Assets/icon-64.png b/GC-BOOT/Assets/icon-64.png similarity index 100% rename from src/main/dotnet/EarthModelStudio/Assets/icon-64.png rename to GC-BOOT/Assets/icon-64.png diff --git a/src/main/dotnet/EarthModelStudio/Assets/icon.ico b/GC-BOOT/Assets/icon.ico similarity index 100% rename from src/main/dotnet/EarthModelStudio/Assets/icon.ico rename to GC-BOOT/Assets/icon.ico diff --git a/src/main/dotnet/EarthModelStudio/Assets/icon.png b/GC-BOOT/Assets/icon.png similarity index 100% rename from src/main/dotnet/EarthModelStudio/Assets/icon.png rename to GC-BOOT/Assets/icon.png diff --git a/src/main/dotnet/EarthModelStudio/EarthModelStudio.csproj b/GC-BOOT/GC.csproj similarity index 83% rename from src/main/dotnet/EarthModelStudio/EarthModelStudio.csproj rename to GC-BOOT/GC.csproj index f1a6f47..6fad61d 100644 --- a/src/main/dotnet/EarthModelStudio/EarthModelStudio.csproj +++ b/GC-BOOT/GC.csproj @@ -4,8 +4,8 @@ WinExe enable true - EarthModelStudio - EarthModelStudio + GC + GC app.manifest Assets\icon.ico @@ -16,6 +16,7 @@ + @@ -27,7 +28,7 @@ - + diff --git a/src/main/dotnet/EarthModelStudio/Models/AppSettings.cs b/GC-BOOT/Models/AppSettings.cs similarity index 98% rename from src/main/dotnet/EarthModelStudio/Models/AppSettings.cs rename to GC-BOOT/Models/AppSettings.cs index 5f62a11..d45567d 100644 --- a/src/main/dotnet/EarthModelStudio/Models/AppSettings.cs +++ b/GC-BOOT/Models/AppSettings.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Text.Json.Serialization; -namespace EarthModelStudio.Models; +namespace GC.Models; /// 应用设置,持久化到 data/settings.json。 public sealed class AppSettings diff --git a/src/main/dotnet/EarthModelStudio/Models/ModelManifest.cs b/GC-BOOT/Models/ModelManifest.cs similarity index 99% rename from src/main/dotnet/EarthModelStudio/Models/ModelManifest.cs rename to GC-BOOT/Models/ModelManifest.cs index 42a1cf6..22a4513 100644 --- a/src/main/dotnet/EarthModelStudio/Models/ModelManifest.cs +++ b/GC-BOOT/Models/ModelManifest.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Text.Json.Serialization; -namespace EarthModelStudio.Models; +namespace GC.Models; /// model/<id>/<id>.json 的内容。 public sealed class ModelManifest diff --git a/src/main/dotnet/EarthModelStudio/Program.cs b/GC-BOOT/Program.cs similarity index 91% rename from src/main/dotnet/EarthModelStudio/Program.cs rename to GC-BOOT/Program.cs index eccd39e..16e33d1 100644 --- a/src/main/dotnet/EarthModelStudio/Program.cs +++ b/GC-BOOT/Program.cs @@ -1,8 +1,8 @@ using System; using Avalonia; -using EarthModelStudio.Services; +using GC.Services; -namespace EarthModelStudio; +namespace GC; internal static class Program { diff --git a/src/main/dotnet/EarthModelStudio/Services/AppPaths.cs b/GC-BOOT/Services/AppPaths.cs similarity index 94% rename from src/main/dotnet/EarthModelStudio/Services/AppPaths.cs rename to GC-BOOT/Services/AppPaths.cs index 001ce37..75c2aba 100644 --- a/src/main/dotnet/EarthModelStudio/Services/AppPaths.cs +++ b/GC-BOOT/Services/AppPaths.cs @@ -2,13 +2,13 @@ using System; using System.Threading.Tasks; using System.IO; -namespace EarthModelStudio.Services; +namespace GC.Services; /// /// 运行目录约定(可执行文件旁边,不内置任何模型): /// /// <安装目录>/ -/// EarthModelStudio(.exe | .app/...) +/// GC(.exe | .app/...) /// .GC/ /// settings.json 设置与已安装版本记录 /// model/ 模型(启动时下载;model 目录也在 .GC 里) @@ -20,6 +20,8 @@ namespace EarthModelStudio.Services; /// public sealed class AppPaths { + private Task _developmentModelsSync = Task.CompletedTask; + /// 安装目录(开发态为仓库根)。 public string AppRoot { get; private init; } = ""; @@ -48,7 +50,7 @@ public sealed class AppPaths // 判定「当前目录」:程序实际所在的位置。 // · 发布版:可执行文件所在目录(单文件时为 exe 旁,否则为 apphost 目录) - // · 源码版:仓库根(含 EarthModelStudio.sln 的目录) + // · 源码版:仓库根(含 GC.sln 的目录) // // 重要:源码版由 `dotnet run` 启动时 Environment.ProcessPath 指向 dotnet 宿主, // 直接用它会把 .GC 与更新包写到 dotnet 安装目录去,所以必须先识别源码版。 @@ -56,7 +58,7 @@ public sealed class AppPaths if (string.IsNullOrWhiteSpace(repoRoot) || !Directory.Exists(repoRoot)) repoRoot = FindRepoRoot(baseDir); var isDev = !string.IsNullOrEmpty(repoRoot) && - File.Exists(Path.Combine(repoRoot!, "EarthModelStudio.sln")); + File.Exists(Path.Combine(repoRoot!, "GC.sln")); string installDir; if (isDev) @@ -112,7 +114,7 @@ public sealed class AppPaths home = CanWrite(portableHome) ? portableHome : Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), - "EarthModelStudio", ".GC"); + "GC", ".GC"); } var envModels = Environment.GetEnvironmentVariable("EMS_MODELS"); @@ -148,7 +150,7 @@ public sealed class AppPaths } /// - /// 从程序所在位置向上找仓库根(含 EarthModelStudio.sln 的目录)。 + /// 从程序所在位置向上找仓库根(含 GC.sln 的目录)。 /// /// 关键:程序若位于 .app 包内(或 dist/ 等发布产物目录),**不算开发态**。 /// 否则把 .app 放在仓库的 dist/ 下运行时,会一路向上命中仓库根的 .sln, @@ -166,7 +168,7 @@ public sealed class AppPaths var name = dir.Name; if (string.Equals(name, "dist", StringComparison.OrdinalIgnoreCase)) return null; - if (File.Exists(Path.Combine(dir.FullName, "EarthModelStudio.sln"))) + if (File.Exists(Path.Combine(dir.FullName, "GC.sln"))) { // 再确认不是从「发布输出目录」里往上找来的 if (IsUnderPublishOutput(start, dir.FullName)) return null; @@ -249,13 +251,15 @@ public sealed class AppPaths // 放到后台线程:这一步要复制 coastline.json 等大文件,同步做会拖慢启动。 if (IsDevelopment && string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("EMS_MODELS"))) { - var root = HomeRoot; + var modelRoot = ModelRoot; var source = Path.Combine(AppRoot, "model"); if (Directory.Exists(source)) - Task.Run(() => SyncDevelopmentModels(root, source)); + _developmentModelsSync = Task.Run(() => SyncDevelopmentModels(modelRoot, source)); } } + public void WaitForDevelopmentModels() => _developmentModelsSync.GetAwaiter().GetResult(); + private static void SyncDevelopmentModels(string modelRoot, string source) { try diff --git a/src/main/dotnet/EarthModelStudio/Services/AppServices.cs b/GC-BOOT/Services/AppServices.cs similarity index 98% rename from src/main/dotnet/EarthModelStudio/Services/AppServices.cs rename to GC-BOOT/Services/AppServices.cs index c1befed..6ea91b8 100644 --- a/src/main/dotnet/EarthModelStudio/Services/AppServices.cs +++ b/GC-BOOT/Services/AppServices.cs @@ -1,6 +1,6 @@ using System; -namespace EarthModelStudio.Services; +namespace GC.Services; /// 组合根:一处初始化所有服务。 public sealed class AppServices diff --git a/src/main/dotnet/EarthModelStudio/Services/ContributorsService.cs b/GC-BOOT/Services/ContributorsService.cs similarity index 97% rename from src/main/dotnet/EarthModelStudio/Services/ContributorsService.cs rename to GC-BOOT/Services/ContributorsService.cs index 012b27c..517ab2f 100644 --- a/src/main/dotnet/EarthModelStudio/Services/ContributorsService.cs +++ b/GC-BOOT/Services/ContributorsService.cs @@ -5,7 +5,7 @@ using System.Text.Json; using System.Threading; using System.Threading.Tasks; -namespace EarthModelStudio.Services; +namespace GC.Services; /// GitCode 仓库的一位贡献者。 public sealed class Contributor @@ -54,7 +54,7 @@ public static class ContributorsService private static HttpClient CreateHttp() { var c = new HttpClient { Timeout = TimeSpan.FromSeconds(10) }; - c.DefaultRequestHeaders.UserAgent.ParseAdd("EarthModelStudio/1.0"); + c.DefaultRequestHeaders.UserAgent.ParseAdd("GC/1.0"); c.DefaultRequestHeaders.Accept.ParseAdd("application/json"); return c; } diff --git a/src/main/dotnet/EarthModelStudio/Services/DirectoryRemote.cs b/GC-BOOT/Services/DirectoryRemote.cs similarity index 99% rename from src/main/dotnet/EarthModelStudio/Services/DirectoryRemote.cs rename to GC-BOOT/Services/DirectoryRemote.cs index a634021..4cc19a2 100644 --- a/src/main/dotnet/EarthModelStudio/Services/DirectoryRemote.cs +++ b/GC-BOOT/Services/DirectoryRemote.cs @@ -5,7 +5,7 @@ using System.Net.Http; using System.Threading; using System.Threading.Tasks; -namespace EarthModelStudio.Services; +namespace GC.Services; /// /// 本地目录源:用于离线教学(U 盘 / 共享盘里的仓库副本)与自动化测试。 diff --git a/src/main/dotnet/EarthModelStudio/Services/DownloadCenter.cs b/GC-BOOT/Services/DownloadCenter.cs similarity index 98% rename from src/main/dotnet/EarthModelStudio/Services/DownloadCenter.cs rename to GC-BOOT/Services/DownloadCenter.cs index df5434a..cf1c8b3 100644 --- a/src/main/dotnet/EarthModelStudio/Services/DownloadCenter.cs +++ b/GC-BOOT/Services/DownloadCenter.cs @@ -5,9 +5,9 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; using CommunityToolkit.Mvvm.ComponentModel; -using EarthModelStudio.Models; +using GC.Models; -namespace EarthModelStudio.Services; +namespace GC.Services; public enum DownloadState { diff --git a/src/main/dotnet/EarthModelStudio/Services/GitCodeReleaseRemote.cs b/GC-BOOT/Services/GitCodeReleaseRemote.cs similarity index 98% rename from src/main/dotnet/EarthModelStudio/Services/GitCodeReleaseRemote.cs rename to GC-BOOT/Services/GitCodeReleaseRemote.cs index 2b04882..0e3a44a 100644 --- a/src/main/dotnet/EarthModelStudio/Services/GitCodeReleaseRemote.cs +++ b/GC-BOOT/Services/GitCodeReleaseRemote.cs @@ -5,7 +5,7 @@ using System.Text.Json; using System.Threading; using System.Threading.Tasks; -namespace EarthModelStudio.Services; +namespace GC.Services; /// /// 启动器更新走 GitCode Release,模型仍走仓库 contents API 的远端源。 @@ -32,7 +32,7 @@ public sealed class GitCodeReleaseRemote : IModelRemote private static HttpClient CreateHttp() { var client = new HttpClient { Timeout = TimeSpan.FromSeconds(15) }; - client.DefaultRequestHeaders.UserAgent.ParseAdd("EarthModelStudio-Updater/1.0"); + client.DefaultRequestHeaders.UserAgent.ParseAdd("GC-Updater/1.0"); client.DefaultRequestHeaders.Accept.ParseAdd("application/json"); return client; } diff --git a/src/main/dotnet/EarthModelStudio/Services/GitCodeRemote.cs b/GC-BOOT/Services/GitCodeRemote.cs similarity index 98% rename from src/main/dotnet/EarthModelStudio/Services/GitCodeRemote.cs rename to GC-BOOT/Services/GitCodeRemote.cs index 258d2d2..ce6478b 100644 --- a/src/main/dotnet/EarthModelStudio/Services/GitCodeRemote.cs +++ b/GC-BOOT/Services/GitCodeRemote.cs @@ -7,7 +7,7 @@ using System.Text.Json; using System.Threading; using System.Threading.Tasks; -namespace EarthModelStudio.Services; +namespace GC.Services; /// /// gitcode 仓库源。默认地址来自 AppSettings.UpdateRepository @@ -39,7 +39,7 @@ public sealed class GitCodeRemote : IModelRemote ? DefaultRepository : repository!.TrimEnd('/'); _http = new HttpClient { Timeout = TimeSpan.FromMinutes(2) }; - _http.DefaultRequestHeaders.UserAgent.ParseAdd("EarthModelStudio-Updater/1.0"); + _http.DefaultRequestHeaders.UserAgent.ParseAdd("GC-Updater/1.0"); _http.DefaultRequestHeaders.Accept.ParseAdd("application/json"); if (string.IsNullOrWhiteSpace(manifestUrl)) @@ -108,7 +108,7 @@ public sealed class GitCodeRemote : IModelRemote } if (!payload.TrimStart().StartsWith("{", StringComparison.Ordinal)) return null; var version = System.Text.Json.JsonSerializer.Deserialize( - payload, EarthModelStudio.Services.Json.Options); + payload, GC.Services.Json.Options); // 404 / 错误页也可能返回一个 JSON 对象,用 generated 确认这确实是版本清单 return version != null && !string.IsNullOrWhiteSpace(version.Generated) ? version : null; } diff --git a/src/main/dotnet/EarthModelStudio/Services/GiteaRemote.cs b/GC-BOOT/Services/GiteaRemote.cs similarity index 98% rename from src/main/dotnet/EarthModelStudio/Services/GiteaRemote.cs rename to GC-BOOT/Services/GiteaRemote.cs index 6da6c28..855eba5 100644 --- a/src/main/dotnet/EarthModelStudio/Services/GiteaRemote.cs +++ b/GC-BOOT/Services/GiteaRemote.cs @@ -6,7 +6,7 @@ using System.Text.Json; using System.Threading; using System.Threading.Tasks; -namespace EarthModelStudio.Services; +namespace GC.Services; /// /// Gitea / Forgejo 后端(Xhmcl 用的就是这个)。 @@ -27,7 +27,7 @@ public sealed class GiteaRemote : IModelRemote private static HttpClient CreateHttp() { var c = new HttpClient { Timeout = TimeSpan.FromSeconds(20) }; - c.DefaultRequestHeaders.UserAgent.ParseAdd("EarthModelStudio-Updater/1.0"); + c.DefaultRequestHeaders.UserAgent.ParseAdd("GC-Updater/1.0"); c.DefaultRequestHeaders.Accept.ParseAdd("application/json"); return c; } diff --git a/src/main/dotnet/EarthModelStudio/Services/Json.cs b/GC-BOOT/Services/Json.cs similarity index 96% rename from src/main/dotnet/EarthModelStudio/Services/Json.cs rename to GC-BOOT/Services/Json.cs index 3264bd7..2dde35c 100644 --- a/src/main/dotnet/EarthModelStudio/Services/Json.cs +++ b/GC-BOOT/Services/Json.cs @@ -2,7 +2,7 @@ using System.Text.Encodings.Web; using System.Text.Json; using System.Text.Json.Serialization; -namespace EarthModelStudio.Services; +namespace GC.Services; public static class Json { diff --git a/src/main/dotnet/EarthModelStudio/Services/LauncherUpdateFlow.cs b/GC-BOOT/Services/LauncherUpdateFlow.cs similarity index 98% rename from src/main/dotnet/EarthModelStudio/Services/LauncherUpdateFlow.cs rename to GC-BOOT/Services/LauncherUpdateFlow.cs index 8834519..55219ad 100644 --- a/src/main/dotnet/EarthModelStudio/Services/LauncherUpdateFlow.cs +++ b/GC-BOOT/Services/LauncherUpdateFlow.cs @@ -6,9 +6,9 @@ using Avalonia; using Avalonia.Controls; using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Threading; -using EarthModelStudio.Views; +using GC.Views; -namespace EarthModelStudio.Services; +namespace GC.Services; /// /// 启动器更新的完整交互流程(「检查更新」与「重新下载启动器」共用): diff --git a/src/main/dotnet/EarthModelStudio/Services/LauncherUpdater.cs b/GC-BOOT/Services/LauncherUpdater.cs similarity index 98% rename from src/main/dotnet/EarthModelStudio/Services/LauncherUpdater.cs rename to GC-BOOT/Services/LauncherUpdater.cs index 814f8e2..19ffcd9 100644 --- a/src/main/dotnet/EarthModelStudio/Services/LauncherUpdater.cs +++ b/GC-BOOT/Services/LauncherUpdater.cs @@ -7,7 +7,7 @@ using System.Security.Cryptography; using System.Threading; using System.Threading.Tasks; -namespace EarthModelStudio.Services; +namespace GC.Services; // =========================================================================== // 启动器更新模块(唯一实现) @@ -211,14 +211,14 @@ public static class LauncherUpdater { using var ms = new MemoryStream(zip); using var archive = new System.IO.Compression.ZipArchive(ms, System.IO.Compression.ZipArchiveMode.Read); - // 找主程序:app 内的可执行文件 / EarthModelStudio.dll / 单文件 exe + // 找主程序:app 内的可执行文件 / GC.dll / 单文件 exe var entry = archive.Entries.FirstOrDefault(e => - e.Name.Equals("EarthModelStudio.dll", StringComparison.OrdinalIgnoreCase)) + e.Name.Equals("GC.dll", StringComparison.OrdinalIgnoreCase)) ?? archive.Entries.FirstOrDefault(e => - e.Name.Equals("EarthModelStudio", StringComparison.OrdinalIgnoreCase)) + e.Name.Equals("GC", StringComparison.OrdinalIgnoreCase)) ?? archive.Entries.FirstOrDefault(e => e.Name.EndsWith(".dll", StringComparison.OrdinalIgnoreCase) && - e.Name.StartsWith("EarthModelStudio", StringComparison.OrdinalIgnoreCase)); + e.Name.StartsWith("GC", StringComparison.OrdinalIgnoreCase)); if (entry == null) return null; await using var es = entry.Open(); @@ -395,7 +395,7 @@ public static class LauncherUpdater if (!File.Exists(marker)) return false; // 安全阀:绝不在源码目录执行替换(防止误删源码) - if (File.Exists(Path.Combine(paths.InstallDirectory, "EarthModelStudio.sln"))) + if (File.Exists(Path.Combine(paths.InstallDirectory, "GC.sln"))) { Console.Error.WriteLine("源码版:新版已下载,但拒绝在源码目录执行替换"); return false; diff --git a/src/main/dotnet/EarthModelStudio/Services/Localization.cs b/GC-BOOT/Services/Localization.cs similarity index 97% rename from src/main/dotnet/EarthModelStudio/Services/Localization.cs rename to GC-BOOT/Services/Localization.cs index d6755a0..96c2059 100644 --- a/src/main/dotnet/EarthModelStudio/Services/Localization.cs +++ b/GC-BOOT/Services/Localization.cs @@ -8,7 +8,7 @@ using Avalonia.Markup.Xaml; using Avalonia.Data; using Avalonia.Platform; -namespace EarthModelStudio.Services; +namespace GC.Services; /// 轻量 i18n:键值表 + 运行时切换(所有绑定自动刷新)。 public sealed class L : INotifyPropertyChanged @@ -75,7 +75,7 @@ public sealed class L : INotifyPropertyChanged { try { - var uri = new Uri($"avares://EarthModelStudio/Assets/i18n/{code}.json"); + var uri = new Uri($"avares://GC/Assets/i18n/{code}.json"); using var stream = AssetLoader.Open(uri); using var reader = new StreamReader(stream); return JsonSerializer.Deserialize>(reader.ReadToEnd(), diff --git a/src/main/dotnet/EarthModelStudio/Services/MemoryBudget.cs b/GC-BOOT/Services/MemoryBudget.cs similarity index 92% rename from src/main/dotnet/EarthModelStudio/Services/MemoryBudget.cs rename to GC-BOOT/Services/MemoryBudget.cs index b779411..da44456 100644 --- a/src/main/dotnet/EarthModelStudio/Services/MemoryBudget.cs +++ b/GC-BOOT/Services/MemoryBudget.cs @@ -1,6 +1,6 @@ using System; -namespace EarthModelStudio.Services; +namespace GC.Services; /// /// 启动时运行内存分配(类似启动器的 -Xmx)。 @@ -11,7 +11,7 @@ public sealed class MemoryBudget { public int BudgetMb { get; private set; } = 2048; public long BudgetBytes => (long)BudgetMb * 1024L * 1024L; - public long ManagedBytes => GC.GetTotalMemory(false); + public long ManagedBytes => System.GC.GetTotalMemory(false); public event Action? Changed; @@ -29,7 +29,7 @@ public sealed class MemoryBudget { try { - var info = GC.GetGCMemoryInfo(); + var info = System.GC.GetGCMemoryInfo(); var totalMb = info.TotalAvailableMemoryBytes / (1024.0 * 1024.0); if (totalMb > 0) return (int)Math.Clamp(Math.Round(totalMb / 4.0 / 256.0) * 256, 512, 8192); diff --git a/src/main/dotnet/EarthModelStudio/Services/ModelHost.cs b/GC-BOOT/Services/ModelHost.cs similarity index 98% rename from src/main/dotnet/EarthModelStudio/Services/ModelHost.cs rename to GC-BOOT/Services/ModelHost.cs index 5241211..4404cb6 100644 --- a/src/main/dotnet/EarthModelStudio/Services/ModelHost.cs +++ b/GC-BOOT/Services/ModelHost.cs @@ -5,10 +5,10 @@ using System.Reflection; using System.Runtime.Loader; using System.Threading.Tasks; using Avalonia.Controls; -using EarthModelStudio.Models; -using EarthModelStudio.ModelSdk; +using GC.Models; +using GC.ModelSdk; -namespace EarthModelStudio.Services; +namespace GC.Services; /// /// 模型宿主:按清单加载模型自己的程序集,拿到模型自带的界面。 @@ -176,7 +176,7 @@ public sealed class ModelLoadContext : AssemblyLoadContext { private static readonly HashSet Shared = new(StringComparer.OrdinalIgnoreCase) { - "EarthModelStudio.ModelSdk", + "GC.ModelSdk", "Avalonia", "Avalonia.Base", "Avalonia.Controls", diff --git a/src/main/dotnet/EarthModelStudio/Services/ModelInstaller.cs b/GC-BOOT/Services/ModelInstaller.cs similarity index 98% rename from src/main/dotnet/EarthModelStudio/Services/ModelInstaller.cs rename to GC-BOOT/Services/ModelInstaller.cs index d7336df..673a84f 100644 --- a/src/main/dotnet/EarthModelStudio/Services/ModelInstaller.cs +++ b/GC-BOOT/Services/ModelInstaller.cs @@ -2,9 +2,9 @@ using System; using System.IO; using System.Threading; using System.Threading.Tasks; -using EarthModelStudio.Models; +using GC.Models; -namespace EarthModelStudio.Services; +namespace GC.Services; public static class ModelInstaller { diff --git a/src/main/dotnet/EarthModelStudio/Services/ModelRepository.cs b/GC-BOOT/Services/ModelRepository.cs similarity index 94% rename from src/main/dotnet/EarthModelStudio/Services/ModelRepository.cs rename to GC-BOOT/Services/ModelRepository.cs index 29af023..8c155c9 100644 --- a/src/main/dotnet/EarthModelStudio/Services/ModelRepository.cs +++ b/GC-BOOT/Services/ModelRepository.cs @@ -2,9 +2,9 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using EarthModelStudio.Models; +using GC.Models; -namespace EarthModelStudio.Services; +namespace GC.Services; /// /// 本地模型库。启动器只**扫描 / 删除**模型包,不再解析或缓存任何场景数据 —— @@ -20,6 +20,7 @@ public sealed class ModelRepository public IReadOnlyList Scan() { + _paths.WaitForDevelopmentModels(); var result = new List(); foreach (var (manifest, dir) in ModelScanner.Scan(_paths.ModelRoot)) { diff --git a/src/main/dotnet/EarthModelStudio/Services/ModelScanner.cs b/GC-BOOT/Services/ModelScanner.cs similarity index 97% rename from src/main/dotnet/EarthModelStudio/Services/ModelScanner.cs rename to GC-BOOT/Services/ModelScanner.cs index 3f88f66..f6e5262 100644 --- a/src/main/dotnet/EarthModelStudio/Services/ModelScanner.cs +++ b/GC-BOOT/Services/ModelScanner.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.IO; -using EarthModelStudio.Models; +using GC.Models; -namespace EarthModelStudio.Services; +namespace GC.Services; public static class ModelScanner { diff --git a/src/main/dotnet/EarthModelStudio/Services/ModelSourceClient.cs b/GC-BOOT/Services/ModelSourceClient.cs similarity index 98% rename from src/main/dotnet/EarthModelStudio/Services/ModelSourceClient.cs rename to GC-BOOT/Services/ModelSourceClient.cs index 1290ad9..bf81eaf 100644 --- a/src/main/dotnet/EarthModelStudio/Services/ModelSourceClient.cs +++ b/GC-BOOT/Services/ModelSourceClient.cs @@ -7,9 +7,9 @@ using System.Linq; using System.Net.Http; using System.Threading; using System.Threading.Tasks; -using EarthModelStudio.Models; +using GC.Models; -namespace EarthModelStudio.Services; +namespace GC.Services; /// /// 从链接导入模型源。 @@ -26,7 +26,7 @@ public sealed class ModelSourceClient private static HttpClient CreateHttp() { var client = new HttpClient { Timeout = TimeSpan.FromMinutes(5) }; - client.DefaultRequestHeaders.UserAgent.ParseAdd("EarthModelStudio/1.0 (+model-source)"); + client.DefaultRequestHeaders.UserAgent.ParseAdd("GC/1.0 (+model-source)"); return client; } diff --git a/src/main/dotnet/EarthModelStudio/Services/ReleaseModels.cs b/GC-BOOT/Services/ReleaseModels.cs similarity index 99% rename from src/main/dotnet/EarthModelStudio/Services/ReleaseModels.cs rename to GC-BOOT/Services/ReleaseModels.cs index f42e6fb..049dfb8 100644 --- a/src/main/dotnet/EarthModelStudio/Services/ReleaseModels.cs +++ b/GC-BOOT/Services/ReleaseModels.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text.Json; using System.Text.Json.Serialization; -namespace EarthModelStudio.Services; +namespace GC.Services; /// /// GitCode/Gitee v5 releases API 的一条 Release(字段做宽松解析,兼容多种返回格式)。 diff --git a/src/main/dotnet/EarthModelStudio/Services/SettingsService.cs b/GC-BOOT/Services/SettingsService.cs similarity index 97% rename from src/main/dotnet/EarthModelStudio/Services/SettingsService.cs rename to GC-BOOT/Services/SettingsService.cs index a2b4fb1..e0e4237 100644 --- a/src/main/dotnet/EarthModelStudio/Services/SettingsService.cs +++ b/GC-BOOT/Services/SettingsService.cs @@ -2,9 +2,9 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using EarthModelStudio.Models; +using GC.Models; -namespace EarthModelStudio.Services; +namespace GC.Services; public sealed class SettingsService { diff --git a/src/main/dotnet/EarthModelStudio/Services/Shell.cs b/GC-BOOT/Services/Shell.cs similarity index 97% rename from src/main/dotnet/EarthModelStudio/Services/Shell.cs rename to GC-BOOT/Services/Shell.cs index 6791eec..96b203e 100644 --- a/src/main/dotnet/EarthModelStudio/Services/Shell.cs +++ b/GC-BOOT/Services/Shell.cs @@ -2,7 +2,7 @@ using System; using System.Diagnostics; using System.IO; -namespace EarthModelStudio.Services; +namespace GC.Services; public static class Shell { diff --git a/src/main/dotnet/EarthModelStudio/Services/SourcePreset.cs b/GC-BOOT/Services/SourcePreset.cs similarity index 98% rename from src/main/dotnet/EarthModelStudio/Services/SourcePreset.cs rename to GC-BOOT/Services/SourcePreset.cs index 9b41018..82a8523 100644 --- a/src/main/dotnet/EarthModelStudio/Services/SourcePreset.cs +++ b/GC-BOOT/Services/SourcePreset.cs @@ -2,7 +2,7 @@ using System; using System.Collections.Generic; using System.Linq; -namespace EarthModelStudio.Services; +namespace GC.Services; /// /// 内置下载源。只允许这两个,不再支持用户自定义源。 diff --git a/src/main/dotnet/EarthModelStudio/Services/SourceSelector.cs b/GC-BOOT/Services/SourceSelector.cs similarity index 97% rename from src/main/dotnet/EarthModelStudio/Services/SourceSelector.cs rename to GC-BOOT/Services/SourceSelector.cs index 08a430e..8c6be57 100644 --- a/src/main/dotnet/EarthModelStudio/Services/SourceSelector.cs +++ b/GC-BOOT/Services/SourceSelector.cs @@ -6,7 +6,7 @@ using System.Net.Http; using System.Threading; using System.Threading.Tasks; -namespace EarthModelStudio.Services; +namespace GC.Services; /// /// 双源选择:Xhmcl 与 GitCode 是同一份仓库的两个镜像。 @@ -22,7 +22,7 @@ public sealed class SourceSelector private static HttpClient CreateHttp() { var c = new HttpClient { Timeout = TimeSpan.FromSeconds(6) }; - c.DefaultRequestHeaders.UserAgent.ParseAdd("EarthModelStudio-Probe/1.0"); + c.DefaultRequestHeaders.UserAgent.ParseAdd("GC-Probe/1.0"); return c; } diff --git a/src/main/dotnet/EarthModelStudio/Services/UpdateModels.cs b/GC-BOOT/Services/UpdateModels.cs similarity index 98% rename from src/main/dotnet/EarthModelStudio/Services/UpdateModels.cs rename to GC-BOOT/Services/UpdateModels.cs index be88e6d..61bdd12 100644 --- a/src/main/dotnet/EarthModelStudio/Services/UpdateModels.cs +++ b/GC-BOOT/Services/UpdateModels.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Threading; using System.Threading.Tasks; -namespace EarthModelStudio.Services; +namespace GC.Services; /// 仓库根 version.json:由构建脚本 VersionStamp 自动生成,模型一改版本就变。 public sealed class RepoVersion diff --git a/src/main/dotnet/EarthModelStudio/Services/UpdateService.cs b/GC-BOOT/Services/UpdateService.cs similarity index 99% rename from src/main/dotnet/EarthModelStudio/Services/UpdateService.cs rename to GC-BOOT/Services/UpdateService.cs index cdd425d..f5567f7 100644 --- a/src/main/dotnet/EarthModelStudio/Services/UpdateService.cs +++ b/GC-BOOT/Services/UpdateService.cs @@ -8,9 +8,9 @@ using System.Runtime.InteropServices; using System.Security.Cryptography; using System.Threading; using System.Threading.Tasks; -using EarthModelStudio.Models; +using GC.Models; -namespace EarthModelStudio.Services; +namespace GC.Services; /// /// 模型自动更新:读远端版本清单,把缺失/过期的模型下载到 cache 后原子替换 diff --git a/src/main/dotnet/EarthModelStudio/Services/VersionUtil.cs b/GC-BOOT/Services/VersionUtil.cs similarity index 97% rename from src/main/dotnet/EarthModelStudio/Services/VersionUtil.cs rename to GC-BOOT/Services/VersionUtil.cs index 9a5d8a1..98d96c3 100644 --- a/src/main/dotnet/EarthModelStudio/Services/VersionUtil.cs +++ b/GC-BOOT/Services/VersionUtil.cs @@ -1,7 +1,7 @@ using System; using System.Globalization; -namespace EarthModelStudio.Services; +namespace GC.Services; /// /// 版本号工具:Release tag 有 v1.0.6 / GC-1.0.6 / 1.0.6 等写法, diff --git a/src/main/dotnet/EarthModelStudio/Services/ZipSafety.cs b/GC-BOOT/Services/ZipSafety.cs similarity index 97% rename from src/main/dotnet/EarthModelStudio/Services/ZipSafety.cs rename to GC-BOOT/Services/ZipSafety.cs index 7a638a8..997d0b8 100644 --- a/src/main/dotnet/EarthModelStudio/Services/ZipSafety.cs +++ b/GC-BOOT/Services/ZipSafety.cs @@ -2,7 +2,7 @@ using System; using System.IO; using System.IO.Compression; -namespace EarthModelStudio.Services; +namespace GC.Services; /// /// 安全解压:拒绝 zip slip(条目名含 ../、绝对路径、盘符), diff --git a/src/main/dotnet/EarthModelStudio/Styles/AppTheme.axaml b/GC-BOOT/Styles/AppTheme.axaml similarity index 100% rename from src/main/dotnet/EarthModelStudio/Styles/AppTheme.axaml rename to GC-BOOT/Styles/AppTheme.axaml diff --git a/src/main/dotnet/EarthModelStudio/ViewModels/AboutViewModel.cs b/GC-BOOT/ViewModels/AboutViewModel.cs similarity index 97% rename from src/main/dotnet/EarthModelStudio/ViewModels/AboutViewModel.cs rename to GC-BOOT/ViewModels/AboutViewModel.cs index 6243674..706152b 100644 --- a/src/main/dotnet/EarthModelStudio/ViewModels/AboutViewModel.cs +++ b/GC-BOOT/ViewModels/AboutViewModel.cs @@ -4,9 +4,9 @@ using System.Collections.ObjectModel; using System.Threading.Tasks; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; -using EarthModelStudio.Services; +using GC.Services; -namespace EarthModelStudio.ViewModels; +namespace GC.ViewModels; /// 「关于」页面:版本号 + 开发者(读取仓库 contributors)。 public partial class AboutViewModel : ObservableObject diff --git a/src/main/dotnet/EarthModelStudio/ViewModels/DownloadViewModel.cs b/GC-BOOT/ViewModels/DownloadViewModel.cs similarity index 99% rename from src/main/dotnet/EarthModelStudio/ViewModels/DownloadViewModel.cs rename to GC-BOOT/ViewModels/DownloadViewModel.cs index bef5f9f..142278e 100644 --- a/src/main/dotnet/EarthModelStudio/ViewModels/DownloadViewModel.cs +++ b/GC-BOOT/ViewModels/DownloadViewModel.cs @@ -9,10 +9,10 @@ using System.Threading.Tasks; using System.Windows.Input; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; -using EarthModelStudio.Models; -using EarthModelStudio.Services; +using GC.Models; +using GC.Services; -namespace EarthModelStudio.ViewModels; +namespace GC.ViewModels; public partial class DownloadViewModel : ObservableObject { diff --git a/src/main/dotnet/EarthModelStudio/ViewModels/HomeViewModel.cs b/GC-BOOT/ViewModels/HomeViewModel.cs similarity index 97% rename from src/main/dotnet/EarthModelStudio/ViewModels/HomeViewModel.cs rename to GC-BOOT/ViewModels/HomeViewModel.cs index 40b9688..fe5f6e3 100644 --- a/src/main/dotnet/EarthModelStudio/ViewModels/HomeViewModel.cs +++ b/GC-BOOT/ViewModels/HomeViewModel.cs @@ -6,11 +6,11 @@ using System.Threading.Tasks; using System.Windows.Input; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; -using EarthModelStudio.Models; +using GC.Models; using Avalonia.Media.Imaging; -using EarthModelStudio.Services; +using GC.Services; -namespace EarthModelStudio.ViewModels; +namespace GC.ViewModels; public partial class HomeViewModel : ObservableObject { diff --git a/src/main/dotnet/EarthModelStudio/ViewModels/MainViewModel.cs b/GC-BOOT/ViewModels/MainViewModel.cs similarity index 98% rename from src/main/dotnet/EarthModelStudio/ViewModels/MainViewModel.cs rename to GC-BOOT/ViewModels/MainViewModel.cs index 885f8f1..3a3cf08 100644 --- a/src/main/dotnet/EarthModelStudio/ViewModels/MainViewModel.cs +++ b/GC-BOOT/ViewModels/MainViewModel.cs @@ -3,10 +3,10 @@ using System.Linq; using System.Threading.Tasks; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; -using EarthModelStudio.Models; -using EarthModelStudio.Services; +using GC.Models; +using GC.Services; -namespace EarthModelStudio.ViewModels; +namespace GC.ViewModels; public partial class MainViewModel : ObservableObject { diff --git a/src/main/dotnet/EarthModelStudio/ViewModels/SettingsViewModel.cs b/GC-BOOT/ViewModels/SettingsViewModel.cs similarity index 97% rename from src/main/dotnet/EarthModelStudio/ViewModels/SettingsViewModel.cs rename to GC-BOOT/ViewModels/SettingsViewModel.cs index 27e5dee..59aec31 100644 --- a/src/main/dotnet/EarthModelStudio/ViewModels/SettingsViewModel.cs +++ b/GC-BOOT/ViewModels/SettingsViewModel.cs @@ -5,10 +5,10 @@ using System.Runtime.InteropServices; using System.Windows.Input; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; -using EarthModelStudio.Models; -using EarthModelStudio.Services; +using GC.Models; +using GC.Services; -namespace EarthModelStudio.ViewModels; +namespace GC.ViewModels; public sealed class LanguageOption { @@ -156,8 +156,8 @@ public partial class SettingsViewModel : ObservableObject private void ClearCache() { // 模型数据由模型自己管理;这里只回收启动器侧托管内存 - GC.Collect(); - GC.WaitForPendingFinalizers(); + System.GC.Collect(); + System.GC.WaitForPendingFinalizers(); _services.Memory.Refresh(); StatusMessage = L.I["set.cacheCleared"]; OnPropertyChanged(nameof(UsageText)); diff --git a/src/main/dotnet/EarthModelStudio/Views/AboutView.axaml b/GC-BOOT/Views/AboutView.axaml similarity index 97% rename from src/main/dotnet/EarthModelStudio/Views/AboutView.axaml rename to GC-BOOT/Views/AboutView.axaml index 729a338..2373e9a 100644 --- a/src/main/dotnet/EarthModelStudio/Views/AboutView.axaml +++ b/GC-BOOT/Views/AboutView.axaml @@ -1,8 +1,8 @@ diff --git a/src/main/dotnet/EarthModelStudio/Views/AboutView.axaml.cs b/GC-BOOT/Views/AboutView.axaml.cs similarity index 86% rename from src/main/dotnet/EarthModelStudio/Views/AboutView.axaml.cs rename to GC-BOOT/Views/AboutView.axaml.cs index ce4bf9b..41f01c4 100644 --- a/src/main/dotnet/EarthModelStudio/Views/AboutView.axaml.cs +++ b/GC-BOOT/Views/AboutView.axaml.cs @@ -1,7 +1,7 @@ using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace EarthModelStudio.Views; +namespace GC.Views; public partial class AboutView : UserControl { diff --git a/src/main/dotnet/EarthModelStudio/Views/ConfirmWindow.axaml b/GC-BOOT/Views/ConfirmWindow.axaml similarity index 89% rename from src/main/dotnet/EarthModelStudio/Views/ConfirmWindow.axaml rename to GC-BOOT/Views/ConfirmWindow.axaml index 1081d75..ee3414e 100644 --- a/src/main/dotnet/EarthModelStudio/Views/ConfirmWindow.axaml +++ b/GC-BOOT/Views/ConfirmWindow.axaml @@ -1,7 +1,7 @@ + xmlns:loc="using:GC.Services" + x:Class="GC.Views.DownloadView"> diff --git a/src/main/dotnet/EarthModelStudio/Views/DownloadView.axaml.cs b/GC-BOOT/Views/DownloadView.axaml.cs similarity index 83% rename from src/main/dotnet/EarthModelStudio/Views/DownloadView.axaml.cs rename to GC-BOOT/Views/DownloadView.axaml.cs index 064ca9b..9b01258 100644 --- a/src/main/dotnet/EarthModelStudio/Views/DownloadView.axaml.cs +++ b/GC-BOOT/Views/DownloadView.axaml.cs @@ -1,7 +1,7 @@ using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace EarthModelStudio.Views; +namespace GC.Views; public partial class DownloadView : UserControl { diff --git a/src/main/dotnet/EarthModelStudio/Views/HomeView.axaml b/GC-BOOT/Views/HomeView.axaml similarity index 97% rename from src/main/dotnet/EarthModelStudio/Views/HomeView.axaml rename to GC-BOOT/Views/HomeView.axaml index e110bce..d7d23d9 100644 --- a/src/main/dotnet/EarthModelStudio/Views/HomeView.axaml +++ b/GC-BOOT/Views/HomeView.axaml @@ -1,8 +1,8 @@ + xmlns:loc="using:GC.Services" + xmlns:controls="using:GC.Controls" + x:Class="GC.Views.HomeView"> diff --git a/src/main/dotnet/EarthModelStudio/Views/HomeView.axaml.cs b/GC-BOOT/Views/HomeView.axaml.cs similarity index 82% rename from src/main/dotnet/EarthModelStudio/Views/HomeView.axaml.cs rename to GC-BOOT/Views/HomeView.axaml.cs index da3a9dc..3027178 100644 --- a/src/main/dotnet/EarthModelStudio/Views/HomeView.axaml.cs +++ b/GC-BOOT/Views/HomeView.axaml.cs @@ -1,7 +1,7 @@ using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace EarthModelStudio.Views; +namespace GC.Views; public partial class HomeView : UserControl { diff --git a/src/main/dotnet/EarthModelStudio/Views/LoadingWindow.cs b/GC-BOOT/Views/LoadingWindow.cs similarity index 98% rename from src/main/dotnet/EarthModelStudio/Views/LoadingWindow.cs rename to GC-BOOT/Views/LoadingWindow.cs index a9ae829..29ac741 100644 --- a/src/main/dotnet/EarthModelStudio/Views/LoadingWindow.cs +++ b/GC-BOOT/Views/LoadingWindow.cs @@ -8,7 +8,7 @@ using Avalonia.Layout; using Avalonia.Media; using Avalonia.Threading; -namespace EarthModelStudio.Views; +namespace GC.Views; /// /// 模型启动进度窗:加载模型程序集、生成地表纹理、构建界面的真实进度。 diff --git a/src/main/dotnet/EarthModelStudio/Views/MainWindow.axaml b/GC-BOOT/Views/MainWindow.axaml similarity index 98% rename from src/main/dotnet/EarthModelStudio/Views/MainWindow.axaml rename to GC-BOOT/Views/MainWindow.axaml index a49f698..0bc6ec9 100644 --- a/src/main/dotnet/EarthModelStudio/Views/MainWindow.axaml +++ b/GC-BOOT/Views/MainWindow.axaml @@ -1,7 +1,7 @@ + xmlns:loc="using:GC.Services" + x:Class="GC.Views.SettingsView"> diff --git a/src/main/dotnet/EarthModelStudio/Views/SettingsView.axaml.cs b/GC-BOOT/Views/SettingsView.axaml.cs similarity index 83% rename from src/main/dotnet/EarthModelStudio/Views/SettingsView.axaml.cs rename to GC-BOOT/Views/SettingsView.axaml.cs index 1939a4b..2cc532c 100644 --- a/src/main/dotnet/EarthModelStudio/Views/SettingsView.axaml.cs +++ b/GC-BOOT/Views/SettingsView.axaml.cs @@ -1,7 +1,7 @@ using Avalonia.Controls; using Avalonia.Markup.Xaml; -namespace EarthModelStudio.Views; +namespace GC.Views; public partial class SettingsView : UserControl { diff --git a/src/main/dotnet/EarthModelStudio/Views/UpdaterWindow.cs b/GC-BOOT/Views/UpdaterWindow.cs similarity index 98% rename from src/main/dotnet/EarthModelStudio/Views/UpdaterWindow.cs rename to GC-BOOT/Views/UpdaterWindow.cs index f2ef171..ebcba7f 100644 --- a/src/main/dotnet/EarthModelStudio/Views/UpdaterWindow.cs +++ b/GC-BOOT/Views/UpdaterWindow.cs @@ -4,9 +4,9 @@ using Avalonia.Controls; using Avalonia.Layout; using Avalonia.Media; using Avalonia.Threading; -using EarthModelStudio.Services; +using GC.Services; -namespace EarthModelStudio.Views; +namespace GC.Views; /// /// 启动器更新进度窗:更新期间主窗口已关闭,由这个独立小窗展示下载进度。 diff --git a/src/main/dotnet/EarthModelStudio/app.manifest b/GC-BOOT/app.manifest similarity index 90% rename from src/main/dotnet/EarthModelStudio/app.manifest rename to GC-BOOT/app.manifest index e3f03fe..4da72a7 100644 --- a/src/main/dotnet/EarthModelStudio/app.manifest +++ b/GC-BOOT/app.manifest @@ -1,6 +1,6 @@ - + true/pm diff --git a/src/main/dotnet/EarthModelStudio/Views/PlayerWindow.cs b/GC-DRAW/PlayerWindow.cs similarity index 99% rename from src/main/dotnet/EarthModelStudio/Views/PlayerWindow.cs rename to GC-DRAW/PlayerWindow.cs index 42f2193..c3f8139 100644 --- a/src/main/dotnet/EarthModelStudio/Views/PlayerWindow.cs +++ b/GC-DRAW/PlayerWindow.cs @@ -13,10 +13,10 @@ using Avalonia.Layout; using Avalonia.Media; using Shapes = Avalonia.Controls.Shapes; using Avalonia.VisualTree; -using EarthModelStudio.Models; -using EarthModelStudio.Services; +using GC.Models; +using GC.Services; -namespace EarthModelStudio.Views; +namespace GC.Views; /// /// 模型窗口:**只做窗口宿主**。 diff --git a/EarthModelStudio.sln b/GC.sln similarity index 84% rename from EarthModelStudio.sln rename to GC.sln index 0d3bc4c..8186988 100644 --- a/EarthModelStudio.sln +++ b/GC.sln @@ -3,23 +3,19 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.0.31903.59 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GC-BOOT", "GC-BOOT", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "main", "main", "{ABAA6554-252E-13CE-1B40-0464A7DBA771}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GC", "GC-BOOT\GC.csproj", "{2E3BE2DB-1C4B-4EA0-9523-43EE910BD54C}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnet", "dotnet", "{F2BBD9FE-F148-5687-ED21-3ABA515A9B22}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GC", "GC", "{3E72BF5C-0B5E-D5BD-DCAE-6B991004B4A5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EarthModelStudio", "src\main\dotnet\EarthModelStudio\EarthModelStudio.csproj", "{2E3BE2DB-1C4B-4EA0-9523-43EE910BD54C}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{09578AA7-0862-3E52-D2AA-D8F7E863B74B}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{3E72BF5C-0B5E-D5BD-DCAE-6B991004B4A5}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnet", "dotnet", "{09578AA7-0862-3E52-D2AA-D8F7E863B74B}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EarthModelStudio.Tests", "src\test\dotnet\EarthModelStudio.Tests\EarthModelStudio.Tests.csproj", "{D15CB92F-5E5C-4516-8D07-C244FC0CD113}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GC.Tests", "GC\src\test\dotnet\GC.Tests\GC.Tests.csproj", "{D15CB92F-5E5C-4516-8D07-C244FC0CD113}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_sdk", "_sdk", "{26AABC0C-8B8D-F9B8-86B4-01B1A96D59F4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EarthModelStudio.ModelSdk", "model\_sdk\EarthModelStudio.ModelSdk\EarthModelStudio.ModelSdk.csproj", "{C8FAB8D5-CAB7-42D7-8A1F-4B79771A2CE0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GC.ModelSdk", "model\_sdk\GC.ModelSdk\GC.ModelSdk.csproj", "{C8FAB8D5-CAB7-42D7-8A1F-4B79771A2CE0}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "model", "model", "{62B8A37E-7066-D91A-6443-87D4E6CE63FE}" EndProject @@ -110,10 +106,7 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {ABAA6554-252E-13CE-1B40-0464A7DBA771} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B} - {F2BBD9FE-F148-5687-ED21-3ABA515A9B22} = {ABAA6554-252E-13CE-1B40-0464A7DBA771} - {2E3BE2DB-1C4B-4EA0-9523-43EE910BD54C} = {F2BBD9FE-F148-5687-ED21-3ABA515A9B22} - {3E72BF5C-0B5E-D5BD-DCAE-6B991004B4A5} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B} + {2E3BE2DB-1C4B-4EA0-9523-43EE910BD54C} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B} {09578AA7-0862-3E52-D2AA-D8F7E863B74B} = {3E72BF5C-0B5E-D5BD-DCAE-6B991004B4A5} {D15CB92F-5E5C-4516-8D07-C244FC0CD113} = {09578AA7-0862-3E52-D2AA-D8F7E863B74B} {C8FAB8D5-CAB7-42D7-8A1F-4B79771A2CE0} = {26AABC0C-8B8D-F9B8-86B4-01B1A96D59F4} diff --git a/src/test/dotnet/EarthModelStudio.Tests/EarthModelStudio.Tests.csproj b/GC/src/test/dotnet/GC.Tests/GC.Tests.csproj similarity index 66% rename from src/test/dotnet/EarthModelStudio.Tests/EarthModelStudio.Tests.csproj rename to GC/src/test/dotnet/GC.Tests/GC.Tests.csproj index ca5d3a8..9117925 100644 --- a/src/test/dotnet/EarthModelStudio.Tests/EarthModelStudio.Tests.csproj +++ b/GC/src/test/dotnet/GC.Tests/GC.Tests.csproj @@ -4,8 +4,8 @@ Exe enable true - EarthModelStudio.Tests - EarthModelStudio.Tests + GC.Tests + GC.Tests @@ -14,7 +14,7 @@ - + diff --git a/src/test/dotnet/EarthModelStudio.Tests/Program.cs b/GC/src/test/dotnet/GC.Tests/Program.cs similarity index 98% rename from src/test/dotnet/EarthModelStudio.Tests/Program.cs rename to GC/src/test/dotnet/GC.Tests/Program.cs index 0e6febf..1f58099 100644 --- a/src/test/dotnet/EarthModelStudio.Tests/Program.cs +++ b/GC/src/test/dotnet/GC.Tests/Program.cs @@ -5,22 +5,22 @@ using System.Threading; using System.IO; using System.IO.Compression; using System.Linq; -using EarthModelStudio.Models; +using GC.Models; using Avalonia; using Avalonia.Controls; using Avalonia.Headless; using Avalonia.Threading; using Avalonia.VisualTree; -using EarthModelStudio; -using EarthModelStudio.Services; -using EarthModelStudio.ViewModels; -using EarthModelStudio.Views; +using GC; +using GC.Services; +using GC.ViewModels; +using GC.Views; -namespace EarthModelStudio.Tests; +namespace GC.Tests; /// /// 离屏校验工具:把启动器页面和模型窗口渲染成 PNG。 -/// 用法:dotnet run --project src/test/dotnet/EarthModelStudio.Tests -- build/screenshots +/// 用法:dotnet run --project GC/src/test/dotnet/GC.Tests -- build/screenshots /// internal static class Program { @@ -221,7 +221,7 @@ internal static class Program var dir = new DirectoryInfo(AppContext.BaseDirectory); for (var i = 0; i < 10 && dir != null; i++, dir = dir.Parent) { - if (File.Exists(Path.Combine(dir.FullName, "EarthModelStudio.sln"))) return dir.FullName; + if (File.Exists(Path.Combine(dir.FullName, "GC.sln"))) return dir.FullName; } return Directory.GetCurrentDirectory(); } diff --git a/README.md b/README.md index 4c79305..bfd05e6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Earth Model Studio +# GC 天文教学模型**启动器**:管理/启动模型、启动时自动检查并下载最新版模型与启动器、设置语言与内存。 @@ -17,7 +17,7 @@ ``` <安装目录>/ - EarthModelStudio.exe | EarthModelStudio.app/ + GC.exe | GC.app/ .GC/ settings.json 设置 + 已安装版本记录 model/ 启动时下载的模型 @@ -51,23 +51,23 @@ ## 目录结构 ``` -EarthModelStudio/ -├── EarthModelStudio.sln +Repository/ +├── GC.sln ├── Directory.Build.props # 公共构建属性 ├── version.json # ★ 自动生成的版本清单(推送到仓库后才生效) ├── build.sh / build.ps1 # 构建脚本 -├── src/ # ★ 启动器(没有渲染逻辑) -│ └── main/dotnet/EarthModelStudio/ -│ ├── Models/ Services/ # 清单/设置/目录探测/i18n/模型库/下载/自动更新 -│ │ # UpdateService · GitCodeRemote · DirectoryRemote · LauncherUpdate -│ ├── ViewModels/ Views/ # 主页、下载、设置、模型窗口壳、启动更新状态条 -│ └── Assets/i18n/ # 启动器界面语言包 -├── src/test/dotnet/…Tests/ # 离屏校验 + --update-test 离线更新链路验证 +├── GC/ # 原 src 内容 +│ └── src/test/dotnet/GC.Tests/ # 离屏校验 + --update-test 离线更新链路验证 +├── GC-BOOT/ # 启动器(不实现模型绘制) +│ ├── Models/ Services/ # 清单/设置/目录探测/i18n/模型库/下载/自动更新 +│ ├── ViewModels/ Views/ # 主页、下载、设置和启动更新状态 +│ └── Assets/i18n/ # 启动器界面语言包 +├── GC-DRAW/PlayerWindow.cs # 通用模型窗口宿主;实际绘制由模型提供 ├── model/ # ★ 模型的一切 │ ├── version.json # 与根 version.json 相同(便于按 model/ 地址读取) -│ ├── _sdk/EarthModelStudio.ModelSdk/ +│ ├── _sdk/GC.ModelSdk/ │ ├── _engine/ -│ │ ├── src/ # CelestialView / PlanetTexture / EarthModelView … +│ │ ├── src/ # 模型专用引擎与渲染,留在 model 内 │ │ ├── PreviewGen/ # 用模型渲染器生成封面 │ │ └── VersionStamp/ # 按内容指纹自动打版本、生成 version.json │ ├── earth-rotation/ @@ -99,9 +99,9 @@ Windows 用 `.\build.ps1`(参数相同)。 | 产物 | 平台 | | --- | --- | -| `dist/mac-arm64/EarthModelStudio.app` | macOS Apple Silicon | -| `dist/win-x64/EarthModelStudio.exe` | Windows x64 | -| `dist/win-arm64/EarthModelStudio.exe` | Windows on ARM | +| `dist/mac-arm64/GC.app` | macOS Apple Silicon | +| `dist/win-x64/GC.exe` | Windows x64 | +| `dist/win-arm64/GC.exe` | Windows on ARM | 均为自包含单文件启动器,**发布包内不含模型**。改完模型: `./build.sh models` → 把 `version.json` 和 `model/` 推送到 gitcode → 客户端下次启动自动更新。 diff --git a/build.ps1 b/build.ps1 index 4645ed4..7d94d78 100644 --- a/build.ps1 +++ b/build.ps1 @@ -1,5 +1,5 @@ # --------------------------------------------------------------------------- -# Earth Model Studio 构建入口(Windows PowerShell,薄封装) +# GC 构建入口(Windows PowerShell,薄封装) # 实际代码在 buildsh/ 里。Windows 上若无 sh,则走内置的最小实现。 # .\build.ps1 build | check | models | stamp | run | test | clean | doctor # --------------------------------------------------------------------------- @@ -15,10 +15,10 @@ $Root = $PSScriptRoot Set-Location $Root $env:AVALONIA_TELEMETRY_OPTOUT = '1' -$AppProj = 'src/main/dotnet/EarthModelStudio/EarthModelStudio.csproj' -$TestProj = 'src/test/dotnet/EarthModelStudio.Tests/EarthModelStudio.Tests.csproj' +$AppProj = 'GC-BOOT/GC.csproj' +$TestProj = 'GC/src/test/dotnet/GC.Tests/GC.Tests.csproj' $StampProj= 'model/_engine/VersionStamp/VersionStamp.csproj' -$Sln = 'EarthModelStudio.sln' +$Sln = 'GC.sln' $Version = ([regex]::Match((Get-Content Directory.Build.props -Raw), '(.*?)')).Groups[1].Value if (-not $Version) { $Version = '1.0.0' } New-Item -ItemType Directory -Force -Path "$Root/build/logs" | Out-Null diff --git a/build.sh b/build.sh index 37a2693..10572b6 100755 --- a/build.sh +++ b/build.sh @@ -1,6 +1,6 @@ #!/bin/sh # --------------------------------------------------------------------------- -# Earth Model Studio 构建入口(薄封装) +# GC 构建入口(薄封装) # # ./build.sh build 完整发布(原 publish),带 apt 风格进度条 # ./build.sh check 验证:编译 + 自检 + 离屏渲染 + 产物 @@ -21,11 +21,11 @@ export AVALONIA_TELEMETRY_OPTOUT=1 ROOT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd) cd "$ROOT_DIR" -APP_PROJ="src/main/dotnet/EarthModelStudio/EarthModelStudio.csproj" +APP_PROJ="GC-BOOT/GC.csproj" PREVIEW_PROJ="model/_engine/PreviewGen/PreviewGen.csproj" STAMP_PROJ="model/_engine/VersionStamp/VersionStamp.csproj" -TEST_PROJ="src/test/dotnet/EarthModelStudio.Tests/EarthModelStudio.Tests.csproj" -SLN="EarthModelStudio.sln" +TEST_PROJ="GC/src/test/dotnet/GC.Tests/GC.Tests.csproj" +SLN="GC.sln" VERSION=$(sed -n 's/.*\(.*\)<\/Version>.*/\1/p' Directory.Build.props | head -1) [ -n "$VERSION" ] || VERSION="1.0.0" diff --git a/buildsh/build.sh b/buildsh/build.sh index e3e7aa6..b6efa4e 100644 --- a/buildsh/build.sh +++ b/buildsh/build.sh @@ -45,7 +45,7 @@ bs_build() { package_mac_app prepare_runtime_layout "dist/win-x64" prepare_runtime_layout "dist/win-arm64" - prepare_runtime_layout "dist/mac-arm64/EarthModelStudio.app/Contents/MacOS" + prepare_runtime_layout "dist/mac-arm64/GC.app/Contents/MacOS" progress_step "打包 zip"; progress_tick 100 pack_launcher diff --git a/buildsh/lib/build_funcs.sh b/buildsh/lib/build_funcs.sh index 82c203d..329f341 100644 --- a/buildsh/lib/build_funcs.sh +++ b/buildsh/lib/build_funcs.sh @@ -24,7 +24,7 @@ build_models() { for DLL in "$DIR"src/bin/Release/net8.0/*.dll; do [ -f "$DLL" ] || continue NAME=$(basename "$DLL") - [ "$NAME" = "EarthModelStudio.ModelSdk.dll" ] && continue + [ "$NAME" = "GC.ModelSdk.dll" ] && continue cp "$DLL" "$DIR$ID.model/" echo " -> model/$ID/$ID.model/$NAME" done @@ -131,12 +131,12 @@ pack_launcher() { done # --- macOS:先得到真实 .app 目录(改名 + 同步 Info.plist)--- - MACAPP="$ROOT_DIR/dist/mac-arm64/EarthModelStudio.app" + MACAPP="$ROOT_DIR/dist/mac-arm64/GC.app" if [ -d "$MACAPP" ]; then FINAL="$ROOT_DIR/dist/GC-${VERSION}-mac-arm64.app" rm -rf "$FINAL" mv "$MACAPP" "$FINAL" - chmod +x "$FINAL/Contents/MacOS/EarthModelStudio" 2>/dev/null || true + chmod +x "$FINAL/Contents/MacOS/GC" 2>/dev/null || true PLIST="$FINAL/Contents/Info.plist" if [ -f "$PLIST" ]; then /usr/libexec/PlistBuddy -c "Set :CFBundleName Morris GC" "$PLIST" 2>/dev/null || true @@ -192,7 +192,7 @@ strip_intermediate_dirs() { package_mac_app() { DIST="$ROOT_DIR/dist/mac-arm64" - APP="$DIST/EarthModelStudio.app" + APP="$DIST/GC.app" rm -rf "$APP" mkdir -p "$APP/Contents/MacOS" "$APP/Contents/Resources" cat > "$APP/Contents/Info.plist" < - CFBundleNameEarth Model Studio - CFBundleDisplayNameEarth Model Studio - CFBundleIdentifiercn.neorf.earthmodelstudio + CFBundleNameGC + CFBundleDisplayNameGC + CFBundleIdentifiercn.neorf.GC CFBundleVersion${VERSION} CFBundleShortVersionString${VERSION} CFBundlePackageTypeAPPL - CFBundleExecutableEarthModelStudio + CFBundleExecutableGC CFBundleInfoDictionaryVersion6.0 LSMinimumSystemVersion11.0 NSHighResolutionCapable @@ -215,12 +215,12 @@ package_mac_app() { PLIST for f in "$DIST"/*; do base=$(basename "$f") - [ "$base" = "EarthModelStudio.app" ] && continue + [ "$base" = "GC.app" ] && continue [ "$base" = ".DS_Store" ] && continue mv "$f" "$APP/Contents/MacOS/" done # 应用图标:由 Assets/icon-1024.png 生成 .icns - ICONSRC="$ROOT_DIR/src/main/dotnet/EarthModelStudio/Assets/icon-1024.png" + ICONSRC="$ROOT_DIR/GC-BOOT/Assets/icon-1024.png" if [ -f "$ICONSRC" ] && command -v iconutil >/dev/null 2>&1; then ICONSET="$DIST/AppIcon.iconset" rm -rf "$ICONSET"; mkdir -p "$ICONSET" @@ -241,7 +241,7 @@ PLIST # 发布包不带 .GC 运行骨架(用户首次启动自行创建),避免覆盖用户数据 rm -rf "$APP/Contents/MacOS/.GC" - chmod +x "$APP/Contents/MacOS/EarthModelStudio" + chmod +x "$APP/Contents/MacOS/GC" echo "==> 已打包 $APP" } diff --git a/model/README.md b/model/README.md index 270980c..e6d7800 100644 --- a/model/README.md +++ b/model/README.md @@ -17,7 +17,7 @@ ``` model/ version.json # 版本清单(与仓库根 version.json 相同,自动生成) - _sdk/EarthModelStudio.ModelSdk/ # 模型契约(启动器与模型唯一的共享代码) + _sdk/GC.ModelSdk/ # 模型契约(启动器与模型唯一的共享代码) _engine/ # 共享引擎源码 src/ # CelestialView / PlanetTexture / EarthModelView / SphereRaster… PreviewGen/ # 用模型渲染器生成封面的小工具 @@ -81,7 +81,7 @@ model/ ## 模型契约(model/_sdk) -模型只依赖一个极小的契约程序集 `EarthModelStudio.ModelSdk`(源码在 `model/_sdk/`): +模型只依赖一个极小的契约程序集 `GC.ModelSdk`(源码在 `model/_sdk/`): ```csharp public interface IModelFactory diff --git a/model/_engine/PreviewGen/PreviewGen.csproj b/model/_engine/PreviewGen/PreviewGen.csproj index abd17f0..63bd4be 100644 --- a/model/_engine/PreviewGen/PreviewGen.csproj +++ b/model/_engine/PreviewGen/PreviewGen.csproj @@ -23,7 +23,7 @@ - + diff --git a/model/_engine/PreviewGen/Program.cs b/model/_engine/PreviewGen/Program.cs index 227d6d2..1be0508 100644 --- a/model/_engine/PreviewGen/Program.cs +++ b/model/_engine/PreviewGen/Program.cs @@ -9,7 +9,7 @@ using Avalonia.Controls; using Avalonia.Headless; using Avalonia.Media.Imaging; using Avalonia.Platform; -using EarthModelStudio.ModelSdk; +using GC.ModelSdk; using NeoRF.EarthModels; namespace NeoRF.EarthModels.Preview; @@ -210,7 +210,7 @@ internal static class Program // 契约与 Avalonia 一律回到默认上下文,与启动器 ModelLoadContext 一致 if (name.Name is null) return null; if (name.Name.StartsWith("System", StringComparison.OrdinalIgnoreCase)) return null; - var shared = new[] { "EarthModelStudio.ModelSdk", "Avalonia", "Avalonia.Base", + var shared = new[] { "GC.ModelSdk", "Avalonia", "Avalonia.Base", "Avalonia.Controls", "Avalonia.Skia", "Avalonia.Themes.Fluent", "SkiaSharp", "HarfBuzzSharp" }; if (shared.Contains(name.Name, StringComparer.OrdinalIgnoreCase)) return null; var candidate = Path.Combine(dataDir, name.Name + ".dll"); diff --git a/model/_engine/src/CelestialView.cs b/model/_engine/src/CelestialView.cs index 23d39ce..6c3790b 100644 --- a/model/_engine/src/CelestialView.cs +++ b/model/_engine/src/CelestialView.cs @@ -403,7 +403,7 @@ public class CelestialView : Control, IDisposable _sphere?.Dispose(); _sphere = null; _sphereSize = 0; - GC.SuppressFinalize(this); + System.GC.SuppressFinalize(this); } private void OnTick(object? sender, EventArgs e) diff --git a/model/_engine/src/EarthModelView.cs b/model/_engine/src/EarthModelView.cs index 73a0638..53f5e5e 100644 --- a/model/_engine/src/EarthModelView.cs +++ b/model/_engine/src/EarthModelView.cs @@ -9,7 +9,7 @@ using Avalonia.Input; using Avalonia.Layout; using Avalonia.Media; using Avalonia.Threading; -using EarthModelStudio.ModelSdk; +using GC.ModelSdk; namespace NeoRF.EarthModels; @@ -187,7 +187,7 @@ public sealed class EarthModelView : UserControl, IDisposable } _canvas.Dispose(); _closeup.Dispose(); - GC.SuppressFinalize(this); + System.GC.SuppressFinalize(this); } private string CurrentView { get; set; } = "rotation"; diff --git a/model/_engine/src/EngineEntry.cs b/model/_engine/src/EngineEntry.cs index dc45319..20495fc 100644 --- a/model/_engine/src/EngineEntry.cs +++ b/model/_engine/src/EngineEntry.cs @@ -1,6 +1,6 @@ using System; using Avalonia.Controls; -using EarthModelStudio.ModelSdk; +using GC.ModelSdk; namespace NeoRF.EarthModels; @@ -40,6 +40,6 @@ public sealed class EarthModelRuntime : IModelRuntime public void Dispose() { _scene = null; - GC.SuppressFinalize(this); + System.GC.SuppressFinalize(this); } } diff --git a/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj b/model/_sdk/GC.ModelSdk/GC.ModelSdk.csproj similarity index 79% rename from model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj rename to model/_sdk/GC.ModelSdk/GC.ModelSdk.csproj index 6905f6a..49910a7 100644 --- a/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj +++ b/model/_sdk/GC.ModelSdk/GC.ModelSdk.csproj @@ -4,8 +4,8 @@ net8.0 enable disable - EarthModelStudio.ModelSdk - EarthModelStudio.ModelSdk + GC.ModelSdk + GC.ModelSdk false Earth Model 模型契约:启动器与模型之间唯一的编译期依赖。 diff --git a/model/_sdk/EarthModelStudio.ModelSdk/IModelContracts.cs b/model/_sdk/GC.ModelSdk/IModelContracts.cs similarity index 98% rename from model/_sdk/EarthModelStudio.ModelSdk/IModelContracts.cs rename to model/_sdk/GC.ModelSdk/IModelContracts.cs index 73039a8..98f0891 100644 --- a/model/_sdk/EarthModelStudio.ModelSdk/IModelContracts.cs +++ b/model/_sdk/GC.ModelSdk/IModelContracts.cs @@ -1,7 +1,7 @@ using System; using Avalonia.Controls; -namespace EarthModelStudio.ModelSdk; +namespace GC.ModelSdk; /// /// 模型入口契约。模型程序集里必须有一个公开、无参构造的 实现, diff --git a/model/contour-map/contour-map.json b/model/contour-map/contour-map.json index e41ec57..4f7e95a 100644 --- a/model/contour-map/contour-map.json +++ b/model/contour-map/contour-map.json @@ -25,6 +25,6 @@ "button": "#9FB4D4", "frame": "#0A1524" }, - "updatedAt": "2026-11-14T02:48:20Z", - "build": "4d5485eed8" + "updatedAt": "2026-11-14T04:41:38Z", + "build": "e4299c5c99" } diff --git a/model/contour-map/contour-map.model/ContourMapModel.dll b/model/contour-map/contour-map.model/ContourMapModel.dll index db60c565084cb46b7c73d6a03de375f3143f0605..c44b4df44a75a00d2a30ae8db1ab5d3502d0382f 100644 GIT binary patch delta 5587 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 CkQL7W diff --git a/model/contour-map/src/ContourMapModel.csproj b/model/contour-map/src/ContourMapModel.csproj index 41e6934..302d6d1 100644 --- a/model/contour-map/src/ContourMapModel.csproj +++ b/model/contour-map/src/ContourMapModel.csproj @@ -15,7 +15,7 @@ - + false diff --git a/model/contour-map/src/ContourMapRuntime.cs b/model/contour-map/src/ContourMapRuntime.cs index 72769b6..5aaddb9 100644 --- a/model/contour-map/src/ContourMapRuntime.cs +++ b/model/contour-map/src/ContourMapRuntime.cs @@ -4,7 +4,7 @@ using Avalonia; using Avalonia.Controls; using Avalonia.Layout; using Avalonia.Media; -using EarthModelStudio.ModelSdk; +using GC.ModelSdk; namespace NeoRF.ContourMap; @@ -49,7 +49,7 @@ public sealed class ContourMapRuntime : IModelRuntime { _field = null; _texts = null; - GC.SuppressFinalize(this); + System.GC.SuppressFinalize(this); } private static Dictionary LoadTexts(string dataDir, string language) diff --git a/model/earth-geography/earth-geography.json b/model/earth-geography/earth-geography.json index 5a3a8c4..b251d13 100644 --- a/model/earth-geography/earth-geography.json +++ b/model/earth-geography/earth-geography.json @@ -18,7 +18,7 @@ ], "dataDir": "earth-geography.model", "version": "1.8", - "updatedAt": "2026-11-14T02:48:20Z", + "updatedAt": "2026-11-14T04:41:38Z", "chrome": { "titleBar": "#0C1828", "titleBorder": "#1B2740", @@ -26,5 +26,5 @@ "button": "#9FB4D4", "frame": "#0A1524" }, - "build": "ede9f2fdd0" + "build": "64b985e484" } diff --git a/model/earth-geography/earth-geography.model/EarthGeographyModel.dll b/model/earth-geography/earth-geography.model/EarthGeographyModel.dll index a87fa05169897f368dd4d5bfb8702489dd3eff2e..f2c87d96e555e1451c784646185a6a60d5799517 100644 GIT binary patch delta 7535 zcmbtZ3v^UfmOb~q`d8)EOZ_WVl@JPq5(EN-z>u_tj|hzr`5HhVkbsGN41yZLE&`!7 zN=D-ogjPl&K@vVf2nvV}M1mNBR)i&CkQpMh3WBzyjz;{w!_wWe6?oW0NI z-h1wS$$iQ4tJ3nT($kL{?riORx_Wh3tf;P^tn@hnFc$E00bre6o$j#sB161w%I{@m8 zs7)LXFO30EQHze4IC2<%-Gw|)+c35~zC;xi3?|s)IO;V)S`wjVf7I)Q@4cj7v9D1~ zU`p!hHo+_hq0HEc@igOpJL#qNPchf$KIb>V?GD1p_J4_(pqwjTW87k=`jM35stqn! zjd9fkL#)SD1=fmr1{>stji^lZ9QC^36}83hf(ahN61EQ*Tl_vSI?u~fp*v2_2UF2@ zL5;fw2TOGy$J{(Y)y`lw6J+CHJ{ai#E@FdW5vnXFA6I?wtf#l)gBhW#a@+@1k@K<% z*7NKRU~&pfkmh6BlH~KU4?6k32>D=8h%nVhIGq(U;~k8nyjL-@Zj$`uBPkz* zTo7N#js3t+?(0rUn8$%=cS9~VejgvNk z%YIz#3~u8PY;T52Sudx2fmwA<^3LPtAC2_J^R$e+vNP_XmTu;t1MZJqKB(nYe&nXL z&TtX-zxP{6D)W$!Eu9R~B5rf}#8c!1exmCD=!4>Gf`Z#2Z2O|+5kPFTV0 z7b~%GPzB{UnKf==(_j;`s>oh#_=J0UWco%~1z2q35D$hXA%5(eg19<39r4}3EX1Au zIf(nU6B8nHDJGp`(m5ubW772)zp?})PbU$6p%P}K5LS8~Mr`&xia0}AfwWWO08tkLe87!eKH!ioNgD??ACQiPZePkUD(?(nTbrAwp^@vLE+H3ND%cOia| zya(|JqmPwG*nWv|HDf(vg?4V@Wid%RGAZhQJzQcnK>{DQ*=#0oYu6`5#b33w$z6Lq z7>?Q`ute$GXgPcwy4fbf{WlS-hB8YgMqlcdUwA;u&zAdrB_a$Pb@nG;R0_i`ovjO%hzRV{*~_7*6oI2U z+lP6n@Se_&VqPlztIj3`OGFxcqO;;)R7!(yb++N=K#AxCKk0NwAS!hNN1w!GR{2Xr zI(T&Utak41SdUZc8Yv3nbnPRx6{7HPf?hnUX32)<;mgxho$3)kD9fPFf9JM@PA z83^2y$oobeEvP!g^c5H)NbQTH@b8LqJ35HFQ z?@2W26?j;WpvpU;TxV2y7gXwuD(`}4I92yb=(nZ627v_Q-Pj8~bl*aM zfnzW9)7c~b5@gvOky_UDSlo^E_rtw##y+G=~H5 zgwCi*Z-AyV3;N!K=XK^q-#PBU8z`wZ(G$G|X`My(DE^|slM!vtn)p+ZZa z84_KzoS9ip@_YilOL%s8(pJul;dj{`GYb%%1z8b#jJ|{)?j!$7*b2_1FTp&oBYJiL zMOPL0<3(Y-YeNF9HUJ5K8UV;QC;~P)NxzpPDF%O183`#;ur9&Z7}H@Vt5o4f11UXI zDEAzD$0w1JKpIg3YbutL;ZO*`02h4#MyLwX-TYVpzzn;z+*#w}|G~o$O3=t9681Gz zWJr%t?pVAu3rOguWYWoNV6XB2;5C5@iWmqHA$OjQgS5*n7 zTgYCAUI~87GH|?+<4qW^s%CD8fXy7a9ak)Kyn#nCa=eM-&2X>_CUo?Di<<`c9n?Z| zGvmwAE8znm!Cm-uA{JebSNt5Wz>7V79|o2IKJ5AcyEGyi3Y%*9+AF?zXS$Au@t}?Qxhi4L=39rtufHI z^D3i??;Q(5rED(&58Gi~`Nd5YK2cO?!(4oc;>vB18Q1_PSqVx;do8r1y$#|g;SEb8 zlwr_*D3``72cc3=NDI7;$^^>^#8H-0aF&zLLR4vmYN;vZJZzM}bqN|U9)DU(Cj9Br zAnm|v4N_%NE8@K=SMZ|vrlB2kKXCm5J+VTPu;PM~L>t`ia*MV&w1nLvD9tdWiIZ5U z73a7&h<8KjOiCX?)5=17gzF#;>7;?jrnEwT=<1y)vf-zcB0{_{*TYwMC2x~>^s zco-orJ0BB*nhak_*3df9&eLk=MYc;cO1l)N)wlDk+ofD*q7$vCd>)`7r{G|txv`^R zMAB~2CY`n%5EFR#X*@h44nF~G9uo+8Q_>lo>wGmnD5B3R$1W z*aA6m3=PV!d81OgJjNQ8f^s*!Nn6D&_-Yc9KXrGPGUUH_drO1l-kt$cu1u}V#Wf9< zaz&c41nr0MO*|$Sdq<=4E&iGyT`noY$tddQL zI~fN@lH`1Ovn?poAx)EG@)pZzjND@BDYr>>dtb!;xE+Pun>IKA{)vy{ai5Z4xxx@>64r=+7)N*N5u+BVQ z>vq=nu)Z3nGDMyShjGE}Vhh%97boR#+z{qMZ*ZYzPH5%?2kXaKKg|Q9jipcX@TXyn zG|jk-<1rWYk2wAk$0MRbo0ugUgws}JTE;c6;v|xAQ|S9ggQ&JXY8rGEZn3^#YLkvR zOYsp}8hFhVlqMSvAWoN?5i=RLOUU-ze3$)9)#QH zL!>j*AY$Qe=FvEz(dKV(LNm=jLQc|RvT<6=c%lYD4{$MeqL?~iKn1-q`A;D_Nmm5m zsk+ZKTCy7GnX(!tg`SbEhE&9KX`E|=*^zjHJh&zkgc(0#bnuDk&vvq5SMY#HHbla^ z%|XN3q`l?>oTv#3r2Hg&?hF@gZ=+(597kMgj7l-XPURHZ13YID^W7H^@4_dvKq^)~ zHOJ)X0h(MNoK`W8lKqXjShTCx&Fx6cmSS<#onm=5F(E-s?jq>8^<=DNy_OGSvG~EQ z{XBn+`5WbCyr!0G;};B$PgHv0?}-*DxuhsVVJR#{TnT>LaK-}G%NaK^;@cy})UdaS zmBXwYW~Ggli>zE^MF^@a3(Atw_S>RtN6C)chB6t-j@fL_X1iF_z)#9bR#vi7iHgNp z!%7V+_2NmWQ|eJyorhUJ%z6uAxzd7qs`CQt7j>lJFLPyCq6x)ii6pC312JbOl**M( zk_MWki$tYksAoEFWBoSPhjQ9b&Kil{;m+Bt7o$DSxsvTl&aFg6b=I&_kM>VW6K0hw zhgoUCm_15M939h~7g@T@C1ja~x5_lURi+X##GjOrh$YTq#D|=fh|8Vzh?UM3j%-0& zbzVl)oK^$%DTer>b0p$6XMuqRE;dljVpLRTCEJyTcn$1z)}wU9*<^Sg9#fjo@fW29 zl~!jPr(H(-W2Z1u39GRNUp`_+?hV?ib0pg%(f-+4jObR&IkMbH%cw-9vs#bXUu{7g zrV2CZ>5RGNCl#DgE|UT?4xsr!p#d<;o%UHj!6pV*7%PHu?hFZJd>}Xs}qSl`YCoJEqh+ zo`g@8Lk_Ch*Gb@)EYkd^c%vk6ryMnQnv6-4r6a3!Aj!U)Z$me8SGV$vm*CUkl6i}C%gG<@e<;fo?}4G|t=dw!7Yh5+F@ zKjDv-ZituFo`?gjgn7O`h}#W0i2agtNm2j!tA5Uxhjw|8@bhGfIc~inl5^AI!TjHK zycL**`cFX`rpiUQ$?{uro&P>m5(9T;@4tm9CNYU1Ph|@)Y=MokUJMhS4=(;SW&+2& zo0LpxHia<7OF`9*&pr64WH)!bhQK5(tt^CRcyL+7>%i9x06WNde@}dtSz5IDW!=1| z*n{sGzkXI(DjMs{maEc;p^bx{uqchUuB$hyH+`O$Ex$Toc*U*7+ltHP&u#pEgGaeF zs~7&Jv!8%o8NK@S%IYy-K)<3n1(~z6GBYwViwZL{`eYUM8#tgKs~~ew=B)mGGcpHc z^qbWmf2Cm-K=r3?7m|0?qQFZa?#z>L3T62JY5X(b(^}~(exvmSfK{t{C91xAUyUMO zJ~;Ndv!iD3KAkmJJM_xDzPk9{8C}Feohn>qQx{krZ*FcV>V7w-cYGF+-Kjd=hkr|4 zvU9!GM+$4ou0JGYY%S=!l#Gtrx{ zivsds5iG{j#0GH%7 zBGQPEAOt}OK?xlcBSB0nZ6nYuE<+Az69z|Z^>jyQoqKP+D1FA6Gv`d@a*ExVjxhlhB6<|Yp&xZgL)C{So zS|GZMTD1bPQLPh`#1d6VZhd$LfKaP;kpXQ)!ptlz#TTiN!E)I15|M3uNb#lseX^tvrY?~GwTyh z0}M8wbvob$F-K>CyTf`^N<1gME;!&k<#)j>58ErOh1EI@u!UyXkpUDPT z$K5qyaw<%a7Gc`bl+R=z^!8s3`Cxd6u&0l34l7>9iH!GnFJt7OFvVBd$-X}IvYZM_ zv5oFpcT(2g)T@}aO(E}Ny!a<0eegW3d8 zX|4~r2nXOk`CvINsSmn%*v19)!J+`+6^z8AhiAwDHQ1H`3V2oK@nBo98lEszeBkv_ z{8-Mtjkn_iQw~X&9E8Jo$OP}rM)L%@3;esM8kf`*sdirvV?4RKE->Cri(KKTR_`9~ zO&s>$1%iHr6J|z;nZbb!pu=?7zX4ea`}T(q`-}0CPBNE{B5%e^p7LrrZvc#A_LEG$ zT$sYF8%N#-)0yq!$lD>#tU2}YEDRkAbC{-b=x~_NY_gNe{2M&X%*4J?kYJW?A>Uo_ zB(tB*#KyrhP=U?VxQR`L&CJ$E4y(f^OzSbkcc)o^$ubV{XlNqhH@?Y;F9oL~o({}H ze9J!@@rZhKLgZeG$>5j_j>+Jd3@yg*Scs7)?1WdHgtw;>uJt^M__614#2Jn!5nu8V zz8fOE!1l@@*&hT5>(#OO5phtRoA1xB3O$d?e8dcR*}ELE$+sMp%*ZyxGrHHz{h+t9 z8}VGqUc}>!K2}z+{W{}IjQbd?)lc%7w5A(XfM;becd0pUhjTHq;MH+mmu}6YYDGh$m*lRZiN<}*SQ=?6RsFV)2zR6}( zf2qg-kH$8upWGAc(dJwuMPZz#U2>j=C_I{E5VD?zuCSe11w5|yDF`Xw;U(G)R`%nH z@UdD@5E9R+3k!ycT(zlSn6f@}$}$iZ#QrGQDY}U z2dvc)n3l|wQbtK@;69B-Lr1JHz&jedpbnW55@XdFQ$mq3zOSq=L#U9lo-$4L{fMk< zk_ASpYp28#eN#-fS73}5k(=VOZGr-g-QkSbHbY!vW1QC^EA3=hxd!HGj4Ic_q9hB@ z@u`J%ns1Bm23sv`(%5caKV;iGBk#b_E%27+%nsgQ+X9C*HZ0f=*`GQ?G4fSt(|qkI znaJ8T_Jg{7YAm0ovJI?7$;r}G>cFEhT8Qls))=+B9lB{O9K6-`8uZdwEI8D*1G1A0 z7fGI$T%_0GQ7wWh?}7@AQRUrGsWGa&8>&0AvFCc&t@+fzXj?rrYHVX*60+uNBKN=v z&G&O~jkE_o)tE7ydK&h?7aCpRS|c^UR~ma>Ju)peoTmN;D8;`{{Y?lY8SlnE=%M)@ z_s4DfAWLH_{H4eSc1Ef>(_@JYtiK=b(;|AhPQ!jE)7a_m1+W1j^V*xrS|Y3#4T#mKH`j9NMb^6X!ir3GvnyAyqf!K1P1YWa*|g*{qP8>6vO-*Vd@;U0}G@I8yHD9LyVAHWG_FF>R2McW6UyO&0-3XJu(SwDmc%wB+M zHDhK-WU9F{a}@G?34KbrJ3MJiXU6ca?9Q2SL?xaRq08uN`0;-7FNN)(*uMtjoX+UN zI7L4b_b29u@m?E}Xtn@I_-OzjU!w@vtdRaNM^X%aD(VR-Qm`(;cNo)Yr#Y#@RUIj} zq*CrD>>Y0>C5bem1ZKQ{#n3;6@U9-d#k+DntPj$?`I!KK5#CnwW{pqiB9ulbK?9da z+E=*IKB((p8s0Q_#&}YwCV6#0Uj6^UYk=#pQ6pGfREH`^TtS9DiE9S<7soaFMF%DP z_P_?n!Jwawc?;&s@FMCu&Puju;319Nv^J{% zo-)}jYv(@=ce-6Bo)iR@R=E5WZ>I*!+KyaD5#P9raffCi4-fisplUdN;8Io`nWMmX3N6FS%Z4L1$& z8>oiv?VorSy%Jsk5{$+7d@Q;SZ}CTZ1>V@x-;p4q1!9O!=*KvKF^_Qs<58#FJ_Aw5X{eGuO8pErNeO0>M)56O2j-r0{R};^f?b$#!gkRHPq^HoEdi&(ZV{Ab z=+eY7EOZ)sJRFRPD(Q>VzJl7yK|9}d5Ql75Xy9r1nSK*wdGp0Uu!f2W!=<7QzQtSe zHmNBxUkv48glJcu7J?QTzLor;7exoR)xneOkZ6<+DM7RE;I2EQJSDjjr%~w$(2)1x zV54|pN5OFW9?>S9Fg1w@Jp5E19ubG100EByguK~)3T+y49iv$eST2eb*=YV=nB{W& zMN!219L81{nZVGX+~SQ&8S-dzR0_)d@lM(-df}rV{D^lHDl#^aA(!eWOI2b*C@xiqh_6(t6yq?mN<8U)2=(_o z<~ev;#S)b1kfzBod8=s@Ms79rl-ne$H52g&ZbuQXO`D{o4um3J#WTDq zXN1``P%eUF3FlzBUaXDWDQDn*Pn1WXdq32R4$Hk*`WgK~xt$ZrarTvH@9|V44t7<` zm8h&kdxN|Q@d#p-{77IMzSG%Wz(;Q}HYZ>)+x7BMMj$}J-ms_a1#^7xUWj; zRT&BHWvlo{#HT9}$K|lDO{}w|AvU_ZBR*$|N~>Xmn4((^7sL$R@3_S8`5e^pDXHbs zs9>ErJl7qp?`3^8wlY|r1IKW}9bzli?-0l2a6%X6LI=1|3n#R2f{pbLSwF!8qm89c z@bD*Kv@}(}nBy@Q^-nqe0>>kwLYtT)>V;w{HZ10vm$3;uZVLVVs25e{#|;B6Lof61 z4Qxq~l&2()r+LBk02j^sfFyp6;Ha;;ov7MrOJJ=*r zbUng*j6vNC_I<`UHfn&lRA9&JPIun&9xB1ehlq>xQ7NX|N=97(0*{O(o)_JJs~NWJ7`$xvQY#)|0W8^;$lR zCBo!Ue|liFQK#I9x2aX?_y=!I6gzt3|B0S(0&a-l!6(OjyEGSDx+i!`o9VI(q8Ny@;I||t@WV=MvfL&S2%2HM; zQ3)tDtkkelCsskDqYm|Sne>>w{Py!f8V|YXo}pl|t4_(4M6%WxJAdD^W>TYFMd5+paWY zR+ZxrE3FvQ;%H5vV~%p3rFJeM%QU=Mrs2&pm53qQl@W-KDJ6(cE0u`PD|LwLlva*x zMLS(-N32oII$Ea~;x1(bVv`cr(ZD4-s#$_cx>Ct@r7lqeN0d60PAbj1^|02_jE?P& zR#Yx3ZJgGQ_TLntrxIp;4am-zp4SHLbY%qFBhYp@OAw>Z3XZJM(=;kk$#m8s4t2I7 zPH+k%=^2c9##IjND33|phy$qpvRJo9M}~=l@)+YLTBtbN6^xruX;h2LV)#AAb7lSQ zjSgYqq88GRl|_wf9Ytt=q+ThDbgOc_!`^1{I-1!&XQ7Qg$95ZM<<7fRtWwM86{LOQ zsI{$vzdPQsQO#x>9gh~bD za5LFn!nlkSHE%&A(dg*vq4+@_>PP1#yDMW6VvA!LV+$)67;AkL)52KfCwm!VEn^E~ zQGj*ETE-T}qTo_I@kJ5prxWJ@q7iy?|!N$Z9R~kO^J@1PmHiih#u)Qcq_Q3$* ztA4_(rtXM;clJcQ*-SXy*B5bzE*CK`C65&6$Y1n!-x#!?3lesuP|SzsYa%(fS0Y&O zn~pyRW}$9PrD4{)2sfL4O@7mVKPt(A`?B||FvTRB=+3RY!4rGXLRmY*g#Qs-@Jq}r zj`^cKh0-hz!W+C4w6S6B!;ec=L+4`%6sc+DAz@H&EsuCp@i7Ct0vYe$ldr|5Q|bfd z-Mww>!RL%$Udv6@4Rz&9oX%nKc?<5lYi?2Tobd}57M09x=&{n|Xz2gqR=v}-t#$kS z^L2x(rLGH`3eP~p?{Dk02hyz&cmf^$)^~vmUAHO_$ldElZ!$Zquwf6Nny)^Od zxF%BRAK&@t>Vwe}6LaX{_Z9ThLCk@_Z)t)8hrHRKL#OTZYI2Xpb>ZXp!nP1k6M!vj#vg@&O$ z54HOs9lxERm}2~HBOS)0wh&nf%vF!?={G(bdcXk4#NRBKjWNaeJ`1h>Sg{DLOvG&d z$-<|w*=Y5}FIx)HAIJANMrUD6A^zNi@8r)?CpGlfXG3r3i{GY>F~0+N-v{tYZbQo6 KuSHc~<9`9()^B(K diff --git a/model/earth-geography/src/EarthGeographyModel.csproj b/model/earth-geography/src/EarthGeographyModel.csproj index c11e9df..36ba399 100644 --- a/model/earth-geography/src/EarthGeographyModel.csproj +++ b/model/earth-geography/src/EarthGeographyModel.csproj @@ -21,7 +21,7 @@ - + false diff --git a/model/earth-geography/src/GeographyRuntime.cs b/model/earth-geography/src/GeographyRuntime.cs index f3c7ad8..f4fba6e 100644 --- a/model/earth-geography/src/GeographyRuntime.cs +++ b/model/earth-geography/src/GeographyRuntime.cs @@ -5,7 +5,7 @@ using Avalonia; using Avalonia.Controls; using Avalonia.Layout; using Avalonia.Media; -using EarthModelStudio.ModelSdk; +using GC.ModelSdk; namespace NeoRF.EarthModels; @@ -258,7 +258,7 @@ public sealed class GeographyRuntime : IModelRuntime _disposables.Clear(); _view?.StopAnimation(); _view = null; - GC.SuppressFinalize(this); + System.GC.SuppressFinalize(this); } } diff --git a/model/earth-geography/src/GeographyView.cs b/model/earth-geography/src/GeographyView.cs index de17ade..a052c68 100644 --- a/model/earth-geography/src/GeographyView.cs +++ b/model/earth-geography/src/GeographyView.cs @@ -6,7 +6,7 @@ using Avalonia; using Avalonia.Controls; using Avalonia.Input; using Avalonia.Media; -using EarthModelStudio.ModelSdk; +using GC.ModelSdk; namespace NeoRF.EarthModels; diff --git a/model/earth-revolution/earth-revolution.json b/model/earth-revolution/earth-revolution.json index 7860517..793e828 100644 --- a/model/earth-revolution/earth-revolution.json +++ b/model/earth-revolution/earth-revolution.json @@ -24,7 +24,7 @@ "preview": "preview.png", "apiVersion": 1, "version": "1.6", - "updatedAt": "2026-11-14T02:48:20Z", + "updatedAt": "2026-11-14T04:41:38Z", "chrome": { "titleBar": "#0C1828", "titleBorder": "#1B2740", @@ -32,5 +32,5 @@ "button": "#9FB4D4", "frame": "#0A1524" }, - "build": "bbd2908c17" + "build": "7fda246d48" } diff --git a/model/earth-revolution/earth-revolution.model/EarthRevolutionModel.dll b/model/earth-revolution/earth-revolution.model/EarthRevolutionModel.dll index 3c0d4e2984ac0711473fd998ad34d8f370be230b..5bfe61b6e650e97229547ea04f0acad54167c53b 100644 GIT binary patch delta 27153 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 BAiDqn delta 26718 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 diff --git a/model/earth-revolution/src/EarthRevolutionModel.csproj b/model/earth-revolution/src/EarthRevolutionModel.csproj index ced296f..c444249 100644 --- a/model/earth-revolution/src/EarthRevolutionModel.csproj +++ b/model/earth-revolution/src/EarthRevolutionModel.csproj @@ -20,7 +20,7 @@ - + false diff --git a/model/earth-revolution/src/RevolutionModelFactory.cs b/model/earth-revolution/src/RevolutionModelFactory.cs index ea0da18..a369e8e 100644 --- a/model/earth-revolution/src/RevolutionModelFactory.cs +++ b/model/earth-revolution/src/RevolutionModelFactory.cs @@ -1,4 +1,4 @@ -using EarthModelStudio.ModelSdk; +using GC.ModelSdk; namespace NeoRF.EarthModels; diff --git a/model/earth-rotation/earth-rotation.json b/model/earth-rotation/earth-rotation.json index 57d2a7e..61d8f5c 100644 --- a/model/earth-rotation/earth-rotation.json +++ b/model/earth-rotation/earth-rotation.json @@ -24,7 +24,7 @@ "preview": "preview.png", "apiVersion": 1, "version": "1.6", - "updatedAt": "2026-11-14T02:48:20Z", + "updatedAt": "2026-11-14T04:41:38Z", "chrome": { "titleBar": "#0C1828", "titleBorder": "#1B2740", @@ -32,5 +32,5 @@ "button": "#9FB4D4", "frame": "#0A1524" }, - "build": "b54f691efe" + "build": "446633f2b9" } diff --git a/model/earth-rotation/earth-rotation.model/EarthRotationModel.dll b/model/earth-rotation/earth-rotation.model/EarthRotationModel.dll index b97c59a39cfcaa9d6cd2d7d967ad72abdf219cb2..ff390db7915b916184a2c9d9beeb2f83cb50d3ac 100644 GIT binary patch delta 27129 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 delta 26704 zcmbuo2YgiJ5;i{X+1;}xo6Vlx^uDQ^vgvfBBOR%lL=j>DLBN#+6b!J56hRS)2dRRI zU_nI1pnzBsL9bj<5&K1vh%I&$6)qy*%$yT8=)L#*|Gqz7o-@zPyz|amPhD>9c2jMG zY0dJKxQye6LH~0SQj$YN0l;7ZAZyBRZmfUoYR9@81zbgnS^@hE^&YpqL4Y0k_NfBK zsU9g;Efblxp9W#UWK<7U?-GfQeFm)r81Xn%eO6?Ok?IMN67x?CM}G$6UkOZb-HRwc z3Lw^33=>_NMoGP;kaz*I|9#BE|BbrI*kH3G&kdDizg-<*sunLc?K8a}Dw>;CyFayQ z&L5JqNu8fqBrHvjCw?SEOVhICu0kZLFL~lzi5NhtNdYiQ-e`37Ua5ZPnb@J8f2&ug z?CQXOP#vk0#mj1SYNmL(X>+PsbTEFW?n+B^cSw>V&H}KhPo+hxzolIxTGWy0KEws- zd5Ak%{)lBuM!XoVrf2xX2z6}6Suw0>c;*g)ee;{QlekLF&GLy+YI#g0kq(x^?j9>t|N6j=#XY$pGIXyy3AqgXbhs2Xuo(XEI| z@txSNjl~|s1B6YV6laS7w?^wljBAtqer!+oS8F;Cr1_7&%)j)q3Tmge7q~W9VCiKAF7rQmOS}K-p#K5( zS5I_G5*GE(PF1pvl50_K?c6zxCY1L8=IQHdu=wpw2RcV}9N=%7KI!s>0Xyqp50ASA zM>oeQdDHM%^#uiOQGf5TOuVQr>bcW#2(=5#X<|u6e|%GyE3PqIHX}FoDHd<4Z}b^1 zj;OJH{c+sSN3oDpL#3)Jj1&;L|Dd|P?=UCZk5N^#$Z}A<*mo`_GPhqk;^uz)5y$r* zgZOBF9Mh)w0ljE)TsyD`aTQ|=C`pv7zYWSlP4eJ9VrbuAUwhi8WZ7Y~!#slhpX}(XkciQ{5Fy`nw@0 z)*2imqhkG2zCj&1{x(iMqv^Zx5t67>rP6(3vU;F&PW#-@hB86sxzVp|V4wdn%9vqJ zsy_H{ne@TWQ8bP0*C**e%2Ke-Z_1K|Lk%fUK+GyH>daHIxZTx>DeHmixoT?sL5lCx z)sJWy)tCSC@=WzveDk%jUJB`b3s*umfV;o|Q*m(@0VoE46o&WW*}&#YL83l&tv4zL zRUt0ny%M##F;dO-*hdC`jQZoXm6unrlV`O$<+?ez9sldPwWgi}2p&&(-V4iEOLdX@*-m z8hvW%WIslEZSsjU6Wl8Rx??-4%h1;*`OEPToiEARni%4c)$6Cm2ChIiNs-MH{MVv` z+pL&ZO^?pEM7m8~F%wYCQ5zL=m>foj$-5n${S#27Slq@ajQCIVSBxFY=DTsKDYl8Z$yT5I-->r#P36$7 z$1*kj#?-*|l&Rfi=lT~?CW<{+qdOE+N#R)ON+{R=A5zLmw&q%_N~o9ev*tRj{)s3= z6`EzMe-cXJp_H^DN0qu|MYi-l@aM&gy4$plesXrARI?BVC_6K`9~;$*S;r>X_hlEjVb zsA(l)n!0q_z%hHULs#8|6BVnF;eI^!#3~HN@_U}e>jxa=G|-j=eAw z6Sl1Kree7Y%hgn?_urJKiF4GWH+4^*i`wblW^9r%s!TC@Z)JWPqT7_@te&T4&qx&W z)gd#+Pq-bGiVeF4Q7+o9$o?ACMEAyPHbAlfNu)ch>jO-cF#keS=+_7*dzWdE-A=qd z35zQIt8uP+e#RV8quw$zS@c%xXU2-B)W>IL#yySwIJKwZtYj~; zN#3W`oLSzkPa&H?=|$#;D5xb)=~{CQ)|?PM%1^zmW$qBgBzb8HDQ0w2@18Y2rVovp zHbZSL_%k90#~Me;dxLszR($sWHYPpFkC(l+bZ;G^{|-&Fm^DjCvy{Xb|1!;Rr*>Gb zUUhS~Kwk=8vjnHR!3F*mX!5xi-N{sFR5E0nv*qlOUJs6iWZ=En=)DU)wK;Bp`>cj1}a@AYFx2 z+tfpJ<~E)v!D6e?;A_DtFZ~(myENquRjs%xU6`*r-k%@RA5-BbRIgE2`y&EtuuzU| z(Q<55HOV1T)i3Dptw-5zF;rb3LMIp2n7yxHPU$|yQf0O1UYgEl=6Z5WRo~MlQ2i46 zX_8Y094FCXBbk9aNgVAYvQIiuDRU=;1 zRi_}o0>!F9LGB~_h#*&}!fS$j0{Q!`flC$6C5O2|2f7NXstIzs{HfX*NgFK12C&;@H?-mFuMv&sFAb)@YP6_h4C|2DWp- z^0$a@3-Z0>A9y6Fc!?Cdg8WHJpee{-C;Rare~awj2KlFCzYyefKUWnJa;ZnsDFG$O z>2@qo6%|y_{Z>^%JFlhft-8bdNNu<1>!U}I^ZFPO(u^ZNKL$a#H4J1!Wj! z^ZFPb98~ZEaVnQu zKntX*Ajo-rjAVZAZQrDPfhV?wcsXyBs{bHy4U1;Htyx&l;@T$ryt@rabnBDuGiF5I zlt-xbhqn z)Rr2zx@dt#ro_BE)RhYc#*(O*6f@px(1V6)m_zk(x*q7Pe!C!oyeT!maV#`Y>^T+%*0AQF@IZo(d8qlDPpx6Hd)t*wg?o78o6NdYptWlXngZ$(bo zw6Uyrxn9$zjWL(2IQN%(UFH^oDJ1qz`OSM>Zxi>e+nn;mpw?cB851eK6zh#6M=n=! z6R}y=OMdDVcO(v^(Q#YCWbgf$)(lKH(EnOR>p2;4*o2fo2&}$=)UD})>xGxza3nR&6&C>XRnnzSA`V`=UaT?>^UVLGJ z189vbOh7l>Jrt9n>_0i+{ct|HsHc~Pch?G02&|<Y^I3Qtzw^6NM5r^+K zcC9FKQ4cm~n;YKNq0311^ol;>3bp92?qOHajL~lGZ3euxueobTW-n}wTgHb@W}}y7 zvuutk)nyCmnW^92H5=cO;3ESmSE##YX2kih;D38&@Z8eq?m0$Iug`&vyGZdSCE>g@$Lg+-qCJQqAC1ynyT3(7{ zfE&Tp4zs%Dp58;T!a_YtyTK}XX)P-929C?Jd4m>~iDiQpm5Fr&1-;r~Qwvs=sGC;V z#Atp-ldCqb`g?!dym*4LO~;Y^?^v2z{s(dP;d`uYc!<3=MD}k-!E7+{lTwH5Fnb578`gN` zap+t(LsQ*@R!*E~YD6jT%!n zp89DnE<{03P^4_x--ON~_>5!^9+NL(x1vm^nWWfKFFhbU)~=+p%-@uBj!8;HPxX7X zQaq!MUYm+bw73Zh8*;ow;?^y;S8K&`yjO!Zn;!b1SVJ8TUu~}`n<#W7|;3@?LLtmeL9?+ zJI0C9LtI|XwqE7#Xtv-Bi7jf<#u%|x?Y1#%gx;_SC0dCnQ^LzjmAFzqu`7{Ej1qad zDoTk}@ab;{ufO!glNrWBkrZ){2x +3 zr6%xIQ>dN=?Id_Q59Lcb8q&henc^C?Z1b(+fO>TE^eDd0c^=0yr8RF#zjA!VBjY93 z3+kx*Z;I8_~-5M(z z)$6wQLEN(SPMo&s4{SsE@B`JD=M@c!WNk=5{p}6$iPUQD>~bZye3rXF$wEe#$lCJS z(=e%*9q&(47Xi$}{j)-HKVX)9k`Y93b$H?$_*f7KWK#&Wwd9L>Ju8)&oAOtFMt#&*0SO$At$_m4U5vfs{`nDhtTT zm_Z$WJvuqyGj8{eB zr&NmHiJP>)cy^%!dZv+eVqCZ!a6xfqxaQov2;Bnm$8I>5|KEQOb!(|xH?K5&GpGe<}75lJ1urEtGq4ldc zYP~0x@P!=20KA2*l;H^GD8rJpiyj%)rjtA&JSs5-o-sROT#(a=LOc{kAueDAF1QDC z$MNIQ-H=aKl{H;+N&iP0;q8Vib6hYpova})(rjY=T{!kK6etuYU`K-th1gaXI1|X# zR6t`tB9ripYj&XwD`Su0DEc!J-Amff(xi$8aoNu#%@wd>(b06VU;0C(xjrbN0qDTb@Is z+sLE-XEw<{aH-8X2_6?%QVG|&35yEHVX53$!aq_-^Mf-1`*jBPG$v8d8=JA(Lm2P{ zsKrgWshGs z7Ehw@;;6uzJTul~h$2{)ur|90zR6#U)hxp9rHyGS?P|Dr;eYtF?91X)*#mWk`(n|l z?D5Eq_!nR_vI!_7L(hrG@QW~*i7eoRDK08FAGSgr8skcc)xd-7+FvHN5FTN+KbhDf z*vafzJh57Mipw>m5?c(#e$?lLG9R%!;U8>!K84r{c#T*9jxbf>6E+@a zwjRD@_8qea;R3Vf0xI|jSOm4=Gp_J)a5Edqjd%*;nN4()=d+M2s7XsQh`j_?3WLW9 zJ7jvw`4S8f2DAn6@*HUk3}?EI*~>7J*_{&E4#FsAA!z{J#32~NjGpZcgjeAjW;2+* z24&0+GJ74aWrk1H(DMzLzzm-|B6|xaGV2mxdJHO=(gV7I@GeYYh8OL~-h&&NjbPjR zFr8T)+dhRELYD1vjN|IsMo&CqZEC!uGu+oH8F5BuFXE9-1&BR6jWu_M{LUozV+^o9 zFpkN#PF>J2fmH_9oZte_Fn-Gz$@*F7Bj96uFT^LK`yoze9F{Q<zJsFV@gPKjkBM_1C_a>P@Wb;g%^a8el!;z z$r`1w95wftCz6l3(oqPXMcss0=OFyDi11g&HEARd%k?8BCX&3tLg>j4(BZ>a!jL$^ zWX8uCe`mdkWj|vV##b2s;L47$PcCb|Osc^MElIVAkW9Fj9+ut7wE=WG z%BoWw=rGIQaOj^IFXU5N-?8-oSEHrd$npn_k&FvHOVQJh=z-q~??RmF>xFomYc=8? zpNbfnyBV=5b30;O`gTXa14TS?dtx8OZrqfx3o$g8LoUgVbi@GsDH9p(q0xP<=m6sB&}N*; zXOn5Nti{}~uKh_qV7$8af#?H90Xg=AsGneMMm%Icg6-&Mi$T01l<*1rdpMC_%lQc9 zslF44-&>loS7wIxLVZ>23B;92C$MZRPsYGq9OzxFQot{E6>*J?%&#%73i%S{^w4h* z$A|uac)k5+M6G(wb9)GtHCw3x9rbB8(!9m`+w3IULJ5Cj{{xKg2l$Z2N%XQ(PuSVD zn}b{(4$?Gmas%z>QT~R*r8%g|{anguGlmIxjMJUV*v9xGm-@zP4D&#>)sEO;bs`!< z!Vz~`2tTw0=&%Y^SJy_xQwMhJ%v(cZ(Aq8JJ=C{Y2-jivdSGd20_w|b31OY#29qZ& z67nEDOosCbT@dYgF%FVx_zt*lLfn*b6KV!!Uy0UzMa?L04j+NI%RDrIs{S~++RgXk zyh$ zFv3}GC*t+2-9i~~j)EJcKIg)`8+H7rJbVOO`nTHKJ@i+pJIqa~}DyxwD6 z-kIbAFSTT)kK|8q-y4;TJ2QM~ZA*6H?l)FrVtDxNVFJpTEsL(ft4jelXv|XU3ZRWX zp#fNCxy!W#S%6p`Ql;pwFbP%?MHXAM8rl6i>lN!Y7+{CahO672$O=52?KPO-l&)*Z zJ|;}?i_RwHdkuK<^8o%?X1O{4n2^D#v#%7d!3+sHJEt5IX7K6kX)I@f?mBw~%UNKk z&I-a^k`=DeS+792z_(sE>hzSui(fy?(b+<>7H`07aKP6(eHw#0;H=Jehj|TQV8RPm zYW+)L$3z&=gA`)E#O{(4Qgqfi(Pwr-k+cS)HYKs!MXgFrAG{ z#qG=m<8;>vN_WW(*XgVuv&lMpBaCbpbyl2kPIiMcRZAv0oY-~D>L4t<)!>G&b=w?s zLs&Q@`Qfn4NLZuO3Zzl+8ngQ7<(W^0MZ*EQ+l4yIN%hC4;&Nyj z#z1@#2ZJGrO<^&xL}%TLedaj0PiHr)opxu5Vs+x~tUz5X-jRX@@69n1%w={fvvtrr zaSGa=Vpb3Lh3yYZhp%)d@Om>7EM2JFA;@>`mb@@cXBWbDOIfgj*_YyoTZU|SjaeNm zi$55a4fA_Yxnh2tcE!5b!%u;75%)=L`WILTc)p;FE!q;HL?#?zjE8wYN8hh0@*EtQA;43Y% zO;7zSYzBNiT4Pt|*E(;8vtu+iI(L<`3cUDSmeP(d4s3Pa27`6lGx=fXe5lpgL;24* z7r-HAb?~0|1?M7gUaf_BA!C;vzY@{eGie8%weTIYdiYvC?5qRhHCh!{=Dz8?10L7e z(Zb`-#SmSp*^WDY3^?zGwPjk+=EC#NRZvo{u~Eu-=W2MI8Eu%Ltbwm5kWHH(_d>tx z+0(M2=$w2n4At4AMNYUE#_DV)E;z$sc+y~K>8XLx}=M;^3(^Ap)n$Ef?*~)szovPWc#MCx{ z^G1ywmlKuE0a!U*qXigdGr%m3MWuB{Hcn@+Ij&Idhck0En+x~m`{CVNHCBqZ+gsr5 zJdO4CoOf=4wevOhNos#(D_CyVSb6L*@c_)x+0bGc8erB^oxY#uGdIAqI(sa2h|&mc zIy2&H)Ca*?qlL*ymSG#*qO&P!S1H@z(FK|f(ymb+g69`%Y$ZP5dK3mPBE}n#`qndX z2?xV=z{mI?kEZH-hDpj!$f?!XBgRRp`Pr6$**#6!15558?U%w=kNA;aR}j zO#GvrN1p`?vvoi-_F0&vvt0Q$WgjfiS$^lrfGmCPs@)B&<*VfpUe`U7UFYQ2;T@f2xt#Die5^C4?|tP6 ze6F)N-$`WOYmB4d8}4OV^}odhT+$n0(J91#tGoe<&R)!ONpC`o&JO2&tGo#*Iy;y9 zi}Ds^>rC>UMOLh{K$LJDg+9#IL50JF>@2f-cq`4}dIy^Cr0VP8ov5^c>peKLg0q2t zDBWEDg8aLgai$-`0A}mpoZQ>>G0b76onJnILz<^$w)33)2^?WohvlwxeFC3pg$Eme_5TJ% zXH@-ph}GGCyjuJNQgrrDyjuJNatwhK_Kvuw0ofSx*An%iCa69(vPeXh^^CyZDJ zRR1zdtFOCs5ytDrAALUaMYvvPahd1v`hBX-vNQ2Lgz)R^3+xLaZqwN>*cU?7>P%oc zNi5fy1ItOGUT0gCbFx8fM27V*v+PuyU=R=LM!GmRipO+D7w1N?M`PTHCee4j)=xKP zcb80Jh|cC``^+XWMrQ>j-6dI+>#T2y&n$~doxNLxm;Yi0u>e;8NfBQEi#fXSs={-! zMJ&+Sq(Ub?fm^CGI&E6TJv#e1=Y5w|Y|t2|W)olPwm~=)Ht~bb#^F%d#P2$5EIucP zh>Oeu%Pc#Joe&}{8?-k4;yx$ag;QsLxSe1ZF*>V?ZgqtUkIt4xe}gPrXQ?=69HK~P zB{*loL=TN|YECgyw|$>@kIN~p)>y!DK5?B(5fgReEDYlkH|p$m4C5BJ=uE*KB3#VV zSuE}l;i67wgD|xSu|j9#FtrGAug19gNU=$`)w<5OBE^F`3*6;8hjgb-2e~D8lxWh~ zShpG3^Ez9dbif`h4(V)TlG7b6-q6|Ijsx}>@t)4sI-KqpaYAQNVF&E7;!B++g*n}^ z;zym;1kw-K{gw9h37brSfsOa z1)Z?qGM$ZzC$>swbjI_DBh2UoR3>{w&-*DEI{$Tdr;6q+#Oh&Z_$YU_ING4Gb(vEG z?jrGcqeg%9`rVzy%m+1gt@k!}H{pClV`IY?yL*Xo%+`TOtalF*M|E3^d!u`pSn{am z*&N&89x0lcEyHu_Bks|{@;KR+!Mk}cxUUtD>dX}Of;%ul4BAD;b#N;3pnIaIWL6J1 z#lPmBBl(#kgkB~~STxUb#{|K2X-qp+5i{5fi7imvuQFf-Ea?cjip47^b=j~#* z#`wIsP`toQ8?=Q1@e0$$&<)PI7mANM7z3hJw}ly8;Q{ey2V1SMJVjM3hOdMxyjJ8f z(}LEC&bsZqz;NW}mcJe5SLZ7N4|4oMl!IS0~4W zFBP+QQ-xX;%fx(Uiy>8#VVPKYnQg6ZdmkTpEE8W`X8TFEb(K=WmxIyvPn;BOLf6!1fm2D{!B!5`QD2cr z`ZZwy2AGM6Pt|17Jc20T+vvZ>c{-h}S_I9ip_@J3(M~5m!s*IHGvsrXgc3g9qj3LO zHo!a=SuZ4z=W&jpp{CbLk<|dp^YB{+eC$Y{C9L$(hXmwfhL7=6Mttptq zM%acGo1it0T%X0l?MeLSaR1vX!@y*!>;hJ7fxO&cw77h#aaw?@q`cY#QKkmY)ClBc zf-G!DyY)XO(cY$`+$OC_!8q+@sYly;uDyqF{$m!L1dV08t5!`=k6*KMhgV=%OK^%i zyv9Lt&{M#pY~8?C&3_g*ESHCshFJU4UJLem0IM%Vvk{hcrnXY&%h>r&ry0WYolXl} zj~&=vARULp0Bv5 z8g}eCtzT){8n|}_Wa7NR$I{rB26)j#o%J;$>1i3?h~pq21FaHIcCC~VRt8XI;sW?> zi-~$P*+Q<=L+t}`8mIaH+@R1pUZ!daxp|>DBiqXs^WcVX#pkgTaUx;A8lgMa`#>Jf zEdeweB%T@gs);LGggt~=bKw`bF9{{+$CLNYB$E9Y2;YpAkWBtsSqWxful%=k+ta$# zy#H@|YsX@L5B_;Y&=~Rk4$Z0&VNNH#2?}~1z|)8Xt9jaPK_4Roe#MsoCTPMX zC&OYl?SmtDWsUC;lq$oy%Cq4DuOqE8(hGdC6s%tJ9E}l7_)3YaujBfXfYu{!BIs%4 z)J?ph;FU)JcN8OGxzcD~c78Og!o#1l)f79HJn}UQd-6X7XW2S^< zZ;7RU_vjH>!bbk;k+4Pu-x^uq=Un{#n-$E364+oOW+$M%@Ly#cr?rtg@RnF=jdn&2 zo?UTG^KMZtQT2}*xW(8od~?cu@Ck42v=d()W0evk|RhL^y<+ zE5+Mbfedep2^qamo|)WB>_F>ulwUQ?M*In}PHK?niTT)oF~WoXcZj#qXRT;8Y)^kc z95&o#+7%G{VYB&Z(M>3w_KPyZq>`7=EaR_N8E2_Hb#Wd2iXgEssJH(Cw!YOD>6=`wUP($nw0#+Rc$kc4q<@z)q=ax#T`F_Xr- zE$v$=joXn1m6?hm7wQU95o-&*h8Cc*t%lz+yBIc#o1(5T)QjKZx=Z!q#k}s)MjVI= z!wONOOf!^#y5~(-pe7SX8ULY=)u=wD3}U~ORKzav`9{T%nmZGAh&tBnO8mvp6C1tO zh-h4D7yvbcu_K1_IQQfvdcsqNIt==6(*fgQ!~G?@L{AuKT4)%@#fJ0ryAEY4^<%+t z<8bbW;b2nlc`GWAi*tRn@kIXb#xm^U3&!1;VyJ1im{^cxns5Bbm4WiUm|R5alil1W zE5r(=*t9|%EgWc~9xgWxz~R5$v;%+3Z~&We6f>C&e@1!@li{1lRP2a{Ty>_&m_wx? z|Hsg?H8<55V=x8so<(B!$i_5oQW~clV>nk*EH{cLut)2Rk0cD0>x@+~-Ela#J7_pB z6pfWvV7g^;1*W^gP;VS>nkdiY3g$4LM!Ze_2(1D>61n)Us{}P`jSCQESirR`z^M>W z3`=+}EaAC;8RdN|pT=Tki1RI{5zodufn>sK)6dC;;v=8MypjV6-fa}=JU*mTBzm;p zXx#6}z<2W0-#d&D?=$Z(9?tWbyRqkPOxg+Eq$N2;=KaPY$=w3xwVX>gsikO;`LJ>cJkJOTD_0|I+^Jv`5Sum{XJCDI-a_dNH<9xx?- zY4mXJ9_dGXFuB9%D)`i##hNT>1wQc1k{-hrXG!a#e29PMeThD4*zWnp(b*ZMEa?@T zJs#<9&-Z5hSF5l|F%tEV$5fN)Gsgs^8s8an7L!6#PRx0hj~I3s1Ig#jg{Es9lI5`8 znKlgC4Lzv?Z_cq;x=Bwa4`TlnhC}SLA3~z3|BUz;cqKPuB{%N~H*Y@}qI+A8aKm;O zf5Jh*TD%2gEm;!H_84hkTn6U2Blove_J=(MZt_8~b1_jYewTbZmeOjmDv!KCpa8C$vM-Y-xRb zo8=6LZZou+|FpCjx?29Ue9oB;(Nd9Sme{PLQC?waHEc^%P&VVIhpmRyiD@W5YVw)e zFoFzi5S4)Q0~W?-TmRri_y;e-7(+o=v3%HgPeE@>8V_rsR1+SUYAuxR4xec)lcwP8 zRiv9^olqe)7SFdf8fjb`jWj@QhM_op6zOp8y;en0nD^tDQ6fQE%$yE0*g`j}=DPHkuxfinTSG zdS_&N3EdjfW_rT)tvp%KDVa1fe9R+l6c0Kh zr8d({OR-!hedB&DWC2wJ)L&N;F+8} z*sjPIiU!+H!;biR`#I^~UYB%EdLehcy-~dD-mbp=UhjZEZI`{xKu;ZUCg26YeCh3s z0~pYcp$_r�se(syjY~qz=a5*uhH#ogx)EHTN<6_3oJh!pD*c>x_f#7QDpm6KcWV zmJAG)U^8LtQZ6*az_;#7vlh6=Xs+JRO;h&tFeP(9D$A)X_h-33%Zo`4L@d_HPFN7Rjm_IwbCBhOET3Ze z6w3yQLrWZ*gR+lX1S4Z8{4q5V`~)cA`s09MQ?`WND+N^0J=wdkPJe+8zx7#M3Yl1 zBgBwvGNUJk^l6BvBKokVFKZ^TT)}cJ%XKU_u-wRUGs`V3pJcg}Wr*eZFJdWlG7@YP z%Y9hx%km_aD_EW!yBU^6PL8FeRm=K1);F-+i2B))%`Bf}gg9<%9K|=rQCVXgl}%>7 zhxCE4K1?Pt*0Jjn#7`m`SkuUwW|mJfLOk~hV_JL@Cf$eS0r50@Cb3-0*vxp65fZo* zV;{yzjDcD{EJ>ik4J>bGxtZldET3fgbCw~I12OhtoWxkm*uc0wk)kyx(rjpE%^}vD zWX(y|KoVIYki_AbB(vOyaX=EchULjDH?Z8yc#;v4xh!KJ#z~B|j17#mYW$5c_@jKEPu{2q);GZ3h9$sPGflh<0RHhX1SK-2F7N_lZ=qc zsWA3QRRb8VmPrF+b1HWl%ZE~Fwx49pN!EPM8c5?1jC~j1~xNN>T1iq-0!C+Bt#wGFb}W~;aDwY_bVL()U0hAa+w zIOOG!w?p0w`5`3Mo@?)HA88+Fzs^40UTa@wzstVa{MB<+ z#HOPDh@)Z$BPN-LBfgSNa#cRz1%>c1%l*Qs)GrRwqB%janYY|iL?t_S1l3qjH;2=y5BV3;TT6hnDkSyw`jvcr#?M>8t>!EH82_yVAm+(TtJBZ`r z39);dUO3fP1RjCj_|W@NLs;Uo4LD1U~CFOeZI3(4pB6}ALlf*<9t5GDLxbT-Ouh!TDR zT8;9zh!T7Ub5Z^tQGy@fHk5xvl;9_Pu#fKt5heH;?}Y^Xf+*qVlnYV*6;XoU@MQ?T zYekgcEWQE|__bplk$>ZDlYsMx_$nKgqWmYK1Q+oKwDj%9ohS>j0%Zvi-};EVQ8pst zTOV-`$}%Fp?-8p}wj$!|9#M~S2qL~I5-Q4}h!Qx&eJF<^O5hah>Dvnh4-)>Ub|V_X z5haKan^BHLlpsoMK{*;xf*Aaq9DhcKDB+8hMwAl}@!!Z3+fYtIlpt9=gt7-wf)w!x z%BhGFq=_9Urz1*`A@KLakclXD1+UnJs$B6TqEGBb%o9zB`QjPG0=F*TW{M9wwr7#Y){$Vw}pfZ3@Hma9%8l|Yw3*+y=7|u za~-~(!WYn&{-lTYa1puOYahNU!?lCutR&!{ywG3q)$m_*fzY}5YU{57ug&?pZWh0! z>{xM^(AD@F@2_PYF@M*k;TJ4__1mYAF7@(&%kZ_iO;yD$#hul@--I{)(zevnwCLw{cYL7{J}7sz5mWB?e!ZucxJ{g1zp8%=M@0X4ah6Z zE66L(=`^L_hLX-V6i+R#oZPKzK|#gT!Y*Apbt$au(zT#lMVHFSm0hQFD=O&*IKjci z%}nNYChHAt8!YlfkEd7k?S49MX%87f>Rf+TVFO@bh46$r|bIl!$pO7e*L-OA{9TuO&B2#h~o7h zjSwI7zY^T&GYYD3H=B&RRVB=Uk+@yX!mW}13`DsKb<-djcWm;Rf{vkm2R);#leGWypYOWtRYr*)MSX$!{{XA&*?Ir~ diff --git a/model/earth-rotation/src/EarthRotationModel.csproj b/model/earth-rotation/src/EarthRotationModel.csproj index 5a9d098..20e843b 100644 --- a/model/earth-rotation/src/EarthRotationModel.csproj +++ b/model/earth-rotation/src/EarthRotationModel.csproj @@ -20,7 +20,7 @@ - + false diff --git a/model/earth-rotation/src/RotationModelFactory.cs b/model/earth-rotation/src/RotationModelFactory.cs index 764eab5..7b4cdc2 100644 --- a/model/earth-rotation/src/RotationModelFactory.cs +++ b/model/earth-rotation/src/RotationModelFactory.cs @@ -1,4 +1,4 @@ -using EarthModelStudio.ModelSdk; +using GC.ModelSdk; namespace NeoRF.EarthModels; diff --git a/model/scale-calculator/scale-calculator.json b/model/scale-calculator/scale-calculator.json index 3cf8f5e..ef205b4 100644 --- a/model/scale-calculator/scale-calculator.json +++ b/model/scale-calculator/scale-calculator.json @@ -25,7 +25,7 @@ "preview": "preview.png", "apiVersion": 1, "version": "1.5", - "updatedAt": "2026-11-14T02:48:20Z", + "updatedAt": "2026-11-14T04:41:38Z", "chrome": { "titleBar": "#FFFFFF", "titleBorder": "#E3E8F3", @@ -33,5 +33,5 @@ "button": "#5B6A86", "frame": "#F4F6FB" }, - "build": "f95a08e72a" + "build": "f7913ac484" } diff --git a/model/scale-calculator/scale-calculator.model/ScaleCalculatorModel.dll b/model/scale-calculator/scale-calculator.model/ScaleCalculatorModel.dll index a8d2f6cabfd1f8857d2d29a7d43af7c27f2309b8..3763f616f0306c68e88863b2d95ab89d458676f6 100644 GIT binary patch delta 6431 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 delta 6489 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 diff --git a/model/scale-calculator/scale-calculator.model/preview.png b/model/scale-calculator/scale-calculator.model/preview.png index 0a760e2a17e561d4bf6bfc1d28e86c03efd98ffe..ace9b69e3441d894985716a10187f2ec214df3e3 100644 GIT binary patch delta 40922 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 E0Of&5mH+?% delta 43231 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 - + false diff --git a/model/scale-calculator/src/ScaleCalculatorRuntime.cs b/model/scale-calculator/src/ScaleCalculatorRuntime.cs index e494d50..8a1f2ca 100644 --- a/model/scale-calculator/src/ScaleCalculatorRuntime.cs +++ b/model/scale-calculator/src/ScaleCalculatorRuntime.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.IO; using System.Text.Json; using Avalonia.Controls; -using EarthModelStudio.ModelSdk; +using GC.ModelSdk; namespace NeoRF.ScaleCalculator; @@ -43,7 +43,7 @@ public sealed class ScaleCalculatorRuntime : IModelRuntime { _data = null; _texts = null; - GC.SuppressFinalize(this); + System.GC.SuppressFinalize(this); } private static Dictionary LoadTexts(string dataDir, string language) diff --git a/model/scale-calculator/src/ScaleCalculatorView.cs b/model/scale-calculator/src/ScaleCalculatorView.cs index e9d115b..17b12e1 100644 --- a/model/scale-calculator/src/ScaleCalculatorView.cs +++ b/model/scale-calculator/src/ScaleCalculatorView.cs @@ -17,7 +17,7 @@ namespace NeoRF.ScaleCalculator; /// public sealed partial class ScaleCalculatorView : UserControl { - // 调色(与 src/main/dotnet/EarthModelStudio/Styles/AppTheme.axaml 一致) + // 调色(与 GC-BOOT/Styles/AppTheme.axaml 一致) internal static readonly Color CAppBg = Color.Parse("#F4F6FB"); internal static readonly Color CSurface = Color.Parse("#FFFFFF"); internal static readonly Color CSurfaceAlt = Color.Parse("#F7F9FE"); diff --git a/model/version.json b/model/version.json index 28b4018..81ff54a 100644 --- a/model/version.json +++ b/model/version.json @@ -1,12 +1,12 @@ { "schema": 1, - "generated": "2026-11-14T02:48:20Z", + "generated": "2026-11-14T04:41:38Z", "repository": "https://gitcode.com/2509_92447106/GC", "branch": "main", "modelDir": "model", "launcher": { "version": "1.0.7", - "revision": "79af318215", + "revision": "", "packages": { "win-x64": { "path": "dist/GC-win-x64.zip", @@ -34,31 +34,31 @@ { "id": "contour-map", "version": "1.0", - "build": "4d5485eed8", + "build": "e4299c5c99", "dir": "model/contour-map" }, { "id": "earth-geography", "version": "1.8", - "build": "ede9f2fdd0", + "build": "64b985e484", "dir": "model/earth-geography" }, { "id": "earth-revolution", "version": "1.6", - "build": "bbd2908c17", + "build": "7fda246d48", "dir": "model/earth-revolution" }, { "id": "earth-rotation", "version": "1.6", - "build": "b54f691efe", + "build": "446633f2b9", "dir": "model/earth-rotation" }, { "id": "scale-calculator", "version": "1.5", - "build": "f95a08e72a", + "build": "f7913ac484", "dir": "model/scale-calculator" } ] diff --git a/version.json b/version.json index 28b4018..81ff54a 100644 --- a/version.json +++ b/version.json @@ -1,12 +1,12 @@ { "schema": 1, - "generated": "2026-11-14T02:48:20Z", + "generated": "2026-11-14T04:41:38Z", "repository": "https://gitcode.com/2509_92447106/GC", "branch": "main", "modelDir": "model", "launcher": { "version": "1.0.7", - "revision": "79af318215", + "revision": "", "packages": { "win-x64": { "path": "dist/GC-win-x64.zip", @@ -34,31 +34,31 @@ { "id": "contour-map", "version": "1.0", - "build": "4d5485eed8", + "build": "e4299c5c99", "dir": "model/contour-map" }, { "id": "earth-geography", "version": "1.8", - "build": "ede9f2fdd0", + "build": "64b985e484", "dir": "model/earth-geography" }, { "id": "earth-revolution", "version": "1.6", - "build": "bbd2908c17", + "build": "7fda246d48", "dir": "model/earth-revolution" }, { "id": "earth-rotation", "version": "1.6", - "build": "b54f691efe", + "build": "446633f2b9", "dir": "model/earth-rotation" }, { "id": "scale-calculator", "version": "1.5", - "build": "f95a08e72a", + "build": "f7913ac484", "dir": "model/scale-calculator" } ]