juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-30 14:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into dev/bbl-network-upd

Browse Source
This commit is contained in:
Noisyfox
2025-05-09 23:03:47 +08:00
committed by GitHub
parent fe0f6497ad 0cc495b425
commit 4d25037614
22 changed files with 180 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libslic3r/Color.hpp
View File

@@ -69,9 +69,9 @@ public:
static const ColorRGB ORCA() { return {0.0f, 150.f / 255.0f, 136.0f / 255}; }
static const ColorRGB WARNING() { return {241.0f / 255, 117.f / 255.0f, 78.0f / 255}; }
static const ColorRGB X() { return { 0.75f, 0.0f, 0.0f }; }
static const ColorRGB Y() { return { 0.0f, 0.75f, 0.0f }; }
static const ColorRGB Z() { return { 0.0f, 0.0f, 0.75f }; }
static const ColorRGB X() { return { 255 / 255.f, 60 / 255.f, 91 / 255.f};}
static const ColorRGB Y() { return { 100 / 255.f, 200 / 255.f, 24 / 255.f};}
static const ColorRGB Z() { return { 47 / 255.f, 136 / 255.f, 233 / 255.f};}
};
class ColorRGBA
@@ -140,9 +140,9 @@ public:
static const ColorRGBA WHITE() { return { 1.0f, 1.0f, 1.0f, 1.0f }; }
static const ColorRGBA ORCA() { return {0.0f, 150.f / 255.0f, 136.0f / 255, 1.0f}; }
static const ColorRGBA X() { return { 0.75f, 0.0f, 0.0f, 1.0f }; }
static const ColorRGBA Y() { return { 0.0f, 0.75f, 0.0f, 1.0f }; }
static const ColorRGBA Z() { return { 0.0f, 0.0f, 0.75f, 1.0f }; }
static const ColorRGBA X() { return { ColorRGB::X().r(), ColorRGB::X().g(), ColorRGB::X().b(), 1.f };}
static const ColorRGBA Y() { return { ColorRGB::Y().r(), ColorRGB::Y().g(), ColorRGB::Y().b(), 1.f };}
static const ColorRGBA Z() { return { ColorRGB::Z().r(), ColorRGB::Z().g(), ColorRGB::Z().b(), 1.f };}
};
ColorRGB operator * (float value, const ColorRGB& other);

2
src/libslic3r/GCode/ToolOrdering.cpp
View File

@@ -38,7 +38,7 @@ static std::vector<unsigned int> solve_extruder_order(const std::vector<std::vec
std::swap(*all_extruders.begin(), *start_iter);
}
else {
*start_extruder_id = all_extruders.front();
start_extruder_id = all_extruders.front();
}
unsigned int iterations = (1 << all_extruders.size());