blame | history | patch | commit | commitdiff
Normand Briere
2019-04-22 91106535bc5aa5e67cbb02a67cf6de1519cba0e4 
 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;
....@@ -125,8 +130,7 @@
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"));
....@@ -594,6 +604,22 @@
594604         }
595605     }
596606 
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
+        }
622
+
597623     private JTextArea createTextPane()
598624     {
599625         String[] initString =
....@@ -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 
....@@ -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,7 +1371,8 @@
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 
13371378 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
....@@ -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;
....@@ -2194,6 +2235,8 @@
21942235             {
21952236                 Mocap sel = (Mocap) copy.selection.get(0);
21962237 
2238
+                sel.SetCurrentBones(sel.frame);
2239
+            
21972240                 sel.fullname = fullname;
21982241 
21992242                 if (changename)
....@@ -2245,6 +2288,8 @@
22452288         {
22462289             Mocap sel = (Mocap) select;
22472290 
2291
+            sel.SetCurrentBones(sel.frame);
2292
+            
22482293             File file = new File(fullname);
22492294 
22502295             //       Mocap mocap = new Mocap("Mocap" + file.getName());
....@@ -2954,20 +2999,37 @@
29542999             // june 2013           copy.HardTouch();
29553000             cameraView.repaint();
29563001             return;
2957
-        } else if (event.getSource() == toggleFullItem)
3002
+        } else if (event.getSource() == toggleTimelineItem)
29583003         {
2959
-            if (CameraPane.FULLSCREEN)
3004
+            timeline ^= true;
3005
+
3006
+            if (timeline)
29603007             {
2961
-                frame.getContentPane().remove(/*"Center",*/bigThree);
2962
-                framePanel.add(bigThree);
2963
-                frame.getContentPane().add(/*"Center",*/framePanel);
2964
-            } else
2965
-            {
2966
-                frame.getContentPane().remove(/*"Center",*/framePanel);
2967
-                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);
29683016             }
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
+
29693027             frame.validate();
2970
-            cameraView.ToggleFullScreen();
3028
+            return;
3029
+        } else if (event.getSource() == toggleFullScreenItem)
3030
+        {
3031
+            ToggleFullScreen();
3032
+            frame.validate();
29713033 
29723034             return;
29733035         } else if (event.getSource() == toggleRandomItem)
....@@ -3077,7 +3139,8 @@
30773139             objEditor.refreshContents();
30783140         } else if (event.getSource() == stepItem)
30793141         {
3080
-            cameraView.ONESTEP = true;
3142
+            //cameraView.ONESTEP = true;
3143
+            Globals.ONESTEP = true;
30813144             cameraView.repaint();
30823145             return;
30833146         } else if (event.getSource() == stepButton)
....@@ -3216,9 +3279,9 @@
32163279             cameraView.RevertCamera();
32173280             cameraView.repaint();
32183281             return;
3219
-        } else if (event.getSource() == textureButton)
3220
-        {
3221
-            return; // true;
3282
+//        } else if (event.getSource() == textureButton)
3283
+//        {
3284
+//            return; // true;
32223285         } else // combos...
32233286         if (event.getSource() == texresMenu)
32243287         {
....@@ -3505,7 +3568,13 @@
35053568             //System.out.println("PARENT = " + parent);
35063569             //if (parent != null)
35073570             //	parent.applySelf();
3508
-            refreshContents();
3571
+		if (e.getSource() == normalpushField)
3572
+		{
3573
+			objEditor.refreshContents();
3574
+			//Refresh();
3575
+		}
3576
+		else
3577
+                    refreshContents();
35093578             // ??? client.refreshEditWindow();
35103579         }
35113580         //else
....@@ -3517,7 +3586,7 @@
35173586         //group.name = nameField.getText();
35183587         //objEditor.applySelf();
35193588 
3520
-        assert (objEditor == this);
3589
+        // OCT2018: assert (objEditor == this);
35213590         if (copy.selection == null || copy.selection.size() == 0)
35223591 			//super.applySelf()
35233592                                 ; else
....@@ -3541,12 +3610,18 @@
35413610                 objEditor.copy = keep;
35423611             }
35433612         }
3613
+        
3614
+        if (normalpushField != null)
3615
+                copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
35443616     }
35453617 
35463618         void SnapObject()
35473619         {
3548
-            Object3D obj = (Object3D)copy.selection.elementAt(0);
3549
-            SnapObject(obj);
3620
+            if (copy.selection.size() > 0)
3621
+            {
3622
+                    Object3D obj = (Object3D)copy.selection.elementAt(0);
3623
+                    SnapObject(obj);
3624
+            }
35503625         }
35513626         
35523627         void SnapObject(Object3D obj)
....@@ -3660,7 +3735,7 @@
36603735 
36613736         if (obj.parent != null)
36623737         {
3663
-            obj.parent.TransformToWorld(interest);
3738
+//            obj.parent.TransformToWorld(interest);
36643739         }
36653740 
36663741         if (!CameraPane.TRACK)
....@@ -4440,7 +4515,8 @@
44404515     MenuItem revertCameraItem;
44414516     CheckboxMenuItem toggleLiveItem;
44424517     MenuItem stepItem;
4443
-    CheckboxMenuItem toggleFullItem;
4518
+    CheckboxMenuItem toggleFullScreenItem;
4519
+    CheckboxMenuItem toggleTimelineItem;
44444520     CheckboxMenuItem toggleRenderItem;
44454521     CheckboxMenuItem toggleDebugItem;
44464522     CheckboxMenuItem toggleFrustumItem;
....@@ -4467,11 +4543,14 @@
44674543     JSplitPane gridPanel;
44684544     JSplitPane bigPanel;
44694545     JPanel bigThree;
4470
-    JTabbedPane jtp;
4471
-    JPanel cameraPanel;
4546
+    JTabbedPane scenePanel;
4547
+    JPanel centralPanel;
4548
+    JSplitPane cameraPanel;
4549
+    JPanel timelinePanel;
4550
+    JMenuBar timelineMenubar;
44724551     JSplitPane framePanel;
44734552     JTextArea/*Field*/ nameField;
4474
-    cButton textureButton;
4553
+    //cButton textureButton;
44754554     cButton okButton;
44764555     cButton applyButton;
44774556     cButton cancelButton;
....@@ -4579,4 +4658,6 @@
45794658     NumberSlider opacityPowerField;
45804659     JTree jTree;
45814660     //ObjectUI parent;
4661
+    
4662
+    NumberSlider normalpushField;
45824663 }