From 294eab460cb3292d17576d3be2e07f1e369a2bc3 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Wed, 25 Dec 2019 16:56:25 -0500
Subject: [PATCH] Camera improvements + new scenes.
---
ObjEditor.java | 503 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 326 insertions(+), 177 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index ab56542..7726e0c 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -1889,12 +1889,315 @@
AddOptions(optionsPanel); //, aConstraints);
sceneTabbedPane.add(FSPane = new cFileSystemPane(this));
-
- fullscenePanel = new cGridBag();
- fullscenePanel.setName("Download");
- sceneTabbedPane.add(fullscenePanel);
+
+ JTabbedPane fullscenePane = new JTabbedPane(JTabbedPane.LEFT);
+ fullscenePane.setName("Download");
+ sceneTabbedPane.add(fullscenePane);
+
+ cGridBag fullscenePanel;
cButton fullsceneButton;
+
+ fullscenePanel = new cGridBag().setVertical(true);
+ fullscenePanel.setName("Actual");
+
+ fullscenePane.add(fullscenePanel);
+
+ fullscenePanel.add(fullsceneButton = GetButton("fullscenes/alsace.png", !Globals.NIMBUSLAF));
+ fullsceneButton.setToolTipText("Alsace!");
+ fullsceneButton.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/Alsace.gfd", new iCallBack()
+ {
+
+ public void Callback(Object obj)
+ {
+ CameraPane.capsLocked = true;
+ Globals.setLIVE(false);
+ Globals.WALK = true;
+ LoadIt(obj);
+ }
+
+ public void DragGesture()
+ {
+ }
+ });
+ }
+ });
+
+ fullscenePanel.add(fullsceneButton = GetButton("fullscenes/london.png", !Globals.NIMBUSLAF));
+ fullsceneButton.setToolTipText("Old London!");
+ fullsceneButton.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/oldlondon.gfd", new iCallBack()
+ {
+
+ public void Callback(Object obj)
+ {
+ CameraPane.capsLocked = true;
+ Globals.setLIVE(false);
+ Globals.WALK = true;
+ LoadIt(obj);
+ }
+
+ public void DragGesture()
+ {
+ }
+ });
+ }
+ });
+
+ fullscenePanel.add(fullsceneButton = GetButton("fullscenes/tuscany.png", !Globals.NIMBUSLAF));
+ fullsceneButton.setToolTipText("Tuscany!");
+ fullsceneButton.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/Tuscany.gfd", new iCallBack()
+ {
+
+ public void Callback(Object obj)
+ {
+ CameraPane.capsLocked = true;
+ Globals.setLIVE(true);
+ Globals.WALK = true;
+ LoadIt(obj);
+ }
+
+ public void DragGesture()
+ {
+ }
+ });
+ }
+ });
+
+// fullscenePanel.add(fullsceneButton = GetButton("fullscenes/venice.png", !Globals.NIMBUSLAF));
+// fullsceneButton.setToolTipText("Venice!");
+// fullsceneButton.addActionListener(new ActionListener()
+// {
+// @Override
+// public void actionPerformed(ActionEvent e)
+// {
+// ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/Venice.gfd", new iCallBack()
+// {
+//
+// public void Callback(Object obj)
+// {
+// CameraPane.capsLocked = true;
+// Globals.setLIVE(true);
+// Globals.WALK = true;
+// LoadIt(obj);
+// }
+//
+// public void DragGesture()
+// {
+// }
+// });
+// }
+// });
+
+ fullscenePanel.add(fullsceneButton = GetButton("fullscenes/yvoire.png", !Globals.NIMBUSLAF));
+ fullsceneButton.setToolTipText("Yvoire!");
+ fullsceneButton.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/Yvoire.gfd", new iCallBack()
+ {
+
+ public void Callback(Object obj)
+ {
+ CameraPane.capsLocked = true;
+ Globals.setLIVE(false);
+ Globals.WALK = true;
+ LoadIt(obj);
+ }
+
+ public void DragGesture()
+ {
+ }
+ });
+ }
+ });
+
+ fullscenePanel = new cGridBag().setVertical(true);
+ fullscenePanel.setName("Cities");
+
+ fullscenePane.add(fullscenePanel);
+
+ fullscenePanel.add(fullsceneButton = GetButton("fullscenes/desertmotel.png", !Globals.NIMBUSLAF));
+ fullsceneButton.setToolTipText("Desert Motel!");
+ fullsceneButton.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/DesertMotel.gfd", new iCallBack()
+ {
+
+ public void Callback(Object obj)
+ {
+ CameraPane.capsLocked = true;
+ Globals.setLIVE(false);
+ Globals.WALK = true;
+ LoadIt(obj);
+ }
+
+ public void DragGesture()
+ {
+ }
+ });
+ }
+ });
+
+ fullscenePanel.add(fullsceneButton = GetButton("fullscenes/SandyBay.png", !Globals.NIMBUSLAF));
+ fullsceneButton.setToolTipText("Sandy Bay!");
+ fullsceneButton.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/SandyBay.gfd", new iCallBack()
+ {
+
+ public void Callback(Object obj)
+ {
+ CameraPane.capsLocked = true;
+ Globals.setLIVE(false);
+ Globals.WALK = true;
+ LoadIt(obj);
+ }
+
+ public void DragGesture()
+ {
+ }
+ });
+ }
+ });
+
+ fullscenePanel.add(fullsceneButton = GetButton("fullscenes/UrbanSprawl.png", !Globals.NIMBUSLAF));
+ fullsceneButton.setToolTipText("Urban Sprawl!");
+ fullsceneButton.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/UrbanSprawl.gfd", new iCallBack()
+ {
+
+ public void Callback(Object obj)
+ {
+ CameraPane.capsLocked = true;
+ Globals.setLIVE(false);
+ Globals.WALK = true;
+ LoadIt(obj);
+ }
+
+ public void DragGesture()
+ {
+ }
+ });
+ }
+ });
+
+ // Medieval City
+ fullscenePanel.add(new cGridBag());
+
+ fullscenePanel = new cGridBag().setVertical(true);
+ fullscenePanel.setName("Fictive");
+
+ fullscenePane.add(fullscenePanel);
+
+ fullscenePanel.add(fullsceneButton = GetButton("fullscenes/ninja.png", !Globals.NIMBUSLAF));
+ fullsceneButton.setToolTipText("Ninja Village!");
+ fullsceneButton.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/NinjaVillage.gfd", new iCallBack()
+ {
+
+ public void Callback(Object obj)
+ {
+ CameraPane.capsLocked = true;
+ Globals.setLIVE(false);
+ Globals.WALK = true;
+ LoadIt(obj);
+ }
+
+ public void DragGesture()
+ {
+ }
+ });
+ }
+ });
+
+ fullscenePanel.add(fullsceneButton = GetButton("fullscenes/skullcove.png", !Globals.NIMBUSLAF));
+ fullsceneButton.setToolTipText("Skull Cove Island!");
+ fullsceneButton.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/SkullCoveIsland.gfd", new iCallBack()
+ {
+
+ public void Callback(Object obj)
+ {
+ CameraPane.capsLocked = true;
+ Globals.setLIVE(true);
+ Globals.WALK = true;
+ LoadIt(obj);
+ }
+
+ public void DragGesture()
+ {
+ }
+ });
+ }
+ });
+
+ fullscenePanel.add(fullsceneButton = GetButton("fullscenes/viking.png", !Globals.NIMBUSLAF));
+ fullsceneButton.setToolTipText("Viking Village!");
+ fullsceneButton.addActionListener(new ActionListener()
+ {
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/VikingVillage.gfd", new iCallBack()
+ {
+
+ public void Callback(Object obj)
+ {
+ CameraPane.capsLocked = true;
+ Globals.setLIVE(false);
+ Globals.WALK = true;
+ LoadIt(obj);
+ }
+
+ public void DragGesture()
+ {
+ }
+ });
+ }
+ });
+
+ // Skull Mountain
+ fullscenePanel.add(new cGridBag());
+
+ fullscenePanel = new cGridBag().setVertical(true);
+ fullscenePanel.setName("Figures");
+
+ fullscenePane.add(fullscenePanel);
fullscenePanel.add(fullsceneButton = GetButton("fullscenes/tom.png", !Globals.NIMBUSLAF));
fullsceneButton.setToolTipText("Tom!");
@@ -1946,23 +2249,29 @@
}
});
- fullscenePanel.Return();
+ fullscenePanel.add(new cGridBag());
+ fullscenePanel.add(new cGridBag());
- fullscenePanel.add(fullsceneButton = GetButton("fullscenes/alsace.png", !Globals.NIMBUSLAF));
- fullsceneButton.setToolTipText("Alsace!");
+ fullscenePanel = new cGridBag().setVertical(true);
+ fullscenePanel.setName("Futuristic");
+
+ fullscenePane.add(fullscenePanel);
+
+ fullscenePanel.add(fullsceneButton = GetButton("fullscenes/GCB2.png", !Globals.NIMBUSLAF));
+ fullsceneButton.setToolTipText("Greeble City II");
fullsceneButton.addActionListener(new ActionListener()
{
@Override
public void actionPerformed(ActionEvent e)
{
- ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/Alsace.gfd", new iCallBack()
+ ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/gcb2.gfd", new iCallBack()
{
public void Callback(Object obj)
{
CameraPane.capsLocked = true;
Globals.setLIVE(false);
- Globals.WALK = true;
+ Globals.WALK = false;
LoadIt(obj);
}
@@ -1972,22 +2281,22 @@
});
}
});
-
- fullscenePanel.add(fullsceneButton = GetButton("fullscenes/desertmotel.png", !Globals.NIMBUSLAF));
- fullsceneButton.setToolTipText("Desert Motel!");
+
+ fullscenePanel.add(fullsceneButton = GetButton("fullscenes/GCB3.png", !Globals.NIMBUSLAF));
+ fullsceneButton.setToolTipText("Greeble City III");
fullsceneButton.addActionListener(new ActionListener()
{
@Override
public void actionPerformed(ActionEvent e)
{
- ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/DesertMotel.gfd", new iCallBack()
+ ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/gcb3.gfd", new iCallBack()
{
public void Callback(Object obj)
{
CameraPane.capsLocked = true;
Globals.setLIVE(false);
- Globals.WALK = true;
+ Globals.WALK = false;
LoadIt(obj);
}
@@ -1997,86 +2306,7 @@
});
}
});
-
- fullscenePanel.Return();
-
- fullscenePanel.add(fullsceneButton = GetButton("fullscenes/london.png", !Globals.NIMBUSLAF));
- fullsceneButton.setToolTipText("Old London!");
- fullsceneButton.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/oldlondon.gfd", new iCallBack()
- {
-
- public void Callback(Object obj)
- {
- CameraPane.capsLocked = true;
- Globals.setLIVE(false);
- Globals.WALK = true;
- LoadIt(obj);
- }
-
- public void DragGesture()
- {
- }
- });
- }
- });
-
- fullscenePanel.add(fullsceneButton = GetButton("fullscenes/skullcove.png", !Globals.NIMBUSLAF));
- fullsceneButton.setToolTipText("Skull Cove Island!");
- fullsceneButton.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/SkullCoveIsland.gfd", new iCallBack()
- {
-
- public void Callback(Object obj)
- {
- CameraPane.capsLocked = true;
- Globals.setLIVE(true);
- Globals.WALK = true;
- LoadIt(obj);
- }
-
- public void DragGesture()
- {
- }
- });
- }
- });
-
- fullscenePanel.Return();
-
- fullscenePanel.add(fullsceneButton = GetButton("fullscenes/tuscany.png", !Globals.NIMBUSLAF));
- fullsceneButton.setToolTipText("Tuscany!");
- fullsceneButton.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/Tuscany.gfd", new iCallBack()
- {
-
- public void Callback(Object obj)
- {
- CameraPane.capsLocked = true;
- Globals.setLIVE(true);
- Globals.WALK = true;
- LoadIt(obj);
- }
-
- public void DragGesture()
- {
- }
- });
- }
- });
-
+
fullscenePanel.add(fullsceneButton = GetButton("fullscenes/urbanfuture3.png", !Globals.NIMBUSLAF));
fullsceneButton.setToolTipText("Urban Future!");
fullsceneButton.addActionListener(new ActionListener()
@@ -2101,8 +2331,6 @@
});
}
});
-
- fullscenePanel.Return();
fullscenePanel.add(fullsceneButton = GetButton("fullscenes/urbanfuture4.png", !Globals.NIMBUSLAF));
fullsceneButton.setToolTipText("Street Level!");
@@ -2129,85 +2357,6 @@
}
});
- fullscenePanel.add(fullsceneButton = GetButton("fullscenes/venice.png", !Globals.NIMBUSLAF));
- fullsceneButton.setToolTipText("Venice!");
- fullsceneButton.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/Venice.gfd", new iCallBack()
- {
-
- public void Callback(Object obj)
- {
- CameraPane.capsLocked = true;
- Globals.setLIVE(true);
- Globals.WALK = true;
- LoadIt(obj);
- }
-
- public void DragGesture()
- {
- }
- });
- }
- });
-
- fullscenePanel.Return();
-
- fullscenePanel.add(fullsceneButton = GetButton("fullscenes/viking.png", !Globals.NIMBUSLAF));
- fullsceneButton.setToolTipText("Viking Village!");
- fullsceneButton.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/VikingVillage.gfd", new iCallBack()
- {
-
- public void Callback(Object obj)
- {
- CameraPane.capsLocked = true;
- Globals.setLIVE(false);
- Globals.WALK = true;
- LoadIt(obj);
- }
-
- public void DragGesture()
- {
- }
- });
- }
- });
-
- fullscenePanel.add(fullsceneButton = GetButton("fullscenes/yvoire.png", !Globals.NIMBUSLAF));
- fullsceneButton.setToolTipText("Yvoire!");
- fullsceneButton.addActionListener(new ActionListener()
- {
- @Override
- public void actionPerformed(ActionEvent e)
- {
- ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/Yvoire.gfd", new iCallBack()
- {
-
- public void Callback(Object obj)
- {
- CameraPane.capsLocked = true;
- Globals.setLIVE(false);
- Globals.WALK = true;
- LoadIt(obj);
- }
-
- public void DragGesture()
- {
- }
- });
- }
- });
-
- fullscenePanel.Return();
-
sceneTabbedPane.add(optionsPanel);
scenePanel.add(sceneTabbedPane);
@@ -3420,7 +3569,7 @@
//? flashIt = false;
CameraPane pane = (CameraPane) cameraView;
pane.clickStart(location.x, location.y, 0, 0);
- pane.clickEnd(location.x, location.y, 0, true);
+ pane.clickEnd(location.x, location.y, 0, 0, true);
if (group.selection.size() == 1)
{
@@ -6788,7 +6937,7 @@
cGridBag materialPanel;
cGridBag ctrlPanel;
cGridBag figurePanel;
- cGridBag fullscenePanel;
+ //cGridBag fullscenePanel;
JScrollPane infoPanel;
--
Gitblit v1.6.2