From 9d25253a85cc4fb3aa0f4adc764626ad0e64d66a Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 25 七月 2024 14:40:01 +0800
Subject: [PATCH] 修改算法-1
---
SimuTools/Tools/Handle.cs | 47 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 34 insertions(+), 13 deletions(-)
diff --git a/SimuTools/Tools/Handle.cs b/SimuTools/Tools/Handle.cs
index 5e58c37..0b3938d 100644
--- a/SimuTools/Tools/Handle.cs
+++ b/SimuTools/Tools/Handle.cs
@@ -176,7 +176,7 @@
//double perHeight = (layer.terrain.maxHeight - layer.terrain.minHeight) * 100 / 65536;
//double differ = layer.terrain.maxHeight - layer.terrain.minHeight;
- double differ = layer.extension.maxHeight - layer.extension.minHeight - 1, minHeight = layer.extension.minHeight - 1;
+ double differ = layer.extension.maxHeight - layer.extension.minHeight, minHeight = layer.extension.minHeight;
for (int x = 0; x < width; x++)
{
for (int y = 0; y < height; y++)
@@ -186,10 +186,18 @@
//int val = Convert.ToInt32((buffer[offset] - layer.terrain.minHeight) * 100 / perHeight);
//int val = Convert.ToInt32((buffer[offset] - layer.terrain.minHeight) / differ * 255); // 65535
- int val = Convert.ToInt32((buffer[offset] - minHeight) / differ * 255);
- int r = 0;
- int g = 0;
- int b = val > 255 ? 255 : val;
+
+ int r = 0, g, b;
+ if (buffer[offset] - layer.extension.maxHeight > 0)
+ {
+ g = b = 255;
+ }
+ else
+ {
+ int val = Convert.ToInt32((buffer[offset] - minHeight) / differ * 65535);
+ g = val / 256;
+ b = val % 256;
+ }
Color color = Color.FromArgb(127, r, g, b);
image.SetPixel(x, y, color);
@@ -287,8 +295,8 @@
if (null != ds) ds.Dispose();
}
});
- layer.extension.minHeight = GetMinVal(layer.extension.minHeight);
- layer.extension.maxHeight = GetMaxVal(layer.extension.maxHeight + WaterHeightOffset);
+ layer.extension.minHeight = GetMinVal(layer.extension.minHeight - 1);
+ layer.extension.maxHeight = GetMaxVal(layer.extension.maxHeight + 1);
}
/// <summary>
@@ -355,19 +363,32 @@
Graphics graphic = Graphics.FromImage(image);
graphic.Clear(Color.Transparent); // 濉厖閫忔槑鑹�
- double perHeight = (layer.extension.maxHeight - layer.extension.minHeight) * 100 / 65536;
+ //double perHeight = (layer.extension.maxHeight - layer.extension.minHeight) * 100 / 65536;
+ double differ = layer.extension.maxHeight - layer.extension.minHeight, minHeight = layer.extension.minHeight;
for (int x = 0; x < width; x++)
{
for (int y = 0; y < height; y++)
{
int offset = x + y * width;
- if (float.IsNaN(buffer[offset]) || buffer[offset] < -999) continue;
+ if (float.IsNaN(buffer[offset]) || buffer[offset] < -999 || buffer[offset] < minHeight) continue;
//int val = Convert.ToInt32(buffer[offset] * 100);
- int val = Convert.ToInt32((buffer[offset] - layer.extension.minHeight + WaterHeightOffset) * 100 / perHeight);
- int r = val / 65536;
- int g = (val - r * 65536) / 256;
- int b = val % 256;
+ //int val = Convert.ToInt32((buffer[offset] - layer.extension.minHeight + WaterHeightOffset) * 100 / perHeight);
+ //int r = val / 65536;
+ //int g = (val - r * 65536) / 256;
+ //int b = val % 256;
+
+ int r = 0, g, b;
+ if (buffer[offset] - layer.extension.maxHeight > 0)
+ {
+ g = b = 255;
+ }
+ else
+ {
+ int val = Convert.ToInt32((buffer[offset] - minHeight) / differ * 65535);
+ g = val / 256;
+ b = val % 256;
+ }
Color color = Color.FromArgb(127, r, g, b);
image.SetPixel(x, y, color);
--
Gitblit v1.9.3