Merge remote-tracking branch 'origin/master'

shaders/StylishShaders/HorizontalProgressBarGradientSquareFrag.glsl

@@ -0,0 +1,36 @@
+#version 410
+
+in vec4 color;
+in vec2 fragCoord;
+
+out vec4 FragColor;
+
+uniform float time;
+uniform float fill;
+uniform bool leftToRight;
+uniform float height;
+
+void main()
+{ //Rectangle plus large que haut
+    vec4 colorTemp = color;
+    float ouverture = 0.8f;
+    float lum = -pow(fragCoord.y + height/2f, 2f) * 5f /height + ouverture;
+    colorTemp.xyz *= lum;
+    if (leftToRight){
+        if (fill > fragCoord.x){
+            FragColor = colorTemp;
+        }
+        else {
+            FragColor = vec4(0f);
+        }
+    } else {
+        if (fill < fragCoord.x){
+            FragColor = colorTemp;
+        }
+        else {
+            FragColor = vec4(0f);
+        }
+    }
+
+
+}

src/engine/object/HorizontalProgressBar.java

@@ -9,13 +9,15 @@ public class HorizontalProgressBar extends ObjectGl {
     private float max;
     private float current;
     private int leftToRight;
+    private boolean useHeight;
 
     public HorizontalProgressBar(float z, float w, float h, float size, float current, float max, boolean leftToRight) {
         super(z, w, h, size, null, new Vector3f(0f, 1f, 0f));
         this.max = max;
         this.current = current;
         this.leftToRight = leftToRight ? 1 : 0;
-        this.setShader("shaders/StylishShaders/BasicNoTexVert.glsl", "shaders/StylishShaders/HorizontalProgressBar.glsl");
+        this.useHeight = false;
+        this.setShader("shaders/StylishShaders/BasicNoTexVert.glsl", "shaders/StylishShaders/HorizontalProgressBarFrag.glsl");
     }
 
     public void setCurrent(float newCurrent) {
@@ -26,6 +28,10 @@ public class HorizontalProgressBar extends ObjectGl {
         this.max = newMax;
     }
 
+    public void setUseHeight(boolean b){
+        this.useHeight = b;
+    }
+
     protected void uniformInjection() {
         if (this.useTime) this.shader.setUniform1f("time", (float) glfwGetTime());
 
@@ -35,6 +41,10 @@ public class HorizontalProgressBar extends ObjectGl {
             this.shader.setUniform1f("fill", Math.abs(((this.current / this.max) * this.getWidth()) - this.getWidth()));
         }
 
+        if (this.useHeight) {
+            this.shader.setUniform1f("height", this.height);
+        }
+
         this.shader.setUniform1i("leftToRight", this.leftToRight);
 
         this.shader.setUniformMat4f("projection", projection);

src/gameplay/match/match.java

@@ -190,7 +190,8 @@ public class match {
 		engine.add_uiElement(coordP2);
 		// Barre de vie
 		healthBarP1Obj = new HorizontalProgressBar(80f, 8.5f, 0.4f, 100f, p1.getCurrentHP(), p1.getMaxHP(), false);
-		healthBarP1Obj.setColorVerticalGradient(new Vector3f(39f/255f, 201f/255f, 30f/255f), new Vector3f(19f/255f, 89f/255f, 15f/255f));
+		healthBarP1Obj.setShader("shaders/StylishShaders/BasicNoTexVert.glsl", "shaders/StylishShaders/HorizontalProgressBarGradientSquareFrag.glsl");
+		healthBarP1Obj.setUseHeight(true);
 		healthBarP1 = new UIElement(healthBarP1Obj, 0.0138f, 0.980f, engine);
 		healthBarP2Obj = new HorizontalProgressBar(80f, 8.5f, 0.4f, 100f, p2.getCurrentHP(), p2.getMaxHP(), true);
 		healthBarP2Obj.setColorVerticalGradient(new Vector3f(39f/255f, 201f/255f, 30f/255f), new Vector3f(19f/255f, 89f/255f, 15f/255f));
@@ -249,7 +250,7 @@ public class match {
 				//end round
 			case 11:
 				endRound();
-				if(roundsWonP1 >= 2||roundsWonP2 >= 2) { endMatch();} //TODO : will probably need to specify more
+				if(roundsWonP1 >= 2 || roundsWonP2 >= 2) { endMatch();} //TODO : will probably need to specify more
 				else{acCode = 0;}
 				break;
 

textures/keyboard_pad_glyphs/Readme.txt

@@ -0,0 +1,147 @@
+Hey there!
+
+Hope you make good use of this pack. You can use all these assets in any project you want to (be it commercial or not).All of the assets are in the public domain under Creative Commons 0 (CC0)
+
+In this pack you will find over 500 buttons including:
+
+Xbox 360 Controller
+Xbox One Controller + Diagram
+Xbox Series X Controller + Diagram
+Play Station 3 Controller
+Play Station 4 Controller + Diagram
+Play Station 5 Controller + Diagram
+Play Station Move
+PS Vita
+Google Stadia Controller
+Amazon Luna Controller
+Vive Controller
+Oculus Controllers & Remote
+Wii Controller
+Wii U Controller
+Nintentdo Switch
+Steam Controller (Updated to commercial version)
+Ouya
+Keyboard and mouse buttons (Both in dark and light variants including blanks)
+Directional arrows for thumb sticks and movement keys
+Touch Screen Gestures
+
+----------------------------------
+
+I am "Nicolae (Xelu) Berbece", I'm responsible for the development studio "Those Awesome Guys", developers of "Move or Die" and publishers of "Monster Prom".
+
+You can contact me at nick@thoseawesomeguys.com or @xelubest
+
+Feel free to credit me in case you use anything in this pack, but don't worry, I won't mind if you don't. ;)
+
+Please share this pack with other fellow developers in need of such assets! In the spirit of good old chain mail, if you share this pack with 5 fellow devs, your game's steam review score will rise by 7% and a notable twitch streamer will pick it up for their stream.
+
+Keep making awesome things!!!
+
+~Nick
+
+
+
+Here is a semi-regularly-updated list of games using these prompts:
+----------------------------
+Mega Man Legacy
+Hunt: Showdown
+Outter Wilds
+Slay The Spire
+A hat in Time
+Forager
+Wonder Boy the dragon's trap
+Postal 2
+Postal Redux
+RWBY
+PikuNiku
+Shadow Warrior 2
+Tiny Metal
+Aztez
+Disney Afternoon
+Heat Signature
+Turbo Dismount
+Black Future 88
+Fallen Legion
+Fru
+Blockships
+20XX
+Furi
+Mike Dies
+Snake Pass
+Danger Scavenger
+Roboquest
+Rive
+Faerie Afterlight
+Obduction
+Fractal Fall
+Guild of Ascension
+Avaria VS
+Blast Zone! Tournament
+100ft Robot Golf
+Sockventure
+Spellbreak
+Zombie Rollerz
+B.O.O.M . - You Win
+Battle Chef Brigade
+De Blob
+Phantom Brigade
+Wytchwood
+Mulaka
+Airheart - Tales of broken wings
+Redirection
+Pull Stay
+Death Pedal
+Defender's Quest
+Akuto "Mad World"
+Project Mobius
+Whispering Willows
+Vostok Inc.
+Divine commander
+Sbirz
+Grashers
+Remnants of Naezith
+Mothergunship
+Roundabout
+Hunter of the Disowned
+Cosmos Quickstop
+West of Dead
+Tune Tank
+Rain on your Parade
+Infinite Adventures
+Arena 3D
+Chroma Vaders
+Hoverloop
+Wrestling Revolution 3D
+Altero
+Super Comboman
+Disc Jam
+Cooking Simulator
+Jelly is Sticky
+The Hatching
+World to the West
+Mayan Death Robots
+Sentris
+Carto
+Unbox
+Fort Triumph
+Insane Robots
+Super Daryl Deluxe
+Induction
+Pawarumi
+The Flock
+Binary Trigger
+Fractal Space
+Deputy dangle
+Bubsy: The Woolies Strike Back
+Tumblestone
+The chronicles of Kyra
+Ghost Knight Victis
+Solbrain Knight of Darkness
+SSMP
+Distance
+Idarb
+Earthlock
+Everspace
+Pylon Rogue
+The Church in the darkness
+Sword n' Board