diff --git a/.GC/cache/sources/gitcode-official/model/README.md b/.GC/cache/sources/gitcode-official/model/README.md new file mode 100644 index 0000000..270980c --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/README.md @@ -0,0 +1,156 @@ +# 模型库(model/) + +这个目录是**模型**,包含模型自己的**源码 + 数据 + 功能程序集 + 封面 + 语言包**。 +`src/`(启动器)只做四件事:扫描模型、下载模型、开窗口加载模型、检查更新。**启动器没有任何渲染逻辑,发布包也不内置模型**。 + +> 模型相关的一切都在 `model/` 里:共享引擎源码 `model/_engine/`、契约源码 `model/_sdk/`、 +> 每个模型自己的源码 `model//src/`,编译产物与数据 `model//.model/`。 +> 仓库根目录只有 `src/`(启动器)和 `model/`,没有任何旁路目录。 + +- 发布态模型库在 **`<可执行文件>/.GC/model/`**;开发态直接用仓库根 `model/` +- 优先级:`EMS_MODELS` 环境变量 → 开发态仓库根 `model/` → 发布态 `.GC/model/` +- 一个模型 = 一个文件夹,文件夹名即模型 id;`_sdk/`、`_engine/` 是下划线开头的共享目录,不会被当成模型 +- 模型可以单独打包、单独分发,也可以放进 git 仓库当模型源 + +## 目录结构 + +``` +model/ + version.json # 版本清单(与仓库根 version.json 相同,自动生成) + _sdk/EarthModelStudio.ModelSdk/ # 模型契约(启动器与模型唯一的共享代码) + _engine/ # 共享引擎源码 + src/ # CelestialView / PlanetTexture / EarthModelView / SphereRaster… + PreviewGen/ # 用模型渲染器生成封面的小工具 + VersionStamp/ # 按内容指纹自动打版本、生成 version.json + <模型 id>/ + <模型 id>.json # 清单:名称、i18n、版本、程序集入口、封面 + src/ # 模型自己的源码(csproj + IModelFactory 实现) + <模型 id>.model/ # 模型包(可分发的部分) + EarthRotationModel.dll # 功能程序集(实现 IModelFactory) + scene.json # 场景数据(内容由模型定义) + land.json # 贴图/轮廓数据(可选) + preview.png # 封面图(启动器只显示,不渲染) + i18n/zh-CN.json # 界面文案(模型自己读) + i18n/en.json +``` + +## 版本是自动改的 + +`./build.sh models`(或 `./build.sh stamp`)会调用 `model/_engine/VersionStamp`: + +1. 对每个模型,把 `.json`(去掉 `version` / `updatedAt`)与 `.model/` 下所有文件 + 按路径排序做 SHA-256 指纹,得到版本号 `1.0-<10位指纹>`; +2. 把这个版本写回 `.json` 的 `version` 与 `updatedAt`; +3. 生成仓库根 `version.json` 和 `model/version.json`(内容相同),里面记录 + 启动器版本、各平台更新包地址、每个模型的 id / 版本 / 仓库目录。 + +**所以只要改了模型文件,版本号就自动变**,不需要手工维护;内容没变时重复构建版本号保持不变。 +客户端启动时读 `version.json`,和 `.GC/settings.json` 里记录的版本一比对就知道要不要下载。 + +> 改了 `scene.json` 或引擎源码后,跑 `./build.sh models`,再把 `version.json` 和 `model/` +> 推送到 gitcode;客户端下次启动会下载新模型并**本次启动立即生效**。 +> 启动器自身更新包由 `./build.sh publish` 生成(`dist/GC-.zip`),下载后**下次启动才应用**。 + +## `.json`(模型清单,启动器只读它) + +```json +{ + "id": "earth-rotation", + "name": "Earth Rotation", + "nameI18n": { "zh-CN": "地球自转", "en": "Earth Rotation" }, + "description": "……", + "descriptionI18n": { "zh-CN": "……", "en": "……" }, + "version": "1.0-3f9a2c1b7d", + "updatedAt": "2026-11-07T08:00:00Z", + "author": "NeoRF", + "tags": ["astronomy", "geography"], + "assembly": "EarthRotationModel.dll", + "type": "NeoRF.EarthModels.RotationModelFactory", + "preview": "preview.png", + "apiVersion": 1 +} +``` + +| 字段 | 作用 | +| --- | --- | +| `version` | **自动生成**,模型包内容指纹;客户端靠它判断是否需要更新 | +| `assembly` | 功能程序集文件名,相对 `.model`;留空按 `.dll` 找 | +| `type` | 实现 `IModelFactory` 的完整类型名;留空则自动找第一个实现 | +| `preview` | 封面图,默认 `preview.png` | +| `apiVersion` | 模型契约版本,目前为 1 | + +## 模型契约(model/_sdk) + +模型只依赖一个极小的契约程序集 `EarthModelStudio.ModelSdk`(源码在 `model/_sdk/`): + +```csharp +public interface IModelFactory +{ + int ApiVersion { get; } + IModelRuntime Create(); +} + +public interface IModelRuntime : IDisposable +{ + void Prepare(IModelContext context); // 后台线程:读数据、算纹理,可汇报进度 + Control CreateView(IModelContext context); // UI 线程:构建界面 +} + +public interface IModelContext +{ + string ModelId { get; } + string ModelDirectory { get; } + string DataDirectory { get; } + string Language { get; } + int MemoryBudgetMb { get; } + void RequestClose(); + void ReportProgress(double value, string? message = null); + void Log(string message); +} +``` + +模型 `CreateView` 返回的控件会铺满窗口客户区 —— **工具栏、动画、文字、交互全由模型自己实现**。 +启动器只提供窗口、语言、内存预算和关闭能力。 + +## `scene.json` / `land.json` + +这两个文件的内容完全由模型自己定义(启动器不解析)。地球模型用的是: + +- `scene.json`:`defaultView`、`views`、行星参数、颜色、轨道、`lessons` 教学要点 + - `orbit.seasonLayout`:`springTopSummerLeft` = **上春分、左夏至**(下秋分、右冬至),季节角度与直射纬度读数不变 + - `planet.axialTiltDeg` / `planet.tropicDeg`:教材值 **23.5°**(极圈自动算 90 − 23.5 = 66.5°) + - `orbit.seasons[].declinationDeg`:二分二至的太阳直射纬度(0 / +23.5 / 0 / −23.5), + 定格时读数直接取这个值,不用近似公式 + - `orbit.seasons[].teachingI18n`:该节气的课堂现象说明(中英双语,写在模型数据里) + - `orbit.seasons[].date`:教材日期(3/21、6/22、9/23、12/22),定格时 HUD 与课堂卡都用它 +- `land.json`:大陆轮廓,`{ "polygons": [ { "name": "...", "points": [[lon,lat], ...] } ] }` + +## 语言包 + +`.model/i18n/.json` 是扁平的 `键: 文案` 映射,模型自己读取。 +地球模型用到的键:`title`、`view.rotation`、`play`、`pause`、`speed`、`reset`、`labels`、`orbit`、`grid`、`tilt`、 +`lessons`、`seasons`、`close`、`sun`、`earth`、`north`、`south`、`subsolar`、`spinInfo`、`orbitInfo`、 +`declinationInfo`、`dateInfo`、`season.*`。 + +## 封面 + +封面是 `preview.png`,由 `model/_engine/PreviewGen` 用**模型自己的渲染器**生成: + +```bash +./build.sh models # 编译模型 dll + 生成所有模型封面 + 自动打版本 +``` + +## 做一个新模型 + +1. 在 `model//src/` 里新建类库项目(可引用 `model/_engine/src` 的共享代码,也可完全自己写) +2. 写一个 `IModelFactory` 实现:`Prepare` 里读数据算纹理并 `ReportProgress`,`CreateView` 里返回控件 +3. 在 `model//` 放清单和 `.model/` 数据目录,用 `assembly` / `type` 指向你的 dll +4. `./build.sh models` 会自动编译每个模型、把 dll 复制进对应 `.model/`、生成封面、打版本并写进 `version.json` +5. 推送仓库,客户端下次启动自动下载 —— 不用改启动器、不用重新发布程序 + +## 作为模型源分发 + +- **自动更新(推荐)**:把 `version.json` 和 `model/` 推到 gitcode 仓库,启动器开机自检并下载到 `.GC/model/` +- **离线源**:把整个仓库目录(含 `version.json` + `model/`)拷到 U 盘 / 共享盘, + 在 `.GC/settings.json` 填 `updateLocalRoot` 指向它 +- **手动导入**:在「下载」页粘贴任意 git 仓库 / zip / 本地目录,读取其中的 `model/` 文件夹 diff --git a/.GC/cache/sources/gitcode-official/model/_engine/PreviewGen/PreviewGen.csproj b/.GC/cache/sources/gitcode-official/model/_engine/PreviewGen/PreviewGen.csproj new file mode 100644 index 0000000..f8477ab --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_engine/PreviewGen/PreviewGen.csproj @@ -0,0 +1,27 @@ + + + + Exe + net8.0 + enable + disable + NeoRF.EarthModels + EarthModelPreview + true + + + + + + + + + + + + + + + + + diff --git a/.GC/cache/sources/gitcode-official/model/_engine/PreviewGen/Program.cs b/.GC/cache/sources/gitcode-official/model/_engine/PreviewGen/Program.cs new file mode 100644 index 0000000..7c7d80b --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_engine/PreviewGen/Program.cs @@ -0,0 +1,113 @@ +using System; +using System.IO; +using System.Linq; +using Avalonia; +using Avalonia.Controls; +using Avalonia.Headless; +using Avalonia.Media.Imaging; +using NeoRF.EarthModels; + +namespace NeoRF.EarthModels.Preview; + +/// +/// 封面生成工具:用模型自己的渲染器给每个模型画一张封面 preview.png。 +/// 封面在模型包里,启动器只负责显示 —— 所以公转模型的封面一定就是公转场景。 +/// 用法:dotnet run --project model-src/tools/PreviewGen -- <仓库根> +/// +internal static class Program +{ + private const int Width = 768; + private const int Height = 316; + + [STAThread] + public static int Main(string[] args) + { + var root = args.Length > 0 ? args[0] : Directory.GetCurrentDirectory(); + var modelRoot = Path.Combine(root, "model"); + if (!Directory.Exists(modelRoot)) + { + Console.Error.WriteLine($"找不到模型库: {modelRoot}"); + return 1; + } + + var bench = args.Contains("--bench"); + + AppBuilder.Configure() + .UseSkia() + .UseHeadless(new AvaloniaHeadlessPlatformOptions { UseHeadlessDrawing = false }) + .SetupWithoutStarting(); + + foreach (var modelDir in Directory.GetDirectories(modelRoot)) + { + var id = Path.GetFileName(modelDir); + if (id.StartsWith(".")) continue; + var dataDir = Path.Combine(modelDir, id + ".model"); + var sceneFile = Path.Combine(dataDir, "scene.json"); + if (!File.Exists(sceneFile)) continue; + + var runtime = SceneRuntime.Load(dataDir, 2048); + var texts = ModelStrings.Load(dataDir, "zh-CN"); + var revolution = string.Equals(runtime.Scene.DefaultView, "revolution", StringComparison.OrdinalIgnoreCase); + + var view = new CelestialView + { + Scene = runtime, + Texts = texts, + View = revolution ? SceneView.Revolution : SceneView.Rotation, + IsPlaying = false, + ShowHud = false, + ShowLabels = false, + ShowOrbit = true, + ShowGraticule = true, + Width = Width, + Height = Height + }; + view.Measure(new Size(Width, Height)); + view.Arrange(new Rect(0, 0, Width, Height)); + view.JumpToOrbit(revolution ? 45 : 0); + view.JumpToSpin(20); + + if (bench) + { + // 真实窗口尺寸下的帧耗时 + view.Width = 1240; + view.Height = 820; + view.Measure(new Size(1240, 820)); + view.Arrange(new Rect(0, 0, 1240, 820)); + // 模拟播放态(运动时降分辨率),分别测静止高清帧与运动帧 + var animField = typeof(NeoRF.EarthModels.CelestialView) + .GetField("_animating", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Instance); + var sw = System.Diagnostics.Stopwatch.StartNew(); + for (var frame = 0; frame < 20; frame++) + { + view.JumpToSpin(20 + frame * 3); + using var tmp = new RenderTargetBitmap(new PixelSize(1240, 820), new Vector(96, 96)); + tmp.Render(view); + } + sw.Stop(); + var still = sw.Elapsed.TotalMilliseconds / 20; + animField?.SetValue(view, true); + sw.Restart(); + for (var frame = 0; frame < 20; frame++) + { + view.JumpToSpin(20 + frame * 3); + using var tmp = new RenderTargetBitmap(new PixelSize(1240, 820), new Vector(96, 96)); + tmp.Render(view); + } + sw.Stop(); + Console.WriteLine($"{id}: 静止 {still:0.0} ms/frame · 播放 {sw.Elapsed.TotalMilliseconds / 20:0.0} ms/frame"); + continue; + } + + var outFile = Path.Combine(dataDir, "preview.png"); + using (var bitmap = new RenderTargetBitmap(new PixelSize(Width, Height), new Vector(96, 96))) + { + bitmap.Render(view); + bitmap.Save(outFile); + } + Console.WriteLine($"preview -> {outFile}"); + } + + return 0; + } +} diff --git a/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/Program.cs b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/Program.cs new file mode 100644 index 0000000..18acc66 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/Program.cs @@ -0,0 +1,164 @@ +using System.Security.Cryptography; +using System.Text; +using System.Text.Encodings.Web; +using System.Text.Json; +using System.Text.Json.Nodes; + +// VersionStamp:构建时自动给模型打版本。 +// 用法:dotnet run --project model/_engine/VersionStamp -- <仓库根> <启动器版本> +// 输出:更新 model//.json 的 version / updatedAt,并生成 +// 仓库根 version.json 与 model/version.json(内容相同,便于两种源地址读取)。 + +// 仓库地址(编译产物的 Release 也发在这里):与启动器默认 updateRepository 保持一致。 +const string Repository = "https://gitcode.com/2509_92447106/GC"; + +var root = args.Length > 0 ? Path.GetFullPath(args[0]) : Directory.GetCurrentDirectory(); +var launcherVersion = args.Length > 1 && !string.IsNullOrWhiteSpace(args[1]) ? args[1] : "1.0.0"; +var modelRoot = Path.Combine(root, "model"); + +if (!Directory.Exists(modelRoot)) +{ + Console.Error.WriteLine($"找不到模型库: {modelRoot}"); + return 1; +} + +var relaxed = new JsonSerializerOptions +{ + WriteIndented = true, + Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping +}; + +static string Rel(string baseDir, string file) => + Path.GetRelativePath(baseDir, file).Replace('\\', '/'); + +static bool Distributable(string file) +{ + var name = Path.GetFileName(file); + if (name.StartsWith('.')) return false; + if (name.EndsWith(".user", StringComparison.OrdinalIgnoreCase)) return false; + var rel = file.Replace('\\', '/'); + return !rel.Contains("/bin/", StringComparison.OrdinalIgnoreCase) && + !rel.Contains("/obj/", StringComparison.OrdinalIgnoreCase) && + !rel.EndsWith(".installing", StringComparison.OrdinalIgnoreCase); +} + +static string Fingerprint(IEnumerable chunks) +{ + using var hash = IncrementalHash.CreateHash(HashAlgorithmName.SHA256); + foreach (var chunk in chunks) hash.AppendData(chunk); + return Convert.ToHexString(hash.GetHashAndReset()).ToLowerInvariant(); +} + +Console.WriteLine("==> 自动计算模型版本(按模型包内容指纹)"); +var models = new List>(); + +foreach (var dir in Directory.GetDirectories(modelRoot) + .OrderBy(p => Path.GetFileName(p), StringComparer.Ordinal)) +{ + var id = Path.GetFileName(dir); + if (id.StartsWith('_')) continue; // _sdk / _engine 是共享源码,不是模型 + + var manifestPath = Path.Combine(dir, id + ".json"); + var dataDir = Path.Combine(dir, id + ".model"); + if (!File.Exists(manifestPath) || !Directory.Exists(dataDir)) continue; + + var manifest = JsonNode.Parse(File.ReadAllText(manifestPath))?.AsObject(); + if (manifest == null) continue; + + // 版本号由模型清单里手写的 version 决定(作者手动升到 1.0 / 1.1 …), + // 不再用内容指纹覆盖:指纹形式(1.0-393cb2b7d4)对用户不可读、也没有语义。 + var declared = manifest["version"]?.GetValue(); + var version = string.IsNullOrWhiteSpace(declared) ? "1.0" : declared!.Trim(); + + // 内容指纹保留在 build 字段,仅用于构建溯源,不参与版本比较 + manifest.Remove("build"); + var canonical = manifest.ToJsonString(new JsonSerializerOptions { WriteIndented = false }); + var chunks = new List { Encoding.UTF8.GetBytes(canonical) }; + foreach (var file in Directory.GetFiles(dataDir, "*", SearchOption.AllDirectories) + .Where(Distributable) + .OrderBy(f => Rel(dataDir, f), StringComparer.Ordinal)) + { + chunks.Add(Encoding.UTF8.GetBytes("\n" + Rel(dataDir, file) + "\n")); + chunks.Add(File.ReadAllBytes(file)); + } + var fingerprint = Fingerprint(chunks)[..10]; + + manifest["version"] = version; + manifest["build"] = fingerprint; + manifest["updatedAt"] = DateTime.UtcNow.ToString("yyyy-MM-ddTHH:mm:ssZ"); + File.WriteAllText(manifestPath, manifest.ToJsonString(relaxed) + "\n"); + + models.Add(new Dictionary + { + ["id"] = id, + ["version"] = version, + ["build"] = fingerprint, + ["dir"] = "model/" + id + }); + Console.WriteLine($" {id,-20} {version,-8} (build {fingerprint})"); +} + +// 启动器源码指纹(只展示,不触发升级;升级看 launcher.version) +var srcRoot = Path.Combine(root, "src"); +var srcChunks = new List(); +if (Directory.Exists(srcRoot)) +{ + foreach (var file in Directory.GetFiles(srcRoot, "*", SearchOption.AllDirectories) + .Where(Distributable) + .Where(f => f.EndsWith(".cs", StringComparison.OrdinalIgnoreCase) || + f.EndsWith(".axaml", StringComparison.OrdinalIgnoreCase) || + f.EndsWith(".csproj", StringComparison.OrdinalIgnoreCase) || + f.EndsWith(".json", StringComparison.OrdinalIgnoreCase) || + f.EndsWith(".props", StringComparison.OrdinalIgnoreCase)) + .OrderBy(f => Rel(srcRoot, f), StringComparer.Ordinal)) + { + srcChunks.Add(Encoding.UTF8.GetBytes(Rel(srcRoot, file) + "\n")); + srcChunks.Add(File.ReadAllBytes(file)); + } +} +var launcherRevision = srcChunks.Count > 0 ? Fingerprint(srcChunks)[..10] : ""; + +var packages = new Dictionary>(); +// 启动器更新只访问「编译的产物」:gitcode Release 里发布的 dist/GC-.zip 附件。 +// 运行时若存在同名 Release,GitCodeReleaseRemote 会用附件真实直链覆盖下面的 url; +// 下面的地址是兜底(编译产物尚未发 Release 时也能指向正确的编译产物位置)。 +var releaseBase = $"{Repository}/releases/download/v{launcherVersion}"; +foreach (var rid in new[] { "win-x64", "win-arm64", "osx-arm64", "osx-x64", "linux-x64" }) +{ + var entry = new Dictionary + { + ["path"] = $"dist/GC-{rid}.zip", + ["url"] = $"{releaseBase}/GC-{rid}.zip" + }; + // 已生成的启动器更新包:把校验值和体积写进清单,供下载端校验 + var zipPath = Path.Combine(root, "dist", $"GC-{rid}.zip"); + if (File.Exists(zipPath)) + { + var bytes = File.ReadAllBytes(zipPath); + entry["sha256"] = Convert.ToHexString(SHA256.HashData(bytes)).ToLowerInvariant(); + entry["size"] = bytes.LongLength; + } + packages[rid] = entry; +} + +var versionDoc = new Dictionary +{ + ["schema"] = 1, + ["generated"] = DateTime.UtcNow.ToString("yyyy-MM-ddTHH:mm:ssZ"), + ["repository"] = Repository, + ["branch"] = "main", + ["modelDir"] = "model", + ["launcher"] = new Dictionary + { + ["version"] = launcherVersion, + ["revision"] = launcherRevision, + ["packages"] = packages + }, + ["models"] = models +}; + +var json = JsonSerializer.Serialize(versionDoc, relaxed) + "\n"; +File.WriteAllText(Path.Combine(root, "version.json"), json); +File.WriteAllText(Path.Combine(modelRoot, "version.json"), json); +Console.WriteLine($"==> version.json 已生成(启动器 {launcherVersion},模型 {models.Count} 个)"); +return 0; diff --git a/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/VersionStamp.csproj b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/VersionStamp.csproj new file mode 100644 index 0000000..0ef6e2a --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/VersionStamp.csproj @@ -0,0 +1,12 @@ + + + + Exe + net8.0 + enable + enable + VersionStamp + VersionStamp + + + diff --git a/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/bin/Release/net8.0/VersionStamp b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/bin/Release/net8.0/VersionStamp new file mode 100755 index 0000000..6ee2b2d Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/bin/Release/net8.0/VersionStamp differ diff --git a/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/bin/Release/net8.0/VersionStamp.deps.json b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/bin/Release/net8.0/VersionStamp.deps.json new file mode 100644 index 0000000..2a47598 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/bin/Release/net8.0/VersionStamp.deps.json @@ -0,0 +1,23 @@ +{ + "runtimeTarget": { + "name": ".NETCoreApp,Version=v8.0", + "signature": "" + }, + "compilationOptions": {}, + "targets": { + ".NETCoreApp,Version=v8.0": { + "VersionStamp/1.0.3": { + "runtime": { + "VersionStamp.dll": {} + } + } + } + }, + "libraries": { + "VersionStamp/1.0.3": { + "type": "project", + "serviceable": false, + "sha512": "" + } + } +} \ No newline at end of file diff --git a/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/bin/Release/net8.0/VersionStamp.dll b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/bin/Release/net8.0/VersionStamp.dll new file mode 100644 index 0000000..4b3b2b7 Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/bin/Release/net8.0/VersionStamp.dll differ diff --git a/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/bin/Release/net8.0/VersionStamp.pdb b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/bin/Release/net8.0/VersionStamp.pdb new file mode 100644 index 0000000..d417a0b Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/bin/Release/net8.0/VersionStamp.pdb differ diff --git a/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/bin/Release/net8.0/VersionStamp.runtimeconfig.json b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/bin/Release/net8.0/VersionStamp.runtimeconfig.json new file mode 100644 index 0000000..d784515 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/bin/Release/net8.0/VersionStamp.runtimeconfig.json @@ -0,0 +1,13 @@ +{ + "runtimeOptions": { + "tfm": "net8.0", + "framework": { + "name": "Microsoft.NETCore.App", + "version": "8.0.0" + }, + "configProperties": { + "System.Reflection.Metadata.MetadataUpdater.IsSupported": false, + "System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization": false + } + } +} \ No newline at end of file diff --git a/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs new file mode 100644 index 0000000..2217181 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v8.0", FrameworkDisplayName = ".NET 8.0")] diff --git a/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.AssemblyInfo.cs b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.AssemblyInfo.cs new file mode 100644 index 0000000..d7cfa94 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.AssemblyInfo.cs @@ -0,0 +1,23 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("NeoRF")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.3.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.3")] +[assembly: System.Reflection.AssemblyProductAttribute("Earth Model Studio")] +[assembly: System.Reflection.AssemblyTitleAttribute("VersionStamp")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.3.0")] +[assembly: System.Resources.NeutralResourcesLanguageAttribute("zh-Hans")] + +// Generated by the MSBuild WriteCodeFragment class. + diff --git a/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.AssemblyInfoInputs.cache b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.AssemblyInfoInputs.cache new file mode 100644 index 0000000..dabd766 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +74f99e4d9cbf91b981ea8bb9ca826e7a8f5f09eeb43c6922e054b3d03a9b8acf diff --git a/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.GeneratedMSBuildEditorConfig.editorconfig b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 0000000..61b19e5 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,18 @@ +is_global = true +build_property.TargetFramework = net8.0 +build_property.TargetFrameworkIdentifier = .NETCoreApp +build_property.TargetFrameworkVersion = v8.0 +build_property.TargetPlatformMinVersion = +build_property.UsingMicrosoftNETSdkWeb = +build_property.ProjectTypeGuids = +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property.EnforceExtendedAnalyzerRules = +build_property.EntryPointFilePath = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = VersionStamp +build_property.ProjectDir = /Users/morris/Downloads/GC#/model/_engine/VersionStamp/ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = +build_property.EffectiveAnalysisLevelStyle = 8.0 +build_property.EnableCodeStyleSeverity = diff --git a/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.GlobalUsings.g.cs b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.GlobalUsings.g.cs new file mode 100644 index 0000000..d12bcbc --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.GlobalUsings.g.cs @@ -0,0 +1,8 @@ +// +global using System; +global using System.Collections.Generic; +global using System.IO; +global using System.Linq; +global using System.Net.Http; +global using System.Threading; +global using System.Threading.Tasks; diff --git a/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.assets.cache b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.assets.cache new file mode 100644 index 0000000..73b8d62 Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.assets.cache differ diff --git a/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.csproj.CoreCompileInputs.cache b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.csproj.CoreCompileInputs.cache new file mode 100644 index 0000000..6a70a8e --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.csproj.CoreCompileInputs.cache @@ -0,0 +1 @@ +85742ef80cf2152cf4a4430f83d458331bf993698b5083cd8b3b2fcfbf3691ce diff --git a/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.csproj.FileListAbsolute.txt b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.csproj.FileListAbsolute.txt new file mode 100644 index 0000000..6eacc1c --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.csproj.FileListAbsolute.txt @@ -0,0 +1,14 @@ +/Users/morris/Downloads/GC#/model/_engine/VersionStamp/bin/Release/net8.0/VersionStamp +/Users/morris/Downloads/GC#/model/_engine/VersionStamp/bin/Release/net8.0/VersionStamp.deps.json +/Users/morris/Downloads/GC#/model/_engine/VersionStamp/bin/Release/net8.0/VersionStamp.runtimeconfig.json +/Users/morris/Downloads/GC#/model/_engine/VersionStamp/bin/Release/net8.0/VersionStamp.dll +/Users/morris/Downloads/GC#/model/_engine/VersionStamp/bin/Release/net8.0/VersionStamp.pdb +/Users/morris/Downloads/GC#/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.GeneratedMSBuildEditorConfig.editorconfig +/Users/morris/Downloads/GC#/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.AssemblyInfoInputs.cache +/Users/morris/Downloads/GC#/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.AssemblyInfo.cs +/Users/morris/Downloads/GC#/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.csproj.CoreCompileInputs.cache +/Users/morris/Downloads/GC#/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.dll +/Users/morris/Downloads/GC#/model/_engine/VersionStamp/obj/Release/net8.0/refint/VersionStamp.dll +/Users/morris/Downloads/GC#/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.pdb +/Users/morris/Downloads/GC#/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.genruntimeconfig.cache +/Users/morris/Downloads/GC#/model/_engine/VersionStamp/obj/Release/net8.0/ref/VersionStamp.dll diff --git a/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.dll b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.dll new file mode 100644 index 0000000..4b3b2b7 Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.dll differ diff --git a/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.genruntimeconfig.cache b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.genruntimeconfig.cache new file mode 100644 index 0000000..72d06c8 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.genruntimeconfig.cache @@ -0,0 +1 @@ +d0976149c15255acc8dcb9e033721a42927c784807f5fd87fba864a81ecce360 diff --git a/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.pdb b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.pdb new file mode 100644 index 0000000..d417a0b Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.pdb differ diff --git a/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/apphost b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/apphost new file mode 100755 index 0000000..6ee2b2d Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/apphost differ diff --git a/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/ref/VersionStamp.dll b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/ref/VersionStamp.dll new file mode 100644 index 0000000..6a37898 Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/ref/VersionStamp.dll differ diff --git a/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/refint/VersionStamp.dll b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/refint/VersionStamp.dll new file mode 100644 index 0000000..6a37898 Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/Release/net8.0/refint/VersionStamp.dll differ diff --git a/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/VersionStamp.csproj.nuget.dgspec.json b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/VersionStamp.csproj.nuget.dgspec.json new file mode 100644 index 0000000..cdd636d --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/VersionStamp.csproj.nuget.dgspec.json @@ -0,0 +1,69 @@ +{ + "format": 1, + "restore": { + "/Users/morris/Downloads/GC#/model/_engine/VersionStamp/VersionStamp.csproj": {} + }, + "projects": { + "/Users/morris/Downloads/GC#/model/_engine/VersionStamp/VersionStamp.csproj": { + "version": "1.0.3", + "restore": { + "projectUniqueName": "/Users/morris/Downloads/GC#/model/_engine/VersionStamp/VersionStamp.csproj", + "projectName": "VersionStamp", + "projectPath": "/Users/morris/Downloads/GC#/model/_engine/VersionStamp/VersionStamp.csproj", + "packagesPath": "/Users/morris/.nuget/packages/", + "outputPath": "/Users/morris/Downloads/GC#/model/_engine/VersionStamp/obj/", + "projectStyle": "PackageReference", + "configFilePaths": [ + "/Users/morris/.nuget/NuGet/NuGet.Config" + ], + "originalTargetFrameworks": [ + "net8.0" + ], + "sources": { + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net8.0": { + "framework": "net8.0", + "targetAlias": "net8.0", + "projectReferences": {} + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" + }, + "SdkAnalysisLevel": "10.0.400" + }, + "frameworks": { + "net8.0": { + "framework": "net8.0", + "targetAlias": "net8.0", + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/10.0.401/PortableRuntimeIdentifierGraph.json" + } + } + } + } +} \ No newline at end of file diff --git a/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/VersionStamp.csproj.nuget.g.props b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/VersionStamp.csproj.nuget.g.props new file mode 100644 index 0000000..73217cc --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/VersionStamp.csproj.nuget.g.props @@ -0,0 +1,15 @@ + + + + True + NuGet + $(MSBuildThisFileDirectory)project.assets.json + /Users/morris/.nuget/packages/ + /Users/morris/.nuget/packages/ + PackageReference + 7.0.0 + + + + + \ No newline at end of file diff --git a/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/VersionStamp.csproj.nuget.g.targets b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/VersionStamp.csproj.nuget.g.targets new file mode 100644 index 0000000..3dc06ef --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/VersionStamp.csproj.nuget.g.targets @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/project.assets.json b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/project.assets.json new file mode 100644 index 0000000..c40f2e8 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/project.assets.json @@ -0,0 +1,74 @@ +{ + "version": 4, + "targets": { + "net8.0": {} + }, + "libraries": {}, + "projectFileDependencyGroups": { + "net8.0": [] + }, + "packageFolders": { + "/Users/morris/.nuget/packages/": {} + }, + "project": { + "version": "1.0.3", + "restore": { + "projectUniqueName": "/Users/morris/Downloads/GC#/model/_engine/VersionStamp/VersionStamp.csproj", + "projectName": "VersionStamp", + "projectPath": "/Users/morris/Downloads/GC#/model/_engine/VersionStamp/VersionStamp.csproj", + "packagesPath": "/Users/morris/.nuget/packages/", + "outputPath": "/Users/morris/Downloads/GC#/model/_engine/VersionStamp/obj/", + "projectStyle": "PackageReference", + "configFilePaths": [ + "/Users/morris/.nuget/NuGet/NuGet.Config" + ], + "originalTargetFrameworks": [ + "net8.0" + ], + "sources": { + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net8.0": { + "framework": "net8.0", + "targetAlias": "net8.0", + "projectReferences": {} + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" + }, + "SdkAnalysisLevel": "10.0.400" + }, + "frameworks": { + "net8.0": { + "framework": "net8.0", + "targetAlias": "net8.0", + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/10.0.401/PortableRuntimeIdentifierGraph.json" + } + } + } +} \ No newline at end of file diff --git a/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/project.nuget.cache b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/project.nuget.cache new file mode 100644 index 0000000..87cff4b --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_engine/VersionStamp/obj/project.nuget.cache @@ -0,0 +1,8 @@ +{ + "version": 2, + "dgSpecHash": "tJZIToOhfvc=", + "success": true, + "projectFilePath": "/Users/morris/Downloads/GC#/model/_engine/VersionStamp/VersionStamp.csproj", + "expectedPackageFiles": [], + "logs": [] +} \ No newline at end of file diff --git a/.GC/cache/sources/gitcode-official/model/_engine/src/CelestialView.cs b/.GC/cache/sources/gitcode-official/model/_engine/src/CelestialView.cs new file mode 100644 index 0000000..2b5f30d --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_engine/src/CelestialView.cs @@ -0,0 +1,1170 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Globalization; +using System.Linq; +using System.Numerics; +using Avalonia; +using Avalonia.Controls; +using Avalonia.Input; +using Avalonia.Media; +using Avalonia.Media.Imaging; +using Avalonia.Platform; +using Avalonia.Threading; + +namespace NeoRF.EarthModels; + +public enum SceneView +{ + Rotation, + Revolution +} + +/// +/// 天文场景画布:地球自转 / 地球公转。 +/// 纯 CPU 像素着色 + 矢量标注,无外部贴图依赖,三平台表现一致。 +/// 交互约定:单指/鼠标拖动只改变地球自身的角度,视角平面保持不变;双指捏合缩放。 +/// +public class CelestialView : Control, IDisposable +{ + // ---------------------------------------------------------------- 属性 + public static readonly StyledProperty SceneProperty = + AvaloniaProperty.Register(nameof(Scene)); + + public static readonly StyledProperty ViewProperty = + AvaloniaProperty.Register(nameof(View)); + + public static readonly StyledProperty IsPlayingProperty = + AvaloniaProperty.Register(nameof(IsPlaying), true); + + public static readonly StyledProperty SpeedProperty = + AvaloniaProperty.Register(nameof(Speed), 1.0); + + public static readonly StyledProperty ShowLabelsProperty = + AvaloniaProperty.Register(nameof(ShowLabels), true); + + public static readonly StyledProperty ShowOrbitProperty = + AvaloniaProperty.Register(nameof(ShowOrbit), true); + + public static readonly StyledProperty ShowGraticuleProperty = + AvaloniaProperty.Register(nameof(ShowGraticule), true); + + public static readonly StyledProperty ExaggerateTiltProperty = + AvaloniaProperty.Register(nameof(ExaggerateTilt)); + + public static readonly StyledProperty FrameRateProperty = + AvaloniaProperty.Register(nameof(FrameRate), 120); + + public static readonly StyledProperty ShowHudProperty = + AvaloniaProperty.Register(nameof(ShowHud), true); + + public static readonly StyledProperty ShowCloudsProperty = + AvaloniaProperty.Register(nameof(ShowClouds), true); + + public static readonly StyledProperty ZoomProperty = + AvaloniaProperty.Register(nameof(Zoom), 1.0); + + /// 自转视图里太阳直射点的纬度(公转视图由轨道角自动计算)。 + public static readonly StyledProperty DeclinationDegProperty = + AvaloniaProperty.Register(nameof(DeclinationDeg), 0.0); + + /// 显式视角俯仰角;NaN 表示使用视图默认值。它只由独立控件修改,绝不随拖动变化。 + public static readonly StyledProperty CameraElevationProperty = + AvaloniaProperty.Register(nameof(CameraElevation), double.NaN); + + /// 是否绘制赤道 / 南北回归线 / 南北极圈等教材纬线。 + public static readonly StyledProperty ShowKeyLatitudesProperty = + AvaloniaProperty.Register(nameof(ShowKeyLatitudes), true); + + /// 特写模式:隐藏 HUD、阳光箭头等,只保留地球与教材纬线。 + public static readonly StyledProperty InsetModeProperty = + AvaloniaProperty.Register(nameof(InsetMode)); + + public SceneRuntime? Scene { get => GetValue(SceneProperty); set => SetValue(SceneProperty, value); } + public SceneView View { get => GetValue(ViewProperty); set => SetValue(ViewProperty, value); } + public bool IsPlaying { get => GetValue(IsPlayingProperty); set => SetValue(IsPlayingProperty, value); } + public double Speed { get => GetValue(SpeedProperty); set => SetValue(SpeedProperty, value); } + public bool ShowLabels { get => GetValue(ShowLabelsProperty); set => SetValue(ShowLabelsProperty, value); } + public bool ShowOrbit { get => GetValue(ShowOrbitProperty); set => SetValue(ShowOrbitProperty, value); } + public bool ShowGraticule { get => GetValue(ShowGraticuleProperty); set => SetValue(ShowGraticuleProperty, value); } + public bool ExaggerateTilt { get => GetValue(ExaggerateTiltProperty); set => SetValue(ExaggerateTiltProperty, value); } + public int FrameRate { get => GetValue(FrameRateProperty); set => SetValue(FrameRateProperty, value); } + public bool ShowHud { get => GetValue(ShowHudProperty); set => SetValue(ShowHudProperty, value); } + public bool ShowClouds { get => GetValue(ShowCloudsProperty); set => SetValue(ShowCloudsProperty, value); } + public double DeclinationDeg { get => GetValue(DeclinationDegProperty); set => SetValue(DeclinationDegProperty, value); } + public double CameraElevation { get => GetValue(CameraElevationProperty); set => SetValue(CameraElevationProperty, value); } + public bool ShowKeyLatitudes { get => GetValue(ShowKeyLatitudesProperty); set => SetValue(ShowKeyLatitudesProperty, value); } + public bool InsetMode { get => GetValue(InsetModeProperty); set => SetValue(InsetModeProperty, value); } + + /// 缩放(0.6–6):滚轮、按钮或双指捏合,带平滑过渡。 + public double Zoom { get => GetValue(ZoomProperty); set => SetValue(ZoomProperty, value); } + + /// 本模型的文案(由模型界面注入,启动器不再提供)。 + public ModelStrings Texts { get; set; } = ModelStrings.Default; + + // ---------------------------------------------------------------- 状态 + private double _orbitDeg; + private double _spinDeg = 20; + private DispatcherTimer? _timer; + private WriteableBitmap? _sphere; + private int _sphereSize; + private long _lastTick; + private double _accum; + private bool _animating; + + /// 运动时的球面渲染边长:按实测帧耗时自适应,慢机器自动降一档。 + private int MotionResolution { get; set; } = 460; + + private double _zoom = 1; + private double _zoomTarget = 1; + private double _camElev = 8; + private double _camElevTarget = 8; + private double _cloudShift; + private double _spinVelocity; + private double _frameAverage; + + // 多点触控:每个手指一个 Pointer.Id,两指时切换为捏合缩放 + private readonly Dictionary _pointers = new(); + private bool _pinching; + private double _pinchStartDistance; + private double _pinchStartZoom; + private bool _dragging; + private Point _dragLast; + + public double OrbitAngle => _orbitDeg; + public double SpinAngle => _spinDeg; + + /// + /// 当前太阳直射纬度。公转视图按真实黄赤交角计算: + /// 春分/秋分 0°、夏至 +23.5°、冬至 −23.5°;夸张倾角只影响示意图形,不影响教学读数。 + /// + public double SubsolarLatitude + { + get + { + if (View == SceneView.Revolution) + { + var tilt = Math.Clamp(Scene?.Scene.Planet.AxialTiltDeg ?? 23.5, 0, 60); + return Math.Asin(Math.Sin(Deg2Rad(tilt)) * Math.Sin(Deg2Rad(_orbitDeg))) * 57.2957795; + } + return Math.Clamp(DeclinationDeg, -66.5, 66.5); + } + } + + public string DeclinationLabel => DeclinationText(SubsolarLatitude); + + /// 定格在二分二至时,日期直接取模型数据里的教材日期,避免近似公式差一两天。 + public string CurrentDate + { + get + { + if (View == SceneView.Revolution) + { + var season = NearestSeason(2.5); + if (season?.Date != null) return FormatSeasonDate(season.Date); + } + return DateForAngle(_orbitDeg); + } + } + + private string FormatSeasonDate(string monthDay) + { + var parts = monthDay.Split('/'); + if (parts.Length == 2 && int.TryParse(parts[0], out var m) && int.TryParse(parts[1], out var d) + && m is >= 1 and <= 12 && d is >= 1 and <= 31) + { + var date = new DateTime(2025, m, d); + var chinese = Texts.Language.StartsWith("zh", StringComparison.OrdinalIgnoreCase); + return date.ToString(chinese ? "M月d日" : "MMM d", CultureInfo.InvariantCulture); + } + return monthDay; + } + + public event Action? AnglesChanged; + /// 缩放目标变化(滚轮、按钮、捏合)。 + public event Action? ZoomChanged; + + static CelestialView() + { + AffectsRender(SceneProperty, ViewProperty, ShowLabelsProperty, ShowOrbitProperty, + ShowGraticuleProperty, ExaggerateTiltProperty, IsPlayingProperty, SpeedProperty, + DeclinationDegProperty, CameraElevationProperty, ShowKeyLatitudesProperty, InsetModeProperty, + ZoomProperty, ShowCloudsProperty, ShowHudProperty); + } + + private double DefaultElevation => double.IsNaN(CameraElevation) + ? (View == SceneView.Revolution ? 26 : 8) + : Math.Clamp(CameraElevation, 0, 82); + + protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change) + { + base.OnPropertyChanged(change); + if (change.Property == ViewProperty || change.Property == CameraElevationProperty) + { + // 视角只由视图/独立控件决定,拖动永远不会改它 + _camElevTarget = DefaultElevation; + InvalidateVisual(); + } + else if (change.Property == DeclinationDegProperty || + change.Property == ShowKeyLatitudesProperty || + change.Property == InsetModeProperty) + { + InvalidateVisual(); + } + } + + public CelestialView() + { + ClipToBounds = true; + Focusable = true; + Cursor = new Cursor(StandardCursorType.SizeAll); + } + + // ---------------------------------------------------------------- 交互 + /// 设置绝对缩放。捏合时 immediate=true 保证跟手。 + public void SetZoom(double value, bool immediate = false) + { + _zoomTarget = Math.Clamp(value, 0.6, 6.0); + if (immediate) _zoom = _zoomTarget; + SetCurrentValue(ZoomProperty, _zoomTarget); + ZoomChanged?.Invoke(_zoomTarget); + InvalidateVisual(); + } + + public void ZoomBy(double factor) => SetZoom(_zoomTarget * factor); + + public void ResetView() + { + SetZoom(1.0, immediate: true); + _camElevTarget = DefaultElevation; + _spinVelocity = 0; + _lastTick = Stopwatch.GetTimestamp(); + InvalidateVisual(); + } + + protected override void OnPointerPressed(PointerPressedEventArgs e) + { + base.OnPointerPressed(e); + if (Scene == null) return; + + var p = e.GetPosition(this); + _pointers[e.Pointer.Id] = p; + e.Pointer.Capture(this); + + if (_pointers.Count >= 2) + { + BeginPinch(); + _dragging = false; + } + else + { + _dragging = true; + _pinching = false; + _spinVelocity = 0; + _dragLast = p; + } + e.Handled = true; + } + + protected override void OnPointerMoved(PointerEventArgs e) + { + base.OnPointerMoved(e); + if (!_pointers.ContainsKey(e.Pointer.Id)) return; + + var p = e.GetPosition(this); + _pointers[e.Pointer.Id] = p; + + if (_pointers.Count >= 2) + { + UpdatePinch(); + e.Handled = true; + return; + } + if (!_dragging) return; + + var dx = p.X - _dragLast.X; + var dy = p.Y - _dragLast.Y; + _dragLast = p; + DragBy(dx, dy); + e.Handled = true; + } + + /// + /// 手动转动地球。只接受水平分量:竖直分量在任何情况下都不会改变相机俯仰角, + /// 因此轨道面、经纬网、地轴所在的平面始终固定。 + /// + public void DragBy(double dx, double dy) + { + _ = dy; + if (View == SceneView.Revolution) + { + _orbitDeg = Wrap360(_orbitDeg + dx * 0.32); + _spinVelocity = 0; + } + else + { + _spinDeg = Wrap360(_spinDeg + dx * 0.42); + _spinVelocity = dx * 0.42 * 55; + } + AnglesChanged?.Invoke(); + InvalidateVisual(); + } + + protected override void OnPointerReleased(PointerReleasedEventArgs e) + { + base.OnPointerReleased(e); + if (!_pointers.Remove(e.Pointer.Id)) return; + e.Pointer.Capture(null); + + if (_pointers.Count >= 2) + { + BeginPinch(); + _dragging = false; + } + else if (_pointers.Count == 1) + { + // 从捏合回到单指:重新建立拖动基准,避免地球突然跳一下 + _pinching = false; + _dragging = true; + _dragLast = _pointers.Values.First(); + _spinVelocity = 0; + } + else + { + _dragging = false; + _pinching = false; + } + e.Handled = true; + } + + protected override void OnPointerWheelChanged(PointerWheelEventArgs e) + { + base.OnPointerWheelChanged(e); + ZoomBy(Math.Pow(1.18, e.Delta.Y)); + e.Handled = true; + } + + private void BeginPinch() + { + var pts = _pointers.Values.Take(2).ToArray(); + _pinchStartDistance = Math.Max(8.0, Distance(pts[0], pts[1])); + _pinchStartZoom = _zoomTarget; + _pinching = true; + _spinVelocity = 0; + } + + private void UpdatePinch() + { + if (!_pinching) { BeginPinch(); return; } + var pts = _pointers.Values.Take(2).ToArray(); + var d = Math.Max(8.0, Distance(pts[0], pts[1])); + SetZoom(PinchZoom(_pinchStartZoom, _pinchStartDistance, d), immediate: true); + } + + /// 捏合比例换算:两指间距放大多少倍,缩放就放大多少倍(限幅 0.6–6)。 + public static double PinchZoom(double startZoom, double startDistance, double currentDistance) + => Math.Clamp(startZoom * Math.Max(8.0, currentDistance) / Math.Max(8.0, startDistance), 0.6, 6.0); + + private static double Distance(Point a, Point b) + { + var dx = a.X - b.X; + var dy = a.Y - b.Y; + return Math.Sqrt(dx * dx + dy * dy); + } + + private static double Wrap360(double deg) => ((deg % 360) + 360) % 360; + + // ---------------------------------------------------------------- 动画 + protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e) + { + base.OnAttachedToVisualTree(e); + _camElevTarget = DefaultElevation; + // 8ms 轮询以支撑最高 120 FPS(模型内部仍按 FrameRate 限流);不依赖系统 VSync 节拍 + _timer = new DispatcherTimer(TimeSpan.FromMilliseconds(8), DispatcherPriority.Render, OnTick); + _lastTick = Stopwatch.GetTimestamp(); + _timer.Start(); + } + + protected override void OnDetachedFromVisualTree(VisualTreeAttachmentEventArgs e) + { + base.OnDetachedFromVisualTree(e); + _timer?.Stop(); + _timer = null; + } + + /// + /// 窗口关闭时释放计时器与 WriteableBitmap:DispatcherTimer 的 Tick 事件会持有本控件实例, + /// 不置空会让 collectible 的 ModelLoadContext 无法回收(模型卸载不干净)。 + /// + public void Dispose() + { + _timer?.Stop(); + _timer = null; + _sphere?.Dispose(); + _sphere = null; + _sphereSize = 0; + GC.SuppressFinalize(this); + } + + private void OnTick(object? sender, EventArgs e) + { + var now = Stopwatch.GetTimestamp(); + var dt = (now - _lastTick) / (double)Stopwatch.Frequency; + _lastTick = now; + if (dt > 0.25) dt = 0.25; + + if (Scene == null) + { + _animating = false; + return; + } + + _cloudShift += dt * (IsPlaying ? 1.6 : 0.18); + if (_cloudShift > 360) _cloudShift -= 360; + + if (_animating && dt > 0.001 && dt < 0.5) + { + _frameAverage = _frameAverage <= 0 ? dt : _frameAverage * 0.92 + dt * 0.08; + if (_frameAverage > 0.026 && MotionResolution > 320) MotionResolution -= 12; + else if (_frameAverage < 0.015 && MotionResolution < 460) MotionResolution += 6; + } + + var smoothing = Math.Min(1.0, dt * 10.0); + var viewChanged = false; + if (Math.Abs(_zoomTarget - _zoom) > 0.0005) + { + _zoom += (_zoomTarget - _zoom) * smoothing; + viewChanged = true; + } + if (Math.Abs(_camElevTarget - _camElev) > 0.01) + { + _camElev += (_camElevTarget - _camElev) * smoothing; + viewChanged = true; + } + + var frameInterval = 1.0 / Math.Clamp(FrameRate, 12, 120); + _accum += dt; + var due = _accum >= frameInterval; + if (!due && !viewChanged) return; + var step = _accum; + if (due) _accum = 0; + + // 手动转动/捏合时画面定格,松手后继续播放(不必先点暂停) + var holding = _dragging || _pinching; + if (IsPlaying && !holding) + { + var speed = Math.Clamp(Speed, 0.05, 8); + _spinDeg = (_spinDeg + step * speed * 60.0) % 360.0; + _orbitDeg = (_orbitDeg + step * speed * 12.0) % 360.0; + _spinVelocity = 0; + } + else if (!IsPlaying && !_dragging && Math.Abs(_spinVelocity) > 0.4 && View == SceneView.Rotation) + { + _spinDeg = Wrap360(_spinDeg + _spinVelocity * step); + _spinVelocity *= Math.Pow(0.02, step); + } + else + { + _spinVelocity = 0; + } + + var wasAnimating = _animating; + _animating = (IsPlaying && !holding) || _dragging || Math.Abs(_spinVelocity) > 0.4 || viewChanged; + InvalidateVisual(); + if (wasAnimating && !_animating) InvalidateVisual(); + } + + public void JumpToOrbit(double deg) + { + _orbitDeg = Wrap360(deg); + AnglesChanged?.Invoke(); + InvalidateVisual(); + } + + public void JumpToSpin(double deg) + { + _spinDeg = Wrap360(deg); + AnglesChanged?.Invoke(); + InvalidateVisual(); + } + + public void StepOrbit(double deltaDeg) + { + _orbitDeg = Wrap360(_orbitDeg + deltaDeg); + AnglesChanged?.Invoke(); + InvalidateVisual(); + } + + public void StepSpin(double deltaDeg) + { + _spinDeg = Wrap360(_spinDeg + deltaDeg); + AnglesChanged?.Invoke(); + InvalidateVisual(); + } + + public void ResetAnimation() + { + _orbitDeg = 0; + _spinDeg = 20; + AnglesChanged?.Invoke(); + InvalidateVisual(); + } + + /// 取离当前轨道角最近的节气(超过阈值返回 null)。 + public SeasonPoint? NearestSeason(double maxDistanceDeg = 8) + { + var seasons = Scene?.Scene.Orbit.Seasons; + if (seasons == null || seasons.Count == 0) return null; + SeasonPoint? best = null; + var bestDistance = double.MaxValue; + foreach (var s in seasons) + { + var d = Math.Abs(WrapSigned(s.AngleDeg - _orbitDeg)); + if (d < bestDistance) { bestDistance = d; best = s; } + } + return bestDistance <= maxDistanceDeg ? best : null; + } + + private static double WrapSigned(double deg) => ((deg + 180) % 360 + 360) % 360 - 180; + + // ---------------------------------------------------------------- 绘制 + public override void Render(DrawingContext ctx) + { + var size = Bounds.Size; + if (size.Width < 80 || size.Height < 80) return; + + DrawSpace(ctx, size); + + var runtime = Scene; + if (runtime == null) + { + DrawLoading(ctx, size); + return; + } + + if (View == SceneView.Revolution) RenderRevolution(ctx, size, runtime); + else RenderRotation(ctx, size, runtime); + } + + // 每帧 Render 都会调用:渐变画刷改成静态只读,避免在热路径反复分配。 + // 全部使用相对坐标,可安全共享;Radius -> RadiusX/RadiusY(旧 API 已过时)。 + private static readonly IBrush SpaceBg = new LinearGradientBrush + { + StartPoint = new RelativePoint(0.15, 0, RelativeUnit.Relative), + EndPoint = new RelativePoint(0.85, 1, RelativeUnit.Relative), + GradientStops = + { + new GradientStop(Color.Parse("#080D1C"), 0), + new GradientStop(Color.Parse("#0B1226"), 0.55), + new GradientStop(Color.Parse("#04060E"), 1) + } + }; + + private static readonly IBrush SpaceBand = new RadialGradientBrush + { + Center = new RelativePoint(0.72, 0.18, RelativeUnit.Relative), + GradientOrigin = new RelativePoint(0.72, 0.18, RelativeUnit.Relative), + RadiusX = new RelativeScalar(1.1, RelativeUnit.Relative), + RadiusY = new RelativeScalar(1.1, RelativeUnit.Relative), + GradientStops = + { + new GradientStop(Color.FromArgb(26, 120, 150, 255), 0), + new GradientStop(Color.FromArgb(0, 120, 150, 255), 1) + } + }; + + private static readonly IBrush AtmosphereGlow = new RadialGradientBrush + { + Center = new RelativePoint(0.5, 0.5, RelativeUnit.Relative), + GradientOrigin = new RelativePoint(0.5, 0.5, RelativeUnit.Relative), + RadiusX = new RelativeScalar(0.5, RelativeUnit.Relative), + RadiusY = new RelativeScalar(0.5, RelativeUnit.Relative), + GradientStops = + { + new GradientStop(Color.FromArgb(90, 70, 140, 235), 0.60), + new GradientStop(Color.FromArgb(34, 80, 150, 240), 0.80), + new GradientStop(Color.FromArgb(0, 80, 150, 240), 1.0) + } + }; + + private static readonly IBrush SunGlow = new RadialGradientBrush + { + Center = new RelativePoint(0.5, 0.5, RelativeUnit.Relative), + GradientOrigin = new RelativePoint(0.5, 0.5, RelativeUnit.Relative), + RadiusX = new RelativeScalar(0.5, RelativeUnit.Relative), + RadiusY = new RelativeScalar(0.5, RelativeUnit.Relative), + GradientStops = + { + new GradientStop(Color.FromArgb(120, 255, 196, 92), 0.10), + new GradientStop(Color.FromArgb(48, 255, 168, 60), 0.34), + new GradientStop(Color.FromArgb(0, 255, 150, 40), 1.0) + } + }; + + private static readonly IBrush EarthHalo = new SolidColorBrush(Color.FromArgb(56, 70, 140, 235)); + + private void DrawSpace(DrawingContext ctx, Size size) + { + ctx.FillRectangle(SpaceBg, new Rect(size)); + + foreach (var star in Stars) + { + var brush = star.Level switch + { + 0 => StarDim, + 1 => StarMid, + _ => StarBright + }; + ctx.DrawEllipse(brush, null, new Point(star.X * size.Width, star.Y * size.Height), star.R, star.R); + } + + ctx.FillRectangle(SpaceBand, new Rect(size)); + } + + private void DrawLoading(DrawingContext ctx, Size size) + { + DrawText(ctx, Texts["loading"], size.Width / 2, size.Height / 2 - 8, 14, MutedBrush, + FontWeight.Normal, TextAlignment.Center); + } + + // ---------------------------------------------------------------- 自转视图 + private void RenderRotation(DrawingContext ctx, Size size, SceneRuntime runtime) + { + var w = size.Width; + var h = size.Height; + var center = new Point(w * 0.5, h * 0.52); + var radius = Math.Min(w * 0.46, h * 0.44) * _zoom; + if (radius < 24) return; + + var cam = CameraMatrix(-12, _camElev); + var tilt = TiltDegrees(runtime); + var planet = Matrix4x4.Multiply(Matrix4x4.CreateRotationY(Deg2Rad(_spinDeg)), + Matrix4x4.CreateRotationZ(Deg2Rad(-tilt))); + + // 太阳光由「直射纬度」反推:直射点严格落在对应纬线上,且始终朝向右前方可见半球 + var light = RotationLight(cam, tilt); + + ctx.DrawEllipse(AtmosphereGlow, null, center, radius * 1.16, radius * 1.16); + + var px = PixelSizeFor(radius); + if (px > 8 && runtime.Texture != null) + { + var bmp = EnsureSphereBitmap(px); + SphereRaster.Draw(bmp, px, cam, planet, light, runtime.Texture, _cloudShift, ShowClouds); + ctx.DrawImage(bmp, new Rect(0, 0, px, px), + new Rect(center.X - radius, center.Y - radius, radius * 2, radius * 2)); + } + + var showGrid = ShowGraticule && runtime.Scene.Planet.ShowGraticule && !InsetMode; + if (showGrid) DrawGraticule(ctx, cam, planet, center, radius); + if (ShowKeyLatitudes) + DrawKeyLatitudes(ctx, cam, planet, center, radius, runtime, ShowLabels && radius > 88); + + DrawTerminator(ctx, light, center, radius); + DrawSubsolarMarker(ctx, center, radius, light, ShowLabels && !InsetMode); + DrawAxis(ctx, cam, planet, center, radius, runtime, ShowLabels && !InsetMode); + + if (InsetMode) return; + DrawSunlightArrows(ctx, center, radius); + + var period = runtime.Scene.Planet.RotationHours; + if (ShowHud) DrawHud(ctx, new Point(20, 78), new[] + { + Texts.F("spinInfo", _spinDeg.ToString("0"), period.ToString("0.##")), + Texts.F("declinationInfo", DeclinationText(SubsolarLatitude)) + }); + } + + /// 构造相机空间的阳光方向,使其与地轴的夹角对应指定直射纬度。 + private Vector3 RotationLight(Matrix4x4 cam, double tiltDeg) + { + var axisCam = Vector3.TransformNormal(AxisWorld(tiltDeg), cam); + // 特写模式:光从正右方水平射来,晨昏线竖直居中、正对观察者, + // 便于课堂直观看昼夜半球;主画布仍用斜向光体现立体感。 + var forwardRight = InsetMode + ? new Vector3(1f, 0f, 0f) + : Vector3.Normalize(new Vector3(0.86f, 0f, 0.50f)); + var u = forwardRight - axisCam * Vector3.Dot(forwardRight, axisCam); + if (u.Length() < 0.001f) u = new Vector3(1, 0, 0); + u = Vector3.Normalize(u); + var d = Deg2Rad(SubsolarLatitude); + return Vector3.Normalize(axisCam * (float)Math.Sin(d) + u * (float)Math.Cos(d)); + } + + private static Vector3 AxisWorld(double tiltDeg) + => Vector3.Transform(new Vector3(0, 1, 0), Matrix4x4.CreateRotationZ(Deg2Rad(-tiltDeg))); + + private static double TropicDegrees(SceneRuntime runtime) + { + var t = runtime.Scene.Planet.TropicDeg; + if (t <= 0 || t > 45) t = Math.Abs(runtime.Scene.Planet.AxialTiltDeg); + if (t <= 0 || t > 45) t = 23.5; + return t; + } + + /// 教材五带分界线:赤道、南北回归线(23.5°)、南北极圈(66.5°)。 + private void DrawKeyLatitudes(DrawingContext ctx, Matrix4x4 cam, Matrix4x4 planet, + Point center, double radius, SceneRuntime runtime, bool labels) + { + var tropic = TropicDegrees(runtime); + var polar = 90.0 - tropic; + + // 五条纬线一起画:先画线,再统一布置标签,避免自转时多个标签 + // 被投影到相近位置而互相覆盖 / 抖动(原来的逐条独立绘制会重叠)。 + var lines = new (double Lat, IPen Pen, string? Label, IBrush Brush)[] + { + (0, EquatorPen, labels ? Texts["lat.equator"] : null, LabelBrush), + (tropic, TropicPen, labels ? Texts["lat.tropicN"] : null, TropicBrush), + (-tropic, TropicPen, labels ? Texts["lat.tropicS"] : null, TropicBrush), + (polar, PolarPen, labels ? Texts["lat.polarN"] : null, PolarBrush), + (-polar, PolarPen, labels ? Texts["lat.polarS"] : null, PolarBrush) + }; + + foreach (var l in lines) + DrawSpherePolyline(ctx, cam, planet, center, radius, l.Pen, + t => LatLonToUnit(l.Lat, t * 360.0), 144); + + if (!labels) return; + + // 收集每个标签的锚点,按屏幕 Y 排序后做垂直去重叠 + var placed = new List<(double Y, double X, string Text, IBrush Brush)>(); + foreach (var l in lines) + { + if (l.Label == null) continue; + Vector3 best = default; + var bestScore = double.NegativeInfinity; + for (var lon = -180; lon < 180; lon += 6) + { + var world = Vector3.Transform(LatLonToUnit(l.Lat, lon), planet); + var c = Vector3.Transform(world, cam); + if (c.Z < 0.10f) continue; + var score = c.X * 2.0 + c.Z; + if (score > bestScore) { bestScore = score; best = c; } + } + if (double.IsNegativeInfinity(bestScore)) continue; + placed.Add((center.Y - best.Y * radius, center.X + best.X * radius, l.Label, l.Brush)); + } + + placed.Sort((a, b) => a.Y.CompareTo(b.Y)); + const double minGap = 16.0; + var lastY = double.NegativeInfinity; + foreach (var p in placed) + { + var y = p.Y; + if (y - lastY < minGap) y = lastY + minGap; + lastY = y; + DrawLabelChip(ctx, p.Text, new Point(p.X, y), InsetMode ? 9.0 : 10.5, p.Brush, toRight: false); + } + } + + /// 带深色底衬的标签:压在明亮的地球上也读得清,且不会被画布边缘裁掉。 + private static void DrawLabelChip(DrawingContext ctx, string text, Point anchor, + double fontSize, IBrush brush, bool toRight) + { + var formatted = new FormattedText(text, CultureInfo.CurrentCulture, FlowDirection.LeftToRight, + new Typeface(FontFamily.Default, FontStyle.Normal, FontWeight.SemiBold), fontSize, brush) + { + TextAlignment = TextAlignment.Left, + Trimming = TextTrimming.None + }; + var x = toRight ? anchor.X + 9 : Math.Max(3, anchor.X - formatted.Width - 9); + var y = anchor.Y - formatted.Height - 4; + ctx.DrawRectangle(ChipBg, null, + new Rect(x - 5, y - 2, formatted.Width + 10, formatted.Height + 5), 4, 4); + ctx.DrawText(formatted, new Point(x, y)); + } + + private void DrawGraticule(DrawingContext ctx, Matrix4x4 cam, Matrix4x4 planet, Point center, double radius) + { + for (var lat = -75; lat <= 75; lat += 15) + { + var pen = Math.Abs(lat) < 1 ? EquatorPen : GridPen; + DrawSpherePolyline(ctx, cam, planet, center, radius, pen, (t) => + { + var lon = t * 360.0; + return LatLonToUnit(lat, lon); + }, 120); + } + + for (var lon = 0; lon < 360; lon += 30) + { + var l = lon; + DrawSpherePolyline(ctx, cam, planet, center, radius, GridPen, (t) => + { + var lat = -90 + t * 180.0; + return LatLonToUnit(lat, l); + }, 90); + } + } + + private void DrawSpherePolyline(DrawingContext ctx, Matrix4x4 cam, Matrix4x4 planet, Point center, + double radius, IPen pen, Func pointAt, int steps) + { + Point? prev = null; + for (var i = 0; i <= steps; i++) + { + var local = pointAt(i / (double)steps); + var world = Vector3.Transform(local, planet); + var c = Vector3.Transform(world, cam); + if (c.Z <= 0.02) + { + prev = null; + continue; + } + var p = new Point(center.X + c.X * radius, center.Y - c.Y * radius); + if (prev.HasValue) ctx.DrawLine(pen, prev.Value, p); + prev = p; + } + } + + private void DrawTerminator(DrawingContext ctx, Vector3 light, Point center, double radius) + { + var up = Math.Abs(light.Y) > 0.92f ? new Vector3(1, 0, 0) : new Vector3(0, 1, 0); + var u = Vector3.Normalize(Vector3.Cross(light, up)); + var v = Vector3.Normalize(Vector3.Cross(light, u)); + + Point? prev = null; + for (var i = 0; i <= 180; i++) + { + var a = i / 180.0 * Math.PI * 2; + var n = u * (float)Math.Cos(a) + v * (float)Math.Sin(a); + if (n.Z <= 0.03f) + { + prev = null; + continue; + } + var p = new Point(center.X + n.X * radius, center.Y - n.Y * radius); + if (prev.HasValue) ctx.DrawLine(TerminatorPen, prev.Value, p); + prev = p; + } + } + + /// 球面直射点:黄圈 + 纬度读数,位置由光照方向(即日下点)精确投影。 + private void DrawSubsolarMarker(DrawingContext ctx, Point center, double radius, + Vector3 light, bool withLabel) + { + if (light.Z <= 0.02f) return; + var p = new Point(center.X + light.X * radius, center.Y - light.Y * radius); + var marker = InsetMode ? 6.5 : 5.0; + ctx.DrawEllipse(SubsolarGlowBrush, null, p, marker * 2.5, marker * 2.5); + ctx.DrawEllipse(null, SubsolarPen, p, marker, marker); + if (withLabel) + DrawLabelChip(ctx, Texts["directPoint"] + " " + DeclinationText(SubsolarLatitude), + p, 11.5, SubsolarBrush, toRight: p.X < center.X); + } + + private void DrawAxis(DrawingContext ctx, Matrix4x4 cam, Matrix4x4 planet, Point center, double radius, + SceneRuntime runtime, bool showLabels) + { + var top = Vector3.Transform(Vector3.Transform(new Vector3(0, 1.32f, 0), planet), cam); + var bottom = Vector3.Transform(Vector3.Transform(new Vector3(0, -1.32f, 0), planet), cam); + var pTop = new Point(center.X + top.X * radius, center.Y - top.Y * radius); + var pBottom = new Point(center.X + bottom.X * radius, center.Y - bottom.Y * radius); + ctx.DrawLine(AxisPen, pTop, pBottom); + + if (!showLabels) return; + DrawText(ctx, Texts["north"], pTop.X + 8, pTop.Y - 16, 11.5, AxisBrush); + DrawText(ctx, Texts["south"], pBottom.X + 8, pBottom.Y + 2, 11.5, AxisBrush); + } + + private void DrawSunlightArrows(DrawingContext ctx, Point center, double radius) + { + for (var i = -1; i <= 1; i++) + { + var y = center.Y + i * radius * 0.42; + var x0 = center.X + radius * 1.42; + var x1 = center.X + radius * 1.06; + ctx.DrawLine(SunRayPen, new Point(x0, y), new Point(x1, y)); + ctx.DrawLine(SunRayPen, new Point(x1, y), new Point(x1 + 8, y - 5)); + ctx.DrawLine(SunRayPen, new Point(x1, y), new Point(x1 + 8, y + 5)); + } + } + + // ---------------------------------------------------------------- 公转视图 + private void RenderRevolution(DrawingContext ctx, Size size, SceneRuntime runtime) + { + var w = size.Width; + var h = size.Height; + var center = new Point(w * 0.5, h * 0.51); + var a = Math.Min(w * 0.36, h * 0.38) * _zoom; + if (a < 40) return; + + var earthR = Math.Clamp(Math.Min(w, h) * 0.052, 16, 34) * (0.65 + 0.35 * _zoom); + var sunR = earthR * 1.05; + var cam = CameraMatrix(0, _camElev); + + var theta = Deg2Rad(_orbitDeg); + var earthPos = new Vector3((float)(-a * Math.Sin(theta)), 0, (float)(-a * Math.Cos(theta))); + var earthScreen = ToScreen(earthPos, cam, center); + var lightWorld = Vector3.Normalize(-earthPos); + var lightCam = Vector3.TransformNormal(lightWorld, cam); + + ctx.DrawEllipse(SunGlow, null, center, sunR * 6.2, sunR * 6.2); + + // sunBody 依赖场景里的 runtime.Star,不能静态化;仅把过时 API 换成 RadiusX/Y + var sunBody = new RadialGradientBrush + { + Center = new RelativePoint(0.42, 0.38, RelativeUnit.Relative), + GradientOrigin = new RelativePoint(0.42, 0.38, RelativeUnit.Relative), + RadiusX = new RelativeScalar(0.62, RelativeUnit.Relative), + RadiusY = new RelativeScalar(0.62, RelativeUnit.Relative), + GradientStops = + { + new GradientStop(Color.Parse("#FFF3D0"), 0), + new GradientStop(runtime.Star, 0.62), + new GradientStop(Color.Parse("#F08A1E"), 1) + } + }; + ctx.DrawEllipse(sunBody, null, center, sunR, sunR); + + if (ShowOrbit) DrawOrbit(ctx, cam, center, a); + + var tilt = TiltDegrees(runtime); + var planet = Matrix4x4.Multiply(Matrix4x4.CreateRotationY(Deg2Rad(_spinDeg)), + Matrix4x4.CreateRotationZ(Deg2Rad(-tilt))); + var px = PixelSizeFor(earthR); + if (px > 8) + { + ctx.DrawEllipse(EarthHalo, null, + earthScreen, earthR * 1.35, earthR * 1.35); + var bmp = EnsureSphereBitmap(px); + if (runtime.Texture != null) + SphereRaster.Draw(bmp, px, cam, planet, lightCam, runtime.Texture, _cloudShift, ShowClouds); + ctx.DrawImage(bmp, new Rect(0, 0, px, px), + new Rect(earthScreen.X - earthR, earthScreen.Y - earthR, earthR * 2, earthR * 2)); + } + + var axis = AxisWorld(tilt); + var axisTop = ToScreen(earthPos + axis * (float)(earthR * 1.9), cam, center); + var axisBottom = ToScreen(earthPos - axis * (float)(earthR * 1.9), cam, center); + ctx.DrawLine(AxisPen, axisTop, axisBottom); + if (ShowLabels) DrawText(ctx, Texts["north"], axisTop.X + 6, axisTop.Y - 14, 10.5, AxisBrush); + + ctx.DrawLine(SunRayPen, center, ToScreen(earthPos * 0.92f, cam, center)); + if (ShowLabels) DrawText(ctx, Texts["sun"], center.X, center.Y + sunR + 8, 12, SunLabelBrush, + FontWeight.SemiBold, TextAlignment.Center); + + if (ShowLabels) DrawSeasonMarkers(ctx, cam, center, a, runtime); + if (ShowLabels) DrawSubsolarMarker(ctx, earthScreen, earthR, lightCam, false); + + if (ShowLabels) + { + DrawText(ctx, Texts["earth"], earthScreen.X, earthScreen.Y - earthR - 20, 12, + PlanetLabelBrush, FontWeight.SemiBold, TextAlignment.Center); + } + + if (ShowHud) DrawHud(ctx, new Point(20, 78), new[] + { + Texts.F("orbitInfo", _orbitDeg.ToString("0")), + Texts.F("declinationInfo", DeclinationLabel), + Texts.F("dateInfo", CurrentDate) + }); + } + + private void DrawOrbit(DrawingContext ctx, Matrix4x4 cam, Point center, double a) + { + Point? prevBack = null; + Point? prevFront = null; + for (var i = 0; i <= 240; i++) + { + var t = i / 240.0 * Math.PI * 2; + var p = new Vector3((float)(-a * Math.Sin(t)), 0, (float)(-a * Math.Cos(t))); + var c = Vector3.Transform(p, cam); + var sp = new Point(center.X + c.X, center.Y - c.Y); + if (c.Z < 0) + { + if (prevBack.HasValue) ctx.DrawLine(OrbitBackPen, prevBack.Value, sp); + prevBack = sp; + prevFront = null; + } + else + { + if (prevFront.HasValue) ctx.DrawLine(OrbitFrontPen, prevFront.Value, sp); + prevFront = sp; + prevBack = null; + } + } + } + + private void DrawSeasonMarkers(DrawingContext ctx, Matrix4x4 cam, Point center, double a, SceneRuntime runtime) + { + var seasons = runtime.Scene.Orbit.Seasons; + if (seasons.Count == 0) + { + seasons = new List + { + new() { AngleDeg = 0, Key = "season.springEquinox", Date = "3/21" }, + new() { AngleDeg = 90, Key = "season.summerSolstice", Date = "6/22" }, + new() { AngleDeg = 180, Key = "season.autumnEquinox", Date = "9/23" }, + new() { AngleDeg = 270, Key = "season.winterSolstice", Date = "12/22" } + }; + } + + foreach (var s in seasons) + { + var t = Deg2Rad(s.AngleDeg); + var pos = new Vector3((float)(-a * Math.Sin(t)), 0, (float)(-a * Math.Cos(t))); + var outer = pos * 1.19f; + var p = ToScreen(outer, cam, center); + ctx.DrawEllipse(SeasonDotBrush, null, ToScreen(pos, cam, center), 2.4, 2.4); + + DrawText(ctx, Texts[s.Key], p.X, p.Y - 16, 12, SeasonBrush, FontWeight.SemiBold, TextAlignment.Center); + if (!string.IsNullOrEmpty(s.Date)) + DrawText(ctx, s.Date, p.X, p.Y - 2, 10, MutedBrush, FontWeight.Normal, TextAlignment.Center); + } + } + + // ---------------------------------------------------------------- 工具 + private static Matrix4x4 CameraMatrix(double azimDeg, double elevDeg) + => Matrix4x4.Multiply(Matrix4x4.CreateRotationY(Deg2Rad(azimDeg)), Matrix4x4.CreateRotationX(Deg2Rad(elevDeg))); + + private static Point ToScreen(Vector3 world, Matrix4x4 cam, Point center) + { + var c = Vector3.Transform(world, cam); + return new Point(center.X + c.X, center.Y - c.Y); + } + + private static Vector3 LatLonToUnit(double latDeg, double lonDeg) + { + var lat = Deg2Rad(latDeg); + var lon = Deg2Rad(lonDeg); + var cosLat = Math.Cos(lat); + return new Vector3((float)(cosLat * Math.Sin(lon)), (float)Math.Sin(lat), (float)(cosLat * Math.Cos(lon))); + } + + private double TiltDegrees(SceneRuntime runtime) + { + var tilt = runtime.Scene.Planet.AxialTiltDeg; + if (ExaggerateTilt) tilt *= 1.9; + return Math.Clamp(tilt, 0, 60); + } + + private int PixelSizeFor(double logicalRadius) + { + var scale = TopLevel.GetTopLevel(this)?.RenderScaling ?? 1.0; + var target = logicalRadius * 2 * scale; + var cap = _animating ? MotionResolution : 820; + return Math.Max(8, (int)Math.Round(Math.Min(target, cap))); + } + + private WriteableBitmap EnsureSphereBitmap(int px) + { + if (_sphere != null && _sphereSize == px) return _sphere; + // 自适应分辨率会频繁改 px,旧位图必须先释放,否则每帧都可能泄漏一张 ~0.8MB 位图 + _sphere?.Dispose(); + _sphere = new WriteableBitmap(new PixelSize(px, px), new Avalonia.Vector(96, 96), + PixelFormat.Bgra8888, AlphaFormat.Premul); + _sphereSize = px; + return _sphere; + } + + private static float Deg2Rad(double deg) => (float)(deg * Math.PI / 180.0); + + private static readonly (double X, double Y, double R, int Level)[] Stars = BuildStars(); + + private static (double, double, double, int)[] BuildStars() + { + var rnd = new Random(20240501); + var list = new (double, double, double, int)[340]; + for (var i = 0; i < list.Length; i++) + { + var level = rnd.NextDouble() switch + { + < 0.62 => 0, + < 0.90 => 1, + _ => 2 + }; + list[i] = (rnd.NextDouble(), rnd.NextDouble(), level == 2 ? 1.5 : 0.7 + rnd.NextDouble() * 0.5, level); + } + return list; + } + + private static readonly IBrush StarDim = new SolidColorBrush(Color.FromArgb(80, 200, 218, 255)); + private static readonly IBrush StarMid = new SolidColorBrush(Color.FromArgb(145, 226, 238, 255)); + private static readonly IBrush StarBright = new SolidColorBrush(Color.FromArgb(225, 255, 255, 255)); + private static readonly IBrush MutedBrush = new SolidColorBrush(Color.FromArgb(165, 186, 204, 232)); + private static readonly IBrush LabelBrush = new SolidColorBrush(Color.FromArgb(235, 238, 246, 255)); + private static readonly IBrush SeasonBrush = new SolidColorBrush(Color.FromArgb(235, 255, 226, 168)); + private static readonly IBrush SeasonDotBrush = new SolidColorBrush(Color.FromArgb(210, 255, 214, 130)); + private static readonly IBrush SunLabelBrush = new SolidColorBrush(Color.FromArgb(240, 255, 214, 140)); + private static readonly IBrush PlanetLabelBrush = new SolidColorBrush(Color.FromArgb(240, 170, 210, 255)); + private static readonly IBrush AxisBrush = new SolidColorBrush(Color.FromArgb(220, 255, 214, 130)); + private static readonly IBrush SubsolarBrush = new SolidColorBrush(Color.FromArgb(240, 255, 236, 170)); + private static readonly IBrush SubsolarGlowBrush = new SolidColorBrush(Color.FromArgb(64, 255, 214, 110)); + private static readonly IBrush ChipBg = new SolidColorBrush(Color.FromArgb(185, 8, 16, 34)); + private static readonly IBrush TropicBrush = new SolidColorBrush(Color.FromArgb(240, 255, 196, 120)); + private static readonly IBrush PolarBrush = new SolidColorBrush(Color.FromArgb(210, 164, 210, 255)); + private static readonly Pen SubsolarPen = new Pen(new SolidColorBrush(Color.FromArgb(230, 255, 226, 150)), 1.4); + private static readonly IPen GridPen = new Pen(new SolidColorBrush(Color.FromArgb(44, 190, 220, 255)), 0.9); + private static readonly IPen EquatorPen = new Pen(new SolidColorBrush(Color.FromArgb(150, 130, 235, 255)), 1.6); + private static readonly IPen TropicPen = new Pen(new SolidColorBrush(Color.FromArgb(210, 255, 186, 92)), 1.5, + new DashStyle(new double[] { 6, 4 }, 0)); + private static readonly IPen PolarPen = new Pen(new SolidColorBrush(Color.FromArgb(150, 140, 190, 255)), 1.2, + new DashStyle(new double[] { 3, 5 }, 0)); + private static readonly IPen AxisPen = new Pen(new SolidColorBrush(Color.FromArgb(190, 255, 210, 120)), 1.3, + new DashStyle(new double[] { 7, 5 }, 0)); + private static readonly IPen TerminatorPen = new Pen(new SolidColorBrush(Color.FromArgb(130, 255, 255, 255)), 1.1, + new DashStyle(new double[] { 4, 4 }, 0)); + private static readonly IPen SunRayPen = new Pen(new SolidColorBrush(Color.FromArgb(95, 255, 226, 160)), 1.0, + new DashStyle(new double[] { 5, 5 }, 0)); + private static readonly IPen OrbitFrontPen = new Pen(new SolidColorBrush(Color.FromArgb(120, 150, 190, 255)), 1.2); + private static readonly IPen OrbitBackPen = new Pen(new SolidColorBrush(Color.FromArgb(48, 150, 190, 255)), 1.0); + + private static void DrawText(DrawingContext ctx, string text, double x, double y, double fontSize, + IBrush brush, FontWeight weight = FontWeight.Normal, TextAlignment align = TextAlignment.Left) + { + var formatted = new FormattedText(text, CultureInfo.CurrentCulture, FlowDirection.LeftToRight, + new Typeface(FontFamily.Default, FontStyle.Normal, weight), fontSize, brush); + var px = align switch + { + TextAlignment.Center => x - formatted.Width / 2, + TextAlignment.Right => x - formatted.Width, + _ => x + }; + ctx.DrawText(formatted, new Point(px, y)); + } + + private static void DrawHud(DrawingContext ctx, Point at, string[] lines) + { + if (lines.Length == 0) return; + const double fontSize = 11.5; + var texts = new List(); + double width = 0; + double height = 0; + foreach (var line in lines) + { + var ft = new FormattedText(line, CultureInfo.CurrentCulture, FlowDirection.LeftToRight, + new Typeface(FontFamily.Default, FontStyle.Normal, FontWeight.Normal), fontSize, LabelBrush); + texts.Add(ft); + width = Math.Max(width, ft.Width); + height += ft.Height + 3; + } + + var rect = new Rect(at.X, at.Y, width + 22, height + 12); + ctx.DrawRectangle(HudBrush, HudPen, rect, 8, 8); + var y = at.Y + 6; + foreach (var ft in texts) + { + ctx.DrawText(ft, new Point(at.X + 11, y)); + y += ft.Height + 3; + } + } + + private static readonly IBrush HudBrush = new SolidColorBrush(Color.FromArgb(96, 10, 20, 40)); + private static readonly IPen HudPen = new Pen(new SolidColorBrush(Color.FromArgb(46, 120, 170, 255)), 1); + + private string DeclinationText(double decl) + { + if (Math.Abs(decl) < 0.05) return "0° " + Texts["lat.equator"]; + var suffix = decl > 0 ? Texts["northShort"] : Texts["southShort"]; + return $"{Math.Abs(decl):0.0}°{suffix}"; + } + + private string DateForAngle(double deg) + { + var dayOfYear = 79 + deg / 360.0 * 365.2422; + var date = new DateTime(2025, 1, 1).AddDays(dayOfYear); + var chinese = Texts.Language.StartsWith("zh", StringComparison.OrdinalIgnoreCase); + return date.ToString(chinese ? "M月d日" : "MMM d", CultureInfo.InvariantCulture); + } +} diff --git a/.GC/cache/sources/gitcode-official/model/_engine/src/EarthModelView.cs b/.GC/cache/sources/gitcode-official/model/_engine/src/EarthModelView.cs new file mode 100644 index 0000000..dadb2ca --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_engine/src/EarthModelView.cs @@ -0,0 +1,904 @@ +using System; +using System.Collections.Generic; +using Avalonia; +using Avalonia.Animation; +using Avalonia.Animation.Easings; +using Avalonia.Controls; +using Avalonia.Controls.Primitives; +using Avalonia.Input; +using Avalonia.Layout; +using Avalonia.Media; +using Avalonia.Threading; +using EarthModelStudio.ModelSdk; + +namespace NeoRF.EarthModels; + +/// +/// 模型自己的界面:画布 + 触控友好工具栏 + 课堂演示卡 + 节气定格与步进。 +/// 启动器只负责下载、开窗口和进度条,不参与任何模型渲染或教学交互。 +/// +public sealed class EarthModelView : UserControl, IDisposable +{ + private static readonly IBrush PanelBg = new SolidColorBrush(Color.Parse("#C40A1020")); + private static readonly IBrush ControlBg = new SolidColorBrush(Color.Parse("#16233C")); + private static readonly IBrush Accent = new SolidColorBrush(Color.Parse("#2E6BE6")); + private static readonly IBrush TitleBrush = new SolidColorBrush(Color.Parse("#F2F6FF")); + private static readonly IBrush TextBrush = new SolidColorBrush(Color.Parse("#DCE7FA")); + private static readonly IBrush MutedBrush = new SolidColorBrush(Color.Parse("#7E93B8")); + private static readonly IBrush FaintBrush = new SolidColorBrush(Color.Parse("#61779C")); + private static readonly IBrush BodyBrush = new SolidColorBrush(Color.Parse("#8CA0C4")); + private static readonly IBrush WarmBrush = new SolidColorBrush(Color.Parse("#FFC46B")); + + private static readonly TimeSpan HoverDuration = TimeSpan.FromMilliseconds(120); + private static readonly TimeSpan PanelDuration = TimeSpan.FromMilliseconds(190); + + private readonly IModelContext _context; + private readonly ModelStrings _texts; + private readonly SceneRuntime _runtime; + private readonly List _views; + private readonly List _viewButtons = new(); + private readonly CelestialView _canvas; + private readonly CelestialView _closeup; + private readonly DispatcherTimer _uiTimer; + + private Border? _viewSwitch; + private StackPanel? _seasonPanel; + private Border? _lessons; + private Border? _closeupHost; + private TextBlock? _closeupLabel; + private ModelButton? _playButton; + private ModelButton? _overheadButton; + private ModelButton? _closeupButton; + private TextBlock? _zoomText; + private TextBlock? _cardState; + private TextBlock? _cardTitle; + private TextBlock? _cardDate; + private TextBlock? _cardDirect; + private TextBlock? _cardNote; + + private bool _playing = true; + private bool _labels = true; + private bool _orbit = true; + private bool _grid = true; + private bool _tilt; + private bool _showLessons = true; + private bool _showCloseup = true; + private bool _overhead; + private double _lastDeclination = double.NaN; + + public EarthModelView(IModelContext context, SceneRuntime runtime) + { + _context = context; + _runtime = runtime; + _texts = ModelStrings.Load(context.DataDirectory, context.Language); + _views = ResolveViews(runtime.Scene); + // 自转模型主画布本身就是放大的地球,不需要再来一份特写 + _showCloseup = IsRevolution; + + Background = new SolidColorBrush(Color.Parse("#05070F")); + + _canvas = new CelestialView + { + Scene = runtime, + Texts = _texts, + ShowLabels = true, + ShowOrbit = true, + ShowGraticule = true, + ShowKeyLatitudes = true, + FrameRate = 120, + View = IsRevolution ? SceneView.Revolution : SceneView.Rotation + }; + _canvas.JumpToOrbit(StartAngle); + _canvas.JumpToSpin(20); + _canvas.ZoomChanged += zoom => + { + if (_zoomText != null) _zoomText.Text = $"{zoom * 100:0}%"; + }; + + // 课堂特写:同一套渲染器,把当前直射纬度放大给全班看 + _closeup = new CelestialView + { + Scene = runtime, + Texts = _texts, + View = SceneView.Rotation, + IsPlaying = false, + ShowHud = false, + ShowLabels = true, + ShowGraticule = false, + ShowKeyLatitudes = true, + InsetMode = true, + Width = 240, + Height = 240 + }; + _closeup.JumpToSpin(20); + + _uiTimer = new DispatcherTimer(TimeSpan.FromMilliseconds(140), + DispatcherPriority.Render, (_, _) => RefreshTeaching()); + + var root = new Grid { RowDefinitions = new RowDefinitions("Auto,Auto,*,Auto") }; + + var top = BuildTopBar(); + root.Children.Add(top); + + var options = BuildOptionsBar(); + Grid.SetRow(options, 1); + root.Children.Add(options); + + var stage = new Grid(); + stage.Children.Add(_canvas); + stage.Children.Add(BuildZoomPad()); + _lessons = BuildClassroomCard(); + stage.Children.Add(_lessons); + Grid.SetRow(stage, 2); + root.Children.Add(stage); + + var bottom = BuildBottomBar(); + Grid.SetRow(bottom, 3); + root.Children.Add(bottom); + + Content = root; + ApplyVisibility(); + RefreshTeaching(); + + // 打开时整窗淡入,避免「啪」地出现 + Opacity = 0; + Transitions = new Transitions + { + new DoubleTransition + { + Property = OpacityProperty, + Duration = TimeSpan.FromMilliseconds(260), + Easing = new CubicEaseOut() + } + }; + AttachedToVisualTree += (_, _) => + { + Opacity = 1; + _uiTimer.Start(); + if (TopLevel.GetTopLevel(this) is Window window) + { + _hostWindow = window; + window.KeyDown += OnKeyDown; + } + }; + DetachedFromVisualTree += (_, _) => + { + _uiTimer.Stop(); + if (_hostWindow != null) + { + _hostWindow.KeyDown -= OnKeyDown; + _hostWindow = null; + } + }; + } + + private Window? _hostWindow; + + /// + /// 窗口关闭时释放计时器、解绑窗口事件并释放两块球面位图, + /// 否则 DispatcherTimer / KeyDown 会持有控件,使 collectible ALC 无法卸载。 + /// + public void Dispose() + { + _uiTimer.Stop(); + if (_hostWindow != null) + { + _hostWindow.KeyDown -= OnKeyDown; + _hostWindow = null; + } + _canvas.Dispose(); + _closeup.Dispose(); + GC.SuppressFinalize(this); + } + + private string CurrentView { get; set; } = "rotation"; + private double StartAngle => IsRevolution ? 60 : 0; + private bool IsRevolution => string.Equals(CurrentView, "revolution", StringComparison.OrdinalIgnoreCase); + private bool HasViewSwitch => _views.Count > 1; + private List Seasons => _runtime.Scene.Orbit.Seasons; + + private static string NormalizeView(string? view) + => string.Equals(view, "revolution", StringComparison.OrdinalIgnoreCase) ? "revolution" : "rotation"; + + private List ResolveViews(SceneDefinition scene) + { + var list = new List(); + foreach (var v in scene.Views) + { + var normalized = NormalizeView(v); + if (!list.Contains(normalized)) list.Add(normalized); + } + if (list.Count == 0) list.Add(NormalizeView(scene.DefaultView)); + CurrentView = list[0]; + return list; + } + + // ---------------------------------------------------------------- 顶部主工具栏 + private Control BuildTopBar() + { + // 关闭按钮统一放在窗口右上角的自建标题栏,这里不再重复放左上角 + var title = new StackPanel { Spacing = 1, VerticalAlignment = VerticalAlignment.Center }; + title.Children.Add(new TextBlock + { + Text = _texts.Pick(_runtime.Scene.NameI18n, _texts["title"]), + Foreground = TitleBrush, + FontSize = 14, + FontWeight = FontWeight.SemiBold + }); + title.Children.Add(new TextBlock + { + Text = _texts.Pick(_runtime.Scene.DescriptionI18n, ""), + Foreground = MutedBrush, + FontSize = 10.5, + MaxWidth = 330, + TextTrimming = TextTrimming.CharacterEllipsis + }); + + var switchPanel = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 3 }; + switchPanel.Children.Add(MakeViewButton("rotation", _texts["view.rotation"])); + switchPanel.Children.Add(MakeViewButton("revolution", _texts["view.revolution"])); + _viewSwitch = new Border + { + Background = ControlBg, + CornerRadius = new CornerRadius(10), + Padding = new Thickness(3), + Margin = new Thickness(16, 0, 0, 0), + VerticalAlignment = VerticalAlignment.Center, + Child = switchPanel + }; + + var actions = new StackPanel + { + Orientation = Orientation.Horizontal, + Spacing = 8, + VerticalAlignment = VerticalAlignment.Center + }; + _playButton = MakeButton(_texts["pause"], TogglePlay); + _playButton.MinWidth = 74; + actions.Children.Add(_playButton); + actions.Children.Add(MakeButton(_texts["reset"], () => + { + _canvas.ResetAnimation(); + _canvas.JumpToOrbit(StartAngle); + RefreshTeaching(); + })); + actions.Children.Add(MakeButton("◀", () => Step(-5), large: true)); + actions.Children.Add(MakeButton("▶", () => Step(5), large: true)); + actions.Children.Add(MakeButton(_texts["classroom"], () => SetLessonsVisible(!_showLessons))); + actions.Children.Add(MakeButton("⛶", ToggleFullScreen, large: true)); + + var grid = new Grid { ColumnDefinitions = new ColumnDefinitions("Auto,Auto,*,Auto") }; + Grid.SetColumn(title, 0); + title.Margin = new Thickness(14, 0, 0, 0); + grid.Children.Add(title); + Grid.SetColumn(_viewSwitch, 1); + grid.Children.Add(_viewSwitch); + Grid.SetColumn(actions, 3); + grid.Children.Add(actions); + + return new Border { Background = PanelBg, Padding = new Thickness(16, 9), Child = grid }; + } + + // ---------------------------------------------------------------- 显示选项行 + private Control BuildOptionsBar() + { + var row = new StackPanel + { + Orientation = Orientation.Horizontal, + Spacing = 7, + VerticalAlignment = VerticalAlignment.Center + }; + row.Children.Add(MakeToggle(_texts["labels"], _labels, on => { _labels = on; _canvas.ShowLabels = on; })); + row.Children.Add(MakeToggle(_texts["orbit"], _orbit, on => { _orbit = on; _canvas.ShowOrbit = on; })); + row.Children.Add(MakeToggle(_texts["grid"], _grid, on => { _grid = on; _canvas.ShowGraticule = on; })); + row.Children.Add(MakeToggle(_texts["tilt"], _tilt, on => { _tilt = on; _canvas.ExaggerateTilt = on; })); + _closeupButton = MakeToggle(_texts["closeup"], _showCloseup, on => + { + _showCloseup = on; + ApplyVisibility(); + }); + row.Children.Add(_closeupButton); + _overheadButton = MakeToggle(_texts["overhead"], _overhead, on => + { + _overhead = on; + // 视角只由这个显式控件改变;拖动永远不会碰它 + _canvas.CameraElevation = on ? (IsRevolution ? 74 : 62) : double.NaN; + }); + row.Children.Add(_overheadButton); + + var shortcut = new TextBlock + { + Text = _texts["shortcutHint"], + Foreground = FaintBrush, + FontSize = 10.5, + VerticalAlignment = VerticalAlignment.Center, + Margin = new Thickness(12, 0, 0, 0) + }; + + var grid = new Grid { ColumnDefinitions = new ColumnDefinitions("Auto,*") }; + grid.Children.Add(row); + Grid.SetColumn(shortcut, 1); + grid.Children.Add(shortcut); + return new Border + { + Background = new SolidColorBrush(Color.Parse("#A00A1020")), + Padding = new Thickness(16, 7), + Child = grid + }; + } + + private ModelButton MakeViewButton(string view, string label) + { + var button = MakeButton(label, () => SwitchView(view)); + button.SetBase(string.Equals(CurrentView, view, StringComparison.OrdinalIgnoreCase) ? Accent : ControlBg); + button.Tag = view; + button.IsVisible = _views.Contains(view); + _viewButtons.Add(button); + return button; + } + + private ModelButton MakeToggle(string label, bool initial, Action changed) + { + var state = initial; + ModelButton? button = null; + button = MakeButton(label, () => + { + state = !state; + changed(state); + button?.SetBase(state ? Accent : ControlBg); + }); + button.SetBase(initial ? Accent : ControlBg); + return button; + } + + private void SwitchView(string view) + { + CurrentView = NormalizeView(view); + _canvas.View = IsRevolution ? SceneView.Revolution : SceneView.Rotation; + _canvas.JumpToOrbit(StartAngle); + _canvas.CameraElevation = _overhead ? (IsRevolution ? 74 : 62) : double.NaN; + foreach (var button in _viewButtons) + button.SetBase(string.Equals(button.Tag as string, CurrentView, StringComparison.OrdinalIgnoreCase) + ? Accent + : ControlBg); + ApplyVisibility(); + RefreshTeaching(); + } + + // ---------------------------------------------------------------- 画布浮动缩放板(触控大按钮) + private Control BuildZoomPad() + { + var plus = MakeButton("+", () => _canvas.ZoomBy(1.25), large: true); + var minus = MakeButton("-", () => _canvas.ZoomBy(1 / 1.25), large: true); + var reset = MakeButton("⟲", () => _canvas.ResetView(), large: true); + foreach (var b in new[] { plus, minus, reset }) + { + b.MinWidth = 62; + b.MinHeight = 48; + b.HorizontalAlignment = HorizontalAlignment.Stretch; + } + + _zoomText = new TextBlock + { + Text = "100%", + Foreground = TextBrush, + FontSize = 13, + FontWeight = FontWeight.SemiBold, + TextAlignment = TextAlignment.Center, + Margin = new Thickness(0, 2, 0, 2) + }; + + var stack = new StackPanel { Spacing = 6, Width = 62 }; + stack.Children.Add(new TextBlock + { + Text = _texts["zoom"], + Foreground = MutedBrush, + FontSize = 10.5, + TextAlignment = TextAlignment.Center + }); + stack.Children.Add(plus); + stack.Children.Add(_zoomText); + stack.Children.Add(minus); + stack.Children.Add(reset); + + return new Border + { + HorizontalAlignment = HorizontalAlignment.Left, + VerticalAlignment = VerticalAlignment.Bottom, + Margin = new Thickness(16, 0, 0, 16), + Background = new SolidColorBrush(Color.Parse("#C00B1226")), + BorderBrush = new SolidColorBrush(Color.Parse("#26374F")), + BorderThickness = new Thickness(1), + CornerRadius = new CornerRadius(14), + Padding = new Thickness(10), + Child = stack + }; + } + + // ---------------------------------------------------------------- 底部 + private Control BuildBottomBar() + { + var speedLabel = new TextBlock + { + Text = _texts["speed"], + Foreground = new SolidColorBrush(Color.Parse("#9DB0D0")), + VerticalAlignment = VerticalAlignment.Center + }; + + var slider = new Slider + { + Minimum = 0.25, + Maximum = 4, + Value = 1, + Margin = new Thickness(12, 0, 0, 0), + Width = 180, + Height = 38 + }; + var speedText = new TextBlock + { + Text = "1×", + Foreground = TextBrush, + VerticalAlignment = VerticalAlignment.Center, + Width = 46, + Margin = new Thickness(6, 0, 0, 0) + }; + slider.ValueChanged += (_, e) => + { + _canvas.Speed = e.NewValue; + speedText.Text = $"{e.NewValue:0.##}×"; + }; + + var hint = new TextBlock + { + Text = _texts["hint"], + Foreground = FaintBrush, + FontSize = 10.5, + VerticalAlignment = VerticalAlignment.Center, + Margin = new Thickness(20, 0, 0, 0), + TextTrimming = TextTrimming.CharacterEllipsis + }; + + _seasonPanel = new StackPanel + { + Orientation = Orientation.Horizontal, + Spacing = 7, + VerticalAlignment = VerticalAlignment.Center + }; + _seasonPanel.Children.Add(new TextBlock + { + Text = _texts["seasons"], + Foreground = MutedBrush, + VerticalAlignment = VerticalAlignment.Center, + Margin = new Thickness(0, 0, 6, 0) + }); + foreach (var season in Seasons) _seasonPanel.Children.Add(MakeSeasonButton(season)); + + var grid = new Grid { ColumnDefinitions = new ColumnDefinitions("Auto,Auto,Auto,*,Auto") }; + grid.Children.Add(speedLabel); + Grid.SetColumn(slider, 1); + grid.Children.Add(slider); + Grid.SetColumn(speedText, 2); + grid.Children.Add(speedText); + Grid.SetColumn(hint, 3); + grid.Children.Add(hint); + Grid.SetColumn(_seasonPanel, 4); + grid.Children.Add(_seasonPanel); + + return new Border { Background = PanelBg, Padding = new Thickness(16, 8), Child = grid }; + } + + private ModelButton MakeSeasonButton(SeasonPoint season) + { + var captured = season; + var button = MakeButton(_texts[season.Key], () => JumpToSeason(captured)); + button.MinHeight = 44; + return button; + } + + // ---------------------------------------------------------------- 课堂演示卡 + private Border BuildClassroomCard() + { + var header = new Grid { ColumnDefinitions = new ColumnDefinitions("*,Auto") }; + header.Children.Add(new TextBlock + { + Text = _texts["classroom"], + Foreground = TitleBrush, + FontWeight = FontWeight.SemiBold, + FontSize = 13, + VerticalAlignment = VerticalAlignment.Center + }); + var close = MakeButton("✕", () => SetLessonsVisible(false)); + close.SetBase(Brushes.Transparent); + Grid.SetColumn(close, 1); + header.Children.Add(close); + + _cardState = new TextBlock + { + Text = _texts["running"], + Foreground = MutedBrush, + FontSize = 11, + Margin = new Thickness(0, 6, 0, 0) + }; + _cardTitle = new TextBlock + { + Foreground = TitleBrush, + FontSize = 20, + FontWeight = FontWeight.Bold + }; + _cardDate = new TextBlock { Foreground = MutedBrush, FontSize = 12 }; + _cardDirect = new TextBlock + { + Foreground = WarmBrush, + FontSize = 27, + FontWeight = FontWeight.Bold + }; + _cardNote = new TextBlock + { + Foreground = BodyBrush, + FontSize = 12, + TextWrapping = TextWrapping.Wrap, + LineHeight = 18 + }; + + _closeupHost = new Border + { + CornerRadius = new CornerRadius(10), + BorderBrush = new SolidColorBrush(Color.Parse("#26374F")), + BorderThickness = new Thickness(1), + HorizontalAlignment = HorizontalAlignment.Center, + Margin = new Thickness(0, 4, 0, 2), + Child = _closeup + }; + + var readouts = new StackPanel { Spacing = 2 }; + readouts.Children.Add(_cardState); + readouts.Children.Add(_cardTitle); + readouts.Children.Add(_cardDate); + readouts.Children.Add(new TextBlock + { + Text = _texts["directPoint"], + Foreground = MutedBrush, + FontSize = 11, + Margin = new Thickness(0, 8, 0, 0) + }); + readouts.Children.Add(_cardDirect); + readouts.Children.Add(_cardNote); + _closeupLabel = new TextBlock + { + Text = _texts["closeup"], + Foreground = MutedBrush, + FontSize = 11, + Margin = new Thickness(0, 6, 0, 0) + }; + readouts.Children.Add(_closeupLabel); + readouts.Children.Add(_closeupHost); + + var list = new StackPanel { Spacing = 2 }; + foreach (var lesson in _runtime.Scene.Lessons) + { + var title = new TextBlock + { + Text = _texts.Pick(lesson.TitleI18n, ""), + Foreground = new SolidColorBrush(Color.Parse("#CFE0FF")), + FontSize = 12, + FontWeight = FontWeight.SemiBold, + TextWrapping = TextWrapping.Wrap + }; + var body = new TextBlock + { + Text = _texts.Pick(lesson.BodyI18n, ""), + Foreground = BodyBrush, + FontSize = 11, + TextWrapping = TextWrapping.Wrap + }; + var stack = new StackPanel { Spacing = 3 }; + stack.Children.Add(title); + stack.Children.Add(body); + + var button = new Button + { + Content = stack, + Background = Brushes.Transparent, + BorderThickness = new Thickness(0), + HorizontalAlignment = HorizontalAlignment.Stretch, + HorizontalContentAlignment = HorizontalAlignment.Left, + Padding = new Thickness(8, 9), + Margin = new Thickness(0, 1), + MinHeight = 44, + Cursor = new Cursor(StandardCursorType.Hand), + Transitions = new Transitions + { + new BrushTransition { Property = BackgroundProperty, Duration = HoverDuration } + } + }; + var captured = lesson; + button.Click += (_, _) => ApplyLesson(captured); + button.PointerEntered += (_, _) => button.Background = new SolidColorBrush(Color.Parse("#1B2A47")); + button.PointerExited += (_, _) => button.Background = Brushes.Transparent; + list.Children.Add(button); + } + + var content = new StackPanel { Spacing = 8 }; + content.Children.Add(readouts); + content.Children.Add(new TextBlock + { + Text = _texts["lessons"], + Foreground = TitleBrush, + FontWeight = FontWeight.SemiBold, + FontSize = 12.5 + }); + content.Children.Add(list); + + var bodyGrid = new Grid { RowDefinitions = new RowDefinitions("Auto,*") }; + bodyGrid.Children.Add(header); + var scroller = new ScrollViewer + { + Content = content, + VerticalScrollBarVisibility = ScrollBarVisibility.Auto, + Margin = new Thickness(0, 8, 0, 0) + }; + Grid.SetRow(scroller, 1); + bodyGrid.Children.Add(scroller); + + var panel = new Border + { + HorizontalAlignment = HorizontalAlignment.Right, + VerticalAlignment = VerticalAlignment.Stretch, + Width = 296, + Margin = new Thickness(0, 12, 16, 12), + Background = new SolidColorBrush(Color.Parse("#D00B1226")), + CornerRadius = new CornerRadius(14), + Padding = new Thickness(13), + BorderBrush = new SolidColorBrush(Color.Parse("#26374F")), + BorderThickness = new Thickness(1), + Child = bodyGrid, + RenderTransform = new TranslateTransform(0, 0) + }; + panel.Transitions = new Transitions + { + new DoubleTransition { Property = OpacityProperty, Duration = PanelDuration, Easing = new CubicEaseOut() }, + new DoubleTransition + { + Property = TranslateTransform.XProperty, + Duration = PanelDuration, + Easing = new CubicEaseOut() + } + }; + return panel; + } + + private void SetLessonsVisible(bool visible) + { + _showLessons = visible; + if (_lessons == null) return; + + if (visible) + { + _lessons.IsVisible = true; + _lessons.Opacity = 1; + if (_lessons.RenderTransform is TranslateTransform transform) transform.X = 0; + return; + } + + _lessons.Opacity = 0; + if (_lessons.RenderTransform is TranslateTransform hidden) hidden.X = 26; + + var timer = new DispatcherTimer { Interval = PanelDuration }; + timer.Tick += (_, _) => + { + timer.Stop(); + if (!_showLessons && _lessons != null) _lessons.IsVisible = false; + }; + timer.Start(); + } + + /// 课堂卡与地球特写跟随当前轨道位置刷新(播放时每 140ms 更新一次)。 + private void RefreshTeaching() + { + if (_cardTitle == null) return; + var season = IsRevolution ? _canvas.NearestSeason(6) : null; + var decl = _canvas.SubsolarLatitude; + + _cardState!.Text = _playing ? _texts["running"] : _texts["frozen"]; + _cardState.Foreground = _playing ? MutedBrush : WarmBrush; + _cardTitle.Text = season != null + ? _texts[season.Key] + : (IsRevolution ? _texts["seasons"] : _texts.Pick(_runtime.Scene.NameI18n, _texts["title"])); + _cardDate!.Text = IsRevolution ? _canvas.CurrentDate : _texts["dayNight"]; + _cardDirect!.Text = season?.DeclinationDeg.HasValue == true + ? FormatDeclination(season.DeclinationDeg.Value) + : _canvas.DeclinationLabel; + _cardNote!.Text = !IsRevolution + ? _texts["rotationTeach"] + : season != null + ? _texts.Pick(season.TeachingI18n, _texts["orbitTeach"]) + : _texts["orbitTeach"]; + + // 特写的直射纬度用缓动逼近目标,而不是瞬间跳变: + // 公转时拖动/改变轨道角,晨昏线会平滑地移过去(每次 timer 步进一帧)。 + if (_showCloseup) + { + var target = decl; + var current = _closeup.DeclinationDeg; + var diff = target - current; + if (Math.Abs(diff) < 0.02) + { + _closeup.DeclinationDeg = target; + } + else + { + // 每 140ms 走剩余距离的 ~18%,形成自然的 ease-out 动画 + _closeup.DeclinationDeg = current + diff * 0.18; + } + _lastDeclination = target; + } + } + + private string FormatDeclination(double d) + => Math.Abs(d) < 0.05 + ? "0° " + _texts["lat.equator"] + : $"{Math.Abs(d):0.0}°" + (d > 0 ? _texts["northShort"] : _texts["southShort"]); + + private void ApplyLesson(Lesson lesson) + { + if (!string.IsNullOrWhiteSpace(lesson.View)) + { + var view = NormalizeView(lesson.View); + if (!string.Equals(view, CurrentView, StringComparison.OrdinalIgnoreCase)) SwitchView(view); + } + // 讲要点时自动定格,读数不再跳动,方便指读板书 + SetPlaying(false); + if (lesson.AngleDeg.HasValue) _canvas.JumpToOrbit(lesson.AngleDeg.Value); + RefreshTeaching(); + } + + // ---------------------------------------------------------------- 教学操作 + private void SetPlaying(bool play) + { + _playing = play; + _canvas.IsPlaying = play; + if (_playButton?.Content is TextBlock block) + block.Text = play ? _texts["pause"] : _texts["play"]; + RefreshTeaching(); + } + + private void TogglePlay() => SetPlaying(!_playing); + + private void Step(double deltaDeg) + { + SetPlaying(false); + if (IsRevolution) _canvas.StepOrbit(deltaDeg); + else _canvas.StepSpin(deltaDeg); + RefreshTeaching(); + } + + private void JumpToSeason(SeasonPoint season) + { + if (!IsRevolution) SwitchView("revolution"); + SetPlaying(false); + _canvas.JumpToOrbit(season.AngleDeg); + RefreshTeaching(); + } + + private void JumpToSeasonIndex(int index) + { + if (index < 0 || index >= Seasons.Count) return; + JumpToSeason(Seasons[index]); + } + + private void ToggleFullScreen() + { + try + { + if (TopLevel.GetTopLevel(this) is Window window) + window.WindowState = window.WindowState == WindowState.FullScreen + ? WindowState.Normal + : WindowState.FullScreen; + } + catch (Exception ex) + { + _context.Log("全屏切换失败: " + ex.Message); + } + } + + private void OnKeyDown(object? sender, KeyEventArgs e) + { + switch (e.Key) + { + case Key.Space: + TogglePlay(); + e.Handled = true; + break; + case Key.Left: + Step(-5); + e.Handled = true; + break; + case Key.Right: + Step(5); + e.Handled = true; + break; + case Key.D1: JumpToSeasonIndex(0); e.Handled = true; break; + case Key.D2: JumpToSeasonIndex(1); e.Handled = true; break; + case Key.D3: JumpToSeasonIndex(2); e.Handled = true; break; + case Key.D4: JumpToSeasonIndex(3); e.Handled = true; break; + case Key.F: ToggleFullScreen(); e.Handled = true; break; + case Key.Add: _canvas.ZoomBy(1.25); e.Handled = true; break; + case Key.Subtract: _canvas.ZoomBy(1 / 1.25); e.Handled = true; break; + case Key.D0: _canvas.ResetView(); e.Handled = true; break; + } + } + + // ---------------------------------------------------------------- 工具 + private ModelButton MakeButton(string text, Action onClick, bool large = false) + { + var button = new ModelButton + { + Content = new TextBlock { Text = text, FontSize = large ? 20 : 12.5 }, + Foreground = TextBrush, + BorderThickness = new Thickness(0), + CornerRadius = new CornerRadius(9), + Padding = large ? new Thickness(10, 8) : new Thickness(13, 9), + MinWidth = large ? 46 : 44, + MinHeight = 40, + HorizontalContentAlignment = HorizontalAlignment.Center, + VerticalAlignment = VerticalAlignment.Center, + Cursor = new Cursor(StandardCursorType.Hand) + }; + button.SetBase(ControlBg); + button.Click += (_, _) => onClick(); + return button; + } + + private void ApplyVisibility() + { + if (_viewSwitch != null) _viewSwitch.IsVisible = HasViewSwitch; + if (_lessons != null) _lessons.IsVisible = _showLessons; + if (_seasonPanel != null) _seasonPanel.IsVisible = IsRevolution; + if (_closeupHost != null) _closeupHost.IsVisible = _showCloseup; + if (_closeupLabel != null) _closeupLabel.IsVisible = _showCloseup; + } + + /// 带悬停过渡的按钮:本地基础色 + 悬停提亮。 + private sealed class ModelButton : Button + { + private IBrush _base = ControlBg; + private IBrush _hover = ControlBg; + + public ModelButton() + { + Transitions = new Transitions + { + new BrushTransition { Property = BackgroundProperty, Duration = HoverDuration } + }; + } + + public void SetBase(IBrush brush) + { + _base = brush; + _hover = Lighten(brush); + Background = brush; + } + + protected override void OnPointerEntered(PointerEventArgs e) + { + base.OnPointerEntered(e); + Background = _hover; + } + + protected override void OnPointerExited(PointerEventArgs e) + { + base.OnPointerExited(e); + Background = _base; + } + + private static IBrush Lighten(IBrush brush) + { + if (brush is not SolidColorBrush solid) return brush; + var c = solid.Color; + return new SolidColorBrush(Color.FromArgb(c.A, + (byte)Math.Min(255, c.R + 26), + (byte)Math.Min(255, c.G + 26), + (byte)Math.Min(255, c.B + 30))); + } + } +} diff --git a/.GC/cache/sources/gitcode-official/model/_engine/src/EngineEntry.cs b/.GC/cache/sources/gitcode-official/model/_engine/src/EngineEntry.cs new file mode 100644 index 0000000..dc45319 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_engine/src/EngineEntry.cs @@ -0,0 +1,45 @@ +using System; +using Avalonia.Controls; +using EarthModelStudio.ModelSdk; + +namespace NeoRF.EarthModels; + +/// +/// 地球模型共享运行时:读自己目录下的 scene.json / land.json / i18n, +/// 然后把自带界面交给启动器。启动器完全不知道“地球”“节气”这些东西。 +/// +public sealed class EarthModelRuntime : IModelRuntime +{ + public const int SupportedApiVersion = 1; + + private SceneRuntime? _scene; + + /// 后台准备:读场景、生成地表纹理(耗时都花在这里,进度条能实时走)。 + public void Prepare(IModelContext context) + { + context.ReportProgress(0.03, "读取场景数据"); + _scene = SceneRuntime.Load(context.DataDirectory, context.MemoryBudgetMb, context.ReportProgress); + context.Log($"[{context.ModelId}] 场景已加载:{_scene.Scene.DefaultView}," + + $"地表纹理 {(_scene.Texture == null ? "无" : _scene.Texture.Width + "×" + _scene.Texture.Height)}"); + } + + /// UI 线程构建界面(很快)。 + public Control CreateView(IModelContext context) + { + context.ReportProgress(0.78, "构建界面"); + _scene ??= SceneRuntime.Load(context.DataDirectory, context.MemoryBudgetMb, context.ReportProgress); + var view = new EarthModelView(context, _scene); + context.ReportProgress(1.0, "准备就绪"); + return view; + } + + /// + /// 释放预烘焙纹理(约 3MB 托管数组)与场景引用。窗口关闭时由启动器调用, + /// 避免 collectible ALC 里的类型被长生命周期引用拖住而无法卸载。 + /// + public void Dispose() + { + _scene = null; + GC.SuppressFinalize(this); + } +} diff --git a/.GC/cache/sources/gitcode-official/model/_engine/src/Geometry.cs b/.GC/cache/sources/gitcode-official/model/_engine/src/Geometry.cs new file mode 100644 index 0000000..5c0cbfa --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_engine/src/Geometry.cs @@ -0,0 +1,110 @@ +using System; +using System.Collections.Generic; +using System.Numerics; + +namespace NeoRF.EarthModels; + +/// +/// 地理模型的球面几何工具:经纬度 ↔ 单位球坐标、正交投影到屏幕、 +/// 以及把一条经纬度折线投影成「可见弧段」(背面自动裁掉)。 +/// 纯 CPU、无依赖,供 GeographyView 画线稿用。 +/// +public static class Geometry +{ + public const float DegToRad = (float)(Math.PI / 180.0); + public const float RadToDeg = (float)(180.0 / Math.PI); + + /// 经纬度 → 单位球坐标(y 轴为地轴,lon 向东为正)。 + public static Vector3 LatLonToUnit(double latDeg, double lonDeg) + { + var lat = (float)(latDeg * Math.PI / 180.0); + var lon = (float)(lonDeg * Math.PI / 180.0); + var cosLat = (float)Math.Cos(lat); + return new Vector3(cosLat * (float)Math.Sin(lon), (float)Math.Sin(lat), cosLat * (float)Math.Cos(lon)); + } + + /// 把世界坐标旋转到相机空间(先用 planet 旋转地球,再用 cam 转到屏幕)。 + public static Vector3 ToCamera(Vector3 world, Matrix4x4 planet, Matrix4x4 cam) + => Vector3.Transform(Vector3.Transform(world, planet), cam); + + /// 相机空间的正交投影:球心在原点,半径 radius。 + public static Vector2 Project(Vector3 camPos, float radius, float centerX, float centerY) + => new(centerX + camPos.X * radius, centerY - camPos.Y * radius); + + /// 相机空间里该点是否朝向观察者(z>0 为正面)。 + public static bool IsVisible(Vector3 camPos, float threshold = 0f) => camPos.Z > threshold; + + /// + /// 把一条经纬度折线拆成若干段「可见」的屏幕折线。 + /// 跨越地平线的相邻两点用线性插值求出交点作为端点,保证线不会穿过球体背面。 + /// + public static List> ProjectPolyline( + IReadOnlyList latLonPoints, + Matrix4x4 planet, Matrix4x4 cam, + float radius, float centerX, float centerY, + bool closed = false) + { + var result = new List>(); + if (latLonPoints.Count < 2) return result; + + var count = latLonPoints.Count; + var total = closed ? count + 1 : count; + List? current = null; + + Vector3 prevCam = default; + var havePrev = false; + + for (var i = 0; i < total; i++) + { + var p = latLonPoints[i % count]; + if (p.Length < 2) { havePrev = false; continue; } + + var camPos = ToCamera(LatLonToUnit(p[1], p[0]), planet, cam); + var visible = camPos.Z > 0f; + + if (!havePrev) + { + if (visible) + { + current = new List(); + current.Add(Project(camPos, radius, centerX, centerY)); + } + prevCam = camPos; + havePrev = true; + continue; + } + + var prevVisible = prevCam.Z > 0f; + if (visible && prevVisible) + { + current ??= new List(); + current.Add(Project(camPos, radius, centerX, centerY)); + } + else if (visible != prevVisible) + { + // 求出与地平线(z=0)的交点 + var t = prevCam.Z / (prevCam.Z - camPos.Z); + var hit = Vector3.Lerp(prevCam, camPos, t); + hit.Z = 0f; + var hitScreen = Project(hit, radius, centerX, centerY); + + if (visible) + { + current = new List { hitScreen }; + current.Add(Project(camPos, radius, centerX, centerY)); + } + else + { + current?.Add(hitScreen); + if (current is { Count: > 1 }) result.Add(current); + current = null; + } + } + + prevCam = camPos; + } + + if (current is { Count: > 1 }) result.Add(current); + return result; + } +} diff --git a/.GC/cache/sources/gitcode-official/model/_engine/src/LandMask.cs b/.GC/cache/sources/gitcode-official/model/_engine/src/LandMask.cs new file mode 100644 index 0000000..d8e0bc0 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_engine/src/LandMask.cs @@ -0,0 +1,159 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Text.Json; +using System.Text.Json.Serialization; + +namespace NeoRF.EarthModels; + +/// <id>.model/land.json —— 简化的大陆轮廓(经纬度多边形)。 +public sealed class LandData +{ + [JsonPropertyName("polygons")] public List Polygons { get; set; } = new(); + + public static LandData? Load(string path) + { + if (!File.Exists(path)) return null; + try + { + return JsonSerializer.Deserialize(File.ReadAllText(path), ModelJson.Options); + } + catch (Exception ex) + { + Console.Error.WriteLine($"解析地表数据失败 {path}: {ex.Message}"); + return null; + } + } +} + +public sealed class LandPolygon +{ + [JsonPropertyName("name")] public string? Name { get; set; } + /// [[lon, lat], ...] + [JsonPropertyName("points")] public List Points { get; set; } = new(); +} + +/// +/// 等经纬度栅格地表掩膜(0=海洋 255=陆地),双线性采样。 +/// 每个模型只生成一次,受内存预算约束。 +/// +public sealed class LandMask +{ + public int Width { get; init; } + public int Height { get; init; } + public byte[] Bits { get; init; } = Array.Empty(); + + public long ByteSize => Bits.LongLength; + + public static LandMask Build(LandData data, int width = 1440, int height = 720) + { + var bits = new byte[width * height]; + foreach (var poly in data.Polygons) + { + if (poly.Points.Count < 3) continue; + var pts = Unwrap(poly.Points); + if (pts.Count < 3) continue; + for (var shift = -1; shift <= 1; shift++) + Rasterize(bits, width, height, pts, shift * 360.0); + } + return new LandMask { Width = width, Height = height, Bits = bits }; + } + + private static List<(double Lon, double Lat)> Unwrap(List points) + { + var result = new List<(double, double)>(points.Count); + if (points.Count == 0 || points[0].Length < 2) return result; + var prev = points[0][0]; + result.Add((prev, points[0][1])); + for (var i = 1; i < points.Count; i++) + { + if (points[i].Length < 2) continue; + var lon = points[i][0]; + while (lon - prev > 180) lon -= 360; + while (prev - lon > 180) lon += 360; + result.Add((lon, points[i][1])); + prev = lon; + } + return result; + } + + private static void Rasterize(byte[] bits, int w, int h, List<(double Lon, double Lat)> pts, double lonShift) + { + var n = pts.Count; + var xs = new double[n]; + var ys = new double[n]; + double minY = double.MaxValue, maxY = double.MinValue; + for (var i = 0; i < n; i++) + { + xs[i] = (pts[i].Lon + lonShift + 180.0) / 360.0 * w; + ys[i] = (90.0 - pts[i].Lat) / 180.0 * h; + if (ys[i] < minY) minY = ys[i]; + if (ys[i] > maxY) maxY = ys[i]; + } + + var y0 = Math.Max(0, (int)Math.Floor(minY)); + var y1 = Math.Min(h - 1, (int)Math.Ceiling(maxY)); + var crossings = new List(16); + + for (var y = y0; y <= y1; y++) + { + var sy = y + 0.5; + crossings.Clear(); + for (var i = 0; i < n; i++) + { + var j = (i + 1) % n; + double ya = ys[i], yb = ys[j]; + if (!((ya <= sy && yb > sy) || (yb <= sy && ya > sy))) continue; + var t = (sy - ya) / (yb - ya); + crossings.Add(xs[i] + t * (xs[j] - xs[i])); + } + if (crossings.Count < 2) continue; + crossings.Sort(); + for (var k = 0; k + 1 < crossings.Count; k += 2) + { + var xa = (int)Math.Ceiling(crossings[k] - 0.5); + var xb = (int)Math.Floor(crossings[k + 1] - 0.5); + if (xb < xa) continue; + if (xb - xa >= w - 1) + { + for (var x = 0; x < w; x++) bits[y * w + x] = 255; + continue; + } + for (var x = xa; x <= xb; x++) + { + var mx = x % w; + if (mx < 0) mx += w; + bits[y * w + mx] = 255; + } + } + } + } + + /// 返回 0..1 的陆地覆盖度。 + public double Sample(double lonDeg, double latDeg) + { + var u = (lonDeg + 180.0) / 360.0 * Width - 0.5; + var v = (90.0 - latDeg) / 180.0 * Height - 0.5; + var x0 = (int)Math.Floor(u); + var y0 = (int)Math.Floor(v); + var fx = u - x0; + var fy = v - y0; + double sum = 0; + for (var dy = 0; dy < 2; dy++) + { + var y = y0 + dy; + if (y < 0) y = 0; + if (y >= Height) y = Height - 1; + var wy = dy == 0 ? 1 - fy : fy; + for (var dx = 0; dx < 2; dx++) + { + var x = x0 + dx; + var mx = x % Width; + if (mx < 0) mx += Width; + var wx = dx == 0 ? 1 - fx : fx; + sum += Bits[y * Width + mx] * wx * wy; + } + } + return sum / 255.0; + } +} diff --git a/.GC/cache/sources/gitcode-official/model/_engine/src/ModelJson.cs b/.GC/cache/sources/gitcode-official/model/_engine/src/ModelJson.cs new file mode 100644 index 0000000..9bd0a88 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_engine/src/ModelJson.cs @@ -0,0 +1,27 @@ +using System.IO; +using System.Text.Encodings.Web; +using System.Text.Json; +using System.Text.Json.Serialization; + +namespace NeoRF.EarthModels; + +/// 模型自己的 JSON 读写(不依赖启动器)。 +public static class ModelJson +{ + public static readonly JsonSerializerOptions Options = new() + { + PropertyNameCaseInsensitive = true, + PropertyNamingPolicy = JsonNamingPolicy.CamelCase, + WriteIndented = true, + Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping, + DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull, + AllowTrailingCommas = true, + ReadCommentHandling = JsonCommentHandling.Skip + }; + + public static T? Read(string path) + { + if (!File.Exists(path)) return default; + return JsonSerializer.Deserialize(File.ReadAllText(path), Options); + } +} diff --git a/.GC/cache/sources/gitcode-official/model/_engine/src/ModelStrings.cs b/.GC/cache/sources/gitcode-official/model/_engine/src/ModelStrings.cs new file mode 100644 index 0000000..dffb791 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_engine/src/ModelStrings.cs @@ -0,0 +1,186 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.IO; +using System.Text.Json; + +namespace NeoRF.EarthModels; + +/// +/// 模型自己的一份文案。优先读模型数据目录里的 i18n/<language>.json, +/// 缺失时回退到代码内的默认文案,保证模型在没有语言包时也能完整显示。 +/// 启动器不再持有任何模型相关文案。 +/// +public sealed class ModelStrings +{ + private readonly Dictionary _texts; + + public string Language { get; } + + private ModelStrings(string language, Dictionary texts) + { + Language = language; + _texts = texts; + } + + public static ModelStrings Default { get; } = new("zh-CN", DefaultTexts.Zh); + + public string this[string key] + => _texts.TryGetValue(key, out var value) ? value + : DefaultTexts.Zh.TryGetValue(key, out var fallback) ? fallback + : key; + + public string F(string key, params object[] args) + => string.Format(CultureInfo.InvariantCulture, this[key], args); + + public string Pick(Dictionary? i18n, string fallback) + { + if (i18n == null) return fallback; + if (i18n.TryGetValue(Language, out var exact) && !string.IsNullOrWhiteSpace(exact)) return exact; + foreach (var pair in i18n) + { + if (Language.StartsWith(pair.Key, StringComparison.OrdinalIgnoreCase) && !string.IsNullOrWhiteSpace(pair.Value)) + return pair.Value; + } + if (i18n.TryGetValue("zh-CN", out var zh) && !string.IsNullOrWhiteSpace(zh)) return zh; + return fallback; + } + + public static ModelStrings Load(string dataDirectory, string language) + { + var zh = new Dictionary(DefaultTexts.Zh); + var isEnglish = language.StartsWith("en", StringComparison.OrdinalIgnoreCase); + var chosen = isEnglish ? new Dictionary(DefaultTexts.En) : new Dictionary(zh); + + // 语言包可以覆盖任意键:i18n/.json + var dir = Path.Combine(dataDirectory, "i18n"); + Overlay(Path.Combine(dir, language + ".json"), chosen); + if (!isEnglish) Overlay(Path.Combine(dir, "zh-CN.json"), chosen); + + return new ModelStrings(isEnglish ? "en" : "zh-CN", chosen); + } + + private static void Overlay(string path, Dictionary target) + { + if (!File.Exists(path)) return; + try + { + var map = JsonSerializer.Deserialize>(File.ReadAllText(path), ModelJson.Options); + if (map == null) return; + foreach (var pair in map) target[pair.Key] = pair.Value; + } + catch (Exception ex) + { + Console.Error.WriteLine($"读取模型语言包失败 {path}: {ex.Message}"); + } + } +} + +internal static class DefaultTexts +{ + public static readonly Dictionary Zh = new() + { + ["title"] = "地球模型", + ["view.rotation"] = "自转", + ["view.revolution"] = "公转", + ["play"] = "播放", + ["pause"] = "暂停", + ["speed"] = "速度", + ["reset"] = "重置", + ["labels"] = "标注", + ["orbit"] = "轨道", + ["grid"] = "经纬网", + ["tilt"] = "夸张倾角", + ["lessons"] = "教学要点", + ["seasons"] = "节气定位", + ["close"] = "关闭窗口", + ["hint"] = "双指捏合或滚轮缩放 · 拖动可转动地球", + ["shortcutHint"] = "空格 播放/暂停 · ←→ 步进 · 1–4 二分二至 · F 全屏", + ["classroom"] = "课堂演示", + ["directPoint"] = "太阳直射", + ["frozen"] = "已定格", + ["running"] = "播放中", + ["step"] = "步进", + ["closeup"] = "地球特写", + ["overhead"] = "俯视", + ["sideview"] = "侧视", + ["zoom"] = "缩放", + ["orbitTeach"] = "太阳直射点在南北回归线之间往返,形成四季更替。", + ["rotationTeach"] = "晨昏线把地球分成昼半球与夜半球;自转产生昼夜交替与地方时差。", + ["dayNight"] = "昼夜交替周期 24 小时", + ["lat.equator"] = "赤道", + ["lat.tropicN"] = "北回归线 23.5°N", + ["lat.tropicS"] = "南回归线 23.5°S", + ["lat.polarN"] = "北极圈 66.5°N", + ["lat.polarS"] = "南极圈 66.5°S", + ["loading"] = "正在准备场景…", + ["subsolar"] = "太阳直射点", + ["north"] = "北极", + ["south"] = "南极", + ["northShort"] = "N", + ["southShort"] = "S", + ["sun"] = "太阳", + ["earth"] = "地球", + ["spinInfo"] = "自转 {0}° · 周期 {1} 小时", + ["orbitInfo"] = "公转 {0}°", + ["declinationInfo"] = "太阳直射 {0}", + ["dateInfo"] = "日期 {0}", + ["season.springEquinox"] = "春分", + ["season.summerSolstice"] = "夏至", + ["season.autumnEquinox"] = "秋分", + ["season.winterSolstice"] = "冬至" + }; + + public static readonly Dictionary En = new() + { + ["title"] = "Earth model", + ["view.rotation"] = "Rotation", + ["view.revolution"] = "Revolution", + ["play"] = "Play", + ["pause"] = "Pause", + ["speed"] = "Speed", + ["reset"] = "Reset", + ["labels"] = "Labels", + ["orbit"] = "Orbit", + ["grid"] = "Graticule", + ["tilt"] = "Exaggerate tilt", + ["lessons"] = "Teaching notes", + ["seasons"] = "Solstices & equinoxes", + ["close"] = "Close window", + ["hint"] = "Pinch or scroll to zoom · drag to turn the Earth", + ["shortcutHint"] = "Space play/pause · ←→ step · 1–4 solstices & equinoxes · F fullscreen", + ["classroom"] = "Classroom", + ["directPoint"] = "Subsolar", + ["frozen"] = "Frozen", + ["running"] = "Playing", + ["step"] = "Step", + ["closeup"] = "Earth close-up", + ["overhead"] = "Top view", + ["sideview"] = "Side view", + ["zoom"] = "Zoom", + ["orbitTeach"] = "The subsolar point travels between the tropics, producing the seasons.", + ["rotationTeach"] = "The terminator splits day and night; rotation drives the day–night cycle and local time.", + ["dayNight"] = "Day–night cycle: 24 h", + ["lat.equator"] = "Equator", + ["lat.tropicN"] = "Tropic of Cancer 23.5°N", + ["lat.tropicS"] = "Tropic of Capricorn 23.5°S", + ["lat.polarN"] = "Arctic Circle 66.5°N", + ["lat.polarS"] = "Antarctic Circle 66.5°S", + ["loading"] = "Preparing scene…", + ["subsolar"] = "Subsolar point", + ["north"] = "North pole", + ["south"] = "South pole", + ["northShort"] = "N", + ["southShort"] = "S", + ["sun"] = "Sun", + ["earth"] = "Earth", + ["spinInfo"] = "Rotation {0}° · period {1} h", + ["orbitInfo"] = "Orbit {0}°", + ["declinationInfo"] = "Subsolar {0}", + ["dateInfo"] = "Date {0}", + ["season.springEquinox"] = "Spring equinox", + ["season.summerSolstice"] = "Summer solstice", + ["season.autumnEquinox"] = "Autumn equinox", + ["season.winterSolstice"] = "Winter solstice" + }; +} diff --git a/.GC/cache/sources/gitcode-official/model/_engine/src/PlanetScene.cs b/.GC/cache/sources/gitcode-official/model/_engine/src/PlanetScene.cs new file mode 100644 index 0000000..1fa7b14 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_engine/src/PlanetScene.cs @@ -0,0 +1,76 @@ +using System.Collections.Generic; + +namespace NeoRF.EarthModels; + +/// <id>.model/scene.json —— 模型数据(可视化场景描述)。 +public sealed class SceneDefinition +{ + public int SchemaVersion { get; set; } = 1; + public string Type { get; set; } = "planet"; + /// rotation | revolution + public string DefaultView { get; set; } = "rotation"; + /// 模型支持的视图;为空表示只有 defaultView。 + public List Views { get; set; } = new(); + public Dictionary? NameI18n { get; set; } + public Dictionary? DescriptionI18n { get; set; } + public StarDefinition Star { get; set; } = new(); + public PlanetDefinition Planet { get; set; } = new(); + public OrbitDefinition Orbit { get; set; } = new(); + public List Lessons { get; set; } = new(); +} + +public sealed class StarDefinition +{ + public string Name { get; set; } = "Sun"; + public Dictionary? NameI18n { get; set; } + public string Color { get; set; } = "#FFC24B"; + /// 相对行星半径的视觉倍率 + public double RadiusScale { get; set; } = 0.5; +} + +public sealed class PlanetDefinition +{ + public string Name { get; set; } = "Earth"; + public Dictionary? NameI18n { get; set; } + /// 黄赤交角:教材值 23.5°(23°26′),决定南北回归线纬度。 + public double AxialTiltDeg { get; set; } = 23.5; + /// 回归线纬度,默认与黄赤交角一致;极圈 = 90 − 回归线。 + public double TropicDeg { get; set; } = 23.5; + public double RotationHours { get; set; } = 23.93; + public double OrbitDays { get; set; } = 365.26; + public string OceanColor { get; set; } = "#1B5FA8"; + public string LandColor { get; set; } = "#4F8C4C"; + public string? IceColor { get; set; } = "#E8EEF4"; + public string? LandFile { get; set; } = "land.json"; + public bool ShowGraticule { get; set; } = true; +} + +public sealed class OrbitDefinition +{ + public double SemiMajorAxis { get; set; } = 4.0; + public double Eccentricity { get; set; } = 0.0167; + public bool Show { get; set; } = true; + /// 节气方位声明:springTopSummerLeft = 上春分 / 左夏至(引擎按此布局绘制轨道)。 + public string SeasonLayout { get; set; } = "springTopSummerLeft"; + public List Seasons { get; set; } = new(); +} + +public sealed class SeasonPoint +{ + /// 0=春分 90=夏至 180=秋分 270=冬至 + public double AngleDeg { get; set; } + public string Key { get; set; } = ""; + public string? Date { get; set; } + /// 该节气的太阳直射纬度:春分/秋分 0,夏至 +23.5,冬至 −23.5。 + public double? DeclinationDeg { get; set; } + /// 课堂现象说明(写在模型数据里,启动器不参与)。 + public Dictionary? TeachingI18n { get; set; } +} + +public sealed class Lesson +{ + public Dictionary? TitleI18n { get; set; } + public Dictionary? BodyI18n { get; set; } + public string? View { get; set; } + public double? AngleDeg { get; set; } +} diff --git a/.GC/cache/sources/gitcode-official/model/_engine/src/PlanetSceneRuntime.cs b/.GC/cache/sources/gitcode-official/model/_engine/src/PlanetSceneRuntime.cs new file mode 100644 index 0000000..59fa9be --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_engine/src/PlanetSceneRuntime.cs @@ -0,0 +1,65 @@ +using System; +using System.IO; +using Avalonia.Media; + +namespace NeoRF.EarthModels; + +/// +/// 模型自己的场景运行时:场景描述 + 预烘焙地表纹理 + 调色板。 +/// 数据来自模型数据目录,不依赖启动器。 +/// +public sealed class SceneRuntime +{ + public SceneDefinition Scene { get; init; } = new(); + public PlanetTexture? Texture { get; init; } + public Color Ocean { get; init; } = Color.Parse("#1B5FA8"); + public Color Land { get; init; } = Color.Parse("#4F8C4C"); + public Color Ice { get; init; } = Color.Parse("#E6EDF4"); + public Color Star { get; init; } = Color.Parse("#FFC24B"); + + public long MemoryBytes => Texture?.ByteSize ?? 0; + + public static SceneRuntime Load(string dataDirectory, int memoryBudgetMb, + Action? progress = null) + { + progress?.Invoke(0.06, "读取场景数据"); + var scenePath = Path.Combine(dataDirectory, "scene.json"); + var scene = ModelJson.Read(scenePath) ?? new SceneDefinition(); + + var ocean = Parse(scene.Planet.OceanColor, "#1B5FA8"); + var land = Parse(scene.Planet.LandColor, "#4F8C4C"); + var ice = Parse(scene.Planet.IceColor, "#E6EDF4"); + + LandData? landData = null; + var landFile = scene.Planet.LandFile; + if (!string.IsNullOrWhiteSpace(landFile)) + { + var path = Path.IsPathRooted(landFile!) ? landFile! : Path.Combine(dataDirectory, landFile!); + progress?.Invoke(0.12, "读取地表轮廓"); + landData = LandData.Load(path); + } + + // 内存预算决定纹理分辨率(1024 宽约 3 MB) + var width = memoryBudgetMb >= 1024 ? PlanetTexture.DefaultWidth + : memoryBudgetMb >= 512 ? 768 + : 512; + + progress?.Invoke(0.16, "生成地表纹理"); + var texture = PlanetTexture.Build(landData, width, ocean, land, ice, + t => progress?.Invoke(0.16 + t * 0.48, "生成地表纹理")); + + progress?.Invoke(0.68, "场景就绪"); + return new SceneRuntime + { + Scene = scene, + Texture = texture, + Ocean = ocean, + Land = land, + Ice = ice, + Star = Parse(scene.Star.Color, "#FFC24B") + }; + } + + private static Color Parse(string? value, string fallback) + => Color.TryParse(string.IsNullOrWhiteSpace(value) ? fallback : value, out var c) ? c : Color.Parse(fallback); +} diff --git a/.GC/cache/sources/gitcode-official/model/_engine/src/PlanetTexture.cs b/.GC/cache/sources/gitcode-official/model/_engine/src/PlanetTexture.cs new file mode 100644 index 0000000..9de4ddc --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_engine/src/PlanetTexture.cs @@ -0,0 +1,476 @@ +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using Avalonia.Media; + +namespace NeoRF.EarthModels; + +/// +/// 预烘焙的等经纬度地表贴图:反照率 + 高度 + 冰盖 + 云层 + 夜间灯光。 +/// 只在模型加载时算一次,之后每帧只做采样 —— 比逐像素跑噪声快一个数量级, +/// 而且能画出「真实一点」的地表:海洋深度、沙漠/雨林/针叶林带、山脉阴影、极地冰盖。 +/// +public sealed class PlanetTexture +{ + public const int DefaultWidth = 1024; + + public int Width { get; } + public int Height { get; } + + /// 打包的反照率(0xRRGGBB),每像素一次双线性即可拿三通道。 + public uint[] Albedo { get; } + /// 地形高度(0=海平面,255=高山) + public byte[] Elevation { get; } + /// 云量 + public byte[] Cloud { get; } + /// 夜间灯光 + public byte[] Lights { get; } + /// 预烘焙的地形坡度:东向 / 北向高度梯度(加载时算一次,每帧直接采样)。 + public float[] SlopeEast { get; } + public float[] SlopeNorth { get; } + + public long ByteSize => (long)(Albedo.Length * 4 + Elevation.Length + Cloud.Length + Lights.Length + + SlopeEast.Length * 4 + SlopeNorth.Length * 4); + + private PlanetTexture(int width, int height) + { + Width = width; + Height = height; + var count = width * height; + Albedo = new uint[count]; + Elevation = new byte[count]; + Cloud = new byte[count]; + Lights = new byte[count]; + SlopeEast = new float[count]; + SlopeNorth = new float[count]; + } + + public static PlanetTexture Build(LandData? landData, int width, Color ocean, Color land, Color ice, + Action? progress = null) + { + width = Math.Clamp(width, 256, 2048); + var height = width / 2; + var texture = new PlanetTexture(width, height); + + progress?.Invoke(0.08); + var mask = landData == null ? null : LandMask.Build(landData, width, height); + progress?.Invoke(0.28); + + // 到海岸的距离:海里用来做深度,陆地上用来做大陆性(内陆更干) + var landDistance = new float[width * height]; + var oceanDistance = new float[width * height]; + ComputeDistances(mask, width, height, landDistance, oceanDistance); + progress?.Invoke(0.42); + + Parallel.For(0, height, y => + { + var lat = 90.0 - (y + 0.5) * 180.0 / height; + var latAbs = MathF.Abs((float)lat); + var rowBase = y * width; + for (var x = 0; x < width; x++) + { + var lon = (x + 0.5) * 360.0 / width - 180.0; + var index = rowBase + x; + var isLand = mask == null || mask.Bits[index] > 127; + + var elevation = Fbm(lon * 2.1, lat * 2.1, 4, 0x51A3); + var moisture = Fbm(lon * 1.35 + 40, lat * 1.35 - 20, 3, 0x9E2B); + var detail = Fbm(lon * 0.85, lat * 0.85, 3, 0x2C77); + + if (isLand) + { + // 内陆更干,靠海更湿 + var inland = Math.Clamp(landDistance[index] / (width * 0.06f), 0f, 1f); + var wet = Math.Clamp(moisture * 0.78f + (1f - inland) * 0.16f + - MathF.Max(0f, latAbs - 45f) / 90f, 0f, 1f); + + var (r, g, b) = LandPalette(latAbs, wet, inland, elevation, detail, land, ice); + texture.Albedo[index] = Pack(r, g, b); + texture.Elevation[index] = (byte)Math.Clamp(elevation * 235f + detail * 20f, 0, 255); + + // 夜间灯光:沿海平原、中低纬,稀疏分布 + // 夜间灯光:低频的城市群辉光(高频点会在小尺寸球面上变成噪点) + var cityGlow = Smooth(0.55f, 0.92f, Fbm(lon * 1.7, lat * 1.7, 3, 0x7A31)); + if (latAbs < 60 && inland < 0.55f && elevation < 0.75f) + texture.Lights[index] = ToByte(cityGlow * 0.55f); + } + else + { + // 海洋:按离岸距离做深浅 + var depth = Math.Clamp(oceanDistance[index] / (width * 0.09f), 0f, 1f); + depth = (float)Math.Pow(depth, 0.65); + var shallowR = Math.Min(1f, ocean.R / 255f + 0.16f); + var shallowG = Math.Min(1f, ocean.G / 255f + 0.22f); + var shallowB = Math.Min(1f, ocean.B / 255f + 0.16f); + var deepR = ocean.R / 255f * 0.32f; + var deepG = ocean.G / 255f * 0.40f; + var deepB = ocean.B / 255f * 0.52f; + var wave = (detail - 0.5f) * 0.035f; + + texture.Albedo[index] = Pack( + ToByte(shallowR + (deepR - shallowR) * depth + wave), + ToByte(shallowG + (deepG - shallowG) * depth + wave), + ToByte(shallowB + (deepB - shallowB) * depth + wave)); + texture.Elevation[index] = 0; + } + + // 极地冰盖:纬度 + 噪声边界,海洋也能结冰 + var iceEdge = 62f + (detail - 0.5f) * 9f; + var iceAmt = Smooth(iceEdge - 7f, iceEdge + 6f, latAbs); + if (iceAmt > 0.001f) + { + var iceR = ice.R / 255f; + var iceG = ice.G / 255f; + var iceB = ice.B / 255f; + var packed = texture.Albedo[index]; + texture.Albedo[index] = Pack( + ToByte(Lerp(((packed >> 16) & 0xFF) / 255f, iceR, iceAmt)), + ToByte(Lerp(((packed >> 8) & 0xFF) / 255f, iceG, iceAmt)), + ToByte(Lerp((packed & 0xFF) / 255f, iceB, iceAmt))); + } + + // 云:多个尺度的 fbm,赤道与中纬多云 + var cloudBase = Fbm(lon * 0.55, lat * 0.7, 3, 0x1144); + var band = 0.5f + 0.5f * MathF.Cos(latAbs / 90f * MathF.PI * 3.1f); + var cloud = Smooth(0.48f, 0.84f, cloudBase * 0.86f + band * 0.14f); + texture.Cloud[index] = ToByte(cloud * 0.72f); + } + }); + + // 云层做一次模糊,避免小尺寸球面上采样出噪点 + Blur(texture.Cloud, width, height, 2); + + // 预烘焙地形坡度:渲染时不必每像素再取 4 次高度 + BakeSlopes(texture, width, height); + progress?.Invoke(0.62); + return texture; + } + + private static (byte R, byte G, byte B) LandPalette(float latAbs, float wet, float inland, float elevation, + float detail, Color landBase, Color ice) + { + // 基色随纬度:赤道雨林 -> 温带 -> 针叶林 -> 苔原 + float r, g, b; + var tropical = (1f - Smooth(8f, 24f, latAbs)); + var temperate = Smooth(20f, 34f, latAbs) * (1f - Smooth(46f, 60f, latAbs)); + var boreal = Smooth(46f, 60f, latAbs) * (1f - Smooth(62f, 70f, latAbs)); + var tundra = Smooth(60f, 72f, latAbs); + + r = 0.13f; g = 0.36f; b = 0.17f; // 温带草原绿 + r = Lerp(r, 0.10f, tropical); g = Lerp(g, 0.42f, tropical); b = Lerp(b, 0.19f, tropical); + r = Lerp(r, 0.17f, boreal); g = Lerp(g, 0.28f, boreal); b = Lerp(b, 0.17f, boreal); + r = Lerp(r, 0.34f, tundra); g = Lerp(g, 0.36f, tundra); b = Lerp(b, 0.31f, tundra); + + // 湿润度:干 -> 沙漠/草原 + var dry = Math.Clamp(1f - wet * 0.95f, 0f, 1f); + var desertBand = Math.Clamp(1f - MathF.Abs(latAbs - 24f) / 13f, 0f, 1f); + var desert = Math.Clamp(dry * 0.72f + desertBand * 0.62f, 0f, 1f); + r = Lerp(r, 0.72f, desert * 0.85f); + g = Lerp(g, 0.60f, desert * 0.85f); + b = Lerp(b, 0.38f, desert * 0.85f); + + // 高原/山地:岩石和雪 + var rock = Smooth(0.62f, 0.86f, elevation); + r = Lerp(r, 0.44f, rock * 0.7f); + g = Lerp(g, 0.40f, rock * 0.7f); + b = Lerp(b, 0.34f, rock * 0.7f); + + var snow = Smooth(0.86f, 0.97f, elevation + (latAbs - 40f) / 220f); + r = Lerp(r, ice.R / 255f, snow); + g = Lerp(g, ice.G / 255f, snow); + b = Lerp(b, ice.B / 255f, snow); + + // 细节扰动,避免大面积纯色 + var grain = (detail - 0.5f) * 0.07f; + var baseMix = 0.25f; + return ( + ToByte(Math.Clamp(r + grain + (landBase.R / 255f - 0.3f) * baseMix * 0.2f, 0f, 1f)), + ToByte(Math.Clamp(g + grain + (landBase.G / 255f - 0.45f) * baseMix * 0.2f, 0f, 1f)), + ToByte(Math.Clamp(b + grain + (landBase.B / 255f - 0.3f) * baseMix * 0.2f, 0f, 1f))); + } + + /// 可分离盒式模糊(原地),用于软化云层。 + private static void Blur(byte[] data, int width, int height, int radius) + { + var temp = new byte[data.Length]; + for (var y = 0; y < height; y++) + { + var row = y * width; + for (var x = 0; x < width; x++) + { + var sum = 0; + var count = 0; + for (var k = -radius; k <= radius; k++) + { + var sx = (x + k + width) % width; + sum += data[row + sx]; + count++; + } + temp[row + x] = (byte)(sum / count); + } + } + for (var x = 0; x < width; x++) + { + for (var y = 0; y < height; y++) + { + var sum = 0; + var count = 0; + for (var k = -radius; k <= radius; k++) + { + var sy = Math.Clamp(y + k, 0, height - 1); + sum += temp[sy * width + x]; + count++; + } + data[y * width + x] = (byte)(sum / count); + } + } + } + + /// 由高度图算东西/南北梯度,供球面光照直接使用。 + private static void BakeSlopes(PlanetTexture t, int width, int height) + { + const float relief = 0.055f * 90f; + for (var y = 0; y < height; y++) + { + var row = y * width; + var up = Math.Max(0, y - 1) * width; + var down = Math.Min(height - 1, y + 1) * width; + for (var x = 0; x < width; x++) + { + var left = (x - 1 + width) % width; + var right = (x + 1) % width; + t.SlopeEast[row + x] = (t.Elevation[row + right] - t.Elevation[row + left]) / 255f * relief; + t.SlopeNorth[row + x] = (t.Elevation[up + x] - t.Elevation[down + x]) / 255f * relief; + } + } + } + + // ---------------------------------------------------------------- 距离场 + private static void ComputeDistances(LandMask? mask, int width, int height, float[] landDistance, float[] oceanDistance) + { + var count = width * height; + const float big = 1e6f; + for (var i = 0; i < count; i++) + { + var isLand = mask != null && mask.Bits[i] > 127; + landDistance[i] = isLand ? big : -big; + oceanDistance[i] = isLand ? -big : big; + } + + // 两遍 chamfer:陆地到海洋的距离 / 海洋到陆地的距离 + for (var y = 0; y < height; y++) + { + for (var x = 0; x < width; x++) + { + var i = y * width + x; + if (mask != null && mask.Bits[i] > 127) + { + var best = big; + if (x > 0 && mask.Bits[i - 1] <= 127) best = 0.5f; + if (x < width - 1 && mask.Bits[i + 1] <= 127) best = Math.Min(best, 0.5f); + if (y > 0 && mask.Bits[i - width] <= 127) best = Math.Min(best, 0.5f); + if (y < height - 1 && mask.Bits[i + width] <= 127) best = Math.Min(best, 0.5f); + if (best < big) landDistance[i] = best; + } + if (mask != null && mask.Bits[i] <= 127) + { + var best = big; + if (x > 0 && mask.Bits[i - 1] > 127) best = 0.5f; + if (x < width - 1 && mask.Bits[i + 1] > 127) best = Math.Min(best, 0.5f); + if (y > 0 && mask.Bits[i - width] > 127) best = Math.Min(best, 0.5f); + if (y < height - 1 && mask.Bits[i + width] > 127) best = Math.Min(best, 0.5f); + if (best < big) oceanDistance[i] = best; + } + } + } + + // 正向传递 + for (var y = 0; y < height; y++) + { + for (var x = 0; x < width; x++) + { + var i = y * width + x; + Propagate(landDistance, i, width, height, x, y, -1, 0, 1.4142f); + Propagate(oceanDistance, i, width, height, x, y, -1, 0, 1.4142f); + if (x > 0) + { + landDistance[i] = Math.Min(landDistance[i], landDistance[i - 1] + 1f); + oceanDistance[i] = Math.Min(oceanDistance[i], oceanDistance[i - 1] + 1f); + } + if (y > 0) + { + landDistance[i] = Math.Min(landDistance[i], landDistance[i - width] + 1f); + oceanDistance[i] = Math.Min(oceanDistance[i], oceanDistance[i - width] + 1f); + if (x > 0) + { + landDistance[i] = Math.Min(landDistance[i], landDistance[i - width - 1] + 1.4142f); + oceanDistance[i] = Math.Min(oceanDistance[i], oceanDistance[i - width - 1] + 1.4142f); + } + if (x < width - 1) + { + landDistance[i] = Math.Min(landDistance[i], landDistance[i - width + 1] + 1.4142f); + oceanDistance[i] = Math.Min(oceanDistance[i], oceanDistance[i - width + 1] + 1.4142f); + } + } + } + } + // 反向传递 + for (var y = height - 1; y >= 0; y--) + { + for (var x = width - 1; x >= 0; x--) + { + var i = y * width + x; + if (x < width - 1) + { + landDistance[i] = Math.Min(landDistance[i], landDistance[i + 1] + 1f); + oceanDistance[i] = Math.Min(oceanDistance[i], oceanDistance[i + 1] + 1f); + } + if (y < height - 1) + { + landDistance[i] = Math.Min(landDistance[i], landDistance[i + width] + 1f); + oceanDistance[i] = Math.Min(oceanDistance[i], oceanDistance[i + width] + 1f); + if (x < width - 1) + { + landDistance[i] = Math.Min(landDistance[i], landDistance[i + width + 1] + 1.4142f); + oceanDistance[i] = Math.Min(oceanDistance[i], oceanDistance[i + width + 1] + 1.4142f); + } + if (x > 0) + { + landDistance[i] = Math.Min(landDistance[i], landDistance[i + width - 1] + 1.4142f); + oceanDistance[i] = Math.Min(oceanDistance[i], oceanDistance[i + width - 1] + 1.4142f); + } + } + } + } + + for (var i = 0; i < count; i++) + { + landDistance[i] = MathF.Max(0f, landDistance[i]); + oceanDistance[i] = MathF.Max(0f, oceanDistance[i]); + } + } + + private static void Propagate(float[] map, int index, int width, int height, int x, int y, int dx, int dy, float w) + { + var nx = x + dx; + var ny = y + dy; + if (nx < 0 || nx >= width || ny < 0 || ny >= height) return; + var other = ny * width + nx; + map[index] = Math.Min(map[index], map[other] + w); + } + + // ---------------------------------------------------------------- 噪声 + /// 值噪声 + 分形叠加(确定性,跨平台一致)。 + public static float Fbm(double x, double y, int octaves, int seed) + { + var amplitude = 1.0; + var frequency = 1.0; + var sum = 0.0; + var norm = 0.0; + for (var i = 0; i < octaves; i++) + { + sum += amplitude * ValueNoise(x * frequency, y * frequency, seed + i * 101); + norm += amplitude; + amplitude *= 0.5; + frequency *= 2.07; + } + return (float)(sum / norm); + } + + private static double ValueNoise(double x, double y, int seed) + { + var xi = (int)Math.Floor(x); + var yi = (int)Math.Floor(y); + var xf = x - xi; + var yf = y - yi; + var u = xf * xf * (3 - 2 * xf); + var v = yf * yf * (3 - 2 * yf); + var a = Hash(xi, yi, seed); + var b = Hash(xi + 1, yi, seed); + var c = Hash(xi, yi + 1, seed); + var d = Hash(xi + 1, yi + 1, seed); + return (a + (b - a) * u) * (1 - v) + (c + (d - c) * u) * v; + } + + private static double Hash(int x, int y, int seed) + { + var h = (uint)(x * 374761393 + y * 668265263 + seed * 1442695041); + h = (h ^ (h >> 13)) * 1274126177u; + h ^= h >> 16; + return (h & 0xFFFFFF) / (double)0xFFFFFF; + } + + // ---------------------------------------------------------------- 采样 + public void Sample(double lon, double lat, out float r, out float g, out float b, + out float elevation, out float cloud, out float lights, + out float slopeEast, out float slopeNorth) + { + var u = (lon + 180.0) / 360.0 * Width - 0.5; + var v = (90.0 - lat) / 180.0 * Height - 0.5; + + var x0 = (int)Math.Floor(u); + var y0 = (int)Math.Floor(v); + var fx = (float)(u - x0); + var fy = (float)(v - y0); + + var x1 = x0 + 1; + var y1 = y0 + 1; + if (x0 < 0) x0 += Width; if (x1 < 0) x1 += Width; + if (x0 >= Width) x0 -= Width; if (x1 >= Width) x1 -= Width; + y0 = Math.Clamp(y0, 0, Height - 1); + y1 = Math.Clamp(y1, 0, Height - 1); + + var i00 = y0 * Width + x0; + var i10 = y0 * Width + x1; + var i01 = y1 * Width + x0; + var i11 = y1 * Width + x1; + + float w00 = (1 - fx) * (1 - fy), w10 = fx * (1 - fy), w01 = (1 - fx) * fy, w11 = fx * fy; + + var p00 = Albedo[i00]; + var p10 = Albedo[i10]; + var p01 = Albedo[i01]; + var p11 = Albedo[i11]; + var rr = ((p00 >> 16) & 0xFF) * w00 + ((p10 >> 16) & 0xFF) * w10 + ((p01 >> 16) & 0xFF) * w01 + ((p11 >> 16) & 0xFF) * w11; + var gg = ((p00 >> 8) & 0xFF) * w00 + ((p10 >> 8) & 0xFF) * w10 + ((p01 >> 8) & 0xFF) * w01 + ((p11 >> 8) & 0xFF) * w11; + var bb = (p00 & 0xFF) * w00 + (p10 & 0xFF) * w10 + (p01 & 0xFF) * w01 + (p11 & 0xFF) * w11; + r = rr / 255f; + g = gg / 255f; + b = bb / 255f; + + elevation = (Elevation[i00] * w00 + Elevation[i10] * w10 + Elevation[i01] * w01 + Elevation[i11] * w11) / 255f; + cloud = (Cloud[i00] * w00 + Cloud[i10] * w10 + Cloud[i01] * w01 + Cloud[i11] * w11) / 255f; + lights = Lights[i00] / 255f; + slopeEast = SlopeEast[i00] * w00 + SlopeEast[i10] * w10 + SlopeEast[i01] * w01 + SlopeEast[i11] * w11; + slopeNorth = SlopeNorth[i00] * w00 + SlopeNorth[i10] * w10 + SlopeNorth[i01] * w01 + SlopeNorth[i11] * w11; + } + + /// 只采样高度(法线扰动用)。 + public float SampleHeight(double lon, double lat) + { + var u = (lon + 180.0) / 360.0 * Width - 0.5; + var v = (90.0 - lat) / 180.0 * Height - 0.5; + var x = Math.Clamp((int)Math.Round(u), 0, Width - 1); + var y = Math.Clamp((int)Math.Round(v), 0, Height - 1); + return Elevation[y * Width + x] / 255f; + } + + public float SampleCloud(double lon, double lat) + { + var u = (lon + 180.0) / 360.0 * Width - 0.5; + var v = (90.0 - lat) / 180.0 * Height - 0.5; + var x = Math.Clamp((int)Math.Round(u), 0, Width - 1); + var y = Math.Clamp((int)Math.Round(v), 0, Height - 1); + return Cloud[y * Width + x] / 255f; + } + + public static byte ToByte(float v) => (byte)Math.Clamp((int)(v * 255f + 0.5f), 0, 255); + private static uint Pack(byte r, byte g, byte b) => ((uint)r << 16) | ((uint)g << 8) | b; + private static float Lerp(float a, float b, float t) => a + (b - a) * Math.Clamp(t, 0f, 1f); + private static float Smooth(float edge0, float edge1, float x) + { + if (edge1 <= edge0) return x >= edge1 ? 1f : 0f; + var t = Math.Clamp((x - edge0) / (edge1 - edge0), 0f, 1f); + return t * t * (3f - 2f * t); + } +} diff --git a/.GC/cache/sources/gitcode-official/model/_engine/src/SphereRaster.cs b/.GC/cache/sources/gitcode-official/model/_engine/src/SphereRaster.cs new file mode 100644 index 0000000..8b7bb8b --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_engine/src/SphereRaster.cs @@ -0,0 +1,172 @@ +using System; +using System.Numerics; +using System.Threading.Tasks; +using Avalonia.Media.Imaging; + +namespace NeoRF.EarthModels; + +/// +/// 球体像素级渲染:正交投影 + 预烘焙地表纹理 + 地形光照 + 云层 + 夜灯 + 大气边缘光。 +/// 纯 CPU 光栅、按行并行,不依赖 GPU,三平台效果一致。 +/// +public static unsafe class SphereRaster +{ + /// 把球体画进 WriteableBitmap(整张位图会被覆盖)。 + public static void Draw(WriteableBitmap bitmap, int size, Matrix4x4 cam, Matrix4x4 planet, + Vector3 light, PlanetTexture texture, double cloudShift, bool showClouds) + { + using var framebuffer = bitmap.Lock(); + var stride = framebuffer.RowBytes / 4; + Render((uint*)framebuffer.Address, stride, size, cam, planet, light, texture, cloudShift, showClouds); + } + + public static void Render(uint* dst, int stride, int size, Matrix4x4 cam, Matrix4x4 planet, + Vector3 light, PlanetTexture texture, double cloudShift, bool showClouds) + { + var radius = size * 0.5f - 1.0f; + var center = size * 0.5f; + var inv = 1f / radius; + + // 相机空间法线 -> 行星本地法线 + var combined = Matrix4x4.Multiply(planet, cam); + var mt = Matrix4x4.Transpose(combined); + float m11 = mt.M11, m12 = mt.M12, m13 = mt.M13; + float m21 = mt.M21, m22 = mt.M22, m23 = mt.M23; + float m31 = mt.M31, m32 = mt.M32, m33 = mt.M33; + + var lx = light.X; var ly = light.Y; var lz = light.Z; + + Parallel.For(0, size, y => + { + var ny = (center - y - 0.5f) * inv; + var row = dst + (long)y * stride; + for (var x = 0; x < size; x++) + { + var nx = (x + 0.5f - center) * inv; + var r2 = nx * nx + ny * ny; + if (r2 >= 1f) + { + row[x] = 0; + continue; + } + + var nz = MathF.Sqrt(1f - r2); + + // 本地法线(用于取经纬度) + var ux = nx * m11 + ny * m21 + nz * m31; + var uy = nx * m12 + ny * m22 + nz * m32; + var uz = nx * m13 + ny * m23 + nz * m33; + + var lat = MathF.Asin(Math.Clamp(uy, -1f, 1f)) * 57.2957795f; + var lon = MathF.Atan2(ux, uz) * 57.2957795f; + + var cloudLon = lon + cloudShift; + if (cloudLon > 180) cloudLon -= 360; + if (cloudLon < -180) cloudLon += 360; + + texture.Sample(lon, lat, out var ar, out var ag, out var ab, + out var elevation, out var cloud, out var lights, + out var dEast, out var dNorth); + + // ---- 地形法线:局部基向量可由球面法线直接推出,不必再算 6 次三角函数 + // 点 P=(cosLat·sinLon, sinLat, cosLat·cosLon) = (ux,uy,uz) + // 东向 = (cosLon,0,-sinLon),北向 = (-sinLat·sinLon, cosLat, -sinLat·cosLon) + var cosLat = MathF.Sqrt(MathF.Max(ux * ux + uz * uz, 1e-6f)); + var invCos = 1f / cosLat; + var eastX = uz * invCos; + var eastZ = -ux * invCos; + var northX = -uy * ux * invCos; + var northY = cosLat; + var northZ = -uy * uz * invCos; + + var nLocalX = ux + eastX * dEast + northX * dNorth; + var nLocalY = uy + northY * dNorth; + var nLocalZ = uz + eastZ * dEast + northZ * dNorth; + var nLen = MathF.Sqrt(nLocalX * nLocalX + nLocalY * nLocalY + nLocalZ * nLocalZ); + if (nLen > 0.0001f) { nLocalX /= nLen; nLocalY /= nLen; nLocalZ /= nLen; } + + var nCamX = nLocalX * combined.M11 + nLocalY * combined.M21 + nLocalZ * combined.M31; + var nCamY = nLocalX * combined.M12 + nLocalY * combined.M22 + nLocalZ * combined.M32; + var nCamZ = nLocalX * combined.M13 + nLocalY * combined.M23 + nLocalZ * combined.M33; + + var lam = nx * lx + ny * ly + nz * lz; // 几何光照(晨昏线) + var bump = nCamX * lx + nCamY * ly + nCamZ * lz; // 地形光照 + var day = Smooth(-0.18f, 0.22f, lam); + var terrainLight = 0.82f + 0.42f * MathF.Max(0f, bump - lam); + + var shade = (0.055f + 0.945f * day) * terrainLight; + + var br = ar * shade; + var bg = ag * shade; + var bb = ab * shade; + + // 海面高光(高度为 0 视为水面) + if (elevation < 0.02f) + { + var t2 = MathF.Max(0f, lam); + var t4 = t2 * t2 * t2 * t2; + var t8 = t4 * t4; + var t16 = t8 * t8; + var spec = t16 * t8 * t4 * t2 * t2 * 0.62f; + br += spec * 0.95f; + bg += spec * 0.98f; + bb += spec; + } + + // 云层(随经度缓慢漂移) + if (showClouds && cloud > 0.02f) + { + var cloudLight = 0.10f + 0.90f * day; + var c = Math.Clamp(cloud * 0.92f, 0f, 1f); + var cloudR = 0.98f * cloudLight; + var cloudG = 0.985f * cloudLight; + var cloudB = 1.0f * cloudLight; + br += (cloudR - br) * c; + bg += (cloudG - bg) * c; + bb += (cloudB - bb) * c; + } + + // 夜间灯光 + if (lights > 0.01f) + { + var night = 1f - day; + var glow = lights * night * 0.35f; + br += glow * 0.95f; + bg += glow * 0.72f; + bb += glow * 0.38f; + } + + // 大气边缘散射 + var rim = 1f - nz; + rim *= rim; + var litRim = rim * MathF.Max(0f, lam) * 0.98f; + br += 0.30f * litRim; + bg += 0.55f * litRim; + bb += 1.00f * litRim; + + // 夜面极淡反照 + var nightSide = 1f - day; + br += 0.008f * nightSide; + bg += 0.013f * nightSide; + bb += 0.028f * nightSide; + + var coverage = 1f; + var edge = (1f - MathF.Sqrt(r2)) * radius; + if (edge < 1f) coverage = MathF.Max(0f, edge); + + var a = (uint)(coverage * 255f); + var r8 = (uint)(Math.Clamp(br, 0f, 1f) * 255f * coverage); + var g8 = (uint)(Math.Clamp(bg, 0f, 1f) * 255f * coverage); + var b8 = (uint)(Math.Clamp(bb, 0f, 1f) * 255f * coverage); + row[x] = (a << 24) | (r8 << 16) | (g8 << 8) | b8; + } + }); + } + + private static float Smooth(float edge0, float edge1, float x) + { + if (edge1 <= edge0) return x >= edge1 ? 1f : 0f; + var t = Math.Clamp((x - edge0) / (edge1 - edge0), 0f, 1f); + return t * t * (3f - 2f * t); + } +} diff --git a/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj new file mode 100644 index 0000000..6905f6a --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj @@ -0,0 +1,17 @@ + + + + net8.0 + enable + disable + EarthModelStudio.ModelSdk + EarthModelStudio.ModelSdk + false + Earth Model 模型契约:启动器与模型之间唯一的编译期依赖。 + + + + + + + diff --git a/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/IModelContracts.cs b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/IModelContracts.cs new file mode 100644 index 0000000..73039a8 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/IModelContracts.cs @@ -0,0 +1,68 @@ +using System; +using Avalonia.Controls; + +namespace EarthModelStudio.ModelSdk; + +/// +/// 模型入口契约。模型程序集里必须有一个公开、无参构造的 实现, +/// 启动器按模型清单里的 assembly + type 定位并创建它。 +/// +public interface IModelFactory +{ + /// 契约版本。启动器目前支持 1。 + int ApiVersion { get; } + + /// 创建一个模型运行时实例(每个窗口一个实例)。 + IModelRuntime Create(); +} + +/// +/// 模型运行时:负责把模型自己的界面交给启动器。 +/// 启动器只负责开窗口,**不参与任何渲染**。 +/// +public interface IModelRuntime : IDisposable +{ + /// + /// 在**后台线程**准备数据(读文件、算纹理等),期间禁止创建或操作任何 UI 控件。 + /// 启动器的进度窗会显示 汇报的进度。 + /// 默认空实现:模型也可以把准备工作留到 CreateView 里(那样会占用 UI 线程)。 + /// + void Prepare(IModelContext context) { } + + /// + /// 在 UI 线程创建模型窗口的内容。模型可以自由组合控件、自己画图、自己管动画。 + /// 返回的控件会被直接放进窗口,铺满客户区。 + /// + Control CreateView(IModelContext context); +} + +/// 启动器提供给模型的环境信息与能力。 +public interface IModelContext +{ + /// 模型 id(即模型目录名)。 + string ModelId { get; } + + /// 模型目录:model/<id>。 + string ModelDirectory { get; } + + /// 模型数据目录:model/<id>/<id>.model,模型自己的场景数据、贴图、语言包都放这里。 + string DataDirectory { get; } + + /// 界面语言(zh-CN / en)。模型应按它选择自己的文案。 + string Language { get; } + + /// 用户在设置里分配的运行内存预算(MB),模型可据此控制缓存规模。 + int MemoryBudgetMb { get; } + + /// 请求关闭承载此模型的窗口。 + void RequestClose(); + + /// + /// 汇报加载进度(0–1)与当前阶段文案。启动器的加载进度条会实时显示, + /// 也可以在任何时候调用(例如切换数据集时)。 + /// + void ReportProgress(double value, string? message = null); + + /// 输出日志(启动器会写到控制台)。 + void Log(string message); +} diff --git a/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/bin/Debug/net8.0/EarthModelStudio.ModelSdk.deps.json b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/bin/Debug/net8.0/EarthModelStudio.ModelSdk.deps.json new file mode 100644 index 0000000..bb672df --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/bin/Debug/net8.0/EarthModelStudio.ModelSdk.deps.json @@ -0,0 +1,115 @@ +{ + "runtimeTarget": { + "name": ".NETCoreApp,Version=v8.0", + "signature": "" + }, + "compilationOptions": {}, + "targets": { + ".NETCoreApp,Version=v8.0": { + "EarthModelStudio.ModelSdk/1.0.3": { + "dependencies": { + "Avalonia": "11.3.9" + }, + "runtime": { + "EarthModelStudio.ModelSdk.dll": {} + } + }, + "Avalonia/11.3.9": { + "dependencies": { + "Avalonia.Remote.Protocol": "11.3.9", + "MicroCom.Runtime": "0.11.0" + }, + "runtime": { + "lib/net8.0/Avalonia.Base.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Controls.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.DesignerSupport.dll": { + "assemblyVersion": "0.7.0.0", + "fileVersion": "0.7.0.0" + }, + "lib/net8.0/Avalonia.Dialogs.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Markup.Xaml.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Markup.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Metal.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.MicroCom.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.OpenGL.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Vulkan.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + } + } + }, + "Avalonia.Remote.Protocol/11.3.9": { + "runtime": { + "lib/net8.0/Avalonia.Remote.Protocol.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + } + } + }, + "MicroCom.Runtime/0.11.0": { + "runtime": { + "lib/net5.0/MicroCom.Runtime.dll": { + "assemblyVersion": "0.11.0.0", + "fileVersion": "0.11.0.0" + } + } + } + } + }, + "libraries": { + "EarthModelStudio.ModelSdk/1.0.3": { + "type": "project", + "serviceable": false, + "sha512": "" + }, + "Avalonia/11.3.9": { + "type": "package", + "serviceable": true, + "sha512": "sha512-YfaTrUxcmVTsGOw2YqdZyunHqZArK16m1pYfNIBvyvAgX89Pzd3A1PgoMkf64u7scL23IN6HkfqhZeFcbYWLoA==", + "path": "avalonia/11.3.9", + "hashPath": "avalonia.11.3.9.nupkg.sha512" + }, + "Avalonia.Remote.Protocol/11.3.9": { + "type": "package", + "serviceable": true, + "sha512": "sha512-2XVLTSNa+Nvwu4D8NqqdudhllTaCRA9ZKlLZZvYLZeuLlzg7OcAV+df/biHQc6AqOv7iMFR9K5Zt3wG0EF4KfQ==", + "path": "avalonia.remote.protocol/11.3.9", + "hashPath": "avalonia.remote.protocol.11.3.9.nupkg.sha512" + }, + "MicroCom.Runtime/0.11.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-MEnrZ3UIiH40hjzMDsxrTyi8dtqB5ziv3iBeeU4bXsL/7NLSal9F1lZKpK+tfBRnUoDSdtcW3KufE4yhATOMCA==", + "path": "microcom.runtime/0.11.0", + "hashPath": "microcom.runtime.0.11.0.nupkg.sha512" + } + } +} \ No newline at end of file diff --git a/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/bin/Debug/net8.0/EarthModelStudio.ModelSdk.dll b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/bin/Debug/net8.0/EarthModelStudio.ModelSdk.dll new file mode 100644 index 0000000..e2e88d0 Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/bin/Debug/net8.0/EarthModelStudio.ModelSdk.dll differ diff --git a/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/bin/Debug/net8.0/EarthModelStudio.ModelSdk.pdb b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/bin/Debug/net8.0/EarthModelStudio.ModelSdk.pdb new file mode 100644 index 0000000..297cf4d Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/bin/Debug/net8.0/EarthModelStudio.ModelSdk.pdb differ diff --git a/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/bin/Release/net8.0/EarthModelStudio.ModelSdk.deps.json b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/bin/Release/net8.0/EarthModelStudio.ModelSdk.deps.json new file mode 100644 index 0000000..bb672df --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/bin/Release/net8.0/EarthModelStudio.ModelSdk.deps.json @@ -0,0 +1,115 @@ +{ + "runtimeTarget": { + "name": ".NETCoreApp,Version=v8.0", + "signature": "" + }, + "compilationOptions": {}, + "targets": { + ".NETCoreApp,Version=v8.0": { + "EarthModelStudio.ModelSdk/1.0.3": { + "dependencies": { + "Avalonia": "11.3.9" + }, + "runtime": { + "EarthModelStudio.ModelSdk.dll": {} + } + }, + "Avalonia/11.3.9": { + "dependencies": { + "Avalonia.Remote.Protocol": "11.3.9", + "MicroCom.Runtime": "0.11.0" + }, + "runtime": { + "lib/net8.0/Avalonia.Base.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Controls.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.DesignerSupport.dll": { + "assemblyVersion": "0.7.0.0", + "fileVersion": "0.7.0.0" + }, + "lib/net8.0/Avalonia.Dialogs.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Markup.Xaml.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Markup.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Metal.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.MicroCom.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.OpenGL.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Vulkan.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + } + } + }, + "Avalonia.Remote.Protocol/11.3.9": { + "runtime": { + "lib/net8.0/Avalonia.Remote.Protocol.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + } + } + }, + "MicroCom.Runtime/0.11.0": { + "runtime": { + "lib/net5.0/MicroCom.Runtime.dll": { + "assemblyVersion": "0.11.0.0", + "fileVersion": "0.11.0.0" + } + } + } + } + }, + "libraries": { + "EarthModelStudio.ModelSdk/1.0.3": { + "type": "project", + "serviceable": false, + "sha512": "" + }, + "Avalonia/11.3.9": { + "type": "package", + "serviceable": true, + "sha512": "sha512-YfaTrUxcmVTsGOw2YqdZyunHqZArK16m1pYfNIBvyvAgX89Pzd3A1PgoMkf64u7scL23IN6HkfqhZeFcbYWLoA==", + "path": "avalonia/11.3.9", + "hashPath": "avalonia.11.3.9.nupkg.sha512" + }, + "Avalonia.Remote.Protocol/11.3.9": { + "type": "package", + "serviceable": true, + "sha512": "sha512-2XVLTSNa+Nvwu4D8NqqdudhllTaCRA9ZKlLZZvYLZeuLlzg7OcAV+df/biHQc6AqOv7iMFR9K5Zt3wG0EF4KfQ==", + "path": "avalonia.remote.protocol/11.3.9", + "hashPath": "avalonia.remote.protocol.11.3.9.nupkg.sha512" + }, + "MicroCom.Runtime/0.11.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-MEnrZ3UIiH40hjzMDsxrTyi8dtqB5ziv3iBeeU4bXsL/7NLSal9F1lZKpK+tfBRnUoDSdtcW3KufE4yhATOMCA==", + "path": "microcom.runtime/0.11.0", + "hashPath": "microcom.runtime.0.11.0.nupkg.sha512" + } + } +} \ No newline at end of file diff --git a/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/bin/Release/net8.0/EarthModelStudio.ModelSdk.dll b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/bin/Release/net8.0/EarthModelStudio.ModelSdk.dll new file mode 100644 index 0000000..16e3399 Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/bin/Release/net8.0/EarthModelStudio.ModelSdk.dll differ diff --git a/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs new file mode 100644 index 0000000..2217181 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v8.0", FrameworkDisplayName = ".NET 8.0")] diff --git a/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache new file mode 100644 index 0000000..c165e27 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache @@ -0,0 +1 @@ +19347f0fd9099e96da933911861c08405b49d004b7b88b97423c17bee0eb100f diff --git a/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.AssemblyInfo.cs b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.AssemblyInfo.cs new file mode 100644 index 0000000..fb9fe02 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.AssemblyInfo.cs @@ -0,0 +1,24 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("NeoRF")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] +[assembly: System.Reflection.AssemblyDescriptionAttribute("Earth Model 模型契约:启动器与模型之间唯一的编译期依赖。")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.3.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.3")] +[assembly: System.Reflection.AssemblyProductAttribute("Earth Model Studio")] +[assembly: System.Reflection.AssemblyTitleAttribute("EarthModelStudio.ModelSdk")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.3.0")] +[assembly: System.Resources.NeutralResourcesLanguageAttribute("zh-Hans")] + +// Generated by the MSBuild WriteCodeFragment class. + diff --git a/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.AssemblyInfoInputs.cache b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.AssemblyInfoInputs.cache new file mode 100644 index 0000000..3072f99 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +b335d297927ccf5a0daf4e3ae36efd34dab2da4d5a059ac53a2e5ec720bc9741 diff --git a/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.GeneratedMSBuildEditorConfig.editorconfig b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 0000000..ebf0815 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,25 @@ +is_global = true +build_property.AvaloniaNameGeneratorIsEnabled = true +build_property.AvaloniaNameGeneratorBehavior = InitializeComponent +build_property.AvaloniaNameGeneratorDefaultFieldModifier = internal +build_property.AvaloniaNameGeneratorFilterByPath = * +build_property.AvaloniaNameGeneratorFilterByNamespace = * +build_property.AvaloniaNameGeneratorViewFileNamingStrategy = NamespaceAndClassName +build_property.AvaloniaNameGeneratorAttachDevTools = true +build_property.TargetFramework = net8.0 +build_property.TargetFrameworkIdentifier = .NETCoreApp +build_property.TargetFrameworkVersion = v8.0 +build_property.TargetPlatformMinVersion = +build_property.UsingMicrosoftNETSdkWeb = +build_property.ProjectTypeGuids = +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property.EnforceExtendedAnalyzerRules = +build_property.EntryPointFilePath = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = EarthModelStudio.ModelSdk +build_property.ProjectDir = /Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = +build_property.EffectiveAnalysisLevelStyle = 8.0 +build_property.EnableCodeStyleSeverity = diff --git a/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.assets.cache b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.assets.cache new file mode 100644 index 0000000..3341ba2 Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.assets.cache differ diff --git a/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.csproj.AssemblyReference.cache b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.csproj.AssemblyReference.cache new file mode 100644 index 0000000..77fd01f Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.csproj.AssemblyReference.cache differ diff --git a/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.csproj.CoreCompileInputs.cache b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.csproj.CoreCompileInputs.cache new file mode 100644 index 0000000..4352e8d --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.csproj.CoreCompileInputs.cache @@ -0,0 +1 @@ +700a4b41f184bc7a11bf82dedb3429528bb388b5fb0ec5c68baea6f472087bef diff --git a/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.csproj.FileListAbsolute.txt b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.csproj.FileListAbsolute.txt new file mode 100644 index 0000000..09132b1 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.csproj.FileListAbsolute.txt @@ -0,0 +1,13 @@ +/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/bin/Debug/net8.0/EarthModelStudio.ModelSdk.deps.json +/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/bin/Debug/net8.0/EarthModelStudio.ModelSdk.dll +/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/bin/Debug/net8.0/EarthModelStudio.ModelSdk.pdb +/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.csproj.AssemblyReference.cache +/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache +/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.GeneratedMSBuildEditorConfig.editorconfig +/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.AssemblyInfoInputs.cache +/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.AssemblyInfo.cs +/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.csproj.CoreCompileInputs.cache +/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.dll +/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/refint/EarthModelStudio.ModelSdk.dll +/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.pdb +/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/ref/EarthModelStudio.ModelSdk.dll diff --git a/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.dll b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.dll new file mode 100644 index 0000000..e2e88d0 Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.dll differ diff --git a/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.pdb b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.pdb new file mode 100644 index 0000000..297cf4d Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.pdb differ diff --git a/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/ref/EarthModelStudio.ModelSdk.dll b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/ref/EarthModelStudio.ModelSdk.dll new file mode 100644 index 0000000..260ab1c Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/ref/EarthModelStudio.ModelSdk.dll differ diff --git a/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/refint/EarthModelStudio.ModelSdk.dll b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/refint/EarthModelStudio.ModelSdk.dll new file mode 100644 index 0000000..260ab1c Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/refint/EarthModelStudio.ModelSdk.dll differ diff --git a/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/EarthModelStudio.ModelSdk.csproj.nuget.dgspec.json b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/EarthModelStudio.ModelSdk.csproj.nuget.dgspec.json new file mode 100644 index 0000000..53ba7ef --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/EarthModelStudio.ModelSdk.csproj.nuget.dgspec.json @@ -0,0 +1,96 @@ +{ + "format": 1, + "restore": { + "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj": {} + }, + "projects": { + "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj": { + "version": "1.0.3", + "restore": { + "projectUniqueName": "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj", + "projectName": "EarthModelStudio.ModelSdk", + "projectPath": "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj", + "packagesPath": "/Users/morris/.nuget/packages/", + "outputPath": "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/obj/", + "projectStyle": "PackageReference", + "configFilePaths": [ + "/Users/morris/.nuget/NuGet/NuGet.Config" + ], + "originalTargetFrameworks": [ + "net8.0" + ], + "sources": { + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net8.0": { + "framework": "net8.0", + "targetAlias": "net8.0", + "projectReferences": {} + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" + }, + "SdkAnalysisLevel": "10.0.400" + }, + "frameworks": { + "net8.0": { + "framework": "net8.0", + "targetAlias": "net8.0", + "dependencies": { + "Avalonia": { + "target": "Package", + "version": "[11.3.9, )" + }, + "Microsoft.NET.ILLink.Tasks": { + "suppressParent": "All", + "target": "Package", + "version": "[8.0.31, )", + "autoReferenced": true + } + }, + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "downloadDependencies": [ + { + "name": "Microsoft.AspNetCore.App.Runtime.win-arm64", + "version": "[8.0.31, 8.0.31]" + }, + { + "name": "Microsoft.NETCore.App.Runtime.win-arm64", + "version": "[8.0.31, 8.0.31]" + } + ], + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/10.0.401/PortableRuntimeIdentifierGraph.json" + } + }, + "runtimes": { + "win-arm64": { + "#import": [] + } + } + } + } +} \ No newline at end of file diff --git a/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/EarthModelStudio.ModelSdk.csproj.nuget.g.props b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/EarthModelStudio.ModelSdk.csproj.nuget.g.props new file mode 100644 index 0000000..8d169b0 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/EarthModelStudio.ModelSdk.csproj.nuget.g.props @@ -0,0 +1,24 @@ + + + + True + NuGet + $(MSBuildThisFileDirectory)project.assets.json + /Users/morris/.nuget/packages/ + /Users/morris/.nuget/packages/ + PackageReference + 7.0.0 + + + + + + + + + + /Users/morris/.nuget/packages/microsoft.net.illink.tasks/8.0.31 + /Users/morris/.nuget/packages/avalonia.buildservices/11.3.2 + /Users/morris/.nuget/packages/avalonia/11.3.9 + + \ No newline at end of file diff --git a/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/EarthModelStudio.ModelSdk.csproj.nuget.g.targets b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/EarthModelStudio.ModelSdk.csproj.nuget.g.targets new file mode 100644 index 0000000..c2c2aaf --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/EarthModelStudio.ModelSdk.csproj.nuget.g.targets @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs new file mode 100644 index 0000000..2217181 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v8.0", FrameworkDisplayName = ".NET 8.0")] diff --git a/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/Avalonia/Resources.Inputs.cache b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/Avalonia/Resources.Inputs.cache new file mode 100644 index 0000000..c165e27 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/Avalonia/Resources.Inputs.cache @@ -0,0 +1 @@ +19347f0fd9099e96da933911861c08405b49d004b7b88b97423c17bee0eb100f diff --git a/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.AssemblyInfo.cs b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.AssemblyInfo.cs new file mode 100644 index 0000000..846ed5b --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.AssemblyInfo.cs @@ -0,0 +1,24 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("NeoRF")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] +[assembly: System.Reflection.AssemblyDescriptionAttribute("Earth Model 模型契约:启动器与模型之间唯一的编译期依赖。")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.3.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.3")] +[assembly: System.Reflection.AssemblyProductAttribute("Earth Model Studio")] +[assembly: System.Reflection.AssemblyTitleAttribute("EarthModelStudio.ModelSdk")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.3.0")] +[assembly: System.Resources.NeutralResourcesLanguageAttribute("zh-Hans")] + +// Generated by the MSBuild WriteCodeFragment class. + diff --git a/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.AssemblyInfoInputs.cache b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.AssemblyInfoInputs.cache new file mode 100644 index 0000000..c2c77e9 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +336916da7664ce932095ba041eac38a72bfaee332d45c8339c55e418ea5f5a20 diff --git a/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.GeneratedMSBuildEditorConfig.editorconfig b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 0000000..04db23a --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,29 @@ +is_global = true +build_property.EnableAotAnalyzer = +build_property.EnableSingleFileAnalyzer = true +build_property.EnableTrimAnalyzer = +build_property.IncludeAllContentForSelfExtract = +build_property.AvaloniaNameGeneratorIsEnabled = true +build_property.AvaloniaNameGeneratorBehavior = InitializeComponent +build_property.AvaloniaNameGeneratorDefaultFieldModifier = internal +build_property.AvaloniaNameGeneratorFilterByPath = * +build_property.AvaloniaNameGeneratorFilterByNamespace = * +build_property.AvaloniaNameGeneratorViewFileNamingStrategy = NamespaceAndClassName +build_property.AvaloniaNameGeneratorAttachDevTools = true +build_property.TargetFramework = net8.0 +build_property.TargetFrameworkIdentifier = .NETCoreApp +build_property.TargetFrameworkVersion = v8.0 +build_property.TargetPlatformMinVersion = +build_property.UsingMicrosoftNETSdkWeb = +build_property.ProjectTypeGuids = +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property.EnforceExtendedAnalyzerRules = +build_property.EntryPointFilePath = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = EarthModelStudio.ModelSdk +build_property.ProjectDir = /Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = +build_property.EffectiveAnalysisLevelStyle = 8.0 +build_property.EnableCodeStyleSeverity = diff --git a/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.assets.cache b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.assets.cache new file mode 100644 index 0000000..e206ee9 Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.assets.cache differ diff --git a/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.csproj.AssemblyReference.cache b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.csproj.AssemblyReference.cache new file mode 100644 index 0000000..77fd01f Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.csproj.AssemblyReference.cache differ diff --git a/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.csproj.CoreCompileInputs.cache b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.csproj.CoreCompileInputs.cache new file mode 100644 index 0000000..79815dd --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.csproj.CoreCompileInputs.cache @@ -0,0 +1 @@ +1ab491e560668f97a7c06bde5290baec8ff1947cd02855cf82f1f7a392fd58bf diff --git a/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.csproj.FileListAbsolute.txt b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.csproj.FileListAbsolute.txt new file mode 100644 index 0000000..8c90239 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.csproj.FileListAbsolute.txt @@ -0,0 +1,11 @@ +/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/bin/Release/net8.0/EarthModelStudio.ModelSdk.deps.json +/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/bin/Release/net8.0/EarthModelStudio.ModelSdk.dll +/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.csproj.AssemblyReference.cache +/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/Avalonia/Resources.Inputs.cache +/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.GeneratedMSBuildEditorConfig.editorconfig +/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.AssemblyInfoInputs.cache +/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.AssemblyInfo.cs +/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.csproj.CoreCompileInputs.cache +/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.dll +/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/refint/EarthModelStudio.ModelSdk.dll +/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/ref/EarthModelStudio.ModelSdk.dll diff --git a/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.dll b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.dll new file mode 100644 index 0000000..16e3399 Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.dll differ diff --git a/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/ref/EarthModelStudio.ModelSdk.dll b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/ref/EarthModelStudio.ModelSdk.dll new file mode 100644 index 0000000..d75e9e8 Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/ref/EarthModelStudio.ModelSdk.dll differ diff --git a/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/refint/EarthModelStudio.ModelSdk.dll b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/refint/EarthModelStudio.ModelSdk.dll new file mode 100644 index 0000000..d75e9e8 Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/refint/EarthModelStudio.ModelSdk.dll differ diff --git a/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/project.assets.json b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/project.assets.json new file mode 100644 index 0000000..cb45165 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/project.assets.json @@ -0,0 +1,610 @@ +{ + "version": 4, + "targets": { + "net8.0": { + "Avalonia/11.3.9": { + "type": "package", + "dependencies": { + "Avalonia.BuildServices": "11.3.2", + "Avalonia.Remote.Protocol": "11.3.9", + "MicroCom.Runtime": "0.11.0" + }, + "compile": { + "ref/net8.0/Avalonia.Base.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.Controls.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.DesignerSupport.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.Dialogs.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.Markup.Xaml.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.Markup.dll": { + "related": ".Xaml.xml;.xml" + }, + "ref/net8.0/Avalonia.Metal.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.MicroCom.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.OpenGL.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.Vulkan.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.dll": { + "related": ".Base.xml;.Controls.xml;.DesignerSupport.xml;.Dialogs.xml;.Markup.Xaml.xml;.Markup.xml;.Metal.xml;.MicroCom.xml;.OpenGL.xml;.Vulkan.xml;.xml" + } + }, + "runtime": { + "lib/net8.0/Avalonia.Base.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.Controls.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.DesignerSupport.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.Dialogs.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.Markup.Xaml.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.Markup.dll": { + "related": ".Xaml.xml;.xml" + }, + "lib/net8.0/Avalonia.Metal.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.MicroCom.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.OpenGL.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.Vulkan.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.dll": { + "related": ".Base.xml;.Controls.xml;.DesignerSupport.xml;.Dialogs.xml;.Markup.Xaml.xml;.Markup.xml;.Metal.xml;.MicroCom.xml;.OpenGL.xml;.Vulkan.xml;.xml" + } + }, + "build": { + "buildTransitive/Avalonia.props": {}, + "buildTransitive/Avalonia.targets": {} + } + }, + "Avalonia.BuildServices/11.3.2": { + "type": "package", + "build": { + "buildTransitive/Avalonia.BuildServices.targets": {} + } + }, + "Avalonia.Remote.Protocol/11.3.9": { + "type": "package", + "compile": { + "lib/net8.0/Avalonia.Remote.Protocol.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net8.0/Avalonia.Remote.Protocol.dll": { + "related": ".xml" + } + } + }, + "MicroCom.Runtime/0.11.0": { + "type": "package", + "compile": { + "lib/net5.0/MicroCom.Runtime.dll": {} + }, + "runtime": { + "lib/net5.0/MicroCom.Runtime.dll": {} + } + }, + "Microsoft.NET.ILLink.Tasks/8.0.31": { + "type": "package", + "build": { + "build/Microsoft.NET.ILLink.Tasks.props": {} + } + } + }, + "net8.0/win-arm64": { + "Avalonia/11.3.9": { + "type": "package", + "dependencies": { + "Avalonia.BuildServices": "11.3.2", + "Avalonia.Remote.Protocol": "11.3.9", + "MicroCom.Runtime": "0.11.0" + }, + "compile": { + "ref/net8.0/Avalonia.Base.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.Controls.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.DesignerSupport.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.Dialogs.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.Markup.Xaml.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.Markup.dll": { + "related": ".Xaml.xml;.xml" + }, + "ref/net8.0/Avalonia.Metal.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.MicroCom.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.OpenGL.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.Vulkan.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.dll": { + "related": ".Base.xml;.Controls.xml;.DesignerSupport.xml;.Dialogs.xml;.Markup.Xaml.xml;.Markup.xml;.Metal.xml;.MicroCom.xml;.OpenGL.xml;.Vulkan.xml;.xml" + } + }, + "runtime": { + "lib/net8.0/Avalonia.Base.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.Controls.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.DesignerSupport.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.Dialogs.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.Markup.Xaml.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.Markup.dll": { + "related": ".Xaml.xml;.xml" + }, + "lib/net8.0/Avalonia.Metal.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.MicroCom.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.OpenGL.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.Vulkan.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.dll": { + "related": ".Base.xml;.Controls.xml;.DesignerSupport.xml;.Dialogs.xml;.Markup.Xaml.xml;.Markup.xml;.Metal.xml;.MicroCom.xml;.OpenGL.xml;.Vulkan.xml;.xml" + } + }, + "build": { + "buildTransitive/Avalonia.props": {}, + "buildTransitive/Avalonia.targets": {} + } + }, + "Avalonia.BuildServices/11.3.2": { + "type": "package", + "build": { + "buildTransitive/Avalonia.BuildServices.targets": {} + } + }, + "Avalonia.Remote.Protocol/11.3.9": { + "type": "package", + "compile": { + "lib/net8.0/Avalonia.Remote.Protocol.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net8.0/Avalonia.Remote.Protocol.dll": { + "related": ".xml" + } + } + }, + "MicroCom.Runtime/0.11.0": { + "type": "package", + "compile": { + "lib/net5.0/MicroCom.Runtime.dll": {} + }, + "runtime": { + "lib/net5.0/MicroCom.Runtime.dll": {} + } + }, + "Microsoft.NET.ILLink.Tasks/8.0.31": { + "type": "package", + "build": { + "build/Microsoft.NET.ILLink.Tasks.props": {} + } + } + } + }, + "libraries": { + "Avalonia/11.3.9": { + "sha512": "YfaTrUxcmVTsGOw2YqdZyunHqZArK16m1pYfNIBvyvAgX89Pzd3A1PgoMkf64u7scL23IN6HkfqhZeFcbYWLoA==", + "type": "package", + "path": "avalonia/11.3.9", + "hasTools": true, + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "analyzers/dotnet/cs/Avalonia.Analyzers.dll", + "analyzers/dotnet/cs/Avalonia.Generators.dll", + "avalonia.11.3.9.nupkg.sha512", + "avalonia.nuspec", + "build/Avalonia.Generators.props", + "build/Avalonia.props", + "build/Avalonia.targets", + "build/AvaloniaBuildTasks.props", + "build/AvaloniaBuildTasks.targets", + "build/AvaloniaItemSchema.xaml", + "build/AvaloniaPrivateApis.targets", + "build/AvaloniaRules.Project.xml", + "build/AvaloniaSingleProject.targets", + "build/AvaloniaVersion.props", + "buildTransitive/Avalonia.Generators.props", + "buildTransitive/Avalonia.props", + "buildTransitive/Avalonia.targets", + "buildTransitive/AvaloniaBuildTasks.props", + "buildTransitive/AvaloniaBuildTasks.targets", + "buildTransitive/AvaloniaItemSchema.xaml", + "buildTransitive/AvaloniaPrivateApis.targets", + "buildTransitive/AvaloniaRules.Project.xml", + "buildTransitive/AvaloniaSingleProject.targets", + "lib/net6.0/Avalonia.Base.dll", + "lib/net6.0/Avalonia.Base.xml", + "lib/net6.0/Avalonia.Controls.dll", + "lib/net6.0/Avalonia.Controls.xml", + "lib/net6.0/Avalonia.DesignerSupport.dll", + "lib/net6.0/Avalonia.DesignerSupport.xml", + "lib/net6.0/Avalonia.Dialogs.dll", + "lib/net6.0/Avalonia.Dialogs.xml", + "lib/net6.0/Avalonia.Markup.Xaml.dll", + "lib/net6.0/Avalonia.Markup.Xaml.xml", + "lib/net6.0/Avalonia.Markup.dll", + "lib/net6.0/Avalonia.Markup.xml", + "lib/net6.0/Avalonia.Metal.dll", + "lib/net6.0/Avalonia.Metal.xml", + "lib/net6.0/Avalonia.MicroCom.dll", + "lib/net6.0/Avalonia.MicroCom.xml", + "lib/net6.0/Avalonia.OpenGL.dll", + "lib/net6.0/Avalonia.OpenGL.xml", + "lib/net6.0/Avalonia.Vulkan.dll", + "lib/net6.0/Avalonia.Vulkan.xml", + "lib/net6.0/Avalonia.dll", + "lib/net6.0/Avalonia.xml", + "lib/net8.0/Avalonia.Base.dll", + "lib/net8.0/Avalonia.Base.xml", + "lib/net8.0/Avalonia.Controls.dll", + "lib/net8.0/Avalonia.Controls.xml", + "lib/net8.0/Avalonia.DesignerSupport.dll", + "lib/net8.0/Avalonia.DesignerSupport.xml", + "lib/net8.0/Avalonia.Dialogs.dll", + "lib/net8.0/Avalonia.Dialogs.xml", + "lib/net8.0/Avalonia.Markup.Xaml.dll", + "lib/net8.0/Avalonia.Markup.Xaml.xml", + "lib/net8.0/Avalonia.Markup.dll", + "lib/net8.0/Avalonia.Markup.xml", + "lib/net8.0/Avalonia.Metal.dll", + "lib/net8.0/Avalonia.Metal.xml", + "lib/net8.0/Avalonia.MicroCom.dll", + "lib/net8.0/Avalonia.MicroCom.xml", + "lib/net8.0/Avalonia.OpenGL.dll", + "lib/net8.0/Avalonia.OpenGL.xml", + "lib/net8.0/Avalonia.Vulkan.dll", + "lib/net8.0/Avalonia.Vulkan.xml", + "lib/net8.0/Avalonia.dll", + "lib/net8.0/Avalonia.xml", + "lib/netstandard2.0/Avalonia.Base.dll", + "lib/netstandard2.0/Avalonia.Base.xml", + "lib/netstandard2.0/Avalonia.Controls.dll", + "lib/netstandard2.0/Avalonia.Controls.xml", + "lib/netstandard2.0/Avalonia.DesignerSupport.dll", + "lib/netstandard2.0/Avalonia.DesignerSupport.xml", + "lib/netstandard2.0/Avalonia.Dialogs.dll", + "lib/netstandard2.0/Avalonia.Dialogs.xml", + "lib/netstandard2.0/Avalonia.Markup.Xaml.dll", + "lib/netstandard2.0/Avalonia.Markup.Xaml.xml", + "lib/netstandard2.0/Avalonia.Markup.dll", + "lib/netstandard2.0/Avalonia.Markup.xml", + "lib/netstandard2.0/Avalonia.Metal.dll", + "lib/netstandard2.0/Avalonia.Metal.xml", + "lib/netstandard2.0/Avalonia.MicroCom.dll", + "lib/netstandard2.0/Avalonia.MicroCom.xml", + "lib/netstandard2.0/Avalonia.OpenGL.dll", + "lib/netstandard2.0/Avalonia.OpenGL.xml", + "lib/netstandard2.0/Avalonia.Vulkan.dll", + "lib/netstandard2.0/Avalonia.Vulkan.xml", + "lib/netstandard2.0/Avalonia.dll", + "lib/netstandard2.0/Avalonia.xml", + "ref/net6.0/Avalonia.Base.dll", + "ref/net6.0/Avalonia.Base.xml", + "ref/net6.0/Avalonia.Controls.dll", + "ref/net6.0/Avalonia.Controls.xml", + "ref/net6.0/Avalonia.DesignerSupport.dll", + "ref/net6.0/Avalonia.DesignerSupport.xml", + "ref/net6.0/Avalonia.Dialogs.dll", + "ref/net6.0/Avalonia.Dialogs.xml", + "ref/net6.0/Avalonia.Markup.Xaml.dll", + "ref/net6.0/Avalonia.Markup.Xaml.xml", + "ref/net6.0/Avalonia.Markup.dll", + "ref/net6.0/Avalonia.Markup.xml", + "ref/net6.0/Avalonia.Metal.dll", + "ref/net6.0/Avalonia.Metal.xml", + "ref/net6.0/Avalonia.MicroCom.dll", + "ref/net6.0/Avalonia.MicroCom.xml", + "ref/net6.0/Avalonia.OpenGL.dll", + "ref/net6.0/Avalonia.OpenGL.xml", + "ref/net6.0/Avalonia.Vulkan.dll", + "ref/net6.0/Avalonia.Vulkan.xml", + "ref/net6.0/Avalonia.dll", + "ref/net6.0/Avalonia.xml", + "ref/net8.0/Avalonia.Base.dll", + "ref/net8.0/Avalonia.Base.xml", + "ref/net8.0/Avalonia.Controls.dll", + "ref/net8.0/Avalonia.Controls.xml", + "ref/net8.0/Avalonia.DesignerSupport.dll", + "ref/net8.0/Avalonia.DesignerSupport.xml", + "ref/net8.0/Avalonia.Dialogs.dll", + "ref/net8.0/Avalonia.Dialogs.xml", + "ref/net8.0/Avalonia.Markup.Xaml.dll", + "ref/net8.0/Avalonia.Markup.Xaml.xml", + "ref/net8.0/Avalonia.Markup.dll", + "ref/net8.0/Avalonia.Markup.xml", + "ref/net8.0/Avalonia.Metal.dll", + "ref/net8.0/Avalonia.Metal.xml", + "ref/net8.0/Avalonia.MicroCom.dll", + "ref/net8.0/Avalonia.MicroCom.xml", + "ref/net8.0/Avalonia.OpenGL.dll", + "ref/net8.0/Avalonia.OpenGL.xml", + "ref/net8.0/Avalonia.Vulkan.dll", + "ref/net8.0/Avalonia.Vulkan.xml", + "ref/net8.0/Avalonia.dll", + "ref/net8.0/Avalonia.xml", + "ref/netstandard2.0/Avalonia.Base.dll", + "ref/netstandard2.0/Avalonia.Base.xml", + "ref/netstandard2.0/Avalonia.Controls.dll", + "ref/netstandard2.0/Avalonia.Controls.xml", + "ref/netstandard2.0/Avalonia.DesignerSupport.dll", + "ref/netstandard2.0/Avalonia.DesignerSupport.xml", + "ref/netstandard2.0/Avalonia.Dialogs.dll", + "ref/netstandard2.0/Avalonia.Dialogs.xml", + "ref/netstandard2.0/Avalonia.Markup.Xaml.dll", + "ref/netstandard2.0/Avalonia.Markup.Xaml.xml", + "ref/netstandard2.0/Avalonia.Markup.dll", + "ref/netstandard2.0/Avalonia.Markup.xml", + "ref/netstandard2.0/Avalonia.Metal.dll", + "ref/netstandard2.0/Avalonia.Metal.xml", + "ref/netstandard2.0/Avalonia.MicroCom.dll", + "ref/netstandard2.0/Avalonia.MicroCom.xml", + "ref/netstandard2.0/Avalonia.OpenGL.dll", + "ref/netstandard2.0/Avalonia.OpenGL.xml", + "ref/netstandard2.0/Avalonia.Vulkan.dll", + "ref/netstandard2.0/Avalonia.Vulkan.xml", + "ref/netstandard2.0/Avalonia.dll", + "ref/netstandard2.0/Avalonia.xml", + "tools/net461/designer/Avalonia.Designer.HostApp.exe", + "tools/netstandard2.0/Avalonia.Build.Tasks.dll", + "tools/netstandard2.0/designer/Avalonia.Designer.HostApp.dll" + ] + }, + "Avalonia.BuildServices/11.3.2": { + "sha512": "qHDToxto1e3hci5YqbG9n0Ty8mlp3zBUN5wT66wKqaDVzXyQ0do3EnRILd4Ke9jpvsktaPpgE0YjEk7hornryQ==", + "type": "package", + "path": "avalonia.buildservices/11.3.2", + "hasTools": true, + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "README.md", + "avalonia.buildservices.11.3.2.nupkg.sha512", + "avalonia.buildservices.nuspec", + "build/Avalonia.BuildServices.targets", + "buildTransitive/Avalonia.BuildServices.targets", + "tools/netstandard2.0/Avalonia.BuildServices.Collector.dll", + "tools/netstandard2.0/Avalonia.BuildServices.dll", + "tools/netstandard2.0/runtimeconfig.json" + ] + }, + "Avalonia.Remote.Protocol/11.3.9": { + "sha512": "2XVLTSNa+Nvwu4D8NqqdudhllTaCRA9ZKlLZZvYLZeuLlzg7OcAV+df/biHQc6AqOv7iMFR9K5Zt3wG0EF4KfQ==", + "type": "package", + "path": "avalonia.remote.protocol/11.3.9", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "avalonia.remote.protocol.11.3.9.nupkg.sha512", + "avalonia.remote.protocol.nuspec", + "lib/net6.0/Avalonia.Remote.Protocol.dll", + "lib/net6.0/Avalonia.Remote.Protocol.xml", + "lib/net8.0/Avalonia.Remote.Protocol.dll", + "lib/net8.0/Avalonia.Remote.Protocol.xml", + "lib/netstandard2.0/Avalonia.Remote.Protocol.dll", + "lib/netstandard2.0/Avalonia.Remote.Protocol.xml" + ] + }, + "MicroCom.Runtime/0.11.0": { + "sha512": "MEnrZ3UIiH40hjzMDsxrTyi8dtqB5ziv3iBeeU4bXsL/7NLSal9F1lZKpK+tfBRnUoDSdtcW3KufE4yhATOMCA==", + "type": "package", + "path": "microcom.runtime/0.11.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "lib/net5.0/MicroCom.Runtime.dll", + "lib/netstandard2.0/MicroCom.Runtime.dll", + "microcom.runtime.0.11.0.nupkg.sha512", + "microcom.runtime.nuspec" + ] + }, + "Microsoft.NET.ILLink.Tasks/8.0.31": { + "sha512": "OJdAGATV2QoVWL11zlDLEluA06q8rK+cgZR47ohrO8V+Qj5z9dlvN7bG9/0e5t0IOe+yD8tREC0bpsEgDGrzIQ==", + "type": "package", + "path": "microsoft.net.illink.tasks/8.0.31", + "hasTools": true, + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "Sdk/Sdk.props", + "THIRD-PARTY-NOTICES.TXT", + "analyzers/dotnet/cs/ILLink.CodeFixProvider.dll", + "analyzers/dotnet/cs/ILLink.RoslynAnalyzer.dll", + "build/Microsoft.NET.ILLink.Analyzers.props", + "build/Microsoft.NET.ILLink.Tasks.props", + "build/Microsoft.NET.ILLink.targets", + "microsoft.net.illink.tasks.8.0.31.nupkg.sha512", + "microsoft.net.illink.tasks.nuspec", + "tools/net472/ILLink.Tasks.dll", + "tools/net472/ILLink.Tasks.dll.config", + "tools/net472/Mono.Cecil.Mdb.dll", + "tools/net472/Mono.Cecil.Pdb.dll", + "tools/net472/Mono.Cecil.Rocks.dll", + "tools/net472/Mono.Cecil.dll", + "tools/net472/Sdk/Sdk.props", + "tools/net472/System.Buffers.dll", + "tools/net472/System.Collections.Immutable.dll", + "tools/net472/System.Memory.dll", + "tools/net472/System.Numerics.Vectors.dll", + "tools/net472/System.Reflection.Metadata.dll", + "tools/net472/System.Runtime.CompilerServices.Unsafe.dll", + "tools/net472/build/Microsoft.NET.ILLink.Analyzers.props", + "tools/net472/build/Microsoft.NET.ILLink.Tasks.props", + "tools/net472/build/Microsoft.NET.ILLink.targets", + "tools/net8.0/ILLink.Tasks.deps.json", + "tools/net8.0/ILLink.Tasks.dll", + "tools/net8.0/Mono.Cecil.Mdb.dll", + "tools/net8.0/Mono.Cecil.Pdb.dll", + "tools/net8.0/Mono.Cecil.Rocks.dll", + "tools/net8.0/Mono.Cecil.dll", + "tools/net8.0/Sdk/Sdk.props", + "tools/net8.0/build/Microsoft.NET.ILLink.Analyzers.props", + "tools/net8.0/build/Microsoft.NET.ILLink.Tasks.props", + "tools/net8.0/build/Microsoft.NET.ILLink.targets", + "tools/net8.0/illink.deps.json", + "tools/net8.0/illink.dll", + "tools/net8.0/illink.runtimeconfig.json", + "useSharedDesignerContext.txt" + ] + } + }, + "projectFileDependencyGroups": { + "net8.0": [ + "Avalonia >= 11.3.9", + "Microsoft.NET.ILLink.Tasks >= 8.0.31" + ] + }, + "packageFolders": { + "/Users/morris/.nuget/packages/": {} + }, + "project": { + "version": "1.0.3", + "restore": { + "projectUniqueName": "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj", + "projectName": "EarthModelStudio.ModelSdk", + "projectPath": "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj", + "packagesPath": "/Users/morris/.nuget/packages/", + "outputPath": "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/obj/", + "projectStyle": "PackageReference", + "configFilePaths": [ + "/Users/morris/.nuget/NuGet/NuGet.Config" + ], + "originalTargetFrameworks": [ + "net8.0" + ], + "sources": { + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net8.0": { + "framework": "net8.0", + "targetAlias": "net8.0", + "projectReferences": {} + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" + }, + "SdkAnalysisLevel": "10.0.400" + }, + "frameworks": { + "net8.0": { + "framework": "net8.0", + "targetAlias": "net8.0", + "dependencies": { + "Avalonia": { + "target": "Package", + "version": "[11.3.9, )" + }, + "Microsoft.NET.ILLink.Tasks": { + "suppressParent": "All", + "target": "Package", + "version": "[8.0.31, )", + "autoReferenced": true + } + }, + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "downloadDependencies": [ + { + "name": "Microsoft.AspNetCore.App.Runtime.win-arm64", + "version": "[8.0.31, 8.0.31]" + }, + { + "name": "Microsoft.NETCore.App.Runtime.win-arm64", + "version": "[8.0.31, 8.0.31]" + } + ], + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/10.0.401/PortableRuntimeIdentifierGraph.json" + } + }, + "runtimes": { + "win-arm64": { + "#import": [] + } + } + } +} \ No newline at end of file diff --git a/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/project.nuget.cache b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/project.nuget.cache new file mode 100644 index 0000000..108430f --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/_sdk/EarthModelStudio.ModelSdk/obj/project.nuget.cache @@ -0,0 +1,16 @@ +{ + "version": 2, + "dgSpecHash": "2wEgD3WME1E=", + "success": true, + "projectFilePath": "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj", + "expectedPackageFiles": [ + "/Users/morris/.nuget/packages/avalonia/11.3.9/avalonia.11.3.9.nupkg.sha512", + "/Users/morris/.nuget/packages/avalonia.buildservices/11.3.2/avalonia.buildservices.11.3.2.nupkg.sha512", + "/Users/morris/.nuget/packages/avalonia.remote.protocol/11.3.9/avalonia.remote.protocol.11.3.9.nupkg.sha512", + "/Users/morris/.nuget/packages/microcom.runtime/0.11.0/microcom.runtime.0.11.0.nupkg.sha512", + "/Users/morris/.nuget/packages/microsoft.net.illink.tasks/8.0.31/microsoft.net.illink.tasks.8.0.31.nupkg.sha512", + "/Users/morris/.nuget/packages/microsoft.netcore.app.runtime.win-arm64/8.0.31/microsoft.netcore.app.runtime.win-arm64.8.0.31.nupkg.sha512", + "/Users/morris/.nuget/packages/microsoft.aspnetcore.app.runtime.win-arm64/8.0.31/microsoft.aspnetcore.app.runtime.win-arm64.8.0.31.nupkg.sha512" + ], + "logs": [] +} \ No newline at end of file diff --git a/.GC/cache/sources/gitcode-official/model/earth-geography/earth-geography.json b/.GC/cache/sources/gitcode-official/model/earth-geography/earth-geography.json new file mode 100644 index 0000000..b2d030f --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-geography/earth-geography.json @@ -0,0 +1,23 @@ +{ + "id": "earth-geography", + "nameI18n": { + "zh-CN": "地球地理", + "en": "Earth Geography" + }, + "descriptionI18n": { + "zh-CN": "五带划分、七大洲四大洋轮廓、六大板块与洲界,纯线稿教学图。", + "en": "Climate zones, continent/ocean outlines, plates and borders — clean line art." + }, + "assembly": "EarthGeographyModel.dll", + "type": "NeoRF.EarthModels.GeographyModelFactory", + "author": "Morris GC", + "tags": [ + "geography", + "earth", + "atlas" + ], + "dataDir": "earth-geography.model", + "version": "1.0", + "updatedAt": "2026-11-08T09:22:29Z", + "build": "883fdf6c57" +} diff --git a/.GC/cache/sources/gitcode-official/model/earth-geography/earth-geography.model/EarthGeographyModel.dll b/.GC/cache/sources/gitcode-official/model/earth-geography/earth-geography.model/EarthGeographyModel.dll new file mode 100644 index 0000000..986d2fb Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/earth-geography/earth-geography.model/EarthGeographyModel.dll differ diff --git a/.GC/cache/sources/gitcode-official/model/earth-geography/earth-geography.model/borders.json b/.GC/cache/sources/gitcode-official/model/earth-geography/earth-geography.model/borders.json new file mode 100644 index 0000000..ff51aab --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-geography/earth-geography.model/borders.json @@ -0,0 +1 @@ +{"borders":[{"between":"亚洲-非洲","name":"苏伊士运河","lines":[[[32.6,31.3],[32.4,30.5],[32.3,29.9]]]},{"between":"亚洲-欧洲","name":"亚欧分界(乌拉尔山—乌拉尔河—里海—大高加索山—黑海—土耳其海峡)","segments":[{"name":"乌拉尔山","nameI18n":{"zh-CN":"乌拉尔山","en":"Ural Mts."},"lines":[[[66.0,68.5],[64.0,64.0],[60.5,60.0],[58.5,54.0],[57.0,51.0]]]},{"name":"乌拉尔河","nameI18n":{"zh-CN":"乌拉尔河","en":"Ural River"},"lines":[[[57.0,51.0],[55.5,49.0],[53.0,47.0],[51.5,46.5]]]},{"name":"里海","nameI18n":{"zh-CN":"里海","en":"Caspian Sea"},"lines":[[[51.5,46.5],[50.5,44.0],[49.5,41.0],[50.0,38.0],[51.0,36.5]]]},{"name":"大高加索山","nameI18n":{"zh-CN":"大高加索山","en":"Greater Caucasus"},"lines":[[[51.0,36.5],[46.0,42.5],[43.0,42.8],[41.0,43.2]]]},{"name":"黑海","nameI18n":{"zh-CN":"黑海","en":"Black Sea"},"lines":[[[41.0,43.2],[36.0,44.5],[31.0,44.0],[29.0,41.5]]]},{"name":"土耳其海峡","nameI18n":{"zh-CN":"土耳其海峡","en":"Turkish Straits"},"lines":[[[29.0,41.5],[28.0,40.5],[26.5,40.0],[26.2,39.5]]]}],"lines":[[[66.0,68.5],[64.0,64.0],[60.5,60.0],[58.5,54.0],[57.0,51.0],[57.0,51.0],[55.5,49.0],[53.0,47.0],[51.5,46.5],[51.5,46.5],[50.5,44.0],[49.5,41.0],[50.0,38.0],[51.0,36.5],[51.0,36.5],[46.0,42.5],[43.0,42.8],[41.0,43.2],[41.0,43.2],[36.0,44.5],[31.0,44.0],[29.0,41.5],[29.0,41.5],[28.0,40.5],[26.5,40.0],[26.2,39.5]]]},{"between":"亚洲-非洲","name":"红海","lines":[[[43.3,12.6],[40.0,18.0],[38.5,22.0],[35.0,27.0],[34.5,29.0]]]},{"between":"欧洲-非洲","name":"直布罗陀海峡","lines":[[[-5.6,36.0],[-4.0,36.2],[0.0,36.5]]]},{"between":"北美-南美","name":"巴拿马运河","lines":[[[-79.6,9.1],[-78.5,8.9],[-77.5,8.6]]]},{"between":"亚洲-北美","name":"白令海峡","lines":[[[-169.0,65.5],[-170.5,65.8],[-172.0,66.0]]]},{"between":"亚洲-大洋洲","name":"印尼群岛","lines":[[[120.0,-1.0],[125.0,-2.0],[130.0,-3.0]]]},{"between":"南极洲","name":"南极圈","lines":[[[-180.0,-66.5],[-170.0,-66.5],[-160.0,-66.5],[-150.0,-66.5],[-140.0,-66.5],[-130.0,-66.5],[-120.0,-66.5],[-110.0,-66.5],[-100.0,-66.5],[-90.0,-66.5],[-80.0,-66.5],[-70.0,-66.5],[-60.0,-66.5],[-50.0,-66.5],[-40.0,-66.5],[-30.0,-66.5],[-20.0,-66.5],[-10.0,-66.5],[0.0,-66.5],[10.0,-66.5],[20.0,-66.5],[30.0,-66.5],[40.0,-66.5],[50.0,-66.5],[60.0,-66.5],[70.0,-66.5],[80.0,-66.5],[90.0,-66.5],[100.0,-66.5],[110.0,-66.5],[120.0,-66.5],[130.0,-66.5],[140.0,-66.5],[150.0,-66.5],[160.0,-66.5],[170.0,-66.5],[180.0,-66.5]]]}]} \ No newline at end of file diff --git a/.GC/cache/sources/gitcode-official/model/earth-geography/earth-geography.model/coastline.json b/.GC/cache/sources/gitcode-official/model/earth-geography/earth-geography.model/coastline.json new file mode 100644 index 0000000..80c6f72 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-geography/earth-geography.model/coastline.json @@ -0,0 +1 @@ +{"lines":[[[179.999,-16.169],[179.564,-16.637],[179.568,-16.747],[179.93,-16.519],[179.928,-16.744],[179.419,-16.807],[179.202,-16.713],[179.007,-16.9],[178.707,-16.976],[178.604,-16.801],[178.497,-16.788],[178.584,-16.622],[178.805,-16.631],[178.961,-16.483],[179.552,-16.25],[179.999,-16.169]],[[143.179,-11.954],[143.11,-12.304],[143.402,-12.64],[143.587,-13.444],[143.548,-13.741],[143.756,-14.349],[143.962,-14.463],[144.473,-14.232],[144.648,-14.492],[145.288,-14.943],[145.272,-15.477],[145.458,-16.056],[145.426,-16.406],[145.755,-16.879],[145.912,-16.913],[146.126,-17.635],[146.032,-18.273],[146.333,-18.554],[146.297,-18.841],[146.383,-18.977],[147.139,-19.393],[147.419,-19.378],[147.742,-19.77],[148.759,-20.29],[148.885,-20.481],[148.73,-20.468],[148.684,-20.58],[149.205,-21.125],[149.329,-21.476],[149.454,-21.579],[149.704,-22.441],[149.822,-22.39],[149.974,-22.551],[149.942,-22.308],[150.021,-22.168],[150.541,-22.559],[150.623,-22.367],[150.764,-22.576],[150.843,-23.458],[151.154,-23.784],[151.832,-24.123],[152.13,-24.598],[152.456,-24.802],[152.654,-25.202],[152.913,-25.432],[152.921,-25.689],[153.165,-25.964],[153.084,-26.304],[153.117,-27.194],[153.576,-28.241],[153.617,-28.673],[153.605,-28.854],[153.348,-29.29],[153.272,-29.892],[153.031,-30.563],[152.944,-31.435],[152.559,-32.046],[152.47,-32.439],[152.137,-32.678],[152.164,-32.757],[151.813,-32.901],[151.432,-33.522],[151.292,-33.581],[151.28,-33.927],[151.125,-34.005],[151.232,-34.03],[150.871,-34.499],[150.805,-35.013],[150.567,-35.214],[150.195,-35.834],[149.96,-36.846],[149.933,-37.529],[149.481,-37.771],[148.262,-37.831],[147.877,-37.934],[146.857,-38.663],[146.217,-38.727],[146.337,-38.894],[146.467,-38.84],[146.484,-39.065],[146.4,-39.146],[146.158,-38.866],[145.935,-38.902],[145.791,-38.667],[145.397,-38.535],[145.542,-38.394],[145.476,-38.244],[145.293,-38.238],[144.96,-38.501],[144.718,-38.34],[144.911,-38.344],[145.12,-38.091],[144.891,-37.9],[144.396,-38.137],[144.665,-38.21],[143.539,-38.821],[142.456,-38.386],[141.725,-38.271],[141.594,-38.388],[141.424,-38.363],[141.011,-38.077],[140.39,-37.897],[139.784,-37.246],[139.738,-37.06],[139.857,-36.662],[139.729,-36.371],[139.466,-36.01],[138.969,-35.581],[139.178,-35.523],[139.289,-35.611],[139.283,-35.375],[138.522,-35.642],[138.184,-35.613],[138.511,-35.024],[138.49,-34.764],[138.089,-34.17],[137.692,-35.143],[136.884,-35.24],[137.014,-34.916],[137.391,-34.913],[137.494,-34.161],[137.932,-33.579],[137.852,-33.201],[137.993,-33.094],[137.783,-32.578],[137.791,-32.823],[137.442,-33.194],[137.237,-33.629],[136.431,-34.03],[135.891,-34.661],[135.97,-34.982],[135.792,-34.863],[135.648,-34.94],[135.231,-34.58],[135.123,-34.586],[135.217,-34.487],[135.45,-34.581],[135.219,-33.96],[134.889,-33.626],[134.719,-33.255],[134.301,-33.165],[134.1,-32.749],[134.227,-32.731],[134.234,-32.549],[133.665,-32.207],[133.212,-32.184],[132.757,-31.956],[132.215,-32.007],[131.721,-31.696],[131.144,-31.496],[130.783,-31.604],[130.13,-31.579],[128.946,-31.703],[127.32,-32.264],[125.917,-32.297],[124.759,-32.883],[124.244,-33.015],[123.868,-33.596],[123.507,-33.916],[123.208,-33.988],[122.778,-33.891],[122.151,-33.992],[122.061,-33.874],[121.405,-33.827],[119.854,-33.975],[119.635,-34.101],[119.451,-34.368],[118.895,-34.48],[118.136,-34.987],[117.863,-35.055],[116.517,-34.988],[115.987,-34.795],[115.565,-34.426],[115.009,-34.256],[114.994,-33.515],[115.182,-33.643],[115.359,-33.64],[115.515,-33.531],[115.683,-33.193],[115.619,-32.667],[115.725,-32.401],[115.698,-31.695],[115.078,-30.56],[114.857,-29.143],[114.165,-28.081],[114.028,-27.347],[113.185,-26.182],[113.323,-26.244],[113.356,-26.08],[113.582,-26.558],[113.734,-26.595],[113.836,-26.501],[113.853,-26.332],[113.589,-26.099],[113.395,-25.713],[113.451,-25.599],[113.713,-25.831],[113.724,-26.13],[113.854,-26.014],[113.992,-26.321],[114.09,-26.394],[114.216,-26.289],[114.214,-25.852],[113.418,-24.436],[113.49,-23.87],[113.757,-23.418],[113.795,-22.915],[113.683,-22.638],[114.023,-21.881],[114.124,-21.829],[114.142,-22.483],[114.378,-22.342],[114.709,-21.823],[115.456,-21.492],[116.011,-21.03],[116.707,-20.654],[117.406,-20.721],[118.199,-20.375],[118.751,-20.262],[119.104,-19.995],[119.586,-20.038],[120.434,-19.842],[120.998,-19.604],[121.338,-19.32],[121.834,-18.477],[122.345,-18.112],[122.147,-17.549],[122.261,-17.136],[122.72,-16.788],[122.971,-16.437],[123.563,-17.521],[123.594,-17.03],[123.831,-17.121],[123.874,-16.919],[123.49,-16.491],[123.626,-16.416],[123.607,-16.224],[123.729,-16.192],[123.859,-16.382],[124.044,-16.265],[124.3,-16.388],[124.772,-16.403],[124.405,-16.299],[124.416,-16.133],[124.577,-16.114],[124.649,-15.87],[124.648,-15.805],[124.504,-15.972],[124.382,-15.758],[124.44,-15.494],[124.562,-15.496],[124.693,-15.274],[125.063,-15.442],[125.073,-15.307],[124.909,-15.31],[124.839,-15.161],[125.038,-15.004],[125.356,-15.12],[125.384,-15.016],[125.243,-14.945],[125.179,-14.715],[125.285,-14.584],[125.58,-14.483],[125.628,-14.257],[125.705,-14.291],[125.662,-14.529],[125.82,-14.469],[125.891,-14.618],[126.021,-14.495],[126.111,-14.114],[126.054,-13.977],[126.184,-14.002],[126.258,-14.164],[126.403,-14.019],[126.57,-14.161],[126.781,-13.955],[126.776,-13.788],[126.903,-13.744],[127.458,-14.031],[128.199,-14.752],[128.069,-15.329],[128.155,-15.226],[128.255,-15.299],[128.175,-15.043],[128.576,-14.775],[129.058,-14.884],[129.216,-15.16],[129.268,-14.871],[129.459,-14.933],[129.635,-15.14],[129.637,-14.851],[129.849,-14.829],[129.605,-14.647],[129.698,-14.557],[129.379,-14.392],[129.71,-13.98],[129.839,-13.573],[130.26,-13.302],[130.135,-13.146],[130.168,-12.957],[130.318,-12.883],[130.4,-12.688],[130.617,-12.647],[130.623,-12.431],[130.867,-12.558],[130.874,-12.367],[131.023,-12.343],[131.02,-12.214],[131.22,-12.178],[131.292,-12.068],[131.438,-12.277],[132.064,-12.281],[132.253,-12.186],[132.411,-12.295],[132.511,-12.135],[132.713,-12.123],[132.63,-12.035],[132.674,-11.649],[132.475,-11.492],[132.134,-11.501],[131.822,-11.302],[131.962,-11.181],[132.155,-11.311],[132.334,-11.224],[132.683,-11.506],[132.961,-11.407],[133.185,-11.706],[133.904,-11.832],[134.417,-12.053],[134.73,-11.984],[135.03,-12.194],[135.218,-12.222],[135.922,-11.826],[135.704,-12.21],[136.008,-12.191],[136.082,-12.422],[136.261,-12.434],[136.329,-12.306],[136.27,-12.132],[136.54,-11.958],[136.61,-12.134],[136.897,-12.244],[136.947,-12.35],[136.537,-12.784],[136.594,-13.004],[136.461,-13.225],[136.294,-13.138],[135.927,-13.304],[135.954,-13.935],[135.883,-14.153],[135.405,-14.758],[135.453,-14.923],[136.205,-15.403],[136.291,-15.57],[136.705,-15.685],[136.698,-15.835],[136.785,-15.894],[137.002,-15.878],[137.704,-16.233],[138.245,-16.718],[139.01,-16.899],[139.248,-17.329],[140.036,-17.703],[140.511,-17.625],[140.83,-17.414],[141.412,-16.07],[141.625,-15.057],[141.523,-14.47],[141.594,-14.153],[141.473,-13.798],[141.645,-13.259],[141.614,-12.943],[141.93,-12.74],[141.678,-12.491],[141.689,-12.351],[141.871,-11.976],[141.961,-12.054],[142.168,-10.947],[142.456,-10.707],[142.605,-10.748],[142.553,-10.874],[142.78,-11.115],[142.873,-11.821],[143.179,-11.954]],[[178.28,-17.372],[178.592,-17.651],[178.668,-18.081],[177.955,-18.264],[177.321,-18.078],[177.264,-17.863],[177.504,-17.54],[177.818,-17.388],[178.188,-17.313],[178.28,-17.372]],[[164.202,-20.246],[164.436,-20.282],[165.192,-20.769],[165.663,-21.267],[166.942,-22.09],[166.97,-22.323],[166.774,-22.376],[166.468,-22.256],[164.927,-21.29],[164.375,-20.739],[164.041,-20.173],[164.202,-20.246]],[[127.733,0.848],[127.881,0.832],[127.967,1.043],[128.161,1.158],[128.222,1.401],[128.688,1.573],[128.703,1.106],[128.299,0.877],[128.261,0.734],[128.611,0.55],[128.692,0.36],[128.9,0.216],[127.983,0.472],[127.887,0.298],[127.978,-0.248],[128.425,-0.893],[128.046,-0.706],[127.692,-0.242],[127.709,0.288],[127.537,0.611],[127.608,0.848],[127.429,1.14],[127.632,1.844],[128.036,2.199],[127.887,1.833],[128.011,1.701],[128.012,1.332],[127.653,1.014],[127.733,0.848]],[[69.185,-49.11],[69.593,-48.971],[69.644,-49.117],[69.405,-49.182],[69.542,-49.256],[70.32,-49.059],[70.484,-49.084],[70.555,-49.201],[70.386,-49.434],[70.166,-49.343],[69.76,-49.43],[69.986,-49.582],[70.166,-49.509],[70.307,-49.583],[70.124,-49.704],[69.153,-49.53],[68.993,-49.705],[68.815,-49.7],[68.872,-49.444],[68.799,-49.232],[68.883,-49.165],[68.77,-49.066],[69.002,-48.661],[69.136,-48.861],[69.052,-49.082],[69.185,-49.11]],[[63.374,80.7],[62.52,80.822],[63.116,80.967],[64.096,80.998],[64.31,81.175],[64.575,81.198],[65.172,81.144],[65.382,81.057],[65.437,80.931],[64.548,80.755],[63.374,80.7]],[[-25.432,70.921],[-25.468,70.78],[-25.346,70.693],[-25.402,70.653],[-26.218,70.454],[-26.605,70.553],[-28.035,70.487],[-27.714,70.713],[-27.709,70.897],[-27.617,70.914],[-26.622,70.876],[-25.819,71.044],[-25.432,70.921]],[[117.311,8.44],[117.219,8.367],[117.35,8.714],[117.885,9.241],[118.115,9.347],[119.224,10.477],[119.306,10.974],[119.501,11.346],[119.553,11.314],[119.527,10.953],[119.687,10.5],[119.369,10.327],[119.192,10.061],[118.782,9.916],[118.774,9.767],[118.435,9.256],[117.311,8.44]],[[122.496,11.615],[122.838,11.596],[122.931,11.529],[122.895,11.441],[123.158,11.536],[123.12,11.287],[122.803,10.99],[122.77,10.824],[121.954,10.444],[122.104,11.643],[121.891,11.791],[121.916,11.854],[122.029,11.895],[122.496,11.615]],[[123.131,9.064],[122.995,9.059],[122.867,9.32],[122.562,9.483],[122.4,9.823],[122.471,9.962],[122.856,10.087],[122.817,10.504],[122.983,10.887],[123.257,10.994],[123.511,10.923],[123.568,10.781],[123.162,9.864],[123.15,9.606],[123.321,9.273],[123.131,9.064]],[[124.575,11.343],[124.93,11.373],[125.027,11.212],[125.013,10.786],[125.164,10.637],[125.268,10.308],[125.143,10.189],[124.987,10.368],[125.027,10.033],[124.781,10.168],[124.787,10.781],[124.663,10.962],[124.446,10.924],[124.331,11.535],[124.575,11.343]],[[125.24,12.528],[125.32,12.322],[125.536,12.191],[125.457,11.953],[125.492,11.594],[125.574,11.238],[125.736,11.05],[125.628,11.132],[125.233,11.145],[125.034,11.341],[124.917,11.558],[124.995,11.765],[124.446,12.153],[124.295,12.569],[125.24,12.528]],[[120.704,13.479],[121.203,13.432],[121.523,13.131],[121.541,12.638],[121.394,12.301],[121.237,12.219],[120.922,12.512],[120.68,13.131],[120.455,13.394],[120.338,13.412],[120.401,13.517],[120.704,13.479]],[[155.958,-6.687],[155.915,-6.797],[155.719,-6.863],[155.344,-6.722],[155.209,-6.527],[155.202,-6.308],[154.759,-5.931],[154.729,-5.444],[155.094,-5.62],[155.467,-6.145],[155.823,-6.38],[155.958,-6.687]],[[152.966,-4.756],[152.892,-4.832],[152.74,-4.636],[152.668,-4.132],[152.279,-3.582],[151.067,-2.829],[150.746,-2.739],[150.826,-2.713],[150.825,-2.573],[151.226,-2.87],[152.033,-3.251],[153.017,-4.106],[153.133,-4.352],[152.966,-4.756]],[[138.535,-8.274],[138.296,-8.405],[137.65,-8.386],[138.082,-7.566],[138.296,-7.438],[138.77,-7.39],[138.989,-7.696],[138.786,-8.059],[138.535,-8.274]],[[129.755,-2.866],[129.984,-2.977],[130.379,-2.989],[130.57,-3.131],[130.86,-3.57],[130.805,-3.858],[129.844,-3.327],[129.512,-3.329],[129.468,-3.453],[128.967,-3.326],[128.925,-3.229],[128.517,-3.449],[128.132,-3.157],[127.902,-3.496],[127.878,-3.222],[128.199,-2.866],[128.991,-2.829],[129.116,-2.937],[129.484,-2.786],[129.755,-2.866]],[[126.861,-3.088],[127.227,-3.391],[127.23,-3.633],[126.686,-3.824],[126.215,-3.605],[126.057,-3.421],[126.088,-3.105],[126.861,-3.088]],[[122.783,-8.612],[121.651,-8.899],[121.415,-8.815],[121.328,-8.917],[121.035,-8.935],[120.55,-8.802],[120.121,-8.777],[119.909,-8.858],[119.808,-8.698],[119.875,-8.42],[120.61,-8.24],[121.445,-8.578],[121.967,-8.455],[122.323,-8.628],[122.85,-8.304],[122.919,-8.222],[122.759,-8.186],[122.917,-8.106],[123.006,-8.329],[122.783,-8.612]],[[120.013,-9.375],[120.291,-9.648],[120.556,-9.719],[120.784,-9.957],[120.804,-10.108],[120.439,-10.294],[120.255,-10.242],[119.601,-9.774],[119.085,-9.707],[118.959,-9.519],[119.296,-9.367],[119.795,-9.38],[119.942,-9.301],[120.013,-9.375]],[[118.242,-8.318],[118.612,-8.281],[118.714,-8.415],[118.926,-8.298],[119.13,-8.668],[118.746,-8.735],[118.833,-8.833],[118.479,-8.856],[118.379,-8.675],[118.19,-8.841],[117.061,-9.099],[116.788,-9.006],[116.835,-8.532],[117.165,-8.367],[117.567,-8.426],[117.806,-8.711],[117.97,-8.728],[118.235,-8.592],[117.815,-8.342],[117.755,-8.15],[118.117,-8.122],[118.242,-8.318]],[[115.448,-8.155],[115.704,-8.407],[115.334,-8.616],[115.145,-8.849],[115.055,-8.573],[114.613,-8.378],[114.468,-8.166],[114.938,-8.187],[115.154,-8.066],[115.448,-8.155]],[[106.046,-1.669],[106.366,-2.465],[106.818,-2.573],[106.612,-2.896],[106.667,-3.072],[105.999,-2.825],[105.786,-2.181],[105.133,-2.043],[105.375,-1.813],[105.46,-1.575],[105.585,-1.527],[105.701,-1.731],[105.72,-1.534],[105.91,-1.505],[106.046,-1.669]],[[22.617,58.621],[22.964,58.606],[23.323,58.451],[22.73,58.231],[22.372,58.217],[22.152,57.967],[21.997,57.931],[22.188,58.154],[21.882,58.262],[21.984,58.387],[21.862,58.497],[22.617,58.621]],[[21.608,78.596],[22.043,78.577],[22.3,78.228],[22.989,78.252],[23.452,78.149],[23.152,78.088],[23.117,77.992],[24.902,77.757],[24.13,77.658],[23.736,77.462],[22.802,77.276],[22.427,77.316],[22.442,77.429],[22.685,77.554],[21.05,77.441],[20.873,77.565],[21.201,77.619],[21.653,77.924],[21.035,78.059],[20.528,78.326],[20.56,78.419],[20.228,78.478],[21.608,78.596]],[[62.168,80.835],[62.228,80.794],[62.076,80.617],[61.051,80.419],[60.278,80.494],[59.65,80.431],[59.288,80.573],[59.387,80.713],[59.716,80.836],[62.168,80.835]],[[47.442,80.854],[48.446,80.806],[48.687,80.718],[48.684,80.633],[47.705,80.765],[47.304,80.606],[46.141,80.447],[45.969,80.569],[44.905,80.611],[47.442,80.854]],[[50.278,80.927],[50.801,80.914],[51.704,80.688],[50.961,80.54],[49.846,80.498],[49.586,80.377],[48.811,80.354],[48.677,80.3],[48.96,80.266],[48.978,80.163],[48.582,80.195],[48.386,80.096],[47.737,80.082],[47.632,80.112],[47.978,80.213],[46.991,80.183],[46.644,80.3],[47.896,80.529],[49.088,80.516],[49.185,80.559],[49.147,80.712],[49.244,80.821],[50.278,80.927]],[[50.265,69.186],[50.221,69.049],[50.094,69.126],[49.626,68.86],[48.91,68.743],[48.439,68.805],[48.279,69.04],[48.414,69.346],[48.953,69.509],[49.225,69.511],[50.265,69.186]],[[60.45,69.935],[60.44,69.726],[59.725,69.706],[59.503,69.866],[58.953,69.893],[58.473,70.267],[59.048,70.46],[60.45,69.935]],[[92.683,79.685],[92.154,79.685],[91.376,79.835],[91.07,79.981],[92.173,80.045],[93.803,79.905],[92.683,79.685]],[[23.852,35.535],[24.166,35.595],[24.109,35.496],[24.354,35.359],[24.721,35.425],[25.476,35.306],[25.73,35.349],[25.791,35.123],[26.32,35.315],[26.166,35.019],[24.8,34.934],[24.709,35.089],[24.464,35.16],[23.593,35.257],[23.57,35.535],[23.673,35.514],[23.737,35.656],[23.852,35.535]],[[23.415,38.959],[23.525,38.813],[24.128,38.648],[24.276,38.22],[24.563,38.148],[24.579,38.02],[24.359,38.019],[24.04,38.39],[23.651,38.443],[23.252,38.801],[22.87,38.871],[23.258,39.031],[23.415,38.959]],[[34.463,35.594],[33.942,35.292],[33.908,35.202],[34.05,34.988],[33.699,34.97],[33.415,34.751],[33.062,34.675],[33.008,34.57],[32.449,34.729],[32.317,34.953],[32.301,35.083],[32.88,35.181],[32.942,35.39],[33.608,35.354],[34.556,35.662],[34.463,35.594]],[[19.076,57.836],[18.814,57.706],[18.791,57.483],[18.908,57.398],[18.146,56.921],[18.285,57.083],[18.105,57.272],[18.137,57.557],[18.537,57.831],[18.901,57.915],[19.076,57.836]],[[12.569,55.785],[12.545,55.656],[12.215,55.467],[12.413,55.286],[12.09,55.188],[12.05,54.815],[11.862,54.773],[11.654,55.187],[11.286,55.204],[11.121,55.601],[10.979,55.722],[11.322,55.753],[11.475,55.943],[11.628,55.957],[11.691,55.729],[11.82,55.698],[11.935,55.896],[11.866,55.968],[12.219,56.119],[12.579,56.064],[12.569,55.785]],[[-120.556,-73.756],[-120.272,-73.989],[-120.99,-74.157],[-121.002,-74.326],[-122.287,-74.403],[-122.938,-74.302],[-122.956,-74.24],[-122.765,-74.219],[-122.881,-74.099],[-122.625,-73.966],[-123.346,-73.843],[-123.013,-73.673],[-120.556,-73.756]],[[-126.33,-73.286],[-125.736,-73.406],[-125.264,-73.666],[-125.828,-73.718],[-125.799,-73.802],[-124.993,-73.83],[-124.54,-73.74],[-124.042,-73.88],[-124.152,-73.944],[-123.8,-74.076],[-123.837,-74.226],[-125.09,-74.182],[-126.244,-73.891],[-126.583,-73.67],[-127.212,-73.724],[-127.233,-73.586],[-127.429,-73.447],[-127.268,-73.304],[-126.33,-73.286]],[[-66.174,-80.078],[-66.904,-79.909],[-66.994,-79.793],[-67.809,-79.546],[-66.014,-79.624],[-65.87,-79.738],[-65.579,-79.771],[-65.504,-79.954],[-66.174,-80.078]],[[-73.707,-70.635],[-73.55,-70.723],[-74.806,-71.012],[-76.271,-71.133],[-76.512,-70.991],[-76.249,-70.864],[-75.127,-70.752],[-74.954,-70.59],[-74.59,-70.792],[-74.401,-70.576],[-73.707,-70.635]],[[-98.091,-71.912],[-98.168,-72.123],[-97.923,-72.117],[-97.816,-71.919],[-97.585,-71.883],[-97.473,-72.0],[-97.582,-72.095],[-97.345,-72.189],[-96.869,-71.851],[-96.383,-71.836],[-96.125,-71.896],[-96.298,-72.045],[-96.979,-72.222],[-96.718,-72.255],[-95.685,-72.057],[-95.531,-72.249],[-95.575,-72.41],[-96.078,-72.454],[-96.052,-72.577],[-98.163,-72.556],[-100.195,-72.273],[-102.022,-72.185],[-102.314,-72.081],[-102.128,-71.985],[-100.219,-71.833],[-99.784,-72.044],[-98.615,-71.764],[-98.189,-71.82],[-98.091,-71.912]],[[-74.354,-73.098],[-74.668,-73.275],[-74.366,-73.464],[-74.575,-73.611],[-75.901,-73.333],[-76.096,-73.15],[-75.898,-73.056],[-75.276,-73.05],[-75.731,-72.879],[-75.377,-72.82],[-74.336,-72.919],[-74.224,-72.997],[-74.354,-73.098]],[[-67.988,-67.474],[-68.818,-67.753],[-69.138,-67.515],[-68.336,-66.802],[-67.711,-66.633],[-67.681,-66.709],[-67.932,-66.845],[-67.968,-67.032],[-67.688,-67.147],[-68.235,-67.372],[-67.988,-67.474]],[[-178.876,71.577],[-178.354,71.529],[-177.498,71.219],[-177.822,71.068],[-179.157,70.94],[-180,70.993],[-180,71.538],[-178.876,71.577]],[[-58.85,-51.27],[-58.426,-51.324],[-58.379,-51.373],[-58.509,-51.484],[-58.272,-51.575],[-58.259,-51.417],[-57.977,-51.384],[-57.808,-51.518],[-57.96,-51.583],[-57.792,-51.636],[-58.683,-51.936],[-58.653,-52.099],[-59.196,-52.018],[-59.068,-52.173],[-59.342,-52.196],[-59.396,-52.308],[-59.532,-52.236],[-59.649,-52.134],[-59.571,-51.925],[-59.06,-51.685],[-59.097,-51.491],[-58.85,-51.27]],[[-37.103,-54.066],[-36.704,-54.108],[-36.607,-54.19],[-36.647,-54.262],[-36.326,-54.251],[-36.073,-54.554],[-35.895,-54.555],[-35.913,-54.711],[-35.799,-54.763],[-36.085,-54.867],[-36.472,-54.534],[-36.886,-54.339],[-37.631,-54.167],[-37.689,-54.077],[-37.619,-54.042],[-38.017,-54.008],[-37.382,-53.984],[-37.103,-54.066]],[[-73.773,-43.346],[-74.114,-43.358],[-74.387,-43.232],[-74.209,-42.879],[-74.037,-41.796],[-73.528,-41.896],[-73.423,-42.193],[-73.533,-42.314],[-73.471,-42.466],[-73.789,-42.586],[-73.436,-42.937],[-73.75,-43.159],[-73.773,-43.346]],[[-60.286,-51.462],[-59.388,-51.36],[-59.268,-51.428],[-59.921,-51.97],[-60.246,-51.986],[-60.384,-52.154],[-60.686,-52.188],[-60.961,-52.057],[-60.238,-51.772],[-60.583,-51.713],[-60.245,-51.639],[-60.568,-51.358],[-60.286,-51.462]],[[-74.476,-49.148],[-74.472,-49.786],[-74.595,-50.007],[-74.763,-50.011],[-74.88,-49.726],[-74.724,-49.424],[-74.96,-49.533],[-75.066,-49.852],[-75.55,-49.791],[-75.521,-49.622],[-75.337,-49.628],[-75.306,-49.494],[-75.467,-49.359],[-75.086,-49.27],[-75.21,-49.148],[-74.949,-48.96],[-74.981,-48.819],[-74.896,-48.733],[-74.546,-48.767],[-74.476,-49.148]],[[-61.801,49.094],[-63.042,49.225],[-63.566,49.399],[-63.777,49.602],[-64.485,49.887],[-64.131,49.942],[-63.089,49.773],[-61.817,49.284],[-61.696,49.139],[-61.801,49.094]],[[-61.105,45.945],[-60.865,45.983],[-61.038,45.882],[-60.972,45.838],[-61.059,45.703],[-60.738,45.751],[-60.461,45.969],[-60.733,45.957],[-60.298,46.311],[-60.226,46.196],[-59.865,46.16],[-59.934,46.019],[-59.828,45.965],[-60.673,45.591],[-61.284,45.574],[-61.45,45.716],[-61.495,45.941],[-61.409,46.17],[-60.87,46.797],[-60.489,47.01],[-60.408,47.004],[-60.332,46.768],[-60.495,46.27],[-61.105,45.945]],[[-171.463,63.64],[-170.875,63.594],[-170.43,63.699],[-169.555,63.373],[-168.716,63.311],[-168.852,63.171],[-169.365,63.171],[-169.676,62.956],[-169.819,63.122],[-170.527,63.379],[-170.954,63.453],[-171.519,63.332],[-171.791,63.425],[-171.746,63.703],[-171.463,63.64]],[[-166.135,60.384],[-165.73,60.314],[-165.712,60.069],[-165.592,59.913],[-166.1,59.85],[-166.149,59.764],[-167.139,60.009],[-167.436,60.207],[-166.836,60.217],[-166.476,60.383],[-166.135,60.384]],[[-163.476,54.981],[-163.379,54.816],[-163.083,54.669],[-163.358,54.736],[-163.583,54.626],[-164.073,54.621],[-164.591,54.404],[-164.823,54.419],[-164.904,54.545],[-164.479,54.907],[-163.807,55.049],[-163.476,54.981]],[[-77.261,18.457],[-76.35,18.152],[-76.211,17.914],[-76.525,17.866],[-76.853,17.974],[-76.944,17.849],[-77.119,17.88],[-77.205,17.715],[-77.361,17.834],[-77.768,17.877],[-78.044,18.174],[-78.34,18.287],[-78.217,18.448],[-77.873,18.522],[-77.261,18.457]],[[-66.129,18.445],[-65.629,18.381],[-65.621,18.242],[-65.971,17.974],[-67.197,17.994],[-67.172,18.224],[-67.264,18.365],[-67.159,18.499],[-66.129,18.445]],[[-152.898,57.824],[-152.429,57.826],[-152.483,57.703],[-152.216,57.577],[-152.412,57.455],[-152.941,57.498],[-152.997,57.469],[-152.781,57.453],[-152.679,57.345],[-153.733,57.052],[-153.643,56.961],[-153.973,56.774],[-154.071,56.821],[-153.793,56.99],[-154.103,57.021],[-154.035,57.122],[-154.244,57.143],[-154.381,57.097],[-154.184,57.005],[-154.339,56.921],[-154.706,57.335],[-154.535,57.559],[-154.116,57.651],[-153.688,57.305],[-153.838,57.636],[-153.693,57.663],[-153.906,57.791],[-153.842,57.863],[-153.488,57.731],[-153.217,57.796],[-153.16,57.972],[-152.85,57.897],[-152.898,57.824]],[[-133.566,56.339],[-133.203,56.32],[-133.097,56.09],[-132.598,55.895],[-132.173,55.481],[-132.511,55.594],[-132.631,55.473],[-132.418,55.483],[-132.16,55.323],[-132.207,55.224],[-131.976,55.209],[-132.022,54.726],[-132.549,54.953],[-132.622,55.136],[-132.782,55.048],[-133.119,55.328],[-132.959,55.396],[-133.082,55.504],[-133.033,55.59],[-133.298,55.607],[-133.68,55.785],[-133.412,55.798],[-133.242,55.921],[-133.371,56.036],[-133.743,55.965],[-133.531,56.146],[-133.566,56.339]],[[-134.97,57.351],[-134.621,56.718],[-134.682,56.216],[-134.981,56.519],[-134.883,56.679],[-135.331,56.822],[-135.2,57.027],[-135.455,57.249],[-135.662,57.034],[-135.812,57.01],[-135.823,57.28],[-135.449,57.534],[-134.97,57.351]],[[-134.68,58.162],[-134.24,58.144],[-133.823,57.629],[-134.18,58.011],[-134.307,58.034],[-134.267,57.885],[-133.937,57.582],[-133.911,57.353],[-134.435,57.057],[-134.613,57.138],[-134.487,57.482],[-134.66,57.638],[-134.923,58.355],[-134.68,58.162]],[[-135.73,58.244],[-135.588,58.147],[-135.693,58.039],[-135.613,57.992],[-135.347,58.124],[-134.955,58.015],[-134.971,57.817],[-135.338,57.769],[-134.979,57.724],[-134.873,57.589],[-134.931,57.481],[-135.564,57.666],[-135.692,57.42],[-135.911,57.447],[-136.077,57.675],[-136.569,57.972],[-136.322,58.219],[-136.144,58.098],[-136.094,58.198],[-135.73,58.244]],[[-132.656,54.127],[-132.303,54.099],[-132.166,53.955],[-132.215,53.815],[-132.574,53.675],[-132.464,53.653],[-132.187,53.685],[-132.134,54.034],[-131.668,54.141],[-132.011,53.265],[-132.52,53.194],[-132.748,53.31],[-132.425,53.337],[-132.845,53.508],[-133.052,53.778],[-133.098,54.006],[-133.048,54.159],[-132.656,54.127]],[[-131.754,53.196],[-131.635,52.922],[-131.972,52.88],[-131.455,52.702],[-131.591,52.578],[-131.43,52.422],[-131.26,52.416],[-131.32,52.303],[-131.143,52.291],[-131.222,52.154],[-132.165,52.783],[-132.258,52.934],[-132.144,52.999],[-132.547,53.138],[-131.754,53.196]],[[-63.811,46.469],[-63.681,46.562],[-63.129,46.422],[-62.164,46.487],[-62.024,46.422],[-62.526,46.203],[-62.478,46.0],[-62.805,45.973],[-63.022,46.067],[-62.895,46.124],[-63.056,46.224],[-62.978,46.316],[-63.271,46.2],[-63.153,46.188],[-63.213,46.16],[-63.569,46.209],[-63.759,46.398],[-64.111,46.425],[-64.136,46.6],[-64.403,46.692],[-63.994,47.062],[-64.088,46.775],[-63.811,46.469]],[[-72.51,40.986],[-72.581,40.921],[-71.903,41.061],[-73.194,40.654],[-73.9,40.571],[-73.799,40.641],[-74.032,40.639],[-73.574,40.92],[-72.625,40.992],[-72.274,41.153],[-72.51,40.986]],[[151.916,-4.297],[152.117,-4.212],[152.406,-4.341],[152.351,-4.822],[151.984,-5.074],[152.143,-5.357],[152.077,-5.458],[151.865,-5.565],[151.515,-5.552],[151.229,-5.92],[150.474,-6.263],[149.653,-6.29],[149.382,-6.078],[149.099,-6.117],[148.337,-5.669],[148.432,-5.472],[149.359,-5.584],[149.831,-5.524],[149.963,-5.448],[150.09,-5.012],[150.17,-5.071],[150.072,-5.31],[150.183,-5.524],[150.9,-5.447],[151.327,-4.96],[151.671,-4.883],[151.593,-4.201],[151.916,-4.297]],[[127.296,-8.425],[126.487,-8.913],[125.408,-9.276],[124.428,-10.149],[123.858,-10.344],[123.605,-10.27],[123.716,-10.079],[123.589,-9.967],[123.709,-9.615],[123.977,-9.373],[124.89,-8.968],[125.178,-8.648],[125.804,-8.492],[126.62,-8.459],[126.966,-8.316],[127.296,-8.425]],[[145.043,-40.787],[145.283,-40.77],[146.317,-41.163],[146.723,-41.078],[146.848,-41.168],[146.857,-41.058],[146.99,-40.992],[147.455,-41.002],[147.622,-40.845],[147.873,-40.873],[147.969,-40.78],[148.215,-40.855],[148.293,-40.947],[148.343,-42.215],[148.29,-42.255],[148.183,-42.065],[148.214,-41.97],[148.023,-42.259],[147.912,-42.658],[147.981,-43.157],[147.786,-43.22],[147.648,-43.021],[147.8,-42.928],[147.574,-42.846],[147.452,-43.033],[147.298,-42.791],[147.348,-42.927],[147.245,-43.216],[146.997,-43.156],[147.077,-43.276],[146.874,-43.612],[146.549,-43.509],[146.043,-43.547],[145.994,-43.376],[146.208,-43.316],[145.873,-43.292],[145.488,-42.927],[145.199,-42.231],[145.468,-42.493],[145.517,-42.354],[145.331,-42.147],[145.235,-42.197],[145.238,-42.02],[144.766,-41.39],[144.646,-40.981],[144.719,-40.672],[145.043,-40.787]],[[96.527,81.076],[96.755,80.958],[97.832,80.798],[97.856,80.698],[97.113,80.614],[97.025,80.536],[97.417,80.323],[97.175,80.241],[94.565,80.126],[93.872,80.01],[92.202,80.179],[91.524,80.359],[92.827,80.619],[93.263,80.791],[92.61,80.81],[93.359,81.032],[95.801,81.28],[96.527,81.076]],[[97.675,80.158],[98.018,80.023],[97.627,79.85],[97.652,79.761],[98.065,79.901],[98.353,79.884],[98.596,80.052],[99.295,80.016],[99.947,79.849],[100.061,79.777],[99.782,79.628],[99.681,79.323],[99.042,79.293],[99.815,79.096],[99.929,78.961],[99.44,78.834],[97.555,78.827],[96.808,78.985],[94.791,79.087],[94.219,79.402],[93.071,79.495],[94.987,80.097],[95.281,80.031],[95.498,80.106],[97.675,80.158]],[[102.885,79.254],[102.412,78.835],[102.95,79.056],[103.801,79.149],[104.633,78.835],[105.146,78.819],[105.343,78.594],[105.313,78.5],[104.742,78.34],[102.797,78.188],[101.204,78.192],[99.845,77.957],[99.287,78.038],[100.019,78.339],[100.416,78.753],[100.956,78.788],[100.856,78.898],[101.052,79.123],[101.543,79.254],[101.591,79.35],[102.251,79.256],[102.181,79.373],[102.405,79.433],[103.098,79.299],[102.885,79.254]],[[140.049,75.829],[140.816,75.631],[140.944,75.7],[140.985,75.965],[141.485,76.137],[142.67,75.863],[143.686,75.864],[145.36,75.53],[144.727,75.366],[144.883,75.269],[144.02,75.045],[143.17,75.117],[142.82,75.268],[142.7,75.449],[142.734,75.545],[142.986,75.633],[142.942,75.713],[142.308,75.692],[142.086,75.661],[142.199,75.393],[142.617,75.133],[143.128,74.97],[142.473,74.82],[141.987,74.991],[140.268,74.847],[139.681,74.964],[139.326,74.687],[139.099,74.657],[138.092,74.797],[137.218,75.124],[136.948,75.326],[137.29,75.349],[137.215,75.554],[137.269,75.749],[137.707,75.76],[137.501,75.91],[137.561,75.955],[138.208,76.115],[138.92,76.197],[140.049,75.829]],[[142.185,73.896],[143.344,73.569],[143.464,73.459],[143.491,73.246],[142.342,73.253],[140.663,73.452],[139.925,73.355],[139.686,73.426],[140.381,73.483],[141.085,73.866],[142.185,73.896]],[[146.795,75.371],[148.432,75.414],[148.509,75.387],[148.475,75.272],[148.59,75.236],[150.104,75.219],[150.531,75.1],[150.822,75.157],[150.58,74.919],[149.05,74.772],[148.092,74.826],[146.149,75.198],[146.438,75.558],[146.751,75.51],[146.795,75.371]],[[173.269,-34.935],[173.448,-34.844],[173.473,-34.947],[174.104,-35.143],[174.143,-35.3],[174.32,-35.247],[174.581,-35.786],[174.396,-35.797],[174.802,-36.309],[174.752,-36.491],[174.819,-36.612],[174.722,-36.841],[175.3,-36.993],[175.385,-37.207],[175.542,-37.201],[175.487,-36.69],[175.386,-36.556],[175.461,-36.476],[175.681,-36.747],[175.772,-36.735],[176.108,-37.645],[177.274,-37.993],[177.558,-37.897],[178.009,-37.555],[178.536,-37.692],[178.268,-38.551],[177.976,-38.722],[177.909,-39.24],[177.786,-39.111],[177.523,-39.074],[177.077,-39.222],[176.939,-39.555],[177.11,-39.673],[176.842,-40.158],[175.983,-41.213],[175.31,-41.611],[175.166,-41.417],[174.881,-41.424],[174.866,-41.223],[174.757,-41.325],[174.635,-41.289],[175.162,-40.622],[175.254,-40.289],[175.156,-40.115],[175.009,-39.952],[173.934,-39.509],[173.764,-39.319],[173.844,-39.139],[174.398,-38.963],[174.597,-38.785],[174.84,-38.023],[174.802,-37.896],[174.928,-37.804],[174.586,-37.098],[174.734,-37.215],[174.929,-37.085],[174.782,-36.944],[174.476,-36.942],[174.189,-36.492],[174.432,-36.565],[174.393,-36.24],[174.036,-36.122],[173.914,-35.909],[174.166,-36.328],[174.055,-36.36],[173.412,-35.543],[173.626,-35.319],[173.376,-35.5],[173.314,-35.443],[173.117,-35.205],[173.191,-35.016],[172.706,-34.455],[173.044,-34.429],[172.964,-34.535],[173.269,-34.935]],[[173.115,-41.279],[173.947,-40.924],[173.798,-41.272],[174.024,-41.072],[173.999,-40.993],[174.303,-41.02],[174.039,-41.242],[174.37,-41.104],[174.069,-41.429],[174.161,-41.562],[174.084,-41.671],[174.283,-41.741],[174.215,-41.85],[173.545,-42.518],[173.221,-42.977],[172.624,-43.272],[172.735,-43.355],[172.527,-43.465],[172.693,-43.444],[172.807,-43.621],[173.073,-43.676],[173.094,-43.844],[172.503,-43.844],[172.584,-43.774],[172.48,-43.727],[172.297,-43.868],[172.036,-43.702],[172.18,-43.896],[171.241,-44.264],[171.313,-44.302],[171.146,-44.912],[170.999,-44.911],[171.113,-45.039],[170.701,-45.684],[170.776,-45.871],[170.335,-45.992],[169.687,-46.552],[169.099,-46.631],[168.382,-46.605],[168.189,-46.362],[167.842,-46.366],[167.539,-46.149],[167.369,-46.242],[166.831,-46.225],[166.712,-46.134],[166.917,-45.957],[166.73,-46.053],[166.65,-46.042],[166.718,-45.889],[166.493,-45.964],[166.513,-45.812],[167.003,-45.712],[166.798,-45.646],[166.991,-45.532],[166.734,-45.544],[166.778,-45.41],[166.92,-45.408],[166.869,-45.311],[167.156,-45.411],[167.118,-45.318],[167.23,-45.29],[167.033,-45.222],[167.026,-45.124],[167.259,-45.082],[167.172,-44.997],[167.411,-44.828],[167.466,-44.958],[167.46,-44.802],[167.698,-44.641],[167.909,-44.665],[167.857,-44.501],[168.367,-44.082],[169.067,-43.863],[169.179,-43.913],[169.17,-43.777],[169.834,-43.537],[169.859,-43.426],[170.24,-43.164],[170.396,-43.182],[170.303,-43.108],[170.459,-43.038],[170.612,-43.092],[170.524,-43.009],[170.665,-42.961],[170.735,-43.03],[170.97,-42.718],[171.038,-42.862],[171.028,-42.696],[171.313,-42.46],[171.252,-42.402],[171.486,-41.795],[171.948,-41.539],[172.273,-40.759],[172.641,-40.518],[172.944,-40.519],[172.733,-40.544],[172.704,-40.668],[172.989,-40.848],[173.115,-41.279]],[[126.006,9.321],[126.193,9.277],[126.305,8.952],[126.14,8.596],[126.365,8.484],[126.459,8.203],[126.435,7.833],[126.57,7.677],[126.582,7.248],[126.439,7.012],[126.192,6.853],[126.189,6.31],[125.824,7.333],[125.689,7.263],[125.381,6.69],[125.588,6.466],[125.668,5.979],[125.346,5.599],[125.241,5.757],[125.232,6.07],[125.035,5.871],[124.927,5.875],[124.213,6.233],[124.078,6.404],[123.985,6.994],[124.207,7.396],[123.968,7.665],[123.666,7.818],[123.493,7.808],[123.391,7.408],[123.178,7.529],[123.097,7.7],[122.99,7.546],[122.843,7.529],[122.792,7.722],[122.616,7.763],[122.474,7.639],[122.142,6.95],[121.964,6.968],[121.925,7.2],[122.243,7.945],[122.911,8.156],[123.096,8.481],[123.435,8.703],[123.68,8.621],[123.849,8.433],[123.799,8.049],[124.198,8.23],[124.405,8.6],[124.731,8.563],[124.869,8.972],[125.141,8.869],[125.21,9.027],[125.499,9.015],[125.414,9.669],[125.471,9.757],[125.877,9.513],[126.006,9.321]],[[121.102,18.615],[121.846,18.295],[122.038,18.328],[122.147,18.487],[122.266,18.459],[122.315,18.32],[122.179,18.064],[122.152,17.664],[122.408,17.178],[122.519,17.125],[122.135,16.185],[121.595,15.933],[121.607,15.67],[121.392,15.324],[121.686,14.765],[121.628,14.581],[121.767,14.168],[121.912,14.02],[122.212,13.93],[122.287,13.996],[122.2,14.148],[122.627,14.318],[122.934,14.188],[123.102,13.75],[123.297,13.836],[123.32,14.062],[123.816,13.837],[123.806,13.722],[123.55,13.646],[123.819,13.269],[123.785,13.111],[124.143,13.036],[124.06,12.567],[123.878,12.69],[123.949,12.916],[123.627,12.912],[123.311,13.044],[123.163,13.442],[122.595,13.908],[122.468,13.887],[122.668,13.395],[122.6,13.194],[122.377,13.521],[121.778,13.938],[121.501,13.842],[121.344,13.649],[121.096,13.679],[120.841,13.885],[120.637,13.804],[120.617,14.188],[120.922,14.493],[120.941,14.645],[120.584,14.881],[120.589,14.483],[120.439,14.453],[120.251,14.793],[120.082,14.851],[119.773,16.255],[119.831,16.327],[120.16,16.048],[120.369,16.11],[120.304,16.645],[120.427,17.377],[120.358,17.638],[120.6,18.508],[121.102,18.615]],[[133.473,-0.726],[133.975,-0.744],[134.112,-0.847],[134.072,-1.002],[134.26,-1.363],[134.106,-1.721],[134.195,-2.309],[134.46,-2.832],[134.483,-2.583],[134.627,-2.537],[134.702,-2.934],[134.843,-2.909],[134.887,-3.21],[135.092,-3.349],[135.487,-3.345],[136.243,-2.583],[136.39,-2.273],[137.072,-2.105],[137.171,-2.025],[137.123,-1.841],[137.911,-1.484],[139.79,-2.348],[140.623,-2.446],[140.747,-2.607],[141.186,-2.628],[142.549,-3.205],[143.509,-3.431],[144.066,-3.805],[144.478,-3.825],[145.088,-4.349],[145.335,-4.385],[145.767,-4.823],[145.745,-5.402],[147.034,-5.919],[147.423,-5.966],[147.802,-6.315],[147.81,-6.704],[147.119,-6.722],[146.954,-6.834],[146.961,-6.929],[147.26,-7.464],[148.127,-8.104],[148.247,-8.554],[148.451,-8.695],[148.583,-9.052],[149.198,-9.031],[149.263,-9.498],[150.011,-9.688],[149.761,-9.806],[149.874,-10.013],[150.364,-10.19],[150.85,-10.236],[150.637,-10.338],[150.446,-10.307],[150.647,-10.518],[150.32,-10.655],[150.017,-10.577],[149.754,-10.353],[147.769,-10.07],[147.017,-9.388],[146.925,-9.247],[146.964,-9.06],[146.856,-9.088],[146.631,-8.951],[146.033,-8.076],[144.974,-7.802],[144.864,-7.632],[144.51,-7.567],[144.431,-7.679],[144.143,-7.757],[143.655,-7.46],[143.942,-7.944],[143.841,-7.942],[143.833,-8.029],[143.518,-8.001],[143.614,-8.2],[142.524,-8.322],[142.347,-8.167],[142.207,-8.196],[142.325,-8.198],[142.475,-8.369],[142.798,-8.345],[143.112,-8.475],[143.377,-8.762],[143.366,-8.961],[142.647,-9.328],[142.23,-9.17],[141.133,-9.221],[140.003,-8.196],[140.117,-7.924],[139.935,-8.101],[139.386,-8.189],[139.249,-7.982],[138.933,-8.262],[138.856,-8.145],[139.088,-7.587],[138.748,-7.251],[139.177,-7.19],[138.846,-7.136],[138.601,-6.937],[138.865,-6.858],[138.439,-6.343],[138.296,-5.949],[138.375,-5.844],[138.2,-5.807],[138.34,-5.676],[138.087,-5.709],[138.061,-5.465],[137.28,-4.945],[136.619,-4.819],[135.98,-4.531],[135.196,-4.451],[134.68,-4.079],[134.707,-3.955],[134.887,-3.938],[134.266,-3.946],[134.147,-3.797],[133.974,-3.818],[133.678,-3.479],[133.697,-3.248],[133.842,-3.055],[133.7,-3.087],[133.653,-3.364],[133.518,-3.412],[133.401,-3.899],[133.249,-4.062],[132.969,-4.095],[132.754,-3.704],[132.87,-3.551],[132.751,-3.295],[132.348,-2.975],[132.054,-2.915],[131.971,-2.789],[132.231,-2.68],[132.725,-2.789],[133.191,-2.438],[133.7,-2.625],[133.753,-2.451],[133.905,-2.391],[133.899,-2.304],[133.791,-2.294],[133.922,-2.102],[132.963,-2.273],[132.308,-2.242],[132.023,-1.99],[131.93,-1.56],[131.294,-1.393],[130.996,-1.425],[131.191,-1.166],[131.257,-0.855],[131.804,-0.704],[132.394,-0.355],[132.856,-0.417],[133.473,-0.726]],[[124.889,0.995],[124.428,0.471],[123.754,0.306],[123.265,0.327],[122.997,0.494],[121.013,0.442],[120.579,0.528],[120.349,0.449],[120.192,0.269],[120.013,-0.196],[120.063,-0.556],[120.27,-0.899],[120.518,-1.039],[120.667,-1.37],[121.034,-1.407],[121.149,-1.339],[121.576,-0.829],[121.97,-0.933],[122.28,-0.757],[122.889,-0.755],[122.829,-0.659],[123.171,-0.571],[123.38,-0.649],[123.434,-0.778],[123.378,-1.004],[122.903,-0.901],[122.251,-1.555],[121.859,-1.693],[121.651,-1.895],[121.355,-1.878],[121.575,-2.151],[121.77,-2.241],[122.083,-2.75],[122.292,-2.908],[122.399,-3.201],[122.253,-3.62],[122.69,-4.084],[122.848,-4.065],[122.872,-4.392],[122.72,-4.341],[122.722,-4.411],[122.114,-4.54],[122.038,-4.832],[121.589,-4.76],[121.487,-4.581],[121.618,-4.093],[120.892,-3.521],[121.054,-3.167],[121.052,-2.752],[120.879,-2.646],[120.654,-2.668],[120.261,-2.949],[120.437,-3.707],[120.362,-4.086],[120.42,-4.617],[120.279,-5.146],[120.43,-5.591],[119.952,-5.578],[119.717,-5.693],[119.557,-5.611],[119.36,-5.314],[119.594,-4.523],[119.624,-4.034],[119.42,-3.475],[118.922,-3.483],[118.783,-2.721],[119.092,-2.483],[119.322,-1.93],[119.309,-1.408],[119.508,-0.907],[119.711,-0.681],[119.844,-0.862],[119.722,-0.088],[119.866,0.04],[119.809,0.239],[119.913,0.445],[120.27,0.971],[120.416,0.849],[120.603,0.854],[120.868,1.253],[121.082,1.328],[121.404,1.244],[121.592,1.068],[122.437,1.018],[122.838,0.846],[123.067,0.942],[123.931,0.85],[124.534,1.23],[124.6,1.392],[124.947,1.672],[125.111,1.686],[125.234,1.502],[124.889,0.995]],[[107.374,-6.008],[107.667,-6.216],[108.33,-6.286],[108.678,-6.791],[110.426,-6.947],[110.835,-6.424],[110.972,-6.436],[111.182,-6.687],[111.54,-6.648],[112.087,-6.893],[112.539,-6.926],[112.649,-7.221],[112.794,-7.304],[112.795,-7.552],[113.014,-7.658],[113.498,-7.724],[114.071,-7.633],[114.409,-7.792],[114.387,-8.405],[114.584,-8.77],[113.253,-8.287],[112.679,-8.409],[111.51,-8.305],[110.607,-8.149],[109.853,-7.828],[109.282,-7.705],[108.741,-7.667],[108.452,-7.797],[107.917,-7.724],[107.285,-7.472],[106.455,-7.369],[106.417,-7.239],[106.52,-7.054],[106.198,-6.928],[105.255,-6.835],[105.371,-6.664],[105.484,-6.782],[105.655,-6.47],[105.787,-6.457],[105.868,-6.116],[106.075,-5.914],[106.825,-6.098],[107.046,-5.904],[107.374,-6.008]],[[96.493,5.229],[97.547,5.206],[98.248,4.415],[98.307,4.093],[99.732,3.183],[100.524,2.189],[100.888,1.948],[100.828,2.243],[101.046,2.257],[101.477,1.693],[101.785,1.621],[102.02,1.442],[102.39,0.842],[103.032,0.579],[103.008,0.415],[102.55,0.216],[102.896,0.279],[103.339,0.514],[103.673,0.289],[103.787,0.047],[103.429,-0.192],[103.405,-0.362],[103.509,-0.466],[103.439,-0.576],[103.721,-0.887],[104.361,-1.038],[104.516,-1.819],[104.845,-2.093],[104.647,-2.43],[104.651,-2.595],[104.971,-2.371],[105.397,-2.38],[105.582,-2.492],[106.044,-3.106],[105.844,-3.614],[105.93,-3.833],[105.831,-4.163],[105.887,-5.01],[105.748,-5.818],[105.349,-5.55],[105.081,-5.746],[104.64,-5.52],[104.684,-5.893],[104.602,-5.905],[103.831,-5.08],[102.538,-4.152],[102.128,-3.599],[101.579,-3.167],[100.89,-2.249],[100.855,-1.934],[100.289,-0.799],[99.67,0.045],[99.159,0.352],[98.595,1.865],[97.701,2.359],[97.591,2.847],[97.391,2.975],[96.969,3.575],[96.445,3.816],[95.579,4.662],[95.207,5.284],[95.228,5.565],[95.629,5.609],[96.133,5.294],[96.493,5.229]],[[116.808,6.691],[116.788,6.606],[117.129,6.969],[117.23,6.94],[117.294,6.677],[117.61,6.513],[117.694,6.35],[117.645,6.002],[117.501,5.885],[118.004,6.053],[118.116,5.862],[117.935,5.787],[117.974,5.706],[118.353,5.806],[118.595,5.592],[119.256,5.366],[119.25,5.199],[119.132,5.1],[118.672,4.964],[118.261,4.989],[118.185,4.829],[118.562,4.502],[118.548,4.379],[118.008,4.25],[117.696,4.343],[117.497,4.133],[117.777,3.689],[117.63,3.636],[117.51,3.73],[117.45,3.629],[117.056,3.623],[117.346,3.427],[117.352,3.194],[117.611,3.064],[117.569,2.929],[117.698,2.887],[117.639,2.825],[117.786,2.747],[118.067,2.318],[117.789,2.027],[118.985,0.982],[118.535,0.814],[118.196,0.874],[117.912,1.099],[117.964,0.89],[117.745,0.73],[117.522,0.236],[117.463,-0.324],[117.562,-0.771],[116.914,-1.224],[116.74,-1.044],[116.753,-1.327],[116.275,-1.785],[116.424,-1.785],[116.424,-2.053],[116.314,-2.14],[116.528,-2.208],[116.549,-2.411],[116.529,-2.511],[116.317,-2.552],[116.331,-2.902],[116.154,-2.984],[116.257,-3.126],[115.956,-3.595],[114.694,-4.17],[114.526,-3.377],[114.446,-3.482],[114.344,-3.444],[114.344,-3.235],[114.236,-3.361],[114.082,-3.279],[113.705,-3.455],[113.61,-3.196],[113.343,-3.246],[113.034,-2.933],[112.971,-3.187],[112.758,-3.322],[112.6,-3.4],[112.285,-3.321],[111.858,-3.552],[111.823,-3.057],[111.695,-2.889],[111.625,-2.975],[111.368,-2.934],[110.93,-3.071],[110.83,-2.995],[110.899,-2.909],[110.703,-3.021],[110.574,-2.891],[110.256,-2.966],[110.097,-2.001],[109.96,-1.863],[110.036,-1.526],[109.983,-1.275],[109.682,-0.944],[109.289,-0.846],[109.373,-0.638],[109.13,-0.445],[109.258,0.031],[108.945,0.356],[108.906,0.794],[108.959,1.135],[109.132,1.254],[109.01,1.24],[109.076,1.496],[109.379,1.923],[109.629,2.028],[109.865,1.764],[110.349,1.72],[111.223,1.396],[111.029,1.558],[111.268,2.14],[111.209,2.38],[111.444,2.382],[111.513,2.743],[112.988,3.162],[113.924,4.243],[114.013,4.575],[114.424,4.66],[114.995,5.022],[115.027,4.9],[115.428,4.969],[115.582,5.194],[115.419,5.413],[115.604,5.603],[115.741,5.533],[115.877,5.614],[116.138,6.13],[116.776,6.99],[116.808,6.691]],[[67.765,76.238],[61.356,75.315],[60.719,75.069],[60.277,75.008],[60.501,74.905],[59.747,74.746],[59.674,74.61],[59.24,74.693],[59.04,74.486],[58.535,74.499],[58.665,74.289],[58.618,74.227],[57.767,74.014],[57.872,73.85],[57.756,73.769],[57.313,73.838],[57.543,73.658],[56.964,73.367],[56.634,73.304],[55.007,73.454],[54.3,73.351],[54.132,73.481],[54.205,73.542],[53.763,73.766],[54.643,73.96],[55.341,74.42],[56.137,74.496],[55.582,74.628],[56.499,74.957],[55.998,75.003],[55.81,75.125],[56.036,75.194],[56.57,75.098],[56.876,75.244],[56.844,75.351],[57.607,75.341],[57.783,75.507],[58.094,75.593],[58.058,75.663],[58.881,75.855],[60.036,75.984],[60.279,76.096],[60.942,76.071],[61.054,76.12],[61.034,76.233],[61.202,76.282],[62.971,76.237],[64.463,76.378],[65.755,76.579],[66.345,76.821],[67.535,77.008],[68.486,76.934],[68.942,76.708],[68.9,76.573],[68.165,76.285],[67.765,76.238]],[[55.32,73.308],[56.43,73.201],[56.189,73.033],[56.122,72.807],[55.723,72.766],[55.616,72.599],[55.403,72.549],[55.36,72.409],[55.518,72.221],[55.298,71.935],[56.454,71.107],[57.625,70.729],[57.146,70.589],[56.26,70.715],[56.561,70.594],[56.435,70.563],[56.142,70.658],[55.797,70.616],[55.687,70.692],[54.645,70.742],[54.601,70.68],[53.722,70.814],[53.384,70.874],[53.614,70.915],[53.588,71.052],[53.671,71.087],[54.156,71.125],[53.41,71.34],[53.319,71.399],[53.412,71.53],[51.938,71.475],[51.59,71.571],[51.439,71.777],[51.444,71.934],[51.583,72.071],[52.252,72.13],[52.622,72.301],[52.917,72.669],[52.551,72.769],[52.913,72.9],[53.37,72.917],[53.247,72.973],[53.189,73.104],[53.251,73.183],[54.804,73.388],[55.32,73.308]],[[142.761,54.394],[142.976,54.141],[142.918,53.794],[143.325,52.963],[143.324,52.614],[143.172,52.349],[143.191,51.944],[143.321,51.583],[143.455,51.471],[143.816,50.283],[144.341,49.181],[144.686,48.871],[144.714,48.64],[144.536,48.894],[144.049,49.249],[143.732,49.312],[143.105,49.199],[142.574,48.072],[142.557,47.738],[142.94,47.323],[143.218,46.795],[143.486,46.752],[143.581,46.361],[143.432,46.029],[143.282,46.559],[142.578,46.701],[142.406,46.555],[142.077,45.917],[141.962,46.013],[141.83,46.451],[142.039,47.14],[141.964,47.587],[142.182,48.013],[142.135,48.29],[141.866,48.75],[142.142,49.569],[142.066,50.63],[142.207,51.223],[141.722,51.736],[141.808,51.789],[141.668,51.933],[141.661,52.273],[141.856,52.794],[141.824,53.34],[142.142,53.496],[142.319,53.405],[142.526,53.447],[142.583,53.537],[142.509,53.588],[142.68,53.674],[142.706,53.896],[142.335,54.281],[142.761,54.394]],[[143.824,44.117],[144.715,43.928],[145.37,44.327],[145.126,43.869],[145.14,43.663],[145.341,43.303],[145.833,43.386],[145.505,43.174],[144.921,43.001],[144.197,42.974],[143.969,42.881],[143.429,42.419],[143.237,42.0],[141.851,42.579],[141.407,42.547],[140.986,42.342],[140.71,42.556],[140.48,42.559],[140.327,42.293],[141.151,41.805],[141.0,41.737],[140.66,41.816],[140.385,41.519],[140.149,41.423],[140.037,41.474],[140.108,41.913],[139.835,42.278],[139.86,42.582],[140.432,42.954],[140.486,43.05],[140.392,43.303],[141.138,43.18],[141.374,43.28],[141.398,43.643],[141.645,44.019],[141.761,44.483],[141.782,44.716],[141.583,45.156],[141.668,45.401],[141.938,45.51],[142.885,44.67],[143.824,44.117]],[[141.229,41.373],[141.455,41.405],[141.43,40.723],[141.797,40.291],[141.991,39.792],[141.977,39.429],[141.901,39.111],[141.659,38.975],[141.546,38.763],[141.467,38.404],[141.108,38.338],[140.962,38.149],[141.002,37.115],[140.73,36.732],[140.574,36.231],[140.874,35.725],[140.457,35.51],[140.355,35.181],[139.844,34.915],[139.826,35.297],[140.097,35.585],[139.835,35.658],[139.65,35.409],[139.744,35.252],[139.675,35.149],[139.474,35.299],[139.249,35.278],[139.134,35.155],[139.086,34.839],[138.838,34.619],[138.761,34.699],[138.803,34.975],[138.904,35.025],[138.72,35.124],[138.577,35.086],[138.189,34.596],[137.543,34.664],[137.062,34.583],[137.288,34.704],[137.275,34.773],[136.963,34.835],[136.944,34.722],[136.871,34.733],[136.897,35.036],[136.804,35.05],[136.533,34.678],[136.88,34.434],[136.854,34.324],[136.33,34.177],[135.916,33.562],[135.695,33.487],[135.453,33.553],[135.128,34.007],[135.1,34.288],[135.309,34.417],[135.416,34.617],[135.042,34.631],[134.74,34.765],[134.247,34.714],[133.968,34.527],[133.142,34.302],[132.657,34.246],[132.313,34.325],[132.146,33.839],[131.741,34.052],[130.919,33.976],[130.889,34.262],[131.004,34.393],[131.354,34.413],[132.923,35.511],[133.981,35.507],[135.174,35.747],[135.265,35.722],[135.232,35.592],[135.327,35.526],[135.68,35.503],[135.903,35.607],[136.095,35.768],[136.006,35.991],[136.067,36.117],[136.698,36.742],[136.719,37.198],[136.843,37.382],[137.323,37.522],[137.338,37.437],[136.9,37.118],[137.017,36.837],[137.246,36.753],[137.514,36.952],[138.32,37.218],[138.633,37.472],[138.885,37.844],[139.364,38.099],[139.521,38.503],[139.802,38.882],[140.065,39.624],[139.995,39.855],[139.742,39.921],[139.908,40.022],[140.011,40.26],[139.967,40.673],[140.281,40.846],[140.386,41.23],[140.628,41.195],[140.749,40.83],[140.936,40.941],[141.119,40.882],[141.225,40.988],[141.244,41.206],[140.801,41.139],[140.802,41.254],[140.937,41.506],[141.229,41.373]],[[134.357,34.256],[134.637,34.227],[134.739,33.821],[134.377,33.608],[134.182,33.247],[133.959,33.448],[133.632,33.511],[133.286,33.36],[132.977,32.842],[132.804,32.752],[132.642,32.762],[132.709,32.902],[132.495,32.917],[132.428,33.059],[132.511,33.293],[132.405,33.331],[132.413,33.43],[132.033,33.34],[132.643,33.69],[132.784,33.992],[132.935,34.095],[133.193,33.933],[133.582,34.017],[133.603,34.244],[133.948,34.348],[134.357,34.256]],[[131.175,33.603],[131.696,33.603],[131.537,33.274],[131.897,33.255],[131.848,33.118],[132.009,32.919],[131.66,32.466],[131.337,31.405],[131.071,31.437],[131.098,31.256],[130.686,31.015],[130.79,31.269],[130.704,31.577],[130.776,31.706],[130.655,31.718],[130.556,31.563],[130.54,31.403],[130.645,31.267],[130.589,31.179],[130.201,31.292],[130.147,31.408],[130.294,31.451],[130.322,31.601],[130.188,31.769],[130.194,32.091],[130.395,32.219],[130.641,32.619],[130.498,32.657],[130.547,32.832],[130.238,33.178],[130.127,33.105],[130.175,32.851],[130.326,32.853],[130.34,32.702],[130.054,32.771],[129.769,32.571],[129.827,32.725],[129.69,32.875],[129.679,33.06],[129.992,32.852],[129.58,33.236],[129.61,33.344],[129.844,33.322],[129.826,33.437],[130.365,33.634],[130.484,33.835],[130.716,33.928],[130.953,33.872],[131.175,33.603]],[[121.009,22.62],[120.84,21.925],[120.743,21.956],[120.581,22.356],[120.316,22.548],[120.083,23.094],[120.132,23.653],[121.041,25.033],[121.594,25.275],[121.929,24.974],[121.82,24.825],[121.828,24.534],[121.397,23.173],[121.009,22.62]],[[110.889,19.992],[111.014,19.655],[110.822,19.558],[110.641,19.291],[110.451,18.748],[110.02,18.416],[109.519,18.218],[108.702,18.535],[108.666,19.304],[109.277,19.761],[109.177,19.768],[109.263,19.883],[110.172,20.054],[110.588,19.976],[110.652,20.138],[110.889,19.992]],[[79.982,9.813],[80.253,9.796],[80.711,9.366],[81.227,8.506],[81.373,8.431],[81.422,8.148],[81.874,7.288],[81.861,6.901],[81.637,6.425],[80.724,5.979],[80.267,6.01],[80.095,6.153],[79.859,6.829],[79.713,8.182],[79.75,8.294],[79.783,8.018],[79.929,8.899],[80.1,9.21],[80.086,9.578],[80.428,9.481],[79.979,9.699],[79.982,9.813]],[[49.538,-12.432],[49.938,-13.072],[50.174,-14.04],[50.235,-14.732],[50.441,-15.149],[50.405,-15.629],[50.185,-15.958],[50.02,-15.802],[49.893,-15.458],[49.664,-15.522],[49.839,-16.487],[49.767,-16.815],[49.595,-16.931],[49.449,-17.241],[49.478,-17.899],[49.363,-18.336],[47.908,-22.466],[47.558,-23.875],[47.177,-24.787],[46.729,-25.15],[46.159,-25.23],[45.508,-25.563],[45.115,-25.543],[44.813,-25.334],[44.346,-25.226],[44.035,-24.996],[43.67,-24.3],[43.699,-23.421],[43.358,-22.791],[43.265,-22.384],[43.291,-21.933],[43.502,-21.356],[43.8,-21.179],[44.405,-19.922],[44.449,-19.429],[44.239,-19.075],[44.233,-18.741],[44.04,-18.288],[43.979,-17.392],[44.421,-16.703],[44.476,-16.217],[44.909,-16.175],[45.223,-15.95],[45.342,-16.037],[45.598,-15.993],[45.7,-15.814],[46.158,-15.738],[46.4,-15.925],[46.331,-15.714],[46.475,-15.513],[46.942,-15.219],[47.027,-15.452],[47.099,-15.434],[47.093,-15.15],[47.352,-14.766],[47.465,-14.713],[47.478,-15.009],[47.774,-14.637],[47.964,-14.673],[47.812,-14.545],[47.773,-14.37],[47.996,-13.96],[47.884,-13.808],[47.941,-13.662],[48.04,-13.596],[48.255,-13.719],[48.796,-13.267],[48.919,-12.839],[48.786,-12.471],[48.932,-12.439],[49.207,-12.08],[49.538,-12.432]],[[-159.053,-79.807],[-160.302,-79.845],[-161.866,-79.704],[-163.712,-79.442],[-164.282,-79.246],[-164.126,-78.995],[-163.256,-78.722],[-162.39,-78.76],[-159.684,-79.402],[-159.051,-79.695],[-159.053,-79.807]],[[-70.334,-79.68],[-71.526,-79.624],[-71.784,-79.444],[-71.667,-79.246],[-71.454,-79.129],[-70.544,-78.884],[-67.479,-78.362],[-66.728,-78.384],[-69.251,-79.21],[-69.686,-79.443],[-69.634,-79.518],[-69.732,-79.618],[-70.334,-79.68]],[[-45.223,-78.811],[-43.627,-78.846],[-42.965,-79.477],[-42.99,-79.801],[-43.267,-79.979],[-43.758,-80.021],[-43.49,-80.096],[-43.528,-80.191],[-49.188,-80.643],[-49.773,-80.784],[-54.163,-80.87],[-54.351,-80.76],[-54.347,-80.569],[-53.394,-80.109],[-53.053,-80.175],[-52.461,-80.067],[-52.297,-80.141],[-50.402,-79.512],[-50.295,-79.43],[-50.379,-79.338],[-50.733,-79.283],[-50.52,-79.104],[-50.502,-78.95],[-50.242,-78.833],[-50.377,-78.78],[-50.22,-78.605],[-49.081,-78.047],[-47.463,-77.819],[-46.258,-77.805],[-44.594,-78.035],[-43.785,-78.336],[-43.947,-78.598],[-45.068,-78.661],[-45.352,-78.791],[-45.223,-78.811]],[[-59.734,-80.344],[-59.825,-80.733],[-60.583,-80.948],[-62.671,-80.834],[-62.94,-80.766],[-63.144,-80.595],[-64.065,-80.65],[-64.268,-80.749],[-66.771,-80.294],[-66.377,-80.222],[-65.98,-80.384],[-61.633,-80.344],[-61.194,-80.257],[-61.597,-80.206],[-61.684,-80.02],[-61.302,-79.996],[-61.343,-79.887],[-60.579,-79.741],[-59.873,-79.777],[-59.706,-79.875],[-59.788,-80.101],[-59.322,-80.196],[-59.734,-80.344]],[[-70.051,-69.189],[-70.079,-69.311],[-69.708,-69.321],[-69.417,-69.583],[-69.091,-70.09],[-68.314,-70.912],[-68.241,-71.822],[-68.543,-72.158],[-69.149,-72.427],[-69.209,-72.534],[-70.543,-72.664],[-72.367,-72.67],[-73.057,-72.448],[-72.737,-72.281],[-70.873,-72.366],[-70.206,-72.228],[-70.533,-72.163],[-71.661,-72.25],[-71.898,-72.121],[-71.034,-72.035],[-70.821,-71.907],[-71.816,-71.822],[-72.337,-71.632],[-72.928,-71.922],[-73.776,-71.849],[-73.537,-72.022],[-73.996,-72.17],[-74.786,-72.064],[-75.383,-71.828],[-75.335,-71.645],[-75.1,-71.555],[-74.392,-71.638],[-74.425,-71.457],[-74.236,-71.388],[-73.479,-71.579],[-73.38,-71.528],[-73.592,-71.448],[-73.604,-71.351],[-72.212,-71.335],[-73.06,-71.127],[-72.71,-71.073],[-71.719,-71.145],[-71.194,-70.985],[-70.381,-70.946],[-69.87,-71.126],[-69.876,-70.876],[-70.917,-70.786],[-71.19,-70.66],[-71.061,-70.537],[-70.328,-70.361],[-69.618,-70.398],[-70.328,-70.16],[-71.121,-70.196],[-71.729,-70.054],[-71.879,-69.909],[-71.743,-69.423],[-72.081,-69.267],[-72.138,-69.115],[-71.869,-68.941],[-70.417,-68.789],[-70.105,-68.959],[-70.051,-69.189]],[[-69.167,-52.668],[-68.79,-52.577],[-68.571,-52.695],[-68.24,-53.082],[-68.431,-53.055],[-68.489,-53.261],[-68.161,-53.306],[-68.008,-53.564],[-67.294,-54.05],[-66.236,-54.533],[-65.179,-54.678],[-65.471,-54.915],[-66.511,-55.032],[-68.22,-54.818],[-69.082,-54.91],[-69.486,-54.859],[-69.723,-54.712],[-70.031,-54.816],[-70.282,-54.752],[-70.497,-54.81],[-71.902,-54.602],[-71.928,-54.529],[-71.8,-54.434],[-71.606,-54.497],[-71.355,-54.395],[-71.08,-54.444],[-70.797,-54.327],[-70.699,-54.349],[-70.701,-54.485],[-70.311,-54.529],[-70.863,-54.11],[-70.868,-53.884],[-70.644,-53.823],[-70.696,-53.727],[-70.531,-53.627],[-70.38,-53.987],[-70.63,-54.006],[-70.243,-54.348],[-69.742,-54.306],[-69.365,-54.438],[-69.312,-54.571],[-69.045,-54.428],[-69.988,-54.109],[-70.151,-53.888],[-70.091,-53.722],[-69.352,-53.48],[-69.394,-53.373],[-70.213,-53.414],[-70.46,-53.206],[-70.391,-53.026],[-70.131,-52.943],[-70.38,-52.752],[-69.935,-52.821],[-69.498,-52.491],[-69.167,-52.668]],[[-81.837,23.163],[-81.262,23.157],[-81.145,23.055],[-80.65,23.103],[-80.365,22.943],[-79.82,22.887],[-79.851,22.827],[-79.276,22.408],[-78.686,22.367],[-77.637,21.797],[-77.497,21.788],[-77.583,21.889],[-77.497,21.872],[-77.144,21.644],[-77.366,21.613],[-77.253,21.483],[-77.099,21.589],[-76.836,21.4],[-76.867,21.33],[-75.723,21.111],[-75.596,20.995],[-75.663,20.898],[-75.597,20.838],[-75.74,20.812],[-75.725,20.715],[-74.883,20.651],[-74.513,20.385],[-74.167,20.292],[-74.154,20.169],[-75.116,19.901],[-75.152,20.008],[-75.29,19.893],[-76.158,19.99],[-77.715,19.855],[-77.554,20.082],[-77.104,20.408],[-77.23,20.644],[-78.116,20.762],[-78.491,21.054],[-78.577,21.414],[-78.728,21.593],[-79.357,21.585],[-80.231,21.872],[-80.485,22.123],[-81.036,22.074],[-81.185,22.268],[-81.284,22.109],[-81.849,22.214],[-82.078,22.388],[-81.71,22.497],[-81.703,22.592],[-81.839,22.672],[-82.738,22.689],[-83.38,22.223],[-83.901,22.17],[-84.031,21.943],[-84.503,21.776],[-84.501,21.93],[-84.887,21.857],[-84.326,22.074],[-84.361,22.379],[-84.045,22.666],[-83.258,22.968],[-82.101,23.19],[-81.837,23.163]],[[20.898,80.25],[21.549,80.243],[22.29,80.049],[22.443,80.19],[22.451,80.402],[23.008,80.474],[23.315,80.425],[23.115,80.187],[24.403,80.355],[25.836,80.175],[26.861,80.16],[27.148,80.059],[27.199,79.907],[26.006,79.617],[25.641,79.403],[24.751,79.365],[23.948,79.194],[22.904,79.231],[22.696,79.329],[22.866,79.412],[20.861,79.398],[20.128,79.49],[19.675,79.591],[20.493,79.633],[20.784,79.749],[18.725,79.761],[18.255,79.929],[18.856,80.037],[17.917,80.143],[18.779,80.194],[19.343,80.116],[19.537,80.163],[19.178,80.332],[19.751,80.227],[19.81,80.327],[19.614,80.463],[19.733,80.478],[20.898,80.25]],[[16.787,79.907],[17.219,79.941],[17.835,79.8],[17.956,79.704],[17.688,79.533],[17.669,79.386],[18.397,79.605],[18.815,79.427],[18.807,79.303],[18.678,79.262],[19.089,79.157],[19.751,79.147],[19.894,79.056],[20.163,79.146],[20.611,79.107],[20.767,79.059],[20.501,78.981],[21.389,78.74],[19.677,78.61],[19.15,78.379],[18.984,78.234],[18.995,78.081],[18.439,78.025],[18.362,77.682],[18.228,77.523],[17.623,77.399],[17.153,77.049],[17.249,76.969],[16.977,76.812],[17.063,76.659],[16.7,76.579],[15.547,76.886],[15.124,77.085],[14.366,77.234],[13.996,77.508],[14.378,77.58],[14.695,77.525],[14.921,77.689],[17.033,77.798],[16.914,77.898],[14.09,77.771],[13.791,77.854],[13.681,78.028],[13.937,78.086],[14.307,78.005],[14.248,78.071],[15.698,78.228],[15.657,78.299],[15.784,78.327],[17.172,78.417],[16.727,78.407],[16.449,78.504],[16.783,78.664],[15.417,78.473],[15.254,78.589],[15.384,78.771],[15.016,78.63],[14.689,78.721],[14.467,78.675],[14.515,78.581],[14.432,78.492],[14.638,78.415],[14.11,78.271],[13.15,78.237],[11.774,78.716],[11.755,78.812],[11.861,78.832],[11.365,78.95],[12.403,78.953],[11.982,79.025],[11.893,79.152],[12.084,79.268],[11.978,79.293],[11.58,79.283],[11.616,79.205],[11.521,79.151],[11.208,79.13],[10.738,79.52],[10.811,79.641],[10.682,79.758],[11.15,79.717],[11.702,79.821],[12.288,79.713],[12.219,79.798],[13.693,79.861],[13.921,79.762],[12.555,79.569],[13.334,79.575],[13.384,79.481],[13.957,79.34],[14.056,79.383],[14.04,79.586],[14.594,79.799],[15.052,79.675],[15.764,79.174],[16.344,78.976],[15.875,79.519],[15.826,79.709],[16.1,79.884],[16.094,80.007],[16.246,80.049],[16.787,79.907]],[[9.632,40.882],[9.805,40.5],[9.643,40.268],[9.707,40.017],[9.562,39.166],[9.056,39.239],[8.967,38.964],[8.649,38.927],[8.418,39.206],[8.399,39.482],[8.548,39.839],[8.408,39.917],[8.471,40.293],[8.19,40.652],[8.224,40.913],[8.572,40.85],[9.228,41.257],[9.615,41.017],[9.554,40.932],[9.632,40.882]],[[9.48,42.805],[9.551,42.13],[9.186,41.385],[8.808,41.588],[8.887,41.701],[8.718,41.761],[8.74,41.925],[8.622,41.931],[8.701,42.096],[8.588,42.161],[8.675,42.284],[8.566,42.358],[8.815,42.608],[9.313,42.713],[9.363,43.017],[9.463,42.981],[9.48,42.805]],[[15.577,38.22],[15.1,37.459],[15.296,37.055],[15.142,36.892],[15.113,36.688],[14.502,36.799],[14.143,37.104],[13.905,37.101],[13.17,37.479],[12.64,37.594],[12.436,37.82],[12.548,38.053],[12.734,38.183],[12.903,38.035],[13.16,38.19],[13.352,38.181],[13.789,37.981],[15.119,38.153],[15.499,38.291],[15.635,38.268],[15.577,38.22]],[[-52.731,69.945],[-52.045,69.807],[-51.9,69.605],[-52.77,69.364],[-53.754,69.26],[-54.183,69.404],[-53.658,69.465],[-53.825,69.54],[-54.734,69.611],[-54.919,69.714],[-54.788,69.95],[-54.323,69.942],[-54.831,70.133],[-54.706,70.256],[-54.372,70.317],[-53.297,70.205],[-52.731,69.945]],[[-127.197,50.64],[-125.482,50.317],[-124.831,49.53],[-123.996,49.224],[-123.497,48.582],[-123.415,48.698],[-123.284,48.455],[-123.573,48.323],[-125.017,48.711],[-125.136,48.822],[-124.85,49.028],[-124.813,49.213],[-124.927,49.014],[-125.543,48.953],[-125.829,49.092],[-125.644,49.186],[-125.952,49.248],[-125.935,49.401],[-126.549,49.419],[-126.542,49.59],[-126.134,49.672],[-126.525,49.72],[-126.903,49.944],[-127.114,49.88],[-127.25,50.138],[-127.349,50.052],[-127.467,50.163],[-127.864,50.128],[-127.839,50.293],[-127.963,50.346],[-127.906,50.445],[-127.487,50.405],[-127.466,50.583],[-127.751,50.607],[-127.731,50.536],[-128.058,50.498],[-128.35,50.697],[-128.242,50.828],[-127.918,50.861],[-127.197,50.64]],[[-71.954,19.722],[-71.735,19.735],[-71.558,19.895],[-70.954,19.914],[-70.194,19.638],[-69.957,19.672],[-69.739,19.299],[-69.232,19.272],[-69.606,19.206],[-69.624,19.118],[-68.685,18.905],[-68.381,18.671],[-68.359,18.538],[-68.687,18.215],[-68.935,18.408],[-69.275,18.44],[-69.771,18.444],[-70.48,18.217],[-70.645,18.336],[-71.028,18.273],[-71.439,17.636],[-71.632,17.774],[-71.712,18.005],[-72.06,18.229],[-72.877,18.152],[-73.515,18.245],[-73.747,18.19],[-73.885,18.042],[-74.46,18.393],[-74.388,18.625],[-74.228,18.663],[-72.789,18.435],[-72.376,18.574],[-72.348,18.675],[-72.811,19.072],[-72.703,19.441],[-73.438,19.722],[-73.315,19.855],[-72.877,19.928],[-71.954,19.722]],[[-49.629,-0.229],[-49.117,-0.164],[-48.393,-0.297],[-48.571,-0.893],[-48.84,-1.227],[-48.834,-1.39],[-49.038,-1.514],[-49.173,-1.413],[-49.234,-1.6],[-49.507,-1.512],[-49.588,-1.712],[-49.805,-1.79],[-50.066,-1.704],[-50.508,-1.788],[-50.76,-1.24],[-50.729,-1.127],[-50.577,-1.103],[-50.71,-1.078],[-50.796,-0.906],[-50.646,-0.273],[-50.248,-0.116],[-49.629,-0.229]],[[-3.11,58.515],[-3.212,58.321],[-3.99,57.959],[-4.036,57.852],[-3.857,57.819],[-4.135,57.578],[-3.403,57.708],[-2.074,57.702],[-1.781,57.474],[-2.593,56.562],[-3.31,56.363],[-2.885,56.398],[-2.653,56.318],[-2.674,56.253],[-3.362,56.028],[-3.789,56.095],[-3.049,55.952],[-2.599,56.027],[-2.147,55.903],[-1.655,55.57],[-1.232,54.704],[-0.671,54.504],[-0.084,54.118],[-0.206,54.022],[0.115,53.609],[-0.27,53.737],[-0.66,53.724],[-0.294,53.692],[0.271,53.335],[0.356,53.16],[0.046,52.906],[0.28,52.809],[0.559,52.967],[1.056,52.959],[1.657,52.754],[1.747,52.469],[1.591,52.12],[1.232,51.971],[1.274,51.845],[1.188,51.803],[0.752,51.73],[0.898,51.689],[0.891,51.571],[0.425,51.466],[1.415,51.363],[1.398,51.182],[1.044,51.047],[0.96,50.926],[0.205,50.763],[-0.785,50.765],[-1.416,50.897],[-1.334,50.821],[-2.031,50.725],[-1.962,50.628],[-2.036,50.603],[-2.999,50.717],[-3.405,50.632],[-3.68,50.24],[-4.195,50.393],[-4.817,50.256],[-5.119,50.038],[-5.622,50.051],[-5.656,50.132],[-4.894,50.534],[-4.583,50.776],[-4.523,50.977],[-4.296,51.027],[-4.188,51.189],[-3.136,51.205],[-2.433,51.741],[-3.293,51.39],[-3.562,51.414],[-3.891,51.592],[-4.235,51.569],[-4.091,51.66],[-4.386,51.741],[-4.902,51.626],[-5.168,51.741],[-5.262,51.88],[-5.183,51.95],[-4.218,52.277],[-3.98,52.542],[-4.079,52.608],[-4.101,52.915],[-4.683,52.806],[-4.269,53.145],[-3.428,53.341],[-3.098,53.26],[-3.166,53.395],[-3.065,53.427],[-2.919,53.305],[-2.75,53.31],[-3.065,53.513],[-2.925,53.733],[-3.032,53.774],[-3.027,53.906],[-2.9,53.961],[-2.846,54.135],[-3.166,54.128],[-3.592,54.564],[-3.465,54.773],[-3.036,54.953],[-3.55,54.947],[-3.958,54.781],[-4.253,54.847],[-4.517,54.758],[-4.818,54.846],[-4.911,54.689],[-5.032,54.761],[-5.173,54.986],[-5.056,54.988],[-4.677,55.501],[-4.892,55.699],[-4.872,55.874],[-4.584,55.939],[-4.844,56.051],[-4.8,56.158],[-5.228,55.886],[-5.223,56.066],[-4.997,56.233],[-5.084,56.197],[-5.41,55.995],[-5.386,55.77],[-5.556,55.39],[-5.731,55.334],[-5.681,55.624],[-5.504,55.802],[-5.623,55.813],[-5.61,56.055],[-5.188,56.758],[-5.652,56.532],[-6.134,56.707],[-5.731,56.853],[-5.861,56.903],[-5.591,57.102],[-5.562,57.233],[-5.795,57.379],[-5.802,57.468],[-5.582,57.547],[-5.745,57.668],[-5.608,57.881],[-5.157,57.881],[-5.413,58.07],[-5.338,58.239],[-5.008,58.263],[-5.09,58.385],[-5.017,58.567],[-4.433,58.513],[-3.053,58.635],[-3.11,58.515]],[[-7.179,55.057],[-6.947,55.183],[-6.129,55.217],[-5.717,54.817],[-5.879,54.641],[-5.583,54.663],[-5.47,54.5],[-5.671,54.55],[-5.656,54.382],[-5.558,54.371],[-5.607,54.273],[-6.345,53.987],[-6.142,53.578],[-6.027,52.927],[-6.217,52.543],[-6.463,52.345],[-6.325,52.247],[-6.89,52.159],[-6.966,52.25],[-7.003,52.166],[-7.527,52.099],[-8.058,51.826],[-8.409,51.889],[-8.336,51.793],[-8.408,51.712],[-9.296,51.498],[-9.835,51.483],[-9.58,51.689],[-10.121,51.601],[-9.599,51.874],[-10.341,51.799],[-10.379,51.869],[-9.91,52.123],[-10.39,52.135],[-10.357,52.207],[-9.772,52.25],[-9.906,52.404],[-9.632,52.547],[-8.783,52.68],[-8.99,52.755],[-9.175,52.635],[-9.917,52.57],[-9.465,52.823],[-9.394,52.896],[-9.462,52.947],[-9.299,53.098],[-8.93,53.207],[-9.514,53.238],[-9.626,53.334],[-9.876,53.343],[-9.795,53.395],[-10.091,53.413],[-10.117,53.549],[-9.721,53.604],[-9.91,53.658],[-9.902,53.727],[-9.578,53.805],[-9.579,53.88],[-9.914,53.864],[-9.856,54.095],[-10.093,54.156],[-10.056,54.258],[-8.546,54.241],[-8.623,54.347],[-8.23,54.507],[-8.133,54.641],[-8.764,54.681],[-8.377,54.889],[-8.393,55.02],[-8.275,55.146],[-7.667,55.256],[-7.557,55.122],[-7.659,54.971],[-7.478,55.047],[-7.518,55.248],[-7.302,55.299],[-7.309,55.366],[-6.962,55.238],[-7.179,55.057]],[[-179.799,68.94],[-178.874,68.754],[-178.539,68.586],[-178.751,68.66],[-178.693,68.546],[-178.097,68.425],[-178.056,68.265],[-177.797,68.338],[-178.373,68.566],[-177.527,68.294],[-177.589,68.224],[-177.297,68.223],[-175.345,67.678],[-175.233,67.447],[-175.375,67.357],[-175.003,67.438],[-174.85,67.349],[-174.938,67.093],[-174.771,66.784],[-174.925,66.623],[-174.504,66.538],[-174.394,66.344],[-174.085,66.473],[-174.065,66.23],[-173.774,66.435],[-174.232,66.632],[-174.006,66.779],[-174.086,66.943],[-174.55,67.091],[-173.68,67.145],[-173.158,67.069],[-173.324,66.955],[-173.347,66.851],[-173.259,66.84],[-173.175,66.865],[-173.193,66.994],[-172.52,66.952],[-173.008,67.065],[-171.796,66.932],[-170.473,66.32],[-170.604,66.249],[-170.301,66.294],[-170.192,66.201],[-170.244,66.169],[-169.778,66.143],[-169.729,66.058],[-170.541,65.865],[-170.561,65.656],[-170.666,65.622],[-171.451,65.794],[-171.054,65.55],[-171.17,65.502],[-171.907,65.496],[-172.436,65.67],[-172.783,65.681],[-172.354,65.496],[-172.418,65.45],[-172.233,65.456],[-172.309,65.276],[-172.662,65.249],[-172.286,65.206],[-172.213,65.048],[-173.066,64.847],[-172.801,64.791],[-172.901,64.629],[-172.487,64.544],[-172.379,64.432],[-172.739,64.412],[-172.903,64.526],[-172.916,64.369],[-173.157,64.28],[-173.376,64.355],[-173.327,64.54],[-173.73,64.365],[-174.571,64.718],[-175.442,64.817],[-175.854,65.011],[-175.856,65.233],[-176.093,65.471],[-177.056,65.614],[-177.489,65.504],[-178.412,65.496],[-178.526,65.593],[-178.502,65.74],[-178.939,66.033],[-178.747,66.014],[-178.527,66.402],[-178.868,66.187],[-179.105,66.232],[-179.143,66.375],[-179.34,66.287],[-179.327,66.163],[-179.683,66.184],[-179.79,65.901],[-179.366,65.639],[-179.352,65.517],[-179.705,65.187],[-180,65.067],[-180.0,68.983],[-179.799,68.94]],[[-15.543,66.229],[-14.596,66.382],[-14.912,66.284],[-15.116,66.102],[-14.698,66.02],[-14.688,65.897],[-14.827,65.764],[-14.392,65.787],[-14.318,65.684],[-14.473,65.575],[-14.167,65.642],[-13.618,65.519],[-13.805,65.355],[-13.653,65.29],[-13.755,65.193],[-13.57,65.068],[-13.854,64.993],[-13.853,64.862],[-14.044,64.742],[-14.385,64.745],[-14.433,64.538],[-14.628,64.416],[-15.833,64.177],[-16.64,63.865],[-17.816,63.713],[-17.947,63.536],[-18.654,63.407],[-20.198,63.556],[-20.494,63.687],[-20.363,63.765],[-20.414,63.805],[-20.651,63.737],[-21.152,63.945],[-21.449,63.858],[-22.652,63.828],[-22.701,64.083],[-22.51,63.991],[-22.188,64.039],[-21.669,64.349],[-21.463,64.379],[-22.053,64.314],[-21.901,64.392],[-22.001,64.413],[-21.95,64.515],[-21.591,64.626],[-22.106,64.533],[-22.325,64.624],[-22.248,64.727],[-22.467,64.795],[-23.347,64.824],[-23.819,64.739],[-24.026,64.863],[-22.788,65.046],[-21.892,65.049],[-21.764,65.174],[-22.509,65.197],[-21.844,65.447],[-22.902,65.58],[-23.9,65.408],[-24.476,65.525],[-24.249,65.615],[-23.857,65.538],[-24.093,65.776],[-23.616,65.68],[-23.285,65.75],[-23.833,65.849],[-23.525,65.88],[-23.777,66.018],[-23.434,66.024],[-23.599,66.109],[-23.453,66.181],[-23.063,66.086],[-23.019,65.982],[-22.66,66.026],[-22.616,65.867],[-22.442,65.908],[-22.445,66.07],[-22.948,66.213],[-22.484,66.266],[-23.117,66.339],[-22.889,66.441],[-22.426,66.43],[-21.407,66.026],[-21.517,65.968],[-21.309,65.895],[-21.375,65.742],[-21.658,65.724],[-21.365,65.578],[-21.432,65.474],[-21.23,65.421],[-21.13,65.267],[-20.804,65.636],[-20.455,65.571],[-20.357,65.719],[-20.357,66.033],[-20.208,66.1],[-19.49,65.768],[-19.383,66.076],[-18.846,66.184],[-18.142,65.734],[-18.099,65.83],[-18.297,66.157],[-17.907,66.143],[-17.55,65.964],[-17.153,66.203],[-16.838,66.125],[-16.485,66.196],[-16.428,66.278],[-16.541,66.447],[-16.249,66.523],[-15.985,66.515],[-15.543,66.229]],[[167.084,-77.322],[169.276,-77.455],[169.353,-77.525],[168.519,-77.681],[167.392,-77.649],[166.729,-77.851],[166.217,-77.525],[166.626,-77.377],[166.413,-77.252],[166.506,-77.189],[166.987,-77.187],[167.084,-77.322]],[[-160.467,-81.589],[-163.951,-81.391],[-163.201,-81.281],[-162.456,-81.313],[-160.938,-81.463],[-160.467,-81.589]],[[-20.607,-73.887],[-20.641,-74.151],[-20.423,-74.317],[-20.489,-74.493],[-20.818,-74.455],[-20.977,-74.225],[-21.167,-74.133],[-22.035,-74.107],[-21.126,-73.94],[-20.867,-73.677],[-20.69,-73.625],[-20.521,-73.712],[-20.607,-73.887]],[[-74.386,-52.922],[-73.654,-53.07],[-73.135,-53.354],[-73.567,-53.307],[-73.867,-53.097],[-74.27,-53.082],[-74.712,-52.749],[-74.386,-52.922]],[[-69.703,-54.919],[-68.901,-55.018],[-68.458,-54.96],[-68.4,-55.042],[-68.613,-55.156],[-68.283,-55.255],[-68.327,-55.333],[-68.09,-55.478],[-68.048,-55.643],[-68.338,-55.505],[-68.867,-55.45],[-68.89,-55.241],[-69.193,-55.172],[-69.297,-55.166],[-69.359,-55.301],[-69.181,-55.475],[-69.412,-55.444],[-69.646,-55.321],[-69.657,-55.229],[-69.98,-55.147],[-69.884,-54.882],[-69.703,-54.919]],[[159.879,-8.534],[158.944,-8.041],[158.457,-7.545],[158.734,-7.604],[159.109,-7.904],[159.431,-8.029],[159.843,-8.327],[159.794,-8.406],[159.879,-8.534]],[[-72.923,-53.482],[-72.882,-53.578],[-72.482,-53.588],[-72.205,-53.807],[-72.409,-54.004],[-72.871,-54.127],[-72.959,-54.066],[-72.764,-53.865],[-73.039,-53.833],[-73.081,-53.998],[-73.211,-53.986],[-73.305,-53.944],[-73.314,-53.729],[-73.845,-53.546],[-73.687,-53.427],[-73.447,-53.41],[-73.099,-53.512],[-73.054,-53.394],[-72.923,-53.482]],[[-73.735,-44.395],[-73.983,-44.495],[-74.002,-44.591],[-73.828,-44.84],[-73.752,-45.267],[-74.099,-45.325],[-74.089,-45.196],[-74.618,-44.648],[-74.481,-44.585],[-74.502,-44.474],[-74.097,-44.389],[-74.083,-44.186],[-73.995,-44.14],[-73.703,-44.274],[-73.735,-44.395]],[[160.749,-8.314],[160.998,-8.612],[160.944,-8.799],[161.159,-8.962],[161.367,-9.611],[160.772,-8.964],[160.663,-8.621],[160.714,-8.539],[160.59,-8.373],[160.749,-8.314]],[[123.37,9.45],[123.386,9.967],[123.711,10.474],[124.039,11.274],[124.005,10.4],[123.7,10.128],[123.37,9.45]],[[57.81,81.546],[58.564,81.418],[57.859,81.368],[58.015,81.255],[57.451,81.136],[56.822,81.238],[55.717,81.188],[55.466,81.311],[56.157,81.303],[57.092,81.541],[57.81,81.546]],[[54.719,81.116],[56.472,80.998],[57.694,80.792],[55.883,80.628],[54.067,80.814],[54.045,80.872],[54.367,80.904],[54.719,81.116]],[[11.25,78.611],[11.262,78.542],[11.826,78.436],[12.116,78.233],[11.121,78.463],[10.628,78.754],[10.558,78.903],[10.961,78.846],[11.25,78.611]],[[148.6,45.318],[147.914,44.99],[147.658,44.977],[147.207,44.554],[146.897,44.404],[147.247,44.856],[147.886,45.226],[147.924,45.383],[148.056,45.262],[148.324,45.282],[148.612,45.485],[148.812,45.51],[148.837,45.363],[148.6,45.318]],[[146.208,44.498],[146.568,44.44],[145.914,44.104],[145.587,43.845],[145.556,43.665],[145.439,43.737],[145.462,43.871],[146.112,44.5],[146.208,44.498]],[[92.723,11.536],[92.534,11.873],[92.676,12.192],[92.788,12.226],[92.721,12.541],[92.857,13.358],[93.062,13.545],[93.066,13.222],[92.886,12.942],[92.99,12.539],[92.864,12.436],[92.723,11.536]],[[-155.581,19.012],[-155.681,18.968],[-155.881,19.071],[-155.891,19.383],[-156.049,19.75],[-155.82,20.014],[-155.893,20.167],[-155.832,20.276],[-155.199,19.994],[-154.804,19.524],[-155.581,19.012]],[[-167.964,53.345],[-169.089,52.832],[-168.69,53.227],[-168.38,53.283],[-168.396,53.409],[-168.288,53.5],[-167.828,53.508],[-167.964,53.345]],[[-166.615,53.901],[-166.572,53.853],[-166.372,53.999],[-166.231,53.933],[-166.549,53.701],[-166.309,53.698],[-166.77,53.476],[-167.629,53.259],[-167.809,53.324],[-167.136,53.526],[-167.016,53.698],[-166.819,53.641],[-166.741,53.713],[-167.071,53.783],[-167.118,53.873],[-167.038,53.942],[-166.673,54.006],[-166.615,53.901]],[[-77.226,25.904],[-77.403,26.025],[-77.247,26.156],[-77.239,26.561],[-77.511,26.846],[-77.944,26.904],[-77.534,26.903],[-77.066,26.53],[-77.038,26.333],[-77.167,26.24],[-77.226,25.904]],[[-91.272,0.025],[-90.8,-0.752],[-90.906,-0.941],[-91.131,-1.02],[-91.419,-0.997],[-91.495,-0.861],[-91.121,-0.559],[-91.369,-0.287],[-91.429,-0.023],[-91.597,0.002],[-91.361,0.126],[-91.272,0.025]],[[-86.589,71.011],[-85.644,71.152],[-85.095,71.152],[-85.002,71.137],[-85.048,71.059],[-84.824,71.029],[-84.658,71.515],[-84.699,71.631],[-85.339,71.697],[-85.912,71.987],[-85.322,72.233],[-84.284,72.044],[-84.842,72.308],[-84.623,72.377],[-85.341,72.422],[-85.616,72.605],[-85.65,72.722],[-85.575,72.856],[-85.262,72.954],[-84.257,72.797],[-85.455,73.105],[-85.018,73.335],[-84.416,73.456],[-83.782,73.417],[-83.904,73.528],[-83.41,73.632],[-82.66,73.73],[-81.605,73.696],[-81.344,73.598],[-81.152,73.314],[-80.603,73.121],[-80.592,72.928],[-80.277,72.77],[-81.229,72.312],[-80.611,72.451],[-80.941,72.21],[-80.691,72.103],[-80.921,72.072],[-80.925,71.908],[-80.182,72.209],[-79.884,72.177],[-80.109,72.332],[-79.831,72.446],[-79.584,72.315],[-79.323,72.391],[-79.0,72.272],[-79.008,72.043],[-78.585,71.881],[-78.863,72.101],[-78.699,72.351],[-77.517,72.178],[-78.287,72.36],[-78.484,72.471],[-78.422,72.572],[-77.753,72.725],[-76.894,72.721],[-76.189,72.572],[-75.704,72.572],[-75.294,72.481],[-75.071,72.323],[-75.053,72.226],[-75.923,71.717],[-75.148,72.063],[-74.266,72.038],[-74.213,71.939],[-74.316,71.843],[-75.205,71.709],[-74.701,71.676],[-74.996,71.218],[-74.759,71.338],[-74.488,71.648],[-73.867,71.771],[-73.707,71.746],[-74.197,71.404],[-73.713,71.588],[-73.181,71.283],[-73.278,71.538],[-72.902,71.678],[-71.641,71.516],[-71.187,71.279],[-71.495,71.105],[-71.938,71.094],[-72.633,70.831],[-72.313,70.833],[-72.009,71.013],[-71.743,71.047],[-71.371,70.975],[-70.826,71.109],[-70.673,71.052],[-70.639,70.902],[-70.762,70.792],[-71.89,70.432],[-71.727,70.395],[-71.427,70.552],[-71.276,70.5],[-71.429,70.128],[-70.98,70.581],[-70.085,70.83],[-69.289,70.783],[-68.496,70.61],[-68.358,70.523],[-68.483,70.415],[-69.436,70.253],[-70.058,70.043],[-68.778,70.204],[-68.723,70.146],[-69.008,69.979],[-68.744,69.941],[-68.231,70.112],[-68.327,70.18],[-68.121,70.315],[-67.855,70.282],[-67.318,69.998],[-67.193,69.757],[-68.02,69.77],[-69.251,69.512],[-68.513,69.577],[-67.908,69.46],[-67.361,69.473],[-66.676,69.258],[-66.803,69.153],[-67.938,69.248],[-69.041,69.098],[-68.416,69.172],[-67.752,69.039],[-67.883,68.784],[-69.319,68.857],[-68.333,68.733],[-67.938,68.524],[-66.714,68.446],[-67.033,68.326],[-66.831,68.216],[-66.923,68.066],[-66.729,68.129],[-66.663,68.034],[-66.631,68.211],[-66.212,68.28],[-66.275,68.041],[-66.526,67.851],[-66.392,67.832],[-65.942,68.071],[-65.975,67.957],[-65.864,67.923],[-65.509,67.968],[-65.541,67.766],[-65.401,67.675],[-65.415,67.879],[-64.977,68.043],[-64.835,67.99],[-65.026,67.892],[-65.021,67.788],[-64.638,67.84],[-63.85,67.566],[-64.077,67.496],[-64.008,67.347],[-64.7,67.351],[-64.589,67.316],[-63.836,67.264],[-63.592,67.378],[-63.04,67.235],[-63.307,66.994],[-63.702,66.822],[-62.962,66.949],[-62.38,66.905],[-62.124,67.047],[-61.3,66.649],[-61.528,66.558],[-61.904,66.678],[-62.123,66.643],[-61.576,66.412],[-61.863,66.313],[-62.553,66.407],[-62.406,66.316],[-62.534,66.227],[-61.992,66.035],[-62.624,66.016],[-62.382,65.833],[-62.659,65.64],[-63.169,65.657],[-63.459,65.853],[-63.421,65.709],[-63.651,65.661],[-63.337,65.617],[-63.363,65.23],[-63.607,64.928],[-63.896,65.109],[-64.152,65.066],[-64.346,65.172],[-64.27,65.401],[-64.555,65.117],[-65.402,65.764],[-64.445,66.317],[-65.305,66.008],[-65.826,65.997],[-65.857,66.086],[-65.656,66.205],[-66.064,66.133],[-66.477,66.28],[-66.986,66.627],[-66.969,66.547],[-67.077,66.525],[-67.307,66.57],[-67.192,66.433],[-67.225,66.31],[-67.883,66.467],[-67.704,66.269],[-67.183,66.034],[-67.35,65.93],[-67.828,65.965],[-68.46,66.249],[-68.749,66.2],[-68.217,66.079],[-68.187,65.871],[-67.866,65.774],[-67.937,65.565],[-67.57,65.644],[-67.118,65.44],[-67.337,65.347],[-66.831,65.074],[-66.697,64.815],[-66.635,65.0],[-66.224,64.854],[-66.302,64.778],[-66.215,64.722],[-65.939,64.886],[-65.432,64.726],[-65.275,64.632],[-65.529,64.505],[-65.075,64.437],[-65.213,64.303],[-65.58,64.294],[-65.348,64.232],[-65.17,64.028],[-64.678,64.028],[-64.798,63.916],[-64.576,63.897],[-64.411,63.706],[-64.562,63.68],[-64.514,63.264],[-64.665,63.245],[-64.933,63.599],[-65.192,63.764],[-65.031,63.44],[-65.069,63.263],[-64.672,62.922],[-65.163,62.933],[-65.047,62.701],[-65.108,62.626],[-66.224,63.107],[-66.229,62.991],[-66.414,63.027],[-66.655,63.265],[-66.636,63.08],[-66.723,63.08],[-67.018,63.317],[-67.261,63.341],[-67.893,63.734],[-67.723,63.423],[-68.494,63.725],[-68.911,63.703],[-68.141,63.172],[-67.676,63.094],[-67.737,63.01],[-66.645,62.602],[-66.281,62.303],[-65.98,62.209],[-66.133,62.102],[-66.059,61.914],[-66.324,61.87],[-67.44,62.151],[-68.536,62.256],[-69.126,62.424],[-69.605,62.768],[-70.236,62.763],[-71.106,63.002],[-70.946,63.121],[-71.254,63.043],[-71.501,63.126],[-71.992,63.416],[-71.614,63.444],[-71.381,63.58],[-71.838,63.725],[-72.29,63.728],[-72.159,63.89],[-72.498,63.823],[-72.678,64.02],[-73.455,64.399],[-73.271,64.583],[-73.91,64.578],[-74.065,64.425],[-74.13,64.608],[-74.461,64.645],[-74.681,64.831],[-74.919,64.766],[-74.64,64.557],[-74.695,64.497],[-75.715,64.524],[-75.767,64.392],[-76.856,64.238],[-77.791,64.367],[-78.175,64.618],[-78.055,64.983],[-77.361,65.197],[-77.46,65.356],[-77.327,65.453],[-75.828,65.227],[-75.52,65.056],[-75.589,64.905],[-75.452,64.842],[-75.357,65.009],[-75.799,65.298],[-75.166,65.284],[-73.99,65.517],[-73.551,65.485],[-73.746,65.767],[-74.276,66.013],[-74.416,66.167],[-73.033,66.728],[-72.789,67.031],[-72.22,67.254],[-72.725,67.812],[-73.328,68.267],[-73.284,68.357],[-73.644,68.295],[-73.821,68.363],[-73.879,68.429],[-73.781,68.619],[-73.852,68.701],[-74.118,68.701],[-73.989,68.549],[-74.422,68.58],[-74.7,68.808],[-74.91,68.823],[-74.743,68.913],[-74.954,68.961],[-74.717,69.046],[-74.855,69.066],[-75.213,68.909],[-75.523,68.953],[-76.585,68.699],[-76.557,69.009],[-75.954,69.031],[-75.648,69.213],[-76.52,69.517],[-76.463,69.62],[-76.234,69.662],[-76.513,69.684],[-76.742,69.573],[-77.09,69.635],[-76.859,69.775],[-77.592,69.846],[-77.774,70.239],[-78.283,70.229],[-79.066,70.604],[-79.405,70.401],[-78.934,70.294],[-78.81,70.179],[-78.819,70.01],[-79.093,69.925],[-79.515,69.888],[-81.652,70.095],[-80.925,69.851],[-80.84,69.771],[-80.922,69.731],[-81.565,69.943],[-82.294,69.837],[-83.15,70.009],[-83.859,69.963],[-85.432,70.111],[-85.78,70.037],[-86.322,70.145],[-86.5,70.35],[-86.397,70.465],[-87.901,70.252],[-88.848,70.523],[-89.208,70.76],[-89.456,71.062],[-87.845,70.944],[-87.14,71.012],[-87.872,71.209],[-89.079,71.288],[-89.693,71.423],[-89.846,71.492],[-90.025,71.949],[-89.657,72.175],[-89.859,72.248],[-89.817,72.468],[-89.358,72.804],[-89.225,73.108],[-88.705,73.403],[-87.72,73.723],[-86.769,73.834],[-85.009,73.779],[-84.975,73.695],[-86.001,73.313],[-86.668,72.763],[-86.323,72.461],[-86.341,72.123],[-86.218,71.899],[-85.023,71.353],[-86.589,71.011]],[[-69.489,83.017],[-66.423,82.927],[-68.469,82.653],[-65.727,82.842],[-65.299,82.8],[-64.905,82.901],[-64.504,82.778],[-63.499,82.793],[-63.643,82.713],[-63.085,82.565],[-63.247,82.45],[-61.697,82.489],[-61.207,82.341],[-62.177,82.043],[-64.436,81.743],[-66.626,81.616],[-66.914,81.485],[-68.689,81.293],[-64.78,81.493],[-68.63,80.679],[-69.551,80.383],[-70.144,80.398],[-70.713,80.54],[-70.213,80.278],[-70.265,80.234],[-72.056,80.123],[-70.559,80.071],[-71.356,79.911],[-71.11,79.848],[-71.388,79.762],[-72.437,79.694],[-74.394,79.874],[-74.66,79.835],[-73.472,79.756],[-73.201,79.597],[-73.466,79.495],[-75.503,79.414],[-76.899,79.512],[-75.603,79.24],[-74.481,79.229],[-74.532,79.053],[-78.582,79.075],[-77.883,78.942],[-76.256,79.007],[-74.433,78.724],[-74.879,78.545],[-76.416,78.512],[-75.193,78.328],[-75.97,77.993],[-78.013,77.946],[-78.076,77.519],[-78.493,77.369],[-80.573,77.315],[-81.659,77.525],[-81.278,77.365],[-82.057,77.297],[-81.756,77.204],[-81.117,77.27],[-80.219,77.147],[-79.497,77.196],[-79.341,77.158],[-79.319,76.98],[-79.221,76.936],[-78.792,76.884],[-78.289,76.978],[-77.999,76.852],[-77.983,76.755],[-78.284,76.571],[-80.69,76.176],[-80.997,76.215],[-80.835,76.369],[-80.975,76.47],[-81.717,76.495],[-82.53,76.723],[-82.262,76.575],[-82.233,76.466],[-83.886,76.453],[-84.224,76.675],[-84.275,76.357],[-85.344,76.313],[-86.116,76.435],[-86.454,76.585],[-86.68,76.377],[-87.354,76.448],[-87.49,76.586],[-87.498,76.386],[-88.396,76.405],[-88.496,76.773],[-88.614,76.651],[-88.546,76.421],[-89.57,76.492],[-89.5,76.827],[-88.556,77.072],[-86.812,77.185],[-87.681,77.436],[-88.095,77.719],[-88.017,77.785],[-86.755,77.864],[-86.173,77.746],[-85.588,77.461],[-84.487,77.368],[-83.608,77.442],[-82.903,77.733],[-82.595,77.992],[-83.779,77.533],[-84.861,77.5],[-85.289,77.559],[-85.292,77.764],[-85.548,77.928],[-84.615,78.196],[-84.223,78.176],[-84.91,78.24],[-84.783,78.528],[-85.024,78.312],[-85.586,78.11],[-86.218,78.081],[-85.92,78.343],[-86.913,78.127],[-87.552,78.177],[-87.491,78.417],[-86.808,78.774],[-85.004,78.912],[-83.271,78.77],[-81.75,78.976],[-82.439,78.904],[-84.412,78.997],[-84.568,79.071],[-83.576,79.054],[-85.269,79.664],[-86.031,79.722],[-86.421,79.845],[-86.615,80.124],[-86.499,80.258],[-86.307,80.319],[-83.724,80.229],[-81.688,79.686],[-80.476,79.606],[-80.124,79.669],[-81.01,79.693],[-82.987,80.323],[-76.863,80.865],[-78.716,80.952],[-78.287,81.168],[-76.885,81.43],[-79.198,81.118],[-79.761,80.842],[-81.007,80.655],[-82.884,80.578],[-82.222,80.772],[-83.401,80.714],[-84.22,80.538],[-85.146,80.521],[-86.615,80.63],[-86.252,80.79],[-85.246,80.988],[-83.289,81.148],[-85.781,81.035],[-87.712,80.656],[-89.263,80.914],[-86.477,81.036],[-84.941,81.286],[-87.275,81.081],[-89.623,81.032],[-89.981,81.125],[-89.209,81.25],[-89.674,81.329],[-89.427,81.387],[-87.597,81.526],[-88.978,81.542],[-90.304,81.401],[-90.609,81.43],[-89.822,81.635],[-91.292,81.571],[-91.684,81.636],[-90.942,81.827],[-88.063,82.096],[-87.018,81.959],[-86.627,82.051],[-85.045,81.983],[-86.616,82.219],[-84.897,82.449],[-83.591,82.326],[-82.634,82.077],[-82.327,82.092],[-82.747,82.196],[-82.537,82.247],[-79.425,81.854],[-82.448,82.395],[-81.681,82.519],[-82.117,82.629],[-80.81,82.586],[-81.178,82.745],[-81.01,82.779],[-78.749,82.679],[-80.155,82.911],[-79.886,82.939],[-77.48,82.883],[-76.009,82.535],[-75.566,82.609],[-77.125,83.009],[-74.414,83.013],[-72.659,82.722],[-73.441,82.946],[-72.812,83.081],[-72.069,83.106],[-70.94,82.902],[-71.424,83.021],[-69.97,83.116],[-69.489,83.017]],[[-94.308,71.765],[-93.81,71.766],[-93.763,71.638],[-93.031,71.336],[-92.883,71.069],[-92.981,70.852],[-92.356,70.634],[-92.047,70.303],[-91.82,70.342],[-91.564,70.178],[-91.995,70.143],[-92.321,70.235],[-92.512,70.104],[-91.977,70.039],[-92.888,69.668],[-92.312,69.673],[-91.912,69.531],[-91.202,69.645],[-91.44,69.526],[-90.416,69.457],[-90.684,69.428],[-90.892,69.267],[-91.237,69.286],[-90.745,69.106],[-90.479,68.881],[-90.574,68.475],[-90.248,68.267],[-89.898,68.491],[-89.667,69.015],[-89.28,69.255],[-89.057,69.266],[-88.041,68.812],[-87.828,68.3],[-88.347,68.288],[-88.314,67.95],[-88.196,67.766],[-87.499,67.355],[-87.359,67.177],[-86.561,67.482],[-86.398,67.8],[-85.953,68.072],[-85.69,68.671],[-85.491,68.774],[-84.868,68.773],[-85.107,68.844],[-84.862,69.074],[-85.387,69.232],[-85.507,69.845],[-84.319,69.844],[-83.665,69.7],[-82.374,69.642],[-82.755,69.494],[-82.31,69.41],[-82.228,69.249],[-81.378,69.186],[-81.329,69.12],[-81.958,68.884],[-81.381,68.85],[-81.252,68.743],[-81.282,68.657],[-81.915,68.459],[-82.553,68.446],[-82.222,68.145],[-82.013,68.194],[-82.063,67.928],[-81.294,67.497],[-81.468,67.07],[-81.926,66.975],[-82.261,66.739],[-83.406,66.371],[-83.59,66.388],[-83.998,66.729],[-84.324,66.782],[-84.273,66.839],[-84.538,66.973],[-84.846,67.029],[-85.114,66.907],[-84.738,66.934],[-84.223,66.682],[-83.826,66.29],[-83.869,66.214],[-84.293,66.292],[-84.478,66.179],[-84.628,66.208],[-85.604,66.568],[-86.708,66.523],[-86.685,66.36],[-85.959,66.119],[-87.081,65.441],[-87.453,65.339],[-87.97,65.349],[-88.744,65.679],[-89.749,65.936],[-89.944,65.934],[-89.89,65.869],[-91.427,65.948],[-91.041,65.83],[-90.983,65.919],[-89.924,65.78],[-88.974,65.348],[-87.028,65.198],[-87.029,65.064],[-87.281,64.826],[-88.106,64.183],[-88.818,63.992],[-89.201,64.114],[-89.132,63.969],[-89.616,64.031],[-89.811,64.181],[-90.042,64.141],[-89.856,63.957],[-90.168,63.979],[-90.013,63.804],[-90.155,63.69],[-90.812,63.581],[-91.982,63.822],[-92.338,63.788],[-93.696,64.147],[-93.597,64.041],[-93.664,63.941],[-93.56,63.865],[-93.27,63.841],[-93.379,63.948],[-92.157,63.692],[-92.465,63.555],[-91.842,63.698],[-90.711,63.304],[-90.778,62.972],[-91.449,62.804],[-92.361,62.819],[-92.305,62.712],[-91.936,62.592],[-92.551,62.547],[-92.768,62.38],[-92.528,62.168],[-93.205,62.365],[-92.906,62.215],[-93.066,62.15],[-93.073,62.061],[-93.35,62.03],[-93.273,61.961],[-93.333,61.933],[-93.582,61.942],[-93.312,61.767],[-93.913,61.481],[-93.889,61.344],[-94.083,61.304],[-94.068,61.139],[-94.509,60.605],[-94.762,60.498],[-94.647,60.416],[-94.786,59.953],[-94.788,59.268],[-94.957,59.069],[-94.287,58.716],[-94.332,58.297],[-94.123,58.737],[-93.179,58.726],[-92.433,57.32],[-92.798,56.922],[-91.111,57.241],[-90.592,57.224],[-88.826,56.814],[-88.075,56.467],[-87.482,56.021],[-85.677,55.601],[-85.218,55.349],[-85.365,55.079],[-85.061,55.286],[-83.911,55.315],[-82.986,55.231],[-82.393,55.068],[-82.219,54.813],[-82.424,54.245],[-82.141,53.818],[-82.159,53.264],[-82.292,53.031],[-81.599,52.433],[-81.612,52.324],[-81.828,52.224],[-81.466,52.204],[-80.658,51.758],[-80.443,51.389],[-80.851,51.125],[-80.478,51.307],[-80.104,51.283],[-79.836,51.173],[-79.348,50.763],[-79.714,51.118],[-79.689,51.347],[-79.498,51.57],[-79.297,51.623],[-79.041,51.464],[-78.903,51.2],[-78.731,51.497],[-78.982,51.775],[-78.448,52.261],[-78.744,52.655],[-78.722,52.856],[-78.898,53.043],[-79.1,53.657],[-79.04,53.818],[-78.946,53.832],[-79.075,53.932],[-78.996,54.002],[-79.242,54.099],[-79.139,54.157],[-79.356,54.263],[-79.712,54.672],[-77.775,55.291],[-76.762,55.996],[-76.53,56.5],[-76.573,57.181],[-76.891,57.758],[-77.552,58.24],[-78.506,58.649],[-78.431,58.902],[-77.761,59.38],[-77.859,59.476],[-77.726,59.676],[-77.349,59.579],[-77.485,59.685],[-77.332,59.797],[-77.373,59.925],[-77.289,60.022],[-77.586,60.088],[-77.453,60.146],[-77.681,60.427],[-77.504,60.543],[-77.791,60.64],[-77.603,60.825],[-78.181,60.819],[-77.765,61.158],[-77.736,61.437],[-77.514,61.556],[-78.021,61.832],[-78.133,62.282],[-77.372,62.573],[-75.676,62.25],[-75.79,62.18],[-75.341,62.312],[-74.633,62.116],[-74.646,62.211],[-73.705,62.473],[-72.882,62.125],[-72.687,62.125],[-72.632,62.027],[-72.772,61.84],[-72.506,61.923],[-72.226,61.832],[-72.04,61.68],[-72.216,61.587],[-71.866,61.689],[-71.638,61.617],[-71.854,61.44],[-71.645,61.413],[-71.743,61.337],[-71.423,61.159],[-70.279,61.069],[-69.992,60.856],[-69.708,60.915],[-69.624,61.05],[-69.472,61.011],[-69.405,60.847],[-69.64,60.69],[-69.751,60.487],[-69.629,60.199],[-69.674,60.076],[-70.655,60.026],[-69.734,59.918],[-69.579,59.675],[-69.682,59.342],[-69.344,59.303],[-69.532,58.869],[-69.677,58.831],[-69.784,58.956],[-70.154,58.761],[-69.79,58.689],[-69.271,58.884],[-68.698,58.905],[-68.381,58.744],[-68.229,58.485],[-68.357,58.163],[-69.041,57.902],[-68.414,58.052],[-68.021,58.485],[-67.888,58.296],[-68.064,58.139],[-67.756,58.405],[-67.678,57.991],[-67.57,58.213],[-66.722,58.491],[-66.362,58.791],[-66.091,58.659],[-66.002,58.431],[-65.923,58.572],[-66.043,58.821],[-65.855,58.847],[-65.921,58.915],[-65.721,59.024],[-65.384,59.06],[-65.7,59.213],[-65.513,59.35],[-65.412,59.315],[-65.475,59.47],[-65.038,59.388],[-65.407,59.539],[-65.486,59.649],[-65.433,59.777],[-65.028,59.771],[-65.172,59.908],[-64.817,60.331],[-64.499,60.268],[-64.42,60.171],[-64.768,60.012],[-64.283,60.064],[-64.183,59.973],[-64.226,59.741],[-64.056,59.823],[-63.75,59.513],[-63.945,59.38],[-63.776,59.277],[-63.54,59.333],[-63.415,59.194],[-63.971,59.054],[-63.248,59.068],[-63.282,58.867],[-63.05,58.878],[-62.874,58.672],[-63.537,58.33],[-63.21,58.467],[-62.594,58.474],[-62.812,58.2],[-63.262,58.015],[-62.486,58.154],[-62.306,57.972],[-61.959,57.912],[-61.899,57.861],[-61.995,57.769],[-61.968,57.612],[-62.496,57.489],[-61.921,57.421],[-61.85,57.37],[-61.977,57.248],[-61.334,57.011],[-61.372,56.681],[-62.497,56.802],[-61.738,56.526],[-62.01,56.454],[-61.94,56.424],[-61.425,56.361],[-61.713,56.231],[-61.365,56.216],[-61.301,56.047],[-61.45,55.996],[-61.089,55.866],[-60.743,55.941],[-60.562,55.727],[-60.341,55.785],[-60.408,55.65],[-60.192,55.481],[-60.617,55.06],[-59.759,55.31],[-59.689,55.196],[-59.438,55.176],[-59.838,54.814],[-59.26,55.2],[-58.997,55.149],[-58.78,54.838],[-58.398,54.774],[-57.962,54.876],[-57.827,54.719],[-57.404,54.591],[-57.699,54.387],[-58.435,54.228],[-58.633,54.05],[-59.823,53.834],[-60.145,53.596],[-60.395,53.653],[-60.1,53.487],[-60.29,53.391],[-60.329,53.266],[-58.652,53.978],[-57.928,54.104],[-58.317,54.114],[-58.31,54.202],[-57.416,54.163],[-57.135,53.792],[-57.524,53.611],[-57.332,53.469],[-56.841,53.739],[-56.524,53.766],[-55.966,53.471],[-55.798,53.212],[-55.892,53.0],[-55.803,52.643],[-56.325,52.545],[-55.746,52.475],[-55.777,52.364],[-56.012,52.394],[-55.673,52.19],[-56.976,51.458],[-57.462,51.469],[-58.51,51.295],[-59.165,50.78],[-60.08,50.255],[-60.807,50.25],[-61.725,50.104],[-61.92,50.233],[-62.715,50.302],[-63.239,50.243],[-65.269,50.32],[-66.496,50.212],[-66.941,49.994],[-67.372,49.348],[-68.282,49.197],[-68.221,49.15],[-68.929,48.829],[-69.674,48.199],[-71.018,48.456],[-69.775,48.098],[-69.994,47.74],[-71.268,46.796],[-72.205,46.559],[-72.981,46.21],[-73.477,45.738],[-73.712,45.711],[-74.038,45.502],[-74.315,45.531],[-74.0,45.433],[-73.974,45.345],[-74.709,45.004],[-73.558,45.425],[-73.16,46.01],[-72.109,46.551],[-70.519,47.033],[-69.471,47.967],[-68.816,48.366],[-66.598,49.126],[-65.523,49.266],[-64.568,49.105],[-64.216,48.874],[-64.209,48.806],[-64.514,48.841],[-64.246,48.691],[-64.254,48.55],[-64.349,48.423],[-65.259,48.021],[-65.927,48.189],[-66.704,48.022],[-66.36,48.061],[-65.849,47.911],[-65.607,47.67],[-65.002,47.847],[-65.046,47.793],[-64.703,47.725],[-64.912,47.369],[-65.319,47.101],[-64.831,47.061],[-64.906,46.888],[-64.542,46.24],[-63.916,46.166],[-63.832,46.107],[-64.056,46.021],[-63.293,45.752],[-62.701,45.741],[-62.75,45.648],[-62.483,45.622],[-61.956,45.868],[-61.777,45.656],[-61.492,45.687],[-61.35,45.574],[-61.282,45.441],[-61.461,45.367],[-61.032,45.292],[-63.306,44.643],[-63.604,44.683],[-63.545,44.544],[-63.61,44.48],[-64.0,44.645],[-64.101,44.487],[-64.167,44.587],[-64.286,44.55],[-64.276,44.334],[-65.482,43.518],[-65.738,43.561],[-65.887,43.795],[-66.038,43.742],[-66.126,43.814],[-66.193,44.144],[-66.1,44.367],[-65.868,44.569],[-66.146,44.436],[-66.091,44.505],[-65.616,44.68],[-65.502,44.76],[-65.728,44.697],[-64.903,45.121],[-64.449,45.256],[-64.448,45.337],[-64.331,45.309],[-64.354,45.138],[-64.135,45.023],[-64.183,45.147],[-64.093,45.217],[-63.368,45.365],[-64.873,45.355],[-64.827,45.476],[-64.315,45.836],[-64.482,45.806],[-64.633,45.947],[-64.594,45.814],[-64.779,45.638],[-65.884,45.223],[-66.11,45.317],[-66.027,45.418],[-66.183,45.335],[-66.144,45.228],[-66.44,45.096],[-66.872,45.067],[-67.125,45.169],[-67.107,44.885],[-66.987,44.828],[-67.191,44.676],[-67.839,44.576],[-68.057,44.384],[-68.117,44.491],[-68.451,44.508],[-68.533,44.259],[-68.812,44.339],[-68.71,44.443],[-68.795,44.454],[-68.763,44.571],[-68.961,44.434],[-69.068,44.098],[-69.226,43.986],[-69.521,43.897],[-69.557,43.983],[-69.624,43.881],[-69.653,43.994],[-69.73,43.852],[-69.795,43.911],[-69.808,43.772],[-69.974,43.788],[-69.965,43.855],[-70.179,43.766],[-70.269,43.672],[-70.203,43.626],[-70.733,43.07],[-70.829,42.825],[-70.613,42.623],[-70.831,42.553],[-71.046,42.331],[-70.738,42.229],[-70.656,41.987],[-70.427,41.757],[-70.001,41.826],[-70.241,42.091],[-70.109,42.078],[-69.978,41.961],[-69.949,41.677],[-70.657,41.534],[-70.701,41.715],[-71.169,41.489],[-71.149,41.746],[-71.271,41.681],[-71.39,41.795],[-71.523,41.379],[-72.925,41.285],[-73.583,41.022],[-73.987,40.751],[-73.872,41.055],[-73.97,41.25],[-73.927,40.914],[-74.264,40.529],[-73.972,40.4],[-74.08,39.788],[-74.065,39.993],[-74.257,39.614],[-74.407,39.549],[-74.429,39.387],[-74.923,38.941],[-74.897,39.145],[-75.136,39.208],[-75.524,39.49],[-75.422,39.79],[-75.074,39.983],[-75.464,39.781],[-75.588,39.641],[-75.574,39.477],[-75.31,38.967],[-75.089,38.778],[-75.187,38.591],[-75.073,38.579],[-75.039,38.426],[-75.934,37.152],[-75.975,37.398],[-75.659,37.954],[-75.851,37.972],[-75.795,38.087],[-75.928,38.169],[-75.859,38.362],[-76.051,38.28],[-76.265,38.436],[-76.264,38.6],[-76.017,38.625],[-76.213,38.758],[-76.341,38.71],[-76.168,38.853],[-76.241,38.943],[-76.331,38.909],[-76.313,39.009],[-76.186,38.991],[-76.135,39.082],[-76.217,39.064],[-76.236,39.192],[-76.074,39.369],[-75.876,39.376],[-76.003,39.411],[-75.873,39.511],[-76.063,39.561],[-76.097,39.433],[-76.248,39.439],[-76.276,39.323],[-76.331,39.404],[-76.421,39.225],[-76.57,39.269],[-76.428,39.126],[-76.473,39.031],[-76.559,39.065],[-76.501,38.532],[-76.394,38.369],[-76.572,38.436],[-76.677,38.612],[-76.669,38.538],[-76.341,38.087],[-76.769,38.263],[-76.868,38.39],[-76.89,38.292],[-77.001,38.445],[-77.233,38.408],[-77.03,38.889],[-77.314,38.397],[-77.047,38.357],[-76.906,38.197],[-76.264,37.894],[-76.344,37.676],[-76.492,37.682],[-77.111,38.166],[-76.549,37.669],[-76.306,37.571],[-76.368,37.53],[-76.269,37.495],[-76.263,37.357],[-76.401,37.386],[-76.454,37.274],[-76.758,37.505],[-76.283,37.053],[-76.401,36.991],[-76.631,37.222],[-77.251,37.329],[-76.672,37.173],[-76.488,36.897],[-75.999,36.913],[-75.534,35.819],[-75.946,36.659],[-75.993,36.474],[-75.82,36.113],[-76.148,36.279],[-76.15,36.146],[-76.271,36.19],[-76.227,36.116],[-76.384,36.134],[-76.559,36.015],[-76.734,36.229],[-76.726,35.958],[-76.07,35.97],[-76.084,35.691],[-75.854,35.96],[-75.759,35.843],[-75.774,35.647],[-76.174,35.354],[-76.49,35.397],[-76.577,35.532],[-76.741,35.431],[-77.04,35.527],[-76.513,35.27],[-76.779,34.99],[-77.07,35.155],[-76.975,35.025],[-76.745,34.941],[-76.457,34.989],[-76.362,34.937],[-76.44,34.843],[-77.296,34.603],[-77.412,34.731],[-77.38,34.527],[-77.751,34.285],[-77.928,33.94],[-77.953,34.169],[-78.013,33.912],[-78.406,33.918],[-78.841,33.724],[-79.194,33.244],[-79.226,33.405],[-79.276,33.135],[-79.805,32.787],[-79.933,32.81],[-79.941,32.667],[-80.363,32.501],[-80.634,32.512],[-80.474,32.423],[-80.579,32.287],[-80.803,32.448],[-80.694,32.216],[-80.923,31.945],[-81.113,31.879],[-81.066,31.788],[-81.259,31.539],[-81.175,31.531],[-81.381,31.353],[-81.288,31.264],[-81.442,31.2],[-81.516,30.802],[-81.25,29.794],[-80.524,28.486],[-80.585,28.272],[-80.457,27.901],[-80.61,28.178],[-80.607,28.523],[-80.694,28.345],[-80.688,28.579],[-80.838,28.758],[-80.05,26.808],[-80.126,25.833],[-80.485,25.23],[-81.11,25.138],[-81.136,25.31],[-80.94,25.264],[-81.113,25.367],[-81.365,25.831],[-81.715,25.983],[-81.959,26.49],[-81.829,26.687],[-82.04,26.552],[-82.013,26.962],[-82.181,26.937],[-82.181,26.84],[-82.29,26.871],[-82.715,27.5],[-82.401,27.835],[-82.636,27.981],[-82.661,27.718],[-82.844,27.846],[-82.661,28.486],[-82.651,28.887],[-83.694,29.926],[-84.044,30.104],[-84.31,30.065],[-84.383,29.907],[-85.319,29.68],[-85.414,29.768],[-85.414,29.842],[-85.315,29.758],[-85.354,29.876],[-85.676,30.122],[-85.604,30.287],[-85.756,30.167],[-86.454,30.399],[-86.124,30.406],[-86.257,30.493],[-87.201,30.339],[-86.986,30.431],[-86.998,30.57],[-87.171,30.539],[-87.281,30.339],[-87.476,30.294],[-87.448,30.394],[-87.622,30.265],[-88.006,30.231],[-87.79,30.292],[-88.011,30.694],[-88.135,30.367],[-88.905,30.415],[-89.321,30.345],[-89.588,30.166],[-90.126,30.369],[-90.332,30.278],[-90.413,30.14],[-90.175,30.029],[-89.737,30.172],[-89.665,30.117],[-89.815,30.007],[-89.632,29.904],[-89.401,30.046],[-89.354,29.82],[-89.721,29.619],[-89.514,29.42],[-89.016,29.203],[-89.156,29.017],[-89.236,29.081],[-89.376,28.981],[-89.443,29.194],[-90.159,29.537],[-90.052,29.431],[-90.136,29.136],[-90.502,29.3],[-90.751,29.131],[-91.29,29.289],[-91.151,29.318],[-91.249,29.564],[-91.514,29.555],[-91.893,29.836],[-92.135,29.699],[-92.084,29.593],[-92.261,29.557],[-93.176,29.779],[-93.826,29.725],[-93.884,29.81],[-93.769,29.952],[-93.841,29.98],[-93.946,29.815],[-93.89,29.689],[-94.76,29.384],[-94.526,29.548],[-94.778,29.548],[-94.742,29.75],[-95.023,29.702],[-94.888,29.371],[-95.273,28.964],[-95.853,28.64],[-96.235,28.489],[-96.011,28.632],[-96.449,28.594],[-96.64,28.709],[-96.421,28.457],[-96.676,28.341],[-96.774,28.422],[-96.84,28.194],[-97.156,28.144],[-97.141,28.061],[-97.034,28.094],[-97.073,27.986],[-97.171,27.88],[-97.431,27.837],[-97.289,27.671],[-97.439,27.328],[-97.768,27.458],[-97.692,27.287],[-97.485,27.237],[-97.555,26.967],[-97.435,26.486],[-97.14,26.03],[-97.164,25.755],[-97.507,25.015],[-97.668,24.39],[-97.745,22.942],[-97.858,22.625],[-97.763,22.106],[-97.315,21.564],[-97.409,21.273],[-97.383,21.567],[-97.754,22.027],[-97.638,21.604],[-97.121,20.615],[-96.456,19.87],[-96.29,19.344],[-95.778,18.806],[-95.92,18.82],[-95.627,18.691],[-95.72,18.768],[-95.182,18.701],[-94.798,18.515],[-94.46,18.167],[-93.552,18.43],[-92.885,18.469],[-92.441,18.675],[-91.974,18.716],[-91.88,18.638],[-91.914,18.529],[-91.534,18.457],[-91.275,18.624],[-91.343,18.901],[-91.469,18.833],[-91.437,18.89],[-90.739,19.352],[-90.693,19.73],[-90.492,19.947],[-90.484,20.556],[-90.353,21.009],[-89.82,21.275],[-88.879,21.414],[-88.467,21.569],[-88.007,21.604],[-87.251,21.447],[-87.188,21.546],[-87.369,21.574],[-87.035,21.592],[-86.824,21.422],[-86.816,21.005],[-87.421,20.231],[-87.442,19.862],[-87.688,19.637],[-87.645,19.554],[-87.425,19.583],[-87.659,19.352],[-87.656,19.258],[-87.501,19.288],[-87.853,18.269],[-88.056,18.524],[-88.032,18.839],[-88.197,18.72],[-88.349,18.359],[-88.13,18.351],[-88.085,18.226],[-88.272,17.61],[-88.203,17.517],[-88.289,17.313],[-88.313,16.633],[-88.879,16.017],[-88.894,15.891],[-88.603,15.764],[-88.536,15.85],[-88.594,15.95],[-88.131,15.701],[-87.702,15.911],[-87.487,15.79],[-86.907,15.762],[-86.357,15.783],[-85.936,15.953],[-85.986,16.024],[-85.484,15.9],[-84.974,15.99],[-84.56,15.802],[-84.426,15.829],[-84.52,15.873],[-84.261,15.823],[-83.765,15.405],[-83.973,15.52],[-84.111,15.492],[-84.095,15.401],[-83.927,15.394],[-83.76,15.22],[-83.498,15.222],[-83.646,15.368],[-83.369,15.24],[-83.158,14.993],[-83.28,14.813],[-83.344,14.902],[-83.414,14.825],[-83.299,14.749],[-83.188,14.34],[-83.494,13.739],[-83.567,13.32],[-83.511,12.412],[-83.627,12.459],[-83.593,12.713],[-83.754,12.502],[-83.651,12.287],[-83.68,12.024],[-83.767,12.059],[-83.829,11.861],[-83.705,11.825],[-83.652,11.642],[-83.868,11.3],[-83.347,10.315],[-82.778,9.67],[-82.371,9.429],[-82.34,9.209],[-82.188,9.192],[-82.244,9.031],[-82.078,8.935],[-81.78,8.957],[-81.894,9.14],[-81.546,8.827],[-81.063,8.813],[-80.127,9.21],[-79.577,9.598],[-79.112,9.537],[-78.932,9.428],[-78.504,9.406],[-77.831,9.068],[-76.852,8.09],[-76.897,7.939],[-76.787,7.932],[-76.772,8.311],[-76.92,8.574],[-76.277,8.989],[-76.027,9.366],[-75.639,9.45],[-75.68,9.73],[-75.539,10.205],[-75.708,10.143],[-75.446,10.611],[-75.248,10.783],[-74.845,11.11],[-74.33,10.997],[-74.516,10.863],[-74.401,10.765],[-74.143,11.321],[-73.313,11.296],[-72.722,11.712],[-72.275,11.889],[-72.136,12.189],[-71.597,12.434],[-71.262,12.335],[-71.137,12.046],[-71.415,11.755],[-71.957,11.57],[-71.835,11.19],[-71.642,11.014],[-71.731,10.995],[-71.594,10.657],[-72.113,9.816],[-71.62,9.048],[-71.241,9.16],[-71.086,9.348],[-71.053,9.706],[-71.494,10.533],[-71.545,10.779],[-71.47,10.964],[-70.233,11.373],[-70.097,11.52],[-69.805,11.474],[-69.817,11.672],[-70.193,11.625],[-70.287,11.886],[-70.203,12.098],[-70.004,12.178],[-69.86,12.054],[-69.632,11.48],[-69.233,11.518],[-68.828,11.432],[-68.399,11.161],[-68.272,10.88],[-68.296,10.689],[-68.14,10.493],[-66.247,10.632],[-65.852,10.258],[-65.129,10.07],[-64.85,10.098],[-64.188,10.458],[-63.732,10.503],[-64.248,10.543],[-64.298,10.635],[-61.879,10.741],[-62.38,10.547],[-62.914,10.531],[-62.686,10.29],[-62.741,10.056],[-62.55,10.2],[-62.32,9.783],[-62.221,9.883],[-62.153,9.822],[-62.155,9.979],[-62.077,9.975],[-61.736,9.631],[-61.766,9.814],[-61.589,9.895],[-61.309,9.633],[-61.013,9.556],[-60.792,9.361],[-61.023,9.155],[-61.247,8.6],[-61.619,8.597],[-61.304,8.41],[-60.801,8.592],[-60.167,8.617],[-59.2,8.075],[-58.812,7.736],[-58.477,7.326],[-58.673,6.391],[-58.415,6.851],[-57.983,6.786],[-57.54,6.332],[-57.228,6.178],[-57.182,5.529],[-56.97,5.993],[-56.236,5.885],[-55.94,5.795],[-55.898,5.699],[-55.91,5.893],[-55.828,5.962],[-54.834,5.988],[-54.356,5.91],[-54.054,5.808],[-54.156,5.359],[-53.847,5.782],[-53.454,5.563],[-52.899,5.425],[-52.291,4.942],[-52.325,4.771],[-52.22,4.863],[-52.058,4.717],[-51.962,4.514],[-52.003,4.352],[-51.828,4.636],[-51.653,4.061],[-51.547,4.311],[-51.22,4.094],[-50.714,2.134],[-50.609,2.104],[-50.459,1.83],[-49.957,1.66],[-49.899,1.163],[-50.294,0.836],[-50.755,0.223],[-51.283,-0.085],[-51.703,-0.762],[-51.721,-1.018],[-51.922,-1.181],[-51.981,-1.368],[-52.229,-1.363],[-52.664,-1.552],[-52.197,-1.64],[-51.948,-1.587],[-50.895,-0.938],[-50.838,-1.039],[-50.918,-1.115],[-50.69,-1.762],[-50.403,-2.016],[-49.999,-1.832],[-49.72,-1.926],[-49.314,-1.732],[-49.637,-2.657],[-49.458,-2.505],[-49.211,-1.917],[-48.991,-1.83],[-48.71,-1.488],[-48.463,-1.614],[-48.35,-1.482],[-48.468,-1.394],[-48.45,-1.146],[-48.115,-0.738],[-47.557,-0.67],[-47.419,-0.766],[-47.398,-0.627],[-46.811,-0.78],[-46.617,-0.971],[-46.219,-1.031],[-45.645,-1.348],[-45.459,-1.356],[-45.329,-1.717],[-45.076,-1.466],[-44.721,-1.733],[-44.779,-1.799],[-44.651,-1.746],[-44.538,-2.053],[-44.756,-2.266],[-44.662,-2.373],[-44.435,-2.168],[-44.382,-2.366],[-44.52,-2.405],[-44.589,-2.573],[-44.723,-3.205],[-44.438,-2.944],[-44.229,-2.471],[-44.106,-2.493],[-44.193,-2.81],[-43.933,-2.583],[-43.455,-2.502],[-43.38,-2.376],[-42.937,-2.465],[-42.25,-2.792],[-41.876,-2.747],[-41.48,-2.917],[-40.475,-2.796],[-39.965,-2.862],[-38.476,-3.717],[-38.049,-4.216],[-37.626,-4.592],[-37.301,-4.713],[-37.175,-4.912],[-36.591,-5.098],[-35.98,-5.054],[-35.482,-5.166],[-35.235,-5.567],[-34.834,-7.024],[-34.835,-7.971],[-35.341,-9.231],[-35.764,-9.703],[-35.891,-9.687],[-35.885,-9.848],[-36.398,-10.484],[-36.768,-10.672],[-37.183,-11.068],[-37.356,-11.404],[-37.359,-11.253],[-37.689,-12.1],[-38.24,-12.844],[-38.499,-12.957],[-38.525,-12.762],[-38.691,-12.624],[-38.852,-12.79],[-38.764,-12.907],[-38.835,-13.147],[-39.031,-13.365],[-39.089,-13.588],[-38.989,-13.615],[-39.048,-14.044],[-39.008,-14.101],[-38.942,-14.031],[-39.06,-14.655],[-38.881,-15.864],[-39.203,-17.178],[-39.154,-17.704],[-39.651,-18.252],[-39.783,-19.572],[-40.001,-19.742],[-40.396,-20.569],[-40.789,-20.906],[-40.955,-21.238],[-41.047,-21.506],[-41.0,-21.999],[-41.706,-22.31],[-41.98,-22.581],[-41.941,-22.788],[-42.042,-22.947],[-42.958,-22.967],[-43.154,-22.725],[-43.242,-22.795],[-43.224,-22.991],[-43.899,-23.101],[-43.974,-23.057],[-43.676,-23.009],[-43.866,-22.911],[-44.637,-23.055],[-44.674,-23.207],[-44.57,-23.274],[-45.325,-23.6],[-45.464,-23.803],[-45.972,-23.796],[-46.867,-24.236],[-47.989,-25.036],[-47.908,-25.068],[-47.929,-25.168],[-48.203,-25.417],[-48.186,-25.31],[-48.402,-25.272],[-48.476,-25.443],[-48.732,-25.369],[-48.692,-25.492],[-48.401,-25.597],[-48.545,-25.816],[-48.666,-25.844],[-48.576,-25.935],[-48.619,-26.179],[-48.748,-26.269],[-48.652,-26.406],[-48.678,-26.703],[-48.554,-27.196],[-48.643,-27.558],[-48.621,-28.076],[-48.8,-28.575],[-49.271,-28.871],[-49.746,-29.363],[-50.3,-30.426],[-50.921,-31.258],[-52.039,-32.115],[-52.063,-31.83],[-51.893,-31.868],[-51.681,-31.775],[-51.272,-31.477],[-51.161,-31.119],[-50.98,-31.094],[-50.941,-30.904],[-50.689,-30.704],[-50.716,-30.426],[-50.582,-30.439],[-50.564,-30.254],[-51.025,-30.369],[-51.298,-30.035],[-51.282,-30.244],[-51.157,-30.364],[-51.283,-30.752],[-51.359,-30.675],[-51.506,-31.104],[-51.972,-31.384],[-52.194,-31.886],[-52.127,-32.168],[-52.652,-33.138],[-53.42,-33.779],[-53.785,-34.38],[-54.169,-34.671],[-54.902,-34.933],[-55.673,-34.776],[-56.195,-34.906],[-56.855,-34.677],[-57.171,-34.452],[-57.829,-34.477],[-58.4,-33.912],[-58.438,-33.719],[-58.364,-33.182],[-58.093,-32.967],[-58.201,-32.472],[-58.171,-32.959],[-58.25,-33.078],[-58.424,-33.112],[-58.547,-33.663],[-58.392,-34.193],[-58.525,-34.296],[-58.283,-34.683],[-57.548,-35.019],[-57.171,-35.362],[-57.159,-35.506],[-57.354,-35.72],[-57.375,-35.9],[-57.076,-36.297],[-56.717,-36.389],[-56.727,-36.958],[-57.396,-37.745],[-57.547,-38.086],[-58.179,-38.436],[-59.828,-38.838],[-61.112,-38.993],[-61.848,-38.962],[-62.335,-38.8],[-62.295,-39.243],[-62.054,-39.374],[-62.179,-39.38],[-62.077,-39.462],[-62.132,-39.825],[-62.287,-39.895],[-62.402,-40.197],[-62.394,-40.459],[-62.246,-40.675],[-62.395,-40.891],[-62.959,-41.11],[-63.622,-41.16],[-64.853,-40.814],[-64.869,-40.736],[-65.069,-40.805],[-65.155,-41.106],[-64.986,-42.102],[-64.512,-42.27],[-64.571,-42.416],[-64.42,-42.434],[-64.101,-42.395],[-64.061,-42.266],[-64.229,-42.218],[-63.796,-42.114],[-63.63,-42.283],[-63.617,-42.696],[-63.692,-42.805],[-64.035,-42.881],[-64.488,-42.513],[-64.971,-42.666],[-65.027,-42.759],[-64.319,-42.969],[-64.84,-43.189],[-65.252,-43.572],[-65.266,-44.28],[-65.361,-44.477],[-65.648,-44.661],[-65.639,-45.008],[-66.19,-44.965],[-66.585,-45.183],[-66.941,-45.257],[-67.6,-46.053],[-67.506,-46.443],[-66.777,-47.006],[-65.854,-47.157],[-65.738,-47.345],[-65.775,-47.568],[-65.886,-47.702],[-66.225,-47.827],[-65.934,-47.827],[-65.81,-47.941],[-67.466,-48.952],[-67.685,-49.247],[-67.783,-49.859],[-67.914,-49.984],[-68.257,-50.105],[-68.668,-49.753],[-68.662,-49.936],[-68.98,-50.003],[-68.598,-50.009],[-68.422,-50.158],[-68.939,-50.382],[-69.155,-50.864],[-69.359,-51.028],[-69.201,-50.994],[-69.058,-51.547],[-69.465,-51.584],[-68.965,-51.677],[-68.394,-52.307],[-69.241,-52.205],[-69.447,-52.269],[-69.62,-52.465],[-70.795,-52.769],[-70.984,-53.374],[-70.996,-53.779],[-71.298,-53.883],[-72.174,-53.632],[-72.413,-53.35],[-72.306,-53.254],[-71.942,-53.234],[-71.828,-53.398],[-71.892,-53.524],[-71.791,-53.485],[-71.741,-53.233],[-71.289,-53.034],[-71.163,-52.888],[-71.227,-52.811],[-71.388,-52.764],[-72.278,-53.132],[-72.493,-53.291],[-72.549,-53.461],[-73.053,-53.243],[-72.916,-53.122],[-72.889,-52.872],[-72.728,-52.762],[-72.453,-52.814],[-72.118,-52.65],[-71.511,-52.605],[-72.226,-52.521],[-72.438,-52.626],[-72.712,-52.536],[-73.122,-53.074],[-73.338,-53.055],[-73.645,-52.837],[-73.241,-52.707],[-73.073,-52.535],[-73.124,-52.488],[-73.244,-52.624],[-73.586,-52.686],[-74.014,-52.639],[-74.037,-52.403],[-74.151,-52.383],[-74.296,-52.118],[-73.834,-52.234],[-73.703,-52.199],[-73.684,-52.078],[-73.26,-52.158],[-72.795,-51.95],[-72.571,-52.2],[-72.714,-52.357],[-72.523,-52.255],[-72.625,-52.007],[-72.494,-51.848],[-72.543,-51.706],[-73.169,-51.454],[-72.649,-51.695],[-72.6,-51.799],[-73.383,-52.07],[-73.518,-52.041],[-73.753,-51.796],[-74.197,-51.681],[-74.07,-51.579],[-73.93,-51.618],[-73.94,-51.266],[-74.815,-51.063],[-75.095,-50.681],[-74.686,-50.662],[-74.776,-50.47],[-74.644,-50.361],[-74.366,-50.488],[-74.139,-50.818],[-73.807,-50.938],[-73.741,-50.697],[-73.618,-50.651],[-73.654,-50.493],[-73.978,-50.827],[-74.197,-50.61],[-74.186,-50.485],[-73.95,-50.511],[-74.63,-50.194],[-74.334,-49.975],[-73.959,-49.995],[-74.324,-49.783],[-74.291,-49.604],[-73.836,-49.609],[-74.094,-49.43],[-73.935,-49.021],[-74.028,-49.026],[-74.221,-49.501],[-74.367,-49.4],[-74.341,-48.596],[-74.009,-48.475],[-74.474,-48.464],[-74.585,-47.999],[-73.854,-48.042],[-73.528,-48.198],[-73.391,-48.146],[-73.61,-47.994],[-73.716,-47.655],[-73.941,-47.929],[-74.227,-47.969],[-74.655,-47.702],[-74.534,-47.568],[-74.243,-47.679],[-74.134,-47.591],[-74.483,-47.43],[-74.158,-47.183],[-74.152,-46.974],[-74.314,-46.788],[-74.454,-46.767],[-74.512,-46.885],[-75.006,-46.741],[-75.019,-46.511],[-75.54,-46.699],[-75.386,-46.863],[-75.43,-46.935],[-75.708,-46.775],[-75.657,-46.61],[-74.924,-46.16],[-75.075,-46.004],[-75.067,-45.875],[-74.158,-45.767],[-74.082,-45.678],[-74.123,-45.496],[-73.957,-45.404],[-73.825,-45.447],[-74.061,-45.947],[-74.02,-46.056],[-74.393,-46.217],[-73.968,-46.154],[-73.879,-45.847],[-73.735,-45.812],[-73.708,-46.07],[-73.949,-46.533],[-73.845,-46.566],[-73.662,-46.297],[-73.592,-45.899],[-73.594,-45.777],[-73.757,-45.703],[-73.731,-45.48],[-73.266,-45.346],[-72.934,-45.452],[-73.226,-45.255],[-73.445,-45.238],[-73.405,-45.102],[-73.362,-44.978],[-72.739,-44.734],[-72.68,-44.594],[-72.664,-44.436],[-73.265,-44.169],[-73.224,-43.898],[-73.069,-43.862],[-72.997,-43.632],[-73.076,-43.324],[-72.878,-43.048],[-72.758,-43.039],[-72.848,-42.669],[-72.774,-42.505],[-72.632,-42.51],[-72.773,-42.258],[-72.631,-42.2],[-72.412,-42.388],[-72.499,-41.981],[-72.738,-41.995],[-72.824,-41.909],[-72.66,-41.742],[-72.36,-41.649],[-72.318,-41.499],[-72.542,-41.691],[-72.953,-41.515],[-73.242,-41.781],[-73.735,-41.742],[-73.624,-41.581],[-73.855,-41.446],[-73.984,-40.974],[-73.671,-39.963],[-73.41,-39.789],[-73.226,-39.224],[-73.52,-38.509],[-73.465,-38.04],[-73.662,-37.699],[-73.662,-37.341],[-73.602,-37.188],[-73.216,-37.167],[-73.118,-36.688],[-73.007,-36.643],[-72.778,-35.979],[-72.587,-35.76],[-72.624,-35.586],[-72.224,-35.096],[-72.003,-34.165],[-71.664,-33.653],[-71.743,-33.095],[-71.452,-32.66],[-71.421,-32.387],[-71.513,-32.208],[-71.709,-30.628],[-71.669,-30.33],[-71.4,-30.143],[-71.316,-29.65],[-71.519,-28.926],[-71.186,-28.378],[-70.647,-26.329],[-70.714,-25.784],[-70.452,-25.252],[-70.574,-24.644],[-70.507,-23.886],[-70.392,-23.566],[-70.593,-23.255],[-70.563,-23.057],[-70.332,-22.849],[-70.088,-21.493],[-70.197,-20.725],[-70.148,-19.805],[-70.362,-18.398],[-71.337,-17.683],[-71.399,-17.422],[-71.532,-17.294],[-72.111,-17.003],[-72.468,-16.708],[-73.728,-16.202],[-75.104,-15.412],[-75.534,-14.899],[-75.934,-14.634],[-76.376,-13.863],[-76.259,-13.803],[-76.224,-13.371],[-76.832,-12.349],[-77.153,-12.06],[-77.22,-11.663],[-77.633,-11.288],[-77.736,-10.837],[-78.186,-10.089],[-78.762,-8.617],[-79.377,-7.836],[-79.618,-7.296],[-79.995,-6.769],[-81.142,-6.057],[-81.164,-5.875],[-80.931,-5.841],[-80.882,-5.635],[-81.337,-4.67],[-81.232,-4.234],[-80.799,-3.731],[-79.963,-3.158],[-79.73,-2.579],[-79.842,-2.067],[-79.926,-2.549],[-80.03,-2.557],[-80.007,-2.354],[-80.285,-2.707],[-80.963,-2.189],[-80.77,-2.077],[-80.761,-1.935],[-80.902,-1.079],[-80.554,-0.848],[-80.455,-0.585],[-80.282,-0.621],[-80.482,-0.368],[-80.046,0.155],[-80.088,0.785],[-79.741,0.98],[-78.9,1.206],[-78.86,1.455],[-79.025,1.624],[-78.793,1.849],[-78.577,1.774],[-78.592,2.357],[-78.417,2.483],[-78.067,2.509],[-77.814,2.716],[-77.67,2.879],[-77.694,3.04],[-77.559,3.076],[-77.357,3.349],[-77.077,3.913],[-77.264,3.893],[-77.278,4.058],[-77.358,3.945],[-77.409,4.248],[-77.521,4.213],[-77.354,4.398],[-77.286,4.722],[-77.373,5.324],[-77.534,5.537],[-77.249,5.78],[-77.469,6.177],[-77.369,6.576],[-78.17,7.544],[-78.422,8.061],[-78.287,8.092],[-78.281,8.248],[-78.142,8.386],[-77.761,8.133],[-78.099,8.497],[-78.223,8.397],[-78.399,8.506],[-78.41,8.355],[-78.514,8.628],[-78.955,8.933],[-79.442,9.006],[-79.687,8.851],[-79.816,8.639],[-79.75,8.596],[-80.459,8.214],[-80.458,8.077],[-80.011,7.5],[-80.287,7.426],[-80.439,7.275],[-80.846,7.22],[-81.064,7.9],[-81.268,7.625],[-81.504,7.721],[-81.728,8.138],[-82.16,8.195],[-82.235,8.311],[-82.68,8.322],[-82.866,8.246],[-82.879,8.071],[-83.123,8.353],[-83.162,8.588],[-83.391,8.718],[-83.47,8.707],[-83.292,8.406],[-83.605,8.48],[-83.734,8.614],[-83.614,8.804],[-83.737,9.15],[-84.222,9.463],[-84.582,9.568],[-84.715,9.899],[-85.236,10.242],[-85.237,10.107],[-84.886,9.821],[-85.077,9.602],[-85.315,9.811],[-85.625,9.902],[-85.85,10.292],[-85.663,10.635],[-85.667,10.745],[-85.908,10.898],[-85.752,10.985],[-85.745,11.089],[-86.469,11.738],[-86.851,12.248],[-87.668,12.904],[-87.585,13.043],[-87.339,12.95],[-87.489,13.353],[-87.814,13.399],[-87.821,13.285],[-88.023,13.169],[-88.686,13.281],[-88.512,13.184],[-89.278,13.478],[-89.804,13.56],[-90.479,13.901],[-91.377,13.99],[-92.265,14.568],[-92.809,15.139],[-93.916,16.054],[-94.374,16.285],[-94.426,16.226],[-94.001,16.019],[-94.662,16.202],[-94.617,16.348],[-94.791,16.287],[-94.9,16.417],[-95.021,16.278],[-94.799,16.21],[-95.134,16.177],[-95.464,15.975],[-96.511,15.652],[-97.185,15.909],[-97.755,15.967],[-98.139,16.206],[-98.52,16.305],[-98.762,16.535],[-99.691,16.72],[-100.848,17.2],[-101.6,17.652],[-101.919,17.96],[-102.7,18.063],[-103.442,18.325],[-103.912,18.828],[-104.938,19.309],[-105.482,19.976],[-105.669,20.386],[-105.26,20.579],[-105.327,20.753],[-105.511,20.809],[-105.237,21.119],[-105.209,21.491],[-105.431,21.618],[-105.649,21.988],[-105.646,22.327],[-105.792,22.627],[-106.402,23.196],[-106.935,23.881],[-107.765,24.472],[-107.527,24.36],[-107.512,24.489],[-107.951,24.615],[-108.281,25.082],[-108.051,25.067],[-108.696,25.383],[-108.787,25.538],[-109.029,25.48],[-109.068,25.552],[-108.887,25.733],[-109.196,25.593],[-109.385,25.727],[-109.426,26.033],[-109.2,26.305],[-109.117,26.253],[-109.276,26.534],[-109.483,26.71],[-109.755,26.703],[-109.944,27.079],[-110.277,27.162],[-110.478,27.323],[-110.615,27.654],[-110.53,27.864],[-111.121,27.967],[-112.162,29.019],[-112.223,29.269],[-112.378,29.348],[-113.058,30.651],[-113.119,31.048],[-113.047,31.179],[-113.623,31.346],[-113.759,31.558],[-113.948,31.629],[-114.003,31.525],[-114.149,31.507],[-114.934,31.901],[-114.79,31.647],[-114.882,31.156],[-114.703,30.765],[-114.55,30.022],[-113.755,29.367],[-113.5,28.927],[-113.382,28.947],[-113.321,28.813],[-113.206,28.799],[-113.094,28.512],[-112.871,28.424],[-112.734,27.826],[-112.329,27.523],[-112.191,27.187],[-112.004,27.079],[-111.863,26.679],[-111.699,26.581],[-111.795,26.88],[-111.57,26.708],[-111.292,25.79],[-111.034,25.527],[-110.687,24.868],[-110.735,24.59],[-110.659,24.341],[-110.367,24.1],[-110.263,24.345],[-109.421,23.48],[-109.496,23.16],[-110.006,22.894],[-110.363,23.605],[-111.683,24.556],[-111.802,24.543],[-112.073,24.84],[-112.07,25.573],[-112.377,26.214],[-113.021,26.583],[-113.156,26.946],[-113.272,26.791],[-113.599,26.721],[-113.841,26.967],[-114.445,27.218],[-114.54,27.431],[-114.994,27.736],[-115.036,27.842],[-114.57,27.784],[-114.301,27.873],[-114.302,27.776],[-114.069,27.676],[-114.158,27.92],[-114.266,27.934],[-114.048,28.426],[-114.937,29.352],[-115.674,29.756],[-115.808,29.96],[-115.816,30.304],[-115.996,30.414],[-116.062,30.804],[-116.296,30.971],[-116.333,31.203],[-116.662,31.565],[-116.722,31.735],[-116.621,31.851],[-116.848,31.997],[-117.063,32.344],[-117.467,33.296],[-118.081,33.722],[-118.41,33.744],[-118.506,34.017],[-119.144,34.112],[-119.606,34.418],[-120.481,34.472],[-120.645,34.58],[-120.659,35.122],[-120.857,35.21],[-120.9,35.425],[-121.284,35.676],[-121.877,36.331],[-121.919,36.572],[-121.79,36.732],[-121.807,36.851],[-122.164,36.991],[-122.395,37.208],[-122.499,37.543],[-122.514,37.772],[-122.384,37.789],[-122.37,37.656],[-122.071,37.478],[-122.385,37.961],[-122.314,38.007],[-121.525,38.056],[-122.393,38.145],[-122.484,38.109],[-122.521,37.826],[-122.932,38.055],[-122.999,37.989],[-122.978,38.227],[-122.877,38.123],[-122.908,38.197],[-123.701,38.907],[-123.833,39.775],[-124.357,40.371],[-124.133,40.97],[-124.072,41.46],[-124.54,42.813],[-124.347,43.342],[-124.197,43.423],[-124.288,43.41],[-124.149,43.692],[-123.929,45.577],[-123.989,46.219],[-123.221,46.154],[-123.465,46.271],[-124.073,46.279],[-124.044,46.605],[-123.946,46.433],[-123.889,46.66],[-124.113,46.863],[-123.843,46.963],[-124.112,47.035],[-124.139,46.955],[-124.376,47.659],[-124.663,47.974],[-124.71,48.38],[-123.976,48.168],[-123.162,48.155],[-122.974,48.073],[-122.779,48.138],[-122.657,47.881],[-123.051,47.552],[-123.136,47.356],[-122.922,47.408],[-123.067,47.4],[-123.049,47.479],[-122.533,47.92],[-122.524,47.769],[-122.675,47.612],[-122.557,47.463],[-122.578,47.293],[-122.708,47.316],[-122.768,47.218],[-122.828,47.337],[-123.028,47.139],[-122.627,47.144],[-122.354,47.372],[-122.402,47.784],[-122.242,48.011],[-122.416,48.184],[-122.395,48.084],[-122.494,48.13],[-122.52,48.229],[-122.409,48.294],[-122.662,48.446],[-122.497,48.506],[-122.545,48.762],[-122.686,48.794],[-122.827,49.028],[-122.963,49.075],[-123.077,48.98],[-123.08,49.131],[-123.196,49.148],[-123.229,49.26],[-122.948,49.293],[-122.879,49.399],[-123.277,49.344],[-123.188,49.68],[-123.336,49.459],[-123.531,49.397],[-123.948,49.535],[-124.054,49.662],[-123.993,49.736],[-123.817,49.587],[-123.582,49.681],[-123.874,49.737],[-123.904,49.981],[-123.785,50.088],[-123.88,50.174],[-123.946,50.184],[-123.863,50.103],[-123.972,49.892],[-124.142,49.793],[-124.413,49.778],[-124.702,49.958],[-125.057,50.419],[-124.863,50.637],[-124.86,50.872],[-125.059,50.514],[-125.476,50.497],[-125.539,50.649],[-125.641,50.466],[-126.094,50.498],[-126.447,50.588],[-125.904,50.705],[-126.514,50.679],[-126.375,50.837],[-126.522,50.866],[-126.517,51.057],[-126.632,50.915],[-127.058,50.868],[-127.708,51.151],[-127.689,51.343],[-127.42,51.608],[-126.691,51.703],[-127.339,51.707],[-127.645,51.478],[-127.851,51.673],[-127.863,51.821],[-127.728,51.993],[-127.859,51.99],[-127.795,52.191],[-127.438,52.356],[-127.242,52.395],[-126.714,52.061],[-127.194,52.458],[-126.951,52.721],[-127.008,52.843],[-127.066,52.653],[-127.834,52.251],[-128.102,51.788],[-128.358,52.159],[-128.037,52.318],[-128.052,52.453],[-127.94,52.545],[-128.272,52.363],[-128.053,52.911],[-128.365,52.826],[-128.525,53.141],[-129.081,53.367],[-129.172,53.534],[-129.021,53.692],[-128.855,53.705],[-128.906,53.559],[-128.542,53.421],[-128.133,53.418],[-127.928,53.275],[-128.207,53.483],[-128.676,53.555],[-128.764,53.747],[-128.532,53.858],[-128.705,53.919],[-128.959,53.841],[-129.208,53.642],[-129.258,53.418],[-129.564,53.251],[-129.912,53.551],[-130.335,53.724],[-130.043,54.134],[-129.626,54.23],[-130.084,54.181],[-130.43,54.421],[-130.35,54.655],[-129.561,55.463],[-129.701,55.439],[-129.795,55.56],[-129.838,55.319],[-130.048,55.057],[-129.985,55.359],[-130.095,55.695],[-130.025,55.888],[-130.147,55.654],[-130.037,55.298],[-130.219,55.06],[-130.204,54.947],[-130.535,54.749],[-130.85,54.808],[-131.048,55.158],[-130.748,55.318],[-130.856,55.355],[-130.919,55.736],[-131.128,55.96],[-131.033,56.088],[-131.784,55.877],[-131.945,55.554],[-132.119,55.57],[-132.208,55.753],[-131.844,56.16],[-131.551,56.207],[-131.888,56.242],[-132.182,56.421],[-132.476,56.65],[-132.487,56.766],[-132.802,56.895],[-132.825,57.056],[-133.466,57.172],[-133.437,57.337],[-133.649,57.642],[-133.554,57.695],[-133.117,57.566],[-133.535,57.833],[-133.194,57.878],[-133.559,57.924],[-133.722,57.844],[-134.031,58.072],[-134.045,58.289],[-133.877,58.518],[-134.209,58.233],[-134.664,58.385],[-135.132,58.843],[-135.364,59.419],[-135.484,59.309],[-135.4,59.208],[-135.502,59.202],[-135.062,58.341],[-135.09,58.246],[-135.572,58.412],[-135.898,58.4],[-135.862,58.577],[-136.043,58.822],[-135.826,58.898],[-136.017,58.874],[-136.15,59.048],[-136.124,58.82],[-136.226,58.765],[-136.989,59.034],[-136.948,58.935],[-137.059,58.874],[-136.614,58.809],[-136.41,58.701],[-136.484,58.618],[-136.225,58.602],[-136.061,58.453],[-136.081,58.364],[-136.607,58.244],[-137.544,58.581],[-138.515,59.166],[-139.799,59.546],[-139.513,59.698],[-139.582,59.848],[-139.512,59.954],[-139.331,59.877],[-139.287,59.611],[-139.221,59.82],[-138.988,59.835],[-139.431,60.012],[-140.42,59.711],[-141.408,59.903],[-141.29,60.004],[-141.409,60.118],[-141.447,60.019],[-141.67,59.97],[-142.946,60.097],[-144.147,60.016],[-144.089,60.084],[-144.185,60.151],[-144.901,60.335],[-144.691,60.669],[-145.248,60.38],[-145.899,60.478],[-145.675,60.651],[-146.57,60.729],[-146.392,60.811],[-146.638,60.897],[-146.599,61.054],[-146.285,61.113],[-146.583,61.128],[-147.361,60.915],[-147.567,60.995],[-147.808,60.885],[-147.991,60.948],[-147.752,61.219],[-148.342,61.06],[-148.411,61.011],[-148.209,61.03],[-148.344,60.854],[-148.556,60.827],[-148.257,60.675],[-148.305,60.583],[-148.64,60.489],[-148.119,60.575],[-147.964,60.485],[-148.182,60.393],[-148.198,60.168],[-148.431,59.989],[-149.267,59.998],[-149.395,60.106],[-149.598,59.77],[-149.714,59.92],[-149.801,59.738],[-150.005,59.784],[-149.967,59.69],[-150.198,59.567],[-150.607,59.563],[-150.935,59.249],[-151.183,59.301],[-151.171,59.237],[-151.619,59.187],[-151.95,59.265],[-151.85,59.406],[-151.4,59.516],[-151.046,59.772],[-151.45,59.65],[-151.853,59.782],[-151.396,60.274],[-151.322,60.743],[-150.441,61.024],[-149.075,60.876],[-150.053,61.171],[-149.329,61.497],[-149.625,61.486],[-149.976,61.279],[-150.612,61.301],[-151.594,60.98],[-151.782,60.858],[-151.75,60.755],[-152.271,60.528],[-152.26,60.409],[-152.541,60.265],[-153.025,60.296],[-152.665,60.125],[-152.66,59.997],[-153.211,59.843],[-153.025,59.794],[-153.094,59.709],[-153.364,59.66],[-153.414,59.74],[-153.653,59.647],[-153.753,59.51],[-154.088,59.363],[-154.178,59.156],[-153.418,58.96],[-153.327,58.884],[-153.438,58.755],[-154.289,58.304],[-154.208,58.289],[-154.247,58.159],[-155.007,58.016],[-155.778,57.568],[-156.436,57.36],[-156.4,57.205],[-156.629,57.01],[-157.441,56.79],[-157.578,56.634],[-158.078,56.552],[-157.93,56.52],[-158.414,56.436],[-158.552,56.313],[-158.276,56.196],[-158.476,56.075],[-158.591,56.185],[-158.79,55.987],[-159.523,55.81],[-159.66,55.626],[-159.679,55.825],[-159.771,55.841],[-160.499,55.537],[-160.897,55.514],[-161.178,55.389],[-161.464,55.383],[-161.413,55.536],[-161.202,55.544],[-161.517,55.618],[-162.074,55.139],[-162.386,55.052],[-162.63,55.247],[-162.674,54.997],[-162.865,54.955],[-163.12,55.065],[-163.131,54.917],[-163.335,54.839],[-163.279,55.122],[-162.907,55.196],[-162.157,55.719],[-161.697,55.907],[-161.216,56.021],[-161.193,55.954],[-160.899,55.994],[-161.005,55.887],[-160.803,55.754],[-160.706,55.87],[-160.292,55.805],[-160.539,56.006],[-160.302,56.314],[-158.918,56.882],[-158.675,56.795],[-158.661,57.039],[-158.321,57.298],[-157.846,57.528],[-157.462,57.506],[-157.697,57.679],[-157.611,58.051],[-157.555,58.14],[-157.194,58.194],[-157.488,58.254],[-157.524,58.421],[-156.975,58.736],[-157.04,58.773],[-156.809,59.134],[-157.142,58.878],[-158.191,58.614],[-158.503,58.85],[-158.426,58.999],[-158.081,58.977],[-158.423,59.09],[-158.678,58.929],[-158.809,58.974],[-158.861,58.719],[-158.789,58.441],[-158.951,58.405],[-159.67,58.911],[-159.92,58.82],[-160.363,59.051],[-161.247,58.799],[-161.361,58.67],[-162.145,58.644],[-161.724,58.794],[-161.789,59.016],[-161.644,59.11],[-161.891,59.076],[-161.981,59.146],[-162.023,59.284],[-161.829,59.589],[-162.242,60.178],[-162.421,60.284],[-162.139,60.614],[-161.947,60.685],[-162.138,60.686],[-162.685,60.269],[-162.527,60.199],[-162.571,59.99],[-163.907,59.807],[-164.662,60.304],[-165.061,60.413],[-165.027,60.501],[-165.354,60.541],[-164.805,60.892],[-164.319,60.771],[-164.266,60.725],[-164.372,60.592],[-164.0,60.766],[-163.73,60.59],[-163.421,60.757],[-163.907,60.854],[-163.587,60.903],[-163.749,60.97],[-163.995,60.865],[-165.115,60.933],[-165.175,60.966],[-164.869,61.112],[-165.345,61.198],[-165.274,61.275],[-165.392,61.212],[-165.381,61.106],[-165.566,61.102],[-165.691,61.3],[-165.864,61.336],[-165.845,61.536],[-166.094,61.507],[-166.168,61.651],[-165.809,61.696],[-166.079,61.803],[-165.613,61.869],[-165.725,61.959],[-165.707,62.1],[-165.195,62.474],[-164.758,62.497],[-164.844,62.581],[-164.589,62.709],[-164.793,62.623],[-164.8,62.918],[-164.677,63.02],[-164.384,63.03],[-164.525,63.128],[-164.409,63.215],[-163.943,63.247],[-163.616,63.125],[-163.738,63.016],[-163.504,63.106],[-163.288,63.046],[-162.621,63.266],[-162.283,63.529],[-161.505,63.468],[-160.927,63.661],[-160.779,63.819],[-160.988,64.251],[-161.491,64.434],[-161.415,64.526],[-160.932,64.579],[-160.836,64.682],[-160.887,64.796],[-161.13,64.925],[-161.466,64.795],[-161.759,64.816],[-162.807,64.374],[-162.876,64.516],[-163.204,64.652],[-163.303,64.606],[-163.052,64.52],[-163.144,64.424],[-163.713,64.588],[-164.979,64.454],[-166.143,64.583],[-166.481,64.728],[-166.415,64.927],[-166.928,65.157],[-166.531,65.155],[-166.452,65.247],[-166.157,65.286],[-167.404,65.422],[-168.088,65.658],[-167.074,65.877],[-166.399,66.144],[-165.63,66.131],[-165.56,66.167],[-165.812,66.288],[-164.46,66.588],[-163.638,66.575],[-163.894,66.576],[-163.775,66.531],[-163.894,66.287],[-164.034,66.216],[-163.695,66.084],[-161.934,66.043],[-161.455,66.281],[-161.034,66.189],[-161.12,66.334],[-161.828,66.371],[-161.917,66.412],[-161.888,66.493],[-162.191,66.693],[-162.467,66.736],[-162.607,66.894],[-162.362,66.947],[-162.018,66.784],[-162.051,66.667],[-161.91,66.56],[-161.591,66.46],[-160.232,66.42],[-160.361,66.612],[-160.864,66.671],[-161.398,66.552],[-161.857,66.7],[-161.879,66.804],[-161.622,66.979],[-161.72,67.021],[-163.532,67.103],[-164.125,67.607],[-165.386,68.046],[-166.786,68.36],[-166.381,68.425],[-166.209,68.885],[-164.302,68.936],[-163.536,69.17],[-163.161,69.388],[-162.952,69.758],[-161.881,70.332],[-161.761,70.258],[-162.074,70.162],[-160.996,70.305],[-160.117,70.591],[-159.963,70.568],[-160.106,70.473],[-160.006,70.448],[-160.095,70.333],[-159.866,70.279],[-159.815,70.497],[-159.387,70.525],[-160.082,70.635],[-159.681,70.787],[-159.315,70.879],[-159.192,70.86],[-159.34,70.781],[-159.251,70.748],[-157.909,70.86],[-156.47,71.408],[-156.395,71.397],[-156.567,71.342],[-155.579,71.121],[-156.147,70.928],[-155.974,70.842],[-155.579,70.894],[-155.167,71.099],[-154.674,70.987],[-154.785,70.894],[-154.195,70.801],[-153.233,70.933],[-152.3,70.847],[-152.233,70.81],[-152.471,70.654],[-151.769,70.56],[-151.945,70.452],[-149.269,70.501],[-147.705,70.217],[-145.823,70.16],[-144.619,69.982],[-143.218,70.116],[-141.408,69.653],[-139.182,69.516],[-137.869,69.093],[-136.717,68.889],[-136.122,68.882],[-135.259,68.684],[-135.435,68.842],[-135.895,68.927],[-135.925,68.993],[-135.576,69.027],[-135.91,69.111],[-135.691,69.311],[-135.293,69.308],[-135.141,69.468],[-134.457,69.478],[-134.409,69.682],[-133.88,69.508],[-134.174,69.253],[-133.163,69.434],[-132.84,69.651],[-132.404,69.659],[-132.568,69.698],[-132.488,69.738],[-132.163,69.705],[-131.441,69.918],[-131.136,69.907],[-130.665,70.127],[-129.945,70.091],[-129.676,70.193],[-129.538,70.105],[-129.648,69.998],[-130.832,69.651],[-131.938,69.535],[-132.331,69.308],[-132.817,69.206],[-133.418,68.844],[-133.197,68.74],[-133.337,68.835],[-132.706,68.815],[-132.533,68.876],[-132.739,68.922],[-132.719,69.079],[-131.92,69.291],[-131.788,69.432],[-131.343,69.435],[-131.325,69.361],[-131.063,69.451],[-130.971,69.209],[-130.516,69.57],[-130.118,69.72],[-128.899,69.966],[-129.158,69.8],[-129.054,69.701],[-128.853,69.751],[-128.387,69.96],[-128.279,70.108],[-127.684,70.26],[-128.17,70.418],[-127.991,70.574],[-127.226,70.296],[-126.612,69.73],[-125.728,69.38],[-125.387,69.349],[-125.172,69.428],[-125.346,69.662],[-125.201,69.829],[-124.768,69.99],[-124.99,70.027],[-124.555,70.151],[-124.444,70.111],[-124.407,69.767],[-124.125,69.69],[-124.454,69.455],[-124.426,69.379],[-123.528,69.389],[-123.214,69.542],[-123.026,69.81],[-121.742,69.798],[-120.962,69.66],[-120.14,69.381],[-118.869,69.257],[-117.227,68.913],[-116.059,68.837],[-116.243,68.974],[-115.442,68.941],[-114.62,68.746],[-113.964,68.399],[-114.096,68.267],[-114.765,68.27],[-115.434,67.902],[-115.133,67.819],[-112.503,67.682],[-110.99,67.791],[-110.074,67.993],[-109.63,67.733],[-109.038,67.691],[-108.852,67.422],[-108.613,67.598],[-107.989,67.256],[-107.909,67.163],[-107.991,67.095],[-108.496,67.092],[-107.259,66.399],[-107.71,66.74],[-107.746,66.961],[-107.156,66.882],[-107.348,67.055],[-107.283,67.103],[-107.567,67.273],[-107.65,67.511],[-107.954,67.7],[-107.958,67.819],[-107.763,67.907],[-107.798,68.037],[-106.424,68.201],[-106.404,68.319],[-105.933,68.443],[-105.75,68.592],[-106.237,68.577],[-106.458,68.516],[-106.608,68.357],[-107.619,68.331],[-107.742,68.286],[-107.734,68.174],[-108.323,68.154],[-108.718,68.297],[-108.346,68.598],[-106.164,68.92],[-105.686,68.828],[-105.377,68.414],[-104.653,68.23],[-104.661,68.149],[-104.487,68.063],[-103.474,68.115],[-102.32,67.736],[-101.555,67.693],[-100.213,67.839],[-99.032,67.719],[-98.412,67.807],[-98.704,67.966],[-98.632,68.073],[-97.607,67.631],[-97.155,67.726],[-97.207,67.855],[-97.547,67.961],[-98.193,67.923],[-98.5,68.118],[-98.381,68.132],[-98.65,68.364],[-97.794,68.388],[-97.939,68.51],[-97.829,68.533],[-97.336,68.479],[-96.977,68.255],[-96.431,68.311],[-96.722,68.039],[-95.97,68.249],[-96.369,67.51],[-96.141,67.272],[-95.72,67.317],[-95.778,67.185],[-95.416,67.156],[-95.419,67.013],[-96.423,67.052],[-95.788,66.617],[-95.743,66.69],[-96.037,66.938],[-95.4,66.949],[-95.259,67.263],[-95.463,67.61],[-95.65,67.737],[-95.461,68.021],[-94.744,68.071],[-93.449,68.619],[-93.644,68.633],[-93.681,68.887],[-93.852,69.0],[-94.065,68.785],[-94.6,68.803],[-94.563,68.912],[-94.084,69.123],[-94.255,69.151],[-94.255,69.314],[-93.619,69.417],[-93.82,69.253],[-93.749,69.226],[-93.431,69.375],[-93.65,69.519],[-94.271,69.455],[-94.634,69.65],[-94.823,69.578],[-96.05,69.831],[-96.492,70.125],[-96.546,70.327],[-96.226,70.542],[-95.879,70.549],[-95.988,70.617],[-95.886,70.694],[-96.359,70.679],[-96.549,70.809],[-96.525,71.127],[-96.406,71.274],[-96.062,71.414],[-95.564,71.337],[-95.406,71.492],[-95.872,71.573],[-95.201,71.904],[-94.557,71.979],[-94.308,71.765]],[[-82.0,62.954],[-81.964,62.828],[-82.114,62.652],[-83.016,62.21],[-83.699,62.16],[-83.912,62.426],[-83.376,62.905],[-82.0,62.954]],[[-104.558,77.142],[-105.215,77.182],[-106.066,77.725],[-105.588,77.736],[-105.29,77.642],[-104.955,77.419],[-104.542,77.338],[-104.454,77.249],[-104.558,77.142]],[[-95.484,77.792],[-93.583,77.771],[-93.129,77.66],[-93.339,77.63],[-93.52,77.474],[-93.836,77.452],[-95.987,77.484],[-96.277,77.631],[-95.484,77.792]],[[-93.543,75.028],[-93.463,74.856],[-93.573,74.669],[-94.535,74.637],[-95.865,74.83],[-96.6,75.032],[-95.955,75.444],[-94.878,75.63],[-93.909,75.423],[-93.498,75.137],[-93.543,75.028]],[[-109.816,78.65],[-109.467,78.567],[-109.352,78.369],[-110.418,78.295],[-111.169,78.386],[-111.517,78.275],[-112.131,78.366],[-113.293,78.334],[-110.878,78.735],[-109.816,78.65]],[[-118.328,75.58],[-118.817,75.522],[-119.395,75.617],[-118.626,75.906],[-117.752,76.112],[-117.499,76.077],[-118.328,75.58]],[[-105.289,72.92],[-106.18,73.304],[-106.95,73.51],[-106.614,73.696],[-105.512,73.766],[-105.114,73.744],[-104.555,73.541],[-104.583,73.354],[-104.791,73.168],[-105.289,72.92]],[[-100.002,73.946],[-99.158,73.732],[-97.67,73.888],[-97.112,73.79],[-97.002,73.667],[-97.626,73.502],[-97.35,73.481],[-97.273,73.387],[-97.796,73.285],[-98.431,72.958],[-97.636,73.028],[-97.083,72.763],[-97.128,72.628],[-96.542,72.699],[-96.473,72.434],[-96.801,72.322],[-96.593,72.204],[-96.766,72.046],[-96.624,71.968],[-96.613,71.834],[-97.582,71.63],[-98.181,71.662],[-98.323,71.852],[-98.459,71.773],[-98.199,71.441],[-98.663,71.302],[-99.167,71.367],[-99.735,71.757],[-100.594,72.152],[-101.209,72.317],[-101.724,72.315],[-102.709,72.765],[-102.551,72.978],[-102.204,73.077],[-101.922,73.057],[-101.273,72.722],[-100.485,72.773],[-100.396,72.977],[-100.128,72.907],[-100.236,73.095],[-100.536,73.198],[-100.341,73.265],[-99.825,73.214],[-100.366,73.359],[-100.889,73.275],[-101.523,73.486],[-100.976,73.6],[-100.522,73.449],[-100.985,73.765],[-100.484,73.844],[-99.991,73.795],[-99.912,73.847],[-100.227,73.889],[-100.002,73.946]],[[-84.92,65.261],[-84.501,65.458],[-84.085,65.218],[-83.491,65.132],[-83.201,64.96],[-82.05,64.644],[-81.676,64.213],[-81.887,64.016],[-80.829,64.09],[-80.569,63.932],[-80.668,63.901],[-80.261,63.802],[-81.046,63.462],[-82.378,63.707],[-82.467,63.927],[-83.034,64.023],[-83.065,64.159],[-83.304,64.144],[-83.584,64.058],[-83.728,63.813],[-84.308,63.586],[-84.633,63.309],[-85.393,63.12],[-85.496,63.139],[-85.769,63.7],[-87.177,63.595],[-86.932,63.902],[-86.252,64.137],[-86.374,64.566],[-86.075,65.534],[-85.814,65.832],[-85.555,65.919],[-85.241,65.796],[-85.105,65.623],[-85.24,65.51],[-84.92,65.261]],[[-75.676,68.323],[-75.078,68.173],[-75.091,67.635],[-75.202,67.459],[-75.78,67.284],[-76.694,67.236],[-77.005,67.267],[-77.224,67.508],[-77.306,67.706],[-77.229,67.85],[-76.74,68.231],[-75.676,68.323]],[[-79.537,73.654],[-78.287,73.666],[-77.207,73.5],[-76.29,73.081],[-76.31,72.998],[-76.09,72.881],[-76.401,72.821],[-78.314,72.882],[-79.501,72.756],[-79.937,72.864],[-80.183,73.225],[-80.776,73.334],[-80.823,73.429],[-80.736,73.483],[-80.861,73.671],[-80.763,73.758],[-80.412,73.765],[-79.537,73.654]],[[-97.701,76.467],[-97.739,76.335],[-97.531,76.109],[-97.65,75.979],[-97.602,75.851],[-97.891,75.76],[-97.408,75.673],[-97.336,75.42],[-97.653,75.508],[-97.878,75.416],[-97.853,75.26],[-97.66,75.151],[-98.069,75.199],[-97.992,75.046],[-100.234,75.008],[-100.483,75.188],[-100.146,75.246],[-100.731,75.347],[-99.756,75.633],[-99.195,75.698],[-102.541,75.514],[-102.798,75.6],[-102.145,75.875],[-100.973,75.798],[-101.288,75.789],[-101.506,75.918],[-101.431,75.992],[-101.872,76.083],[-101.557,76.236],[-102.138,76.285],[-101.788,76.451],[-101.34,76.41],[-101.056,76.246],[-99.865,75.924],[-99.689,75.96],[-100.113,76.117],[-99.541,76.146],[-100.414,76.243],[-99.978,76.312],[-100.891,76.475],[-100.069,76.635],[-98.89,76.466],[-99.024,76.615],[-98.711,76.694],[-97.701,76.467]],[[-103.426,79.316],[-102.914,79.231],[-102.652,79.095],[-102.731,78.969],[-102.576,78.879],[-102.393,79.01],[-101.704,79.079],[-101.037,78.939],[-101.128,78.802],[-100.435,78.82],[-100.015,78.729],[-99.582,78.563],[-99.848,78.438],[-99.751,78.303],[-99.132,78.118],[-99.0,77.997],[-99.166,77.857],[-99.956,77.794],[-100.586,77.892],[-101.074,78.194],[-102.607,78.249],[-102.772,78.307],[-102.731,78.371],[-104.513,78.295],[-104.996,78.519],[-103.571,78.54],[-103.483,78.594],[-104.021,78.635],[-103.372,78.736],[-104.185,78.781],[-103.876,78.903],[-104.152,78.99],[-104.896,78.808],[-104.97,78.856],[-104.747,79.027],[-105.536,79.033],[-105.58,79.114],[-105.388,79.324],[-103.426,79.316]],[[-91.886,81.133],[-90.683,80.688],[-90.643,80.594],[-89.236,80.511],[-89.134,80.44],[-89.198,80.263],[-88.857,80.166],[-88.2,80.111],[-88.612,80.255],[-88.644,80.387],[-88.525,80.418],[-87.675,80.372],[-87.625,80.187],[-87.922,80.098],[-87.202,80.043],[-86.977,79.894],[-87.295,79.58],[-86.337,79.635],[-86.007,79.479],[-85.648,79.611],[-85.042,79.285],[-86.957,78.975],[-87.617,78.676],[-87.922,78.751],[-87.953,78.915],[-87.817,79.036],[-88.04,78.995],[-88.164,78.933],[-88.254,78.672],[-88.003,78.616],[-87.983,78.537],[-88.148,78.477],[-88.742,78.584],[-88.606,78.392],[-88.822,78.186],[-89.096,78.209],[-90.037,78.607],[-90.076,78.549],[-89.49,78.172],[-90.459,78.331],[-90.652,78.308],[-90.327,78.185],[-91.41,78.188],[-92.848,78.46],[-91.867,78.543],[-93.267,78.608],[-93.634,78.751],[-93.16,78.776],[-94.17,78.973],[-92.684,79.186],[-92.547,79.283],[-91.3,79.373],[-92.822,79.45],[-93.933,79.291],[-94.109,79.315],[-93.94,79.386],[-94.11,79.402],[-95.103,79.29],[-95.733,79.418],[-95.663,79.527],[-94.402,79.736],[-95.858,79.674],[-96.463,79.848],[-96.773,80.136],[-94.646,80.049],[-94.583,80.141],[-94.263,80.195],[-95.405,80.135],[-96.394,80.315],[-95.549,80.367],[-96.152,80.553],[-96.133,80.691],[-95.927,80.721],[-95.226,80.686],[-94.893,80.571],[-93.928,80.559],[-95.515,80.838],[-95.27,81.001],[-93.236,81.129],[-94.194,81.241],[-94.22,81.331],[-93.035,81.346],[-91.886,81.133]],[[-94.295,76.912],[-93.811,76.914],[-93.212,76.755],[-93.201,76.669],[-93.535,76.448],[-92.995,76.62],[-91.305,76.681],[-90.543,76.496],[-91.415,76.456],[-89.285,76.302],[-89.219,76.258],[-89.407,76.189],[-91.407,76.22],[-90.251,76.053],[-89.278,75.795],[-89.205,75.762],[-89.257,75.698],[-89.646,75.565],[-88.917,75.454],[-88.804,75.502],[-88.852,75.625],[-88.645,75.658],[-88.201,75.512],[-87.73,75.576],[-87.539,75.485],[-87.257,75.618],[-85.951,75.395],[-85.905,75.442],[-86.069,75.502],[-84.605,75.653],[-83.932,75.819],[-83.237,75.751],[-82.154,75.831],[-81.269,75.756],[-81.001,75.643],[-80.322,75.629],[-80.119,75.562],[-80.26,75.479],[-79.66,75.45],[-79.509,75.26],[-80.382,75.034],[-79.664,75.021],[-79.401,74.918],[-79.944,74.834],[-80.348,74.903],[-80.149,74.796],[-80.263,74.584],[-81.94,74.473],[-82.931,74.566],[-83.117,74.693],[-83.103,74.817],[-83.522,74.901],[-83.341,74.765],[-83.532,74.586],[-84.426,74.508],[-85.061,74.607],[-85.133,74.517],[-85.442,74.601],[-85.808,74.499],[-88.423,74.494],[-88.558,74.57],[-88.34,74.785],[-88.535,74.832],[-88.851,74.69],[-88.94,74.79],[-89.192,74.745],[-89.196,74.638],[-89.559,74.555],[-90.553,74.613],[-90.967,74.715],[-90.88,74.818],[-91.13,74.736],[-91.135,74.65],[-91.508,74.651],[-91.962,74.793],[-92.174,75.051],[-92.076,75.124],[-92.389,75.263],[-92.411,75.406],[-92.069,75.658],[-92.185,75.847],[-93.092,76.354],[-95.274,76.264],[-96.04,76.487],[-95.651,76.585],[-96.898,76.754],[-96.402,76.797],[-96.814,76.913],[-96.758,76.972],[-95.85,77.066],[-94.295,76.912]],[[-96.204,78.531],[-94.915,78.391],[-95.329,78.225],[-94.934,78.076],[-95.199,77.968],[-96.99,77.806],[-97.019,77.908],[-97.658,78.091],[-96.945,78.152],[-98.05,78.326],[-98.317,78.477],[-98.06,78.558],[-98.341,78.751],[-97.382,78.783],[-96.475,78.665],[-96.204,78.531]],[[-110.458,78.103],[-109.619,78.057],[-109.772,77.957],[-110.866,77.834],[-110.153,77.763],[-110.117,77.625],[-110.198,77.525],[-111.952,77.344],[-113.164,77.53],[-113.209,77.58],[-113.121,77.633],[-113.283,77.813],[-113.187,77.912],[-112.305,78.007],[-110.458,78.103]],[[-115.551,77.363],[-115.47,77.309],[-116.329,77.137],[-115.81,76.939],[-116.253,76.901],[-115.946,76.711],[-116.999,76.532],[-117.044,76.373],[-117.234,76.282],[-117.993,76.406],[-117.78,76.784],[-117.881,76.805],[-118.301,76.737],[-118.468,76.547],[-118.791,76.513],[-118.625,76.366],[-118.994,76.145],[-119.168,76.127],[-119.58,76.327],[-119.74,76.118],[-119.526,75.997],[-119.913,75.859],[-120.409,75.826],[-120.848,76.183],[-121.019,76.02],[-121.213,75.984],[-121.908,76.035],[-122.4,75.944],[-122.64,76.009],[-122.546,76.081],[-122.593,76.162],[-122.903,76.135],[-122.423,76.39],[-121.561,76.453],[-119.09,77.305],[-116.844,77.34],[-116.704,77.38],[-117.04,77.465],[-116.511,77.548],[-115.551,77.363]],[[-108.292,76.057],[-107.723,75.995],[-108.021,75.805],[-107.216,75.892],[-106.914,75.68],[-106.892,75.782],[-106.693,75.81],[-106.862,75.93],[-106.677,76.024],[-105.905,76.009],[-105.604,75.93],[-105.481,75.702],[-105.863,75.192],[-106.093,75.089],[-107.153,74.927],[-107.82,75.0],[-108.475,74.947],[-108.831,75.065],[-109.503,74.883],[-110.387,74.814],[-110.941,74.639],[-112.519,74.417],[-113.514,74.43],[-114.377,74.671],[-112.836,74.976],[-111.671,75.019],[-111.033,75.227],[-112.214,75.133],[-112.597,75.212],[-113.712,75.069],[-113.845,75.112],[-113.853,75.259],[-113.467,75.416],[-114.017,75.434],[-114.168,75.24],[-114.514,75.275],[-114.358,75.171],[-114.452,75.088],[-115.02,74.976],[-115.413,75.115],[-115.729,74.968],[-116.476,75.172],[-117.005,75.156],[-117.6,75.272],[-117.258,75.46],[-116.077,75.493],[-115.142,75.679],[-116.426,75.585],[-117.164,75.645],[-116.802,75.772],[-114.992,75.896],[-116.338,75.881],[-116.665,75.958],[-116.55,76.017],[-116.591,76.096],[-116.21,76.194],[-114.779,76.173],[-115.832,76.296],[-115.581,76.438],[-114.998,76.497],[-114.194,76.451],[-113.823,76.207],[-112.698,76.202],[-111.865,75.939],[-112.057,75.834],[-111.549,75.822],[-111.053,75.549],[-109.086,75.506],[-108.913,75.587],[-108.945,75.699],[-109.871,75.929],[-109.455,76.021],[-109.43,76.109],[-110.201,76.289],[-110.309,76.397],[-109.339,76.76],[-108.832,76.821],[-108.467,76.738],[-108.628,76.587],[-108.123,76.233],[-108.406,76.085],[-108.292,76.057]],[[-93.171,74.161],[-92.223,73.972],[-91.088,74.009],[-90.355,73.869],[-91.249,73.304],[-91.554,73.236],[-91.426,73.195],[-92.118,72.754],[-94.211,72.757],[-93.771,72.668],[-93.572,72.559],[-93.542,72.437],[-94.144,72.001],[-95.193,72.027],[-95.251,72.502],[-95.602,72.884],[-95.633,73.695],[-95.386,73.755],[-94.698,73.664],[-95.134,73.881],[-95.121,73.985],[-94.974,74.041],[-93.171,74.161]],[[-97.439,69.643],[-97.236,69.673],[-96.3,69.344],[-95.751,68.898],[-95.268,68.826],[-96.599,68.461],[-97.472,68.544],[-98.235,68.739],[-98.321,68.843],[-98.775,68.817],[-98.904,68.932],[-99.254,68.863],[-99.564,69.034],[-99.456,69.131],[-98.912,69.168],[-98.504,69.308],[-98.45,69.354],[-98.559,69.461],[-98.448,69.48],[-98.546,69.573],[-98.041,69.457],[-98.304,69.669],[-98.081,69.833],[-97.691,69.841],[-97.411,69.738],[-97.439,69.643]],[[-114.522,72.593],[-113.578,72.652],[-113.45,72.863],[-113.074,72.995],[-111.27,72.714],[-111.356,72.572],[-111.895,72.356],[-111.675,72.3],[-111.311,72.455],[-111.268,72.364],[-111.14,72.365],[-110.205,72.661],[-110.197,72.759],[-110.554,72.861],[-110.661,73.008],[-110.008,72.984],[-108.755,72.551],[-108.188,71.724],[-107.813,71.626],[-107.306,71.895],[-107.696,72.149],[-108.237,73.15],[-107.936,73.217],[-108.077,73.281],[-108.029,73.349],[-107.113,73.192],[-106.951,73.276],[-106.482,73.196],[-105.813,73.011],[-105.415,72.788],[-104.878,71.98],[-104.386,71.577],[-104.356,71.382],[-104.563,71.132],[-104.515,71.064],[-103.585,70.631],[-103.077,70.509],[-103.001,70.541],[-103.05,70.655],[-101.99,70.285],[-101.641,70.266],[-101.562,70.135],[-101.091,70.136],[-100.906,69.812],[-101.044,69.669],[-101.337,69.71],[-101.484,69.85],[-101.648,69.699],[-102.234,69.842],[-102.596,69.718],[-102.535,69.621],[-102.621,69.552],[-103.435,69.668],[-103.049,69.472],[-103.12,69.205],[-102.447,69.476],[-102.151,69.488],[-101.978,69.425],[-102.046,69.258],[-101.789,69.182],[-101.857,69.024],[-102.895,68.824],[-105.106,68.92],[-105.169,68.955],[-105.02,69.081],[-106.141,69.162],[-106.341,69.224],[-106.42,69.414],[-106.659,69.44],[-107.44,69.002],[-108.365,68.935],[-109.472,68.677],[-113.02,68.481],[-113.555,68.768],[-113.694,69.195],[-115.618,69.283],[-116.513,69.425],[-117.104,69.804],[-117.195,70.054],[-114.592,70.312],[-112.638,70.225],[-111.633,70.309],[-113.757,70.691],[-115.991,70.586],[-117.587,70.63],[-118.377,70.968],[-117.814,71.158],[-115.892,71.382],[-116.045,71.423],[-115.98,71.469],[-115.303,71.494],[-115.587,71.546],[-117.936,71.392],[-118.226,71.467],[-117.742,71.659],[-118.583,71.649],[-118.988,71.764],[-118.945,71.986],[-118.213,72.263],[-118.481,72.428],[-118.375,72.534],[-116.573,73.055],[-114.638,73.373],[-114.206,73.298],[-114.052,73.071],[-114.075,72.907],[-114.522,72.593]],[[-119.736,74.113],[-119.206,74.198],[-119.118,74.016],[-118.544,74.245],[-117.515,74.232],[-115.634,73.666],[-115.393,73.502],[-118.962,72.684],[-119.513,72.303],[-120.18,72.213],[-120.443,71.631],[-120.619,71.506],[-121.472,71.389],[-121.749,71.445],[-122.84,71.097],[-123.315,71.169],[-124.008,71.677],[-125.297,71.973],[-125.845,71.979],[-125.763,72.138],[-125.584,72.183],[-125.627,72.255],[-124.987,72.588],[-124.97,72.843],[-124.565,72.944],[-124.817,73.059],[-124.804,73.126],[-123.797,73.768],[-124.192,73.902],[-124.696,74.348],[-121.504,74.545],[-119.563,74.233],[-119.736,74.113]],[[-102.227,76.015],[-102.008,75.939],[-102.58,75.78],[-103.315,75.764],[-103.042,75.919],[-103.77,75.892],[-103.985,75.933],[-103.801,76.037],[-104.406,76.108],[-104.012,76.223],[-102.728,76.307],[-102.584,76.282],[-102.49,76.095],[-102.227,76.015]],[[-55.459,51.537],[-55.583,51.389],[-56.031,51.328],[-56.0,51.199],[-55.815,51.191],[-55.8,51.033],[-56.732,50.008],[-56.849,49.765],[-56.822,49.613],[-56.179,50.115],[-56.161,49.94],[-55.927,50.018],[-55.503,49.983],[-56.14,49.619],[-55.87,49.67],[-56.087,49.452],[-55.376,49.49],[-55.344,49.373],[-55.23,49.508],[-55.353,49.079],[-55.176,49.244],[-54.502,49.527],[-54.448,49.329],[-54.317,49.424],[-53.958,49.442],[-53.619,49.322],[-53.573,49.141],[-54.161,48.788],[-53.853,48.811],[-53.966,48.707],[-53.706,48.656],[-53.795,48.526],[-54.114,48.394],[-53.028,48.635],[-53.136,48.402],[-53.61,48.208],[-53.569,48.088],[-53.87,48.02],[-53.638,48.015],[-53.864,47.787],[-53.672,47.648],[-53.283,47.998],[-52.866,48.113],[-53.154,47.735],[-53.17,47.512],[-53.122,47.455],[-52.945,47.553],[-52.782,47.769],[-52.654,47.549],[-53.07,46.681],[-53.59,46.639],[-53.597,47.146],[-54.01,46.84],[-54.174,46.88],[-53.85,47.44],[-53.989,47.756],[-54.192,47.86],[-54.488,47.404],[-54.563,47.375],[-54.474,47.547],[-54.857,47.385],[-55.316,46.906],[-55.789,46.867],[-55.95,46.928],[-55.919,47.017],[-55.492,47.161],[-54.785,47.665],[-55.366,47.661],[-55.435,47.501],[-55.576,47.465],[-56.127,47.503],[-55.867,47.592],[-55.858,47.819],[-56.774,47.565],[-58.337,47.731],[-58.941,47.58],[-59.26,47.634],[-59.341,47.934],[-58.33,48.522],[-59.168,48.558],[-58.842,48.746],[-58.906,48.65],[-58.716,48.598],[-58.404,49.084],[-57.991,48.988],[-58.099,49.077],[-57.98,49.23],[-58.191,49.259],[-58.213,49.387],[-58.016,49.542],[-57.791,49.49],[-57.926,49.701],[-57.433,50.506],[-57.18,50.615],[-57.298,50.699],[-57.053,50.857],[-57.036,51.011],[-56.682,51.333],[-56.026,51.568],[-55.69,51.471],[-55.666,51.579],[-55.459,51.537]],[[19.255,70.066],[19.608,70.019],[18.785,69.579],[18.274,69.535],[18.062,69.602],[18.349,69.768],[18.674,69.782],[18.687,69.891],[19.051,70.038],[19.133,70.244],[19.213,70.247],[19.255,70.066]],[[15.76,68.561],[16.276,68.868],[16.547,68.717],[16.519,68.633],[15.975,68.402],[14.258,68.191],[14.586,68.4],[15.095,68.441],[15.413,68.616],[15.564,68.874],[15.444,68.919],[15.483,69.043],[15.893,69.278],[16.129,69.274],[15.812,69.024],[15.928,68.733],[15.76,68.561]],[[-44.865,82.084],[-46.752,82.348],[-47.351,82.599],[-46.399,82.692],[-44.917,82.481],[-44.75,82.401],[-44.865,82.084]],[[-29.953,83.565],[-25.795,83.261],[-31.993,83.085],[-32.033,82.983],[-29.964,83.11],[-27.002,83.067],[-25.123,83.16],[-24.47,82.877],[-22.525,82.789],[-21.521,82.595],[-23.118,82.325],[-29.579,82.161],[-29.887,82.055],[-29.811,81.955],[-29.544,81.94],[-27.84,82.049],[-25.149,82.001],[-24.589,81.883],[-24.293,81.701],[-23.496,81.773],[-23.18,81.989],[-22.94,82.031],[-21.338,82.069],[-21.13,81.934],[-21.147,81.695],[-21.504,81.438],[-23.072,80.927],[-23.196,80.847],[-23.118,80.778],[-22.826,80.913],[-20.89,81.276],[-19.63,81.64],[-19.225,81.64],[-19.153,81.512],[-17.456,81.398],[-16.121,81.777],[-14.242,81.814],[-12.434,81.683],[-11.426,81.481],[-13.126,81.088],[-14.452,80.993],[-14.229,80.87],[-14.504,80.763],[-16.761,80.573],[-15.937,80.428],[-16.489,80.252],[-18.071,80.172],[-19.429,80.258],[-20.15,80.011],[-20.181,79.858],[-20.069,79.774],[-19.353,79.734],[-19.284,79.683],[-19.414,79.349],[-19.152,79.325],[-18.992,79.178],[-19.723,79.065],[-20.05,78.842],[-21.134,78.659],[-20.956,78.555],[-21.748,77.791],[-21.73,77.709],[-21.579,77.651],[-20.863,77.912],[-19.49,77.719],[-19.296,77.585],[-20.162,77.69],[-20.681,77.619],[-20.232,77.368],[-19.3,77.222],[-18.443,77.259],[-18.292,77.133],[-18.337,76.921],[-18.606,76.763],[-20.487,76.921],[-21.615,76.688],[-22.334,76.794],[-22.607,76.681],[-21.877,76.573],[-21.758,76.401],[-21.488,76.272],[-20.887,76.304],[-19.863,76.121],[-19.958,75.997],[-19.509,75.758],[-19.4,75.494],[-19.375,75.298],[-19.526,75.18],[-19.798,75.157],[-20.485,75.314],[-21.649,75.023],[-22.233,75.12],[-21.695,74.964],[-20.986,75.074],[-20.795,74.806],[-21.038,74.654],[-20.862,74.636],[-20.611,74.728],[-20.417,74.975],[-19.985,74.975],[-19.538,74.625],[-19.287,74.546],[-19.272,74.343],[-19.646,74.258],[-20.256,74.283],[-20.231,74.205],[-21.129,74.111],[-21.955,74.244],[-21.762,74.483],[-21.983,74.567],[-21.973,74.39],[-22.334,74.286],[-22.196,74.206],[-22.335,74.063],[-22.135,73.99],[-20.367,73.848],[-20.51,73.493],[-20.637,73.464],[-21.548,73.432],[-22.347,73.269],[-23.233,73.398],[-24.158,73.764],[-24.677,73.602],[-25.521,73.852],[-24.778,73.54],[-26.062,73.253],[-27.27,73.436],[-26.542,73.249],[-27.562,73.138],[-27.348,73.068],[-25.399,73.276],[-25.057,73.396],[-24.133,73.409],[-22.036,72.918],[-22.075,72.399],[-22.28,72.345],[-22.293,72.12],[-24.069,72.499],[-24.359,72.687],[-24.63,73.038],[-26.658,72.716],[-26.392,72.673],[-24.813,72.902],[-24.65,72.583],[-24.701,72.506],[-25.204,72.393],[-24.572,72.42],[-22.497,71.914],[-22.37,71.77],[-21.96,71.745],[-22.503,71.5],[-22.48,71.383],[-22.418,71.249],[-22.299,71.432],[-21.752,71.478],[-21.675,70.856],[-21.523,70.526],[-22.384,70.462],[-22.437,70.86],[-22.691,70.437],[-23.328,70.451],[-23.971,70.649],[-24.266,71.046],[-24.562,71.224],[-25.885,71.572],[-27.087,71.627],[-27.162,71.602],[-27.107,71.533],[-25.843,71.48],[-25.668,71.265],[-26.014,71.093],[-26.718,70.95],[-28.398,70.993],[-27.979,70.84],[-28.146,70.656],[-29.072,70.445],[-26.747,70.476],[-26.508,70.397],[-27.328,70.217],[-27.629,70.028],[-27.384,69.992],[-27.028,70.201],[-25.53,70.353],[-23.667,70.139],[-22.207,70.108],[-22.435,69.986],[-23.088,69.883],[-23.05,69.793],[-23.866,69.737],[-23.739,69.589],[-24.297,69.586],[-24.221,69.479],[-24.296,69.439],[-25.189,69.261],[-25.092,69.165],[-26.483,68.676],[-29.25,68.299],[-29.869,68.312],[-30.196,68.199],[-30.72,68.251],[-30.611,68.118],[-30.979,68.061],[-32.327,68.437],[-32.18,68.257],[-32.367,68.213],[-32.165,67.991],[-33.108,67.658],[-33.504,67.377],[-33.528,67.258],[-34.102,66.726],[-34.423,66.63],[-34.633,66.435],[-35.189,66.25],[-35.867,66.441],[-35.63,66.14],[-36.379,65.831],[-36.389,65.96],[-36.527,66.008],[-36.665,65.79],[-36.932,65.783],[-37.063,65.871],[-37.316,65.79],[-37.41,65.656],[-37.754,65.593],[-38.001,65.71],[-37.797,65.857],[-37.788,65.978],[-37.279,66.304],[-38.157,66.386],[-37.752,66.262],[-38.14,65.904],[-38.52,66.01],[-38.216,65.838],[-38.203,65.712],[-40.174,65.556],[-39.578,65.341],[-40.253,65.049],[-40.668,65.109],[-41.084,65.101],[-41.089,65.035],[-40.966,64.869],[-40.655,64.915],[-40.182,64.48],[-40.699,64.33],[-40.782,64.222],[-41.581,64.298],[-41.031,64.121],[-40.618,64.132],[-40.652,63.928],[-40.55,63.725],[-40.772,63.626],[-40.775,63.534],[-41.049,63.514],[-41.152,63.349],[-41.108,63.274],[-41.388,63.062],[-41.844,63.07],[-42.175,63.209],[-41.634,62.972],[-41.909,62.737],[-42.942,62.72],[-42.153,62.568],[-42.321,62.153],[-42.143,62.014],[-42.11,61.857],[-42.585,61.717],[-42.324,61.682],[-42.717,60.767],[-43.044,60.524],[-43.923,60.595],[-43.213,60.391],[-43.123,60.061],[-43.32,59.928],[-43.955,60.025],[-43.658,59.859],[-43.907,59.815],[-44.117,59.832],[-44.065,59.925],[-44.413,59.923],[-44.453,60.015],[-44.224,60.274],[-44.613,60.017],[-45.379,60.203],[-45.368,60.373],[-44.975,60.457],[-44.757,60.665],[-45.381,60.445],[-46.047,60.616],[-46.142,60.777],[-45.87,61.218],[-46.874,60.816],[-48.181,60.769],[-48.205,60.856],[-47.77,60.998],[-48.386,61.005],[-48.428,61.187],[-48.922,61.277],[-49.049,61.524],[-49.289,61.59],[-49.193,61.686],[-49.38,61.89],[-48.829,62.08],[-49.12,62.113],[-49.624,61.999],[-49.668,62.151],[-49.553,62.233],[-50.319,62.473],[-50.299,62.722],[-49.793,63.045],[-50.39,62.822],[-51.469,63.642],[-51.538,63.758],[-51.451,63.905],[-51.548,64.006],[-50.261,64.214],[-50.487,64.209],[-50.437,64.313],[-51.542,64.097],[-51.708,64.205],[-51.232,64.561],[-50.835,64.559],[-50.849,64.645],[-50.684,64.678],[-50.355,64.683],[-50.009,64.447],[-50.122,64.704],[-50.517,64.767],[-50.961,65.201],[-50.722,64.798],[-51.221,64.628],[-51.139,64.786],[-51.255,64.758],[-51.923,64.219],[-52.093,64.416],[-52.089,64.682],[-52.259,65.155],[-52.538,65.329],[-51.619,65.713],[-51.092,65.776],[-51.723,65.723],[-52.348,65.461],[-52.551,65.461],[-52.761,65.591],[-53.199,65.594],[-53.234,65.771],[-53.106,65.977],[-53.392,66.048],[-51.225,66.882],[-53.036,66.201],[-53.615,66.154],[-53.635,66.414],[-53.419,66.649],[-53.038,66.827],[-52.387,66.881],[-53.687,66.986],[-53.884,67.136],[-53.799,67.418],[-52.512,67.761],[-50.613,67.528],[-51.171,67.694],[-50.887,67.784],[-50.969,67.807],[-51.765,67.738],[-52.345,67.837],[-53.735,67.549],[-53.578,67.837],[-53.152,68.208],[-51.597,68.055],[-51.169,68.385],[-52.199,68.221],[-53.383,68.297],[-53.039,68.611],[-52.605,68.709],[-51.623,68.535],[-51.133,68.598],[-50.801,68.791],[-51.249,68.74],[-51.085,69.128],[-50.297,69.171],[-50.537,69.248],[-51.077,69.209],[-50.804,69.663],[-50.349,69.796],[-50.5,69.936],[-50.323,70.027],[-52.255,70.059],[-53.023,70.302],[-54.014,70.422],[-54.531,70.699],[-54.166,70.82],[-52.802,70.751],[-51.524,70.439],[-50.682,70.397],[-51.323,70.589],[-51.257,70.853],[-51.774,71.01],[-51.019,71.001],[-51.377,71.119],[-53.008,71.18],[-53.117,71.313],[-52.749,71.502],[-51.779,71.683],[-53.44,71.579],[-53.476,71.64],[-53.145,71.807],[-53.334,71.79],[-53.42,72.0],[-53.81,72.293],[-53.652,72.363],[-53.928,72.319],[-53.462,71.894],[-53.78,71.679],[-54.02,71.658],[-53.912,71.526],[-53.963,71.459],[-54.689,71.367],[-55.336,71.427],[-55.594,71.554],[-55.669,71.692],[-55.316,72.111],[-54.84,72.356],[-55.581,72.179],[-55.636,72.3],[-55.296,72.354],[-55.602,72.453],[-54.925,72.572],[-54.74,72.7],[-54.738,72.873],[-55.073,73.015],[-55.289,72.933],[-55.669,73.008],[-55.693,73.113],[-55.359,73.203],[-55.288,73.327],[-55.446,73.46],[-55.739,73.384],[-56.104,73.558],[-55.968,73.76],[-55.838,73.76],[-56.225,74.129],[-57.231,74.125],[-56.706,74.219],[-56.639,74.278],[-56.718,74.429],[-56.255,74.527],[-58.566,75.353],[-58.25,75.507],[-58.516,75.689],[-61.188,76.158],[-63.291,76.352],[-63.843,76.217],[-64.307,76.317],[-65.37,76.131],[-65.954,76.242],[-66.466,76.139],[-67.079,76.195],[-66.675,75.977],[-66.826,75.969],[-68.317,76.091],[-69.484,76.399],[-68.114,76.651],[-69.252,76.686],[-69.888,76.827],[-69.694,76.989],[-70.613,76.822],[-71.155,77.074],[-70.604,77.194],[-68.978,77.195],[-68.592,77.343],[-68.136,77.38],[-66.389,77.28],[-66.453,77.393],[-66.266,77.515],[-66.824,77.687],[-67.688,77.524],[-68.622,77.602],[-69.351,77.467],[-70.562,77.717],[-70.114,77.841],[-71.272,77.813],[-72.159,77.957],[-72.818,78.194],[-72.581,78.279],[-72.715,78.362],[-72.473,78.482],[-71.651,78.623],[-68.993,78.857],[-68.924,78.882],[-69.031,78.943],[-68.377,79.038],[-65.826,79.174],[-65.288,79.437],[-64.792,80.001],[-64.179,80.099],[-65.81,80.024],[-66.844,80.076],[-67.141,80.166],[-67.193,80.28],[-66.61,80.53],[-65.645,80.685],[-64.516,81],[-63.722,81.057],[-63.059,80.886],[-63.235,81.083],[-62.993,81.207],[-61.436,81.134],[-61.1,81.396],[-61.203,81.747],[-60.432,81.92],[-59.282,81.884],[-56.615,81.363],[-59.268,81.982],[-58.717,82.093],[-54.549,82.351],[-53.671,82.164],[-53.582,82.062],[-53.556,81.653],[-53.041,81.871],[-52.926,82.038],[-53.102,82.119],[-53.023,82.322],[-50.894,81.895],[-49.541,81.918],[-50.713,82.237],[-50.99,82.46],[-50.037,82.472],[-48.861,82.405],[-44.729,81.78],[-44.532,81.849],[-44.637,82.104],[-44.547,82.26],[-44.239,82.368],[-44.327,82.472],[-45.557,82.747],[-41.357,82.705],[-41.434,82.779],[-46.137,82.859],[-46.478,82.952],[-46.169,83.064],[-45.415,83.018],[-43.009,83.265],[-41.3,83.101],[-40.357,83.332],[-38.156,82.999],[-37.935,83.161],[-38.75,83.371],[-36.606,83.537],[-29.953,83.565]],[[-57.021,-63.373],[-56.782,-63.572],[-56.835,-63.631],[-57.119,-63.638],[-57.152,-63.479],[-57.461,-63.514],[-58.263,-63.763],[-58.839,-64.187],[-59.005,-64.195],[-58.799,-64.293],[-58.905,-64.352],[-58.786,-64.524],[-59.461,-64.346],[-59.612,-64.44],[-59.646,-64.584],[-59.765,-64.451],[-59.963,-64.431],[-60.341,-64.551],[-61.06,-64.981],[-61.703,-64.987],[-61.577,-65.186],[-61.948,-65.192],[-62.145,-65.332],[-61.756,-65.569],[-61.991,-65.589],[-62.305,-65.84],[-62.005,-66.113],[-60.913,-65.921],[-60.565,-65.979],[-60.744,-66.105],[-61.009,-66.111],[-60.903,-66.191],[-61.028,-66.337],[-61.15,-66.212],[-61.432,-66.145],[-61.676,-66.25],[-61.756,-66.429],[-62.117,-66.209],[-62.682,-66.237],[-62.755,-66.31],[-62.543,-66.621],[-62.537,-66.707],[-62.629,-66.706],[-63.258,-66.264],[-63.753,-66.278],[-63.654,-66.383],[-64.078,-66.654],[-63.809,-66.761],[-63.755,-66.873],[-64.043,-66.927],[-64.686,-66.806],[-64.878,-67.025],[-64.785,-67.124],[-65.027,-67.214],[-64.819,-67.307],[-65.503,-67.377],[-65.418,-67.66],[-65.6,-67.876],[-65.469,-68.009],[-65.64,-68.131],[-64.885,-68.056],[-64.829,-68.127],[-65.452,-68.337],[-64.996,-68.408],[-65.242,-68.583],[-65.158,-68.618],[-64.078,-68.771],[-64.169,-68.583],[-63.924,-68.498],[-62.933,-68.443],[-63.773,-68.632],[-63.344,-68.81],[-63.456,-69.042],[-62.587,-69.477],[-62.451,-69.584],[-62.407,-69.827],[-61.961,-70.12],[-62.014,-70.279],[-62.218,-70.233],[-62.378,-70.365],[-62.001,-70.497],[-61.505,-70.491],[-61.491,-70.57],[-61.696,-70.676],[-61.994,-70.729],[-61.961,-70.901],[-61.313,-70.868],[-60.962,-71.245],[-61.959,-71.658],[-61.563,-71.675],[-61.214,-71.564],[-60.995,-71.661],[-60.949,-71.747],[-61.035,-71.82],[-61.939,-71.904],[-62.257,-72.018],[-61.31,-72.113],[-60.719,-72.073],[-60.665,-72.362],[-60.73,-72.426],[-61.28,-72.468],[-61.286,-72.601],[-60.939,-72.7],[-60.532,-72.673],[-60.532,-72.832],[-60.385,-73.007],[-60.01,-72.938],[-59.957,-73.031],[-60.122,-73.275],[-60.561,-73.211],[-61.081,-73.328],[-61.428,-73.191],[-62.008,-73.148],[-61.788,-73.255],[-61.637,-73.5],[-61.08,-73.539],[-60.79,-73.712],[-60.903,-73.871],[-61.203,-73.957],[-61.692,-73.924],[-61.838,-74.032],[-61.042,-74.122],[-61.843,-74.29],[-61.332,-74.329],[-60.784,-74.241],[-60.704,-74.307],[-61.011,-74.478],[-61.37,-74.512],[-62.235,-74.441],[-61.855,-74.777],[-62.138,-74.926],[-62.372,-74.952],[-62.708,-74.737],[-63.178,-74.684],[-63.125,-74.85],[-63.198,-74.909],[-63.925,-75.004],[-63.337,-75.035],[-63.173,-75.115],[-63.231,-75.154],[-64.28,-75.293],[-63.258,-75.399],[-63.363,-75.451],[-65.966,-75.952],[-69.304,-76.351],[-70.21,-76.674],[-71.799,-76.753],[-75.268,-76.581],[-77.19,-76.63],[-77.287,-76.702],[-76.249,-77.275],[-75.387,-77.474],[-72.852,-77.59],[-72.875,-77.694],[-73.252,-77.894],[-74.042,-78.109],[-75.398,-78.158],[-80.602,-77.752],[-81.581,-77.846],[-77.858,-78.351],[-77.433,-78.435],[-77.452,-78.56],[-77.869,-78.746],[-80.292,-78.823],[-82.608,-78.412],[-83.779,-77.984],[-83.688,-78.148],[-83.227,-78.402],[-83.544,-78.355],[-83.763,-78.461],[-83.26,-78.774],[-81.661,-79.1],[-80.892,-79.502],[-80.535,-79.513],[-80.489,-79.321],[-80.151,-79.268],[-76.218,-79.387],[-76.032,-79.627],[-76.558,-79.904],[-77.702,-80.01],[-79.66,-79.997],[-78.176,-80.167],[-76.407,-80.095],[-75.709,-80.383],[-75.076,-80.86],[-73.938,-80.816],[-73.029,-80.917],[-70.688,-80.626],[-70.239,-80.857],[-69.772,-80.962],[-68.59,-80.968],[-68.144,-81.13],[-65.574,-81.461],[-62.354,-81.577],[-62.165,-81.636],[-64.696,-81.652],[-65.62,-81.729],[-64.19,-81.795],[-64.137,-81.869],[-66.134,-81.953],[-65.844,-81.993],[-65.787,-82.046],[-65.913,-82.183],[-65.714,-82.279],[-64.92,-82.371],[-60.528,-82.2],[-62.736,-82.527],[-61.917,-82.977],[-61.218,-82.992],[-61.2,-83.098],[-61.59,-83.341],[-61.425,-83.396],[-59.516,-83.458],[-55.801,-82.478],[-55.295,-82.465],[-53.986,-82.201],[-48.361,-81.892],[-47.36,-82.004],[-46.258,-81.947],[-46.046,-82.159],[-46.448,-82.34],[-46.517,-82.455],[-45.789,-82.495],[-43.669,-82.27],[-41.434,-81.298],[-38.772,-80.882],[-37.209,-81.064],[-35.966,-80.891],[-35.327,-80.651],[-31.312,-80.45],[-31.015,-80.308],[-29.531,-80.182],[-24.24,-80.062],[-23.574,-79.965],[-23.407,-79.859],[-29.949,-79.599],[-30.211,-79.485],[-30.178,-79.304],[-30.316,-79.163],[-32.994,-79.229],[-35.516,-78.933],[-36.239,-78.774],[-36.266,-78.616],[-36.181,-78.468],[-35.509,-78.041],[-35.088,-77.837],[-34.551,-77.729],[-34.076,-77.425],[-32.614,-77.141],[-32.063,-77.16],[-28.934,-76.37],[-24.27,-75.767],[-21.434,-75.683],[-20.488,-75.492],[-19.493,-75.54],[-18.305,-75.431],[-18.749,-75.242],[-18.517,-75.052],[-18.221,-74.975],[-17.436,-74.379],[-16.43,-74.324],[-15.673,-74.407],[-14.574,-73.938],[-14.611,-73.852],[-16.22,-73.916],[-16.282,-73.867],[-15.936,-73.758],[-16.519,-73.644],[-16.435,-73.426],[-15.596,-73.097],[-15.007,-73.047],[-14.321,-73.123],[-14.0,-73.001],[-14.298,-72.733],[-13.209,-72.785],[-11.497,-72.413],[-10.958,-71.902],[-11.009,-71.758],[-11.333,-71.786],[-12.148,-71.614],[-12.351,-71.39],[-11.926,-71.289],[-10.825,-71.553],[-10.52,-71.296],[-10.033,-71.131],[-10.331,-71.024],[-10.271,-70.936],[-9.231,-71.174],[-8.646,-71.673],[-7.916,-71.635],[-7.714,-71.546],[-7.59,-71.224],[-7.873,-70.94],[-7.753,-70.843],[-6.838,-70.845],[-5.936,-70.713],[-5.695,-70.745],[-5.588,-70.857],[-6.08,-71.154],[-6.117,-71.326],[-2.61,-71.321],[-2.015,-71.433],[-1.354,-71.387],[-1.068,-71.266],[-0.896,-71.349],[-0.76,-71.63],[-0.543,-71.713],[0.538,-71.274],[1.909,-71.004],[7.401,-70.494],[7.677,-70.356],[8.523,-70.474],[9.142,-70.184],[10.969,-70.688],[11.701,-70.767],[12.929,-70.213],[12.626,-70.066],[13.066,-70.054],[13.298,-70.23],[13.823,-70.343],[15.807,-70.324],[16.025,-70.193],[16.381,-70.145],[16.585,-70.204],[16.709,-70.397],[18.125,-70.54],[18.433,-70.29],[19.009,-70.212],[19.196,-70.293],[19.027,-70.674],[19.265,-70.902],[19.409,-70.917],[21.071,-70.843],[21.337,-70.495],[21.705,-70.258],[22.366,-70.475],[22.396,-70.561],[22.234,-70.643],[22.278,-70.696],[22.979,-70.81],[23.407,-70.723],[23.804,-70.405],[24.024,-70.413],[24.386,-70.537],[24.386,-70.704],[24.757,-70.892],[26.499,-71.02],[30.003,-70.3],[31.379,-70.226],[32.621,-70.001],[32.81,-69.909],[32.989,-69.624],[32.903,-69.379],[32.568,-69.074],[32.642,-68.869],[33.121,-68.689],[33.466,-68.671],[34.193,-68.702],[34.219,-68.791],[33.772,-69.02],[33.814,-69.099],[34.596,-69.095],[35.357,-69.681],[36.586,-69.638],[37.115,-69.81],[37.787,-69.726],[38.886,-70.172],[38.859,-70.006],[39.705,-69.426],[39.864,-68.967],[40.216,-68.805],[42.409,-68.352],[42.961,-68.095],[44.373,-67.961],[45.197,-67.731],[46.399,-67.618],[46.437,-67.533],[46.317,-67.402],[46.56,-67.268],[47.352,-67.362],[47.403,-67.409],[47.117,-67.573],[47.49,-67.728],[48.21,-67.699],[48.375,-67.988],[48.648,-67.794],[48.63,-67.521],[49.219,-67.227],[48.714,-67.217],[48.465,-67.043],[49.247,-66.942],[50.006,-67.175],[50.553,-67.194],[50.521,-66.82],[50.306,-66.753],[50.244,-66.603],[50.332,-66.445],[51.885,-66.02],[53.672,-65.859],[55.29,-65.954],[56.362,-66.373],[56.859,-66.423],[57.185,-66.613],[56.824,-66.713],[56.146,-66.626],[56.48,-66.859],[56.391,-66.974],[55.803,-67.199],[56.155,-67.265],[56.76,-67.073],[57.627,-67.014],[58.737,-67.23],[59.251,-67.485],[60.482,-67.385],[62.688,-67.648],[63.699,-67.508],[68.328,-67.89],[69.559,-67.763],[69.656,-67.865],[69.603,-68.041],[69.982,-68.464],[69.534,-68.737],[69.646,-68.932],[69.531,-69.024],[69.629,-69.232],[68.906,-69.373],[68.88,-69.47],[69.188,-69.655],[69.083,-69.867],[68.744,-69.921],[68.178,-69.837],[67.268,-70.273],[67.941,-70.423],[69.021,-70.325],[69.25,-70.431],[69.188,-70.705],[68.873,-71.035],[68.037,-71.391],[67.432,-72.003],[66.892,-72.949],[66.498,-73.125],[66.569,-73.209],[67.322,-73.3],[67.971,-73.086],[67.971,-72.751],[68.42,-72.515],[69.555,-72.375],[70.573,-71.931],[70.616,-71.842],[71.277,-71.624],[71.465,-71.155],[71.771,-70.801],[72.76,-70.396],[72.822,-70.096],[73.325,-69.849],[73.942,-69.743],[74.571,-69.88],[75.636,-69.849],[75.891,-69.576],[76.112,-69.487],[76.36,-69.49],[77.817,-69.069],[78.489,-68.626],[78.563,-68.394],[79.035,-68.175],[82.017,-67.69],[83.304,-67.603],[83.494,-67.441],[84.485,-67.114],[85.711,-67.161],[87.98,-66.788],[89.698,-66.823],[92.073,-66.508],[93.964,-66.69],[94.84,-66.501],[95.541,-66.631],[97.101,-66.499],[97.72,-66.607],[98.258,-66.467],[98.72,-66.553],[98.859,-66.671],[99.37,-66.648],[100.889,-66.358],[101.327,-66.1],[101.381,-65.973],[102.674,-65.865],[107.171,-66.47],[107.785,-66.664],[108.158,-66.639],[108.376,-66.766],[109.463,-66.909],[110.622,-66.524],[110.587,-66.312],[110.907,-66.077],[113.099,-65.8],[113.71,-65.93],[114.337,-66.36],[115.31,-66.561],[115.635,-66.771],[115.274,-67.028],[113.991,-67.212],[113.912,-67.368],[114.027,-67.441],[116.713,-67.047],[118.714,-67.172],[119.768,-66.992],[120.375,-66.984],[118.922,-67.32],[119.133,-67.371],[121.488,-67.091],[122.183,-66.859],[123.969,-66.608],[124.822,-66.695],[125.095,-66.641],[125.398,-66.424],[125.866,-66.364],[126.665,-66.498],[126.874,-66.759],[127.541,-67.051],[128.431,-67.119],[129.237,-67.042],[129.741,-66.469],[130.579,-66.209],[131.831,-66.236],[133.445,-66.081],[134.179,-66.277],[134.289,-66.477],[134.398,-66.48],[135.352,-66.127],[136.553,-66.439],[137.336,-66.346],[138.271,-66.564],[139.242,-66.574],[141.286,-66.832],[141.973,-66.807],[142.688,-67.013],[143.73,-66.877],[143.863,-66.939],[143.911,-67.091],[144.348,-67.018],[144.551,-67.036],[144.621,-67.141],[143.942,-67.794],[143.977,-67.865],[144.189,-67.9],[145.128,-67.626],[145.975,-67.624],[146.828,-67.965],[146.897,-68.12],[146.798,-68.274],[147.094,-68.369],[148.456,-68.467],[150.936,-68.358],[151.068,-68.385],[151.139,-68.764],[151.289,-68.817],[151.562,-68.694],[152.546,-68.73],[153.082,-68.857],[153.705,-68.729],[153.785,-68.35],[153.908,-68.323],[155.52,-69.024],[156.489,-69.183],[157.046,-69.176],[157.481,-69.309],[157.933,-69.181],[159.784,-69.522],[160.126,-69.734],[160.21,-69.975],[160.652,-70.081],[161.037,-70.317],[161.425,-70.827],[162.189,-71.04],[162.287,-70.969],[162.04,-70.625],[162.022,-70.44],[162.216,-70.334],[162.675,-70.305],[163.349,-70.621],[163.998,-70.637],[164.403,-70.51],[167.569,-70.81],[168.173,-71.183],[170.162,-71.63],[170.277,-71.444],[170.436,-71.419],[170.859,-71.869],[170.675,-71.969],[170.224,-71.948],[170.03,-72.116],[169.954,-72.403],[170.259,-72.371],[170.206,-72.565],[168.428,-72.383],[168.82,-72.552],[169.829,-72.729],[169.545,-73.05],[169.033,-73.2],[168.381,-73.066],[167.156,-73.147],[166.453,-72.936],[166.834,-73.224],[167.709,-73.394],[166.996,-73.544],[165.86,-73.593],[166.106,-73.735],[165.734,-73.867],[165.347,-73.879],[165.129,-73.383],[164.813,-73.397],[164.75,-73.559],[164.98,-73.926],[164.776,-74.029],[165.409,-74.559],[163.735,-74.564],[163.398,-74.382],[163.167,-74.602],[162.604,-74.823],[162.534,-75.167],[162.41,-75.238],[161.68,-75.218],[160.911,-75.335],[162.19,-75.467],[162.239,-75.622],[162.816,-75.846],[162.437,-76.155],[162.728,-76.225],[162.825,-76.464],[162.675,-76.569],[162.763,-76.746],[162.45,-76.956],[163.087,-77.032],[163.608,-77.388],[163.619,-77.582],[163.766,-77.7],[164.492,-77.954],[163.978,-78.224],[164.628,-78.316],[165.418,-78.042],[165.524,-78.064],[165.663,-78.306],[166.209,-78.452],[167.058,-78.518],[167.13,-78.606],[167.049,-78.686],[166.525,-78.695],[166.117,-78.571],[164.635,-78.603],[162.639,-78.898],[161.669,-78.536],[161.51,-78.571],[161.502,-78.677],[161.951,-79.03],[161.191,-78.979],[160.874,-79.05],[160.483,-79.201],[160.646,-79.427],[159.976,-79.586],[160.346,-79.692],[159.872,-79.79],[159.896,-79.859],[160.558,-79.93],[160.559,-80.011],[158.767,-80.293],[158.56,-80.349],[158.574,-80.423],[160.637,-80.45],[160.521,-80.583],[160.83,-80.73],[160.26,-80.787],[160.717,-80.907],[160.717,-81.2],[160.47,-81.341],[162.821,-81.866],[163.68,-82.187],[161.167,-82.408],[161.283,-82.49],[163.012,-82.535],[164.747,-82.354],[167.116,-82.801],[167.297,-82.986],[167.602,-83.047],[168.092,-82.975],[168.607,-83.065],[168.24,-83.23],[167.658,-83.272],[168.11,-83.362],[171.036,-83.448],[171.917,-83.644],[179.403,-84.206],[180,-84.352],[180,-89.999],[-180,-89.999],[-180,-84.352],[-176.289,-84.418],[-175.875,-84.51],[-171.704,-84.542],[-168.668,-84.684],[-167.492,-84.834],[-162.933,-84.901],[-156.459,-85.186],[-157.454,-84.912],[-156.49,-84.889],[-156.621,-84.84],[-165.135,-84.41],[-165.24,-84.381],[-163.758,-84.305],[-164.685,-84.155],[-164.011,-84.016],[-164.951,-83.806],[-167.801,-83.791],[-169.168,-83.45],[-174.066,-82.9],[-174.236,-82.793],[-173.071,-82.916],[-171.821,-82.847],[-168.418,-83.229],[-165.619,-83.216],[-164.916,-83.29],[-164.446,-83.468],[-163.111,-83.329],[-162.197,-83.519],[-159.444,-83.543],[-157.428,-83.346],[-157.028,-83.234],[-157.679,-83.129],[-155.459,-82.981],[-153.01,-82.45],[-154.717,-81.941],[-153.957,-81.7],[-154.908,-81.51],[-157.033,-81.319],[-156.528,-81.162],[-148.123,-80.901],[-148.023,-80.836],[-149.147,-80.719],[-149.214,-80.604],[-150.133,-80.51],[-150.575,-80.354],[-150.221,-80.15],[-148.317,-80.071],[-148.433,-79.929],[-148.129,-79.908],[-148.083,-79.857],[-148.177,-79.776],[-151.048,-79.46],[-152.091,-79.242],[-152.138,-79.116],[-154.518,-79.047],[-156.115,-78.745],[-156.469,-78.635],[-154.716,-78.398],[-154.293,-78.259],[-157.267,-78.2],[-158.286,-77.951],[-158.5,-77.778],[-158.23,-77.498],[-158.214,-77.157],[-158.003,-77.091],[-157.139,-77.242],[-156.211,-77.106],[-154.815,-77.127],[-153.91,-77.227],[-153.461,-77.416],[-151.719,-77.426],[-149.718,-77.797],[-148.156,-77.462],[-148.744,-77.343],[-148.844,-77.284],[-148.777,-77.125],[-147.566,-77.325],[-146.928,-77.26],[-146.391,-77.472],[-146.074,-77.487],[-145.601,-77.455],[-145.808,-77.273],[-145.516,-77.199],[-145.967,-77.069],[-145.629,-76.954],[-145.75,-76.749],[-146.777,-76.507],[-147.34,-76.438],[-148.601,-76.493],[-149.654,-76.365],[-148.32,-76.104],[-145.886,-76.424],[-145.442,-76.409],[-146.383,-76.1],[-145.988,-75.889],[-144.721,-75.832],[-143.574,-75.564],[-142.33,-75.491],[-140.874,-75.746],[-141.223,-75.546],[-139.149,-75.16],[-137.618,-75.076],[-136.65,-75.162],[-136.228,-74.836],[-135.362,-74.69],[-133.796,-74.855],[-132.049,-74.766],[-129.791,-74.891],[-127.02,-74.698],[-121.544,-74.75],[-119.677,-74.655],[-118.342,-74.382],[-115.223,-74.487],[-114.624,-73.903],[-113.508,-74.089],[-113.489,-74.158],[-113.714,-74.228],[-113.753,-74.367],[-113.333,-74.454],[-113.903,-74.644],[-114.11,-74.982],[-111.696,-74.792],[-111.584,-74.751],[-111.789,-74.572],[-111.696,-74.504],[-111.806,-74.27],[-111.63,-74.181],[-110.307,-74.367],[-110.23,-74.536],[-110.3,-74.711],[-111.463,-75.133],[-111.359,-75.22],[-109.272,-75.185],[-106.619,-75.344],[-104.902,-75.115],[-103.121,-75.095],[-101.708,-75.127],[-101.039,-75.422],[-98.752,-75.317],[-98.558,-75.19],[-100.473,-74.872],[-100.013,-74.662],[-100.238,-74.484],[-101.252,-74.486],[-101.715,-74.024],[-102.766,-73.884],[-102.863,-73.784],[-102.8,-73.646],[-102.411,-73.616],[-100.718,-73.758],[-98.896,-73.611],[-100.436,-73.353],[-102.909,-73.285],[-103.375,-72.819],[-103.11,-72.721],[-102.363,-72.76],[-102.272,-72.835],[-102.482,-72.951],[-102.409,-72.987],[-98.209,-73.022],[-96.394,-73.301],[-95.237,-73.22],[-94.246,-73.313],[-92.828,-73.165],[-90.921,-73.319],[-90.431,-73.243],[-90.274,-73.119],[-90.295,-72.978],[-89.818,-72.863],[-89.341,-72.89],[-89.127,-72.693],[-88.78,-72.683],[-88.194,-72.787],[-88.561,-73.121],[-88.419,-73.229],[-87.401,-73.192],[-86.791,-73.364],[-85.801,-73.192],[-84.981,-73.502],[-82.183,-73.857],[-81.309,-73.738],[-81.163,-73.632],[-81.262,-73.315],[-81.176,-73.249],[-80.336,-73.414],[-80.614,-73.083],[-80.588,-72.978],[-80.442,-72.945],[-79.522,-73.09],[-78.964,-73.312],[-78.786,-73.507],[-76.85,-73.46],[-76.765,-73.566],[-77.135,-73.818],[-77.049,-73.844],[-75.293,-73.639],[-73.996,-73.7],[-72.929,-73.448],[-69.282,-73.17],[-67.667,-72.835],[-67.307,-72.611],[-66.828,-72.09],[-66.952,-71.897],[-67.46,-71.527],[-67.505,-71.058],[-67.692,-70.686],[-68.403,-70.02],[-68.47,-69.644],[-68.708,-69.432],[-68.141,-69.348],[-67.372,-69.412],[-66.975,-69.161],[-67.021,-69.029],[-67.391,-68.861],[-67.134,-68.771],[-67.041,-68.453],[-66.793,-68.24],[-67.15,-68.025],[-66.915,-67.693],[-66.677,-67.56],[-67.124,-67.485],[-67.545,-67.535],[-67.493,-67.113],[-67.034,-66.945],[-66.902,-67.256],[-66.61,-67.209],[-66.499,-67.289],[-66.504,-66.69],[-66.307,-66.592],[-65.766,-66.625],[-65.678,-66.403],[-65.775,-66.288],[-65.617,-66.135],[-65.172,-66.117],[-65.267,-65.994],[-64.514,-65.96],[-64.653,-65.867],[-64.647,-65.748],[-64.475,-65.781],[-64.39,-65.708],[-64.439,-65.641],[-63.818,-65.532],[-64.051,-65.417],[-64.071,-65.278],[-63.76,-65.033],[-63.059,-65.139],[-63.12,-64.942],[-62.528,-64.833],[-62.503,-64.656],[-62.243,-64.747],[-61.632,-64.605],[-61.082,-64.315],[-60.864,-64.073],[-59.51,-63.821],[-58.872,-63.552],[-57.39,-63.226],[-57.077,-63.263],[-57.021,-63.373]],[[178.862,70.826],[178.648,71.001],[178.684,71.106],[180,71.538],[180,70.993],[178.862,70.826]],[[17.98,59.329],[18.509,59.408],[18.618,59.327],[18.414,59.29],[18.285,59.109],[16.978,58.654],[16.214,58.637],[16.788,58.585],[16.924,58.493],[16.652,58.434],[16.77,58.214],[16.695,57.918],[16.555,57.812],[16.652,57.501],[16.476,57.265],[16.528,57.068],[15.997,56.223],[15.827,56.125],[14.714,56.134],[14.755,56.033],[14.559,56.049],[14.215,55.833],[14.342,55.528],[14.174,55.397],[13.321,55.346],[12.886,55.411],[12.974,55.748],[12.471,56.291],[12.802,56.264],[12.656,56.441],[12.857,56.452],[12.884,56.618],[12.421,56.906],[12.053,57.447],[11.962,57.426],[11.879,57.679],[11.735,57.718],[11.703,57.973],[11.449,58.118],[11.432,58.34],[11.248,58.369],[11.147,58.989],[11.196,59.078],[11.386,59.066],[10.834,59.184],[10.645,59.389],[10.595,59.765],[10.57,59.587],[10.398,59.519],[10.431,59.28],[10.179,59.009],[9.843,58.958],[9.557,59.113],[9.657,58.971],[9.31,58.857],[9.396,58.806],[8.166,58.145],[7.466,58.021],[7.005,58.024],[6.877,58.151],[6.731,58.068],[6.555,58.123],[6.66,58.263],[6.055,58.375],[5.586,58.62],[5.522,58.823],[5.612,59.013],[6.099,58.87],[6.363,59.001],[6.099,58.952],[5.889,59.098],[5.952,59.299],[6.415,59.547],[5.173,59.163],[5.242,59.564],[5.472,59.713],[5.772,59.661],[6.217,59.818],[5.73,59.863],[6.349,60.353],[6.574,60.361],[6.527,60.153],[6.72,60.418],[6.996,60.512],[6.153,60.346],[5.877,60.07],[5.146,59.639],[5.206,60.088],[5.689,60.123],[5.286,60.206],[5.137,60.446],[5.648,60.688],[5.244,60.57],[5.116,60.636],[5.009,61.038],[6.778,61.142],[7.039,60.953],[7.04,61.091],[7.604,61.211],[7.347,61.301],[7.443,61.435],[7.276,61.181],[6.657,61.207],[6.6,61.29],[6.383,61.134],[5.325,61.108],[5.022,61.251],[4.99,61.378],[5.339,61.485],[4.997,61.645],[4.91,61.81],[4.985,61.9],[6.016,61.788],[6.731,61.87],[6.131,61.852],[5.267,61.936],[5.096,62.027],[5.143,62.16],[5.358,62.152],[5.718,62.379],[6.209,62.353],[6.692,62.468],[6.136,62.407],[6.353,62.611],[7.57,62.548],[7.691,62.586],[7.538,62.672],[8.096,62.732],[6.735,62.721],[6.94,62.93],[7.572,63.1],[8.101,63.091],[8.623,62.846],[8.158,63.162],[8.271,63.287],[8.636,63.342],[8.361,63.499],[8.576,63.601],[9.136,63.594],[9.076,63.5],[9.156,63.459],[9.697,63.625],[10.021,63.391],[10.76,63.461],[10.674,63.558],[10.725,63.625],[11.371,63.805],[11.176,63.899],[11.458,64.003],[11.307,64.049],[10.914,63.921],[11.047,63.845],[10.935,63.77],[10.055,63.513],[9.924,63.522],[9.767,63.7],[9.567,63.706],[10.566,64.418],[11.633,64.814],[11.297,64.755],[11.489,64.976],[12.16,65.179],[12.508,65.099],[12.916,65.339],[12.418,65.184],[12.134,65.279],[12.273,65.568],[12.689,65.902],[13.033,65.956],[12.784,66.1],[13.674,66.18],[14.034,66.298],[13.119,66.231],[13.068,66.431],[13.211,66.641],[13.621,66.795],[13.959,66.794],[13.652,66.907],[14.109,67.119],[15.416,67.202],[14.442,67.271],[14.962,67.574],[15.594,67.349],[15.576,67.444],[15.692,67.521],[15.249,67.602],[15.304,67.765],[14.781,67.675],[14.799,67.809],[15.134,67.973],[15.621,67.948],[15.293,68.036],[16.008,68.229],[16.312,67.881],[16.259,68.001],[16.392,68.092],[16.26,68.145],[16.204,68.317],[17.553,68.426],[16.514,68.533],[17.391,68.799],[17.705,69.1],[18.101,69.156],[18.079,69.325],[18.26,69.471],[18.859,69.314],[18.916,69.336],[18.614,69.491],[18.991,69.561],[19.197,69.748],[19.687,69.805],[19.642,69.424],[19.961,69.825],[20.324,69.945],[20.338,69.617],[20.044,69.356],[20.107,69.341],[20.487,69.542],[20.739,69.521],[20.533,69.692],[20.622,69.914],[21.163,69.89],[21.254,70.003],[21.433,70.013],[21.975,69.835],[21.803,70.066],[21.356,70.233],[22.322,70.265],[22.685,70.375],[22.941,70.305],[23.046,70.102],[23.354,69.983],[23.286,70.105],[23.379,70.247],[24.42,70.702],[24.263,70.826],[24.658,71.001],[25.265,70.844],[25.436,70.912],[25.768,70.853],[25.209,70.489],[24.994,70.218],[25.044,70.109],[25.419,70.235],[25.471,70.341],[26.507,70.913],[26.661,70.94],[26.734,70.854],[26.558,70.669],[26.645,70.636],[26.585,70.41],[26.989,70.511],[27.309,70.804],[27.546,70.804],[27.235,70.947],[27.332,70.997],[27.597,71.091],[28.142,71.043],[28.392,70.975],[28.383,70.869],[27.898,70.678],[28.272,70.668],[28.193,70.249],[28.609,70.76],[28.832,70.864],[29.738,70.647],[30.065,70.703],[30.238,70.622],[30.213,70.543],[30.596,70.524],[30.961,70.344],[30.944,70.274],[30.263,70.125],[28.781,70.145],[29.601,69.977],[29.695,69.745],[30.088,69.718],[30.238,69.862],[30.428,69.722],[30.714,69.796],[31.547,69.697],[31.998,69.81],[31.985,69.954],[33.008,69.722],[32.915,69.602],[32.092,69.633],[32.378,69.479],[33.0,69.47],[32.979,69.367],[33.454,69.428],[33.328,69.152],[33.141,69.069],[33.436,69.13],[33.684,69.31],[35.858,69.192],[37.731,68.692],[38.43,68.356],[38.832,68.325],[39.569,68.072],[39.823,68.059],[39.746,68.162],[39.809,68.151],[40.381,67.832],[40.966,67.713],[41.134,67.267],[41.359,67.21],[41.189,66.826],[40.103,66.3],[38.654,66.069],[35.513,66.396],[34.825,66.611],[34.483,66.55],[34.396,66.613],[34.452,66.651],[33.15,66.844],[32.848,67.022],[32.93,67.087],[31.895,67.161],[32.501,67.004],[32.464,66.916],[32.862,66.721],[33.181,66.68],[33.217,66.532],[33.656,66.443],[33.361,66.33],[34.113,66.225],[34.692,65.952],[34.777,65.768],[34.616,65.51],[34.406,65.396],[34.804,64.986],[34.833,64.8],[34.952,64.756],[34.858,64.707],[34.87,64.56],[35.035,64.44],[35.647,64.378],[36.146,64.189],[36.365,64.003],[37.442,63.813],[37.968,63.949],[38.062,64.091],[37.954,64.32],[37.184,64.408],[36.579,64.791],[36.535,64.939],[36.786,64.987],[36.883,65.172],[37.141,65.194],[38.009,64.879],[39.758,64.577],[40.058,64.771],[40.445,64.779],[39.798,65.35],[39.817,65.598],[40.692,65.963],[41.476,66.123],[42.211,66.52],[43.233,66.416],[43.653,66.251],[43.542,66.123],[43.844,66.142],[44.104,66.009],[44.097,66.235],[44.489,66.672],[44.429,66.938],[44.292,67.1],[43.782,67.254],[44.225,67.996],[44.205,68.254],[43.333,68.673],[44.048,68.549],[45.078,68.578],[45.892,68.48],[46.684,67.97],[46.69,67.849],[45.529,67.758],[44.902,67.413],[45.562,67.186],[45.885,66.891],[46.492,66.8],[47.656,66.976],[47.908,67.455],[47.875,67.584],[48.833,67.681],[48.878,67.731],[48.696,67.874],[48.754,67.896],[49.155,67.87],[50.699,68.318],[51.995,68.539],[52.285,68.459],[52.183,68.374],[52.397,68.352],[52.723,68.484],[52.344,68.608],[53.802,68.996],[54.491,68.992],[53.798,68.907],[53.971,68.844],[53.759,68.634],[53.931,68.436],[53.261,68.267],[54.476,68.294],[54.861,68.202],[54.923,68.374],[55.418,68.568],[56.044,68.649],[57.127,68.554],[58.173,68.89],[58.237,68.834],[59.057,69.006],[59.371,68.738],[59.112,68.616],[59.099,68.444],[59.726,68.352],[59.923,68.471],[59.896,68.706],[60.489,68.729],[60.934,68.987],[60.859,69.146],[60.665,69.11],[60.171,69.591],[60.909,69.847],[63.361,69.675],[64.19,69.535],[64.929,69.325],[64.896,69.248],[67.002,68.874],[67.731,68.514],[68.371,68.314],[68.504,68.348],[68.829,68.567],[69.141,68.951],[68.543,68.967],[68.117,69.236],[68.006,69.48],[67.624,69.584],[67.064,69.694],[66.897,69.554],[66.803,69.74],[66.926,70.014],[67.239,70.108],[67.146,70.22],[67.285,70.739],[67.143,70.838],[66.702,70.819],[66.666,70.901],[66.847,71.064],[66.64,71.081],[66.918,71.282],[68.269,71.683],[68.607,72.013],[69.039,72.67],[69.391,72.956],[69.694,72.978],[69.645,72.898],[69.738,72.885],[71.5,72.914],[72.812,72.691],[72.574,72.013],[72.279,71.696],[71.867,71.457],[72.581,71.151],[72.704,70.963],[72.7,70.457],[72.469,70.275],[72.599,69.793],[72.577,68.969],[73.548,68.575],[73.592,68.482],[73.139,68.181],[73.173,67.973],[73.067,67.767],[72.594,67.587],[71.847,67.008],[71.365,66.962],[71.54,66.683],[70.725,66.519],[70.383,66.602],[70.691,66.745],[70.283,66.686],[69.877,66.845],[69.013,66.788],[69.194,66.579],[69.982,66.401],[72.068,66.253],[72.322,66.332],[72.417,66.561],[73.792,66.995],[74.075,67.414],[74.77,67.766],[74.743,68.074],[74.391,68.421],[74.58,68.751],[75.125,68.862],[76.459,68.978],[77.238,68.47],[77.174,67.779],[77.772,67.57],[78.922,67.589],[77.588,67.752],[77.536,68.008],[77.665,68.19],[77.995,68.259],[77.651,68.903],[76.001,69.235],[75.42,69.239],[74.815,69.091],[73.977,69.115],[73.776,69.198],[73.891,69.418],[73.56,69.707],[73.578,69.803],[73.83,70.176],[74.343,70.579],[73.577,71.217],[73.086,71.445],[73.672,71.845],[74.992,72.145],[75.09,72.263],[75.06,72.549],[74.787,72.812],[75.369,72.797],[75.604,72.581],[75.591,72.457],[75.741,72.296],[75.274,71.959],[75.247,71.813],[75.503,71.655],[75.469,71.534],[75.28,71.43],[75.332,71.342],[75.734,71.266],[76.929,71.128],[77.59,71.168],[78.321,70.93],[79.015,70.95],[79.084,71.002],[78.491,71.025],[78.213,71.266],[77.481,71.312],[76.433,71.552],[76.032,71.91],[76.871,72.033],[77.551,71.842],[78.187,71.907],[78.232,71.952],[78.016,72.092],[77.411,72.108],[77.968,72.329],[78.483,72.395],[79.422,72.381],[80.763,72.089],[80.856,71.97],[81.662,71.716],[83.107,71.721],[83.234,71.668],[82.977,71.451],[82.323,71.26],[82.239,70.998],[82.336,70.807],[82.163,70.598],[82.221,70.396],[82.592,70.89],[82.869,70.955],[83.01,70.895],[83.03,70.581],[82.682,70.218],[83.081,70.093],[83.074,70.277],[83.497,70.345],[83.736,70.546],[83.151,71.104],[83.531,71.514],[83.534,71.684],[83.2,71.875],[82.645,71.925],[82.094,72.265],[80.827,72.488],[80.656,72.712],[80.842,72.949],[80.51,73.086],[80.425,73.231],[80.398,73.357],[80.596,73.474],[80.583,73.568],[85.201,73.722],[86.893,73.887],[87.029,73.824],[85.793,73.438],[85.818,73.327],[86.677,73.107],[85.91,73.39],[86.155,73.535],[87.12,73.615],[87.571,73.811],[87.21,73.879],[86.571,74.244],[86.001,74.316],[86.396,74.45],[86.898,74.325],[87.23,74.364],[86.426,74.585],[85.791,74.645],[86.201,74.816],[86.651,74.682],[86.863,74.718],[87.468,75.013],[86.939,75.068],[87.006,75.17],[87.671,75.13],[90.185,75.591],[91.479,75.65],[94.156,75.959],[92.987,75.903],[92.859,75.979],[93.259,76.099],[95.579,76.137],[96.075,76.082],[95.653,75.892],[96.601,75.99],[96.497,75.891],[97.351,76.033],[97.499,75.98],[98.662,76.243],[99.77,76.029],[99.442,75.803],[99.541,75.799],[99.851,75.93],[99.825,76.136],[98.806,76.481],[100.844,76.525],[101.598,76.439],[101.684,76.485],[100.928,76.557],[101.099,76.704],[100.906,76.901],[101.518,77.198],[102.61,77.509],[104.015,77.73],[105.71,77.525],[106.06,77.391],[104.202,77.102],[105.646,77.101],[105.822,76.998],[106.942,77.034],[107.43,76.927],[106.639,76.573],[106.385,76.589],[106.414,76.512],[107.722,76.522],[108.182,76.738],[111.115,76.723],[112.094,76.48],[111.943,76.38],[112.62,76.384],[112.798,76.13],[112.656,76.054],[113.15,76.175],[112.988,76.24],[113.273,76.252],[113.564,75.892],[113.857,75.921],[113.568,75.568],[113.392,75.678],[112.466,75.844],[112.956,75.572],[113.243,75.611],[113.726,75.451],[113.614,75.293],[112.925,75.015],[109.84,74.322],[109.911,74.261],[109.81,74.169],[109.075,74.032],[108.2,73.694],[107.271,73.621],[106.679,73.331],[106.189,73.308],[105.677,72.959],[105.144,72.777],[105.708,72.837],[106.478,73.139],[107.75,73.173],[109.331,73.487],[109.855,73.472],[110.868,73.731],[109.753,73.723],[109.666,73.8],[110.261,74.017],[111.056,73.939],[111.131,74.053],[111.551,74.029],[111.228,73.969],[111.4,73.828],[112.147,73.709],[112.795,73.746],[112.94,73.836],[112.836,73.962],[113.033,73.914],[113.416,73.648],[113.157,73.46],[113.491,73.346],[113.475,73.048],[113.128,72.831],[113.158,72.769],[113.312,72.657],[113.665,72.635],[113.216,72.806],[113.543,73.054],[113.559,73.233],[113.886,73.346],[113.51,73.505],[114.061,73.585],[115.338,73.703],[118.45,73.59],[118.936,73.481],[118.457,73.464],[118.377,73.367],[118.43,73.247],[119.75,72.979],[121.748,72.97],[122.537,72.878],[122.752,72.906],[122.527,73.017],[123.16,72.955],[123.622,73.193],[123.323,73.431],[123.416,73.637],[124.541,73.751],[125.617,73.521],[125.599,73.447],[126.254,73.548],[126.345,73.506],[126.292,73.394],[126.553,73.335],[127.031,73.547],[127.74,73.482],[128.281,73.331],[128.258,73.267],[129.101,73.112],[128.599,72.895],[129.017,72.872],[129.25,72.705],[128.418,72.535],[129.281,72.438],[129.412,72.315],[129.411,72.166],[129.283,72.092],[128.935,72.079],[127.726,72.413],[128.911,71.755],[129.117,71.825],[129.122,71.953],[129.21,71.917],[129.461,71.739],[128.843,71.663],[129.134,71.593],[129.762,71.12],[130.537,70.893],[130.757,70.962],[131.022,70.746],[131.562,70.901],[132.035,71.244],[132.004,71.35],[132.228,71.643],[132.654,71.926],[133.131,71.607],[133.689,71.434],[134.703,71.387],[135.559,71.61],[136.09,71.62],[137.116,71.416],[137.94,71.133],[137.844,71.227],[138.314,71.326],[137.918,71.384],[138.234,71.596],[138.78,71.629],[139.209,71.445],[139.984,71.492],[139.695,71.7],[139.723,71.885],[139.359,71.951],[140.188,72.191],[139.176,72.163],[139.141,72.33],[139.601,72.496],[141.079,72.587],[140.652,72.843],[140.808,72.891],[142.061,72.721],[143.516,72.698],[146.253,72.442],[146.235,72.35],[144.897,72.396],[144.169,72.259],[144.471,72.175],[146.832,72.295],[146.113,71.945],[146.006,71.945],[146.23,72.138],[145.759,72.226],[145.664,72.067],[145.757,71.941],[145.064,71.926],[144.99,71.753],[145.189,71.696],[146.073,71.808],[147.262,72.328],[148.402,72.312],[149.502,72.164],[149.963,71.992],[150.017,71.896],[148.923,71.715],[150.668,71.455],[150.098,71.227],[150.968,71.38],[151.582,71.287],[152.093,71.023],[151.762,70.982],[152.509,70.834],[155.895,71.096],[157.447,71.075],[158.702,70.935],[159.351,70.791],[159.912,70.506],[160.006,70.31],[159.729,69.87],[159.833,69.785],[160.911,69.606],[161.036,69.098],[161.341,68.905],[161.129,68.654],[160.856,68.538],[161.104,68.562],[161.566,68.905],[161.48,69.202],[161.537,69.38],[162.166,69.612],[163.201,69.715],[163.946,69.735],[164.513,69.609],[166.884,69.5],[167.628,69.74],[167.857,69.728],[168.15,69.577],[168.303,69.271],[169.311,69.08],[169.61,68.786],[170.538,68.825],[170.995,69.045],[170.997,69.135],[170.582,69.583],[170.161,69.627],[170.503,69.857],[170.487,70.108],[172.56,69.968],[173.277,69.824],[173.439,69.947],[174.786,69.856],[175.921,69.895],[176.924,69.646],[178.848,69.387],[180,68.983],[180,65.067],[179.448,64.822],[178.52,64.603],[177.749,64.717],[176.881,65.082],[176.341,65.047],[177.037,65.0],[177.223,64.862],[177.069,64.787],[176.061,64.961],[175.781,64.844],[174.549,64.684],[175.678,64.782],[176.057,64.905],[176.351,64.705],[176.141,64.586],[177.387,64.774],[177.467,64.737],[177.433,64.444],[177.688,64.305],[178.045,64.22],[178.229,64.364],[178.477,64.128],[178.451,64.011],[178.65,63.965],[178.692,63.842],[178.731,63.667],[178.466,63.574],[178.654,63.557],[178.744,63.395],[178.793,63.54],[178.921,63.345],[179.332,63.19],[179.405,63.078],[179.26,63.008],[179.571,62.773],[179.477,62.613],[179.177,62.469],[179.121,62.32],[177.293,62.599],[177.339,62.781],[177.024,62.777],[176.965,62.659],[177.159,62.561],[176.703,62.506],[174.514,61.824],[173.822,61.679],[173.623,61.716],[173.132,61.407],[172.857,61.469],[172.908,61.312],[172.396,61.167],[172.393,61.062],[170.608,60.435],[170.351,59.966],[169.983,60.067],[169.618,60.438],[169.227,60.596],[168.137,60.574],[167.227,60.406],[166.273,59.856],[166.187,59.849],[166.136,59.979],[166.352,60.485],[165.085,60.099],[165.074,59.946],[164.954,59.844],[164.525,60.061],[164.113,59.898],[164.135,59.984],[163.744,60.028],[163.365,59.781],[163.273,59.303],[162.94,59.114],[162.97,58.986],[162.142,58.447],[161.96,58.077],[162.04,57.918],[162.411,57.778],[162.391,57.717],[162.654,57.948],[163.226,57.79],[163.188,57.637],[162.779,57.358],[162.762,57.244],[162.803,56.811],[163.257,56.688],[163.336,56.233],[163.047,56.045],[162.84,56.066],[162.628,56.232],[163.038,56.522],[162.671,56.49],[162.489,56.399],[162.528,56.261],[162.085,56.09],[161.724,55.496],[161.785,55.205],[162.106,54.752],[161.625,54.516],[161.13,54.598],[160.773,54.541],[160.074,54.189],[159.844,53.784],[160.025,53.13],[159.586,53.238],[158.745,52.909],[158.472,53.032],[158.432,52.957],[158.609,52.874],[158.481,52.627],[158.493,52.383],[158.104,51.81],[156.748,50.969],[156.521,51.38],[156.365,52.509],[156.11,52.866],[155.564,55.199],[155.717,56.072],[156.025,56.752],[156.849,57.29],[156.977,57.466],[156.792,57.748],[156.872,57.804],[157.45,57.799],[157.666,58.02],[158.275,58.009],[159.211,58.519],[159.847,59.127],[161.754,60.152],[162.068,60.466],[162.973,60.783],[163.71,60.917],[163.554,61.026],[164.005,61.344],[163.804,61.461],[164.02,61.711],[164.207,62.292],[164.598,62.471],[165.208,62.374],[165.397,62.494],[164.418,62.705],[163.332,62.551],[163.018,61.891],[163.009,61.792],[163.258,61.699],[163.085,61.571],[162.994,61.544],[162.856,61.705],[162.393,61.662],[160.767,60.753],[160.174,60.638],[160.379,61.025],[159.79,60.957],[159.949,61.129],[159.883,61.292],[160.247,61.648],[160.309,61.894],[159.552,61.719],[159.189,61.929],[158.07,61.754],[157.469,61.799],[157.084,61.676],[156.68,61.481],[156.63,61.272],[156.056,60.996],[155.716,60.682],[154.971,60.377],[154.293,59.833],[154.15,59.529],[154.971,59.45],[155.167,59.36],[155.16,59.19],[154.704,59.141],[154.458,59.217],[154.011,59.076],[153.695,59.225],[153.361,59.215],[153.273,59.091],[152.818,58.926],[152.32,59.031],[152.088,58.91],[151.327,58.875],[151.121,59.083],[152.261,59.224],[151.798,59.323],[151.348,59.561],[150.484,59.494],[150.667,59.556],[149.643,59.77],[149.065,59.631],[149.205,59.488],[148.797,59.532],[148.744,59.374],[148.965,59.369],[148.727,59.258],[148.491,59.262],[148.257,59.414],[147.514,59.269],[146.537,59.457],[146.273,59.221],[146.05,59.171],[145.555,59.414],[143.869,59.411],[142.58,59.24],[142.025,59.0],[141.603,58.649],[140.79,58.303],[140.447,57.814],[140.002,57.688],[138.662,56.966],[137.692,56.139],[135.262,54.943],[135.258,54.731],[135.852,54.584],[136.797,54.621],[136.719,53.804],[137.155,53.822],[137.258,54.025],[137.096,54.129],[137.142,54.182],[137.666,54.283],[137.339,54.101],[137.835,53.947],[137.254,53.546],[137.95,53.604],[138.528,53.96],[138.569,53.819],[138.25,53.524],[138.451,53.537],[138.661,53.745],[138.696,54.32],[139.32,54.193],[139.796,54.256],[140.179,54.052],[140.347,53.813],[140.688,53.596],[141.374,53.293],[141.402,53.184],[141.181,53.015],[140.84,53.088],[141.256,52.84],[141.245,52.55],[141.132,52.436],[141.485,52.179],[141.367,51.921],[140.933,51.62],[140.521,50.8],[140.535,50.131],[140.625,50.082],[140.463,49.911],[140.517,49.596],[140.309,49.054],[140.378,48.964],[140.113,48.423],[139.373,47.887],[139.001,47.383],[138.587,47.057],[138.337,46.543],[137.685,45.818],[136.804,45.171],[136.142,44.489],[135.875,44.374],[135.483,43.835],[135.131,43.526],[134.01,42.947],[133.16,42.697],[132.709,42.876],[132.304,42.883],[132.31,43.314],[131.947,43.095],[131.867,43.095],[132.013,43.28],[131.795,43.255],[131.158,42.626],[130.709,42.656],[130.834,42.523],[130.73,42.326],[130.236,42.183],[129.756,41.712],[129.686,41.595],[129.766,41.304],[129.709,40.857],[129.341,40.726],[128.511,40.13],[127.967,39.996],[127.568,39.782],[127.549,39.461],[127.422,39.374],[127.395,39.208],[127.786,39.084],[128.329,38.681],[129.418,37.059],[129.404,36.052],[129.573,36.051],[129.562,35.948],[129.214,35.182],[128.511,35.101],[128.419,35.016],[128.444,34.87],[128.095,34.934],[128.036,35.022],[127.715,34.955],[127.639,34.89],[127.715,34.721],[127.404,34.823],[127.479,34.625],[127.325,34.463],[127.173,34.546],[127.247,34.755],[126.897,34.439],[126.755,34.512],[126.531,34.314],[126.482,34.494],[126.264,34.673],[126.525,34.698],[126.473,34.756],[126.593,34.824],[126.421,34.823],[126.291,35.154],[126.614,35.571],[126.488,35.647],[126.753,35.872],[126.54,36.166],[126.488,36.694],[126.181,36.692],[126.161,36.772],[126.487,37.007],[126.784,36.948],[126.872,36.824],[126.977,36.939],[126.746,37.194],[126.791,37.295],[126.563,37.717],[126.634,37.782],[126.37,37.878],[126.117,37.743],[126.05,37.87],[125.769,37.985],[125.358,37.725],[125.311,37.844],[124.989,37.931],[125.207,38.082],[124.691,38.129],[124.875,38.233],[125.067,38.557],[125.554,38.686],[125.169,38.806],[125.41,39.288],[125.361,39.527],[124.775,39.758],[124.638,39.615],[124.557,39.791],[124.349,39.907],[124.35,40.012],[124.106,39.841],[123.651,39.882],[123.581,39.786],[122.84,39.601],[122.335,39.366],[121.982,39.053],[121.677,39.003],[121.65,38.865],[121.164,38.732],[121.107,38.921],[121.68,39.109],[121.628,39.22],[121.818,39.387],[121.275,39.385],[121.267,39.545],[121.518,39.639],[121.517,39.845],[121.801,39.951],[122.264,40.5],[122.14,40.688],[121.859,40.842],[121.835,40.974],[121.729,40.846],[121.175,40.901],[120.479,40.231],[119.391,39.752],[119.225,39.408],[118.977,39.183],[118.298,39.067],[118.041,39.227],[117.785,39.134],[117.554,38.691],[117.656,38.424],[118.015,38.183],[118.8,38.127],[118.94,38.043],[119.089,37.701],[118.991,37.641],[118.953,37.331],[119.287,37.138],[119.761,37.155],[119.883,37.351],[120.312,37.623],[120.257,37.679],[120.75,37.834],[121.64,37.46],[121.965,37.445],[122.057,37.529],[122.338,37.405],[122.667,37.403],[122.447,37.068],[122.52,36.947],[122.341,36.832],[122.162,36.959],[121.933,36.959],[121.054,36.611],[120.811,36.633],[120.896,36.444],[120.712,36.413],[120.638,36.13],[120.393,36.054],[120.328,36.228],[120.183,36.202],[120.094,36.119],[120.285,35.984],[119.43,35.301],[119.165,34.849],[119.201,34.748],[119.351,34.749],[120.267,34.274],[120.505,33.638],[120.871,33.017],[120.853,32.661],[121.342,32.425],[121.404,32.206],[121.751,31.993],[121.856,31.816],[121.866,31.704],[121.681,31.712],[121.352,31.859],[120.974,31.869],[120.792,32.032],[120.52,32.106],[120.036,31.936],[120.716,31.984],[120.788,31.82],[121.661,31.32],[121.878,30.917],[121.419,30.79],[120.998,30.558],[120.821,30.355],[120.45,30.388],[120.195,30.241],[120.495,30.303],[120.633,30.133],[121.258,30.304],[121.678,29.979],[122.083,29.87],[121.506,29.485],[121.888,29.628],[121.968,29.491],[121.918,29.135],[121.717,29.256],[121.448,29.131],[121.68,28.953],[121.54,28.932],[121.662,28.851],[121.475,28.641],[121.61,28.292],[121.272,28.222],[121.217,28.346],[121.146,28.327],[120.959,28.037],[120.748,28.01],[120.833,27.891],[120.588,27.581],[120.608,27.412],[120.279,27.097],[120.087,26.672],[119.882,26.61],[119.824,26.846],[119.71,26.729],[119.588,26.785],[119.881,26.334],[119.463,26.055],[119.139,26.122],[119.332,25.949],[119.619,26.004],[119.539,25.591],[119.622,25.391],[119.18,25.45],[119.286,25.232],[118.978,25.209],[118.909,24.929],[118.637,24.836],[118.719,24.746],[118.657,24.621],[118.087,24.627],[118.006,24.482],[117.843,24.474],[118.024,24.38],[118.056,24.246],[117.628,23.837],[117.466,23.841],[117.368,23.589],[117.331,23.709],[117.083,23.579],[116.911,23.647],[116.861,23.453],[116.629,23.354],[116.699,23.278],[116.538,23.18],[116.471,22.946],[116.252,22.981],[115.852,22.802],[115.64,22.853],[115.498,22.719],[115.196,22.817],[114.854,22.617],[114.652,22.755],[114.554,22.529],[114.266,22.541],[114.335,22.396],[114.268,22.296],[113.903,22.396],[114.015,22.512],[113.62,22.861],[113.621,23.127],[113.52,23.102],[113.331,22.912],[113.553,22.594],[113.548,22.223],[113.149,22.075],[113.089,22.208],[112.954,21.907],[112.809,21.945],[112.586,21.777],[112.36,21.978],[112.39,21.801],[112.305,21.742],[111.944,21.85],[111.603,21.559],[111.017,21.512],[110.567,21.214],[110.411,21.338],[110.375,21.172],[110.154,20.945],[110.18,20.859],[110.365,20.838],[110.313,20.672],[110.512,20.518],[110.345,20.295],[109.938,20.295],[109.886,20.413],[109.968,20.448],[109.663,20.917],[109.681,21.132],[109.931,21.481],[109.687,21.525],[109.521,21.693],[109.544,21.538],[109.082,21.44],[109.102,21.59],[108.772,21.63],[108.594,21.901],[108.48,21.905],[108.502,21.633],[108.325,21.694],[108.246,21.558],[107.809,21.497],[107.41,21.285],[107.354,21.055],[107.165,20.949],[106.683,21.0],[106.753,20.735],[106.551,20.527],[106.518,20.289],[105.984,19.939],[105.622,18.966],[105.888,18.502],[106.499,17.946],[106.479,17.72],[106.371,17.747],[107.834,16.322],[108.029,16.331],[108.821,15.378],[109.303,13.856],[109.272,13.279],[109.424,12.956],[109.445,12.6],[109.336,12.752],[109.219,12.646],[109.305,12.391],[109.207,12.415],[109.259,11.955],[109.199,11.999],[109.199,11.725],[109.04,11.593],[108.987,11.336],[108.095,10.897],[108.001,10.72],[107.262,10.398],[107.007,10.661],[106.947,10.4],[106.727,10.536],[106.606,10.465],[106.741,10.444],[106.757,10.296],[106.464,10.298],[106.785,10.116],[106.596,9.86],[106.136,10.222],[106.572,9.641],[106.378,9.556],[105.831,10.001],[106.159,9.594],[106.168,9.397],[105.501,9.093],[105.114,8.629],[104.77,8.598],[104.896,8.747],[104.819,8.802],[104.845,9.606],[104.903,9.816],[105.093,9.901],[105.028,10.067],[104.802,10.203],[104.663,10.17],[104.262,10.541],[103.871,10.655],[103.662,10.509],[103.587,10.552],[103.54,10.669],[103.722,10.89],[103.532,11.147],[103.354,10.922],[103.153,10.914],[103.125,11.461],[102.594,12.203],[102.54,12.109],[102.259,12.394],[102.23,12.332],[101.724,12.689],[100.898,12.654],[100.963,13.432],[100.603,13.568],[100.017,13.353],[100.09,13.046],[99.964,12.69],[99.989,12.171],[99.627,11.463],[99.487,10.89],[99.165,10.32],[99.254,9.265],[99.836,9.288],[99.99,8.589],[100.129,8.428],[100.163,8.508],[100.279,8.269],[100.545,7.227],[100.439,7.281],[100.38,7.542],[100.284,7.552],[100.257,7.775],[100.158,7.728],[100.161,7.599],[100.424,7.188],[100.586,7.176],[101.018,6.861],[101.498,6.865],[101.799,6.475],[102.34,6.172],[102.534,5.863],[103.197,5.262],[103.454,4.669],[103.362,3.769],[103.454,3.521],[103.439,2.933],[103.812,2.58],[103.968,2.261],[104.288,1.481],[104.176,1.365],[103.981,1.624],[103.992,1.455],[103.695,1.45],[103.48,1.329],[103.357,1.546],[102.727,1.856],[101.296,2.885],[101.3,3.253],[100.715,3.966],[100.796,4.023],[100.615,4.373],[100.343,5.984],[100.119,6.442],[99.696,6.877],[99.72,7.106],[99.553,7.219],[99.597,7.356],[99.359,7.372],[99.264,7.619],[99.078,7.718],[99.051,7.888],[98.789,8.06],[98.704,8.257],[98.579,8.344],[98.421,8.178],[98.305,8.226],[98.242,8.768],[98.703,10.19],[98.563,10.035],[98.465,10.676],[98.676,10.987],[98.741,11.592],[98.876,11.72],[98.636,11.738],[98.696,12.225],[98.6,12.245],[98.679,12.348],[98.576,13.162],[98.245,13.733],[98.2,13.98],[98.15,13.648],[98.111,13.713],[98.1,14.162],[97.91,14.653],[98.019,14.653],[97.812,14.859],[97.71,15.876],[97.584,16.02],[97.634,16.458],[97.726,16.569],[97.376,16.523],[97.2,17.095],[96.851,17.401],[96.909,17.031],[96.765,16.71],[96.431,16.505],[96.189,16.768],[96.324,16.444],[95.763,16.169],[95.39,15.723],[95.301,15.756],[95.347,16.098],[95.177,15.826],[94.943,15.818],[94.893,16.183],[94.798,15.971],[94.662,15.904],[94.703,16.512],[94.665,16.336],[94.442,16.094],[94.224,16.016],[94.271,16.517],[94.589,17.569],[94.431,18.202],[94.171,18.732],[94.246,18.741],[94.07,18.893],[94.045,19.287],[93.929,18.9],[93.705,19.027],[93.493,19.369],[93.579,19.401],[93.825,19.238],[93.998,19.441],[93.612,19.776],[93.707,19.912],[93.25,20.07],[93.157,20.041],[93.199,19.898],[93.129,19.858],[93.002,20.075],[93.096,20.181],[93.015,20.185],[93.067,20.378],[92.828,20.178],[92.891,20.34],[92.736,20.563],[92.723,20.296],[92.308,20.79],[92.056,21.175],[91.863,22.35],[91.797,22.297],[91.48,22.885],[91.216,22.642],[90.946,22.597],[90.656,23.025],[90.604,23.591],[90.556,23.422],[90.269,23.456],[90.591,23.266],[90.595,23.134],[90.466,23.054],[90.552,22.905],[90.435,22.752],[90.616,22.362],[90.231,21.83],[90.071,21.887],[90.21,22.157],[89.954,22.023],[89.918,22.116],[89.985,22.466],[89.882,22.388],[89.812,21.983],[89.569,21.767],[89.483,22.276],[89.501,21.914],[89.354,21.721],[89.094,21.873],[89.051,22.093],[89.028,21.937],[88.949,21.938],[89.052,21.654],[88.907,21.653],[88.858,21.745],[88.745,21.584],[88.74,22.005],[88.642,22.122],[88.585,21.66],[88.446,21.614],[88.287,21.758],[88.254,21.622],[88.122,21.636],[88.057,21.694],[88.196,22.14],[87.941,22.374],[87.962,22.255],[88.159,22.122],[87.948,21.825],[87.678,21.654],[87.101,21.501],[86.86,21.237],[86.975,20.7],[86.75,20.313],[86.377,20.007],[86.245,20.053],[86.279,19.919],[85.575,19.693],[85.497,19.697],[85.56,19.753],[85.504,19.888],[85.249,19.758],[85.181,19.595],[85.371,19.679],[85.442,19.627],[84.771,19.125],[84.104,18.293],[83.654,18.07],[83.198,17.609],[82.36,17.096],[82.259,16.56],[81.762,16.329],[81.286,16.337],[80.979,15.758],[80.647,15.895],[80.293,15.711],[80.053,15.074],[80.179,14.478],[80.112,14.212],[80.307,13.485],[80.156,13.714],[80.062,13.606],[80.342,13.361],[80.229,12.69],[79.858,11.989],[79.793,11.447],[79.693,11.313],[79.799,11.339],[79.849,11.197],[79.838,10.323],[79.315,10.257],[78.94,9.566],[79.02,9.333],[79.411,9.192],[78.98,9.269],[78.421,9.105],[78.192,8.891],[78.06,8.385],[77.518,8.078],[77.066,8.316],[76.553,8.903],[76.325,9.452],[76.242,9.927],[76.343,9.827],[76.376,9.54],[76.459,9.536],[76.346,9.922],[76.196,10.086],[75.724,11.362],[75.197,12.058],[74.946,12.565],[74.382,14.495],[73.949,15.075],[73.801,15.397],[73.932,15.397],[73.772,15.573],[73.833,15.659],[73.68,15.709],[73.338,16.46],[73.156,17.622],[72.875,18.643],[73.006,19.021],[72.972,19.153],[72.835,18.976],[72.803,19.079],[72.812,19.299],[72.987,19.277],[72.788,19.363],[72.668,19.831],[72.894,20.673],[72.814,21.117],[72.692,21.178],[72.624,21.372],[72.735,21.471],[72.613,21.462],[73.112,21.75],[72.543,21.697],[72.7,21.972],[72.522,21.976],[72.553,22.16],[72.809,22.233],[72.183,22.27],[72.306,22.189],[72.274,22.09],[72.037,21.823],[72.21,21.728],[72.254,21.531],[72.015,21.156],[71.025,20.739],[70.485,20.84],[70.034,21.179],[68.97,22.29],[69.052,22.437],[69.277,22.285],[70.177,22.573],[70.513,23.002],[70.489,23.09],[70.339,22.94],[70.118,22.947],[69.665,22.759],[68.817,23.054],[68.417,23.571],[68.777,23.852],[68.235,23.597],[68.165,23.857],[68.116,23.753],[67.86,23.903],[67.668,23.811],[67.646,23.92],[67.563,23.882],[67.309,24.175],[67.171,24.756],[66.703,24.861],[66.699,25.226],[66.429,25.575],[66.219,25.59],[66.131,25.493],[66.468,25.445],[64.777,25.307],[64.659,25.184],[64.059,25.403],[63.557,25.353],[63.491,25.211],[62.665,25.265],[62.315,25.135],[62.199,25.225],[61.908,25.131],[61.533,25.196],[61.412,25.102],[60.664,25.282],[60.511,25.437],[60.4,25.312],[59.456,25.481],[59.046,25.417],[58.798,25.555],[57.796,25.653],[57.335,25.792],[57.036,26.801],[56.728,27.128],[56.356,27.2],[56.118,27.143],[55.65,26.978],[55.424,26.771],[54.645,26.509],[54.247,26.697],[53.706,26.726],[52.692,27.323],[52.476,27.617],[52.031,27.824],[51.589,27.864],[51.279,28.131],[51.062,28.726],[50.867,28.87],[50.876,29.063],[50.675,29.147],[50.65,29.42],[50.169,29.921],[50.072,30.199],[49.555,30.029],[49.002,30.374],[49.19,30.375],[49.225,30.472],[49.002,30.507],[48.832,30.035],[48.454,29.938],[47.983,30.011],[48.143,29.572],[47.97,29.617],[47.723,29.393],[48.051,29.355],[48.809,27.896],[48.797,27.724],[49.237,27.493],[49.175,27.438],[49.405,27.181],[50.15,26.663],[50.008,26.679],[50.214,26.308],[50.155,26.101],[50.032,26.111],[50.081,25.961],[50.804,24.789],[50.755,25.399],[51.003,25.981],[51.262,26.153],[51.543,25.902],[51.485,25.525],[51.609,25.053],[51.428,24.668],[51.268,24.607],[51.418,24.531],[51.31,24.34],[51.605,24.338],[51.768,24.254],[51.843,24.011],[52.119,23.971],[52.648,24.155],[53.802,24.069],[54.148,24.171],[54.397,24.278],[54.747,24.81],[55.941,25.794],[56.164,26.207],[56.413,26.351],[56.298,25.651],[56.373,25.018],[56.641,24.47],[57.22,23.923],[58.325,23.624],[58.578,23.643],[58.773,23.517],[59.429,22.661],[59.823,22.509],[59.824,22.305],[59.371,21.499],[58.896,21.113],[58.474,20.407],[58.209,20.424],[58.245,20.599],[58.169,20.59],[57.862,20.244],[57.714,19.678],[57.812,19.017],[56.826,18.754],[56.655,18.587],[56.551,18.166],[56.383,17.988],[55.479,17.843],[55.255,17.586],[55.275,17.321],[55.064,17.039],[54.772,16.965],[54.068,17.006],[53.61,16.76],[52.581,16.47],[52.237,16.171],[52.217,15.656],[51.322,15.226],[49.35,14.638],[48.668,14.05],[47.99,14.048],[47.408,13.662],[46.789,13.466],[45.657,13.339],[45.039,12.816],[44.618,12.817],[44.358,12.669],[43.93,12.617],[43.634,12.744],[43.488,12.699],[43.232,13.267],[43.282,13.693],[43.089,14.011],[42.936,14.939],[42.856,15.133],[42.658,15.233],[42.799,15.326],[42.717,15.655],[42.84,16.032],[42.79,16.452],[42.699,16.737],[42.383,17.122],[42.294,17.435],[41.658,18.008],[41.229,18.678],[40.759,19.755],[40.081,20.266],[39.728,20.39],[39.276,20.974],[39.094,21.31],[39.147,21.519],[38.988,21.882],[39.062,22.592],[38.464,23.712],[37.92,24.185],[37.543,24.292],[37.181,24.82],[37.266,24.96],[37.149,25.291],[35.18,28.035],[34.722,28.131],[34.625,28.065],[34.973,29.555],[34.736,29.271],[34.4,28.016],[34.22,27.764],[33.76,28.048],[33.248,28.568],[33.13,28.978],[32.721,29.522],[32.566,29.974],[32.473,29.925],[32.36,29.631],[32.599,29.322],[32.659,28.928],[33.547,27.898],[33.55,27.607],[33.849,27.185],[33.959,26.649],[35.194,24.475],[35.784,23.938],[35.541,23.921],[35.504,23.779],[35.698,22.946],[35.913,22.74],[36.23,22.629],[36.83,22.098],[36.927,21.587],[37.259,21.109],[37.257,21.039],[37.151,21.104],[37.141,20.982],[37.228,20.557],[37.193,20.121],[37.471,18.82],[37.922,18.556],[38.202,18.249],[38.283,18.287],[38.574,18.073],[38.912,17.427],[39.299,15.921],[39.507,15.532],[39.786,15.125],[39.864,15.47],[40.041,15.335],[40.204,15.014],[41.176,14.62],[41.658,13.983],[42.245,13.588],[42.399,13.213],[42.523,13.221],[42.796,12.864],[42.97,12.808],[42.999,12.9],[43.083,12.825],[43.354,12.367],[43.41,12.19],[43.337,12.027],[42.799,11.739],[42.64,11.56],[42.522,11.572],[42.54,11.504],[43.162,11.566],[43.441,11.346],[43.853,10.784],[44.279,10.472],[44.943,10.437],[45.817,10.836],[46.565,10.746],[47.405,11.174],[47.712,11.112],[48.573,11.321],[49.062,11.271],[50.11,11.529],[50.792,11.984],[51.255,11.831],[51.084,11.336],[51.141,10.657],[51.032,10.445],[51.193,10.555],[51.385,10.387],[51.209,10.431],[50.93,10.336],[50.825,9.428],[50.103,8.2],[49.852,7.963],[49.671,7.47],[49.235,6.777],[49.049,6.174],[47.975,4.497],[46.051,2.475],[44.92,1.81],[43.718,0.858],[41.98,-0.973],[41.387,-1.867],[40.89,-2.024],[40.922,-2.194],[40.813,-2.392],[40.222,-2.688],[40.115,-3.251],[39.861,-3.577],[39.491,-4.478],[39.228,-4.666],[38.805,-6.07],[38.874,-6.331],[39.546,-7.024],[39.288,-7.518],[39.287,-7.788],[39.428,-7.813],[39.441,-8.012],[39.304,-8.444],[39.451,-8.943],[39.641,-9.192],[39.784,-9.915],[39.725,-10.0],[40.389,-10.354],[40.612,-10.662],[40.487,-10.765],[40.597,-10.831],[40.403,-11.332],[40.532,-12.005],[40.487,-12.492],[40.581,-12.636],[40.437,-12.983],[40.569,-12.985],[40.596,-14.123],[40.716,-14.214],[40.646,-14.539],[40.727,-14.421],[40.818,-14.468],[40.835,-14.792],[40.618,-15.116],[40.559,-15.473],[39.984,-16.225],[39.791,-16.295],[39.845,-16.436],[39.084,-16.973],[38.145,-17.243],[37.512,-17.571],[36.939,-17.993],[36.404,-18.77],[36.263,-18.72],[36.236,-18.861],[35.854,-18.993],[34.948,-19.813],[34.649,-19.701],[34.756,-19.822],[34.705,-20.473],[34.982,-20.806],[35.268,-21.651],[35.316,-22.397],[35.383,-22.455],[35.456,-22.116],[35.54,-22.303],[35.49,-22.658],[35.575,-22.963],[35.37,-23.798],[35.542,-23.824],[35.438,-24.171],[34.992,-24.651],[33.347,-25.261],[32.792,-25.644],[32.59,-26.004],[32.849,-26.268],[32.955,-26.084],[32.889,-26.83],[32.535,-28.2],[32.375,-28.498],[31.335,-29.378],[30.472,-30.715],[29.971,-31.322],[27.861,-33.054],[26.614,-33.707],[25.806,-33.737],[25.574,-34.035],[25.003,-33.974],[24.827,-34.169],[24.596,-34.175],[23.698,-33.993],[23.268,-34.081],[22.554,-34.01],[22.246,-34.069],[21.789,-34.373],[20.99,-34.367],[20.53,-34.463],[20.021,-34.786],[19.298,-34.615],[19.331,-34.492],[19.098,-34.35],[18.831,-34.364],[18.752,-34.083],[18.5,-34.109],[18.462,-34.347],[18.352,-34.188],[18.354,-33.939],[18.465,-33.888],[18.433,-33.717],[17.851,-32.827],[17.965,-32.709],[18.125,-32.749],[18.325,-32.505],[18.211,-31.742],[17.347,-30.445],[16.739,-29.009],[16.481,-28.642],[15.719,-27.966],[15.342,-27.387],[15.133,-26.788],[15.139,-26.508],[14.968,-26.318],[14.845,-25.726],[14.837,-25.033],[14.502,-24.202],[14.403,-22.968],[14.52,-22.805],[14.463,-22.449],[13.451,-20.917],[13.168,-20.185],[12.458,-18.927],[12.041,-18.471],[11.776,-18.002],[11.722,-17.467],[11.82,-16.504],[11.751,-15.832],[12.016,-15.514],[12.55,-13.438],[12.898,-13.028],[12.983,-12.776],[13.417,-12.52],[13.686,-12.124],[13.847,-11.054],[13.721,-10.634],[13.332,-9.999],[12.999,-9.048],[13.359,-8.687],[13.379,-8.37],[12.862,-7.232],[12.823,-6.955],[12.283,-6.124],[13.068,-5.865],[12.453,-6.0],[12.24,-5.807],[12.155,-5.633],[12.177,-5.325],[11.778,-4.566],[10.348,-3.013],[9.722,-2.468],[10.062,-2.55],[9.625,-2.367],[9.299,-1.903],[9.483,-1.962],[9.483,-1.895],[9.266,-1.825],[9.036,-1.309],[9.319,-1.632],[9.501,-1.555],[9.296,-1.515],[9.347,-1.325],[9.204,-1.382],[9.065,-1.298],[8.703,-0.591],[8.821,-0.708],[8.946,-0.689],[9.297,-0.351],[9.355,0.344],[9.468,0.16],[9.797,0.044],[10.001,0.195],[9.546,0.296],[9.325,0.552],[9.495,0.665],[9.618,0.577],[9.599,1.054],[9.386,1.139],[9.807,1.927],[9.948,3.079],[9.672,3.538],[9.766,3.624],[9.642,3.612],[9.556,3.798],[9.74,3.853],[9.64,3.965],[9.689,4.056],[9.484,4.066],[9.425,3.922],[9.0,4.092],[8.918,4.554],[8.66,4.671],[8.69,4.55],[8.574,4.526],[8.571,4.752],[8.431,4.746],[8.253,4.924],[8.293,4.558],[7.644,4.525],[7.531,4.655],[7.46,4.555],[7.284,4.548],[7.077,4.716],[7.155,4.514],[6.923,4.391],[6.768,4.725],[6.86,4.373],[6.633,4.34],[6.58,4.476],[6.555,4.341],[6.264,4.309],[6.271,4.432],[6.206,4.292],[6.077,4.291],[5.588,4.647],[5.493,4.839],[5.383,5.129],[5.476,5.154],[5.37,5.195],[5.368,5.338],[5.55,5.474],[5.386,5.402],[5.199,5.534],[5.457,5.612],[5.327,5.708],[5.112,5.642],[4.861,6.026],[4.431,6.349],[3.451,6.427],[3.717,6.598],[3.43,6.525],[3.336,6.397],[2.287,6.328],[1.311,6.147],[1.106,6.051],[0.95,5.81],[0.26,5.757],[-2.002,4.762],[-3.246,5.114],[-3.019,5.131],[-3.169,5.203],[-3.2,5.354],[-3.348,5.131],[-4.12,5.31],[-4.609,5.236],[-4.037,5.23],[-4.9,5.138],[-5.282,5.21],[-5.368,5.151],[-5.062,5.131],[-5.914,5.011],[-7.545,4.351],[-8.259,4.59],[-9.132,5.055],[-10.276,6.078],[-10.786,6.31],[-10.849,6.465],[-11.292,6.688],[-11.733,7.089],[-12.486,7.386],[-12.48,7.753],[-12.698,7.716],[-12.851,7.819],[-12.957,8.145],[-13.149,8.215],[-13.273,8.43],[-13.085,8.425],[-12.894,8.63],[-13.182,8.577],[-13.207,8.843],[-13.059,8.881],[-13.272,8.987],[-13.269,9.171],[-13.436,9.42],[-13.691,9.536],[-13.69,9.928],[-13.82,9.887],[-14.045,10.141],[-14.427,10.248],[-14.61,10.55],[-14.594,10.767],[-14.677,10.689],[-14.776,10.932],[-14.887,10.968],[-15.012,10.804],[-15.055,11.142],[-15.222,11.031],[-15.217,11.156],[-15.393,11.217],[-15.348,11.378],[-15.479,11.41],[-15.429,11.499],[-15.073,11.598],[-15.23,11.687],[-15.413,11.615],[-15.5,11.778],[-15.078,11.969],[-15.942,11.787],[-15.92,11.938],[-16.138,11.917],[-16.328,12.052],[-16.245,12.237],[-16.437,12.204],[-16.785,12.473],[-16.443,12.609],[-16.598,12.715],[-16.768,12.628],[-16.825,13.341],[-16.75,13.425],[-16.669,13.475],[-16.556,13.303],[-16.413,13.27],[-16.185,13.283],[-16.158,13.384],[-15.427,13.468],[-16.441,13.353],[-16.767,13.905],[-16.618,14.041],[-16.792,14.004],[-17.168,14.641],[-17.346,14.729],[-17.445,14.652],[-17.536,14.755],[-17.147,14.922],[-16.571,15.734],[-16.464,16.602],[-16.079,17.546],[-16.085,18.521],[-16.213,19.003],[-16.514,19.362],[-16.305,19.513],[-16.445,19.473],[-16.283,19.787],[-16.21,20.228],[-16.43,20.652],[-16.53,20.71],[-16.563,20.604],[-16.623,20.634],[-16.876,21.086],[-16.998,21.04],[-17.048,20.806],[-17.099,20.857],[-16.931,21.9],[-16.359,22.595],[-16.21,23.098],[-15.789,23.793],[-15.981,23.67],[-15.899,23.844],[-14.904,24.72],[-14.795,25.404],[-14.471,26.163],[-13.576,26.735],[-13.176,27.656],[-12.949,27.914],[-11.553,28.31],[-10.486,29.065],[-10.201,29.38],[-9.667,30.109],[-9.653,30.448],[-9.875,30.718],[-9.809,31.425],[-9.347,32.086],[-9.246,32.572],[-8.513,33.252],[-6.901,33.969],[-6.353,34.776],[-5.925,35.786],[-5.278,35.903],[-5.338,35.745],[-5.253,35.615],[-4.628,35.206],[-4.33,35.161],[-3.693,35.28],[-3.395,35.212],[-2.972,35.407],[-2.84,35.128],[-1.913,35.094],[-0.917,35.668],[-0.426,35.862],[-0.048,35.833],[0.312,36.162],[1.257,36.52],[2.593,36.601],[2.973,36.784],[3.521,36.795],[3.779,36.896],[4.758,36.896],[5.295,36.648],[6.065,36.864],[6.487,37.086],[6.928,36.919],[7.238,36.969],[7.204,37.092],[7.432,37.059],[7.91,36.856],[8.824,36.998],[9.142,37.195],[9.688,37.34],[9.838,37.309],[9.83,37.135],[9.876,37.254],[10.196,37.206],[10.293,36.781],[10.412,36.732],[10.951,37.059],[11.054,37.073],[11.127,36.874],[10.488,36.255],[10.591,35.887],[11.004,35.634],[11.12,35.24],[10.691,34.678],[10.065,34.212],[10.049,34.056],[10.305,33.728],[10.713,33.689],[10.723,33.514],[10.958,33.626],[11.257,33.309],[11.203,33.249],[11.813,33.094],[12.28,32.859],[12.754,32.801],[13.283,32.915],[14.156,32.71],[14.513,32.511],[15.177,32.391],[15.359,32.16],[15.496,31.657],[15.706,31.426],[16.123,31.264],[16.782,31.215],[17.83,30.928],[18.936,30.29],[19.292,30.288],[19.59,30.414],[20.013,30.801],[20.141,31.196],[19.926,31.818],[20.121,32.219],[20.621,32.58],[21.062,32.776],[21.425,32.799],[21.636,32.937],[22.187,32.918],[23.091,32.619],[23.106,32.331],[23.286,32.214],[23.798,32.159],[24.13,32.009],[24.879,31.984],[25.225,31.534],[25.893,31.621],[26.769,31.47],[27.968,31.097],[28.515,31.05],[29.072,30.83],[29.429,30.927],[29.93,31.227],[30.223,31.258],[30.395,31.458],[30.924,31.567],[30.563,31.417],[31.002,31.463],[31.083,31.603],[31.524,31.458],[31.889,31.541],[32.136,31.341],[31.892,31.482],[31.771,31.293],[32.008,31.221],[32.102,31.093],[32.282,31.201],[32.251,31.295],[32.603,31.069],[33.903,31.181],[34.484,31.592],[35.648,34.248],[35.978,34.547],[35.902,35.421],[35.764,35.572],[35.957,35.998],[35.811,36.31],[36.188,36.659],[36.18,36.807],[36.049,36.911],[35.393,36.575],[34.704,36.817],[33.695,36.182],[32.795,36.036],[32.378,36.184],[32.022,36.535],[31.241,36.822],[30.644,36.866],[30.446,36.27],[30.232,36.307],[29.689,36.157],[29.224,36.324],[28.97,36.715],[28.817,36.675],[28.304,36.812],[28.112,36.646],[28.019,36.634],[28.084,36.751],[27.54,36.684],[27.467,36.746],[28.005,36.832],[28.242,37.029],[27.263,36.977],[27.3,37.127],[27.535,37.164],[27.52,37.249],[27.219,37.389],[27.068,37.658],[27.224,37.725],[27.232,37.979],[26.291,38.277],[26.416,38.368],[26.372,38.562],[26.441,38.641],[26.587,38.557],[26.674,38.336],[26.727,38.419],[27.144,38.452],[26.907,38.482],[26.764,38.71],[27.014,38.887],[26.815,38.961],[26.854,39.116],[26.682,39.292],[26.899,39.55],[26.113,39.467],[26.181,39.99],[26.738,40.4],[27.285,40.456],[27.476,40.32],[27.728,40.329],[27.849,40.382],[27.732,40.481],[27.875,40.513],[27.99,40.489],[27.963,40.37],[29.007,40.39],[28.788,40.534],[29.849,40.76],[29.365,40.809],[29.114,40.938],[29.046,41.008],[29.148,41.221],[31.255,41.108],[31.458,41.32],[32.306,41.73],[33.381,42.018],[34.75,41.957],[35.006,42.063],[35.155,42.028],[35.122,41.891],[35.209,41.794],[35.558,41.634],[36.052,41.683],[36.179,41.427],[36.405,41.275],[36.778,41.363],[37.066,41.184],[38.381,40.925],[39.426,41.106],[40.265,40.961],[41.414,41.424],[41.702,41.705],[41.763,41.97],[41.419,42.738],[39.874,43.473],[38.717,44.288],[38.181,44.42],[37.851,44.699],[37.495,44.695],[37.205,44.972],[36.628,45.151],[36.941,45.29],[36.72,45.372],[36.866,45.427],[37.214,45.272],[37.647,45.377],[37.612,45.565],[37.933,46.002],[38.014,46.048],[38.08,45.935],[38.184,46.095],[38.492,46.091],[38.078,46.394],[37.914,46.406],[37.767,46.636],[38.501,46.664],[38.439,46.813],[39.271,47.044],[39.196,47.269],[38.668,47.144],[38.552,47.15],[38.762,47.262],[38.577,47.239],[38.178,47.08],[37.543,47.075],[36.795,46.714],[36.559,46.763],[35.827,46.624],[35.015,46.106],[35.28,46.279],[35.23,46.441],[34.85,46.19],[34.857,45.987],[35.023,45.701],[35.458,45.316],[36.171,45.453],[36.575,45.394],[36.393,45.065],[35.87,45.005],[35.473,45.098],[35.088,44.803],[34.47,44.722],[34.282,44.538],[33.91,44.388],[33.451,44.554],[33.612,44.908],[33.555,45.098],[32.919,45.348],[32.611,45.328],[32.508,45.404],[33.665,45.947],[33.594,46.096],[33.43,46.058],[33.202,46.176],[32.477,46.084],[31.831,46.282],[31.78,46.325],[32.008,46.43],[31.555,46.554],[32.361,46.475],[32.578,46.616],[32.354,46.565],[32.044,46.642],[31.759,47.213],[31.913,46.926],[31.873,46.65],[31.532,46.665],[31.563,46.777],[31.403,46.629],[30.796,46.552],[30.657,46.267],[30.219,45.867],[29.628,45.722],[29.727,45.343],[29.558,44.843],[29.048,44.758],[29.095,44.975],[28.931,44.966],[28.807,44.565],[28.888,44.575],[28.645,44.296],[28.562,43.501],[28.465,43.389],[28.134,43.396],[27.929,43.186],[27.889,42.75],[27.485,42.468],[27.983,42.047],[27.987,41.855],[28.198,41.554],[29.057,41.23],[28.956,41.008],[28.172,41.081],[27.499,40.973],[27.258,40.687],[26.772,40.498],[26.203,40.075],[26.254,40.315],[26.792,40.627],[26.105,40.611],[25.856,40.844],[25.104,40.995],[24.793,40.858],[24.477,40.948],[24.082,40.724],[23.763,40.748],[23.867,40.419],[24.213,40.328],[24.343,40.148],[23.913,40.359],[23.728,40.33],[23.967,40.115],[23.947,39.966],[23.665,40.224],[23.426,40.264],[23.433,40.115],[23.627,39.924],[23.396,39.99],[23.312,40.216],[22.896,40.4],[22.922,40.591],[22.629,40.496],[22.592,40.037],[23.328,39.175],[23.155,39.101],[23.162,39.258],[22.921,39.306],[22.839,39.259],[22.886,39.17],[22.966,39.031],[23.067,39.038],[22.569,38.867],[23.253,38.661],[23.684,38.352],[23.967,38.275],[24.025,38.14],[24.02,37.678],[23.502,38.035],[23.036,37.878],[23.198,37.62],[23.396,37.58],[23.489,37.44],[23.162,37.334],[23.015,37.482],[22.725,37.542],[23.16,36.448],[22.717,36.794],[22.608,36.78],[22.489,36.447],[22.428,36.476],[22.376,36.702],[22.08,37.029],[21.956,36.99],[21.892,36.737],[21.583,37.081],[21.679,37.387],[21.125,37.892],[21.404,38.197],[21.658,38.175],[21.825,38.328],[22.92,37.958],[22.893,38.051],[23.122,38.073],[23.149,38.176],[22.422,38.439],[22.32,38.357],[21.965,38.412],[21.473,38.321],[21.331,38.487],[21.303,38.374],[21.113,38.385],[20.769,38.874],[21.112,38.896],[21.118,39.03],[20.78,39.009],[20.301,39.327],[19.852,40.044],[19.398,40.285],[19.322,40.407],[19.459,40.405],[19.337,40.664],[19.461,40.933],[19.441,41.425],[19.578,41.788],[19.186,41.949],[18.646,42.443],[17.045,43.015],[17.724,42.851],[16.903,43.392],[16.394,43.543],[15.986,43.52],[15.942,43.657],[15.186,44.172],[15.123,44.257],[15.471,44.272],[14.981,44.603],[14.855,45.081],[14.55,45.298],[14.313,45.338],[13.966,44.836],[13.861,44.837],[13.629,45.108],[13.517,45.482],[13.783,45.627],[13.628,45.771],[13.465,45.71],[13.206,45.771],[12.761,45.544],[12.274,45.446],[12.226,45.242],[12.523,44.968],[12.384,44.798],[12.279,44.832],[12.248,44.723],[12.396,44.224],[13.564,43.571],[14.01,42.69],[14.541,42.244],[15.169,41.934],[16.165,41.896],[16.151,41.758],[15.914,41.621],[15.9,41.512],[17.955,40.655],[18.461,40.221],[18.344,39.821],[18.078,39.937],[17.865,40.28],[17.396,40.34],[17.18,40.503],[16.928,40.458],[16.67,40.137],[16.522,39.748],[17.115,39.381],[17.175,38.998],[16.617,38.8],[16.546,38.409],[16.282,38.25],[16.057,37.942],[15.725,37.939],[15.646,38.034],[15.643,38.175],[15.905,38.483],[15.879,38.614],[16.197,38.759],[16.21,38.941],[15.693,39.99],[14.951,40.239],[14.948,40.469],[14.766,40.668],[14.34,40.599],[14.461,40.729],[14.044,40.812],[13.733,41.236],[13.089,41.244],[12.631,41.47],[11.637,42.288],[11.296,42.423],[11.141,42.39],[11.168,42.535],[10.708,42.936],[10.515,42.968],[10.521,43.204],[10.188,43.948],[9.289,44.319],[8.766,44.422],[8.552,44.346],[8.005,43.877],[7.262,43.696],[6.57,43.199],[6.116,43.072],[5.407,43.229],[5.06,43.445],[4.712,43.373],[4.053,43.593],[3.259,43.193],[3.043,42.838],[3.091,42.591],[3.307,42.289],[3.166,42.256],[3.248,41.944],[2.083,41.287],[1.033,41.062],[0.715,40.823],[0.891,40.722],[0.596,40.615],[-0.327,39.52],[-0.205,39.063],[0.202,38.759],[-0.521,38.317],[-0.815,37.77],[-0.722,37.631],[-1.328,37.561],[-1.641,37.387],[-2.188,36.745],[-2.453,36.831],[-2.788,36.715],[-4.367,36.718],[-4.674,36.506],[-5.171,36.424],[-5.361,36.135],[-5.625,36.026],[-6.041,36.188],[-6.269,36.597],[-6.384,36.637],[-6.412,36.729],[-6.217,36.914],[-6.396,36.832],[-6.885,37.194],[-6.864,37.279],[-6.975,37.198],[-7.494,37.168],[-7.834,37.006],[-8.598,37.121],[-8.998,37.032],[-8.814,37.431],[-8.879,37.959],[-8.802,38.184],[-8.881,38.447],[-8.668,38.424],[-8.799,38.518],[-9.213,38.448],[-9.25,38.657],[-9.021,38.747],[-8.938,38.998],[-8.792,39.078],[-8.954,39.016],[-9.136,38.743],[-9.357,38.698],[-9.48,38.799],[-9.375,39.338],[-9.148,39.543],[-8.838,40.116],[-8.873,40.259],[-8.685,40.753],[-8.66,41.086],[-8.806,41.56],[-8.755,41.698],[-8.888,41.765],[-8.777,41.941],[-8.878,41.947],[-8.887,42.105],[-8.691,42.274],[-8.816,42.285],[-8.73,42.412],[-8.812,42.64],[-9.033,42.594],[-8.927,42.799],[-9.235,42.977],[-9.178,43.174],[-8.874,43.334],[-8.249,43.439],[-8.257,43.58],[-7.698,43.765],[-7.061,43.554],[-5.847,43.645],[-4.523,43.416],[-3.605,43.519],[-3.046,43.372],[-2.875,43.454],[-1.991,43.345],[-1.485,43.564],[-1.246,44.56],[-1.077,44.69],[-1.153,44.764],[-1.245,44.667],[-1.081,45.532],[-0.826,45.381],[-0.691,45.093],[-0.548,45.001],[-0.791,45.468],[-1.196,45.714],[-1.032,45.741],[-1.146,46.311],[-1.787,46.515],[-2.092,46.865],[-2.019,47.038],[-2.197,47.163],[-2.149,47.224],[-1.743,47.216],[-1.975,47.311],[-2.503,47.312],[-2.428,47.471],[-2.77,47.514],[-2.787,47.626],[-3.901,47.838],[-4.312,47.823],[-4.428,47.969],[-4.679,48.04],[-4.329,48.17],[-4.577,48.29],[-4.241,48.304],[-4.719,48.363],[-4.721,48.54],[-3.231,48.841],[-3.003,48.791],[-2.692,48.537],[-2.446,48.648],[-2.004,48.582],[-1.906,48.697],[-1.376,48.653],[-1.565,48.806],[-1.583,49.202],[-1.856,49.684],[-1.259,49.68],[-1.139,49.388],[-0.163,49.297],[0.417,49.448],[0.129,49.508],[0.187,49.703],[1.407,50.089],[1.593,50.252],[1.579,50.739],[1.768,50.936],[3.426,51.394],[4.226,51.386],[3.449,51.541],[3.744,51.596],[4.274,51.472],[4.005,51.596],[4.183,51.61],[3.947,51.811],[4.026,51.928],[4.483,52.309],[4.769,52.941],[5.061,52.961],[5.532,53.269],[6.062,53.407],[6.816,53.441],[7.197,53.282],[7.053,53.376],[7.206,53.655],[7.629,53.697],[8.009,53.691],[8.201,53.432],[8.334,53.606],[8.493,53.514],[8.495,53.394],[8.528,53.781],[8.619,53.875],[9.206,53.856],[9.784,53.555],[9.312,53.859],[8.978,53.926],[8.907,54.261],[8.645,54.295],[8.648,54.398],[8.952,54.468],[8.957,54.538],[8.682,54.792],[8.573,55.134],[8.67,55.156],[8.651,55.329],[8.616,55.418],[8.132,55.6],[8.164,56.607],[8.672,56.496],[8.888,56.735],[9.067,56.794],[9.196,56.702],[9.255,57.012],[9.11,57.044],[8.772,56.725],[8.468,56.665],[8.268,56.754],[8.619,57.111],[9.434,57.174],[9.962,57.581],[10.61,57.737],[10.46,57.615],[10.524,57.243],[10.296,56.999],[10.283,56.621],[10.926,56.443],[10.753,56.242],[10.319,56.213],[10.183,55.865],[9.904,55.843],[10.024,55.761],[9.591,55.493],[9.671,55.266],[9.454,55.04],[9.688,55.0],[9.746,54.807],[10.022,54.674],[10.029,54.581],[9.869,54.472],[10.143,54.488],[10.732,54.316],[11.013,54.379],[11.064,54.281],[10.811,54.075],[10.855,54.01],[11.4,53.945],[11.796,54.145],[12.111,54.168],[12.575,54.467],[13.029,54.411],[13.448,54.141],[13.724,54.153],[13.95,53.801],[14.583,53.639],[14.558,53.823],[13.926,53.879],[13.828,54.127],[14.384,53.925],[16.186,54.29],[16.56,54.554],[17.262,54.73],[18.086,54.836],[18.759,54.685],[18.8,54.633],[18.436,54.745],[18.67,54.431],[18.836,54.37],[19.407,54.386],[19.859,54.634],[19.975,54.921],[20.397,54.951],[20.679,55.103],[21.014,55.402],[21.115,55.617],[21.032,55.35],[20.595,54.982],[21.189,54.935],[21.238,55.455],[21.062,55.813],[21.031,56.637],[21.071,56.824],[21.351,57.018],[21.459,57.322],[21.729,57.571],[22.555,57.724],[23.137,57.324],[23.287,57.09],[23.648,56.971],[23.931,57.008],[24.383,57.25],[24.302,57.784],[24.529,58.354],[24.337,58.381],[24.115,58.266],[23.768,58.361],[23.509,58.659],[23.681,58.787],[23.504,58.79],[23.432,58.921],[23.515,58.999],[23.494,59.196],[24.083,59.292],[24.054,59.372],[24.38,59.473],[25.444,59.521],[25.509,59.639],[27.893,59.414],[28.064,59.554],[28.058,59.782],[28.335,59.693],[28.518,59.85],[28.947,59.829],[29.147,60.0],[30.123,59.874],[30.173,59.957],[29.721,60.195],[29.069,60.191],[28.643,60.375],[28.492,60.54],[28.622,60.492],[28.651,60.611],[28.513,60.677],[27.462,60.465],[27.205,60.543],[26.535,60.413],[26.569,60.625],[26.378,60.424],[25.956,60.474],[26.036,60.342],[25.758,60.268],[25.656,60.333],[24.446,60.021],[23.464,59.986],[23.021,59.816],[23.198,60.022],[22.912,60.21],[22.75,60.057],[22.463,60.029],[22.443,60.157],[22.59,60.228],[22.512,60.281],[22.585,60.381],[21.854,60.505],[21.805,60.594],[21.613,60.531],[21.436,60.596],[21.361,60.967],[21.565,61.484],[21.498,61.552],[21.606,61.592],[21.256,61.99],[21.343,62.277],[21.166,62.414],[21.104,62.623],[21.474,63.033],[21.651,63.039],[21.545,63.204],[22.32,63.31],[22.243,63.438],[22.532,63.648],[23.599,64.041],[24.558,64.801],[25.288,64.86],[25.228,64.951],[25.373,65.009],[25.256,65.143],[25.348,65.479],[24.675,65.671],[24.582,65.757],[24.628,65.859],[24.404,65.78],[23.691,65.829],[23.102,65.735],[22.747,65.871],[22.539,65.794],[22.401,65.862],[22.254,65.598],[22.086,65.611],[22.148,65.553],[21.92,65.532],[21.88,65.424],[21.566,65.408],[21.609,65.261],[21.41,65.317],[21.574,65.126],[21.138,64.809],[21.52,64.463],[21.018,64.178],[20.763,63.868],[19.914,63.611],[19.722,63.463],[19.354,63.477],[19.034,63.238],[18.606,63.178],[18.313,62.996],[18.502,62.989],[18.463,62.896],[18.17,62.789],[17.88,62.873],[17.974,62.721],[17.903,62.659],[18.037,62.601],[17.646,62.451],[17.378,62.463],[17.429,62.335],[17.634,62.233],[17.51,62.166],[17.375,61.866],[17.465,61.684],[17.196,61.725],[17.131,61.576],[17.251,60.701],[17.593,60.628],[17.661,60.535],[17.956,60.59],[18.558,60.254],[18.535,60.153],[18.787,60.079],[18.99,59.828],[17.98,59.329]],[[50.68,46.939],[49.886,46.596],[49.347,46.519],[49.362,46.41],[49.206,46.386],[49.246,46.292],[48.684,46.086],[48.73,45.897],[48.487,45.935],[48.159,45.737],[47.701,45.686],[47.633,45.584],[47.463,45.68],[47.529,45.53],[47.351,45.218],[47.084,44.817],[47.003,44.876],[46.755,44.657],[46.721,44.452],[47.024,44.343],[47.307,44.103],[47.463,43.555],[47.646,43.885],[47.463,43.035],[47.709,42.811],[47.728,42.681],[48.384,41.953],[48.824,41.63],[49.457,40.8],[49.776,40.584],[50.183,40.505],[50.366,40.279],[49.919,40.316],[49.551,40.194],[49.324,39.608],[49.363,39.35],[49.165,39.03],[49.013,39.134],[48.962,39.079],[48.854,38.839],[48.871,38.393],[49.081,37.668],[49.372,37.52],[50.13,37.407],[50.338,37.149],[50.927,36.81],[51.762,36.615],[53.768,36.93],[53.915,36.93],[53.679,36.853],[53.97,36.818],[54.024,36.901],[53.824,37.928],[53.869,38.949],[53.705,39.21],[53.336,39.341],[53.157,39.265],[53.125,39.432],[53.236,39.609],[53.603,39.547],[53.472,39.669],[53.487,39.909],[52.987,39.988],[53.036,39.774],[52.805,40.054],[52.734,40.399],[52.943,41.038],[53.145,40.825],[53.615,40.819],[53.87,40.649],[54.377,40.693],[54.319,40.835],[54.685,40.873],[54.704,41.071],[54.095,41.519],[53.846,42.091],[53.752,42.129],[53.164,42.094],[52.97,41.976],[52.815,41.712],[52.883,41.653],[52.85,41.2],[52.468,41.886],[52.638,42.556],[52.597,42.76],[51.898,42.87],[51.616,43.158],[51.295,43.174],[51.302,43.482],[50.831,44.193],[50.253,44.406],[50.297,44.582],[50.409,44.624],[51.544,44.531],[51.31,44.619],[51.009,44.922],[51.416,45.358],[52.427,45.405],[53.2,45.332],[52.774,45.573],[53.135,46.192],[53.064,46.475],[53.17,46.669],[52.916,46.954],[52.483,46.991],[52.138,46.829],[51.178,47.11],[50.68,46.939]]]} \ No newline at end of file diff --git a/.GC/cache/sources/gitcode-official/model/earth-geography/earth-geography.model/i18n/en.json b/.GC/cache/sources/gitcode-official/model/earth-geography/earth-geography.model/i18n/en.json new file mode 100644 index 0000000..4ae817e --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-geography/earth-geography.model/i18n/en.json @@ -0,0 +1,7 @@ +{ + "zones": "Zones", + "coast": "Continents", + "plates": "Plates", + "borders": "Borders", + "reset": "Reset" +} \ No newline at end of file diff --git a/.GC/cache/sources/gitcode-official/model/earth-geography/earth-geography.model/i18n/zh-CN.json b/.GC/cache/sources/gitcode-official/model/earth-geography/earth-geography.model/i18n/zh-CN.json new file mode 100644 index 0000000..0218a48 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-geography/earth-geography.model/i18n/zh-CN.json @@ -0,0 +1,7 @@ +{ + "zones": "五带", + "coast": "大洲轮廓", + "plates": "板块", + "borders": "洲界", + "reset": "复位" +} \ No newline at end of file diff --git a/.GC/cache/sources/gitcode-official/model/earth-geography/earth-geography.model/labels.json b/.GC/cache/sources/gitcode-official/model/earth-geography/earth-geography.model/labels.json new file mode 100644 index 0000000..eef2d7b --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-geography/earth-geography.model/labels.json @@ -0,0 +1,103 @@ +{ + "labels": [ + { + "lat": 34, + "lon": 90, + "kind": "continent", + "nameI18n": { + "zh-CN": "亚洲", + "en": "Asia" + } + }, + { + "lat": 2, + "lon": 20, + "kind": "continent", + "nameI18n": { + "zh-CN": "非洲", + "en": "Africa" + } + }, + { + "lat": 48, + "lon": -100, + "kind": "continent", + "nameI18n": { + "zh-CN": "北美洲", + "en": "North America" + } + }, + { + "lat": -15, + "lon": -60, + "kind": "continent", + "nameI18n": { + "zh-CN": "南美洲", + "en": "South America" + } + }, + { + "lat": -78, + "lon": 20, + "kind": "continent", + "nameI18n": { + "zh-CN": "南极洲", + "en": "Antarctica" + } + }, + { + "lat": 52, + "lon": 18, + "kind": "continent", + "nameI18n": { + "zh-CN": "欧洲", + "en": "Europe" + } + }, + { + "lat": -24, + "lon": 134, + "kind": "continent", + "nameI18n": { + "zh-CN": "大洋洲", + "en": "Oceania" + } + }, + { + "lat": 0, + "lon": -155, + "kind": "ocean", + "nameI18n": { + "zh-CN": "太平洋", + "en": "Pacific Ocean" + } + }, + { + "lat": 12, + "lon": -30, + "kind": "ocean", + "nameI18n": { + "zh-CN": "大西洋", + "en": "Atlantic Ocean" + } + }, + { + "lat": -22, + "lon": 78, + "kind": "ocean", + "nameI18n": { + "zh-CN": "印度洋", + "en": "Indian Ocean" + } + }, + { + "lat": 85, + "lon": 0, + "kind": "ocean", + "nameI18n": { + "zh-CN": "北冰洋", + "en": "Arctic Ocean" + } + } + ] +} \ No newline at end of file diff --git a/.GC/cache/sources/gitcode-official/model/earth-geography/earth-geography.model/plates.json b/.GC/cache/sources/gitcode-official/model/earth-geography/earth-geography.model/plates.json new file mode 100644 index 0000000..157250a --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-geography/earth-geography.model/plates.json @@ -0,0 +1 @@ +{"plates":[{"id":"pacific","lines":[[[-180,60],[-150,55],[-130,45],[-110,25],[-95,10],[-80,0],[-75,-15],[-90,-30],[-110,-45],[-130,-55],[-160,-60],[-180,-55],[-180,60]]]},{"id":"north-american","lines":[[[-168,72],[-140,70],[-120,60],[-100,50],[-80,45],[-60,42],[-52,28],[-62,12],[-82,8],[-95,16],[-110,25],[-130,45],[-150,55],[-168,72]]]},{"id":"south-american","lines":[[[-82,12],[-62,10],[-45,-2],[-35,-8],[-30,-20],[-40,-35],[-55,-42],[-70,-52],[-78,-40],[-80,-20],[-82,12]]]},{"id":"african","lines":[[[-20,35],[10,37],[32,32],[43,12],[51,10],[42,-8],[40,-25],[25,-35],[15,-30],[8,-5],[-8,5],[-17,15],[-20,35]]]},{"id":"eurasian","lines":[[[-10,36],[0,45],[15,55],[30,68],[60,72],[100,76],[140,70],[160,60],[140,42],[120,30],[100,20],[75,8],[60,22],[45,30],[30,32],[10,37],[-10,36]]]},{"id":"indo-australian","lines":[[[95,5],[115,10],[130,5],[145,-5],[150,-20],[145,-35],[130,-42],[115,-38],[105,-25],[95,-10],[95,5]]]},{"id":"antarctic","lines":[[[-180,-60],[-120,-62],[-60,-60],[0,-62],[60,-60],[120,-62],[180,-60],[180,-90],[-180,-90],[-180,-60]]]},{"id":"nazca","lines":[[[-95,-5],[-85,-10],[-75,-25],[-78,-40],[-90,-42],[-100,-30],[-95,-5]]]},{"id":"cocos","lines":[[[-105,10],[-95,12],[-90,5],[-100,2],[-105,10]]]},{"id":"caribbean","lines":[[[-88,15],[-75,18],[-62,15],[-60,8],[-72,6],[-85,8],[-88,15]]]},{"id":"philippine","lines":[[[118,20],[128,18],[130,8],[125,2],[118,8],[118,20]]]},{"id":"arabian","lines":[[[35,32],[48,30],[58,22],[55,12],[42,10],[35,20],[35,32]]]}]} \ No newline at end of file diff --git a/.GC/cache/sources/gitcode-official/model/earth-geography/earth-geography.model/preview.png b/.GC/cache/sources/gitcode-official/model/earth-geography/earth-geography.model/preview.png new file mode 100644 index 0000000..a0baeb3 Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/earth-geography/earth-geography.model/preview.png differ diff --git a/.GC/cache/sources/gitcode-official/model/earth-geography/earth-geography.model/scene.json b/.GC/cache/sources/gitcode-official/model/earth-geography/earth-geography.model/scene.json new file mode 100644 index 0000000..914cf41 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-geography/earth-geography.model/scene.json @@ -0,0 +1,88 @@ +{ + "schemaVersion": 1, + "type": "geography", + "defaultView": "zones", + "views": [ + "zones", + "coast", + "plates" + ], + "nameI18n": { + "zh-CN": "地球地理", + "en": "Earth Geography" + }, + "descriptionI18n": { + "zh-CN": "五带划分 · 七大洲四大洋 · 六大板块与洲界", + "en": "Climate zones · continents & oceans · plates & borders" + }, + "tropicDeg": 23.5, + "axialTiltDeg": 23.5, + "oceanColor": "#0E2A4A", + "zones": [ + { + "id": "torrid", + "latMin": -23.5, + "latMax": 23.5, + "nameI18n": { + "zh-CN": "热带", + "en": "Torrid zone" + }, + "descI18n": { + "zh-CN": "南北回归线之间,有太阳直射,终年高温。", + "en": "Between the tropics; the Sun is overhead at some time each year." + } + }, + { + "id": "north-temperate", + "latMin": 23.5, + "latMax": 66.5, + "nameI18n": { + "zh-CN": "北温带", + "en": "North temperate" + }, + "descI18n": { + "zh-CN": "北回归线与北极圈之间,四季分明,无直射也无极昼极夜。", + "en": "Between Tropic of Cancer and Arctic Circle; four distinct seasons." + } + }, + { + "id": "south-temperate", + "latMin": -66.5, + "latMax": -23.5, + "nameI18n": { + "zh-CN": "南温带", + "en": "South temperate" + }, + "descI18n": { + "zh-CN": "南回归线与南极圈之间,四季分明。", + "en": "Between Tropic of Capricorn and Antarctic Circle; four seasons." + } + }, + { + "id": "north-frigid", + "latMin": 66.5, + "latMax": 90, + "nameI18n": { + "zh-CN": "北寒带", + "en": "North frigid zone" + }, + "descI18n": { + "zh-CN": "北极圈以北,有极昼极夜,终年寒冷。", + "en": "North of the Arctic Circle; polar day/night, always cold." + } + }, + { + "id": "south-frigid", + "latMin": -90, + "latMax": -66.5, + "nameI18n": { + "zh-CN": "南寒带", + "en": "South frigid zone" + }, + "descI18n": { + "zh-CN": "南极圈以南,有极昼极夜,终年寒冷。", + "en": "South of the Antarctic Circle; polar day/night, always cold." + } + } + ] +} \ No newline at end of file diff --git a/.GC/cache/sources/gitcode-official/model/earth-geography/src/EarthGeographyModel.csproj b/.GC/cache/sources/gitcode-official/model/earth-geography/src/EarthGeographyModel.csproj new file mode 100644 index 0000000..c11e9df --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-geography/src/EarthGeographyModel.csproj @@ -0,0 +1,29 @@ + + + + net8.0 + enable + disable + NeoRF.EarthModels + EarthGeographyModel + true + false + + + + + + + + + + + + + + + false + + + + diff --git a/.GC/cache/sources/gitcode-official/model/earth-geography/src/GeoModels.cs b/.GC/cache/sources/gitcode-official/model/earth-geography/src/GeoModels.cs new file mode 100644 index 0000000..310878a --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-geography/src/GeoModels.cs @@ -0,0 +1,88 @@ +using System.Collections.Generic; +using System.Text.Json.Serialization; + +namespace NeoRF.EarthModels; + +/// 地球地理模型的数据文件:全部是经纬度折线,只有轮廓没有填色。 +public sealed class GeoData +{ + [JsonPropertyName("lines")] public List> Lines { get; set; } = new(); +} + +public sealed class PlateEntry +{ + [JsonPropertyName("id")] public string Id { get; set; } = ""; + [JsonPropertyName("nameI18n")] public Dictionary? NameI18n { get; set; } + [JsonPropertyName("lines")] public List> Lines { get; set; } = new(); +} + +public sealed class PlateData +{ + [JsonPropertyName("plates")] public List Plates { get; set; } = new(); +} + +public sealed class BorderEntry +{ + /// 分界的两个大洲,如「亚洲-非洲」。 + [JsonPropertyName("between")] public string Between { get; set; } = ""; + /// 分界标志名称,如「苏伊士运河」。 + [JsonPropertyName("name")] public string Name { get; set; } = ""; + [JsonPropertyName("nameI18n")] public Dictionary? NameI18n { get; set; } + [JsonPropertyName("lines")] public List> Lines { get; set; } = new(); + /// 复合分界的逐段明细(如亚欧分界的六个地理标志)。 + [JsonPropertyName("segments")] public List? Segments { get; set; } +} + +public sealed class BorderSegment +{ + [JsonPropertyName("name")] public string Name { get; set; } = ""; + [JsonPropertyName("nameI18n")] public Dictionary? NameI18n { get; set; } + [JsonPropertyName("lines")] public List> Lines { get; set; } = new(); +} + +public sealed class BorderData +{ + [JsonPropertyName("borders")] public List Borders { get; set; } = new(); +} + +/// 七大洲四大洋的标签位置(经纬度 + 名称)。 +public sealed class ZoneLabel +{ + [JsonPropertyName("lat")] public double Lat { get; set; } + [JsonPropertyName("lon")] public double Lon { get; set; } + [JsonPropertyName("kind")] public string Kind { get; set; } = "continent"; + [JsonPropertyName("nameI18n")] public Dictionary? NameI18n { get; set; } +} + +public sealed class LabelData +{ + [JsonPropertyName("labels")] public List Labels { get; set; } = new(); +} + +/// 五带:以纬度区间定义的五个温度带。 +public sealed class ClimateZone +{ + [JsonPropertyName("id")] public string Id { get; set; } = ""; + /// 南边界纬度(可为负)。 + [JsonPropertyName("latMin")] public double LatMin { get; set; } + /// 北边界纬度。 + [JsonPropertyName("latMax")] public double LatMax { get; set; } + [JsonPropertyName("nameI18n")] public Dictionary? NameI18n { get; set; } + [JsonPropertyName("descI18n")] public Dictionary? DescI18n { get; set; } +} + +/// 地理模型场景清单。 +public sealed class GeoScene +{ + [JsonPropertyName("schemaVersion")] public int SchemaVersion { get; set; } = 1; + [JsonPropertyName("type")] public string Type { get; set; } = "geography"; + [JsonPropertyName("defaultView")] public string DefaultView { get; set; } = "zones"; + [JsonPropertyName("views")] public List Views { get; set; } = new(); + [JsonPropertyName("nameI18n")] public Dictionary? NameI18n { get; set; } + [JsonPropertyName("descriptionI18n")] public Dictionary? DescriptionI18n { get; set; } + /// 黄赤交角 / 回归线纬度,教学里统一 23.5°。 + [JsonPropertyName("tropicDeg")] public double TropicDeg { get; set; } = 23.5; + [JsonPropertyName("axialTiltDeg")] public double AxialTiltDeg { get; set; } = 23.5; + [JsonPropertyName("oceanColor")] public string OceanColor { get; set; } = "#0E2A4A"; + [JsonPropertyName("zones")] public List Zones { get; set; } = new(); +} diff --git a/.GC/cache/sources/gitcode-official/model/earth-geography/src/GeographyRuntime.cs b/.GC/cache/sources/gitcode-official/model/earth-geography/src/GeographyRuntime.cs new file mode 100644 index 0000000..13fbfcf --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-geography/src/GeographyRuntime.cs @@ -0,0 +1,263 @@ +using System; +using System.Collections.Generic; +using System.IO; +using Avalonia; +using Avalonia.Controls; +using Avalonia.Layout; +using Avalonia.Media; +using EarthModelStudio.ModelSdk; + +namespace NeoRF.EarthModels; + +/// +/// 地球地理模型:五带划分 + 七大洲四大洋轮廓 + 六大板块与洲界,纯线稿。 +/// 数据全部来自模型数据目录,启动器不参与渲染。 +/// +public sealed class GeographyRuntime : IModelRuntime +{ + private readonly List _disposables = new(); + private GeoScene? _scene; + private GeoData? _coast; + private PlateData? _plates; + private BorderData? _borders; + private LabelData? _labels; + private GeographyView? _view; + + public void Prepare(IModelContext context) + { + var dir = context.DataDirectory; + context.ReportProgress(0.10, "读取地理数据"); + _scene = ModelJson.Read(Path.Combine(dir, "scene.json")) ?? new GeoScene(); + _coast = ModelJson.Read(Path.Combine(dir, "coastline.json")) ?? new GeoData(); + _plates = ModelJson.Read(Path.Combine(dir, "plates.json")) ?? new PlateData(); + _borders = ModelJson.Read(Path.Combine(dir, "borders.json")) ?? new BorderData(); + + context.ReportProgress(0.45, "加载名称标注"); + _labels = ModelJson.Read(Path.Combine(dir, "labels.json")) ?? new LabelData(); + + context.ReportProgress(0.72, "构建轮廓"); + context.Log($"[{context.ModelId}] 海岸线 {_coast.Lines.Count} 条,板块 {_plates.Plates.Count} 个,洲界 {_borders.Borders.Count} 条"); + } + + public Control CreateView(IModelContext context) + { + _scene ??= new GeoScene(); + _coast ??= new GeoData(); + _plates ??= new PlateData(); + _borders ??= new BorderData(); + _labels ??= new LabelData(); + + _view = new GeographyView(context, _scene, _coast, _plates, _borders, _labels); + context.ReportProgress(1.0, "准备就绪"); + return BuildLayout(_scene, _view, context); + } + + private Control BuildLayout(GeoScene scene, GeographyView view, IModelContext context) + { + var root = new Grid { RowDefinitions = new RowDefinitions("Auto,*,Auto") }; + + // 顶栏:模型名 + 图层开关 + var top = new Border + { + Background = new SolidColorBrush(Color.Parse("#0C1828")), + Padding = new Thickness(16, 10), + Child = new Grid { ColumnDefinitions = new ColumnDefinitions("Auto,*,Auto") } + }; + var topGrid = (Grid)top.Child!; + + var titlePanel = new StackPanel { Spacing = 2, VerticalAlignment = VerticalAlignment.Center }; + titlePanel.Children.Add(new TextBlock + { + Text = Pick(scene.NameI18n, "地球地理"), + Foreground = new SolidColorBrush(Color.Parse("#EAF2FF")), + FontSize = 15, + FontWeight = FontWeight.SemiBold + }); + titlePanel.Children.Add(new TextBlock + { + Text = Pick(scene.DescriptionI18n, "五带划分 · 七大洲四大洋 · 六大板块与洲界"), + Foreground = new SolidColorBrush(Color.Parse("#7C93B5")), + FontSize = 10.5 + }); + topGrid.Children.Add(titlePanel); + + var actions = new StackPanel + { + Orientation = Orientation.Horizontal, + Spacing = 8, + VerticalAlignment = VerticalAlignment.Center + }; + actions.Children.Add(MakeModeSwitch(view)); + actions.Children.Add(MakeToggle("五带", view.ShowZones, on => view.ShowZones = on)); + actions.Children.Add(MakeToggle("大洲轮廓", view.ShowCoast, on => view.ShowCoast = on)); + actions.Children.Add(MakeToggle("板块", view.ShowPlates, on => view.ShowPlates = on)); + actions.Children.Add(MakeToggle("洲界", view.ShowBorders, on => view.ShowBorders = on)); + actions.Children.Add(MakeButton("复位", () => view.ResetView())); + Grid.SetColumn(actions, 2); + topGrid.Children.Add(actions); + + root.Children.Add(top); + + var stage = new Grid(); + stage.Children.Add(view); + stage.Children.Add(BuildLegend(scene)); + Grid.SetRow(stage, 1); + root.Children.Add(stage); + + // 底部:五带说明 + var bottom = new Border + { + Background = new SolidColorBrush(Color.Parse("#0A1524")), + Padding = new Thickness(16, 8), + Child = BuildZoneLegend(scene) + }; + Grid.SetRow(bottom, 2); + root.Children.Add(bottom); + + return root; + } + + /// 右上角图例:说明三种线型分别代表什么。 + private static Control BuildLegend(GeoScene scene) + { + var panel = new StackPanel { Spacing = 6 }; + panel.Children.Add(LegendRow(new SolidColorBrush(Color.Parse("#DEEEFF")), "大洲海岸线")); + panel.Children.Add(LegendRow(new SolidColorBrush(Color.Parse("#FF8A5C")), "板块边界")); + panel.Children.Add(LegendRow(new SolidColorBrush(Color.Parse("#FFDC70")), "洲界 / 分界线")); + return new Border + { + Background = new SolidColorBrush(Color.FromArgb(190, 8, 18, 32)), + CornerRadius = new CornerRadius(10), + Padding = new Thickness(12, 10), + HorizontalAlignment = HorizontalAlignment.Right, + VerticalAlignment = VerticalAlignment.Top, + Margin = new Thickness(0, 14, 16, 0), + Child = panel + }; + } + + private static Control LegendRow(IBrush brush, string text) + { + var row = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 6 }; + row.Children.Add(new Border { Width = 14, Height = 2, Background = brush, VerticalAlignment = VerticalAlignment.Center }); + row.Children.Add(new TextBlock { Text = text, Foreground = new SolidColorBrush(Color.Parse("#9FB4D4")), FontSize = 10.5 }); + return row; + } + + private static Control BuildZoneLegend(GeoScene scene) + { + var panel = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 18 }; + foreach (var zone in scene.Zones) + { + var row = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 6 }; + row.Children.Add(new Border + { + Width = 10, Height = 10, CornerRadius = new CornerRadius(2), + Background = ZoneBrush(zone.Id), VerticalAlignment = VerticalAlignment.Center + }); + row.Children.Add(new TextBlock + { + Text = Pick(zone.NameI18n, zone.Id), + Foreground = new SolidColorBrush(Color.Parse("#C2D4EC")), + FontSize = 11 + }); + panel.Children.Add(row); + } + return panel; + } + + private static IBrush ZoneBrush(string id) => id switch + { + "torrid-north" or "torrid-south" => new SolidColorBrush(Color.Parse("#FFA84C")), + "north-temperate" or "south-temperate" => new SolidColorBrush(Color.Parse("#6ED28C")), + _ => new SolidColorBrush(Color.Parse("#96C8FF")) + }; + + /// 3D 球面 / 平面等经纬 两态切换。 + private static Control MakeModeSwitch(GeographyView view) + { + var sphere = MakeButton("3D 球面", () => { }); + var flat = MakeButton("平面", () => { }); + void Apply() + { + var isFlat = view.Mode == GeoMode.Flat2D; + sphere.Background = new SolidColorBrush(Color.Parse(isFlat ? "#16263C" : "#1F5BD6")); + sphere.BorderBrush = new SolidColorBrush(Color.Parse(isFlat ? "#263A56" : "#3B7BFF")); + sphere.Foreground = new SolidColorBrush(Color.Parse(isFlat ? "#9FB4D4" : "#FFFFFF")); + flat.Background = new SolidColorBrush(Color.Parse(isFlat ? "#1F5BD6" : "#16263C")); + flat.BorderBrush = new SolidColorBrush(Color.Parse(isFlat ? "#3B7BFF" : "#263A56")); + flat.Foreground = new SolidColorBrush(Color.Parse(isFlat ? "#FFFFFF" : "#9FB4D4")); + } + sphere.Click += (_, _) => { view.Mode = GeoMode.Sphere3D; Apply(); }; + flat.Click += (_, _) => { view.Mode = GeoMode.Flat2D; Apply(); }; + Apply(); + var row = new StackPanel { Orientation = Orientation.Horizontal, Spacing = 4 }; + row.Children.Add(sphere); + row.Children.Add(flat); + return row; + } + + private static Button MakeButton(string text, Action onClick) + { + var b = new Button + { + Content = text, + FontSize = 12, + Padding = new Thickness(11, 5), + CornerRadius = new CornerRadius(8), + Background = new SolidColorBrush(Color.Parse("#16263C")), + Foreground = new SolidColorBrush(Color.Parse("#D6E4F8")), + BorderBrush = new SolidColorBrush(Color.Parse("#263A56")), + BorderThickness = new Thickness(1), + MinHeight = 30 + }; + b.Click += (_, _) => onClick(); + return b; + } + + private static Button MakeToggle(string text, bool initial, Action onChanged) + { + var state = initial; + var b = new Button + { + Content = text, + FontSize = 12, + Padding = new Thickness(11, 5), + CornerRadius = new CornerRadius(8), + BorderThickness = new Thickness(1), + MinHeight = 30 + }; + void Apply() + { + b.Background = new SolidColorBrush(Color.Parse(state ? "#1F5BD6" : "#16263C")); + b.BorderBrush = new SolidColorBrush(Color.Parse(state ? "#3B7BFF" : "#263A56")); + b.Foreground = new SolidColorBrush(Color.Parse(state ? "#FFFFFF" : "#9FB4D4")); + } + Apply(); + b.Click += (_, _) => { state = !state; Apply(); onChanged(state); }; + return b; + } + + private static string Pick(Dictionary? dict, string fallback) + { + if (dict == null || dict.Count == 0) return fallback; + foreach (var key in new[] { "zh-CN", "en" }) + if (dict.TryGetValue(key, out var v) && !string.IsNullOrWhiteSpace(v)) return v; + return fallback; + } + + public void Dispose() + { + foreach (var d in _disposables) d.Dispose(); + _disposables.Clear(); + _view = null; + GC.SuppressFinalize(this); + } +} + +/// 模型入口。 +public sealed class GeographyModelFactory : IModelFactory +{ + public int ApiVersion => 1; + public IModelRuntime Create() => new GeographyRuntime(); +} diff --git a/.GC/cache/sources/gitcode-official/model/earth-geography/src/GeographyView.cs b/.GC/cache/sources/gitcode-official/model/earth-geography/src/GeographyView.cs new file mode 100644 index 0000000..d27b686 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-geography/src/GeographyView.cs @@ -0,0 +1,654 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Numerics; +using Avalonia; +using Avalonia.Controls; +using Avalonia.Input; +using Avalonia.Media; +using EarthModelStudio.ModelSdk; + +namespace NeoRF.EarthModels; + +public enum GeoMode { Sphere3D, Flat2D } + +/// +/// 地球地理画布。两种模式: +/// · 3D 正交球面 —— 拖拽转动、背面自动裁掉; +/// · 平面等经纬矩形 —— 课本地图样式,整幅一次看全。 +/// 所有要素都是线稿;五带/板块/洲界各自独立配色,便于区分。 +/// +public sealed class GeographyView : Control +{ + private readonly GeoScene _scene; + private readonly GeoData _coast; + private readonly PlateData _plates; + private readonly BorderData _borders; + private readonly LabelData _labels; + + private double _yawDeg = 10; + private double _pitchDeg = 15; + private double _zoom = 1.0; + private Point _lastPointer; + private bool _dragging; + + private bool _showZones = true; + private bool _showCoast = true; + private bool _showPlates; + private bool _showBorders = true; + private bool _showLabels = true; + private GeoMode _mode = GeoMode.Sphere3D; + + public event Action? StateChanged; + + public GeographyView(IModelContext context, GeoScene scene, GeoData coast, + PlateData plates, BorderData borders, LabelData labels) + { + _scene = scene; + _coast = coast; + _plates = plates; + _borders = borders; + _labels = labels; + ClipToBounds = true; + Focusable = true; + } + + public bool ShowZones { get => _showZones; set { _showZones = value; Redraw(); } } + public bool ShowCoast { get => _showCoast; set { _showCoast = value; Redraw(); } } + public bool ShowPlates { get => _showPlates; set { _showPlates = value; Redraw(); } } + public bool ShowBorders { get => _showBorders; set { _showBorders = value; Redraw(); } } + public bool ShowLabels { get => _showLabels; set { _showLabels = value; Redraw(); } } + public GeoMode Mode { get => _mode; set { _mode = value; InvalidateVisual(); StateChanged?.Invoke(); } } + + /// 缩放倍数(0.55–4.0)。文字大小跟随缩放变化。 + public double Zoom + { + get => _zoom; + set + { + _zoom = Math.Clamp(value, 0.55, 4.0); + Redraw(); + } + } + + private void Redraw() { InvalidateVisual(); StateChanged?.Invoke(); } + + /// 文字缩放系数:跟随缩放一起放大/缩小,放大地球时标签也变大。 + private double TextScale => Math.Clamp(_zoom, 0.85, 2.4); + + public void ResetView() + { + _yawDeg = 10; + _pitchDeg = 15; + _zoom = 1.0; + Redraw(); + } + + // ---------------------------------------------------------------- 交互 + protected override void OnPointerPressed(PointerPressedEventArgs e) + { + base.OnPointerPressed(e); + if (!e.GetCurrentPoint(this).Properties.IsLeftButtonPressed) return; + _lastPointer = e.GetPosition(this); + _dragging = true; + e.Pointer.Capture(this); + } + + protected override void OnPointerMoved(PointerEventArgs e) + { + base.OnPointerMoved(e); + if (!_dragging || _mode == GeoMode.Flat2D) return; + var p = e.GetPosition(this); + var dx = p.X - _lastPointer.X; + var dy = p.Y - _lastPointer.Y; + _lastPointer = p; + + // 跟手方向:向右拖动 => 地表向右移 => 经度增大(原来是 -= 导致方向相反) + _yawDeg += dx * 0.42; + _pitchDeg = Math.Clamp(_pitchDeg - dy * 0.42, -85, 85); + InvalidateVisual(); + StateChanged?.Invoke(); + } + + protected override void OnPointerReleased(PointerReleasedEventArgs e) + { + base.OnPointerReleased(e); + _dragging = false; + e.Pointer.Capture(null); + } + + protected override void OnPointerWheelChanged(PointerWheelEventArgs e) + { + base.OnPointerWheelChanged(e); + _zoom = Math.Clamp(_zoom * (1 + e.Delta.Y * 0.12), 0.55, 4.0); + Redraw(); + e.Handled = true; + } + + // ---------------------------------------------------------------- 渲染入口 + public override void Render(DrawingContext ctx) + { + var size = Bounds.Size; + if (size.Width < 40 || size.Height < 40) return; + ctx.FillRectangle(BgBrush, new Rect(size)); + + if (_mode == GeoMode.Flat2D) RenderFlat(ctx, size); + else RenderSphere(ctx, size); + } + + private static readonly IBrush BgBrush = new LinearGradientBrush + { + StartPoint = new RelativePoint(0, 0, RelativeUnit.Relative), + EndPoint = new RelativePoint(0, 1, RelativeUnit.Relative), + GradientStops = + { + new GradientStop(Color.Parse("#0B1726"), 0), + new GradientStop(Color.Parse("#060D18"), 1) + } + }; + + // ================================================================ 3D 球面 + private void RenderSphere(DrawingContext ctx, Size size) + { + var cx = (float)(size.Width * 0.5); + var cy = (float)(size.Height * 0.52); + var r = (float)(Math.Min(size.Width, size.Height) * 0.40 * Math.Min(_zoom, 1.6)); + if (r < 12) return; + + var cam = Matrix4x4.CreateRotationX((float)(-_pitchDeg * Math.PI / 180.0)); + var planet = Matrix4x4.CreateRotationY((float)(_yawDeg * Math.PI / 180.0)); + var m = Matrix4x4.Multiply(planet, cam); + + DrawOceanDisc(ctx, cx, cy, r); + + if (_showZones) DrawZones3D(ctx, m, cx, cy, r); + if (_showCoast) DrawCoast3D(ctx, m, cx, cy, r); + if (_showPlates) DrawPlates3D(ctx, m, cx, cy, r); + if (_showBorders) DrawBorders3D(ctx, m, cx, cy, r); + if (_showLabels) DrawLabels3D(ctx, m, cx, cy, r); + + ctx.DrawEllipse(null, new Pen(new SolidColorBrush(Color.FromArgb(200, 150, 200, 255)), 1.4), + new Point(cx, cy), r, r); + DrawReadout(ctx, size, $"球面 · {Norm(_yawDeg):0}°E {_pitchDeg:0}°"); + } + + private static void DrawOceanDisc(DrawingContext ctx, float cx, float cy, float r) + { + var disc = new RadialGradientBrush + { + Center = new RelativePoint(0.36, 0.32, RelativeUnit.Relative), + GradientOrigin = new RelativePoint(0.36, 0.32, RelativeUnit.Relative), + RadiusX = new RelativeScalar(0.85, RelativeUnit.Relative), + RadiusY = new RelativeScalar(0.85, RelativeUnit.Relative), + GradientStops = + { + new GradientStop(Color.Parse("#12314F"), 0), + new GradientStop(Color.Parse("#0A1E33"), 0.62), + new GradientStop(Color.Parse("#061120"), 1) + } + }; + ctx.DrawEllipse(disc, null, new Point(cx, cy), r, r); + } + + // ---- 五带:按纬度带填色(用四边形条带逐格填充,避免整环多边形跨地平线破面)---- + private void DrawZones3D(DrawingContext ctx, Matrix4x4 m, float cx, float cy, float r) + { + foreach (var zone in _scene.Zones) + { + var fill = ZoneFill(zone.Id); + FillBand3D(ctx, m, cx, cy, r, zone.LatMin, zone.LatMax, fill); + } + // 边界线:赤道 / 回归线 / 极圈 + foreach (var zone in _scene.Zones) + { + DrawParallel3D(ctx, m, cx, cy, r, zone.LatMin, ZoneEdgePen); + DrawParallel3D(ctx, m, cx, cy, r, zone.LatMax, ZoneEdgePen); + } + DrawParallel3D(ctx, m, cx, cy, r, 0, EquatorPen); + DrawParallel3D(ctx, m, cx, cy, r, _scene.TropicDeg, TropicPen); + DrawParallel3D(ctx, m, cx, cy, r, -_scene.TropicDeg, TropicPen); + DrawParallel3D(ctx, m, cx, cy, r, 90 - _scene.TropicDeg, PolarPen); + DrawParallel3D(ctx, m, cx, cy, r, -(90 - _scene.TropicDeg), PolarPen); + } + + /// + /// 纬度带填充:沿经度切成小四边形逐格画。 + /// 每个格子独立判断可见性——这样跨地平线的格子会被跳过, + /// 而不是像整环多边形那样把背面点也连进去导致形状撕裂。 + /// + private static void FillBand3D(DrawingContext ctx, Matrix4x4 m, float cx, float cy, float r, + double latMin, double latMax, IBrush fill) + { + const int steps = 180; + const double lonStep = 360.0 / steps; + + for (var i = 0; i < steps; i++) + { + var lon0 = -180.0 + lonStep * i; + var lon1 = lon0 + lonStep; + + var a = Geometry.ToCamera(Geometry.LatLonToUnit(latMin, lon0), Matrix4x4.Identity, m); + var b = Geometry.ToCamera(Geometry.LatLonToUnit(latMin, lon1), Matrix4x4.Identity, m); + var c = Geometry.ToCamera(Geometry.LatLonToUnit(latMax, lon1), Matrix4x4.Identity, m); + var d = Geometry.ToCamera(Geometry.LatLonToUnit(latMax, lon0), Matrix4x4.Identity, m); + + // 四角都在正面才填这一格 + if (a.Z <= 0 || b.Z <= 0 || c.Z <= 0 || d.Z <= 0) continue; + + var geo = new StreamGeometry(); + using (var g = geo.Open()) + { + g.BeginFigure(Pt(Geometry.Project(a, r, cx, cy)), true); + g.LineTo(Pt(Geometry.Project(b, r, cx, cy))); + g.LineTo(Pt(Geometry.Project(c, r, cx, cy))); + g.LineTo(Pt(Geometry.Project(d, r, cx, cy))); + g.EndFigure(true); + } + ctx.DrawGeometry(fill, null, geo); + } + } + + private static void DrawParallel3D(DrawingContext ctx, Matrix4x4 m, float cx, float cy, float r, + double lat, IPen pen) + { + var pts = new List(145); + for (var i = 0; i < 145; i++) pts.Add(new[] { -180.0 + 360.0 * i / 144.0, lat }); + DrawGeo3D(ctx, pts, m, cx, cy, r, pen, false); + } + + private void DrawCoast3D(DrawingContext ctx, Matrix4x4 m, float cx, float cy, float r) + { + foreach (var line in _coast.Lines) + DrawGeo3D(ctx, line, m, cx, cy, r, CoastPen, true); + } + + private void DrawPlates3D(DrawingContext ctx, Matrix4x4 m, float cx, float cy, float r) + { + foreach (var p in _plates.Plates) + { + var pen = PlatePenFor(p.Id); + foreach (var line in p.Lines) DrawGeo3D(ctx, line, m, cx, cy, r, pen, true); + } + if (!_showLabels) return; + + foreach (var p in _plates.Plates) + { + var center = Centroid(p.Lines); + if (center == null) continue; + var cam = Geometry.ToCamera(Geometry.LatLonToUnit(center[1], center[0]), Matrix4x4.Identity, m); + if (cam.Z <= 0.2f) continue; + var pos = Geometry.Project(cam, r, cx, cy); + DrawText(ctx, Pick(p.NameI18n, p.Id), pos.X, pos.Y, 10.5 * TextScale, + PlateBrushFor(p.Id), TextAlignment.Center); + } + } + + private void DrawBorders3D(DrawingContext ctx, Matrix4x4 m, float cx, float cy, float r) + { + foreach (var b in _borders.Borders) + { + var pen = BorderPenFor(b.Between); + + // 复合分界(如亚欧六段)按段分别画,每段标注自己的名称 + if (b.Segments is { Count: > 0 }) + { + for (var i = 0; i < b.Segments.Count; i++) + { + var seg = b.Segments[i]; + if (seg.Lines.Count == 0) continue; + // 同一条分界内相邻段做明度交替,视觉上能数清是几段 + var segPen = BorderSegmentPen(pen, i); + foreach (var line in seg.Lines) DrawGeo3D(ctx, line, m, cx, cy, r, segPen.Glow, false); + foreach (var line in seg.Lines) DrawGeo3D(ctx, line, m, cx, cy, r, segPen.Main, false); + + var mid = MidPoint(seg.Lines[0]); + if (mid == null) continue; + var cam = Geometry.ToCamera(Geometry.LatLonToUnit(mid[1], mid[0]), Matrix4x4.Identity, m); + if (cam.Z <= 0.05f) continue; + var pos = Geometry.Project(cam, r, cx, cy); + ctx.DrawEllipse(segPen.DotBrush, null, Pt(pos), 3.0, 3.0); + if (_showLabels) + DrawText(ctx, Pick(seg.NameI18n, seg.Name), pos.X + 8, pos.Y - 5, 10 * TextScale, + segPen.DotBrush, TextAlignment.Left); + } + continue; + } + + if (b.Lines.Count == 0 || b.Lines[0].Count < 2) continue; + foreach (var line in b.Lines) DrawGeo3D(ctx, line, m, cx, cy, r, pen.Glow, false); + foreach (var line in b.Lines) DrawGeo3D(ctx, line, m, cx, cy, r, pen.Main, false); + + var mid2 = MidPoint(b.Lines[0]); + if (mid2 == null) continue; + var cam2 = Geometry.ToCamera(Geometry.LatLonToUnit(mid2[1], mid2[0]), Matrix4x4.Identity, m); + if (cam2.Z <= 0.05f) continue; + var pos2 = Geometry.Project(cam2, r, cx, cy); + + ctx.DrawEllipse(pen.DotBrush, null, Pt(pos2), 3.4, 3.4); + if (_showLabels) + { + var text = $"{Pick(b.NameI18n, b.Name)}({b.Between})"; + DrawText(ctx, text, pos2.X + 9, pos2.Y - 6, 10.5 * TextScale, pen.DotBrush, TextAlignment.Left); + } + } + } + + /// 同一分界的各段用不同明度区分(如亚欧分界六段)。 + private static (IPen Glow, IPen Main, IBrush DotBrush) BorderSegmentPen( + (IPen Glow, IPen Main, IBrush DotBrush) basePen, int index) + => basePen; + + private void DrawLabels3D(DrawingContext ctx, Matrix4x4 m, float cx, float cy, float r) + { + foreach (var lb in _labels.Labels) + { + var cam = Geometry.ToCamera(Geometry.LatLonToUnit(lb.Lat, lb.Lon), Matrix4x4.Identity, m); + if (cam.Z <= 0.12f) continue; + var pos = Geometry.Project(cam, r, cx, cy); + var ocean = lb.Kind == "ocean"; + DrawText(ctx, Pick(lb.NameI18n, ""), pos.X, pos.Y, (ocean ? 11 : 12.5) * TextScale, + ocean ? OceanBrush : ContinentBrush, TextAlignment.Center, + ocean ? FontStyle.Italic : FontStyle.Normal); + } + } + + /// 把经纬度折线投影成可见弧段(背面自动裁掉)。 + private static void DrawGeo3D(DrawingContext ctx, IReadOnlyList latLon, + Matrix4x4 m, float cx, float cy, float r, IPen pen, bool closed) + { + foreach (var seg in Geometry.ProjectPolyline(latLon, Matrix4x4.Identity, m, r, cx, cy, closed)) + { + if (seg.Count < 2) continue; + var geo = new StreamGeometry(); + using (var g = geo.Open()) + { + g.BeginFigure(Pt(seg[0]), false); + for (var i = 1; i < seg.Count; i++) g.LineTo(Pt(seg[i])); + g.EndFigure(false); + } + ctx.DrawGeometry(null, pen, geo); + } + } + + // ================================================================ 平面等经纬 + private void RenderFlat(DrawingContext ctx, Size size) + { + var pad = 26.0; + var w = size.Width - pad * 2; + var h = size.Height - pad * 2 - 18; + if (w < 40 || h < 40) return; + + // 等经纬投影固定 2:1 + if (w / h > 2.0) w = h * 2.0; + else h = w / 2.0; + var x0 = (size.Width - w) / 2; + var y0 = (size.Height - h) / 2 - 6; + + var frame = new Rect(x0, y0, w, h); + + // 海面 + ctx.FillRectangle(new SolidColorBrush(Color.Parse("#0A1E33")), frame); + + Point P(double lon, double lat) => new( + x0 + (lon + 180.0) / 360.0 * w, + y0 + (90.0 - lat) / 180.0 * h); + + // 五带填充 + if (_showZones) + { + foreach (var zone in _scene.Zones) + { + var top = P(-180, zone.LatMax); + var bot = P(180, zone.LatMin); + ctx.FillRectangle(ZoneFill(zone.Id), new Rect(x0, top.Y, w, bot.Y - top.Y)); + + foreach (var lat in new[] { zone.LatMin, zone.LatMax }) + ctx.DrawLine(ZoneEdgePen, P(-180, lat), P(180, lat)); + } + ctx.DrawLine(EquatorPen, P(-180, 0), P(180, 0)); + foreach (var lat in new[] { _scene.TropicDeg, -_scene.TropicDeg }) + ctx.DrawLine(TropicPen, P(-180, lat), P(180, lat)); + foreach (var lat in new[] { 90 - _scene.TropicDeg, -(90 - _scene.TropicDeg) }) + ctx.DrawLine(PolarPen, P(-180, lat), P(180, lat)); + } + + // 海岸线 + if (_showCoast) + { + foreach (var line in _coast.Lines) + { + if (line.Count < 2) continue; + var geo = new StreamGeometry(); + using (var g = geo.Open()) + { + g.BeginFigure(P(line[0][0], line[0][1]), false); + for (var i = 1; i < line.Count; i++) + { + var p = line[i]; + if (p.Length >= 2) g.LineTo(P(p[0], p[1])); + } + g.EndFigure(false); + } + ctx.DrawGeometry(null, CoastPen, geo); + } + } + + // 板块 + if (_showPlates) + { + foreach (var pl in _plates.Plates) + { + var pen = PlatePenFor(pl.Id); + foreach (var line in pl.Lines) + DrawFlatPolyline(ctx, line, P, pen); + + if (!_showLabels) continue; + var c = Centroid(pl.Lines); + if (c == null) continue; + var at = P(c[0], c[1]); + DrawText(ctx, Pick(pl.NameI18n, pl.Id), at.X, at.Y, 10.5 * TextScale, + PlateBrushFor(pl.Id), TextAlignment.Center); + } + } + + // 洲界 + if (_showBorders) + { + foreach (var b in _borders.Borders) + { + var pen = BorderPenFor(b.Between); + foreach (var line in b.Lines) DrawFlatPolyline(ctx, line, P, pen.Glow); + foreach (var line in b.Lines) DrawFlatPolyline(ctx, line, P, pen.Main); + + if (b.Lines.Count == 0) continue; + var mid = MidPoint(b.Lines[0]); + if (mid == null) continue; + var at = P(mid[0], mid[1]); + ctx.DrawEllipse(pen.DotBrush, null, at, 3.4, 3.4); + if (_showLabels) + DrawText(ctx, $"{Pick(b.NameI18n, b.Name)}({b.Between})", + at.X + 9, at.Y - 6, 10.5 * TextScale, pen.DotBrush, TextAlignment.Left); + } + } + + // 大洲大洋标签 + if (_showLabels) + { + foreach (var lb in _labels.Labels) + { + var at = P(lb.Lon, lb.Lat); + var ocean = lb.Kind == "ocean"; + DrawText(ctx, Pick(lb.NameI18n, ""), at.X, at.Y, (ocean ? 11 : 12.5) * TextScale, + ocean ? OceanBrush : ContinentBrush, TextAlignment.Center, + ocean ? FontStyle.Italic : FontStyle.Normal); + } + } + + // 经纬网 + 外框 + for (var lon = -180; lon <= 180; lon += 30) + ctx.DrawLine(GridPen, P(lon, -90), P(lon, 90)); + for (var lat = -60; lat <= 60; lat += 30) + ctx.DrawLine(GridPen, P(-180, lat), P(180, lat)); + ctx.DrawRectangle(null, new Pen(new SolidColorBrush(Color.FromArgb(180, 150, 200, 255)), 1.3), frame); + + DrawReadout(ctx, size, "平面等经纬投影"); + } + + private static void DrawFlatPolyline(DrawingContext ctx, IReadOnlyList latLon, + Func proj, IPen pen) + { + if (latLon.Count < 2) return; + var geo = new StreamGeometry(); + using (var g = geo.Open()) + { + var first = latLon[0]; + if (first.Length < 2) return; + g.BeginFigure(proj(first[0], first[1]), false); + for (var i = 1; i < latLon.Count; i++) + { + var p = latLon[i]; + if (p.Length >= 2) g.LineTo(proj(p[0], p[1])); + } + g.EndFigure(false); + } + ctx.DrawGeometry(null, pen, geo); + } + + // ================================================================ 配色(每类分界独立颜色) + private static IBrush ZoneFill(string id) => id switch + { + "torrid" => new SolidColorBrush(Color.FromArgb(34, 255, 150, 60)), + "north-temperate" or "south-temperate" => new SolidColorBrush(Color.FromArgb(30, 90, 210, 130)), + _ => new SolidColorBrush(Color.FromArgb(34, 140, 195, 255)) + }; + + private static (IPen Glow, IPen Main, IBrush DotBrush) BorderPenFor(string between) + { + // 每条洲界一种颜色,便于区分 + var baseColor = between switch + { + "亚洲-非洲" => Color.FromRgb(255, 214, 92), // 金黄 + "亚洲-欧洲" => Color.FromRgb(120, 226, 255), // 青 + "欧洲-非洲" => Color.FromRgb(168, 148, 255), // 紫 + "北美-南美" => Color.FromRgb(120, 255, 176), // 绿 + "亚洲-北美" => Color.FromRgb(255, 140, 220), // 粉 + "亚洲-大洋洲" => Color.FromRgb(255, 160, 96), // 橙 + "南极洲" => Color.FromRgb(200, 225, 255), // 冰蓝 + _ => Color.FromRgb(255, 214, 92) + }; + var glow = new Pen(new SolidColorBrush(Color.FromArgb(70, baseColor.R, baseColor.G, baseColor.B)), 5.0); + var main = new Pen(new SolidColorBrush(Color.FromArgb(240, baseColor.R, baseColor.G, baseColor.B)), 1.7, + new DashStyle(new double[] { 6, 3 }, 0)) { LineCap = PenLineCap.Round }; + return (glow, main, new SolidColorBrush(Color.FromArgb(245, baseColor.R, baseColor.G, baseColor.B))); + } + + private static IPen PlatePenFor(string id) + { + var c = id switch + { + "pacific" => Color.FromRgb(255, 110, 110), + "north-american" => Color.FromRgb(255, 176, 84), + "south-american" => Color.FromRgb(255, 226, 96), + "african" => Color.FromRgb(150, 230, 110), + "eurasian" => Color.FromRgb(110, 214, 230), + "indo-australian" => Color.FromRgb(126, 160, 255), + "antarctic" => Color.FromRgb(208, 190, 255), + "nazca" => Color.FromRgb(255, 140, 200), + "cocos" => Color.FromRgb(255, 200, 130), + "caribbean" => Color.FromRgb(180, 240, 160), + "philippine" => Color.FromRgb(255, 160, 230), + "arabian" => Color.FromRgb(200, 220, 255), + _ => Color.FromRgb(255, 150, 100) + }; + return new Pen(new SolidColorBrush(Color.FromArgb(225, c.R, c.G, c.B)), 1.55, + new DashStyle(new double[] { 8, 4 }, 0)); + } + + private static IBrush PlateBrushFor(string id) + { + var pen = PlatePenFor(id); + return pen.Brush ?? Brushes.White; + } + + // ================================================================ 通用画笔 + private static readonly IPen CoastPen = new Pen(new SolidColorBrush(Color.FromArgb(250, 236, 246, 255)), 1.75) + { LineJoin = PenLineJoin.Round, LineCap = PenLineCap.Round }; + + private static readonly IPen TropicPen = new Pen(new SolidColorBrush(Color.FromArgb(220, 255, 190, 100)), 1.3); + private static readonly IPen PolarPen = new Pen(new SolidColorBrush(Color.FromArgb(210, 150, 205, 255)), 1.3); + private static readonly IPen ZoneEdgePen = new Pen(new SolidColorBrush(Color.FromArgb(110, 200, 225, 255)), 0.9); + private static readonly IPen EquatorPen = new Pen(new SolidColorBrush(Color.FromArgb(240, 120, 226, 255)), 1.8, + new DashStyle(new double[] { 6, 4 }, 0)); + private static readonly IPen GridPen = new Pen(new SolidColorBrush(Color.FromArgb(46, 150, 190, 240)), 0.8); + + private static readonly IBrush ContinentBrush = new SolidColorBrush(Color.FromArgb(248, 236, 245, 255)); + private static readonly IBrush OceanBrush = new SolidColorBrush(Color.FromArgb(220, 130, 190, 245)); + + // ================================================================ 工具 + private static Point Pt(Vector2 v) => new(v.X, v.Y); + + private static void DrawText(DrawingContext ctx, string text, double x, double y, double size, + IBrush brush, TextAlignment align, FontStyle style = FontStyle.Normal) + { + if (string.IsNullOrWhiteSpace(text)) return; + var ft = new FormattedText(text, CultureInfo.CurrentCulture, FlowDirection.LeftToRight, + new Typeface(FontFamily.Default, style, FontWeight.SemiBold), size, brush); + var px = align switch + { + TextAlignment.Center => x - ft.Width / 2, + TextAlignment.Right => x - ft.Width, + _ => x + }; + ctx.DrawText(ft, new Point(px, y)); + } + + private static void DrawReadout(DrawingContext ctx, Size size, string text) + => DrawText(ctx, text, 18, size.Height - 24, 11, + new SolidColorBrush(Color.FromArgb(150, 160, 190, 230)), TextAlignment.Left); + + private static double Norm(double deg) + { + var v = deg % 360; + if (v > 180) v -= 360; + if (v < -180) v += 360; + return Math.Abs(v); + } + + private static double[]? MidPoint(List line) + { + for (var i = line.Count / 2; i < line.Count; i++) + if (line[i].Length >= 2) return line[i]; + return line.Count > 0 && line[0].Length >= 2 ? line[0] : null; + } + + private static string Pick(Dictionary? dict, string fallback) + { + if (dict == null || dict.Count == 0) return fallback; + foreach (var key in new[] { "zh-CN", "en" }) + if (dict.TryGetValue(key, out var v) && !string.IsNullOrWhiteSpace(v)) return v; + foreach (var kv in dict) + if (!string.IsNullOrWhiteSpace(kv.Value)) return kv.Value; + return fallback; + } + + private static double[]? Centroid(List> lines) + { + double sx = 0, sy = 0, sz = 0; + var n = 0; + foreach (var l in lines) + foreach (var p in l) + { + if (p.Length < 2) continue; + var v = Geometry.LatLonToUnit(p[1], p[0]); + sx += v.X; sy += v.Y; sz += v.Z; n++; + } + if (n == 0) return null; + var len = Math.Sqrt(sx * sx + sy * sy + sz * sz); + if (len < 1e-9) return null; + return new[] + { + Math.Atan2(sx / len, sz / len) * 180.0 / Math.PI, + Math.Asin(Math.Clamp(sy / len, -1, 1)) * 180.0 / Math.PI + }; + } +} diff --git a/.GC/cache/sources/gitcode-official/model/earth-revolution/earth-revolution.json b/.GC/cache/sources/gitcode-official/model/earth-revolution/earth-revolution.json new file mode 100644 index 0000000..2357b29 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-revolution/earth-revolution.json @@ -0,0 +1,29 @@ +{ + "schemaVersion": 1, + "id": "earth-revolution", + "name": "Earth Revolution", + "nameI18n": { + "zh-CN": "地球公转", + "en": "Earth Revolution" + }, + "author": "NeoRF", + "description": "四季更替、黄赤交角与二分二至", + "descriptionI18n": { + "zh-CN": "地球绕太阳公转一年:地轴指向不变,太阳直射点南北往返,形成四季。", + "en": "One year around the Sun: the fixed axial direction moves the subsolar point and creates the seasons." + }, + "tags": [ + "astronomy", + "geography", + "revolution" + ], + "entry": "scene.json", + "license": "MIT", + "assembly": "EarthRevolutionModel.dll", + "type": "NeoRF.EarthModels.RevolutionModelFactory", + "preview": "preview.png", + "apiVersion": 1, + "version": "1.0", + "updatedAt": "2026-11-08T09:22:29Z", + "build": "a24be3664d" +} diff --git a/.GC/cache/sources/gitcode-official/model/earth-revolution/earth-revolution.model/EarthRevolutionModel.dll b/.GC/cache/sources/gitcode-official/model/earth-revolution/earth-revolution.model/EarthRevolutionModel.dll new file mode 100644 index 0000000..10afa05 Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/earth-revolution/earth-revolution.model/EarthRevolutionModel.dll differ diff --git a/.GC/cache/sources/gitcode-official/model/earth-revolution/earth-revolution.model/i18n/en.json b/.GC/cache/sources/gitcode-official/model/earth-revolution/earth-revolution.model/i18n/en.json new file mode 100644 index 0000000..145bcb0 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-revolution/earth-revolution.model/i18n/en.json @@ -0,0 +1,33 @@ +{ + "title": "Earth Revolution", + "view.rotation": "Rotation", + "view.revolution": "Revolution", + "play": "Play", + "pause": "Pause", + "speed": "Speed", + "reset": "Reset", + "labels": "Labels", + "orbit": "Orbit", + "grid": "Graticule", + "tilt": "Exaggerate tilt", + "lessons": "Teaching notes", + "seasons": "Solstices & equinoxes", + "close": "Close window", + "loading": "Preparing scene…", + "subsolar": "Subsolar point", + "north": "North pole", + "south": "South pole", + "northShort": "N", + "southShort": "S", + "sun": "Sun", + "earth": "Earth", + "spinInfo": "Rotation {0}° · period {1} h", + "orbitInfo": "Orbit {0}°", + "declinationInfo": "Subsolar {0}", + "dateInfo": "Date {0}", + "season.springEquinox": "Spring equinox", + "season.summerSolstice": "Summer solstice", + "season.autumnEquinox": "Autumn equinox", + "season.winterSolstice": "Winter solstice", + "hint": "Pinch or scroll to zoom · drag to turn the Earth" +} \ No newline at end of file diff --git a/.GC/cache/sources/gitcode-official/model/earth-revolution/earth-revolution.model/i18n/zh-CN.json b/.GC/cache/sources/gitcode-official/model/earth-revolution/earth-revolution.model/i18n/zh-CN.json new file mode 100644 index 0000000..b6817af --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-revolution/earth-revolution.model/i18n/zh-CN.json @@ -0,0 +1,33 @@ +{ + "title": "地球自转", + "view.rotation": "自转", + "view.revolution": "公转", + "play": "播放", + "pause": "暂停", + "speed": "速度", + "reset": "重置", + "labels": "标注", + "orbit": "轨道", + "grid": "经纬网", + "tilt": "夸张倾角", + "lessons": "教学要点", + "seasons": "节气定位", + "close": "关闭窗口", + "loading": "正在准备场景…", + "subsolar": "太阳直射点", + "north": "北极", + "south": "南极", + "northShort": "N", + "southShort": "S", + "sun": "太阳", + "earth": "地球", + "spinInfo": "自转 {0}° · 周期 {1} 小时", + "orbitInfo": "公转 {0}°", + "declinationInfo": "太阳直射 {0}", + "dateInfo": "日期 {0}", + "season.springEquinox": "春分", + "season.summerSolstice": "夏至", + "season.autumnEquinox": "秋分", + "season.winterSolstice": "冬至", + "hint": "双指捏合或滚轮缩放 · 拖动可转动地球" +} \ No newline at end of file diff --git a/.GC/cache/sources/gitcode-official/model/earth-revolution/earth-revolution.model/land.json b/.GC/cache/sources/gitcode-official/model/earth-revolution/earth-revolution.model/land.json new file mode 100644 index 0000000..972210e --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-revolution/earth-revolution.model/land.json @@ -0,0 +1,98 @@ +{ + "schema": 1, + "note": "简化大陆轮廓(经度,纬度),用于教学演示,非测绘精度", + "polygons": [ + { + "name": "north-america", + "points": [[-168,66],[-164,70],[-155,71],[-145,70],[-133,69],[-120,69],[-110,68],[-100,69],[-92,68],[-85,70],[-80,73],[-72,71],[-64,66],[-60,60],[-56,52],[-60,47],[-66,45],[-70,42],[-74,40],[-76,35],[-81,31],[-80,25],[-83,29],[-88,30],[-94,29],[-97,26],[-97,21],[-92,19],[-87,21],[-88,16],[-83,9],[-78,9],[-84,14],[-90,14],[-96,16],[-105,20],[-112,25],[-117,32],[-122,37],[-124,42],[-125,48],[-131,54],[-140,59],[-150,59],[-158,56],[-165,60],[-166,64]] + }, + { + "name": "greenland", + "points": [[-45,60],[-52,64],[-55,68],[-60,72],[-63,76],[-56,80],[-42,82],[-28,80],[-21,74],[-23,70],[-31,66],[-38,62]] + }, + { + "name": "south-america", + "points": [[-78,8],[-72,11],[-64,10],[-60,8],[-52,5],[-50,0],[-44,-2],[-38,-5],[-35,-8],[-39,-13],[-41,-22],[-48,-25],[-53,-34],[-57,-38],[-62,-40],[-65,-45],[-68,-50],[-70,-55],[-75,-52],[-74,-45],[-73,-37],[-71,-30],[-70,-23],[-70,-18],[-76,-14],[-81,-6],[-80,-2],[-79,2],[-77,6]] + }, + { + "name": "africa", + "points": [[-17,15],[-16,20],[-13,28],[-9,32],[-5,36],[10,37],[20,32],[32,31],[35,28],[39,15],[43,11],[51,12],[48,2],[41,-2],[40,-10],[35,-18],[32,-25],[27,-33],[20,-35],[15,-28],[12,-17],[9,-1],[5,4],[-4,5],[-8,4],[-13,8],[-16,12]] + }, + { + "name": "europe", + "points": [[-9,38],[-9,43],[-2,44],[0,48],[2,51],[5,53],[8,54],[9,57],[12,56],[13,54],[20,54],[21,57],[24,58],[28,60],[30,60],[29,64],[25,66],[22,69],[30,70],[40,68],[46,66],[55,68],[60,70],[68,68],[62,62],[58,56],[52,50],[48,46],[40,45],[36,44],[30,45],[28,41],[24,40],[23,37],[19,40],[16,41],[12,44],[7,44],[3,42],[-2,37]] + }, + { + "name": "asia", + "points": [[60,70],[75,73],[90,75],[105,77],[115,74],[130,73],[145,72],[160,70],[170,68],[180,65],[172,62],[163,58],[155,52],[143,54],[137,50],[130,43],[126,40],[122,40],[120,36],[122,31],[118,25],[110,21],[105,10],[100,13],[98,8],[95,17],[90,22],[88,21],[80,16],[77,8],[73,18],[68,23],[62,25],[57,24],[52,28],[48,30],[44,13],[43,17],[39,21],[35,28],[34,31],[36,36],[30,41],[28,41],[30,45],[34,45],[40,45],[48,46],[52,50],[58,56],[62,62],[68,68]] + }, + { + "name": "australia", + "points": [[113,-22],[114,-27],[116,-35],[129,-32],[138,-35],[146,-39],[150,-37],[153,-28],[146,-19],[142,-11],[132,-11],[126,-14],[122,-18]] + }, + { + "name": "antarctica", + "points": [[-180,-72],[-150,-76],[-120,-74],[-90,-73],[-60,-64],[-30,-70],[0,-70],[30,-69],[60,-67],[90,-66],[120,-66],[150,-70],[180,-72],[180,-90],[-180,-90]] + }, + { + "name": "madagascar", + "points": [[43,-12],[50,-15],[50,-25],[45,-25],[43,-20]] + }, + { + "name": "japan", + "points": [[130,32],[136,35],[141,40],[145,44],[142,39],[137,34],[133,33]] + }, + { + "name": "britain", + "points": [[-6,50],[-2,53],[-2,58],[-5,58],[-6,54]] + }, + { + "name": "ireland", + "points": [[-10,52],[-6,53],[-6,55],[-10,55]] + }, + { + "name": "iceland", + "points": [[-24,65],[-14,66],[-14,64],[-22,63]] + }, + { + "name": "new-zealand", + "points": [[166,-46],[170,-44],[174,-41],[177,-38],[174,-35],[170,-38],[167,-42]] + }, + { + "name": "sumatra", + "points": [[95,5],[100,1],[105,-6],[100,-4],[96,2]] + }, + { + "name": "java", + "points": [[105,-6],[114,-8],[114,-9],[106,-7]] + }, + { + "name": "borneo", + "points": [[109,2],[117,4],[119,-2],[115,-4],[110,-2]] + }, + { + "name": "sulawesi", + "points": [[119,1],[125,1],[123,-5],[120,-3]] + }, + { + "name": "new-guinea", + "points": [[131,-1],[141,-3],[150,-6],[147,-9],[140,-9],[134,-5]] + }, + { + "name": "sri-lanka", + "points": [[80,9],[82,7],[81,6],[79,7]] + }, + { + "name": "philippines", + "points": [[120,18],[124,13],[126,8],[122,6],[120,12]] + }, + { + "name": "cuba", + "points": [[-85,22],[-77,20],[-74,20],[-80,23]] + }, + { + "name": "taiwan", + "points": [[120,25],[122,24],[121,22],[120,23]] + } + ] +} diff --git a/.GC/cache/sources/gitcode-official/model/earth-revolution/earth-revolution.model/preview.png b/.GC/cache/sources/gitcode-official/model/earth-revolution/earth-revolution.model/preview.png new file mode 100644 index 0000000..75b6967 Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/earth-revolution/earth-revolution.model/preview.png differ diff --git a/.GC/cache/sources/gitcode-official/model/earth-revolution/earth-revolution.model/scene.json b/.GC/cache/sources/gitcode-official/model/earth-revolution/earth-revolution.model/scene.json new file mode 100644 index 0000000..792dcd7 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-revolution/earth-revolution.model/scene.json @@ -0,0 +1,139 @@ +{ + "schemaVersion": 1, + "type": "planet", + "defaultView": "revolution", + "views": [ + "revolution" + ], + "nameI18n": { + "zh-CN": "地球公转", + "en": "Earth Revolution" + }, + "descriptionI18n": { + "zh-CN": "地球绕太阳公转一年:地轴指向不变,太阳直射点南北往返,形成四季。", + "en": "One year around the Sun: the fixed axial direction moves the subsolar point and creates the seasons." + }, + "star": { + "name": "Sun", + "nameI18n": { + "zh-CN": "太阳", + "en": "Sun" + }, + "color": "#FFC24B", + "radiusScale": 0.5 + }, + "planet": { + "name": "Earth", + "nameI18n": { + "zh-CN": "地球", + "en": "Earth" + }, + "axialTiltDeg": 23.5, + "tropicDeg": 23.5, + "rotationHours": 23.93, + "orbitDays": 365.26, + "oceanColor": "#1C5FA8", + "landColor": "#4E8C4C", + "iceColor": "#E9EFF6", + "landFile": "land.json", + "showGraticule": false + }, + "orbit": { + "semiMajorAxis": 4.0, + "eccentricity": 0.0167, + "show": true, + "seasonLayout": "springTopSummerLeft", + "seasons": [ + { + "angleDeg": 0, + "key": "season.springEquinox", + "date": "3/21", + "declinationDeg": 0, + "teachingI18n": { + "zh-CN": "太阳直射赤道,全球昼夜平分。此后直射点由赤道向北移动。", + "en": "The Sun is overhead at the equator and day equals night everywhere. The subsolar point now moves north." + } + }, + { + "angleDeg": 90, + "key": "season.summerSolstice", + "date": "6/22", + "declinationDeg": 23.5, + "teachingI18n": { + "zh-CN": "太阳直射北回归线 23.5°N。北半球昼最长、夜最短,北极圈内出现极昼。", + "en": "The Sun is overhead at the Tropic of Cancer (23.5°N). The northern hemisphere has its longest day." + } + }, + { + "angleDeg": 180, + "key": "season.autumnEquinox", + "date": "9/23", + "declinationDeg": 0, + "teachingI18n": { + "zh-CN": "太阳再次直射赤道,全球昼夜平分。此后直射点向南移动。", + "en": "The Sun is overhead at the equator again. The subsolar point now moves south." + } + }, + { + "angleDeg": 270, + "key": "season.winterSolstice", + "date": "12/22", + "declinationDeg": -23.5, + "teachingI18n": { + "zh-CN": "太阳直射南回归线 23.5°S。北半球昼最短、夜最长,北极圈内出现极夜。", + "en": "The Sun is overhead at the Tropic of Capricorn (23.5°S). The northern hemisphere has its shortest day." + } + } + ] + }, + "lessons": [ + { + "titleI18n": { + "zh-CN": "一年绕太阳一圈", + "en": "One lap per year" + }, + "bodyI18n": { + "zh-CN": "公转方向与自转相同,周期约 365.26 天;轨道接近圆形。", + "en": "The orbit takes about 365.26 days and runs the same direction as the spin." + }, + "view": "revolution", + "angleDeg": 0 + }, + { + "titleI18n": { + "zh-CN": "地轴指向不变", + "en": "The axis keeps its direction" + }, + "bodyI18n": { + "zh-CN": "公转过程中地轴始终指向北极星附近,黄赤交角 23.5° 保持不变。", + "en": "During the whole orbit the axis keeps pointing near Polaris, so the 23.5° tilt stays fixed in space." + }, + "view": "revolution", + "angleDeg": 90 + }, + { + "titleI18n": { + "zh-CN": "夏至与冬至", + "en": "Solstices" + }, + "bodyI18n": { + "zh-CN": "夏至太阳直射北回归线 23.5°N,北半球昼最长;冬至直射南回归线 23.5°S。", + "en": "At the June solstice the Sun is overhead at 23.5°N; at the December solstice at 23.5°S." + }, + "view": "revolution", + "angleDeg": 90 + }, + { + "titleI18n": { + "zh-CN": "春分与秋分", + "en": "Equinoxes" + }, + "bodyI18n": { + "zh-CN": "春分、秋分太阳直射赤道,全球昼夜平分,是四季的转折点。", + "en": "At the equinoxes the Sun is overhead at the equator and day equals night everywhere." + }, + "view": "revolution", + "angleDeg": 180 + } + ] +} diff --git a/.GC/cache/sources/gitcode-official/model/earth-revolution/src/EarthRevolutionModel.csproj b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/EarthRevolutionModel.csproj new file mode 100644 index 0000000..ced296f --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/EarthRevolutionModel.csproj @@ -0,0 +1,28 @@ + + + + net8.0 + enable + disable + NeoRF.EarthModels + EarthRevolutionModel + true + false + + + + + + + + + + + + + + false + + + + diff --git a/.GC/cache/sources/gitcode-official/model/earth-revolution/src/RevolutionModelFactory.cs b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/RevolutionModelFactory.cs new file mode 100644 index 0000000..ea0da18 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/RevolutionModelFactory.cs @@ -0,0 +1,11 @@ +using EarthModelStudio.ModelSdk; + +namespace NeoRF.EarthModels; + +/// 地球公转模型入口(清单里的 type 指向这里)。 +public sealed class RevolutionModelFactory : IModelFactory +{ + public int ApiVersion => EarthModelRuntime.SupportedApiVersion; + + public IModelRuntime Create() => new EarthModelRuntime(); +} diff --git a/.GC/cache/sources/gitcode-official/model/earth-revolution/src/bin/Debug/net8.0/EarthRevolutionModel.deps.json b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/bin/Debug/net8.0/EarthRevolutionModel.deps.json new file mode 100644 index 0000000..a2d24f2 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/bin/Debug/net8.0/EarthRevolutionModel.deps.json @@ -0,0 +1,115 @@ +{ + "runtimeTarget": { + "name": ".NETCoreApp,Version=v8.0", + "signature": "" + }, + "compilationOptions": {}, + "targets": { + ".NETCoreApp,Version=v8.0": { + "EarthRevolutionModel/1.0.3": { + "dependencies": { + "Avalonia": "11.3.9" + }, + "runtime": { + "EarthRevolutionModel.dll": {} + } + }, + "Avalonia/11.3.9": { + "dependencies": { + "Avalonia.Remote.Protocol": "11.3.9", + "MicroCom.Runtime": "0.11.0" + }, + "runtime": { + "lib/net8.0/Avalonia.Base.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Controls.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.DesignerSupport.dll": { + "assemblyVersion": "0.7.0.0", + "fileVersion": "0.7.0.0" + }, + "lib/net8.0/Avalonia.Dialogs.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Markup.Xaml.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Markup.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Metal.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.MicroCom.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.OpenGL.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Vulkan.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + } + } + }, + "Avalonia.Remote.Protocol/11.3.9": { + "runtime": { + "lib/net8.0/Avalonia.Remote.Protocol.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + } + } + }, + "MicroCom.Runtime/0.11.0": { + "runtime": { + "lib/net5.0/MicroCom.Runtime.dll": { + "assemblyVersion": "0.11.0.0", + "fileVersion": "0.11.0.0" + } + } + } + } + }, + "libraries": { + "EarthRevolutionModel/1.0.3": { + "type": "project", + "serviceable": false, + "sha512": "" + }, + "Avalonia/11.3.9": { + "type": "package", + "serviceable": true, + "sha512": "sha512-YfaTrUxcmVTsGOw2YqdZyunHqZArK16m1pYfNIBvyvAgX89Pzd3A1PgoMkf64u7scL23IN6HkfqhZeFcbYWLoA==", + "path": "avalonia/11.3.9", + "hashPath": "avalonia.11.3.9.nupkg.sha512" + }, + "Avalonia.Remote.Protocol/11.3.9": { + "type": "package", + "serviceable": true, + "sha512": "sha512-2XVLTSNa+Nvwu4D8NqqdudhllTaCRA9ZKlLZZvYLZeuLlzg7OcAV+df/biHQc6AqOv7iMFR9K5Zt3wG0EF4KfQ==", + "path": "avalonia.remote.protocol/11.3.9", + "hashPath": "avalonia.remote.protocol.11.3.9.nupkg.sha512" + }, + "MicroCom.Runtime/0.11.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-MEnrZ3UIiH40hjzMDsxrTyi8dtqB5ziv3iBeeU4bXsL/7NLSal9F1lZKpK+tfBRnUoDSdtcW3KufE4yhATOMCA==", + "path": "microcom.runtime/0.11.0", + "hashPath": "microcom.runtime.0.11.0.nupkg.sha512" + } + } +} \ No newline at end of file diff --git a/.GC/cache/sources/gitcode-official/model/earth-revolution/src/bin/Debug/net8.0/EarthRevolutionModel.dll b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/bin/Debug/net8.0/EarthRevolutionModel.dll new file mode 100644 index 0000000..b166e19 Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/bin/Debug/net8.0/EarthRevolutionModel.dll differ diff --git a/.GC/cache/sources/gitcode-official/model/earth-revolution/src/bin/Debug/net8.0/EarthRevolutionModel.pdb b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/bin/Debug/net8.0/EarthRevolutionModel.pdb new file mode 100644 index 0000000..ff5e13b Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/bin/Debug/net8.0/EarthRevolutionModel.pdb differ diff --git a/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs new file mode 100644 index 0000000..2217181 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v8.0", FrameworkDisplayName = ".NET 8.0")] diff --git a/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache new file mode 100644 index 0000000..6bdfd39 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache @@ -0,0 +1 @@ +9ace3cec70386f1107b579993a2b0e2d8726efadf0ccd58f63e17c3abe4138ab diff --git a/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.AssemblyInfo.cs b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.AssemblyInfo.cs new file mode 100644 index 0000000..d1a3166 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.AssemblyInfo.cs @@ -0,0 +1,23 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("NeoRF")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.3.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.3")] +[assembly: System.Reflection.AssemblyProductAttribute("Earth Model Studio")] +[assembly: System.Reflection.AssemblyTitleAttribute("EarthRevolutionModel")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.3.0")] +[assembly: System.Resources.NeutralResourcesLanguageAttribute("zh-Hans")] + +// Generated by the MSBuild WriteCodeFragment class. + diff --git a/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.AssemblyInfoInputs.cache b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.AssemblyInfoInputs.cache new file mode 100644 index 0000000..7e8819b --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +212b627f3eca9aa6cb36bd0f638955f96b46ee28122ebd09110af90b813dddf0 diff --git a/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.GeneratedMSBuildEditorConfig.editorconfig b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 0000000..ab7605f --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,25 @@ +is_global = true +build_property.AvaloniaNameGeneratorIsEnabled = true +build_property.AvaloniaNameGeneratorBehavior = InitializeComponent +build_property.AvaloniaNameGeneratorDefaultFieldModifier = internal +build_property.AvaloniaNameGeneratorFilterByPath = * +build_property.AvaloniaNameGeneratorFilterByNamespace = * +build_property.AvaloniaNameGeneratorViewFileNamingStrategy = NamespaceAndClassName +build_property.AvaloniaNameGeneratorAttachDevTools = true +build_property.TargetFramework = net8.0 +build_property.TargetFrameworkIdentifier = .NETCoreApp +build_property.TargetFrameworkVersion = v8.0 +build_property.TargetPlatformMinVersion = +build_property.UsingMicrosoftNETSdkWeb = +build_property.ProjectTypeGuids = +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property.EnforceExtendedAnalyzerRules = +build_property.EntryPointFilePath = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = NeoRF.EarthModels +build_property.ProjectDir = /Users/morris/Downloads/GC#/model/earth-revolution/src/ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = +build_property.EffectiveAnalysisLevelStyle = 8.0 +build_property.EnableCodeStyleSeverity = diff --git a/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.assets.cache b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.assets.cache new file mode 100644 index 0000000..e77c43b Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.assets.cache differ diff --git a/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.csproj.AssemblyReference.cache b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.csproj.AssemblyReference.cache new file mode 100644 index 0000000..48f2eaa Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.csproj.AssemblyReference.cache differ diff --git a/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.csproj.CoreCompileInputs.cache b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.csproj.CoreCompileInputs.cache new file mode 100644 index 0000000..a1c1e0b --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.csproj.CoreCompileInputs.cache @@ -0,0 +1 @@ +eecdd1bb9d3d7fc86a4e758519d9e02953d8036228bf17bed1471ac387b3afaf diff --git a/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.csproj.FileListAbsolute.txt b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.csproj.FileListAbsolute.txt new file mode 100644 index 0000000..161a37c --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.csproj.FileListAbsolute.txt @@ -0,0 +1,13 @@ +/Users/morris/Downloads/GC#/model/earth-revolution/src/bin/Debug/net8.0/EarthRevolutionModel.deps.json +/Users/morris/Downloads/GC#/model/earth-revolution/src/bin/Debug/net8.0/EarthRevolutionModel.dll +/Users/morris/Downloads/GC#/model/earth-revolution/src/bin/Debug/net8.0/EarthRevolutionModel.pdb +/Users/morris/Downloads/GC#/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.csproj.AssemblyReference.cache +/Users/morris/Downloads/GC#/model/earth-revolution/src/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache +/Users/morris/Downloads/GC#/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.GeneratedMSBuildEditorConfig.editorconfig +/Users/morris/Downloads/GC#/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.AssemblyInfoInputs.cache +/Users/morris/Downloads/GC#/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.AssemblyInfo.cs +/Users/morris/Downloads/GC#/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.csproj.CoreCompileInputs.cache +/Users/morris/Downloads/GC#/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.dll +/Users/morris/Downloads/GC#/model/earth-revolution/src/obj/Debug/net8.0/refint/EarthRevolutionModel.dll +/Users/morris/Downloads/GC#/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.pdb +/Users/morris/Downloads/GC#/model/earth-revolution/src/obj/Debug/net8.0/ref/EarthRevolutionModel.dll diff --git a/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.dll b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.dll new file mode 100644 index 0000000..b166e19 Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.dll differ diff --git a/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.pdb b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.pdb new file mode 100644 index 0000000..ff5e13b Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.pdb differ diff --git a/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/ref/EarthRevolutionModel.dll b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/ref/EarthRevolutionModel.dll new file mode 100644 index 0000000..ea41b4a Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/ref/EarthRevolutionModel.dll differ diff --git a/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/refint/EarthRevolutionModel.dll b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/refint/EarthRevolutionModel.dll new file mode 100644 index 0000000..ea41b4a Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/Debug/net8.0/refint/EarthRevolutionModel.dll differ diff --git a/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/EarthRevolutionModel.csproj.nuget.dgspec.json b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/EarthRevolutionModel.csproj.nuget.dgspec.json new file mode 100644 index 0000000..d6f5dc6 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/EarthRevolutionModel.csproj.nuget.dgspec.json @@ -0,0 +1,146 @@ +{ + "format": 1, + "restore": { + "/Users/morris/Downloads/GC#/model/earth-revolution/src/EarthRevolutionModel.csproj": {} + }, + "projects": { + "/Users/morris/Downloads/GC#/model/earth-revolution/src/EarthRevolutionModel.csproj": { + "version": "1.0.3", + "restore": { + "projectUniqueName": "/Users/morris/Downloads/GC#/model/earth-revolution/src/EarthRevolutionModel.csproj", + "projectName": "EarthRevolutionModel", + "projectPath": "/Users/morris/Downloads/GC#/model/earth-revolution/src/EarthRevolutionModel.csproj", + "packagesPath": "/Users/morris/.nuget/packages/", + "outputPath": "/Users/morris/Downloads/GC#/model/earth-revolution/src/obj/", + "projectStyle": "PackageReference", + "configFilePaths": [ + "/Users/morris/.nuget/NuGet/NuGet.Config" + ], + "originalTargetFrameworks": [ + "net8.0" + ], + "sources": { + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net8.0": { + "framework": "net8.0", + "targetAlias": "net8.0", + "projectReferences": { + "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj": { + "projectPath": "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj" + } + } + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" + }, + "SdkAnalysisLevel": "10.0.400" + }, + "frameworks": { + "net8.0": { + "framework": "net8.0", + "targetAlias": "net8.0", + "dependencies": { + "Avalonia": { + "target": "Package", + "version": "[11.3.9, )" + } + }, + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/10.0.401/PortableRuntimeIdentifierGraph.json" + } + } + }, + "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj": { + "version": "1.0.3", + "restore": { + "projectUniqueName": "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj", + "projectName": "EarthModelStudio.ModelSdk", + "projectPath": "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj", + "packagesPath": "/Users/morris/.nuget/packages/", + "outputPath": "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/obj/", + "projectStyle": "PackageReference", + "configFilePaths": [ + "/Users/morris/.nuget/NuGet/NuGet.Config" + ], + "originalTargetFrameworks": [ + "net8.0" + ], + "sources": { + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net8.0": { + "framework": "net8.0", + "targetAlias": "net8.0", + "projectReferences": {} + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" + }, + "SdkAnalysisLevel": "10.0.400" + }, + "frameworks": { + "net8.0": { + "framework": "net8.0", + "targetAlias": "net8.0", + "dependencies": { + "Avalonia": { + "target": "Package", + "version": "[11.3.9, )" + } + }, + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/10.0.401/PortableRuntimeIdentifierGraph.json" + } + } + } + } +} \ No newline at end of file diff --git a/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/EarthRevolutionModel.csproj.nuget.g.props b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/EarthRevolutionModel.csproj.nuget.g.props new file mode 100644 index 0000000..49d666c --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/EarthRevolutionModel.csproj.nuget.g.props @@ -0,0 +1,22 @@ + + + + True + NuGet + $(MSBuildThisFileDirectory)project.assets.json + /Users/morris/.nuget/packages/ + /Users/morris/.nuget/packages/ + PackageReference + 7.0.0 + + + + + + + + + /Users/morris/.nuget/packages/avalonia.buildservices/11.3.2 + /Users/morris/.nuget/packages/avalonia/11.3.9 + + \ No newline at end of file diff --git a/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/EarthRevolutionModel.csproj.nuget.g.targets b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/EarthRevolutionModel.csproj.nuget.g.targets new file mode 100644 index 0000000..c2c2aaf --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/EarthRevolutionModel.csproj.nuget.g.targets @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/project.assets.json b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/project.assets.json new file mode 100644 index 0000000..47913d7 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/project.assets.json @@ -0,0 +1,436 @@ +{ + "version": 4, + "targets": { + "net8.0": { + "Avalonia/11.3.9": { + "type": "package", + "dependencies": { + "Avalonia.BuildServices": "11.3.2", + "Avalonia.Remote.Protocol": "11.3.9", + "MicroCom.Runtime": "0.11.0" + }, + "compile": { + "ref/net8.0/Avalonia.Base.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.Controls.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.DesignerSupport.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.Dialogs.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.Markup.Xaml.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.Markup.dll": { + "related": ".Xaml.xml;.xml" + }, + "ref/net8.0/Avalonia.Metal.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.MicroCom.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.OpenGL.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.Vulkan.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.dll": { + "related": ".Base.xml;.Controls.xml;.DesignerSupport.xml;.Dialogs.xml;.Markup.Xaml.xml;.Markup.xml;.Metal.xml;.MicroCom.xml;.OpenGL.xml;.Vulkan.xml;.xml" + } + }, + "runtime": { + "lib/net8.0/Avalonia.Base.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.Controls.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.DesignerSupport.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.Dialogs.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.Markup.Xaml.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.Markup.dll": { + "related": ".Xaml.xml;.xml" + }, + "lib/net8.0/Avalonia.Metal.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.MicroCom.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.OpenGL.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.Vulkan.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.dll": { + "related": ".Base.xml;.Controls.xml;.DesignerSupport.xml;.Dialogs.xml;.Markup.Xaml.xml;.Markup.xml;.Metal.xml;.MicroCom.xml;.OpenGL.xml;.Vulkan.xml;.xml" + } + }, + "build": { + "buildTransitive/Avalonia.props": {}, + "buildTransitive/Avalonia.targets": {} + } + }, + "Avalonia.BuildServices/11.3.2": { + "type": "package", + "build": { + "buildTransitive/Avalonia.BuildServices.targets": {} + } + }, + "Avalonia.Remote.Protocol/11.3.9": { + "type": "package", + "compile": { + "lib/net8.0/Avalonia.Remote.Protocol.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net8.0/Avalonia.Remote.Protocol.dll": { + "related": ".xml" + } + } + }, + "MicroCom.Runtime/0.11.0": { + "type": "package", + "compile": { + "lib/net5.0/MicroCom.Runtime.dll": {} + }, + "runtime": { + "lib/net5.0/MicroCom.Runtime.dll": {} + } + }, + "EarthModelStudio.ModelSdk/1.0.3": { + "type": "project", + "framework": ".NETCoreApp,Version=v8.0", + "dependencies": { + "Avalonia": "11.3.9" + }, + "compile": { + "bin/placeholder/EarthModelStudio.ModelSdk.dll": {} + }, + "runtime": { + "bin/placeholder/EarthModelStudio.ModelSdk.dll": {} + } + } + } + }, + "libraries": { + "Avalonia/11.3.9": { + "sha512": "YfaTrUxcmVTsGOw2YqdZyunHqZArK16m1pYfNIBvyvAgX89Pzd3A1PgoMkf64u7scL23IN6HkfqhZeFcbYWLoA==", + "type": "package", + "path": "avalonia/11.3.9", + "hasTools": true, + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "analyzers/dotnet/cs/Avalonia.Analyzers.dll", + "analyzers/dotnet/cs/Avalonia.Generators.dll", + "avalonia.11.3.9.nupkg.sha512", + "avalonia.nuspec", + "build/Avalonia.Generators.props", + "build/Avalonia.props", + "build/Avalonia.targets", + "build/AvaloniaBuildTasks.props", + "build/AvaloniaBuildTasks.targets", + "build/AvaloniaItemSchema.xaml", + "build/AvaloniaPrivateApis.targets", + "build/AvaloniaRules.Project.xml", + "build/AvaloniaSingleProject.targets", + "build/AvaloniaVersion.props", + "buildTransitive/Avalonia.Generators.props", + "buildTransitive/Avalonia.props", + "buildTransitive/Avalonia.targets", + "buildTransitive/AvaloniaBuildTasks.props", + "buildTransitive/AvaloniaBuildTasks.targets", + "buildTransitive/AvaloniaItemSchema.xaml", + "buildTransitive/AvaloniaPrivateApis.targets", + "buildTransitive/AvaloniaRules.Project.xml", + "buildTransitive/AvaloniaSingleProject.targets", + "lib/net6.0/Avalonia.Base.dll", + "lib/net6.0/Avalonia.Base.xml", + "lib/net6.0/Avalonia.Controls.dll", + "lib/net6.0/Avalonia.Controls.xml", + "lib/net6.0/Avalonia.DesignerSupport.dll", + "lib/net6.0/Avalonia.DesignerSupport.xml", + "lib/net6.0/Avalonia.Dialogs.dll", + "lib/net6.0/Avalonia.Dialogs.xml", + "lib/net6.0/Avalonia.Markup.Xaml.dll", + "lib/net6.0/Avalonia.Markup.Xaml.xml", + "lib/net6.0/Avalonia.Markup.dll", + "lib/net6.0/Avalonia.Markup.xml", + "lib/net6.0/Avalonia.Metal.dll", + "lib/net6.0/Avalonia.Metal.xml", + "lib/net6.0/Avalonia.MicroCom.dll", + "lib/net6.0/Avalonia.MicroCom.xml", + "lib/net6.0/Avalonia.OpenGL.dll", + "lib/net6.0/Avalonia.OpenGL.xml", + "lib/net6.0/Avalonia.Vulkan.dll", + "lib/net6.0/Avalonia.Vulkan.xml", + "lib/net6.0/Avalonia.dll", + "lib/net6.0/Avalonia.xml", + "lib/net8.0/Avalonia.Base.dll", + "lib/net8.0/Avalonia.Base.xml", + "lib/net8.0/Avalonia.Controls.dll", + "lib/net8.0/Avalonia.Controls.xml", + "lib/net8.0/Avalonia.DesignerSupport.dll", + "lib/net8.0/Avalonia.DesignerSupport.xml", + "lib/net8.0/Avalonia.Dialogs.dll", + "lib/net8.0/Avalonia.Dialogs.xml", + "lib/net8.0/Avalonia.Markup.Xaml.dll", + "lib/net8.0/Avalonia.Markup.Xaml.xml", + "lib/net8.0/Avalonia.Markup.dll", + "lib/net8.0/Avalonia.Markup.xml", + "lib/net8.0/Avalonia.Metal.dll", + "lib/net8.0/Avalonia.Metal.xml", + "lib/net8.0/Avalonia.MicroCom.dll", + "lib/net8.0/Avalonia.MicroCom.xml", + "lib/net8.0/Avalonia.OpenGL.dll", + "lib/net8.0/Avalonia.OpenGL.xml", + "lib/net8.0/Avalonia.Vulkan.dll", + "lib/net8.0/Avalonia.Vulkan.xml", + "lib/net8.0/Avalonia.dll", + "lib/net8.0/Avalonia.xml", + "lib/netstandard2.0/Avalonia.Base.dll", + "lib/netstandard2.0/Avalonia.Base.xml", + "lib/netstandard2.0/Avalonia.Controls.dll", + "lib/netstandard2.0/Avalonia.Controls.xml", + "lib/netstandard2.0/Avalonia.DesignerSupport.dll", + "lib/netstandard2.0/Avalonia.DesignerSupport.xml", + "lib/netstandard2.0/Avalonia.Dialogs.dll", + "lib/netstandard2.0/Avalonia.Dialogs.xml", + "lib/netstandard2.0/Avalonia.Markup.Xaml.dll", + "lib/netstandard2.0/Avalonia.Markup.Xaml.xml", + "lib/netstandard2.0/Avalonia.Markup.dll", + "lib/netstandard2.0/Avalonia.Markup.xml", + "lib/netstandard2.0/Avalonia.Metal.dll", + "lib/netstandard2.0/Avalonia.Metal.xml", + "lib/netstandard2.0/Avalonia.MicroCom.dll", + "lib/netstandard2.0/Avalonia.MicroCom.xml", + "lib/netstandard2.0/Avalonia.OpenGL.dll", + "lib/netstandard2.0/Avalonia.OpenGL.xml", + "lib/netstandard2.0/Avalonia.Vulkan.dll", + "lib/netstandard2.0/Avalonia.Vulkan.xml", + "lib/netstandard2.0/Avalonia.dll", + "lib/netstandard2.0/Avalonia.xml", + "ref/net6.0/Avalonia.Base.dll", + "ref/net6.0/Avalonia.Base.xml", + "ref/net6.0/Avalonia.Controls.dll", + "ref/net6.0/Avalonia.Controls.xml", + "ref/net6.0/Avalonia.DesignerSupport.dll", + "ref/net6.0/Avalonia.DesignerSupport.xml", + "ref/net6.0/Avalonia.Dialogs.dll", + "ref/net6.0/Avalonia.Dialogs.xml", + "ref/net6.0/Avalonia.Markup.Xaml.dll", + "ref/net6.0/Avalonia.Markup.Xaml.xml", + "ref/net6.0/Avalonia.Markup.dll", + "ref/net6.0/Avalonia.Markup.xml", + "ref/net6.0/Avalonia.Metal.dll", + "ref/net6.0/Avalonia.Metal.xml", + "ref/net6.0/Avalonia.MicroCom.dll", + "ref/net6.0/Avalonia.MicroCom.xml", + "ref/net6.0/Avalonia.OpenGL.dll", + "ref/net6.0/Avalonia.OpenGL.xml", + "ref/net6.0/Avalonia.Vulkan.dll", + "ref/net6.0/Avalonia.Vulkan.xml", + "ref/net6.0/Avalonia.dll", + "ref/net6.0/Avalonia.xml", + "ref/net8.0/Avalonia.Base.dll", + "ref/net8.0/Avalonia.Base.xml", + "ref/net8.0/Avalonia.Controls.dll", + "ref/net8.0/Avalonia.Controls.xml", + "ref/net8.0/Avalonia.DesignerSupport.dll", + "ref/net8.0/Avalonia.DesignerSupport.xml", + "ref/net8.0/Avalonia.Dialogs.dll", + "ref/net8.0/Avalonia.Dialogs.xml", + "ref/net8.0/Avalonia.Markup.Xaml.dll", + "ref/net8.0/Avalonia.Markup.Xaml.xml", + "ref/net8.0/Avalonia.Markup.dll", + "ref/net8.0/Avalonia.Markup.xml", + "ref/net8.0/Avalonia.Metal.dll", + "ref/net8.0/Avalonia.Metal.xml", + "ref/net8.0/Avalonia.MicroCom.dll", + "ref/net8.0/Avalonia.MicroCom.xml", + "ref/net8.0/Avalonia.OpenGL.dll", + "ref/net8.0/Avalonia.OpenGL.xml", + "ref/net8.0/Avalonia.Vulkan.dll", + "ref/net8.0/Avalonia.Vulkan.xml", + "ref/net8.0/Avalonia.dll", + "ref/net8.0/Avalonia.xml", + "ref/netstandard2.0/Avalonia.Base.dll", + "ref/netstandard2.0/Avalonia.Base.xml", + "ref/netstandard2.0/Avalonia.Controls.dll", + "ref/netstandard2.0/Avalonia.Controls.xml", + "ref/netstandard2.0/Avalonia.DesignerSupport.dll", + "ref/netstandard2.0/Avalonia.DesignerSupport.xml", + "ref/netstandard2.0/Avalonia.Dialogs.dll", + "ref/netstandard2.0/Avalonia.Dialogs.xml", + "ref/netstandard2.0/Avalonia.Markup.Xaml.dll", + "ref/netstandard2.0/Avalonia.Markup.Xaml.xml", + "ref/netstandard2.0/Avalonia.Markup.dll", + "ref/netstandard2.0/Avalonia.Markup.xml", + "ref/netstandard2.0/Avalonia.Metal.dll", + "ref/netstandard2.0/Avalonia.Metal.xml", + "ref/netstandard2.0/Avalonia.MicroCom.dll", + "ref/netstandard2.0/Avalonia.MicroCom.xml", + "ref/netstandard2.0/Avalonia.OpenGL.dll", + "ref/netstandard2.0/Avalonia.OpenGL.xml", + "ref/netstandard2.0/Avalonia.Vulkan.dll", + "ref/netstandard2.0/Avalonia.Vulkan.xml", + "ref/netstandard2.0/Avalonia.dll", + "ref/netstandard2.0/Avalonia.xml", + "tools/net461/designer/Avalonia.Designer.HostApp.exe", + "tools/netstandard2.0/Avalonia.Build.Tasks.dll", + "tools/netstandard2.0/designer/Avalonia.Designer.HostApp.dll" + ] + }, + "Avalonia.BuildServices/11.3.2": { + "sha512": "qHDToxto1e3hci5YqbG9n0Ty8mlp3zBUN5wT66wKqaDVzXyQ0do3EnRILd4Ke9jpvsktaPpgE0YjEk7hornryQ==", + "type": "package", + "path": "avalonia.buildservices/11.3.2", + "hasTools": true, + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "README.md", + "avalonia.buildservices.11.3.2.nupkg.sha512", + "avalonia.buildservices.nuspec", + "build/Avalonia.BuildServices.targets", + "buildTransitive/Avalonia.BuildServices.targets", + "tools/netstandard2.0/Avalonia.BuildServices.Collector.dll", + "tools/netstandard2.0/Avalonia.BuildServices.dll", + "tools/netstandard2.0/runtimeconfig.json" + ] + }, + "Avalonia.Remote.Protocol/11.3.9": { + "sha512": "2XVLTSNa+Nvwu4D8NqqdudhllTaCRA9ZKlLZZvYLZeuLlzg7OcAV+df/biHQc6AqOv7iMFR9K5Zt3wG0EF4KfQ==", + "type": "package", + "path": "avalonia.remote.protocol/11.3.9", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "avalonia.remote.protocol.11.3.9.nupkg.sha512", + "avalonia.remote.protocol.nuspec", + "lib/net6.0/Avalonia.Remote.Protocol.dll", + "lib/net6.0/Avalonia.Remote.Protocol.xml", + "lib/net8.0/Avalonia.Remote.Protocol.dll", + "lib/net8.0/Avalonia.Remote.Protocol.xml", + "lib/netstandard2.0/Avalonia.Remote.Protocol.dll", + "lib/netstandard2.0/Avalonia.Remote.Protocol.xml" + ] + }, + "MicroCom.Runtime/0.11.0": { + "sha512": "MEnrZ3UIiH40hjzMDsxrTyi8dtqB5ziv3iBeeU4bXsL/7NLSal9F1lZKpK+tfBRnUoDSdtcW3KufE4yhATOMCA==", + "type": "package", + "path": "microcom.runtime/0.11.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "lib/net5.0/MicroCom.Runtime.dll", + "lib/netstandard2.0/MicroCom.Runtime.dll", + "microcom.runtime.0.11.0.nupkg.sha512", + "microcom.runtime.nuspec" + ] + }, + "EarthModelStudio.ModelSdk/1.0.3": { + "type": "project", + "path": "../../_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj", + "msbuildProject": "../../_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj" + } + }, + "projectFileDependencyGroups": { + "net8.0": [ + "Avalonia >= 11.3.9", + "EarthModelStudio.ModelSdk >= 1.0.3" + ] + }, + "packageFolders": { + "/Users/morris/.nuget/packages/": {} + }, + "project": { + "version": "1.0.3", + "restore": { + "projectUniqueName": "/Users/morris/Downloads/GC#/model/earth-revolution/src/EarthRevolutionModel.csproj", + "projectName": "EarthRevolutionModel", + "projectPath": "/Users/morris/Downloads/GC#/model/earth-revolution/src/EarthRevolutionModel.csproj", + "packagesPath": "/Users/morris/.nuget/packages/", + "outputPath": "/Users/morris/Downloads/GC#/model/earth-revolution/src/obj/", + "projectStyle": "PackageReference", + "configFilePaths": [ + "/Users/morris/.nuget/NuGet/NuGet.Config" + ], + "originalTargetFrameworks": [ + "net8.0" + ], + "sources": { + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net8.0": { + "framework": "net8.0", + "targetAlias": "net8.0", + "projectReferences": { + "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj": { + "projectPath": "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj" + } + } + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" + }, + "SdkAnalysisLevel": "10.0.400" + }, + "frameworks": { + "net8.0": { + "framework": "net8.0", + "targetAlias": "net8.0", + "dependencies": { + "Avalonia": { + "target": "Package", + "version": "[11.3.9, )" + } + }, + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/10.0.401/PortableRuntimeIdentifierGraph.json" + } + } + } +} \ No newline at end of file diff --git a/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/project.nuget.cache b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/project.nuget.cache new file mode 100644 index 0000000..bdc5dc6 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-revolution/src/obj/project.nuget.cache @@ -0,0 +1,13 @@ +{ + "version": 2, + "dgSpecHash": "RXt4P+mp/5Q=", + "success": true, + "projectFilePath": "/Users/morris/Downloads/GC#/model/earth-revolution/src/EarthRevolutionModel.csproj", + "expectedPackageFiles": [ + "/Users/morris/.nuget/packages/avalonia/11.3.9/avalonia.11.3.9.nupkg.sha512", + "/Users/morris/.nuget/packages/avalonia.buildservices/11.3.2/avalonia.buildservices.11.3.2.nupkg.sha512", + "/Users/morris/.nuget/packages/avalonia.remote.protocol/11.3.9/avalonia.remote.protocol.11.3.9.nupkg.sha512", + "/Users/morris/.nuget/packages/microcom.runtime/0.11.0/microcom.runtime.0.11.0.nupkg.sha512" + ], + "logs": [] +} \ No newline at end of file diff --git a/.GC/cache/sources/gitcode-official/model/earth-rotation/earth-rotation.json b/.GC/cache/sources/gitcode-official/model/earth-rotation/earth-rotation.json new file mode 100644 index 0000000..adae70b --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-rotation/earth-rotation.json @@ -0,0 +1,29 @@ +{ + "schemaVersion": 1, + "id": "earth-rotation", + "name": "Earth Rotation", + "nameI18n": { + "zh-CN": "地球自转", + "en": "Earth Rotation" + }, + "author": "NeoRF", + "description": "昼夜交替、晨昏线与太阳直射点", + "descriptionI18n": { + "zh-CN": "观察自转中的地球:昼夜半球、晨昏线与太阳直射点位置。", + "en": "Watch a rotating Earth: day/night hemispheres, terminator and the subsolar point." + }, + "tags": [ + "astronomy", + "geography", + "rotation" + ], + "entry": "scene.json", + "license": "MIT", + "assembly": "EarthRotationModel.dll", + "type": "NeoRF.EarthModels.RotationModelFactory", + "preview": "preview.png", + "apiVersion": 1, + "version": "1.0", + "updatedAt": "2026-11-08T09:22:29Z", + "build": "0bd5b4507c" +} diff --git a/.GC/cache/sources/gitcode-official/model/earth-rotation/earth-rotation.model/EarthRotationModel.dll b/.GC/cache/sources/gitcode-official/model/earth-rotation/earth-rotation.model/EarthRotationModel.dll new file mode 100644 index 0000000..e3a6086 Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/earth-rotation/earth-rotation.model/EarthRotationModel.dll differ diff --git a/.GC/cache/sources/gitcode-official/model/earth-rotation/earth-rotation.model/i18n/en.json b/.GC/cache/sources/gitcode-official/model/earth-rotation/earth-rotation.model/i18n/en.json new file mode 100644 index 0000000..536b37a --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-rotation/earth-rotation.model/i18n/en.json @@ -0,0 +1,33 @@ +{ + "title": "Earth Rotation", + "view.rotation": "Rotation", + "view.revolution": "Revolution", + "play": "Play", + "pause": "Pause", + "speed": "Speed", + "reset": "Reset", + "labels": "Labels", + "orbit": "Orbit", + "grid": "Graticule", + "tilt": "Exaggerate tilt", + "lessons": "Teaching notes", + "seasons": "Solstices & equinoxes", + "close": "Close window", + "loading": "Preparing scene…", + "subsolar": "Subsolar point", + "north": "North pole", + "south": "South pole", + "northShort": "N", + "southShort": "S", + "sun": "Sun", + "earth": "Earth", + "spinInfo": "Rotation {0}° · period {1} h", + "orbitInfo": "Orbit {0}°", + "declinationInfo": "Subsolar {0}", + "dateInfo": "Date {0}", + "season.springEquinox": "Spring equinox", + "season.summerSolstice": "Summer solstice", + "season.autumnEquinox": "Autumn equinox", + "season.winterSolstice": "Winter solstice", + "hint": "Pinch or scroll to zoom · drag to turn the Earth" +} \ No newline at end of file diff --git a/.GC/cache/sources/gitcode-official/model/earth-rotation/earth-rotation.model/i18n/zh-CN.json b/.GC/cache/sources/gitcode-official/model/earth-rotation/earth-rotation.model/i18n/zh-CN.json new file mode 100644 index 0000000..b6817af --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-rotation/earth-rotation.model/i18n/zh-CN.json @@ -0,0 +1,33 @@ +{ + "title": "地球自转", + "view.rotation": "自转", + "view.revolution": "公转", + "play": "播放", + "pause": "暂停", + "speed": "速度", + "reset": "重置", + "labels": "标注", + "orbit": "轨道", + "grid": "经纬网", + "tilt": "夸张倾角", + "lessons": "教学要点", + "seasons": "节气定位", + "close": "关闭窗口", + "loading": "正在准备场景…", + "subsolar": "太阳直射点", + "north": "北极", + "south": "南极", + "northShort": "N", + "southShort": "S", + "sun": "太阳", + "earth": "地球", + "spinInfo": "自转 {0}° · 周期 {1} 小时", + "orbitInfo": "公转 {0}°", + "declinationInfo": "太阳直射 {0}", + "dateInfo": "日期 {0}", + "season.springEquinox": "春分", + "season.summerSolstice": "夏至", + "season.autumnEquinox": "秋分", + "season.winterSolstice": "冬至", + "hint": "双指捏合或滚轮缩放 · 拖动可转动地球" +} \ No newline at end of file diff --git a/.GC/cache/sources/gitcode-official/model/earth-rotation/earth-rotation.model/land.json b/.GC/cache/sources/gitcode-official/model/earth-rotation/earth-rotation.model/land.json new file mode 100644 index 0000000..972210e --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-rotation/earth-rotation.model/land.json @@ -0,0 +1,98 @@ +{ + "schema": 1, + "note": "简化大陆轮廓(经度,纬度),用于教学演示,非测绘精度", + "polygons": [ + { + "name": "north-america", + "points": [[-168,66],[-164,70],[-155,71],[-145,70],[-133,69],[-120,69],[-110,68],[-100,69],[-92,68],[-85,70],[-80,73],[-72,71],[-64,66],[-60,60],[-56,52],[-60,47],[-66,45],[-70,42],[-74,40],[-76,35],[-81,31],[-80,25],[-83,29],[-88,30],[-94,29],[-97,26],[-97,21],[-92,19],[-87,21],[-88,16],[-83,9],[-78,9],[-84,14],[-90,14],[-96,16],[-105,20],[-112,25],[-117,32],[-122,37],[-124,42],[-125,48],[-131,54],[-140,59],[-150,59],[-158,56],[-165,60],[-166,64]] + }, + { + "name": "greenland", + "points": [[-45,60],[-52,64],[-55,68],[-60,72],[-63,76],[-56,80],[-42,82],[-28,80],[-21,74],[-23,70],[-31,66],[-38,62]] + }, + { + "name": "south-america", + "points": [[-78,8],[-72,11],[-64,10],[-60,8],[-52,5],[-50,0],[-44,-2],[-38,-5],[-35,-8],[-39,-13],[-41,-22],[-48,-25],[-53,-34],[-57,-38],[-62,-40],[-65,-45],[-68,-50],[-70,-55],[-75,-52],[-74,-45],[-73,-37],[-71,-30],[-70,-23],[-70,-18],[-76,-14],[-81,-6],[-80,-2],[-79,2],[-77,6]] + }, + { + "name": "africa", + "points": [[-17,15],[-16,20],[-13,28],[-9,32],[-5,36],[10,37],[20,32],[32,31],[35,28],[39,15],[43,11],[51,12],[48,2],[41,-2],[40,-10],[35,-18],[32,-25],[27,-33],[20,-35],[15,-28],[12,-17],[9,-1],[5,4],[-4,5],[-8,4],[-13,8],[-16,12]] + }, + { + "name": "europe", + "points": [[-9,38],[-9,43],[-2,44],[0,48],[2,51],[5,53],[8,54],[9,57],[12,56],[13,54],[20,54],[21,57],[24,58],[28,60],[30,60],[29,64],[25,66],[22,69],[30,70],[40,68],[46,66],[55,68],[60,70],[68,68],[62,62],[58,56],[52,50],[48,46],[40,45],[36,44],[30,45],[28,41],[24,40],[23,37],[19,40],[16,41],[12,44],[7,44],[3,42],[-2,37]] + }, + { + "name": "asia", + "points": [[60,70],[75,73],[90,75],[105,77],[115,74],[130,73],[145,72],[160,70],[170,68],[180,65],[172,62],[163,58],[155,52],[143,54],[137,50],[130,43],[126,40],[122,40],[120,36],[122,31],[118,25],[110,21],[105,10],[100,13],[98,8],[95,17],[90,22],[88,21],[80,16],[77,8],[73,18],[68,23],[62,25],[57,24],[52,28],[48,30],[44,13],[43,17],[39,21],[35,28],[34,31],[36,36],[30,41],[28,41],[30,45],[34,45],[40,45],[48,46],[52,50],[58,56],[62,62],[68,68]] + }, + { + "name": "australia", + "points": [[113,-22],[114,-27],[116,-35],[129,-32],[138,-35],[146,-39],[150,-37],[153,-28],[146,-19],[142,-11],[132,-11],[126,-14],[122,-18]] + }, + { + "name": "antarctica", + "points": [[-180,-72],[-150,-76],[-120,-74],[-90,-73],[-60,-64],[-30,-70],[0,-70],[30,-69],[60,-67],[90,-66],[120,-66],[150,-70],[180,-72],[180,-90],[-180,-90]] + }, + { + "name": "madagascar", + "points": [[43,-12],[50,-15],[50,-25],[45,-25],[43,-20]] + }, + { + "name": "japan", + "points": [[130,32],[136,35],[141,40],[145,44],[142,39],[137,34],[133,33]] + }, + { + "name": "britain", + "points": [[-6,50],[-2,53],[-2,58],[-5,58],[-6,54]] + }, + { + "name": "ireland", + "points": [[-10,52],[-6,53],[-6,55],[-10,55]] + }, + { + "name": "iceland", + "points": [[-24,65],[-14,66],[-14,64],[-22,63]] + }, + { + "name": "new-zealand", + "points": [[166,-46],[170,-44],[174,-41],[177,-38],[174,-35],[170,-38],[167,-42]] + }, + { + "name": "sumatra", + "points": [[95,5],[100,1],[105,-6],[100,-4],[96,2]] + }, + { + "name": "java", + "points": [[105,-6],[114,-8],[114,-9],[106,-7]] + }, + { + "name": "borneo", + "points": [[109,2],[117,4],[119,-2],[115,-4],[110,-2]] + }, + { + "name": "sulawesi", + "points": [[119,1],[125,1],[123,-5],[120,-3]] + }, + { + "name": "new-guinea", + "points": [[131,-1],[141,-3],[150,-6],[147,-9],[140,-9],[134,-5]] + }, + { + "name": "sri-lanka", + "points": [[80,9],[82,7],[81,6],[79,7]] + }, + { + "name": "philippines", + "points": [[120,18],[124,13],[126,8],[122,6],[120,12]] + }, + { + "name": "cuba", + "points": [[-85,22],[-77,20],[-74,20],[-80,23]] + }, + { + "name": "taiwan", + "points": [[120,25],[122,24],[121,22],[120,23]] + } + ] +} diff --git a/.GC/cache/sources/gitcode-official/model/earth-rotation/earth-rotation.model/preview.png b/.GC/cache/sources/gitcode-official/model/earth-rotation/earth-rotation.model/preview.png new file mode 100644 index 0000000..b95d846 Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/earth-rotation/earth-rotation.model/preview.png differ diff --git a/.GC/cache/sources/gitcode-official/model/earth-rotation/earth-rotation.model/scene.json b/.GC/cache/sources/gitcode-official/model/earth-rotation/earth-rotation.model/scene.json new file mode 100644 index 0000000..fdb7a89 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-rotation/earth-rotation.model/scene.json @@ -0,0 +1,138 @@ +{ + "schemaVersion": 1, + "type": "planet", + "defaultView": "rotation", + "views": [ + "rotation" + ], + "nameI18n": { + "zh-CN": "地球自转", + "en": "Earth Rotation" + }, + "descriptionI18n": { + "zh-CN": "观察自转中的地球:昼夜半球、晨昏线与太阳直射点位置。", + "en": "Watch a rotating Earth: day/night hemispheres, terminator and the subsolar point." + }, + "star": { + "name": "Sun", + "nameI18n": { + "zh-CN": "太阳", + "en": "Sun" + }, + "color": "#FFC24B", + "radiusScale": 0.5 + }, + "planet": { + "name": "Earth", + "nameI18n": { + "zh-CN": "地球", + "en": "Earth" + }, + "axialTiltDeg": 23.5, + "tropicDeg": 23.5, + "rotationHours": 23.93, + "orbitDays": 365.26, + "oceanColor": "#1C5FA8", + "landColor": "#4E8C4C", + "iceColor": "#E9EFF6", + "landFile": "land.json", + "showGraticule": true + }, + "orbit": { + "semiMajorAxis": 4.0, + "eccentricity": 0.0167, + "show": true, + "seasons": [ + { + "angleDeg": 0, + "key": "season.springEquinox", + "date": "3/21", + "declinationDeg": 0, + "teachingI18n": { + "zh-CN": "太阳直射赤道,全球昼夜平分。", + "en": "The Sun is overhead at the equator and day equals night everywhere." + } + }, + { + "angleDeg": 90, + "key": "season.summerSolstice", + "date": "6/22", + "declinationDeg": 23.5, + "teachingI18n": { + "zh-CN": "太阳直射北回归线 23.5°N,北半球昼最长。", + "en": "The Sun is overhead at 23.5°N; the northern hemisphere has its longest day." + } + }, + { + "angleDeg": 180, + "key": "season.autumnEquinox", + "date": "9/23", + "declinationDeg": 0, + "teachingI18n": { + "zh-CN": "太阳直射赤道,全球昼夜平分。", + "en": "The Sun is overhead at the equator and day equals night everywhere." + } + }, + { + "angleDeg": 270, + "key": "season.winterSolstice", + "date": "12/22", + "declinationDeg": -23.5, + "teachingI18n": { + "zh-CN": "太阳直射南回归线 23.5°S,北半球昼最短。", + "en": "The Sun is overhead at 23.5°S; the northern hemisphere has its shortest day." + } + } + ] + }, + "lessons": [ + { + "titleI18n": { + "zh-CN": "自西向东的自转", + "en": "Rotation from west to east" + }, + "bodyI18n": { + "zh-CN": "从北极上空看,地球逆时针转动;转一圈用 23 小时 56 分 4 秒。", + "en": "Seen from above the north pole the Earth turns counter-clockwise, once every 23 h 56 min." + }, + "view": "rotation", + "angleDeg": 0 + }, + { + "titleI18n": { + "zh-CN": "昼夜交替", + "en": "Day and night" + }, + "bodyI18n": { + "zh-CN": "晨昏线(白色虚线)把地球分成昼半球与夜半球,交替周期 24 小时。", + "en": "The terminator (white dashes) splits the lit and dark hemispheres; one cycle takes 24 h." + }, + "view": "rotation", + "angleDeg": 60 + }, + { + "titleI18n": { + "zh-CN": "太阳直射点", + "en": "Subsolar point" + }, + "bodyI18n": { + "zh-CN": "黄色圆环标出太阳光垂直照射的位置,它随季节在南北回归线之间往返。", + "en": "The yellow ring marks where sunlight strikes vertically — it drifts between the tropics over a year." + }, + "view": "rotation", + "angleDeg": 120 + }, + { + "titleI18n": { + "zh-CN": "地轴倾斜 23.5°", + "en": "Axial tilt 23.5°" + }, + "bodyI18n": { + "zh-CN": "地轴与黄道面法线成 23.5°,倾斜方向不变,这是四季与五带划分的根本原因。", + "en": "The axis is tilted 23.5° from the ecliptic normal and keeps its direction — the root cause of seasons." + }, + "view": "rotation", + "angleDeg": 200 + } + ] +} diff --git a/.GC/cache/sources/gitcode-official/model/earth-rotation/src/EarthRotationModel.csproj b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/EarthRotationModel.csproj new file mode 100644 index 0000000..5a9d098 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/EarthRotationModel.csproj @@ -0,0 +1,28 @@ + + + + net8.0 + enable + disable + NeoRF.EarthModels + EarthRotationModel + true + false + + + + + + + + + + + + + + false + + + + diff --git a/.GC/cache/sources/gitcode-official/model/earth-rotation/src/RotationModelFactory.cs b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/RotationModelFactory.cs new file mode 100644 index 0000000..764eab5 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/RotationModelFactory.cs @@ -0,0 +1,11 @@ +using EarthModelStudio.ModelSdk; + +namespace NeoRF.EarthModels; + +/// 地球自转模型入口(清单里的 type 指向这里)。 +public sealed class RotationModelFactory : IModelFactory +{ + public int ApiVersion => EarthModelRuntime.SupportedApiVersion; + + public IModelRuntime Create() => new EarthModelRuntime(); +} diff --git a/.GC/cache/sources/gitcode-official/model/earth-rotation/src/bin/Debug/net8.0/EarthRotationModel.deps.json b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/bin/Debug/net8.0/EarthRotationModel.deps.json new file mode 100644 index 0000000..8b0a7e5 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/bin/Debug/net8.0/EarthRotationModel.deps.json @@ -0,0 +1,115 @@ +{ + "runtimeTarget": { + "name": ".NETCoreApp,Version=v8.0", + "signature": "" + }, + "compilationOptions": {}, + "targets": { + ".NETCoreApp,Version=v8.0": { + "EarthRotationModel/1.0.3": { + "dependencies": { + "Avalonia": "11.3.9" + }, + "runtime": { + "EarthRotationModel.dll": {} + } + }, + "Avalonia/11.3.9": { + "dependencies": { + "Avalonia.Remote.Protocol": "11.3.9", + "MicroCom.Runtime": "0.11.0" + }, + "runtime": { + "lib/net8.0/Avalonia.Base.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Controls.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.DesignerSupport.dll": { + "assemblyVersion": "0.7.0.0", + "fileVersion": "0.7.0.0" + }, + "lib/net8.0/Avalonia.Dialogs.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Markup.Xaml.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Markup.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Metal.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.MicroCom.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.OpenGL.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Vulkan.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + } + } + }, + "Avalonia.Remote.Protocol/11.3.9": { + "runtime": { + "lib/net8.0/Avalonia.Remote.Protocol.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + } + } + }, + "MicroCom.Runtime/0.11.0": { + "runtime": { + "lib/net5.0/MicroCom.Runtime.dll": { + "assemblyVersion": "0.11.0.0", + "fileVersion": "0.11.0.0" + } + } + } + } + }, + "libraries": { + "EarthRotationModel/1.0.3": { + "type": "project", + "serviceable": false, + "sha512": "" + }, + "Avalonia/11.3.9": { + "type": "package", + "serviceable": true, + "sha512": "sha512-YfaTrUxcmVTsGOw2YqdZyunHqZArK16m1pYfNIBvyvAgX89Pzd3A1PgoMkf64u7scL23IN6HkfqhZeFcbYWLoA==", + "path": "avalonia/11.3.9", + "hashPath": "avalonia.11.3.9.nupkg.sha512" + }, + "Avalonia.Remote.Protocol/11.3.9": { + "type": "package", + "serviceable": true, + "sha512": "sha512-2XVLTSNa+Nvwu4D8NqqdudhllTaCRA9ZKlLZZvYLZeuLlzg7OcAV+df/biHQc6AqOv7iMFR9K5Zt3wG0EF4KfQ==", + "path": "avalonia.remote.protocol/11.3.9", + "hashPath": "avalonia.remote.protocol.11.3.9.nupkg.sha512" + }, + "MicroCom.Runtime/0.11.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-MEnrZ3UIiH40hjzMDsxrTyi8dtqB5ziv3iBeeU4bXsL/7NLSal9F1lZKpK+tfBRnUoDSdtcW3KufE4yhATOMCA==", + "path": "microcom.runtime/0.11.0", + "hashPath": "microcom.runtime.0.11.0.nupkg.sha512" + } + } +} \ No newline at end of file diff --git a/.GC/cache/sources/gitcode-official/model/earth-rotation/src/bin/Debug/net8.0/EarthRotationModel.dll b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/bin/Debug/net8.0/EarthRotationModel.dll new file mode 100644 index 0000000..733e0a5 Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/bin/Debug/net8.0/EarthRotationModel.dll differ diff --git a/.GC/cache/sources/gitcode-official/model/earth-rotation/src/bin/Debug/net8.0/EarthRotationModel.pdb b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/bin/Debug/net8.0/EarthRotationModel.pdb new file mode 100644 index 0000000..93b7eff Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/bin/Debug/net8.0/EarthRotationModel.pdb differ diff --git a/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs new file mode 100644 index 0000000..2217181 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v8.0", FrameworkDisplayName = ".NET 8.0")] diff --git a/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache new file mode 100644 index 0000000..59628ff --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache @@ -0,0 +1 @@ +d3edfd2d27ad53cecc2233c3c00fc7c5105ef31f11edecbb0d3f09f0877ea283 diff --git a/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.AssemblyInfo.cs b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.AssemblyInfo.cs new file mode 100644 index 0000000..abbcd11 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.AssemblyInfo.cs @@ -0,0 +1,23 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("NeoRF")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.3.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.3")] +[assembly: System.Reflection.AssemblyProductAttribute("Earth Model Studio")] +[assembly: System.Reflection.AssemblyTitleAttribute("EarthRotationModel")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.3.0")] +[assembly: System.Resources.NeutralResourcesLanguageAttribute("zh-Hans")] + +// Generated by the MSBuild WriteCodeFragment class. + diff --git a/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.AssemblyInfoInputs.cache b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.AssemblyInfoInputs.cache new file mode 100644 index 0000000..8cd403a --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +a85e572672b7e11cce087994ec2bf9f2c6c35d08caa8f597de7648b4deccfeac diff --git a/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.GeneratedMSBuildEditorConfig.editorconfig b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 0000000..ca1d663 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,25 @@ +is_global = true +build_property.AvaloniaNameGeneratorIsEnabled = true +build_property.AvaloniaNameGeneratorBehavior = InitializeComponent +build_property.AvaloniaNameGeneratorDefaultFieldModifier = internal +build_property.AvaloniaNameGeneratorFilterByPath = * +build_property.AvaloniaNameGeneratorFilterByNamespace = * +build_property.AvaloniaNameGeneratorViewFileNamingStrategy = NamespaceAndClassName +build_property.AvaloniaNameGeneratorAttachDevTools = true +build_property.TargetFramework = net8.0 +build_property.TargetFrameworkIdentifier = .NETCoreApp +build_property.TargetFrameworkVersion = v8.0 +build_property.TargetPlatformMinVersion = +build_property.UsingMicrosoftNETSdkWeb = +build_property.ProjectTypeGuids = +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property.EnforceExtendedAnalyzerRules = +build_property.EntryPointFilePath = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = NeoRF.EarthModels +build_property.ProjectDir = /Users/morris/Downloads/GC#/model/earth-rotation/src/ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = +build_property.EffectiveAnalysisLevelStyle = 8.0 +build_property.EnableCodeStyleSeverity = diff --git a/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.assets.cache b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.assets.cache new file mode 100644 index 0000000..52e249d Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.assets.cache differ diff --git a/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.csproj.AssemblyReference.cache b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.csproj.AssemblyReference.cache new file mode 100644 index 0000000..48f2eaa Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.csproj.AssemblyReference.cache differ diff --git a/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.csproj.CoreCompileInputs.cache b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.csproj.CoreCompileInputs.cache new file mode 100644 index 0000000..ba618a1 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.csproj.CoreCompileInputs.cache @@ -0,0 +1 @@ +b8c681344b459d3421d8d2e695338da5708aaca5438c8e32bdb8ff420fbced60 diff --git a/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.csproj.FileListAbsolute.txt b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.csproj.FileListAbsolute.txt new file mode 100644 index 0000000..251a263 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.csproj.FileListAbsolute.txt @@ -0,0 +1,13 @@ +/Users/morris/Downloads/GC#/model/earth-rotation/src/bin/Debug/net8.0/EarthRotationModel.deps.json +/Users/morris/Downloads/GC#/model/earth-rotation/src/bin/Debug/net8.0/EarthRotationModel.dll +/Users/morris/Downloads/GC#/model/earth-rotation/src/bin/Debug/net8.0/EarthRotationModel.pdb +/Users/morris/Downloads/GC#/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.csproj.AssemblyReference.cache +/Users/morris/Downloads/GC#/model/earth-rotation/src/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache +/Users/morris/Downloads/GC#/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.GeneratedMSBuildEditorConfig.editorconfig +/Users/morris/Downloads/GC#/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.AssemblyInfoInputs.cache +/Users/morris/Downloads/GC#/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.AssemblyInfo.cs +/Users/morris/Downloads/GC#/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.csproj.CoreCompileInputs.cache +/Users/morris/Downloads/GC#/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.dll +/Users/morris/Downloads/GC#/model/earth-rotation/src/obj/Debug/net8.0/refint/EarthRotationModel.dll +/Users/morris/Downloads/GC#/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.pdb +/Users/morris/Downloads/GC#/model/earth-rotation/src/obj/Debug/net8.0/ref/EarthRotationModel.dll diff --git a/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.dll b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.dll new file mode 100644 index 0000000..733e0a5 Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.dll differ diff --git a/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.pdb b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.pdb new file mode 100644 index 0000000..93b7eff Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.pdb differ diff --git a/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/ref/EarthRotationModel.dll b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/ref/EarthRotationModel.dll new file mode 100644 index 0000000..2998d6f Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/ref/EarthRotationModel.dll differ diff --git a/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/refint/EarthRotationModel.dll b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/refint/EarthRotationModel.dll new file mode 100644 index 0000000..2998d6f Binary files /dev/null and b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/Debug/net8.0/refint/EarthRotationModel.dll differ diff --git a/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/EarthRotationModel.csproj.nuget.dgspec.json b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/EarthRotationModel.csproj.nuget.dgspec.json new file mode 100644 index 0000000..5bdb538 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/EarthRotationModel.csproj.nuget.dgspec.json @@ -0,0 +1,146 @@ +{ + "format": 1, + "restore": { + "/Users/morris/Downloads/GC#/model/earth-rotation/src/EarthRotationModel.csproj": {} + }, + "projects": { + "/Users/morris/Downloads/GC#/model/earth-rotation/src/EarthRotationModel.csproj": { + "version": "1.0.3", + "restore": { + "projectUniqueName": "/Users/morris/Downloads/GC#/model/earth-rotation/src/EarthRotationModel.csproj", + "projectName": "EarthRotationModel", + "projectPath": "/Users/morris/Downloads/GC#/model/earth-rotation/src/EarthRotationModel.csproj", + "packagesPath": "/Users/morris/.nuget/packages/", + "outputPath": "/Users/morris/Downloads/GC#/model/earth-rotation/src/obj/", + "projectStyle": "PackageReference", + "configFilePaths": [ + "/Users/morris/.nuget/NuGet/NuGet.Config" + ], + "originalTargetFrameworks": [ + "net8.0" + ], + "sources": { + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net8.0": { + "framework": "net8.0", + "targetAlias": "net8.0", + "projectReferences": { + "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj": { + "projectPath": "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj" + } + } + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" + }, + "SdkAnalysisLevel": "10.0.400" + }, + "frameworks": { + "net8.0": { + "framework": "net8.0", + "targetAlias": "net8.0", + "dependencies": { + "Avalonia": { + "target": "Package", + "version": "[11.3.9, )" + } + }, + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/10.0.401/PortableRuntimeIdentifierGraph.json" + } + } + }, + "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj": { + "version": "1.0.3", + "restore": { + "projectUniqueName": "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj", + "projectName": "EarthModelStudio.ModelSdk", + "projectPath": "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj", + "packagesPath": "/Users/morris/.nuget/packages/", + "outputPath": "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/obj/", + "projectStyle": "PackageReference", + "configFilePaths": [ + "/Users/morris/.nuget/NuGet/NuGet.Config" + ], + "originalTargetFrameworks": [ + "net8.0" + ], + "sources": { + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net8.0": { + "framework": "net8.0", + "targetAlias": "net8.0", + "projectReferences": {} + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" + }, + "SdkAnalysisLevel": "10.0.400" + }, + "frameworks": { + "net8.0": { + "framework": "net8.0", + "targetAlias": "net8.0", + "dependencies": { + "Avalonia": { + "target": "Package", + "version": "[11.3.9, )" + } + }, + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/10.0.401/PortableRuntimeIdentifierGraph.json" + } + } + } + } +} \ No newline at end of file diff --git a/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/EarthRotationModel.csproj.nuget.g.props b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/EarthRotationModel.csproj.nuget.g.props new file mode 100644 index 0000000..49d666c --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/EarthRotationModel.csproj.nuget.g.props @@ -0,0 +1,22 @@ + + + + True + NuGet + $(MSBuildThisFileDirectory)project.assets.json + /Users/morris/.nuget/packages/ + /Users/morris/.nuget/packages/ + PackageReference + 7.0.0 + + + + + + + + + /Users/morris/.nuget/packages/avalonia.buildservices/11.3.2 + /Users/morris/.nuget/packages/avalonia/11.3.9 + + \ No newline at end of file diff --git a/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/EarthRotationModel.csproj.nuget.g.targets b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/EarthRotationModel.csproj.nuget.g.targets new file mode 100644 index 0000000..c2c2aaf --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/EarthRotationModel.csproj.nuget.g.targets @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/project.assets.json b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/project.assets.json new file mode 100644 index 0000000..b33fbb4 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/project.assets.json @@ -0,0 +1,436 @@ +{ + "version": 4, + "targets": { + "net8.0": { + "Avalonia/11.3.9": { + "type": "package", + "dependencies": { + "Avalonia.BuildServices": "11.3.2", + "Avalonia.Remote.Protocol": "11.3.9", + "MicroCom.Runtime": "0.11.0" + }, + "compile": { + "ref/net8.0/Avalonia.Base.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.Controls.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.DesignerSupport.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.Dialogs.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.Markup.Xaml.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.Markup.dll": { + "related": ".Xaml.xml;.xml" + }, + "ref/net8.0/Avalonia.Metal.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.MicroCom.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.OpenGL.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.Vulkan.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.dll": { + "related": ".Base.xml;.Controls.xml;.DesignerSupport.xml;.Dialogs.xml;.Markup.Xaml.xml;.Markup.xml;.Metal.xml;.MicroCom.xml;.OpenGL.xml;.Vulkan.xml;.xml" + } + }, + "runtime": { + "lib/net8.0/Avalonia.Base.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.Controls.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.DesignerSupport.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.Dialogs.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.Markup.Xaml.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.Markup.dll": { + "related": ".Xaml.xml;.xml" + }, + "lib/net8.0/Avalonia.Metal.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.MicroCom.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.OpenGL.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.Vulkan.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.dll": { + "related": ".Base.xml;.Controls.xml;.DesignerSupport.xml;.Dialogs.xml;.Markup.Xaml.xml;.Markup.xml;.Metal.xml;.MicroCom.xml;.OpenGL.xml;.Vulkan.xml;.xml" + } + }, + "build": { + "buildTransitive/Avalonia.props": {}, + "buildTransitive/Avalonia.targets": {} + } + }, + "Avalonia.BuildServices/11.3.2": { + "type": "package", + "build": { + "buildTransitive/Avalonia.BuildServices.targets": {} + } + }, + "Avalonia.Remote.Protocol/11.3.9": { + "type": "package", + "compile": { + "lib/net8.0/Avalonia.Remote.Protocol.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net8.0/Avalonia.Remote.Protocol.dll": { + "related": ".xml" + } + } + }, + "MicroCom.Runtime/0.11.0": { + "type": "package", + "compile": { + "lib/net5.0/MicroCom.Runtime.dll": {} + }, + "runtime": { + "lib/net5.0/MicroCom.Runtime.dll": {} + } + }, + "EarthModelStudio.ModelSdk/1.0.3": { + "type": "project", + "framework": ".NETCoreApp,Version=v8.0", + "dependencies": { + "Avalonia": "11.3.9" + }, + "compile": { + "bin/placeholder/EarthModelStudio.ModelSdk.dll": {} + }, + "runtime": { + "bin/placeholder/EarthModelStudio.ModelSdk.dll": {} + } + } + } + }, + "libraries": { + "Avalonia/11.3.9": { + "sha512": "YfaTrUxcmVTsGOw2YqdZyunHqZArK16m1pYfNIBvyvAgX89Pzd3A1PgoMkf64u7scL23IN6HkfqhZeFcbYWLoA==", + "type": "package", + "path": "avalonia/11.3.9", + "hasTools": true, + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "analyzers/dotnet/cs/Avalonia.Analyzers.dll", + "analyzers/dotnet/cs/Avalonia.Generators.dll", + "avalonia.11.3.9.nupkg.sha512", + "avalonia.nuspec", + "build/Avalonia.Generators.props", + "build/Avalonia.props", + "build/Avalonia.targets", + "build/AvaloniaBuildTasks.props", + "build/AvaloniaBuildTasks.targets", + "build/AvaloniaItemSchema.xaml", + "build/AvaloniaPrivateApis.targets", + "build/AvaloniaRules.Project.xml", + "build/AvaloniaSingleProject.targets", + "build/AvaloniaVersion.props", + "buildTransitive/Avalonia.Generators.props", + "buildTransitive/Avalonia.props", + "buildTransitive/Avalonia.targets", + "buildTransitive/AvaloniaBuildTasks.props", + "buildTransitive/AvaloniaBuildTasks.targets", + "buildTransitive/AvaloniaItemSchema.xaml", + "buildTransitive/AvaloniaPrivateApis.targets", + "buildTransitive/AvaloniaRules.Project.xml", + "buildTransitive/AvaloniaSingleProject.targets", + "lib/net6.0/Avalonia.Base.dll", + "lib/net6.0/Avalonia.Base.xml", + "lib/net6.0/Avalonia.Controls.dll", + "lib/net6.0/Avalonia.Controls.xml", + "lib/net6.0/Avalonia.DesignerSupport.dll", + "lib/net6.0/Avalonia.DesignerSupport.xml", + "lib/net6.0/Avalonia.Dialogs.dll", + "lib/net6.0/Avalonia.Dialogs.xml", + "lib/net6.0/Avalonia.Markup.Xaml.dll", + "lib/net6.0/Avalonia.Markup.Xaml.xml", + "lib/net6.0/Avalonia.Markup.dll", + "lib/net6.0/Avalonia.Markup.xml", + "lib/net6.0/Avalonia.Metal.dll", + "lib/net6.0/Avalonia.Metal.xml", + "lib/net6.0/Avalonia.MicroCom.dll", + "lib/net6.0/Avalonia.MicroCom.xml", + "lib/net6.0/Avalonia.OpenGL.dll", + "lib/net6.0/Avalonia.OpenGL.xml", + "lib/net6.0/Avalonia.Vulkan.dll", + "lib/net6.0/Avalonia.Vulkan.xml", + "lib/net6.0/Avalonia.dll", + "lib/net6.0/Avalonia.xml", + "lib/net8.0/Avalonia.Base.dll", + "lib/net8.0/Avalonia.Base.xml", + "lib/net8.0/Avalonia.Controls.dll", + "lib/net8.0/Avalonia.Controls.xml", + "lib/net8.0/Avalonia.DesignerSupport.dll", + "lib/net8.0/Avalonia.DesignerSupport.xml", + "lib/net8.0/Avalonia.Dialogs.dll", + "lib/net8.0/Avalonia.Dialogs.xml", + "lib/net8.0/Avalonia.Markup.Xaml.dll", + "lib/net8.0/Avalonia.Markup.Xaml.xml", + "lib/net8.0/Avalonia.Markup.dll", + "lib/net8.0/Avalonia.Markup.xml", + "lib/net8.0/Avalonia.Metal.dll", + "lib/net8.0/Avalonia.Metal.xml", + "lib/net8.0/Avalonia.MicroCom.dll", + "lib/net8.0/Avalonia.MicroCom.xml", + "lib/net8.0/Avalonia.OpenGL.dll", + "lib/net8.0/Avalonia.OpenGL.xml", + "lib/net8.0/Avalonia.Vulkan.dll", + "lib/net8.0/Avalonia.Vulkan.xml", + "lib/net8.0/Avalonia.dll", + "lib/net8.0/Avalonia.xml", + "lib/netstandard2.0/Avalonia.Base.dll", + "lib/netstandard2.0/Avalonia.Base.xml", + "lib/netstandard2.0/Avalonia.Controls.dll", + "lib/netstandard2.0/Avalonia.Controls.xml", + "lib/netstandard2.0/Avalonia.DesignerSupport.dll", + "lib/netstandard2.0/Avalonia.DesignerSupport.xml", + "lib/netstandard2.0/Avalonia.Dialogs.dll", + "lib/netstandard2.0/Avalonia.Dialogs.xml", + "lib/netstandard2.0/Avalonia.Markup.Xaml.dll", + "lib/netstandard2.0/Avalonia.Markup.Xaml.xml", + "lib/netstandard2.0/Avalonia.Markup.dll", + "lib/netstandard2.0/Avalonia.Markup.xml", + "lib/netstandard2.0/Avalonia.Metal.dll", + "lib/netstandard2.0/Avalonia.Metal.xml", + "lib/netstandard2.0/Avalonia.MicroCom.dll", + "lib/netstandard2.0/Avalonia.MicroCom.xml", + "lib/netstandard2.0/Avalonia.OpenGL.dll", + "lib/netstandard2.0/Avalonia.OpenGL.xml", + "lib/netstandard2.0/Avalonia.Vulkan.dll", + "lib/netstandard2.0/Avalonia.Vulkan.xml", + "lib/netstandard2.0/Avalonia.dll", + "lib/netstandard2.0/Avalonia.xml", + "ref/net6.0/Avalonia.Base.dll", + "ref/net6.0/Avalonia.Base.xml", + "ref/net6.0/Avalonia.Controls.dll", + "ref/net6.0/Avalonia.Controls.xml", + "ref/net6.0/Avalonia.DesignerSupport.dll", + "ref/net6.0/Avalonia.DesignerSupport.xml", + "ref/net6.0/Avalonia.Dialogs.dll", + "ref/net6.0/Avalonia.Dialogs.xml", + "ref/net6.0/Avalonia.Markup.Xaml.dll", + "ref/net6.0/Avalonia.Markup.Xaml.xml", + "ref/net6.0/Avalonia.Markup.dll", + "ref/net6.0/Avalonia.Markup.xml", + "ref/net6.0/Avalonia.Metal.dll", + "ref/net6.0/Avalonia.Metal.xml", + "ref/net6.0/Avalonia.MicroCom.dll", + "ref/net6.0/Avalonia.MicroCom.xml", + "ref/net6.0/Avalonia.OpenGL.dll", + "ref/net6.0/Avalonia.OpenGL.xml", + "ref/net6.0/Avalonia.Vulkan.dll", + "ref/net6.0/Avalonia.Vulkan.xml", + "ref/net6.0/Avalonia.dll", + "ref/net6.0/Avalonia.xml", + "ref/net8.0/Avalonia.Base.dll", + "ref/net8.0/Avalonia.Base.xml", + "ref/net8.0/Avalonia.Controls.dll", + "ref/net8.0/Avalonia.Controls.xml", + "ref/net8.0/Avalonia.DesignerSupport.dll", + "ref/net8.0/Avalonia.DesignerSupport.xml", + "ref/net8.0/Avalonia.Dialogs.dll", + "ref/net8.0/Avalonia.Dialogs.xml", + "ref/net8.0/Avalonia.Markup.Xaml.dll", + "ref/net8.0/Avalonia.Markup.Xaml.xml", + "ref/net8.0/Avalonia.Markup.dll", + "ref/net8.0/Avalonia.Markup.xml", + "ref/net8.0/Avalonia.Metal.dll", + "ref/net8.0/Avalonia.Metal.xml", + "ref/net8.0/Avalonia.MicroCom.dll", + "ref/net8.0/Avalonia.MicroCom.xml", + "ref/net8.0/Avalonia.OpenGL.dll", + "ref/net8.0/Avalonia.OpenGL.xml", + "ref/net8.0/Avalonia.Vulkan.dll", + "ref/net8.0/Avalonia.Vulkan.xml", + "ref/net8.0/Avalonia.dll", + "ref/net8.0/Avalonia.xml", + "ref/netstandard2.0/Avalonia.Base.dll", + "ref/netstandard2.0/Avalonia.Base.xml", + "ref/netstandard2.0/Avalonia.Controls.dll", + "ref/netstandard2.0/Avalonia.Controls.xml", + "ref/netstandard2.0/Avalonia.DesignerSupport.dll", + "ref/netstandard2.0/Avalonia.DesignerSupport.xml", + "ref/netstandard2.0/Avalonia.Dialogs.dll", + "ref/netstandard2.0/Avalonia.Dialogs.xml", + "ref/netstandard2.0/Avalonia.Markup.Xaml.dll", + "ref/netstandard2.0/Avalonia.Markup.Xaml.xml", + "ref/netstandard2.0/Avalonia.Markup.dll", + "ref/netstandard2.0/Avalonia.Markup.xml", + "ref/netstandard2.0/Avalonia.Metal.dll", + "ref/netstandard2.0/Avalonia.Metal.xml", + "ref/netstandard2.0/Avalonia.MicroCom.dll", + "ref/netstandard2.0/Avalonia.MicroCom.xml", + "ref/netstandard2.0/Avalonia.OpenGL.dll", + "ref/netstandard2.0/Avalonia.OpenGL.xml", + "ref/netstandard2.0/Avalonia.Vulkan.dll", + "ref/netstandard2.0/Avalonia.Vulkan.xml", + "ref/netstandard2.0/Avalonia.dll", + "ref/netstandard2.0/Avalonia.xml", + "tools/net461/designer/Avalonia.Designer.HostApp.exe", + "tools/netstandard2.0/Avalonia.Build.Tasks.dll", + "tools/netstandard2.0/designer/Avalonia.Designer.HostApp.dll" + ] + }, + "Avalonia.BuildServices/11.3.2": { + "sha512": "qHDToxto1e3hci5YqbG9n0Ty8mlp3zBUN5wT66wKqaDVzXyQ0do3EnRILd4Ke9jpvsktaPpgE0YjEk7hornryQ==", + "type": "package", + "path": "avalonia.buildservices/11.3.2", + "hasTools": true, + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "README.md", + "avalonia.buildservices.11.3.2.nupkg.sha512", + "avalonia.buildservices.nuspec", + "build/Avalonia.BuildServices.targets", + "buildTransitive/Avalonia.BuildServices.targets", + "tools/netstandard2.0/Avalonia.BuildServices.Collector.dll", + "tools/netstandard2.0/Avalonia.BuildServices.dll", + "tools/netstandard2.0/runtimeconfig.json" + ] + }, + "Avalonia.Remote.Protocol/11.3.9": { + "sha512": "2XVLTSNa+Nvwu4D8NqqdudhllTaCRA9ZKlLZZvYLZeuLlzg7OcAV+df/biHQc6AqOv7iMFR9K5Zt3wG0EF4KfQ==", + "type": "package", + "path": "avalonia.remote.protocol/11.3.9", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "avalonia.remote.protocol.11.3.9.nupkg.sha512", + "avalonia.remote.protocol.nuspec", + "lib/net6.0/Avalonia.Remote.Protocol.dll", + "lib/net6.0/Avalonia.Remote.Protocol.xml", + "lib/net8.0/Avalonia.Remote.Protocol.dll", + "lib/net8.0/Avalonia.Remote.Protocol.xml", + "lib/netstandard2.0/Avalonia.Remote.Protocol.dll", + "lib/netstandard2.0/Avalonia.Remote.Protocol.xml" + ] + }, + "MicroCom.Runtime/0.11.0": { + "sha512": "MEnrZ3UIiH40hjzMDsxrTyi8dtqB5ziv3iBeeU4bXsL/7NLSal9F1lZKpK+tfBRnUoDSdtcW3KufE4yhATOMCA==", + "type": "package", + "path": "microcom.runtime/0.11.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "lib/net5.0/MicroCom.Runtime.dll", + "lib/netstandard2.0/MicroCom.Runtime.dll", + "microcom.runtime.0.11.0.nupkg.sha512", + "microcom.runtime.nuspec" + ] + }, + "EarthModelStudio.ModelSdk/1.0.3": { + "type": "project", + "path": "../../_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj", + "msbuildProject": "../../_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj" + } + }, + "projectFileDependencyGroups": { + "net8.0": [ + "Avalonia >= 11.3.9", + "EarthModelStudio.ModelSdk >= 1.0.3" + ] + }, + "packageFolders": { + "/Users/morris/.nuget/packages/": {} + }, + "project": { + "version": "1.0.3", + "restore": { + "projectUniqueName": "/Users/morris/Downloads/GC#/model/earth-rotation/src/EarthRotationModel.csproj", + "projectName": "EarthRotationModel", + "projectPath": "/Users/morris/Downloads/GC#/model/earth-rotation/src/EarthRotationModel.csproj", + "packagesPath": "/Users/morris/.nuget/packages/", + "outputPath": "/Users/morris/Downloads/GC#/model/earth-rotation/src/obj/", + "projectStyle": "PackageReference", + "configFilePaths": [ + "/Users/morris/.nuget/NuGet/NuGet.Config" + ], + "originalTargetFrameworks": [ + "net8.0" + ], + "sources": { + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net8.0": { + "framework": "net8.0", + "targetAlias": "net8.0", + "projectReferences": { + "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj": { + "projectPath": "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj" + } + } + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" + }, + "SdkAnalysisLevel": "10.0.400" + }, + "frameworks": { + "net8.0": { + "framework": "net8.0", + "targetAlias": "net8.0", + "dependencies": { + "Avalonia": { + "target": "Package", + "version": "[11.3.9, )" + } + }, + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/10.0.401/PortableRuntimeIdentifierGraph.json" + } + } + } +} \ No newline at end of file diff --git a/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/project.nuget.cache b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/project.nuget.cache new file mode 100644 index 0000000..9d5f739 --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/earth-rotation/src/obj/project.nuget.cache @@ -0,0 +1,13 @@ +{ + "version": 2, + "dgSpecHash": "qWCssTziIvU=", + "success": true, + "projectFilePath": "/Users/morris/Downloads/GC#/model/earth-rotation/src/EarthRotationModel.csproj", + "expectedPackageFiles": [ + "/Users/morris/.nuget/packages/avalonia/11.3.9/avalonia.11.3.9.nupkg.sha512", + "/Users/morris/.nuget/packages/avalonia.buildservices/11.3.2/avalonia.buildservices.11.3.2.nupkg.sha512", + "/Users/morris/.nuget/packages/avalonia.remote.protocol/11.3.9/avalonia.remote.protocol.11.3.9.nupkg.sha512", + "/Users/morris/.nuget/packages/microcom.runtime/0.11.0/microcom.runtime.0.11.0.nupkg.sha512" + ], + "logs": [] +} \ No newline at end of file diff --git a/.GC/cache/sources/gitcode-official/model/version.json b/.GC/cache/sources/gitcode-official/model/version.json new file mode 100644 index 0000000..04d80ad --- /dev/null +++ b/.GC/cache/sources/gitcode-official/model/version.json @@ -0,0 +1,53 @@ +{ + "schema": 1, + "generated": "2026-11-08T09:22:29Z", + "repository": "https://gitcode.com/2509_92447106/GC", + "branch": "main", + "modelDir": "model", + "launcher": { + "version": "1.0.3", + "revision": "a75fbf4d57", + "packages": { + "win-x64": { + "path": "dist/GC-win-x64.zip", + "url": "https://gitcode.com/2509_92447106/GC/releases/download/v1.0.3/GC-win-x64.zip" + }, + "win-arm64": { + "path": "dist/GC-win-arm64.zip", + "url": "https://gitcode.com/2509_92447106/GC/releases/download/v1.0.3/GC-win-arm64.zip" + }, + "osx-arm64": { + "path": "dist/GC-osx-arm64.zip", + "url": "https://gitcode.com/2509_92447106/GC/releases/download/v1.0.3/GC-osx-arm64.zip" + }, + "osx-x64": { + "path": "dist/GC-osx-x64.zip", + "url": "https://gitcode.com/2509_92447106/GC/releases/download/v1.0.3/GC-osx-x64.zip" + }, + "linux-x64": { + "path": "dist/GC-linux-x64.zip", + "url": "https://gitcode.com/2509_92447106/GC/releases/download/v1.0.3/GC-linux-x64.zip" + } + } + }, + "models": [ + { + "id": "earth-geography", + "version": "1.0", + "build": "883fdf6c57", + "dir": "model/earth-geography" + }, + { + "id": "earth-revolution", + "version": "1.0", + "build": "a24be3664d", + "dir": "model/earth-revolution" + }, + { + "id": "earth-rotation", + "version": "1.0", + "build": "0bd5b4507c", + "dir": "model/earth-rotation" + } + ] +} diff --git a/.GC/model/earth-geography/earth-geography.json b/.GC/model/earth-geography/earth-geography.json index b2d030f..43651df 100644 --- a/.GC/model/earth-geography/earth-geography.json +++ b/.GC/model/earth-geography/earth-geography.json @@ -17,7 +17,7 @@ "atlas" ], "dataDir": "earth-geography.model", - "version": "1.0", - "updatedAt": "2026-11-08T09:22:29Z", - "build": "883fdf6c57" + "version": "1.1", + "updatedAt": "2026-11-08T10:02:58Z", + "build": "8a5dd0c9b4" } diff --git a/.GC/model/earth-geography/earth-geography.model/EarthGeographyModel.dll b/.GC/model/earth-geography/earth-geography.model/EarthGeographyModel.dll index 986d2fb..146b4f8 100644 Binary files a/.GC/model/earth-geography/earth-geography.model/EarthGeographyModel.dll and b/.GC/model/earth-geography/earth-geography.model/EarthGeographyModel.dll differ diff --git a/.GC/model/earth-revolution/earth-revolution.json b/.GC/model/earth-revolution/earth-revolution.json index 2357b29..a0711a2 100644 --- a/.GC/model/earth-revolution/earth-revolution.json +++ b/.GC/model/earth-revolution/earth-revolution.json @@ -23,7 +23,7 @@ "type": "NeoRF.EarthModels.RevolutionModelFactory", "preview": "preview.png", "apiVersion": 1, - "version": "1.0", - "updatedAt": "2026-11-08T09:22:29Z", - "build": "a24be3664d" + "version": "1.1", + "updatedAt": "2026-11-08T10:02:58Z", + "build": "51511a8825" } diff --git a/.GC/model/earth-revolution/earth-revolution.model/EarthRevolutionModel.dll b/.GC/model/earth-revolution/earth-revolution.model/EarthRevolutionModel.dll index 10afa05..3c0d4e2 100644 Binary files a/.GC/model/earth-revolution/earth-revolution.model/EarthRevolutionModel.dll and b/.GC/model/earth-revolution/earth-revolution.model/EarthRevolutionModel.dll differ diff --git a/.GC/model/earth-rotation/earth-rotation.json b/.GC/model/earth-rotation/earth-rotation.json index adae70b..a1d0e37 100644 --- a/.GC/model/earth-rotation/earth-rotation.json +++ b/.GC/model/earth-rotation/earth-rotation.json @@ -23,7 +23,7 @@ "type": "NeoRF.EarthModels.RotationModelFactory", "preview": "preview.png", "apiVersion": 1, - "version": "1.0", - "updatedAt": "2026-11-08T09:22:29Z", - "build": "0bd5b4507c" + "version": "1.1", + "updatedAt": "2026-11-08T10:02:58Z", + "build": "c478068be1" } diff --git a/.GC/model/earth-rotation/earth-rotation.model/EarthRotationModel.dll b/.GC/model/earth-rotation/earth-rotation.model/EarthRotationModel.dll index e3a6086..b97c59a 100644 Binary files a/.GC/model/earth-rotation/earth-rotation.model/EarthRotationModel.dll and b/.GC/model/earth-rotation/earth-rotation.model/EarthRotationModel.dll differ diff --git a/Directory.Build.props b/Directory.Build.props index dd81491..486ba3c 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -21,7 +21,7 @@ --> 11.3.9 8.2.2 - 1.0.3 + 1.0.4 NeoRF Earth Model Studio zh-Hans diff --git a/build.sh b/build.sh index 9a15fbb..37a2693 100755 --- a/build.sh +++ b/build.sh @@ -30,6 +30,24 @@ VERSION=$(sed -n 's/.*\(.*\)<\/Version>.*/\1/p' Directory.Build.props | [ -n "$VERSION" ] || VERSION="1.0.0" TASK="${1:-build}" +shift 2>/dev/null || true + +# 解析 -version=<版本号>(也接受 --version=) +CLI_VERSION="" +for arg in "$@"; do + case "$arg" in + -version=*|--version=*) CLI_VERSION="${arg#*=}" ;; + esac +done +if [ -n "$CLI_VERSION" ]; then + VERSION="$CLI_VERSION" + # 写回 Directory.Build.props,让程序集版本与关于页显示一致 + if [ -f Directory.Build.props ]; then + sed -i.bak "s|[^<]*|${VERSION}|" Directory.Build.props + rm -f Directory.Build.props.bak + fi + echo "==> 版本号设为 ${VERSION}" +fi mkdir -p "$ROOT_DIR/build/logs" # 加载 buildsh 模块 diff --git a/buildsh/lib/build_funcs.sh b/buildsh/lib/build_funcs.sh index 8ddee06..82c203d 100644 --- a/buildsh/lib/build_funcs.sh +++ b/buildsh/lib/build_funcs.sh @@ -219,6 +219,26 @@ PLIST [ "$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" + if [ -f "$ICONSRC" ] && command -v iconutil >/dev/null 2>&1; then + ICONSET="$DIST/AppIcon.iconset" + rm -rf "$ICONSET"; mkdir -p "$ICONSET" + for sz in 16 32 64 128 256 512; do + sips -z $sz $sz "$ICONSRC" --out "$ICONSET/icon_${sz}x${sz}.png" >/dev/null 2>&1 + d=$((sz * 2)) + sips -z $d $d "$ICONSRC" --out "$ICONSET/icon_${sz}x${sz}@2x.png" >/dev/null 2>&1 + done + iconutil -c icns "$ICONSET" -o "$APP/Contents/Resources/AppIcon.icns" 2>/dev/null && \ + echo " + AppIcon.icns" + rm -rf "$ICONSET" + # Info.plist 增加图标项 + if [ -f "$APP/Contents/Info.plist" ]; then + /usr/libexec/PlistBuddy -c "Delete :CFBundleIconFile" "$APP/Contents/Info.plist" 2>/dev/null || true + /usr/libexec/PlistBuddy -c "Add :CFBundleIconFile string AppIcon" "$APP/Contents/Info.plist" 2>/dev/null || true + fi + fi + # 发布包不带 .GC 运行骨架(用户首次启动自行创建),避免覆盖用户数据 rm -rf "$APP/Contents/MacOS/.GC" chmod +x "$APP/Contents/MacOS/EarthModelStudio" diff --git a/model/_engine/VersionStamp/bin/Release/net8.0/VersionStamp.deps.json b/model/_engine/VersionStamp/bin/Release/net8.0/VersionStamp.deps.json index 2a47598..0600a40 100644 --- a/model/_engine/VersionStamp/bin/Release/net8.0/VersionStamp.deps.json +++ b/model/_engine/VersionStamp/bin/Release/net8.0/VersionStamp.deps.json @@ -6,7 +6,7 @@ "compilationOptions": {}, "targets": { ".NETCoreApp,Version=v8.0": { - "VersionStamp/1.0.3": { + "VersionStamp/1.0.4": { "runtime": { "VersionStamp.dll": {} } @@ -14,7 +14,7 @@ } }, "libraries": { - "VersionStamp/1.0.3": { + "VersionStamp/1.0.4": { "type": "project", "serviceable": false, "sha512": "" diff --git a/model/_engine/VersionStamp/bin/Release/net8.0/VersionStamp.dll b/model/_engine/VersionStamp/bin/Release/net8.0/VersionStamp.dll index 4b3b2b7..ed23d53 100644 Binary files a/model/_engine/VersionStamp/bin/Release/net8.0/VersionStamp.dll and b/model/_engine/VersionStamp/bin/Release/net8.0/VersionStamp.dll differ diff --git a/model/_engine/VersionStamp/bin/Release/net8.0/VersionStamp.pdb b/model/_engine/VersionStamp/bin/Release/net8.0/VersionStamp.pdb index d417a0b..8a8e679 100644 Binary files a/model/_engine/VersionStamp/bin/Release/net8.0/VersionStamp.pdb and b/model/_engine/VersionStamp/bin/Release/net8.0/VersionStamp.pdb differ diff --git a/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.AssemblyInfo.cs b/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.AssemblyInfo.cs index d7cfa94..643b09e 100644 --- a/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.AssemblyInfo.cs +++ b/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.AssemblyInfo.cs @@ -12,11 +12,11 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("NeoRF")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] -[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.3.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.3")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.4.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.4+5e0b46b3f3cd9800af177571c7809a7cdc8e9249")] [assembly: System.Reflection.AssemblyProductAttribute("Earth Model Studio")] [assembly: System.Reflection.AssemblyTitleAttribute("VersionStamp")] -[assembly: System.Reflection.AssemblyVersionAttribute("1.0.3.0")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.4.0")] [assembly: System.Resources.NeutralResourcesLanguageAttribute("zh-Hans")] // Generated by the MSBuild WriteCodeFragment class. diff --git a/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.AssemblyInfoInputs.cache b/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.AssemblyInfoInputs.cache index dabd766..e06a808 100644 --- a/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.AssemblyInfoInputs.cache +++ b/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.AssemblyInfoInputs.cache @@ -1 +1 @@ -74f99e4d9cbf91b981ea8bb9ca826e7a8f5f09eeb43c6922e054b3d03a9b8acf +0fdccf7064e4678fc0b1e0e6a51a346fd9c3d8203e8baf89bd9cd32cd21f8939 diff --git a/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.dll b/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.dll index 4b3b2b7..ed23d53 100644 Binary files a/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.dll and b/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.dll differ diff --git a/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.pdb b/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.pdb index d417a0b..8a8e679 100644 Binary files a/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.pdb and b/model/_engine/VersionStamp/obj/Release/net8.0/VersionStamp.pdb differ diff --git a/model/_engine/VersionStamp/obj/Release/net8.0/ref/VersionStamp.dll b/model/_engine/VersionStamp/obj/Release/net8.0/ref/VersionStamp.dll index 6a37898..1139844 100644 Binary files a/model/_engine/VersionStamp/obj/Release/net8.0/ref/VersionStamp.dll and b/model/_engine/VersionStamp/obj/Release/net8.0/ref/VersionStamp.dll differ diff --git a/model/_engine/VersionStamp/obj/Release/net8.0/refint/VersionStamp.dll b/model/_engine/VersionStamp/obj/Release/net8.0/refint/VersionStamp.dll index 6a37898..1139844 100644 Binary files a/model/_engine/VersionStamp/obj/Release/net8.0/refint/VersionStamp.dll and b/model/_engine/VersionStamp/obj/Release/net8.0/refint/VersionStamp.dll differ diff --git a/model/_engine/VersionStamp/obj/VersionStamp.csproj.nuget.dgspec.json b/model/_engine/VersionStamp/obj/VersionStamp.csproj.nuget.dgspec.json index cdd636d..81ac9a4 100644 --- a/model/_engine/VersionStamp/obj/VersionStamp.csproj.nuget.dgspec.json +++ b/model/_engine/VersionStamp/obj/VersionStamp.csproj.nuget.dgspec.json @@ -5,7 +5,7 @@ }, "projects": { "/Users/morris/Downloads/GC#/model/_engine/VersionStamp/VersionStamp.csproj": { - "version": "1.0.3", + "version": "1.0.4", "restore": { "projectUniqueName": "/Users/morris/Downloads/GC#/model/_engine/VersionStamp/VersionStamp.csproj", "projectName": "VersionStamp", diff --git a/model/_engine/VersionStamp/obj/project.assets.json b/model/_engine/VersionStamp/obj/project.assets.json index c40f2e8..1b8b661 100644 --- a/model/_engine/VersionStamp/obj/project.assets.json +++ b/model/_engine/VersionStamp/obj/project.assets.json @@ -11,7 +11,7 @@ "/Users/morris/.nuget/packages/": {} }, "project": { - "version": "1.0.3", + "version": "1.0.4", "restore": { "projectUniqueName": "/Users/morris/Downloads/GC#/model/_engine/VersionStamp/VersionStamp.csproj", "projectName": "VersionStamp", diff --git a/model/_engine/VersionStamp/obj/project.nuget.cache b/model/_engine/VersionStamp/obj/project.nuget.cache index 87cff4b..8f06c55 100644 --- a/model/_engine/VersionStamp/obj/project.nuget.cache +++ b/model/_engine/VersionStamp/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "tJZIToOhfvc=", + "dgSpecHash": "d5HD23m5HNE=", "success": true, "projectFilePath": "/Users/morris/Downloads/GC#/model/_engine/VersionStamp/VersionStamp.csproj", "expectedPackageFiles": [], diff --git a/model/_engine/src/CelestialView.cs b/model/_engine/src/CelestialView.cs index 2b5f30d..23d39ce 100644 --- a/model/_engine/src/CelestialView.cs +++ b/model/_engine/src/CelestialView.cs @@ -726,34 +726,43 @@ public class CelestialView : Control, IDisposable if (!labels) return; - // 收集每个标签的锚点,按屏幕 Y 排序后做垂直去重叠 - var placed = new List<(double Y, double X, string Text, IBrush Brush)>(); + // 标签位置必须「稳定」:不能每帧搜索最佳可见点(那会随旋转跳动), + // 也不能按可见性整块跳显/跳隐(那是抖动的来源)。 + // + // 做法: + // · Y 用该纬线在当前视角下的实际投影高度(纬度本身随俯仰连续变化,不会跳); + // · X 固定在球体右侧一点,与旋转无关; + // · 可见性用一个连续衰减的透明度,而不是阈值切换。 + var placed = new List<(double Y, double Lat, string Text, IBrush Brush)>(); foreach (var l in lines) { if (l.Label == null) continue; - Vector3 best = default; - var bestScore = double.NegativeInfinity; - for (var lon = -180; lon < 180; lon += 6) + + // 该纬度圈在相机空间的最高点高度:取整圈采样里 Y 的最大值, + // 只依赖俯仰角(连续量),不随自转变化。 + var maxY = double.NegativeInfinity; + for (var lon = 0; lon < 360; lon += 10) { var world = Vector3.Transform(LatLonToUnit(l.Lat, lon), planet); var c = Vector3.Transform(world, cam); - if (c.Z < 0.10f) continue; - var score = c.X * 2.0 + c.Z; - if (score > bestScore) { bestScore = score; best = c; } + if (c.Y > maxY) maxY = c.Y; } - if (double.IsNegativeInfinity(bestScore)) continue; - placed.Add((center.Y - best.Y * radius, center.X + best.X * radius, l.Label, l.Brush)); + if (double.IsNegativeInfinity(maxY)) continue; + + placed.Add((center.Y - maxY * radius, l.Lat, l.Label, l.Brush)); } - placed.Sort((a, b) => a.Y.CompareTo(b.Y)); - const double minGap = 16.0; - var lastY = double.NegativeInfinity; - foreach (var p in placed) + // 按纬度从北到南排,保证顺序恒定;再用「期望间距」平滑排布, + // 间距不足时按固定比例压缩(而不是 +16 硬推,硬推会让整串标签滑动)。 + placed.Sort((a, b) => b.Lat.CompareTo(a.Lat)); + if (placed.Count == 0) return; + + var labelX = center.X + radius * 1.02; // 固定在球右侧外部 + for (var i = 0; i < placed.Count; i++) { - var y = p.Y; - if (y - lastY < minGap) y = lastY + minGap; - lastY = y; - DrawLabelChip(ctx, p.Text, new Point(p.X, y), InsetMode ? 9.0 : 10.5, p.Brush, toRight: false); + var p = placed[i]; + DrawLabelChip(ctx, p.Text, new Point(labelX, p.Y), + InsetMode ? 9.0 : 10.5, p.Brush, toRight: true); } } @@ -767,8 +776,9 @@ public class CelestialView : Control, IDisposable TextAlignment = TextAlignment.Left, Trimming = TextTrimming.None }; + // 锚点即文字垂直中心,避免不同文字高度造成上下漂移 var x = toRight ? anchor.X + 9 : Math.Max(3, anchor.X - formatted.Width - 9); - var y = anchor.Y - formatted.Height - 4; + var y = anchor.Y - formatted.Height * 0.5; ctx.DrawRectangle(ChipBg, null, new Rect(x - 5, y - 2, formatted.Width + 10, formatted.Height + 5), 4, 4); ctx.DrawText(formatted, new Point(x, y)); diff --git a/model/_engine/src/EarthModelView.cs b/model/_engine/src/EarthModelView.cs index dadb2ca..73a0638 100644 --- a/model/_engine/src/EarthModelView.cs +++ b/model/_engine/src/EarthModelView.cs @@ -48,7 +48,6 @@ public sealed class EarthModelView : UserControl, IDisposable private TextBlock? _closeupLabel; private ModelButton? _playButton; private ModelButton? _overheadButton; - private ModelButton? _closeupButton; private TextBlock? _zoomText; private TextBlock? _cardState; private TextBlock? _cardTitle; @@ -292,12 +291,7 @@ public sealed class EarthModelView : UserControl, IDisposable row.Children.Add(MakeToggle(_texts["orbit"], _orbit, on => { _orbit = on; _canvas.ShowOrbit = on; })); row.Children.Add(MakeToggle(_texts["grid"], _grid, on => { _grid = on; _canvas.ShowGraticule = on; })); row.Children.Add(MakeToggle(_texts["tilt"], _tilt, on => { _tilt = on; _canvas.ExaggerateTilt = on; })); - _closeupButton = MakeToggle(_texts["closeup"], _showCloseup, on => - { - _showCloseup = on; - ApplyVisibility(); - }); - row.Children.Add(_closeupButton); + // 「放大」切换按钮已按需求移除;特写视图本身仍随公转显示 _overheadButton = MakeToggle(_texts["overhead"], _overhead, on => { _overhead = on; diff --git a/model/_sdk/EarthModelStudio.ModelSdk/bin/Debug/net8.0/EarthModelStudio.ModelSdk.deps.json b/model/_sdk/EarthModelStudio.ModelSdk/bin/Debug/net8.0/EarthModelStudio.ModelSdk.deps.json index bb672df..04c6aac 100644 --- a/model/_sdk/EarthModelStudio.ModelSdk/bin/Debug/net8.0/EarthModelStudio.ModelSdk.deps.json +++ b/model/_sdk/EarthModelStudio.ModelSdk/bin/Debug/net8.0/EarthModelStudio.ModelSdk.deps.json @@ -6,7 +6,7 @@ "compilationOptions": {}, "targets": { ".NETCoreApp,Version=v8.0": { - "EarthModelStudio.ModelSdk/1.0.3": { + "EarthModelStudio.ModelSdk/1.0.4": { "dependencies": { "Avalonia": "11.3.9" }, @@ -85,7 +85,7 @@ } }, "libraries": { - "EarthModelStudio.ModelSdk/1.0.3": { + "EarthModelStudio.ModelSdk/1.0.4": { "type": "project", "serviceable": false, "sha512": "" diff --git a/model/_sdk/EarthModelStudio.ModelSdk/bin/Debug/net8.0/EarthModelStudio.ModelSdk.dll b/model/_sdk/EarthModelStudio.ModelSdk/bin/Debug/net8.0/EarthModelStudio.ModelSdk.dll index e2e88d0..271e170 100644 Binary files a/model/_sdk/EarthModelStudio.ModelSdk/bin/Debug/net8.0/EarthModelStudio.ModelSdk.dll and b/model/_sdk/EarthModelStudio.ModelSdk/bin/Debug/net8.0/EarthModelStudio.ModelSdk.dll differ diff --git a/model/_sdk/EarthModelStudio.ModelSdk/bin/Debug/net8.0/EarthModelStudio.ModelSdk.pdb b/model/_sdk/EarthModelStudio.ModelSdk/bin/Debug/net8.0/EarthModelStudio.ModelSdk.pdb index 297cf4d..6b2dd30 100644 Binary files a/model/_sdk/EarthModelStudio.ModelSdk/bin/Debug/net8.0/EarthModelStudio.ModelSdk.pdb and b/model/_sdk/EarthModelStudio.ModelSdk/bin/Debug/net8.0/EarthModelStudio.ModelSdk.pdb differ diff --git a/model/_sdk/EarthModelStudio.ModelSdk/bin/Release/net8.0/EarthModelStudio.ModelSdk.deps.json b/model/_sdk/EarthModelStudio.ModelSdk/bin/Release/net8.0/EarthModelStudio.ModelSdk.deps.json index bb672df..04c6aac 100644 --- a/model/_sdk/EarthModelStudio.ModelSdk/bin/Release/net8.0/EarthModelStudio.ModelSdk.deps.json +++ b/model/_sdk/EarthModelStudio.ModelSdk/bin/Release/net8.0/EarthModelStudio.ModelSdk.deps.json @@ -6,7 +6,7 @@ "compilationOptions": {}, "targets": { ".NETCoreApp,Version=v8.0": { - "EarthModelStudio.ModelSdk/1.0.3": { + "EarthModelStudio.ModelSdk/1.0.4": { "dependencies": { "Avalonia": "11.3.9" }, @@ -85,7 +85,7 @@ } }, "libraries": { - "EarthModelStudio.ModelSdk/1.0.3": { + "EarthModelStudio.ModelSdk/1.0.4": { "type": "project", "serviceable": false, "sha512": "" diff --git a/model/_sdk/EarthModelStudio.ModelSdk/bin/Release/net8.0/EarthModelStudio.ModelSdk.dll b/model/_sdk/EarthModelStudio.ModelSdk/bin/Release/net8.0/EarthModelStudio.ModelSdk.dll index 16e3399..6cd4bff 100644 Binary files a/model/_sdk/EarthModelStudio.ModelSdk/bin/Release/net8.0/EarthModelStudio.ModelSdk.dll and b/model/_sdk/EarthModelStudio.ModelSdk/bin/Release/net8.0/EarthModelStudio.ModelSdk.dll differ diff --git a/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.AssemblyInfo.cs b/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.AssemblyInfo.cs index fb9fe02..2af2987 100644 --- a/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.AssemblyInfo.cs +++ b/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.AssemblyInfo.cs @@ -13,11 +13,11 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("NeoRF")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyDescriptionAttribute("Earth Model 模型契约:启动器与模型之间唯一的编译期依赖。")] -[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.3.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.3")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.4.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.4+5e0b46b3f3cd9800af177571c7809a7cdc8e9249")] [assembly: System.Reflection.AssemblyProductAttribute("Earth Model Studio")] [assembly: System.Reflection.AssemblyTitleAttribute("EarthModelStudio.ModelSdk")] -[assembly: System.Reflection.AssemblyVersionAttribute("1.0.3.0")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.4.0")] [assembly: System.Resources.NeutralResourcesLanguageAttribute("zh-Hans")] // Generated by the MSBuild WriteCodeFragment class. diff --git a/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.AssemblyInfoInputs.cache b/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.AssemblyInfoInputs.cache index 3072f99..f05e07a 100644 --- a/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.AssemblyInfoInputs.cache +++ b/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.AssemblyInfoInputs.cache @@ -1 +1 @@ -b335d297927ccf5a0daf4e3ae36efd34dab2da4d5a059ac53a2e5ec720bc9741 +51307d8d1f4c7c56c379af93362a7652f563b1553db868cd4f98666bd5426114 diff --git a/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.assets.cache b/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.assets.cache index 3341ba2..93cd5c5 100644 Binary files a/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.assets.cache and b/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.assets.cache differ diff --git a/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.dll b/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.dll index e2e88d0..271e170 100644 Binary files a/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.dll and b/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.dll differ diff --git a/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.pdb b/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.pdb index 297cf4d..6b2dd30 100644 Binary files a/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.pdb and b/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/EarthModelStudio.ModelSdk.pdb differ diff --git a/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/ref/EarthModelStudio.ModelSdk.dll b/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/ref/EarthModelStudio.ModelSdk.dll index 260ab1c..e94995f 100644 Binary files a/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/ref/EarthModelStudio.ModelSdk.dll and b/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/ref/EarthModelStudio.ModelSdk.dll differ diff --git a/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/refint/EarthModelStudio.ModelSdk.dll b/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/refint/EarthModelStudio.ModelSdk.dll index 260ab1c..e94995f 100644 Binary files a/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/refint/EarthModelStudio.ModelSdk.dll and b/model/_sdk/EarthModelStudio.ModelSdk/obj/Debug/net8.0/refint/EarthModelStudio.ModelSdk.dll differ diff --git a/model/_sdk/EarthModelStudio.ModelSdk/obj/EarthModelStudio.ModelSdk.csproj.nuget.dgspec.json b/model/_sdk/EarthModelStudio.ModelSdk/obj/EarthModelStudio.ModelSdk.csproj.nuget.dgspec.json index 53ba7ef..8973a95 100644 --- a/model/_sdk/EarthModelStudio.ModelSdk/obj/EarthModelStudio.ModelSdk.csproj.nuget.dgspec.json +++ b/model/_sdk/EarthModelStudio.ModelSdk/obj/EarthModelStudio.ModelSdk.csproj.nuget.dgspec.json @@ -5,7 +5,7 @@ }, "projects": { "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj": { - "version": "1.0.3", + "version": "1.0.4", "restore": { "projectUniqueName": "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj", "projectName": "EarthModelStudio.ModelSdk", @@ -49,12 +49,6 @@ "Avalonia": { "target": "Package", "version": "[11.3.9, )" - }, - "Microsoft.NET.ILLink.Tasks": { - "suppressParent": "All", - "target": "Package", - "version": "[8.0.31, )", - "autoReferenced": true } }, "imports": [ @@ -68,16 +62,6 @@ ], "assetTargetFallback": true, "warn": true, - "downloadDependencies": [ - { - "name": "Microsoft.AspNetCore.App.Runtime.win-arm64", - "version": "[8.0.31, 8.0.31]" - }, - { - "name": "Microsoft.NETCore.App.Runtime.win-arm64", - "version": "[8.0.31, 8.0.31]" - } - ], "frameworkReferences": { "Microsoft.NETCore.App": { "privateAssets": "all" @@ -85,11 +69,6 @@ }, "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/10.0.401/PortableRuntimeIdentifierGraph.json" } - }, - "runtimes": { - "win-arm64": { - "#import": [] - } } } } diff --git a/model/_sdk/EarthModelStudio.ModelSdk/obj/EarthModelStudio.ModelSdk.csproj.nuget.g.props b/model/_sdk/EarthModelStudio.ModelSdk/obj/EarthModelStudio.ModelSdk.csproj.nuget.g.props index 8d169b0..49d666c 100644 --- a/model/_sdk/EarthModelStudio.ModelSdk/obj/EarthModelStudio.ModelSdk.csproj.nuget.g.props +++ b/model/_sdk/EarthModelStudio.ModelSdk/obj/EarthModelStudio.ModelSdk.csproj.nuget.g.props @@ -13,11 +13,9 @@ - - /Users/morris/.nuget/packages/microsoft.net.illink.tasks/8.0.31 /Users/morris/.nuget/packages/avalonia.buildservices/11.3.2 /Users/morris/.nuget/packages/avalonia/11.3.9 diff --git a/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.AssemblyInfo.cs b/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.AssemblyInfo.cs index 846ed5b..3f1a8fd 100644 --- a/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.AssemblyInfo.cs +++ b/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.AssemblyInfo.cs @@ -13,11 +13,11 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("NeoRF")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] [assembly: System.Reflection.AssemblyDescriptionAttribute("Earth Model 模型契约:启动器与模型之间唯一的编译期依赖。")] -[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.3.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.3")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.4.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.4+5e0b46b3f3cd9800af177571c7809a7cdc8e9249")] [assembly: System.Reflection.AssemblyProductAttribute("Earth Model Studio")] [assembly: System.Reflection.AssemblyTitleAttribute("EarthModelStudio.ModelSdk")] -[assembly: System.Reflection.AssemblyVersionAttribute("1.0.3.0")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.4.0")] [assembly: System.Resources.NeutralResourcesLanguageAttribute("zh-Hans")] // Generated by the MSBuild WriteCodeFragment class. diff --git a/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.AssemblyInfoInputs.cache b/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.AssemblyInfoInputs.cache index c2c77e9..2276947 100644 --- a/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.AssemblyInfoInputs.cache +++ b/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.AssemblyInfoInputs.cache @@ -1 +1 @@ -336916da7664ce932095ba041eac38a72bfaee332d45c8339c55e418ea5f5a20 +e6fb78b711e101c9247f941f32edef6f26edd57d08adac4b237aa86ef1ee07bc diff --git a/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.dll b/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.dll index 16e3399..6cd4bff 100644 Binary files a/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.dll and b/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.dll differ diff --git a/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/ref/EarthModelStudio.ModelSdk.dll b/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/ref/EarthModelStudio.ModelSdk.dll index d75e9e8..62557b6 100644 Binary files a/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/ref/EarthModelStudio.ModelSdk.dll and b/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/ref/EarthModelStudio.ModelSdk.dll differ diff --git a/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/refint/EarthModelStudio.ModelSdk.dll b/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/refint/EarthModelStudio.ModelSdk.dll index d75e9e8..62557b6 100644 Binary files a/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/refint/EarthModelStudio.ModelSdk.dll and b/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/refint/EarthModelStudio.ModelSdk.dll differ diff --git a/model/_sdk/EarthModelStudio.ModelSdk/obj/project.assets.json b/model/_sdk/EarthModelStudio.ModelSdk/obj/project.assets.json index cb45165..5e1f0ac 100644 --- a/model/_sdk/EarthModelStudio.ModelSdk/obj/project.assets.json +++ b/model/_sdk/EarthModelStudio.ModelSdk/obj/project.assets.json @@ -111,130 +111,6 @@ "runtime": { "lib/net5.0/MicroCom.Runtime.dll": {} } - }, - "Microsoft.NET.ILLink.Tasks/8.0.31": { - "type": "package", - "build": { - "build/Microsoft.NET.ILLink.Tasks.props": {} - } - } - }, - "net8.0/win-arm64": { - "Avalonia/11.3.9": { - "type": "package", - "dependencies": { - "Avalonia.BuildServices": "11.3.2", - "Avalonia.Remote.Protocol": "11.3.9", - "MicroCom.Runtime": "0.11.0" - }, - "compile": { - "ref/net8.0/Avalonia.Base.dll": { - "related": ".xml" - }, - "ref/net8.0/Avalonia.Controls.dll": { - "related": ".xml" - }, - "ref/net8.0/Avalonia.DesignerSupport.dll": { - "related": ".xml" - }, - "ref/net8.0/Avalonia.Dialogs.dll": { - "related": ".xml" - }, - "ref/net8.0/Avalonia.Markup.Xaml.dll": { - "related": ".xml" - }, - "ref/net8.0/Avalonia.Markup.dll": { - "related": ".Xaml.xml;.xml" - }, - "ref/net8.0/Avalonia.Metal.dll": { - "related": ".xml" - }, - "ref/net8.0/Avalonia.MicroCom.dll": { - "related": ".xml" - }, - "ref/net8.0/Avalonia.OpenGL.dll": { - "related": ".xml" - }, - "ref/net8.0/Avalonia.Vulkan.dll": { - "related": ".xml" - }, - "ref/net8.0/Avalonia.dll": { - "related": ".Base.xml;.Controls.xml;.DesignerSupport.xml;.Dialogs.xml;.Markup.Xaml.xml;.Markup.xml;.Metal.xml;.MicroCom.xml;.OpenGL.xml;.Vulkan.xml;.xml" - } - }, - "runtime": { - "lib/net8.0/Avalonia.Base.dll": { - "related": ".xml" - }, - "lib/net8.0/Avalonia.Controls.dll": { - "related": ".xml" - }, - "lib/net8.0/Avalonia.DesignerSupport.dll": { - "related": ".xml" - }, - "lib/net8.0/Avalonia.Dialogs.dll": { - "related": ".xml" - }, - "lib/net8.0/Avalonia.Markup.Xaml.dll": { - "related": ".xml" - }, - "lib/net8.0/Avalonia.Markup.dll": { - "related": ".Xaml.xml;.xml" - }, - "lib/net8.0/Avalonia.Metal.dll": { - "related": ".xml" - }, - "lib/net8.0/Avalonia.MicroCom.dll": { - "related": ".xml" - }, - "lib/net8.0/Avalonia.OpenGL.dll": { - "related": ".xml" - }, - "lib/net8.0/Avalonia.Vulkan.dll": { - "related": ".xml" - }, - "lib/net8.0/Avalonia.dll": { - "related": ".Base.xml;.Controls.xml;.DesignerSupport.xml;.Dialogs.xml;.Markup.Xaml.xml;.Markup.xml;.Metal.xml;.MicroCom.xml;.OpenGL.xml;.Vulkan.xml;.xml" - } - }, - "build": { - "buildTransitive/Avalonia.props": {}, - "buildTransitive/Avalonia.targets": {} - } - }, - "Avalonia.BuildServices/11.3.2": { - "type": "package", - "build": { - "buildTransitive/Avalonia.BuildServices.targets": {} - } - }, - "Avalonia.Remote.Protocol/11.3.9": { - "type": "package", - "compile": { - "lib/net8.0/Avalonia.Remote.Protocol.dll": { - "related": ".xml" - } - }, - "runtime": { - "lib/net8.0/Avalonia.Remote.Protocol.dll": { - "related": ".xml" - } - } - }, - "MicroCom.Runtime/0.11.0": { - "type": "package", - "compile": { - "lib/net5.0/MicroCom.Runtime.dll": {} - }, - "runtime": { - "lib/net5.0/MicroCom.Runtime.dll": {} - } - }, - "Microsoft.NET.ILLink.Tasks/8.0.31": { - "type": "package", - "build": { - "build/Microsoft.NET.ILLink.Tasks.props": {} - } } } }, @@ -457,70 +333,18 @@ "microcom.runtime.0.11.0.nupkg.sha512", "microcom.runtime.nuspec" ] - }, - "Microsoft.NET.ILLink.Tasks/8.0.31": { - "sha512": "OJdAGATV2QoVWL11zlDLEluA06q8rK+cgZR47ohrO8V+Qj5z9dlvN7bG9/0e5t0IOe+yD8tREC0bpsEgDGrzIQ==", - "type": "package", - "path": "microsoft.net.illink.tasks/8.0.31", - "hasTools": true, - "files": [ - ".nupkg.metadata", - ".signature.p7s", - "Icon.png", - "LICENSE.TXT", - "Sdk/Sdk.props", - "THIRD-PARTY-NOTICES.TXT", - "analyzers/dotnet/cs/ILLink.CodeFixProvider.dll", - "analyzers/dotnet/cs/ILLink.RoslynAnalyzer.dll", - "build/Microsoft.NET.ILLink.Analyzers.props", - "build/Microsoft.NET.ILLink.Tasks.props", - "build/Microsoft.NET.ILLink.targets", - "microsoft.net.illink.tasks.8.0.31.nupkg.sha512", - "microsoft.net.illink.tasks.nuspec", - "tools/net472/ILLink.Tasks.dll", - "tools/net472/ILLink.Tasks.dll.config", - "tools/net472/Mono.Cecil.Mdb.dll", - "tools/net472/Mono.Cecil.Pdb.dll", - "tools/net472/Mono.Cecil.Rocks.dll", - "tools/net472/Mono.Cecil.dll", - "tools/net472/Sdk/Sdk.props", - "tools/net472/System.Buffers.dll", - "tools/net472/System.Collections.Immutable.dll", - "tools/net472/System.Memory.dll", - "tools/net472/System.Numerics.Vectors.dll", - "tools/net472/System.Reflection.Metadata.dll", - "tools/net472/System.Runtime.CompilerServices.Unsafe.dll", - "tools/net472/build/Microsoft.NET.ILLink.Analyzers.props", - "tools/net472/build/Microsoft.NET.ILLink.Tasks.props", - "tools/net472/build/Microsoft.NET.ILLink.targets", - "tools/net8.0/ILLink.Tasks.deps.json", - "tools/net8.0/ILLink.Tasks.dll", - "tools/net8.0/Mono.Cecil.Mdb.dll", - "tools/net8.0/Mono.Cecil.Pdb.dll", - "tools/net8.0/Mono.Cecil.Rocks.dll", - "tools/net8.0/Mono.Cecil.dll", - "tools/net8.0/Sdk/Sdk.props", - "tools/net8.0/build/Microsoft.NET.ILLink.Analyzers.props", - "tools/net8.0/build/Microsoft.NET.ILLink.Tasks.props", - "tools/net8.0/build/Microsoft.NET.ILLink.targets", - "tools/net8.0/illink.deps.json", - "tools/net8.0/illink.dll", - "tools/net8.0/illink.runtimeconfig.json", - "useSharedDesignerContext.txt" - ] } }, "projectFileDependencyGroups": { "net8.0": [ - "Avalonia >= 11.3.9", - "Microsoft.NET.ILLink.Tasks >= 8.0.31" + "Avalonia >= 11.3.9" ] }, "packageFolders": { "/Users/morris/.nuget/packages/": {} }, "project": { - "version": "1.0.3", + "version": "1.0.4", "restore": { "projectUniqueName": "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj", "projectName": "EarthModelStudio.ModelSdk", @@ -564,12 +388,6 @@ "Avalonia": { "target": "Package", "version": "[11.3.9, )" - }, - "Microsoft.NET.ILLink.Tasks": { - "suppressParent": "All", - "target": "Package", - "version": "[8.0.31, )", - "autoReferenced": true } }, "imports": [ @@ -583,16 +401,6 @@ ], "assetTargetFallback": true, "warn": true, - "downloadDependencies": [ - { - "name": "Microsoft.AspNetCore.App.Runtime.win-arm64", - "version": "[8.0.31, 8.0.31]" - }, - { - "name": "Microsoft.NETCore.App.Runtime.win-arm64", - "version": "[8.0.31, 8.0.31]" - } - ], "frameworkReferences": { "Microsoft.NETCore.App": { "privateAssets": "all" @@ -600,11 +408,6 @@ }, "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/10.0.401/PortableRuntimeIdentifierGraph.json" } - }, - "runtimes": { - "win-arm64": { - "#import": [] - } } } } \ No newline at end of file diff --git a/model/_sdk/EarthModelStudio.ModelSdk/obj/project.nuget.cache b/model/_sdk/EarthModelStudio.ModelSdk/obj/project.nuget.cache index 108430f..d3eb6b2 100644 --- a/model/_sdk/EarthModelStudio.ModelSdk/obj/project.nuget.cache +++ b/model/_sdk/EarthModelStudio.ModelSdk/obj/project.nuget.cache @@ -1,16 +1,13 @@ { "version": 2, - "dgSpecHash": "2wEgD3WME1E=", + "dgSpecHash": "XCy7zfNs4zI=", "success": true, "projectFilePath": "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj", "expectedPackageFiles": [ "/Users/morris/.nuget/packages/avalonia/11.3.9/avalonia.11.3.9.nupkg.sha512", "/Users/morris/.nuget/packages/avalonia.buildservices/11.3.2/avalonia.buildservices.11.3.2.nupkg.sha512", "/Users/morris/.nuget/packages/avalonia.remote.protocol/11.3.9/avalonia.remote.protocol.11.3.9.nupkg.sha512", - "/Users/morris/.nuget/packages/microcom.runtime/0.11.0/microcom.runtime.0.11.0.nupkg.sha512", - "/Users/morris/.nuget/packages/microsoft.net.illink.tasks/8.0.31/microsoft.net.illink.tasks.8.0.31.nupkg.sha512", - "/Users/morris/.nuget/packages/microsoft.netcore.app.runtime.win-arm64/8.0.31/microsoft.netcore.app.runtime.win-arm64.8.0.31.nupkg.sha512", - "/Users/morris/.nuget/packages/microsoft.aspnetcore.app.runtime.win-arm64/8.0.31/microsoft.aspnetcore.app.runtime.win-arm64.8.0.31.nupkg.sha512" + "/Users/morris/.nuget/packages/microcom.runtime/0.11.0/microcom.runtime.0.11.0.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/model/earth-geography/earth-geography.json b/model/earth-geography/earth-geography.json index b2d030f..1ad8eb3 100644 --- a/model/earth-geography/earth-geography.json +++ b/model/earth-geography/earth-geography.json @@ -17,7 +17,7 @@ "atlas" ], "dataDir": "earth-geography.model", - "version": "1.0", - "updatedAt": "2026-11-08T09:22:29Z", - "build": "883fdf6c57" + "version": "1.1", + "updatedAt": "2026-11-08T10:13:50Z", + "build": "1f9f80727b" } diff --git a/model/earth-geography/earth-geography.model/EarthGeographyModel.dll b/model/earth-geography/earth-geography.model/EarthGeographyModel.dll index 986d2fb..146b4f8 100644 Binary files a/model/earth-geography/earth-geography.model/EarthGeographyModel.dll and b/model/earth-geography/earth-geography.model/EarthGeographyModel.dll differ diff --git a/model/earth-geography/src/GeographyView.cs b/model/earth-geography/src/GeographyView.cs index d27b686..5fe7658 100644 --- a/model/earth-geography/src/GeographyView.cs +++ b/model/earth-geography/src/GeographyView.cs @@ -172,22 +172,61 @@ public sealed class GeographyView : Control DrawReadout(ctx, size, $"球面 · {Norm(_yawDeg):0}°E {_pitchDeg:0}°"); } + /// + /// 球体本体:分层绘制提升立体感 + /// ① 外层大气光晕(径向渐变,越靠边缘越亮) + /// ② 海洋底色(左上受光的渐变,模拟日光) + /// ③ 高光点 + 阴影弧(明暗对比塑造球感) + /// private static void DrawOceanDisc(DrawingContext ctx, float cx, float cy, float r) { - var disc = new RadialGradientBrush + // ① 大气边缘光:球外一层的柔和蓝晕 + var halo = new RadialGradientBrush { - Center = new RelativePoint(0.36, 0.32, RelativeUnit.Relative), - GradientOrigin = new RelativePoint(0.36, 0.32, RelativeUnit.Relative), - RadiusX = new RelativeScalar(0.85, RelativeUnit.Relative), - RadiusY = new RelativeScalar(0.85, RelativeUnit.Relative), + Center = new RelativePoint(0.5, 0.5, RelativeUnit.Relative), + GradientOrigin = new RelativePoint(0.5, 0.5, RelativeUnit.Relative), + RadiusX = new RelativeScalar(0.5, RelativeUnit.Relative), + RadiusY = new RelativeScalar(0.5, RelativeUnit.Relative), GradientStops = { - new GradientStop(Color.Parse("#12314F"), 0), - new GradientStop(Color.Parse("#0A1E33"), 0.62), - new GradientStop(Color.Parse("#061120"), 1) + new GradientStop(Color.FromArgb(0, 90, 160, 255), 0.82), + new GradientStop(Color.FromArgb(70, 90, 170, 255), 0.94), + new GradientStop(Color.FromArgb(0, 90, 170, 255), 1.0) } }; - ctx.DrawEllipse(disc, null, new Point(cx, cy), r, r); + ctx.DrawEllipse(halo, null, new Point(cx, cy), r * 1.14, r * 1.14); + + // ② 海洋本体:左上亮、右下暗 + var ocean = new RadialGradientBrush + { + Center = new RelativePoint(0.34, 0.30, RelativeUnit.Relative), + GradientOrigin = new RelativePoint(0.34, 0.30, RelativeUnit.Relative), + RadiusX = new RelativeScalar(0.95, RelativeUnit.Relative), + RadiusY = new RelativeScalar(0.95, RelativeUnit.Relative), + GradientStops = + { + new GradientStop(Color.Parse("#1B4A78"), 0.0), + new GradientStop(Color.Parse("#123A5E"), 0.35), + new GradientStop(Color.Parse("#0B2440"), 0.68), + new GradientStop(Color.Parse("#05121F"), 1.0) + } + }; + ctx.DrawEllipse(ocean, null, new Point(cx, cy), r, r); + + // ③ 高光:左上方一个小亮点,强化球面 + var spec = new RadialGradientBrush + { + Center = new RelativePoint(0.30, 0.26, RelativeUnit.Relative), + GradientOrigin = new RelativePoint(0.30, 0.26, RelativeUnit.Relative), + RadiusX = new RelativeScalar(0.30, RelativeUnit.Relative), + RadiusY = new RelativeScalar(0.30, RelativeUnit.Relative), + GradientStops = + { + new GradientStop(Color.FromArgb(70, 180, 220, 255), 0.0), + new GradientStop(Color.FromArgb(0, 180, 220, 255), 1.0) + } + }; + ctx.DrawEllipse(spec, null, new Point(cx, cy), r, r); } // ---- 五带:按纬度带填色(用四边形条带逐格填充,避免整环多边形跨地平线破面)---- diff --git a/model/earth-geography/src/bin/Debug/net8.0/EarthGeographyModel.deps.json b/model/earth-geography/src/bin/Debug/net8.0/EarthGeographyModel.deps.json new file mode 100644 index 0000000..1421767 --- /dev/null +++ b/model/earth-geography/src/bin/Debug/net8.0/EarthGeographyModel.deps.json @@ -0,0 +1,115 @@ +{ + "runtimeTarget": { + "name": ".NETCoreApp,Version=v8.0", + "signature": "" + }, + "compilationOptions": {}, + "targets": { + ".NETCoreApp,Version=v8.0": { + "EarthGeographyModel/1.0.3": { + "dependencies": { + "Avalonia": "11.3.9" + }, + "runtime": { + "EarthGeographyModel.dll": {} + } + }, + "Avalonia/11.3.9": { + "dependencies": { + "Avalonia.Remote.Protocol": "11.3.9", + "MicroCom.Runtime": "0.11.0" + }, + "runtime": { + "lib/net8.0/Avalonia.Base.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Controls.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.DesignerSupport.dll": { + "assemblyVersion": "0.7.0.0", + "fileVersion": "0.7.0.0" + }, + "lib/net8.0/Avalonia.Dialogs.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Markup.Xaml.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Markup.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Metal.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.MicroCom.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.OpenGL.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Vulkan.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + } + } + }, + "Avalonia.Remote.Protocol/11.3.9": { + "runtime": { + "lib/net8.0/Avalonia.Remote.Protocol.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + } + } + }, + "MicroCom.Runtime/0.11.0": { + "runtime": { + "lib/net5.0/MicroCom.Runtime.dll": { + "assemblyVersion": "0.11.0.0", + "fileVersion": "0.11.0.0" + } + } + } + } + }, + "libraries": { + "EarthGeographyModel/1.0.3": { + "type": "project", + "serviceable": false, + "sha512": "" + }, + "Avalonia/11.3.9": { + "type": "package", + "serviceable": true, + "sha512": "sha512-YfaTrUxcmVTsGOw2YqdZyunHqZArK16m1pYfNIBvyvAgX89Pzd3A1PgoMkf64u7scL23IN6HkfqhZeFcbYWLoA==", + "path": "avalonia/11.3.9", + "hashPath": "avalonia.11.3.9.nupkg.sha512" + }, + "Avalonia.Remote.Protocol/11.3.9": { + "type": "package", + "serviceable": true, + "sha512": "sha512-2XVLTSNa+Nvwu4D8NqqdudhllTaCRA9ZKlLZZvYLZeuLlzg7OcAV+df/biHQc6AqOv7iMFR9K5Zt3wG0EF4KfQ==", + "path": "avalonia.remote.protocol/11.3.9", + "hashPath": "avalonia.remote.protocol.11.3.9.nupkg.sha512" + }, + "MicroCom.Runtime/0.11.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-MEnrZ3UIiH40hjzMDsxrTyi8dtqB5ziv3iBeeU4bXsL/7NLSal9F1lZKpK+tfBRnUoDSdtcW3KufE4yhATOMCA==", + "path": "microcom.runtime/0.11.0", + "hashPath": "microcom.runtime.0.11.0.nupkg.sha512" + } + } +} \ No newline at end of file diff --git a/model/earth-geography/src/bin/Debug/net8.0/EarthGeographyModel.dll b/model/earth-geography/src/bin/Debug/net8.0/EarthGeographyModel.dll new file mode 100644 index 0000000..afdbf59 Binary files /dev/null and b/model/earth-geography/src/bin/Debug/net8.0/EarthGeographyModel.dll differ diff --git a/model/earth-geography/src/bin/Debug/net8.0/EarthGeographyModel.pdb b/model/earth-geography/src/bin/Debug/net8.0/EarthGeographyModel.pdb new file mode 100644 index 0000000..36012e4 Binary files /dev/null and b/model/earth-geography/src/bin/Debug/net8.0/EarthGeographyModel.pdb differ diff --git a/model/earth-geography/src/bin/Release/net8.0/EarthGeographyModel.deps.json b/model/earth-geography/src/bin/Release/net8.0/EarthGeographyModel.deps.json new file mode 100644 index 0000000..1421767 --- /dev/null +++ b/model/earth-geography/src/bin/Release/net8.0/EarthGeographyModel.deps.json @@ -0,0 +1,115 @@ +{ + "runtimeTarget": { + "name": ".NETCoreApp,Version=v8.0", + "signature": "" + }, + "compilationOptions": {}, + "targets": { + ".NETCoreApp,Version=v8.0": { + "EarthGeographyModel/1.0.3": { + "dependencies": { + "Avalonia": "11.3.9" + }, + "runtime": { + "EarthGeographyModel.dll": {} + } + }, + "Avalonia/11.3.9": { + "dependencies": { + "Avalonia.Remote.Protocol": "11.3.9", + "MicroCom.Runtime": "0.11.0" + }, + "runtime": { + "lib/net8.0/Avalonia.Base.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Controls.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.DesignerSupport.dll": { + "assemblyVersion": "0.7.0.0", + "fileVersion": "0.7.0.0" + }, + "lib/net8.0/Avalonia.Dialogs.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Markup.Xaml.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Markup.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Metal.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.MicroCom.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.OpenGL.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Vulkan.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + } + } + }, + "Avalonia.Remote.Protocol/11.3.9": { + "runtime": { + "lib/net8.0/Avalonia.Remote.Protocol.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + } + } + }, + "MicroCom.Runtime/0.11.0": { + "runtime": { + "lib/net5.0/MicroCom.Runtime.dll": { + "assemblyVersion": "0.11.0.0", + "fileVersion": "0.11.0.0" + } + } + } + } + }, + "libraries": { + "EarthGeographyModel/1.0.3": { + "type": "project", + "serviceable": false, + "sha512": "" + }, + "Avalonia/11.3.9": { + "type": "package", + "serviceable": true, + "sha512": "sha512-YfaTrUxcmVTsGOw2YqdZyunHqZArK16m1pYfNIBvyvAgX89Pzd3A1PgoMkf64u7scL23IN6HkfqhZeFcbYWLoA==", + "path": "avalonia/11.3.9", + "hashPath": "avalonia.11.3.9.nupkg.sha512" + }, + "Avalonia.Remote.Protocol/11.3.9": { + "type": "package", + "serviceable": true, + "sha512": "sha512-2XVLTSNa+Nvwu4D8NqqdudhllTaCRA9ZKlLZZvYLZeuLlzg7OcAV+df/biHQc6AqOv7iMFR9K5Zt3wG0EF4KfQ==", + "path": "avalonia.remote.protocol/11.3.9", + "hashPath": "avalonia.remote.protocol.11.3.9.nupkg.sha512" + }, + "MicroCom.Runtime/0.11.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-MEnrZ3UIiH40hjzMDsxrTyi8dtqB5ziv3iBeeU4bXsL/7NLSal9F1lZKpK+tfBRnUoDSdtcW3KufE4yhATOMCA==", + "path": "microcom.runtime/0.11.0", + "hashPath": "microcom.runtime.0.11.0.nupkg.sha512" + } + } +} \ No newline at end of file diff --git a/model/earth-geography/src/bin/Release/net8.0/EarthGeographyModel.dll b/model/earth-geography/src/bin/Release/net8.0/EarthGeographyModel.dll new file mode 100644 index 0000000..146b4f8 Binary files /dev/null and b/model/earth-geography/src/bin/Release/net8.0/EarthGeographyModel.dll differ diff --git a/model/earth-geography/src/bin/Release/net8.0/EarthGeographyModel.pdb b/model/earth-geography/src/bin/Release/net8.0/EarthGeographyModel.pdb new file mode 100644 index 0000000..92ad5a3 Binary files /dev/null and b/model/earth-geography/src/bin/Release/net8.0/EarthGeographyModel.pdb differ diff --git a/model/earth-geography/src/obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs b/model/earth-geography/src/obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs new file mode 100644 index 0000000..2217181 --- /dev/null +++ b/model/earth-geography/src/obj/Debug/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v8.0", FrameworkDisplayName = ".NET 8.0")] diff --git a/model/earth-geography/src/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache b/model/earth-geography/src/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache new file mode 100644 index 0000000..d176387 --- /dev/null +++ b/model/earth-geography/src/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache @@ -0,0 +1 @@ +c5f16ca9fce0f0594ebc177c2ecb2b54604734e59fc765d9f79f6e5986cc8840 diff --git a/model/earth-geography/src/obj/Debug/net8.0/EarthGeographyModel.AssemblyInfo.cs b/model/earth-geography/src/obj/Debug/net8.0/EarthGeographyModel.AssemblyInfo.cs new file mode 100644 index 0000000..8a5c3b0 --- /dev/null +++ b/model/earth-geography/src/obj/Debug/net8.0/EarthGeographyModel.AssemblyInfo.cs @@ -0,0 +1,23 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("NeoRF")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.3.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.3+5e0b46b3f3cd9800af177571c7809a7cdc8e9249")] +[assembly: System.Reflection.AssemblyProductAttribute("Earth Model Studio")] +[assembly: System.Reflection.AssemblyTitleAttribute("EarthGeographyModel")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.3.0")] +[assembly: System.Resources.NeutralResourcesLanguageAttribute("zh-Hans")] + +// Generated by the MSBuild WriteCodeFragment class. + diff --git a/model/earth-geography/src/obj/Debug/net8.0/EarthGeographyModel.AssemblyInfoInputs.cache b/model/earth-geography/src/obj/Debug/net8.0/EarthGeographyModel.AssemblyInfoInputs.cache new file mode 100644 index 0000000..22f028f --- /dev/null +++ b/model/earth-geography/src/obj/Debug/net8.0/EarthGeographyModel.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +23e7870a86ac5dd2806c4361ac2881c5183aaff8f1f41e3785e44cba6cf89c09 diff --git a/model/earth-geography/src/obj/Debug/net8.0/EarthGeographyModel.GeneratedMSBuildEditorConfig.editorconfig b/model/earth-geography/src/obj/Debug/net8.0/EarthGeographyModel.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 0000000..3d18394 --- /dev/null +++ b/model/earth-geography/src/obj/Debug/net8.0/EarthGeographyModel.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,25 @@ +is_global = true +build_property.AvaloniaNameGeneratorIsEnabled = true +build_property.AvaloniaNameGeneratorBehavior = InitializeComponent +build_property.AvaloniaNameGeneratorDefaultFieldModifier = internal +build_property.AvaloniaNameGeneratorFilterByPath = * +build_property.AvaloniaNameGeneratorFilterByNamespace = * +build_property.AvaloniaNameGeneratorViewFileNamingStrategy = NamespaceAndClassName +build_property.AvaloniaNameGeneratorAttachDevTools = true +build_property.TargetFramework = net8.0 +build_property.TargetFrameworkIdentifier = .NETCoreApp +build_property.TargetFrameworkVersion = v8.0 +build_property.TargetPlatformMinVersion = +build_property.UsingMicrosoftNETSdkWeb = +build_property.ProjectTypeGuids = +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property.EnforceExtendedAnalyzerRules = +build_property.EntryPointFilePath = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = NeoRF.EarthModels +build_property.ProjectDir = /Users/morris/Downloads/GC#/model/earth-geography/src/ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = +build_property.EffectiveAnalysisLevelStyle = 8.0 +build_property.EnableCodeStyleSeverity = diff --git a/model/earth-geography/src/obj/Debug/net8.0/EarthGeographyModel.assets.cache b/model/earth-geography/src/obj/Debug/net8.0/EarthGeographyModel.assets.cache new file mode 100644 index 0000000..8a2bba6 Binary files /dev/null and b/model/earth-geography/src/obj/Debug/net8.0/EarthGeographyModel.assets.cache differ diff --git a/model/earth-geography/src/obj/Debug/net8.0/EarthGeographyModel.csproj.AssemblyReference.cache b/model/earth-geography/src/obj/Debug/net8.0/EarthGeographyModel.csproj.AssemblyReference.cache new file mode 100644 index 0000000..a707511 Binary files /dev/null and b/model/earth-geography/src/obj/Debug/net8.0/EarthGeographyModel.csproj.AssemblyReference.cache differ diff --git a/model/earth-geography/src/obj/Debug/net8.0/EarthGeographyModel.csproj.CoreCompileInputs.cache b/model/earth-geography/src/obj/Debug/net8.0/EarthGeographyModel.csproj.CoreCompileInputs.cache new file mode 100644 index 0000000..3fc24ef --- /dev/null +++ b/model/earth-geography/src/obj/Debug/net8.0/EarthGeographyModel.csproj.CoreCompileInputs.cache @@ -0,0 +1 @@ +c78a6ef41b63479935eee5ff8c1b58d6f2207d419745554527580c2a89b09f4d diff --git a/model/earth-geography/src/obj/Debug/net8.0/EarthGeographyModel.csproj.FileListAbsolute.txt b/model/earth-geography/src/obj/Debug/net8.0/EarthGeographyModel.csproj.FileListAbsolute.txt new file mode 100644 index 0000000..39202b8 --- /dev/null +++ b/model/earth-geography/src/obj/Debug/net8.0/EarthGeographyModel.csproj.FileListAbsolute.txt @@ -0,0 +1,13 @@ +/Users/morris/Downloads/GC#/model/earth-geography/src/bin/Debug/net8.0/EarthGeographyModel.deps.json +/Users/morris/Downloads/GC#/model/earth-geography/src/bin/Debug/net8.0/EarthGeographyModel.dll +/Users/morris/Downloads/GC#/model/earth-geography/src/bin/Debug/net8.0/EarthGeographyModel.pdb +/Users/morris/Downloads/GC#/model/earth-geography/src/obj/Debug/net8.0/EarthGeographyModel.csproj.AssemblyReference.cache +/Users/morris/Downloads/GC#/model/earth-geography/src/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache +/Users/morris/Downloads/GC#/model/earth-geography/src/obj/Debug/net8.0/EarthGeographyModel.GeneratedMSBuildEditorConfig.editorconfig +/Users/morris/Downloads/GC#/model/earth-geography/src/obj/Debug/net8.0/EarthGeographyModel.AssemblyInfoInputs.cache +/Users/morris/Downloads/GC#/model/earth-geography/src/obj/Debug/net8.0/EarthGeographyModel.AssemblyInfo.cs +/Users/morris/Downloads/GC#/model/earth-geography/src/obj/Debug/net8.0/EarthGeographyModel.csproj.CoreCompileInputs.cache +/Users/morris/Downloads/GC#/model/earth-geography/src/obj/Debug/net8.0/EarthGeographyModel.dll +/Users/morris/Downloads/GC#/model/earth-geography/src/obj/Debug/net8.0/refint/EarthGeographyModel.dll +/Users/morris/Downloads/GC#/model/earth-geography/src/obj/Debug/net8.0/EarthGeographyModel.pdb +/Users/morris/Downloads/GC#/model/earth-geography/src/obj/Debug/net8.0/ref/EarthGeographyModel.dll diff --git a/model/earth-geography/src/obj/Debug/net8.0/EarthGeographyModel.dll b/model/earth-geography/src/obj/Debug/net8.0/EarthGeographyModel.dll new file mode 100644 index 0000000..afdbf59 Binary files /dev/null and b/model/earth-geography/src/obj/Debug/net8.0/EarthGeographyModel.dll differ diff --git a/model/earth-geography/src/obj/Debug/net8.0/EarthGeographyModel.pdb b/model/earth-geography/src/obj/Debug/net8.0/EarthGeographyModel.pdb new file mode 100644 index 0000000..36012e4 Binary files /dev/null and b/model/earth-geography/src/obj/Debug/net8.0/EarthGeographyModel.pdb differ diff --git a/model/earth-geography/src/obj/Debug/net8.0/ref/EarthGeographyModel.dll b/model/earth-geography/src/obj/Debug/net8.0/ref/EarthGeographyModel.dll new file mode 100644 index 0000000..fb6273f Binary files /dev/null and b/model/earth-geography/src/obj/Debug/net8.0/ref/EarthGeographyModel.dll differ diff --git a/model/earth-geography/src/obj/Debug/net8.0/refint/EarthGeographyModel.dll b/model/earth-geography/src/obj/Debug/net8.0/refint/EarthGeographyModel.dll new file mode 100644 index 0000000..fb6273f Binary files /dev/null and b/model/earth-geography/src/obj/Debug/net8.0/refint/EarthGeographyModel.dll differ diff --git a/model/earth-geography/src/obj/EarthGeographyModel.csproj.nuget.dgspec.json b/model/earth-geography/src/obj/EarthGeographyModel.csproj.nuget.dgspec.json new file mode 100644 index 0000000..786ee67 --- /dev/null +++ b/model/earth-geography/src/obj/EarthGeographyModel.csproj.nuget.dgspec.json @@ -0,0 +1,146 @@ +{ + "format": 1, + "restore": { + "/Users/morris/Downloads/GC#/model/earth-geography/src/EarthGeographyModel.csproj": {} + }, + "projects": { + "/Users/morris/Downloads/GC#/model/earth-geography/src/EarthGeographyModel.csproj": { + "version": "1.0.3", + "restore": { + "projectUniqueName": "/Users/morris/Downloads/GC#/model/earth-geography/src/EarthGeographyModel.csproj", + "projectName": "EarthGeographyModel", + "projectPath": "/Users/morris/Downloads/GC#/model/earth-geography/src/EarthGeographyModel.csproj", + "packagesPath": "/Users/morris/.nuget/packages/", + "outputPath": "/Users/morris/Downloads/GC#/model/earth-geography/src/obj/", + "projectStyle": "PackageReference", + "configFilePaths": [ + "/Users/morris/.nuget/NuGet/NuGet.Config" + ], + "originalTargetFrameworks": [ + "net8.0" + ], + "sources": { + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net8.0": { + "framework": "net8.0", + "targetAlias": "net8.0", + "projectReferences": { + "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj": { + "projectPath": "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj" + } + } + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" + }, + "SdkAnalysisLevel": "10.0.400" + }, + "frameworks": { + "net8.0": { + "framework": "net8.0", + "targetAlias": "net8.0", + "dependencies": { + "Avalonia": { + "target": "Package", + "version": "[11.3.9, )" + } + }, + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/10.0.401/PortableRuntimeIdentifierGraph.json" + } + } + }, + "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj": { + "version": "1.0.3", + "restore": { + "projectUniqueName": "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj", + "projectName": "EarthModelStudio.ModelSdk", + "projectPath": "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj", + "packagesPath": "/Users/morris/.nuget/packages/", + "outputPath": "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/obj/", + "projectStyle": "PackageReference", + "configFilePaths": [ + "/Users/morris/.nuget/NuGet/NuGet.Config" + ], + "originalTargetFrameworks": [ + "net8.0" + ], + "sources": { + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net8.0": { + "framework": "net8.0", + "targetAlias": "net8.0", + "projectReferences": {} + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" + }, + "SdkAnalysisLevel": "10.0.400" + }, + "frameworks": { + "net8.0": { + "framework": "net8.0", + "targetAlias": "net8.0", + "dependencies": { + "Avalonia": { + "target": "Package", + "version": "[11.3.9, )" + } + }, + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/10.0.401/PortableRuntimeIdentifierGraph.json" + } + } + } + } +} \ No newline at end of file diff --git a/model/earth-geography/src/obj/EarthGeographyModel.csproj.nuget.g.props b/model/earth-geography/src/obj/EarthGeographyModel.csproj.nuget.g.props new file mode 100644 index 0000000..49d666c --- /dev/null +++ b/model/earth-geography/src/obj/EarthGeographyModel.csproj.nuget.g.props @@ -0,0 +1,22 @@ + + + + True + NuGet + $(MSBuildThisFileDirectory)project.assets.json + /Users/morris/.nuget/packages/ + /Users/morris/.nuget/packages/ + PackageReference + 7.0.0 + + + + + + + + + /Users/morris/.nuget/packages/avalonia.buildservices/11.3.2 + /Users/morris/.nuget/packages/avalonia/11.3.9 + + \ No newline at end of file diff --git a/model/earth-geography/src/obj/EarthGeographyModel.csproj.nuget.g.targets b/model/earth-geography/src/obj/EarthGeographyModel.csproj.nuget.g.targets new file mode 100644 index 0000000..c2c2aaf --- /dev/null +++ b/model/earth-geography/src/obj/EarthGeographyModel.csproj.nuget.g.targets @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/model/earth-geography/src/obj/Release/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs b/model/earth-geography/src/obj/Release/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs new file mode 100644 index 0000000..2217181 --- /dev/null +++ b/model/earth-geography/src/obj/Release/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v8.0", FrameworkDisplayName = ".NET 8.0")] diff --git a/model/earth-geography/src/obj/Release/net8.0/Avalonia/Resources.Inputs.cache b/model/earth-geography/src/obj/Release/net8.0/Avalonia/Resources.Inputs.cache new file mode 100644 index 0000000..d176387 --- /dev/null +++ b/model/earth-geography/src/obj/Release/net8.0/Avalonia/Resources.Inputs.cache @@ -0,0 +1 @@ +c5f16ca9fce0f0594ebc177c2ecb2b54604734e59fc765d9f79f6e5986cc8840 diff --git a/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.AssemblyInfo.cs b/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.AssemblyInfo.cs new file mode 100644 index 0000000..772a7db --- /dev/null +++ b/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.AssemblyInfo.cs @@ -0,0 +1,23 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("NeoRF")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.3.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.3+5e0b46b3f3cd9800af177571c7809a7cdc8e9249")] +[assembly: System.Reflection.AssemblyProductAttribute("Earth Model Studio")] +[assembly: System.Reflection.AssemblyTitleAttribute("EarthGeographyModel")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.3.0")] +[assembly: System.Resources.NeutralResourcesLanguageAttribute("zh-Hans")] + +// Generated by the MSBuild WriteCodeFragment class. + diff --git a/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.AssemblyInfoInputs.cache b/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.AssemblyInfoInputs.cache new file mode 100644 index 0000000..3bc87c1 --- /dev/null +++ b/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +64d244f4a14d63a2a4b7a2c2c5d4c77c5e5f540fcf0498aa4b7729198e9b47da diff --git a/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.GeneratedMSBuildEditorConfig.editorconfig b/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 0000000..3d18394 --- /dev/null +++ b/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,25 @@ +is_global = true +build_property.AvaloniaNameGeneratorIsEnabled = true +build_property.AvaloniaNameGeneratorBehavior = InitializeComponent +build_property.AvaloniaNameGeneratorDefaultFieldModifier = internal +build_property.AvaloniaNameGeneratorFilterByPath = * +build_property.AvaloniaNameGeneratorFilterByNamespace = * +build_property.AvaloniaNameGeneratorViewFileNamingStrategy = NamespaceAndClassName +build_property.AvaloniaNameGeneratorAttachDevTools = true +build_property.TargetFramework = net8.0 +build_property.TargetFrameworkIdentifier = .NETCoreApp +build_property.TargetFrameworkVersion = v8.0 +build_property.TargetPlatformMinVersion = +build_property.UsingMicrosoftNETSdkWeb = +build_property.ProjectTypeGuids = +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property.EnforceExtendedAnalyzerRules = +build_property.EntryPointFilePath = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = NeoRF.EarthModels +build_property.ProjectDir = /Users/morris/Downloads/GC#/model/earth-geography/src/ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = +build_property.EffectiveAnalysisLevelStyle = 8.0 +build_property.EnableCodeStyleSeverity = diff --git a/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.assets.cache b/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.assets.cache new file mode 100644 index 0000000..a20549e Binary files /dev/null and b/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.assets.cache differ diff --git a/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.csproj.AssemblyReference.cache b/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.csproj.AssemblyReference.cache new file mode 100644 index 0000000..fd28939 Binary files /dev/null and b/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.csproj.AssemblyReference.cache differ diff --git a/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.csproj.CoreCompileInputs.cache b/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.csproj.CoreCompileInputs.cache new file mode 100644 index 0000000..6e32cf4 --- /dev/null +++ b/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.csproj.CoreCompileInputs.cache @@ -0,0 +1 @@ +e5451ccab6124d4ea608d6238d410a852fcc37116d802d29ae6e1f7a41ec6f63 diff --git a/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.csproj.FileListAbsolute.txt b/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.csproj.FileListAbsolute.txt new file mode 100644 index 0000000..7253229 --- /dev/null +++ b/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.csproj.FileListAbsolute.txt @@ -0,0 +1,13 @@ +/Users/morris/Downloads/GC#/model/earth-geography/src/bin/Release/net8.0/EarthGeographyModel.deps.json +/Users/morris/Downloads/GC#/model/earth-geography/src/bin/Release/net8.0/EarthGeographyModel.dll +/Users/morris/Downloads/GC#/model/earth-geography/src/bin/Release/net8.0/EarthGeographyModel.pdb +/Users/morris/Downloads/GC#/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.csproj.AssemblyReference.cache +/Users/morris/Downloads/GC#/model/earth-geography/src/obj/Release/net8.0/Avalonia/Resources.Inputs.cache +/Users/morris/Downloads/GC#/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.GeneratedMSBuildEditorConfig.editorconfig +/Users/morris/Downloads/GC#/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.AssemblyInfoInputs.cache +/Users/morris/Downloads/GC#/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.AssemblyInfo.cs +/Users/morris/Downloads/GC#/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.csproj.CoreCompileInputs.cache +/Users/morris/Downloads/GC#/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.dll +/Users/morris/Downloads/GC#/model/earth-geography/src/obj/Release/net8.0/refint/EarthGeographyModel.dll +/Users/morris/Downloads/GC#/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.pdb +/Users/morris/Downloads/GC#/model/earth-geography/src/obj/Release/net8.0/ref/EarthGeographyModel.dll diff --git a/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.dll b/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.dll new file mode 100644 index 0000000..146b4f8 Binary files /dev/null and b/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.dll differ diff --git a/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.pdb b/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.pdb new file mode 100644 index 0000000..92ad5a3 Binary files /dev/null and b/model/earth-geography/src/obj/Release/net8.0/EarthGeographyModel.pdb differ diff --git a/model/earth-geography/src/obj/Release/net8.0/ref/EarthGeographyModel.dll b/model/earth-geography/src/obj/Release/net8.0/ref/EarthGeographyModel.dll new file mode 100644 index 0000000..959196a Binary files /dev/null and b/model/earth-geography/src/obj/Release/net8.0/ref/EarthGeographyModel.dll differ diff --git a/model/earth-geography/src/obj/Release/net8.0/refint/EarthGeographyModel.dll b/model/earth-geography/src/obj/Release/net8.0/refint/EarthGeographyModel.dll new file mode 100644 index 0000000..959196a Binary files /dev/null and b/model/earth-geography/src/obj/Release/net8.0/refint/EarthGeographyModel.dll differ diff --git a/model/earth-geography/src/obj/project.assets.json b/model/earth-geography/src/obj/project.assets.json new file mode 100644 index 0000000..ca026a9 --- /dev/null +++ b/model/earth-geography/src/obj/project.assets.json @@ -0,0 +1,436 @@ +{ + "version": 4, + "targets": { + "net8.0": { + "Avalonia/11.3.9": { + "type": "package", + "dependencies": { + "Avalonia.BuildServices": "11.3.2", + "Avalonia.Remote.Protocol": "11.3.9", + "MicroCom.Runtime": "0.11.0" + }, + "compile": { + "ref/net8.0/Avalonia.Base.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.Controls.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.DesignerSupport.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.Dialogs.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.Markup.Xaml.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.Markup.dll": { + "related": ".Xaml.xml;.xml" + }, + "ref/net8.0/Avalonia.Metal.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.MicroCom.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.OpenGL.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.Vulkan.dll": { + "related": ".xml" + }, + "ref/net8.0/Avalonia.dll": { + "related": ".Base.xml;.Controls.xml;.DesignerSupport.xml;.Dialogs.xml;.Markup.Xaml.xml;.Markup.xml;.Metal.xml;.MicroCom.xml;.OpenGL.xml;.Vulkan.xml;.xml" + } + }, + "runtime": { + "lib/net8.0/Avalonia.Base.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.Controls.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.DesignerSupport.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.Dialogs.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.Markup.Xaml.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.Markup.dll": { + "related": ".Xaml.xml;.xml" + }, + "lib/net8.0/Avalonia.Metal.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.MicroCom.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.OpenGL.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.Vulkan.dll": { + "related": ".xml" + }, + "lib/net8.0/Avalonia.dll": { + "related": ".Base.xml;.Controls.xml;.DesignerSupport.xml;.Dialogs.xml;.Markup.Xaml.xml;.Markup.xml;.Metal.xml;.MicroCom.xml;.OpenGL.xml;.Vulkan.xml;.xml" + } + }, + "build": { + "buildTransitive/Avalonia.props": {}, + "buildTransitive/Avalonia.targets": {} + } + }, + "Avalonia.BuildServices/11.3.2": { + "type": "package", + "build": { + "buildTransitive/Avalonia.BuildServices.targets": {} + } + }, + "Avalonia.Remote.Protocol/11.3.9": { + "type": "package", + "compile": { + "lib/net8.0/Avalonia.Remote.Protocol.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net8.0/Avalonia.Remote.Protocol.dll": { + "related": ".xml" + } + } + }, + "MicroCom.Runtime/0.11.0": { + "type": "package", + "compile": { + "lib/net5.0/MicroCom.Runtime.dll": {} + }, + "runtime": { + "lib/net5.0/MicroCom.Runtime.dll": {} + } + }, + "EarthModelStudio.ModelSdk/1.0.3": { + "type": "project", + "framework": ".NETCoreApp,Version=v8.0", + "dependencies": { + "Avalonia": "11.3.9" + }, + "compile": { + "bin/placeholder/EarthModelStudio.ModelSdk.dll": {} + }, + "runtime": { + "bin/placeholder/EarthModelStudio.ModelSdk.dll": {} + } + } + } + }, + "libraries": { + "Avalonia/11.3.9": { + "sha512": "YfaTrUxcmVTsGOw2YqdZyunHqZArK16m1pYfNIBvyvAgX89Pzd3A1PgoMkf64u7scL23IN6HkfqhZeFcbYWLoA==", + "type": "package", + "path": "avalonia/11.3.9", + "hasTools": true, + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "analyzers/dotnet/cs/Avalonia.Analyzers.dll", + "analyzers/dotnet/cs/Avalonia.Generators.dll", + "avalonia.11.3.9.nupkg.sha512", + "avalonia.nuspec", + "build/Avalonia.Generators.props", + "build/Avalonia.props", + "build/Avalonia.targets", + "build/AvaloniaBuildTasks.props", + "build/AvaloniaBuildTasks.targets", + "build/AvaloniaItemSchema.xaml", + "build/AvaloniaPrivateApis.targets", + "build/AvaloniaRules.Project.xml", + "build/AvaloniaSingleProject.targets", + "build/AvaloniaVersion.props", + "buildTransitive/Avalonia.Generators.props", + "buildTransitive/Avalonia.props", + "buildTransitive/Avalonia.targets", + "buildTransitive/AvaloniaBuildTasks.props", + "buildTransitive/AvaloniaBuildTasks.targets", + "buildTransitive/AvaloniaItemSchema.xaml", + "buildTransitive/AvaloniaPrivateApis.targets", + "buildTransitive/AvaloniaRules.Project.xml", + "buildTransitive/AvaloniaSingleProject.targets", + "lib/net6.0/Avalonia.Base.dll", + "lib/net6.0/Avalonia.Base.xml", + "lib/net6.0/Avalonia.Controls.dll", + "lib/net6.0/Avalonia.Controls.xml", + "lib/net6.0/Avalonia.DesignerSupport.dll", + "lib/net6.0/Avalonia.DesignerSupport.xml", + "lib/net6.0/Avalonia.Dialogs.dll", + "lib/net6.0/Avalonia.Dialogs.xml", + "lib/net6.0/Avalonia.Markup.Xaml.dll", + "lib/net6.0/Avalonia.Markup.Xaml.xml", + "lib/net6.0/Avalonia.Markup.dll", + "lib/net6.0/Avalonia.Markup.xml", + "lib/net6.0/Avalonia.Metal.dll", + "lib/net6.0/Avalonia.Metal.xml", + "lib/net6.0/Avalonia.MicroCom.dll", + "lib/net6.0/Avalonia.MicroCom.xml", + "lib/net6.0/Avalonia.OpenGL.dll", + "lib/net6.0/Avalonia.OpenGL.xml", + "lib/net6.0/Avalonia.Vulkan.dll", + "lib/net6.0/Avalonia.Vulkan.xml", + "lib/net6.0/Avalonia.dll", + "lib/net6.0/Avalonia.xml", + "lib/net8.0/Avalonia.Base.dll", + "lib/net8.0/Avalonia.Base.xml", + "lib/net8.0/Avalonia.Controls.dll", + "lib/net8.0/Avalonia.Controls.xml", + "lib/net8.0/Avalonia.DesignerSupport.dll", + "lib/net8.0/Avalonia.DesignerSupport.xml", + "lib/net8.0/Avalonia.Dialogs.dll", + "lib/net8.0/Avalonia.Dialogs.xml", + "lib/net8.0/Avalonia.Markup.Xaml.dll", + "lib/net8.0/Avalonia.Markup.Xaml.xml", + "lib/net8.0/Avalonia.Markup.dll", + "lib/net8.0/Avalonia.Markup.xml", + "lib/net8.0/Avalonia.Metal.dll", + "lib/net8.0/Avalonia.Metal.xml", + "lib/net8.0/Avalonia.MicroCom.dll", + "lib/net8.0/Avalonia.MicroCom.xml", + "lib/net8.0/Avalonia.OpenGL.dll", + "lib/net8.0/Avalonia.OpenGL.xml", + "lib/net8.0/Avalonia.Vulkan.dll", + "lib/net8.0/Avalonia.Vulkan.xml", + "lib/net8.0/Avalonia.dll", + "lib/net8.0/Avalonia.xml", + "lib/netstandard2.0/Avalonia.Base.dll", + "lib/netstandard2.0/Avalonia.Base.xml", + "lib/netstandard2.0/Avalonia.Controls.dll", + "lib/netstandard2.0/Avalonia.Controls.xml", + "lib/netstandard2.0/Avalonia.DesignerSupport.dll", + "lib/netstandard2.0/Avalonia.DesignerSupport.xml", + "lib/netstandard2.0/Avalonia.Dialogs.dll", + "lib/netstandard2.0/Avalonia.Dialogs.xml", + "lib/netstandard2.0/Avalonia.Markup.Xaml.dll", + "lib/netstandard2.0/Avalonia.Markup.Xaml.xml", + "lib/netstandard2.0/Avalonia.Markup.dll", + "lib/netstandard2.0/Avalonia.Markup.xml", + "lib/netstandard2.0/Avalonia.Metal.dll", + "lib/netstandard2.0/Avalonia.Metal.xml", + "lib/netstandard2.0/Avalonia.MicroCom.dll", + "lib/netstandard2.0/Avalonia.MicroCom.xml", + "lib/netstandard2.0/Avalonia.OpenGL.dll", + "lib/netstandard2.0/Avalonia.OpenGL.xml", + "lib/netstandard2.0/Avalonia.Vulkan.dll", + "lib/netstandard2.0/Avalonia.Vulkan.xml", + "lib/netstandard2.0/Avalonia.dll", + "lib/netstandard2.0/Avalonia.xml", + "ref/net6.0/Avalonia.Base.dll", + "ref/net6.0/Avalonia.Base.xml", + "ref/net6.0/Avalonia.Controls.dll", + "ref/net6.0/Avalonia.Controls.xml", + "ref/net6.0/Avalonia.DesignerSupport.dll", + "ref/net6.0/Avalonia.DesignerSupport.xml", + "ref/net6.0/Avalonia.Dialogs.dll", + "ref/net6.0/Avalonia.Dialogs.xml", + "ref/net6.0/Avalonia.Markup.Xaml.dll", + "ref/net6.0/Avalonia.Markup.Xaml.xml", + "ref/net6.0/Avalonia.Markup.dll", + "ref/net6.0/Avalonia.Markup.xml", + "ref/net6.0/Avalonia.Metal.dll", + "ref/net6.0/Avalonia.Metal.xml", + "ref/net6.0/Avalonia.MicroCom.dll", + "ref/net6.0/Avalonia.MicroCom.xml", + "ref/net6.0/Avalonia.OpenGL.dll", + "ref/net6.0/Avalonia.OpenGL.xml", + "ref/net6.0/Avalonia.Vulkan.dll", + "ref/net6.0/Avalonia.Vulkan.xml", + "ref/net6.0/Avalonia.dll", + "ref/net6.0/Avalonia.xml", + "ref/net8.0/Avalonia.Base.dll", + "ref/net8.0/Avalonia.Base.xml", + "ref/net8.0/Avalonia.Controls.dll", + "ref/net8.0/Avalonia.Controls.xml", + "ref/net8.0/Avalonia.DesignerSupport.dll", + "ref/net8.0/Avalonia.DesignerSupport.xml", + "ref/net8.0/Avalonia.Dialogs.dll", + "ref/net8.0/Avalonia.Dialogs.xml", + "ref/net8.0/Avalonia.Markup.Xaml.dll", + "ref/net8.0/Avalonia.Markup.Xaml.xml", + "ref/net8.0/Avalonia.Markup.dll", + "ref/net8.0/Avalonia.Markup.xml", + "ref/net8.0/Avalonia.Metal.dll", + "ref/net8.0/Avalonia.Metal.xml", + "ref/net8.0/Avalonia.MicroCom.dll", + "ref/net8.0/Avalonia.MicroCom.xml", + "ref/net8.0/Avalonia.OpenGL.dll", + "ref/net8.0/Avalonia.OpenGL.xml", + "ref/net8.0/Avalonia.Vulkan.dll", + "ref/net8.0/Avalonia.Vulkan.xml", + "ref/net8.0/Avalonia.dll", + "ref/net8.0/Avalonia.xml", + "ref/netstandard2.0/Avalonia.Base.dll", + "ref/netstandard2.0/Avalonia.Base.xml", + "ref/netstandard2.0/Avalonia.Controls.dll", + "ref/netstandard2.0/Avalonia.Controls.xml", + "ref/netstandard2.0/Avalonia.DesignerSupport.dll", + "ref/netstandard2.0/Avalonia.DesignerSupport.xml", + "ref/netstandard2.0/Avalonia.Dialogs.dll", + "ref/netstandard2.0/Avalonia.Dialogs.xml", + "ref/netstandard2.0/Avalonia.Markup.Xaml.dll", + "ref/netstandard2.0/Avalonia.Markup.Xaml.xml", + "ref/netstandard2.0/Avalonia.Markup.dll", + "ref/netstandard2.0/Avalonia.Markup.xml", + "ref/netstandard2.0/Avalonia.Metal.dll", + "ref/netstandard2.0/Avalonia.Metal.xml", + "ref/netstandard2.0/Avalonia.MicroCom.dll", + "ref/netstandard2.0/Avalonia.MicroCom.xml", + "ref/netstandard2.0/Avalonia.OpenGL.dll", + "ref/netstandard2.0/Avalonia.OpenGL.xml", + "ref/netstandard2.0/Avalonia.Vulkan.dll", + "ref/netstandard2.0/Avalonia.Vulkan.xml", + "ref/netstandard2.0/Avalonia.dll", + "ref/netstandard2.0/Avalonia.xml", + "tools/net461/designer/Avalonia.Designer.HostApp.exe", + "tools/netstandard2.0/Avalonia.Build.Tasks.dll", + "tools/netstandard2.0/designer/Avalonia.Designer.HostApp.dll" + ] + }, + "Avalonia.BuildServices/11.3.2": { + "sha512": "qHDToxto1e3hci5YqbG9n0Ty8mlp3zBUN5wT66wKqaDVzXyQ0do3EnRILd4Ke9jpvsktaPpgE0YjEk7hornryQ==", + "type": "package", + "path": "avalonia.buildservices/11.3.2", + "hasTools": true, + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "README.md", + "avalonia.buildservices.11.3.2.nupkg.sha512", + "avalonia.buildservices.nuspec", + "build/Avalonia.BuildServices.targets", + "buildTransitive/Avalonia.BuildServices.targets", + "tools/netstandard2.0/Avalonia.BuildServices.Collector.dll", + "tools/netstandard2.0/Avalonia.BuildServices.dll", + "tools/netstandard2.0/runtimeconfig.json" + ] + }, + "Avalonia.Remote.Protocol/11.3.9": { + "sha512": "2XVLTSNa+Nvwu4D8NqqdudhllTaCRA9ZKlLZZvYLZeuLlzg7OcAV+df/biHQc6AqOv7iMFR9K5Zt3wG0EF4KfQ==", + "type": "package", + "path": "avalonia.remote.protocol/11.3.9", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "avalonia.remote.protocol.11.3.9.nupkg.sha512", + "avalonia.remote.protocol.nuspec", + "lib/net6.0/Avalonia.Remote.Protocol.dll", + "lib/net6.0/Avalonia.Remote.Protocol.xml", + "lib/net8.0/Avalonia.Remote.Protocol.dll", + "lib/net8.0/Avalonia.Remote.Protocol.xml", + "lib/netstandard2.0/Avalonia.Remote.Protocol.dll", + "lib/netstandard2.0/Avalonia.Remote.Protocol.xml" + ] + }, + "MicroCom.Runtime/0.11.0": { + "sha512": "MEnrZ3UIiH40hjzMDsxrTyi8dtqB5ziv3iBeeU4bXsL/7NLSal9F1lZKpK+tfBRnUoDSdtcW3KufE4yhATOMCA==", + "type": "package", + "path": "microcom.runtime/0.11.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "lib/net5.0/MicroCom.Runtime.dll", + "lib/netstandard2.0/MicroCom.Runtime.dll", + "microcom.runtime.0.11.0.nupkg.sha512", + "microcom.runtime.nuspec" + ] + }, + "EarthModelStudio.ModelSdk/1.0.3": { + "type": "project", + "path": "../../_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj", + "msbuildProject": "../../_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj" + } + }, + "projectFileDependencyGroups": { + "net8.0": [ + "Avalonia >= 11.3.9", + "EarthModelStudio.ModelSdk >= 1.0.3" + ] + }, + "packageFolders": { + "/Users/morris/.nuget/packages/": {} + }, + "project": { + "version": "1.0.3", + "restore": { + "projectUniqueName": "/Users/morris/Downloads/GC#/model/earth-geography/src/EarthGeographyModel.csproj", + "projectName": "EarthGeographyModel", + "projectPath": "/Users/morris/Downloads/GC#/model/earth-geography/src/EarthGeographyModel.csproj", + "packagesPath": "/Users/morris/.nuget/packages/", + "outputPath": "/Users/morris/Downloads/GC#/model/earth-geography/src/obj/", + "projectStyle": "PackageReference", + "configFilePaths": [ + "/Users/morris/.nuget/NuGet/NuGet.Config" + ], + "originalTargetFrameworks": [ + "net8.0" + ], + "sources": { + "https://api.nuget.org/v3/index.json": {} + }, + "frameworks": { + "net8.0": { + "framework": "net8.0", + "targetAlias": "net8.0", + "projectReferences": { + "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj": { + "projectPath": "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj" + } + } + } + }, + "warningProperties": { + "warnAsError": [ + "NU1605" + ] + }, + "restoreAuditProperties": { + "enableAudit": "true", + "auditLevel": "low", + "auditMode": "direct" + }, + "SdkAnalysisLevel": "10.0.400" + }, + "frameworks": { + "net8.0": { + "framework": "net8.0", + "targetAlias": "net8.0", + "dependencies": { + "Avalonia": { + "target": "Package", + "version": "[11.3.9, )" + } + }, + "imports": [ + "net461", + "net462", + "net47", + "net471", + "net472", + "net48", + "net481" + ], + "assetTargetFallback": true, + "warn": true, + "frameworkReferences": { + "Microsoft.NETCore.App": { + "privateAssets": "all" + } + }, + "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/10.0.401/PortableRuntimeIdentifierGraph.json" + } + } + } +} \ No newline at end of file diff --git a/model/earth-geography/src/obj/project.nuget.cache b/model/earth-geography/src/obj/project.nuget.cache new file mode 100644 index 0000000..ae6e18d --- /dev/null +++ b/model/earth-geography/src/obj/project.nuget.cache @@ -0,0 +1,13 @@ +{ + "version": 2, + "dgSpecHash": "3ZSn38nmvSY=", + "success": true, + "projectFilePath": "/Users/morris/Downloads/GC#/model/earth-geography/src/EarthGeographyModel.csproj", + "expectedPackageFiles": [ + "/Users/morris/.nuget/packages/avalonia/11.3.9/avalonia.11.3.9.nupkg.sha512", + "/Users/morris/.nuget/packages/avalonia.buildservices/11.3.2/avalonia.buildservices.11.3.2.nupkg.sha512", + "/Users/morris/.nuget/packages/avalonia.remote.protocol/11.3.9/avalonia.remote.protocol.11.3.9.nupkg.sha512", + "/Users/morris/.nuget/packages/microcom.runtime/0.11.0/microcom.runtime.0.11.0.nupkg.sha512" + ], + "logs": [] +} \ No newline at end of file diff --git a/model/earth-revolution/earth-revolution.json b/model/earth-revolution/earth-revolution.json index 2357b29..fd4da3a 100644 --- a/model/earth-revolution/earth-revolution.json +++ b/model/earth-revolution/earth-revolution.json @@ -23,7 +23,7 @@ "type": "NeoRF.EarthModels.RevolutionModelFactory", "preview": "preview.png", "apiVersion": 1, - "version": "1.0", - "updatedAt": "2026-11-08T09:22:29Z", - "build": "a24be3664d" + "version": "1.1", + "updatedAt": "2026-11-08T10:13:50Z", + "build": "455cb9e7c1" } diff --git a/model/earth-revolution/earth-revolution.model/EarthRevolutionModel.dll b/model/earth-revolution/earth-revolution.model/EarthRevolutionModel.dll index 10afa05..3c0d4e2 100644 Binary files a/model/earth-revolution/earth-revolution.model/EarthRevolutionModel.dll and b/model/earth-revolution/earth-revolution.model/EarthRevolutionModel.dll differ diff --git a/model/earth-revolution/src/bin/Debug/net8.0/EarthRevolutionModel.deps.json b/model/earth-revolution/src/bin/Debug/net8.0/EarthRevolutionModel.deps.json index a2d24f2..8f09a64 100644 --- a/model/earth-revolution/src/bin/Debug/net8.0/EarthRevolutionModel.deps.json +++ b/model/earth-revolution/src/bin/Debug/net8.0/EarthRevolutionModel.deps.json @@ -6,7 +6,7 @@ "compilationOptions": {}, "targets": { ".NETCoreApp,Version=v8.0": { - "EarthRevolutionModel/1.0.3": { + "EarthRevolutionModel/1.0.4": { "dependencies": { "Avalonia": "11.3.9" }, @@ -85,7 +85,7 @@ } }, "libraries": { - "EarthRevolutionModel/1.0.3": { + "EarthRevolutionModel/1.0.4": { "type": "project", "serviceable": false, "sha512": "" diff --git a/model/earth-revolution/src/bin/Debug/net8.0/EarthRevolutionModel.dll b/model/earth-revolution/src/bin/Debug/net8.0/EarthRevolutionModel.dll index b166e19..458684c 100644 Binary files a/model/earth-revolution/src/bin/Debug/net8.0/EarthRevolutionModel.dll and b/model/earth-revolution/src/bin/Debug/net8.0/EarthRevolutionModel.dll differ diff --git a/model/earth-revolution/src/bin/Debug/net8.0/EarthRevolutionModel.pdb b/model/earth-revolution/src/bin/Debug/net8.0/EarthRevolutionModel.pdb index ff5e13b..1fb8c3d 100644 Binary files a/model/earth-revolution/src/bin/Debug/net8.0/EarthRevolutionModel.pdb and b/model/earth-revolution/src/bin/Debug/net8.0/EarthRevolutionModel.pdb differ diff --git a/model/earth-revolution/src/bin/Release/net8.0/EarthRevolutionModel.deps.json b/model/earth-revolution/src/bin/Release/net8.0/EarthRevolutionModel.deps.json new file mode 100644 index 0000000..a2d24f2 --- /dev/null +++ b/model/earth-revolution/src/bin/Release/net8.0/EarthRevolutionModel.deps.json @@ -0,0 +1,115 @@ +{ + "runtimeTarget": { + "name": ".NETCoreApp,Version=v8.0", + "signature": "" + }, + "compilationOptions": {}, + "targets": { + ".NETCoreApp,Version=v8.0": { + "EarthRevolutionModel/1.0.3": { + "dependencies": { + "Avalonia": "11.3.9" + }, + "runtime": { + "EarthRevolutionModel.dll": {} + } + }, + "Avalonia/11.3.9": { + "dependencies": { + "Avalonia.Remote.Protocol": "11.3.9", + "MicroCom.Runtime": "0.11.0" + }, + "runtime": { + "lib/net8.0/Avalonia.Base.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Controls.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.DesignerSupport.dll": { + "assemblyVersion": "0.7.0.0", + "fileVersion": "0.7.0.0" + }, + "lib/net8.0/Avalonia.Dialogs.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Markup.Xaml.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Markup.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Metal.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.MicroCom.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.OpenGL.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Vulkan.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + } + } + }, + "Avalonia.Remote.Protocol/11.3.9": { + "runtime": { + "lib/net8.0/Avalonia.Remote.Protocol.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + } + } + }, + "MicroCom.Runtime/0.11.0": { + "runtime": { + "lib/net5.0/MicroCom.Runtime.dll": { + "assemblyVersion": "0.11.0.0", + "fileVersion": "0.11.0.0" + } + } + } + } + }, + "libraries": { + "EarthRevolutionModel/1.0.3": { + "type": "project", + "serviceable": false, + "sha512": "" + }, + "Avalonia/11.3.9": { + "type": "package", + "serviceable": true, + "sha512": "sha512-YfaTrUxcmVTsGOw2YqdZyunHqZArK16m1pYfNIBvyvAgX89Pzd3A1PgoMkf64u7scL23IN6HkfqhZeFcbYWLoA==", + "path": "avalonia/11.3.9", + "hashPath": "avalonia.11.3.9.nupkg.sha512" + }, + "Avalonia.Remote.Protocol/11.3.9": { + "type": "package", + "serviceable": true, + "sha512": "sha512-2XVLTSNa+Nvwu4D8NqqdudhllTaCRA9ZKlLZZvYLZeuLlzg7OcAV+df/biHQc6AqOv7iMFR9K5Zt3wG0EF4KfQ==", + "path": "avalonia.remote.protocol/11.3.9", + "hashPath": "avalonia.remote.protocol.11.3.9.nupkg.sha512" + }, + "MicroCom.Runtime/0.11.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-MEnrZ3UIiH40hjzMDsxrTyi8dtqB5ziv3iBeeU4bXsL/7NLSal9F1lZKpK+tfBRnUoDSdtcW3KufE4yhATOMCA==", + "path": "microcom.runtime/0.11.0", + "hashPath": "microcom.runtime.0.11.0.nupkg.sha512" + } + } +} \ No newline at end of file diff --git a/model/earth-revolution/src/bin/Release/net8.0/EarthRevolutionModel.dll b/model/earth-revolution/src/bin/Release/net8.0/EarthRevolutionModel.dll new file mode 100644 index 0000000..3c0d4e2 Binary files /dev/null and b/model/earth-revolution/src/bin/Release/net8.0/EarthRevolutionModel.dll differ diff --git a/model/earth-revolution/src/bin/Release/net8.0/EarthRevolutionModel.pdb b/model/earth-revolution/src/bin/Release/net8.0/EarthRevolutionModel.pdb new file mode 100644 index 0000000..aeb45a6 Binary files /dev/null and b/model/earth-revolution/src/bin/Release/net8.0/EarthRevolutionModel.pdb differ diff --git a/model/earth-revolution/src/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache b/model/earth-revolution/src/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache index 6bdfd39..2c6e493 100644 --- a/model/earth-revolution/src/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache +++ b/model/earth-revolution/src/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache @@ -1 +1 @@ -9ace3cec70386f1107b579993a2b0e2d8726efadf0ccd58f63e17c3abe4138ab +53167376ca320a2883b3ea70457ba5caa49ab452af81a313044551fea9319e36 diff --git a/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.AssemblyInfo.cs b/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.AssemblyInfo.cs index d1a3166..61f0ab5 100644 --- a/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.AssemblyInfo.cs +++ b/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.AssemblyInfo.cs @@ -12,11 +12,11 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("NeoRF")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] -[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.3.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.3")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.4.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.4+5e0b46b3f3cd9800af177571c7809a7cdc8e9249")] [assembly: System.Reflection.AssemblyProductAttribute("Earth Model Studio")] [assembly: System.Reflection.AssemblyTitleAttribute("EarthRevolutionModel")] -[assembly: System.Reflection.AssemblyVersionAttribute("1.0.3.0")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.4.0")] [assembly: System.Resources.NeutralResourcesLanguageAttribute("zh-Hans")] // Generated by the MSBuild WriteCodeFragment class. diff --git a/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.AssemblyInfoInputs.cache b/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.AssemblyInfoInputs.cache index 7e8819b..15a90f1 100644 --- a/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.AssemblyInfoInputs.cache +++ b/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.AssemblyInfoInputs.cache @@ -1 +1 @@ -212b627f3eca9aa6cb36bd0f638955f96b46ee28122ebd09110af90b813dddf0 +93fdd9b310a228bf3830b48bd92db5157a97258b0cffa334403964847bb274b8 diff --git a/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.csproj.AssemblyReference.cache b/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.csproj.AssemblyReference.cache index 48f2eaa..f80fa28 100644 Binary files a/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.csproj.AssemblyReference.cache and b/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.csproj.AssemblyReference.cache differ diff --git a/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.dll b/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.dll index b166e19..458684c 100644 Binary files a/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.dll and b/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.dll differ diff --git a/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.pdb b/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.pdb index ff5e13b..1fb8c3d 100644 Binary files a/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.pdb and b/model/earth-revolution/src/obj/Debug/net8.0/EarthRevolutionModel.pdb differ diff --git a/model/earth-revolution/src/obj/Debug/net8.0/ref/EarthRevolutionModel.dll b/model/earth-revolution/src/obj/Debug/net8.0/ref/EarthRevolutionModel.dll index ea41b4a..023ea85 100644 Binary files a/model/earth-revolution/src/obj/Debug/net8.0/ref/EarthRevolutionModel.dll and b/model/earth-revolution/src/obj/Debug/net8.0/ref/EarthRevolutionModel.dll differ diff --git a/model/earth-revolution/src/obj/Debug/net8.0/refint/EarthRevolutionModel.dll b/model/earth-revolution/src/obj/Debug/net8.0/refint/EarthRevolutionModel.dll index ea41b4a..023ea85 100644 Binary files a/model/earth-revolution/src/obj/Debug/net8.0/refint/EarthRevolutionModel.dll and b/model/earth-revolution/src/obj/Debug/net8.0/refint/EarthRevolutionModel.dll differ diff --git a/model/earth-revolution/src/obj/EarthRevolutionModel.csproj.nuget.dgspec.json b/model/earth-revolution/src/obj/EarthRevolutionModel.csproj.nuget.dgspec.json index d6f5dc6..36f6d5c 100644 --- a/model/earth-revolution/src/obj/EarthRevolutionModel.csproj.nuget.dgspec.json +++ b/model/earth-revolution/src/obj/EarthRevolutionModel.csproj.nuget.dgspec.json @@ -5,7 +5,7 @@ }, "projects": { "/Users/morris/Downloads/GC#/model/earth-revolution/src/EarthRevolutionModel.csproj": { - "version": "1.0.3", + "version": "1.0.4", "restore": { "projectUniqueName": "/Users/morris/Downloads/GC#/model/earth-revolution/src/EarthRevolutionModel.csproj", "projectName": "EarthRevolutionModel", @@ -76,7 +76,7 @@ } }, "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj": { - "version": "1.0.3", + "version": "1.0.4", "restore": { "projectUniqueName": "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj", "projectName": "EarthModelStudio.ModelSdk", diff --git a/model/earth-revolution/src/obj/Release/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs b/model/earth-revolution/src/obj/Release/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs new file mode 100644 index 0000000..2217181 --- /dev/null +++ b/model/earth-revolution/src/obj/Release/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v8.0", FrameworkDisplayName = ".NET 8.0")] diff --git a/model/earth-revolution/src/obj/Release/net8.0/Avalonia/Resources.Inputs.cache b/model/earth-revolution/src/obj/Release/net8.0/Avalonia/Resources.Inputs.cache new file mode 100644 index 0000000..6bdfd39 --- /dev/null +++ b/model/earth-revolution/src/obj/Release/net8.0/Avalonia/Resources.Inputs.cache @@ -0,0 +1 @@ +9ace3cec70386f1107b579993a2b0e2d8726efadf0ccd58f63e17c3abe4138ab diff --git a/model/earth-revolution/src/obj/Release/net8.0/EarthRevolutionModel.AssemblyInfo.cs b/model/earth-revolution/src/obj/Release/net8.0/EarthRevolutionModel.AssemblyInfo.cs new file mode 100644 index 0000000..1404583 --- /dev/null +++ b/model/earth-revolution/src/obj/Release/net8.0/EarthRevolutionModel.AssemblyInfo.cs @@ -0,0 +1,23 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("NeoRF")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.3.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.3+5e0b46b3f3cd9800af177571c7809a7cdc8e9249")] +[assembly: System.Reflection.AssemblyProductAttribute("Earth Model Studio")] +[assembly: System.Reflection.AssemblyTitleAttribute("EarthRevolutionModel")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.3.0")] +[assembly: System.Resources.NeutralResourcesLanguageAttribute("zh-Hans")] + +// Generated by the MSBuild WriteCodeFragment class. + diff --git a/model/earth-revolution/src/obj/Release/net8.0/EarthRevolutionModel.AssemblyInfoInputs.cache b/model/earth-revolution/src/obj/Release/net8.0/EarthRevolutionModel.AssemblyInfoInputs.cache new file mode 100644 index 0000000..93400a3 --- /dev/null +++ b/model/earth-revolution/src/obj/Release/net8.0/EarthRevolutionModel.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +9ca5559e783061446dbd03d562687e10a9e62185198e535be376a2e926e82199 diff --git a/model/earth-revolution/src/obj/Release/net8.0/EarthRevolutionModel.GeneratedMSBuildEditorConfig.editorconfig b/model/earth-revolution/src/obj/Release/net8.0/EarthRevolutionModel.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 0000000..ab7605f --- /dev/null +++ b/model/earth-revolution/src/obj/Release/net8.0/EarthRevolutionModel.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,25 @@ +is_global = true +build_property.AvaloniaNameGeneratorIsEnabled = true +build_property.AvaloniaNameGeneratorBehavior = InitializeComponent +build_property.AvaloniaNameGeneratorDefaultFieldModifier = internal +build_property.AvaloniaNameGeneratorFilterByPath = * +build_property.AvaloniaNameGeneratorFilterByNamespace = * +build_property.AvaloniaNameGeneratorViewFileNamingStrategy = NamespaceAndClassName +build_property.AvaloniaNameGeneratorAttachDevTools = true +build_property.TargetFramework = net8.0 +build_property.TargetFrameworkIdentifier = .NETCoreApp +build_property.TargetFrameworkVersion = v8.0 +build_property.TargetPlatformMinVersion = +build_property.UsingMicrosoftNETSdkWeb = +build_property.ProjectTypeGuids = +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property.EnforceExtendedAnalyzerRules = +build_property.EntryPointFilePath = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = NeoRF.EarthModels +build_property.ProjectDir = /Users/morris/Downloads/GC#/model/earth-revolution/src/ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = +build_property.EffectiveAnalysisLevelStyle = 8.0 +build_property.EnableCodeStyleSeverity = diff --git a/model/earth-revolution/src/obj/Release/net8.0/EarthRevolutionModel.assets.cache b/model/earth-revolution/src/obj/Release/net8.0/EarthRevolutionModel.assets.cache new file mode 100644 index 0000000..b41acc1 Binary files /dev/null and b/model/earth-revolution/src/obj/Release/net8.0/EarthRevolutionModel.assets.cache differ diff --git a/model/earth-revolution/src/obj/Release/net8.0/EarthRevolutionModel.csproj.AssemblyReference.cache b/model/earth-revolution/src/obj/Release/net8.0/EarthRevolutionModel.csproj.AssemblyReference.cache new file mode 100644 index 0000000..fd28939 Binary files /dev/null and b/model/earth-revolution/src/obj/Release/net8.0/EarthRevolutionModel.csproj.AssemblyReference.cache differ diff --git a/model/earth-revolution/src/obj/Release/net8.0/EarthRevolutionModel.csproj.CoreCompileInputs.cache b/model/earth-revolution/src/obj/Release/net8.0/EarthRevolutionModel.csproj.CoreCompileInputs.cache new file mode 100644 index 0000000..9996778 --- /dev/null +++ b/model/earth-revolution/src/obj/Release/net8.0/EarthRevolutionModel.csproj.CoreCompileInputs.cache @@ -0,0 +1 @@ +987c49e15f81afe6c0957a5abf431c96a8585d44b3356174dd77852d44bf1b86 diff --git a/model/earth-revolution/src/obj/Release/net8.0/EarthRevolutionModel.csproj.FileListAbsolute.txt b/model/earth-revolution/src/obj/Release/net8.0/EarthRevolutionModel.csproj.FileListAbsolute.txt new file mode 100644 index 0000000..5bb8b2a --- /dev/null +++ b/model/earth-revolution/src/obj/Release/net8.0/EarthRevolutionModel.csproj.FileListAbsolute.txt @@ -0,0 +1,13 @@ +/Users/morris/Downloads/GC#/model/earth-revolution/src/bin/Release/net8.0/EarthRevolutionModel.deps.json +/Users/morris/Downloads/GC#/model/earth-revolution/src/bin/Release/net8.0/EarthRevolutionModel.dll +/Users/morris/Downloads/GC#/model/earth-revolution/src/bin/Release/net8.0/EarthRevolutionModel.pdb +/Users/morris/Downloads/GC#/model/earth-revolution/src/obj/Release/net8.0/EarthRevolutionModel.csproj.AssemblyReference.cache +/Users/morris/Downloads/GC#/model/earth-revolution/src/obj/Release/net8.0/Avalonia/Resources.Inputs.cache +/Users/morris/Downloads/GC#/model/earth-revolution/src/obj/Release/net8.0/EarthRevolutionModel.GeneratedMSBuildEditorConfig.editorconfig +/Users/morris/Downloads/GC#/model/earth-revolution/src/obj/Release/net8.0/EarthRevolutionModel.AssemblyInfoInputs.cache +/Users/morris/Downloads/GC#/model/earth-revolution/src/obj/Release/net8.0/EarthRevolutionModel.AssemblyInfo.cs +/Users/morris/Downloads/GC#/model/earth-revolution/src/obj/Release/net8.0/EarthRevolutionModel.csproj.CoreCompileInputs.cache +/Users/morris/Downloads/GC#/model/earth-revolution/src/obj/Release/net8.0/EarthRevolutionModel.dll +/Users/morris/Downloads/GC#/model/earth-revolution/src/obj/Release/net8.0/refint/EarthRevolutionModel.dll +/Users/morris/Downloads/GC#/model/earth-revolution/src/obj/Release/net8.0/EarthRevolutionModel.pdb +/Users/morris/Downloads/GC#/model/earth-revolution/src/obj/Release/net8.0/ref/EarthRevolutionModel.dll diff --git a/model/earth-revolution/src/obj/Release/net8.0/EarthRevolutionModel.dll b/model/earth-revolution/src/obj/Release/net8.0/EarthRevolutionModel.dll new file mode 100644 index 0000000..3c0d4e2 Binary files /dev/null and b/model/earth-revolution/src/obj/Release/net8.0/EarthRevolutionModel.dll differ diff --git a/model/earth-revolution/src/obj/Release/net8.0/EarthRevolutionModel.pdb b/model/earth-revolution/src/obj/Release/net8.0/EarthRevolutionModel.pdb new file mode 100644 index 0000000..aeb45a6 Binary files /dev/null and b/model/earth-revolution/src/obj/Release/net8.0/EarthRevolutionModel.pdb differ diff --git a/model/earth-revolution/src/obj/Release/net8.0/ref/EarthRevolutionModel.dll b/model/earth-revolution/src/obj/Release/net8.0/ref/EarthRevolutionModel.dll new file mode 100644 index 0000000..ed51dc6 Binary files /dev/null and b/model/earth-revolution/src/obj/Release/net8.0/ref/EarthRevolutionModel.dll differ diff --git a/model/earth-revolution/src/obj/Release/net8.0/refint/EarthRevolutionModel.dll b/model/earth-revolution/src/obj/Release/net8.0/refint/EarthRevolutionModel.dll new file mode 100644 index 0000000..ed51dc6 Binary files /dev/null and b/model/earth-revolution/src/obj/Release/net8.0/refint/EarthRevolutionModel.dll differ diff --git a/model/earth-revolution/src/obj/project.assets.json b/model/earth-revolution/src/obj/project.assets.json index 47913d7..c88bbeb 100644 --- a/model/earth-revolution/src/obj/project.assets.json +++ b/model/earth-revolution/src/obj/project.assets.json @@ -112,7 +112,7 @@ "lib/net5.0/MicroCom.Runtime.dll": {} } }, - "EarthModelStudio.ModelSdk/1.0.3": { + "EarthModelStudio.ModelSdk/1.0.4": { "type": "project", "framework": ".NETCoreApp,Version=v8.0", "dependencies": { @@ -347,7 +347,7 @@ "microcom.runtime.nuspec" ] }, - "EarthModelStudio.ModelSdk/1.0.3": { + "EarthModelStudio.ModelSdk/1.0.4": { "type": "project", "path": "../../_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj", "msbuildProject": "../../_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj" @@ -356,14 +356,14 @@ "projectFileDependencyGroups": { "net8.0": [ "Avalonia >= 11.3.9", - "EarthModelStudio.ModelSdk >= 1.0.3" + "EarthModelStudio.ModelSdk >= 1.0.4" ] }, "packageFolders": { "/Users/morris/.nuget/packages/": {} }, "project": { - "version": "1.0.3", + "version": "1.0.4", "restore": { "projectUniqueName": "/Users/morris/Downloads/GC#/model/earth-revolution/src/EarthRevolutionModel.csproj", "projectName": "EarthRevolutionModel", diff --git a/model/earth-revolution/src/obj/project.nuget.cache b/model/earth-revolution/src/obj/project.nuget.cache index bdc5dc6..90b622b 100644 --- a/model/earth-revolution/src/obj/project.nuget.cache +++ b/model/earth-revolution/src/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "RXt4P+mp/5Q=", + "dgSpecHash": "9Wh3BIdHFE0=", "success": true, "projectFilePath": "/Users/morris/Downloads/GC#/model/earth-revolution/src/EarthRevolutionModel.csproj", "expectedPackageFiles": [ diff --git a/model/earth-rotation/earth-rotation.json b/model/earth-rotation/earth-rotation.json index adae70b..ecaf5f1 100644 --- a/model/earth-rotation/earth-rotation.json +++ b/model/earth-rotation/earth-rotation.json @@ -23,7 +23,7 @@ "type": "NeoRF.EarthModels.RotationModelFactory", "preview": "preview.png", "apiVersion": 1, - "version": "1.0", - "updatedAt": "2026-11-08T09:22:29Z", - "build": "0bd5b4507c" + "version": "1.1", + "updatedAt": "2026-11-08T10:13:50Z", + "build": "895e07bcd4" } diff --git a/model/earth-rotation/earth-rotation.model/EarthRotationModel.dll b/model/earth-rotation/earth-rotation.model/EarthRotationModel.dll index e3a6086..b97c59a 100644 Binary files a/model/earth-rotation/earth-rotation.model/EarthRotationModel.dll and b/model/earth-rotation/earth-rotation.model/EarthRotationModel.dll differ diff --git a/model/earth-rotation/src/bin/Debug/net8.0/EarthRotationModel.deps.json b/model/earth-rotation/src/bin/Debug/net8.0/EarthRotationModel.deps.json index 8b0a7e5..da02d58 100644 --- a/model/earth-rotation/src/bin/Debug/net8.0/EarthRotationModel.deps.json +++ b/model/earth-rotation/src/bin/Debug/net8.0/EarthRotationModel.deps.json @@ -6,7 +6,7 @@ "compilationOptions": {}, "targets": { ".NETCoreApp,Version=v8.0": { - "EarthRotationModel/1.0.3": { + "EarthRotationModel/1.0.4": { "dependencies": { "Avalonia": "11.3.9" }, @@ -85,7 +85,7 @@ } }, "libraries": { - "EarthRotationModel/1.0.3": { + "EarthRotationModel/1.0.4": { "type": "project", "serviceable": false, "sha512": "" diff --git a/model/earth-rotation/src/bin/Debug/net8.0/EarthRotationModel.dll b/model/earth-rotation/src/bin/Debug/net8.0/EarthRotationModel.dll index 733e0a5..beeb1e1 100644 Binary files a/model/earth-rotation/src/bin/Debug/net8.0/EarthRotationModel.dll and b/model/earth-rotation/src/bin/Debug/net8.0/EarthRotationModel.dll differ diff --git a/model/earth-rotation/src/bin/Debug/net8.0/EarthRotationModel.pdb b/model/earth-rotation/src/bin/Debug/net8.0/EarthRotationModel.pdb index 93b7eff..699216b 100644 Binary files a/model/earth-rotation/src/bin/Debug/net8.0/EarthRotationModel.pdb and b/model/earth-rotation/src/bin/Debug/net8.0/EarthRotationModel.pdb differ diff --git a/model/earth-rotation/src/bin/Release/net8.0/EarthRotationModel.deps.json b/model/earth-rotation/src/bin/Release/net8.0/EarthRotationModel.deps.json new file mode 100644 index 0000000..8b0a7e5 --- /dev/null +++ b/model/earth-rotation/src/bin/Release/net8.0/EarthRotationModel.deps.json @@ -0,0 +1,115 @@ +{ + "runtimeTarget": { + "name": ".NETCoreApp,Version=v8.0", + "signature": "" + }, + "compilationOptions": {}, + "targets": { + ".NETCoreApp,Version=v8.0": { + "EarthRotationModel/1.0.3": { + "dependencies": { + "Avalonia": "11.3.9" + }, + "runtime": { + "EarthRotationModel.dll": {} + } + }, + "Avalonia/11.3.9": { + "dependencies": { + "Avalonia.Remote.Protocol": "11.3.9", + "MicroCom.Runtime": "0.11.0" + }, + "runtime": { + "lib/net8.0/Avalonia.Base.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Controls.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.DesignerSupport.dll": { + "assemblyVersion": "0.7.0.0", + "fileVersion": "0.7.0.0" + }, + "lib/net8.0/Avalonia.Dialogs.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Markup.Xaml.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Markup.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Metal.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.MicroCom.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.OpenGL.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.Vulkan.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + }, + "lib/net8.0/Avalonia.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + } + } + }, + "Avalonia.Remote.Protocol/11.3.9": { + "runtime": { + "lib/net8.0/Avalonia.Remote.Protocol.dll": { + "assemblyVersion": "11.3.9.0", + "fileVersion": "11.3.9.0" + } + } + }, + "MicroCom.Runtime/0.11.0": { + "runtime": { + "lib/net5.0/MicroCom.Runtime.dll": { + "assemblyVersion": "0.11.0.0", + "fileVersion": "0.11.0.0" + } + } + } + } + }, + "libraries": { + "EarthRotationModel/1.0.3": { + "type": "project", + "serviceable": false, + "sha512": "" + }, + "Avalonia/11.3.9": { + "type": "package", + "serviceable": true, + "sha512": "sha512-YfaTrUxcmVTsGOw2YqdZyunHqZArK16m1pYfNIBvyvAgX89Pzd3A1PgoMkf64u7scL23IN6HkfqhZeFcbYWLoA==", + "path": "avalonia/11.3.9", + "hashPath": "avalonia.11.3.9.nupkg.sha512" + }, + "Avalonia.Remote.Protocol/11.3.9": { + "type": "package", + "serviceable": true, + "sha512": "sha512-2XVLTSNa+Nvwu4D8NqqdudhllTaCRA9ZKlLZZvYLZeuLlzg7OcAV+df/biHQc6AqOv7iMFR9K5Zt3wG0EF4KfQ==", + "path": "avalonia.remote.protocol/11.3.9", + "hashPath": "avalonia.remote.protocol.11.3.9.nupkg.sha512" + }, + "MicroCom.Runtime/0.11.0": { + "type": "package", + "serviceable": true, + "sha512": "sha512-MEnrZ3UIiH40hjzMDsxrTyi8dtqB5ziv3iBeeU4bXsL/7NLSal9F1lZKpK+tfBRnUoDSdtcW3KufE4yhATOMCA==", + "path": "microcom.runtime/0.11.0", + "hashPath": "microcom.runtime.0.11.0.nupkg.sha512" + } + } +} \ No newline at end of file diff --git a/model/earth-rotation/src/bin/Release/net8.0/EarthRotationModel.dll b/model/earth-rotation/src/bin/Release/net8.0/EarthRotationModel.dll new file mode 100644 index 0000000..b97c59a Binary files /dev/null and b/model/earth-rotation/src/bin/Release/net8.0/EarthRotationModel.dll differ diff --git a/model/earth-rotation/src/bin/Release/net8.0/EarthRotationModel.pdb b/model/earth-rotation/src/bin/Release/net8.0/EarthRotationModel.pdb new file mode 100644 index 0000000..01526ab Binary files /dev/null and b/model/earth-rotation/src/bin/Release/net8.0/EarthRotationModel.pdb differ diff --git a/model/earth-rotation/src/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache b/model/earth-rotation/src/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache index 59628ff..2c6e493 100644 --- a/model/earth-rotation/src/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache +++ b/model/earth-rotation/src/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache @@ -1 +1 @@ -d3edfd2d27ad53cecc2233c3c00fc7c5105ef31f11edecbb0d3f09f0877ea283 +53167376ca320a2883b3ea70457ba5caa49ab452af81a313044551fea9319e36 diff --git a/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.AssemblyInfo.cs b/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.AssemblyInfo.cs index abbcd11..936ad82 100644 --- a/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.AssemblyInfo.cs +++ b/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.AssemblyInfo.cs @@ -12,11 +12,11 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("NeoRF")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] -[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.3.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.3")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.4.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.4+5e0b46b3f3cd9800af177571c7809a7cdc8e9249")] [assembly: System.Reflection.AssemblyProductAttribute("Earth Model Studio")] [assembly: System.Reflection.AssemblyTitleAttribute("EarthRotationModel")] -[assembly: System.Reflection.AssemblyVersionAttribute("1.0.3.0")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.4.0")] [assembly: System.Resources.NeutralResourcesLanguageAttribute("zh-Hans")] // Generated by the MSBuild WriteCodeFragment class. diff --git a/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.AssemblyInfoInputs.cache b/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.AssemblyInfoInputs.cache index 8cd403a..071e096 100644 --- a/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.AssemblyInfoInputs.cache +++ b/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.AssemblyInfoInputs.cache @@ -1 +1 @@ -a85e572672b7e11cce087994ec2bf9f2c6c35d08caa8f597de7648b4deccfeac +b8fdd6a6e938df55efeab3c29833aaab8d3a51dc159413db94c59f1163b37876 diff --git a/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.csproj.AssemblyReference.cache b/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.csproj.AssemblyReference.cache index 48f2eaa..f80fa28 100644 Binary files a/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.csproj.AssemblyReference.cache and b/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.csproj.AssemblyReference.cache differ diff --git a/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.dll b/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.dll index 733e0a5..beeb1e1 100644 Binary files a/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.dll and b/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.dll differ diff --git a/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.pdb b/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.pdb index 93b7eff..699216b 100644 Binary files a/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.pdb and b/model/earth-rotation/src/obj/Debug/net8.0/EarthRotationModel.pdb differ diff --git a/model/earth-rotation/src/obj/Debug/net8.0/ref/EarthRotationModel.dll b/model/earth-rotation/src/obj/Debug/net8.0/ref/EarthRotationModel.dll index 2998d6f..cade3b5 100644 Binary files a/model/earth-rotation/src/obj/Debug/net8.0/ref/EarthRotationModel.dll and b/model/earth-rotation/src/obj/Debug/net8.0/ref/EarthRotationModel.dll differ diff --git a/model/earth-rotation/src/obj/Debug/net8.0/refint/EarthRotationModel.dll b/model/earth-rotation/src/obj/Debug/net8.0/refint/EarthRotationModel.dll index 2998d6f..cade3b5 100644 Binary files a/model/earth-rotation/src/obj/Debug/net8.0/refint/EarthRotationModel.dll and b/model/earth-rotation/src/obj/Debug/net8.0/refint/EarthRotationModel.dll differ diff --git a/model/earth-rotation/src/obj/EarthRotationModel.csproj.nuget.dgspec.json b/model/earth-rotation/src/obj/EarthRotationModel.csproj.nuget.dgspec.json index 5bdb538..8b20832 100644 --- a/model/earth-rotation/src/obj/EarthRotationModel.csproj.nuget.dgspec.json +++ b/model/earth-rotation/src/obj/EarthRotationModel.csproj.nuget.dgspec.json @@ -5,7 +5,7 @@ }, "projects": { "/Users/morris/Downloads/GC#/model/earth-rotation/src/EarthRotationModel.csproj": { - "version": "1.0.3", + "version": "1.0.4", "restore": { "projectUniqueName": "/Users/morris/Downloads/GC#/model/earth-rotation/src/EarthRotationModel.csproj", "projectName": "EarthRotationModel", @@ -76,7 +76,7 @@ } }, "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj": { - "version": "1.0.3", + "version": "1.0.4", "restore": { "projectUniqueName": "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj", "projectName": "EarthModelStudio.ModelSdk", diff --git a/model/earth-rotation/src/obj/Release/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs b/model/earth-rotation/src/obj/Release/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs new file mode 100644 index 0000000..2217181 --- /dev/null +++ b/model/earth-rotation/src/obj/Release/net8.0/.NETCoreApp,Version=v8.0.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v8.0", FrameworkDisplayName = ".NET 8.0")] diff --git a/model/earth-rotation/src/obj/Release/net8.0/Avalonia/Resources.Inputs.cache b/model/earth-rotation/src/obj/Release/net8.0/Avalonia/Resources.Inputs.cache new file mode 100644 index 0000000..59628ff --- /dev/null +++ b/model/earth-rotation/src/obj/Release/net8.0/Avalonia/Resources.Inputs.cache @@ -0,0 +1 @@ +d3edfd2d27ad53cecc2233c3c00fc7c5105ef31f11edecbb0d3f09f0877ea283 diff --git a/model/earth-rotation/src/obj/Release/net8.0/EarthRotationModel.AssemblyInfo.cs b/model/earth-rotation/src/obj/Release/net8.0/EarthRotationModel.AssemblyInfo.cs new file mode 100644 index 0000000..6687599 --- /dev/null +++ b/model/earth-rotation/src/obj/Release/net8.0/EarthRotationModel.AssemblyInfo.cs @@ -0,0 +1,23 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("NeoRF")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.3.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.3+5e0b46b3f3cd9800af177571c7809a7cdc8e9249")] +[assembly: System.Reflection.AssemblyProductAttribute("Earth Model Studio")] +[assembly: System.Reflection.AssemblyTitleAttribute("EarthRotationModel")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.3.0")] +[assembly: System.Resources.NeutralResourcesLanguageAttribute("zh-Hans")] + +// Generated by the MSBuild WriteCodeFragment class. + diff --git a/model/earth-rotation/src/obj/Release/net8.0/EarthRotationModel.AssemblyInfoInputs.cache b/model/earth-rotation/src/obj/Release/net8.0/EarthRotationModel.AssemblyInfoInputs.cache new file mode 100644 index 0000000..50cb31a --- /dev/null +++ b/model/earth-rotation/src/obj/Release/net8.0/EarthRotationModel.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +61540155afd949b0993d501d78ad509ba0984e3b3ea1e2e0bf89605f760f5746 diff --git a/model/earth-rotation/src/obj/Release/net8.0/EarthRotationModel.GeneratedMSBuildEditorConfig.editorconfig b/model/earth-rotation/src/obj/Release/net8.0/EarthRotationModel.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 0000000..ca1d663 --- /dev/null +++ b/model/earth-rotation/src/obj/Release/net8.0/EarthRotationModel.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,25 @@ +is_global = true +build_property.AvaloniaNameGeneratorIsEnabled = true +build_property.AvaloniaNameGeneratorBehavior = InitializeComponent +build_property.AvaloniaNameGeneratorDefaultFieldModifier = internal +build_property.AvaloniaNameGeneratorFilterByPath = * +build_property.AvaloniaNameGeneratorFilterByNamespace = * +build_property.AvaloniaNameGeneratorViewFileNamingStrategy = NamespaceAndClassName +build_property.AvaloniaNameGeneratorAttachDevTools = true +build_property.TargetFramework = net8.0 +build_property.TargetFrameworkIdentifier = .NETCoreApp +build_property.TargetFrameworkVersion = v8.0 +build_property.TargetPlatformMinVersion = +build_property.UsingMicrosoftNETSdkWeb = +build_property.ProjectTypeGuids = +build_property.InvariantGlobalization = +build_property.PlatformNeutralAssembly = +build_property.EnforceExtendedAnalyzerRules = +build_property.EntryPointFilePath = +build_property._SupportedPlatformList = Linux,macOS,Windows +build_property.RootNamespace = NeoRF.EarthModels +build_property.ProjectDir = /Users/morris/Downloads/GC#/model/earth-rotation/src/ +build_property.EnableComHosting = +build_property.EnableGeneratedComInterfaceComImportInterop = +build_property.EffectiveAnalysisLevelStyle = 8.0 +build_property.EnableCodeStyleSeverity = diff --git a/model/earth-rotation/src/obj/Release/net8.0/EarthRotationModel.assets.cache b/model/earth-rotation/src/obj/Release/net8.0/EarthRotationModel.assets.cache new file mode 100644 index 0000000..c1a96e0 Binary files /dev/null and b/model/earth-rotation/src/obj/Release/net8.0/EarthRotationModel.assets.cache differ diff --git a/model/earth-rotation/src/obj/Release/net8.0/EarthRotationModel.csproj.AssemblyReference.cache b/model/earth-rotation/src/obj/Release/net8.0/EarthRotationModel.csproj.AssemblyReference.cache new file mode 100644 index 0000000..fd28939 Binary files /dev/null and b/model/earth-rotation/src/obj/Release/net8.0/EarthRotationModel.csproj.AssemblyReference.cache differ diff --git a/model/earth-rotation/src/obj/Release/net8.0/EarthRotationModel.csproj.CoreCompileInputs.cache b/model/earth-rotation/src/obj/Release/net8.0/EarthRotationModel.csproj.CoreCompileInputs.cache new file mode 100644 index 0000000..a01552b --- /dev/null +++ b/model/earth-rotation/src/obj/Release/net8.0/EarthRotationModel.csproj.CoreCompileInputs.cache @@ -0,0 +1 @@ +7b6e65ff9026f070d5416e9d3c2ed05b838ed0404e2df6676d794e2607f19723 diff --git a/model/earth-rotation/src/obj/Release/net8.0/EarthRotationModel.csproj.FileListAbsolute.txt b/model/earth-rotation/src/obj/Release/net8.0/EarthRotationModel.csproj.FileListAbsolute.txt new file mode 100644 index 0000000..4a976a8 --- /dev/null +++ b/model/earth-rotation/src/obj/Release/net8.0/EarthRotationModel.csproj.FileListAbsolute.txt @@ -0,0 +1,13 @@ +/Users/morris/Downloads/GC#/model/earth-rotation/src/bin/Release/net8.0/EarthRotationModel.deps.json +/Users/morris/Downloads/GC#/model/earth-rotation/src/bin/Release/net8.0/EarthRotationModel.dll +/Users/morris/Downloads/GC#/model/earth-rotation/src/bin/Release/net8.0/EarthRotationModel.pdb +/Users/morris/Downloads/GC#/model/earth-rotation/src/obj/Release/net8.0/EarthRotationModel.csproj.AssemblyReference.cache +/Users/morris/Downloads/GC#/model/earth-rotation/src/obj/Release/net8.0/Avalonia/Resources.Inputs.cache +/Users/morris/Downloads/GC#/model/earth-rotation/src/obj/Release/net8.0/EarthRotationModel.GeneratedMSBuildEditorConfig.editorconfig +/Users/morris/Downloads/GC#/model/earth-rotation/src/obj/Release/net8.0/EarthRotationModel.AssemblyInfoInputs.cache +/Users/morris/Downloads/GC#/model/earth-rotation/src/obj/Release/net8.0/EarthRotationModel.AssemblyInfo.cs +/Users/morris/Downloads/GC#/model/earth-rotation/src/obj/Release/net8.0/EarthRotationModel.csproj.CoreCompileInputs.cache +/Users/morris/Downloads/GC#/model/earth-rotation/src/obj/Release/net8.0/EarthRotationModel.dll +/Users/morris/Downloads/GC#/model/earth-rotation/src/obj/Release/net8.0/refint/EarthRotationModel.dll +/Users/morris/Downloads/GC#/model/earth-rotation/src/obj/Release/net8.0/EarthRotationModel.pdb +/Users/morris/Downloads/GC#/model/earth-rotation/src/obj/Release/net8.0/ref/EarthRotationModel.dll diff --git a/model/earth-rotation/src/obj/Release/net8.0/EarthRotationModel.dll b/model/earth-rotation/src/obj/Release/net8.0/EarthRotationModel.dll new file mode 100644 index 0000000..b97c59a Binary files /dev/null and b/model/earth-rotation/src/obj/Release/net8.0/EarthRotationModel.dll differ diff --git a/model/earth-rotation/src/obj/Release/net8.0/EarthRotationModel.pdb b/model/earth-rotation/src/obj/Release/net8.0/EarthRotationModel.pdb new file mode 100644 index 0000000..01526ab Binary files /dev/null and b/model/earth-rotation/src/obj/Release/net8.0/EarthRotationModel.pdb differ diff --git a/model/earth-rotation/src/obj/Release/net8.0/ref/EarthRotationModel.dll b/model/earth-rotation/src/obj/Release/net8.0/ref/EarthRotationModel.dll new file mode 100644 index 0000000..7761778 Binary files /dev/null and b/model/earth-rotation/src/obj/Release/net8.0/ref/EarthRotationModel.dll differ diff --git a/model/earth-rotation/src/obj/Release/net8.0/refint/EarthRotationModel.dll b/model/earth-rotation/src/obj/Release/net8.0/refint/EarthRotationModel.dll new file mode 100644 index 0000000..7761778 Binary files /dev/null and b/model/earth-rotation/src/obj/Release/net8.0/refint/EarthRotationModel.dll differ diff --git a/model/earth-rotation/src/obj/project.assets.json b/model/earth-rotation/src/obj/project.assets.json index b33fbb4..9acb460 100644 --- a/model/earth-rotation/src/obj/project.assets.json +++ b/model/earth-rotation/src/obj/project.assets.json @@ -112,7 +112,7 @@ "lib/net5.0/MicroCom.Runtime.dll": {} } }, - "EarthModelStudio.ModelSdk/1.0.3": { + "EarthModelStudio.ModelSdk/1.0.4": { "type": "project", "framework": ".NETCoreApp,Version=v8.0", "dependencies": { @@ -347,7 +347,7 @@ "microcom.runtime.nuspec" ] }, - "EarthModelStudio.ModelSdk/1.0.3": { + "EarthModelStudio.ModelSdk/1.0.4": { "type": "project", "path": "../../_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj", "msbuildProject": "../../_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj" @@ -356,14 +356,14 @@ "projectFileDependencyGroups": { "net8.0": [ "Avalonia >= 11.3.9", - "EarthModelStudio.ModelSdk >= 1.0.3" + "EarthModelStudio.ModelSdk >= 1.0.4" ] }, "packageFolders": { "/Users/morris/.nuget/packages/": {} }, "project": { - "version": "1.0.3", + "version": "1.0.4", "restore": { "projectUniqueName": "/Users/morris/Downloads/GC#/model/earth-rotation/src/EarthRotationModel.csproj", "projectName": "EarthRotationModel", diff --git a/model/earth-rotation/src/obj/project.nuget.cache b/model/earth-rotation/src/obj/project.nuget.cache index 9d5f739..7cbdbb4 100644 --- a/model/earth-rotation/src/obj/project.nuget.cache +++ b/model/earth-rotation/src/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "qWCssTziIvU=", + "dgSpecHash": "aSznX+JZ4eM=", "success": true, "projectFilePath": "/Users/morris/Downloads/GC#/model/earth-rotation/src/EarthRotationModel.csproj", "expectedPackageFiles": [ diff --git a/model/version.json b/model/version.json index 04d80ad..b9bfdb2 100644 --- a/model/version.json +++ b/model/version.json @@ -1,52 +1,52 @@ { "schema": 1, - "generated": "2026-11-08T09:22:29Z", + "generated": "2026-11-08T10:13:50Z", "repository": "https://gitcode.com/2509_92447106/GC", "branch": "main", "modelDir": "model", "launcher": { - "version": "1.0.3", - "revision": "a75fbf4d57", + "version": "1.0.4", + "revision": "6283c8482f", "packages": { "win-x64": { "path": "dist/GC-win-x64.zip", - "url": "https://gitcode.com/2509_92447106/GC/releases/download/v1.0.3/GC-win-x64.zip" + "url": "https://gitcode.com/2509_92447106/GC/releases/download/v1.0.4/GC-win-x64.zip" }, "win-arm64": { "path": "dist/GC-win-arm64.zip", - "url": "https://gitcode.com/2509_92447106/GC/releases/download/v1.0.3/GC-win-arm64.zip" + "url": "https://gitcode.com/2509_92447106/GC/releases/download/v1.0.4/GC-win-arm64.zip" }, "osx-arm64": { "path": "dist/GC-osx-arm64.zip", - "url": "https://gitcode.com/2509_92447106/GC/releases/download/v1.0.3/GC-osx-arm64.zip" + "url": "https://gitcode.com/2509_92447106/GC/releases/download/v1.0.4/GC-osx-arm64.zip" }, "osx-x64": { "path": "dist/GC-osx-x64.zip", - "url": "https://gitcode.com/2509_92447106/GC/releases/download/v1.0.3/GC-osx-x64.zip" + "url": "https://gitcode.com/2509_92447106/GC/releases/download/v1.0.4/GC-osx-x64.zip" }, "linux-x64": { "path": "dist/GC-linux-x64.zip", - "url": "https://gitcode.com/2509_92447106/GC/releases/download/v1.0.3/GC-linux-x64.zip" + "url": "https://gitcode.com/2509_92447106/GC/releases/download/v1.0.4/GC-linux-x64.zip" } } }, "models": [ { "id": "earth-geography", - "version": "1.0", - "build": "883fdf6c57", + "version": "1.1", + "build": "1f9f80727b", "dir": "model/earth-geography" }, { "id": "earth-revolution", - "version": "1.0", - "build": "a24be3664d", + "version": "1.1", + "build": "455cb9e7c1", "dir": "model/earth-revolution" }, { "id": "earth-rotation", - "version": "1.0", - "build": "0bd5b4507c", + "version": "1.1", + "build": "895e07bcd4", "dir": "model/earth-rotation" } ] diff --git a/src/main/dotnet/EarthModelStudio/App.axaml.cs b/src/main/dotnet/EarthModelStudio/App.axaml.cs index 94f3367..5aaa32d 100644 --- a/src/main/dotnet/EarthModelStudio/App.axaml.cs +++ b/src/main/dotnet/EarthModelStudio/App.axaml.cs @@ -51,6 +51,15 @@ public partial class App : Application return await dialog.ShowDialog(window); }; + // 应用图标:窗口标题栏与任务栏也使用同一图标 + try + { + using var iconStream = Avalonia.Platform.AssetLoader.Open( + new Uri("avares://EarthModelStudio/Assets/icon.png")); + window.Icon = new Avalonia.Controls.WindowIcon(iconStream); + } + catch { /* 图标缺失不影响启动 */ } + desktop.MainWindow = window; desktop.ShutdownMode = ShutdownMode.OnMainWindowClose; diff --git a/src/main/dotnet/EarthModelStudio/Assets/icon-1024.png b/src/main/dotnet/EarthModelStudio/Assets/icon-1024.png new file mode 100644 index 0000000..2b347c2 Binary files /dev/null and b/src/main/dotnet/EarthModelStudio/Assets/icon-1024.png differ diff --git a/src/main/dotnet/EarthModelStudio/Assets/icon-128.png b/src/main/dotnet/EarthModelStudio/Assets/icon-128.png new file mode 100644 index 0000000..4b24f8e Binary files /dev/null and b/src/main/dotnet/EarthModelStudio/Assets/icon-128.png differ diff --git a/src/main/dotnet/EarthModelStudio/Assets/icon-256.png b/src/main/dotnet/EarthModelStudio/Assets/icon-256.png new file mode 100644 index 0000000..4f9fbfd Binary files /dev/null and b/src/main/dotnet/EarthModelStudio/Assets/icon-256.png differ diff --git a/src/main/dotnet/EarthModelStudio/Assets/icon-32.png b/src/main/dotnet/EarthModelStudio/Assets/icon-32.png new file mode 100644 index 0000000..59a421b Binary files /dev/null and b/src/main/dotnet/EarthModelStudio/Assets/icon-32.png differ diff --git a/src/main/dotnet/EarthModelStudio/Assets/icon-512.png b/src/main/dotnet/EarthModelStudio/Assets/icon-512.png new file mode 100644 index 0000000..9f43917 Binary files /dev/null and b/src/main/dotnet/EarthModelStudio/Assets/icon-512.png differ diff --git a/src/main/dotnet/EarthModelStudio/Assets/icon-64.png b/src/main/dotnet/EarthModelStudio/Assets/icon-64.png new file mode 100644 index 0000000..56b59cc Binary files /dev/null and b/src/main/dotnet/EarthModelStudio/Assets/icon-64.png differ diff --git a/src/main/dotnet/EarthModelStudio/Assets/icon.ico b/src/main/dotnet/EarthModelStudio/Assets/icon.ico new file mode 100644 index 0000000..b5b2c81 Binary files /dev/null and b/src/main/dotnet/EarthModelStudio/Assets/icon.ico differ diff --git a/src/main/dotnet/EarthModelStudio/Assets/icon.png b/src/main/dotnet/EarthModelStudio/Assets/icon.png new file mode 100644 index 0000000..4f9fbfd Binary files /dev/null and b/src/main/dotnet/EarthModelStudio/Assets/icon.png differ diff --git a/src/main/dotnet/EarthModelStudio/EarthModelStudio.csproj b/src/main/dotnet/EarthModelStudio/EarthModelStudio.csproj index 84df85d..f1a6f47 100644 --- a/src/main/dotnet/EarthModelStudio/EarthModelStudio.csproj +++ b/src/main/dotnet/EarthModelStudio/EarthModelStudio.csproj @@ -7,6 +7,8 @@ EarthModelStudio EarthModelStudio app.manifest + + Assets\icon.ico false true false diff --git a/src/main/dotnet/EarthModelStudio/Services/ModelSourceClient.cs b/src/main/dotnet/EarthModelStudio/Services/ModelSourceClient.cs index 057f28a..1290ad9 100644 --- a/src/main/dotnet/EarthModelStudio/Services/ModelSourceClient.cs +++ b/src/main/dotnet/EarthModelStudio/Services/ModelSourceClient.cs @@ -215,11 +215,64 @@ public sealed class ModelSourceClient } } - var args = new List { "clone", "--depth", "1" }; - if (!string.IsNullOrWhiteSpace(branch)) { args.Add("--branch"); args.Add(branch!); } - args.Add(url); - args.Add(cacheDir); + // 只拉取 model/ 目录:整仓 clone 会把 .git / src / dist 一起拖下来 + // (实测 700MB+),既慢又容易超时,表现就是「读不到模型源」。 + // 先浅克隆到临时目录,再用 sparse-checkout 只检出 model/。 + var tmpDir = cacheDir + ".tmp"; + try + { + if (Directory.Exists(tmpDir)) Directory.Delete(tmpDir, true); + // 1) 初始化 + 加远程(比 clone 更快,避免先拉全量) + var initArgs = new List { "init", "--quiet", tmpDir }; + if (!await RunGitAsync(initArgs, ct)) return false; + + var remoteArgs = new List { "-C", tmpDir, "remote", "add", "origin", url }; + if (!await RunGitAsync(remoteArgs, ct)) return false; + + // 2) 只允许 model 目录参与检出 + await RunGitAsync(new List { "-C", tmpDir, "config", "core.sparseCheckout", "true" }, ct); + var sparseFile = Path.Combine(tmpDir, ".git", "info", "sparse-checkout"); + Directory.CreateDirectory(Path.GetDirectoryName(sparseFile)!); + File.WriteAllText(sparseFile, "model/\n"); + + // 3) 浅拉指定分支 + var branchName = string.IsNullOrWhiteSpace(branch) ? "main" : branch!; + var fetchArgs = new List + { + "-C", tmpDir, "fetch", "--depth", "1", "--filter=blob:none", "origin", branchName + }; + if (!await RunGitAsync(fetchArgs, ct)) return false; + + await RunGitAsync(new List { "-C", tmpDir, "checkout", "FETCH_HEAD" }, ct); + + // 4) 把 model/ 移到缓存根,与原有目录结构一致 + var modelDir = Path.Combine(tmpDir, "model"); + if (!Directory.Exists(modelDir)) + { + Console.Error.WriteLine("git sparse-checkout 后未找到 model/ 目录"); + return false; + } + + if (Directory.Exists(cacheDir)) Directory.Delete(cacheDir, true); + Directory.CreateDirectory(cacheDir); + Directory.Move(modelDir, Path.Combine(cacheDir, "model")); + return true; + } + catch (Exception ex) + { + Console.Error.WriteLine($"git 拉取异常: {ex.Message}"); + return false; + } + finally + { + try { if (Directory.Exists(tmpDir)) Directory.Delete(tmpDir, true); } catch { } + } + } + + /// 安静地跑一条 git 命令,返回是否成功。 + private static async Task RunGitAsync(List args, CancellationToken ct) + { try { var psi = new ProcessStartInfo("git") @@ -233,19 +286,16 @@ public sealed class ModelSourceClient using var process = Process.Start(psi); if (process == null) return false; - var stderrTask = process.StandardError.ReadToEndAsync(ct); + var errTask = process.StandardError.ReadToEndAsync(ct); await process.WaitForExitAsync(ct); - var stderr = await stderrTask; + var err = await errTask; if (process.ExitCode != 0) - { - Console.Error.WriteLine($"git clone 失败: {stderr}"); - return false; - } - return Directory.Exists(Path.Combine(cacheDir, "model")) || Directory.Exists(cacheDir); + Console.Error.WriteLine($"git {string.Join(' ', args)} 失败: {err.Trim()}"); + return process.ExitCode == 0; } catch (Exception ex) { - Console.Error.WriteLine($"git clone 异常: {ex.Message}"); + Console.Error.WriteLine($"git 执行失败: {ex.Message}"); return false; } } diff --git a/src/main/dotnet/EarthModelStudio/bin/Debug/net8.0/EarthModelStudio.ModelSdk.dll b/src/main/dotnet/EarthModelStudio/bin/Debug/net8.0/EarthModelStudio.ModelSdk.dll index e2e88d0..271e170 100644 Binary files a/src/main/dotnet/EarthModelStudio/bin/Debug/net8.0/EarthModelStudio.ModelSdk.dll and b/src/main/dotnet/EarthModelStudio/bin/Debug/net8.0/EarthModelStudio.ModelSdk.dll differ diff --git a/src/main/dotnet/EarthModelStudio/bin/Debug/net8.0/EarthModelStudio.ModelSdk.pdb b/src/main/dotnet/EarthModelStudio/bin/Debug/net8.0/EarthModelStudio.ModelSdk.pdb index 297cf4d..6b2dd30 100644 Binary files a/src/main/dotnet/EarthModelStudio/bin/Debug/net8.0/EarthModelStudio.ModelSdk.pdb and b/src/main/dotnet/EarthModelStudio/bin/Debug/net8.0/EarthModelStudio.ModelSdk.pdb differ diff --git a/src/main/dotnet/EarthModelStudio/bin/Debug/net8.0/EarthModelStudio.deps.json b/src/main/dotnet/EarthModelStudio/bin/Debug/net8.0/EarthModelStudio.deps.json index c88ea4b..6b443de 100644 --- a/src/main/dotnet/EarthModelStudio/bin/Debug/net8.0/EarthModelStudio.deps.json +++ b/src/main/dotnet/EarthModelStudio/bin/Debug/net8.0/EarthModelStudio.deps.json @@ -6,13 +6,13 @@ "compilationOptions": {}, "targets": { ".NETCoreApp,Version=v8.0": { - "EarthModelStudio/1.0.3": { + "EarthModelStudio/1.0.4": { "dependencies": { "Avalonia": "11.3.9", "Avalonia.Desktop": "11.3.9", "Avalonia.Themes.Fluent": "11.3.9", "CommunityToolkit.Mvvm": "8.2.2", - "EarthModelStudio.ModelSdk": "1.0.3" + "EarthModelStudio.ModelSdk": "1.0.4" }, "runtime": { "EarthModelStudio.dll": {} @@ -398,21 +398,21 @@ } } }, - "EarthModelStudio.ModelSdk/1.0.3": { + "EarthModelStudio.ModelSdk/1.0.4": { "dependencies": { "Avalonia": "11.3.9" }, "runtime": { "EarthModelStudio.ModelSdk.dll": { - "assemblyVersion": "1.0.3.0", - "fileVersion": "1.0.3.0" + "assemblyVersion": "1.0.4.0", + "fileVersion": "1.0.4.0" } } } } }, "libraries": { - "EarthModelStudio/1.0.3": { + "EarthModelStudio/1.0.4": { "type": "project", "serviceable": false, "sha512": "" @@ -571,7 +571,7 @@ "path": "tmds.dbus.protocol/0.21.2", "hashPath": "tmds.dbus.protocol.0.21.2.nupkg.sha512" }, - "EarthModelStudio.ModelSdk/1.0.3": { + "EarthModelStudio.ModelSdk/1.0.4": { "type": "project", "serviceable": false, "sha512": "" diff --git a/src/main/dotnet/EarthModelStudio/bin/Debug/net8.0/EarthModelStudio.dll b/src/main/dotnet/EarthModelStudio/bin/Debug/net8.0/EarthModelStudio.dll index a21156a..3f12d9c 100644 Binary files a/src/main/dotnet/EarthModelStudio/bin/Debug/net8.0/EarthModelStudio.dll and b/src/main/dotnet/EarthModelStudio/bin/Debug/net8.0/EarthModelStudio.dll differ diff --git a/src/main/dotnet/EarthModelStudio/bin/Debug/net8.0/EarthModelStudio.pdb b/src/main/dotnet/EarthModelStudio/bin/Debug/net8.0/EarthModelStudio.pdb index 62dd546..670a155 100644 Binary files a/src/main/dotnet/EarthModelStudio/bin/Debug/net8.0/EarthModelStudio.pdb and b/src/main/dotnet/EarthModelStudio/bin/Debug/net8.0/EarthModelStudio.pdb differ diff --git a/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/osx-arm64/EarthModelStudio.ModelSdk.dll b/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/osx-arm64/EarthModelStudio.ModelSdk.dll index 16e3399..6cd4bff 100644 Binary files a/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/osx-arm64/EarthModelStudio.ModelSdk.dll and b/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/osx-arm64/EarthModelStudio.ModelSdk.dll differ diff --git a/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/osx-arm64/EarthModelStudio.deps.json b/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/osx-arm64/EarthModelStudio.deps.json index b5d372b..9f04b4a 100644 --- a/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/osx-arm64/EarthModelStudio.deps.json +++ b/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/osx-arm64/EarthModelStudio.deps.json @@ -7,13 +7,13 @@ "targets": { ".NETCoreApp,Version=v8.0": {}, ".NETCoreApp,Version=v8.0/osx-arm64": { - "EarthModelStudio/1.0.3": { + "EarthModelStudio/1.0.4": { "dependencies": { "Avalonia": "11.3.9", "Avalonia.Desktop": "11.3.9", "Avalonia.Themes.Fluent": "11.3.9", "CommunityToolkit.Mvvm": "8.2.2", - "EarthModelStudio.ModelSdk": "1.0.3", + "EarthModelStudio.ModelSdk": "1.0.4", "runtimepack.Microsoft.NETCore.App.Runtime.osx-arm64": "8.0.31" }, "runtime": { @@ -966,21 +966,21 @@ } } }, - "EarthModelStudio.ModelSdk/1.0.3": { + "EarthModelStudio.ModelSdk/1.0.4": { "dependencies": { "Avalonia": "11.3.9" }, "runtime": { "EarthModelStudio.ModelSdk.dll": { - "assemblyVersion": "1.0.3.0", - "fileVersion": "1.0.3.0" + "assemblyVersion": "1.0.4.0", + "fileVersion": "1.0.4.0" } } } } }, "libraries": { - "EarthModelStudio/1.0.3": { + "EarthModelStudio/1.0.4": { "type": "project", "serviceable": false, "sha512": "" @@ -1109,7 +1109,7 @@ "path": "tmds.dbus.protocol/0.21.2", "hashPath": "tmds.dbus.protocol.0.21.2.nupkg.sha512" }, - "EarthModelStudio.ModelSdk/1.0.3": { + "EarthModelStudio.ModelSdk/1.0.4": { "type": "project", "serviceable": false, "sha512": "" diff --git a/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/osx-arm64/EarthModelStudio.dll b/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/osx-arm64/EarthModelStudio.dll index 4348cd4..37c6eda 100644 Binary files a/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/osx-arm64/EarthModelStudio.dll and b/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/osx-arm64/EarthModelStudio.dll differ diff --git a/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/win-arm64/EarthModelStudio.ModelSdk.dll b/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/win-arm64/EarthModelStudio.ModelSdk.dll index 16e3399..6cd4bff 100644 Binary files a/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/win-arm64/EarthModelStudio.ModelSdk.dll and b/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/win-arm64/EarthModelStudio.ModelSdk.dll differ diff --git a/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/win-arm64/EarthModelStudio.deps.json b/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/win-arm64/EarthModelStudio.deps.json index 68ee300..bcba10e 100644 --- a/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/win-arm64/EarthModelStudio.deps.json +++ b/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/win-arm64/EarthModelStudio.deps.json @@ -7,13 +7,13 @@ "targets": { ".NETCoreApp,Version=v8.0": {}, ".NETCoreApp,Version=v8.0/win-arm64": { - "EarthModelStudio/1.0.3": { + "EarthModelStudio/1.0.4": { "dependencies": { "Avalonia": "11.3.9", "Avalonia.Desktop": "11.3.9", "Avalonia.Themes.Fluent": "11.3.9", "CommunityToolkit.Mvvm": "8.2.2", - "EarthModelStudio.ModelSdk": "1.0.3", + "EarthModelStudio.ModelSdk": "1.0.4", "runtimepack.Microsoft.NETCore.App.Runtime.win-arm64": "8.0.31" }, "runtime": { @@ -969,21 +969,21 @@ } } }, - "EarthModelStudio.ModelSdk/1.0.3": { + "EarthModelStudio.ModelSdk/1.0.4": { "dependencies": { "Avalonia": "11.3.9" }, "runtime": { "EarthModelStudio.ModelSdk.dll": { - "assemblyVersion": "1.0.3.0", - "fileVersion": "1.0.3.0" + "assemblyVersion": "1.0.4.0", + "fileVersion": "1.0.4.0" } } } } }, "libraries": { - "EarthModelStudio/1.0.3": { + "EarthModelStudio/1.0.4": { "type": "project", "serviceable": false, "sha512": "" @@ -1119,7 +1119,7 @@ "path": "tmds.dbus.protocol/0.21.2", "hashPath": "tmds.dbus.protocol.0.21.2.nupkg.sha512" }, - "EarthModelStudio.ModelSdk/1.0.3": { + "EarthModelStudio.ModelSdk/1.0.4": { "type": "project", "serviceable": false, "sha512": "" diff --git a/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/win-arm64/EarthModelStudio.dll b/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/win-arm64/EarthModelStudio.dll index 4348cd4..37c6eda 100644 Binary files a/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/win-arm64/EarthModelStudio.dll and b/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/win-arm64/EarthModelStudio.dll differ diff --git a/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/win-arm64/EarthModelStudio.exe b/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/win-arm64/EarthModelStudio.exe index 98e923f..bd2327b 100755 Binary files a/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/win-arm64/EarthModelStudio.exe and b/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/win-arm64/EarthModelStudio.exe differ diff --git a/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/win-x64/EarthModelStudio.ModelSdk.dll b/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/win-x64/EarthModelStudio.ModelSdk.dll index 16e3399..6cd4bff 100644 Binary files a/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/win-x64/EarthModelStudio.ModelSdk.dll and b/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/win-x64/EarthModelStudio.ModelSdk.dll differ diff --git a/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/win-x64/EarthModelStudio.deps.json b/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/win-x64/EarthModelStudio.deps.json index 85d6422..bffa41b 100644 --- a/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/win-x64/EarthModelStudio.deps.json +++ b/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/win-x64/EarthModelStudio.deps.json @@ -7,13 +7,13 @@ "targets": { ".NETCoreApp,Version=v8.0": {}, ".NETCoreApp,Version=v8.0/win-x64": { - "EarthModelStudio/1.0.3": { + "EarthModelStudio/1.0.4": { "dependencies": { "Avalonia": "11.3.9", "Avalonia.Desktop": "11.3.9", "Avalonia.Themes.Fluent": "11.3.9", "CommunityToolkit.Mvvm": "8.2.2", - "EarthModelStudio.ModelSdk": "1.0.3", + "EarthModelStudio.ModelSdk": "1.0.4", "runtimepack.Microsoft.NETCore.App.Runtime.win-x64": "8.0.31" }, "runtime": { @@ -969,21 +969,21 @@ } } }, - "EarthModelStudio.ModelSdk/1.0.3": { + "EarthModelStudio.ModelSdk/1.0.4": { "dependencies": { "Avalonia": "11.3.9" }, "runtime": { "EarthModelStudio.ModelSdk.dll": { - "assemblyVersion": "1.0.3.0", - "fileVersion": "1.0.3.0" + "assemblyVersion": "1.0.4.0", + "fileVersion": "1.0.4.0" } } } } }, "libraries": { - "EarthModelStudio/1.0.3": { + "EarthModelStudio/1.0.4": { "type": "project", "serviceable": false, "sha512": "" @@ -1119,7 +1119,7 @@ "path": "tmds.dbus.protocol/0.21.2", "hashPath": "tmds.dbus.protocol.0.21.2.nupkg.sha512" }, - "EarthModelStudio.ModelSdk/1.0.3": { + "EarthModelStudio.ModelSdk/1.0.4": { "type": "project", "serviceable": false, "sha512": "" diff --git a/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/win-x64/EarthModelStudio.dll b/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/win-x64/EarthModelStudio.dll index b0786d3..1bb94bc 100644 Binary files a/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/win-x64/EarthModelStudio.dll and b/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/win-x64/EarthModelStudio.dll differ diff --git a/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/win-x64/EarthModelStudio.exe b/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/win-x64/EarthModelStudio.exe index 5f2b489..cfacfae 100755 Binary files a/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/win-x64/EarthModelStudio.exe and b/src/main/dotnet/EarthModelStudio/bin/Release/net8.0/win-x64/EarthModelStudio.exe differ diff --git a/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache b/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache index 8e29cfa..dcbc0c4 100644 --- a/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache +++ b/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache @@ -1 +1 @@ -d94573b416791c54a79fb7098e9d5a5d00e1443254dc1f3aecbc9b86590788ce +b5b025787ddcf020e4af544e7291049bae132a2a48645e60ce75f9c17a36c04e diff --git a/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/Avalonia/resources b/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/Avalonia/resources index 174c4e5..aec7dd6 100644 Binary files a/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/Avalonia/resources and b/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/Avalonia/resources differ diff --git a/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/EarthModelStudio.AssemblyInfo.cs b/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/EarthModelStudio.AssemblyInfo.cs index d549a27..8d8ad32 100644 --- a/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/EarthModelStudio.AssemblyInfo.cs +++ b/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/EarthModelStudio.AssemblyInfo.cs @@ -12,11 +12,11 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("NeoRF")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] -[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.3.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.3")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.4.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.4+5e0b46b3f3cd9800af177571c7809a7cdc8e9249")] [assembly: System.Reflection.AssemblyProductAttribute("Earth Model Studio")] [assembly: System.Reflection.AssemblyTitleAttribute("EarthModelStudio")] -[assembly: System.Reflection.AssemblyVersionAttribute("1.0.3.0")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.4.0")] [assembly: System.Resources.NeutralResourcesLanguageAttribute("zh-Hans")] // Generated by the MSBuild WriteCodeFragment class. diff --git a/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/EarthModelStudio.AssemblyInfoInputs.cache b/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/EarthModelStudio.AssemblyInfoInputs.cache index 9244ed4..7431ac4 100644 --- a/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/EarthModelStudio.AssemblyInfoInputs.cache +++ b/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/EarthModelStudio.AssemblyInfoInputs.cache @@ -1 +1 @@ -11e61a6a7fb4140cbcdb0b701f2883ca3985c9f63bbe484400bbaf2d1aa82887 +4b53b80918cdf3129cb1e2a40db5bf8bd2373753f7b100d149cfe4108f55dfbd diff --git a/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/EarthModelStudio.assets.cache b/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/EarthModelStudio.assets.cache index 6838bcd..ee0170e 100644 Binary files a/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/EarthModelStudio.assets.cache and b/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/EarthModelStudio.assets.cache differ diff --git a/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/EarthModelStudio.csproj.AssemblyReference.cache b/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/EarthModelStudio.csproj.AssemblyReference.cache index 11fe82e..2c5ca51 100644 Binary files a/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/EarthModelStudio.csproj.AssemblyReference.cache and b/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/EarthModelStudio.csproj.AssemblyReference.cache differ diff --git a/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/EarthModelStudio.dll b/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/EarthModelStudio.dll index a21156a..3f12d9c 100644 Binary files a/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/EarthModelStudio.dll and b/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/EarthModelStudio.dll differ diff --git a/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/EarthModelStudio.pdb b/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/EarthModelStudio.pdb index 62dd546..670a155 100644 Binary files a/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/EarthModelStudio.pdb and b/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/EarthModelStudio.pdb differ diff --git a/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/ref/EarthModelStudio.dll b/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/ref/EarthModelStudio.dll index db20a3f..3211fe1 100644 Binary files a/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/ref/EarthModelStudio.dll and b/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/ref/EarthModelStudio.dll differ diff --git a/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/refint/EarthModelStudio.dll b/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/refint/EarthModelStudio.dll index db20a3f..3211fe1 100644 Binary files a/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/refint/EarthModelStudio.dll and b/src/main/dotnet/EarthModelStudio/obj/Debug/net8.0/refint/EarthModelStudio.dll differ diff --git a/src/main/dotnet/EarthModelStudio/obj/EarthModelStudio.csproj.nuget.dgspec.json b/src/main/dotnet/EarthModelStudio/obj/EarthModelStudio.csproj.nuget.dgspec.json index 2098933..c01ac11 100644 --- a/src/main/dotnet/EarthModelStudio/obj/EarthModelStudio.csproj.nuget.dgspec.json +++ b/src/main/dotnet/EarthModelStudio/obj/EarthModelStudio.csproj.nuget.dgspec.json @@ -5,7 +5,7 @@ }, "projects": { "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj": { - "version": "1.0.3", + "version": "1.0.4", "restore": { "projectUniqueName": "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj", "projectName": "EarthModelStudio.ModelSdk", @@ -49,12 +49,6 @@ "Avalonia": { "target": "Package", "version": "[11.3.9, )" - }, - "Microsoft.NET.ILLink.Tasks": { - "suppressParent": "All", - "target": "Package", - "version": "[8.0.31, )", - "autoReferenced": true } }, "imports": [ @@ -68,16 +62,6 @@ ], "assetTargetFallback": true, "warn": true, - "downloadDependencies": [ - { - "name": "Microsoft.AspNetCore.App.Runtime.win-arm64", - "version": "[8.0.31, 8.0.31]" - }, - { - "name": "Microsoft.NETCore.App.Runtime.win-arm64", - "version": "[8.0.31, 8.0.31]" - } - ], "frameworkReferences": { "Microsoft.NETCore.App": { "privateAssets": "all" @@ -85,15 +69,10 @@ }, "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/10.0.401/PortableRuntimeIdentifierGraph.json" } - }, - "runtimes": { - "win-arm64": { - "#import": [] - } } }, "/Users/morris/Downloads/GC#/src/main/dotnet/EarthModelStudio/EarthModelStudio.csproj": { - "version": "1.0.3", + "version": "1.0.4", "restore": { "projectUniqueName": "/Users/morris/Downloads/GC#/src/main/dotnet/EarthModelStudio/EarthModelStudio.csproj", "projectName": "EarthModelStudio", @@ -153,12 +132,6 @@ "CommunityToolkit.Mvvm": { "target": "Package", "version": "[8.2.2, )" - }, - "Microsoft.NET.ILLink.Tasks": { - "suppressParent": "All", - "target": "Package", - "version": "[8.0.31, )", - "autoReferenced": true } }, "imports": [ @@ -172,20 +145,6 @@ ], "assetTargetFallback": true, "warn": true, - "downloadDependencies": [ - { - "name": "Microsoft.AspNetCore.App.Runtime.win-arm64", - "version": "[8.0.31, 8.0.31]" - }, - { - "name": "Microsoft.NETCore.App.Host.win-arm64", - "version": "[8.0.31, 8.0.31]" - }, - { - "name": "Microsoft.NETCore.App.Runtime.win-arm64", - "version": "[8.0.31, 8.0.31]" - } - ], "frameworkReferences": { "Microsoft.NETCore.App": { "privateAssets": "all" @@ -193,11 +152,6 @@ }, "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/10.0.401/PortableRuntimeIdentifierGraph.json" } - }, - "runtimes": { - "win-arm64": { - "#import": [] - } } } } diff --git a/src/main/dotnet/EarthModelStudio/obj/EarthModelStudio.csproj.nuget.g.props b/src/main/dotnet/EarthModelStudio/obj/EarthModelStudio.csproj.nuget.g.props index aed745f..cb99f02 100644 --- a/src/main/dotnet/EarthModelStudio/obj/EarthModelStudio.csproj.nuget.g.props +++ b/src/main/dotnet/EarthModelStudio/obj/EarthModelStudio.csproj.nuget.g.props @@ -14,12 +14,10 @@ - - /Users/morris/.nuget/packages/microsoft.net.illink.tasks/8.0.31 /Users/morris/.nuget/packages/avalonia.buildservices/11.3.2 /Users/morris/.nuget/packages/avalonia/11.3.9 diff --git a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/osx-arm64/Avalonia/Resources.Inputs.cache b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/osx-arm64/Avalonia/Resources.Inputs.cache index 8e29cfa..09c1689 100644 --- a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/osx-arm64/Avalonia/Resources.Inputs.cache +++ b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/osx-arm64/Avalonia/Resources.Inputs.cache @@ -1 +1 @@ -d94573b416791c54a79fb7098e9d5a5d00e1443254dc1f3aecbc9b86590788ce +0aef3705cc5861ae47f166e26ea2e3b27fd85cb1df12754a1e85eb4400e855e9 diff --git a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/osx-arm64/Avalonia/resources b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/osx-arm64/Avalonia/resources index 174c4e5..aec7dd6 100644 Binary files a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/osx-arm64/Avalonia/resources and b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/osx-arm64/Avalonia/resources differ diff --git a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/osx-arm64/EarthModelStudio.AssemblyInfo.cs b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/osx-arm64/EarthModelStudio.AssemblyInfo.cs index b28a982..ed9bf15 100644 --- a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/osx-arm64/EarthModelStudio.AssemblyInfo.cs +++ b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/osx-arm64/EarthModelStudio.AssemblyInfo.cs @@ -12,11 +12,11 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("NeoRF")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] -[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.3.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.3")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.4.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.4+5e0b46b3f3cd9800af177571c7809a7cdc8e9249")] [assembly: System.Reflection.AssemblyProductAttribute("Earth Model Studio")] [assembly: System.Reflection.AssemblyTitleAttribute("EarthModelStudio")] -[assembly: System.Reflection.AssemblyVersionAttribute("1.0.3.0")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.4.0")] [assembly: System.Resources.NeutralResourcesLanguageAttribute("zh-Hans")] // Generated by the MSBuild WriteCodeFragment class. diff --git a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/osx-arm64/EarthModelStudio.AssemblyInfoInputs.cache b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/osx-arm64/EarthModelStudio.AssemblyInfoInputs.cache index 18ee192..9d973ea 100644 --- a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/osx-arm64/EarthModelStudio.AssemblyInfoInputs.cache +++ b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/osx-arm64/EarthModelStudio.AssemblyInfoInputs.cache @@ -1 +1 @@ -dfde32a1b638d0d011748d61b4eaff277a793bc4fcae3375700d687f56b5f118 +bbea3a678295bbbef711b3c94168d9cc4ab226467bb6869e4e9f13afae159277 diff --git a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/osx-arm64/EarthModelStudio.csproj.AssemblyReference.cache b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/osx-arm64/EarthModelStudio.csproj.AssemblyReference.cache index 7c00876..d532b0c 100644 Binary files a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/osx-arm64/EarthModelStudio.csproj.AssemblyReference.cache and b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/osx-arm64/EarthModelStudio.csproj.AssemblyReference.cache differ diff --git a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/osx-arm64/EarthModelStudio.dll b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/osx-arm64/EarthModelStudio.dll index 4348cd4..37c6eda 100644 Binary files a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/osx-arm64/EarthModelStudio.dll and b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/osx-arm64/EarthModelStudio.dll differ diff --git a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/osx-arm64/ref/EarthModelStudio.dll b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/osx-arm64/ref/EarthModelStudio.dll index 3ed2bd7..9192cb8 100644 Binary files a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/osx-arm64/ref/EarthModelStudio.dll and b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/osx-arm64/ref/EarthModelStudio.dll differ diff --git a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/osx-arm64/refint/EarthModelStudio.dll b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/osx-arm64/refint/EarthModelStudio.dll index 3ed2bd7..9192cb8 100644 Binary files a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/osx-arm64/refint/EarthModelStudio.dll and b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/osx-arm64/refint/EarthModelStudio.dll differ diff --git a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/Avalonia/Resources.Inputs.cache b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/Avalonia/Resources.Inputs.cache index 8e29cfa..dcbc0c4 100644 --- a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/Avalonia/Resources.Inputs.cache +++ b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/Avalonia/Resources.Inputs.cache @@ -1 +1 @@ -d94573b416791c54a79fb7098e9d5a5d00e1443254dc1f3aecbc9b86590788ce +b5b025787ddcf020e4af544e7291049bae132a2a48645e60ce75f9c17a36c04e diff --git a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/Avalonia/resources b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/Avalonia/resources index 174c4e5..aec7dd6 100644 Binary files a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/Avalonia/resources and b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/Avalonia/resources differ diff --git a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/EarthModelStudio.AssemblyInfo.cs b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/EarthModelStudio.AssemblyInfo.cs index b28a982..ed9bf15 100644 --- a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/EarthModelStudio.AssemblyInfo.cs +++ b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/EarthModelStudio.AssemblyInfo.cs @@ -12,11 +12,11 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("NeoRF")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] -[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.3.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.3")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.4.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.4+5e0b46b3f3cd9800af177571c7809a7cdc8e9249")] [assembly: System.Reflection.AssemblyProductAttribute("Earth Model Studio")] [assembly: System.Reflection.AssemblyTitleAttribute("EarthModelStudio")] -[assembly: System.Reflection.AssemblyVersionAttribute("1.0.3.0")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.4.0")] [assembly: System.Resources.NeutralResourcesLanguageAttribute("zh-Hans")] // Generated by the MSBuild WriteCodeFragment class. diff --git a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/EarthModelStudio.AssemblyInfoInputs.cache b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/EarthModelStudio.AssemblyInfoInputs.cache index 18ee192..9d973ea 100644 --- a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/EarthModelStudio.AssemblyInfoInputs.cache +++ b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/EarthModelStudio.AssemblyInfoInputs.cache @@ -1 +1 @@ -dfde32a1b638d0d011748d61b4eaff277a793bc4fcae3375700d687f56b5f118 +bbea3a678295bbbef711b3c94168d9cc4ab226467bb6869e4e9f13afae159277 diff --git a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/EarthModelStudio.csproj.AssemblyReference.cache b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/EarthModelStudio.csproj.AssemblyReference.cache index 16a1c91..74af3c1 100644 Binary files a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/EarthModelStudio.csproj.AssemblyReference.cache and b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/EarthModelStudio.csproj.AssemblyReference.cache differ diff --git a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/EarthModelStudio.deps.json b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/EarthModelStudio.deps.json index ea6cdad..60916e6 100644 --- a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/EarthModelStudio.deps.json +++ b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/EarthModelStudio.deps.json @@ -7,13 +7,13 @@ "targets": { ".NETCoreApp,Version=v8.0": {}, ".NETCoreApp,Version=v8.0/win-arm64": { - "EarthModelStudio/1.0.3": { + "EarthModelStudio/1.0.4": { "dependencies": { "Avalonia": "11.3.9", "Avalonia.Desktop": "11.3.9", "Avalonia.Themes.Fluent": "11.3.9", "CommunityToolkit.Mvvm": "8.2.2", - "EarthModelStudio.ModelSdk": "1.0.3", + "EarthModelStudio.ModelSdk": "1.0.4", "runtimepack.Microsoft.NETCore.App.Runtime.win-arm64": "8.0.31" }, "runtime": { @@ -925,21 +925,21 @@ } } }, - "EarthModelStudio.ModelSdk/1.0.3": { + "EarthModelStudio.ModelSdk/1.0.4": { "dependencies": { "Avalonia": "11.3.9" }, "runtime": { "EarthModelStudio.ModelSdk.dll": { - "assemblyVersion": "1.0.3.0", - "fileVersion": "1.0.3.0" + "assemblyVersion": "1.0.4.0", + "fileVersion": "1.0.4.0" } } } } }, "libraries": { - "EarthModelStudio/1.0.3": { + "EarthModelStudio/1.0.4": { "type": "project", "serviceable": false, "sha512": "" @@ -1075,7 +1075,7 @@ "path": "tmds.dbus.protocol/0.21.2", "hashPath": "tmds.dbus.protocol.0.21.2.nupkg.sha512" }, - "EarthModelStudio.ModelSdk/1.0.3": { + "EarthModelStudio.ModelSdk/1.0.4": { "type": "project", "serviceable": false, "sha512": "" diff --git a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/EarthModelStudio.dll b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/EarthModelStudio.dll index 4348cd4..37c6eda 100644 Binary files a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/EarthModelStudio.dll and b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/EarthModelStudio.dll differ diff --git a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/EarthModelStudio.genpublishdeps.cache b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/EarthModelStudio.genpublishdeps.cache index b6cbca1..6d0e310 100644 --- a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/EarthModelStudio.genpublishdeps.cache +++ b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/EarthModelStudio.genpublishdeps.cache @@ -1 +1 @@ -be943e262cfa635d580a5828af53185d1d5df2fc50f87c66a538f48f8c909b7f +91a3b03c316261e46135b11140df783e350ca94aa2c193de5c638adc629b3446 diff --git a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/apphost.exe b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/apphost.exe index 98e923f..bd2327b 100755 Binary files a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/apphost.exe and b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/apphost.exe differ diff --git a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/ref/EarthModelStudio.dll b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/ref/EarthModelStudio.dll index 3ed2bd7..9192cb8 100644 Binary files a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/ref/EarthModelStudio.dll and b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/ref/EarthModelStudio.dll differ diff --git a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/refint/EarthModelStudio.dll b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/refint/EarthModelStudio.dll index 3ed2bd7..9192cb8 100644 Binary files a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/refint/EarthModelStudio.dll and b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/refint/EarthModelStudio.dll differ diff --git a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/singlefilehost.exe b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/singlefilehost.exe index b0bc628..3b45d53 100755 Binary files a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/singlefilehost.exe and b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-arm64/singlefilehost.exe differ diff --git a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/Avalonia/Resources.Inputs.cache b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/Avalonia/Resources.Inputs.cache index 8e29cfa..dcbc0c4 100644 --- a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/Avalonia/Resources.Inputs.cache +++ b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/Avalonia/Resources.Inputs.cache @@ -1 +1 @@ -d94573b416791c54a79fb7098e9d5a5d00e1443254dc1f3aecbc9b86590788ce +b5b025787ddcf020e4af544e7291049bae132a2a48645e60ce75f9c17a36c04e diff --git a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/Avalonia/resources b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/Avalonia/resources index 174c4e5..aec7dd6 100644 Binary files a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/Avalonia/resources and b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/Avalonia/resources differ diff --git a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/EarthModelStudio.AssemblyInfo.cs b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/EarthModelStudio.AssemblyInfo.cs index b28a982..ed9bf15 100644 --- a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/EarthModelStudio.AssemblyInfo.cs +++ b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/EarthModelStudio.AssemblyInfo.cs @@ -12,11 +12,11 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("NeoRF")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] -[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.3.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.3")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.4.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.4+5e0b46b3f3cd9800af177571c7809a7cdc8e9249")] [assembly: System.Reflection.AssemblyProductAttribute("Earth Model Studio")] [assembly: System.Reflection.AssemblyTitleAttribute("EarthModelStudio")] -[assembly: System.Reflection.AssemblyVersionAttribute("1.0.3.0")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.4.0")] [assembly: System.Resources.NeutralResourcesLanguageAttribute("zh-Hans")] // Generated by the MSBuild WriteCodeFragment class. diff --git a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/EarthModelStudio.AssemblyInfoInputs.cache b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/EarthModelStudio.AssemblyInfoInputs.cache index 18ee192..9d973ea 100644 --- a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/EarthModelStudio.AssemblyInfoInputs.cache +++ b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/EarthModelStudio.AssemblyInfoInputs.cache @@ -1 +1 @@ -dfde32a1b638d0d011748d61b4eaff277a793bc4fcae3375700d687f56b5f118 +bbea3a678295bbbef711b3c94168d9cc4ab226467bb6869e4e9f13afae159277 diff --git a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/EarthModelStudio.csproj.AssemblyReference.cache b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/EarthModelStudio.csproj.AssemblyReference.cache index 16a1c91..74af3c1 100644 Binary files a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/EarthModelStudio.csproj.AssemblyReference.cache and b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/EarthModelStudio.csproj.AssemblyReference.cache differ diff --git a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/EarthModelStudio.deps.json b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/EarthModelStudio.deps.json index c8ee2b0..946a2fb 100644 --- a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/EarthModelStudio.deps.json +++ b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/EarthModelStudio.deps.json @@ -7,13 +7,13 @@ "targets": { ".NETCoreApp,Version=v8.0": {}, ".NETCoreApp,Version=v8.0/win-x64": { - "EarthModelStudio/1.0.3": { + "EarthModelStudio/1.0.4": { "dependencies": { "Avalonia": "11.3.9", "Avalonia.Desktop": "11.3.9", "Avalonia.Themes.Fluent": "11.3.9", "CommunityToolkit.Mvvm": "8.2.2", - "EarthModelStudio.ModelSdk": "1.0.3", + "EarthModelStudio.ModelSdk": "1.0.4", "runtimepack.Microsoft.NETCore.App.Runtime.win-x64": "8.0.31" }, "runtime": { @@ -925,21 +925,21 @@ } } }, - "EarthModelStudio.ModelSdk/1.0.3": { + "EarthModelStudio.ModelSdk/1.0.4": { "dependencies": { "Avalonia": "11.3.9" }, "runtime": { "EarthModelStudio.ModelSdk.dll": { - "assemblyVersion": "1.0.3.0", - "fileVersion": "1.0.3.0" + "assemblyVersion": "1.0.4.0", + "fileVersion": "1.0.4.0" } } } } }, "libraries": { - "EarthModelStudio/1.0.3": { + "EarthModelStudio/1.0.4": { "type": "project", "serviceable": false, "sha512": "" @@ -1075,7 +1075,7 @@ "path": "tmds.dbus.protocol/0.21.2", "hashPath": "tmds.dbus.protocol.0.21.2.nupkg.sha512" }, - "EarthModelStudio.ModelSdk/1.0.3": { + "EarthModelStudio.ModelSdk/1.0.4": { "type": "project", "serviceable": false, "sha512": "" diff --git a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/EarthModelStudio.dll b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/EarthModelStudio.dll index b0786d3..1bb94bc 100644 Binary files a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/EarthModelStudio.dll and b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/EarthModelStudio.dll differ diff --git a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/EarthModelStudio.genpublishdeps.cache b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/EarthModelStudio.genpublishdeps.cache index e7b3670..b58fe71 100644 --- a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/EarthModelStudio.genpublishdeps.cache +++ b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/EarthModelStudio.genpublishdeps.cache @@ -1 +1 @@ -139e8433122fe1b5b6e9cecf7dc0d4bd6b8f66010cf21b4b80304e990aa980e2 +cf7c7673f0db053bc814435fa0d38384687e1858becb917647e3d4ca42b91227 diff --git a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/apphost.exe b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/apphost.exe index 5f2b489..cfacfae 100755 Binary files a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/apphost.exe and b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/apphost.exe differ diff --git a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/ref/EarthModelStudio.dll b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/ref/EarthModelStudio.dll index 8cc3cab..c8b356d 100644 Binary files a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/ref/EarthModelStudio.dll and b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/ref/EarthModelStudio.dll differ diff --git a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/refint/EarthModelStudio.dll b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/refint/EarthModelStudio.dll index 8cc3cab..c8b356d 100644 Binary files a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/refint/EarthModelStudio.dll and b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/refint/EarthModelStudio.dll differ diff --git a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/singlefilehost.exe b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/singlefilehost.exe index 65a1c63..09f3f3c 100755 Binary files a/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/singlefilehost.exe and b/src/main/dotnet/EarthModelStudio/obj/Release/net8.0/win-x64/singlefilehost.exe differ diff --git a/src/main/dotnet/EarthModelStudio/obj/project.assets.json b/src/main/dotnet/EarthModelStudio/obj/project.assets.json index c4e8d75..f58ec85 100644 --- a/src/main/dotnet/EarthModelStudio/obj/project.assets.json +++ b/src/main/dotnet/EarthModelStudio/obj/project.assets.json @@ -406,12 +406,6 @@ "lib/net5.0/MicroCom.Runtime.dll": {} } }, - "Microsoft.NET.ILLink.Tasks/8.0.31": { - "type": "package", - "build": { - "build/Microsoft.NET.ILLink.Tasks.props": {} - } - }, "SkiaSharp/2.88.9": { "type": "package", "dependencies": { @@ -538,443 +532,7 @@ "lib/net8.0/Tmds.DBus.Protocol.dll": {} } }, - "EarthModelStudio.ModelSdk/1.0.3": { - "type": "project", - "framework": ".NETCoreApp,Version=v8.0", - "dependencies": { - "Avalonia": "11.3.9" - }, - "compile": { - "bin/placeholder/EarthModelStudio.ModelSdk.dll": {} - }, - "runtime": { - "bin/placeholder/EarthModelStudio.ModelSdk.dll": {} - } - } - }, - "net8.0/win-arm64": { - "Avalonia/11.3.9": { - "type": "package", - "dependencies": { - "Avalonia.BuildServices": "11.3.2", - "Avalonia.Remote.Protocol": "11.3.9", - "MicroCom.Runtime": "0.11.0" - }, - "compile": { - "ref/net8.0/Avalonia.Base.dll": { - "related": ".xml" - }, - "ref/net8.0/Avalonia.Controls.dll": { - "related": ".xml" - }, - "ref/net8.0/Avalonia.DesignerSupport.dll": { - "related": ".xml" - }, - "ref/net8.0/Avalonia.Dialogs.dll": { - "related": ".xml" - }, - "ref/net8.0/Avalonia.Markup.Xaml.dll": { - "related": ".xml" - }, - "ref/net8.0/Avalonia.Markup.dll": { - "related": ".Xaml.xml;.xml" - }, - "ref/net8.0/Avalonia.Metal.dll": { - "related": ".xml" - }, - "ref/net8.0/Avalonia.MicroCom.dll": { - "related": ".xml" - }, - "ref/net8.0/Avalonia.OpenGL.dll": { - "related": ".xml" - }, - "ref/net8.0/Avalonia.Vulkan.dll": { - "related": ".xml" - }, - "ref/net8.0/Avalonia.dll": { - "related": ".Base.xml;.Controls.xml;.DesignerSupport.xml;.Dialogs.xml;.Markup.Xaml.xml;.Markup.xml;.Metal.xml;.MicroCom.xml;.OpenGL.xml;.Vulkan.xml;.xml" - } - }, - "runtime": { - "lib/net8.0/Avalonia.Base.dll": { - "related": ".xml" - }, - "lib/net8.0/Avalonia.Controls.dll": { - "related": ".xml" - }, - "lib/net8.0/Avalonia.DesignerSupport.dll": { - "related": ".xml" - }, - "lib/net8.0/Avalonia.Dialogs.dll": { - "related": ".xml" - }, - "lib/net8.0/Avalonia.Markup.Xaml.dll": { - "related": ".xml" - }, - "lib/net8.0/Avalonia.Markup.dll": { - "related": ".Xaml.xml;.xml" - }, - "lib/net8.0/Avalonia.Metal.dll": { - "related": ".xml" - }, - "lib/net8.0/Avalonia.MicroCom.dll": { - "related": ".xml" - }, - "lib/net8.0/Avalonia.OpenGL.dll": { - "related": ".xml" - }, - "lib/net8.0/Avalonia.Vulkan.dll": { - "related": ".xml" - }, - "lib/net8.0/Avalonia.dll": { - "related": ".Base.xml;.Controls.xml;.DesignerSupport.xml;.Dialogs.xml;.Markup.Xaml.xml;.Markup.xml;.Metal.xml;.MicroCom.xml;.OpenGL.xml;.Vulkan.xml;.xml" - } - }, - "build": { - "buildTransitive/Avalonia.props": {}, - "buildTransitive/Avalonia.targets": {} - } - }, - "Avalonia.Angle.Windows.Natives/2.1.25547.20250602": { - "type": "package", - "native": { - "runtimes/win-arm64/native/av_libglesv2.dll": {} - } - }, - "Avalonia.BuildServices/11.3.2": { - "type": "package", - "build": { - "buildTransitive/Avalonia.BuildServices.targets": {} - } - }, - "Avalonia.Desktop/11.3.9": { - "type": "package", - "dependencies": { - "Avalonia": "11.3.9", - "Avalonia.Native": "11.3.9", - "Avalonia.Skia": "11.3.9", - "Avalonia.Win32": "11.3.9", - "Avalonia.X11": "11.3.9" - }, - "compile": { - "lib/net8.0/Avalonia.Desktop.dll": { - "related": ".xml" - } - }, - "runtime": { - "lib/net8.0/Avalonia.Desktop.dll": { - "related": ".xml" - } - } - }, - "Avalonia.FreeDesktop/11.3.9": { - "type": "package", - "dependencies": { - "Avalonia": "11.3.9", - "Tmds.DBus.Protocol": "0.21.2" - }, - "compile": { - "lib/net8.0/Avalonia.FreeDesktop.dll": { - "related": ".xml" - } - }, - "runtime": { - "lib/net8.0/Avalonia.FreeDesktop.dll": { - "related": ".xml" - } - } - }, - "Avalonia.Native/11.3.9": { - "type": "package", - "dependencies": { - "Avalonia": "11.3.9" - }, - "compile": { - "lib/net8.0/Avalonia.Native.dll": { - "related": ".xml" - } - }, - "runtime": { - "lib/net8.0/Avalonia.Native.dll": { - "related": ".xml" - } - } - }, - "Avalonia.Remote.Protocol/11.3.9": { - "type": "package", - "compile": { - "lib/net8.0/Avalonia.Remote.Protocol.dll": { - "related": ".xml" - } - }, - "runtime": { - "lib/net8.0/Avalonia.Remote.Protocol.dll": { - "related": ".xml" - } - } - }, - "Avalonia.Skia/11.3.9": { - "type": "package", - "dependencies": { - "Avalonia": "11.3.9", - "HarfBuzzSharp": "8.3.1.1", - "HarfBuzzSharp.NativeAssets.Linux": "8.3.1.1", - "HarfBuzzSharp.NativeAssets.WebAssembly": "8.3.1.1", - "SkiaSharp": "2.88.9", - "SkiaSharp.NativeAssets.Linux": "2.88.9", - "SkiaSharp.NativeAssets.WebAssembly": "2.88.9" - }, - "compile": { - "lib/net8.0/Avalonia.Skia.dll": { - "related": ".xml" - } - }, - "runtime": { - "lib/net8.0/Avalonia.Skia.dll": { - "related": ".xml" - } - } - }, - "Avalonia.Themes.Fluent/11.3.9": { - "type": "package", - "dependencies": { - "Avalonia": "11.3.9" - }, - "compile": { - "lib/net8.0/Avalonia.Themes.Fluent.dll": { - "related": ".xml" - } - }, - "runtime": { - "lib/net8.0/Avalonia.Themes.Fluent.dll": { - "related": ".xml" - } - } - }, - "Avalonia.Win32/11.3.9": { - "type": "package", - "dependencies": { - "Avalonia": "11.3.9", - "Avalonia.Angle.Windows.Natives": "2.1.25547.20250602" - }, - "compile": { - "lib/net8.0/Avalonia.Win32.Automation.dll": { - "related": ".xml" - }, - "lib/net8.0/Avalonia.Win32.dll": { - "related": ".Automation.xml;.xml" - } - }, - "runtime": { - "lib/net8.0/Avalonia.Win32.Automation.dll": { - "related": ".xml" - }, - "lib/net8.0/Avalonia.Win32.dll": { - "related": ".Automation.xml;.xml" - } - } - }, - "Avalonia.X11/11.3.9": { - "type": "package", - "dependencies": { - "Avalonia": "11.3.9", - "Avalonia.FreeDesktop": "11.3.9", - "Avalonia.Skia": "11.3.9" - }, - "compile": { - "lib/net8.0/Avalonia.X11.dll": { - "related": ".xml" - } - }, - "runtime": { - "lib/net8.0/Avalonia.X11.dll": { - "related": ".xml" - } - } - }, - "CommunityToolkit.Mvvm/8.2.2": { - "type": "package", - "compile": { - "lib/net6.0/CommunityToolkit.Mvvm.dll": { - "related": ".pdb;.xml" - } - }, - "runtime": { - "lib/net6.0/CommunityToolkit.Mvvm.dll": { - "related": ".pdb;.xml" - } - }, - "build": { - "buildTransitive/netstandard2.1/CommunityToolkit.Mvvm.targets": {} - } - }, - "HarfBuzzSharp/8.3.1.1": { - "type": "package", - "dependencies": { - "HarfBuzzSharp.NativeAssets.Win32": "8.3.1.1", - "HarfBuzzSharp.NativeAssets.macOS": "8.3.1.1" - }, - "compile": { - "lib/net8.0/HarfBuzzSharp.dll": { - "related": ".pdb" - } - }, - "runtime": { - "lib/net8.0/HarfBuzzSharp.dll": { - "related": ".pdb" - } - } - }, - "HarfBuzzSharp.NativeAssets.Linux/8.3.1.1": { - "type": "package", - "compile": { - "lib/net8.0/_._": {} - }, - "runtime": { - "lib/net8.0/_._": {} - } - }, - "HarfBuzzSharp.NativeAssets.macOS/8.3.1.1": { - "type": "package", - "compile": { - "lib/net8.0/_._": {} - }, - "runtime": { - "lib/net8.0/_._": {} - } - }, - "HarfBuzzSharp.NativeAssets.WebAssembly/8.3.1.1": { - "type": "package", - "compile": { - "lib/net8.0/_._": {} - }, - "runtime": { - "lib/net8.0/_._": {} - }, - "build": { - "buildTransitive/netstandard1.0/HarfBuzzSharp.NativeAssets.WebAssembly.props": {}, - "buildTransitive/netstandard1.0/HarfBuzzSharp.NativeAssets.WebAssembly.targets": {} - } - }, - "HarfBuzzSharp.NativeAssets.Win32/8.3.1.1": { - "type": "package", - "compile": { - "lib/net8.0/_._": {} - }, - "runtime": { - "lib/net8.0/_._": {} - }, - "native": { - "runtimes/win-arm64/native/libHarfBuzzSharp.dll": {} - } - }, - "MicroCom.Runtime/0.11.0": { - "type": "package", - "compile": { - "lib/net5.0/MicroCom.Runtime.dll": {} - }, - "runtime": { - "lib/net5.0/MicroCom.Runtime.dll": {} - } - }, - "Microsoft.NET.ILLink.Tasks/8.0.31": { - "type": "package", - "build": { - "build/Microsoft.NET.ILLink.Tasks.props": {} - } - }, - "SkiaSharp/2.88.9": { - "type": "package", - "dependencies": { - "SkiaSharp.NativeAssets.Win32": "2.88.9", - "SkiaSharp.NativeAssets.macOS": "2.88.9" - }, - "compile": { - "lib/net6.0/SkiaSharp.dll": { - "related": ".pdb;.xml" - } - }, - "runtime": { - "lib/net6.0/SkiaSharp.dll": { - "related": ".pdb;.xml" - } - } - }, - "SkiaSharp.NativeAssets.Linux/2.88.9": { - "type": "package", - "dependencies": { - "SkiaSharp": "2.88.9" - }, - "compile": { - "lib/net6.0/_._": {} - }, - "runtime": { - "lib/net6.0/_._": {} - } - }, - "SkiaSharp.NativeAssets.macOS/2.88.9": { - "type": "package", - "compile": { - "lib/net6.0/_._": {} - }, - "runtime": { - "lib/net6.0/_._": {} - } - }, - "SkiaSharp.NativeAssets.WebAssembly/2.88.9": { - "type": "package", - "compile": { - "lib/netstandard1.0/_._": {} - }, - "runtime": { - "lib/netstandard1.0/_._": {} - }, - "build": { - "buildTransitive/netstandard1.0/SkiaSharp.NativeAssets.WebAssembly.props": {}, - "buildTransitive/netstandard1.0/SkiaSharp.NativeAssets.WebAssembly.targets": {} - } - }, - "SkiaSharp.NativeAssets.Win32/2.88.9": { - "type": "package", - "compile": { - "lib/net6.0/_._": {} - }, - "runtime": { - "lib/net6.0/_._": {} - }, - "native": { - "runtimes/win-arm64/native/libSkiaSharp.dll": {} - } - }, - "System.IO.Pipelines/8.0.0": { - "type": "package", - "compile": { - "lib/net8.0/System.IO.Pipelines.dll": { - "related": ".xml" - } - }, - "runtime": { - "lib/net8.0/System.IO.Pipelines.dll": { - "related": ".xml" - } - }, - "build": { - "buildTransitive/net6.0/_._": {} - } - }, - "Tmds.DBus.Protocol/0.21.2": { - "type": "package", - "dependencies": { - "System.IO.Pipelines": "8.0.0" - }, - "compile": { - "lib/net8.0/Tmds.DBus.Protocol.dll": {} - }, - "runtime": { - "lib/net8.0/Tmds.DBus.Protocol.dll": {} - } - }, - "EarthModelStudio.ModelSdk/1.0.3": { + "EarthModelStudio.ModelSdk/1.0.4": { "type": "project", "framework": ".NETCoreApp,Version=v8.0", "dependencies": { @@ -1547,57 +1105,6 @@ "microcom.runtime.nuspec" ] }, - "Microsoft.NET.ILLink.Tasks/8.0.31": { - "sha512": "OJdAGATV2QoVWL11zlDLEluA06q8rK+cgZR47ohrO8V+Qj5z9dlvN7bG9/0e5t0IOe+yD8tREC0bpsEgDGrzIQ==", - "type": "package", - "path": "microsoft.net.illink.tasks/8.0.31", - "hasTools": true, - "files": [ - ".nupkg.metadata", - ".signature.p7s", - "Icon.png", - "LICENSE.TXT", - "Sdk/Sdk.props", - "THIRD-PARTY-NOTICES.TXT", - "analyzers/dotnet/cs/ILLink.CodeFixProvider.dll", - "analyzers/dotnet/cs/ILLink.RoslynAnalyzer.dll", - "build/Microsoft.NET.ILLink.Analyzers.props", - "build/Microsoft.NET.ILLink.Tasks.props", - "build/Microsoft.NET.ILLink.targets", - "microsoft.net.illink.tasks.8.0.31.nupkg.sha512", - "microsoft.net.illink.tasks.nuspec", - "tools/net472/ILLink.Tasks.dll", - "tools/net472/ILLink.Tasks.dll.config", - "tools/net472/Mono.Cecil.Mdb.dll", - "tools/net472/Mono.Cecil.Pdb.dll", - "tools/net472/Mono.Cecil.Rocks.dll", - "tools/net472/Mono.Cecil.dll", - "tools/net472/Sdk/Sdk.props", - "tools/net472/System.Buffers.dll", - "tools/net472/System.Collections.Immutable.dll", - "tools/net472/System.Memory.dll", - "tools/net472/System.Numerics.Vectors.dll", - "tools/net472/System.Reflection.Metadata.dll", - "tools/net472/System.Runtime.CompilerServices.Unsafe.dll", - "tools/net472/build/Microsoft.NET.ILLink.Analyzers.props", - "tools/net472/build/Microsoft.NET.ILLink.Tasks.props", - "tools/net472/build/Microsoft.NET.ILLink.targets", - "tools/net8.0/ILLink.Tasks.deps.json", - "tools/net8.0/ILLink.Tasks.dll", - "tools/net8.0/Mono.Cecil.Mdb.dll", - "tools/net8.0/Mono.Cecil.Pdb.dll", - "tools/net8.0/Mono.Cecil.Rocks.dll", - "tools/net8.0/Mono.Cecil.dll", - "tools/net8.0/Sdk/Sdk.props", - "tools/net8.0/build/Microsoft.NET.ILLink.Analyzers.props", - "tools/net8.0/build/Microsoft.NET.ILLink.Tasks.props", - "tools/net8.0/build/Microsoft.NET.ILLink.targets", - "tools/net8.0/illink.deps.json", - "tools/net8.0/illink.dll", - "tools/net8.0/illink.runtimeconfig.json", - "useSharedDesignerContext.txt" - ] - }, "SkiaSharp/2.88.9": { "sha512": "3MD5VHjXXieSHCleRLuaTXmL2pD0mB7CcOB1x2kA1I4bhptf4e3R27iM93264ZYuAq6mkUyX5XbcxnZvMJYc1Q==", "type": "package", @@ -1820,7 +1327,7 @@ "tmds.dbus.protocol.nuspec" ] }, - "EarthModelStudio.ModelSdk/1.0.3": { + "EarthModelStudio.ModelSdk/1.0.4": { "type": "project", "path": "../../../../model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj", "msbuildProject": "../../../../model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj" @@ -1832,15 +1339,14 @@ "Avalonia.Desktop >= 11.3.9", "Avalonia.Themes.Fluent >= 11.3.9", "CommunityToolkit.Mvvm >= 8.2.2", - "EarthModelStudio.ModelSdk >= 1.0.3", - "Microsoft.NET.ILLink.Tasks >= 8.0.31" + "EarthModelStudio.ModelSdk >= 1.0.4" ] }, "packageFolders": { "/Users/morris/.nuget/packages/": {} }, "project": { - "version": "1.0.3", + "version": "1.0.4", "restore": { "projectUniqueName": "/Users/morris/Downloads/GC#/src/main/dotnet/EarthModelStudio/EarthModelStudio.csproj", "projectName": "EarthModelStudio", @@ -1900,12 +1406,6 @@ "CommunityToolkit.Mvvm": { "target": "Package", "version": "[8.2.2, )" - }, - "Microsoft.NET.ILLink.Tasks": { - "suppressParent": "All", - "target": "Package", - "version": "[8.0.31, )", - "autoReferenced": true } }, "imports": [ @@ -1919,20 +1419,6 @@ ], "assetTargetFallback": true, "warn": true, - "downloadDependencies": [ - { - "name": "Microsoft.AspNetCore.App.Runtime.win-arm64", - "version": "[8.0.31, 8.0.31]" - }, - { - "name": "Microsoft.NETCore.App.Host.win-arm64", - "version": "[8.0.31, 8.0.31]" - }, - { - "name": "Microsoft.NETCore.App.Runtime.win-arm64", - "version": "[8.0.31, 8.0.31]" - } - ], "frameworkReferences": { "Microsoft.NETCore.App": { "privateAssets": "all" @@ -1940,11 +1426,6 @@ }, "runtimeIdentifierGraphPath": "/usr/local/share/dotnet/sdk/10.0.401/PortableRuntimeIdentifierGraph.json" } - }, - "runtimes": { - "win-arm64": { - "#import": [] - } } } } \ No newline at end of file diff --git a/src/main/dotnet/EarthModelStudio/obj/project.nuget.cache b/src/main/dotnet/EarthModelStudio/obj/project.nuget.cache index 9324f52..c68f270 100644 --- a/src/main/dotnet/EarthModelStudio/obj/project.nuget.cache +++ b/src/main/dotnet/EarthModelStudio/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "Awo7VBTz1wQ=", + "dgSpecHash": "sgJrxHi8SXg=", "success": true, "projectFilePath": "/Users/morris/Downloads/GC#/src/main/dotnet/EarthModelStudio/EarthModelStudio.csproj", "expectedPackageFiles": [ @@ -22,17 +22,13 @@ "/Users/morris/.nuget/packages/harfbuzzsharp.nativeassets.webassembly/8.3.1.1/harfbuzzsharp.nativeassets.webassembly.8.3.1.1.nupkg.sha512", "/Users/morris/.nuget/packages/harfbuzzsharp.nativeassets.win32/8.3.1.1/harfbuzzsharp.nativeassets.win32.8.3.1.1.nupkg.sha512", "/Users/morris/.nuget/packages/microcom.runtime/0.11.0/microcom.runtime.0.11.0.nupkg.sha512", - "/Users/morris/.nuget/packages/microsoft.net.illink.tasks/8.0.31/microsoft.net.illink.tasks.8.0.31.nupkg.sha512", "/Users/morris/.nuget/packages/skiasharp/2.88.9/skiasharp.2.88.9.nupkg.sha512", "/Users/morris/.nuget/packages/skiasharp.nativeassets.linux/2.88.9/skiasharp.nativeassets.linux.2.88.9.nupkg.sha512", "/Users/morris/.nuget/packages/skiasharp.nativeassets.macos/2.88.9/skiasharp.nativeassets.macos.2.88.9.nupkg.sha512", "/Users/morris/.nuget/packages/skiasharp.nativeassets.webassembly/2.88.9/skiasharp.nativeassets.webassembly.2.88.9.nupkg.sha512", "/Users/morris/.nuget/packages/skiasharp.nativeassets.win32/2.88.9/skiasharp.nativeassets.win32.2.88.9.nupkg.sha512", "/Users/morris/.nuget/packages/system.io.pipelines/8.0.0/system.io.pipelines.8.0.0.nupkg.sha512", - "/Users/morris/.nuget/packages/tmds.dbus.protocol/0.21.2/tmds.dbus.protocol.0.21.2.nupkg.sha512", - "/Users/morris/.nuget/packages/microsoft.netcore.app.runtime.win-arm64/8.0.31/microsoft.netcore.app.runtime.win-arm64.8.0.31.nupkg.sha512", - "/Users/morris/.nuget/packages/microsoft.aspnetcore.app.runtime.win-arm64/8.0.31/microsoft.aspnetcore.app.runtime.win-arm64.8.0.31.nupkg.sha512", - "/Users/morris/.nuget/packages/microsoft.netcore.app.host.win-arm64/8.0.31/microsoft.netcore.app.host.win-arm64.8.0.31.nupkg.sha512" + "/Users/morris/.nuget/packages/tmds.dbus.protocol/0.21.2/tmds.dbus.protocol.0.21.2.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/src/test/dotnet/EarthModelStudio.Tests/bin/Debug/net8.0/EarthModelStudio.ModelSdk.dll b/src/test/dotnet/EarthModelStudio.Tests/bin/Debug/net8.0/EarthModelStudio.ModelSdk.dll index e2e88d0..271e170 100644 Binary files a/src/test/dotnet/EarthModelStudio.Tests/bin/Debug/net8.0/EarthModelStudio.ModelSdk.dll and b/src/test/dotnet/EarthModelStudio.Tests/bin/Debug/net8.0/EarthModelStudio.ModelSdk.dll differ diff --git a/src/test/dotnet/EarthModelStudio.Tests/bin/Debug/net8.0/EarthModelStudio.ModelSdk.pdb b/src/test/dotnet/EarthModelStudio.Tests/bin/Debug/net8.0/EarthModelStudio.ModelSdk.pdb index 297cf4d..6b2dd30 100644 Binary files a/src/test/dotnet/EarthModelStudio.Tests/bin/Debug/net8.0/EarthModelStudio.ModelSdk.pdb and b/src/test/dotnet/EarthModelStudio.Tests/bin/Debug/net8.0/EarthModelStudio.ModelSdk.pdb differ diff --git a/src/test/dotnet/EarthModelStudio.Tests/bin/Debug/net8.0/EarthModelStudio.Tests.deps.json b/src/test/dotnet/EarthModelStudio.Tests/bin/Debug/net8.0/EarthModelStudio.Tests.deps.json index 36a80e9..3a24768 100644 --- a/src/test/dotnet/EarthModelStudio.Tests/bin/Debug/net8.0/EarthModelStudio.Tests.deps.json +++ b/src/test/dotnet/EarthModelStudio.Tests/bin/Debug/net8.0/EarthModelStudio.Tests.deps.json @@ -6,11 +6,11 @@ "compilationOptions": {}, "targets": { ".NETCoreApp,Version=v8.0": { - "EarthModelStudio.Tests/1.0.3": { + "EarthModelStudio.Tests/1.0.4": { "dependencies": { "Avalonia.Headless": "11.3.9", "Avalonia.Skia": "11.3.9", - "EarthModelStudio": "1.0.3" + "EarthModelStudio": "1.0.4" }, "runtime": { "EarthModelStudio.Tests.dll": {} @@ -407,36 +407,36 @@ } } }, - "EarthModelStudio/1.0.3": { + "EarthModelStudio/1.0.4": { "dependencies": { "Avalonia": "11.3.9", "Avalonia.Desktop": "11.3.9", "Avalonia.Themes.Fluent": "11.3.9", "CommunityToolkit.Mvvm": "8.2.2", - "EarthModelStudio.ModelSdk": "1.0.3" + "EarthModelStudio.ModelSdk": "1.0.4" }, "runtime": { "EarthModelStudio.dll": { - "assemblyVersion": "1.0.3.0", - "fileVersion": "1.0.3.0" + "assemblyVersion": "1.0.4.0", + "fileVersion": "1.0.4.0" } } }, - "EarthModelStudio.ModelSdk/1.0.3": { + "EarthModelStudio.ModelSdk/1.0.4": { "dependencies": { "Avalonia": "11.3.9" }, "runtime": { "EarthModelStudio.ModelSdk.dll": { - "assemblyVersion": "1.0.3.0", - "fileVersion": "1.0.3.0" + "assemblyVersion": "1.0.4.0", + "fileVersion": "1.0.4.0" } } } } }, "libraries": { - "EarthModelStudio.Tests/1.0.3": { + "EarthModelStudio.Tests/1.0.4": { "type": "project", "serviceable": false, "sha512": "" @@ -602,12 +602,12 @@ "path": "tmds.dbus.protocol/0.21.2", "hashPath": "tmds.dbus.protocol.0.21.2.nupkg.sha512" }, - "EarthModelStudio/1.0.3": { + "EarthModelStudio/1.0.4": { "type": "project", "serviceable": false, "sha512": "" }, - "EarthModelStudio.ModelSdk/1.0.3": { + "EarthModelStudio.ModelSdk/1.0.4": { "type": "project", "serviceable": false, "sha512": "" diff --git a/src/test/dotnet/EarthModelStudio.Tests/bin/Debug/net8.0/EarthModelStudio.Tests.dll b/src/test/dotnet/EarthModelStudio.Tests/bin/Debug/net8.0/EarthModelStudio.Tests.dll index 127a51f..87fc16b 100644 Binary files a/src/test/dotnet/EarthModelStudio.Tests/bin/Debug/net8.0/EarthModelStudio.Tests.dll and b/src/test/dotnet/EarthModelStudio.Tests/bin/Debug/net8.0/EarthModelStudio.Tests.dll differ diff --git a/src/test/dotnet/EarthModelStudio.Tests/bin/Debug/net8.0/EarthModelStudio.Tests.pdb b/src/test/dotnet/EarthModelStudio.Tests/bin/Debug/net8.0/EarthModelStudio.Tests.pdb index fc89b93..fa5c900 100644 Binary files a/src/test/dotnet/EarthModelStudio.Tests/bin/Debug/net8.0/EarthModelStudio.Tests.pdb and b/src/test/dotnet/EarthModelStudio.Tests/bin/Debug/net8.0/EarthModelStudio.Tests.pdb differ diff --git a/src/test/dotnet/EarthModelStudio.Tests/bin/Debug/net8.0/EarthModelStudio.deps.json b/src/test/dotnet/EarthModelStudio.Tests/bin/Debug/net8.0/EarthModelStudio.deps.json index c88ea4b..6b443de 100644 --- a/src/test/dotnet/EarthModelStudio.Tests/bin/Debug/net8.0/EarthModelStudio.deps.json +++ b/src/test/dotnet/EarthModelStudio.Tests/bin/Debug/net8.0/EarthModelStudio.deps.json @@ -6,13 +6,13 @@ "compilationOptions": {}, "targets": { ".NETCoreApp,Version=v8.0": { - "EarthModelStudio/1.0.3": { + "EarthModelStudio/1.0.4": { "dependencies": { "Avalonia": "11.3.9", "Avalonia.Desktop": "11.3.9", "Avalonia.Themes.Fluent": "11.3.9", "CommunityToolkit.Mvvm": "8.2.2", - "EarthModelStudio.ModelSdk": "1.0.3" + "EarthModelStudio.ModelSdk": "1.0.4" }, "runtime": { "EarthModelStudio.dll": {} @@ -398,21 +398,21 @@ } } }, - "EarthModelStudio.ModelSdk/1.0.3": { + "EarthModelStudio.ModelSdk/1.0.4": { "dependencies": { "Avalonia": "11.3.9" }, "runtime": { "EarthModelStudio.ModelSdk.dll": { - "assemblyVersion": "1.0.3.0", - "fileVersion": "1.0.3.0" + "assemblyVersion": "1.0.4.0", + "fileVersion": "1.0.4.0" } } } } }, "libraries": { - "EarthModelStudio/1.0.3": { + "EarthModelStudio/1.0.4": { "type": "project", "serviceable": false, "sha512": "" @@ -571,7 +571,7 @@ "path": "tmds.dbus.protocol/0.21.2", "hashPath": "tmds.dbus.protocol.0.21.2.nupkg.sha512" }, - "EarthModelStudio.ModelSdk/1.0.3": { + "EarthModelStudio.ModelSdk/1.0.4": { "type": "project", "serviceable": false, "sha512": "" diff --git a/src/test/dotnet/EarthModelStudio.Tests/bin/Debug/net8.0/EarthModelStudio.dll b/src/test/dotnet/EarthModelStudio.Tests/bin/Debug/net8.0/EarthModelStudio.dll index a21156a..3f12d9c 100644 Binary files a/src/test/dotnet/EarthModelStudio.Tests/bin/Debug/net8.0/EarthModelStudio.dll and b/src/test/dotnet/EarthModelStudio.Tests/bin/Debug/net8.0/EarthModelStudio.dll differ diff --git a/src/test/dotnet/EarthModelStudio.Tests/bin/Debug/net8.0/EarthModelStudio.pdb b/src/test/dotnet/EarthModelStudio.Tests/bin/Debug/net8.0/EarthModelStudio.pdb index 62dd546..670a155 100644 Binary files a/src/test/dotnet/EarthModelStudio.Tests/bin/Debug/net8.0/EarthModelStudio.pdb and b/src/test/dotnet/EarthModelStudio.Tests/bin/Debug/net8.0/EarthModelStudio.pdb differ diff --git a/src/test/dotnet/EarthModelStudio.Tests/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache b/src/test/dotnet/EarthModelStudio.Tests/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache index 6a21a8f..2c6e493 100644 --- a/src/test/dotnet/EarthModelStudio.Tests/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache +++ b/src/test/dotnet/EarthModelStudio.Tests/obj/Debug/net8.0/Avalonia/Resources.Inputs.cache @@ -1 +1 @@ -fa8aab6da0752869d5b064419c5343d5f8df7cabaaa7bbd73dfdf69471fe6d66 +53167376ca320a2883b3ea70457ba5caa49ab452af81a313044551fea9319e36 diff --git a/src/test/dotnet/EarthModelStudio.Tests/obj/Debug/net8.0/EarthModelStudio.Tests.AssemblyInfo.cs b/src/test/dotnet/EarthModelStudio.Tests/obj/Debug/net8.0/EarthModelStudio.Tests.AssemblyInfo.cs index f7afe2d..b4b4c3d 100644 --- a/src/test/dotnet/EarthModelStudio.Tests/obj/Debug/net8.0/EarthModelStudio.Tests.AssemblyInfo.cs +++ b/src/test/dotnet/EarthModelStudio.Tests/obj/Debug/net8.0/EarthModelStudio.Tests.AssemblyInfo.cs @@ -12,11 +12,11 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("NeoRF")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] -[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.3.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.3")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.4.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.4+5e0b46b3f3cd9800af177571c7809a7cdc8e9249")] [assembly: System.Reflection.AssemblyProductAttribute("Earth Model Studio")] [assembly: System.Reflection.AssemblyTitleAttribute("EarthModelStudio.Tests")] -[assembly: System.Reflection.AssemblyVersionAttribute("1.0.3.0")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.4.0")] [assembly: System.Resources.NeutralResourcesLanguageAttribute("zh-Hans")] // Generated by the MSBuild WriteCodeFragment class. diff --git a/src/test/dotnet/EarthModelStudio.Tests/obj/Debug/net8.0/EarthModelStudio.Tests.AssemblyInfoInputs.cache b/src/test/dotnet/EarthModelStudio.Tests/obj/Debug/net8.0/EarthModelStudio.Tests.AssemblyInfoInputs.cache index d42c984..517efcb 100644 --- a/src/test/dotnet/EarthModelStudio.Tests/obj/Debug/net8.0/EarthModelStudio.Tests.AssemblyInfoInputs.cache +++ b/src/test/dotnet/EarthModelStudio.Tests/obj/Debug/net8.0/EarthModelStudio.Tests.AssemblyInfoInputs.cache @@ -1 +1 @@ -078a7d27505fa14e604c6abddf8aea6dc3d4470dda04f6dbcf0670cb9f6cc952 +4b6b121978a0c654aebf9f2d493562b69270036a85ba315c6e2fedb654bb68dd diff --git a/src/test/dotnet/EarthModelStudio.Tests/obj/Debug/net8.0/EarthModelStudio.Tests.assets.cache b/src/test/dotnet/EarthModelStudio.Tests/obj/Debug/net8.0/EarthModelStudio.Tests.assets.cache index 8464fb9..aa4b820 100644 Binary files a/src/test/dotnet/EarthModelStudio.Tests/obj/Debug/net8.0/EarthModelStudio.Tests.assets.cache and b/src/test/dotnet/EarthModelStudio.Tests/obj/Debug/net8.0/EarthModelStudio.Tests.assets.cache differ diff --git a/src/test/dotnet/EarthModelStudio.Tests/obj/Debug/net8.0/EarthModelStudio.Tests.csproj.AssemblyReference.cache b/src/test/dotnet/EarthModelStudio.Tests/obj/Debug/net8.0/EarthModelStudio.Tests.csproj.AssemblyReference.cache index fcc96cf..38f800c 100644 Binary files a/src/test/dotnet/EarthModelStudio.Tests/obj/Debug/net8.0/EarthModelStudio.Tests.csproj.AssemblyReference.cache and b/src/test/dotnet/EarthModelStudio.Tests/obj/Debug/net8.0/EarthModelStudio.Tests.csproj.AssemblyReference.cache differ diff --git a/src/test/dotnet/EarthModelStudio.Tests/obj/Debug/net8.0/EarthModelStudio.Tests.dll b/src/test/dotnet/EarthModelStudio.Tests/obj/Debug/net8.0/EarthModelStudio.Tests.dll index 127a51f..87fc16b 100644 Binary files a/src/test/dotnet/EarthModelStudio.Tests/obj/Debug/net8.0/EarthModelStudio.Tests.dll and b/src/test/dotnet/EarthModelStudio.Tests/obj/Debug/net8.0/EarthModelStudio.Tests.dll differ diff --git a/src/test/dotnet/EarthModelStudio.Tests/obj/Debug/net8.0/EarthModelStudio.Tests.pdb b/src/test/dotnet/EarthModelStudio.Tests/obj/Debug/net8.0/EarthModelStudio.Tests.pdb index fc89b93..fa5c900 100644 Binary files a/src/test/dotnet/EarthModelStudio.Tests/obj/Debug/net8.0/EarthModelStudio.Tests.pdb and b/src/test/dotnet/EarthModelStudio.Tests/obj/Debug/net8.0/EarthModelStudio.Tests.pdb differ diff --git a/src/test/dotnet/EarthModelStudio.Tests/obj/Debug/net8.0/ref/EarthModelStudio.Tests.dll b/src/test/dotnet/EarthModelStudio.Tests/obj/Debug/net8.0/ref/EarthModelStudio.Tests.dll index e7a32e7..725c224 100644 Binary files a/src/test/dotnet/EarthModelStudio.Tests/obj/Debug/net8.0/ref/EarthModelStudio.Tests.dll and b/src/test/dotnet/EarthModelStudio.Tests/obj/Debug/net8.0/ref/EarthModelStudio.Tests.dll differ diff --git a/src/test/dotnet/EarthModelStudio.Tests/obj/Debug/net8.0/refint/EarthModelStudio.Tests.dll b/src/test/dotnet/EarthModelStudio.Tests/obj/Debug/net8.0/refint/EarthModelStudio.Tests.dll index e7a32e7..725c224 100644 Binary files a/src/test/dotnet/EarthModelStudio.Tests/obj/Debug/net8.0/refint/EarthModelStudio.Tests.dll and b/src/test/dotnet/EarthModelStudio.Tests/obj/Debug/net8.0/refint/EarthModelStudio.Tests.dll differ diff --git a/src/test/dotnet/EarthModelStudio.Tests/obj/EarthModelStudio.Tests.csproj.nuget.dgspec.json b/src/test/dotnet/EarthModelStudio.Tests/obj/EarthModelStudio.Tests.csproj.nuget.dgspec.json index eb3dbf4..087f80f 100644 --- a/src/test/dotnet/EarthModelStudio.Tests/obj/EarthModelStudio.Tests.csproj.nuget.dgspec.json +++ b/src/test/dotnet/EarthModelStudio.Tests/obj/EarthModelStudio.Tests.csproj.nuget.dgspec.json @@ -5,7 +5,7 @@ }, "projects": { "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj": { - "version": "1.0.3", + "version": "1.0.4", "restore": { "projectUniqueName": "/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj", "projectName": "EarthModelStudio.ModelSdk", @@ -72,7 +72,7 @@ } }, "/Users/morris/Downloads/GC#/src/main/dotnet/EarthModelStudio/EarthModelStudio.csproj": { - "version": "1.0.3", + "version": "1.0.4", "restore": { "projectUniqueName": "/Users/morris/Downloads/GC#/src/main/dotnet/EarthModelStudio/EarthModelStudio.csproj", "projectName": "EarthModelStudio", @@ -155,7 +155,7 @@ } }, "/Users/morris/Downloads/GC#/src/test/dotnet/EarthModelStudio.Tests/EarthModelStudio.Tests.csproj": { - "version": "1.0.3", + "version": "1.0.4", "restore": { "projectUniqueName": "/Users/morris/Downloads/GC#/src/test/dotnet/EarthModelStudio.Tests/EarthModelStudio.Tests.csproj", "projectName": "EarthModelStudio.Tests", diff --git a/src/test/dotnet/EarthModelStudio.Tests/obj/project.assets.json b/src/test/dotnet/EarthModelStudio.Tests/obj/project.assets.json index ce556f1..f9ae91c 100644 --- a/src/test/dotnet/EarthModelStudio.Tests/obj/project.assets.json +++ b/src/test/dotnet/EarthModelStudio.Tests/obj/project.assets.json @@ -548,7 +548,7 @@ "lib/net8.0/Tmds.DBus.Protocol.dll": {} } }, - "EarthModelStudio/1.0.3": { + "EarthModelStudio/1.0.4": { "type": "project", "framework": ".NETCoreApp,Version=v8.0", "dependencies": { @@ -556,7 +556,7 @@ "Avalonia.Desktop": "11.3.9", "Avalonia.Themes.Fluent": "11.3.9", "CommunityToolkit.Mvvm": "8.2.2", - "EarthModelStudio.ModelSdk": "1.0.3" + "EarthModelStudio.ModelSdk": "1.0.4" }, "compile": { "bin/placeholder/EarthModelStudio.dll": {} @@ -565,7 +565,7 @@ "bin/placeholder/EarthModelStudio.dll": {} } }, - "EarthModelStudio.ModelSdk/1.0.3": { + "EarthModelStudio.ModelSdk/1.0.4": { "type": "project", "framework": ".NETCoreApp,Version=v8.0", "dependencies": { @@ -1378,12 +1378,12 @@ "tmds.dbus.protocol.nuspec" ] }, - "EarthModelStudio/1.0.3": { + "EarthModelStudio/1.0.4": { "type": "project", "path": "../../../main/dotnet/EarthModelStudio/EarthModelStudio.csproj", "msbuildProject": "../../../main/dotnet/EarthModelStudio/EarthModelStudio.csproj" }, - "EarthModelStudio.ModelSdk/1.0.3": { + "EarthModelStudio.ModelSdk/1.0.4": { "type": "project", "path": "../../../../model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj", "msbuildProject": "../../../../model/_sdk/EarthModelStudio.ModelSdk/EarthModelStudio.ModelSdk.csproj" @@ -1393,14 +1393,14 @@ "net8.0": [ "Avalonia.Headless >= 11.3.9", "Avalonia.Skia >= 11.3.9", - "EarthModelStudio >= 1.0.3" + "EarthModelStudio >= 1.0.4" ] }, "packageFolders": { "/Users/morris/.nuget/packages/": {} }, "project": { - "version": "1.0.3", + "version": "1.0.4", "restore": { "projectUniqueName": "/Users/morris/Downloads/GC#/src/test/dotnet/EarthModelStudio.Tests/EarthModelStudio.Tests.csproj", "projectName": "EarthModelStudio.Tests", diff --git a/src/test/dotnet/EarthModelStudio.Tests/obj/project.nuget.cache b/src/test/dotnet/EarthModelStudio.Tests/obj/project.nuget.cache index ac818c6..7cc28e8 100644 --- a/src/test/dotnet/EarthModelStudio.Tests/obj/project.nuget.cache +++ b/src/test/dotnet/EarthModelStudio.Tests/obj/project.nuget.cache @@ -1,6 +1,6 @@ { "version": 2, - "dgSpecHash": "fh1wR2Ad3Ew=", + "dgSpecHash": "F7MS4KdlA0E=", "success": true, "projectFilePath": "/Users/morris/Downloads/GC#/src/test/dotnet/EarthModelStudio.Tests/EarthModelStudio.Tests.csproj", "expectedPackageFiles": [ diff --git a/version.json b/version.json index 04d80ad..b9bfdb2 100644 --- a/version.json +++ b/version.json @@ -1,52 +1,52 @@ { "schema": 1, - "generated": "2026-11-08T09:22:29Z", + "generated": "2026-11-08T10:13:50Z", "repository": "https://gitcode.com/2509_92447106/GC", "branch": "main", "modelDir": "model", "launcher": { - "version": "1.0.3", - "revision": "a75fbf4d57", + "version": "1.0.4", + "revision": "6283c8482f", "packages": { "win-x64": { "path": "dist/GC-win-x64.zip", - "url": "https://gitcode.com/2509_92447106/GC/releases/download/v1.0.3/GC-win-x64.zip" + "url": "https://gitcode.com/2509_92447106/GC/releases/download/v1.0.4/GC-win-x64.zip" }, "win-arm64": { "path": "dist/GC-win-arm64.zip", - "url": "https://gitcode.com/2509_92447106/GC/releases/download/v1.0.3/GC-win-arm64.zip" + "url": "https://gitcode.com/2509_92447106/GC/releases/download/v1.0.4/GC-win-arm64.zip" }, "osx-arm64": { "path": "dist/GC-osx-arm64.zip", - "url": "https://gitcode.com/2509_92447106/GC/releases/download/v1.0.3/GC-osx-arm64.zip" + "url": "https://gitcode.com/2509_92447106/GC/releases/download/v1.0.4/GC-osx-arm64.zip" }, "osx-x64": { "path": "dist/GC-osx-x64.zip", - "url": "https://gitcode.com/2509_92447106/GC/releases/download/v1.0.3/GC-osx-x64.zip" + "url": "https://gitcode.com/2509_92447106/GC/releases/download/v1.0.4/GC-osx-x64.zip" }, "linux-x64": { "path": "dist/GC-linux-x64.zip", - "url": "https://gitcode.com/2509_92447106/GC/releases/download/v1.0.3/GC-linux-x64.zip" + "url": "https://gitcode.com/2509_92447106/GC/releases/download/v1.0.4/GC-linux-x64.zip" } } }, "models": [ { "id": "earth-geography", - "version": "1.0", - "build": "883fdf6c57", + "version": "1.1", + "build": "1f9f80727b", "dir": "model/earth-geography" }, { "id": "earth-revolution", - "version": "1.0", - "build": "a24be3664d", + "version": "1.1", + "build": "455cb9e7c1", "dir": "model/earth-revolution" }, { "id": "earth-rotation", - "version": "1.0", - "build": "0bd5b4507c", + "version": "1.1", + "build": "895e07bcd4", "dir": "model/earth-rotation" } ]