Normand Briere
2019-02-22 611518a0ff65fd05e517d44adbcec639570b86eb
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,9 +300,11 @@
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);
....@@ -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,11 +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);
1164
- //new timeflow.app.TimeflowApp().TimeFlowWindow(cameraPanel, frame);
1190
+ centralPanel = new JPanel(new BorderLayout());
1191
+ timelinePanel = new JPanel(new BorderLayout());
1192
+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
11651193
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
+
11661205 //topView.camera = ;
11671206 //frontView.camera = new Camera(2);
11681207 //sideView.camera = new Camera(3);
....@@ -1192,7 +1231,7 @@
11921231 gridPanel.add(cameraView);
11931232 gridPanel.add(XYZPanel);
11941233 */
1195
- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, cameraPanel, XYZPanel); //new BorderLayout());
1234
+ gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
11961235 gridPanel.setContinuousLayout(true);
11971236 gridPanel.setOneTouchExpandable(true);
11981237 gridPanel.setDividerLocation(1.0);
....@@ -1304,7 +1343,7 @@
13041343 // aConstraints.gridheight = 3;
13051344 aWindowConstraints.gridx = 1;
13061345 aWindowConstraints.fill = GridBagConstraints.BOTH;
1307
- bigThree.add(cameraPanel, aWindowConstraints);
1346
+ bigThree.add(centralPanel, aWindowConstraints);
13081347 aWindowConstraints.weightx = 0;
13091348 aWindowConstraints.gridx = 4;
13101349 aWindowConstraints.gridwidth = 1;
....@@ -1332,7 +1371,8 @@
13321371 //worldPane.add(bigPanel);
13331372 //worldPane.add(worldPanel);
13341373 /**/
1335
- frame.getContentPane().add(/*"Center",*/framePanel);
1374
+ //frame.getContentPane().add(/*"Center",*/framePanel);
1375
+ frame.add(/*"Center",*/framePanel);
13361376 //frame.getContentPane().add(/*"Center",*/ worldPane);
13371377
13381378 // aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
....@@ -1423,7 +1463,7 @@
14231463 aConstraints.gridx += 1;
14241464 aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
14251465 //aConstraints.weightx = 0;
1426
- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1466
+ ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
14271467 aConstraints.gridx = 0;
14281468 aConstraints.gridy += 1;
14291469 aConstraints.gridwidth = 1;
....@@ -1433,7 +1473,7 @@
14331473 aConstraints.fill = GridBagConstraints.HORIZONTAL;
14341474 aConstraints.gridx += 1;
14351475 aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1436
- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1476
+ ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
14371477 aConstraints.gridx = 0;
14381478 aConstraints.gridy += 1;
14391479 aConstraints.gridwidth = 1;
....@@ -1443,7 +1483,7 @@
14431483 aConstraints.fill = GridBagConstraints.HORIZONTAL;
14441484 aConstraints.gridx += 1;
14451485 aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1446
- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1486
+ ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
14471487 aConstraints.gridx = 0;
14481488 aConstraints.gridy += 1;
14491489 aConstraints.gridwidth = 1;
....@@ -1453,7 +1493,7 @@
14531493 aConstraints.fill = GridBagConstraints.HORIZONTAL;
14541494 aConstraints.gridx += 1;
14551495 aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1456
- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1496
+ ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
14571497 aConstraints.gridx = 0;
14581498 aConstraints.gridy += 1;
14591499 aConstraints.gridwidth = 1;
....@@ -1463,7 +1503,7 @@
14631503 aConstraints.fill = GridBagConstraints.HORIZONTAL;
14641504 aConstraints.gridx += 1;
14651505 aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1466
- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1506
+ ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
14671507 aConstraints.gridx = 0;
14681508 aConstraints.gridy += 1;
14691509 aConstraints.gridwidth = 1;
....@@ -1532,7 +1572,7 @@
15321572 aConstraints.fill = GridBagConstraints.HORIZONTAL;
15331573 aConstraints.gridx += 1;
15341574 aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1535
- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1575
+ ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
15361576 aConstraints.gridx = 0;
15371577 aConstraints.gridy += 1;
15381578 aConstraints.gridwidth = 1;
....@@ -1601,7 +1641,7 @@
16011641 aConstraints.fill = GridBagConstraints.HORIZONTAL;
16021642 aConstraints.gridx += 1;
16031643 aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1604
- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1644
+ ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
16051645 aConstraints.gridx = 0;
16061646 aConstraints.gridy += 1;
16071647 aConstraints.gridwidth = 1;
....@@ -1672,7 +1712,7 @@
16721712 aConstraints.fill = GridBagConstraints.HORIZONTAL;
16731713 aConstraints.gridx += 1;
16741714 aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1675
- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1715
+ ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
16761716 aConstraints.gridx = 0;
16771717 aConstraints.gridy += 1;
16781718 aConstraints.gridwidth = 1;
....@@ -2959,20 +2999,37 @@
29592999 // june 2013 copy.HardTouch();
29603000 cameraView.repaint();
29613001 return;
2962
- } else if (event.getSource() == toggleFullItem)
3002
+ } else if (event.getSource() == toggleTimelineItem)
29633003 {
2964
- if (CameraPane.FULLSCREEN)
3004
+ timeline ^= true;
3005
+
3006
+ if (timeline)
29653007 {
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);
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);
29733016 }
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
+
29743027 frame.validate();
2975
- cameraView.ToggleFullScreen();
3028
+ return;
3029
+ } else if (event.getSource() == toggleFullScreenItem)
3030
+ {
3031
+ ToggleFullScreen();
3032
+ frame.validate();
29763033
29773034 return;
29783035 } else if (event.getSource() == toggleRandomItem)
....@@ -3221,9 +3278,9 @@
32213278 cameraView.RevertCamera();
32223279 cameraView.repaint();
32233280 return;
3224
- } else if (event.getSource() == textureButton)
3225
- {
3226
- return; // true;
3281
+// } else if (event.getSource() == textureButton)
3282
+// {
3283
+// return; // true;
32273284 } else // combos...
32283285 if (event.getSource() == texresMenu)
32293286 {
....@@ -3510,7 +3567,13 @@
35103567 //System.out.println("PARENT = " + parent);
35113568 //if (parent != null)
35123569 // parent.applySelf();
3513
- refreshContents();
3570
+ if (e.getSource() == normalpushField)
3571
+ {
3572
+ objEditor.refreshContents();
3573
+ //Refresh();
3574
+ }
3575
+ else
3576
+ refreshContents();
35143577 // ??? client.refreshEditWindow();
35153578 }
35163579 //else
....@@ -3522,7 +3585,7 @@
35223585 //group.name = nameField.getText();
35233586 //objEditor.applySelf();
35243587
3525
- assert (objEditor == this);
3588
+ // OCT2018: assert (objEditor == this);
35263589 if (copy.selection == null || copy.selection.size() == 0)
35273590 //super.applySelf()
35283591 ; else
....@@ -3546,12 +3609,18 @@
35463609 objEditor.copy = keep;
35473610 }
35483611 }
3612
+
3613
+ if (normalpushField != null)
3614
+ copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
35493615 }
35503616
35513617 void SnapObject()
35523618 {
3553
- Object3D obj = (Object3D)copy.selection.elementAt(0);
3554
- SnapObject(obj);
3619
+ if (copy.selection.size() > 0)
3620
+ {
3621
+ Object3D obj = (Object3D)copy.selection.elementAt(0);
3622
+ SnapObject(obj);
3623
+ }
35553624 }
35563625
35573626 void SnapObject(Object3D obj)
....@@ -4445,7 +4514,8 @@
44454514 MenuItem revertCameraItem;
44464515 CheckboxMenuItem toggleLiveItem;
44474516 MenuItem stepItem;
4448
- CheckboxMenuItem toggleFullItem;
4517
+ CheckboxMenuItem toggleFullScreenItem;
4518
+ CheckboxMenuItem toggleTimelineItem;
44494519 CheckboxMenuItem toggleRenderItem;
44504520 CheckboxMenuItem toggleDebugItem;
44514521 CheckboxMenuItem toggleFrustumItem;
....@@ -4473,10 +4543,13 @@
44734543 JSplitPane bigPanel;
44744544 JPanel bigThree;
44754545 JTabbedPane scenePanel;
4476
- JPanel cameraPanel;
4546
+ JPanel centralPanel;
4547
+ JSplitPane cameraPanel;
4548
+ JPanel timelinePanel;
4549
+ JMenuBar timelineMenubar;
44774550 JSplitPane framePanel;
44784551 JTextArea/*Field*/ nameField;
4479
- cButton textureButton;
4552
+ //cButton textureButton;
44804553 cButton okButton;
44814554 cButton applyButton;
44824555 cButton cancelButton;
....@@ -4584,4 +4657,6 @@
45844657 NumberSlider opacityPowerField;
45854658 JTree jTree;
45864659 //ObjectUI parent;
4660
+
4661
+ NumberSlider normalpushField;
45874662 }