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

Add support for Orca-specific extrusion roles

Browse Source
This commit is contained in:
Andrew Sun
2025-09-20 15:09:55 -04:00
parent 9359aa8607
commit d539540a65
7 changed files with 55 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libvgcode/include/Types.hpp
View File

@@ -140,6 +140,12 @@ enum class EGCodeExtrusionRole : uint8_t
SupportMaterialInterface,
WipeTower,
Custom,
// ORCA
BottomSurface,
InternalBridgeInfill,
Brim,
SupportTransition,
Mixed,
COUNT
};

6
src/libvgcode/include/Viewer.hpp
View File

@@ -370,7 +370,11 @@ public:
EGCodeExtrusionRole::InternalInfill, EGCodeExtrusionRole::SolidInfill, EGCodeExtrusionRole::TopSolidInfill,
EGCodeExtrusionRole::Ironing, EGCodeExtrusionRole::BridgeInfill, EGCodeExtrusionRole::GapFill,
EGCodeExtrusionRole::Skirt, EGCodeExtrusionRole::SupportMaterial, EGCodeExtrusionRole::SupportMaterialInterface,
EGCodeExtrusionRole::WipeTower, EGCodeExtrusionRole::Custom }) const;
EGCodeExtrusionRole::WipeTower, EGCodeExtrusionRole::Custom,
// ORCA
EGCodeExtrusionRole::BottomSurface, EGCodeExtrusionRole::InternalBridgeInfill, EGCodeExtrusionRole::Brim,
EGCodeExtrusionRole::SupportTransition, EGCodeExtrusionRole::Mixed
}) const;
//
// Return the size of the used cpu memory, in bytes
//

7
src/libvgcode/src/Settings.hpp
View File

@@ -61,7 +61,12 @@ struct Settings
true, // SupportMaterial
true, // SupportMaterialInterface
true, // WipeTower
true // Custom
true, // Custom
// ORCA
true, // BottomSurface
true, // InternalBridgeInfill
true, // Brim
true, // SupportTransition
};
};

11
src/libvgcode/src/ViewerImpl.cpp
View File

@@ -295,7 +295,12 @@ static const std::array<Color, size_t(EGCodeExtrusionRole::COUNT)> DEFAULT_EXTRU
{ 0, 255, 0 }, // SupportMaterial
{ 0, 128, 0 }, // SupportMaterialInterface
{ 179, 227, 171 }, // WipeTower
{ 94, 209, 148 } // Custom
{ 94, 209, 148 }, // Custom
// ORCA
{ 102, 92, 199 }, // BottomSurface
{ 77, 128, 186 }, // InternalBridgeInfill
{ 0, 59, 110 }, // Brim
{ 0, 64, 0 }, // SupportTransition
} };
static const std::array<Color, size_t(EOptionType::COUNT)> DEFAULT_OPTIONS_COLORS{ {
@@ -1019,7 +1024,9 @@ void ViewerImpl::load(GCodeInputData&& gcode_data)
v.role != EGCodeExtrusionRole::SupportMaterial &&
v.role != EGCodeExtrusionRole::SupportMaterialInterface &&
v.role != EGCodeExtrusionRole::WipeTower &&
v.role != EGCodeExtrusionRole::Custom) {
v.role != EGCodeExtrusionRole::Custom &&
v.role != EGCodeExtrusionRole::Brim &&
v.role != EGCodeExtrusionRole::SupportTransition) {
m_cog_marker.update(0.5f * (v.position + m_vertices[i - 1].position), v.weight);
}
#endif // VGCODE_ENABLE_COG_AND_TOOL_MARKERS

6
src/libvgcode/src/ViewerImpl.hpp
View File

@@ -110,7 +110,11 @@ public:
EGCodeExtrusionRole::InternalInfill, EGCodeExtrusionRole::SolidInfill, EGCodeExtrusionRole::TopSolidInfill,
EGCodeExtrusionRole::Ironing, EGCodeExtrusionRole::BridgeInfill, EGCodeExtrusionRole::GapFill,
EGCodeExtrusionRole::Skirt, EGCodeExtrusionRole::SupportMaterial, EGCodeExtrusionRole::SupportMaterialInterface,
EGCodeExtrusionRole::WipeTower, EGCodeExtrusionRole::Custom }) const;
EGCodeExtrusionRole::WipeTower, EGCodeExtrusionRole::Custom,
// ORCA
EGCodeExtrusionRole::BottomSurface, EGCodeExtrusionRole::InternalBridgeInfill, EGCodeExtrusionRole::Brim,
EGCodeExtrusionRole::SupportTransition, EGCodeExtrusionRole::Mixed
}) const;
bool is_option_visible(EOptionType type) const;
void toggle_option_visibility(EOptionType type);