Skip to content

Fix lights position when setting camera rotation to something different from 0 #7173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix lights position when setting camera rotation to something different from 0 #7173

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions src/renderer/webgl/pipelines/LightPipeline.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,9 +197,18 @@ var LightPipeline = new Class({

var lightName = 'uLights[' + i + '].';

cameraMatrix.transformPoint(light.x, light.y, tempVec2);

this.set2f(lightName + 'position', tempVec2.x - (camera.scrollX * light.scrollFactorX * camera.zoom), height - (tempVec2.y - (camera.scrollY * light.scrollFactorY) * camera.zoom));
if (camera.rotation !== 0)
{
// When camera is rotated, apply scroll before matrix transformation to avoid double-transformation
cameraMatrix.transformPoint(light.x - (camera.scrollX * light.scrollFactorX), light.y - (camera.scrollY * light.scrollFactorY), tempVec2);
this.set2f(lightName + 'position', tempVec2.x, height - tempVec2.y);
}
else
{
// When camera is not rotated, use original calculation (matrix transform then manual scroll/zoom)
cameraMatrix.transformPoint(light.x, light.y, tempVec2);
this.set2f(lightName + 'position', tempVec2.x - (camera.scrollX * light.scrollFactorX * camera.zoom), height - (tempVec2.y - (camera.scrollY * light.scrollFactorY) * camera.zoom));
}
this.set3f(lightName + 'color', color.r, color.g, color.b);
this.set1f(lightName + 'intensity', light.intensity);
this.set1f(lightName + 'radius', light.radius);
Expand Down