Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add UE4 filmic tone mapping and make Hable tone mapping configurable. #1519

Merged
merged 9 commits into from
Oct 28, 2023
Merged

Add UE4 filmic tone mapping and make Hable tone mapping configurable. #1519

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ef6fb93
Add the filmic tone mapper from Unreal Engine 4.
leMaik Dec 28, 2022
1acc7ce
Fix hable tone mapping.
leMaik Dec 28, 2022
34338ac
Make PostProcessingFilter extend the Registerable interface.
leMaik Dec 28, 2022
bd1d224
Prepare hable tone mapping for configuration.
leMaik Dec 28, 2022
569838b
Add an interface for configurable objects.
leMaik Dec 28, 2022
0a3d0ea
Make the hable and ue4 tone mapping configurable.
leMaik Dec 28, 2022
7eb4ab4
Start implementing a UI for hable and ue4 post processor configuration.
leMaik Jul 22, 2023
2b5ef40
Implement UI logic to customize hable and ue4 post processors.
leMaik Oct 28, 2023
ac21e6a
Replace casts with .floatValue()
leMaik Oct 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
118 changes: 110 additions & 8 deletions chunky/src/java/se/llbit/chunky/ui/render/tabs/PostprocessingTab.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,21 @@
*/
package se.llbit.chunky.ui.render.tabs;

import javafx.event.EventHandler;
import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader;
import javafx.fxml.Initializable;
import javafx.scene.Node;
import javafx.scene.control.ChoiceBox;
import javafx.scene.control.ScrollPane;
import javafx.scene.control.Separator;
import javafx.scene.control.Tooltip;
import javafx.scene.control.*;
import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyEvent;
import javafx.scene.layout.VBox;
import javafx.util.StringConverter;
import se.llbit.chunky.renderer.RenderMode;
import se.llbit.chunky.renderer.postprocessing.HableToneMappingFilter;
import se.llbit.chunky.renderer.postprocessing.PostProcessingFilter;
import se.llbit.chunky.renderer.postprocessing.PostProcessingFilters;
import se.llbit.chunky.renderer.postprocessing.UE4ToneMappingFilter;
import se.llbit.chunky.renderer.scene.Scene;
import se.llbit.chunky.resources.BitmapImage;
import se.llbit.chunky.ui.DoubleAdjuster;
Expand All @@ -48,20 +52,26 @@ public class PostprocessingTab extends ScrollPane implements RenderControlsTab,
@FXML private DoubleAdjuster exposure;
@FXML private ChoiceBox<PostProcessingFilter> postprocessingFilter;

@FXML private VBox hableCurveSettings;
@FXML private DoubleTextField hableShoulderStrength;
@FXML private DoubleTextField hableLinearStrength;
@FXML private DoubleTextField hableLinearAngle;
@FXML private DoubleTextField hableToeStrength;
@FXML private DoubleTextField hableToeNumerator;
@FXML private DoubleTextField hableToeDenominator;
@FXML private DoubleTextField hableLinearWhitePointValue;
@FXML private Button gdcPreset;
@FXML private Button fwPreset;

@FXML private VBox ue4CurveSettings;
@FXML private DoubleTextField ue4Saturation;
@FXML private DoubleTextField ue4Slope;
@FXML private DoubleTextField ue4Toe;
@FXML private DoubleTextField ue4Shoulder;
@FXML private DoubleTextField ue4BlackClip;
@FXML private DoubleTextField ue4WhiteClip;
@FXML private Button acesPreset;
@FXML private Button ue4LegacyPreset;

public PostprocessingTab() throws IOException {
FXMLLoader loader = new FXMLLoader(getClass().getResource("PostprocessingTab.fxml"));
Expand All @@ -77,7 +87,28 @@ public PostprocessingTab() throws IOException {

@Override public void update(Scene scene) {
postprocessingFilter.getSelectionModel().select(scene.getPostProcessingFilter());
hableCurveSettings.setVisible(scene.getPostProcessingFilter() instanceof HableToneMappingFilter);
ue4CurveSettings.setVisible(scene.getPostProcessingFilter() instanceof UE4ToneMappingFilter);
exposure.set(scene.getExposure());

if (scene.getPostProcessingFilter() instanceof HableToneMappingFilter) {
HableToneMappingFilter filter = (HableToneMappingFilter) scene.getPostProcessingFilter();
hableShoulderStrength.valueProperty().set(filter.getShoulderStrength());
hableLinearStrength.valueProperty().set(filter.getLinearStrength());
hableLinearAngle.valueProperty().set(filter.getLinearAngle());
hableToeStrength.valueProperty().set(filter.getToeStrength());
hableToeNumerator.valueProperty().set(filter.getToeNumerator());
hableToeDenominator.valueProperty().set(filter.getToeDenominator());
hableLinearWhitePointValue.valueProperty().set(filter.getLinearWhitePointValue());
} else if (scene.getPostProcessingFilter() instanceof UE4ToneMappingFilter) {
UE4ToneMappingFilter filter = (UE4ToneMappingFilter) scene.getPostProcessingFilter();
ue4Saturation.valueProperty().set(filter.getSaturation());
ue4Slope.valueProperty().set(filter.getSlope());
ue4Toe.valueProperty().set(filter.getToe());
ue4Shoulder.valueProperty().set(filter.getShoulder());
ue4BlackClip.valueProperty().set(filter.getBlackClip());
ue4WhiteClip.valueProperty().set(filter.getWhiteClip());
}
}

@Override public String getTabTitle() {
Expand All @@ -101,8 +132,7 @@ public PostprocessingTab() throws IOException {
postprocessingFilter.getSelectionModel().selectedItemProperty().addListener(
(observable, oldValue, newValue) -> {
scene.setPostprocess(newValue);
scene.postProcessFrame(new TaskTracker(ProgressListener.NONE));
controller.getCanvas().forceRepaint();
applyChangedSettings(false);
});
postprocessingFilter.setConverter(new StringConverter<PostProcessingFilter>() {
@Override
Expand All @@ -122,9 +152,81 @@ public PostProcessingFilter fromString(String string) {
exposure.clampMin();
exposure.onValueChange(value -> {
scene.setExposure(value);
scene.postProcessFrame(new TaskTracker(ProgressListener.NONE));
controller.getCanvas().forceRepaint();
applyChangedSettings(false);
});
hableCurveSettings.managedProperty().bind(hableCurveSettings.visibleProperty());
gdcPreset.setOnAction((e) -> {
if (scene.postProcessingFilter instanceof HableToneMappingFilter) {
((HableToneMappingFilter) scene.postProcessingFilter).applyPreset(HableToneMappingFilter.Preset.GDC);
applyChangedSettings(true);
}
});
fwPreset.setOnAction((e) -> {
if (scene.postProcessingFilter instanceof HableToneMappingFilter) {
((HableToneMappingFilter) scene.postProcessingFilter).applyPreset(HableToneMappingFilter.Preset.FILMIC_WORLDS);
applyChangedSettings(true);
}
});
ue4CurveSettings.managedProperty().bind(ue4CurveSettings.visibleProperty());
acesPreset.setOnAction((e) -> {
if (scene.postProcessingFilter instanceof UE4ToneMappingFilter) {
((UE4ToneMappingFilter) scene.postProcessingFilter).applyPreset(UE4ToneMappingFilter.Preset.ACES);
applyChangedSettings(true);
}
});
ue4LegacyPreset.setOnAction((e) -> {
if (scene.postProcessingFilter instanceof UE4ToneMappingFilter) {
((UE4ToneMappingFilter) scene.postProcessingFilter).applyPreset(UE4ToneMappingFilter.Preset.LEGACY_UE4);
applyChangedSettings(true);
}
});

EventHandler<KeyEvent> postprocessingSettingsHandler = e -> {
if (e.getCode() == KeyCode.ENTER) {
if (scene.postProcessingFilter instanceof HableToneMappingFilter) {
HableToneMappingFilter filter = (HableToneMappingFilter) scene.postProcessingFilter;
filter.setShoulderStrength((float) hableShoulderStrength.valueProperty().get());
leMaik marked this conversation as resolved.
Show resolved Hide resolved
filter.setLinearStrength((float) hableLinearStrength.valueProperty().get());
filter.setLinearAngle((float) hableLinearAngle.valueProperty().get());
filter.setToeStrength((float) hableToeStrength.valueProperty().get());
filter.setToeNumerator((float) hableToeNumerator.valueProperty().get());
filter.setToeDenominator((float) hableToeDenominator.valueProperty().get());
filter.setLinearWhitePointValue((float) hableLinearWhitePointValue.valueProperty().get());
} else if (scene.postProcessingFilter instanceof UE4ToneMappingFilter) {
UE4ToneMappingFilter filter = (UE4ToneMappingFilter) scene.postProcessingFilter;
filter.setSaturation((float) ue4Saturation.valueProperty().get());
filter.setSlope((float) ue4Slope.valueProperty().get());
filter.setToe((float) ue4Toe.valueProperty().get());
filter.setShoulder((float) ue4Shoulder.valueProperty().get());
filter.setBlackClip((float) ue4BlackClip.valueProperty().get());
filter.setWhiteClip((float) ue4WhiteClip.valueProperty().get());
}
applyChangedSettings(true);
}
};
hableShoulderStrength.addEventFilter(KeyEvent.KEY_PRESSED, postprocessingSettingsHandler);
hableLinearStrength.addEventFilter(KeyEvent.KEY_PRESSED, postprocessingSettingsHandler);
hableLinearAngle.addEventFilter(KeyEvent.KEY_PRESSED, postprocessingSettingsHandler);
hableToeStrength.addEventFilter(KeyEvent.KEY_PRESSED, postprocessingSettingsHandler);
hableToeNumerator.addEventFilter(KeyEvent.KEY_PRESSED, postprocessingSettingsHandler);
hableToeDenominator.addEventFilter(KeyEvent.KEY_PRESSED, postprocessingSettingsHandler);
hableLinearWhitePointValue.addEventFilter(KeyEvent.KEY_PRESSED, postprocessingSettingsHandler);
ue4Saturation.addEventFilter(KeyEvent.KEY_PRESSED, postprocessingSettingsHandler);
ue4Slope.addEventFilter(KeyEvent.KEY_PRESSED, postprocessingSettingsHandler);
ue4Toe.addEventFilter(KeyEvent.KEY_PRESSED, postprocessingSettingsHandler);
ue4Shoulder.addEventFilter(KeyEvent.KEY_PRESSED, postprocessingSettingsHandler);
ue4BlackClip.addEventFilter(KeyEvent.KEY_PRESSED, postprocessingSettingsHandler);
ue4WhiteClip.addEventFilter(KeyEvent.KEY_PRESSED, postprocessingSettingsHandler);
}

private void applyChangedSettings(boolean refreshScene) {
if (refreshScene && scene.getMode() == RenderMode.PREVIEW) {
// Don't interrupt the render if we are currently rendering.
scene.refresh();
}
update(scene);
scene.postProcessFrame(new TaskTracker(ProgressListener.NONE));
controller.getCanvas().forceRepaint();
}

/**
Expand Down
13 changes: 6 additions & 7 deletions chunky/src/res/se/llbit/chunky/ui/render/tabs/PostprocessingTab.fxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
<Label text="Postprocessing filter:" />
<ChoiceBox fx:id="postprocessingFilter" prefWidth="150.0" />
</HBox>
<Text strokeType="OUTSIDE" strokeWidth="0.0" text="Hable tone mapping curve parameters:" wrappingWidth="275" />
<VBox prefWidth="250.0" spacing="5.0">
<VBox prefWidth="250.0" spacing="5.0" fx:id="hableCurveSettings">
<TextFieldLabelWrapper labelText="Shoulder strength:">
<DoubleTextField fx:id="hableShoulderStrength" />
</TextFieldLabelWrapper>
Expand All @@ -39,15 +38,15 @@
</TextFieldLabelWrapper>
<HBox alignment="TOP_RIGHT" prefWidth="200.0" spacing="5.0">
<children>
<Button mnemonicParsing="false" text="GDC preset" />
<Button mnemonicParsing="false" text="FW preset" />
<Button mnemonicParsing="false" text="FW preset" fx:id="fwPreset" />
<Button mnemonicParsing="false" text="GDC preset" fx:id="gdcPreset" />
</children>
</HBox>
<VBox.margin>
<Insets left="20.0" />
</VBox.margin>
</VBox>
<VBox prefWidth="250.0" spacing="5.0">
<VBox prefWidth="250.0" spacing="5.0" fx:id="ue4CurveSettings" >
<TextFieldLabelWrapper labelText="Saturation:">
<DoubleTextField fx:id="ue4Saturation" />
</TextFieldLabelWrapper>
Expand All @@ -68,8 +67,8 @@
</TextFieldLabelWrapper>
<HBox alignment="TOP_RIGHT" prefWidth="200.0" spacing="5.0">
<children>
<Button mnemonicParsing="false" text="ACES preset" />
<Button mnemonicParsing="false" text="UE4 Legacy preset" />
<Button mnemonicParsing="false" text="ACES preset" fx:id="acesPreset" />
<Button mnemonicParsing="false" text="UE4 Legacy preset" fx:id="ue4LegacyPreset" />
</children>
</HBox>
<VBox.margin>
Expand Down
Loading