Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.10.0 beta fixes #5025

Merged
merged 14 commits into from
Oct 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/libslic3r/Brim.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include <numeric>
#include <unordered_set>
#include <tbb/parallel_for.h>
#include <tbb/spin_mutex.h>

#include <boost/log/trivial.hpp>

Expand Down
3 changes: 3 additions & 0 deletions src/libslic3r/FlushVolPredictor.hpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
#ifndef FLUSH_VOL_PREDICTOR_HPP
#define FLUSH_VOL_PREDICTOR_HPP

#include<cstdint>
#include<unordered_map>
#include<string>
#include<vector>

namespace FlushPredict
{
Expand Down
1 change: 1 addition & 0 deletions src/libslic3r/Format/STEP.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ namespace fs = boost::filesystem;

namespace Slic3r {

class Model;
class TriangleMesh;
class ModelObject;

Expand Down
1 change: 1 addition & 0 deletions src/libslic3r/Support/TreeSupport.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#include <chrono>
#include <math.h>

#include "format.hpp"
#include "ClipperUtils.hpp"
#include "Fill/FillBase.hpp"
#include "I18N.hpp"
Expand Down
5 changes: 5 additions & 0 deletions src/slic3r/GUI/AVVideoDecoder.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ extern "C" {
#include <libavcodec/avcodec.h>
#include <libswscale/swscale.h>
}
#include <vector>
#include <wx/bitmap.h>
#include <wx/gdicmn.h>
#include <wx/image.h>

class wxBitmap;

class AVVideoDecoder
Expand Down
1 change: 1 addition & 0 deletions src/slic3r/GUI/BitmapCache.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "GUI_Utils.hpp"

#include <boost/filesystem.hpp>
#include <boost/nowide/cstdio.hpp>

#ifdef __WXGTK2__
// Broken alpha workaround
Expand Down
1 change: 1 addition & 0 deletions src/slic3r/GUI/Gizmos/GLGizmoBrimEars.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include "slic3r/GUI/Gizmos/GLGizmosCommon.hpp"
#include "slic3r/GUI/GUI_App.hpp"
#include "slic3r/GUI/Plater.hpp"
#include "libslic3r/ClipperUtils.hpp"
#include "libslic3r/ExPolygon.hpp"

namespace Slic3r { namespace GUI {
Expand Down
2 changes: 2 additions & 0 deletions src/slic3r/GUI/Gizmos/GLGizmoFlatten.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
#include "libslic3r/Geometry/ConvexHull.hpp"
#include "libslic3r/Model.hpp"

#include <wx/display.h>

#include <numeric>
#include <imgui/imgui_internal.h>
#include <GL/glew.h>
Expand Down
1 change: 1 addition & 0 deletions src/slic3r/GUI/MediaFilePanel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include "Printer/PrinterFileSystem.h"
#include "MsgDialog.hpp"
#include "Widgets/ProgressDialog.hpp"
#include <boost/lexical_cast.hpp>
#include <libslic3r/Model.hpp>
#include <libslic3r/Format/bbs_3mf.hpp>

Expand Down
3 changes: 2 additions & 1 deletion src/slic3r/GUI/StepMeshDialog.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#ifndef _STEP_MESH_DIALOG_H_
#define _STEP_MESH_DIALOG_H_

#include <future>
#include <thread>
#include "GUI_Utils.hpp"
#include "libslic3r/Format/STEP.hpp"
Expand Down Expand Up @@ -44,4 +45,4 @@ class StepMeshDialog : public Slic3r::GUI::DPIDialog
void stop_task();
};

#endif // _STEP_MESH_DIALOG_H_
#endif // _STEP_MESH_DIALOG_H_
2 changes: 2 additions & 0 deletions src/slic3r/GUI/wxMediaCtrl2.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#include "wxMediaCtrl2.h"
#include "I18N.hpp"
#include "libslic3r/Utils.hpp"
#include <wx/log.h>
#include <wx/msgdlg.h>
#ifdef __WIN32__
#include <versionhelpers.h>
#include <wx/msw/registry.h>
Expand Down
2 changes: 2 additions & 0 deletions src/slic3r/GUI/wxMediaCtrl3.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
#include "AVVideoDecoder.hpp"
#include "I18N.hpp"
#include "libslic3r/Utils.hpp"
#include <boost/log/trivial.hpp>
#include <wx/dcclient.h>
#ifdef __WIN32__
#include <versionhelpers.h>
#include <wx/msw/registry.h>
Expand Down
5 changes: 5 additions & 0 deletions src/slic3r/GUI/wxMediaCtrl3.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ void wxMediaCtrl_OnSize(wxWindow * ctrl, wxSize const & videoSize, int width, in
#else

#define BAMBU_DYNAMIC
#include <condition_variable>
#include <thread>
#ifndef _WIN32
#include <wx/image.h>
#endif
#include "Printer/BambuTunnel.h"

class AVVideoDecoder;
Expand Down
Loading