DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply render settings only when their checkbox is enabled (fixes #3)

Browse Source
This commit is contained in:
johni0702
2016-09-18 12:53:29 +02:00
parent 82246a5f48
commit ad62060368
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/replaymod/render/gui/GuiRenderSettings.java
View File

@@ -186,7 +186,7 @@ public class GuiRenderSettings extends GuiScreen implements Closeable {
// Closing this GUI ensures that settings are saved // Closing this GUI ensures that settings are saved
getMinecraft().displayGuiScreen(null); getMinecraft().displayGuiScreen(null);
try { try {
VideoRenderer videoRenderer = new VideoRenderer(save(true), replayHandler, timeline); VideoRenderer videoRenderer = new VideoRenderer(save(false), replayHandler, timeline);
videoRenderer.renderVideo(); videoRenderer.renderVideo();
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
@@ -378,7 +378,7 @@ public class GuiRenderSettings extends GuiScreen implements Closeable {
updateInputs(); updateInputs();
} }
public RenderSettings save(boolean saveOutputFile) { public RenderSettings save(boolean serialize) {
return new RenderSettings( return new RenderSettings(
renderMethodDropdown.getSelectedValue(), renderMethodDropdown.getSelectedValue(),
encodingPresetDropdown.getSelectedValue(), encodingPresetDropdown.getSelectedValue(),
@@ -386,13 +386,13 @@ public class GuiRenderSettings extends GuiScreen implements Closeable {
videoHeight.getInteger(), videoHeight.getInteger(),
frameRateSlider.getValue() + 10, frameRateSlider.getValue() + 10,
bitRateField.getInteger() << (10 * bitRateUnit.getSelected()), bitRateField.getInteger() << (10 * bitRateUnit.getSelected()),
saveOutputFile ? outputFile : null, serialize ? null : outputFile,
nametagCheckbox.isChecked(), nametagCheckbox.isChecked(),
stabilizeYaw.isChecked(), stabilizeYaw.isChecked() && (serialize || stabilizeYaw.isEnabled()),
stabilizePitch.isChecked(), stabilizePitch.isChecked() && (serialize || stabilizePitch.isEnabled()),
stabilizeRoll.isChecked(), stabilizeRoll.isChecked() && (serialize || stabilizeRoll.isEnabled()),
chromaKeyingCheckbox.isChecked() ? chromaKeyingColor.getColor() : null, chromaKeyingCheckbox.isChecked() ? chromaKeyingColor.getColor() : null,
inject360Metadata.isChecked(), inject360Metadata.isChecked() && (serialize || inject360Metadata.isEnabled()),
exportCommand.getText(), exportCommand.getText(),
exportArguments.getText(), exportArguments.getText(),
net.minecraft.client.gui.GuiScreen.isCtrlKeyDown() net.minecraft.client.gui.GuiScreen.isCtrlKeyDown()
@@ -412,7 +412,7 @@ public class GuiRenderSettings extends GuiScreen implements Closeable {
@Override @Override
public void close() { public void close() {
RenderSettings settings = save(false); RenderSettings settings = save(true);
String json = new Gson().toJson(settings); String json = new Gson().toJson(settings);
Configuration config = ReplayModRender.instance.getConfiguration(); Configuration config = ReplayModRender.instance.getConfiguration();
getConfigProperty(config).set(json); getConfigProperty(config).set(json);