edgevoid/armorpaint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Ortho camera zoom

Browse Source
This commit is contained in:
luboslenco
2019-05-06 23:11:49 +02:00
parent 6c5824fffb
commit e97ba08c00
5 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sources/arm/renderpath/RenderPathDeferred.hx
+4 -2
View File
@@ -388,7 +388,8 @@ class RenderPathDeferred {
#if ((rp_ssgi == "RTGI") || (rp_ssgi == "RTAO"))
{
if (armory.data.Config.raw.rp_ssgi != false) {
var ssgi = armory.data.Config.raw.rp_ssgi != false && UITrait.inst.cameraType == 0;
if (ssgi) {
path.setTarget("singlea");
path.bindTarget("_main", "gbufferD");
path.bindTarget("gbuffer0", "gbuffer0");
@@ -451,7 +452,8 @@ class RenderPathDeferred {
path.bindTarget("gbuffer1", "gbuffer1");
#if (rp_ssgi != "Off")
{
if (armory.data.Config.raw.rp_ssgi != false) {
var ssgi = armory.data.Config.raw.rp_ssgi != false && UITrait.inst.cameraType == 0;
if (ssgi) {
path.bindTarget("singlea", "ssaotex");
}
else {
Sources/arm/trait/FlyCamera.hx
+4
View File
@@ -66,6 +66,10 @@ class FlyCamera extends iron.Trait {
if (d > 0.0) {
UITrait.inst.ddirty = 2;
camera.transform.move(dir, d);
if (UITrait.inst.cameraType == 1) {
UITrait.inst.updateCameraType(UITrait.inst.cameraType);
}
}
if (mouse.down("right")) {
Sources/arm/trait/OrbitCamera.hx
+4
View File
@@ -76,6 +76,10 @@ class OrbitCamera extends iron.Trait {
if (redraws > 0) {
redraws--;
UITrait.inst.ddirty = 2;
if (UITrait.inst.cameraType == 1) {
UITrait.inst.updateCameraType(UITrait.inst.cameraType);
}
}
});
}
Sources/arm/trait/RotateCamera.hx
+4
View File
@@ -69,6 +69,10 @@ class RotateCamera extends iron.Trait {
if (redraws > 0) {
redraws--;
UITrait.inst.ddirty = 2;
if (UITrait.inst.cameraType == 1) {
UITrait.inst.updateCameraType(UITrait.inst.cameraType);
}
}
});
}
Sources/arm/ui/UITrait.hx
+10 -8
View File
@@ -1503,8 +1503,7 @@ class UITrait extends iron.Trait {
fovHandle = Id.handle({value: Std.int(cam.data.raw.fov * 100) / 100});
cam.data.raw.fov = ui.slider(fovHandle, "FoV", 0.3, 2.0, true);
if (fovHandle.changed) {
cam.buildProjection();
ddirty = 2;
updateCameraType(cameraType);
}
if (messageTimer > 0) {
@@ -2748,19 +2747,22 @@ class UITrait extends iron.Trait {
public function updateCameraType(cameraType:Int) {
var cam = iron.Scene.active.cameras[0];
var light = iron.Scene.active.lights[0];
if (cameraType == 0) {
cam.data.raw.ortho = null;
cam.buildProjection();
light.visible = true;
}
else {
var f32 = new kha.arrays.Float32Array(4);
f32[0] = -2;
f32[1] = 2;
f32[2] = -2 * (iron.App.h() / iron.App.w());
f32[3] = 2 * (iron.App.h() / iron.App.w());
var f = cam.data.raw.fov * cam.transform.world.getLoc().length() / 2.5;
f32[0] = -2 * f;
f32[1] = 2 * f;
f32[2] = -2 * f * (iron.App.h() / iron.App.w());
f32[3] = 2 * f * (iron.App.h() / iron.App.w());
cam.data.raw.ortho = f32;
cam.buildProjection();
light.visible = false;
}
cam.buildProjection();
ddirty = 2;
}