改名

web_server/app/Gallery_Observer_Adminive.h

@@ -3,7 +3,7 @@
 
 #include "Gallery_Enum.h"
 #include "common/Gallery_Performance_Types.h"
-#include "render_2D/scene/Plot_Scene.h"
+#include "render_2D/scene/Render_Scene_2D.h"
 #include "render_2D/renderable/Renderable.h"
 
 #include "adminive/adminive.hpp"

web_server/app/Gallery_Protocol.cpp

@@ -87,13 +87,13 @@ void append_session_actions(Gallery_Frame_Mode frame_mode,
                             std::vector<Action_Model>& result) {
     switch (frame_mode) {
     case Gallery_Frame_Mode::Manual:
-        append_gallery_actions<Gallery_Session_Control<Plot_Scene>>(result);
+        append_gallery_actions<Gallery_Session_Control<Render_Scene_2D>>(result);
         return;
     case Gallery_Frame_Mode::Low_Latency:
-        append_gallery_actions<Gallery_Session_Control<Plot_Scene>>(result);
+        append_gallery_actions<Gallery_Session_Control<Render_Scene_2D>>(result);
         return;
     case Gallery_Frame_Mode::Playback:
-        append_gallery_actions<Gallery_Session_Control<Plot_Scene>>(result);
+        append_gallery_actions<Gallery_Session_Control<Render_Scene_2D>>(result);
         return;
     }
     ::renderive::error::unexpected<std::invalid_argument>("unknown gallery frame mode");
@@ -103,11 +103,11 @@ std::size_t session_control_count(std::string_view case_id, Gallery_Frame_Mode f
         return 0;
     switch (frame_mode) {
     case Gallery_Frame_Mode::Manual:
-        return gallery_control_count<Gallery_Session_Control<Plot_Scene>>();
+        return gallery_control_count<Gallery_Session_Control<Render_Scene_2D>>();
     case Gallery_Frame_Mode::Low_Latency:
-        return gallery_control_count<Gallery_Session_Control<Plot_Scene>>();
+        return gallery_control_count<Gallery_Session_Control<Render_Scene_2D>>();
     case Gallery_Frame_Mode::Playback:
-        return gallery_control_count<Gallery_Session_Control<Plot_Scene>>();
+        return gallery_control_count<Gallery_Session_Control<Render_Scene_2D>>();
     }
     ::renderive::error::unexpected<std::invalid_argument>("unknown gallery frame mode");
 }

web_server/app/Gallery_Session_Control.h

@@ -1,7 +1,7 @@
 #pragma once
 #include "render_2D/plottable/Performance_Overlay.h"
 #include "render_2D/renderable/Renderable.h"
-#include "render_2D/scene/Plot_Scene.h"
+#include "render_2D/scene/Render_Scene_2D.h"
 #include <memory>
 #include <string>
 namespace adminive {

web_server/app/Web_Plot_Session.cpp

@@ -51,7 +51,7 @@ double gaussian(double x, double center, double width) {
 }
 } // namespace
 struct Web_Plot_Session::Impl {
-    Plot_Scene plot;
+    Render_Scene_2D plot;
     renderive_Owner<Frequency_Axis> spectrum_frequency_axis;
     renderive_Owner<Axis> spectrum_power_axis;
     renderive_Owner<Frequency_Axis> waterfall_frequency_axis;

web_server/app/render_2D/Gallery_Scene2D.cpp

@@ -218,7 +218,7 @@ public:
         }
         attach_performance_overlay(plot_);
         apply_layout();
-        session_control_ = std::make_unique<Gallery_Session_Control<Plot_Scene>>(
+        session_control_ = std::make_unique<Gallery_Session_Control<Render_Scene_2D>>(
             plot_, *primary_, feedback_policy_);
         register_controls();
         set_performance_plot_name(plot_, case_id_ + "/" + gallery_enum_id(frame_mode_));
@@ -1420,9 +1420,9 @@ private:
     std::string case_id_;
     Gallery_Frame_Mode frame_mode_ = Gallery_Frame_Mode::Low_Latency;
     bool automatic_low_latency_{};
-    Plot_Scene plot_;
+    Render_Scene_2D plot_;
     Gallery_Feedback_Policy feedback_policy_;
-    std::unique_ptr<Gallery_Session_Control<Plot_Scene>> session_control_;
+    std::unique_ptr<Gallery_Session_Control<Render_Scene_2D>> session_control_;
     Gallery_Controls controls_;
     std::chrono::steady_clock::time_point performance_started_;
     std::chrono::steady_clock::time_point last_performance_log_;

web_server/app/render_3D/Gallery_Scene3D.cpp

@@ -5,7 +5,7 @@
 #include "../Gallery_Enum.h"
 #include "../common/Gallery_Scheduler_Adminive.h"
 #include "../common/Pixel_Frame.h"
-#include <render_3D/Point_Scene.h>
+#include <render_3D/Render_Scene_3D.h>
 
 #include "adminive/adminive.hpp"
 #include "adminive/adapters/nlohmann_json.hpp"
@@ -681,7 +681,7 @@ private:
     bool automatic_low_latency_{};
     bool active_{true};
     std::shared_ptr<Point_Visual> visual_;
-    Point_Scene scene_;
+    Render_Scene_3D scene_;
     Gallery_Client_Performance client_performance_;
     float blue_offset_{};
     float projection_scale_{1.0F};