blame | history | patch | commit | commitdiff
Normand Briere
2018-12-17 86f4e9c75951153ae9825f4772633e45698cb602 
 ObjEditor.java
....@@ -28,6 +28,8 @@
2828         iSendInfo
2929 //KeyListener
3030 {
31
+        boolean timeline;
32
+        boolean wasFullScreen;
3133 
3234     // SCRIPT
3335     
....@@ -158,12 +160,16 @@
158160         objEditor.ctrlPanel.remove(slowerButton);
159161         objEditor.ctrlPanel.remove(fasterButton);
160162         objEditor.ctrlPanel.remove(remarkButton);
163
+        
164
+        Remove(normalpushField);
161165     }
162166 
163167     public ObjEditor GetEditor()
164168     {
165169         return objEditor; //.GetEditor();
166170     }
171
+    
172
+    // Sometimes myself, sometimes my callee's.
167173     ObjEditor objEditor;
168174 
169175     /*
....@@ -238,7 +244,7 @@
238244         //if (!isDisplayable())
239245         //setUndecorated(true);
240246 
241
-        System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
247
+        //System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
242248         client = inClient;
243249         copy = localCopy;
244250         copy.editWindow = this;
....@@ -292,9 +298,11 @@
292298         //normalLensItem.addActionListener(this);
293299         cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
294300         revertCameraItem.addActionListener(this);
295
-        cameraMenu.add(toggleFullItem = new CheckboxMenuItem("Full Screen"));
296
-        toggleFullItem.addItemListener(this);
297
-        toggleFullItem.setState(CameraPane.FULLSCREEN);
301
+        cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
302
+        toggleTimelineItem.addItemListener(this);
303
+        cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
304
+        toggleFullScreenItem.addItemListener(this);
305
+        toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
298306         cameraMenu.add("-");
299307         cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
300308         toggleTextureItem.addItemListener(this);
....@@ -594,6 +602,22 @@
594602         }
595603     }
596604 
605
+        void ToggleFullScreen()
606
+        {
607
+                if (CameraPane.FULLSCREEN)
608
+                {
609
+                    frame.getContentPane().remove(/*"Center",*/bigThree);
610
+                    framePanel.add(bigThree);
611
+                    frame.getContentPane().add(/*"Center",*/framePanel);
612
+                } else
613
+                {
614
+                    frame.getContentPane().remove(/*"Center",*/framePanel);
615
+                    framePanel.remove(bigThree);
616
+                    frame.getContentPane().add(/*"Center",*/bigThree);
617
+                }
618
+                cameraView.ToggleFullScreen();
619
+        }
620
+
597621     private JTextArea createTextPane()
598622     {
599623         String[] initString =
....@@ -794,7 +818,7 @@
794818 
795819         aConstraints.fill = GridBagConstraints.VERTICAL;
796820         jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
797
-        aConstraints.gridwidth = 2;
821
+        aConstraints.gridwidth = 1;
798822         ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
799823         aConstraints.gridx += 1;
800824         aConstraints.fill = GridBagConstraints.HORIZONTAL;
....@@ -963,6 +987,9 @@
963987 
964988         Return();
965989 
990
+    normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
991
+    Return();
992
+            
966993 //	oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
967994 //        ObjEditor.aConstraints.gridx += 1;
968995 
....@@ -1158,11 +1185,21 @@
11581185         //JPanel worldPanel =
11591186         //		new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
11601187         //worldPanel.setName("World");
1161
-		/*JPanel*/ cameraPanel =
1162
-                new JPanel(new BorderLayout());
1163
-        cameraPanel.add(cameraView);
1164
-        //new timeflow.app.TimeflowApp().TimeFlowWindow(cameraPanel, frame);
1188
+	centralPanel = new JPanel(new BorderLayout());
1189
+	timelinePanel = new JPanel(new BorderLayout());
1190
+        timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
11651191 
1192
+        cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1193
+        cameraPanel.setContinuousLayout(true);
1194
+        cameraPanel.setOneTouchExpandable(true);
1195
+//        cameraPanel.setDividerLocation(0.9);
1196
+//        cameraPanel.setDividerSize(9);
1197
+        cameraPanel.setResizeWeight(1.0);
1198
+        
1199
+        centralPanel.add(cameraView);
1200
+        //frame.setJMenuBar(timelineMenubar);
1201
+        //centralPanel.add(timelinePanel);
1202
+        
11661203         //topView.camera = ;
11671204         //frontView.camera = new Camera(2);
11681205         //sideView.camera = new Camera(3);
....@@ -1192,7 +1229,7 @@
11921229         gridPanel.add(cameraView);
11931230         gridPanel.add(XYZPanel);
11941231          */
1195
-        gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, cameraPanel, XYZPanel); //new BorderLayout());
1232
+        gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
11961233         gridPanel.setContinuousLayout(true);
11971234         gridPanel.setOneTouchExpandable(true);
11981235         gridPanel.setDividerLocation(1.0);
....@@ -1304,7 +1341,7 @@
13041341         //	aConstraints.gridheight = 3;
13051342         aWindowConstraints.gridx = 1;
13061343         aWindowConstraints.fill = GridBagConstraints.BOTH;
1307
-        bigThree.add(cameraPanel, aWindowConstraints);
1344
+        bigThree.add(centralPanel, aWindowConstraints);
13081345         aWindowConstraints.weightx = 0;
13091346         aWindowConstraints.gridx = 4;
13101347         aWindowConstraints.gridwidth = 1;
....@@ -1423,7 +1460,7 @@
14231460         aConstraints.gridx += 1;
14241461         aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
14251462         //aConstraints.weightx = 0;
1426
-        ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1463
+        ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
14271464         aConstraints.gridx = 0;
14281465         aConstraints.gridy += 1;
14291466         aConstraints.gridwidth = 1;
....@@ -1433,7 +1470,7 @@
14331470         aConstraints.fill = GridBagConstraints.HORIZONTAL;
14341471         aConstraints.gridx += 1;
14351472         aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1436
-        ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1473
+        ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
14371474         aConstraints.gridx = 0;
14381475         aConstraints.gridy += 1;
14391476         aConstraints.gridwidth = 1;
....@@ -1443,7 +1480,7 @@
14431480         aConstraints.fill = GridBagConstraints.HORIZONTAL;
14441481         aConstraints.gridx += 1;
14451482         aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1446
-        ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1483
+        ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
14471484         aConstraints.gridx = 0;
14481485         aConstraints.gridy += 1;
14491486         aConstraints.gridwidth = 1;
....@@ -1453,7 +1490,7 @@
14531490         aConstraints.fill = GridBagConstraints.HORIZONTAL;
14541491         aConstraints.gridx += 1;
14551492         aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1456
-        ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1493
+        ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
14571494         aConstraints.gridx = 0;
14581495         aConstraints.gridy += 1;
14591496         aConstraints.gridwidth = 1;
....@@ -1463,7 +1500,7 @@
14631500         aConstraints.fill = GridBagConstraints.HORIZONTAL;
14641501         aConstraints.gridx += 1;
14651502         aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1466
-        ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1503
+        ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
14671504         aConstraints.gridx = 0;
14681505         aConstraints.gridy += 1;
14691506         aConstraints.gridwidth = 1;
....@@ -1532,7 +1569,7 @@
15321569         aConstraints.fill = GridBagConstraints.HORIZONTAL;
15331570         aConstraints.gridx += 1;
15341571         aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1535
-        ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1572
+        ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
15361573         aConstraints.gridx = 0;
15371574         aConstraints.gridy += 1;
15381575         aConstraints.gridwidth = 1;
....@@ -1601,7 +1638,7 @@
16011638         aConstraints.fill = GridBagConstraints.HORIZONTAL;
16021639         aConstraints.gridx += 1;
16031640         aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1604
-        ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1641
+        ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
16051642         aConstraints.gridx = 0;
16061643         aConstraints.gridy += 1;
16071644         aConstraints.gridwidth = 1;
....@@ -1672,7 +1709,7 @@
16721709         aConstraints.fill = GridBagConstraints.HORIZONTAL;
16731710         aConstraints.gridx += 1;
16741711         aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1675
-        ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1712
+        ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
16761713         aConstraints.gridx = 0;
16771714         aConstraints.gridy += 1;
16781715         aConstraints.gridwidth = 1;
....@@ -2959,20 +2996,37 @@
29592996             // june 2013           copy.HardTouch();
29602997             cameraView.repaint();
29612998             return;
2962
-        } else if (event.getSource() == toggleFullItem)
2999
+        } else if (event.getSource() == toggleTimelineItem)
29633000         {
2964
-            if (CameraPane.FULLSCREEN)
3001
+            timeline ^= true;
3002
+
3003
+            if (timeline)
29653004             {
2966
-                frame.getContentPane().remove(/*"Center",*/bigThree);
2967
-                framePanel.add(bigThree);
2968
-                frame.getContentPane().add(/*"Center",*/framePanel);
2969
-            } else
2970
-            {
2971
-                frame.getContentPane().remove(/*"Center",*/framePanel);
2972
-                frame.getContentPane().add(/*"Center",*/bigThree);
3005
+                centralPanel.remove(cameraView);
3006
+                cameraPanel.add(cameraView);
3007
+                centralPanel.add(cameraPanel);
3008
+                frame.setJMenuBar(timelineMenubar);
3009
+                wasFullScreen = CameraPane.FULLSCREEN;
3010
+                if (!CameraPane.FULLSCREEN)
3011
+                    ToggleFullScreen();
3012
+                toggleFullScreenItem.setEnabled(false);
29733013             }
3014
+            else
3015
+            {
3016
+                centralPanel.remove(cameraPanel);
3017
+                centralPanel.add(cameraView);
3018
+                frame.setJMenuBar(null);
3019
+                if (!wasFullScreen)
3020
+                    ToggleFullScreen();
3021
+                toggleFullScreenItem.setEnabled(true);
3022
+            }
3023
+
29743024             frame.validate();
2975
-            cameraView.ToggleFullScreen();
3025
+            return;
3026
+        } else if (event.getSource() == toggleFullScreenItem)
3027
+        {
3028
+            ToggleFullScreen();
3029
+            frame.validate();
29763030 
29773031             return;
29783032         } else if (event.getSource() == toggleRandomItem)
....@@ -3221,9 +3275,9 @@
32213275             cameraView.RevertCamera();
32223276             cameraView.repaint();
32233277             return;
3224
-        } else if (event.getSource() == textureButton)
3225
-        {
3226
-            return; // true;
3278
+//        } else if (event.getSource() == textureButton)
3279
+//        {
3280
+//            return; // true;
32273281         } else // combos...
32283282         if (event.getSource() == texresMenu)
32293283         {
....@@ -3510,7 +3564,13 @@
35103564             //System.out.println("PARENT = " + parent);
35113565             //if (parent != null)
35123566             //	parent.applySelf();
3513
-            refreshContents();
3567
+		if (e.getSource() == normalpushField)
3568
+		{
3569
+			objEditor.refreshContents();
3570
+			//Refresh();
3571
+		}
3572
+		else
3573
+                    refreshContents();
35143574             // ??? client.refreshEditWindow();
35153575         }
35163576         //else
....@@ -3522,7 +3582,7 @@
35223582         //group.name = nameField.getText();
35233583         //objEditor.applySelf();
35243584 
3525
-        assert (objEditor == this);
3585
+        // OCT2018: assert (objEditor == this);
35263586         if (copy.selection == null || copy.selection.size() == 0)
35273587 			//super.applySelf()
35283588                                 ; else
....@@ -3546,12 +3606,18 @@
35463606                 objEditor.copy = keep;
35473607             }
35483608         }
3609
+        
3610
+        if (normalpushField != null)
3611
+                copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
35493612     }
35503613 
35513614         void SnapObject()
35523615         {
3553
-            Object3D obj = (Object3D)copy.selection.elementAt(0);
3554
-            SnapObject(obj);
3616
+            if (copy.selection.size() > 0)
3617
+            {
3618
+                    Object3D obj = (Object3D)copy.selection.elementAt(0);
3619
+                    SnapObject(obj);
3620
+            }
35553621         }
35563622         
35573623         void SnapObject(Object3D obj)
....@@ -4445,7 +4511,8 @@
44454511     MenuItem revertCameraItem;
44464512     CheckboxMenuItem toggleLiveItem;
44474513     MenuItem stepItem;
4448
-    CheckboxMenuItem toggleFullItem;
4514
+    CheckboxMenuItem toggleFullScreenItem;
4515
+    CheckboxMenuItem toggleTimelineItem;
44494516     CheckboxMenuItem toggleRenderItem;
44504517     CheckboxMenuItem toggleDebugItem;
44514518     CheckboxMenuItem toggleFrustumItem;
....@@ -4473,10 +4540,13 @@
44734540     JSplitPane bigPanel;
44744541     JPanel bigThree;
44754542     JTabbedPane scenePanel;
4476
-    JPanel cameraPanel;
4543
+    JPanel centralPanel;
4544
+    JSplitPane cameraPanel;
4545
+    JPanel timelinePanel;
4546
+    JMenuBar timelineMenubar;
44774547     JSplitPane framePanel;
44784548     JTextArea/*Field*/ nameField;
4479
-    cButton textureButton;
4549
+    //cButton textureButton;
44804550     cButton okButton;
44814551     cButton applyButton;
44824552     cButton cancelButton;
....@@ -4584,4 +4654,6 @@
45844654     NumberSlider opacityPowerField;
45854655     JTree jTree;
45864656     //ObjectUI parent;
4657
+    
4658
+    NumberSlider normalpushField;
45874659 }