[Scummvm-git-logs] scummvm master -> 3e5f4b1df4e4e544e667ab1bcae9b260adff46cd

aquadran aquadran at gmail.com
Tue Nov 9 20:32:58 UTC 2021


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:
3e5f4b1df4 STARK: Fixed lights code placement


Commit: 3e5f4b1df4e4e544e667ab1bcae9b260adff46cd
    https://github.com/scummvm/scummvm/commit/3e5f4b1df4e4e544e667ab1bcae9b260adff46cd
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2021-11-09T21:32:53+01:00

Commit Message:
STARK: Fixed lights code placement

Changed paths:
    engines/stark/gfx/tinyglactor.cpp
    engines/stark/gfx/tinyglprop.cpp


diff --git a/engines/stark/gfx/tinyglactor.cpp b/engines/stark/gfx/tinyglactor.cpp
index 43f1137ca4..144060a8b3 100644
--- a/engines/stark/gfx/tinyglactor.cpp
+++ b/engines/stark/gfx/tinyglactor.cpp
@@ -223,16 +223,15 @@ void TinyGLActorRenderer::render(const Math::Vector3d &position, float direction
 					default:
 						break;
 				}
-
-				lightColor.x() = CLIP(lightColor.x(), 0.0f, 1.0f);
-				lightColor.y() = CLIP(lightColor.y(), 0.0f, 1.0f);
-				lightColor.z() = CLIP(lightColor.z(), 0.0f, 1.0f);
-				color = color * lightColor;
-				vertex.r = color.x();
-				vertex.g = color.y();
-				vertex.b = color.z();
 			}
 
+			lightColor.x() = CLIP(lightColor.x(), 0.0f, 1.0f);
+			lightColor.y() = CLIP(lightColor.y(), 0.0f, 1.0f);
+			lightColor.z() = CLIP(lightColor.z(), 0.0f, 1.0f);
+			color = color * lightColor;
+			vertex.r = color.x();
+			vertex.g = color.y();
+			vertex.b = color.z();
 			_faceVBO[index] = vertex;
 		}
 
diff --git a/engines/stark/gfx/tinyglprop.cpp b/engines/stark/gfx/tinyglprop.cpp
index 66a400c3e0..423df81ea3 100644
--- a/engines/stark/gfx/tinyglprop.cpp
+++ b/engines/stark/gfx/tinyglprop.cpp
@@ -154,15 +154,15 @@ void TinyGLPropRenderer::render(const Math::Vector3d &position, float direction,
 					default:
 						break;
 				}
-
-				lightColor.x() = CLIP(lightColor.x(), 0.0f, 1.0f);
-				lightColor.y() = CLIP(lightColor.y(), 0.0f, 1.0f);
-				lightColor.z() = CLIP(lightColor.z(), 0.0f, 1.0f);
-				color = color * lightColor;
-				vertex.r = color.x();
-				vertex.g = color.y();
-				vertex.b = color.z();
 			}
+
+			lightColor.x() = CLIP(lightColor.x(), 0.0f, 1.0f);
+			lightColor.y() = CLIP(lightColor.y(), 0.0f, 1.0f);
+			lightColor.z() = CLIP(lightColor.z(), 0.0f, 1.0f);
+			color = color * lightColor;
+			vertex.r = color.x();
+			vertex.g = color.y();
+			vertex.b = color.z();
 			_faceVBO[index] = vertex;
 		}
 




More information about the Scummvm-git-logs mailing list