juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-25 20:02:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into dev/h2d-2

Browse Source 
# Conflicts:
#	src/slic3r/GUI/PartPlate.hpp
This commit is contained in:
Noisyfox
2025-10-14 19:43:33 +08:00
parent 592a3aea37 cbc41501b4
commit 3a5a49b23d
72 changed files with 276 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/slic3r/GUI/PartPlate.hpp
View File

@@ -206,9 +206,9 @@ private:
void on_filament_map_mode_change();
public:
static const unsigned int PLATE_NAME_HOVER_ID = 6;
static const unsigned int PLATE_FILAMENT_MAP_ID = 8;
static const unsigned int GRABBER_COUNT = 9;
static constexpr unsigned int PLATE_NAME_HOVER_ID = 6;
static constexpr unsigned int PLATE_FILAMENT_MAP_ID = 8;
static constexpr unsigned int GRABBER_COUNT = 9;
static ColorRGBA SELECT_COLOR;
static ColorRGBA UNSELECT_COLOR;
@@ -675,7 +675,7 @@ public:
void reset();
};
static const unsigned int MAX_PLATES_COUNT = MAX_PLATE_COUNT;
static constexpr unsigned int MAX_PLATES_COUNT = MAX_PLATE_COUNT;
static GLTexture bed_textures[(unsigned int)btCount];
static bool is_load_bedtype_textures;
static bool is_load_cali_texture;

3
src/slic3r/GUI/SceneRaycaster.cpp
View File

@@ -9,6 +9,9 @@
namespace Slic3r {
namespace GUI {
// EIdBase::Volume must be greater than PartPlateList::MAX_PLATES_COUNT * PartPlate::GRABBER_COUNT
static_assert((int) SceneRaycaster::EIdBase::Volume > PartPlateList::MAX_PLATES_COUNT * PartPlate::GRABBER_COUNT, "EIdBase::Volume too small");
SceneRaycaster::SceneRaycaster() {
#if ENABLE_RAYCAST_PICKING_DEBUG
// hit point

2
src/slic3r/GUI/SceneRaycaster.hpp
View File

@@ -52,7 +52,7 @@ public:
enum class EIdBase
{
Bed = 0,
Volume = 1000, // Must be smaller than PartPlateList::MAX_PLATES_COUNT * PartPlate::GRABBER_COUNT
Volume = 1000, // Must be greater than PartPlateList::MAX_PLATES_COUNT * PartPlate::GRABBER_COUNT
Gizmo = 1000000,
FallbackGizmo = 2000000
};