Rativel/jeu-de-combat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
no 2021-06-23 22:38:44 +02:00
commit 460a3f68f8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
shaders/StylishShaders/HorizontalProgressBarGradientSquareFrag.glsl
View File

@ -15,7 +15,7 @@ void main()
vec4 colorTemp = color; vec4 colorTemp = color;
float ouverture = 0.8f; float ouverture = 0.8f;
// Effet "tube" // Effet "tube"
float lum = -pow(fragCoord.y + height/2f, 2f) * 5f /height + ouverture; float lum = -pow(fragCoord.y + height/2.0f, 2.0f) * 5.0f /height + ouverture;
colorTemp.xyz *= lum; colorTemp.xyz *= lum;
// Effet flash sur la surface // Effet flash sur la surface
@ -27,14 +27,14 @@ void main()
FragColor = colorTemp; FragColor = colorTemp;
} }
else { else {
FragColor = vec4(0f); FragColor = vec4(0.0f);
} }
} else { } else {
if (fill < fragCoord.x){ if (fill < fragCoord.x){
FragColor = colorTemp; FragColor = colorTemp;
} }
else { else {
FragColor = vec4(0f); FragColor = vec4(0.0f);
} }
} }

4
src/engine/input/GamepadInput.java
View File

@ -107,8 +107,8 @@ public class GamepadInput {
return new Vector3f(x,y); return new Vector3f(x,y);
} }
public int getGamepadName(){ public String getGamepadName(){
return this.gamepadNum; return glfwGetGamepadName(this.gamepadNum);
} }
} }