From 255bcc8ac2faaf412e78e231eaa8e4a560621668 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sun, 29 Sep 2019 12:44:37 -0400
Subject: [PATCH] link2master + link2support + UF
---
ObjEditor.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 56 insertions(+), 4 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index c8eff94..216b8ba 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -558,7 +558,7 @@
// }
// }
// }
- cameraView.transformMode = objectTabbedPane.getSelectedIndex() == 5;
+ cameraView.transformMode = objectTabbedPane.getSelectedIndex() == transformTabIndex;
// refreshContents(false); // To refresh Info tab
cameraView.repaint();
@@ -1421,7 +1421,7 @@
randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
- link2masterCB = AddCheckBox(setupPanel2, GetSupportText(), copy.link2master);
+ link2masterCB = AddCheckBox(setupPanel2, GetSupportText(), copy.Link2Support());
link2masterCB.setToolTipText("Link to support");
if (Globals.ADVANCED)
@@ -1600,6 +1600,8 @@
}
int objectTabCount;
+
+ int transformTabIndex;
void SetupViews()
{
@@ -1792,12 +1794,15 @@
objectTabbedPane.add(materialPanel);
objectTabbedPane.setIconAt(objectTabCount, GetIcon("icons/material.png"));
objectTabbedPane.setToolTipTextAt(objectTabCount++, "Material");
-
+
+ if (Globals.ADVANCED)
+ {
figurePanel = new cGridBag();
figurePanel.add(new cButton("FIGURES and POSES coming soon!"));
objectTabbedPane.add(figurePanel);
objectTabbedPane.setIconAt(objectTabCount, GetIcon("icons/figure.png"));
objectTabbedPane.setToolTipTextAt(objectTabCount++, "Figures and poses");
+ }
// JPanel north = new JPanel(new BorderLayout());
// north.setName("Edit");
@@ -1806,7 +1811,8 @@
objectTabbedPane.add(editPanel);
objectTabbedPane.setIconAt(objectTabCount, GetIcon("icons/writewhite.png"));
objectTabbedPane.setToolTipTextAt(objectTabCount++, "Edit controls");
-
+
+ transformTabIndex = objectTabCount;
objectTabbedPane.add(transformPanel);
objectTabbedPane.setIconAt(objectTabCount, GetIcon("icons/XYZ.png"));
objectTabbedPane.setToolTipTextAt(objectTabCount++, "TRS transform");
@@ -2037,6 +2043,52 @@
fullscenePanel.Return();
+ fullscenePanel.add(fullsceneButton = GetButton("fullscenes/urbanfuture3.png", !Globals.NIMBUSLAF));
+ fullsceneButton.setToolTipText("Urban Future!");
+ fullsceneButton.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/uf3.gfd", new iCallBack()
+ {
+
+ public void Callback(Object obj)
+ {
+ LoadIt(obj);
+ }
+
+ public void DragGesture()
+ {
+ }
+ });
+ }
+ });
+
+ fullscenePanel.add(fullsceneButton = GetButton("fullscenes/urbanfuture4.png", !Globals.NIMBUSLAF));
+ fullsceneButton.setToolTipText("Street Level!");
+ fullsceneButton.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/uf4.gfd", new iCallBack()
+ {
+
+ public void Callback(Object obj)
+ {
+ LoadIt(obj);
+ }
+
+ public void DragGesture()
+ {
+ }
+ });
+ }
+ });
+
+ fullscenePanel.Return();
+
fullscenePanel.add(new cGridBag());
fullscenePanel.add(new cGridBag());
fullscenePanel.Return();
--
Gitblit v1.6.2