From 19c1811823b9fdded9f41b4f0fa49af0025e8b1b Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Sun, 6 May 2018 22:43:02 -0500 Subject: [PATCH] Added bare-bones stubs for 3D plater and 3D preview. --- src/GUI/Plater.hpp | 7 ++++++- src/GUI/Plater/Plate3D.hpp | 16 ++++++++++++++++ src/GUI/Plater/Preview3D.hpp | 16 ++++++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 src/GUI/Plater/Plate3D.hpp create mode 100644 src/GUI/Plater/Preview3D.hpp diff --git a/src/GUI/Plater.hpp b/src/GUI/Plater.hpp index d4eb41abf..47d61a693 100644 --- a/src/GUI/Plater.hpp +++ b/src/GUI/Plater.hpp @@ -16,6 +16,8 @@ #include "Plater/PlaterObject.hpp" #include "Plater/Plate2D.hpp" +#include "Plater/Plate3D.hpp" +#include "Plater/Preview3D.hpp" #include "Settings.hpp" #include "MainFrame.hpp" @@ -58,7 +60,10 @@ private: wxNotebook* preview_notebook {new wxNotebook(this, -1, wxDefaultPosition, wxSize(335,335), wxNB_BOTTOM)}; - Plate2D* canvas2D {}; //< 2D plater canvas + Plate2D* canvas2D {nullptr}; //< 2D plater canvas + Plate3D* canvas3D {nullptr}; //< 3D plater canvas + + Preview3D* preview3D {nullptr}; //< 3D Preview /// Handles the actual load of the file from the dialog handoff. std::vector load_file(const std::string file, const int obj_idx_to_load = -1); diff --git a/src/GUI/Plater/Plate3D.hpp b/src/GUI/Plater/Plate3D.hpp new file mode 100644 index 000000000..488e35019 --- /dev/null +++ b/src/GUI/Plater/Plate3D.hpp @@ -0,0 +1,16 @@ +#ifndef PLATE3D_HPP +#define PLATE3D_HPP +#include +#ifndef WX_PRECOMP + #include +#endif + +namespace Slic3r { namespace GUI { + +class Plate3D : public wxPanel { +public: + void update() {}; +}; + +} } // Namespace Slic3r::GUI +#endif diff --git a/src/GUI/Plater/Preview3D.hpp b/src/GUI/Plater/Preview3D.hpp new file mode 100644 index 000000000..cd4e0a283 --- /dev/null +++ b/src/GUI/Plater/Preview3D.hpp @@ -0,0 +1,16 @@ +#ifndef PREVIEW3D_HPP +#define PREVIEW3D_HPP +#include +#ifndef WX_PRECOMP + #include +#endif + +namespace Slic3r { namespace GUI { + +class Preview3D : public wxPanel { +public: + void reload_print() {}; +}; + +} } // Namespace Slic3r::GUI +#endif