fixed FXAA crash on other browsers, added exit chat button, fixed arrow key mappings

This commit is contained in:
LAX1DUDE 2022-01-13 18:22:37 -08:00
parent 6d1bfd9e3e
commit 403987807e
9 changed files with 31120 additions and 31049 deletions

File diff suppressed because it is too large Load Diff

View File

@ -26,8 +26,10 @@ public class EffectPipelineFXAA {
private static BufferArrayGL renderQuadArray = null; private static BufferArrayGL renderQuadArray = null;
private static BufferGL renderQuadBuffer; private static BufferGL renderQuadBuffer;
private static int width = -1; public static int displayWidth = -1;
private static int height = -1; public static int displayHeight = -1;
public static int width = -1;
public static int height = -1;
private static int[] originalViewport = new int[4]; private static int[] originalViewport = new int[4];
@ -142,6 +144,9 @@ public class EffectPipelineFXAA {
} }
public static void beginPipelineRender() { public static void beginPipelineRender() {
if(width == -1 || displayWidth == -1 || height == -1 || displayHeight == -1) {
return;
}
int mode = Minecraft.getMinecraft().gameSettings.antialiasMode; int mode = Minecraft.getMinecraft().gameSettings.antialiasMode;
if(mode == 0) newState = 0; if(mode == 0) newState = 0;
if(mode == 1) newState = Minecraft.getMinecraft().gameSettings.fancyGraphics ? 1 : 0; if(mode == 1) newState = Minecraft.getMinecraft().gameSettings.fancyGraphics ? 1 : 0;
@ -153,14 +158,12 @@ public class EffectPipelineFXAA {
if(state == 0) { if(state == 0) {
destroy(); destroy();
} }
width = -1;
height = -1;
} }
if(state == 0) return; if(state == 0) return;
_wglGetParameter(_wGL_VIEWPORT, 4, originalViewport); //_wglGetParameter(_wGL_VIEWPORT, 4, originalViewport);
if (width != originalViewport[2] || height != originalViewport[3]) { if (displayWidth != width || displayHeight != height) {
width = originalViewport[2]; width = displayWidth;
height = originalViewport[3]; height = displayHeight;
if(state == 1) { if(state == 1) {
if(isUsingFXAA == false || fxaaProgram == null) { if(isUsingFXAA == false || fxaaProgram == null) {
initFXAA(); initFXAA();
@ -190,6 +193,9 @@ public class EffectPipelineFXAA {
} }
public static void endPipelineRender() { public static void endPipelineRender() {
if(width == -1 || displayWidth == -1 || height == -1 || displayHeight == -1) {
return;
}
if(state == 0) return; if(state == 0) return;
_wglBindFramebuffer(_wGL_FRAMEBUFFER, null); _wglBindFramebuffer(_wGL_FRAMEBUFFER, null);
_wglClear(_wGL_COLOR_BUFFER_BIT | _wGL_DEPTH_BUFFER_BIT); _wglClear(_wGL_COLOR_BUFFER_BIT | _wGL_DEPTH_BUFFER_BIT);

View File

@ -919,6 +919,8 @@ public class EntityRenderer {
} }
EaglerAdapter.glViewport(0, 0, this.mc.displayWidth, this.mc.displayHeight); EaglerAdapter.glViewport(0, 0, this.mc.displayWidth, this.mc.displayHeight);
EffectPipelineFXAA.displayWidth = this.mc.displayWidth;
EffectPipelineFXAA.displayHeight = this.mc.displayHeight;
EffectPipelineFXAA.beginPipelineRender(); EffectPipelineFXAA.beginPipelineRender();
this.mc.mcProfiler.endStartSection("clear"); this.mc.mcProfiler.endStartSection("clear");
EaglerAdapter.glClear(EaglerAdapter.GL_COLOR_BUFFER_BIT | EaglerAdapter.GL_DEPTH_BUFFER_BIT); EaglerAdapter.glClear(EaglerAdapter.GL_COLOR_BUFFER_BIT | EaglerAdapter.GL_DEPTH_BUFFER_BIT);

View File

@ -43,6 +43,7 @@ public class GuiChat extends GuiScreen {
*/ */
public void initGui() { public void initGui() {
EaglerAdapter.enableRepeatEvents(true); EaglerAdapter.enableRepeatEvents(true);
this.buttonList.add(new GuiButton(69, this.width - 100, 3, 97, 20, "Exit Chat"));
this.sentHistoryCursor = this.mc.ingameGUI.getChatGUI().getSentMessages().size(); this.sentHistoryCursor = this.mc.ingameGUI.getChatGUI().getSentMessages().size();
this.inputField = new GuiTextField(this.fontRenderer, 4, this.height - 12, this.width - 4, 12); this.inputField = new GuiTextField(this.fontRenderer, 4, this.height - 12, this.width - 4, 12);
this.inputField.setMaxStringLength(100); this.inputField.setMaxStringLength(100);
@ -52,6 +53,12 @@ public class GuiChat extends GuiScreen {
this.inputField.setCanLoseFocus(false); this.inputField.setCanLoseFocus(false);
} }
protected void actionPerformed(GuiButton par1GuiButton) {
if (par1GuiButton.id == 69) {
this.mc.displayGuiScreen(null);
}
}
/** /**
* Called when the screen is unloaded. Used to disable keyboard repeat events * Called when the screen is unloaded. Used to disable keyboard repeat events
*/ */

View File

@ -20,6 +20,10 @@ public class MouseHelper {
* Grabs the mouse cursor it doesn't move and isn't seen. * Grabs the mouse cursor it doesn't move and isn't seen.
*/ */
public void grabMouseCursor() { public void grabMouseCursor() {
int var1 = Minecraft.getMinecraft().displayWidth;
int var2 = Minecraft.getMinecraft().displayHeight;
EaglerAdapter.mouseSetCursorPosition(var1 / 2, var2 / 2);
EaglerAdapter.mouseSetGrabbed(true); EaglerAdapter.mouseSetGrabbed(true);
this.deltaX = 0; this.deltaX = 0;
this.deltaY = 0; this.deltaY = 0;

File diff suppressed because one or more lines are too long

Binary file not shown.

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long