kaze/orx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[orx-camera] deduplication code and fix bug in OrbitalCamera.applyTo()

Browse Source
This commit is contained in:
Edwin Jakobs
2020-09-08 17:45:38 +02:00
parent 49b5bae9ac
commit db24d17802
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
orx-camera/src/main/kotlin/OrbitalCamera.kt
View File

@@ -170,19 +170,7 @@ class OrbitalCamera(eye: Vector3 = Vector3.ZERO, lookAt: Vector3 = Vector3.UNIT_
lastSeconds = program.seconds lastSeconds = program.seconds
update(delta) update(delta)
applyTo(drawer)
if (projectionType == ProjectionType.PERSPECTIVE) {
drawer.perspective(fov, drawer.width.toDouble() / drawer.height, near, far)
} else {
val ar = drawer.width * 1.0 / drawer.height
drawer.ortho(-ar * magnitude, ar * magnitude, -1.0 * magnitude, 1.0 * magnitude, -1000.0, 1000.0)
}
drawer.view = viewMatrix()
if (depthTest) {
drawer.drawStyle.depthWrite = true
drawer.drawStyle.depthTestPass = DepthTestPass.LESS_OR_EQUAL
}
} }
override fun afterDraw(drawer: Drawer, program: Program) { override fun afterDraw(drawer: Drawer, program: Program) {
@@ -219,9 +207,12 @@ fun OrbitalCamera.applyTo(drawer: Drawer) {
drawer.perspective(fov, drawer.width.toDouble() / drawer.height, near, far) drawer.perspective(fov, drawer.width.toDouble() / drawer.height, near, far)
} else { } else {
val ar = drawer.width * 1.0 / drawer.height val ar = drawer.width * 1.0 / drawer.height
drawer.ortho(-ar, ar, 1.0, -1.0, near, far) drawer.ortho(-ar * magnitude, ar * magnitude, -1.0 * magnitude, 1.0 * magnitude, -1000.0, 1000.0)
} }
drawer.view = viewMatrix() drawer.view = viewMatrix()
if (depthTest) {
drawer.drawStyle.depthWrite = true drawer.drawStyle.depthWrite = true
drawer.drawStyle.depthTestPass = DepthTestPass.LESS_OR_EQUAL drawer.drawStyle.depthTestPass = DepthTestPass.LESS_OR_EQUAL
}
} }