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

Prevent rendering with invalid resolution

Browse Source
This commit is contained in:
johni0702
2015-07-15 15:42:43 +02:00
parent 13314e27da
commit 7ee5f86b4e
3 changed files with 47 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/main/java/eu/crushedpixel/replaymod/gui/GuiRenderSettings.java
View File

@@ -38,7 +38,7 @@ public class GuiRenderSettings extends GuiScreen {
private static final int LEFT_BORDER = 10;
private GuiButton renderButton, cancelButton, advancedButton;
private GuiAdvancedButton renderButton, cancelButton, advancedButton;
private GuiDropdown<RendererSettings> rendererDropdown;
private int virtualY, virtualHeight;
@@ -79,9 +79,9 @@ public class GuiRenderSettings extends GuiScreen {
i++;
}
renderButton = new GuiButton(GuiConstants.RENDER_SETTINGS_RENDER_BUTTON, 0, 0, I18n.format("replaymod.gui.render"));
cancelButton = new GuiButton(GuiConstants.RENDER_SETTINGS_CANCEL_BUTTON, 0, 0, I18n.format("replaymod.gui.cancel"));
advancedButton = new GuiButton(GuiConstants.RENDER_SETTINGS_ADVANCED_BUTTON, 0, 0, I18n.format("replaymod.gui.rendersettings.advanced"));
renderButton = new GuiAdvancedButton(GuiConstants.RENDER_SETTINGS_RENDER_BUTTON, 0, 0, I18n.format("replaymod.gui.render"));
cancelButton = new GuiAdvancedButton(GuiConstants.RENDER_SETTINGS_CANCEL_BUTTON, 0, 0, I18n.format("replaymod.gui.cancel"));
advancedButton = new GuiAdvancedButton(GuiConstants.RENDER_SETTINGS_ADVANCED_BUTTON, 0, 0, I18n.format("replaymod.gui.rendersettings.advanced"));
customResolution = new GuiCheckBox(GuiConstants.RENDER_SETTINGS_RESOLUTION_CHECKBOX, 0, 0, I18n.format("replaymod.gui.rendersettings.customresolution"), false);
@@ -100,6 +100,7 @@ public class GuiRenderSettings extends GuiScreen {
}
}
yRes.setCursorPositionEnd();
validateInputs();
}
};
yRes = new GuiNumberInput(fontRendererObj, 0, 0, 50, 1, 10000, mc.displayHeight, false) {
@@ -117,6 +118,7 @@ public class GuiRenderSettings extends GuiScreen {
}
}
xRes.setCursorPositionEnd();
validateInputs();
}
};
@@ -301,6 +303,8 @@ public class GuiRenderSettings extends GuiScreen {
i++;
}
}
renderButton.drawOverlay(mc, mouseX, mouseY);
}
@Override
@@ -537,6 +541,8 @@ public class GuiRenderSettings extends GuiScreen {
yRes.setSelectionPos(yRes.getCursorPosition());
yRes.moveCursorBy(0); //This causes the Aspect Ratio to be recalculated based on the Y Resolution
validateInputs();
}
}
@@ -545,4 +551,38 @@ public class GuiRenderSettings extends GuiScreen {
Keyboard.enableRepeatEvents(false);
super.onGuiClosed();
}
private void validateInputs() {
boolean valid = true;
switch (rendererDropdown.getElement(rendererDropdown.getSelectionIndex())) {
case CUBIC:
if (getWidthSetting() * 3 / 4 != getHeightSetting()
|| getWidthSetting() * 3 % 4 != 0) {
valid = false;
renderButton.hoverText = I18n.format("replaymod.gui.rendersettings.customresolution.warning.cubic");
}
break;
case EQUIRECTANGULAR:
if (getWidthSetting() / 2 != getHeightSetting()
|| getWidthSetting() % 2 != 0) {
valid = false;
renderButton.hoverText = I18n.format("replaymod.gui.rendersettings.customresolution.warning.equirectangular");
}
break;
}
if (valid) {
renderButton.enabled = true;
renderButton.hoverText = "";
xRes.setTextColor(0xffffffff);
yRes.setTextColor(0xffffffff);
xRes.setDisabledTextColour(0xff707070);
yRes.setDisabledTextColour(0xff707070);
} else {
renderButton.enabled = false;
xRes.setTextColor(0xffff0000);
yRes.setTextColor(0xffff0000);
xRes.setDisabledTextColour(0xffff0000);
yRes.setDisabledTextColour(0xffff0000);
}
}
}

2
src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiAdvancedButton.java
View File

@@ -8,7 +8,7 @@ import java.awt.*;
public class GuiAdvancedButton extends GuiButton implements GuiElement {
private final Runnable action;
private final String hoverText;
public String hoverText;
public GuiAdvancedButton(int id, int x, int y, String buttonText) {
this(id, x, y, buttonText, null, null);

2
src/main/resources/assets/replaymod/lang/en_US.lang
View File

@@ -307,6 +307,8 @@ replaymod.gui.rendersettings.renderer.cubic.description=Renders the video with a
replaymod.gui.rendersettings.renderer.equirectangular.description=Renders the video with a 360 degree panoramic view, using Equirectangular Projection. This is useable by YouTube's new 360 degree video function, and several video players (and the Oculus Rift), for example VR Player.
replaymod.gui.rendersettings.customresolution=Custom Video Resolution
replaymod.gui.rendersettings.customresolution.warning.cubic=Cubic Rendering requires an aspect ratio of 4:3
replaymod.gui.rendersettings.customresolution.warning.equirectangular=Equirectangular Rendering requires an aspect ratio of 2:1
replaymod.gui.rendersettings.resolution=Video Resolution
replaymod.gui.rendersettings.interpolation=Path Interpolation
replaymod.gui.rendersettings.forcechunks=Force Render Chunks