mirrors/linux-wallpaperengine
1
0
Fork 0
mirror of https://github.com/Almamu/linux-wallpaperengine.git synced 2025-09-14 13:56:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

~ Hopefully take into account object scale properly

Browse Source 
Signed-off-by: Alexis Maiquez <almamu@almamu.com>
This commit is contained in:
Alexis Maiquez 2021-12-04 03:48:24 +01:00
parent 49a5f9e2ab
commit 816e0a6ddf
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/WallpaperEngine/Render/Objects/CImage.cpp
View File

@ -24,15 +24,14 @@ CImage::CImage (CScene* scene, Core::Objects::CImage* image) :
float xright = 0.0f;
float ybottom = 0.0f;
// TODO: TAKE INTO ACCOUNT SCALE
// depending on the alignment these values might change, for now just support center
if (this->getImage ()->getAlignment () == "center")
{
// calculate the real position of the image
xleft = (-scene_width / 2) + (origin.x - (size.x / 2));
xright = (-scene_width / 2) + (origin.x + (size.x / 2));
ytop = (-scene_height / 2) + origin.y + (size.y / 2);
ybottom = (-scene_height / 2) + (origin.y - (size.y / 2));
xleft = (-scene_width / 2) + (origin.x - (size.x * scale.x / 2));
xright = (-scene_width / 2) + (origin.x + (size.x * scale.x / 2));
ytop = (-scene_height / 2) + origin.y + (size.y * scale.y / 2);
ybottom = (-scene_height / 2) + (origin.y - (size.y * scale.y / 2));
}
else
{
@ -165,8 +164,7 @@ CImage::CImage (CScene* scene, Core::Objects::CImage* image) :
this->m_modelViewProjectionScreen =
this->getScene ()->getCamera ()->getProjection () *
this->getScene ()->getCamera ()->getLookAt () *
glm::scale (glm::mat4 (1.0f), scale);
this->getScene ()->getCamera ()->getLookAt ();
this->m_modelViewProjectionPass =
glm::ortho<float> (-size.x / 2, size.x / 2, -size.y / 2, size.y / 2, 0, 10000);