blame | history | patch | commit | commitdiff
Normand Briere
2019-04-28 f1c718cce66e5651a0dae91375db6ebfaded1a92 
 ObjEditor.java
....@@ -28,7 +28,12 @@
2828         iSendInfo
2929 //KeyListener
3030 {
31
+        boolean timeline;
32
+        boolean wasFullScreen;
3133 
34
+    GroupEditor callee;
35
+    JFrame frame;
36
+    
3237     // SCRIPT
3338     
3439     transient JFrame textpanel = null;
....@@ -119,14 +124,13 @@
119124     void keyPressed(int key, int modifiers)
120125     {
121126     System.out.println("KEY PRESSED");
122
-    CameraPane.theRenderer.keyPressed(key, modifiers);
127
+    Globals.theRenderer.keyPressed(key, modifiers);
123128     }
124129      */
125130 
126131     static GridBagConstraints aConstraints;
127132     static GridBagConstraints aWindowConstraints;
128
-    GroupEditor callee;
129
-    JFrame frame;
133
+
130134     static int GRIDWIDTH = 100; // 4;
131135 
132136     public void closeUI()
....@@ -158,12 +162,16 @@
158162         objEditor.ctrlPanel.remove(slowerButton);
159163         objEditor.ctrlPanel.remove(fasterButton);
160164         objEditor.ctrlPanel.remove(remarkButton);
165
+        
166
+        Remove(normalpushField);
161167     }
162168 
163169     public ObjEditor GetEditor()
164170     {
165171         return objEditor; //.GetEditor();
166172     }
173
+    
174
+    // Sometimes myself, sometimes my callee's.
167175     ObjEditor objEditor;
168176 
169177     /*
....@@ -238,7 +246,7 @@
238246         //if (!isDisplayable())
239247         //setUndecorated(true);
240248 
241
-        System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
249
+        //System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
242250         client = inClient;
243251         copy = localCopy;
244252         copy.editWindow = this;
....@@ -292,16 +300,18 @@
292300         //normalLensItem.addActionListener(this);
293301         cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
294302         revertCameraItem.addActionListener(this);
295
-        cameraMenu.add(toggleFullItem = new CheckboxMenuItem("Full Screen"));
296
-        toggleFullItem.addItemListener(this);
297
-        toggleFullItem.setState(CameraPane.FULLSCREEN);
303
+        cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
304
+        toggleTimelineItem.addItemListener(this);
305
+        cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
306
+        toggleFullScreenItem.addItemListener(this);
307
+        toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
298308         cameraMenu.add("-");
299309         cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
300310         toggleTextureItem.addItemListener(this);
301311         toggleTextureItem.setState(CameraPane.textureon);
302312         cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
303313         toggleLiveItem.addItemListener(this);
304
-        toggleLiveItem.setState(CameraPane.isLIVE());
314
+        toggleLiveItem.setState(Globals.isLIVE());
305315         cameraMenu.add(stepItem = new MenuItem("Step"));
306316         stepItem.addActionListener(this);
307317 //		cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
....@@ -522,18 +532,18 @@
522532                     maxima.y = sel.toParent[3][1];
523533                     maxima.z = sel.toParent[3][2];
524534                     si.SendInfo("    Orig: " + maxima, "regular");
525
-                    maxima.x = sel.globalTransform[3][0];
526
-                    maxima.y = sel.globalTransform[3][1];
527
-                    maxima.z = sel.globalTransform[3][2];
528
-        if (full)
529
-            si.SendInfo("    Global Orig: " + maxima, "regular");
530535                     maxima.x = sel.toParent[0][0];
531536                     maxima.y = sel.toParent[1][1];
532537                     maxima.z = sel.toParent[2][2];
533538                     si.SendInfo("    Scale: " + maxima, "regular");
534
-                    maxima.x = sel.globalTransform[0][0];
535
-                    maxima.y = sel.globalTransform[1][1];
536
-                    maxima.z = sel.globalTransform[2][2];
539
+        maxima.x = sel.globalTransform[3][0];
540
+        maxima.y = sel.globalTransform[3][1];
541
+        maxima.z = sel.globalTransform[3][2];
542
+        if (full)
543
+            si.SendInfo("    Global Orig: " + maxima, "regular");
544
+        maxima.x = sel.globalTransform[0][0];
545
+        maxima.y = sel.globalTransform[1][1];
546
+        maxima.z = sel.globalTransform[2][2];
537547         if (full)
538548             si.SendInfo("    Global Scale: " + maxima, "regular");
539549                 }
....@@ -593,6 +603,22 @@
593603             System.err.println("Couldn't insert initial text into text pane.");
594604         }
595605     }
606
+
607
+        void ToggleFullScreen()
608
+        {
609
+                if (CameraPane.FULLSCREEN)
610
+                {
611
+                    frame.getContentPane().remove(/*"Center",*/bigThree);
612
+                    framePanel.add(bigThree);
613
+                    frame.getContentPane().add(/*"Center",*/framePanel);
614
+                } else
615
+                {
616
+                    frame.getContentPane().remove(/*"Center",*/framePanel);
617
+                    framePanel.remove(bigThree);
618
+                    frame.getContentPane().add(/*"Center",*/bigThree);
619
+                }
620
+                cameraView.ToggleFullScreen();
621
+        }
596622 
597623     private JTextArea createTextPane()
598624     {
....@@ -692,7 +718,7 @@
692718     protected static ImageIcon createImageIcon(String path,
693719             String description)
694720     {
695
-        java.net.URL imgURL = GraphreeD.class.getResource(path);
721
+        java.net.URL imgURL = GrafreeD.class.getResource(path);
696722         if (imgURL != null)
697723         {
698724             return new ImageIcon(imgURL, description);
....@@ -794,7 +820,7 @@
794820 
795821         aConstraints.fill = GridBagConstraints.VERTICAL;
796822         jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
797
-        aConstraints.gridwidth = 2;
823
+        aConstraints.gridwidth = 1;
798824         ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
799825         aConstraints.gridx += 1;
800826         aConstraints.fill = GridBagConstraints.HORIZONTAL;
....@@ -963,6 +989,9 @@
963989 
964990         Return();
965991 
992
+    normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
993
+    Return();
994
+            
966995 //	oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
967996 //        ObjEditor.aConstraints.gridx += 1;
968997 
....@@ -1107,7 +1136,7 @@
11071136         //frontScroll.setLabel("------------------------------ XZ (front) ---------------------------------------------------");
11081137         //sideScroll.setLabel("------------------------------- YZ (side) ---------------------------------------------------");
11091138 
1110
-//            GridBagConstraints gbc = (GridBagConstraints) GraphreeD.clone(aConstraints);
1139
+//            GridBagConstraints gbc = (GridBagConstraints) GrafreeD.clone(aConstraints);
11111140         Camera cam = GetCamera(copy, 0);
11121141 
11131142         Composite cams = null;
....@@ -1158,10 +1187,21 @@
11581187         //JPanel worldPanel =
11591188         //		new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
11601189         //worldPanel.setName("World");
1161
-		/*JPanel*/ cameraPanel =
1162
-                new JPanel(new BorderLayout());
1163
-        cameraPanel.add(cameraView);
1190
+	centralPanel = new JPanel(new BorderLayout());
1191
+	timelinePanel = new JPanel(new BorderLayout());
1192
+        timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
11641193 
1194
+        cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1195
+        cameraPanel.setContinuousLayout(true);
1196
+        cameraPanel.setOneTouchExpandable(true);
1197
+//        cameraPanel.setDividerLocation(0.9);
1198
+//        cameraPanel.setDividerSize(9);
1199
+        cameraPanel.setResizeWeight(1.0);
1200
+        
1201
+        centralPanel.add(cameraView);
1202
+        //frame.setJMenuBar(timelineMenubar);
1203
+        //centralPanel.add(timelinePanel);
1204
+        
11651205         //topView.camera = ;
11661206         //frontView.camera = new Camera(2);
11671207         //sideView.camera = new Camera(3);
....@@ -1191,7 +1231,7 @@
11911231         gridPanel.add(cameraView);
11921232         gridPanel.add(XYZPanel);
11931233          */
1194
-        gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, cameraPanel, XYZPanel); //new BorderLayout());
1234
+        gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
11951235         gridPanel.setContinuousLayout(true);
11961236         gridPanel.setOneTouchExpandable(true);
11971237         gridPanel.setDividerLocation(1.0);
....@@ -1244,15 +1284,15 @@
12441284         scrollpane.setWheelScrollingEnabled(true);
12451285         scrollpane.addMouseWheelListener(this); // Default not fast enough
12461286 
1247
-        /*JTabbedPane*/ jtp = new JTabbedPane();
1248
-        jtp.add(scrollpane);
1287
+        /*JTabbedPane*/ scenePanel = new JTabbedPane();
1288
+        scenePanel.add(scrollpane);
12491289 
1250
-        jtp.add(FSPane = new cFileSystemPane(this));
1290
+        scenePanel.add(FSPane = new cFileSystemPane(this));
12511291 
12521292         optionsPanel = new JPanel(new GridBagLayout());
12531293 
12541294         optionsPanel.setName("Options");
1255
-        jtp.add(optionsPanel);
1295
+        scenePanel.add(optionsPanel);
12561296 
12571297 
12581298         /*
....@@ -1275,7 +1315,7 @@
12751315         jtp.add(tree);
12761316          */
12771317 
1278
-        bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, jtp, gridPanel);
1318
+        bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
12791319         bigPanel.setContinuousLayout(true);
12801320         bigPanel.setOneTouchExpandable(true);
12811321         bigPanel.setDividerLocation(0.8);
....@@ -1297,13 +1337,13 @@
12971337         aWindowConstraints.fill = GridBagConstraints.VERTICAL;
12981338         aWindowConstraints.weightx = 0;
12991339         aWindowConstraints.weighty = 1;
1300
-        bigThree.add(jtp, aWindowConstraints);
1340
+        bigThree.add(scenePanel, aWindowConstraints);
13011341         aWindowConstraints.weightx = 1;
13021342         aWindowConstraints.gridwidth = 3;
13031343         //	aConstraints.gridheight = 3;
13041344         aWindowConstraints.gridx = 1;
13051345         aWindowConstraints.fill = GridBagConstraints.BOTH;
1306
-        bigThree.add(cameraPanel, aWindowConstraints);
1346
+        bigThree.add(centralPanel, aWindowConstraints);
13071347         aWindowConstraints.weightx = 0;
13081348         aWindowConstraints.gridx = 4;
13091349         aWindowConstraints.gridwidth = 1;
....@@ -1331,12 +1371,13 @@
13311371         //worldPane.add(bigPanel);
13321372         //worldPane.add(worldPanel);
13331373                 /**/
1334
-        frame.getContentPane().add(/*"Center",*/framePanel);
1374
+        //frame.getContentPane().add(/*"Center",*/framePanel);
1375
+        frame.add(/*"Center",*/framePanel);
13351376         //frame.getContentPane().add(/*"Center",*/ worldPane);
13361377 
1337
-//            aConstraints = gbc; // (GridBagConstraints) GraphreeD.clone(gbc);
1378
+//            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
13381379 
1339
-        frame.setSize(800, 600);
1380
+        frame.setSize(1024, 768);
13401381         frame.show();
13411382 
13421383         gridPanel.setDividerLocation(1.0);
....@@ -1422,7 +1463,7 @@
14221463         aConstraints.gridx += 1;
14231464         aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
14241465         //aConstraints.weightx = 0;
1425
-        ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1466
+        ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
14261467         aConstraints.gridx = 0;
14271468         aConstraints.gridy += 1;
14281469         aConstraints.gridwidth = 1;
....@@ -1432,7 +1473,7 @@
14321473         aConstraints.fill = GridBagConstraints.HORIZONTAL;
14331474         aConstraints.gridx += 1;
14341475         aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1435
-        ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1476
+        ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
14361477         aConstraints.gridx = 0;
14371478         aConstraints.gridy += 1;
14381479         aConstraints.gridwidth = 1;
....@@ -1442,7 +1483,7 @@
14421483         aConstraints.fill = GridBagConstraints.HORIZONTAL;
14431484         aConstraints.gridx += 1;
14441485         aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1445
-        ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1486
+        ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
14461487         aConstraints.gridx = 0;
14471488         aConstraints.gridy += 1;
14481489         aConstraints.gridwidth = 1;
....@@ -1452,7 +1493,7 @@
14521493         aConstraints.fill = GridBagConstraints.HORIZONTAL;
14531494         aConstraints.gridx += 1;
14541495         aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1455
-        ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1496
+        ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
14561497         aConstraints.gridx = 0;
14571498         aConstraints.gridy += 1;
14581499         aConstraints.gridwidth = 1;
....@@ -1462,7 +1503,7 @@
14621503         aConstraints.fill = GridBagConstraints.HORIZONTAL;
14631504         aConstraints.gridx += 1;
14641505         aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1465
-        ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1506
+        ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
14661507         aConstraints.gridx = 0;
14671508         aConstraints.gridy += 1;
14681509         aConstraints.gridwidth = 1;
....@@ -1531,7 +1572,7 @@
15311572         aConstraints.fill = GridBagConstraints.HORIZONTAL;
15321573         aConstraints.gridx += 1;
15331574         aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1534
-        ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1575
+        ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
15351576         aConstraints.gridx = 0;
15361577         aConstraints.gridy += 1;
15371578         aConstraints.gridwidth = 1;
....@@ -1600,7 +1641,7 @@
16001641         aConstraints.fill = GridBagConstraints.HORIZONTAL;
16011642         aConstraints.gridx += 1;
16021643         aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1603
-        ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1644
+        ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
16041645         aConstraints.gridx = 0;
16051646         aConstraints.gridy += 1;
16061647         aConstraints.gridwidth = 1;
....@@ -1671,7 +1712,7 @@
16711712         aConstraints.fill = GridBagConstraints.HORIZONTAL;
16721713         aConstraints.gridx += 1;
16731714         aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1674
-        ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1715
+        ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
16751716         aConstraints.gridx = 0;
16761717         aConstraints.gridy += 1;
16771718         aConstraints.gridwidth = 1;
....@@ -1859,19 +1900,21 @@
18591900             }
18601901 
18611902             // Images/textures
1862
-            if (textures
1863
-                    && (filename.toLowerCase().endsWith(".jpg")
1864
-                    || filename.toLowerCase().endsWith(".jpeg")
1865
-                    || filename.toLowerCase().endsWith(".gif")
1866
-                    || filename.toLowerCase().endsWith(".png")
1867
-                    || filename.toLowerCase().endsWith(".tre")
1868
-                    || filename.toLowerCase().endsWith(".bmp")
1869
-                    || filename.toLowerCase().endsWith(".tga")
1870
-                    || filename.toLowerCase().endsWith(".sgi")
1871
-                    || filename.toLowerCase().endsWith(".tif")
1872
-                    || filename.toLowerCase().endsWith(".tiff")))
1903
+            if (filename.toLowerCase().endsWith(".jpg")
1904
+                || filename.toLowerCase().endsWith(".jpeg")
1905
+                || filename.toLowerCase().endsWith(".gif")
1906
+                || filename.toLowerCase().endsWith(".png")
1907
+                || filename.toLowerCase().endsWith(".tre")
1908
+                || filename.toLowerCase().endsWith(".bmp")
1909
+                || filename.toLowerCase().endsWith(".tga")
1910
+                || filename.toLowerCase().endsWith(".sgi")
1911
+                || filename.toLowerCase().endsWith(".tif")
1912
+                || filename.toLowerCase().endsWith(".tiff"))
18731913             {
1874
-                DropTexture(filename);
1914
+                if (textures)
1915
+                    DropTexture(filename);
1916
+                else
1917
+                    CreateBillboard(filename);
18751918                 continue;
18761919             }
18771920 
....@@ -1880,6 +1923,60 @@
18801923         }
18811924 
18821925         ResetModel();
1926
+    }
1927
+    
1928
+    void CreateBillboard(String filename)
1929
+    {
1930
+        Object3D source = null;
1931
+        Object3D group = copy;
1932
+
1933
+        if (group.selection.size() > 0)
1934
+        {
1935
+            source = group.selection.get(0);
1936
+        }
1937
+
1938
+        Grid grid = new Grid(1,1);
1939
+        grid.material = null;
1940
+        
1941
+        grid.toParent = LA.newMatrix();
1942
+        grid.fromParent = LA.newMatrix();
1943
+        LA.matYRotate(grid.toParent, Math.PI/2);
1944
+        LA.matXRotate(grid.toParent, -Math.PI/2);
1945
+        LA.matXRotate(grid.fromParent, Math.PI/2);
1946
+        LA.matYRotate(grid.fromParent, -Math.PI/2);
1947
+        
1948
+        BillboardNode bb = new BillboardNode();
1949
+        bb.addChild(grid);
1950
+        
1951
+        Object3D newgroup = new Object3D();
1952
+        newgroup.CreateMaterial();
1953
+        
1954
+        File file = new File(filename);
1955
+        newgroup.name = file.getName();
1956
+        newgroup.addChild(bb);
1957
+        
1958
+        Object3D main = newgroup;
1959
+        
1960
+        main.SetPigmentTexture(filename);
1961
+        
1962
+        if (source != null)
1963
+        {
1964
+            main.material = new cMaterial(source.material);
1965
+            if (main.projectedVertices.length < source.projectedVertices.length)
1966
+            {
1967
+                main.projectedVertices = new Object3D.cVector2[source.projectedVertices.length];
1968
+            }
1969
+            
1970
+            for (int i=0; i<source.projectedVertices.length; i++)
1971
+            {
1972
+                main.projectedVertices[i].x = source.projectedVertices[i].x;
1973
+                main.projectedVertices[i].y = source.projectedVertices[i].y;
1974
+            }
1975
+            
1976
+            main.texres = source.texres;
1977
+        }
1978
+        
1979
+        makeSomething(newgroup, false);
18831980     }
18841981     
18851982     Point location;
....@@ -2138,6 +2235,8 @@
21382235             {
21392236                 Mocap sel = (Mocap) copy.selection.get(0);
21402237 
2238
+                sel.SetCurrentBones(sel.frame);
2239
+            
21412240                 sel.fullname = fullname;
21422241 
21432242                 if (changename)
....@@ -2151,14 +2250,18 @@
21512250                 sel.smoothed = false;
21522251 
21532252                 //    if (!changename)
2154
-                sel.SetPositionDelta(false, true, true, true/*?*/); // false
2253
+                //sel.SetPositionDelta(false, true, true, true/*?*/); // false
2254
+                sel.SetGlobalTransform();
2255
+                sel.LoadData();
2256
+                sel.Rewind();
2257
+                sel.Fade();
21552258                 //                sel.setPose(0);
21562259                 refreshContents();
21572260             } else
21582261             {
21592262                 mocap.Reset();
21602263                 // new skeleton
2161
-                makeSomething(mocap, false); // true);
2264
+                makeSomething(mocap, true); // true);
21622265             }
21632266         } catch (Exception e)
21642267         {
....@@ -2185,6 +2288,8 @@
21852288         {
21862289             Mocap sel = (Mocap) select;
21872290 
2291
+            sel.SetCurrentBones(sel.frame);
2292
+            
21882293             File file = new File(fullname);
21892294 
21902295             //       Mocap mocap = new Mocap("Mocap" + file.getName());
....@@ -2251,7 +2356,11 @@
22512356 
22522357             if (!changename)
22532358             {
2254
-                sel.SetPositionDelta(false, true, true, true/*?*/);
2359
+                //sel.SetPositionDelta(false, true, true, true/*?*/);
2360
+                sel.SetGlobalTransform();
2361
+                sel.LoadData();
2362
+                sel.Rewind();
2363
+                sel.Fade();
22552364             }
22562365 
22572366             //          sel.setPose(0);
....@@ -2345,7 +2454,7 @@
23452454 
23462455     void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
23472456     {
2348
-        if (GraphreeD.standAlone)
2457
+        if (GrafreeD.standAlone)
23492458         {
23502459             /**/
23512460             FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
....@@ -2890,20 +2999,37 @@
28902999             // june 2013           copy.HardTouch();
28913000             cameraView.repaint();
28923001             return;
2893
-        } else if (event.getSource() == toggleFullItem)
3002
+        } else if (event.getSource() == toggleTimelineItem)
28943003         {
2895
-            if (CameraPane.FULLSCREEN)
3004
+            timeline ^= true;
3005
+
3006
+            if (timeline)
28963007             {
2897
-                frame.getContentPane().remove(/*"Center",*/bigThree);
2898
-                framePanel.add(bigThree);
2899
-                frame.getContentPane().add(/*"Center",*/framePanel);
2900
-            } else
2901
-            {
2902
-                frame.getContentPane().remove(/*"Center",*/framePanel);
2903
-                frame.getContentPane().add(/*"Center",*/bigThree);
3008
+                centralPanel.remove(cameraView);
3009
+                cameraPanel.add(cameraView);
3010
+                centralPanel.add(cameraPanel);
3011
+                frame.setJMenuBar(timelineMenubar);
3012
+                wasFullScreen = CameraPane.FULLSCREEN;
3013
+                if (!CameraPane.FULLSCREEN)
3014
+                    ToggleFullScreen();
3015
+                toggleFullScreenItem.setEnabled(false);
29043016             }
3017
+            else
3018
+            {
3019
+                centralPanel.remove(cameraPanel);
3020
+                centralPanel.add(cameraView);
3021
+                frame.setJMenuBar(null);
3022
+                if (!wasFullScreen)
3023
+                    ToggleFullScreen();
3024
+                toggleFullScreenItem.setEnabled(true);
3025
+            }
3026
+
29053027             frame.validate();
2906
-            cameraView.ToggleFullScreen();
3028
+            return;
3029
+        } else if (event.getSource() == toggleFullScreenItem)
3030
+        {
3031
+            ToggleFullScreen();
3032
+            frame.validate();
29073033 
29083034             return;
29093035         } else if (event.getSource() == toggleRandomItem)
....@@ -3013,7 +3139,8 @@
30133139             objEditor.refreshContents();
30143140         } else if (event.getSource() == stepItem)
30153141         {
3016
-            cameraView.ONESTEP = true;
3142
+            //cameraView.ONESTEP = true;
3143
+            Globals.ONESTEP = true;
30173144             cameraView.repaint();
30183145             return;
30193146         } else if (event.getSource() == stepButton)
....@@ -3152,9 +3279,9 @@
31523279             cameraView.RevertCamera();
31533280             cameraView.repaint();
31543281             return;
3155
-        } else if (event.getSource() == textureButton)
3156
-        {
3157
-            return; // true;
3282
+//        } else if (event.getSource() == textureButton)
3283
+//        {
3284
+//            return; // true;
31583285         } else // combos...
31593286         if (event.getSource() == texresMenu)
31603287         {
....@@ -3170,25 +3297,25 @@
31703297 
31713298     void ToggleAnimation()
31723299     {
3173
-        if (!CameraPane.ANIMATION)
3300
+        if (!Globals.ANIMATION)
31743301         {
31753302             FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
31763303             browser.show();
31773304             String filename = browser.getFile();
31783305             if (filename != null && filename.length() > 0)
31793306             {
3180
-                CameraPane.filename = browser.getDirectory() + filename;
3307
+                Globals.filename = browser.getDirectory() + filename;
31813308                 //CameraPane.framecount = 0;
3182
-                CameraPane.imagecount = 0;
3309
+                Globals.imagecount = 0;
31833310 
3184
-                CameraPane.ANIMATION ^= true;
3311
+                Globals.ANIMATION ^= true;
31853312 
3186
-                GraphreeD.wav.cursor = 0;
3187
-                GraphreeD.wav.loop = 0;
3313
+                GrafreeD.wav.cursor = 0;
3314
+                GrafreeD.wav.loop = 0;
31883315             }
31893316         } else
31903317         {
3191
-            CameraPane.ANIMATION ^= true;
3318
+            Globals.ANIMATION ^= true;
31923319         }
31933320     }
31943321 
....@@ -3441,7 +3568,13 @@
34413568             //System.out.println("PARENT = " + parent);
34423569             //if (parent != null)
34433570             //	parent.applySelf();
3444
-            refreshContents();
3571
+		if (e.getSource() == normalpushField)
3572
+		{
3573
+			objEditor.refreshContents();
3574
+			//Refresh();
3575
+		}
3576
+		else
3577
+                    refreshContents();
34453578             // ??? client.refreshEditWindow();
34463579         }
34473580         //else
....@@ -3453,7 +3586,7 @@
34533586         //group.name = nameField.getText();
34543587         //objEditor.applySelf();
34553588 
3456
-        assert (objEditor == this);
3589
+        // OCT2018: assert (objEditor == this);
34573590         if (copy.selection == null || copy.selection.size() == 0)
34583591 			//super.applySelf()
34593592                                 ; else
....@@ -3477,12 +3610,18 @@
34773610                 objEditor.copy = keep;
34783611             }
34793612         }
3613
+        
3614
+        if (normalpushField != null)
3615
+                copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
34803616     }
34813617 
34823618         void SnapObject()
34833619         {
3484
-            Object3D obj = (Object3D)copy.selection.elementAt(0);
3485
-            SnapObject(obj);
3620
+            if (copy.selection.size() > 0)
3621
+            {
3622
+                    Object3D obj = (Object3D)copy.selection.elementAt(0);
3623
+                    SnapObject(obj);
3624
+            }
34863625         }
34873626         
34883627         void SnapObject(Object3D obj)
....@@ -3596,7 +3735,7 @@
35963735 
35973736         if (obj.parent != null)
35983737         {
3599
-            obj.parent.TransformToWorld(interest);
3738
+//            obj.parent.TransformToWorld(interest);
36003739         }
36013740 
36023741         if (!CameraPane.TRACK)
....@@ -4085,7 +4224,7 @@
40854224 
40864225     void load() // throws ClassNotFoundException
40874226     {
4088
-        if (GraphreeD.standAlone)
4227
+        if (GrafreeD.standAlone)
40894228         {
40904229             FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
40914230             browser.show();
....@@ -4190,7 +4329,7 @@
41904329 
41914330     void saveAs()
41924331     {
4193
-        if (GraphreeD.standAlone)
4332
+        if (GrafreeD.standAlone)
41944333         {
41954334             FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
41964335             browser.setVisible(true);
....@@ -4213,10 +4352,20 @@
42134352 
42144353         Object3D object = copy.selection.get(0);
42154354         
4355
+        FileObject fileobj = null;
4356
+        
4357
+        if (object instanceof FileObject)
4358
+            fileobj = (FileObject)object;
4359
+        
42164360         if (object.fileparent != null)
42174361         {
4218
-            FileObject fileobj = (FileObject) object.fileparent;
4362
+            assert(fileobj == null);
42194363             
4364
+            fileobj = (FileObject) object.fileparent;
4365
+        }
4366
+            
4367
+        if (fileobj != null)
4368
+        {
42204369             System.out.println("WriteObject " + object + " : " + fileobj.name);
42214370             WriteObject(object, fileobj.name);
42224371         }
....@@ -4259,7 +4408,7 @@
42594408             }
42604409         }
42614410         else
4262
-        //if (GraphreeD.standAlone)
4411
+        //if (GrafreeD.standAlone)
42634412         {
42644413             FileDialog browser = new FileDialog(frame, "Export", FileDialog.SAVE);
42654414             browser.setVisible(true);
....@@ -4291,7 +4440,7 @@
42914440             Object3D objectparent = obj.parent;
42924441             obj.parent = null;
42934442 
4294
-            Object3D object = (Object3D) GraphreeD.clone(obj);
4443
+            Object3D object = (Object3D) GrafreeD.clone(obj);
42954444 
42964445             obj.parent = objectparent;
42974446 
....@@ -4325,7 +4474,7 @@
43254474         buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
43264475         cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
43274476         copy.generatePOV(buffer);
4328
-        if (GraphreeD.standAlone)
4477
+        if (GrafreeD.standAlone)
43294478         {
43304479             FileDialog browser = new FileDialog(frame, "Export POV", 1);
43314480             browser.show();
....@@ -4366,7 +4515,8 @@
43664515     MenuItem revertCameraItem;
43674516     CheckboxMenuItem toggleLiveItem;
43684517     MenuItem stepItem;
4369
-    CheckboxMenuItem toggleFullItem;
4518
+    CheckboxMenuItem toggleFullScreenItem;
4519
+    CheckboxMenuItem toggleTimelineItem;
43704520     CheckboxMenuItem toggleRenderItem;
43714521     CheckboxMenuItem toggleDebugItem;
43724522     CheckboxMenuItem toggleFrustumItem;
....@@ -4393,11 +4543,14 @@
43934543     JSplitPane gridPanel;
43944544     JSplitPane bigPanel;
43954545     JPanel bigThree;
4396
-    JTabbedPane jtp;
4397
-    JPanel cameraPanel;
4546
+    JTabbedPane scenePanel;
4547
+    JPanel centralPanel;
4548
+    JSplitPane cameraPanel;
4549
+    JPanel timelinePanel;
4550
+    JMenuBar timelineMenubar;
43984551     JSplitPane framePanel;
43994552     JTextArea/*Field*/ nameField;
4400
-    cButton textureButton;
4553
+    //cButton textureButton;
44014554     cButton okButton;
44024555     cButton applyButton;
44034556     cButton cancelButton;
....@@ -4505,4 +4658,6 @@
45054658     NumberSlider opacityPowerField;
45064659     JTree jTree;
45074660     //ObjectUI parent;
4661
+    
4662
+    NumberSlider normalpushField;
45084663 }