Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
086303f9b7 | ||
|
|
68513876bc | ||
|
|
35d7b1f30c | ||
|
|
1b18c3d170 | ||
|
|
e12922ad92 | ||
|
|
cf6f839ada | ||
|
|
f8fc0f6018 | ||
|
|
e4ea4f054e | ||
|
|
639ff1ba57 | ||
|
|
d81ab2acaa | ||
|
|
ab39c5103d | ||
|
|
4c9b1f8cb7 | ||
|
|
6e23391339 | ||
|
|
5760fb77b0 | ||
|
|
153ea88f4f | ||
|
|
60113ab76e |
No files matched your search
+6
-8
@@ -1,22 +1,20 @@
|
|||||||
# 运行数据目录(settings/model/cache/update),绝不入库
|
|
||||||
.GC/
|
|
||||||
|
|
||||||
# .NET 构建中间产物(已跟踪的历史文件不动,只防新增)
|
|
||||||
bin/
|
bin/
|
||||||
obj/
|
obj/
|
||||||
|
build/
|
||||||
|
.GC/
|
||||||
|
*.user
|
||||||
|
.DS_Store
|
||||||
|
.vs/
|
||||||
.venv/
|
.venv/
|
||||||
venv/
|
venv/
|
||||||
env/
|
env/
|
||||||
.idea/
|
.idea/
|
||||||
.vscode/
|
.vscode/
|
||||||
.DS_Store
|
|
||||||
__pycache__/
|
__pycache__/
|
||||||
*.pyc
|
*.pyc
|
||||||
*.pyo
|
*.pyo
|
||||||
*.log
|
*.log
|
||||||
node_modules/
|
node_modules/
|
||||||
dist/
|
|
||||||
build/
|
|
||||||
.pytest_cache/
|
.pytest_cache/
|
||||||
.mypy_cache/
|
.mypy_cache/
|
||||||
|
dist/
|
||||||
@@ -0,0 +1,40 @@
|
|||||||
|
# 2026-11-07
|
||||||
|
|
||||||
|
## Earth Model Studio(新建项目)
|
||||||
|
- 用户要求:C#/.NET8(可切10),多目录结构(曾要求 gradle 命名,后明确改为标准 .NET 命名,勿再用 gradle 字样)
|
||||||
|
- 结构:src/main/dotnet + src/test/dotnet + src/main/resources + model/ + examples/ + dist/ + Directory.Build.props + build.sh/build.ps1
|
||||||
|
- 三平台一次性编译:`./build.sh publish` → dist/{mac-arm64(.app),win-x64,win-arm64},自包含单文件 + 内置 model/ + examples/
|
||||||
|
- 技术栈:Avalonia 11.3.9 + CommunityToolkit.Mvvm 8.2.2(本地 NuGet 已缓存);纯 CPU 球面像素渲染(SphereRaster + CelestialView)
|
||||||
|
- 模型格式:model/<id>/<id>.json + <id>.model/scene.json + land.json;模型源=git 仓库根的 model/ 目录(支持 github/gitlab/gitee zip 归档、git clone、本地目录)
|
||||||
|
- 内置模型:earth-rotation(自转)、earth-revolution(公转),land.json 手绘大陆轮廓已校验
|
||||||
|
- 校验:src/test/dotnet 用 Avalonia.Headless 渲染截图到 build/screenshots(页面+场景全通过,HUD 重叠已修)
|
||||||
|
- 已知小问题:RadialGradientBrush.Radius 过时警告;发布后 mac 单文件在沙箱内需 DOTNET_BUNDLE_EXTRACT_BASE_DIR 可写
|
||||||
|
|
||||||
|
## 修改(14:10 之后)
|
||||||
|
- 模型启动改为独立窗口:新增 Views/PlayerWindow.axaml(.cs),MainViewModel 只抛 PlayerRequested 事件,MainWindow 负责 Show(owner) 并维护 PlayerWindows 列表;PlayerViewModel 去掉 MainViewModel 依赖,改 CloseRequested + IDisposable;Esc/空格/F11 快捷键
|
||||||
|
- 分层:src=启动器(无模型数据、无预置模型源),model/=模型数据。移除 examples/,SettingsService 不再种内置源,AppPaths 去掉 ExamplesRoot 并新增 EMS_MODELS
|
||||||
|
- build.sh/build.ps1:publish 只建空 model/(仅 README),新增 pack-models → dist/models-1.0.0.zip
|
||||||
|
- model/README.md 写清模型格式规范
|
||||||
|
- 验证:离屏截图 page-player.png / page-main-while-playing.png,双窗口计数 2→关一个→1→0;三平台重新发布 + 模型 zip
|
||||||
|
|
||||||
|
## 架构重构(14:30 之后):启动器不再渲染,模型自带功能代码
|
||||||
|
- 新分层:src=启动器(扫描/下载/开窗,零渲染);model-sdk=契约;model-src=模型源码+封面工具;model=模型包(数据+dll+preview.png+i18n)
|
||||||
|
- 契约:IModelFactory(ApiVersion/Create) / IModelRuntime.CreateView(IModelContext) / IModelContext(ModelId/ModelDirectory/DataDirectory/Language/MemoryBudgetMb/RequestClose/Log)
|
||||||
|
- 加载:ModelHost + 可收集 AssemblyLoadContext,Sdk/Avalonia 走默认上下文,关窗 Unload
|
||||||
|
- 迁移:CelestialView/SphereRaster/LandMask/SceneDefinition/SceneRuntime → model-src/EarthModels(命名空间 NeoRF.EarthModels);PlayerView+PlayerViewModel 换成模型内 EarthModelView(C# 构建 UI)
|
||||||
|
- 模型包新增清单字段 assembly/type/preview/apiVersion;封面由 model-src/tools/PreviewGen 用模型渲染器生成
|
||||||
|
- 自转模型 views=["rotation"] → 无节气定位/无视图切换;公转 views=["revolution"] → 有节气、封面是公转场景
|
||||||
|
- 构建:./build.sh models 编译模型 dll + 生成封面;pack-models 先编译再打包
|
||||||
|
- 验证:EMS_SELFTEST=1 自检(dev + 发布包 /tmp 部署)两个模型均 OK;离屏截图含插件加载真实窗口
|
||||||
|
|
||||||
|
## 六项改动(15:00–15:35):真实贴图 / 缩放 / 拖动 / 动画 / 代码归位 / 进度条
|
||||||
|
- 目录:删除 model-src,根目录 model-sdk -> model/_sdk;现在根目录只有 src/ 与 model/。模型源码在 model/<id>/src/,共享引擎在 model/_engine/,契约在 model/_sdk/
|
||||||
|
- 清单 assembly 改为各模型自己的 dll:EarthRotationModel.dll / EarthRevolutionModel.dll(工厂仍是 NeoRF.EarthModels.*ModelFactory)
|
||||||
|
- 贴图:PlanetTexture 烘焙 1024×512 等经纬度纹理(海洋深度、沙漠/雨林/针叶林/苔原、极地冰盖、云层模糊、夜间辉光);反照率打包 uint[] Albedo
|
||||||
|
- 性能:地形梯度 SlopeEast/SlopeNorth 预烘焙(去掉每像素 4 次 SampleHeight + 6 次三角函数);海面高光 Pow 改乘法;运动时降分辨率 460 + 按帧耗时自适应 320–460,静止补 820 高清帧。实测公转播放 6ms、自转播放 ~18ms
|
||||||
|
- 交互:滚轮/工具栏 −100%+/⟲ 缩放 0.6–6×(缓动),暂停后拖动旋转地球或沿轨道移动、松手惯性;云层播放/暂停都缓慢漂移
|
||||||
|
- 动画:模型窗口淡入、按钮悬停 BrushTransition、教学面板滑入淡出;启动器页面切换淡入、按钮/卡片悬停过渡、进度条 DoubleTransition 平滑
|
||||||
|
- 进度条:契约新增 IModelRuntime.Prepare(后台)+ IModelContext.ReportProgress;ModelHost.LoadAsync 两阶段;LoadingWindow 显示真实阶段(读场景→烘焙纹理→构建界面)
|
||||||
|
- 打包:pack-models 排除 */bin/* */obj/*,避免把 107MB SkiaSharp native 打进包;模型包 356KB(含源码+dll+封面+i18n)
|
||||||
|
- 验证:离屏截图全部正常;反射校验缩放 1.00→1.25→1.00、暂停拖动=True、交互提示=True;自转无节气;发布包复制到 /tmp 自检两个模型 OK
|
||||||
|
- 产物:dist/mac-arm64 97M、win-x64 88M、win-arm64 94M(model/ 仅 README),dist/models-1.0.0.zip 356K
|
||||||
@@ -21,7 +21,7 @@
|
|||||||
-->
|
-->
|
||||||
<AvaloniaVersion>11.3.9</AvaloniaVersion>
|
<AvaloniaVersion>11.3.9</AvaloniaVersion>
|
||||||
<MvvmVersion>8.2.2</MvvmVersion>
|
<MvvmVersion>8.2.2</MvvmVersion>
|
||||||
<Version>1.0.4</Version>
|
<Version>1.0.2</Version>
|
||||||
<Company>NeoRF</Company>
|
<Company>NeoRF</Company>
|
||||||
<Product>Earth Model Studio</Product>
|
<Product>Earth Model Studio</Product>
|
||||||
<NeutralLanguage>zh-Hans</NeutralLanguage>
|
<NeutralLanguage>zh-Hans</NeutralLanguage>
|
||||||
|
|||||||
@@ -1,75 +1,228 @@
|
|||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Earth Model Studio 构建入口(Windows PowerShell,薄封装)
|
# Earth Model Studio 构建脚本(Windows PowerShell)
|
||||||
# 实际代码在 buildsh/ 里。Windows 上若无 sh,则走内置的最小实现。
|
#
|
||||||
# .\build.ps1 build | check | models | stamp | run | test | clean | doctor
|
# .\build.ps1 编译
|
||||||
|
# .\build.ps1 run 运行
|
||||||
|
# .\build.ps1 test 离屏渲染校验
|
||||||
|
# .\build.ps1 models 编译模型 dll + 生成封面 + 自动打版本
|
||||||
|
# .\build.ps1 stamp 只重新生成 version.json 与模型版本
|
||||||
|
# .\build.ps1 publish 编译三个平台启动器(不内置模型)+ 建立 .GC 运行目录
|
||||||
|
# .\build.ps1 pack-models 单独打包模型数据(含 version.json)
|
||||||
|
# .\build.ps1 pack-launcher 生成三个平台的启动器更新包 zip
|
||||||
|
# .\build.ps1 update-test 离线验证自动更新链路
|
||||||
|
# .\build.ps1 clean 清理
|
||||||
|
#
|
||||||
|
# 分层:src\ 只是启动器;模型全部在 model\;**发布包不内置模型**。
|
||||||
|
#
|
||||||
|
# 运行目录(发布包里就长这样):
|
||||||
|
# <安装目录>\
|
||||||
|
# EarthModelStudio.exe
|
||||||
|
# .GC\settings.json
|
||||||
|
# .GC\model\ 启动时从 gitcode 下载的模型
|
||||||
|
# .GC\cache\ 下载暂存
|
||||||
|
# .GC\update\ 待下次启动应用的启动器更新
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
param(
|
param(
|
||||||
[Parameter(Position = 0)]
|
[Parameter(Position = 0)]
|
||||||
[ValidateSet('build','check','models','stamp','pack-models','pack-launcher',
|
[ValidateSet('build', 'run', 'test', 'publish', 'models', 'stamp', 'pack-models',
|
||||||
'run','test','update-test','clean','doctor','dist')]
|
'pack-launcher', 'update-test', 'bundle', 'clean', 'doctor')]
|
||||||
[string]$Task = 'build'
|
[string]$Task = 'build'
|
||||||
)
|
)
|
||||||
|
|
||||||
$ErrorActionPreference = 'Stop'
|
$ErrorActionPreference = 'Stop'
|
||||||
$Root = $PSScriptRoot
|
$Root = $PSScriptRoot
|
||||||
Set-Location $Root
|
Set-Location $Root
|
||||||
|
|
||||||
|
# Avalonia 遥测任务在只读用户目录/CI/沙箱会因写日志失败而中断编译(MSB4018)。
|
||||||
|
# 官方 opt-out;Directory.Build.targets 里还有一层项目内的兜底。
|
||||||
$env:AVALONIA_TELEMETRY_OPTOUT = '1'
|
$env:AVALONIA_TELEMETRY_OPTOUT = '1'
|
||||||
|
|
||||||
$AppProj = 'src/main/dotnet/EarthModelStudio/EarthModelStudio.csproj'
|
$AppProj = 'src/main/dotnet/EarthModelStudio/EarthModelStudio.csproj'
|
||||||
$TestProj = 'src/test/dotnet/EarthModelStudio.Tests/EarthModelStudio.Tests.csproj'
|
$TestProj = 'src/test/dotnet/EarthModelStudio.Tests/EarthModelStudio.Tests.csproj'
|
||||||
$StampProj= 'model/_engine/VersionStamp/VersionStamp.csproj'
|
$PreviewProj = 'model/_engine/PreviewGen/PreviewGen.csproj'
|
||||||
$Sln = 'EarthModelStudio.sln'
|
$StampProj = 'model/_engine/VersionStamp/VersionStamp.csproj'
|
||||||
$Version = ([regex]::Match((Get-Content Directory.Build.props -Raw), '<Version>(.*?)</Version>')).Groups[1].Value
|
$Sln = 'EarthModelStudio.sln'
|
||||||
if (-not $Version) { $Version = '1.0.0' }
|
$Version = '1.0.2'
|
||||||
New-Item -ItemType Directory -Force -Path "$Root/build/logs" | Out-Null
|
|
||||||
|
|
||||||
# 优先复用 buildsh 的 shell 实现(Git Bash / WSL / sh 可用时)
|
function Stamp-Versions {
|
||||||
$sh = Get-Command sh -ErrorAction SilentlyContinue
|
Write-Host '==> 自动计算模型版本并生成 version.json'
|
||||||
if ($sh) {
|
dotnet run --project $StampProj -c Release -- $Root $Version
|
||||||
& $sh.Source "$Root/build.sh" $Task
|
|
||||||
exit $LASTEXITCODE
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function Stamp { dotnet run --project $StampProj -c Release -- $Root $Version }
|
|
||||||
function Build-Models {
|
function Build-Models {
|
||||||
|
Write-Host '==> 编译模型功能程序集(源码就在各模型目录的 src\ 里)'
|
||||||
Get-ChildItem "$Root/model" -Directory | ForEach-Object {
|
Get-ChildItem "$Root/model" -Directory | ForEach-Object {
|
||||||
$id = $_.Name
|
$id = $_.Name
|
||||||
$src = Join-Path $_.FullName 'src'
|
$src = Join-Path $_.FullName 'src'
|
||||||
if (-not (Test-Path $src)) { return }
|
if (-not (Test-Path $src)) { return }
|
||||||
$proj = Get-ChildItem $src -Filter *.csproj | Select-Object -First 1
|
$proj = Get-ChildItem $src -Filter *.csproj | Select-Object -First 1
|
||||||
if (-not $proj) { return }
|
if ($null -eq $proj) { return }
|
||||||
dotnet build $proj.FullName -c Release
|
dotnet build $proj.FullName -c Release
|
||||||
|
$data = Join-Path $_.FullName "$id.model"
|
||||||
|
if (Test-Path $data) {
|
||||||
|
Get-ChildItem (Join-Path $src 'bin/Release/net8.0') -Filter *.dll | ForEach-Object {
|
||||||
|
if ($_.Name -eq 'EarthModelStudio.ModelSdk.dll') { return }
|
||||||
|
Copy-Item -Force $_.FullName $data
|
||||||
|
Write-Host " -> model/$id/$id.model/$($_.Name)"
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Stamp
|
Write-Host '==> 用模型自己的渲染器生成封面'
|
||||||
|
dotnet run --project $PreviewProj -c Release -- $Root
|
||||||
|
Stamp-Versions
|
||||||
|
}
|
||||||
|
|
||||||
|
# 发布目录只放启动器 + 空的 .GC 运行骨架,绝不放模型
|
||||||
|
function Prepare-RuntimeLayout([string]$RelDir) {
|
||||||
|
$dest = "$Root/$RelDir"
|
||||||
|
if (-not (Test-Path $dest)) { return }
|
||||||
|
foreach ($old in @("$dest/model", "$dest/examples")) {
|
||||||
|
if (Test-Path $old) { Remove-Item -Recurse -Force $old }
|
||||||
|
}
|
||||||
|
foreach ($dir in @("$dest/.GC/model", "$dest/.GC/cache", "$dest/.GC/update")) {
|
||||||
|
New-Item -ItemType Directory -Force -Path $dir | Out-Null
|
||||||
|
}
|
||||||
|
$readme = @'
|
||||||
|
模型库目录(.GC/model/)
|
||||||
|
启动时程序会读取 gitcode 仓库的 version.json,把最新版模型下载到这里。
|
||||||
|
离线使用也可以手动放入 <模型id>/<模型id>.json + <模型id>/<模型id>.model/。
|
||||||
|
|
||||||
|
运行目录:
|
||||||
|
<可执行文件>
|
||||||
|
.GC/settings.json
|
||||||
|
.GC/model/ 本目录(下载的模型)
|
||||||
|
.GC/cache/ 下载暂存
|
||||||
|
.GC/update/ 待下次启动应用的启动器更新
|
||||||
|
'@
|
||||||
|
Set-Content -Path "$dest/.GC/model/README.txt" -Value $readme -Encoding UTF8
|
||||||
|
|
||||||
|
$settingsPath = "$dest/.GC/settings.json"
|
||||||
|
if (-not (Test-Path $settingsPath)) {
|
||||||
|
$json = @'
|
||||||
|
{
|
||||||
|
"language": "auto",
|
||||||
|
"theme": "light",
|
||||||
|
"renderFps": 30,
|
||||||
|
"memoryMb": 2048,
|
||||||
|
"autoUpdateOnStartup": true,
|
||||||
|
"updateRepository": "https://gitcode.com/2509_92447106/GC",
|
||||||
|
"updateManifestUrl": "",
|
||||||
|
"updateLocalRoot": "",
|
||||||
|
"installedModelVersions": {},
|
||||||
|
"launcherVersion": "",
|
||||||
|
"pendingLauncherVersion": "",
|
||||||
|
"lastUpdateCheck": "",
|
||||||
|
"sources": [],
|
||||||
|
"recentModels": []
|
||||||
|
}
|
||||||
|
'@
|
||||||
|
Set-Content -Path $settingsPath -Value $json -Encoding UTF8
|
||||||
|
}
|
||||||
|
Write-Host " 运行目录 -> $RelDir/.GC (settings.json + model/ + cache/ + update/)"
|
||||||
|
}
|
||||||
|
|
||||||
|
function Publish-Rid([string]$Rid, [string]$OutDir) {
|
||||||
|
Write-Host "==> 编译 $Rid -> $OutDir"
|
||||||
|
# 先删旧产物目录,避免残留文件混进新包
|
||||||
|
if (Test-Path "$Root/$OutDir") { Remove-Item -Recurse -Force "$Root/$OutDir" }
|
||||||
|
dotnet publish $AppProj -c Release -r $Rid --self-contained true `
|
||||||
|
-p:Version=$Version -p:DebugType=none -p:PublishSingleFile=true `
|
||||||
|
-p:IncludeNativeLibrariesForSelfExtract=true -p:PublishTrimmed=false -o "$Root/$OutDir"
|
||||||
|
foreach ($old in @("$Root/$OutDir/model", "$Root/$OutDir/examples")) {
|
||||||
|
if (Test-Path $old) { Remove-Item -Recurse -Force $old }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function Pack-Models {
|
||||||
|
New-Item -ItemType Directory -Force -Path "$Root/dist" | Out-Null
|
||||||
|
$zip = "$Root/dist/models-$Version.zip"
|
||||||
|
if (Test-Path $zip) { Remove-Item -Force $zip }
|
||||||
|
Write-Host "==> 打包模型数据 -> dist/models-$Version.zip"
|
||||||
|
$stage = Join-Path $env:TEMP "ems-models-stage"
|
||||||
|
if (Test-Path $stage) { Remove-Item -Recurse -Force $stage }
|
||||||
|
New-Item -ItemType Directory -Force -Path $stage | Out-Null
|
||||||
|
Get-ChildItem "$Root/model" -Recurse -File | Where-Object {
|
||||||
|
$_.FullName -notmatch '\\(bin|obj)\\' -and $_.Extension -ne '.user'
|
||||||
|
} | ForEach-Object {
|
||||||
|
$rel = $_.FullName.Substring("$Root/model".Length + 1)
|
||||||
|
$dest = Join-Path $stage $rel
|
||||||
|
New-Item -ItemType Directory -Force -Path (Split-Path $dest) | Out-Null
|
||||||
|
Copy-Item -Force $_.FullName $dest
|
||||||
|
}
|
||||||
|
Compress-Archive -Path "$stage/*" -DestinationPath $zip -Force
|
||||||
|
Remove-Item -Recurse -Force $stage
|
||||||
|
}
|
||||||
|
|
||||||
|
# 启动器更新包:只包含程序文件,排除 .GC(否则会覆盖用户模型与设置)
|
||||||
|
function Pack-Launcher {
|
||||||
|
Write-Host '==> 生成启动器更新包(不含 .GC)'
|
||||||
|
$targets = @{
|
||||||
|
'GC-win-x64.zip' = "$Root/dist/win-x64"
|
||||||
|
'GC-win-arm64.zip' = "$Root/dist/win-arm64"
|
||||||
|
'GC-osx-arm64.zip' = "$Root/dist/mac-arm64/EarthModelStudio.app/Contents/MacOS"
|
||||||
|
}
|
||||||
|
if (-not (Test-Path $targets['GC-osx-arm64.zip'])) {
|
||||||
|
$targets['GC-osx-arm64.zip'] = "$Root/dist/mac-arm64"
|
||||||
|
}
|
||||||
|
foreach ($name in $targets.Keys) {
|
||||||
|
$src = $targets[$name]
|
||||||
|
if (-not (Test-Path $src)) { continue }
|
||||||
|
$stage = Join-Path $env:TEMP ("ems-launcher-" + [IO.Path]::GetFileNameWithoutExtension($name))
|
||||||
|
if (Test-Path $stage) { Remove-Item -Recurse -Force $stage }
|
||||||
|
New-Item -ItemType Directory -Force -Path $stage | Out-Null
|
||||||
|
Get-ChildItem $src -Recurse -File | Where-Object {
|
||||||
|
$_.FullName -notmatch '\\\.GC\\' -and $_.Name -ne '.DS_Store'
|
||||||
|
} | ForEach-Object {
|
||||||
|
$rel = $_.FullName.Substring($src.Length).TrimStart('\', '/')
|
||||||
|
$dest = Join-Path $stage $rel
|
||||||
|
New-Item -ItemType Directory -Force -Path (Split-Path $dest) | Out-Null
|
||||||
|
Copy-Item -Force $_.FullName $dest
|
||||||
|
}
|
||||||
|
$zip = "$Root/dist/$name"
|
||||||
|
if (Test-Path $zip) { Remove-Item -Force $zip }
|
||||||
|
Compress-Archive -Path "$stage/*" -DestinationPath $zip -Force
|
||||||
|
Remove-Item -Recurse -Force $stage
|
||||||
|
}
|
||||||
|
Stamp-Versions
|
||||||
|
Get-ChildItem "$Root/dist/GC-*.zip" | Select-Object Name, Length
|
||||||
}
|
}
|
||||||
|
|
||||||
switch ($Task) {
|
switch ($Task) {
|
||||||
'build' {
|
'build' {
|
||||||
Write-Host '==> 编译三平台(进度见 buildsh/lib/progress.sh,建议用 Git Bash 运行 ./build.sh build)'
|
Get-ChildItem "$Root/dist/GC-*.zip","$Root/dist/models-*.zip" -ErrorAction SilentlyContinue |
|
||||||
Remove-Item -Recurse -Force "$Root/dist" -ErrorAction SilentlyContinue
|
Remove-Item -Force
|
||||||
New-Item -ItemType Directory -Force -Path "$Root/dist" | Out-Null
|
|
||||||
Stamp
|
|
||||||
foreach ($rid in @('osx-arm64','win-x64','win-arm64')) {
|
|
||||||
dotnet publish $AppProj -c Release -r $rid --self-contained true `
|
|
||||||
-p:Version=$Version -p:DebugType=none -p:PublishSingleFile=true `
|
|
||||||
-p:IncludeNativeLibrariesForSelfExtract=true -p:PublishTrimmed=false `
|
|
||||||
-o "$Root/dist/$rid"
|
|
||||||
}
|
|
||||||
Write-Host '==> 完成(详细打包请用 ./build.sh build)'
|
|
||||||
}
|
|
||||||
'check' {
|
|
||||||
dotnet build $Sln -c Debug
|
dotnet build $Sln -c Debug
|
||||||
$env:EMS_SELFTEST = '1'; dotnet run --project $AppProj -c Debug --no-build; Remove-Item Env:\EMS_SELFTEST
|
|
||||||
dotnet run --project $TestProj -c Debug --no-build -- "$Root/build/screenshots"
|
|
||||||
}
|
}
|
||||||
'models' { Build-Models }
|
'run' { dotnet run --project $AppProj -c Debug }
|
||||||
'stamp' { Stamp }
|
'test' { dotnet run --project $TestProj -c Debug -- "$Root/build/screenshots" }
|
||||||
'pack-models' { Build-Models }
|
'publish' {
|
||||||
'pack-launcher' { Write-Host '请用 ./build.sh pack-launcher' }
|
# 先清理 dist 旧产物,再重新生成
|
||||||
'run' { dotnet run --project $AppProj -c Debug }
|
if (Test-Path "$Root/dist") { Remove-Item -Recurse -Force "$Root/dist" }
|
||||||
'test' { dotnet run --project $TestProj -c Debug -- "$Root/build/screenshots" }
|
New-Item -ItemType Directory -Force -Path "$Root/dist" | Out-Null
|
||||||
|
Stamp-Versions
|
||||||
|
Publish-Rid 'osx-arm64' 'dist/mac-arm64'
|
||||||
|
Publish-Rid 'win-x64' 'dist/win-x64'
|
||||||
|
Publish-Rid 'win-arm64' 'dist/win-arm64'
|
||||||
|
Prepare-RuntimeLayout 'dist/win-x64'
|
||||||
|
Prepare-RuntimeLayout 'dist/win-arm64'
|
||||||
|
Prepare-RuntimeLayout 'dist/mac-arm64'
|
||||||
|
Pack-Launcher
|
||||||
|
Write-Host '==> 三个平台编译完成(发布包不含模型,首次启动自动下载),见 dist\' -ForegroundColor Green
|
||||||
|
Write-Host ' 把 version.json / model/ 推送到 gitcode,启动器就会自动检查更新'
|
||||||
|
}
|
||||||
|
'models' { Build-Models }
|
||||||
|
'stamp' { Stamp-Versions }
|
||||||
|
'bundle' { Write-Host '已弃用:发布包不再内置模型。请改用 .\build.ps1 stamp 与 gitcode 自动更新。' }
|
||||||
|
'pack-models' {
|
||||||
|
Build-Models
|
||||||
|
Pack-Models
|
||||||
|
}
|
||||||
|
'pack-launcher' { Pack-Launcher }
|
||||||
'update-test' { dotnet run --project $TestProj -c Debug -- '--update-test' $Root }
|
'update-test' { dotnet run --project $TestProj -c Debug -- '--update-test' $Root }
|
||||||
'clean' { Remove-Item -Recurse -Force "$Root/build","$Root/dist" -ErrorAction SilentlyContinue; Write-Host '==> 已清理' }
|
'clean' {
|
||||||
'doctor' { dotnet --info | Select-Object -First 20 }
|
Remove-Item -Recurse -Force "$Root/build", "$Root/dist" -ErrorAction SilentlyContinue
|
||||||
'dist' { Get-ChildItem "$Root/dist" -ErrorAction SilentlyContinue }
|
Get-ChildItem "$Root/src" -Recurse -Directory -Include bin, obj |
|
||||||
|
Remove-Item -Recurse -Force -ErrorAction SilentlyContinue
|
||||||
|
}
|
||||||
|
'doctor' { dotnet --info }
|
||||||
}
|
}
|
||||||
@@ -1,21 +1,33 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Earth Model Studio 构建入口(薄封装)
|
# Earth Model Studio 构建脚本(macOS / Linux)
|
||||||
#
|
#
|
||||||
# ./build.sh build 完整发布(原 publish),带 apt 风格进度条
|
# ./build.sh build 编译(Debug)
|
||||||
# ./build.sh check 验证:编译 + 自检 + 离屏渲染 + 产物
|
# ./build.sh run 本机运行
|
||||||
# ./build.sh models 编译模型 dll + 封面 + 版本戳
|
# ./build.sh test 离屏渲染校验,截图输出到 build/screenshots
|
||||||
# ./build.sh stamp 重新生成 version.json
|
# ./build.sh models 编译模型 dll + 生成封面 + 自动打版本
|
||||||
# ./build.sh run / test / update-test / pack-models / pack-launcher
|
# ./build.sh stamp 只重新生成 version.json 与模型版本
|
||||||
# ./build.sh clean 清理
|
# ./build.sh publish 编译三个平台启动器(不内置模型)+ 建立 .GC 运行目录
|
||||||
# ./build.sh doctor dotnet 信息
|
# ./build.sh pack-models 单独打包模型数据(含 version.json)
|
||||||
# ./build.sh dist 列出产物
|
# ./build.sh pack-launcher 生成三个平台的启动器更新包 zip
|
||||||
|
# ./build.sh update-test 离线验证自动更新链路
|
||||||
|
# ./build.sh clean 清理
|
||||||
#
|
#
|
||||||
# 实际代码都在 buildsh/ 里,本文件只负责加载模块与分发。
|
# 分层:src/ 只是启动器;模型全部在 model/;**发布包不内置模型**。
|
||||||
|
#
|
||||||
|
# 运行目录(发布包里就长这样):
|
||||||
|
# <安装目录>/
|
||||||
|
# EarthModelStudio(.exe | .app/...)
|
||||||
|
# .GC/
|
||||||
|
# settings.json 设置与已安装版本
|
||||||
|
# model/ 启动时从 gitcode 下载的模型
|
||||||
|
# cache/ 下载暂存
|
||||||
|
# update/ 待下次启动应用的启动器更新
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
# Avalonia 遥测任务在只读用户目录/CI/沙箱会因写日志失败中断编译(MSB4018)
|
# Avalonia 遥测任务在只读用户目录/CI/沙箱会因写日志失败而中断编译(MSB4018)。
|
||||||
|
# 官方 opt-out;Directory.Build.targets 里还有一层项目内的兜底。
|
||||||
export AVALONIA_TELEMETRY_OPTOUT=1
|
export AVALONIA_TELEMETRY_OPTOUT=1
|
||||||
|
|
||||||
ROOT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
|
ROOT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
|
||||||
@@ -26,39 +38,295 @@ PREVIEW_PROJ="model/_engine/PreviewGen/PreviewGen.csproj"
|
|||||||
STAMP_PROJ="model/_engine/VersionStamp/VersionStamp.csproj"
|
STAMP_PROJ="model/_engine/VersionStamp/VersionStamp.csproj"
|
||||||
TEST_PROJ="src/test/dotnet/EarthModelStudio.Tests/EarthModelStudio.Tests.csproj"
|
TEST_PROJ="src/test/dotnet/EarthModelStudio.Tests/EarthModelStudio.Tests.csproj"
|
||||||
SLN="EarthModelStudio.sln"
|
SLN="EarthModelStudio.sln"
|
||||||
VERSION=$(sed -n 's/.*<Version>\(.*\)<\/Version>.*/\1/p' Directory.Build.props | head -1)
|
VERSION="1.0.2"
|
||||||
[ -n "$VERSION" ] || VERSION="1.0.0"
|
|
||||||
|
|
||||||
TASK="${1:-build}"
|
TASK="${1:-build}"
|
||||||
shift 2>/dev/null || true
|
|
||||||
|
|
||||||
# 解析 -version=<版本号>(也接受 --version=)
|
# 按模型包内容指纹自动写回 <id>.json 的 version,并生成 version.json
|
||||||
CLI_VERSION=""
|
stamp_versions() {
|
||||||
for arg in "$@"; do
|
echo "==> 自动计算模型版本并生成 version.json"
|
||||||
case "$arg" in
|
dotnet run --project "$STAMP_PROJ" -c Release -- "$ROOT_DIR" "$VERSION"
|
||||||
-version=*|--version=*) CLI_VERSION="${arg#*=}" ;;
|
}
|
||||||
esac
|
|
||||||
done
|
# 编译模型自己的功能程序集,并把 dll / 封面直接写进模型包
|
||||||
if [ -n "$CLI_VERSION" ]; then
|
build_models() {
|
||||||
VERSION="$CLI_VERSION"
|
echo "==> 编译模型功能程序集(源码就在各模型目录的 src/ 里)"
|
||||||
# 写回 Directory.Build.props,让程序集版本与关于页显示一致
|
for DIR in "$ROOT_DIR"/model/*/; do
|
||||||
if [ -f Directory.Build.props ]; then
|
ID=$(basename "$DIR")
|
||||||
sed -i.bak "s|<Version>[^<]*</Version>|<Version>${VERSION}</Version>|" Directory.Build.props
|
[ -d "$DIR/src" ] || continue
|
||||||
rm -f Directory.Build.props.bak
|
PROJ=$(ls "$DIR"src/*.csproj 2>/dev/null | head -1)
|
||||||
|
[ -n "$PROJ" ] || continue
|
||||||
|
dotnet build "$PROJ" -c Release
|
||||||
|
if [ -d "$DIR$ID.model" ]; then
|
||||||
|
for DLL in "$DIR"src/bin/Release/net8.0/*.dll; do
|
||||||
|
[ -f "$DLL" ] || continue
|
||||||
|
NAME=$(basename "$DLL")
|
||||||
|
[ "$NAME" = "EarthModelStudio.ModelSdk.dll" ] && continue
|
||||||
|
cp "$DLL" "$DIR$ID.model/"
|
||||||
|
echo " -> model/$ID/$ID.model/$NAME"
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
echo "==> 用模型自己的渲染器生成封面"
|
||||||
|
dotnet run --project "$PREVIEW_PROJ" -c Release -- "$ROOT_DIR"
|
||||||
|
stamp_versions
|
||||||
|
}
|
||||||
|
|
||||||
|
# 发布目录只放启动器 + 空的 .GC 运行骨架,绝不放模型
|
||||||
|
prepare_runtime_layout() {
|
||||||
|
REL="$1"
|
||||||
|
DEST="$ROOT_DIR/$REL"
|
||||||
|
[ -d "$DEST" ] || return 0
|
||||||
|
rm -rf "$DEST/model" "$DEST/examples"
|
||||||
|
mkdir -p "$DEST/.GC/model" "$DEST/.GC/cache" "$DEST/.GC/update"
|
||||||
|
cat > "$DEST/.GC/model/README.txt" <<'TXT'
|
||||||
|
模型库目录(.GC/model/)
|
||||||
|
启动时程序会读取 gitcode 仓库的 version.json,把最新版模型下载到这里。
|
||||||
|
离线使用也可以手动放入 <模型id>/<模型id>.json + <模型id>/<模型id>.model/。
|
||||||
|
|
||||||
|
运行目录:
|
||||||
|
<可执行文件>
|
||||||
|
.GC/settings.json
|
||||||
|
.GC/model/ 本目录(下载的模型)
|
||||||
|
.GC/cache/ 下载暂存
|
||||||
|
.GC/update/ 待下次启动应用的启动器更新
|
||||||
|
TXT
|
||||||
|
if [ ! -f "$DEST/.GC/settings.json" ]; then
|
||||||
|
cat > "$DEST/.GC/settings.json" <<'JSON'
|
||||||
|
{
|
||||||
|
"language": "auto",
|
||||||
|
"theme": "light",
|
||||||
|
"renderFps": 30,
|
||||||
|
"memoryMb": 2048,
|
||||||
|
"autoUpdateOnStartup": true,
|
||||||
|
"updateRepository": "https://gitcode.com/2509_92447106/GC",
|
||||||
|
"updateManifestUrl": "",
|
||||||
|
"updateLocalRoot": "",
|
||||||
|
"installedModelVersions": {},
|
||||||
|
"launcherVersion": "",
|
||||||
|
"pendingLauncherVersion": "",
|
||||||
|
"lastUpdateCheck": "",
|
||||||
|
"sources": [],
|
||||||
|
"recentModels": []
|
||||||
|
}
|
||||||
|
JSON
|
||||||
fi
|
fi
|
||||||
echo "==> 版本号设为 ${VERSION}"
|
echo " 运行目录 -> $REL/.GC (settings.json + model/ + cache/ + update/)"
|
||||||
fi
|
}
|
||||||
mkdir -p "$ROOT_DIR/build/logs"
|
|
||||||
|
|
||||||
# 加载 buildsh 模块
|
# $1=RID $2=输出目录 $3=singlefile(true/false)
|
||||||
. "$ROOT_DIR/buildsh/lib/progress.sh"
|
publish_rid() {
|
||||||
. "$ROOT_DIR/buildsh/lib/build_funcs.sh"
|
RID="$1"; OUT="$2"; SINGLE="${3:-true}"
|
||||||
. "$ROOT_DIR/buildsh/build.sh"
|
echo ""
|
||||||
. "$ROOT_DIR/buildsh/check.sh"
|
echo "==> 编译 ${RID} (single-file=${SINGLE}) -> ${OUT}"
|
||||||
. "$ROOT_DIR/buildsh/tools.sh"
|
# 先删旧产物,避免上次 publish 的残留文件混进新包
|
||||||
|
rm -rf "$ROOT_DIR/$OUT"
|
||||||
|
dotnet publish "$APP_PROJ" \
|
||||||
|
-c Release \
|
||||||
|
-r "$RID" \
|
||||||
|
--self-contained true \
|
||||||
|
-p:Version="$VERSION" \
|
||||||
|
-p:DebugType=none \
|
||||||
|
-p:PublishSingleFile="$SINGLE" \
|
||||||
|
-p:IncludeNativeLibrariesForSelfExtract="$SINGLE" \
|
||||||
|
-p:PublishTrimmed=false \
|
||||||
|
-o "$ROOT_DIR/$OUT"
|
||||||
|
rm -rf "$ROOT_DIR/$OUT/model" "$ROOT_DIR/$OUT/examples"
|
||||||
|
}
|
||||||
|
|
||||||
|
# 把 model/ 里的模型数据单独打包(与启动器分开分发)
|
||||||
|
pack_models() {
|
||||||
|
mkdir -p "$ROOT_DIR/dist"
|
||||||
|
ZIP="$ROOT_DIR/dist/models-$VERSION.zip"
|
||||||
|
rm -f "$ZIP"
|
||||||
|
echo "==> 打包模型数据 -> dist/models-$VERSION.zip"
|
||||||
|
( cd "$ROOT_DIR" && zip -qr "$ZIP" model \
|
||||||
|
-x "*.DS_Store" "*/bin/*" "*/obj/*" "*.user" )
|
||||||
|
du -sh "$ZIP"
|
||||||
|
}
|
||||||
|
|
||||||
|
# 启动器更新包:只包含程序文件,排除 .GC(否则会覆盖用户已下载的模型与设置)
|
||||||
|
# 产物命名:GC-<版本>-<系统>-<架构>.exe / GC-<版本>-<系统>-<架构>.app.zip
|
||||||
|
# Windows: 单文件 exe 直接改名(本身就是可执行产物)
|
||||||
|
# macOS: .app 必须打成 zip 才能作为单文件分发;文件名用 .app.zip,
|
||||||
|
# 这样 macOS 双击会用归档工具解压出可运行的 .app。
|
||||||
|
# 若直接命名 .app,系统会把 zip 当成应用包解析 => 报「已损坏/打不开」。
|
||||||
|
pack_launcher() {
|
||||||
|
echo "==> 生成启动器产物(GC-<版本>-<系统>-<架构>)"
|
||||||
|
|
||||||
|
# --- Windows:exe 单文件 ---
|
||||||
|
for pair in "win-x64:win-amd64" "win-arm64:win-arm64"; do
|
||||||
|
RID="${pair%%:*}"; LABEL="${pair##*:}"
|
||||||
|
SRC="$ROOT_DIR/dist/$RID"
|
||||||
|
[ -d "$SRC" ] || continue
|
||||||
|
EXE=$(ls "$SRC"/*.exe 2>/dev/null | head -1)
|
||||||
|
[ -n "$EXE" ] || continue
|
||||||
|
DEST="$ROOT_DIR/dist/GC-${VERSION}-${LABEL}.exe"
|
||||||
|
cp "$EXE" "$DEST"
|
||||||
|
chmod +x "$DEST"
|
||||||
|
echo " -> $(basename "$DEST")"
|
||||||
|
done
|
||||||
|
|
||||||
|
# --- macOS:打包成 zip -> 解压回来 -> 改名 -> 删除 zip ---
|
||||||
|
# 这样 dist 里得到的是一个可直接双击运行的真实 .app 目录,
|
||||||
|
# 而 zip 只是保证权限/符号链接不丢的中间载体,用完即删。
|
||||||
|
MACAPP="$ROOT_DIR/dist/mac-arm64/EarthModelStudio.app"
|
||||||
|
if [ -d "$MACAPP" ]; then
|
||||||
|
FINAL="$ROOT_DIR/dist/GC-${VERSION}-mac-arm64.app"
|
||||||
|
TMPZIP="$ROOT_DIR/dist/.gc-mac-tmp.zip"
|
||||||
|
WORK="$ROOT_DIR/dist/.gc-mac-work"
|
||||||
|
|
||||||
|
rm -rf "$FINAL" "$WORK" "$TMPZIP"
|
||||||
|
mkdir -p "$WORK"
|
||||||
|
|
||||||
|
# 1) 打包(ditto 保留可执行权限与符号链接,比 zip -y 可靠)
|
||||||
|
if command -v ditto >/dev/null 2>&1; then
|
||||||
|
ditto -c -k --sequesterRsrc --keepParent "$MACAPP" "$TMPZIP"
|
||||||
|
else
|
||||||
|
( cd "$(dirname "$MACAPP")" && zip -qry "$TMPZIP" "$(basename "$MACAPP")" -x "*.DS_Store" )
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 2) 解压到工作目录
|
||||||
|
if command -v ditto >/dev/null 2>&1; then
|
||||||
|
ditto -x -k "$TMPZIP" "$WORK"
|
||||||
|
else
|
||||||
|
( cd "$WORK" && unzip -q "$TMPZIP" )
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 3) 改名为发布名(保持 .app 是目录)
|
||||||
|
SRCAPP="$WORK/EarthModelStudio.app"
|
||||||
|
if [ -d "$SRCAPP" ]; then
|
||||||
|
mv "$SRCAPP" "$FINAL"
|
||||||
|
chmod +x "$FINAL/Contents/MacOS/EarthModelStudio" 2>/dev/null || true
|
||||||
|
# 同步 Info.plist 的显示名,避免 Finder 里显示旧名
|
||||||
|
PLIST="$FINAL/Contents/Info.plist"
|
||||||
|
if [ -f "$PLIST" ]; then
|
||||||
|
/usr/libexec/PlistBuddy -c "Set :CFBundleName Morris GC" "$PLIST" 2>/dev/null || true
|
||||||
|
/usr/libexec/PlistBuddy -c "Set :CFBundleDisplayName Morris GC" "$PLIST" 2>/dev/null || true
|
||||||
|
fi
|
||||||
|
# 去掉隔离属性,避免 Gatekeeper 误拦(本地构建产物)
|
||||||
|
xattr -cr "$FINAL" 2>/dev/null || true
|
||||||
|
echo " -> $(basename "$FINAL")/ (目录)"
|
||||||
|
else
|
||||||
|
echo " !! macOS 打包失败:解压后未找到 EarthModelStudio.app" >&2
|
||||||
|
fi
|
||||||
|
|
||||||
|
# 4) 删除 zip 与工作目录
|
||||||
|
rm -rf "$WORK" "$TMPZIP"
|
||||||
|
fi
|
||||||
|
|
||||||
|
strip_intermediate_dirs
|
||||||
|
stamp_versions
|
||||||
|
echo ""
|
||||||
|
echo "==> dist 只保留可发布的附件:"
|
||||||
|
ls -lh "$ROOT_DIR"/dist/GC-"$VERSION"-* 2>/dev/null || true
|
||||||
|
}
|
||||||
|
|
||||||
|
# 删除 publish 过程中的中间目录,dist 里只留最终附件
|
||||||
|
strip_intermediate_dirs() {
|
||||||
|
for d in win-x64 win-arm64 mac-arm64; do
|
||||||
|
[ -d "$ROOT_DIR/dist/$d" ] && rm -rf "$ROOT_DIR/dist/$d"
|
||||||
|
done
|
||||||
|
find "$ROOT_DIR/dist" -name ".DS_Store" -delete 2>/dev/null || true
|
||||||
|
}
|
||||||
|
|
||||||
|
package_mac_app() {
|
||||||
|
DIST="$ROOT_DIR/dist/mac-arm64"
|
||||||
|
APP="$DIST/EarthModelStudio.app"
|
||||||
|
rm -rf "$APP"
|
||||||
|
mkdir -p "$APP/Contents/MacOS" "$APP/Contents/Resources"
|
||||||
|
cat > "$APP/Contents/Info.plist" <<PLIST
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||||
|
<plist version="1.0">
|
||||||
|
<dict>
|
||||||
|
<key>CFBundleName</key><string>Earth Model Studio</string>
|
||||||
|
<key>CFBundleDisplayName</key><string>Earth Model Studio</string>
|
||||||
|
<key>CFBundleIdentifier</key><string>cn.neorf.earthmodelstudio</string>
|
||||||
|
<key>CFBundleVersion</key><string>${VERSION}</string>
|
||||||
|
<key>CFBundleShortVersionString</key><string>${VERSION}</string>
|
||||||
|
<key>CFBundlePackageType</key><string>APPL</string>
|
||||||
|
<key>CFBundleExecutable</key><string>EarthModelStudio</string>
|
||||||
|
<key>CFBundleInfoDictionaryVersion</key><string>6.0</string>
|
||||||
|
<key>LSMinimumSystemVersion</key><string>11.0</string>
|
||||||
|
<key>NSHighResolutionCapable</key><true/>
|
||||||
|
</dict>
|
||||||
|
</plist>
|
||||||
|
PLIST
|
||||||
|
for f in "$DIST"/*; do
|
||||||
|
base=$(basename "$f")
|
||||||
|
[ "$base" = "EarthModelStudio.app" ] && continue
|
||||||
|
[ "$base" = ".DS_Store" ] && continue
|
||||||
|
mv "$f" "$APP/Contents/MacOS/"
|
||||||
|
done
|
||||||
|
# 发布包不带 .GC 运行骨架(用户首次启动自行创建),避免覆盖用户数据
|
||||||
|
rm -rf "$APP/Contents/MacOS/.GC"
|
||||||
|
chmod +x "$APP/Contents/MacOS/EarthModelStudio"
|
||||||
|
echo "==> 已打包 $APP"
|
||||||
|
}
|
||||||
|
|
||||||
case "$TASK" in
|
case "$TASK" in
|
||||||
build) bs_build "$ROOT_DIR" ;;
|
build)
|
||||||
check) bs_check "$ROOT_DIR" ;;
|
# 清理上次遗留的发布包 zip,避免误用旧产物
|
||||||
*) bs_tools "$ROOT_DIR" "$TASK" ;;
|
rm -f "$ROOT_DIR"/dist/GC-*.zip "$ROOT_DIR"/dist/models-*.zip 2>/dev/null || true
|
||||||
|
dotnet build "$SLN" -c Debug
|
||||||
|
;;
|
||||||
|
run)
|
||||||
|
dotnet run --project "$APP_PROJ" -c Debug
|
||||||
|
;;
|
||||||
|
test)
|
||||||
|
dotnet run --project "$TEST_PROJ" -c Debug -- "$ROOT_DIR/build/screenshots"
|
||||||
|
;;
|
||||||
|
publish)
|
||||||
|
# 先清掉 dist 旧产物(含历史 zip / 目录),再重新生成
|
||||||
|
echo "==> 清理 dist 旧产物"
|
||||||
|
rm -rf "$ROOT_DIR/dist"
|
||||||
|
mkdir -p "$ROOT_DIR/dist"
|
||||||
|
stamp_versions
|
||||||
|
# macOS 用目录形式(非单文件):单文件包启动时需要解压缓存目录,
|
||||||
|
# 在受限/沙箱环境下创建失败会直接报「打不开」。目录形式无此依赖。
|
||||||
|
publish_rid "osx-arm64" "dist/mac-arm64" false
|
||||||
|
publish_rid "win-x64" "dist/win-x64" true
|
||||||
|
publish_rid "win-arm64" "dist/win-arm64" true
|
||||||
|
package_mac_app
|
||||||
|
prepare_runtime_layout "dist/win-x64"
|
||||||
|
prepare_runtime_layout "dist/win-arm64"
|
||||||
|
prepare_runtime_layout "dist/mac-arm64/EarthModelStudio.app/Contents/MacOS"
|
||||||
|
pack_launcher
|
||||||
|
echo ""
|
||||||
|
echo "==> 三个平台编译完成(发布包不含模型,首次启动自动下载):"
|
||||||
|
du -sh "$ROOT_DIR/dist"/* 2>/dev/null || true
|
||||||
|
echo " 把 version.json / model/ 推送到 gitcode,启动器就会自动检查更新"
|
||||||
|
;;
|
||||||
|
models)
|
||||||
|
build_models
|
||||||
|
;;
|
||||||
|
stamp)
|
||||||
|
stamp_versions
|
||||||
|
;;
|
||||||
|
bundle)
|
||||||
|
echo "已弃用:发布包不再内置模型。请改用 ./build.sh stamp 与 gitcode 自动更新。"
|
||||||
|
;;
|
||||||
|
pack-models)
|
||||||
|
build_models
|
||||||
|
pack_models
|
||||||
|
;;
|
||||||
|
pack-launcher)
|
||||||
|
pack_launcher
|
||||||
|
;;
|
||||||
|
update-test)
|
||||||
|
dotnet run --project "$TEST_PROJ" -c Debug -- --update-test "$ROOT_DIR"
|
||||||
|
;;
|
||||||
|
clean)
|
||||||
|
rm -rf "$ROOT_DIR/build" "$ROOT_DIR/dist"
|
||||||
|
find "$ROOT_DIR/src" -type d \( -name bin -o -name obj \) -prune -exec rm -rf {} + 2>/dev/null || true
|
||||||
|
echo "==> 已清理"
|
||||||
|
;;
|
||||||
|
doctor)
|
||||||
|
dotnet --info | head -20
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "未知任务: $TASK"
|
||||||
|
echo "可用: build | run | test | publish | models | stamp | pack-models | pack-launcher | update-test | clean | doctor"
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
@@ -1,57 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
# buildsh/build.sh —— 完整发布(原 publish)
|
|
||||||
# 步骤及权重按实测耗时设定,供进度条估算总进度与剩余时间:
|
|
||||||
# 清理(2) 版本(3) Mac(35) WinX64(25) WinArm(25) 骨架(3) 打包(5) 收尾(2) = 100
|
|
||||||
|
|
||||||
bs_build() {
|
|
||||||
ROOT_DIR="$1"
|
|
||||||
: "${APP_PROJ:?}" "${SLN:?}" "${VERSION:?}"
|
|
||||||
|
|
||||||
progress_init 100 2 3 35 25 25 3 5 2
|
|
||||||
|
|
||||||
progress_step "清理旧产物"; progress_tick 100
|
|
||||||
rm -rf "$ROOT_DIR/dist"; mkdir -p "$ROOT_DIR/dist"
|
|
||||||
|
|
||||||
progress_step "版本戳"; progress_tick 100
|
|
||||||
stamp_versions
|
|
||||||
|
|
||||||
# 每个 publish 用后台任务包裹,边跑边按「已用时/预估用时」推进当前步骤进度
|
|
||||||
_run_publish() {
|
|
||||||
_label="$1"; _est="$2"; shift 2
|
|
||||||
( "$@" >"$ROOT_DIR/build/logs/publish-$_label.log" 2>&1 ) &
|
|
||||||
_pid=$!
|
|
||||||
_t0=$(date +%s)
|
|
||||||
while kill -0 "$_pid" 2>/dev/null; do
|
|
||||||
_elapsed=$(( $(date +%s) - _t0 ))
|
|
||||||
_p=$(( _elapsed * 100 / _est ))
|
|
||||||
[ "$_p" -gt 96 ] && _p=96
|
|
||||||
progress_tick "$_p"
|
|
||||||
sleep 1
|
|
||||||
done
|
|
||||||
wait "$_pid" || { echo; echo "!! $_label 编译失败,见 build/logs/publish-$_label.log"; return 1; }
|
|
||||||
progress_tick 100
|
|
||||||
}
|
|
||||||
|
|
||||||
progress_step "编译 Mac"
|
|
||||||
_run_publish mac 90 publish_rid "osx-arm64" "dist/mac-arm64" false || return 1
|
|
||||||
|
|
||||||
progress_step "编译 Win-x64"
|
|
||||||
_run_publish winx64 70 publish_rid "win-x64" "dist/win-x64" true || return 1
|
|
||||||
|
|
||||||
progress_step "编译 Win-arm64"
|
|
||||||
_run_publish winarm 70 publish_rid "win-arm64" "dist/win-arm64" true || return 1
|
|
||||||
|
|
||||||
progress_step "运行骨架"; progress_tick 100
|
|
||||||
package_mac_app
|
|
||||||
prepare_runtime_layout "dist/win-x64"
|
|
||||||
prepare_runtime_layout "dist/win-arm64"
|
|
||||||
prepare_runtime_layout "dist/mac-arm64/EarthModelStudio.app/Contents/MacOS"
|
|
||||||
|
|
||||||
progress_step "打包 zip"; progress_tick 100
|
|
||||||
pack_launcher
|
|
||||||
|
|
||||||
progress_step "收尾"; progress_tick 100
|
|
||||||
progress_done
|
|
||||||
echo "==> 完成,产物:"
|
|
||||||
ls -lh "$ROOT_DIR"/dist/GC-"$VERSION"-*.zip 2>/dev/null || true
|
|
||||||
}
|
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
# buildsh/check.sh —— 验证:编译 + 自检 + 离屏测试 + 产物完整性
|
|
||||||
# 步骤权重:编译(40) 自检(15) 离屏(25) 产物(20)
|
|
||||||
|
|
||||||
bs_check() {
|
|
||||||
ROOT_DIR="$1"
|
|
||||||
progress_init 100 40 15 25 20
|
|
||||||
_fail=0
|
|
||||||
|
|
||||||
progress_step "编译检查"
|
|
||||||
if dotnet build "$SLN" -c Debug -v quiet >"$ROOT_DIR/build/logs/check-build.log" 2>&1; then
|
|
||||||
progress_tick 100
|
|
||||||
else
|
|
||||||
progress_tick 100; _fail=1
|
|
||||||
echo; echo "!! 编译失败,见 build/logs/check-build.log"
|
|
||||||
fi
|
|
||||||
|
|
||||||
progress_step "模型自检"
|
|
||||||
if EMS_SELFTEST=1 dotnet run --project "$APP_PROJ" -c Debug --no-build \
|
|
||||||
>"$ROOT_DIR/build/logs/check-selftest.log" 2>&1; then
|
|
||||||
grep -q "FAIL" "$ROOT_DIR/build/logs/check-selftest.log" && { _fail=1; echo; echo "!! 自检有失败项"; }
|
|
||||||
else
|
|
||||||
_fail=1; echo; echo "!! 自检异常"
|
|
||||||
fi
|
|
||||||
progress_tick 100
|
|
||||||
|
|
||||||
progress_step "离屏渲染"
|
|
||||||
if dotnet run --project "$TEST_PROJ" -c Debug --no-build -- \
|
|
||||||
"$ROOT_DIR/build/screenshots" >"$ROOT_DIR/build/logs/check-render.log" 2>&1; then
|
|
||||||
progress_tick 100
|
|
||||||
else
|
|
||||||
_fail=1; progress_tick 100; echo; echo "!! 离屏渲染失败"
|
|
||||||
fi
|
|
||||||
|
|
||||||
progress_step "产物检查"
|
|
||||||
_n=$(ls "$ROOT_DIR"/dist/GC-"$VERSION"-*.zip 2>/dev/null | wc -l | tr -d ' ')
|
|
||||||
if [ "$_n" -ge 3 ]; then
|
|
||||||
progress_tick 100
|
|
||||||
else
|
|
||||||
_fail=1; progress_tick 100; echo; echo "!! 产物不足 3 个(当前 $_n)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
progress_done
|
|
||||||
[ "$_fail" -eq 0 ] && echo "==> 全部通过" || echo "==> 有失败项"
|
|
||||||
return "$_fail"
|
|
||||||
}
|
|
||||||
@@ -1,247 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
# buildsh/lib/build_funcs.sh —— 构建函数库(由入口脚本 source)
|
|
||||||
# 依赖调用方提供:ROOT_DIR, APP_PROJ, PREVIEW_PROJ, STAMP_PROJ, TEST_PROJ, SLN, VERSION
|
|
||||||
# 以及任务进度上报函数 step / progress(由进度条引擎提供,未定义时降级为 echo)
|
|
||||||
|
|
||||||
if ! type step >/dev/null 2>&1; then step() { echo "==> $1"; }; fi
|
|
||||||
if ! type progress >/dev/null 2>&1; then progress() { :; }; fi
|
|
||||||
|
|
||||||
stamp_versions() {
|
|
||||||
echo "==> 自动计算模型版本并生成 version.json"
|
|
||||||
dotnet run --project "$STAMP_PROJ" -c Release -- "$ROOT_DIR" "$VERSION"
|
|
||||||
}
|
|
||||||
|
|
||||||
# 编译模型自己的功能程序集,并把 dll / 封面直接写进模型包
|
|
||||||
build_models() {
|
|
||||||
echo "==> 编译模型功能程序集(源码就在各模型目录的 src/ 里)"
|
|
||||||
for DIR in "$ROOT_DIR"/model/*/; do
|
|
||||||
ID=$(basename "$DIR")
|
|
||||||
[ -d "$DIR/src" ] || continue
|
|
||||||
PROJ=$(ls "$DIR"src/*.csproj 2>/dev/null | head -1)
|
|
||||||
[ -n "$PROJ" ] || continue
|
|
||||||
dotnet build "$PROJ" -c Release
|
|
||||||
if [ -d "$DIR$ID.model" ]; then
|
|
||||||
for DLL in "$DIR"src/bin/Release/net8.0/*.dll; do
|
|
||||||
[ -f "$DLL" ] || continue
|
|
||||||
NAME=$(basename "$DLL")
|
|
||||||
[ "$NAME" = "EarthModelStudio.ModelSdk.dll" ] && continue
|
|
||||||
cp "$DLL" "$DIR$ID.model/"
|
|
||||||
echo " -> model/$ID/$ID.model/$NAME"
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
echo "==> 用模型自己的渲染器生成封面"
|
|
||||||
dotnet run --project "$PREVIEW_PROJ" -c Release -- "$ROOT_DIR"
|
|
||||||
stamp_versions
|
|
||||||
}
|
|
||||||
|
|
||||||
# 发布目录只放启动器 + 空的 .GC 运行骨架,绝不放模型
|
|
||||||
prepare_runtime_layout() {
|
|
||||||
REL="$1"
|
|
||||||
DEST="$ROOT_DIR/$REL"
|
|
||||||
[ -d "$DEST" ] || return 0
|
|
||||||
rm -rf "$DEST/model" "$DEST/examples"
|
|
||||||
mkdir -p "$DEST/.GC/model" "$DEST/.GC/cache" "$DEST/.GC/update"
|
|
||||||
cat > "$DEST/.GC/model/README.txt" <<'TXT'
|
|
||||||
模型库目录(.GC/model/)
|
|
||||||
启动时程序会读取 gitcode 仓库的 version.json,把最新版模型下载到这里。
|
|
||||||
离线使用也可以手动放入 <模型id>/<模型id>.json + <模型id>/<模型id>.model/。
|
|
||||||
|
|
||||||
运行目录:
|
|
||||||
<可执行文件>
|
|
||||||
.GC/settings.json
|
|
||||||
.GC/model/ 本目录(下载的模型)
|
|
||||||
.GC/cache/ 下载暂存
|
|
||||||
.GC/update/ 待下次启动应用的启动器更新
|
|
||||||
TXT
|
|
||||||
if [ ! -f "$DEST/.GC/settings.json" ]; then
|
|
||||||
cat > "$DEST/.GC/settings.json" <<'JSON'
|
|
||||||
{
|
|
||||||
"language": "auto",
|
|
||||||
"theme": "light",
|
|
||||||
"renderFps": 30,
|
|
||||||
"memoryMb": 2048,
|
|
||||||
"autoUpdateOnStartup": true,
|
|
||||||
"updateRepository": "https://gitcode.com/2509_92447106/GC",
|
|
||||||
"updateManifestUrl": "",
|
|
||||||
"updateLocalRoot": "",
|
|
||||||
"installedModelVersions": {},
|
|
||||||
"launcherVersion": "",
|
|
||||||
"pendingLauncherVersion": "",
|
|
||||||
"lastUpdateCheck": "",
|
|
||||||
"sources": [],
|
|
||||||
"recentModels": []
|
|
||||||
}
|
|
||||||
JSON
|
|
||||||
fi
|
|
||||||
echo " 运行目录 -> $REL/.GC (settings.json + model/ + cache/ + update/)"
|
|
||||||
}
|
|
||||||
|
|
||||||
# $1=RID $2=输出目录 $3=singlefile(true/false)
|
|
||||||
publish_rid() {
|
|
||||||
RID="$1"; OUT="$2"; SINGLE="${3:-true}"
|
|
||||||
echo ""
|
|
||||||
echo "==> 编译 ${RID} (single-file=${SINGLE}) -> ${OUT}"
|
|
||||||
# 先删旧产物,避免上次 publish 的残留文件混进新包
|
|
||||||
rm -rf "$ROOT_DIR/$OUT"
|
|
||||||
dotnet publish "$APP_PROJ" \
|
|
||||||
-c Release \
|
|
||||||
-r "$RID" \
|
|
||||||
--self-contained true \
|
|
||||||
-p:Version="$VERSION" \
|
|
||||||
-p:DebugType=none \
|
|
||||||
-p:PublishSingleFile="$SINGLE" \
|
|
||||||
-p:IncludeNativeLibrariesForSelfExtract="$SINGLE" \
|
|
||||||
-p:PublishTrimmed=false \
|
|
||||||
-o "$ROOT_DIR/$OUT"
|
|
||||||
rm -rf "$ROOT_DIR/$OUT/model" "$ROOT_DIR/$OUT/examples"
|
|
||||||
}
|
|
||||||
|
|
||||||
# 把 model/ 里的模型数据单独打包(与启动器分开分发)
|
|
||||||
pack_models() {
|
|
||||||
mkdir -p "$ROOT_DIR/dist"
|
|
||||||
ZIP="$ROOT_DIR/dist/models-$VERSION.zip"
|
|
||||||
rm -f "$ZIP"
|
|
||||||
echo "==> 打包模型数据 -> dist/models-$VERSION.zip"
|
|
||||||
( cd "$ROOT_DIR" && zip -qr "$ZIP" model \
|
|
||||||
-x "*.DS_Store" "*/bin/*" "*/obj/*" "*.user" )
|
|
||||||
du -sh "$ZIP"
|
|
||||||
}
|
|
||||||
|
|
||||||
# 启动器更新包:只包含程序文件,排除 .GC(否则会覆盖用户已下载的模型与设置)
|
|
||||||
# 产物命名:GC-<版本>-<系统>-<架构>.exe / GC-<版本>-<系统>-<架构>.app.zip
|
|
||||||
# Windows: 单文件 exe 直接改名(本身就是可执行产物)
|
|
||||||
# macOS: .app 必须打成 zip 才能作为单文件分发;文件名用 .app.zip,
|
|
||||||
# 这样 macOS 双击会用归档工具解压出可运行的 .app。
|
|
||||||
# 若直接命名 .app,系统会把 zip 当成应用包解析 => 报「已损坏/打不开」。
|
|
||||||
pack_launcher() {
|
|
||||||
echo "==> 生成启动器产物(GC-<版本>-<系统>-<架构>)"
|
|
||||||
|
|
||||||
# --- Windows:exe 单文件 ---
|
|
||||||
for pair in "win-x64:win-amd64" "win-arm64:win-arm64"; do
|
|
||||||
RID="${pair%%:*}"; LABEL="${pair##*:}"
|
|
||||||
SRC="$ROOT_DIR/dist/$RID"
|
|
||||||
[ -d "$SRC" ] || continue
|
|
||||||
EXE=$(ls "$SRC"/*.exe 2>/dev/null | head -1)
|
|
||||||
[ -n "$EXE" ] || continue
|
|
||||||
DEST="$ROOT_DIR/dist/GC-${VERSION}-${LABEL}.exe"
|
|
||||||
cp "$EXE" "$DEST"
|
|
||||||
chmod +x "$DEST"
|
|
||||||
echo " -> $(basename "$DEST")"
|
|
||||||
done
|
|
||||||
|
|
||||||
# --- macOS:先得到真实 .app 目录(改名 + 同步 Info.plist)---
|
|
||||||
MACAPP="$ROOT_DIR/dist/mac-arm64/EarthModelStudio.app"
|
|
||||||
if [ -d "$MACAPP" ]; then
|
|
||||||
FINAL="$ROOT_DIR/dist/GC-${VERSION}-mac-arm64.app"
|
|
||||||
rm -rf "$FINAL"
|
|
||||||
mv "$MACAPP" "$FINAL"
|
|
||||||
chmod +x "$FINAL/Contents/MacOS/EarthModelStudio" 2>/dev/null || true
|
|
||||||
PLIST="$FINAL/Contents/Info.plist"
|
|
||||||
if [ -f "$PLIST" ]; then
|
|
||||||
/usr/libexec/PlistBuddy -c "Set :CFBundleName Morris GC" "$PLIST" 2>/dev/null || true
|
|
||||||
/usr/libexec/PlistBuddy -c "Set :CFBundleDisplayName Morris GC" "$PLIST" 2>/dev/null || true
|
|
||||||
fi
|
|
||||||
xattr -cr "$FINAL" 2>/dev/null || true
|
|
||||||
echo " -> $(basename "$FINAL")/"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# --- 统一压缩:每个产物都打成同名 .zip ---
|
|
||||||
# GC-1.0.3-win-amd64.exe -> GC-1.0.3-win-amd64.zip
|
|
||||||
# GC-1.0.3-win-arm64.exe -> GC-1.0.3-win-arm64.zip
|
|
||||||
# GC-1.0.3-mac-arm64.app -> GC-1.0.3-mac-arm64.zip
|
|
||||||
# 客户端下载时按「原名去掉扩展名 + .zip」取包,再解压回原名。
|
|
||||||
echo "==> 压缩为 zip"
|
|
||||||
for art in "$ROOT_DIR"/dist/GC-"$VERSION"-*.exe "$ROOT_DIR"/dist/GC-"$VERSION"-*.app; do
|
|
||||||
[ -e "$art" ] || continue
|
|
||||||
base=$(basename "$art")
|
|
||||||
name="${base%.*}" # 去掉 .exe / .app
|
|
||||||
ZIP="$ROOT_DIR/dist/${name}.zip"
|
|
||||||
rm -f "$ZIP"
|
|
||||||
if [ -d "$art" ]; then
|
|
||||||
# 目录(.app):保留权限与符号链接
|
|
||||||
if command -v ditto >/dev/null 2>&1; then
|
|
||||||
ditto -c -k --sequesterRsrc --keepParent "$art" "$ZIP"
|
|
||||||
else
|
|
||||||
( cd "$(dirname "$art")" && zip -qry "$ZIP" "$base" -x "*.DS_Store" )
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
( cd "$(dirname "$art")" && zip -q "$ZIP" "$base" )
|
|
||||||
fi
|
|
||||||
echo " -> ${name}.zip"
|
|
||||||
done
|
|
||||||
|
|
||||||
# 原始产物(.exe / .app 目录)不再保留:只发布 zip
|
|
||||||
rm -f "$ROOT_DIR"/dist/GC-"$VERSION"-*.exe
|
|
||||||
rm -rf "$ROOT_DIR"/dist/GC-"$VERSION"-*.app
|
|
||||||
|
|
||||||
strip_intermediate_dirs
|
|
||||||
stamp_versions
|
|
||||||
echo ""
|
|
||||||
echo "==> dist 只保留可发布的 zip:"
|
|
||||||
ls -lh "$ROOT_DIR"/dist/GC-"$VERSION"-*.zip 2>/dev/null || true
|
|
||||||
}
|
|
||||||
|
|
||||||
# 删除 publish 过程中的中间目录,dist 里只留最终附件
|
|
||||||
strip_intermediate_dirs() {
|
|
||||||
for d in win-x64 win-arm64 mac-arm64; do
|
|
||||||
[ -d "$ROOT_DIR/dist/$d" ] && rm -rf "$ROOT_DIR/dist/$d"
|
|
||||||
done
|
|
||||||
find "$ROOT_DIR/dist" -name ".DS_Store" -delete 2>/dev/null || true
|
|
||||||
}
|
|
||||||
|
|
||||||
package_mac_app() {
|
|
||||||
DIST="$ROOT_DIR/dist/mac-arm64"
|
|
||||||
APP="$DIST/EarthModelStudio.app"
|
|
||||||
rm -rf "$APP"
|
|
||||||
mkdir -p "$APP/Contents/MacOS" "$APP/Contents/Resources"
|
|
||||||
cat > "$APP/Contents/Info.plist" <<PLIST
|
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
|
||||||
<plist version="1.0">
|
|
||||||
<dict>
|
|
||||||
<key>CFBundleName</key><string>Earth Model Studio</string>
|
|
||||||
<key>CFBundleDisplayName</key><string>Earth Model Studio</string>
|
|
||||||
<key>CFBundleIdentifier</key><string>cn.neorf.earthmodelstudio</string>
|
|
||||||
<key>CFBundleVersion</key><string>${VERSION}</string>
|
|
||||||
<key>CFBundleShortVersionString</key><string>${VERSION}</string>
|
|
||||||
<key>CFBundlePackageType</key><string>APPL</string>
|
|
||||||
<key>CFBundleExecutable</key><string>EarthModelStudio</string>
|
|
||||||
<key>CFBundleInfoDictionaryVersion</key><string>6.0</string>
|
|
||||||
<key>LSMinimumSystemVersion</key><string>11.0</string>
|
|
||||||
<key>NSHighResolutionCapable</key><true/>
|
|
||||||
</dict>
|
|
||||||
</plist>
|
|
||||||
PLIST
|
|
||||||
for f in "$DIST"/*; do
|
|
||||||
base=$(basename "$f")
|
|
||||||
[ "$base" = "EarthModelStudio.app" ] && continue
|
|
||||||
[ "$base" = ".DS_Store" ] && continue
|
|
||||||
mv "$f" "$APP/Contents/MacOS/"
|
|
||||||
done
|
|
||||||
# 应用图标:由 Assets/icon-1024.png 生成 .icns
|
|
||||||
ICONSRC="$ROOT_DIR/src/main/dotnet/EarthModelStudio/Assets/icon-1024.png"
|
|
||||||
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"
|
|
||||||
echo "==> 已打包 $APP"
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,100 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
# buildsh/lib/progress.sh —— apt 风格底部实时进度条
|
|
||||||
#
|
|
||||||
# 底部一行:任务 当前任务进度 总进度 剩余时间
|
|
||||||
# 编译MacOS 95% 30% 10s
|
|
||||||
#
|
|
||||||
# 用法:
|
|
||||||
# progress_init <总步骤数> <每步权重...>
|
|
||||||
# progress_step <步骤名> # 开始某步骤
|
|
||||||
# progress_tick <0-100> # 更新当前步骤完成度
|
|
||||||
# progress_done # 结束
|
|
||||||
|
|
||||||
PROGRESS_TOTAL=1
|
|
||||||
PROGRESS_WEIGHTS=""
|
|
||||||
PROGRESS_IDX=0
|
|
||||||
PROGRESS_CUR=0
|
|
||||||
PROGRESS_STARTED=0
|
|
||||||
PROGRESS_LAST=0
|
|
||||||
PROGRESS_HISTORY=""
|
|
||||||
|
|
||||||
_now() { date +%s; }
|
|
||||||
|
|
||||||
# 加权总进度:前序步骤权重之和 + 当前步骤权重*完成度
|
|
||||||
_progress_overall() {
|
|
||||||
_sum=0; _i=1
|
|
||||||
for _w in $PROGRESS_WEIGHTS; do
|
|
||||||
if [ "$_i" -lt "$PROGRESS_IDX" ]; then
|
|
||||||
_sum=$((_sum + _w)) # 已完成的步骤:全额
|
|
||||||
elif [ "$_i" -eq "$PROGRESS_IDX" ]; then
|
|
||||||
_sum=$((_sum + _w * PROGRESS_CUR / 100)) # 当前步骤:按完成度
|
|
||||||
fi
|
|
||||||
_i=$((_i + 1))
|
|
||||||
done
|
|
||||||
_p=$((_sum * 100 / PROGRESS_TOTAL))
|
|
||||||
[ "$_p" -gt 100 ] && _p=100
|
|
||||||
echo "$_p"
|
|
||||||
}
|
|
||||||
|
|
||||||
# 剩余时间:基于「已完成总进度 / 已用时间」线性外推
|
|
||||||
_progress_eta() {
|
|
||||||
_p=$(_progress_overall)
|
|
||||||
_t=$(( $(_now) - PROGRESS_STARTED ))
|
|
||||||
# 前期用「预估总时长」估算(按各步骤经验权重),后期用实测速率外推,更稳
|
|
||||||
if [ "$_p" -le 3 ] || [ "$_t" -le 0 ]; then
|
|
||||||
_eta=$(( PROGRESS_TOTAL * 8 / 100 )) # 粗估:每 1% 约 8 秒 -> 总约 800s? 见下
|
|
||||||
_eta=$(( 240 )) # 默认预估 4 分钟
|
|
||||||
else
|
|
||||||
_eta=$(( _t * (100 - _p) / _p ))
|
|
||||||
fi
|
|
||||||
if [ "$_eta" -ge 60 ]; then echo "$(( _eta / 60 ))m$((_eta % 60))s"; else echo "${_eta}s"; fi
|
|
||||||
}
|
|
||||||
|
|
||||||
progress_draw() {
|
|
||||||
_task="$PROGRESS_TASK"
|
|
||||||
_cur=$PROGRESS_CUR
|
|
||||||
_overall=$(_progress_overall)
|
|
||||||
_eta=$(_progress_eta)
|
|
||||||
|
|
||||||
# 进度条(20 格)
|
|
||||||
_filled=$((_overall * 20 / 100))
|
|
||||||
_bar=""
|
|
||||||
_i=0
|
|
||||||
while [ "$_i" -lt 20 ]; do
|
|
||||||
if [ "$_i" -lt "$_filled" ]; then _bar="${_bar}#"; else _bar="${_bar}."; fi
|
|
||||||
_i=$((_i + 1))
|
|
||||||
done
|
|
||||||
|
|
||||||
# 底部一行:任务 当前任务进度 总进度 剩余时间
|
|
||||||
printf '\r\033[K[%s] %-14s %3d%% %3d%% %s' \
|
|
||||||
"$_bar" "$_task" "$_cur" "$_overall" "$_eta"
|
|
||||||
}
|
|
||||||
|
|
||||||
progress_init() {
|
|
||||||
PROGRESS_TOTAL=$1
|
|
||||||
shift
|
|
||||||
PROGRESS_WEIGHTS="$*"
|
|
||||||
PROGRESS_IDX=0
|
|
||||||
PROGRESS_CUR=0
|
|
||||||
PROGRESS_STARTED=$(_now)
|
|
||||||
PROGRESS_TASK="准备"
|
|
||||||
progress_draw
|
|
||||||
}
|
|
||||||
|
|
||||||
progress_step() {
|
|
||||||
PROGRESS_TASK="$1"
|
|
||||||
PROGRESS_CUR=0
|
|
||||||
PROGRESS_IDX=$((PROGRESS_IDX + 1))
|
|
||||||
progress_draw
|
|
||||||
}
|
|
||||||
|
|
||||||
progress_tick() {
|
|
||||||
PROGRESS_CUR=$1
|
|
||||||
progress_draw
|
|
||||||
}
|
|
||||||
|
|
||||||
progress_done() {
|
|
||||||
PROGRESS_CUR=100
|
|
||||||
progress_tick 100
|
|
||||||
printf '\n'
|
|
||||||
}
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
# buildsh/tools.sh —— 实用工具:模型、版本戳、清理、运行、医生、打开目录
|
|
||||||
|
|
||||||
bs_tools() {
|
|
||||||
ROOT_DIR="$1"; TASK="$2"
|
|
||||||
case "$TASK" in
|
|
||||||
models)
|
|
||||||
build_models ;;
|
|
||||||
stamp)
|
|
||||||
stamp_versions ;;
|
|
||||||
pack-models)
|
|
||||||
build_models; pack_models ;;
|
|
||||||
pack-launcher)
|
|
||||||
pack_launcher ;;
|
|
||||||
run)
|
|
||||||
dotnet run --project "$APP_PROJ" -c Debug ;;
|
|
||||||
test)
|
|
||||||
dotnet run --project "$TEST_PROJ" -c Debug -- "$ROOT_DIR/build/screenshots" ;;
|
|
||||||
update-test)
|
|
||||||
dotnet run --project "$TEST_PROJ" -c Debug -- --update-test "$ROOT_DIR" ;;
|
|
||||||
clean)
|
|
||||||
rm -rf "$ROOT_DIR/build" "$ROOT_DIR/dist"
|
|
||||||
find "$ROOT_DIR/src" -type d \( -name bin -o -name obj \) -prune -exec rm -rf {} + 2>/dev/null || true
|
|
||||||
echo "==> 已清理" ;;
|
|
||||||
doctor)
|
|
||||||
dotnet --info | head -20 ;;
|
|
||||||
dist)
|
|
||||||
echo "==> dist 产物:"
|
|
||||||
ls -lh "$ROOT_DIR"/dist 2>/dev/null || true ;;
|
|
||||||
*)
|
|
||||||
echo "未知工具: $TASK"; return 1 ;;
|
|
||||||
esac
|
|
||||||
}
|
|
||||||
@@ -18,8 +18,6 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Avalonia.Headless" Version="$(AvaloniaVersion)" />
|
<PackageReference Include="Avalonia.Headless" Version="$(AvaloniaVersion)" />
|
||||||
<PackageReference Include="Avalonia.Skia" Version="$(AvaloniaVersion)" />
|
<PackageReference Include="Avalonia.Skia" Version="$(AvaloniaVersion)" />
|
||||||
<!-- 通用封面路径会渲染模型自带的 UserControl,headless 下需要主题样式才会出内容 -->
|
|
||||||
<PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -1,44 +1,24 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Reflection;
|
|
||||||
using System.Runtime.Loader;
|
|
||||||
using Avalonia;
|
using Avalonia;
|
||||||
using Avalonia.Controls;
|
using Avalonia.Controls;
|
||||||
using Avalonia.Headless;
|
using Avalonia.Headless;
|
||||||
using Avalonia.Media.Imaging;
|
using Avalonia.Media.Imaging;
|
||||||
using Avalonia.Platform;
|
|
||||||
using EarthModelStudio.ModelSdk;
|
|
||||||
using NeoRF.EarthModels;
|
using NeoRF.EarthModels;
|
||||||
|
|
||||||
namespace NeoRF.EarthModels.Preview;
|
namespace NeoRF.EarthModels.Preview;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 封面生成工具:给每个模型画一张 preview.png。
|
/// 封面生成工具:用模型自己的渲染器给每个模型画一张封面 preview.png。
|
||||||
///
|
/// 封面在模型包里,启动器只负责显示 —— 所以公转模型的封面一定就是公转场景。
|
||||||
/// 两条路径:
|
/// 用法:dotnet run --project model-src/tools/PreviewGen -- <仓库根>
|
||||||
/// 1) 通用路径(默认):按模型清单的 assembly + type 加载模型程序集,
|
|
||||||
/// 调它自己的 IModelRuntime.CreateView 做 headless 渲染 —— 任何新模型都能自动出封面。
|
|
||||||
/// 2) 地球模型路径:仍走共享引擎的 CelestialView(保留 --bench 基准测试能力)。
|
|
||||||
///
|
|
||||||
/// 封面在模型包里,启动器只负责显示。用法:
|
|
||||||
/// dotnet run --project model/_engine/PreviewGen -- <仓库根> [--bench]
|
|
||||||
/// </summary>
|
/// </summary>
|
||||||
internal static class Program
|
internal static class Program
|
||||||
{
|
{
|
||||||
private const int Width = 768;
|
private const int Width = 768;
|
||||||
private const int Height = 316;
|
private const int Height = 316;
|
||||||
|
|
||||||
/// <summary>headless 封面应用:带上 Fluent 主题,UserControl 才有模板可渲染。</summary>
|
|
||||||
private sealed class PreviewApp : Application
|
|
||||||
{
|
|
||||||
public override void Initialize()
|
|
||||||
{
|
|
||||||
Styles.Add(new Avalonia.Themes.Fluent.FluentTheme());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
[STAThread]
|
[STAThread]
|
||||||
public static int Main(string[] args)
|
public static int Main(string[] args)
|
||||||
{
|
{
|
||||||
@@ -52,53 +32,23 @@ internal static class Program
|
|||||||
|
|
||||||
var bench = args.Contains("--bench");
|
var bench = args.Contains("--bench");
|
||||||
|
|
||||||
AppBuilder.Configure<PreviewApp>()
|
AppBuilder.Configure<Application>()
|
||||||
.UseSkia()
|
.UseSkia()
|
||||||
.UseHeadless(new AvaloniaHeadlessPlatformOptions { UseHeadlessDrawing = false })
|
.UseHeadless(new AvaloniaHeadlessPlatformOptions { UseHeadlessDrawing = false })
|
||||||
.SetupWithoutStarting();
|
.SetupWithoutStarting();
|
||||||
|
|
||||||
foreach (var modelDir in Directory.GetDirectories(modelRoot).OrderBy(p => p, StringComparer.Ordinal))
|
foreach (var modelDir in Directory.GetDirectories(modelRoot))
|
||||||
{
|
{
|
||||||
var id = Path.GetFileName(modelDir);
|
var id = Path.GetFileName(modelDir);
|
||||||
if (id.StartsWith('.') || id.StartsWith('_')) continue;
|
if (id.StartsWith(".")) continue;
|
||||||
|
|
||||||
var dataDir = Path.Combine(modelDir, id + ".model");
|
var dataDir = Path.Combine(modelDir, id + ".model");
|
||||||
if (!Directory.Exists(dataDir)) continue;
|
var sceneFile = Path.Combine(dataDir, "scene.json");
|
||||||
|
if (!File.Exists(sceneFile)) continue;
|
||||||
|
|
||||||
var outFile = Path.Combine(dataDir, "preview.png");
|
|
||||||
var hasScene = File.Exists(Path.Combine(dataDir, "scene.json"));
|
|
||||||
|
|
||||||
// 基准测试只对地球模型(依赖 CelestialView)
|
|
||||||
if (bench)
|
|
||||||
{
|
|
||||||
if (!hasScene) continue;
|
|
||||||
BenchEarthModel(dataDir, id);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
var ok = false;
|
|
||||||
string? err = null;
|
|
||||||
if (hasScene)
|
|
||||||
ok = TryRenderEarthModel(dataDir, outFile, out err);
|
|
||||||
if (!ok)
|
|
||||||
ok = TryRenderViaContract(modelDir, dataDir, outFile, out err);
|
|
||||||
if (!ok)
|
|
||||||
Console.Error.WriteLine($"preview 跳过 {id}:{err}");
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
// ─────────────────────────────────────────── 地球模型(保留原渲染器,封面一定是真场景)
|
|
||||||
|
|
||||||
private static bool TryRenderEarthModel(string dataDir, string outFile, out string? error)
|
|
||||||
{
|
|
||||||
error = null;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var runtime = SceneRuntime.Load(dataDir, 2048);
|
var runtime = SceneRuntime.Load(dataDir, 2048);
|
||||||
var texts = ModelStrings.Load(dataDir, "zh-CN");
|
var texts = ModelStrings.Load(dataDir, "zh-CN");
|
||||||
var revolution = string.Equals(runtime.Scene.DefaultView, "revolution", StringComparison.OrdinalIgnoreCase);
|
var revolution = string.Equals(runtime.Scene.DefaultView, "revolution", StringComparison.OrdinalIgnoreCase);
|
||||||
|
|
||||||
var view = new CelestialView
|
var view = new CelestialView
|
||||||
{
|
{
|
||||||
Scene = runtime,
|
Scene = runtime,
|
||||||
@@ -112,181 +62,52 @@ internal static class Program
|
|||||||
Width = Width,
|
Width = Width,
|
||||||
Height = Height
|
Height = Height
|
||||||
};
|
};
|
||||||
PrepareView(view, Width, Height);
|
view.Measure(new Size(Width, Height));
|
||||||
|
view.Arrange(new Rect(0, 0, Width, Height));
|
||||||
view.JumpToOrbit(revolution ? 45 : 0);
|
view.JumpToOrbit(revolution ? 45 : 0);
|
||||||
view.JumpToSpin(20);
|
view.JumpToSpin(20);
|
||||||
Save(view, outFile);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
error = ex.Message;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void BenchEarthModel(string dataDir, string id)
|
if (bench)
|
||||||
{
|
|
||||||
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
|
|
||||||
};
|
|
||||||
PrepareView(view, Width, Height);
|
|
||||||
view.JumpToOrbit(revolution ? 45 : 0);
|
|
||||||
view.JumpToSpin(20);
|
|
||||||
|
|
||||||
view.Width = 1240;
|
|
||||||
view.Height = 820;
|
|
||||||
view.Measure(new Size(1240, 820));
|
|
||||||
view.Arrange(new Rect(0, 0, 1240, 820));
|
|
||||||
var animField = typeof(CelestialView)
|
|
||||||
.GetField("_animating", BindingFlags.NonPublic | 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");
|
|
||||||
}
|
|
||||||
|
|
||||||
// ─────────────────────────────────────────── 通用路径:按契约加载模型自己的界面
|
|
||||||
|
|
||||||
private sealed class PreviewContext : IModelContext
|
|
||||||
{
|
|
||||||
public string ModelId { get; init; } = "";
|
|
||||||
public string ModelDirectory { get; init; } = "";
|
|
||||||
public string DataDirectory { get; init; } = "";
|
|
||||||
public string Language => "zh-CN";
|
|
||||||
public int MemoryBudgetMb => 512;
|
|
||||||
public void RequestClose() { }
|
|
||||||
public void ReportProgress(double value, string? message = null) { }
|
|
||||||
public void Log(string message) => Console.WriteLine(" " + message);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static bool TryRenderViaContract(string modelDir, string dataDir, string outFile, out string? error)
|
|
||||||
{
|
|
||||||
error = null;
|
|
||||||
var manifestPath = Path.Combine(modelDir, Path.GetFileName(modelDir) + ".json");
|
|
||||||
if (!File.Exists(manifestPath)) { error = "缺少模型清单"; return false; }
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
using var doc = System.Text.Json.JsonDocument.Parse(File.ReadAllText(manifestPath));
|
|
||||||
var root = doc.RootElement;
|
|
||||||
var id = Path.GetFileName(modelDir);
|
|
||||||
var asmName = GetString(root, "assembly") ?? (id + ".dll");
|
|
||||||
var typeName = GetString(root, "type");
|
|
||||||
var asmPath = Path.Combine(dataDir, asmName);
|
|
||||||
if (!File.Exists(asmPath)) { error = $"找不到功能程序集 {asmName}"; return false; }
|
|
||||||
|
|
||||||
var alc = new AssemblyLoadContext("preview:" + id, isCollectible: true);
|
|
||||||
alc.Resolving += (_, name) =>
|
|
||||||
{
|
{
|
||||||
// 契约与 Avalonia 一律回到默认上下文,与启动器 ModelLoadContext 一致
|
// 真实窗口尺寸下的帧耗时
|
||||||
if (name.Name is null) return null;
|
view.Width = 1240;
|
||||||
if (name.Name.StartsWith("System", StringComparison.OrdinalIgnoreCase)) return null;
|
view.Height = 820;
|
||||||
var shared = new[] { "EarthModelStudio.ModelSdk", "Avalonia", "Avalonia.Base",
|
view.Measure(new Size(1240, 820));
|
||||||
"Avalonia.Controls", "Avalonia.Skia", "Avalonia.Themes.Fluent", "SkiaSharp", "HarfBuzzSharp" };
|
view.Arrange(new Rect(0, 0, 1240, 820));
|
||||||
if (shared.Contains(name.Name, StringComparer.OrdinalIgnoreCase)) return null;
|
// 模拟播放态(运动时降分辨率),分别测静止高清帧与运动帧
|
||||||
var candidate = Path.Combine(dataDir, name.Name + ".dll");
|
var animField = typeof(NeoRF.EarthModels.CelestialView)
|
||||||
return File.Exists(candidate) ? alc.LoadFromAssemblyPath(candidate) : null;
|
.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 asm = alc.LoadFromAssemblyPath(asmPath);
|
var outFile = Path.Combine(dataDir, "preview.png");
|
||||||
Type? factoryType = null;
|
using (var bitmap = new RenderTargetBitmap(new PixelSize(Width, Height), new Vector(96, 96)))
|
||||||
if (!string.IsNullOrWhiteSpace(typeName))
|
|
||||||
factoryType = asm.GetType(typeName!, throwOnError: false);
|
|
||||||
factoryType ??= asm.GetTypes().FirstOrDefault(t =>
|
|
||||||
!t.IsAbstract && !t.IsInterface && typeof(IModelFactory).IsAssignableFrom(t));
|
|
||||||
if (factoryType == null) { error = "程序集里没有 IModelFactory 实现"; return false; }
|
|
||||||
if (Activator.CreateInstance(factoryType) is not IModelFactory factory)
|
|
||||||
{ error = "无法创建模型入口"; return false; }
|
|
||||||
|
|
||||||
var runtime = factory.Create();
|
|
||||||
var ctx = new PreviewContext
|
|
||||||
{
|
{
|
||||||
ModelId = id,
|
bitmap.Render(view);
|
||||||
ModelDirectory = modelDir,
|
bitmap.Save(outFile);
|
||||||
DataDirectory = dataDir
|
}
|
||||||
};
|
Console.WriteLine($"preview -> {outFile}");
|
||||||
runtime.Prepare(ctx);
|
|
||||||
var view = runtime.CreateView(ctx);
|
|
||||||
if (view == null) { error = "模型没有返回界面"; return false; }
|
|
||||||
|
|
||||||
PrepareView(view, Width, Height);
|
|
||||||
Save(view, outFile);
|
|
||||||
runtime.Dispose();
|
|
||||||
(view as IDisposable)?.Dispose();
|
|
||||||
alc.Unload();
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
error = ex.ToString();
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static string? GetString(System.Text.Json.JsonElement e, string name)
|
return 0;
|
||||||
=> e.TryGetProperty(name, out var v) && v.ValueKind == System.Text.Json.JsonValueKind.String
|
|
||||||
? v.GetString() : null;
|
|
||||||
|
|
||||||
// ─────────────────────────────────────────── 公共
|
|
||||||
|
|
||||||
private static void PrepareView(Control view, double w, double h)
|
|
||||||
{
|
|
||||||
// 封面是宽幅(768×316),模型界面按设计尺寸是 1240×820;这里把布局直接按封面
|
|
||||||
// 尺寸 Measure/Arrange,让卡片上看到的是完整布局而不是被裁掉一角。
|
|
||||||
view.Width = w;
|
|
||||||
view.Height = h;
|
|
||||||
view.Measure(new Size(w, h));
|
|
||||||
view.Arrange(new Rect(0, 0, w, h));
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void Save(Control view, string outFile)
|
|
||||||
{
|
|
||||||
// headless 下 UserControl 必须挂进 Window 才有视觉树;直接 Render(Control)
|
|
||||||
// 会得到一张全黑的图(实测)。地球模型的裸 Control 走同一路径也正常工作。
|
|
||||||
var win = new Window
|
|
||||||
{
|
|
||||||
Width = Width,
|
|
||||||
Height = Height,
|
|
||||||
Background = Avalonia.Media.Brushes.White,
|
|
||||||
Content = view,
|
|
||||||
SystemDecorations = SystemDecorations.None,
|
|
||||||
ShowInTaskbar = false
|
|
||||||
};
|
|
||||||
win.Show();
|
|
||||||
using var bitmap = new RenderTargetBitmap(new PixelSize(Width, Height), new Vector(96, 96));
|
|
||||||
bitmap.Render(win);
|
|
||||||
bitmap.Save(outFile);
|
|
||||||
win.Content = null;
|
|
||||||
win.Close();
|
|
||||||
Console.WriteLine($"preview -> {outFile}");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -65,14 +65,11 @@ foreach (var dir in Directory.GetDirectories(modelRoot)
|
|||||||
var manifest = JsonNode.Parse(File.ReadAllText(manifestPath))?.AsObject();
|
var manifest = JsonNode.Parse(File.ReadAllText(manifestPath))?.AsObject();
|
||||||
if (manifest == null) continue;
|
if (manifest == null) continue;
|
||||||
|
|
||||||
// 版本号由模型清单里手写的 version 决定(作者手动升到 1.0 / 1.1 …),
|
// 版本号只由「清单内容 + 模型包数据」决定,重复构建结果稳定
|
||||||
// 不再用内容指纹覆盖:指纹形式(1.0-393cb2b7d4)对用户不可读、也没有语义。
|
manifest.Remove("version");
|
||||||
var declared = manifest["version"]?.GetValue<string>();
|
manifest.Remove("updatedAt");
|
||||||
var version = string.IsNullOrWhiteSpace(declared) ? "1.0" : declared!.Trim();
|
|
||||||
|
|
||||||
// 内容指纹保留在 build 字段,仅用于构建溯源,不参与版本比较
|
|
||||||
manifest.Remove("build");
|
|
||||||
var canonical = manifest.ToJsonString(new JsonSerializerOptions { WriteIndented = false });
|
var canonical = manifest.ToJsonString(new JsonSerializerOptions { WriteIndented = false });
|
||||||
|
|
||||||
var chunks = new List<byte[]> { Encoding.UTF8.GetBytes(canonical) };
|
var chunks = new List<byte[]> { Encoding.UTF8.GetBytes(canonical) };
|
||||||
foreach (var file in Directory.GetFiles(dataDir, "*", SearchOption.AllDirectories)
|
foreach (var file in Directory.GetFiles(dataDir, "*", SearchOption.AllDirectories)
|
||||||
.Where(Distributable)
|
.Where(Distributable)
|
||||||
@@ -81,10 +78,9 @@ foreach (var dir in Directory.GetDirectories(modelRoot)
|
|||||||
chunks.Add(Encoding.UTF8.GetBytes("\n" + Rel(dataDir, file) + "\n"));
|
chunks.Add(Encoding.UTF8.GetBytes("\n" + Rel(dataDir, file) + "\n"));
|
||||||
chunks.Add(File.ReadAllBytes(file));
|
chunks.Add(File.ReadAllBytes(file));
|
||||||
}
|
}
|
||||||
var fingerprint = Fingerprint(chunks)[..10];
|
|
||||||
|
|
||||||
|
var version = "1.0-" + Fingerprint(chunks)[..10];
|
||||||
manifest["version"] = version;
|
manifest["version"] = version;
|
||||||
manifest["build"] = fingerprint;
|
|
||||||
manifest["updatedAt"] = DateTime.UtcNow.ToString("yyyy-MM-ddTHH:mm:ssZ");
|
manifest["updatedAt"] = DateTime.UtcNow.ToString("yyyy-MM-ddTHH:mm:ssZ");
|
||||||
File.WriteAllText(manifestPath, manifest.ToJsonString(relaxed) + "\n");
|
File.WriteAllText(manifestPath, manifest.ToJsonString(relaxed) + "\n");
|
||||||
|
|
||||||
@@ -92,10 +88,9 @@ foreach (var dir in Directory.GetDirectories(modelRoot)
|
|||||||
{
|
{
|
||||||
["id"] = id,
|
["id"] = id,
|
||||||
["version"] = version,
|
["version"] = version,
|
||||||
["build"] = fingerprint,
|
|
||||||
["dir"] = "model/" + id
|
["dir"] = "model/" + id
|
||||||
});
|
});
|
||||||
Console.WriteLine($" {id,-20} {version,-8} (build {fingerprint})");
|
Console.WriteLine($" {id,-20} {version}");
|
||||||
}
|
}
|
||||||
|
|
||||||
// 启动器源码指纹(只展示,不触发升级;升级看 launcher.version)
|
// 启动器源码指纹(只展示,不触发升级;升级看 launcher.version)
|
||||||
|
|||||||
Binary file not shown.
@@ -1,23 +0,0 @@
|
|||||||
{
|
|
||||||
"runtimeTarget": {
|
|
||||||
"name": ".NETCoreApp,Version=v8.0",
|
|
||||||
"signature": ""
|
|
||||||
},
|
|
||||||
"compilationOptions": {},
|
|
||||||
"targets": {
|
|
||||||
".NETCoreApp,Version=v8.0": {
|
|
||||||
"VersionStamp/1.0.4": {
|
|
||||||
"runtime": {
|
|
||||||
"VersionStamp.dll": {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"libraries": {
|
|
||||||
"VersionStamp/1.0.4": {
|
|
||||||
"type": "project",
|
|
||||||
"serviceable": false,
|
|
||||||
"sha512": ""
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Binary file not shown.
Binary file not shown.
@@ -1,13 +0,0 @@
|
|||||||
{
|
|
||||||
"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
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-4
@@ -1,4 +0,0 @@
|
|||||||
// <autogenerated />
|
|
||||||
using System;
|
|
||||||
using System.Reflection;
|
|
||||||
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v8.0", FrameworkDisplayName = ".NET 8.0")]
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
//------------------------------------------------------------------------------
|
|
||||||
// <auto-generated>
|
|
||||||
// This code was generated by a tool.
|
|
||||||
//
|
|
||||||
// Changes to this file may cause incorrect behavior and will be lost if
|
|
||||||
// the code is regenerated.
|
|
||||||
// </auto-generated>
|
|
||||||
//------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
using System;
|
|
||||||
using System.Reflection;
|
|
||||||
|
|
||||||
[assembly: System.Reflection.AssemblyCompanyAttribute("NeoRF")]
|
|
||||||
[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
|
|
||||||
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.4.0")]
|
|
||||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.4+936aec81850fb15f55014c66116d174dc9e2f967")]
|
|
||||||
[assembly: System.Reflection.AssemblyProductAttribute("Earth Model Studio")]
|
|
||||||
[assembly: System.Reflection.AssemblyTitleAttribute("VersionStamp")]
|
|
||||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.4.0")]
|
|
||||||
[assembly: System.Resources.NeutralResourcesLanguageAttribute("zh-Hans")]
|
|
||||||
|
|
||||||
// Generated by the MSBuild WriteCodeFragment class.
|
|
||||||
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
227dfd55e1626217a9b4b76559607d369bc84a173b8c542681a836eb300be0a1
|
|
||||||
-18
@@ -1,18 +0,0 @@
|
|||||||
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 =
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
// <auto-generated/>
|
|
||||||
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;
|
|
||||||
Binary file not shown.
-1
@@ -1 +0,0 @@
|
|||||||
85742ef80cf2152cf4a4430f83d458331bf993698b5083cd8b3b2fcfbf3691ce
|
|
||||||
-14
@@ -1,14 +0,0 @@
|
|||||||
/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
|
|
||||||
Binary file not shown.
@@ -1 +0,0 @@
|
|||||||
d0976149c15255acc8dcb9e033721a42927c784807f5fd87fba864a81ecce360
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,69 +0,0 @@
|
|||||||
{
|
|
||||||
"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.4",
|
|
||||||
"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"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8" standalone="no"?>
|
|
||||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
|
|
||||||
<RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
|
|
||||||
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
|
|
||||||
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
|
|
||||||
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/Users/morris/.nuget/packages/</NuGetPackageRoot>
|
|
||||||
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/Users/morris/.nuget/packages/</NuGetPackageFolders>
|
|
||||||
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
|
|
||||||
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">7.0.0</NuGetToolVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
|
|
||||||
<SourceRoot Include="/Users/morris/.nuget/packages/" />
|
|
||||||
</ItemGroup>
|
|
||||||
</Project>
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8" standalone="no"?>
|
|
||||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />
|
|
||||||
@@ -1,74 +0,0 @@
|
|||||||
{
|
|
||||||
"version": 4,
|
|
||||||
"targets": {
|
|
||||||
"net8.0": {}
|
|
||||||
},
|
|
||||||
"libraries": {},
|
|
||||||
"projectFileDependencyGroups": {
|
|
||||||
"net8.0": []
|
|
||||||
},
|
|
||||||
"packageFolders": {
|
|
||||||
"/Users/morris/.nuget/packages/": {}
|
|
||||||
},
|
|
||||||
"project": {
|
|
||||||
"version": "1.0.4",
|
|
||||||
"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"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
{
|
|
||||||
"version": 2,
|
|
||||||
"dgSpecHash": "d5HD23m5HNE=",
|
|
||||||
"success": true,
|
|
||||||
"projectFilePath": "/Users/morris/Downloads/GC#/model/_engine/VersionStamp/VersionStamp.csproj",
|
|
||||||
"expectedPackageFiles": [],
|
|
||||||
"logs": []
|
|
||||||
}
|
|
||||||
@@ -726,43 +726,34 @@ public class CelestialView : Control, IDisposable
|
|||||||
|
|
||||||
if (!labels) return;
|
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)
|
foreach (var l in lines)
|
||||||
{
|
{
|
||||||
if (l.Label == null) continue;
|
if (l.Label == null) continue;
|
||||||
|
Vector3 best = default;
|
||||||
// 该纬度圈在相机空间的最高点高度:取整圈采样里 Y 的最大值,
|
var bestScore = double.NegativeInfinity;
|
||||||
// 只依赖俯仰角(连续量),不随自转变化。
|
for (var lon = -180; lon < 180; lon += 6)
|
||||||
var maxY = double.NegativeInfinity;
|
|
||||||
for (var lon = 0; lon < 360; lon += 10)
|
|
||||||
{
|
{
|
||||||
var world = Vector3.Transform(LatLonToUnit(l.Lat, lon), planet);
|
var world = Vector3.Transform(LatLonToUnit(l.Lat, lon), planet);
|
||||||
var c = Vector3.Transform(world, cam);
|
var c = Vector3.Transform(world, cam);
|
||||||
if (c.Y > maxY) maxY = c.Y;
|
if (c.Z < 0.10f) continue;
|
||||||
|
var score = c.X * 2.0 + c.Z;
|
||||||
|
if (score > bestScore) { bestScore = score; best = c; }
|
||||||
}
|
}
|
||||||
if (double.IsNegativeInfinity(maxY)) continue;
|
if (double.IsNegativeInfinity(bestScore)) continue;
|
||||||
|
placed.Add((center.Y - best.Y * radius, center.X + best.X * radius, l.Label, l.Brush));
|
||||||
placed.Add((center.Y - maxY * radius, l.Lat, l.Label, l.Brush));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// 按纬度从北到南排,保证顺序恒定;再用「期望间距」平滑排布,
|
placed.Sort((a, b) => a.Y.CompareTo(b.Y));
|
||||||
// 间距不足时按固定比例压缩(而不是 +16 硬推,硬推会让整串标签滑动)。
|
const double minGap = 16.0;
|
||||||
placed.Sort((a, b) => b.Lat.CompareTo(a.Lat));
|
var lastY = double.NegativeInfinity;
|
||||||
if (placed.Count == 0) return;
|
foreach (var p in placed)
|
||||||
|
|
||||||
var labelX = center.X + radius * 1.02; // 固定在球右侧外部
|
|
||||||
for (var i = 0; i < placed.Count; i++)
|
|
||||||
{
|
{
|
||||||
var p = placed[i];
|
var y = p.Y;
|
||||||
DrawLabelChip(ctx, p.Text, new Point(labelX, p.Y),
|
if (y - lastY < minGap) y = lastY + minGap;
|
||||||
InsetMode ? 9.0 : 10.5, p.Brush, toRight: true);
|
lastY = y;
|
||||||
|
DrawLabelChip(ctx, p.Text, new Point(p.X, y), InsetMode ? 9.0 : 10.5, p.Brush, toRight: false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -776,9 +767,8 @@ public class CelestialView : Control, IDisposable
|
|||||||
TextAlignment = TextAlignment.Left,
|
TextAlignment = TextAlignment.Left,
|
||||||
Trimming = TextTrimming.None
|
Trimming = TextTrimming.None
|
||||||
};
|
};
|
||||||
// 锚点即文字垂直中心,避免不同文字高度造成上下漂移
|
|
||||||
var x = toRight ? anchor.X + 9 : Math.Max(3, anchor.X - formatted.Width - 9);
|
var x = toRight ? anchor.X + 9 : Math.Max(3, anchor.X - formatted.Width - 9);
|
||||||
var y = anchor.Y - formatted.Height * 0.5;
|
var y = anchor.Y - formatted.Height - 4;
|
||||||
ctx.DrawRectangle(ChipBg, null,
|
ctx.DrawRectangle(ChipBg, null,
|
||||||
new Rect(x - 5, y - 2, formatted.Width + 10, formatted.Height + 5), 4, 4);
|
new Rect(x - 5, y - 2, formatted.Width + 10, formatted.Height + 5), 4, 4);
|
||||||
ctx.DrawText(formatted, new Point(x, y));
|
ctx.DrawText(formatted, new Point(x, y));
|
||||||
|
|||||||
@@ -48,6 +48,7 @@ public sealed class EarthModelView : UserControl, IDisposable
|
|||||||
private TextBlock? _closeupLabel;
|
private TextBlock? _closeupLabel;
|
||||||
private ModelButton? _playButton;
|
private ModelButton? _playButton;
|
||||||
private ModelButton? _overheadButton;
|
private ModelButton? _overheadButton;
|
||||||
|
private ModelButton? _closeupButton;
|
||||||
private TextBlock? _zoomText;
|
private TextBlock? _zoomText;
|
||||||
private TextBlock? _cardState;
|
private TextBlock? _cardState;
|
||||||
private TextBlock? _cardTitle;
|
private TextBlock? _cardTitle;
|
||||||
@@ -291,7 +292,12 @@ public sealed class EarthModelView : UserControl, IDisposable
|
|||||||
row.Children.Add(MakeToggle(_texts["orbit"], _orbit, on => { _orbit = on; _canvas.ShowOrbit = 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["grid"], _grid, on => { _grid = on; _canvas.ShowGraticule = on; }));
|
||||||
row.Children.Add(MakeToggle(_texts["tilt"], _tilt, on => { _tilt = on; _canvas.ExaggerateTilt = 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 =>
|
_overheadButton = MakeToggle(_texts["overhead"], _overhead, on =>
|
||||||
{
|
{
|
||||||
_overhead = on;
|
_overhead = on;
|
||||||
|
|||||||
-115
@@ -1,115 +0,0 @@
|
|||||||
{
|
|
||||||
"runtimeTarget": {
|
|
||||||
"name": ".NETCoreApp,Version=v8.0",
|
|
||||||
"signature": ""
|
|
||||||
},
|
|
||||||
"compilationOptions": {},
|
|
||||||
"targets": {
|
|
||||||
".NETCoreApp,Version=v8.0": {
|
|
||||||
"EarthModelStudio.ModelSdk/1.0.4": {
|
|
||||||
"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.4": {
|
|
||||||
"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"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Binary file not shown.
Binary file not shown.
-115
@@ -1,115 +0,0 @@
|
|||||||
{
|
|
||||||
"runtimeTarget": {
|
|
||||||
"name": ".NETCoreApp,Version=v8.0",
|
|
||||||
"signature": ""
|
|
||||||
},
|
|
||||||
"compilationOptions": {},
|
|
||||||
"targets": {
|
|
||||||
".NETCoreApp,Version=v8.0": {
|
|
||||||
"EarthModelStudio.ModelSdk/1.0.4": {
|
|
||||||
"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.4": {
|
|
||||||
"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"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Binary file not shown.
-4
@@ -1,4 +0,0 @@
|
|||||||
// <autogenerated />
|
|
||||||
using System;
|
|
||||||
using System.Reflection;
|
|
||||||
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v8.0", FrameworkDisplayName = ".NET 8.0")]
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
19347f0fd9099e96da933911861c08405b49d004b7b88b97423c17bee0eb100f
|
|
||||||
-24
@@ -1,24 +0,0 @@
|
|||||||
//------------------------------------------------------------------------------
|
|
||||||
// <auto-generated>
|
|
||||||
// This code was generated by a tool.
|
|
||||||
//
|
|
||||||
// Changes to this file may cause incorrect behavior and will be lost if
|
|
||||||
// the code is regenerated.
|
|
||||||
// </auto-generated>
|
|
||||||
//------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
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.4.0")]
|
|
||||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.4+f69a8fbb7fa563800802d3c2e319ed56365c3b8c")]
|
|
||||||
[assembly: System.Reflection.AssemblyProductAttribute("Earth Model Studio")]
|
|
||||||
[assembly: System.Reflection.AssemblyTitleAttribute("EarthModelStudio.ModelSdk")]
|
|
||||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.4.0")]
|
|
||||||
[assembly: System.Resources.NeutralResourcesLanguageAttribute("zh-Hans")]
|
|
||||||
|
|
||||||
// Generated by the MSBuild WriteCodeFragment class.
|
|
||||||
|
|
||||||
-1
@@ -1 +0,0 @@
|
|||||||
d6cbf6a817e6aee9414cc9cd44beae17a3d7a177fe3f87185800ffb9e4ec71ca
|
|
||||||
-25
@@ -1,25 +0,0 @@
|
|||||||
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 =
|
|
||||||
BIN
Binary file not shown.
BIN
Binary file not shown.
-1
@@ -1 +0,0 @@
|
|||||||
700a4b41f184bc7a11bf82dedb3429528bb388b5fb0ec5c68baea6f472087bef
|
|
||||||
-13
@@ -1,13 +0,0 @@
|
|||||||
/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
|
|
||||||
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
-75
@@ -1,75 +0,0 @@
|
|||||||
{
|
|
||||||
"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.4",
|
|
||||||
"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"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-22
@@ -1,22 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8" standalone="no"?>
|
|
||||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
|
|
||||||
<RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
|
|
||||||
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
|
|
||||||
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
|
|
||||||
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/Users/morris/.nuget/packages/</NuGetPackageRoot>
|
|
||||||
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/Users/morris/.nuget/packages/</NuGetPackageFolders>
|
|
||||||
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
|
|
||||||
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">7.0.0</NuGetToolVersion>
|
|
||||||
</PropertyGroup>
|
|
||||||
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
|
|
||||||
<SourceRoot Include="/Users/morris/.nuget/packages/" />
|
|
||||||
</ItemGroup>
|
|
||||||
<ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
|
|
||||||
<Import Project="$(NuGetPackageRoot)avalonia/11.3.9/buildTransitive/Avalonia.props" Condition="Exists('$(NuGetPackageRoot)avalonia/11.3.9/buildTransitive/Avalonia.props')" />
|
|
||||||
</ImportGroup>
|
|
||||||
<PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
|
|
||||||
<PkgAvalonia_BuildServices Condition=" '$(PkgAvalonia_BuildServices)' == '' ">/Users/morris/.nuget/packages/avalonia.buildservices/11.3.2</PkgAvalonia_BuildServices>
|
|
||||||
<PkgAvalonia Condition=" '$(PkgAvalonia)' == '' ">/Users/morris/.nuget/packages/avalonia/11.3.9</PkgAvalonia>
|
|
||||||
</PropertyGroup>
|
|
||||||
</Project>
|
|
||||||
-7
@@ -1,7 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8" standalone="no"?>
|
|
||||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
||||||
<ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
|
|
||||||
<Import Project="$(NuGetPackageRoot)avalonia.buildservices/11.3.2/buildTransitive/Avalonia.BuildServices.targets" Condition="Exists('$(NuGetPackageRoot)avalonia.buildservices/11.3.2/buildTransitive/Avalonia.BuildServices.targets')" />
|
|
||||||
<Import Project="$(NuGetPackageRoot)avalonia/11.3.9/buildTransitive/Avalonia.targets" Condition="Exists('$(NuGetPackageRoot)avalonia/11.3.9/buildTransitive/Avalonia.targets')" />
|
|
||||||
</ImportGroup>
|
|
||||||
</Project>
|
|
||||||
-4
@@ -1,4 +0,0 @@
|
|||||||
// <autogenerated />
|
|
||||||
using System;
|
|
||||||
using System.Reflection;
|
|
||||||
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v8.0", FrameworkDisplayName = ".NET 8.0")]
|
|
||||||
-1
@@ -1 +0,0 @@
|
|||||||
19347f0fd9099e96da933911861c08405b49d004b7b88b97423c17bee0eb100f
|
|
||||||
-24
@@ -1,24 +0,0 @@
|
|||||||
//------------------------------------------------------------------------------
|
|
||||||
// <auto-generated>
|
|
||||||
// This code was generated by a tool.
|
|
||||||
//
|
|
||||||
// Changes to this file may cause incorrect behavior and will be lost if
|
|
||||||
// the code is regenerated.
|
|
||||||
// </auto-generated>
|
|
||||||
//------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
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.4.0")]
|
|
||||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.4+874c97ee271617592f530440ae8879461e91488b")]
|
|
||||||
[assembly: System.Reflection.AssemblyProductAttribute("Earth Model Studio")]
|
|
||||||
[assembly: System.Reflection.AssemblyTitleAttribute("EarthModelStudio.ModelSdk")]
|
|
||||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.4.0")]
|
|
||||||
[assembly: System.Resources.NeutralResourcesLanguageAttribute("zh-Hans")]
|
|
||||||
|
|
||||||
// Generated by the MSBuild WriteCodeFragment class.
|
|
||||||
|
|
||||||
-1
@@ -1 +0,0 @@
|
|||||||
1e556d89cb334279dd738ee053373abdd6a4398ad2892bf59fdbda53299c0ae5
|
|
||||||
-25
@@ -1,25 +0,0 @@
|
|||||||
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 =
|
|
||||||
BIN
Binary file not shown.
BIN
Binary file not shown.
-1
@@ -1 +0,0 @@
|
|||||||
1ab491e560668f97a7c06bde5290baec8ff1947cd02855cf82f1f7a392fd58bf
|
|
||||||
-13
@@ -1,13 +0,0 @@
|
|||||||
/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
|
|
||||||
/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/bin/Release/net8.0/EarthModelStudio.ModelSdk.pdb
|
|
||||||
/Users/morris/Downloads/GC#/model/_sdk/EarthModelStudio.ModelSdk/obj/Release/net8.0/EarthModelStudio.ModelSdk.pdb
|
|
||||||
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
@@ -1,413 +0,0 @@
|
|||||||
{
|
|
||||||
"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": {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"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"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"projectFileDependencyGroups": {
|
|
||||||
"net8.0": [
|
|
||||||
"Avalonia >= 11.3.9"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"packageFolders": {
|
|
||||||
"/Users/morris/.nuget/packages/": {}
|
|
||||||
},
|
|
||||||
"project": {
|
|
||||||
"version": "1.0.4",
|
|
||||||
"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"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
{
|
|
||||||
"version": 2,
|
|
||||||
"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"
|
|
||||||
],
|
|
||||||
"logs": []
|
|
||||||
}
|
|
||||||
@@ -17,7 +17,6 @@
|
|||||||
"atlas"
|
"atlas"
|
||||||
],
|
],
|
||||||
"dataDir": "earth-geography.model",
|
"dataDir": "earth-geography.model",
|
||||||
"version": "1.2",
|
"version": "1.0-dd67f83d0c",
|
||||||
"updatedAt": "2026-11-08T12:19:03Z",
|
"updatedAt": "2026-11-08T01:29:16Z"
|
||||||
"build": "5e12cd2ee1"
|
|
||||||
}
|
}
|
||||||
Binary file not shown.
@@ -1 +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":[[[-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":"德雷克海峡","nameI18n":{"zh-CN":"德雷克海峡","en":"Drake Passage"},"lines":[[[-68.0,-56.0],[-66.5,-57.5],[-65.0,-59.0],[-63.5,-60.5],[-62.0,-62.0]]]},{"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]]]}]}
|
{"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]]]}]}
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
{
|
|
||||||
"continents": [
|
|
||||||
{
|
|
||||||
"id": "eurasia",
|
|
||||||
"nameI18n": { "zh-CN": "亚欧大陆", "en": "Eurasia" },
|
|
||||||
"label": [85, 52],
|
|
||||||
"lines": [
|
|
||||||
[[-10,36],[-9,43],[-2,48],[3,52],[8,58],[12,65],[20,70],[30,71],[45,68],[60,72],[80,74],[100,76],[120,73],[140,70],[160,62],[170,60],[160,54],[145,50],[140,42],[130,38],[122,30],[120,22],[110,20],[105,10],[100,5],[103,-2],[98,2],[92,20],[88,22],[80,8],[77,8],[72,20],[68,24],[62,25],[57,25],[50,28],[45,38],[35,36],[28,40],[26,40],[20,42],[15,38],[10,37],[0,36],[-10,36]]
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "africa",
|
|
||||||
"nameI18n": { "zh-CN": "非洲大陆", "en": "Africa" },
|
|
||||||
"label": [18, 2],
|
|
||||||
"lines": [
|
|
||||||
[[-17,15],[-16,21],[-10,27],[-6,36],[10,37],[20,33],[32,31],[35,24],[38,18],[43,12],[51,11],[48,5],[42,-2],[41,-12],[40,-20],[35,-26],[30,-31],[25,-35],[18,-34],[15,-27],[12,-18],[9,-5],[8,4],[3,6],[-4,5],[-8,5],[-13,10],[-17,15]]
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "america",
|
|
||||||
"nameI18n": { "zh-CN": "美洲大陆", "en": "America" },
|
|
||||||
"label": [-88, 8],
|
|
||||||
"lines": [
|
|
||||||
[[-168,66],[-160,70],[-145,70],[-130,68],[-115,70],[-100,72],[-85,70],[-75,63],[-62,60],[-55,52],[-60,47],[-66,45],[-70,42],[-75,36],[-81,30],[-80,25],[-83,22],[-87,21],[-90,18],[-88,16],[-83,10],[-78,9],[-77,8],[-79,2],[-81,-5],[-76,-14],[-71,-18],[-70,-24],[-72,-38],[-74,-45],[-70,-52],[-68,-55],[-72,-54],[-75,-48],[-73,-40],[-71,-30],[-70,-20],[-75,-10],[-80,0],[-83,8],[-88,14],[-95,16],[-105,20],[-110,24],[-114,30],[-117,33],[-122,38],[-124,45],[-130,52],[-135,58],[-145,60],[-155,58],[-165,60],[-168,66]]
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "australia",
|
|
||||||
"nameI18n": { "zh-CN": "澳大利亚大陆", "en": "Australia" },
|
|
||||||
"label": [134, -25],
|
|
||||||
"lines": [
|
|
||||||
[[113,-22],[114,-27],[116,-33],[122,-34],[129,-32],[134,-33],[138,-35],[141,-38],[147,-38],[150,-35],[153,-29],[153,-25],[149,-21],[146,-19],[142,-11],[138,-12],[136,-14],[132,-11],[129,-15],[125,-14],[122,-17],[117,-20],[113,-22]]
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "antarctica",
|
|
||||||
"nameI18n": { "zh-CN": "南极大陆", "en": "Antarctica" },
|
|
||||||
"label": [20, -78],
|
|
||||||
"lines": [
|
|
||||||
[[-180,-72],[-150,-75],[-120,-73],[-90,-75],[-60,-70],[-45,-73],[-20,-70],[0,-69],[30,-68],[60,-67],[90,-66],[120,-66],[150,-70],[170,-72],[180,-78],[150,-80],[120,-80],[90,-79],[60,-78],[30,-76],[0,-75],[-30,-76],[-60,-77],[-90,-78],[-120,-77],[-150,-76],[-180,-72]]
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -1,53 +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]]]}]}
|
||||||
"plates": [
|
|
||||||
{
|
|
||||||
"id": "eurasian",
|
|
||||||
"nameI18n": { "zh-CN": "亚欧板块", "en": "Eurasian Plate" },
|
|
||||||
"label": [85, 55],
|
|
||||||
"lines": [
|
|
||||||
[[-10,36],[0,45],[15,55],[30,68],[60,72],[100,76],[140,70],[160,60],[140,42],[125,32],[110,28],[95,28],[80,30],[72,28],[60,25],[45,30],[32,32],[10,37],[-10,36]]
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "african",
|
|
||||||
"nameI18n": { "zh-CN": "非洲板块", "en": "African Plate" },
|
|
||||||
"label": [12, 2],
|
|
||||||
"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": "american",
|
|
||||||
"nameI18n": { "zh-CN": "美洲板块", "en": "American Plate" },
|
|
||||||
"label": [-100, 12],
|
|
||||||
"lines": [
|
|
||||||
[[-168,72],[-140,70],[-115,70],[-90,72],[-60,60],[-52,45],[-60,30],[-80,25],[-82,8],[-78,0],[-70,-15],[-72,-40],[-75,-52],[-80,-55],[-95,-45],[-105,-25],[-95,-5],[-90,10],[-105,20],[-120,35],[-135,50],[-155,60],[-168,72]]
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "pacific",
|
|
||||||
"nameI18n": { "zh-CN": "太平洋板块", "en": "Pacific Plate" },
|
|
||||||
"label": [-150, 0],
|
|
||||||
"lines": [
|
|
||||||
[[-180,60],[-150,55],[-130,45],[-110,25],[-95,10],[-80,0],[-75,-15],[-90,-30],[-110,-45],[-130,-55],[-160,-60],[-180,-58],[-180,60]],
|
|
||||||
[[145,55],[158,45],[152,30],[145,15],[140,0],[148,-15],[158,-30],[168,-45],[180,-55],[180,60],[165,60],[145,55]]
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "indian-ocean",
|
|
||||||
"nameI18n": { "zh-CN": "印度洋板块", "en": "Indian Ocean Plate" },
|
|
||||||
"label": [95, -8],
|
|
||||||
"lines": [
|
|
||||||
[[35,32],[50,30],[60,22],[68,24],[75,8],[88,5],[95,5],[115,10],[130,5],[145,-5],[150,-20],[145,-35],[130,-42],[115,-38],[105,-25],[95,-10],[80,-10],[65,-5],[55,10],[42,10],[35,20],[35,32]]
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "antarctic",
|
|
||||||
"nameI18n": { "zh-CN": "南极洲板块", "en": "Antarctic Plate" },
|
|
||||||
"label": [0, -76],
|
|
||||||
"lines": [
|
|
||||||
[[-180,-60],[-120,-62],[-60,-60],[0,-62],[60,-60],[120,-62],[180,-60],[180,-90],[-180,-90],[-180,-60]]
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 196 KiB |
@@ -12,8 +12,8 @@
|
|||||||
"en": "Earth Geography"
|
"en": "Earth Geography"
|
||||||
},
|
},
|
||||||
"descriptionI18n": {
|
"descriptionI18n": {
|
||||||
"zh-CN": "五带划分 · 七大洲四大洋 · 六大板块 · 五大陆与洲界",
|
"zh-CN": "五带划分 · 七大洲四大洋 · 六大板块与洲界",
|
||||||
"en": "Climate zones · continents & oceans · six plates · five mainlands & borders"
|
"en": "Climate zones · continents & oceans · plates & borders"
|
||||||
},
|
},
|
||||||
"tropicDeg": 23.5,
|
"tropicDeg": 23.5,
|
||||||
"axialTiltDeg": 23.5,
|
"axialTiltDeg": 23.5,
|
||||||
|
|||||||
@@ -13,8 +13,6 @@ public sealed class PlateEntry
|
|||||||
{
|
{
|
||||||
[JsonPropertyName("id")] public string Id { get; set; } = "";
|
[JsonPropertyName("id")] public string Id { get; set; } = "";
|
||||||
[JsonPropertyName("nameI18n")] public Dictionary<string, string>? NameI18n { get; set; }
|
[JsonPropertyName("nameI18n")] public Dictionary<string, string>? NameI18n { get; set; }
|
||||||
/// <summary>标签锚点 [lon, lat];缺省时用轮廓质心。</summary>
|
|
||||||
[JsonPropertyName("label")] public double[]? Label { get; set; }
|
|
||||||
[JsonPropertyName("lines")] public List<List<double[]>> Lines { get; set; } = new();
|
[JsonPropertyName("lines")] public List<List<double[]>> Lines { get; set; } = new();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -23,12 +21,6 @@ public sealed class PlateData
|
|||||||
[JsonPropertyName("plates")] public List<PlateEntry> Plates { get; set; } = new();
|
[JsonPropertyName("plates")] public List<PlateEntry> Plates { get; set; } = new();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>大陆(六块大陆里的教材五块写法)。结构与板块一致,纯线稿。</summary>
|
|
||||||
public sealed class ContinentData
|
|
||||||
{
|
|
||||||
[JsonPropertyName("continents")] public List<PlateEntry> Continents { get; set; } = new();
|
|
||||||
}
|
|
||||||
|
|
||||||
public sealed class BorderEntry
|
public sealed class BorderEntry
|
||||||
{
|
{
|
||||||
/// <summary>分界的两个大洲,如「亚洲-非洲」。</summary>
|
/// <summary>分界的两个大洲,如「亚洲-非洲」。</summary>
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ public sealed class GeographyRuntime : IModelRuntime
|
|||||||
private GeoScene? _scene;
|
private GeoScene? _scene;
|
||||||
private GeoData? _coast;
|
private GeoData? _coast;
|
||||||
private PlateData? _plates;
|
private PlateData? _plates;
|
||||||
private ContinentData? _continents;
|
|
||||||
private BorderData? _borders;
|
private BorderData? _borders;
|
||||||
private LabelData? _labels;
|
private LabelData? _labels;
|
||||||
private GeographyView? _view;
|
private GeographyView? _view;
|
||||||
@@ -31,15 +30,13 @@ public sealed class GeographyRuntime : IModelRuntime
|
|||||||
_scene = ModelJson.Read<GeoScene>(Path.Combine(dir, "scene.json")) ?? new GeoScene();
|
_scene = ModelJson.Read<GeoScene>(Path.Combine(dir, "scene.json")) ?? new GeoScene();
|
||||||
_coast = ModelJson.Read<GeoData>(Path.Combine(dir, "coastline.json")) ?? new GeoData();
|
_coast = ModelJson.Read<GeoData>(Path.Combine(dir, "coastline.json")) ?? new GeoData();
|
||||||
_plates = ModelJson.Read<PlateData>(Path.Combine(dir, "plates.json")) ?? new PlateData();
|
_plates = ModelJson.Read<PlateData>(Path.Combine(dir, "plates.json")) ?? new PlateData();
|
||||||
_continents = ModelJson.Read<ContinentData>(Path.Combine(dir, "continents.json")) ?? new ContinentData();
|
|
||||||
_borders = ModelJson.Read<BorderData>(Path.Combine(dir, "borders.json")) ?? new BorderData();
|
_borders = ModelJson.Read<BorderData>(Path.Combine(dir, "borders.json")) ?? new BorderData();
|
||||||
|
|
||||||
context.ReportProgress(0.45, "加载名称标注");
|
context.ReportProgress(0.45, "加载名称标注");
|
||||||
_labels = ModelJson.Read<LabelData>(Path.Combine(dir, "labels.json")) ?? new LabelData();
|
_labels = ModelJson.Read<LabelData>(Path.Combine(dir, "labels.json")) ?? new LabelData();
|
||||||
|
|
||||||
context.ReportProgress(0.72, "构建轮廓");
|
context.ReportProgress(0.72, "构建轮廓");
|
||||||
context.Log($"[{context.ModelId}] 海岸线 {_coast.Lines.Count} 条,六大板块 {_plates.Plates.Count} 个," +
|
context.Log($"[{context.ModelId}] 海岸线 {_coast.Lines.Count} 条,板块 {_plates.Plates.Count} 个,洲界 {_borders.Borders.Count} 条");
|
||||||
$"大陆 {_continents.Continents.Count} 块,洲界 {_borders.Borders.Count} 条");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Control CreateView(IModelContext context)
|
public Control CreateView(IModelContext context)
|
||||||
@@ -47,11 +44,10 @@ public sealed class GeographyRuntime : IModelRuntime
|
|||||||
_scene ??= new GeoScene();
|
_scene ??= new GeoScene();
|
||||||
_coast ??= new GeoData();
|
_coast ??= new GeoData();
|
||||||
_plates ??= new PlateData();
|
_plates ??= new PlateData();
|
||||||
_continents ??= new ContinentData();
|
|
||||||
_borders ??= new BorderData();
|
_borders ??= new BorderData();
|
||||||
_labels ??= new LabelData();
|
_labels ??= new LabelData();
|
||||||
|
|
||||||
_view = new GeographyView(context, _scene, _coast, _plates, _continents, _borders, _labels);
|
_view = new GeographyView(context, _scene, _coast, _plates, _borders, _labels);
|
||||||
context.ReportProgress(1.0, "准备就绪");
|
context.ReportProgress(1.0, "准备就绪");
|
||||||
return BuildLayout(_scene, _view, context);
|
return BuildLayout(_scene, _view, context);
|
||||||
}
|
}
|
||||||
@@ -94,8 +90,7 @@ public sealed class GeographyRuntime : IModelRuntime
|
|||||||
actions.Children.Add(MakeModeSwitch(view));
|
actions.Children.Add(MakeModeSwitch(view));
|
||||||
actions.Children.Add(MakeToggle("五带", view.ShowZones, on => view.ShowZones = on));
|
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.ShowCoast, on => view.ShowCoast = on));
|
||||||
actions.Children.Add(MakeToggle("六大板块", view.ShowPlates, on => view.ShowPlates = on));
|
actions.Children.Add(MakeToggle("板块", view.ShowPlates, on => view.ShowPlates = on));
|
||||||
actions.Children.Add(MakeToggle("五大陆", view.ShowContinents, on => view.ShowContinents = on));
|
|
||||||
actions.Children.Add(MakeToggle("洲界", view.ShowBorders, on => view.ShowBorders = on));
|
actions.Children.Add(MakeToggle("洲界", view.ShowBorders, on => view.ShowBorders = on));
|
||||||
actions.Children.Add(MakeButton("复位", () => view.ResetView()));
|
actions.Children.Add(MakeButton("复位", () => view.ResetView()));
|
||||||
Grid.SetColumn(actions, 2);
|
Grid.SetColumn(actions, 2);
|
||||||
@@ -127,8 +122,7 @@ public sealed class GeographyRuntime : IModelRuntime
|
|||||||
{
|
{
|
||||||
var panel = new StackPanel { Spacing = 6 };
|
var panel = new StackPanel { Spacing = 6 };
|
||||||
panel.Children.Add(LegendRow(new SolidColorBrush(Color.Parse("#DEEEFF")), "大洲海岸线"));
|
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("#FF8A5C")), "板块边界"));
|
||||||
panel.Children.Add(LegendRow(new SolidColorBrush(Color.Parse("#FFD24A")), "五大陆轮廓"));
|
|
||||||
panel.Children.Add(LegendRow(new SolidColorBrush(Color.Parse("#FFDC70")), "洲界 / 分界线"));
|
panel.Children.Add(LegendRow(new SolidColorBrush(Color.Parse("#FFDC70")), "洲界 / 分界线"));
|
||||||
return new Border
|
return new Border
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ public sealed class GeographyView : Control
|
|||||||
private readonly GeoScene _scene;
|
private readonly GeoScene _scene;
|
||||||
private readonly GeoData _coast;
|
private readonly GeoData _coast;
|
||||||
private readonly PlateData _plates;
|
private readonly PlateData _plates;
|
||||||
private readonly ContinentData _continents;
|
|
||||||
private readonly BorderData _borders;
|
private readonly BorderData _borders;
|
||||||
private readonly LabelData _labels;
|
private readonly LabelData _labels;
|
||||||
|
|
||||||
@@ -36,7 +35,6 @@ public sealed class GeographyView : Control
|
|||||||
private bool _showZones = true;
|
private bool _showZones = true;
|
||||||
private bool _showCoast = true;
|
private bool _showCoast = true;
|
||||||
private bool _showPlates;
|
private bool _showPlates;
|
||||||
private bool _showContinents = true;
|
|
||||||
private bool _showBorders = true;
|
private bool _showBorders = true;
|
||||||
private bool _showLabels = true;
|
private bool _showLabels = true;
|
||||||
private GeoMode _mode = GeoMode.Sphere3D;
|
private GeoMode _mode = GeoMode.Sphere3D;
|
||||||
@@ -44,12 +42,11 @@ public sealed class GeographyView : Control
|
|||||||
public event Action? StateChanged;
|
public event Action? StateChanged;
|
||||||
|
|
||||||
public GeographyView(IModelContext context, GeoScene scene, GeoData coast,
|
public GeographyView(IModelContext context, GeoScene scene, GeoData coast,
|
||||||
PlateData plates, ContinentData continents, BorderData borders, LabelData labels)
|
PlateData plates, BorderData borders, LabelData labels)
|
||||||
{
|
{
|
||||||
_scene = scene;
|
_scene = scene;
|
||||||
_coast = coast;
|
_coast = coast;
|
||||||
_plates = plates;
|
_plates = plates;
|
||||||
_continents = continents;
|
|
||||||
_borders = borders;
|
_borders = borders;
|
||||||
_labels = labels;
|
_labels = labels;
|
||||||
ClipToBounds = true;
|
ClipToBounds = true;
|
||||||
@@ -59,27 +56,12 @@ public sealed class GeographyView : Control
|
|||||||
public bool ShowZones { get => _showZones; set { _showZones = value; Redraw(); } }
|
public bool ShowZones { get => _showZones; set { _showZones = value; Redraw(); } }
|
||||||
public bool ShowCoast { get => _showCoast; set { _showCoast = value; Redraw(); } }
|
public bool ShowCoast { get => _showCoast; set { _showCoast = value; Redraw(); } }
|
||||||
public bool ShowPlates { get => _showPlates; set { _showPlates = value; Redraw(); } }
|
public bool ShowPlates { get => _showPlates; set { _showPlates = value; Redraw(); } }
|
||||||
public bool ShowContinents { get => _showContinents; set { _showContinents = value; Redraw(); } }
|
|
||||||
public bool ShowBorders { get => _showBorders; set { _showBorders = value; Redraw(); } }
|
public bool ShowBorders { get => _showBorders; set { _showBorders = value; Redraw(); } }
|
||||||
public bool ShowLabels { get => _showLabels; set { _showLabels = value; Redraw(); } }
|
public bool ShowLabels { get => _showLabels; set { _showLabels = value; Redraw(); } }
|
||||||
public GeoMode Mode { get => _mode; set { _mode = value; InvalidateVisual(); StateChanged?.Invoke(); } }
|
public GeoMode Mode { get => _mode; set { _mode = value; InvalidateVisual(); StateChanged?.Invoke(); } }
|
||||||
|
|
||||||
/// <summary>缩放倍数(0.55–4.0)。文字大小跟随缩放变化。</summary>
|
|
||||||
public double Zoom
|
|
||||||
{
|
|
||||||
get => _zoom;
|
|
||||||
set
|
|
||||||
{
|
|
||||||
_zoom = Math.Clamp(value, 0.55, 4.0);
|
|
||||||
Redraw();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void Redraw() { InvalidateVisual(); StateChanged?.Invoke(); }
|
private void Redraw() { InvalidateVisual(); StateChanged?.Invoke(); }
|
||||||
|
|
||||||
/// <summary>文字缩放系数:跟随缩放一起放大/缩小,放大地球时标签也变大。</summary>
|
|
||||||
private double TextScale => Math.Clamp(_zoom, 0.85, 2.4);
|
|
||||||
|
|
||||||
public void ResetView()
|
public void ResetView()
|
||||||
{
|
{
|
||||||
_yawDeg = 10;
|
_yawDeg = 10;
|
||||||
@@ -156,7 +138,7 @@ public sealed class GeographyView : Control
|
|||||||
{
|
{
|
||||||
var cx = (float)(size.Width * 0.5);
|
var cx = (float)(size.Width * 0.5);
|
||||||
var cy = (float)(size.Height * 0.52);
|
var cy = (float)(size.Height * 0.52);
|
||||||
var r = (float)(Math.Min(size.Width, size.Height) * 0.40 * Math.Min(_zoom, 1.6));
|
var r = (float)(Math.Min(size.Width, size.Height) * 0.44 * _zoom);
|
||||||
if (r < 12) return;
|
if (r < 12) return;
|
||||||
|
|
||||||
var cam = Matrix4x4.CreateRotationX((float)(-_pitchDeg * Math.PI / 180.0));
|
var cam = Matrix4x4.CreateRotationX((float)(-_pitchDeg * Math.PI / 180.0));
|
||||||
@@ -168,7 +150,6 @@ public sealed class GeographyView : Control
|
|||||||
if (_showZones) DrawZones3D(ctx, m, cx, cy, r);
|
if (_showZones) DrawZones3D(ctx, m, cx, cy, r);
|
||||||
if (_showCoast) DrawCoast3D(ctx, m, cx, cy, r);
|
if (_showCoast) DrawCoast3D(ctx, m, cx, cy, r);
|
||||||
if (_showPlates) DrawPlates3D(ctx, m, cx, cy, r);
|
if (_showPlates) DrawPlates3D(ctx, m, cx, cy, r);
|
||||||
if (_showContinents) DrawContinents3D(ctx, m, cx, cy, r);
|
|
||||||
if (_showBorders) DrawBorders3D(ctx, m, cx, cy, r);
|
if (_showBorders) DrawBorders3D(ctx, m, cx, cy, r);
|
||||||
if (_showLabels) DrawLabels3D(ctx, m, cx, cy, r);
|
if (_showLabels) DrawLabels3D(ctx, m, cx, cy, r);
|
||||||
|
|
||||||
@@ -177,61 +158,22 @@ public sealed class GeographyView : Control
|
|||||||
DrawReadout(ctx, size, $"球面 · {Norm(_yawDeg):0}°E {_pitchDeg:0}°");
|
DrawReadout(ctx, size, $"球面 · {Norm(_yawDeg):0}°E {_pitchDeg:0}°");
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 球体本体:分层绘制提升立体感
|
|
||||||
/// ① 外层大气光晕(径向渐变,越靠边缘越亮)
|
|
||||||
/// ② 海洋底色(左上受光的渐变,模拟日光)
|
|
||||||
/// ③ 高光点 + 阴影弧(明暗对比塑造球感)
|
|
||||||
/// </summary>
|
|
||||||
private static void DrawOceanDisc(DrawingContext ctx, float cx, float cy, float r)
|
private static void DrawOceanDisc(DrawingContext ctx, float cx, float cy, float r)
|
||||||
{
|
{
|
||||||
// ① 大气边缘光:球外一层的柔和蓝晕
|
var disc = new RadialGradientBrush
|
||||||
var halo = new RadialGradientBrush
|
|
||||||
{
|
{
|
||||||
Center = new RelativePoint(0.5, 0.5, RelativeUnit.Relative),
|
Center = new RelativePoint(0.36, 0.32, RelativeUnit.Relative),
|
||||||
GradientOrigin = new RelativePoint(0.5, 0.5, RelativeUnit.Relative),
|
GradientOrigin = new RelativePoint(0.36, 0.32, RelativeUnit.Relative),
|
||||||
RadiusX = new RelativeScalar(0.5, RelativeUnit.Relative),
|
RadiusX = new RelativeScalar(0.85, RelativeUnit.Relative),
|
||||||
RadiusY = new RelativeScalar(0.5, RelativeUnit.Relative),
|
RadiusY = new RelativeScalar(0.85, RelativeUnit.Relative),
|
||||||
GradientStops =
|
GradientStops =
|
||||||
{
|
{
|
||||||
new GradientStop(Color.FromArgb(0, 90, 160, 255), 0.82),
|
new GradientStop(Color.Parse("#12314F"), 0),
|
||||||
new GradientStop(Color.FromArgb(70, 90, 170, 255), 0.94),
|
new GradientStop(Color.Parse("#0A1E33"), 0.62),
|
||||||
new GradientStop(Color.FromArgb(0, 90, 170, 255), 1.0)
|
new GradientStop(Color.Parse("#061120"), 1)
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
ctx.DrawEllipse(halo, null, new Point(cx, cy), r * 1.14, r * 1.14);
|
ctx.DrawEllipse(disc, null, new Point(cx, cy), r, r);
|
||||||
|
|
||||||
// ② 海洋本体:左上亮、右下暗
|
|
||||||
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);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ---- 五带:按纬度带填色(用四边形条带逐格填充,避免整环多边形跨地平线破面)----
|
// ---- 五带:按纬度带填色(用四边形条带逐格填充,避免整环多边形跨地平线破面)----
|
||||||
@@ -313,44 +255,20 @@ public sealed class GeographyView : Control
|
|||||||
var pen = PlatePenFor(p.Id);
|
var pen = PlatePenFor(p.Id);
|
||||||
foreach (var line in p.Lines) DrawGeo3D(ctx, line, m, cx, cy, r, pen, true);
|
foreach (var line in p.Lines) DrawGeo3D(ctx, line, m, cx, cy, r, pen, true);
|
||||||
}
|
}
|
||||||
if (_showLabels) DrawPlateLabels3D(ctx, m, cx, cy, r);
|
if (!_showLabels) return;
|
||||||
}
|
|
||||||
|
|
||||||
private void DrawPlateLabels3D(DrawingContext ctx, Matrix4x4 m, float cx, float cy, float r)
|
|
||||||
{
|
|
||||||
foreach (var p in _plates.Plates)
|
foreach (var p in _plates.Plates)
|
||||||
{
|
{
|
||||||
var at = p.Label is { Length: >= 2 } ? p.Label : Centroid(p.Lines);
|
var center = Centroid(p.Lines);
|
||||||
if (at == null) continue;
|
if (center == null) continue;
|
||||||
var cam = Geometry.ToCamera(Geometry.LatLonToUnit(at[1], at[0]), Matrix4x4.Identity, m);
|
var cam = Geometry.ToCamera(Geometry.LatLonToUnit(center[1], center[0]), Matrix4x4.Identity, m);
|
||||||
if (cam.Z <= 0.2f) continue;
|
if (cam.Z <= 0.2f) continue;
|
||||||
var pos = Geometry.Project(cam, r, cx, cy);
|
var pos = Geometry.Project(cam, r, cx, cy);
|
||||||
DrawText(ctx, Pick(p.NameI18n, p.Id), pos.X, pos.Y, 10.5 * TextScale,
|
DrawText(ctx, Pick(p.NameI18n, p.Id), pos.X, pos.Y, 10.5,
|
||||||
PlateBrushFor(p.Id), TextAlignment.Center);
|
PlateBrushFor(p.Id), TextAlignment.Center);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>五块大陆:与板块独立的线稿图层,便于讲清「板块 ≠ 大陆」。</summary>
|
|
||||||
private void DrawContinents3D(DrawingContext ctx, Matrix4x4 m, float cx, float cy, float r)
|
|
||||||
{
|
|
||||||
var pen = ContinentPen;
|
|
||||||
foreach (var c in _continents.Continents)
|
|
||||||
foreach (var line in c.Lines)
|
|
||||||
DrawGeo3D(ctx, line, m, cx, cy, r, pen, true);
|
|
||||||
|
|
||||||
if (!_showLabels) return;
|
|
||||||
foreach (var c in _continents.Continents)
|
|
||||||
{
|
|
||||||
var at = c.Label is { Length: >= 2 } ? c.Label : Centroid(c.Lines);
|
|
||||||
if (at == null) continue;
|
|
||||||
var cam = Geometry.ToCamera(Geometry.LatLonToUnit(at[1], at[0]), Matrix4x4.Identity, m);
|
|
||||||
if (cam.Z <= 0.2f) continue;
|
|
||||||
var pos = Geometry.Project(cam, r, cx, cy);
|
|
||||||
DrawText(ctx, Pick(c.NameI18n, c.Id), pos.X, pos.Y, 12 * TextScale,
|
|
||||||
MainlandBrush, TextAlignment.Center, FontStyle.Normal);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void DrawBorders3D(DrawingContext ctx, Matrix4x4 m, float cx, float cy, float r)
|
private void DrawBorders3D(DrawingContext ctx, Matrix4x4 m, float cx, float cy, float r)
|
||||||
{
|
{
|
||||||
foreach (var b in _borders.Borders)
|
foreach (var b in _borders.Borders)
|
||||||
@@ -376,7 +294,7 @@ public sealed class GeographyView : Control
|
|||||||
var pos = Geometry.Project(cam, r, cx, cy);
|
var pos = Geometry.Project(cam, r, cx, cy);
|
||||||
ctx.DrawEllipse(segPen.DotBrush, null, Pt(pos), 3.0, 3.0);
|
ctx.DrawEllipse(segPen.DotBrush, null, Pt(pos), 3.0, 3.0);
|
||||||
if (_showLabels)
|
if (_showLabels)
|
||||||
DrawText(ctx, Pick(seg.NameI18n, seg.Name), pos.X + 8, pos.Y - 5, 10 * TextScale,
|
DrawText(ctx, Pick(seg.NameI18n, seg.Name), pos.X + 8, pos.Y - 5, 10,
|
||||||
segPen.DotBrush, TextAlignment.Left);
|
segPen.DotBrush, TextAlignment.Left);
|
||||||
}
|
}
|
||||||
continue;
|
continue;
|
||||||
@@ -396,7 +314,7 @@ public sealed class GeographyView : Control
|
|||||||
if (_showLabels)
|
if (_showLabels)
|
||||||
{
|
{
|
||||||
var text = $"{Pick(b.NameI18n, b.Name)}({b.Between})";
|
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);
|
DrawText(ctx, text, pos2.X + 9, pos2.Y - 6, 10.5, pen.DotBrush, TextAlignment.Left);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -414,7 +332,7 @@ public sealed class GeographyView : Control
|
|||||||
if (cam.Z <= 0.12f) continue;
|
if (cam.Z <= 0.12f) continue;
|
||||||
var pos = Geometry.Project(cam, r, cx, cy);
|
var pos = Geometry.Project(cam, r, cx, cy);
|
||||||
var ocean = lb.Kind == "ocean";
|
var ocean = lb.Kind == "ocean";
|
||||||
DrawText(ctx, Pick(lb.NameI18n, ""), pos.X, pos.Y, (ocean ? 11 : 12.5) * TextScale,
|
DrawText(ctx, Pick(lb.NameI18n, ""), pos.X, pos.Y, ocean ? 11 : 12.5,
|
||||||
ocean ? OceanBrush : ContinentBrush, TextAlignment.Center,
|
ocean ? OceanBrush : ContinentBrush, TextAlignment.Center,
|
||||||
ocean ? FontStyle.Italic : FontStyle.Normal);
|
ocean ? FontStyle.Italic : FontStyle.Normal);
|
||||||
}
|
}
|
||||||
@@ -511,31 +429,14 @@ public sealed class GeographyView : Control
|
|||||||
DrawFlatPolyline(ctx, line, P, pen);
|
DrawFlatPolyline(ctx, line, P, pen);
|
||||||
|
|
||||||
if (!_showLabels) continue;
|
if (!_showLabels) continue;
|
||||||
var c = pl.Label is { Length: >= 2 } ? pl.Label : Centroid(pl.Lines);
|
var c = Centroid(pl.Lines);
|
||||||
if (c == null) continue;
|
if (c == null) continue;
|
||||||
var at = P(c[0], c[1]);
|
var at = P(c[0], c[1]);
|
||||||
DrawText(ctx, Pick(pl.NameI18n, pl.Id), at.X, at.Y, 10.5 * TextScale,
|
DrawText(ctx, Pick(pl.NameI18n, pl.Id), at.X, at.Y, 10.5,
|
||||||
PlateBrushFor(pl.Id), TextAlignment.Center);
|
PlateBrushFor(pl.Id), TextAlignment.Center);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 五大陆
|
|
||||||
if (_showContinents)
|
|
||||||
{
|
|
||||||
foreach (var c in _continents.Continents)
|
|
||||||
{
|
|
||||||
foreach (var line in c.Lines)
|
|
||||||
DrawFlatPolyline(ctx, line, P, ContinentPen);
|
|
||||||
|
|
||||||
if (!_showLabels) continue;
|
|
||||||
var a = c.Label is { Length: >= 2 } ? c.Label : Centroid(c.Lines);
|
|
||||||
if (a == null) continue;
|
|
||||||
var at = P(a[0], a[1]);
|
|
||||||
DrawText(ctx, Pick(c.NameI18n, c.Id), at.X, at.Y, 12 * TextScale,
|
|
||||||
MainlandBrush, TextAlignment.Center);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 洲界
|
// 洲界
|
||||||
if (_showBorders)
|
if (_showBorders)
|
||||||
{
|
{
|
||||||
@@ -552,7 +453,7 @@ public sealed class GeographyView : Control
|
|||||||
ctx.DrawEllipse(pen.DotBrush, null, at, 3.4, 3.4);
|
ctx.DrawEllipse(pen.DotBrush, null, at, 3.4, 3.4);
|
||||||
if (_showLabels)
|
if (_showLabels)
|
||||||
DrawText(ctx, $"{Pick(b.NameI18n, b.Name)}({b.Between})",
|
DrawText(ctx, $"{Pick(b.NameI18n, b.Name)}({b.Between})",
|
||||||
at.X + 9, at.Y - 6, 10.5 * TextScale, pen.DotBrush, TextAlignment.Left);
|
at.X + 9, at.Y - 6, 10.5, pen.DotBrush, TextAlignment.Left);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -563,7 +464,7 @@ public sealed class GeographyView : Control
|
|||||||
{
|
{
|
||||||
var at = P(lb.Lon, lb.Lat);
|
var at = P(lb.Lon, lb.Lat);
|
||||||
var ocean = lb.Kind == "ocean";
|
var ocean = lb.Kind == "ocean";
|
||||||
DrawText(ctx, Pick(lb.NameI18n, ""), at.X, at.Y, (ocean ? 11 : 12.5) * TextScale,
|
DrawText(ctx, Pick(lb.NameI18n, ""), at.X, at.Y, ocean ? 11 : 12.5,
|
||||||
ocean ? OceanBrush : ContinentBrush, TextAlignment.Center,
|
ocean ? OceanBrush : ContinentBrush, TextAlignment.Center,
|
||||||
ocean ? FontStyle.Italic : FontStyle.Normal);
|
ocean ? FontStyle.Italic : FontStyle.Normal);
|
||||||
}
|
}
|
||||||
@@ -616,7 +517,6 @@ public sealed class GeographyView : Control
|
|||||||
"亚洲-欧洲" => Color.FromRgb(120, 226, 255), // 青
|
"亚洲-欧洲" => Color.FromRgb(120, 226, 255), // 青
|
||||||
"欧洲-非洲" => Color.FromRgb(168, 148, 255), // 紫
|
"欧洲-非洲" => Color.FromRgb(168, 148, 255), // 紫
|
||||||
"北美-南美" => Color.FromRgb(120, 255, 176), // 绿
|
"北美-南美" => Color.FromRgb(120, 255, 176), // 绿
|
||||||
"南美-南极" => Color.FromRgb(96, 232, 222), // 青绿(德雷克海峡)
|
|
||||||
"亚洲-北美" => Color.FromRgb(255, 140, 220), // 粉
|
"亚洲-北美" => Color.FromRgb(255, 140, 220), // 粉
|
||||||
"亚洲-大洋洲" => Color.FromRgb(255, 160, 96), // 橙
|
"亚洲-大洋洲" => Color.FromRgb(255, 160, 96), // 橙
|
||||||
"南极洲" => Color.FromRgb(200, 225, 255), // 冰蓝
|
"南极洲" => Color.FromRgb(200, 225, 255), // 冰蓝
|
||||||
@@ -630,15 +530,20 @@ public sealed class GeographyView : Control
|
|||||||
|
|
||||||
private static IPen PlatePenFor(string id)
|
private static IPen PlatePenFor(string id)
|
||||||
{
|
{
|
||||||
// 教材六大板块,每块一个颜色
|
|
||||||
var c = id switch
|
var c = id switch
|
||||||
{
|
{
|
||||||
"eurasian" => Color.FromRgb(110, 214, 230), // 青
|
"pacific" => Color.FromRgb(255, 110, 110),
|
||||||
"african" => Color.FromRgb(150, 230, 110), // 绿
|
"north-american" => Color.FromRgb(255, 176, 84),
|
||||||
"american" => Color.FromRgb(255, 176, 84), // 橙
|
"south-american" => Color.FromRgb(255, 226, 96),
|
||||||
"pacific" => Color.FromRgb(255, 110, 110), // 红
|
"african" => Color.FromRgb(150, 230, 110),
|
||||||
"indian-ocean" => Color.FromRgb(126, 160, 255), // 蓝紫
|
"eurasian" => Color.FromRgb(110, 214, 230),
|
||||||
"antarctic" => Color.FromRgb(208, 190, 255), // 淡紫
|
"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)
|
_ => Color.FromRgb(255, 150, 100)
|
||||||
};
|
};
|
||||||
return new Pen(new SolidColorBrush(Color.FromArgb(225, c.R, c.G, c.B)), 1.55,
|
return new Pen(new SolidColorBrush(Color.FromArgb(225, c.R, c.G, c.B)), 1.55,
|
||||||
@@ -655,11 +560,6 @@ public sealed class GeographyView : Control
|
|||||||
private static readonly IPen CoastPen = new Pen(new SolidColorBrush(Color.FromArgb(250, 236, 246, 255)), 1.75)
|
private static readonly IPen CoastPen = new Pen(new SolidColorBrush(Color.FromArgb(250, 236, 246, 255)), 1.75)
|
||||||
{ LineJoin = PenLineJoin.Round, LineCap = PenLineCap.Round };
|
{ LineJoin = PenLineJoin.Round, LineCap = PenLineCap.Round };
|
||||||
|
|
||||||
/// <summary>五大陆轮廓:金黄色实线,与板块虚线明显区分。</summary>
|
|
||||||
private static readonly IPen ContinentPen = new Pen(new SolidColorBrush(Color.FromArgb(240, 255, 210, 74)), 2.0)
|
|
||||||
{ LineJoin = PenLineJoin.Round, LineCap = PenLineCap.Round };
|
|
||||||
private static readonly IBrush MainlandBrush = new SolidColorBrush(Color.FromRgb(255, 218, 110));
|
|
||||||
|
|
||||||
private static readonly IPen TropicPen = new Pen(new SolidColorBrush(Color.FromArgb(220, 255, 190, 100)), 1.3);
|
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 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 ZoneEdgePen = new Pen(new SolidColorBrush(Color.FromArgb(110, 200, 225, 255)), 0.9);
|
||||||
|
|||||||
@@ -1,115 +0,0 @@
|
|||||||
{
|
|
||||||
"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"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Binary file not shown.
Binary file not shown.
@@ -1,115 +0,0 @@
|
|||||||
{
|
|
||||||
"runtimeTarget": {
|
|
||||||
"name": ".NETCoreApp,Version=v8.0",
|
|
||||||
"signature": ""
|
|
||||||
},
|
|
||||||
"compilationOptions": {},
|
|
||||||
"targets": {
|
|
||||||
".NETCoreApp,Version=v8.0": {
|
|
||||||
"EarthGeographyModel/1.0.4": {
|
|
||||||
"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.4": {
|
|
||||||
"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"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Binary file not shown.
Binary file not shown.
-4
@@ -1,4 +0,0 @@
|
|||||||
// <autogenerated />
|
|
||||||
using System;
|
|
||||||
using System.Reflection;
|
|
||||||
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v8.0", FrameworkDisplayName = ".NET 8.0")]
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
c5f16ca9fce0f0594ebc177c2ecb2b54604734e59fc765d9f79f6e5986cc8840
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
//------------------------------------------------------------------------------
|
|
||||||
// <auto-generated>
|
|
||||||
// This code was generated by a tool.
|
|
||||||
//
|
|
||||||
// Changes to this file may cause incorrect behavior and will be lost if
|
|
||||||
// the code is regenerated.
|
|
||||||
// </auto-generated>
|
|
||||||
//------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
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.
|
|
||||||
|
|
||||||
-1
@@ -1 +0,0 @@
|
|||||||
23e7870a86ac5dd2806c4361ac2881c5183aaff8f1f41e3785e44cba6cf89c09
|
|
||||||
-25
@@ -1,25 +0,0 @@
|
|||||||
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 =
|
|
||||||
Binary file not shown.
BIN
Binary file not shown.
-1
@@ -1 +0,0 @@
|
|||||||
c78a6ef41b63479935eee5ff8c1b58d6f2207d419745554527580c2a89b09f4d
|
|
||||||
-13
@@ -1,13 +0,0 @@
|
|||||||
/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
|
|
||||||
Binary file not shown.
Loaded 100 of 1132 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user