From 54adfcbf93eb477bedeec45409f36cf7e102b790 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 16 Sep 2019 21:54:55 -0400
Subject: [PATCH] Navigation with intersection.
---
GroupEditor.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/GroupEditor.java b/GroupEditor.java
index 513ea9a..d328971 100644
--- a/GroupEditor.java
+++ b/GroupEditor.java
@@ -1404,7 +1404,7 @@
// supportCB.setToolTipText("Enable rigging");
// supportCB.addItemListener(this);
- panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
+ panel.add(freezeCB = new cCheckBox("Fast cam", Globals.FREEZEONMOVE)); //, constraints);
freezeCB.setToolTipText("Fast moving camera");
freezeCB.addItemListener(this);
@@ -1413,9 +1413,12 @@
panel.Return();
+ if (Globals.ADVANCED)
+ {
panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
crowdCB.setToolTipText("Used for crowds");
crowdCB.addItemListener(this);
+ }
panel.add(smoothCB = new cCheckBox("Inertia", CameraPane.INERTIA)); //, constraints);
smoothCB.setToolTipText("Snapping delay");
@@ -1428,30 +1431,26 @@
minshaderCB.setToolTipText("Minimal fast shader");
minshaderCB.addItemListener(this);
-// constraints.gridy += 1;
// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
// speakerMocapCB.addItemListener(this);
- panel.Return();
-
if (false)
{
// handled in scripts
- //constraints.gridy += 1;
panel.add(speakerCameraCB = new cCheckBox("Cam", CameraPane.SPEAKERCAMERA)); //, constraints);
speakerCameraCB.addItemListener(this);
- //constraints.gridy += 1;
panel.add(speakerFocusCB = new cCheckBox("Focus", CameraPane.SPEAKERFOCUS)); //, constraints);
speakerFocusCB.addItemListener(this);
- //constraints.gridy += 1;
- panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
- smoothfocusCB.addItemListener(this);
panel.Return();
}
-//constraints.gridx += 1;
+ panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
+ smoothfocusCB.addItemListener(this);
+
+ panel.Return();
+
//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
// debugCB.addItemListener(this);
@@ -2090,7 +2089,7 @@
Object3D obj = (Object3D)group.selection.elementAt(0);
objEditor.ScreenFit(obj, false);
- cameraView.pingthread.StepToTarget(true);
+ cameraView.pingthread.StepToTarget(); //true);
refreshContents();
}
@@ -4874,6 +4873,7 @@
LA.matTranslateInv(obj.fromParent, -i * scale, 0, 0);
}
+ Globals.lighttouched = true;
refreshContents();
}
--
Gitblit v1.6.2