修复
This commit is contained in:
1 parent
874c97ee27
commit
7de92a25f5
30 files changed
+190
-259
No files matched your search
@@ -13,6 +13,8 @@ public sealed class PlateEntry
|
||||
{
|
||||
[JsonPropertyName("id")] public string Id { 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();
|
||||
}
|
||||
|
||||
@@ -21,6 +23,12 @@ public sealed class PlateData
|
||||
[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
|
||||
{
|
||||
/// <summary>分界的两个大洲,如「亚洲-非洲」。</summary>
|
||||
|
||||
@@ -19,6 +19,7 @@ public sealed class GeographyRuntime : IModelRuntime
|
||||
private GeoScene? _scene;
|
||||
private GeoData? _coast;
|
||||
private PlateData? _plates;
|
||||
private ContinentData? _continents;
|
||||
private BorderData? _borders;
|
||||
private LabelData? _labels;
|
||||
private GeographyView? _view;
|
||||
@@ -30,13 +31,15 @@ public sealed class GeographyRuntime : IModelRuntime
|
||||
_scene = ModelJson.Read<GeoScene>(Path.Combine(dir, "scene.json")) ?? new GeoScene();
|
||||
_coast = ModelJson.Read<GeoData>(Path.Combine(dir, "coastline.json")) ?? new GeoData();
|
||||
_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();
|
||||
|
||||
context.ReportProgress(0.45, "加载名称标注");
|
||||
_labels = ModelJson.Read<LabelData>(Path.Combine(dir, "labels.json")) ?? new LabelData();
|
||||
|
||||
context.ReportProgress(0.72, "构建轮廓");
|
||||
context.Log($"[{context.ModelId}] 海岸线 {_coast.Lines.Count} 条,板块 {_plates.Plates.Count} 个,洲界 {_borders.Borders.Count} 条");
|
||||
context.Log($"[{context.ModelId}] 海岸线 {_coast.Lines.Count} 条,六大板块 {_plates.Plates.Count} 个," +
|
||||
$"大陆 {_continents.Continents.Count} 块,洲界 {_borders.Borders.Count} 条");
|
||||
}
|
||||
|
||||
public Control CreateView(IModelContext context)
|
||||
@@ -44,10 +47,11 @@ public sealed class GeographyRuntime : IModelRuntime
|
||||
_scene ??= new GeoScene();
|
||||
_coast ??= new GeoData();
|
||||
_plates ??= new PlateData();
|
||||
_continents ??= new ContinentData();
|
||||
_borders ??= new BorderData();
|
||||
_labels ??= new LabelData();
|
||||
|
||||
_view = new GeographyView(context, _scene, _coast, _plates, _borders, _labels);
|
||||
_view = new GeographyView(context, _scene, _coast, _plates, _continents, _borders, _labels);
|
||||
context.ReportProgress(1.0, "准备就绪");
|
||||
return BuildLayout(_scene, _view, context);
|
||||
}
|
||||
@@ -90,7 +94,8 @@ public sealed class GeographyRuntime : IModelRuntime
|
||||
actions.Children.Add(MakeModeSwitch(view));
|
||||
actions.Children.Add(MakeToggle("五带", view.ShowZones, on => view.ShowZones = on));
|
||||
actions.Children.Add(MakeToggle("大洲轮廓", view.ShowCoast, on => view.ShowCoast = on));
|
||||
actions.Children.Add(MakeToggle("板块", view.ShowPlates, on => view.ShowPlates = on));
|
||||
actions.Children.Add(MakeToggle("六大板块", view.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(MakeButton("复位", () => view.ResetView()));
|
||||
Grid.SetColumn(actions, 2);
|
||||
@@ -122,7 +127,8 @@ public sealed class GeographyRuntime : IModelRuntime
|
||||
{
|
||||
var panel = new StackPanel { Spacing = 6 };
|
||||
panel.Children.Add(LegendRow(new SolidColorBrush(Color.Parse("#DEEEFF")), "大洲海岸线"));
|
||||
panel.Children.Add(LegendRow(new SolidColorBrush(Color.Parse("#FF8A5C")), "板块边界"));
|
||||
panel.Children.Add(LegendRow(new SolidColorBrush(Color.Parse("#FF8A5C")), "六大板块边界"));
|
||||
panel.Children.Add(LegendRow(new SolidColorBrush(Color.Parse("#FFD24A")), "五大陆轮廓"));
|
||||
panel.Children.Add(LegendRow(new SolidColorBrush(Color.Parse("#FFDC70")), "洲界 / 分界线"));
|
||||
return new Border
|
||||
{
|
||||
|
||||
@@ -23,6 +23,7 @@ public sealed class GeographyView : Control
|
||||
private readonly GeoScene _scene;
|
||||
private readonly GeoData _coast;
|
||||
private readonly PlateData _plates;
|
||||
private readonly ContinentData _continents;
|
||||
private readonly BorderData _borders;
|
||||
private readonly LabelData _labels;
|
||||
|
||||
@@ -35,6 +36,7 @@ public sealed class GeographyView : Control
|
||||
private bool _showZones = true;
|
||||
private bool _showCoast = true;
|
||||
private bool _showPlates;
|
||||
private bool _showContinents = true;
|
||||
private bool _showBorders = true;
|
||||
private bool _showLabels = true;
|
||||
private GeoMode _mode = GeoMode.Sphere3D;
|
||||
@@ -42,11 +44,12 @@ public sealed class GeographyView : Control
|
||||
public event Action? StateChanged;
|
||||
|
||||
public GeographyView(IModelContext context, GeoScene scene, GeoData coast,
|
||||
PlateData plates, BorderData borders, LabelData labels)
|
||||
PlateData plates, ContinentData continents, BorderData borders, LabelData labels)
|
||||
{
|
||||
_scene = scene;
|
||||
_coast = coast;
|
||||
_plates = plates;
|
||||
_continents = continents;
|
||||
_borders = borders;
|
||||
_labels = labels;
|
||||
ClipToBounds = true;
|
||||
@@ -56,6 +59,7 @@ public sealed class GeographyView : Control
|
||||
public bool ShowZones { get => _showZones; set { _showZones = value; Redraw(); } }
|
||||
public bool ShowCoast { get => _showCoast; set { _showCoast = value; Redraw(); } }
|
||||
public bool ShowPlates { get => _showPlates; set { _showPlates = value; Redraw(); } }
|
||||
public bool ShowContinents { get => _showContinents; set { _showContinents = value; Redraw(); } }
|
||||
public bool ShowBorders { get => _showBorders; set { _showBorders = value; Redraw(); } }
|
||||
public bool ShowLabels { get => _showLabels; set { _showLabels = value; Redraw(); } }
|
||||
public GeoMode Mode { get => _mode; set { _mode = value; InvalidateVisual(); StateChanged?.Invoke(); } }
|
||||
@@ -164,6 +168,7 @@ public sealed class GeographyView : Control
|
||||
if (_showZones) DrawZones3D(ctx, m, cx, cy, r);
|
||||
if (_showCoast) DrawCoast3D(ctx, m, cx, cy, r);
|
||||
if (_showPlates) DrawPlates3D(ctx, m, cx, cy, r);
|
||||
if (_showContinents) DrawContinents3D(ctx, m, cx, cy, r);
|
||||
if (_showBorders) DrawBorders3D(ctx, m, cx, cy, r);
|
||||
if (_showLabels) DrawLabels3D(ctx, m, cx, cy, r);
|
||||
|
||||
@@ -308,13 +313,16 @@ public sealed class GeographyView : Control
|
||||
var pen = PlatePenFor(p.Id);
|
||||
foreach (var line in p.Lines) DrawGeo3D(ctx, line, m, cx, cy, r, pen, true);
|
||||
}
|
||||
if (!_showLabels) return;
|
||||
if (_showLabels) DrawPlateLabels3D(ctx, m, cx, cy, r);
|
||||
}
|
||||
|
||||
private void DrawPlateLabels3D(DrawingContext ctx, Matrix4x4 m, float cx, float cy, float r)
|
||||
{
|
||||
foreach (var p in _plates.Plates)
|
||||
{
|
||||
var center = Centroid(p.Lines);
|
||||
if (center == null) continue;
|
||||
var cam = Geometry.ToCamera(Geometry.LatLonToUnit(center[1], center[0]), Matrix4x4.Identity, m);
|
||||
var at = p.Label is { Length: >= 2 } ? p.Label : Centroid(p.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(p.NameI18n, p.Id), pos.X, pos.Y, 10.5 * TextScale,
|
||||
@@ -322,6 +330,27 @@ public sealed class GeographyView : Control
|
||||
}
|
||||
}
|
||||
|
||||
/// <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)
|
||||
{
|
||||
foreach (var b in _borders.Borders)
|
||||
@@ -482,7 +511,7 @@ public sealed class GeographyView : Control
|
||||
DrawFlatPolyline(ctx, line, P, pen);
|
||||
|
||||
if (!_showLabels) continue;
|
||||
var c = Centroid(pl.Lines);
|
||||
var c = pl.Label is { Length: >= 2 } ? pl.Label : Centroid(pl.Lines);
|
||||
if (c == null) continue;
|
||||
var at = P(c[0], c[1]);
|
||||
DrawText(ctx, Pick(pl.NameI18n, pl.Id), at.X, at.Y, 10.5 * TextScale,
|
||||
@@ -490,6 +519,23 @@ public sealed class GeographyView : Control
|
||||
}
|
||||
}
|
||||
|
||||
// 五大陆
|
||||
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)
|
||||
{
|
||||
@@ -584,20 +630,15 @@ public sealed class GeographyView : Control
|
||||
|
||||
private static IPen PlatePenFor(string id)
|
||||
{
|
||||
// 教材六大板块,每块一个颜色
|
||||
var c = id switch
|
||||
{
|
||||
"pacific" => Color.FromRgb(255, 110, 110),
|
||||
"north-american" => Color.FromRgb(255, 176, 84),
|
||||
"south-american" => Color.FromRgb(255, 226, 96),
|
||||
"african" => Color.FromRgb(150, 230, 110),
|
||||
"eurasian" => Color.FromRgb(110, 214, 230),
|
||||
"indo-australian" => Color.FromRgb(126, 160, 255),
|
||||
"antarctic" => Color.FromRgb(208, 190, 255),
|
||||
"nazca" => Color.FromRgb(255, 140, 200),
|
||||
"cocos" => Color.FromRgb(255, 200, 130),
|
||||
"caribbean" => Color.FromRgb(180, 240, 160),
|
||||
"philippine" => Color.FromRgb(255, 160, 230),
|
||||
"arabian" => Color.FromRgb(200, 220, 255),
|
||||
"eurasian" => Color.FromRgb(110, 214, 230), // 青
|
||||
"african" => Color.FromRgb(150, 230, 110), // 绿
|
||||
"american" => Color.FromRgb(255, 176, 84), // 橙
|
||||
"pacific" => Color.FromRgb(255, 110, 110), // 红
|
||||
"indian-ocean" => Color.FromRgb(126, 160, 255), // 蓝紫
|
||||
"antarctic" => Color.FromRgb(208, 190, 255), // 淡紫
|
||||
_ => Color.FromRgb(255, 150, 100)
|
||||
};
|
||||
return new Pen(new SolidColorBrush(Color.FromArgb(225, c.R, c.G, c.B)), 1.55,
|
||||
@@ -614,6 +655,11 @@ public sealed class GeographyView : Control
|
||||
private static readonly IPen CoastPen = new Pen(new SolidColorBrush(Color.FromArgb(250, 236, 246, 255)), 1.75)
|
||||
{ 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 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);
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@@ -13,7 +13,7 @@ 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.AssemblyInformationalVersionAttribute("1.0.4+874c97ee271617592f530440ae8879461e91488b")]
|
||||
[assembly: System.Reflection.AssemblyProductAttribute("Earth Model Studio")]
|
||||
[assembly: System.Reflection.AssemblyTitleAttribute("EarthGeographyModel")]
|
||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.4.0")]
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
ed259fd40e43f2cdb14b0deef0da4645edb339d430e473fbc89582da08e3d2b5
|
||||
d4fd061fd66be936bfe3ff861ab130f2046842e22ccd1d5d0250ed8beb77769b
|
||||
BIN
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in new issue
Block a user