From 42107f9a01652cb2f47228d20c1148a2a22f6a63 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Tue, 22 May 2018 19:33:31 -0400
Subject: [PATCH] new torus code and VR
---
CameraPane.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/CameraPane.java b/CameraPane.java
index 091d05a..b876bb4 100644
--- a/CameraPane.java
+++ b/CameraPane.java
@@ -12854,7 +12854,9 @@
{
mouseMode |= ZOOM;
}
- if ((modifiers & META) == META)
+
+ boolean capsLocked = Toolkit.getDefaultToolkit().getLockingKeyState(KeyEvent.VK_CAPS_LOCK);
+ if (capsLocked || (modifiers & META) == META)
{
mouseMode |= VR; // BACKFORTH;
}
@@ -12868,6 +12870,7 @@
}
if ((modifiers & SHIFT) == SHIFT || forcetranslate)
{
+ mouseMode &= ~VR;
mouseMode |= TRANSLATE;
}
// if ((modifiers & SHIFT_META) == SHIFT_META)
@@ -14719,6 +14722,11 @@
// System.err.println("view = " + view[8] + " " + view[9] + " " + view[10] + " " + view[11]);
// System.err.println("view = " + view[12] + " " + view[13] + " " + view[14] + " " + view[15]);
+ // Will fit the mesh !!!
+ selectedpoint.toParent[0][0] = 0.0001;
+ selectedpoint.toParent[1][1] = 0.0001;
+ selectedpoint.toParent[2][2] = 0.0001;
+
glu.gluUnProject(x,y,depth,view,0,tempmat2,0,viewport,0,selectedpoint.toParent[3],0);
// if (object.selection != null && object.selection.Size() > 0)
@@ -15341,7 +15349,7 @@
int AAbuffersize = 0;
//double[] selectedpoint = new double[3];
- static Sphere selectedpoint = new Sphere();
+ static Superellipsoid selectedpoint = new Superellipsoid();
static Sphere previousselectedpoint = null;
static Sphere debugpoint = new Sphere();
static Sphere debugpoint2 = new Sphere();
--
Gitblit v1.6.2