juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-20 11:53:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

revert pure format changes

Browse Source
This commit is contained in:
SoftFever
2026-04-28 19:57:14 +08:00
parent 1acab58d60
commit ae6729248c
1 changed files with 142 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

212
src/libslic3r/PrintConfig.hpp
View File

@@ -1049,89 +1049,161 @@ PRINT_CONFIG_CLASS_DEFINE(
PRINT_CONFIG_CLASS_DEFINE( PRINT_CONFIG_CLASS_DEFINE(
PrintRegionConfig, PrintRegionConfig,
((ConfigOptionInts, print_extruder_id))((ConfigOptionStrings, print_extruder_variant))((ConfigOptionInt, bottom_shell_layers))( ((ConfigOptionInts, print_extruder_id))
(ConfigOptionFloat, bottom_shell_thickness))((ConfigOptionFloat, bridge_angle))( ((ConfigOptionStrings, print_extruder_variant))
(ConfigOptionFloat, internal_bridge_angle)) // ORCA: Internal bridge angle override ((ConfigOptionInt, bottom_shell_layers))
((ConfigOptionFloat, bridge_flow))((ConfigOptionFloat, internal_bridge_flow))((ConfigOptionFloat, bridge_speed))( ((ConfigOptionFloat, bottom_shell_thickness))
(ConfigOptionFloatOrPercent, internal_bridge_speed))((ConfigOptionEnum<EnsureVerticalShellThickness>, ((ConfigOptionFloat, bridge_angle))
ensure_vertical_shell_thickness))((ConfigOptionPercent, top_surface_density))( ((ConfigOptionFloat, internal_bridge_angle)) // ORCA: Internal bridge angle override
(ConfigOptionPercent, bottom_surface_density))((ConfigOptionEnum<InfillPattern>, top_surface_pattern))( ((ConfigOptionFloat, bridge_flow))
(ConfigOptionEnum<InfillPattern>, bottom_surface_pattern))((ConfigOptionEnum<InfillPattern>, internal_solid_infill_pattern))( ((ConfigOptionFloat, internal_bridge_flow))
(ConfigOptionFloatOrPercent, outer_wall_line_width))((ConfigOptionFloat, outer_wall_speed))((ConfigOptionFloat, infill_direction))( ((ConfigOptionFloat, bridge_speed))
(ConfigOptionFloat, solid_infill_direction))((ConfigOptionString, solid_infill_rotate_template))( ((ConfigOptionFloatOrPercent, internal_bridge_speed))
(ConfigOptionBool, symmetric_infill_y_axis))((ConfigOptionFloat, infill_shift_step))( ((ConfigOptionEnum<EnsureVerticalShellThickness>, ensure_vertical_shell_thickness))
(ConfigOptionString, sparse_infill_rotate_template))((ConfigOptionPercent, sparse_infill_density))( ((ConfigOptionPercent, top_surface_density))
(ConfigOptionEnum<InfillPattern>, sparse_infill_pattern))((ConfigOptionFloat, lateral_lattice_angle_1))( ((ConfigOptionPercent, bottom_surface_density))
(ConfigOptionFloat, lateral_lattice_angle_2))((ConfigOptionFloat, infill_overhang_angle))((ConfigOptionBool, ((ConfigOptionEnum<InfillPattern>, top_surface_pattern))
align_infill_direction_to_model))(( ((ConfigOptionEnum<InfillPattern>, bottom_surface_pattern))
ConfigOptionString, extra_solid_infills))((ConfigOptionEnum<FuzzySkinType>, fuzzy_skin))((ConfigOptionFloat, fuzzy_skin_thickness))( ((ConfigOptionEnum<InfillPattern>, internal_solid_infill_pattern))
(ConfigOptionFloat, fuzzy_skin_point_distance))((ConfigOptionBool, fuzzy_skin_first_layer))((ConfigOptionEnum<NoiseType>, ((ConfigOptionFloatOrPercent, outer_wall_line_width))
fuzzy_skin_noise_type))( ((ConfigOptionFloat, outer_wall_speed))
(ConfigOptionEnum<FuzzySkinMode>, fuzzy_skin_mode))((ConfigOptionFloat, fuzzy_skin_scale))((ConfigOptionInt, fuzzy_skin_octaves))( ((ConfigOptionFloat, infill_direction))
(ConfigOptionFloat, fuzzy_skin_persistence))((ConfigOptionFloat, gap_infill_speed))((ConfigOptionInt, sparse_infill_filament))( ((ConfigOptionFloat, solid_infill_direction))
(ConfigOptionFloatOrPercent, sparse_infill_line_width))((ConfigOptionPercent, infill_wall_overlap))( ((ConfigOptionString, solid_infill_rotate_template))
(ConfigOptionPercent, top_bottom_infill_wall_overlap))((ConfigOptionFloat, sparse_infill_speed))( ((ConfigOptionBool, symmetric_infill_y_axis))
(ConfigOptionPercent, skeleton_infill_density))((ConfigOptionPercent, skin_infill_density))((ConfigOptionFloat, infill_lock_depth))( ((ConfigOptionFloat, infill_shift_step))
(ConfigOptionFloat, skin_infill_depth))((ConfigOptionFloatOrPercent, skin_infill_line_width))( ((ConfigOptionString, sparse_infill_rotate_template))
(ConfigOptionFloatOrPercent, skeleton_infill_line_width))((ConfigOptionBool, infill_combination)) ((ConfigOptionPercent, sparse_infill_density))
((ConfigOptionEnum<InfillPattern>, sparse_infill_pattern))
((ConfigOptionFloat, lateral_lattice_angle_1))
((ConfigOptionFloat, lateral_lattice_angle_2))
((ConfigOptionFloat, infill_overhang_angle))
((ConfigOptionBool, align_infill_direction_to_model))
((ConfigOptionString, extra_solid_infills))
((ConfigOptionEnum<FuzzySkinType>, fuzzy_skin))
((ConfigOptionFloat, fuzzy_skin_thickness))
((ConfigOptionFloat, fuzzy_skin_point_distance))
((ConfigOptionBool, fuzzy_skin_first_layer))
((ConfigOptionEnum<NoiseType>, fuzzy_skin_noise_type))
((ConfigOptionEnum<FuzzySkinMode>, fuzzy_skin_mode))
((ConfigOptionFloat, fuzzy_skin_scale))
((ConfigOptionInt, fuzzy_skin_octaves))
((ConfigOptionFloat, fuzzy_skin_persistence))
((ConfigOptionFloat, gap_infill_speed))
((ConfigOptionInt, sparse_infill_filament))
((ConfigOptionFloatOrPercent, sparse_infill_line_width))
((ConfigOptionPercent, infill_wall_overlap))
((ConfigOptionPercent, top_bottom_infill_wall_overlap))
((ConfigOptionFloat, sparse_infill_speed))
((ConfigOptionPercent, skeleton_infill_density))
((ConfigOptionPercent, skin_infill_density))
((ConfigOptionFloat, infill_lock_depth))
((ConfigOptionFloat, skin_infill_depth))
((ConfigOptionFloatOrPercent, skin_infill_line_width))
((ConfigOptionFloatOrPercent, skeleton_infill_line_width))
((ConfigOptionBool, infill_combination))
// Orca: // Orca:
((ConfigOptionFloatOrPercent, infill_combination_max_layer_height))((ConfigOptionInt, fill_multiline)) ((ConfigOptionFloatOrPercent, infill_combination_max_layer_height))
((ConfigOptionInt, fill_multiline))
// Ironing options // Ironing options
((ConfigOptionEnum<IroningType>, ironing_type))((ConfigOptionEnum<InfillPattern>, ironing_pattern))((ConfigOptionPercent, ironing_flow))( ((ConfigOptionEnum<IroningType>, ironing_type))
(ConfigOptionFloat, ironing_spacing))((ConfigOptionFloat, ironing_inset))((ConfigOptionFloat, ((ConfigOptionEnum<InfillPattern>, ironing_pattern))
ironing_direction))((ConfigOptionFloat, ironing_speed))( ((ConfigOptionPercent, ironing_flow))
(ConfigOptionFloat, ironing_angle))((ConfigOptionBool, ironing_angle_fixed))((ConfigOptionFloat, ironing_expansion)) ((ConfigOptionFloat, ironing_spacing))
((ConfigOptionFloat, ironing_inset))
((ConfigOptionFloat, ironing_direction))
((ConfigOptionFloat, ironing_speed))
((ConfigOptionFloat, ironing_angle))
((ConfigOptionBool, ironing_angle_fixed))
// Filament Ironing // Filament Ironing
((ConfigOptionPercentsNullable, filament_ironing_flow))((ConfigOptionFloatsNullable, filament_ironing_spacing))( ((ConfigOptionPercentsNullable, filament_ironing_flow))
(ConfigOptionFloatsNullable, filament_ironing_inset))((ConfigOptionFloatsNullable, filament_ironing_speed)) ((ConfigOptionFloatsNullable, filament_ironing_spacing))
((ConfigOptionFloatsNullable, filament_ironing_inset))
((ConfigOptionFloatsNullable, filament_ironing_speed))
// Detect bridging perimeters // Detect bridging perimeters
((ConfigOptionBool, detect_overhang_wall))((ConfigOptionInt, wall_filament))((ConfigOptionFloatOrPercent, inner_wall_line_width))( ((ConfigOptionBool, detect_overhang_wall))
(ConfigOptionFloat, inner_wall_speed)) ((ConfigOptionInt, wall_filament))
((ConfigOptionFloatOrPercent, inner_wall_line_width))
((ConfigOptionFloat, inner_wall_speed))
// Total number of perimeters. // Total number of perimeters.
((ConfigOptionInt, wall_loops))((ConfigOptionBool, alternate_extra_wall))((ConfigOptionFloat, minimum_sparse_infill_area))( ((ConfigOptionInt, wall_loops))
(ConfigOptionInt, solid_infill_filament))((ConfigOptionFloatOrPercent, ((ConfigOptionBool, alternate_extra_wall))
internal_solid_infill_line_width))((ConfigOptionFloat, internal_solid_infill_speed)) ((ConfigOptionFloat, minimum_sparse_infill_area))
((ConfigOptionInt, solid_infill_filament))
((ConfigOptionFloatOrPercent, internal_solid_infill_line_width))
((ConfigOptionFloat, internal_solid_infill_speed))
// Detect thin walls. // Detect thin walls.
((ConfigOptionBool, detect_thin_wall))((ConfigOptionFloatOrPercent, top_surface_line_width))((ConfigOptionInt, top_shell_layers))( ((ConfigOptionBool, detect_thin_wall))
(ConfigOptionFloat, top_shell_thickness))((ConfigOptionFloat, top_surface_speed)) ((ConfigOptionFloatOrPercent, top_surface_line_width))
// BBS ((ConfigOptionInt, top_shell_layers))
((ConfigOptionBool, enable_overhang_speed))((ConfigOptionFloatOrPercent, overhang_1_4_speed))( ((ConfigOptionFloat, top_shell_thickness))
(ConfigOptionFloatOrPercent, overhang_2_4_speed))((ConfigOptionFloatOrPercent, overhang_3_4_speed))( ((ConfigOptionFloat, top_surface_speed))
(ConfigOptionFloatOrPercent, overhang_4_4_speed))((ConfigOptionBool, only_one_wall_top)) //BBS
((ConfigOptionBool, enable_overhang_speed))
((ConfigOptionFloatOrPercent, overhang_1_4_speed))
((ConfigOptionFloatOrPercent, overhang_2_4_speed))
((ConfigOptionFloatOrPercent, overhang_3_4_speed))
((ConfigOptionFloatOrPercent, overhang_4_4_speed))
((ConfigOptionBool, only_one_wall_top))
// SoftFever //SoftFever
((ConfigOptionFloatOrPercent, min_width_top_surface))((ConfigOptionBool, only_one_wall_first_layer))( ((ConfigOptionFloatOrPercent, min_width_top_surface))
(ConfigOptionFloat, print_flow_ratio))((ConfigOptionFloatOrPercent, seam_gap))((ConfigOptionBool, role_based_wipe_speed))( ((ConfigOptionBool, only_one_wall_first_layer))
(ConfigOptionFloatOrPercent, wipe_speed))((ConfigOptionBool, wipe_on_loops))((ConfigOptionBool, wipe_before_external_loop))( ((ConfigOptionFloat, print_flow_ratio))
(ConfigOptionEnum<WallInfillOrder>, wall_infill_order))((ConfigOptionBool, precise_outer_wall))(( ((ConfigOptionFloatOrPercent, seam_gap))
ConfigOptionPercent, bridge_density))((ConfigOptionFloat, filter_out_gap_fill))((ConfigOptionFloatOrPercent, small_perimeter_speed))( ((ConfigOptionBool, role_based_wipe_speed))
(ConfigOptionFloat, small_perimeter_threshold))((ConfigOptionFloat, top_solid_infill_flow_ratio))( ((ConfigOptionFloatOrPercent, wipe_speed))
(ConfigOptionFloat, bottom_solid_infill_flow_ratio))((ConfigOptionFloatOrPercent, infill_anchor))((ConfigOptionFloatOrPercent, ((ConfigOptionBool, wipe_on_loops))
infill_anchor_max)) ((ConfigOptionBool, wipe_before_external_loop))
((ConfigOptionEnum<WallInfillOrder>, wall_infill_order))
((ConfigOptionBool, precise_outer_wall))
((ConfigOptionPercent, bridge_density))
((ConfigOptionFloat, filter_out_gap_fill))
((ConfigOptionFloatOrPercent, small_perimeter_speed))
((ConfigOptionFloat, small_perimeter_threshold))
((ConfigOptionFloat, top_solid_infill_flow_ratio))
((ConfigOptionFloat, bottom_solid_infill_flow_ratio))
((ConfigOptionFloatOrPercent, infill_anchor))
((ConfigOptionFloatOrPercent, infill_anchor_max))
// Orca // Orca
((ConfigOptionBool, make_overhang_printable))((ConfigOptionBool, extra_perimeters_on_overhangs))( ((ConfigOptionBool, make_overhang_printable))
(ConfigOptionBool, slowdown_for_curled_perimeters))((ConfigOptionBool, hole_to_polyhole))( ((ConfigOptionBool, extra_perimeters_on_overhangs))
(ConfigOptionFloatOrPercent, hole_to_polyhole_threshold))((ConfigOptionBool, hole_to_polyhole_twisted))( ((ConfigOptionBool, slowdown_for_curled_perimeters))
(ConfigOptionBool, overhang_reverse))((ConfigOptionBool, overhang_reverse_internal_only))((ConfigOptionFloatOrPercent, ((ConfigOptionBool, hole_to_polyhole))
overhang_reverse_threshold))( ((ConfigOptionFloatOrPercent, hole_to_polyhole_threshold))
(ConfigOptionEnum<CounterboreHoleBridgingOption>, counterbore_hole_bridging))((ConfigOptionEnum<WallSequence>, wall_sequence))( ((ConfigOptionBool, hole_to_polyhole_twisted))
(ConfigOptionBool, is_infill_first))((ConfigOptionBool, small_area_infill_flow_compensation))((ConfigOptionEnum<WallDirection>, ((ConfigOptionBool, overhang_reverse))
wall_direction)) ((ConfigOptionBool, overhang_reverse_internal_only))
((ConfigOptionFloatOrPercent, overhang_reverse_threshold))
((ConfigOptionEnum<CounterboreHoleBridgingOption>, counterbore_hole_bridging))
((ConfigOptionEnum<WallSequence>, wall_sequence))
((ConfigOptionBool, is_infill_first))
((ConfigOptionBool, small_area_infill_flow_compensation))
((ConfigOptionEnum<WallDirection>, wall_direction))
// Orca: other flow ratios (available for overriding, if set_other_flow_ratios is enabled) // Orca: other flow ratios (available for overriding, if set_other_flow_ratios is enabled)
((ConfigOptionFloat, first_layer_flow_ratio))((ConfigOptionFloat, outer_wall_flow_ratio))((ConfigOptionFloat, inner_wall_flow_ratio))( ((ConfigOptionFloat, first_layer_flow_ratio))
(ConfigOptionFloat, overhang_flow_ratio))((ConfigOptionFloat, sparse_infill_flow_ratio))( ((ConfigOptionFloat, outer_wall_flow_ratio))
(ConfigOptionFloat, internal_solid_infill_flow_ratio))((ConfigOptionFloat, gap_fill_flow_ratio)) ((ConfigOptionFloat, inner_wall_flow_ratio))
((ConfigOptionFloat, overhang_flow_ratio))
((ConfigOptionFloat, sparse_infill_flow_ratio))
((ConfigOptionFloat, internal_solid_infill_flow_ratio))
((ConfigOptionFloat, gap_fill_flow_ratio))
// Orca: seam slopes // Orca: seam slopes
((ConfigOptionEnum<SeamScarfType>, seam_slope_type))((ConfigOptionBool, seam_slope_conditional))( ((ConfigOptionEnum<SeamScarfType>, seam_slope_type))
(ConfigOptionInt, scarf_angle_threshold))((ConfigOptionFloatOrPercent, seam_slope_start_height))( ((ConfigOptionBool, seam_slope_conditional))
(ConfigOptionBool, seam_slope_entire_loop))((ConfigOptionFloat, seam_slope_min_length))((ConfigOptionInt, seam_slope_steps))( ((ConfigOptionInt, scarf_angle_threshold))
(ConfigOptionBool, seam_slope_inner_walls))((ConfigOptionFloatOrPercent, scarf_joint_speed))( ((ConfigOptionFloatOrPercent, seam_slope_start_height))
(ConfigOptionFloat, scarf_joint_flow_ratio))((ConfigOptionPercent, scarf_overhang_threshold)) ((ConfigOptionBool, seam_slope_entire_loop))
((ConfigOptionFloat, seam_slope_min_length))
// Z Anti-Aliasing (aka Z Contouring) ((ConfigOptionInt, seam_slope_steps))
((ConfigOptionBool, seam_slope_inner_walls))
((ConfigOptionFloatOrPercent, scarf_joint_speed))
((ConfigOptionFloat, scarf_joint_flow_ratio))
((ConfigOptionPercent, scarf_overhang_threshold))
// Orca: Z Anti-Aliasing (aka Z Contouring)
((ConfigOptionBool, zaa_enabled))((ConfigOptionFloat, zaa_minimize_perimeter_height))) ((ConfigOptionBool, zaa_enabled))((ConfigOptionFloat, zaa_minimize_perimeter_height)))
PRINT_CONFIG_CLASS_DEFINE( PRINT_CONFIG_CLASS_DEFINE(