From fc335b8df22903ea26e457d08ecbf064a3e4ee56 Mon Sep 17 00:00:00 2001 From: austin Date: Sat, 6 Nov 2021 00:50:33 -0400 Subject: [PATCH] Menu sound suite, continued UI work --- assets/Audio/MenuBackspace.ogg | Bin 0 -> 5199 bytes assets/Audio/MenuBadOption.ogg | Bin 0 -> 5742 bytes assets/Audio/MenuChangeOption.ogg | Bin 0 -> 4991 bytes assets/Audio/MenuType.ogg | Bin 0 -> 4922 bytes assets/Textures/ow1.png | Bin 0 -> 718 bytes src/main/java/electrosphere/main/Globals.java | 18 ++++++++++++++- src/main/java/electrosphere/main/Main.java | 1 + src/main/java/electrosphere/menu/Menu.java | 4 ++++ .../electrosphere/menu/MenuTransition.java | 6 +++++ .../renderer/RenderingEngine.java | 21 ++++++++++++++++++ 10 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 assets/Audio/MenuBackspace.ogg create mode 100644 assets/Audio/MenuBadOption.ogg create mode 100644 assets/Audio/MenuChangeOption.ogg create mode 100644 assets/Audio/MenuType.ogg create mode 100644 assets/Textures/ow1.png diff --git a/assets/Audio/MenuBackspace.ogg b/assets/Audio/MenuBackspace.ogg new file mode 100644 index 0000000000000000000000000000000000000000..e6fc2e74eb4ebc713502917588c8d33f8295e413 GIT binary patch literal 5199 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 literal 0 HcmV?d00001 diff --git a/assets/Audio/MenuChangeOption.ogg b/assets/Audio/MenuChangeOption.ogg new file mode 100644 index 0000000000000000000000000000000000000000..4ab6de885f2391133985b92c896bcb5eeff61d88 GIT binary patch literal 4991 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 Zccw||0*q*PHm19a)b`RIy3x$s{NJyZ$2$N3 literal 0 HcmV?d00001 diff --git a/assets/Textures/ow1.png b/assets/Textures/ow1.png new file mode 100644 index 0000000000000000000000000000000000000000..58043da6685e45366a6ae474937fda0db7b3194e GIT binary patch literal 718 zcmeAS@N?(olHy`uVBq!ia0vp^DImc}*5j~)%+YxJEsI21tvf7IR``jzxLSFMb|);{A{td{u=5M|EE5$?y}qXGg9rPM zu4?YyypC^OlfnMx{cdD1{QuwHRUA6tbg?R3_PiH2~^E@lu-qD)G?k#)9YnPLav&=Nnsh{>n zwx^zpo-@^}ck8>8@e*fNYiF*zEaNKU?V-TQD3qnKm`PYLDl~{^NrwHiNAes0dKP&; z(Q2NU%owU6kZb=#{?EH>8b1D(o(Cl^d`*g!Pj*NU&$y=h`uB}Zv(y{jOYR7|{V$8T zqi#}Me)dDg6@Ug&%Ru{b^Ims zgoW#-O>_%)p?h48n{ROYO^mg6t)pzOL*~x!G6*)irGjeglOhOI#yLobz*YQ}ap~oQqNu zOHxx5$}>wc6x=<11Hv2m#DR*Idb&72NtNkJMS^P5n^%scIL 0){ currentTextBox.setText(currentText.substring(0, currentText.length() - 1)); + AudioSource startupSound = AudioUtils.playAudioAtLocation("/Audio/MenuBackspace.ogg", new Vector3f(0,0,0)); } } backspace = true; @@ -316,6 +321,7 @@ public class MenuTransition { String currentText = currentTextBox.getText(); if(currentText.length() < currentTextBox.getCols()){ currentTextBox.setText(currentText + toWrite); + AudioSource startupSound = AudioUtils.playAudioAtLocation("/Audio/MenuType.ogg", new Vector3f(0,0,0)); } } } diff --git a/src/main/java/electrosphere/renderer/RenderingEngine.java b/src/main/java/electrosphere/renderer/RenderingEngine.java index 29595c19..6c46112f 100644 --- a/src/main/java/electrosphere/renderer/RenderingEngine.java +++ b/src/main/java/electrosphere/renderer/RenderingEngine.java @@ -305,6 +305,13 @@ public class RenderingEngine { renderBlackBackground(); } + /* + Render white background + */ + if(Globals.RENDER_FLAG_RENDER_WHITE_BACKGROUND){ + renderWhiteBackground(); + } + /* Render any ui elements */ @@ -668,6 +675,20 @@ public class RenderingEngine { glBindVertexArray(0); } + static void renderWhiteBackground(){ + //render full screen quad + glUseProgram(screenTextureShaders.shaderProgram); + glDisable(GL_DEPTH_TEST); + glBindVertexArray(screenTextureVAO); + Texture blackTexture = Globals.assetManager.fetchTexture(Globals.offWhiteTexture); + if(blackTexture != null){ + blackTexture.bind(); + } +// glBindTexture(GL_TEXTURE_2D, screenFramebuffer.getTexture()); + glDrawArrays(GL_TRIANGLES, 0, 6); + glBindVertexArray(0); + } + public void setActiveShader(ShaderProgram program){ glUseProgram(program.shaderProgram);