Move weather editor inside CEnvironment

Author: Xottab-DUTY

src/xrEngine/CMakeLists.txt

@@ -9,7 +9,6 @@ target_sources_grouped(
     editor_base_input.cpp
     editor_helper.cpp
     editor_helper.h
-    editor_weather.cpp
 )
 
 target_sources_grouped(
@@ -142,6 +141,7 @@ target_sources_grouped(
     FILES
     Environment.cpp
     Environment.h
+    Environment_editor.cpp
     Environment_misc.cpp
     Environment_render.cpp
     xrHemisphere.cpp

src/xrEngine/Environment.h

@@ -7,6 +7,7 @@
 #include "xrCommon/xr_vector.h"
 #include "xrCommon/xr_map.h"
 #include "xrSound/Sound.h"
+#include "editor_base.h"
 
 // refs
 class ENGINE_API IRender_Visual;
@@ -193,6 +194,8 @@ class ENGINE_API CEnvDescriptor
         exec_time_loaded = tm1;
     }
 
+    void ed_show_params(const CEnvironment& env); // ImGui editor
+
     void on_device_create();
     void on_device_destroy();
 
@@ -217,9 +220,11 @@ class ENGINE_API CEnvDescriptorMixer : public CEnvDescriptor
         float f, CEnvModifier& M, float m_power);
 
     static std::pair<Fvector3, float> calculate_dynamic_sun_dir(float fGameTime, float azimuth);
+
+    void ed_show_params(const CEnvironment& env); // ImGui editor
 };
 
-class ENGINE_API CEnvironment
+class ENGINE_API CEnvironment : public xray::editor::ide_tool
 {
     friend class dxEnvironmentRender;
     struct str_pred
@@ -318,6 +323,7 @@ class ENGINE_API CEnvironment
     void mods_unload();
 
     void OnFrame();
+    void on_tool_frame() override;
     void lerp();
 
     void RenderSky();
@@ -362,6 +368,9 @@ class ENGINE_API CEnvironment
 
     void save_weathers(CInifile* environment_config = nullptr) const;
     void save_weather_effects(CInifile* environment_config = nullptr) const;
+
+private:
+    pcstr tool_name() override { return "Weather Editor"; }
 };
 
 ENGINE_API extern Flags32 psEnvFlags;