From 259b7b54a48977fe0de8ce2f0b87376c17c50bcb Mon Sep 17 00:00:00 2001 From: wyc <1104749580@qq.com> Date: Tue, 28 Jul 2026 11:11:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/config.json | 8 ++++---- module/Local_Server/server/Config.cpp | 6 ++++++ module/Local_Server/server/Config.h | 3 +++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/config/config.json b/config/config.json index ddc8195..413eda8 100644 --- a/config/config.json +++ b/config/config.json @@ -599,10 +599,10 @@ "use_browser_recommended_resolution": true, "resolution_scale": 1.000000, "msaa_samples": 1, - "fxaa": false, - "shadows": false, - "enable_lighting": false, - "solar_lighting": false, + "fxaa": true, + "shadows": true, + "enable_lighting": true, + "solar_lighting": true, "solar_light_intensity": 1.500000, "maximum_screen_space_error": 4, "terrain_enabled_in_3d": true, diff --git a/module/Local_Server/server/Config.cpp b/module/Local_Server/server/Config.cpp index ed1961c..5e9edac 100644 --- a/module/Local_Server/server/Config.cpp +++ b/module/Local_Server/server/Config.cpp @@ -336,6 +336,7 @@ void Map_View_Config::from_base_json(const Psc::JSON* that_json) { map2d.from_base_json(that_json->get("map2d")); map3d.from_base_json(that_json->get("map3d")); camera.from_base_json(that_json->get("camera")); + base_station_fly_to_height_offset_meters = std::max(100.0, read_optional_double_field(that_json, "baseStationFlyToHeightOffsetMeters", base_station_fly_to_height_offset_meters)); } Psc::JSON Map_View_Config::to_base_json() const { auto ret = Psc::JSON::object(); @@ -343,6 +344,7 @@ Psc::JSON Map_View_Config::to_base_json() const { ret.append({"map2d", map2d.to_base_json()}); ret.append({"map3d", map3d.to_base_json()}); ret.append({"camera", camera.to_base_json()}); + ret.append({"baseStationFlyToHeightOffsetMeters", base_station_fly_to_height_offset_meters}); return ret; } void Cesium_Graphics_Config::from_base_json(const Psc::JSON* that_json) { @@ -369,6 +371,8 @@ void Cesium_Graphics_Config::from_base_json(const Psc::JSON* that_json) { terrain_maximum_level = std::clamp(read_optional_uint32_field(that_json, "terrain_maximum_level", terrain_maximum_level), 0u, 24u); terrain_cache_tiles = std::clamp(read_optional_uint32_field(that_json, "terrain_cache_tiles", terrain_cache_tiles), 16u, 2048u); terrain_occlusion_enabled = read_optional_bool_field(that_json, "terrain_occlusion_enabled", terrain_occlusion_enabled); + surface_navigation_reference_visible = read_optional_bool_field(that_json, "surface_navigation_reference_visible", surface_navigation_reference_visible); + view_axes_visible = read_optional_bool_field(that_json, "view_axes_visible", view_axes_visible); occlusion_sample_spacing_meters = std::clamp(read_optional_double_field(that_json, "occlusion_sample_spacing_meters", occlusion_sample_spacing_meters), 10.0, 5000.0); occlusion_clearance_margin_meters = read_optional_double_field(that_json, "occlusion_clearance_margin_meters", occlusion_clearance_margin_meters); } @@ -391,6 +395,8 @@ Psc::JSON Cesium_Graphics_Config::to_base_json() const { ret.append({"terrain_maximum_level", terrain_maximum_level}); ret.append({"terrain_cache_tiles", terrain_cache_tiles}); ret.append({"terrain_occlusion_enabled", terrain_occlusion_enabled}); + ret.append({"surface_navigation_reference_visible", surface_navigation_reference_visible}); + ret.append({"view_axes_visible", view_axes_visible}); ret.append({"occlusion_sample_spacing_meters", occlusion_sample_spacing_meters}); ret.append({"occlusion_clearance_margin_meters", occlusion_clearance_margin_meters}); return ret; diff --git a/module/Local_Server/server/Config.h b/module/Local_Server/server/Config.h index 9f62956..cad7a89 100644 --- a/module/Local_Server/server/Config.h +++ b/module/Local_Server/server/Config.h @@ -166,6 +166,7 @@ struct Map_View_Config { Map_Tile_View_Config map2d; Map_Tile_View_Config map3d; Map_Camera_Config camera; + double base_station_fly_to_height_offset_meters = 8000.0; void from_base_json(const Psc::JSON* that_json); [[nodiscard]] Psc::JSON to_base_json() const; [[nodiscard]] static bool is_scene_mode(std::string_view mode); @@ -188,6 +189,8 @@ struct Cesium_Graphics_Config { std::uint32_t terrain_maximum_level = 15; std::uint32_t terrain_cache_tiles = 128; bool terrain_occlusion_enabled = false; + bool surface_navigation_reference_visible = false; + bool view_axes_visible = false; double occlusion_sample_spacing_meters = 250.0; double occlusion_clearance_margin_meters = 10.0; void from_base_json(const Psc::JSON* that_json);