Normand Briere
2019-06-21 15123b19e7bc8da2869429b07f0fbaa0598e945e
ObjEditor.java
....@@ -19,6 +19,8 @@
1919 import //weka.core.
2020 matrix.Matrix;
2121
22
+import grafeme.ui.*;
23
+
2224 class ObjEditor /*extends JFrame*/ implements iCallBack, ObjectUI,
2325 ActionListener, ChangeListener,
2426 InputMethodListener,
....@@ -28,7 +30,12 @@
2830 iSendInfo
2931 //KeyListener
3032 {
33
+ boolean timeline;
34
+ boolean wasFullScreen;
3135
36
+ GroupEditor callee;
37
+ JFrame frame;
38
+
3239 // SCRIPT
3340
3441 transient JFrame textpanel = null;
....@@ -119,51 +126,62 @@
119126 void keyPressed(int key, int modifiers)
120127 {
121128 System.out.println("KEY PRESSED");
122
- CameraPane.theRenderer.keyPressed(key, modifiers);
129
+ Globals.theRenderer.keyPressed(key, modifiers);
123130 }
124131 */
125132
126133 static GridBagConstraints aConstraints;
127134 static GridBagConstraints aWindowConstraints;
128
- GroupEditor callee;
129
- JFrame frame;
135
+
130136 static int GRIDWIDTH = 100; // 4;
131137
132138 public void closeUI()
133139 {
134140 //new Exception().printStackTrace();
135
- System.out.println("this = " + this);
136
- System.out.println("objEditor = " + objEditor);
141
+// System.out.println("this = " + this);
142
+// System.out.println("objEditor = " + objEditor);
137143 //nameField.removeActionListener(this);
138
- objEditor.ctrlPanel.remove(nameField);
144
+// objEditor.ctrlPanel.remove(nameField);
145
+
146
+ objEditor.ctrlPanel.remove(namePanel);
139147
140148 if (!GroupEditor.allparams)
141149 return;
142150
143
- objEditor.ctrlPanel.remove(liveCB);
144
- objEditor.ctrlPanel.remove(hideCB);
145
- objEditor.ctrlPanel.remove(markCB);
146
-
147
- objEditor.ctrlPanel.remove(randomCB);
148
- objEditor.ctrlPanel.remove(speedupCB);
149
- objEditor.ctrlPanel.remove(rewindCB);
150
-
151
- objEditor.ctrlPanel.remove(resetButton);
152
- objEditor.ctrlPanel.remove(stepButton);
153
-// objEditor.ctrlPanel.remove(stepAllButton);
154
-// objEditor.ctrlPanel.remove(resetAllButton);
155
- objEditor.ctrlPanel.remove(link2masterCB);
156
- //objEditor.ctrlPanel.remove(flipVCB);
157
- //objEditor.ctrlPanel.remove(texresMenu);
158
- objEditor.ctrlPanel.remove(slowerButton);
159
- objEditor.ctrlPanel.remove(fasterButton);
160
- objEditor.ctrlPanel.remove(remarkButton);
151
+// objEditor.ctrlPanel.remove(liveCB);
152
+// objEditor.ctrlPanel.remove(hideCB);
153
+// objEditor.ctrlPanel.remove(markCB);
154
+//
155
+// objEditor.ctrlPanel.remove(randomCB);
156
+// objEditor.ctrlPanel.remove(speedupCB);
157
+// objEditor.ctrlPanel.remove(rewindCB);
158
+//
159
+// objEditor.ctrlPanel.remove(resetButton);
160
+// objEditor.ctrlPanel.remove(stepButton);
161
+//// objEditor.ctrlPanel.remove(stepAllButton);
162
+//// objEditor.ctrlPanel.remove(resetAllButton);
163
+// objEditor.ctrlPanel.remove(link2masterCB);
164
+// //objEditor.ctrlPanel.remove(flipVCB);
165
+// //objEditor.ctrlPanel.remove(texresMenu);
166
+// objEditor.ctrlPanel.remove(slowerButton);
167
+// objEditor.ctrlPanel.remove(fasterButton);
168
+// objEditor.ctrlPanel.remove(remarkButton);
169
+
170
+ objEditor.ctrlPanel.remove(setupPanel);
171
+ objEditor.ctrlPanel.remove(setupPanel2);
172
+ objEditor.ctrlPanel.remove(commandsPanel);
173
+ objEditor.ctrlPanel.remove(pushPanel);
174
+ //objEditor.ctrlPanel.remove(fillPanel);
175
+
176
+ //Remove(normalpushField);
161177 }
162178
163179 public ObjEditor GetEditor()
164180 {
165181 return objEditor; //.GetEditor();
166182 }
183
+
184
+ // Sometimes myself, sometimes my callee's.
167185 ObjEditor objEditor;
168186
169187 /*
....@@ -238,7 +256,7 @@
238256 //if (!isDisplayable())
239257 //setUndecorated(true);
240258
241
- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
259
+ //System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
242260 client = inClient;
243261 copy = localCopy;
244262 copy.editWindow = this;
....@@ -259,24 +277,40 @@
259277 void SetupMenu()
260278 {
261279 frame.setMenuBar(menuBar = new MenuBar());
262
- menuBar.add(windowMenu = new Menu("File"));
263
- windowMenu.add(loadItem = new MenuItem("Load..."));
264
- windowMenu.add("-");
265
- windowMenu.add(saveItem = new MenuItem("Save"));
266
- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
280
+ menuBar.add(fileMenu = new Menu("File"));
281
+ fileMenu.add(newItem = new MenuItem("New"));
282
+ fileMenu.add(loadItem = new MenuItem("Open..."));
283
+
284
+ //oe.menuBar.add(menu = new Menu("Include"));
285
+ Menu menu = new Menu("Import");
286
+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
287
+ importOBJItem.addActionListener(this);
288
+ import3DSItem = menu.add(new MenuItem("3DS file..."));
289
+ import3DSItem.addActionListener(this);
290
+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
291
+ importVRMLX3DItem.addActionListener(this);
292
+ menu.add("-");
293
+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
294
+ importGFDItem.addActionListener(this);
295
+ fileMenu.add(menu);
296
+ fileMenu.add("-");
297
+
298
+ fileMenu.add(saveItem = new MenuItem("Save"));
299
+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
267300 //windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
268
- windowMenu.add("-");
269
- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
270
- windowMenu.add(reexportItem = new MenuItem("Re-export"));
271
- windowMenu.add("-");
301
+ fileMenu.add("-");
302
+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
303
+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
304
+ fileMenu.add("-");
272305 if (client.parent != null)
273306 {
274
- windowMenu.add(closeItem = new MenuItem("Close"));
307
+ fileMenu.add(closeItem = new MenuItem("Close"));
275308 } else
276309 {
277
- windowMenu.add(closeItem = new MenuItem("Exit"));
310
+ fileMenu.add(closeItem = new MenuItem("Exit"));
278311 }
279312
313
+ newItem.addActionListener(this);
280314 loadItem.addActionListener(this);
281315 saveItem.addActionListener(this);
282316 saveAsItem.addActionListener(this);
....@@ -285,77 +319,26 @@
285319 //povItem.addActionListener(this);
286320 closeItem.addActionListener(this);
287321
288
- menuBar.add(cameraMenu = new Menu("View"));
289
- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
290
- //zBufferItem.addActionListener(this);
291
- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
292
- //normalLensItem.addActionListener(this);
293
- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
294
- revertCameraItem.addActionListener(this);
295
- cameraMenu.add(toggleFullItem = new CheckboxMenuItem("Full Screen"));
296
- toggleFullItem.addItemListener(this);
297
- toggleFullItem.setState(CameraPane.FULLSCREEN);
298
- cameraMenu.add("-");
299
- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
300
- toggleTextureItem.addItemListener(this);
301
- toggleTextureItem.setState(CameraPane.textureon);
302
- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
303
- toggleLiveItem.addItemListener(this);
304
- toggleLiveItem.setState(CameraPane.isLIVE());
305
- cameraMenu.add(stepItem = new MenuItem("Step"));
306
- stepItem.addActionListener(this);
307
-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
308
-// toggleDLItem.addItemListener(this);
309
-// toggleDLItem.setState(false);
310
- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
311
- toggleRenderItem.addItemListener(this);
312
- toggleRenderItem.setState(!CameraPane.frozen);
313
- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
314
- toggleDebugItem.addItemListener(this);
315
- toggleDebugItem.setState(CameraPane.DEBUG);
316
- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
317
- toggleFrustumItem.addItemListener(this);
318
- toggleFrustumItem.setState(CameraPane.FRUSTUM);
319
- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
320
- toggleFootContactItem.addItemListener(this);
321
- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
322
- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
323
- toggleRandomItem.addItemListener(this);
324
- toggleRandomItem.setState(CameraPane.RANDOM);
325
- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
326
- toggleHandleItem.addItemListener(this);
327
- toggleHandleItem.setState(CameraPane.HANDLES);
328
- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
329
- togglePaintItem.addItemListener(this);
330
- togglePaintItem.setState(CameraPane.PAINTMODE);
331
-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
332
-// toggleRootItem.addItemListener(this);
333
-// toggleRootItem.setState(false);
334
-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
335
-// animationItem.addItemListener(this);
336
-// animationItem.setState(CameraPane.ANIMATION);
337
- cameraMenu.add("-");
338
- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
339
- editCameraItem.addActionListener(this);
340
-
341322 objectPanel = new JTabbedPane();
342323 toolbarPanel = new JPanel();
343324 toolbarPanel.setName("Toolbar");
344
- treePanel = new JPanel();
325
+ treePanel = new cGridBag();
345326 treePanel.setName("Tree");
346
- ctrlPanel = new JPanel(); // new GridBagLayout());
327
+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
347328 ctrlPanel.setName("Edit");
348
- materialPanel = new JPanel();
329
+ materialPanel = new cGridBag().setVertical(true);
349330 materialPanel.setName("Material");
350331 /*JTextPane*/
351332 infoarea = createTextPane();
333
+ doc = infoarea.getStyledDocument();
334
+
352335 infoarea.setEditable(true);
353336 SetText();
354337 // infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
355338 // infoarea.setOpaque(false);
356339 // //infoarea.setForeground(textcolor);
357
- infoarea.setLineWrap(true);
358
- infoarea.setWrapStyleWord(true);
340
+// TEXTAREA infoarea.setLineWrap(true);
341
+// TEXTAREA infoarea.setWrapStyleWord(true);
359342 infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
360343 infoPanel.setPreferredSize(new Dimension(50, 200));
361344 infoPanel.setName("Info");
....@@ -366,16 +349,16 @@
366349 mainPanel.setName("Main");
367350 mainPanel.setContinuousLayout(true);
368351 mainPanel.setOneTouchExpandable(true);
369
- mainPanel.setDividerLocation(1.0);
370352 mainPanel.setDividerSize(9);
371
- mainPanel.setResizeWeight(0);
353
+ mainPanel.setDividerLocation(0.5); //1.0);
354
+ mainPanel.setResizeWeight(0.5);
372355
373356 //ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
374357 //mainPanel.setLayout(new GridBagLayout());
375358 toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
376
- treePanel.setLayout(new GridBagLayout());
377
- ctrlPanel.setLayout(new GridBagLayout());
378
- materialPanel.setLayout(new GridBagLayout());
359
+// treePanel.setLayout(new GridBagLayout());
360
+ //ctrlPanel.setLayout(new GridBagLayout());
361
+ //materialPanel.setLayout(new GridBagLayout());
379362
380363 aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
381364 GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
....@@ -414,7 +397,7 @@
414397 static String newline = "\n";
415398 protected static final String buttonString = "JButton";
416399 StyledDocument doc;
417
- JTextArea infoarea;
400
+ JTextPane infoarea;
418401
419402 void ClearInfo()
420403 {
....@@ -437,10 +420,10 @@
437420 e.printStackTrace();
438421 }
439422
440
- String selection = infoarea.getText();
441
- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
442
- java.awt.datatransfer.Clipboard clipboard =
443
- Toolkit.getDefaultToolkit().getSystemClipboard();
423
+// String selection = infoarea.getText();
424
+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
425
+// java.awt.datatransfer.Clipboard clipboard =
426
+// Toolkit.getDefaultToolkit().getSystemClipboard();
444427 //clipboard.setContents(data, data);
445428 }
446429
....@@ -463,13 +446,13 @@
463446 //SendInfo("Name:", "bold");
464447 if (sel.GetTextures() != null || debug)
465448 {
466
- si.SendInfo(sel.toString(), "bold");
449
+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
467450 //SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
468451 if (sel.Size() > 0)
469452 {
470453 si.SendInfo("#children = " + sel.Size(), "regular");
471454 }
472
- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
455
+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
473456 if (debug)
474457 {
475458 try
....@@ -481,7 +464,10 @@
481464 }
482465
483466 if (full)
484
- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
467
+ {
468
+ si.SendInfo(" BBox min: " + minima, "regular");
469
+ si.SendInfo(" BBox max: " + maxima, "regular");
470
+ }
485471
486472 if (sel.bRep != null)
487473 {
....@@ -508,7 +494,7 @@
508494 }
509495 if (sel.support != null)
510496 {
511
- si.SendInfo(" support: " + sel.support, "regular");
497
+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
512498 }
513499 if (sel.scriptnode != null)
514500 {
....@@ -579,6 +565,9 @@
579565 {
580566 CameraPane.pointflow = (PointFlow) sel;
581567 }
568
+
569
+ si.SendInfo("_____________________", "regular");
570
+ si.SendInfo("", "regular");
582571 }
583572 }
584573
....@@ -594,52 +583,68 @@
594583 }
595584 }
596585
597
- private JTextArea createTextPane()
598
- {
599
- String[] initString =
586
+ void ToggleFullScreen()
600587 {
601
- "This is an editable JTextPane, ", //regular
602
- "another ", //italic
603
- "styled ", //bold
604
- "text ", //small
605
- "component, ", //large
606
- "which supports embedded components..." + newline,//regular
607
- " " + newline, //button
608
- "...and embedded icons..." + newline, //regular
609
- " ", //icon
610
- newline + "JTextPane is a subclass of JEditorPane that "
611
- + "uses a StyledEditorKit and StyledDocument, and provides "
612
- + "cover methods for interacting with those objects."
613
- };
614
-
615
- String[] initStyles =
616
- {
617
- "regular", "italic", "bold", "small", "large",
618
- "regular", "button", "regular", "icon",
619
- "regular"
620
- };
621
-
622
- JTextPane textPane = new JTextPane();
623
- textPane.setEditable(true);
624
- /*StyledDocument*/ doc = textPane.getStyledDocument();
625
- addStylesToDocument(doc);
626
-
627
- try
628
- {
629
- for (int j = 0; j < 2; j++)
630
- {
631
- for (int i = 0; i < initString.length; i++)
588
+ if (CameraPane.FULLSCREEN)
632589 {
633
- doc.insertString(doc.getLength(), initString[i],
634
- doc.getStyle(initStyles[i]));
590
+ frame.getContentPane().remove(/*"Center",*/bigThree);
591
+ framePanel.add(bigThree);
592
+ frame.getContentPane().add(/*"Center",*/framePanel);
593
+ } else
594
+ {
595
+ frame.getContentPane().remove(/*"Center",*/framePanel);
596
+ framePanel.remove(bigThree);
597
+ frame.getContentPane().add(/*"Center",*/bigThree);
635598 }
636
- }
637
- } catch (BadLocationException ble)
638
- {
639
- System.err.println("Couldn't insert initial text into text pane.");
599
+ cameraView.ToggleFullScreen();
640600 }
641601
642
- return new JTextArea(); // textPane;
602
+ private JTextPane createTextPane()
603
+ {
604
+// TEXTAREA String[] initString =
605
+// {
606
+// "This is an editable JTextPane, ", //regular
607
+// "another ", //italic
608
+// "styled ", //bold
609
+// "text ", //small
610
+// "component, ", //large
611
+// "which supports embedded components..." + newline,//regular
612
+// " " + newline, //button
613
+// "...and embedded icons..." + newline, //regular
614
+// " ", //icon
615
+// newline + "JTextPane is a subclass of JEditorPane that "
616
+// + "uses a StyledEditorKit and StyledDocument, and provides "
617
+// + "cover methods for interacting with those objects."
618
+// };
619
+//
620
+// String[] initStyles =
621
+// {
622
+// "regular", "italic", "bold", "small", "large",
623
+// "regular", "button", "regular", "icon",
624
+// "regular"
625
+// };
626
+//
627
+// JTextPane textPane = new JTextPane();
628
+// textPane.setEditable(true);
629
+// /*StyledDocument*/ doc = textPane.getStyledDocument();
630
+// addStylesToDocument(doc);
631
+//
632
+// try
633
+// {
634
+// for (int j = 0; j < 2; j++)
635
+// {
636
+// for (int i = 0; i < initString.length; i++)
637
+// {
638
+// doc.insertString(doc.getLength(), initString[i],
639
+// doc.getStyle(initStyles[i]));
640
+// }
641
+// }
642
+// } catch (BadLocationException ble)
643
+// {
644
+// System.err.println("Couldn't insert initial text into text pane.");
645
+// }
646
+
647
+ return new JTextPane(); // textPane;
643648 }
644649
645650 protected void addStylesToDocument(StyledDocument doc)
....@@ -692,7 +697,7 @@
692697 protected static ImageIcon createImageIcon(String path,
693698 String description)
694699 {
695
- java.net.URL imgURL = GrafreeD.class.getResource(path);
700
+ java.net.URL imgURL = Grafreed.class.getResource(path);
696701 if (imgURL != null)
697702 {
698703 return new ImageIcon(imgURL, description);
....@@ -724,6 +729,7 @@
724729 // NumberSlider vDivsField;
725730 // JCheckBox endcaps;
726731 JCheckBox liveCB;
732
+ JCheckBox selectCB;
727733 JCheckBox hideCB;
728734 JCheckBox link2masterCB;
729735 JCheckBox markCB;
....@@ -739,115 +745,84 @@
739745 JButton slowerButton;
740746 JButton fasterButton;
741747 JButton remarkButton;
748
+
749
+ cGridBag namePanel;
750
+ cGridBag setupPanel;
751
+ cGridBag setupPanel2;
752
+ cGridBag commandsPanel;
753
+ cGridBag pushPanel;
754
+ cGridBag fillPanel;
742755
743
- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
756
+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
744757 {
745758 JCheckBox cb;
746759
747
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
748
- oe.aConstraints.gridwidth = 1; // 3;
749
-// oe.aConstraints.weightx = 1;
750
-// oe.aConstraints.anchor = GridBagConstraints.WEST;
751
- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
760
+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
752761 cb.addItemListener(this);
753
-// oe.aConstraints.anchor = GridBagConstraints.EAST;
754
- oe.aConstraints.gridwidth = 1;
755
- oe.aConstraints.gridx += 1;
756762
757763 return cb;
758764 }
759765
760
- cButton AddButton(ObjEditor oe, String label)
766
+ cButton AddButton(cGridBag panel, String label)
761767 {
762768 cButton cb;
763769
764
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
765
- oe.aConstraints.gridwidth = 1;
766
-// oe.aConstraints.weightx = 1;
767
-// oe.aConstraints.anchor = GridBagConstraints.WEST;
768
- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
770
+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
769771 cb.addActionListener(this);
770
-// oe.aConstraints.anchor = GridBagConstraints.EAST;
771
- oe.aConstraints.gridwidth = 1;
772
- oe.aConstraints.gridx += 1;
773772
774773 return cb;
775774 }
776775
777
- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
776
+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
778777 {
779778 JComboBox combo;
780779
781
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
782
- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
783
- oe.aConstraints.gridx += 1;
780
+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
784781 combo.addActionListener(this);
785782
786783 return combo;
787784 }
788785
789
- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
786
+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
790787 {
791
- NumberSlider combo;
788
+ cGridBag control = new cGridBag();
789
+
790
+ cNumberSlider combo;
792791
793792 JLabel jlabel = new JLabel(label);
794
-
795
- aConstraints.fill = GridBagConstraints.VERTICAL;
796793 jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
797
- aConstraints.gridwidth = 2;
798
- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
799
- aConstraints.gridx += 1;
800
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
801
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
802
- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
803
- aConstraints.gridx += 1;
804
- aConstraints.gridwidth = 1;
805
-
794
+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
795
+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
806796 combo.setFloat(current);
807
-
808
- combo.label = jlabel;
809
-
810
- combo.addChangeListener(this);
811
-
812
- return combo;
797
+
798
+ panel.add(control);
799
+
800
+ return control;
813801 }
814802
815
- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
803
+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
816804 {
817
- NumberSlider combo;
805
+ cGridBag control = new cGridBag();
806
+
807
+ cNumberSlider combo;
818808
819809 JLabel jlabel = new JLabel(label);
820
-
821
- aConstraints.fill = GridBagConstraints.VERTICAL;
822810 jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
823
- aConstraints.gridwidth = 2;
824
- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
825
- aConstraints.gridx += 1;
826
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
827
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
828
- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
829
- aConstraints.gridx += 1;
830
- aConstraints.gridwidth = 1;
831
-
811
+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
812
+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
832813 combo.setInteger(current);
833814
834
- combo.label = jlabel;
835
-
836
- combo.addChangeListener(this);
837
-
838
- return combo;
815
+ panel.add(control);
816
+
817
+ return control;
839818 }
840819
841
- JTextArea AddText(JPanel ctrlPanel, String name)
820
+ JTextArea AddText(cGridBag ctrlPanel, String name)
842821 {
843822 JTextArea text;
844823
845
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
846
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
847
- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
824
+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
848825 text.addCaretListener(this);
849
- aConstraints.gridx += 1;
850
- aConstraints.gridwidth = 1;
851826
852827 return text;
853828 }
....@@ -877,9 +852,16 @@
877852 objEditor.ctrlPanel.remove(j);
878853 }
879854
855
+ void Remove(cNumberSlider j)
856
+ {
857
+ j.removeChangeListener(this);
858
+ //objEditor.ctrlPanel.remove(j.label);
859
+ objEditor.ctrlPanel.remove(j);
860
+ }
861
+
880862 /*
881863 */
882
- void Return() // ObjEditor oe)
864
+ void Return0() // ObjEditor oe)
883865 {
884866 aConstraints.gridy += 1;
885867 aConstraints.gridx = 0;
....@@ -934,35 +916,77 @@
934916
935917 void SetupUI2(ObjEditor oe)
936918 {
937
-// oe.aConstraints.weightx = 0;
938
-// oe.aConstraints.weighty = 0;
939
-// oe.aConstraints.gridx = 0;
940
-// oe.aConstraints.gridy = 0;
941
- SetupName(oe);
919
+ //SetupName(oe);
920
+
921
+ namePanel = new cGridBag();
922
+
923
+ nameField = AddText(namePanel, copy.GetName());
924
+ namePanel.add(nameField);
925
+ oe.ctrlPanel.add(namePanel);
926
+
927
+ oe.ctrlPanel.Return();
942928
943929 if (!GroupEditor.allparams)
944930 return;
945931
946
- liveCB = AddCheckBox(oe, "Live", copy.live);
947
- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
948
- hideCB = AddCheckBox(oe, "Hide", copy.hide);
932
+ setupPanel = new cGridBag().setVertical(false);
933
+
934
+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
935
+ liveCB.setToolTipText("Animate object");
936
+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
937
+ selectCB.setToolTipText("Make object selectable");
949938 // Return();
950
- markCB = AddCheckBox(oe, "Mark", copy.marked);
951
- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
952
- randomCB = AddCheckBox(oe, "Rand", copy.random);
953
- Return();
954
- resetButton = AddButton(oe, "Reset");
955
- stepButton = AddButton(oe, "Step");
939
+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
940
+ hideCB.setToolTipText("Hide object");
941
+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
942
+ markCB.setToolTipText("Set the animation target transform");
943
+
944
+ setupPanel2 = new cGridBag().setVertical(false);
945
+
946
+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
947
+ rewindCB.setToolTipText("Rewind animation");
948
+
949
+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
950
+ randomCB.setToolTipText("Rewind or Go back and forth randomly");
951
+
952
+ if (Globals.ADVANCED)
953
+ {
954
+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
955
+ link2masterCB.setToolTipText("Attach to support");
956
+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
957
+ speedupCB.setToolTipText("Option motion capture");
958
+ }
959
+
960
+ oe.ctrlPanel.add(setupPanel);
961
+ oe.ctrlPanel.Return();
962
+ oe.ctrlPanel.add(setupPanel2);
963
+ oe.ctrlPanel.Return();
964
+
965
+ commandsPanel = new cGridBag().setVertical(false);
966
+
967
+ resetButton = AddButton(commandsPanel, "Reset");
968
+ resetButton.setToolTipText("Jump to frame zero");
969
+ stepButton = AddButton(commandsPanel, "Step");
970
+ stepButton.setToolTipText("Step one frame");
956971 // resetAllButton = AddButton(oe, "Reset All");
957972 // stepAllButton = AddButton(oe, "Step All");
958
- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
959973 // Return();
960
- slowerButton = AddButton(oe, "Slow");
961
- fasterButton = AddButton(oe, "Fast");
962
- remarkButton = AddButton(oe, "Rem");
974
+ slowerButton = AddButton(commandsPanel, "Slow");
975
+ slowerButton.setToolTipText("Decrease animation speed");
976
+ fasterButton = AddButton(commandsPanel, "Fast");
977
+ fasterButton.setToolTipText("Increase animation speed");
978
+ remarkButton = AddButton(commandsPanel, "Remark");
979
+ remarkButton.setToolTipText("Set the current transform as the target");
963980
964
- Return();
981
+ oe.ctrlPanel.add(commandsPanel);
982
+ oe.ctrlPanel.Return();
965983
984
+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
985
+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
986
+ //Return();
987
+
988
+ oe.ctrlPanel.Return();
989
+
966990 // oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
967991 // ObjEditor.aConstraints.gridx += 1;
968992
....@@ -1056,7 +1080,7 @@
10561080 oe.aConstraints.gridwidth = 1;
10571081 /**/
10581082 nameField = AddText(oe.ctrlPanel, copy.GetName());
1059
- Return();
1083
+ oe.ctrlPanel.Return();
10601084
10611085 //ctrlPanel.add(textureButton = new Button("Texture..."));
10621086 //textureButton.setEnabled(false);
....@@ -1158,10 +1182,22 @@
11581182 //JPanel worldPanel =
11591183 // new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
11601184 //worldPanel.setName("World");
1161
- /*JPanel*/ cameraPanel =
1162
- new JPanel(new BorderLayout());
1163
- cameraPanel.add(cameraView);
1185
+ centralPanel = new cGridBag();
1186
+ centralPanel.preferredWidth = 20;
1187
+ timelinePanel = new JPanel(new BorderLayout());
1188
+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
11641189
1190
+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1191
+ cameraPanel.setContinuousLayout(true);
1192
+ cameraPanel.setOneTouchExpandable(true);
1193
+// cameraPanel.setDividerLocation(0.9);
1194
+// cameraPanel.setDividerSize(9);
1195
+ cameraPanel.setResizeWeight(1.0);
1196
+
1197
+ centralPanel.add(cameraView);
1198
+ //frame.setJMenuBar(timelineMenubar);
1199
+ //centralPanel.add(timelinePanel);
1200
+
11651201 //topView.camera = ;
11661202 //frontView.camera = new Camera(2);
11671203 //sideView.camera = new Camera(3);
....@@ -1177,12 +1213,13 @@
11771213 //frontView.object = copy;
11781214 //sideView.object = copy;
11791215
1180
- XYZPanel = new JPanel();
1181
- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1216
+ XYZPanel = new cGridBag().setVertical(true);
1217
+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
11821218
1183
- XYZPanel.add(/*BorderLayout.SOUTH,*/sideView); // Scroll);
1184
- XYZPanel.add(/*BorderLayout.CENTER,*/frontView); // Scroll);
1185
- XYZPanel.add(/*BorderLayout.NORTH,*/topView); // Scroll);
1219
+ XYZPanel.preferredWidth = 5;
1220
+ XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll);
1221
+ XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll);
1222
+ XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
11861223
11871224 /*
11881225 gridPanel = new JPanel(); //new BorderLayout());
....@@ -1191,7 +1228,7 @@
11911228 gridPanel.add(cameraView);
11921229 gridPanel.add(XYZPanel);
11931230 */
1194
- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, cameraPanel, XYZPanel); //new BorderLayout());
1231
+ gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
11951232 gridPanel.setContinuousLayout(true);
11961233 gridPanel.setOneTouchExpandable(true);
11971234 gridPanel.setDividerLocation(1.0);
....@@ -1220,10 +1257,11 @@
12201257 //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
12211258 //tmp.setName("Edit");
12221259 objectPanel.add(materialPanel);
1223
- JPanel north = new JPanel(new BorderLayout());
1224
- north.setName("Edit");
1225
- north.add(ctrlPanel, BorderLayout.NORTH);
1226
- objectPanel.add(north);
1260
+// JPanel north = new JPanel(new BorderLayout());
1261
+// north.setName("Edit");
1262
+// north.add(ctrlPanel, BorderLayout.NORTH);
1263
+// objectPanel.add(north);
1264
+ objectPanel.add(ctrlPanel);
12271265 objectPanel.add(infoPanel);
12281266
12291267 /*
....@@ -1244,16 +1282,23 @@
12441282 scrollpane.setWheelScrollingEnabled(true);
12451283 scrollpane.addMouseWheelListener(this); // Default not fast enough
12461284
1247
- /*JTabbedPane*/ jtp = new JTabbedPane();
1248
- jtp.add(scrollpane);
1285
+ /*JTabbedPane*/ scenePanel = new cGridBag();
1286
+ scenePanel.preferredWidth = 6;
1287
+
1288
+ JTabbedPane tabbedPane = new JTabbedPane();
1289
+ tabbedPane.add(scrollpane);
12491290
1250
- jtp.add(FSPane = new cFileSystemPane(this));
1291
+ tabbedPane.add(FSPane = new cFileSystemPane(this));
12511292
1252
- optionsPanel = new JPanel(new GridBagLayout());
1293
+ optionsPanel = new cGridBag().setVertical(true);
12531294
12541295 optionsPanel.setName("Options");
1255
- jtp.add(optionsPanel);
1256
-
1296
+
1297
+ AddOptions(optionsPanel); //, aConstraints);
1298
+
1299
+ tabbedPane.add(optionsPanel);
1300
+
1301
+ scenePanel.add(tabbedPane);
12571302
12581303 /*
12591304 cTree jTree = new cTree(null);
....@@ -1275,7 +1320,7 @@
12751320 jtp.add(tree);
12761321 */
12771322
1278
- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, jtp, gridPanel);
1323
+ bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
12791324 bigPanel.setContinuousLayout(true);
12801325 bigPanel.setOneTouchExpandable(true);
12811326 bigPanel.setDividerLocation(0.8);
....@@ -1287,6 +1332,7 @@
12871332 //bigPanel.setSize(new Dimension(10,10));
12881333 //bigPanel.add(ctrlPanel);
12891334 //bigPanel.add(gridPanel);
1335
+ /**
12901336 bigThree = new JPanel();
12911337 //big.setLayout(new FlowLayout(FlowLayout.LEFT));
12921338 bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
....@@ -1297,20 +1343,26 @@
12971343 aWindowConstraints.fill = GridBagConstraints.VERTICAL;
12981344 aWindowConstraints.weightx = 0;
12991345 aWindowConstraints.weighty = 1;
1300
- bigThree.add(jtp, aWindowConstraints);
1346
+ bigThree.add(scenePanel, aWindowConstraints);
13011347 aWindowConstraints.weightx = 1;
13021348 aWindowConstraints.gridwidth = 3;
13031349 // aConstraints.gridheight = 3;
13041350 aWindowConstraints.gridx = 1;
13051351 aWindowConstraints.fill = GridBagConstraints.BOTH;
1306
- bigThree.add(cameraPanel, aWindowConstraints);
1352
+ bigThree.add(centralPanel, aWindowConstraints);
13071353 aWindowConstraints.weightx = 0;
13081354 aWindowConstraints.gridx = 4;
13091355 aWindowConstraints.gridwidth = 1;
13101356 // aConstraints.gridheight = 3;
13111357 aWindowConstraints.fill = GridBagConstraints.VERTICAL;
13121358 bigThree.add(XYZPanel, aWindowConstraints);
1359
+ /**/
13131360
1361
+ bigThree = new cGridBag();
1362
+ bigThree.addComponent(scenePanel);
1363
+ bigThree.addComponent(centralPanel);
1364
+ bigThree.addComponent(XYZPanel);
1365
+
13141366 // // SIDE EFFECT!!!
13151367 // aConstraints.gridx = 0;
13161368 // aConstraints.gridy = 0;
....@@ -1331,13 +1383,14 @@
13311383 //worldPane.add(bigPanel);
13321384 //worldPane.add(worldPanel);
13331385 /**/
1334
- frame.getContentPane().add(/*"Center",*/framePanel);
1386
+ //frame.getContentPane().add(/*"Center",*/framePanel);
1387
+ frame.add(/*"Center",*/framePanel);
13351388 //frame.getContentPane().add(/*"Center",*/ worldPane);
13361389
13371390 // aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
13381391
1339
- frame.setSize(1024, 768);
1340
- frame.show();
1392
+ frame.setSize(1280, 860);
1393
+ frame.setVisible(true);
13411394
13421395 gridPanel.setDividerLocation(1.0);
13431396
....@@ -1352,6 +1405,10 @@
13521405 });
13531406 }
13541407
1408
+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
1409
+ {
1410
+ }
1411
+
13551412 JTree GetTree()
13561413 {
13571414 return objEditor.jTree;
....@@ -1363,260 +1420,173 @@
13631420 ctrlPanel.removeAll();
13641421 }
13651422
1366
- void SetupMaterial(JPanel ctrlPanel)
1423
+ void SetupMaterial(cGridBag panel)
13671424 {
1368
- aConstraints.weighty = 0;
1369
- //aConstraints.weightx = 1;
1370
- /*
1425
+ /*
13711426 ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
13721427 materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1373
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1374
- aConstraints.gridx += 1;
13751428 */
13761429
1377
- aConstraints.gridwidth = 1;
1378
- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1379
- aConstraints.gridx += 1;
1380
- aConstraints.weighty = 0;
1381
- aConstraints.gridwidth = 1;
1430
+ cGridBag editBar = new cGridBag().setVertical(false);
1431
+
1432
+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1433
+ createMaterialButton.setToolTipText("Create material");
13821434
13831435 /*
13841436 ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1385
- aConstraints.gridx += 1;
1386
- aConstraints.weighty = 0;
1387
- aConstraints.gridwidth = 1;
13881437 */
13891438
1390
- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1391
- aConstraints.gridx += 1;
1439
+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1440
+ clearMaterialButton.setToolTipText("Clear material");
1441
+
1442
+ if (Globals.ADVANCED)
1443
+ {
1444
+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
1445
+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1446
+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1447
+ }
13921448
1393
- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1394
-
1395
- aConstraints.gridx += 1;
1396
-
1397
- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1398
-
1399
- aConstraints.gridx += 1;
1400
-
1401
- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1402
-
1403
- aConstraints.gridx = 0;
1404
- aConstraints.gridy += 1;
1405
- aConstraints.weighty = 0;
1406
- aConstraints.gridwidth = 1;
1449
+ editBar.preferredHeight = 15;
1450
+
1451
+ panel.add(editBar);
1452
+
14071453 /**/
14081454 //aConstraints.weighty = 0;
14091455 ////aConstraints.weightx = 1;
14101456 //aConstraints.weighty = 1;
14111457 aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
14121458 //aConstraints.gridx += 1;
1413
- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1414
- aConstraints.weighty = 0;
1415
- aConstraints.gridx = 0;
1416
- aConstraints.gridy += 1;
1417
- aConstraints.gridwidth = 1;
1459
+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
14181460
1419
- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1420
- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1421
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1422
- aConstraints.gridx += 1;
1423
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1424
- //aConstraints.weightx = 0;
1425
- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1426
- aConstraints.gridx = 0;
1427
- aConstraints.gridy += 1;
1428
- aConstraints.gridwidth = 1;
1461
+ cGridBag colorSection = new cGridBag().setVertical(true);
1462
+
1463
+ cGridBag color = new cGridBag();
1464
+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1465
+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1466
+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1467
+ //colorField.preferredWidth = 200;
1468
+ colorSection.add(color);
14291469
1430
- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1431
- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1432
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1433
- aConstraints.gridx += 1;
1434
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1435
- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1436
- aConstraints.gridx = 0;
1437
- aConstraints.gridy += 1;
1438
- aConstraints.gridwidth = 1;
1470
+ cGridBag modulation = new cGridBag();
1471
+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1472
+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1473
+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1474
+ colorSection.add(modulation);
14391475
1440
- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1441
- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1442
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1443
- aConstraints.gridx += 1;
1444
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1445
- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1446
- aConstraints.gridx = 0;
1447
- aConstraints.gridy += 1;
1448
- aConstraints.gridwidth = 1;
1476
+ cGridBag texture = new cGridBag();
1477
+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1478
+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1479
+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1480
+ colorSection.add(texture);
14491481
1450
- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1451
- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1452
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1453
- aConstraints.gridx += 1;
1454
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1455
- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1456
- aConstraints.gridx = 0;
1457
- aConstraints.gridy += 1;
1458
- aConstraints.gridwidth = 1;
1482
+ cGridBag anisoU = new cGridBag();
1483
+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1484
+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1485
+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1486
+ colorSection.add(anisoU);
14591487
1460
- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1461
- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1462
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1463
- aConstraints.gridx += 1;
1464
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1465
- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1466
- aConstraints.gridx = 0;
1467
- aConstraints.gridy += 1;
1468
- aConstraints.gridwidth = 1;
1488
+ cGridBag anisoV = new cGridBag();
1489
+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1490
+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1491
+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1492
+ colorSection.add(anisoV);
14691493
1470
- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1471
- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1472
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1473
- aConstraints.gridx += 1;
1474
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1475
- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1476
- aConstraints.gridx = 0;
1477
- aConstraints.gridy += 1;
1478
- aConstraints.gridwidth = 1;
1494
+ cGridBag shadowbias = new cGridBag();
1495
+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1496
+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1497
+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1498
+ colorSection.add(shadowbias);
14791499
1480
- //aConstraints.weighty = 1;
1481
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1482
- //aConstraints.gridx += 1;
1483
- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1484
- aConstraints.weighty = 0;
1485
- aConstraints.gridx = 0;
1486
- aConstraints.gridy += 1;
1487
- aConstraints.gridwidth = 1;
1500
+ panel.add(new JSeparator());
1501
+
1502
+ panel.add(colorSection);
1503
+
1504
+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1505
+
1506
+ cGridBag diffuseSection = new cGridBag().setVertical(true);
1507
+
1508
+ cGridBag diffuse = new cGridBag();
1509
+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
1510
+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1511
+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1512
+ diffuseSection.add(diffuse);
14881513
1489
- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1490
- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1491
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1492
- aConstraints.gridx += 1;
1493
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1494
- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1495
- aConstraints.gridx = 0;
1496
- aConstraints.gridy += 1;
1497
- aConstraints.gridwidth = 1;
1514
+ cGridBag diffuseness = new cGridBag();
1515
+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
1516
+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1517
+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1518
+ diffuseSection.add(diffuseness);
14981519
1499
- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1500
- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1501
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1502
- aConstraints.gridx += 1;
1503
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1504
- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1505
- aConstraints.gridx = 0;
1506
- aConstraints.gridy += 1;
1507
- aConstraints.gridwidth = 1;
1520
+ cGridBag selfshadow = new cGridBag();
1521
+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
1522
+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1523
+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1524
+ diffuseSection.add(selfshadow);
15081525
1509
- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1510
- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1511
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1512
- aConstraints.gridx += 1;
1513
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1514
- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1515
- aConstraints.gridx = 0;
1516
- aConstraints.gridy += 1;
1517
- aConstraints.gridwidth = 1;
1526
+ cGridBag sheen = new cGridBag();
1527
+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
1528
+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1529
+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1530
+ diffuseSection.add(sheen);
15181531
1519
- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1520
- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1521
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1522
- aConstraints.gridx += 1;
1523
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1524
- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1525
- aConstraints.gridx = 0;
1526
- aConstraints.gridy += 1;
1527
- aConstraints.gridwidth = 1;
1532
+ cGridBag subsurface = new cGridBag();
1533
+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
1534
+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1535
+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1536
+ diffuseSection.add(subsurface);
15281537
1529
- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1530
- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1531
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1532
- aConstraints.gridx += 1;
1533
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1534
- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1535
- aConstraints.gridx = 0;
1536
- aConstraints.gridy += 1;
1537
- aConstraints.gridwidth = 1;
1538
+ cGridBag shadow = new cGridBag();
1539
+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
1540
+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1541
+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1542
+ diffuseSection.add(shadow);
15381543
1539
- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1540
- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1541
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1542
- aConstraints.gridx += 1;
1543
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1544
- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1545
- aConstraints.gridx = 0;
1546
- aConstraints.gridy += 1;
1547
- aConstraints.gridwidth = 1;
1544
+ cGridBag fakedepth = new cGridBag();
1545
+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
1546
+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1547
+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1548
+ diffuseSection.add(fakedepth);
15481549
1549
- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1550
- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1551
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1552
- aConstraints.gridx += 1;
1553
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1554
- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1555
- aConstraints.gridx = 0;
1556
- aConstraints.gridy += 1;
1557
- aConstraints.gridwidth = 1;
1550
+ panel.add(new JSeparator());
1551
+
1552
+ panel.add(diffuseSection);
1553
+
1554
+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1555
+
1556
+ cGridBag specularSection = new cGridBag().setVertical(true);
15581557
1559
- //aConstraints.weighty = 1;
1560
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1561
- //aConstraints.gridx += 1;
1562
- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1563
- aConstraints.weighty = 0;
1564
- aConstraints.gridx = 0;
1565
- aConstraints.gridy += 1;
1566
- aConstraints.gridwidth = 1;
1558
+ cGridBag specular = new cGridBag();
1559
+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
1560
+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1561
+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1562
+ specularSection.add(specular);
15671563
1568
- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1569
- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1570
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1571
- aConstraints.gridx += 1;
1572
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1573
- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1574
- aConstraints.gridx = 0;
1575
- aConstraints.gridy += 1;
1576
- aConstraints.gridwidth = 1;
1564
+ cGridBag lightarea = new cGridBag();
1565
+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
1566
+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1567
+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1568
+ specularSection.add(lightarea);
15771569
1578
- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1579
- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1580
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1581
- aConstraints.gridx += 1;
1582
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1583
- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1584
- aConstraints.gridx = 0;
1585
- aConstraints.gridy += 1;
1586
- aConstraints.gridwidth = 1;
1570
+ cGridBag shininess = new cGridBag();
1571
+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
1572
+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1573
+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1574
+ specularSection.add(shininess);
15871575
1588
- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1589
- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1590
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1591
- aConstraints.gridx += 1;
1592
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1593
- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1594
- aConstraints.gridx = 0;
1595
- aConstraints.gridy += 1;
1596
- aConstraints.gridwidth = 1;
1576
+ cGridBag metalness = new cGridBag();
1577
+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
1578
+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1579
+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1580
+ specularSection.add(metalness);
15971581
1598
- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1599
- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1600
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1601
- aConstraints.gridx += 1;
1602
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1603
- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1604
- aConstraints.gridx = 0;
1605
- aConstraints.gridy += 1;
1606
- aConstraints.gridwidth = 1;
1582
+ cGridBag velvet = new cGridBag();
1583
+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
1584
+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1585
+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1586
+ specularSection.add(velvet);
16071587
1608
- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1609
- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1610
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1611
- aConstraints.gridx += 1;
1612
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1613
- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1614
- aConstraints.gridx = 0;
1615
- aConstraints.gridy += 1;
1616
- aConstraints.gridwidth = 1;
1617
-
1618
- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1619
- Return();
1588
+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
1589
+ //Return();
16201590 // ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
16211591 // shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
16221592 // aConstraints.fill = GridBagConstraints.HORIZONTAL;
....@@ -1627,130 +1597,93 @@
16271597 // aConstraints.gridy += 1;
16281598 // aConstraints.gridwidth = 1;
16291599
1630
- //aConstraints.weighty = 1;
1631
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1632
- //aConstraints.gridx += 1;
1633
- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1634
- aConstraints.weighty = 0;
1635
- aConstraints.gridx = 0;
1636
- aConstraints.gridy += 1;
1637
- aConstraints.gridwidth = 1;
16381600
1639
- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1640
- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1641
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1642
- aConstraints.gridx += 1;
1643
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1644
- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1645
- aConstraints.gridx = 0;
1646
- aConstraints.gridy += 1;
1647
- aConstraints.gridwidth = 1;
1601
+ panel.add(new JSeparator());
1602
+
1603
+ panel.add(specularSection);
1604
+
1605
+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1606
+
1607
+ cGridBag globalSection = new cGridBag().setVertical(true);
16481608
1649
- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1650
- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1651
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1652
- aConstraints.gridx += 1;
1653
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1654
- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1655
- aConstraints.gridx = 0;
1656
- aConstraints.gridy += 1;
1657
- aConstraints.gridwidth = 1;
1609
+ cGridBag camera = new cGridBag();
1610
+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1611
+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1612
+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1613
+ globalSection.add(camera);
16581614
1659
- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1660
- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1661
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1662
- aConstraints.gridx += 1;
1663
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1664
- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1665
- aConstraints.gridx = 0;
1666
- aConstraints.gridy += 1;
1667
- aConstraints.gridwidth = 1;
1615
+ cGridBag ambient = new cGridBag();
1616
+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1617
+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1618
+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1619
+ globalSection.add(ambient);
16681620
1669
- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1670
- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1671
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1672
- aConstraints.gridx += 1;
1673
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1674
- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1675
- aConstraints.gridx = 0;
1676
- aConstraints.gridy += 1;
1677
- aConstraints.gridwidth = 1;
1678
- aConstraints.weighty = 0;
1621
+ cGridBag backlit = new cGridBag();
1622
+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1623
+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1624
+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1625
+ globalSection.add(backlit);
16791626
1680
- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1681
- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1682
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1683
- aConstraints.gridx += 1;
1684
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1685
- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1686
- aConstraints.gridx = 0;
1687
- aConstraints.gridy += 1;
1688
- aConstraints.gridwidth = 1;
1627
+ cGridBag opacity = new cGridBag();
1628
+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1629
+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1630
+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1631
+ globalSection.add(opacity);
16891632
1690
- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1691
- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1692
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1693
- aConstraints.gridx += 1;
1694
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1695
- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/*5*/), aConstraints);
1696
- aConstraints.gridx = 0;
1697
- aConstraints.gridy += 1;
1698
- aConstraints.gridwidth = 1;
1633
+ panel.add(new JSeparator());
1634
+
1635
+ panel.add(globalSection);
1636
+
1637
+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1638
+
1639
+ cGridBag textureSection = new cGridBag().setVertical(true);
16991640
1700
- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1701
- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1702
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1703
- aConstraints.gridx += 1;
1704
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1705
- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1706
- aConstraints.gridx = 0;
1707
- aConstraints.gridy += 1;
1708
- aConstraints.gridwidth = 1;
1641
+ cGridBag bump = new cGridBag();
1642
+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
1643
+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1644
+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
1645
+ textureSection.add(bump);
17091646
1710
- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1711
- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1712
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1713
- aConstraints.gridx += 1;
1714
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1715
- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1716
- aConstraints.gridx = 0;
1717
- aConstraints.gridy += 1;
1718
- aConstraints.gridwidth = 1;
1647
+ cGridBag noise = new cGridBag();
1648
+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
1649
+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1650
+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/*5*/)); // , aConstraints);
1651
+ textureSection.add(noise);
17191652
1720
- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1721
- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1722
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1723
- aConstraints.gridx += 1;
1724
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1725
- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1726
- aConstraints.gridx = 0;
1727
- aConstraints.gridy += 1;
1728
- aConstraints.gridwidth = 1;
1653
+ cGridBag power = new cGridBag();
1654
+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
1655
+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1656
+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
1657
+ textureSection.add(power);
17291658
1730
- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1731
- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1732
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1733
- aConstraints.gridx += 1;
1734
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1735
- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /*10 dec 2013*/), aConstraints);
1736
- aConstraints.gridx = 0;
1737
- aConstraints.gridy += 1;
1738
- aConstraints.gridwidth = 1;
1659
+ cGridBag borderfade = new cGridBag();
1660
+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
1661
+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1662
+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
1663
+ textureSection.add(borderfade);
17391664
1740
- //aConstraints.weighty = 1;
1741
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1742
- //aConstraints.gridx += 1;
1743
- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1744
- aConstraints.weighty = 0;
1665
+ cGridBag fog = new cGridBag();
1666
+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
1667
+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1668
+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
1669
+ textureSection.add(fog);
17451670
1746
- aConstraints.gridx = 0;
1747
- aConstraints.gridy = 0;
1748
- aConstraints.gridwidth = 1;
1671
+ cGridBag opacityPower = new cGridBag();
1672
+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
1673
+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1674
+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /*10 dec 2013*/)); // , aConstraints);
1675
+ textureSection.add(opacityPower);
1676
+
1677
+ panel.add(new JSeparator());
1678
+
1679
+ panel.add(textureSection);
1680
+
1681
+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
17491682
17501683 SetMaterial(copy); // .GetMaterial());
17511684
1752
- colorField.addChangeListener(this);
1753
- modulationField.addChangeListener(this);
1685
+ //colorField.addChangeListener(this);
1686
+// modulationField.addChangeListener(this);
17541687 metalnessField.addChangeListener(this);
17551688 diffuseField.addChangeListener(this);
17561689 specularField.addChangeListener(this);
....@@ -1780,12 +1713,15 @@
17801713 opacityPowerField.addChangeListener(this);
17811714 /**/
17821715
1783
- resetSlidersButton.addActionListener(this);
17841716 clearMaterialButton.addActionListener(this);
17851717 createMaterialButton.addActionListener(this);
1786
-
1787
- propagateToggle.addItemListener(this);
1788
- multiplyToggle.addItemListener(this);
1718
+
1719
+ if (Globals.ADVANCED)
1720
+ {
1721
+ resetSlidersButton.addActionListener(this);
1722
+ propagateToggle.addItemListener(this);
1723
+ multiplyToggle.addItemListener(this);
1724
+ }
17891725 }
17901726
17911727 void DropFile(java.io.File[] files, boolean textures)
....@@ -1956,7 +1892,7 @@
19561892
19571893 //? flashIt = false;
19581894 CameraPane pane = (CameraPane) cameraView;
1959
- pane.clickStart(location.x, location.y, 0);
1895
+ pane.clickStart(location.x, location.y, 0, 0);
19601896 pane.clickEnd(location.x, location.y, 0, true);
19611897
19621898 if (group.selection.size() == 1)
....@@ -2005,6 +1941,7 @@
20051941 e2.printStackTrace();
20061942 }
20071943 }
1944
+
20081945 LoadJMEThread loadThread;
20091946
20101947 class LoadJMEThread extends Thread
....@@ -2062,6 +1999,7 @@
20621999 //LoadFile0(filename, converter);
20632000 }
20642001 }
2002
+
20652003 LoadOBJThread loadObjThread;
20662004
20672005 class LoadOBJThread extends Thread
....@@ -2140,19 +2078,19 @@
21402078
21412079 void LoadObjFile(String fullname)
21422080 {
2143
- /*
2081
+ System.out.println("Loading " + fullname);
2082
+ /**/
21442083 //lastFilename = fullname;
21452084 if(loadObjThread == null)
21462085 {
2147
- loadObjThread = new LoadOBJThread();
2148
- loadObjThread.start();
2086
+ loadObjThread = new LoadOBJThread();
2087
+ loadObjThread.start();
21492088 }
21502089
21512090 loadObjThread.add(fullname);
2152
- */
2091
+ /**/
21532092
2154
- System.out.println("Loading " + fullname);
2155
- makeSomething(new FileObject(fullname, true), true);
2093
+ //makeSomething(new FileObject(fullname, true), true);
21562094 }
21572095
21582096 void LoadGFDFile(String fullname)
....@@ -2413,11 +2351,11 @@
24132351
24142352 void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
24152353 {
2416
- if (GrafreeD.standAlone)
2354
+ if (Grafreed.standAlone)
24172355 {
24182356 /**/
24192357 FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2420
- browser.show();
2358
+ browser.setVisible(true);
24212359 String filename = browser.getFile();
24222360 if (filename != null && filename.length() > 0)
24232361 {
....@@ -2562,6 +2500,7 @@
25622500 }
25632501 if (input == null)
25642502 {
2503
+ new Exception().printStackTrace();
25652504 System.exit(0);
25662505 }
25672506
....@@ -2776,7 +2715,8 @@
27762715 return;
27772716 }
27782717
2779
- multiplyToggle.setSelected(mat.multiply);
2718
+ if (multiplyToggle != null)
2719
+ multiplyToggle.setSelected(mat.multiply);
27802720
27812721 assert (object.projectedVertices != null);
27822722
....@@ -2958,25 +2898,42 @@
29582898 // june 2013 copy.HardTouch();
29592899 cameraView.repaint();
29602900 return;
2961
- } else if (event.getSource() == toggleFullItem)
2901
+ } else if (event.getSource() == toggleTimelineItem)
29622902 {
2963
- if (CameraPane.FULLSCREEN)
2903
+ timeline ^= true;
2904
+
2905
+ if (timeline)
29642906 {
2965
- frame.getContentPane().remove(/*"Center",*/bigThree);
2966
- framePanel.add(bigThree);
2967
- frame.getContentPane().add(/*"Center",*/framePanel);
2968
- } else
2969
- {
2970
- frame.getContentPane().remove(/*"Center",*/framePanel);
2971
- frame.getContentPane().add(/*"Center",*/bigThree);
2907
+ centralPanel.remove(cameraView);
2908
+ cameraPanel.add(cameraView);
2909
+ centralPanel.add(cameraPanel);
2910
+ frame.setJMenuBar(timelineMenubar);
2911
+ wasFullScreen = CameraPane.FULLSCREEN;
2912
+ if (!CameraPane.FULLSCREEN)
2913
+ ToggleFullScreen();
2914
+ toggleFullScreenItem.setEnabled(false);
29722915 }
2916
+ else
2917
+ {
2918
+ centralPanel.remove(cameraPanel);
2919
+ centralPanel.add(cameraView);
2920
+ frame.setJMenuBar(null);
2921
+ if (!wasFullScreen)
2922
+ ToggleFullScreen();
2923
+ toggleFullScreenItem.setEnabled(true);
2924
+ }
2925
+
29732926 frame.validate();
2974
- cameraView.ToggleFullScreen();
2927
+ return;
2928
+ } else if (event.getSource() == toggleFullScreenItem)
2929
+ {
2930
+ ToggleFullScreen();
2931
+ frame.validate();
29752932
29762933 return;
2977
- } else if (event.getSource() == toggleRandomItem)
2934
+ } else if (event.getSource() == toggleSwitchItem)
29782935 {
2979
- cameraView.ToggleRandom();
2936
+ cameraView.ToggleSwitch();
29802937 cameraView.repaint();
29812938 return;
29822939 } else if (event.getSource() == toggleHandleItem)
....@@ -3005,6 +2962,10 @@
30052962 {
30062963 copy.live ^= true;
30072964 return;
2965
+ } else if (event.getSource() == selectCB)
2966
+ {
2967
+ copy.dontselect ^= true;
2968
+ return;
30082969 } else if (event.getSource() == hideCB)
30092970 {
30102971 copy.hide ^= true;
....@@ -3019,6 +2980,7 @@
30192980 if (event.getSource() == randomCB)
30202981 {
30212982 copy.random ^= true;
2983
+ objEditor.refreshContents();
30222984 return;
30232985 }
30242986 if (event.getSource() == speedupCB)
....@@ -3042,8 +3004,9 @@
30423004
30433005 public void actionPerformed(ActionEvent event)
30443006 {
3007
+ Object source = event.getSource();
30453008 // SCRIPT DIALOG
3046
- if (event.getSource() == okbutton)
3009
+ if (source == okbutton)
30473010 {
30483011 textpanel.setVisible(false);
30493012 textpanel.remove(textarea);
....@@ -3055,7 +3018,7 @@
30553018 textarea = null;
30563019 textpanel = null;
30573020 }
3058
- if (event.getSource() == cancelbutton)
3021
+ if (source == cancelbutton)
30593022 {
30603023 textpanel.setVisible(false);
30613024 textpanel.remove(textarea);
....@@ -3067,49 +3030,50 @@
30673030 //applySelf();
30683031 //client.refreshEditWindow();
30693032 //refreshContents();
3070
- if (event.getSource() == nameField)
3033
+ if (source == nameField)
30713034 {
30723035 //System.out.println("ObjEditor " + event);
30733036 applySelf0(true);
30743037 //parent.applySelf();
30753038 objEditor.refreshContents();
3076
- } else if (event.getSource() == resetButton)
3039
+ } else if (source == resetButton)
30773040 {
30783041 CameraPane.fullreset = true;
30793042 copy.Reset(); // ResetMeshes();
30803043 copy.Touch();
30813044 objEditor.refreshContents();
3082
- } else if (event.getSource() == stepItem)
3045
+ } else if (source == stepItem)
30833046 {
3084
- cameraView.ONESTEP = true;
3047
+ //cameraView.ONESTEP = true;
3048
+ Globals.ONESTEP = true;
30853049 cameraView.repaint();
30863050 return;
3087
- } else if (event.getSource() == stepButton)
3051
+ } else if (source == stepButton)
30883052 {
30893053 copy.Step();
30903054 copy.Touch();
30913055 objEditor.refreshContents();
3092
- } else if (event.getSource() == slowerButton)
3056
+ } else if (source == slowerButton)
30933057 {
30943058 copy.Slower();
30953059 copy.Touch();
30963060 objEditor.refreshContents();
3097
- } else if (event.getSource() == fasterButton)
3061
+ } else if (source == fasterButton)
30983062 {
30993063 copy.Faster();
31003064 copy.Touch();
31013065 objEditor.refreshContents();
3102
- } else if (event.getSource() == remarkButton)
3066
+ } else if (source == remarkButton)
31033067 {
31043068 copy.Remark();
31053069 copy.Touch();
31063070 objEditor.refreshContents();
3107
- } else if (event.getSource() == stepAllButton)
3071
+ } else if (source == stepAllButton)
31083072 {
31093073 copy.StepAll();
31103074 copy.Touch();
31113075 objEditor.refreshContents();
3112
- } else if (event.getSource() == resetAllButton)
3076
+ } else if (source == resetAllButton)
31133077 {
31143078 //CameraPane.fullreset = true;
31153079 copy.ResetAll(); // ResetMeshes();
....@@ -3142,53 +3106,75 @@
31423106 // Close();
31433107 // }
31443108 // else
3145
- if (event.getSource() == resetSlidersButton)
3109
+ if (source == resetSlidersButton)
31463110 {
31473111 ResetSliders();
3148
- } else if (event.getSource() == clearMaterialButton)
3112
+ } else if (source == clearMaterialButton)
31493113 {
31503114 ClearMaterial();
3151
- } else if (event.getSource() == createMaterialButton)
3115
+ } else if (source == createMaterialButton)
31523116 {
31533117 CreateMaterial();
3154
- } else if (event.getSource() == clearPanelButton)
3118
+ } else if (source == clearPanelButton)
31553119 {
31563120 copy.ClearUI();
31573121 refreshContents(true);
3158
- } /*
3159
- }
3160
-
3161
- public boolean action(Event event, Object arg)
3162
- {
3163
- */ else if (event.getSource() == closeItem)
3122
+ } else if (source == importGFDItem)
3123
+ {
3124
+ ImportGFD();
3125
+ } else
3126
+ if (source == importVRMLX3DItem)
3127
+ {
3128
+ ImportVRMLX3D();
3129
+ } else
3130
+ if (source == import3DSItem)
3131
+ {
3132
+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
3133
+ } else
3134
+ if (source == importOBJItem)
3135
+ {
3136
+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
3137
+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
3138
+ browser.setVisible(true);
3139
+ String filename = browser.getFile();
3140
+ if (filename != null && filename.length() > 0)
3141
+ {
3142
+ String fullname = browser.getDirectory() + filename;
3143
+ makeSomething(ReadOBJ(fullname), true);
3144
+ }
3145
+ } else
3146
+ if (source == closeItem)
31643147 {
31653148 Close();
31663149 //return true;
3167
- } else if (event.getSource() == loadItem)
3150
+ } else if (source == loadItem)
31683151 {
31693152 load();
31703153 //return true;
3171
- } else if (event.getSource() == saveItem)
3154
+ } else if (source == newItem)
3155
+ {
3156
+ New();
3157
+ } else if (source == saveItem)
31723158 {
31733159 save();
31743160 //return true;
3175
- } else if (event.getSource() == saveAsItem)
3161
+ } else if (source == saveAsItem)
31763162 {
31773163 saveAs();
31783164 //return true;
3179
- } else if (event.getSource() == reexportItem)
3165
+ } else if (source == reexportItem)
31803166 {
31813167 reexport();
31823168 //return true;
3183
- } else if (event.getSource() == exportAsItem)
3169
+ } else if (source == exportAsItem)
31843170 {
31853171 export();
31863172 //return true;
3187
- } else if (event.getSource() == povItem)
3173
+ } else if (source == povItem)
31883174 {
31893175 generatePOV();
31903176 //return true;
3191
- } else if (event.getSource() == zBufferItem)
3177
+ } else if (source == zBufferItem)
31923178 {
31933179 try
31943180 {
....@@ -3210,21 +3196,8 @@
32103196 cameraView.repaint();
32113197 //return true;
32123198 }
3213
- */ else if (event.getSource() == editCameraItem)
3214
- {
3215
- cameraView.ProtectCamera();
3216
- cameraView.repaint();
3217
- return;
3218
- } else if (event.getSource() == revertCameraItem)
3219
- {
3220
- cameraView.RevertCamera();
3221
- cameraView.repaint();
3222
- return;
3223
- } else if (event.getSource() == textureButton)
3224
- {
3225
- return; // true;
3226
- } else // combos...
3227
- if (event.getSource() == texresMenu)
3199
+ */ else // combos...
3200
+ if (source == texresMenu)
32283201 {
32293202 System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
32303203 copy.texres = texresMenu.getSelectedIndex();
....@@ -3236,27 +3209,283 @@
32363209 }
32373210 }
32383211
3239
- void ToggleAnimation()
3212
+ void New()
32403213 {
3241
- if (!CameraPane.ANIMATION)
3214
+ while (copy.Size() > 1)
32423215 {
3243
- FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3216
+ copy.remove(1);
3217
+ }
3218
+
3219
+ ResetModel();
3220
+ objEditor.refreshContents();
3221
+ }
3222
+
3223
+ static public byte[] Compress(Object3D o)
3224
+ {
3225
+ try
3226
+ {
3227
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
3228
+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3229
+ ObjectOutputStream out = new ObjectOutputStream(zstream);
3230
+
3231
+ Object3D parent = o.parent;
3232
+ o.parent = null;
3233
+
3234
+ out.writeObject(o);
3235
+
3236
+ o.parent = parent;
3237
+
3238
+ out.flush();
3239
+
3240
+ zstream.close();
3241
+ out.close();
3242
+
3243
+ return baos.toByteArray();
3244
+ } catch (Exception e)
3245
+ {
3246
+ System.err.println(e);
3247
+ return null;
3248
+ }
3249
+ }
3250
+
3251
+ static public Object Uncompress(byte[] bytes)
3252
+ {
3253
+ System.out.println("#bytes = " + bytes.length);
3254
+ try
3255
+ {
3256
+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3257
+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3258
+ ObjectInputStream in = new ObjectInputStream(istream);
3259
+ Object obj = in.readObject();
3260
+ in.close();
3261
+
3262
+ return obj;
3263
+ } catch (Exception e)
3264
+ {
3265
+ System.err.println(e);
3266
+ return null;
3267
+ }
3268
+ }
3269
+
3270
+ static public Object clone(Object o)
3271
+ {
3272
+ try
3273
+ {
3274
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
3275
+ ObjectOutputStream out = new ObjectOutputStream(baos);
3276
+
3277
+ out.writeObject(o);
3278
+
3279
+ out.flush();
3280
+ out.close();
3281
+
3282
+ byte[] bytes = baos.toByteArray();
3283
+
3284
+ System.out.println("clone = " + bytes.length);
3285
+
3286
+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3287
+ ObjectInputStream in = new ObjectInputStream(bais);
3288
+ Object obj = in.readObject();
3289
+ in.close();
3290
+
3291
+ return obj;
3292
+ } catch (Exception e)
3293
+ {
3294
+ System.err.println(e);
3295
+ return null;
3296
+ }
3297
+ }
3298
+
3299
+ cRadio GetCurrentTab()
3300
+ {
3301
+ cRadio ab;
3302
+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3303
+ {
3304
+ ab = (cRadio)e.nextElement();
3305
+ if(ab.GetObject() == copy)
3306
+ {
3307
+ return ab;
3308
+ }
3309
+ }
3310
+
3311
+ return null;
3312
+ }
3313
+
3314
+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3315
+
3316
+ public void Save()
3317
+ {
3318
+ cRadio tab = GetCurrentTab();
3319
+
3320
+ boolean temp = CameraPane.SWITCH;
3321
+ CameraPane.SWITCH = false;
3322
+
3323
+ copy.ExtractBigData(hashtable);
3324
+
3325
+ //EditorFrame.m_MainFrame.requestFocusInWindow();
3326
+ tab.graphs[tab.undoindex++] = Compress(copy);
3327
+
3328
+ copy.RestoreBigData(hashtable);
3329
+
3330
+ CameraPane.SWITCH = temp;
3331
+
3332
+ //assert(hashtable.isEmpty());
3333
+
3334
+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
3335
+ {
3336
+ tab.graphs[i] = null;
3337
+ }
3338
+
3339
+ // test save
3340
+ if (false)
3341
+ {
3342
+ try
3343
+ {
3344
+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
3345
+ ObjectOutputStream p = new ObjectOutputStream(ostream);
3346
+
3347
+ p.writeObject(copy);
3348
+
3349
+ p.flush();
3350
+
3351
+ ostream.close();
3352
+ } catch (Exception e)
3353
+ {
3354
+ e.printStackTrace();
3355
+ }
3356
+ }
3357
+ }
3358
+
3359
+ void CopyChanged(Object3D obj)
3360
+ {
3361
+ boolean temp = CameraPane.SWITCH;
3362
+ CameraPane.SWITCH = false;
3363
+
3364
+ copy.ExtractBigData(hashtable);
3365
+
3366
+ copy.clear();
3367
+
3368
+ for (int i=0; i<obj.Size(); i++)
3369
+ {
3370
+ copy.add(obj.get(i));
3371
+ }
3372
+
3373
+ copy.RestoreBigData(hashtable);
3374
+
3375
+ CameraPane.SWITCH = temp;
3376
+
3377
+ //assert(hashtable.isEmpty());
3378
+
3379
+ copy.Touch();
3380
+
3381
+ ResetModel();
3382
+ copy.HardTouch(); // recompile?
3383
+
3384
+ cRadio ab;
3385
+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3386
+ {
3387
+ ab = (cRadio)e.nextElement();
3388
+ Object3D test = copy.GetObject(ab.object.GetUUID());
3389
+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
3390
+ if (test != null)
3391
+ {
3392
+ test.editWindow = ab.object.editWindow;
3393
+ ab.object = test;
3394
+ }
3395
+ }
3396
+
3397
+ refreshContents();
3398
+ }
3399
+
3400
+ public void Undo()
3401
+ {
3402
+ cRadio tab = GetCurrentTab();
3403
+
3404
+ if (tab.undoindex == 0)
3405
+ {
3406
+ java.awt.Toolkit.getDefaultToolkit().beep();
3407
+ return;
3408
+ }
3409
+
3410
+ if (tab.graphs[tab.undoindex] == null)
3411
+ {
3412
+ Save();
3413
+ tab.undoindex -= 1;
3414
+ }
3415
+
3416
+ tab.undoindex -= 1;
3417
+
3418
+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3419
+ }
3420
+
3421
+ public void Redo()
3422
+ {
3423
+ cRadio tab = GetCurrentTab();
3424
+
3425
+ if (tab.graphs[tab.undoindex + 1] == null)
3426
+ {
3427
+ java.awt.Toolkit.getDefaultToolkit().beep();
3428
+ return;
3429
+ }
3430
+
3431
+ tab.undoindex += 1;
3432
+
3433
+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3434
+ }
3435
+
3436
+ void ImportGFD()
3437
+ {
3438
+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
32443439 browser.show();
32453440 String filename = browser.getFile();
32463441 if (filename != null && filename.length() > 0)
32473442 {
3248
- CameraPane.filename = browser.getDirectory() + filename;
3443
+ String fullname = browser.getDirectory() + filename;
3444
+
3445
+ //Object3D readobj =
3446
+ objEditor.ReadGFD(fullname, objEditor);
3447
+ //makeSomething(readobj);
3448
+ }
3449
+ }
3450
+
3451
+ void ImportVRMLX3D()
3452
+ {
3453
+ if (Grafreed.standAlone)
3454
+ {
3455
+ /**/
3456
+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
3457
+ browser.show();
3458
+ String filename = browser.getFile();
3459
+ if (filename != null && filename.length() > 0)
3460
+ {
3461
+ String fullname = browser.getDirectory() + filename;
3462
+ LoadVRMLX3D(fullname);
3463
+ }
3464
+ /**/
3465
+ }
3466
+ }
3467
+
3468
+ void ToggleAnimation()
3469
+ {
3470
+ if (!Globals.ANIMATION)
3471
+ {
3472
+ FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3473
+ browser.setVisible(true);
3474
+ String filename = browser.getFile();
3475
+ if (filename != null && filename.length() > 0)
3476
+ {
3477
+ Globals.filename = browser.getDirectory() + filename;
32493478 //CameraPane.framecount = 0;
3250
- CameraPane.imagecount = 0;
3479
+ Globals.imagecount = 0;
32513480
3252
- CameraPane.ANIMATION ^= true;
3481
+ Globals.ANIMATION ^= true;
32533482
3254
- GrafreeD.wav.cursor = 0;
3255
- GrafreeD.wav.loop = 0;
3483
+ Grafreed.wav.cursor = 0;
3484
+ Grafreed.wav.loop = 0;
32563485 }
32573486 } else
32583487 {
3259
- CameraPane.ANIMATION ^= true;
3488
+ Globals.ANIMATION ^= true;
32603489 }
32613490 }
32623491
....@@ -3302,7 +3531,7 @@
33023531 void CreateMaterial()
33033532 {
33043533 //copy.ClearMaterial(); // PATCH
3305
- copy.CreateMaterialS(multiplyToggle.isSelected());
3534
+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
33063535 if (copy.selection.size() > 0)
33073536 //SetMaterial(copy);
33083537 {
....@@ -3361,11 +3590,11 @@
33613590 {
33623591 copy.ResetBlockLoop(); // temporary problem
33633592
3364
- boolean random = CameraPane.RANDOM;
3365
- CameraPane.RANDOM = false; // parse everything
3593
+ boolean random = CameraPane.SWITCH;
3594
+ CameraPane.SWITCH = false; // parse everything
33663595 copy.ResetDisplayList();
33673596 copy.HardTouch();
3368
- CameraPane.RANDOM = random;
3597
+ CameraPane.SWITCH = random;
33693598 }
33703599
33713600 // public void applySelf()
....@@ -3435,10 +3664,40 @@
34353664 current.fakedepth = (float) fakedepthField.getFloat();
34363665 current.shadowbias = (float) shadowbiasField.getFloat();
34373666
3438
- if (!NumberSlider.frozen)
3667
+ if (!cNumberSlider.frozen)
34393668 {
34403669 //System.out.println("Propagate = " + propagate);
34413670 copy.UpdateMaterial(anchor, current, propagate);
3671
+
3672
+ if (copy.material != null)
3673
+ {
3674
+ cMaterial mat = copy.material;
3675
+
3676
+ colorField.SetToolTipValue((mat.color));
3677
+ modulationField.SetToolTipValue((mat.modulation));
3678
+ metalnessField.SetToolTipValue((mat.metalness));
3679
+ diffuseField.SetToolTipValue((mat.diffuse));
3680
+ specularField.SetToolTipValue((mat.specular));
3681
+ shininessField.SetToolTipValue((mat.shininess));
3682
+ shiftField.SetToolTipValue((mat.shift));
3683
+ ambientField.SetToolTipValue((mat.ambient));
3684
+ lightareaField.SetToolTipValue((mat.lightarea));
3685
+ diffusenessField.SetToolTipValue((mat.factor));
3686
+ velvetField.SetToolTipValue((mat.velvet));
3687
+ sheenField.SetToolTipValue((mat.sheen));
3688
+ subsurfaceField.SetToolTipValue((mat.subsurface));
3689
+ backlitField.SetToolTipValue((mat.bump));
3690
+ anisoField.SetToolTipValue((mat.aniso));
3691
+ anisoVField.SetToolTipValue((mat.anisoV));
3692
+ cameraField.SetToolTipValue((mat.cameralight));
3693
+ selfshadowField.SetToolTipValue((mat.diffuseness));
3694
+ shadowField.SetToolTipValue((mat.shadow));
3695
+ textureField.SetToolTipValue((mat.texture));
3696
+ opacityField.SetToolTipValue((mat.opacity));
3697
+ fakedepthField.SetToolTipValue((mat.fakedepth));
3698
+ shadowbiasField.SetToolTipValue((mat.shadowbias));
3699
+ }
3700
+
34423701 if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
34433702 {
34443703 copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
....@@ -3483,6 +3742,7 @@
34833742 || e.getSource() == apertureField
34843743 || e.getSource() == shadowblurField)
34853744 {
3745
+ new Exception().printStackTrace();
34863746 System.exit(0);
34873747 cameraView.options1[0] = (float) focusField.getFloat() * 10;
34883748 cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
....@@ -3509,7 +3769,13 @@
35093769 //System.out.println("PARENT = " + parent);
35103770 //if (parent != null)
35113771 // parent.applySelf();
3512
- refreshContents();
3772
+ if (e.getSource() == normalpushField)
3773
+ {
3774
+ objEditor.refreshContents();
3775
+ //Refresh();
3776
+ }
3777
+ else
3778
+ refreshContents();
35133779 // ??? client.refreshEditWindow();
35143780 }
35153781 //else
....@@ -3521,7 +3787,7 @@
35213787 //group.name = nameField.getText();
35223788 //objEditor.applySelf();
35233789
3524
- assert (objEditor == this);
3790
+ // OCT2018: assert (objEditor == this);
35253791 if (copy.selection == null || copy.selection.size() == 0)
35263792 //super.applySelf()
35273793 ; else
....@@ -3545,12 +3811,18 @@
35453811 objEditor.copy = keep;
35463812 }
35473813 }
3814
+
3815
+ if (normalpushField != null)
3816
+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
35483817 }
35493818
35503819 void SnapObject()
35513820 {
3552
- Object3D obj = (Object3D)copy.selection.elementAt(0);
3553
- SnapObject(obj);
3821
+ if (copy.selection.size() > 0)
3822
+ {
3823
+ Object3D obj = (Object3D)copy.selection.elementAt(0);
3824
+ SnapObject(obj);
3825
+ }
35543826 }
35553827
35563828 void SnapObject(Object3D obj)
....@@ -3664,7 +3936,7 @@
36643936
36653937 if (obj.parent != null)
36663938 {
3667
- obj.parent.TransformToWorld(interest);
3939
+// obj.parent.TransformToWorld(interest);
36683940 }
36693941
36703942 if (!CameraPane.TRACK)
....@@ -3796,7 +4068,7 @@
37964068
37974069 radioPanel.revalidate();
37984070 radioPanel.repaint();
3799
- ctrlPanel.revalidate(); // ? new
4071
+ ctrlPanel.validate(); // ? new
38004072 ctrlPanel.repaint();
38014073 }
38024074 }
....@@ -3805,6 +4077,7 @@
38054077
38064078 void makeSomething(Object3D thing, boolean resetmodel) // deselect)
38074079 {
4080
+ Save();
38084081 //Tween.set(thing, 0).target(1).start(tweenManager);
38094082 //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
38104083 // if (thing instanceof GenericJointDemo)
....@@ -4008,6 +4281,7 @@
40084281 }
40094282 }
40104283 }
4284
+
40114285 LoadGFDThread loadGFDThread;
40124286
40134287 void ReadGFD(String fullname, iCallBack cb)
....@@ -4027,8 +4301,10 @@
40274301
40284302 try
40294303 {
4304
+ // Try compressed version first.
40304305 java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4031
- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
4306
+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
4307
+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
40324308
40334309 readobj = (Object3D) p.readObject();
40344310 istream.close();
....@@ -4036,7 +4312,20 @@
40364312 readobj.ResetDisplayList();
40374313 } catch (Exception e)
40384314 {
4039
- e.printStackTrace();
4315
+ //e.printStackTrace();
4316
+ try
4317
+ {
4318
+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4319
+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
4320
+
4321
+ readobj = (Object3D) p.readObject();
4322
+ istream.close();
4323
+
4324
+ readobj.ResetDisplayList();
4325
+ } catch (Exception e2)
4326
+ {
4327
+ e2.printStackTrace();
4328
+ }
40404329 }
40414330 // catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
40424331 // catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
....@@ -4082,6 +4371,12 @@
40824371
40834372 void LoadIt(Object obj)
40844373 {
4374
+ if (obj == null)
4375
+ {
4376
+ // Invalid file
4377
+ return;
4378
+ }
4379
+
40854380 System.out.println("Loaded " + obj);
40864381 //new Exception().printStackTrace();
40874382 Object3D readobj = (Object3D) obj;
....@@ -4091,6 +4386,7 @@
40914386
40924387 if (readobj != null)
40934388 {
4389
+ Save();
40944390 try
40954391 {
40964392 //readobj.deepCopySelf(copy);
....@@ -4153,7 +4449,7 @@
41534449
41544450 void load() // throws ClassNotFoundException
41554451 {
4156
- if (GrafreeD.standAlone)
4452
+ if (Grafreed.standAlone)
41574453 {
41584454 FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
41594455 browser.show();
....@@ -4240,11 +4536,13 @@
42404536 try
42414537 {
42424538 FileOutputStream ostream = new FileOutputStream(lastname);
4243
- ObjectOutputStream p = new ObjectOutputStream(ostream);
4539
+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4540
+ ObjectOutputStream p = new ObjectOutputStream(zstream);
42444541
42454542 p.writeObject(copy);
42464543 p.flush();
42474544
4545
+ zstream.close();
42484546 ostream.close();
42494547
42504548 //FileOutputStream fos = new FileOutputStream(fullname);
....@@ -4254,11 +4552,12 @@
42544552 {
42554553 }
42564554 }
4555
+
42574556 String lastname;
42584557
42594558 void saveAs()
42604559 {
4261
- if (GrafreeD.standAlone)
4560
+ if (Grafreed.standAlone)
42624561 {
42634562 FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
42644563 browser.setVisible(true);
....@@ -4363,13 +4662,13 @@
43634662 try
43644663 {
43654664 FileOutputStream ostream = new FileOutputStream(filename);
4366
- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4367
- ObjectOutputStream p = new ObjectOutputStream(/*z*/ostream);
4665
+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4666
+ ObjectOutputStream p = new ObjectOutputStream(zstream);
43684667
43694668 Object3D objectparent = obj.parent;
43704669 obj.parent = null;
43714670
4372
- Object3D object = (Object3D) GrafreeD.clone(obj);
4671
+ Object3D object = (Object3D) Grafreed.clone(obj);
43734672
43744673 obj.parent = objectparent;
43754674
....@@ -4381,8 +4680,8 @@
43814680 p.writeObject(object);
43824681 p.flush();
43834682
4683
+ zstream.close();
43844684 ostream.close();
4385
- // zstream.close();
43864685
43874686 // group.selection.get(0).parent = parent;
43884687 //FileOutputStream fos = new FileOutputStream(fullname);
....@@ -4403,7 +4702,7 @@
44034702 buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
44044703 cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
44054704 copy.generatePOV(buffer);
4406
- if (GrafreeD.standAlone)
4705
+ if (Grafreed.standAlone)
44074706 {
44084707 FileDialog browser = new FileDialog(frame, "Export POV", 1);
44094708 browser.show();
....@@ -4429,7 +4728,8 @@
44294728 Object3D client;
44304729 Object3D copy;
44314730 MenuBar menuBar;
4432
- Menu windowMenu;
4731
+ Menu fileMenu;
4732
+ MenuItem newItem;
44334733 MenuItem loadItem;
44344734 MenuItem saveItem;
44354735 MenuItem saveAsItem;
....@@ -4437,21 +4737,20 @@
44374737 MenuItem reexportItem;
44384738 MenuItem povItem;
44394739 MenuItem closeItem;
4440
- Menu cameraMenu;
4740
+
44414741 CheckboxMenuItem zBufferItem;
44424742 //MenuItem normalLensItem;
4443
- MenuItem editCameraItem;
4444
- MenuItem revertCameraItem;
4445
- CheckboxMenuItem toggleLiveItem;
44464743 MenuItem stepItem;
4447
- CheckboxMenuItem toggleFullItem;
4744
+ CheckboxMenuItem toggleLiveItem;
4745
+ CheckboxMenuItem toggleFullScreenItem;
4746
+ CheckboxMenuItem toggleTimelineItem;
44484747 CheckboxMenuItem toggleRenderItem;
44494748 CheckboxMenuItem toggleDebugItem;
44504749 CheckboxMenuItem toggleFrustumItem;
44514750 CheckboxMenuItem toggleFootContactItem;
44524751 CheckboxMenuItem toggleDLItem;
44534752 CheckboxMenuItem toggleTextureItem;
4454
- CheckboxMenuItem toggleRandomItem;
4753
+ CheckboxMenuItem toggleSwitchItem;
44554754 CheckboxMenuItem toggleRootItem;
44564755 CheckboxMenuItem animationItem;
44574756 CheckboxMenuItem toggleHandleItem;
....@@ -4459,23 +4758,26 @@
44594758 JSplitPane mainPanel;
44604759 JScrollPane scrollpane;
44614760 JPanel toolbarPanel;
4462
- JPanel treePanel;
4761
+ cGridBag treePanel;
44634762 JPanel radioPanel;
44644763 ButtonGroup buttonGroup;
4465
- JPanel ctrlPanel;
4466
- JPanel materialPanel;
4764
+ cGridBag ctrlPanel;
4765
+ cGridBag materialPanel;
44674766 JScrollPane infoPanel;
4468
- JPanel optionsPanel;
4767
+ cGridBag optionsPanel;
44694768 JTabbedPane objectPanel;
4470
- JPanel XYZPanel;
4769
+ cGridBag XYZPanel;
44714770 JSplitPane gridPanel;
44724771 JSplitPane bigPanel;
4473
- JPanel bigThree;
4474
- JTabbedPane jtp;
4475
- JPanel cameraPanel;
4772
+ cGridBag bigThree;
4773
+ cGridBag scenePanel;
4774
+ cGridBag centralPanel;
4775
+ JSplitPane cameraPanel;
4776
+ JPanel timelinePanel;
4777
+ JMenuBar timelineMenubar;
44764778 JSplitPane framePanel;
44774779 JTextArea/*Field*/ nameField;
4478
- cButton textureButton;
4780
+ //cButton textureButton;
44794781 cButton okButton;
44804782 cButton applyButton;
44814783 cButton cancelButton;
....@@ -4522,65 +4824,72 @@
45224824 // MATERIAL
45234825 JLabel materialLabel;
45244826 JLabel colorLabel;
4525
- NumberSlider colorField;
4827
+ cNumberSlider colorField;
45264828 JLabel modulationLabel;
4527
- NumberSlider modulationField;
4829
+ cNumberSlider modulationField;
45284830 JLabel metalnessLabel;
4529
- NumberSlider metalnessField;
4831
+ cNumberSlider metalnessField;
45304832 JLabel diffuseLabel;
4531
- NumberSlider diffuseField;
4833
+ cNumberSlider diffuseField;
45324834 JLabel specularLabel;
4533
- NumberSlider specularField;
4835
+ cNumberSlider specularField;
45344836 JLabel shininessLabel;
4535
- NumberSlider shininessField;
4837
+ cNumberSlider shininessField;
45364838 JLabel shiftLabel;
4537
- NumberSlider shiftField;
4839
+ cNumberSlider shiftField;
45384840 JLabel ambientLabel;
4539
- NumberSlider ambientField;
4841
+ cNumberSlider ambientField;
45404842 JLabel lightareaLabel;
4541
- NumberSlider lightareaField;
4843
+ cNumberSlider lightareaField;
45424844 JLabel diffusenessLabel;
4543
- NumberSlider diffusenessField;
4845
+ cNumberSlider diffusenessField;
45444846 JLabel velvetLabel;
4545
- NumberSlider velvetField;
4847
+ cNumberSlider velvetField;
45464848 JLabel sheenLabel;
4547
- NumberSlider sheenField;
4849
+ cNumberSlider sheenField;
45484850 JLabel subsurfaceLabel;
4549
- NumberSlider subsurfaceField;
4851
+ cNumberSlider subsurfaceField;
45504852 //JLabel bumpLabel;
45514853 //NumberSlider bumpField;
45524854 JLabel backlitLabel;
4553
- NumberSlider backlitField;
4855
+ cNumberSlider backlitField;
45544856 JLabel anisoLabel;
4555
- NumberSlider anisoField;
4857
+ cNumberSlider anisoField;
45564858 JLabel anisoVLabel;
4557
- NumberSlider anisoVField;
4859
+ cNumberSlider anisoVField;
45584860 JLabel cameraLabel;
4559
- NumberSlider cameraField;
4861
+ cNumberSlider cameraField;
45604862 JLabel selfshadowLabel;
4561
- NumberSlider selfshadowField;
4863
+ cNumberSlider selfshadowField;
45624864 JLabel shadowLabel;
4563
- NumberSlider shadowField;
4865
+ cNumberSlider shadowField;
45644866 JLabel textureLabel;
4565
- NumberSlider textureField;
4867
+ cNumberSlider textureField;
45664868 JLabel opacityLabel;
4567
- NumberSlider opacityField;
4869
+ cNumberSlider opacityField;
45684870 JLabel fakedepthLabel;
4569
- NumberSlider fakedepthField;
4871
+ cNumberSlider fakedepthField;
45704872 JLabel shadowbiasLabel;
4571
- NumberSlider shadowbiasField;
4873
+ cNumberSlider shadowbiasField;
45724874 JLabel bumpLabel;
4573
- NumberSlider bumpField;
4875
+ cNumberSlider bumpField;
45744876 JLabel noiseLabel;
4575
- NumberSlider noiseField;
4877
+ cNumberSlider noiseField;
45764878 JLabel powerLabel;
4577
- NumberSlider powerField;
4879
+ cNumberSlider powerField;
45784880 JLabel borderfadeLabel;
4579
- NumberSlider borderfadeField;
4881
+ cNumberSlider borderfadeField;
45804882 JLabel fogLabel;
4581
- NumberSlider fogField;
4883
+ cNumberSlider fogField;
45824884 JLabel opacityPowerLabel;
4583
- NumberSlider opacityPowerField;
4885
+ cNumberSlider opacityPowerField;
45844886 JTree jTree;
45854887 //ObjectUI parent;
4888
+
4889
+ cNumberSlider normalpushField;
4890
+
4891
+ private MenuItem importGFDItem;
4892
+ private MenuItem importVRMLX3DItem;
4893
+ private MenuItem import3DSItem;
4894
+ private MenuItem importOBJItem;
45864895 }