From 35bc639712f701b89dba700e39ac38b61ca0e267 Mon Sep 17 00:00:00 2001 From: Antoine Date: Wed, 23 Jun 2021 21:26:14 +0200 Subject: [PATCH 1/2] Correction shader, detection des float --- .../HorizontalProgressBarGradientSquareFrag.glsl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/shaders/StylishShaders/HorizontalProgressBarGradientSquareFrag.glsl b/shaders/StylishShaders/HorizontalProgressBarGradientSquareFrag.glsl index edad87e..8560e3c 100644 --- a/shaders/StylishShaders/HorizontalProgressBarGradientSquareFrag.glsl +++ b/shaders/StylishShaders/HorizontalProgressBarGradientSquareFrag.glsl @@ -15,7 +15,7 @@ void main() vec4 colorTemp = color; float ouverture = 0.8f; // 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; // Effet flash sur la surface @@ -27,14 +27,14 @@ void main() FragColor = colorTemp; } else { - FragColor = vec4(0f); + FragColor = vec4(0.0f); } } else { if (fill < fragCoord.x){ FragColor = colorTemp; } else { - FragColor = vec4(0f); + FragColor = vec4(0.0f); } } From 262fef9b6c2884c305531573a9dec75b90b513c1 Mon Sep 17 00:00:00 2001 From: Antoine Date: Wed, 23 Jun 2021 21:57:58 +0200 Subject: [PATCH 2/2] glfwGetGamepadName --- src/engine/input/GamepadInput.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/engine/input/GamepadInput.java b/src/engine/input/GamepadInput.java index 77b3b25..47bbe9f 100644 --- a/src/engine/input/GamepadInput.java +++ b/src/engine/input/GamepadInput.java @@ -107,8 +107,8 @@ public class GamepadInput { return new Vector3f(x,y); } - public int getGamepadName(){ - return this.gamepadNum; + public String getGamepadName(){ + return glfwGetGamepadName(this.gamepadNum); } }