Normand Briere
2019-10-01 65bdec7ae2c99ca2102c55f92bd62b48c9f14847
Disable project on ground + adam/eve/tom
2 files modified
2 files added
67 ■■■■ changed files
ObjEditor.java 65 ●●●● patch | view | raw | blame | history
Object3D.java 2 ●●● patch | view | raw | blame | history
fullscenes/adameve.png patch | view | raw | blame | history
fullscenes/tom.png patch | view | raw | blame | history
ObjEditor.java
....@@ -1977,7 +1977,53 @@
19771977 });
19781978 }
19791979 });
1980
-
1980
+
1981
+ fullscenePanel.add(fullsceneButton = GetButton("fullscenes/urbanfuture3.png", !Globals.NIMBUSLAF));
1982
+ fullsceneButton.setToolTipText("Urban Future!");
1983
+ fullsceneButton.addActionListener(new ActionListener()
1984
+ {
1985
+ @Override
1986
+ public void actionPerformed(ActionEvent e)
1987
+ {
1988
+ ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/uf3.gfd", new iCallBack()
1989
+ {
1990
+
1991
+ public void Callback(Object obj)
1992
+ {
1993
+ LoadIt(obj);
1994
+ }
1995
+
1996
+ public void DragGesture()
1997
+ {
1998
+ }
1999
+ });
2000
+ }
2001
+ });
2002
+
2003
+ fullscenePanel.Return();
2004
+
2005
+ fullscenePanel.add(fullsceneButton = GetButton("fullscenes/urbanfuture4.png", !Globals.NIMBUSLAF));
2006
+ fullsceneButton.setToolTipText("Street Level!");
2007
+ fullsceneButton.addActionListener(new ActionListener()
2008
+ {
2009
+ @Override
2010
+ public void actionPerformed(ActionEvent e)
2011
+ {
2012
+ ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/uf4.gfd", new iCallBack()
2013
+ {
2014
+
2015
+ public void Callback(Object obj)
2016
+ {
2017
+ LoadIt(obj);
2018
+ }
2019
+
2020
+ public void DragGesture()
2021
+ {
2022
+ }
2023
+ });
2024
+ }
2025
+ });
2026
+
19812027 fullscenePanel.add(fullsceneButton = GetButton("fullscenes/venice.png", !Globals.NIMBUSLAF));
19822028 fullsceneButton.setToolTipText("Venice!");
19832029 fullsceneButton.addActionListener(new ActionListener()
....@@ -2047,15 +2093,15 @@
20472093 });
20482094
20492095 fullscenePanel.Return();
2050
-
2051
- fullscenePanel.add(fullsceneButton = GetButton("fullscenes/urbanfuture3.png", !Globals.NIMBUSLAF));
2052
- fullsceneButton.setToolTipText("Urban Future!");
2096
+
2097
+ fullscenePanel.add(fullsceneButton = GetButton("fullscenes/tom.png", !Globals.NIMBUSLAF));
2098
+ fullsceneButton.setToolTipText("Tom!");
20532099 fullsceneButton.addActionListener(new ActionListener()
20542100 {
20552101 @Override
20562102 public void actionPerformed(ActionEvent e)
20572103 {
2058
- ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/uf3.gfd", new iCallBack()
2104
+ ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/tom.gfd", new iCallBack()
20592105 {
20602106
20612107 public void Callback(Object obj)
....@@ -2070,14 +2116,14 @@
20702116 }
20712117 });
20722118
2073
- fullscenePanel.add(fullsceneButton = GetButton("fullscenes/urbanfuture4.png", !Globals.NIMBUSLAF));
2074
- fullsceneButton.setToolTipText("Street Level!");
2119
+ fullscenePanel.add(fullsceneButton = GetButton("fullscenes/adameve.png", !Globals.NIMBUSLAF));
2120
+ fullsceneButton.setToolTipText("Adam and Eve!");
20752121 fullsceneButton.addActionListener(new ActionListener()
20762122 {
20772123 @Override
20782124 public void actionPerformed(ActionEvent e)
20792125 {
2080
- ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/uf4.gfd", new iCallBack()
2126
+ ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/adameve.gfd", new iCallBack()
20812127 {
20822128
20832129 public void Callback(Object obj)
....@@ -2094,9 +2140,6 @@
20942140
20952141 fullscenePanel.Return();
20962142
2097
- fullscenePanel.add(new cGridBag());
2098
- fullscenePanel.add(new cGridBag());
2099
- fullscenePanel.Return();
21002143 fullscenePanel.add(new cGridBag());
21012144 fullscenePanel.add(new cGridBag());
21022145
Object3D.java
....@@ -6200,7 +6200,7 @@
62006200 // System.err.println("Draw " + this + " Frame # " + ((Mocap)((Merge)support).object).frame);
62016201 }
62026202
6203
- if (live && Link2Support() && support == null && !this.marked) // project on ground
6203
+ if (false) // live && Link2Support() && support == null && !this.marked) // project on ground
62046204 {
62056205 getBounds(minima, maxima, true);
62066206 center.x = (minima.x + maxima.x) / 2;
fullscenes/adameve.png
Binary files differ
fullscenes/tom.png
Binary files differ