From 65bdec7ae2c99ca2102c55f92bd62b48c9f14847 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Tue, 01 Oct 2019 17:30:29 -0400
Subject: [PATCH] Disable project on ground + adam/eve/tom
---
ObjEditor.java | 65 +++++++++++++++++++++++++++-----
fullscenes/tom.png | 0
fullscenes/adameve.png | 0
Object3D.java | 2
4 files changed, 55 insertions(+), 12 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index ed17507..8d2ff7b 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -1977,7 +1977,53 @@
});
}
});
-
+
+ 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.Return();
+
+ 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.add(fullsceneButton = GetButton("fullscenes/venice.png", !Globals.NIMBUSLAF));
fullsceneButton.setToolTipText("Venice!");
fullsceneButton.addActionListener(new ActionListener()
@@ -2047,15 +2093,15 @@
});
fullscenePanel.Return();
-
- fullscenePanel.add(fullsceneButton = GetButton("fullscenes/urbanfuture3.png", !Globals.NIMBUSLAF));
- fullsceneButton.setToolTipText("Urban Future!");
+
+ fullscenePanel.add(fullsceneButton = GetButton("fullscenes/tom.png", !Globals.NIMBUSLAF));
+ fullsceneButton.setToolTipText("Tom!");
fullsceneButton.addActionListener(new ActionListener()
{
@Override
public void actionPerformed(ActionEvent e)
{
- ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/uf3.gfd", new iCallBack()
+ ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/tom.gfd", new iCallBack()
{
public void Callback(Object obj)
@@ -2070,14 +2116,14 @@
}
});
- fullscenePanel.add(fullsceneButton = GetButton("fullscenes/urbanfuture4.png", !Globals.NIMBUSLAF));
- fullsceneButton.setToolTipText("Street Level!");
+ fullscenePanel.add(fullsceneButton = GetButton("fullscenes/adameve.png", !Globals.NIMBUSLAF));
+ fullsceneButton.setToolTipText("Adam and Eve!");
fullsceneButton.addActionListener(new ActionListener()
{
@Override
public void actionPerformed(ActionEvent e)
{
- ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/uf4.gfd", new iCallBack()
+ ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/adameve.gfd", new iCallBack()
{
public void Callback(Object obj)
@@ -2094,9 +2140,6 @@
fullscenePanel.Return();
- fullscenePanel.add(new cGridBag());
- fullscenePanel.add(new cGridBag());
- fullscenePanel.Return();
fullscenePanel.add(new cGridBag());
fullscenePanel.add(new cGridBag());
diff --git a/Object3D.java b/Object3D.java
index 7a66915..abd4fbd 100644
--- a/Object3D.java
+++ b/Object3D.java
@@ -6200,7 +6200,7 @@
// System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
}
- if (live && Link2Support() && support == null && !this.marked) // project on ground
+ if (false) // live && Link2Support() && support == null && !this.marked) // project on ground
{
getBounds(minima, maxima, true);
center.x = (minima.x + maxima.x) / 2;
diff --git a/fullscenes/adameve.png b/fullscenes/adameve.png
new file mode 100644
index 0000000..3c1fc5c
--- /dev/null
+++ b/fullscenes/adameve.png
Binary files differ
diff --git a/fullscenes/tom.png b/fullscenes/tom.png
new file mode 100644
index 0000000..6c7c2ea
--- /dev/null
+++ b/fullscenes/tom.png
Binary files differ
--
Gitblit v1.6.2