Change shared_ptr to unique_ptr

Author: bluekyu

render_pipeline/rpcore/gui/draggable_window.hpp

@@ -51,7 +51,7 @@ class RENDER_PIPELINE_DECL DraggableWindow : public RPObject
 public:
     DraggableWindow(int width=Default::width, int height=Default::height,
                     const std::string& title=Default::title, NodePath parent={});
-    ~DraggableWindow();
+    virtual ~DraggableWindow();
 
     /** Centers the window on screen. */
     void center_on_screen();

render_pipeline/rpcore/gui/slider.hpp

@@ -51,6 +51,7 @@ class Slider : public RPObject
         float min_value=0, float max_value=Default::max_value,
         float value=Default::value, float page_size=Default::page_size,
         const std::function<void()>& callback={});
+    ~Slider();
 
     /** Returns the currently assigned value. */
     float get_value() const;

src/rpcore/gui/buffer_viewer.cpp

@@ -45,7 +45,7 @@ BufferViewer::BufferViewer(NodePath parent): DraggableWindow(1400, 800, "Buffer-
 {
     create_components();
 
-    _tex_preview = std::make_shared<TexturePreview>(parent);
+    _tex_preview = std::make_unique<TexturePreview>(parent);
     _tex_preview->hide();
 
     hide();
@@ -138,7 +138,7 @@ void BufferViewer::create_components()
     _content_node.set_scale(1, 1, -1);
     _content_node.set_z(_scroll_height);
 
-    _chb_show_images = std::make_shared<LabeledCheckbox>(node_, 10, 43,
+    _chb_show_images = std::make_unique<LabeledCheckbox>(node_, 10, 43,
         std::bind(&BufferViewer::set_show_images, this, std::placeholders::_1),
         false, "Display image resources", 16, false, LVecBase3f(0.4f), 330);
 }

src/rpcore/gui/buffer_viewer.hpp

@@ -88,10 +88,10 @@ class BufferViewer : public DraggableWindow
     bool _display_images = false;
     PT(rppanda::DirectScrolledFrame) _content_frame;
     NodePath _content_node;
-    std::shared_ptr<LabeledCheckbox> _chb_show_images;
+    std::unique_ptr<LabeledCheckbox> _chb_show_images;
 
     std::vector<std::pair<Texture*, EntryID>> _stages;
-    std::shared_ptr<TexturePreview> _tex_preview;
+    std::unique_ptr<TexturePreview> _tex_preview;
 
     std::vector<PT(rppanda::DirectFrame)> frame_hovers_;
 

src/rpcore/gui/slider.cpp

@@ -52,6 +52,8 @@ Slider::Slider(float x, float y, NodePath parent, float size, float min_value, f
     node_ = new rppanda::DirectSlider(parent, options);
 }
 
+Slider::~Slider() = default;
+
 float Slider::get_value() const
 {
     return node_->get_value();

src/rpcore/gui/texture_preview.cpp

@@ -42,6 +42,8 @@ TexturePreview::TexturePreview(NodePath parent):
     create_components();
 }
 
+TexturePreview::~TexturePreview() = default;
+
 void TexturePreview::present(Texture* tex)
 {
     _current_tex = tex;
@@ -63,7 +65,7 @@ void TexturePreview::present(Texture* tex)
         display_h = scale_f * h;
     }
 
-    std::shared_ptr<Sprite> image = std::make_shared<Sprite>(tex, display_w, display_h, _content_node, 20, 90, false, true, false);
+    auto image = std::make_unique<Sprite>(tex, display_w, display_h, _content_node, 20, 90, false, true, false);
 
     std::string description;
 
@@ -90,13 +92,13 @@ void TexturePreview::present(Texture* tex)
     // Slider for viewing different mipmaps
     if (tex->uses_mipmaps())
     {
-        _mip_slider = std::make_shared<Slider>(x_pos, 65, _content_node, 140, 0,
+        _mip_slider = std::make_unique<Slider>(x_pos, 65, _content_node, 140, 0,
             tex->get_expected_num_mipmap_levels()-1, 0, Slider::Default::page_size,
             std::bind(&TexturePreview::set_mip, this));
 
         x_pos += 140 + 5;
 
-        _mip_text = std::make_shared<Text>("MIP: 5", _content_node, x_pos, 72, 18,
+        _mip_text = std::make_unique<Text>("MIP: 5", _content_node, x_pos, 72, 18,
             Text::Default::align,
             LVecBase3(1.0f, 0.4f, 0.4f), true);
 
@@ -106,31 +108,31 @@ void TexturePreview::present(Texture* tex)
     // Slider for viewing different Z-layers
     if (tex->get_z_size() > 1)
     {
-        _slice_slider = std::make_shared<Slider>(x_pos, 65, _content_node, 250, 0,
+        _slice_slider = std::make_unique<Slider>(x_pos, 65, _content_node, 250, 0,
             tex->get_z_size() - 1, 0, Slider::Default::page_size,
             std::bind(&TexturePreview::set_slice, this));
 
         x_pos += 250 + 5;
 
-        _slice_text = std::make_shared<Text>("Z: 5", _content_node, x_pos, 72, 18,
+        _slice_text = std::make_unique<Text>("Z: 5", _content_node, x_pos, 72, 18,
             Text::Default::align,
             LVecBase3(0.4f, 1.0f, 0.4f), true);
 
         x_pos += 50 + 30;
     }
 
     // Slider to adjust brightness
-    _bright_slider = std::make_shared<Slider>(x_pos, 65, _content_node, 140, -14, 14,
+    _bright_slider = std::make_unique<Slider>(x_pos, 65, _content_node, 140, -14, 14,
         0, Slider::Default::page_size,
         std::bind(&TexturePreview::set_brightness, this));
 
     x_pos += 140 + 5;
-    _bright_text = std::make_shared<Text>("Bright: 1", _content_node, x_pos, 72, 18,
+    _bright_text = std::make_unique<Text>("Bright: 1", _content_node, x_pos, 72, 18,
         Text::Default::align, LVecBase3(0.4f, 0.4f, 1.0f), true);
     x_pos += 100 + 30;
 
     // Slider to enable reinhard tonemapping
-    _tonemap_box = std::make_shared<LabeledCheckbox>(_content_node, x_pos, 60,
+    _tonemap_box = std::make_unique<LabeledCheckbox>(_content_node, x_pos, 60,
         std::bind(&TexturePreview::set_enable_tonemap, this, std::placeholders::_1),
         false, "Tonemap", 18, false, LVecBase3(1.0f, 0.4f, 0.4f), 90);
     x_pos += 90 + 30;
@@ -144,7 +146,7 @@ void TexturePreview::present(Texture* tex)
     PT(Shader) preview_shader = DisplayShaderBuilder::build(tex, display_w, display_h);
     image->set_shader(preview_shader);
 
-    _preview_image = image;
+    _preview_image = std::move(image);
 
     show();
 }

src/rpcore/gui/texture_preview.hpp

@@ -34,6 +34,7 @@ class TexturePreview : public DraggableWindow
 {
 public:
     TexturePreview(NodePath parent);
+    virtual ~TexturePreview();
 
     /** "Presents" a given texture and shows the window. */
     void present(Texture* tex);
@@ -52,16 +53,16 @@ class TexturePreview : public DraggableWindow
     NodePath _content_node;
     Texture* _current_tex;
 
-    std::shared_ptr<Sprite> _preview_image;
-    std::shared_ptr<LabeledCheckbox> _tonemap_box;
+    std::unique_ptr<Sprite> _preview_image;
+    std::unique_ptr<LabeledCheckbox> _tonemap_box;
 
-    std::shared_ptr<Text> _mip_text;
-    std::shared_ptr<Text> _slice_text;
-    std::shared_ptr<Text> _bright_text;
+    std::unique_ptr<Text> _mip_text;
+    std::unique_ptr<Text> _slice_text;
+    std::unique_ptr<Text> _bright_text;
 
-    std::shared_ptr<Slider> _mip_slider;
-    std::shared_ptr<Slider> _slice_slider;
-    std::shared_ptr<Slider> _bright_slider;
+    std::unique_ptr<Slider> _mip_slider;
+    std::unique_ptr<Slider> _slice_slider;
+    std::unique_ptr<Slider> _bright_slider;
 };
 
 }