[Scummvm-git-logs] scummvm master -> debdcd6a594e18f3a4b2608a1ac2f7a9ea61d96e

aquadran aquadran at gmail.com
Fri Oct 30 20:28:12 UTC 2020


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
debdcd6a59 WINTERMUTE: Remove float suffix in opengl shader


Commit: debdcd6a594e18f3a4b2608a1ac2f7a9ea61d96e
    https://github.com/scummvm/scummvm/commit/debdcd6a594e18f3a4b2608a1ac2f7a9ea61d96e
Author: Paweł Kołodziejski (aquadran at users.sourceforge.net)
Date: 2020-10-30T21:28:04+01:00

Commit Message:
WINTERMUTE: Remove float suffix in opengl shader

Changed paths:
    engines/wintermute/base/gfx/opengl/shaders/wme_modelx.vertex


diff --git a/engines/wintermute/base/gfx/opengl/shaders/wme_modelx.vertex b/engines/wintermute/base/gfx/opengl/shaders/wme_modelx.vertex
index 2b756b0b0d..aa2e6cb07c 100644
--- a/engines/wintermute/base/gfx/opengl/shaders/wme_modelx.vertex
+++ b/engines/wintermute/base/gfx/opengl/shaders/wme_modelx.vertex
@@ -28,7 +28,7 @@ out vec3 Normal;
 
 void main()
 {
-	vec4 viewCoords = viewMatrix * modelMatrix * vec4(position, 1.0f);
+	vec4 viewCoords = viewMatrix * modelMatrix * vec4(position, 1.0);
 	gl_Position = projMatrix * viewCoords;
 
 	Texcoord = texcoord;
@@ -38,7 +38,7 @@ void main()
 	vec3 normalEye = normalize((normalMatrix * vec4(normal, 0.0)).xyz);
 
 	for (int i = 0; i < maxLights; ++i) {
-		if (lights[i].enabled < 0.0f) {
+		if (lights[i].enabled < 0.0) {
 			continue;
 		}
 
@@ -48,7 +48,7 @@ void main()
 		float dist = length(vertexToLight);
 
 		if (lights[i]._direction.w < 0.0) { // Spotlight
-			vec4 lightDirection = viewMatrix * vec4(lights[i]._direction.xyz, 0.0f);
+			vec4 lightDirection = viewMatrix * vec4(lights[i]._direction.xyz, 0.0);
 			// See DirectX spotlight documentation
 			float cosAngle = -dot(normalize(vertexToLight), normalize(lightDirection.xyz)); // rho
 			float cosPenumbra = 0.968912; // cos(1 / 4)




More information about the Scummvm-git-logs mailing list