parent: 3d30e720 | patch | commit
Normand Briere
2019-12-25 294eab460cb3292d17576d3be2e07f1e369a2bc3 
Camera improvements + new scenes.
7 files modified
5 files added
608 ■■■■■ changed files
Camera.java 2 ●●●●● patch | view | raw | blame | history
CameraPane.java 95 ●●●●● patch | view | raw | blame | history
Grafreed.java 6 ●●●●● patch | view | raw | blame | history
GroupEditor.java 2 ●●●●● patch | view | raw | blame | history
ObjEditor.java 503 ●●●●● patch | view | raw | blame | history
fullscenes/GCB2.png patch | view | raw | blame | history
fullscenes/GCB3.png patch | view | raw | blame | history
fullscenes/SandyBay.png patch | view | raw | blame | history
fullscenes/UrbanSprawl.png patch | view | raw | blame | history
fullscenes/desertmotel.png patch | view | raw | blame | history
fullscenes/ninja.png patch | view | raw | blame | history
fullscenes/urbanfuture4.png patch | view | raw | blame | history 
 Camera.java
....@@ -292,6 +292,8 @@
292292 		
293293                 if (scale == 0)
294294                 {
295
+                    // Mouse wheel in edit mode
296
+                    
295297                     // Zoom
296298                     double factor = Math.exp(-dy/300.0); // (1 + dy/100);
297299 


 CameraPane.java
....@@ -10895,7 +10895,7 @@
1089510895             {
1089610896                 //pingthread.mute = true;
1089710897         
10898
-                if (capsLocked)
10898
+                if (true) // capsLocked)
1089910899                 {
1090010900                     boolean keyon = false;
1090110901 
....@@ -14658,7 +14658,7 @@
1465814658             (e.getModifiersEx() & COMMAND) != 0) // || IsFrozen())
1465914659         {
1466014660             //System.out.println("mouseDragged: " + e);
14661
-            clickEnd(e.getX(), e.getY(), e.getModifiersEx());
14661
+            clickEnd(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1466214662         }
1466314663         else
1466414664             drag(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
....@@ -15034,14 +15034,16 @@
1503415034         }
1503515035     }
1503615036     
15037
+    float SCALE = 1;
15038
+    
1503715039     void GoDown(int mod)
1503815040     {
1503915041         LA.vecSub(manipCamera.location, manipCamera.lookAt, manipCamera.direction);
1504015042         float scale = (float)manipCamera.direction.length() / 10;
1504115043         
15042
-        if (!capsLocked)
15044
+        //if (!capsLocked)
1504315045         {
15044
-            scale = 50;
15046
+            scale = SCALE;
1504515047         }
1504615048 
1504715049         MODIFIERS |= COMMAND;
....@@ -15062,7 +15064,7 @@
1506215064             if (isVR)
1506315065                 manipCamera.BackForth(0, -speed*delta*scale, isVR?1000:0); // getWidth());
1506415066             else
15065
-                manipCamera.RotatePosition(0, -speed*scale);
15067
+                manipCamera.RotatePosition(0, speed*scale*8/manipCamera.shaper_fovy);
1506615068         }
1506715069         
1506815070         /**/
....@@ -15085,9 +15087,9 @@
1508515087         LA.vecSub(manipCamera.location, manipCamera.lookAt, manipCamera.direction);
1508615088         float scale = (float)manipCamera.direction.length() / 10;
1508715089         
15088
-        if (!capsLocked)
15090
+        //if (!capsLocked)
1508915091         {
15090
-            scale = 50;
15092
+            scale = SCALE;
1509115093         }
1509215094 
1509315095                 RigidBody.justclicked = true;
....@@ -15111,7 +15113,7 @@
1511115113             if (isVR)
1511215114                 manipCamera.BackForth(0, speed*delta*scale, isVR?1000:0); // getWidth());
1511315115             else
15114
-                manipCamera.RotatePosition(0, speed*scale);
15116
+                manipCamera.RotatePosition(0, -speed*scale*(capsLocked?manipCamera.shaper_fovy/90:8/manipCamera.shaper_fovy));
1511515117         }
1511615118         
1511715119         /**/
....@@ -15134,9 +15136,9 @@
1513415136         LA.vecSub(manipCamera.location, manipCamera.lookAt, manipCamera.direction);
1513515137         float scale = (float)manipCamera.direction.length() / 10;
1513615138         
15137
-        if (!capsLocked)
15139
+        //if (!capsLocked)
1513815140         {
15139
-            scale = 50;
15141
+            scale = SCALE;
1514015142         }
1514115143 
1514215144         MODIFIERS |= COMMAND;
....@@ -15146,9 +15148,9 @@
1514615148         else
1514715149         {
1514815150             if ((mouseMode&VR)!=0)
15149
-                manipCamera.RotateInterest(-speed*scale*manipCamera.shaper_fovy/90, 0);
15151
+                manipCamera.RotateInterest(-speed*scale*(capsLocked?manipCamera.shaper_fovy/90:8/manipCamera.shaper_fovy), 0);
1515015152             else
15151
-                manipCamera.RotatePosition(speed*scale*manipCamera.shaper_fovy/90, 0);
15153
+                manipCamera.RotatePosition(-speed*scale*(capsLocked?manipCamera.shaper_fovy/90:8/manipCamera.shaper_fovy), 0);
1515215154         }
1515315155         
1515415156         /**/
....@@ -15174,9 +15176,9 @@
1517415176         LA.vecSub(manipCamera.location, manipCamera.lookAt, manipCamera.direction);
1517515177         float scale = (float)manipCamera.direction.length() / 10;
1517615178         
15177
-        if (!capsLocked)
15179
+        //if (!capsLocked)
1517815180         {
15179
-            scale = 50;
15181
+            scale = SCALE;
1518015182         }
1518115183 
1518215184         MODIFIERS |= COMMAND;
....@@ -15186,9 +15188,9 @@
1518615188         else
1518715189         {
1518815190             if ((mouseMode&VR)!=0)
15189
-                manipCamera.RotateInterest(speed*scale*manipCamera.shaper_fovy/90, 0);
15191
+                manipCamera.RotateInterest(speed*scale*(capsLocked?manipCamera.shaper_fovy/90:8/manipCamera.shaper_fovy), 0);
1519015192             else
15191
-                manipCamera.RotatePosition(-speed*scale*manipCamera.shaper_fovy/90, 0);
15193
+                manipCamera.RotatePosition(speed*scale*(capsLocked?manipCamera.shaper_fovy/90:8/manipCamera.shaper_fovy), 0);
1519215194         }
1519315195         
1519415196         /**/
....@@ -15341,12 +15343,13 @@
1534115343                     }
1534215344                     else
1534315345                     if ((mouseMode & VR) != 0)
15344
-                        manipCamera.BackForth(dx, dy, getWidth());
15346
+                        manipCamera.BackForth(dx, dy, -getWidth());
1534515347                     else
1534615348                         manipCamera.BackForth(dx, dy, 0);
1534715349                 }
1534815350                 if ((mouseMode & BACKFORTH) != 0)
1534915351                 {
15352
+                    Grafreed.SystemExit("mouseMode & BACKFORTH");
1535015353                     if (manipCamera != lightCamera)
1535115354                     {
1535215355                         manipCamera.BackForth(dx, dy, getWidth());
....@@ -15357,7 +15360,7 @@
1535715360                 }
1535815361                 if ((mouseMode & TRANSLATE) != 0)
1535915362                 {
15360
-                    manipCamera.Translate(dx, dy, getWidth());
15363
+                    manipCamera.Translate(dx, dy, getWidth()*(capsLocked?-1:1));
1536115364                 }
1536215365                 else
1536315366                 if ((mouseMode & ZOOM) == 0 && (mouseMode & VR) != 0)
....@@ -15453,15 +15456,15 @@
1545315456         X = 0; // getBounds().width/2;
1545415457         Y = 0; // getBounds().height/2;
1545515458         //System.out.println("mouseReleased: " + e);
15456
-        clickEnd(e.getX(), e.getY(), e.getModifiersEx());
15459
+        clickEnd(e.getX(), e.getY(), e.getModifiers(), e.getModifiersEx());
1545715460     }
1545815461 
15459
-    void clickEnd(int x, int y, int modifiers)
15462
+    void clickEnd(int x, int y, int modifiers, int modifiersex)
1546015463     {
15461
-        clickEnd(x, y, modifiers, false);
15464
+        clickEnd(x, y, modifiers, modifiersex, false);
1546215465     }
1546315466 
15464
-    void clickEnd(int x, int y, int modifiers, boolean timeout)
15467
+    void clickEnd(int x, int y, int modifiers, int modifiersex, boolean timeout)
1546515468     {
1546615469    //     System.out.println("clickEnd: " + modifiers);
1546715470 
....@@ -15471,8 +15474,8 @@
1547115474         
1547215475         timeout |= hold || forcetranslate;
1547315476 
15474
-        boolean control = ((modifiers & CTRL) != 0); // june 2013: for point selection
15475
-        boolean command = ((modifiers & COMMAND) != 0); // june 2013: for multiple selection
15477
+        boolean control = ((modifiersex & CTRL) != 0); // june 2013: for point selection
15478
+        boolean command = ((modifiersex & COMMAND) != 0); // june 2013: for multiple selection
1547615479         
1547715480 // No delay        if (control || command || IsFrozen())
1547815481             timeout = true;
....@@ -15496,14 +15499,18 @@
1549615499 
1549715500             selection = true;
1549815501             
15499
-            if (control)
15502
+            if (control || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
15503
+            {
1550015504                 pointselection = true;
15505
+
15506
+                //mouseMode &= ~TRANSLATE;
15507
+            }
1550115508             
15502
-            if (modifiers != 0)
15509
+            if (modifiersex != 0)
1550315510             {
1550415511                // System.out.println("modifiers = " + modifiers);
1550515512             }
15506
-            deselect = (modifiers == 0); // || control;
15513
+            deselect = (modifiersex == 0); // || control;
1550715514             //if (control)
1550815515             //{
1550915516             //    selectX = x;
....@@ -15610,7 +15617,7 @@
1561015617         {
1561115618             mouseMode |= VR; // BACKFORTH;
1561215619         }
15613
-        if ((modifiersex & CTRLCLICK) == CTRLCLICK)
15620
+        if ((modifiersex & CTRLCLICK) == CTRLCLICK) // || (modifiers & MouseEvent.BUTTON3_MASK) != 0)
1561415621         {
1561515622             mouseMode |= SELECT;
1561615623         }
....@@ -16146,13 +16153,13 @@
1614616153                 Globals.ONESTEP = true;
1614716154                 repaint();
1614816155                 break;
16149
-//            case BACKSPACE:
16150
-//                // almost working enablebackspace = true;
16151
-//                Globals.WALK ^= true;
16152
-//                
16153
-//   //             SwitchCameras(false);
16154
-//                repaint();
16155
-//                break;
16156
+            case BACKSPACE:
16157
+                // almost working enablebackspace = true;
16158
+                Globals.WALK ^= true;
16159
+                
16160
+   //             SwitchCameras(false);
16161
+                repaint();
16162
+                break;
1615616163 
1615716164             default:
1615816165                 return (false);
....@@ -16184,7 +16191,7 @@
1618416191             case KeyEvent.KEY_PRESSED:
1618516192                 boolean repaintit = false;
1618616193                 
16187
-                if (capsLocked)
16194
+                if (true) // capsLocked)
1618816195                 {
1618916196                     keys[e.getKeyCode()] = true;
1619016197                     modifiers = e.getModifiersEx();
....@@ -16199,24 +16206,24 @@
1619916206                         switch (e.getKeyCode())
1620016207                         {
1620116208                             case DOWN_ARROW:
16202
-                                lightCamera.DECAL /= 2;
16209
+                                lightCamera.DECAL /= 1.1;
1620316210                                 repaintit = true;
1620416211                                 break;
1620516212                             case UP_ARROW:
16206
-                                lightCamera.DECAL *= 2;
16213
+                                lightCamera.DECAL *= 1.1;
1620716214                                 repaintit = true;
1620816215                                 break;
1620916216                             case LEFT_ARROW:
16210
-                                lightCamera.SCALE /= 2;
16217
+                                lightCamera.SCALE /= 1.1;
1621116218                                 repaintit = true;
1621216219                                 break;
1621316220                             case RIGHT_ARROW:
16214
-                                lightCamera.SCALE *= 2;
16221
+                                lightCamera.SCALE *= 1.1;
1621516222                                 repaintit = true;
1621616223                                 break;
1621716224                             default:
16218
-                                modifiers = e.getModifiersEx();
16219
-                                repaintit = keyPressed(e.getKeyChar(), modifiers);
16225
+                            //    modifiers = e.getModifiersEx();
16226
+                            //    repaintit = keyPressed(e.getKeyChar(), modifiers);
1622016227                                 break;
1622116228                         }
1622216229 
....@@ -17095,7 +17102,7 @@
1709517102         {
1709617103             modifiers |= SHIFT;
1709717104         }
17098
-        clickEnd(x, y, modifiers);
17105
+        clickEnd(x, y, modifiers, 0); // modifiersex? 
1709917106         if (modifiers != 0)
1710017107         {
1710117108             keyReleased(0, modifiers);
....@@ -17750,7 +17757,7 @@
1775017757 
1775117758             float depth = depths[y * TEX_SIZE + x];
1775217759 
17753
-            if (pointselection && (mouseMode & SELECT) == SELECT && depth != 0 && depth != 1)
17760
+            if (pointselection && ((mouseMode & SELECT) == SELECT || (mouseMode & TRANSLATE) == TRANSLATE) && depth != 0 && depth != 1)
1775417761             {
1775517762                 pointselection = false;
1775617763                 


 Grafreed.java
....@@ -40,6 +40,12 @@
4040 //import com.jamonapi.*;
4141 public class Grafreed extends Applet implements ActionListener
4242 {        
43
+    static void SystemExit(String string)
44
+    {
45
+        System.out.println(string);
46
+        System.exit(0);
47
+    }
48
+    
4349     static int RENDERME = 0;
4450 
4551     static boolean epsequal = false;


 GroupEditor.java
....@@ -1823,7 +1823,7 @@
18231823                     flashIt = false;
18241824                     CameraPane pane = (CameraPane) target;
18251825                     pane.clickStart(objEditor.location.x, objEditor.location.y, 0, 0);
1826
-                    pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, true);
1826
+                    pane.clickEnd(objEditor.location.x, objEditor.location.y, 0, 0, true);
18271827                     
18281828                     if (group.selection.size() == 1)
18291829                     {


 ObjEditor.java
....@@ -1889,12 +1889,315 @@
18891889         AddOptions(optionsPanel); //, aConstraints);
18901890         
18911891         sceneTabbedPane.add(FSPane = new cFileSystemPane(this));
1892
-
1893
-        fullscenePanel = new cGridBag();
1894
-        fullscenePanel.setName("Download");
1895
-        sceneTabbedPane.add(fullscenePanel);
1892
+      
1893
+        JTabbedPane fullscenePane = new JTabbedPane(JTabbedPane.LEFT);
18961894         
1895
+        fullscenePane.setName("Download");
1896
+        sceneTabbedPane.add(fullscenePane);
1897
+        
1898
+        cGridBag fullscenePanel;
18971899         cButton fullsceneButton;
1900
+        
1901
+        fullscenePanel = new cGridBag().setVertical(true);
1902
+        fullscenePanel.setName("Actual");
1903
+        
1904
+        fullscenePane.add(fullscenePanel);
1905
+        
1906
+        fullscenePanel.add(fullsceneButton = GetButton("fullscenes/alsace.png", !Globals.NIMBUSLAF));
1907
+        fullsceneButton.setToolTipText("Alsace!");
1908
+        fullsceneButton.addActionListener(new ActionListener()
1909
+        {
1910
+                @Override
1911
+                public void actionPerformed(ActionEvent e)
1912
+                {
1913
+                    ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/Alsace.gfd", new iCallBack()
1914
+                    {
1915
+
1916
+                        public void Callback(Object obj)
1917
+                        {
1918
+                            CameraPane.capsLocked = true;
1919
+                            Globals.setLIVE(false);
1920
+                            Globals.WALK = true;
1921
+                            LoadIt(obj);
1922
+                        }
1923
+
1924
+                        public void DragGesture()
1925
+                        {
1926
+                        }
1927
+                    });
1928
+                }
1929
+        });
1930
+
1931
+        fullscenePanel.add(fullsceneButton = GetButton("fullscenes/london.png", !Globals.NIMBUSLAF));
1932
+        fullsceneButton.setToolTipText("Old London!");
1933
+        fullsceneButton.addActionListener(new ActionListener()
1934
+        {
1935
+                @Override
1936
+                public void actionPerformed(ActionEvent e)
1937
+                {
1938
+                    ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/oldlondon.gfd", new iCallBack()
1939
+                    {
1940
+
1941
+                        public void Callback(Object obj)
1942
+                        {
1943
+                            CameraPane.capsLocked = true;
1944
+                            Globals.setLIVE(false);
1945
+                            Globals.WALK = true;
1946
+                            LoadIt(obj);
1947
+                        }
1948
+
1949
+                        public void DragGesture()
1950
+                        {
1951
+                        }
1952
+                    });
1953
+                }
1954
+        });
1955
+        
1956
+        fullscenePanel.add(fullsceneButton = GetButton("fullscenes/tuscany.png", !Globals.NIMBUSLAF));
1957
+        fullsceneButton.setToolTipText("Tuscany!");
1958
+        fullsceneButton.addActionListener(new ActionListener()
1959
+        {
1960
+                @Override
1961
+                public void actionPerformed(ActionEvent e)
1962
+                {
1963
+                    ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/Tuscany.gfd", new iCallBack()
1964
+                    {
1965
+
1966
+                        public void Callback(Object obj)
1967
+                        {
1968
+                            CameraPane.capsLocked = true;
1969
+                            Globals.setLIVE(true);
1970
+                            Globals.WALK = true;
1971
+                            LoadIt(obj);
1972
+                        }
1973
+
1974
+                        public void DragGesture()
1975
+                        {
1976
+                        }
1977
+                    });
1978
+                }
1979
+        });
1980
+        
1981
+//        fullscenePanel.add(fullsceneButton = GetButton("fullscenes/venice.png", !Globals.NIMBUSLAF));
1982
+//        fullsceneButton.setToolTipText("Venice!");
1983
+//        fullsceneButton.addActionListener(new ActionListener()
1984
+//        {
1985
+//                @Override
1986
+//                public void actionPerformed(ActionEvent e)
1987
+//                {
1988
+//                    ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/Venice.gfd", new iCallBack()
1989
+//                    {
1990
+//
1991
+//                        public void Callback(Object obj)
1992
+//                        {
1993
+//                            CameraPane.capsLocked = true;
1994
+//                            Globals.setLIVE(true);
1995
+//                            Globals.WALK = true;
1996
+//                            LoadIt(obj);
1997
+//                        }
1998
+//
1999
+//                        public void DragGesture()
2000
+//                        {
2001
+//                        }
2002
+//                    });
2003
+//                }
2004
+//        });
2005
+        
2006
+        fullscenePanel.add(fullsceneButton = GetButton("fullscenes/yvoire.png", !Globals.NIMBUSLAF));
2007
+        fullsceneButton.setToolTipText("Yvoire!");
2008
+        fullsceneButton.addActionListener(new ActionListener()
2009
+        {
2010
+                @Override
2011
+                public void actionPerformed(ActionEvent e)
2012
+                {
2013
+                    ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/Yvoire.gfd", new iCallBack()
2014
+                    {
2015
+
2016
+                        public void Callback(Object obj)
2017
+                        {
2018
+                            CameraPane.capsLocked = true;
2019
+                            Globals.setLIVE(false);
2020
+                            Globals.WALK = true;
2021
+                            LoadIt(obj);
2022
+                        }
2023
+
2024
+                        public void DragGesture()
2025
+                        {
2026
+                        }
2027
+                    });
2028
+                }
2029
+        });
2030
+                        
2031
+        fullscenePanel = new cGridBag().setVertical(true);
2032
+        fullscenePanel.setName("Cities");
2033
+        
2034
+        fullscenePane.add(fullscenePanel);
2035
+        
2036
+        fullscenePanel.add(fullsceneButton = GetButton("fullscenes/desertmotel.png", !Globals.NIMBUSLAF));
2037
+        fullsceneButton.setToolTipText("Desert Motel!");
2038
+        fullsceneButton.addActionListener(new ActionListener()
2039
+        {
2040
+                @Override
2041
+                public void actionPerformed(ActionEvent e)
2042
+                {
2043
+                    ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/DesertMotel.gfd", new iCallBack()
2044
+                    {
2045
+
2046
+                        public void Callback(Object obj)
2047
+                        {
2048
+                            CameraPane.capsLocked = true;
2049
+                            Globals.setLIVE(false);
2050
+                            Globals.WALK = true;
2051
+                            LoadIt(obj);
2052
+                        }
2053
+
2054
+                        public void DragGesture()
2055
+                        {
2056
+                        }
2057
+                    });
2058
+                }
2059
+        });
2060
+                
2061
+        fullscenePanel.add(fullsceneButton = GetButton("fullscenes/SandyBay.png", !Globals.NIMBUSLAF));
2062
+        fullsceneButton.setToolTipText("Sandy Bay!");
2063
+        fullsceneButton.addActionListener(new ActionListener()
2064
+        {
2065
+                @Override
2066
+                public void actionPerformed(ActionEvent e)
2067
+                {
2068
+                    ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/SandyBay.gfd", new iCallBack()
2069
+                    {
2070
+
2071
+                        public void Callback(Object obj)
2072
+                        {
2073
+                            CameraPane.capsLocked = true;
2074
+                            Globals.setLIVE(false);
2075
+                            Globals.WALK = true;
2076
+                            LoadIt(obj);
2077
+                        }
2078
+
2079
+                        public void DragGesture()
2080
+                        {
2081
+                        }
2082
+                    });
2083
+                }
2084
+        });
2085
+
2086
+        fullscenePanel.add(fullsceneButton = GetButton("fullscenes/UrbanSprawl.png", !Globals.NIMBUSLAF));
2087
+        fullsceneButton.setToolTipText("Urban Sprawl!");
2088
+        fullsceneButton.addActionListener(new ActionListener()
2089
+        {
2090
+                @Override
2091
+                public void actionPerformed(ActionEvent e)
2092
+                {
2093
+                    ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/UrbanSprawl.gfd", new iCallBack()
2094
+                    {
2095
+
2096
+                        public void Callback(Object obj)
2097
+                        {
2098
+                            CameraPane.capsLocked = true;
2099
+                            Globals.setLIVE(false);
2100
+                            Globals.WALK = true;
2101
+                            LoadIt(obj);
2102
+                        }
2103
+
2104
+                        public void DragGesture()
2105
+                        {
2106
+                        }
2107
+                    });
2108
+                }
2109
+        });
2110
+
2111
+        // Medieval City
2112
+        fullscenePanel.add(new cGridBag());
2113
+        
2114
+        fullscenePanel = new cGridBag().setVertical(true);
2115
+        fullscenePanel.setName("Fictive");
2116
+        
2117
+        fullscenePane.add(fullscenePanel);
2118
+        
2119
+        fullscenePanel.add(fullsceneButton = GetButton("fullscenes/ninja.png", !Globals.NIMBUSLAF));
2120
+        fullsceneButton.setToolTipText("Ninja Village!");
2121
+        fullsceneButton.addActionListener(new ActionListener()
2122
+        {
2123
+                @Override
2124
+                public void actionPerformed(ActionEvent e)
2125
+                {
2126
+                    ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/NinjaVillage.gfd", new iCallBack()
2127
+                    {
2128
+
2129
+                        public void Callback(Object obj)
2130
+                        {
2131
+                            CameraPane.capsLocked = true;
2132
+                            Globals.setLIVE(false);
2133
+                            Globals.WALK = true;
2134
+                            LoadIt(obj);
2135
+                        }
2136
+
2137
+                        public void DragGesture()
2138
+                        {
2139
+                        }
2140
+                    });
2141
+                }
2142
+        });
2143
+
2144
+        fullscenePanel.add(fullsceneButton = GetButton("fullscenes/skullcove.png", !Globals.NIMBUSLAF));
2145
+        fullsceneButton.setToolTipText("Skull Cove Island!");
2146
+        fullsceneButton.addActionListener(new ActionListener()
2147
+        {
2148
+                @Override
2149
+                public void actionPerformed(ActionEvent e)
2150
+                {
2151
+                    ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/SkullCoveIsland.gfd", new iCallBack()
2152
+                    {
2153
+
2154
+                        public void Callback(Object obj)
2155
+                        {
2156
+                            CameraPane.capsLocked = true;
2157
+                            Globals.setLIVE(true);
2158
+                            Globals.WALK = true;
2159
+                            LoadIt(obj);
2160
+                        }
2161
+
2162
+                        public void DragGesture()
2163
+                        {
2164
+                        }
2165
+                    });
2166
+                }
2167
+        });
2168
+                
2169
+        fullscenePanel.add(fullsceneButton = GetButton("fullscenes/viking.png", !Globals.NIMBUSLAF));
2170
+        fullsceneButton.setToolTipText("Viking Village!");
2171
+        fullsceneButton.addActionListener(new ActionListener()
2172
+        {
2173
+                @Override
2174
+                public void actionPerformed(ActionEvent e)
2175
+                {
2176
+                    ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/VikingVillage.gfd", new iCallBack()
2177
+                    {
2178
+
2179
+                        public void Callback(Object obj)
2180
+                        {
2181
+                            CameraPane.capsLocked = true;
2182
+                            Globals.setLIVE(false);
2183
+                            Globals.WALK = true;
2184
+                            LoadIt(obj);
2185
+                        }
2186
+
2187
+                        public void DragGesture()
2188
+                        {
2189
+                        }
2190
+                    });
2191
+                }
2192
+        });
2193
+
2194
+        // Skull Mountain
2195
+        fullscenePanel.add(new cGridBag());
2196
+        
2197
+        fullscenePanel = new cGridBag().setVertical(true);
2198
+        fullscenePanel.setName("Figures");
2199
+        
2200
+        fullscenePane.add(fullscenePanel);
18982201         
18992202         fullscenePanel.add(fullsceneButton = GetButton("fullscenes/tom.png", !Globals.NIMBUSLAF));
19002203         fullsceneButton.setToolTipText("Tom!");
....@@ -1946,23 +2249,29 @@
19462249                 }
19472250         });
19482251 
1949
-        fullscenePanel.Return();
2252
+        fullscenePanel.add(new cGridBag());
2253
+        fullscenePanel.add(new cGridBag());
19502254         
1951
-        fullscenePanel.add(fullsceneButton = GetButton("fullscenes/alsace.png", !Globals.NIMBUSLAF));
1952
-        fullsceneButton.setToolTipText("Alsace!");
2255
+        fullscenePanel = new cGridBag().setVertical(true);
2256
+        fullscenePanel.setName("Futuristic");
2257
+        
2258
+        fullscenePane.add(fullscenePanel);
2259
+        
2260
+        fullscenePanel.add(fullsceneButton = GetButton("fullscenes/GCB2.png", !Globals.NIMBUSLAF));
2261
+        fullsceneButton.setToolTipText("Greeble City II");
19532262         fullsceneButton.addActionListener(new ActionListener()
19542263         {
19552264                 @Override
19562265                 public void actionPerformed(ActionEvent e)
19572266                 {
1958
-                    ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/Alsace.gfd", new iCallBack()
2267
+                    ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/gcb2.gfd", new iCallBack()
19592268                     {
19602269 
19612270                         public void Callback(Object obj)
19622271                         {
19632272                             CameraPane.capsLocked = true;
19642273                             Globals.setLIVE(false);
1965
-                            Globals.WALK = true;
2274
+                            Globals.WALK = false;
19662275                             LoadIt(obj);
19672276                         }
19682277 
....@@ -1972,22 +2281,22 @@
19722281                     });
19732282                 }
19742283         });
1975
-
1976
-        fullscenePanel.add(fullsceneButton = GetButton("fullscenes/desertmotel.png", !Globals.NIMBUSLAF));
1977
-        fullsceneButton.setToolTipText("Desert Motel!");
2284
+    
2285
+        fullscenePanel.add(fullsceneButton = GetButton("fullscenes/GCB3.png", !Globals.NIMBUSLAF));
2286
+        fullsceneButton.setToolTipText("Greeble City III");
19782287         fullsceneButton.addActionListener(new ActionListener()
19792288         {
19802289                 @Override
19812290                 public void actionPerformed(ActionEvent e)
19822291                 {
1983
-                    ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/DesertMotel.gfd", new iCallBack()
2292
+                    ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/gcb3.gfd", new iCallBack()
19842293                     {
19852294 
19862295                         public void Callback(Object obj)
19872296                         {
19882297                             CameraPane.capsLocked = true;
19892298                             Globals.setLIVE(false);
1990
-                            Globals.WALK = true;
2299
+                            Globals.WALK = false;
19912300                             LoadIt(obj);
19922301                         }
19932302 
....@@ -1997,86 +2306,7 @@
19972306                     });
19982307                 }
19992308         });
2000
-        
2001
-        fullscenePanel.Return();
2002
-        
2003
-        fullscenePanel.add(fullsceneButton = GetButton("fullscenes/london.png", !Globals.NIMBUSLAF));
2004
-        fullsceneButton.setToolTipText("Old London!");
2005
-        fullsceneButton.addActionListener(new ActionListener()
2006
-        {
2007
-                @Override
2008
-                public void actionPerformed(ActionEvent e)
2009
-                {
2010
-                    ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/oldlondon.gfd", new iCallBack()
2011
-                    {
2012
-
2013
-                        public void Callback(Object obj)
2014
-                        {
2015
-                            CameraPane.capsLocked = true;
2016
-                            Globals.setLIVE(false);
2017
-                            Globals.WALK = true;
2018
-                            LoadIt(obj);
2019
-                        }
2020
-
2021
-                        public void DragGesture()
2022
-                        {
2023
-                        }
2024
-                    });
2025
-                }
2026
-        });
2027
-        
2028
-        fullscenePanel.add(fullsceneButton = GetButton("fullscenes/skullcove.png", !Globals.NIMBUSLAF));
2029
-        fullsceneButton.setToolTipText("Skull Cove Island!");
2030
-        fullsceneButton.addActionListener(new ActionListener()
2031
-        {
2032
-                @Override
2033
-                public void actionPerformed(ActionEvent e)
2034
-                {
2035
-                    ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/SkullCoveIsland.gfd", new iCallBack()
2036
-                    {
2037
-
2038
-                        public void Callback(Object obj)
2039
-                        {
2040
-                            CameraPane.capsLocked = true;
2041
-                            Globals.setLIVE(true);
2042
-                            Globals.WALK = true;
2043
-                            LoadIt(obj);
2044
-                        }
2045
-
2046
-                        public void DragGesture()
2047
-                        {
2048
-                        }
2049
-                    });
2050
-                }
2051
-        });
2052
-        
2053
-        fullscenePanel.Return();
2054
-        
2055
-        fullscenePanel.add(fullsceneButton = GetButton("fullscenes/tuscany.png", !Globals.NIMBUSLAF));
2056
-        fullsceneButton.setToolTipText("Tuscany!");
2057
-        fullsceneButton.addActionListener(new ActionListener()
2058
-        {
2059
-                @Override
2060
-                public void actionPerformed(ActionEvent e)
2061
-                {
2062
-                    ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/Tuscany.gfd", new iCallBack()
2063
-                    {
2064
-
2065
-                        public void Callback(Object obj)
2066
-                        {
2067
-                            CameraPane.capsLocked = true;
2068
-                            Globals.setLIVE(true);
2069
-                            Globals.WALK = true;
2070
-                            LoadIt(obj);
2071
-                        }
2072
-
2073
-                        public void DragGesture()
2074
-                        {
2075
-                        }
2076
-                    });
2077
-                }
2078
-        });
2079
-        
2309
+    
20802310         fullscenePanel.add(fullsceneButton = GetButton("fullscenes/urbanfuture3.png", !Globals.NIMBUSLAF));
20812311         fullsceneButton.setToolTipText("Urban Future!");
20822312         fullsceneButton.addActionListener(new ActionListener()
....@@ -2101,8 +2331,6 @@
21012331                     });
21022332                 }
21032333         });
2104
-
2105
-        fullscenePanel.Return();
21062334     
21072335         fullscenePanel.add(fullsceneButton = GetButton("fullscenes/urbanfuture4.png", !Globals.NIMBUSLAF));
21082336         fullsceneButton.setToolTipText("Street Level!");
....@@ -2129,85 +2357,6 @@
21292357                 }
21302358         });
21312359 
2132
-        fullscenePanel.add(fullsceneButton = GetButton("fullscenes/venice.png", !Globals.NIMBUSLAF));
2133
-        fullsceneButton.setToolTipText("Venice!");
2134
-        fullsceneButton.addActionListener(new ActionListener()
2135
-        {
2136
-                @Override
2137
-                public void actionPerformed(ActionEvent e)
2138
-                {
2139
-                    ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/Venice.gfd", new iCallBack()
2140
-                    {
2141
-
2142
-                        public void Callback(Object obj)
2143
-                        {
2144
-                            CameraPane.capsLocked = true;
2145
-                            Globals.setLIVE(true);
2146
-                            Globals.WALK = true;
2147
-                            LoadIt(obj);
2148
-                        }
2149
-
2150
-                        public void DragGesture()
2151
-                        {
2152
-                        }
2153
-                    });
2154
-                }
2155
-        });
2156
-
2157
-        fullscenePanel.Return();
2158
-        
2159
-        fullscenePanel.add(fullsceneButton = GetButton("fullscenes/viking.png", !Globals.NIMBUSLAF));
2160
-        fullsceneButton.setToolTipText("Viking Village!");
2161
-        fullsceneButton.addActionListener(new ActionListener()
2162
-        {
2163
-                @Override
2164
-                public void actionPerformed(ActionEvent e)
2165
-                {
2166
-                    ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/VikingVillage.gfd", new iCallBack()
2167
-                    {
2168
-
2169
-                        public void Callback(Object obj)
2170
-                        {
2171
-                            CameraPane.capsLocked = true;
2172
-                            Globals.setLIVE(false);
2173
-                            Globals.WALK = true;
2174
-                            LoadIt(obj);
2175
-                        }
2176
-
2177
-                        public void DragGesture()
2178
-                        {
2179
-                        }
2180
-                    });
2181
-                }
2182
-        });
2183
-
2184
-        fullscenePanel.add(fullsceneButton = GetButton("fullscenes/yvoire.png", !Globals.NIMBUSLAF));
2185
-        fullsceneButton.setToolTipText("Yvoire!");
2186
-        fullsceneButton.addActionListener(new ActionListener()
2187
-        {
2188
-                @Override
2189
-                public void actionPerformed(ActionEvent e)
2190
-                {
2191
-                    ReadGFD("https://www.noaofarc.ca/akeeba/categories/Applications/Yvoire.gfd", new iCallBack()
2192
-                    {
2193
-
2194
-                        public void Callback(Object obj)
2195
-                        {
2196
-                            CameraPane.capsLocked = true;
2197
-                            Globals.setLIVE(false);
2198
-                            Globals.WALK = true;
2199
-                            LoadIt(obj);
2200
-                        }
2201
-
2202
-                        public void DragGesture()
2203
-                        {
2204
-                        }
2205
-                    });
2206
-                }
2207
-        });
2208
-
2209
-        fullscenePanel.Return();
2210
-                        
22112360         sceneTabbedPane.add(optionsPanel);
22122361         
22132362         scenePanel.add(sceneTabbedPane);
....@@ -3420,7 +3569,7 @@
34203569         //? flashIt = false;
34213570         CameraPane pane = (CameraPane) cameraView;
34223571         pane.clickStart(location.x, location.y, 0, 0);
3423
-        pane.clickEnd(location.x, location.y, 0, true);
3572
+        pane.clickEnd(location.x, location.y, 0, 0, true);
34243573 
34253574         if (group.selection.size() == 1)
34263575         {
....@@ -6788,7 +6937,7 @@
67886937     cGridBag materialPanel;
67896938     cGridBag ctrlPanel;
67906939     cGridBag figurePanel;
6791
-    cGridBag fullscenePanel;
6940
+    //cGridBag fullscenePanel;
67926941     
67936942     JScrollPane infoPanel;
67946943     


 fullscenes/GCB2.png
Binary files differ


 fullscenes/GCB3.png
Binary files differ


 fullscenes/SandyBay.png
Binary files differ


 fullscenes/UrbanSprawl.png
Binary files differ


 fullscenes/desertmotel.png
Binary files differ


 fullscenes/ninja.png
Binary files differ


 fullscenes/urbanfuture4.png
Binary files differ