From d5fac992bb6a91e52a90e8318060f5f26ddab982 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sun, 15 Sep 2019 10:55:46 -0400
Subject: [PATCH] Fix navigation and hide cursor.
---
Camera.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/Camera.java b/Camera.java
index e28a69d..e2f05a8 100644
--- a/Camera.java
+++ b/Camera.java
@@ -286,24 +286,34 @@
if (scale == 0)
{
// Zoom
- LA.vecSub(location, lookAt, location);
-
- cVector p = location;
-
double factor = Math.exp(-dy/300.0); // (1 + dy/100);
- p.x *= factor;
- p.y *= factor;
- p.z *= factor;
+ if (viewCode != 0)
+ {
+ LA.vecSub(location, lookAt, location);
- LA.vecAdd(location, lookAt, location);
+ cVector p = location;
+
+ p.x *= factor;
+ p.y *= factor;
+ p.z *= factor;
+
+ LA.vecAdd(location, lookAt, location);
+ }
+ else
+ if (//shaper_fovy < 180 && factor > 1 ||
+ shaper_fovy * factor < 180)
+ {
+ shaper_fovy *= factor;
+ //System.out.println("fovy = " + shaper_fovy);
+ }
}
else
{
LA.vecSub(location, lookAt, direction);
//scale /= Distance();
- scale /= shaper_fovy/20;
+ // scale /= shaper_fovy/20;
location.x -= dy * direction.x / scale;
//location.y -= dy * direction.y / scale;
--
Gitblit v1.6.2