Skip to content

Commit 4aa0d1a

Browse files
authored
Added post-processing options to the 3D Preview (contributed by williamchange)
Post-processing for 3D Preview
2 parents 6c297bd + be9b5f8 commit 4aa0d1a

File tree

9 files changed

+1094
-106
lines changed

9 files changed

+1094
-106
lines changed

material_maker/globals.gd

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,31 @@ const DEFAULT_CONFIG : Dictionary = {
1818
ui_3d_preview_resolution = 2.0,
1919
ui_3d_preview_tesselation_detail = 256,
2020
ui_3d_preview_sun_shadow = false,
21+
ui_3d_preview_tonemap_enabled = false,
2122
ui_3d_preview_tonemap = 0,
2223
ui_3d_preview_tonemap_white = 1.0,
2324
ui_3d_preview_tonemap_exposure = 1.0,
25+
ui_3d_preview_glow_enabled = false,
26+
ui_3d_preview_glow_bloom = 0.0,
27+
ui_3d_preview_glow_size = 2.0,
28+
ui_3d_preview_glow_intensity = 0.8,
29+
ui_3d_preview_glow_strength = 1.0,
30+
ui_3d_preview_glow_blend_mode = 1,
31+
ui_3d_preview_glow_blend_mix_factor = 0.05,
32+
ui_3d_preview_glow_lower_threshold = 1.0,
33+
ui_3d_preview_glow_upper_threshold = 4.0,
34+
ui_3d_preview_adjustment_enabled = false,
35+
ui_3d_preview_adjustment_brightness = 1.0,
36+
ui_3d_preview_adjustment_contrast = 1.0,
37+
ui_3d_preview_adjustment_saturation = 1.0,
38+
ui_3d_preview_dof_enabled = false,
39+
ui_3d_preview_dof_far = false,
40+
ui_3d_preview_dof_near = false,
41+
ui_3d_preview_dof_blur_amount = 0.1,
42+
ui_3d_preview_dof_far_distance = 10.0,
43+
ui_3d_preview_dof_near_distance = 2.0,
44+
ui_3d_preview_dof_far_transition = 5.0,
45+
ui_3d_preview_dof_near_transition = 1.0,
2446
ui_console_open = false,
2547
ui_console_height = 100,
2648
bake_ray_count = 64,

material_maker/panels/preview_3d/environment_menu.gd

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,40 +2,21 @@ extends PanelContainer
22

33
const SETTING_PREVIEW_CLEAR_BG := "3D_preview_panel_clear_background"
44

5-
const TONEMAPS : Array = ["Linear", "Reinhard", "Filmic", "ACES", "AgX"]
6-
75
@onready var preview3D := owner
86

9-
@onready var ToneMap := %ToneMap
107
@onready var ClearBackground := %ClearBackground
118
@onready var EnvironmentList := %EnvironmentList
129

1310

1411
func _ready() -> void:
15-
ToneMap.clear()
16-
for i in TONEMAPS.size():
17-
ToneMap.add_item(TONEMAPS[i], i)
18-
1912
if mm_globals.has_config(SETTING_PREVIEW_CLEAR_BG):
2013
ClearBackground.button_pressed = mm_globals.get_config(SETTING_PREVIEW_CLEAR_BG)
2114

2215

23-
2416
func _open() -> void:
2517
update_environment_selector()
2618

27-
var tonemap_mode: int = mm_globals.get_config("ui_3d_preview_tonemap")
28-
ToneMap.select(tonemap_mode)
29-
30-
if mm_globals.has_config("ui_3d_preview_tonemap_exposure"):
31-
$VBoxContainer/VBox/Exposure.set_value(mm_globals.get_config("ui_3d_preview_tonemap_exposure"))
32-
33-
if mm_globals.has_config("ui_3d_preview_tonemap_white"):
34-
$VBoxContainer/VBox/White.set_value(mm_globals.get_config("ui_3d_preview_tonemap_white"))
35-
36-
$VBoxContainer/VBox/White.visible = tonemap_mode > 0 && tonemap_mode <= 3
37-
$VBoxContainer/VBox/WhiteLabel.visible = tonemap_mode > 0 && tonemap_mode <= 3
38-
19+
3920
func update_environment_selector() -> void:
4021
var environment_manager = get_node("/root/MainWindow/EnvironmentManager")
4122
if not environment_manager:
@@ -59,17 +40,10 @@ func _on_environment_editor_button_pressed() -> void:
5940
env_editor.tree_exited.connect(update_environment_selector)
6041

6142

62-
6343
func _on_environment_list_item_selected(index: int) -> void:
6444
preview3D.set_environment(index)
6545

6646

67-
68-
func _on_tone_map_item_selected(index: int) -> void:
69-
preview3D.set_tonemap(index)
70-
$VBoxContainer/VBox/White.visible = index > 0 && index <= 3
71-
$VBoxContainer/VBox/WhiteLabel.visible = index > 0 && index <= 3
72-
7347
func _on_clear_background_toggled(toggled_on: bool) -> void:
7448
preview3D.clear_background = toggled_on
7549
mm_globals.set_config(SETTING_PREVIEW_CLEAR_BG, toggled_on)

0 commit comments

Comments
 (0)