Merge branch 'feat/plugin-feature' into feature/speed-dial
# Conflicts: # src/slic3r/GUI/PluginsDialog.hpp
5
resources/images/dev_ams_dry_ctr_disable.svg
Normal file
@@ -0,0 +1,5 @@
|
||||
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<circle cx="12" cy="12" r="9.35422" fill="#E14747" stroke="#E14747" stroke-width="1.29157"/>
|
||||
<rect x="11" y="6" width="2" height="9" rx="1" fill="white"/>
|
||||
<rect x="11" y="16" width="2" height="2" rx="1" fill="white"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 321 B |
4
resources/images/dev_ams_dry_ctr_enable.svg
Normal file
@@ -0,0 +1,4 @@
|
||||
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M1.80005 12.3C1.80005 6.83238 6.23243 2.4 11.7 2.4C17.1677 2.4 21.6 6.83238 21.6 12.3C21.6 17.7676 17.1677 22.2 11.7 22.2C6.23243 22.2 1.80005 17.7676 1.80005 12.3Z" fill="#009688"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M17.7742 8.66235C18.0746 8.9415 18.0918 9.41131 17.8126 9.7117L12.2128 15.7376C11.5275 16.4751 10.36 16.4751 9.67461 15.7376L6.82482 12.6709C6.54567 12.3706 6.56289 11.9007 6.86328 11.6216C7.16367 11.3424 7.63348 11.3597 7.91263 11.66L10.7624 14.7267C10.8603 14.832 11.0271 14.832 11.125 14.7267L16.7248 8.70081C17.004 8.40042 17.4738 8.3832 17.7742 8.66235Z" fill="white"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 759 B |
BIN
resources/images/dev_ams_dry_ctr_filament_in_chamber.png
Normal file
|
After Width: | Height: | Size: 103 KiB |
3
resources/images/dev_ams_dry_ctr_heating_icon.svg
Normal file
@@ -0,0 +1,3 @@
|
||||
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M8.3125 0.7125V2.6125C8.3125 3.00734 7.99484 3.325 7.6 3.325C7.20516 3.325 6.8875 3.00734 6.8875 2.6125V0.7125C6.8875 0.317656 7.20516 0 7.6 0C7.99484 0 8.3125 0.317656 8.3125 0.7125ZM12.9734 3.23297L11.6286 4.57781C11.3495 4.85687 10.8983 4.85687 10.6222 4.57781C10.3461 4.29875 10.3431 3.8475 10.6222 3.57141L11.967 2.22656C12.2461 1.9475 12.6973 1.9475 12.9734 2.22656C13.2495 2.50562 13.2525 2.95688 12.9734 3.23297ZM3.23297 2.22656L4.57781 3.57141C4.85687 3.85047 4.85687 4.30172 4.57781 4.57781C4.29875 4.85391 3.8475 4.85687 3.57141 4.57781L2.22656 3.23297C1.9475 2.95391 1.9475 2.50266 2.22656 2.22656C2.50562 1.95047 2.95688 1.9475 3.23297 2.22656ZM0.7125 6.8875H2.6125C3.00734 6.8875 3.325 7.20516 3.325 7.6C3.325 7.99484 3.00734 8.3125 2.6125 8.3125H0.7125C0.317656 8.3125 0 7.99484 0 7.6C0 7.20516 0.317656 6.8875 0.7125 6.8875ZM12.5875 6.8875H14.4875C14.8823 6.8875 15.2 7.20516 15.2 7.6C15.2 7.99484 14.8823 8.3125 14.4875 8.3125H12.5875C12.1927 8.3125 11.875 7.99484 11.875 7.6C11.875 7.20516 12.1927 6.8875 12.5875 6.8875ZM4.57781 11.6316L3.23297 12.9734C2.95391 13.2525 2.50266 13.2525 2.22656 12.9734C1.95047 12.6944 1.9475 12.2431 2.22656 11.967L3.57141 10.6222C3.85047 10.3431 4.30172 10.3431 4.57781 10.6222C4.85391 10.9012 4.85687 11.3525 4.57781 11.6286V11.6316ZM11.6316 10.6252L12.9734 11.967C13.2525 12.2461 13.2525 12.6973 12.9734 12.9734C12.6944 13.2495 12.2431 13.2525 11.967 12.9734L10.6222 11.6286C10.3431 11.3495 10.3431 10.8983 10.6222 10.6222C10.9012 10.3461 11.3525 10.3431 11.6286 10.6222L11.6316 10.6252ZM8.3125 12.5875V14.4875C8.3125 14.8823 7.99484 15.2 7.6 15.2C7.20516 15.2 6.8875 14.8823 6.8875 14.4875V12.5875C6.8875 12.1927 7.20516 11.875 7.6 11.875C7.99484 11.875 8.3125 12.1927 8.3125 12.5875ZM9.5 7.6C9.5 7.09609 9.29982 6.61282 8.9435 6.2565C8.58718 5.90018 8.10391 5.7 7.6 5.7C7.09609 5.7 6.61282 5.90018 6.2565 6.2565C5.90018 6.61282 5.7 7.09609 5.7 7.6C5.7 8.10391 5.90018 8.58718 6.2565 8.9435C6.61282 9.29982 7.09609 9.5 7.6 9.5C8.10391 9.5 8.58718 9.29982 8.9435 8.9435C9.29982 8.58718 9.5 8.10391 9.5 7.6ZM4.275 7.6C4.275 6.71815 4.62531 5.87243 5.24887 5.24887C5.87243 4.62531 6.71815 4.275 7.6 4.275C8.48184 4.275 9.32757 4.62531 9.95113 5.24887C10.5747 5.87243 10.925 6.71815 10.925 7.6C10.925 8.48184 10.5747 9.32757 9.95113 9.95113C9.32757 10.5747 8.48184 10.925 7.6 10.925C6.71815 10.925 5.87243 10.5747 5.24887 9.95113C4.62531 9.32757 4.275 8.48184 4.275 7.6Z" fill="#F09A17"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.5 KiB |
BIN
resources/images/dev_ams_dry_ctr_n3f_cooling.png
Normal file
|
After Width: | Height: | Size: 20 KiB |
BIN
resources/images/dev_ams_dry_ctr_n3f_dehumidifying.png
Normal file
|
After Width: | Height: | Size: 22 KiB |
BIN
resources/images/dev_ams_dry_ctr_n3f_error.png
Normal file
|
After Width: | Height: | Size: 18 KiB |
BIN
resources/images/dev_ams_dry_ctr_n3f_heating.png
Normal file
|
After Width: | Height: | Size: 20 KiB |
BIN
resources/images/dev_ams_dry_ctr_n3s_cooling.png
Normal file
|
After Width: | Height: | Size: 10 KiB |
BIN
resources/images/dev_ams_dry_ctr_n3s_dehumidifying.png
Normal file
|
After Width: | Height: | Size: 10 KiB |
BIN
resources/images/dev_ams_dry_ctr_n3s_error.png
Normal file
|
After Width: | Height: | Size: 7.1 KiB |
BIN
resources/images/dev_ams_dry_ctr_n3s_heating.png
Normal file
|
After Width: | Height: | Size: 11 KiB |
@@ -42,8 +42,8 @@
|
||||
"filament_z_hop_types": [
|
||||
"Normal Lift"
|
||||
],
|
||||
"filament_scarf_seam_type": [
|
||||
"none"
|
||||
"filament_dev_drying_cooling_temperature": [
|
||||
"70"
|
||||
],
|
||||
"impact_strength_z": [
|
||||
"3.4"
|
||||
|
||||
@@ -32,6 +32,9 @@
|
||||
"filament_vendor": [
|
||||
"Bambu Lab"
|
||||
],
|
||||
"filament_dev_drying_cooling_temperature": [
|
||||
"95"
|
||||
],
|
||||
"hot_plate_temp": [
|
||||
"100"
|
||||
],
|
||||
|
||||
@@ -33,6 +33,9 @@
|
||||
"full_fan_speed_layer": [
|
||||
"2"
|
||||
],
|
||||
"filament_dev_chamber_drying_time": [
|
||||
"16"
|
||||
],
|
||||
"impact_strength_z": [
|
||||
"13.3"
|
||||
],
|
||||
|
||||
@@ -45,6 +45,27 @@
|
||||
"filament_adhesiveness_category": [
|
||||
"800"
|
||||
],
|
||||
"filament_dev_chamber_drying_bed_temperature": [
|
||||
"90"
|
||||
],
|
||||
"filament_dev_ams_drying_ams_limitations": [
|
||||
"1"
|
||||
],
|
||||
"filament_dev_ams_drying_heat_distortion_temperature": [
|
||||
"165"
|
||||
],
|
||||
"filament_dev_drying_cooling_temperature": [
|
||||
"150"
|
||||
],
|
||||
"filament_dev_ams_drying_temperature": [
|
||||
"65",
|
||||
"80",
|
||||
"65",
|
||||
"80"
|
||||
],
|
||||
"filament_dev_drying_softening_temperature": [
|
||||
"150"
|
||||
],
|
||||
"hot_plate_temp": [
|
||||
"100"
|
||||
],
|
||||
|
||||
@@ -24,6 +24,24 @@
|
||||
"filament_adhesiveness_category": [
|
||||
"703"
|
||||
],
|
||||
"filament_dev_chamber_drying_time": [
|
||||
"16"
|
||||
],
|
||||
"filament_dev_ams_drying_heat_distortion_temperature": [
|
||||
"90"
|
||||
],
|
||||
"filament_dev_drying_cooling_temperature": [
|
||||
"75"
|
||||
],
|
||||
"filament_dev_ams_drying_temperature": [
|
||||
"65",
|
||||
"80",
|
||||
"65",
|
||||
"80"
|
||||
],
|
||||
"filament_dev_drying_softening_temperature": [
|
||||
"85"
|
||||
],
|
||||
"nozzle_temperature": [
|
||||
"280"
|
||||
],
|
||||
|
||||
@@ -24,11 +24,20 @@
|
||||
"filament_vendor": [
|
||||
"Bambu Lab"
|
||||
],
|
||||
"filament_scarf_seam_type": [
|
||||
"none"
|
||||
],
|
||||
"filament_adhesiveness_category": [
|
||||
"702"
|
||||
],
|
||||
"filament_dev_ams_drying_temperature": [
|
||||
"60",
|
||||
"60",
|
||||
"50",
|
||||
"50"
|
||||
],
|
||||
"filament_dev_ams_drying_heat_distortion_temperature": [
|
||||
"50"
|
||||
],
|
||||
"filament_dev_drying_softening_temperature": [
|
||||
"55"
|
||||
],
|
||||
"slow_down_layer_time": [
|
||||
"8"
|
||||
|
||||
@@ -27,14 +27,26 @@
|
||||
"filament_max_volumetric_speed": [
|
||||
"6"
|
||||
],
|
||||
"filament_scarf_seam_type": [
|
||||
"none"
|
||||
],
|
||||
"filament_vendor": [
|
||||
"Bambu Lab"
|
||||
],
|
||||
"filament_adhesiveness_category": [
|
||||
"705"
|
||||
],
|
||||
"filament_dev_chamber_drying_bed_temperature": [
|
||||
"80"
|
||||
],
|
||||
"filament_dev_ams_drying_temperature": [
|
||||
"60",
|
||||
"60",
|
||||
"50",
|
||||
"50"
|
||||
],
|
||||
"filament_dev_ams_drying_heat_distortion_temperature": [
|
||||
"50"
|
||||
],
|
||||
"filament_dev_drying_softening_temperature": [
|
||||
"55"
|
||||
],
|
||||
"hot_plate_temp": [
|
||||
"60"
|
||||
|
||||
@@ -21,11 +21,26 @@
|
||||
"filament_vendor": [
|
||||
"Bambu Lab"
|
||||
],
|
||||
"filament_scarf_seam_type": [
|
||||
"none"
|
||||
],
|
||||
"filament_adhesiveness_category": [
|
||||
"701"
|
||||
],
|
||||
"filament_dev_chamber_drying_time": [
|
||||
"16"
|
||||
],
|
||||
"filament_dev_ams_drying_heat_distortion_temperature": [
|
||||
"90"
|
||||
],
|
||||
"filament_dev_drying_cooling_temperature": [
|
||||
"75"
|
||||
],
|
||||
"filament_dev_ams_drying_temperature": [
|
||||
"65",
|
||||
"80",
|
||||
"65",
|
||||
"80"
|
||||
],
|
||||
"filament_dev_drying_softening_temperature": [
|
||||
"85"
|
||||
],
|
||||
"nozzle_temperature": [
|
||||
"280"
|
||||
|
||||
@@ -27,11 +27,14 @@
|
||||
"filament_vendor": [
|
||||
"Bambu Lab"
|
||||
],
|
||||
"filament_scarf_seam_type": [
|
||||
"none"
|
||||
],
|
||||
"filament_adhesiveness_category": [
|
||||
"706"
|
||||
],
|
||||
"filament_dev_ams_drying_time": [
|
||||
"12",
|
||||
"4",
|
||||
"12",
|
||||
"4"
|
||||
],
|
||||
"nozzle_temperature_range_high": [
|
||||
"270"
|
||||
|
||||
@@ -21,6 +21,21 @@
|
||||
"filament_max_volumetric_speed": [
|
||||
"12"
|
||||
],
|
||||
"filament_dev_ams_drying_temperature": [
|
||||
"65",
|
||||
"80",
|
||||
"65",
|
||||
"80"
|
||||
],
|
||||
"filament_dev_ams_drying_heat_distortion_temperature": [
|
||||
"90"
|
||||
],
|
||||
"filament_dev_drying_cooling_temperature": [
|
||||
"65"
|
||||
],
|
||||
"filament_dev_drying_softening_temperature": [
|
||||
"85"
|
||||
],
|
||||
"nozzle_temperature": [
|
||||
"260"
|
||||
],
|
||||
|
||||
@@ -38,6 +38,34 @@
|
||||
"filament_max_volumetric_speed": [
|
||||
"6"
|
||||
],
|
||||
"filament_dev_chamber_drying_bed_temperature": [
|
||||
"80"
|
||||
],
|
||||
"filament_dev_ams_drying_time": [
|
||||
"12",
|
||||
"12",
|
||||
"12",
|
||||
"12"
|
||||
],
|
||||
"filament_dev_ams_drying_ams_limitations": [
|
||||
"1",
|
||||
"0"
|
||||
],
|
||||
"filament_dev_ams_drying_heat_distortion_temperature": [
|
||||
"75"
|
||||
],
|
||||
"filament_dev_drying_cooling_temperature": [
|
||||
"55"
|
||||
],
|
||||
"filament_dev_ams_drying_temperature": [
|
||||
"65",
|
||||
"65",
|
||||
"55",
|
||||
"55"
|
||||
],
|
||||
"filament_dev_drying_softening_temperature": [
|
||||
"60"
|
||||
],
|
||||
"hot_plate_temp": [
|
||||
"70"
|
||||
],
|
||||
|
||||
@@ -4,5 +4,26 @@
|
||||
"inherits": "fdm_filament_pps",
|
||||
"from": "system",
|
||||
"filament_id": "GFT97",
|
||||
"instantiation": "false"
|
||||
"instantiation": "false",
|
||||
"filament_dev_chamber_drying_bed_temperature": [
|
||||
"90"
|
||||
],
|
||||
"filament_dev_ams_drying_ams_limitations": [
|
||||
"1"
|
||||
],
|
||||
"filament_dev_ams_drying_heat_distortion_temperature": [
|
||||
"90"
|
||||
],
|
||||
"filament_dev_drying_cooling_temperature": [
|
||||
"80"
|
||||
],
|
||||
"filament_dev_ams_drying_temperature": [
|
||||
"65",
|
||||
"80",
|
||||
"65",
|
||||
"80"
|
||||
],
|
||||
"filament_dev_drying_softening_temperature": [
|
||||
"85"
|
||||
]
|
||||
}
|
||||
|
||||
@@ -41,6 +41,30 @@
|
||||
"filament_vendor": [
|
||||
"Polymaker"
|
||||
],
|
||||
"filament_adhesiveness_category": [
|
||||
"800"
|
||||
],
|
||||
"filament_dev_chamber_drying_bed_temperature": [
|
||||
"90"
|
||||
],
|
||||
"filament_dev_ams_drying_ams_limitations": [
|
||||
"1"
|
||||
],
|
||||
"filament_dev_ams_drying_heat_distortion_temperature": [
|
||||
"165"
|
||||
],
|
||||
"filament_dev_drying_cooling_temperature": [
|
||||
"150"
|
||||
],
|
||||
"filament_dev_ams_drying_temperature": [
|
||||
"65",
|
||||
"80",
|
||||
"65",
|
||||
"80"
|
||||
],
|
||||
"filament_dev_drying_softening_temperature": [
|
||||
"150"
|
||||
],
|
||||
"hot_plate_temp": [
|
||||
"70"
|
||||
],
|
||||
@@ -83,9 +107,6 @@
|
||||
"textured_plate_temp_initial_layer": [
|
||||
"70"
|
||||
],
|
||||
"filament_adhesiveness_category": [
|
||||
"800"
|
||||
],
|
||||
"filament_start_gcode": [
|
||||
"; filament start gcode\n{if (bed_temperature[current_extruder] >80)||(bed_temperature_initial_layer[current_extruder] >80)}M106 P3 S255\n{elsif (bed_temperature[current_extruder] >60)||(bed_temperature_initial_layer[current_extruder] >60)}M106 P3 S180\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
|
||||
]
|
||||
|
||||
@@ -43,6 +43,27 @@
|
||||
"filament_adhesiveness_category": [
|
||||
"200"
|
||||
],
|
||||
"filament_dev_ams_drying_time": [
|
||||
"12",
|
||||
"8.0",
|
||||
"12",
|
||||
"8.0"
|
||||
],
|
||||
"filament_dev_ams_drying_heat_distortion_temperature": [
|
||||
"90"
|
||||
],
|
||||
"filament_dev_drying_cooling_temperature": [
|
||||
"75"
|
||||
],
|
||||
"filament_dev_ams_drying_temperature": [
|
||||
"65",
|
||||
"80",
|
||||
"65",
|
||||
"75"
|
||||
],
|
||||
"filament_dev_drying_softening_temperature": [
|
||||
"80"
|
||||
],
|
||||
"hot_plate_temp": [
|
||||
"90"
|
||||
],
|
||||
|
||||
@@ -43,6 +43,27 @@
|
||||
"filament_adhesiveness_category": [
|
||||
"200"
|
||||
],
|
||||
"filament_dev_ams_drying_time": [
|
||||
"12",
|
||||
"8.0",
|
||||
"12",
|
||||
"8.0"
|
||||
],
|
||||
"filament_dev_ams_drying_heat_distortion_temperature": [
|
||||
"100"
|
||||
],
|
||||
"filament_dev_drying_cooling_temperature": [
|
||||
"85"
|
||||
],
|
||||
"filament_dev_ams_drying_temperature": [
|
||||
"65",
|
||||
"80",
|
||||
"65",
|
||||
"80"
|
||||
],
|
||||
"filament_dev_drying_softening_temperature": [
|
||||
"85"
|
||||
],
|
||||
"hot_plate_temp": [
|
||||
"90"
|
||||
],
|
||||
|
||||
@@ -43,6 +43,34 @@
|
||||
"filament_type": [
|
||||
"BVOH"
|
||||
],
|
||||
"filament_dev_chamber_drying_bed_temperature": [
|
||||
"80"
|
||||
],
|
||||
"filament_dev_ams_drying_time": [
|
||||
"12",
|
||||
"12",
|
||||
"12",
|
||||
"12"
|
||||
],
|
||||
"filament_dev_ams_drying_ams_limitations": [
|
||||
"1",
|
||||
"0"
|
||||
],
|
||||
"filament_dev_ams_drying_heat_distortion_temperature": [
|
||||
"65"
|
||||
],
|
||||
"filament_dev_drying_cooling_temperature": [
|
||||
"40"
|
||||
],
|
||||
"filament_dev_ams_drying_temperature": [
|
||||
"60",
|
||||
"60",
|
||||
"45",
|
||||
"45"
|
||||
],
|
||||
"filament_dev_drying_softening_temperature": [
|
||||
"50"
|
||||
],
|
||||
"hot_plate_temp": [
|
||||
"55"
|
||||
],
|
||||
|
||||
@@ -7,6 +7,34 @@
|
||||
"filament_type": [
|
||||
"EVA"
|
||||
],
|
||||
"filament_dev_chamber_drying_bed_temperature": [
|
||||
"70"
|
||||
],
|
||||
"filament_dev_ams_drying_time": [
|
||||
"12",
|
||||
"12",
|
||||
"12",
|
||||
"12"
|
||||
],
|
||||
"filament_dev_ams_drying_ams_limitations": [
|
||||
"1",
|
||||
"0"
|
||||
],
|
||||
"filament_dev_ams_drying_heat_distortion_temperature": [
|
||||
"45"
|
||||
],
|
||||
"filament_dev_drying_cooling_temperature": [
|
||||
"40"
|
||||
],
|
||||
"filament_dev_ams_drying_temperature": [
|
||||
"45",
|
||||
"45",
|
||||
"45",
|
||||
"45"
|
||||
],
|
||||
"filament_dev_drying_softening_temperature": [
|
||||
"50"
|
||||
],
|
||||
"supertack_plate_temp": [
|
||||
"0"
|
||||
],
|
||||
|
||||
@@ -4,9 +4,6 @@
|
||||
"inherits": "fdm_filament_common",
|
||||
"from": "system",
|
||||
"instantiation": "false",
|
||||
"additional_cooling_fan_speed": [
|
||||
"0"
|
||||
],
|
||||
"cool_plate_temp": [
|
||||
"0"
|
||||
],
|
||||
@@ -42,6 +39,27 @@
|
||||
],
|
||||
"filament_adhesiveness_category": [
|
||||
"798"
|
||||
],
|
||||
"filament_dev_ams_drying_time": [
|
||||
"12",
|
||||
"12",
|
||||
"12",
|
||||
"12"
|
||||
],
|
||||
"filament_dev_ams_drying_heat_distortion_temperature": [
|
||||
"90"
|
||||
],
|
||||
"filament_dev_drying_cooling_temperature": [
|
||||
"75"
|
||||
],
|
||||
"filament_dev_ams_drying_temperature": [
|
||||
"65",
|
||||
"80",
|
||||
"65",
|
||||
"75"
|
||||
],
|
||||
"filament_dev_drying_softening_temperature": [
|
||||
"80"
|
||||
],
|
||||
"hot_plate_temp": [
|
||||
"90"
|
||||
|
||||
@@ -43,6 +43,30 @@
|
||||
"filament_adhesiveness_category": [
|
||||
"400"
|
||||
],
|
||||
"filament_dev_ams_drying_time": [
|
||||
"12",
|
||||
"12",
|
||||
"12",
|
||||
"12"
|
||||
],
|
||||
"filament_dev_chamber_drying_time": [
|
||||
"18"
|
||||
],
|
||||
"filament_dev_ams_drying_heat_distortion_temperature": [
|
||||
"165"
|
||||
],
|
||||
"filament_dev_drying_cooling_temperature": [
|
||||
"150"
|
||||
],
|
||||
"filament_dev_ams_drying_temperature": [
|
||||
"65",
|
||||
"85",
|
||||
"65",
|
||||
"85"
|
||||
],
|
||||
"filament_dev_drying_softening_temperature": [
|
||||
"150"
|
||||
],
|
||||
"hot_plate_temp": [
|
||||
"100"
|
||||
],
|
||||
|
||||
@@ -40,6 +40,27 @@
|
||||
"filament_adhesiveness_category": [
|
||||
"500"
|
||||
],
|
||||
"filament_dev_ams_drying_time": [
|
||||
"12",
|
||||
"8.0",
|
||||
"12",
|
||||
"8.0"
|
||||
],
|
||||
"filament_dev_ams_drying_heat_distortion_temperature": [
|
||||
"105"
|
||||
],
|
||||
"filament_dev_drying_cooling_temperature": [
|
||||
"90"
|
||||
],
|
||||
"filament_dev_ams_drying_temperature": [
|
||||
"65",
|
||||
"80",
|
||||
"65",
|
||||
"80"
|
||||
],
|
||||
"filament_dev_drying_softening_temperature": [
|
||||
"90"
|
||||
],
|
||||
"hot_plate_temp": [
|
||||
"110"
|
||||
],
|
||||
|
||||
@@ -28,6 +28,37 @@
|
||||
"filament_type": [
|
||||
"PCTG"
|
||||
],
|
||||
"filament_dev_chamber_drying_bed_temperature": [
|
||||
"80"
|
||||
],
|
||||
"filament_dev_ams_drying_time": [
|
||||
"12",
|
||||
"12",
|
||||
"12",
|
||||
"12"
|
||||
],
|
||||
"filament_dev_ams_drying_ams_limitations": [
|
||||
"1",
|
||||
"0"
|
||||
],
|
||||
"filament_dev_chamber_drying_time": [
|
||||
"12"
|
||||
],
|
||||
"filament_dev_ams_drying_heat_distortion_temperature": [
|
||||
"75"
|
||||
],
|
||||
"filament_dev_drying_cooling_temperature": [
|
||||
"55"
|
||||
],
|
||||
"filament_dev_ams_drying_temperature": [
|
||||
"65",
|
||||
"65",
|
||||
"55",
|
||||
"55"
|
||||
],
|
||||
"filament_dev_drying_softening_temperature": [
|
||||
"60"
|
||||
],
|
||||
"hot_plate_temp": [
|
||||
"80"
|
||||
],
|
||||
|
||||
@@ -40,6 +40,31 @@
|
||||
"filament_type": [
|
||||
"PE"
|
||||
],
|
||||
"filament_dev_chamber_drying_bed_temperature": [
|
||||
"70"
|
||||
],
|
||||
"filament_dev_ams_drying_time": [
|
||||
"12",
|
||||
"12",
|
||||
"12",
|
||||
"12"
|
||||
],
|
||||
"filament_dev_ams_drying_ams_limitations": [
|
||||
"1",
|
||||
"0"
|
||||
],
|
||||
"filament_dev_drying_cooling_temperature": [
|
||||
"50"
|
||||
],
|
||||
"filament_dev_ams_drying_temperature": [
|
||||
"45",
|
||||
"45",
|
||||
"45",
|
||||
"45"
|
||||
],
|
||||
"filament_dev_drying_softening_temperature": [
|
||||
"50"
|
||||
],
|
||||
"hot_plate_temp": [
|
||||
"55"
|
||||
],
|
||||
|
||||
@@ -31,6 +31,34 @@
|
||||
"filament_adhesiveness_category": [
|
||||
"300"
|
||||
],
|
||||
"filament_dev_chamber_drying_bed_temperature": [
|
||||
"80"
|
||||
],
|
||||
"filament_dev_ams_drying_time": [
|
||||
"12",
|
||||
"12",
|
||||
"12",
|
||||
"12"
|
||||
],
|
||||
"filament_dev_ams_drying_ams_limitations": [
|
||||
"1",
|
||||
"0"
|
||||
],
|
||||
"filament_dev_ams_drying_heat_distortion_temperature": [
|
||||
"75"
|
||||
],
|
||||
"filament_dev_drying_cooling_temperature": [
|
||||
"55"
|
||||
],
|
||||
"filament_dev_ams_drying_temperature": [
|
||||
"65",
|
||||
"65",
|
||||
"55",
|
||||
"55"
|
||||
],
|
||||
"filament_dev_drying_softening_temperature": [
|
||||
"60"
|
||||
],
|
||||
"hot_plate_temp": [
|
||||
"80"
|
||||
],
|
||||
|
||||
@@ -40,6 +40,31 @@
|
||||
"filament_type": [
|
||||
"PHA"
|
||||
],
|
||||
"filament_dev_chamber_drying_bed_temperature": [
|
||||
"70"
|
||||
],
|
||||
"filament_dev_ams_drying_time": [
|
||||
"12",
|
||||
"12",
|
||||
"12",
|
||||
"12"
|
||||
],
|
||||
"filament_dev_ams_drying_ams_limitations": [
|
||||
"1",
|
||||
"0"
|
||||
],
|
||||
"filament_dev_drying_cooling_temperature": [
|
||||
"45"
|
||||
],
|
||||
"filament_dev_ams_drying_temperature": [
|
||||
"45",
|
||||
"45",
|
||||
"45",
|
||||
"45"
|
||||
],
|
||||
"filament_dev_drying_softening_temperature": [
|
||||
"50"
|
||||
],
|
||||
"hot_plate_temp": [
|
||||
"55"
|
||||
],
|
||||
|
||||
@@ -37,14 +37,39 @@
|
||||
"filament_max_volumetric_speed": [
|
||||
"12"
|
||||
],
|
||||
"filament_scarf_seam_type": [
|
||||
"none"
|
||||
],
|
||||
"filament_scarf_gap": [
|
||||
"15%"
|
||||
],
|
||||
"filament_adhesiveness_category": [
|
||||
"100"
|
||||
],
|
||||
"filament_dev_chamber_drying_bed_temperature": [
|
||||
"70"
|
||||
],
|
||||
"filament_dev_ams_drying_time": [
|
||||
"12",
|
||||
"12",
|
||||
"12",
|
||||
"12"
|
||||
],
|
||||
"filament_dev_ams_drying_ams_limitations": [
|
||||
"1",
|
||||
"0"
|
||||
],
|
||||
"filament_dev_ams_drying_heat_distortion_temperature": [
|
||||
"45"
|
||||
],
|
||||
"filament_dev_drying_cooling_temperature": [
|
||||
"45"
|
||||
],
|
||||
"filament_dev_ams_drying_temperature": [
|
||||
"45",
|
||||
"45",
|
||||
"45",
|
||||
"45"
|
||||
],
|
||||
"filament_dev_drying_softening_temperature": [
|
||||
"50"
|
||||
],
|
||||
"hot_plate_temp": [
|
||||
"55"
|
||||
|
||||
@@ -43,6 +43,34 @@
|
||||
"filament_adhesiveness_category": [
|
||||
"902"
|
||||
],
|
||||
"filament_dev_chamber_drying_bed_temperature": [
|
||||
"70"
|
||||
],
|
||||
"filament_dev_ams_drying_time": [
|
||||
"12",
|
||||
"12",
|
||||
"12",
|
||||
"12"
|
||||
],
|
||||
"filament_dev_ams_drying_ams_limitations": [
|
||||
"1",
|
||||
"0"
|
||||
],
|
||||
"filament_dev_ams_drying_heat_distortion_temperature": [
|
||||
"60"
|
||||
],
|
||||
"filament_dev_drying_cooling_temperature": [
|
||||
"50"
|
||||
],
|
||||
"filament_dev_ams_drying_temperature": [
|
||||
"60",
|
||||
"60",
|
||||
"50",
|
||||
"50"
|
||||
],
|
||||
"filament_dev_drying_softening_temperature": [
|
||||
"55"
|
||||
],
|
||||
"hot_plate_temp": [
|
||||
"55"
|
||||
],
|
||||
|
||||
@@ -46,6 +46,34 @@
|
||||
"filament_vendor": [
|
||||
"Bambu Lab"
|
||||
],
|
||||
"filament_dev_chamber_drying_bed_temperature": [
|
||||
"100"
|
||||
],
|
||||
"filament_dev_ams_drying_time": [
|
||||
"12",
|
||||
"12",
|
||||
"12",
|
||||
"12"
|
||||
],
|
||||
"filament_dev_ams_drying_ams_limitations": [],
|
||||
"filament_dev_chamber_drying_time": [
|
||||
"18"
|
||||
],
|
||||
"filament_dev_ams_drying_heat_distortion_temperature": [
|
||||
"165"
|
||||
],
|
||||
"filament_dev_drying_cooling_temperature": [
|
||||
"150"
|
||||
],
|
||||
"filament_dev_ams_drying_temperature": [
|
||||
"65",
|
||||
"85",
|
||||
"65",
|
||||
"85"
|
||||
],
|
||||
"filament_dev_drying_softening_temperature": [
|
||||
"150"
|
||||
],
|
||||
"hot_plate_temp": [
|
||||
"100"
|
||||
],
|
||||
|
||||
@@ -43,6 +43,31 @@
|
||||
"filament_adhesiveness_category": [
|
||||
"801"
|
||||
],
|
||||
"filament_dev_chamber_drying_bed_temperature": [
|
||||
"100"
|
||||
],
|
||||
"filament_dev_ams_drying_time": [
|
||||
"12",
|
||||
"12",
|
||||
"12",
|
||||
"12"
|
||||
],
|
||||
"filament_dev_ams_drying_ams_limitations": [],
|
||||
"filament_dev_ams_drying_heat_distortion_temperature": [
|
||||
"165"
|
||||
],
|
||||
"filament_dev_drying_cooling_temperature": [
|
||||
"150"
|
||||
],
|
||||
"filament_dev_ams_drying_temperature": [
|
||||
"65",
|
||||
"85",
|
||||
"65",
|
||||
"85"
|
||||
],
|
||||
"filament_dev_drying_softening_temperature": [
|
||||
"150"
|
||||
],
|
||||
"hot_plate_temp": [
|
||||
"110"
|
||||
],
|
||||
|
||||
@@ -49,6 +49,27 @@
|
||||
"filament_adhesiveness_category": [
|
||||
"704"
|
||||
],
|
||||
"filament_dev_ams_drying_time": [
|
||||
"12",
|
||||
"18",
|
||||
"12",
|
||||
"18"
|
||||
],
|
||||
"filament_dev_ams_drying_heat_distortion_temperature": [
|
||||
"75"
|
||||
],
|
||||
"filament_dev_drying_cooling_temperature": [
|
||||
"40"
|
||||
],
|
||||
"filament_dev_ams_drying_temperature": [
|
||||
"65",
|
||||
"85",
|
||||
"65",
|
||||
"70"
|
||||
],
|
||||
"filament_dev_drying_softening_temperature": [
|
||||
"75"
|
||||
],
|
||||
"hot_plate_temp": [
|
||||
"55"
|
||||
],
|
||||
|
||||
@@ -46,6 +46,30 @@
|
||||
"filament_adhesiveness_category": [
|
||||
"600"
|
||||
],
|
||||
"filament_dev_ams_drying_time": [
|
||||
"12",
|
||||
"18",
|
||||
"12",
|
||||
"18"
|
||||
],
|
||||
"filament_dev_chamber_drying_time": [
|
||||
"16"
|
||||
],
|
||||
"filament_dev_ams_drying_heat_distortion_temperature": [
|
||||
"45"
|
||||
],
|
||||
"filament_dev_drying_cooling_temperature": [
|
||||
"40"
|
||||
],
|
||||
"filament_dev_ams_drying_temperature": [
|
||||
"65",
|
||||
"75",
|
||||
"45",
|
||||
"45"
|
||||
],
|
||||
"filament_dev_drying_softening_temperature": [
|
||||
"50"
|
||||
],
|
||||
"hot_plate_temp": [
|
||||
"35"
|
||||
],
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
"name": "0.40mm Standard @Creality K1 SE 0.8 nozzle",
|
||||
"inherits": "fdm_process_creality_common",
|
||||
"from": "system",
|
||||
"setting_id": "caYmVSsFmtESzLNF",
|
||||
"setting_id": "5mfhrVJYlK4lWDUs",
|
||||
"instantiation": "true",
|
||||
"reduce_crossing_wall": "0",
|
||||
"max_travel_detour_distance": "0",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "Qidi",
|
||||
"version": "02.04.00.07",
|
||||
"version": "02.04.00.08",
|
||||
"force_update": "0",
|
||||
"description": "Qidi configurations",
|
||||
"machine_model_list": [
|
||||
|
||||
@@ -10,36 +10,6 @@
|
||||
"machine_pause_gcode": "M0",
|
||||
"support_chamber_temp_control": "1",
|
||||
"wipe_tower_type": "type1",
|
||||
"filament_dev_ams_drying_ams_limitations": [
|
||||
"1"
|
||||
],
|
||||
"filament_dev_ams_drying_temperature": [
|
||||
"40.0",
|
||||
"40.0",
|
||||
"40.0",
|
||||
"40.0"
|
||||
],
|
||||
"filament_dev_ams_drying_time": [
|
||||
"8.0",
|
||||
"8.0",
|
||||
"8.0",
|
||||
"8.0"
|
||||
],
|
||||
"filament_dev_drying_softening_temperature": [
|
||||
"40.0"
|
||||
],
|
||||
"filament_dev_ams_drying_heat_distortion_temperature": [
|
||||
"45.0"
|
||||
],
|
||||
"filament_dev_drying_cooling_temperature": [
|
||||
"35.0"
|
||||
],
|
||||
"filament_dev_chamber_drying_bed_temperature": [
|
||||
"90.0"
|
||||
],
|
||||
"filament_dev_chamber_drying_time": [
|
||||
"12.0"
|
||||
],
|
||||
"retraction_length": [
|
||||
"1"
|
||||
],
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
"name": "0.30mm Big @RatRig V-Core 4 0.8",
|
||||
"inherits": "fdm_process_ratrig_common",
|
||||
"from": "system",
|
||||
"setting_id": "7FOG8fkUbrLknvuz",
|
||||
"setting_id": "2tM04aSQ8NcTsmQo",
|
||||
"instantiation": "true",
|
||||
"layer_height": "0.3",
|
||||
"inital_layer_height": "0.35",
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
"name": "0.15mm Standard @iQ TiQ2 (0.25 Nozzle)",
|
||||
"inherits": "fdm_process_tiq_common",
|
||||
"from": "system",
|
||||
"setting_id": "PNxZXC0peOlGlKwG",
|
||||
"instantiation": "true",
|
||||
"compatible_printers": [
|
||||
"iQ TiQ2 0.25 Nozzle"
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
"name": "0.15mm Standard @iQ TiQ8 (0.25 Nozzle)",
|
||||
"inherits": "fdm_process_tiq_common",
|
||||
"from": "system",
|
||||
"setting_id": "K0Ybw0qUqEIL05PY",
|
||||
"instantiation": "true",
|
||||
"compatible_printers": [
|
||||
"iQ TiQ8 0.25 Nozzle"
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
"name": "0.30mm Standard @iQ TiQ2 (0.6 Nozzle)",
|
||||
"inherits": "fdm_process_tiq_common",
|
||||
"from": "system",
|
||||
"setting_id": "IGN3ZUR73J0veLrE",
|
||||
"instantiation": "true",
|
||||
"compatible_printers": [
|
||||
"iQ TiQ2 0.6 Nozzle"
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
"name": "0.30mm Standard @iQ TiQ8 (0.6 Nozzle)",
|
||||
"inherits": "fdm_process_tiq_common",
|
||||
"from": "system",
|
||||
"setting_id": "QEODQzrO9UZEgrtB",
|
||||
"instantiation": "true",
|
||||
"compatible_printers": [
|
||||
"iQ TiQ8 0.6 Nozzle"
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
"name": "0.40mm Standard @iQ TiQ2 (0.8 Nozzle)",
|
||||
"inherits": "fdm_process_tiq_common",
|
||||
"from": "system",
|
||||
"setting_id": "ZoiYkGXOTBh39HTB",
|
||||
"instantiation": "true",
|
||||
"compatible_printers": [
|
||||
"iQ TiQ2 0.8 Nozzle"
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
"name": "0.40mm Standard @iQ TiQ8 (0.8 Nozzle)",
|
||||
"inherits": "fdm_process_tiq_common",
|
||||
"from": "system",
|
||||
"setting_id": "C7TZWdCzQroB8pKL",
|
||||
"instantiation": "true",
|
||||
"compatible_printers": [
|
||||
"iQ TiQ8 0.8 Nozzle"
|
||||
|
||||
@@ -231,6 +231,8 @@ void main()
|
||||
s = max(s, DetectSilho(fragCoord.xy + vec2(i, 0)));
|
||||
s = max(s, DetectSilho(fragCoord.xy + vec2(0, i)));
|
||||
}
|
||||
if (s < 0.01)
|
||||
discard;
|
||||
gl_FragColor = vec4(mix(color.rgb, getBackfaceColor(color.rgb), s), color.a);
|
||||
}
|
||||
#ifdef ENABLE_ENVIRONMENT_MAP
|
||||
|
||||
@@ -30,6 +30,8 @@ uniform mat4 projection_matrix;
|
||||
uniform mat3 view_normal_matrix;
|
||||
uniform mat4 volume_world_matrix;
|
||||
uniform SlopeDetection slope;
|
||||
uniform bool is_outline;
|
||||
uniform vec2 screen_size;
|
||||
|
||||
// Clipping plane, x = min z, y = max z. Used by the FFF and SLA previews to clip with a top / bottom plane.
|
||||
uniform vec2 z_range;
|
||||
@@ -75,6 +77,15 @@ void main()
|
||||
world_normal_z = slope.actived ? (normalize(slope.volume_world_normal_matrix * v_normal)).z : 0.0;
|
||||
|
||||
gl_Position = projection_matrix * position;
|
||||
if (is_outline) {
|
||||
vec3 n = normalize((view_normal_matrix * v_normal).xyz);
|
||||
vec2 dir = normalize(n.xy);
|
||||
if (dot(dir, dir) > 0.0) {
|
||||
//set outline thickness
|
||||
float px = 3.0;
|
||||
gl_Position.xy += dir * (px * 2.0 / screen_size) * gl_Position.w;
|
||||
}
|
||||
}
|
||||
// Fill in the scalars for fragment shader clipping. Fragments with any of these components lower than zero are discarded.
|
||||
clipping_planes_dots = vec3(dot(world_pos, clipping_plane), world_pos.z - z_range.x, z_range.y - world_pos.z);
|
||||
color_clip_plane_dot = dot(world_pos, color_clip_plane);
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
#version 110
|
||||
|
||||
uniform sampler2D Texture;
|
||||
uniform sampler2D s_texture;
|
||||
|
||||
varying vec2 Frag_UV;
|
||||
varying vec4 Frag_Color;
|
||||
|
||||
void main()
|
||||
{
|
||||
gl_FragColor = Frag_Color * texture2D(Texture, Frag_UV.st);
|
||||
gl_FragColor = Frag_Color * texture2D(s_texture, Frag_UV.st);
|
||||
}
|
||||
@@ -273,6 +273,8 @@ void main()
|
||||
s = max(s, DetectSilho(fragCoord.xy + vec2(i, 0)));
|
||||
s = max(s, DetectSilho(fragCoord.xy + vec2(0, i)));
|
||||
}
|
||||
if (s < 0.01)
|
||||
discard;
|
||||
gl_FragColor = vec4(mix(shaded_color.rgb, getBackfaceColor(shaded_color.rgb), s), shaded_color.a);
|
||||
}
|
||||
#ifdef ENABLE_ENVIRONMENT_MAP
|
||||
|
||||
@@ -14,6 +14,8 @@ uniform mat4 projection_matrix;
|
||||
uniform mat3 view_normal_matrix;
|
||||
uniform mat4 volume_world_matrix;
|
||||
uniform SlopeDetection slope;
|
||||
uniform bool is_outline;
|
||||
uniform vec2 screen_size;
|
||||
|
||||
// Clipping plane, x = min z, y = max z. Used by the FFF and SLA previews to clip with a top / bottom plane.
|
||||
uniform vec2 z_range;
|
||||
@@ -48,6 +50,15 @@ void main()
|
||||
world_normal_z = slope.actived ? (normalize(slope.volume_world_normal_matrix * v_normal)).z : 0.0;
|
||||
|
||||
gl_Position = projection_matrix * position;
|
||||
if (is_outline) {
|
||||
vec3 n = normalize((view_normal_matrix * v_normal).xyz);
|
||||
vec2 dir = normalize(n.xy);
|
||||
if (dot(dir, dir) > 0.0) {
|
||||
//set outline thickness
|
||||
float px = 3.0;
|
||||
gl_Position.xy += dir * (px * 2.0 / screen_size) * gl_Position.w;
|
||||
}
|
||||
}
|
||||
// Fill in the scalars for fragment shader clipping. Fragments with any of these components lower than zero are discarded.
|
||||
clipping_planes_dots = vec3(dot(world_pos, clipping_plane), world_pos.z - z_range.x, z_range.y - world_pos.z);
|
||||
color_clip_plane_dot = dot(world_pos, color_clip_plane);
|
||||
|
||||
@@ -11,6 +11,7 @@ uniform sampler2D normal_texture;
|
||||
uniform vec2 inv_tex_size;
|
||||
uniform float z_near;
|
||||
uniform float z_far;
|
||||
uniform bool is_outline;
|
||||
|
||||
varying vec2 tex_coord;
|
||||
|
||||
@@ -22,6 +23,10 @@ float linearize_depth(float depth)
|
||||
|
||||
void main()
|
||||
{
|
||||
if (is_outline) {
|
||||
gl_FragColor = vec4(texture2D(color_texture, tex_coord).rgb, 1.0);
|
||||
return;
|
||||
}
|
||||
vec3 base = texture2D(color_texture, tex_coord).rgb;
|
||||
float depth_center = linearize_depth(texture2D(depth_texture, tex_coord).r);
|
||||
|
||||
|
||||
@@ -232,6 +232,8 @@ void main()
|
||||
s = max(s, DetectSilho(fragCoord.xy + vec2(i, 0)));
|
||||
s = max(s, DetectSilho(fragCoord.xy + vec2(0, i)));
|
||||
}
|
||||
if (s < 0.01)
|
||||
discard;
|
||||
out_color = vec4(mix(color.rgb, getBackfaceColor(color.rgb), s), color.a);
|
||||
}
|
||||
#ifdef ENABLE_ENVIRONMENT_MAP
|
||||
|
||||
@@ -30,6 +30,8 @@ uniform mat4 projection_matrix;
|
||||
uniform mat3 view_normal_matrix;
|
||||
uniform mat4 volume_world_matrix;
|
||||
uniform SlopeDetection slope;
|
||||
uniform bool is_outline;
|
||||
uniform vec2 screen_size;
|
||||
|
||||
// Clipping plane, x = min z, y = max z. Used by the FFF and SLA previews to clip with a top / bottom plane.
|
||||
uniform vec2 z_range;
|
||||
@@ -75,6 +77,15 @@ void main()
|
||||
world_normal_z = slope.actived ? (normalize(slope.volume_world_normal_matrix * v_normal)).z : 0.0;
|
||||
|
||||
gl_Position = projection_matrix * position;
|
||||
if (is_outline) {
|
||||
vec3 n = normalize((view_normal_matrix * v_normal).xyz);
|
||||
vec2 dir = normalize(n.xy);
|
||||
if (dot(dir, dir) > 0.0) {
|
||||
//set outline thickness
|
||||
float px = 3.0;
|
||||
gl_Position.xy += dir * (px * 2.0 / screen_size) * gl_Position.w;
|
||||
}
|
||||
}
|
||||
// Fill in the scalars for fragment shader clipping. Fragments with any of these components lower than zero are discarded.
|
||||
clipping_planes_dots = vec3(dot(world_pos, clipping_plane), world_pos.z - z_range.x, z_range.y - world_pos.z);
|
||||
color_clip_plane_dot = dot(world_pos, color_clip_plane);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#version 140
|
||||
|
||||
uniform sampler2D Texture;
|
||||
uniform sampler2D s_texture;
|
||||
|
||||
in vec2 Frag_UV;
|
||||
in vec4 Frag_Color;
|
||||
@@ -9,5 +9,5 @@ out vec4 out_color;
|
||||
|
||||
void main()
|
||||
{
|
||||
out_color = Frag_Color * texture(Texture, Frag_UV.st);
|
||||
out_color = Frag_Color * texture(s_texture, Frag_UV.st);
|
||||
}
|
||||
@@ -277,6 +277,8 @@ void main()
|
||||
s = max(s, DetectSilho(fragCoord.xy + vec2(i, 0)));
|
||||
s = max(s, DetectSilho(fragCoord.xy + vec2(0, i)));
|
||||
}
|
||||
if (s < 0.01)
|
||||
discard;
|
||||
out_color = vec4(mix(shaded_color.rgb, getBackfaceColor(shaded_color.rgb), s), shaded_color.a);
|
||||
}
|
||||
#ifdef ENABLE_ENVIRONMENT_MAP
|
||||
|
||||
@@ -14,6 +14,8 @@ uniform mat4 projection_matrix;
|
||||
uniform mat3 view_normal_matrix;
|
||||
uniform mat4 volume_world_matrix;
|
||||
uniform SlopeDetection slope;
|
||||
uniform bool is_outline;
|
||||
uniform vec2 screen_size;
|
||||
|
||||
// Clipping plane, x = min z, y = max z. Used by the FFF and SLA previews to clip with a top / bottom plane.
|
||||
uniform vec2 z_range;
|
||||
@@ -48,6 +50,15 @@ void main()
|
||||
world_normal_z = slope.actived ? (normalize(slope.volume_world_normal_matrix * v_normal)).z : 0.0;
|
||||
|
||||
gl_Position = projection_matrix * position;
|
||||
if (is_outline) {
|
||||
vec3 n = normalize((view_normal_matrix * v_normal).xyz);
|
||||
vec2 dir = normalize(n.xy);
|
||||
if (dot(dir, dir) > 0.0) {
|
||||
//set outline thickness
|
||||
float px = 3.0;
|
||||
gl_Position.xy += dir * (px * 2.0 / screen_size) * gl_Position.w;
|
||||
}
|
||||
}
|
||||
// Fill in the scalars for fragment shader clipping. Fragments with any of these components lower than zero are discarded.
|
||||
clipping_planes_dots = vec3(dot(world_pos, clipping_plane), world_pos.z - z_range.x, z_range.y - world_pos.z);
|
||||
color_clip_plane_dot = dot(world_pos, color_clip_plane);
|
||||
|
||||
@@ -10,6 +10,7 @@ uniform sampler2D depth_texture;
|
||||
uniform sampler2D normal_texture;
|
||||
uniform float z_near;
|
||||
uniform float z_far;
|
||||
uniform bool is_outline;
|
||||
|
||||
in vec2 tex_coord;
|
||||
out vec4 frag_color;
|
||||
@@ -22,6 +23,10 @@ float linearize_depth(float depth)
|
||||
|
||||
void main()
|
||||
{
|
||||
if (is_outline) {
|
||||
frag_color = vec4(texture(color_texture, tex_coord).rgb, 1.0);
|
||||
return;
|
||||
}
|
||||
ivec2 pixel = ivec2(gl_FragCoord.xy);
|
||||
float center_depth = linearize_depth(texelFetch(depth_texture, pixel, 0).r);
|
||||
|
||||
|
||||
@@ -1071,7 +1071,7 @@ function RunScriptPlugin(pluginId, capabilityName = "") {
|
||||
if (!plugin || !capability)
|
||||
return;
|
||||
|
||||
SendMessage("run_script_plugin", {
|
||||
SendMessage("run_script_plugin_capability", {
|
||||
plugin_key: pluginId,
|
||||
capability_name: String(capability.name || "")
|
||||
});
|
||||
|
||||