epervier/epervier-old
1
0
Fork 0
Code Issues 28 Pull requests Releases Wiki Activity

fix(camera): fix onscreen coordinates by using new core.screen func

Browse source
This commit is contained in:
Kazhnuz 2019-07-14 18:41:13 +02:00
parent fb428b45c3
commit 6947d2f3f2
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -55,6 +55,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- **examples:** Add missing translations
- **camera:** Fix onscreen coordinates by using new core.screen func
### Removed
- **actor:** Remove all function related to XGravity

12
gamecore/modules/world/camera/init.lua
View file

@ -232,8 +232,10 @@ function CameraSystem:getOnScreenViewCoordinate(id)
viewx = (basex) + view.pos.onScreen.x - (self.views.width / 2)
viewy = (basey) + view.pos.onScreen.y - (self.views.height / 2)
vieww = self.views.width
viewh = self.views.height
viewx, viewy = core.screen:getScreenCoordinate(viewx, viewy)
vieww = self.views.width * core.screen:getScale()
viewh = self.views.height * core.screen:getScale()
return viewx, viewy, vieww, viewh
end
@ -245,7 +247,7 @@ function CameraSystem:getOnScreenViewRelativePosition(id)
viewx = view.pos.onScreen.x
viewy = view.pos.onScreen.y
return viewx, viewy
return core.screen:getScreenCoordinate(viewx, viewy)
end
function CameraSystem:getOnScreenViewCenter(id)
@ -256,13 +258,13 @@ function CameraSystem:getOnScreenViewCenter(id)
viewx = (basex) + view.pos.onScreen.x
viewy = (basey) + view.pos.onScreen.y
return viewx, viewy
return core.screen:getScreenCoordinate(viewx, viewy)
end
function CameraSystem:getViewScale(id)
local cam = self:getViewCam(id)
return cam.scale
return cam.scale * core.screen:getScale()
end
function CameraSystem:limitView(id)