Normand Briere
2019-06-27 f78dd18c66d607b693c0bf5937fc59181bf5a26b
ObjEditor.java
....@@ -4,6 +4,7 @@
44
55 import java.awt.*;
66 import java.awt.event.*;
7
+import java.awt.image.BufferedImage;
78 import javax.swing.*;
89 import javax.swing.event.*;
910 import javax.swing.text.*;
....@@ -14,10 +15,15 @@
1415 //import javax.swing.plaf.ColorUIResource;
1516 //import javax.swing.plaf.metal.DefaultMetalTheme;
1617
18
+import javax.swing.plaf.basic.BasicSplitPaneDivider;
19
+import javax.swing.plaf.basic.BasicSplitPaneUI;
20
+
1721 //import javax.media.opengl.GLCanvas;
1822
1923 import //weka.core.
2024 matrix.Matrix;
25
+
26
+import grafeme.ui.*;
2127
2228 class ObjEditor /*extends JFrame*/ implements iCallBack, ObjectUI,
2329 ActionListener, ChangeListener,
....@@ -33,6 +39,67 @@
3339
3440 GroupEditor callee;
3541 JFrame frame;
42
+
43
+ static ObjEditor theFrame;
44
+
45
+ cButton GetButton(String name, boolean border)
46
+ {
47
+ try
48
+ {
49
+ ImageIcon icon = GetIcon(name);
50
+ return new cButton(icon, border);
51
+ }
52
+ catch (Exception e)
53
+ {
54
+ return new cButton(name, border);
55
+ }
56
+ }
57
+
58
+ cToggleButton GetToggleButton(String name, boolean border)
59
+ {
60
+ try
61
+ {
62
+ ImageIcon icon = GetIcon(name);
63
+ return new cToggleButton(icon, border);
64
+ }
65
+ catch (Exception e)
66
+ {
67
+ return new cToggleButton(name, border);
68
+ }
69
+ }
70
+
71
+ cCheckBox GetCheckBox(String name, boolean border)
72
+ {
73
+ try
74
+ {
75
+ ImageIcon icon = GetIcon(name);
76
+ return new cCheckBox(icon, border);
77
+ }
78
+ catch (Exception e)
79
+ {
80
+ return new cCheckBox(name, border);
81
+ }
82
+ }
83
+
84
+ private ImageIcon GetIcon(String name) throws IOException
85
+ {
86
+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
87
+
88
+ if (image.getWidth() != 24 && image.getHeight() != 24)
89
+ {
90
+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
91
+ Graphics2D g = resized.createGraphics();
92
+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
93
+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
94
+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
95
+ g.dispose();
96
+
97
+ image = resized;
98
+ }
99
+
100
+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
101
+ return icon;
102
+ }
36103
37104 // SCRIPT
38105
....@@ -124,7 +191,7 @@
124191 void keyPressed(int key, int modifiers)
125192 {
126193 System.out.println("KEY PRESSED");
127
- CameraPane.theRenderer.keyPressed(key, modifiers);
194
+ Globals.theRenderer.keyPressed(key, modifiers);
128195 }
129196 */
130197
....@@ -136,34 +203,42 @@
136203 public void closeUI()
137204 {
138205 //new Exception().printStackTrace();
139
- System.out.println("this = " + this);
140
- System.out.println("objEditor = " + objEditor);
206
+// System.out.println("this = " + this);
207
+// System.out.println("objEditor = " + objEditor);
141208 //nameField.removeActionListener(this);
142
- objEditor.ctrlPanel.remove(nameField);
209
+// objEditor.ctrlPanel.remove(nameField);
143210
144
- if (!GroupEditor.allparams)
211
+ objEditor.ctrlPanel.remove(namePanel);
212
+
213
+ if (!allparams)
145214 return;
146215
147
- objEditor.ctrlPanel.remove(liveCB);
148
- objEditor.ctrlPanel.remove(hideCB);
149
- objEditor.ctrlPanel.remove(markCB);
150
-
151
- objEditor.ctrlPanel.remove(randomCB);
152
- objEditor.ctrlPanel.remove(speedupCB);
153
- objEditor.ctrlPanel.remove(rewindCB);
154
-
155
- objEditor.ctrlPanel.remove(resetButton);
156
- objEditor.ctrlPanel.remove(stepButton);
157
-// objEditor.ctrlPanel.remove(stepAllButton);
158
-// objEditor.ctrlPanel.remove(resetAllButton);
159
- objEditor.ctrlPanel.remove(link2masterCB);
160
- //objEditor.ctrlPanel.remove(flipVCB);
161
- //objEditor.ctrlPanel.remove(texresMenu);
162
- objEditor.ctrlPanel.remove(slowerButton);
163
- objEditor.ctrlPanel.remove(fasterButton);
164
- objEditor.ctrlPanel.remove(remarkButton);
216
+// objEditor.ctrlPanel.remove(liveCB);
217
+// objEditor.ctrlPanel.remove(hideCB);
218
+// objEditor.ctrlPanel.remove(markCB);
219
+//
220
+// objEditor.ctrlPanel.remove(randomCB);
221
+// objEditor.ctrlPanel.remove(speedupCB);
222
+// objEditor.ctrlPanel.remove(rewindCB);
223
+//
224
+// objEditor.ctrlPanel.remove(resetButton);
225
+// objEditor.ctrlPanel.remove(stepButton);
226
+//// objEditor.ctrlPanel.remove(stepAllButton);
227
+//// objEditor.ctrlPanel.remove(resetAllButton);
228
+// objEditor.ctrlPanel.remove(link2masterCB);
229
+// //objEditor.ctrlPanel.remove(flipVCB);
230
+// //objEditor.ctrlPanel.remove(texresMenu);
231
+// objEditor.ctrlPanel.remove(slowerButton);
232
+// objEditor.ctrlPanel.remove(fasterButton);
233
+// objEditor.ctrlPanel.remove(remarkButton);
165234
166
- Remove(normalpushField);
235
+ objEditor.ctrlPanel.remove(setupPanel);
236
+ objEditor.ctrlPanel.remove(setupPanel2);
237
+ objEditor.ctrlPanel.remove(objectCommandsPanel);
238
+ objEditor.ctrlPanel.remove(pushPanel);
239
+ //objEditor.ctrlPanel.remove(fillPanel);
240
+
241
+ //Remove(normalpushField);
167242 }
168243
169244 public ObjEditor GetEditor()
....@@ -234,6 +309,7 @@
234309 //localCopy.parent = null;
235310
236311 frame = new JFrame();
312
+ frame.setUndecorated(true);
237313 objEditor = this;
238314 this.callee = callee;
239315
....@@ -264,27 +340,48 @@
264340 return frame.action(event, obj);
265341 }
266342
343
+ // Cannot work without static
344
+ static boolean allparams = true;
345
+
346
+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
347
+
267348 void SetupMenu()
268349 {
269350 frame.setMenuBar(menuBar = new MenuBar());
270
- menuBar.add(windowMenu = new Menu("File"));
271
- windowMenu.add(loadItem = new MenuItem("Load..."));
272
- windowMenu.add("-");
273
- windowMenu.add(saveItem = new MenuItem("Save"));
274
- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
351
+ menuBar.add(fileMenu = new Menu("File"));
352
+ fileMenu.add(newItem = new MenuItem("New"));
353
+ fileMenu.add(loadItem = new MenuItem("Open..."));
354
+
355
+ //oe.menuBar.add(menu = new Menu("Include"));
356
+ Menu menu = new Menu("Import");
357
+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
358
+ importOBJItem.addActionListener(this);
359
+ import3DSItem = menu.add(new MenuItem("3DS file..."));
360
+ import3DSItem.addActionListener(this);
361
+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
362
+ importVRMLX3DItem.addActionListener(this);
363
+ menu.add("-");
364
+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
365
+ importGFDItem.addActionListener(this);
366
+ fileMenu.add(menu);
367
+ fileMenu.add("-");
368
+
369
+ fileMenu.add(saveItem = new MenuItem("Save"));
370
+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
275371 //windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
276
- windowMenu.add("-");
277
- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
278
- windowMenu.add(reexportItem = new MenuItem("Re-export"));
279
- windowMenu.add("-");
372
+ fileMenu.add("-");
373
+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
374
+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
375
+ fileMenu.add("-");
280376 if (client.parent != null)
281377 {
282
- windowMenu.add(closeItem = new MenuItem("Close"));
378
+ fileMenu.add(closeItem = new MenuItem("Close"));
283379 } else
284380 {
285
- windowMenu.add(closeItem = new MenuItem("Exit"));
381
+ fileMenu.add(closeItem = new MenuItem("Exit"));
286382 }
287383
384
+ newItem.addActionListener(this);
288385 loadItem.addActionListener(this);
289386 saveItem.addActionListener(this);
290387 saveAsItem.addActionListener(this);
....@@ -293,79 +390,64 @@
293390 //povItem.addActionListener(this);
294391 closeItem.addActionListener(this);
295392
296
- menuBar.add(cameraMenu = new Menu("View"));
297
- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
298
- //zBufferItem.addActionListener(this);
299
- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
300
- //normalLensItem.addActionListener(this);
301
- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
302
- revertCameraItem.addActionListener(this);
303
- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
304
- toggleTimelineItem.addItemListener(this);
305
- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
306
- toggleFullScreenItem.addItemListener(this);
307
- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
308
- cameraMenu.add("-");
309
- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
310
- toggleTextureItem.addItemListener(this);
311
- toggleTextureItem.setState(CameraPane.textureon);
312
- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
313
- toggleLiveItem.addItemListener(this);
314
- toggleLiveItem.setState(CameraPane.isLIVE());
315
- cameraMenu.add(stepItem = new MenuItem("Step"));
316
- stepItem.addActionListener(this);
317
-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
318
-// toggleDLItem.addItemListener(this);
319
-// toggleDLItem.setState(false);
320
- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
321
- toggleRenderItem.addItemListener(this);
322
- toggleRenderItem.setState(!CameraPane.frozen);
323
- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
324
- toggleDebugItem.addItemListener(this);
325
- toggleDebugItem.setState(CameraPane.DEBUG);
326
- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
327
- toggleFrustumItem.addItemListener(this);
328
- toggleFrustumItem.setState(CameraPane.FRUSTUM);
329
- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
330
- toggleFootContactItem.addItemListener(this);
331
- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
332
- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
333
- toggleRandomItem.addItemListener(this);
334
- toggleRandomItem.setState(CameraPane.RANDOM);
335
- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
336
- toggleHandleItem.addItemListener(this);
337
- toggleHandleItem.setState(CameraPane.HANDLES);
338
- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
339
- togglePaintItem.addItemListener(this);
340
- togglePaintItem.setState(CameraPane.PAINTMODE);
341
-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
342
-// toggleRootItem.addItemListener(this);
343
-// toggleRootItem.setState(false);
344
-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
345
-// animationItem.addItemListener(this);
346
-// animationItem.setState(CameraPane.ANIMATION);
347
- cameraMenu.add("-");
348
- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
349
- editCameraItem.addActionListener(this);
350
-
351393 objectPanel = new JTabbedPane();
394
+
395
+ ChangeListener changeListener = new ChangeListener()
396
+ {
397
+ public void stateChanged(ChangeEvent changeEvent)
398
+ {
399
+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
400
+// {
401
+// if (latestObject != null)
402
+// {
403
+// refreshContents(true);
404
+// SetMaterial(latestObject);
405
+// }
406
+//
407
+// materialFlushed = true;
408
+// }
409
+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
410
+// {
411
+// if (listUI.size() == 0)
412
+// EditSelection(false);
413
+// }
414
+
415
+ refreshContents(false); // To refresh Info tab
416
+ }
417
+ };
418
+ objectPanel.addChangeListener(changeListener);
419
+
352420 toolbarPanel = new JPanel();
353421 toolbarPanel.setName("Toolbar");
354
- treePanel = new JPanel();
422
+ treePanel = new cGridBag();
355423 treePanel.setName("Tree");
356
- ctrlPanel = new JPanel(); // new GridBagLayout());
357
- ctrlPanel.setName("Edit");
358
- materialPanel = new JPanel();
424
+
425
+ editPanel = new cGridBag().setVertical(true);
426
+ editPanel.setName("Edit");
427
+
428
+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
429
+
430
+ editCommandsPanel = new cGridBag();
431
+ editPanel.add(editCommandsPanel);
432
+ editPanel.add(ctrlPanel);
433
+
434
+ toolboxPanel = new cGridBag().setVertical(false);
435
+ toolboxPanel.setName("Toolbox");
436
+
437
+ materialPanel = new cGridBag().setVertical(true);
359438 materialPanel.setName("Material");
439
+
360440 /*JTextPane*/
361441 infoarea = createTextPane();
442
+ doc = infoarea.getStyledDocument();
443
+
362444 infoarea.setEditable(true);
363445 SetText();
364446 // infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
365447 // infoarea.setOpaque(false);
366448 // //infoarea.setForeground(textcolor);
367
- infoarea.setLineWrap(true);
368
- infoarea.setWrapStyleWord(true);
449
+// TEXTAREA infoarea.setLineWrap(true);
450
+// TEXTAREA infoarea.setWrapStyleWord(true);
369451 infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
370452 infoPanel.setPreferredSize(new Dimension(50, 200));
371453 infoPanel.setName("Info");
....@@ -376,16 +458,22 @@
376458 mainPanel.setName("Main");
377459 mainPanel.setContinuousLayout(true);
378460 mainPanel.setOneTouchExpandable(true);
379
- mainPanel.setDividerLocation(1.0);
380461 mainPanel.setDividerSize(9);
381
- mainPanel.setResizeWeight(0);
382
-
462
+ mainPanel.setDividerLocation(0.5); //1.0);
463
+ mainPanel.setResizeWeight(0.5);
464
+
465
+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
466
+// BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
467
+// divider.setDividerSize(15);
468
+// divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
469
+
470
+
383471 //ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
384472 //mainPanel.setLayout(new GridBagLayout());
385473 toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
386
- treePanel.setLayout(new GridBagLayout());
387
- ctrlPanel.setLayout(new GridBagLayout());
388
- materialPanel.setLayout(new GridBagLayout());
474
+// treePanel.setLayout(new GridBagLayout());
475
+ //ctrlPanel.setLayout(new GridBagLayout());
476
+ //materialPanel.setLayout(new GridBagLayout());
389477
390478 aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
391479 GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
....@@ -424,7 +512,7 @@
424512 static String newline = "\n";
425513 protected static final String buttonString = "JButton";
426514 StyledDocument doc;
427
- JTextArea infoarea;
515
+ JTextPane infoarea;
428516
429517 void ClearInfo()
430518 {
....@@ -447,10 +535,10 @@
447535 e.printStackTrace();
448536 }
449537
450
- String selection = infoarea.getText();
451
- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
452
- java.awt.datatransfer.Clipboard clipboard =
453
- Toolkit.getDefaultToolkit().getSystemClipboard();
538
+// String selection = infoarea.getText();
539
+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
540
+// java.awt.datatransfer.Clipboard clipboard =
541
+// Toolkit.getDefaultToolkit().getSystemClipboard();
454542 //clipboard.setContents(data, data);
455543 }
456544
....@@ -473,13 +561,13 @@
473561 //SendInfo("Name:", "bold");
474562 if (sel.GetTextures() != null || debug)
475563 {
476
- si.SendInfo(sel.toString(), "bold");
564
+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
477565 //SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
478566 if (sel.Size() > 0)
479567 {
480568 si.SendInfo("#children = " + sel.Size(), "regular");
481569 }
482
- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
570
+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
483571 if (debug)
484572 {
485573 try
....@@ -491,7 +579,10 @@
491579 }
492580
493581 if (full)
494
- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
582
+ {
583
+ si.SendInfo(" BBox min: " + minima, "regular");
584
+ si.SendInfo(" BBox max: " + maxima, "regular");
585
+ }
495586
496587 if (sel.bRep != null)
497588 {
....@@ -518,7 +609,7 @@
518609 }
519610 if (sel.support != null)
520611 {
521
- si.SendInfo(" support: " + sel.support, "regular");
612
+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
522613 }
523614 if (sel.scriptnode != null)
524615 {
....@@ -589,6 +680,9 @@
589680 {
590681 CameraPane.pointflow = (PointFlow) sel;
591682 }
683
+
684
+ si.SendInfo("_____________________", "regular");
685
+ si.SendInfo("", "regular");
592686 }
593687 }
594688
....@@ -604,68 +698,140 @@
604698 }
605699 }
606700
701
+static GraphicsDevice device = GraphicsEnvironment
702
+ .getLocalGraphicsEnvironment().getScreenDevices()[0];
703
+
704
+ Rectangle keeprect;
705
+ cRadio radio;
706
+
707
+cButton keepButton;
708
+ cButton twoButton; // Full 3D
709
+ cButton sixButton;
710
+ cButton threeButton;
711
+ cButton sevenButton;
712
+ cButton fourButton; // full panel
713
+ cButton oneButton; // full XYZ
714
+ //cButton currentLayout;
715
+
716
+ boolean maximized;
717
+
718
+ cButton fullscreenLayout;
719
+
720
+ void Minimize()
721
+ {
722
+ frame.setState(Frame.ICONIFIED);
723
+ }
724
+
725
+ void Maximize()
726
+ {
727
+ if (maximized)
728
+ {
729
+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
730
+ }
731
+ else
732
+ {
733
+ keeprect = frame.getBounds();
734
+ Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
735
+ Dimension rect2 = frame.getToolkit().getScreenSize();
736
+ frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
737
+// frame.setState(Frame.MAXIMIZED_BOTH);
738
+ }
739
+
740
+ maximized ^= true;
741
+ }
742
+
607743 void ToggleFullScreen()
608744 {
609
- if (CameraPane.FULLSCREEN)
745
+ cameraView.ToggleFullScreen();
746
+
747
+ if (!CameraPane.FULLSCREEN)
610748 {
611
- frame.getContentPane().remove(/*"Center",*/bigThree);
612
- framePanel.add(bigThree);
613
- frame.getContentPane().add(/*"Center",*/framePanel);
749
+ device.setFullScreenWindow(null);
750
+ //frame.setVisible(false);
751
+// frame.removeNotify();
752
+// frame.setUndecorated(false);
753
+// frame.addNotify();
754
+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
755
+
756
+// X frame.getContentPane().remove(/*"Center",*/bigThree);
757
+// X framePanel.add(bigThree);
758
+// X frame.getContentPane().add(/*"Center",*/framePanel);
759
+ framePanel.setDividerLocation(1);
760
+
761
+ //frame.setVisible(true);
762
+ radio.layout = keepButton;
763
+ //theFrame = null;
764
+ keepButton = null;
765
+ radio.layout.doClick();
766
+
614767 } else
615768 {
616
- frame.getContentPane().remove(/*"Center",*/framePanel);
617
- framePanel.remove(bigThree);
618
- frame.getContentPane().add(/*"Center",*/bigThree);
769
+ keepButton = radio.layout;
770
+ //keeprect = frame.getBounds();
771
+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
772
+// frame.getToolkit().getScreenSize().height);
773
+ //frame.setVisible(false);
774
+ device.setFullScreenWindow(frame);
775
+// frame.removeNotify();
776
+// frame.setUndecorated(true);
777
+// frame.addNotify();
778
+// X frame.getContentPane().remove(/*"Center",*/framePanel);
779
+// X framePanel.remove(bigThree);
780
+// X frame.getContentPane().add(/*"Center",*/bigThree);
781
+ framePanel.setDividerLocation(0);
782
+
783
+ radio.layout = fullscreenLayout;
784
+ radio.layout.doClick();
785
+ //frame.setVisible(true);
619786 }
620
- cameraView.ToggleFullScreen();
621787 }
622788
623
- private JTextArea createTextPane()
789
+ private JTextPane createTextPane()
624790 {
625
- String[] initString =
626
- {
627
- "This is an editable JTextPane, ", //regular
628
- "another ", //italic
629
- "styled ", //bold
630
- "text ", //small
631
- "component, ", //large
632
- "which supports embedded components..." + newline,//regular
633
- " " + newline, //button
634
- "...and embedded icons..." + newline, //regular
635
- " ", //icon
636
- newline + "JTextPane is a subclass of JEditorPane that "
637
- + "uses a StyledEditorKit and StyledDocument, and provides "
638
- + "cover methods for interacting with those objects."
639
- };
791
+// TEXTAREA String[] initString =
792
+// {
793
+// "This is an editable JTextPane, ", //regular
794
+// "another ", //italic
795
+// "styled ", //bold
796
+// "text ", //small
797
+// "component, ", //large
798
+// "which supports embedded components..." + newline,//regular
799
+// " " + newline, //button
800
+// "...and embedded icons..." + newline, //regular
801
+// " ", //icon
802
+// newline + "JTextPane is a subclass of JEditorPane that "
803
+// + "uses a StyledEditorKit and StyledDocument, and provides "
804
+// + "cover methods for interacting with those objects."
805
+// };
806
+//
807
+// String[] initStyles =
808
+// {
809
+// "regular", "italic", "bold", "small", "large",
810
+// "regular", "button", "regular", "icon",
811
+// "regular"
812
+// };
813
+//
814
+// JTextPane textPane = new JTextPane();
815
+// textPane.setEditable(true);
816
+// /*StyledDocument*/ doc = textPane.getStyledDocument();
817
+// addStylesToDocument(doc);
818
+//
819
+// try
820
+// {
821
+// for (int j = 0; j < 2; j++)
822
+// {
823
+// for (int i = 0; i < initString.length; i++)
824
+// {
825
+// doc.insertString(doc.getLength(), initString[i],
826
+// doc.getStyle(initStyles[i]));
827
+// }
828
+// }
829
+// } catch (BadLocationException ble)
830
+// {
831
+// System.err.println("Couldn't insert initial text into text pane.");
832
+// }
640833
641
- String[] initStyles =
642
- {
643
- "regular", "italic", "bold", "small", "large",
644
- "regular", "button", "regular", "icon",
645
- "regular"
646
- };
647
-
648
- JTextPane textPane = new JTextPane();
649
- textPane.setEditable(true);
650
- /*StyledDocument*/ doc = textPane.getStyledDocument();
651
- addStylesToDocument(doc);
652
-
653
- try
654
- {
655
- for (int j = 0; j < 2; j++)
656
- {
657
- for (int i = 0; i < initString.length; i++)
658
- {
659
- doc.insertString(doc.getLength(), initString[i],
660
- doc.getStyle(initStyles[i]));
661
- }
662
- }
663
- } catch (BadLocationException ble)
664
- {
665
- System.err.println("Couldn't insert initial text into text pane.");
666
- }
667
-
668
- return new JTextArea(); // textPane;
834
+ return new JTextPane(); // textPane;
669835 }
670836
671837 protected void addStylesToDocument(StyledDocument doc)
....@@ -718,7 +884,7 @@
718884 protected static ImageIcon createImageIcon(String path,
719885 String description)
720886 {
721
- java.net.URL imgURL = GrafreeD.class.getResource(path);
887
+ java.net.URL imgURL = Grafreed.class.getResource(path);
722888 if (imgURL != null)
723889 {
724890 return new ImageIcon(imgURL, description);
....@@ -750,6 +916,7 @@
750916 // NumberSlider vDivsField;
751917 // JCheckBox endcaps;
752918 JCheckBox liveCB;
919
+ JCheckBox selectCB;
753920 JCheckBox hideCB;
754921 JCheckBox link2masterCB;
755922 JCheckBox markCB;
....@@ -757,7 +924,12 @@
757924 JCheckBox speedupCB;
758925 JCheckBox rewindCB;
759926 JCheckBox flipVCB;
927
+
928
+ cCheckBox toggleTextureCB;
929
+ cCheckBox toggleSwitchCB;
930
+
760931 JComboBox texresMenu;
932
+
761933 JButton resetButton;
762934 JButton stepButton;
763935 JButton stepAllButton;
....@@ -765,115 +937,87 @@
765937 JButton slowerButton;
766938 JButton fasterButton;
767939 JButton remarkButton;
940
+
941
+ cGridBag editPanel;
942
+ cGridBag editCommandsPanel;
943
+
944
+ cGridBag namePanel;
945
+ cGridBag setupPanel;
946
+ cGridBag setupPanel2;
947
+ cGridBag objectCommandsPanel;
948
+ cGridBag pushPanel;
949
+ cGridBag fillPanel;
768950
769
- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
951
+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
770952 {
771953 JCheckBox cb;
772954
773
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
774
- oe.aConstraints.gridwidth = 1; // 3;
775
-// oe.aConstraints.weightx = 1;
776
-// oe.aConstraints.anchor = GridBagConstraints.WEST;
777
- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
955
+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
778956 cb.addItemListener(this);
779
-// oe.aConstraints.anchor = GridBagConstraints.EAST;
780
- oe.aConstraints.gridwidth = 1;
781
- oe.aConstraints.gridx += 1;
782957
783958 return cb;
784959 }
785960
786
- cButton AddButton(ObjEditor oe, String label)
961
+ cButton AddButton(cGridBag panel, String label)
787962 {
788963 cButton cb;
789964
790
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
791
- oe.aConstraints.gridwidth = 1;
792
-// oe.aConstraints.weightx = 1;
793
-// oe.aConstraints.anchor = GridBagConstraints.WEST;
794
- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
965
+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
795966 cb.addActionListener(this);
796
-// oe.aConstraints.anchor = GridBagConstraints.EAST;
797
- oe.aConstraints.gridwidth = 1;
798
- oe.aConstraints.gridx += 1;
799967
800968 return cb;
801969 }
802970
803
- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
971
+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
804972 {
805973 JComboBox combo;
806974
807
- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
808
- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
809
- oe.aConstraints.gridx += 1;
975
+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
810976 combo.addActionListener(this);
811977
812978 return combo;
813979 }
814980
815
- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
981
+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
816982 {
817
- NumberSlider combo;
983
+ cGridBag control = new cGridBag();
984
+
985
+ cNumberSlider combo;
818986
819987 JLabel jlabel = new JLabel(label);
820
-
821
- aConstraints.fill = GridBagConstraints.VERTICAL;
822988 jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
823
- aConstraints.gridwidth = 1;
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, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
829
- aConstraints.gridx += 1;
830
- aConstraints.gridwidth = 1;
831
-
989
+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
990
+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
832991 combo.setFloat(current);
833
-
834
- combo.label = jlabel;
835
-
836
- combo.addChangeListener(this);
837
-
838
- return combo;
992
+
993
+ panel.add(control);
994
+
995
+ return control;
839996 }
840997
841
- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
998
+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
842999 {
843
- NumberSlider combo;
1000
+ cGridBag control = new cGridBag();
1001
+
1002
+ cNumberSlider combo;
8441003
8451004 JLabel jlabel = new JLabel(label);
846
-
847
- aConstraints.fill = GridBagConstraints.VERTICAL;
8481005 jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
849
- aConstraints.gridwidth = 2;
850
- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
851
- aConstraints.gridx += 1;
852
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
853
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
854
- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
855
- aConstraints.gridx += 1;
856
- aConstraints.gridwidth = 1;
857
-
1006
+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
1007
+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
8581008 combo.setInteger(current);
8591009
860
- combo.label = jlabel;
861
-
862
- combo.addChangeListener(this);
863
-
864
- return combo;
1010
+ panel.add(control);
1011
+
1012
+ return control;
8651013 }
8661014
867
- JTextArea AddText(JPanel ctrlPanel, String name)
1015
+ JTextArea AddText(cGridBag ctrlPanel, String name)
8681016 {
8691017 JTextArea text;
8701018
871
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
872
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
873
- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
1019
+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
8741020 text.addCaretListener(this);
875
- aConstraints.gridx += 1;
876
- aConstraints.gridwidth = 1;
8771021
8781022 return text;
8791023 }
....@@ -903,9 +1047,16 @@
9031047 objEditor.ctrlPanel.remove(j);
9041048 }
9051049
1050
+ void Remove(cNumberSlider j)
1051
+ {
1052
+ j.removeChangeListener(this);
1053
+ //objEditor.ctrlPanel.remove(j.label);
1054
+ objEditor.ctrlPanel.remove(j);
1055
+ }
1056
+
9061057 /*
9071058 */
908
- void Return() // ObjEditor oe)
1059
+ void Return0() // ObjEditor oe)
9091060 {
9101061 aConstraints.gridy += 1;
9111062 aConstraints.gridx = 0;
....@@ -960,37 +1111,76 @@
9601111
9611112 void SetupUI2(ObjEditor oe)
9621113 {
963
-// oe.aConstraints.weightx = 0;
964
-// oe.aConstraints.weighty = 0;
965
-// oe.aConstraints.gridx = 0;
966
-// oe.aConstraints.gridy = 0;
967
- SetupName(oe);
1114
+ //SetupName(oe);
9681115
969
- if (!GroupEditor.allparams)
1116
+ namePanel = new cGridBag();
1117
+
1118
+ nameField = AddText(namePanel, copy.GetName());
1119
+ namePanel.add(nameField);
1120
+ oe.ctrlPanel.add(namePanel);
1121
+
1122
+ oe.ctrlPanel.Return();
1123
+
1124
+ if (!allparams)
9701125 return;
9711126
972
- liveCB = AddCheckBox(oe, "Live", copy.live);
973
- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
974
- hideCB = AddCheckBox(oe, "Hide", copy.hide);
1127
+ setupPanel = new cGridBag().setVertical(false);
1128
+
1129
+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1130
+ liveCB.setToolTipText("Animate object");
1131
+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1132
+ selectCB.setToolTipText("Make object selectable");
9751133 // Return();
976
- markCB = AddCheckBox(oe, "Mark", copy.marked);
977
- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
978
- randomCB = AddCheckBox(oe, "Rand", copy.random);
979
- Return();
980
- resetButton = AddButton(oe, "Reset");
981
- stepButton = AddButton(oe, "Step");
1134
+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1135
+ hideCB.setToolTipText("Hide object");
1136
+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1137
+ markCB.setToolTipText("As animation target transform");
1138
+
1139
+ setupPanel2 = new cGridBag().setVertical(false);
1140
+
1141
+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1142
+ rewindCB.setToolTipText("Rewind animation");
1143
+
1144
+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1145
+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1146
+
1147
+ if (Globals.ADVANCED)
1148
+ {
1149
+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1150
+ link2masterCB.setToolTipText("Attach to support");
1151
+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1152
+ speedupCB.setToolTipText("Option motion capture");
1153
+ }
1154
+
1155
+ oe.ctrlPanel.add(setupPanel);
1156
+ oe.ctrlPanel.Return();
1157
+ oe.ctrlPanel.add(setupPanel2);
1158
+ oe.ctrlPanel.Return();
1159
+
1160
+ objectCommandsPanel = new cGridBag().setVertical(false);
1161
+
1162
+ resetButton = AddButton(objectCommandsPanel, "Reset");
1163
+ resetButton.setToolTipText("Jump to frame zero");
1164
+ stepButton = AddButton(objectCommandsPanel, "Step");
1165
+ stepButton.setToolTipText("Step one frame");
9821166 // resetAllButton = AddButton(oe, "Reset All");
9831167 // stepAllButton = AddButton(oe, "Step All");
984
- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
9851168 // Return();
986
- slowerButton = AddButton(oe, "Slow");
987
- fasterButton = AddButton(oe, "Fast");
988
- remarkButton = AddButton(oe, "Rem");
1169
+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1170
+ slowerButton.setToolTipText("Decrease animation speed");
1171
+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1172
+ fasterButton.setToolTipText("Increase animation speed");
1173
+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1174
+ remarkButton.setToolTipText("Set the current transform as the target");
9891175
990
- Return();
1176
+ oe.ctrlPanel.add(objectCommandsPanel);
1177
+ oe.ctrlPanel.Return();
9911178
992
- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
993
- Return();
1179
+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
1180
+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1181
+ //Return();
1182
+
1183
+ oe.ctrlPanel.Return();
9941184
9951185 // oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
9961186 // ObjEditor.aConstraints.gridx += 1;
....@@ -1085,7 +1275,7 @@
10851275 oe.aConstraints.gridwidth = 1;
10861276 /**/
10871277 nameField = AddText(oe.ctrlPanel, copy.GetName());
1088
- Return();
1278
+ oe.ctrlPanel.Return();
10891279
10901280 //ctrlPanel.add(textureButton = new Button("Texture..."));
10911281 //textureButton.setEnabled(false);
....@@ -1187,9 +1377,13 @@
11871377 //JPanel worldPanel =
11881378 // new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
11891379 //worldPanel.setName("World");
1190
- centralPanel = new JPanel(new BorderLayout());
1191
- timelinePanel = new JPanel(new BorderLayout());
1192
- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1380
+ centralPanel = new cGridBag();
1381
+ centralPanel.preferredWidth = 20;
1382
+
1383
+ if (Globals.ADVANCED)
1384
+ {
1385
+ timelinePanel = new JPanel(new BorderLayout());
1386
+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
11931387
11941388 cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
11951389 cameraPanel.setContinuousLayout(true);
....@@ -1198,7 +1392,10 @@
11981392 // cameraPanel.setDividerSize(9);
11991393 cameraPanel.setResizeWeight(1.0);
12001394
1395
+ }
1396
+
12011397 centralPanel.add(cameraView);
1398
+ centralPanel.setFocusable(true);
12021399 //frame.setJMenuBar(timelineMenubar);
12031400 //centralPanel.add(timelinePanel);
12041401
....@@ -1217,12 +1414,13 @@
12171414 //frontView.object = copy;
12181415 //sideView.object = copy;
12191416
1220
- XYZPanel = new JPanel();
1221
- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1417
+ XYZPanel = new cGridBag().setVertical(true);
1418
+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
12221419
1223
- XYZPanel.add(/*BorderLayout.SOUTH,*/sideView); // Scroll);
1224
- XYZPanel.add(/*BorderLayout.CENTER,*/frontView); // Scroll);
1225
- XYZPanel.add(/*BorderLayout.NORTH,*/topView); // Scroll);
1420
+ XYZPanel.preferredWidth = 5;
1421
+ XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll);
1422
+ XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll);
1423
+ XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
12261424
12271425 /*
12281426 gridPanel = new JPanel(); //new BorderLayout());
....@@ -1260,11 +1458,13 @@
12601458 //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
12611459 //tmp.setName("Edit");
12621460 objectPanel.add(materialPanel);
1263
- JPanel north = new JPanel(new BorderLayout());
1264
- north.setName("Edit");
1265
- north.add(ctrlPanel, BorderLayout.NORTH);
1266
- objectPanel.add(north);
1461
+// JPanel north = new JPanel(new BorderLayout());
1462
+// north.setName("Edit");
1463
+// north.add(ctrlPanel, BorderLayout.NORTH);
1464
+// objectPanel.add(north);
1465
+ objectPanel.add(editPanel);
12671466 objectPanel.add(infoPanel);
1467
+ objectPanel.add(toolboxPanel);
12681468
12691469 /*
12701470 aConstraints.gridx = 0;
....@@ -1273,7 +1473,7 @@
12731473 aConstraints.gridy += 1;
12741474 aConstraints.gridwidth = 1;
12751475 mainPanel.add(objectPanel, aConstraints);
1276
- */
1476
+ */
12771477
12781478 scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
12791479 VERTICAL_SCROLLBAR_AS_NEEDED,
....@@ -1284,16 +1484,23 @@
12841484 scrollpane.setWheelScrollingEnabled(true);
12851485 scrollpane.addMouseWheelListener(this); // Default not fast enough
12861486
1287
- /*JTabbedPane*/ scenePanel = new JTabbedPane();
1288
- scenePanel.add(scrollpane);
1487
+ /*JTabbedPane*/ scenePanel = new cGridBag();
1488
+ scenePanel.preferredWidth = 6;
1489
+
1490
+ JTabbedPane tabbedPane = new JTabbedPane();
1491
+ tabbedPane.add(scrollpane);
12891492
1290
- scenePanel.add(FSPane = new cFileSystemPane(this));
1291
-
1292
- optionsPanel = new JPanel(new GridBagLayout());
1493
+ optionsPanel = new cGridBag().setVertical(false);
12931494
12941495 optionsPanel.setName("Options");
1295
- scenePanel.add(optionsPanel);
1496
+
1497
+ AddOptions(optionsPanel); //, aConstraints);
1498
+
1499
+ tabbedPane.add(optionsPanel);
1500
+
1501
+ tabbedPane.add(FSPane = new cFileSystemPane(this));
12961502
1503
+ scenePanel.add(tabbedPane);
12971504
12981505 /*
12991506 cTree jTree = new cTree(null);
....@@ -1327,6 +1534,7 @@
13271534 //bigPanel.setSize(new Dimension(10,10));
13281535 //bigPanel.add(ctrlPanel);
13291536 //bigPanel.add(gridPanel);
1537
+ /**
13301538 bigThree = new JPanel();
13311539 //big.setLayout(new FlowLayout(FlowLayout.LEFT));
13321540 bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
....@@ -1350,7 +1558,13 @@
13501558 // aConstraints.gridheight = 3;
13511559 aWindowConstraints.fill = GridBagConstraints.VERTICAL;
13521560 bigThree.add(XYZPanel, aWindowConstraints);
1561
+ /**/
13531562
1563
+ bigThree = new cGridBag();
1564
+ bigThree.addComponent(scenePanel);
1565
+ bigThree.addComponent(centralPanel);
1566
+ bigThree.addComponent(XYZPanel);
1567
+
13541568 // // SIDE EFFECT!!!
13551569 // aConstraints.gridx = 0;
13561570 // aConstraints.gridy = 0;
....@@ -1377,9 +1591,13 @@
13771591
13781592 // aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
13791593
1380
- frame.setSize(1024, 768);
1381
- frame.show();
1594
+ frame.setSize(1280, 860);
1595
+
1596
+ frame.validate();
1597
+ frame.setVisible(true);
13821598
1599
+ cameraView.requestFocusInWindow();
1600
+
13831601 gridPanel.setDividerLocation(1.0);
13841602
13851603 frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
....@@ -1393,6 +1611,10 @@
13931611 });
13941612 }
13951613
1614
+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
1615
+ {
1616
+ }
1617
+
13961618 JTree GetTree()
13971619 {
13981620 return objEditor.jTree;
....@@ -1404,260 +1626,173 @@
14041626 ctrlPanel.removeAll();
14051627 }
14061628
1407
- void SetupMaterial(JPanel ctrlPanel)
1629
+ void SetupMaterial(cGridBag panel)
14081630 {
1409
- aConstraints.weighty = 0;
1410
- //aConstraints.weightx = 1;
1411
- /*
1631
+ /*
14121632 ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
14131633 materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1414
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1415
- aConstraints.gridx += 1;
14161634 */
14171635
1418
- aConstraints.gridwidth = 1;
1419
- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1420
- aConstraints.gridx += 1;
1421
- aConstraints.weighty = 0;
1422
- aConstraints.gridwidth = 1;
1636
+ cGridBag editBar = new cGridBag().setVertical(false);
1637
+
1638
+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1639
+ createMaterialButton.setToolTipText("Create material");
14231640
14241641 /*
14251642 ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1426
- aConstraints.gridx += 1;
1427
- aConstraints.weighty = 0;
1428
- aConstraints.gridwidth = 1;
14291643 */
14301644
1431
- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1432
- aConstraints.gridx += 1;
1645
+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1646
+ clearMaterialButton.setToolTipText("Clear material");
1647
+
1648
+ if (Globals.ADVANCED)
1649
+ {
1650
+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
1651
+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1652
+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1653
+ }
14331654
1434
- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1435
-
1436
- aConstraints.gridx += 1;
1437
-
1438
- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1439
-
1440
- aConstraints.gridx += 1;
1441
-
1442
- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1443
-
1444
- aConstraints.gridx = 0;
1445
- aConstraints.gridy += 1;
1446
- aConstraints.weighty = 0;
1447
- aConstraints.gridwidth = 1;
1655
+ editBar.preferredHeight = 15;
1656
+
1657
+ panel.add(editBar);
1658
+
14481659 /**/
14491660 //aConstraints.weighty = 0;
14501661 ////aConstraints.weightx = 1;
14511662 //aConstraints.weighty = 1;
14521663 aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
14531664 //aConstraints.gridx += 1;
1454
- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1455
- aConstraints.weighty = 0;
1456
- aConstraints.gridx = 0;
1457
- aConstraints.gridy += 1;
1458
- aConstraints.gridwidth = 1;
1665
+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
14591666
1460
- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1461
- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1462
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1463
- aConstraints.gridx += 1;
1464
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1465
- //aConstraints.weightx = 0;
1466
- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1467
- aConstraints.gridx = 0;
1468
- aConstraints.gridy += 1;
1469
- aConstraints.gridwidth = 1;
1667
+ cGridBag colorSection = new cGridBag().setVertical(true);
1668
+
1669
+ cGridBag color = new cGridBag();
1670
+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1671
+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1672
+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1673
+ //colorField.preferredWidth = 200;
1674
+ colorSection.add(color);
14701675
1471
- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1472
- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1473
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1474
- aConstraints.gridx += 1;
1475
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1476
- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1477
- aConstraints.gridx = 0;
1478
- aConstraints.gridy += 1;
1479
- aConstraints.gridwidth = 1;
1676
+ cGridBag modulation = new cGridBag();
1677
+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1678
+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1679
+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1680
+ colorSection.add(modulation);
14801681
1481
- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1482
- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1483
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1484
- aConstraints.gridx += 1;
1485
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1486
- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1487
- aConstraints.gridx = 0;
1488
- aConstraints.gridy += 1;
1489
- aConstraints.gridwidth = 1;
1682
+ cGridBag texture = new cGridBag();
1683
+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1684
+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1685
+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1686
+ colorSection.add(texture);
14901687
1491
- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1492
- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1493
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1494
- aConstraints.gridx += 1;
1495
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1496
- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1497
- aConstraints.gridx = 0;
1498
- aConstraints.gridy += 1;
1499
- aConstraints.gridwidth = 1;
1688
+ cGridBag anisoU = new cGridBag();
1689
+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1690
+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1691
+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1692
+ colorSection.add(anisoU);
15001693
1501
- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1502
- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1503
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1504
- aConstraints.gridx += 1;
1505
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1506
- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1507
- aConstraints.gridx = 0;
1508
- aConstraints.gridy += 1;
1509
- aConstraints.gridwidth = 1;
1694
+ cGridBag anisoV = new cGridBag();
1695
+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1696
+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1697
+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1698
+ colorSection.add(anisoV);
15101699
1511
- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1512
- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1513
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1514
- aConstraints.gridx += 1;
1515
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1516
- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1517
- aConstraints.gridx = 0;
1518
- aConstraints.gridy += 1;
1519
- aConstraints.gridwidth = 1;
1700
+ cGridBag shadowbias = new cGridBag();
1701
+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1702
+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1703
+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1704
+ colorSection.add(shadowbias);
15201705
1521
- //aConstraints.weighty = 1;
1522
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1523
- //aConstraints.gridx += 1;
1524
- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1525
- aConstraints.weighty = 0;
1526
- aConstraints.gridx = 0;
1527
- aConstraints.gridy += 1;
1528
- aConstraints.gridwidth = 1;
1706
+ panel.add(new JSeparator());
1707
+
1708
+ panel.add(colorSection);
1709
+
1710
+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1711
+
1712
+ cGridBag diffuseSection = new cGridBag().setVertical(true);
1713
+
1714
+ cGridBag diffuse = new cGridBag();
1715
+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
1716
+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1717
+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1718
+ diffuseSection.add(diffuse);
15291719
1530
- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1531
- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1532
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1533
- aConstraints.gridx += 1;
1534
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1535
- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1536
- aConstraints.gridx = 0;
1537
- aConstraints.gridy += 1;
1538
- aConstraints.gridwidth = 1;
1720
+ cGridBag diffuseness = new cGridBag();
1721
+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
1722
+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1723
+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1724
+ diffuseSection.add(diffuseness);
15391725
1540
- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1541
- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1542
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1543
- aConstraints.gridx += 1;
1544
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1545
- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1546
- aConstraints.gridx = 0;
1547
- aConstraints.gridy += 1;
1548
- aConstraints.gridwidth = 1;
1726
+ cGridBag selfshadow = new cGridBag();
1727
+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
1728
+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1729
+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1730
+ diffuseSection.add(selfshadow);
15491731
1550
- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1551
- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1552
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1553
- aConstraints.gridx += 1;
1554
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1555
- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1556
- aConstraints.gridx = 0;
1557
- aConstraints.gridy += 1;
1558
- aConstraints.gridwidth = 1;
1732
+ cGridBag sheen = new cGridBag();
1733
+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
1734
+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1735
+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1736
+ diffuseSection.add(sheen);
15591737
1560
- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1561
- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1562
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1563
- aConstraints.gridx += 1;
1564
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1565
- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1566
- aConstraints.gridx = 0;
1567
- aConstraints.gridy += 1;
1568
- aConstraints.gridwidth = 1;
1738
+ cGridBag subsurface = new cGridBag();
1739
+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
1740
+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1741
+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1742
+ diffuseSection.add(subsurface);
15691743
1570
- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1571
- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1572
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1573
- aConstraints.gridx += 1;
1574
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1575
- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1576
- aConstraints.gridx = 0;
1577
- aConstraints.gridy += 1;
1578
- aConstraints.gridwidth = 1;
1744
+ cGridBag shadow = new cGridBag();
1745
+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
1746
+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1747
+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1748
+ diffuseSection.add(shadow);
15791749
1580
- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1581
- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1582
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1583
- aConstraints.gridx += 1;
1584
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1585
- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1586
- aConstraints.gridx = 0;
1587
- aConstraints.gridy += 1;
1588
- aConstraints.gridwidth = 1;
1750
+ cGridBag fakedepth = new cGridBag();
1751
+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
1752
+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1753
+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1754
+ diffuseSection.add(fakedepth);
15891755
1590
- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1591
- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1592
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1593
- aConstraints.gridx += 1;
1594
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1595
- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1596
- aConstraints.gridx = 0;
1597
- aConstraints.gridy += 1;
1598
- aConstraints.gridwidth = 1;
1756
+ panel.add(new JSeparator());
1757
+
1758
+ panel.add(diffuseSection);
1759
+
1760
+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1761
+
1762
+ cGridBag specularSection = new cGridBag().setVertical(true);
15991763
1600
- //aConstraints.weighty = 1;
1601
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1602
- //aConstraints.gridx += 1;
1603
- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1604
- aConstraints.weighty = 0;
1605
- aConstraints.gridx = 0;
1606
- aConstraints.gridy += 1;
1607
- aConstraints.gridwidth = 1;
1764
+ cGridBag specular = new cGridBag();
1765
+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
1766
+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1767
+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1768
+ specularSection.add(specular);
16081769
1609
- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1610
- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1611
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1612
- aConstraints.gridx += 1;
1613
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1614
- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1615
- aConstraints.gridx = 0;
1616
- aConstraints.gridy += 1;
1617
- aConstraints.gridwidth = 1;
1770
+ cGridBag lightarea = new cGridBag();
1771
+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
1772
+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1773
+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1774
+ specularSection.add(lightarea);
16181775
1619
- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1620
- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1621
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1622
- aConstraints.gridx += 1;
1623
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1624
- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1625
- aConstraints.gridx = 0;
1626
- aConstraints.gridy += 1;
1627
- aConstraints.gridwidth = 1;
1776
+ cGridBag shininess = new cGridBag();
1777
+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
1778
+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1779
+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1780
+ specularSection.add(shininess);
16281781
1629
- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1630
- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1631
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1632
- aConstraints.gridx += 1;
1633
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1634
- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1635
- aConstraints.gridx = 0;
1636
- aConstraints.gridy += 1;
1637
- aConstraints.gridwidth = 1;
1782
+ cGridBag metalness = new cGridBag();
1783
+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
1784
+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1785
+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1786
+ specularSection.add(metalness);
16381787
1639
- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1640
- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1641
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1642
- aConstraints.gridx += 1;
1643
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1644
- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1645
- aConstraints.gridx = 0;
1646
- aConstraints.gridy += 1;
1647
- aConstraints.gridwidth = 1;
1788
+ cGridBag velvet = new cGridBag();
1789
+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
1790
+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1791
+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1792
+ specularSection.add(velvet);
16481793
1649
- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1650
- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1651
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1652
- aConstraints.gridx += 1;
1653
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1654
- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1655
- aConstraints.gridx = 0;
1656
- aConstraints.gridy += 1;
1657
- aConstraints.gridwidth = 1;
1658
-
1659
- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1660
- Return();
1794
+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
1795
+ //Return();
16611796 // ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
16621797 // shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
16631798 // aConstraints.fill = GridBagConstraints.HORIZONTAL;
....@@ -1668,130 +1803,93 @@
16681803 // aConstraints.gridy += 1;
16691804 // aConstraints.gridwidth = 1;
16701805
1671
- //aConstraints.weighty = 1;
1672
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1673
- //aConstraints.gridx += 1;
1674
- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1675
- aConstraints.weighty = 0;
1676
- aConstraints.gridx = 0;
1677
- aConstraints.gridy += 1;
1678
- aConstraints.gridwidth = 1;
16791806
1680
- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1681
- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1682
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1683
- aConstraints.gridx += 1;
1684
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1685
- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1686
- aConstraints.gridx = 0;
1687
- aConstraints.gridy += 1;
1688
- aConstraints.gridwidth = 1;
1807
+ panel.add(new JSeparator());
1808
+
1809
+ panel.add(specularSection);
1810
+
1811
+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1812
+
1813
+ cGridBag globalSection = new cGridBag().setVertical(true);
16891814
1690
- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1691
- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1692
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1693
- aConstraints.gridx += 1;
1694
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1695
- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1696
- aConstraints.gridx = 0;
1697
- aConstraints.gridy += 1;
1698
- aConstraints.gridwidth = 1;
1815
+ cGridBag camera = new cGridBag();
1816
+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1817
+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1818
+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1819
+ globalSection.add(camera);
16991820
1700
- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1701
- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1702
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1703
- aConstraints.gridx += 1;
1704
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1705
- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1706
- aConstraints.gridx = 0;
1707
- aConstraints.gridy += 1;
1708
- aConstraints.gridwidth = 1;
1821
+ cGridBag ambient = new cGridBag();
1822
+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1823
+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1824
+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1825
+ globalSection.add(ambient);
17091826
1710
- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1711
- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1712
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1713
- aConstraints.gridx += 1;
1714
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1715
- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1716
- aConstraints.gridx = 0;
1717
- aConstraints.gridy += 1;
1718
- aConstraints.gridwidth = 1;
1719
- aConstraints.weighty = 0;
1827
+ cGridBag backlit = new cGridBag();
1828
+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1829
+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1830
+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1831
+ globalSection.add(backlit);
17201832
1721
- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1722
- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1723
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1724
- aConstraints.gridx += 1;
1725
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1726
- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1727
- aConstraints.gridx = 0;
1728
- aConstraints.gridy += 1;
1729
- aConstraints.gridwidth = 1;
1833
+ cGridBag opacity = new cGridBag();
1834
+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1835
+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1836
+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1837
+ globalSection.add(opacity);
17301838
1731
- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1732
- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1733
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1734
- aConstraints.gridx += 1;
1735
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1736
- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/*5*/), aConstraints);
1737
- aConstraints.gridx = 0;
1738
- aConstraints.gridy += 1;
1739
- aConstraints.gridwidth = 1;
1839
+ panel.add(new JSeparator());
1840
+
1841
+ panel.add(globalSection);
1842
+
1843
+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1844
+
1845
+ cGridBag textureSection = new cGridBag().setVertical(true);
17401846
1741
- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1742
- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1743
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1744
- aConstraints.gridx += 1;
1745
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1746
- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1747
- aConstraints.gridx = 0;
1748
- aConstraints.gridy += 1;
1749
- aConstraints.gridwidth = 1;
1847
+ cGridBag bump = new cGridBag();
1848
+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
1849
+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1850
+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
1851
+ textureSection.add(bump);
17501852
1751
- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1752
- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1753
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1754
- aConstraints.gridx += 1;
1755
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1756
- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1757
- aConstraints.gridx = 0;
1758
- aConstraints.gridy += 1;
1759
- aConstraints.gridwidth = 1;
1853
+ cGridBag noise = new cGridBag();
1854
+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
1855
+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1856
+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/*5*/)); // , aConstraints);
1857
+ textureSection.add(noise);
17601858
1761
- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1762
- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1763
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1764
- aConstraints.gridx += 1;
1765
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1766
- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1767
- aConstraints.gridx = 0;
1768
- aConstraints.gridy += 1;
1769
- aConstraints.gridwidth = 1;
1859
+ cGridBag power = new cGridBag();
1860
+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
1861
+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1862
+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
1863
+ textureSection.add(power);
17701864
1771
- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1772
- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1773
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1774
- aConstraints.gridx += 1;
1775
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1776
- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /*10 dec 2013*/), aConstraints);
1777
- aConstraints.gridx = 0;
1778
- aConstraints.gridy += 1;
1779
- aConstraints.gridwidth = 1;
1865
+ cGridBag borderfade = new cGridBag();
1866
+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
1867
+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1868
+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
1869
+ textureSection.add(borderfade);
17801870
1781
- //aConstraints.weighty = 1;
1782
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1783
- //aConstraints.gridx += 1;
1784
- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1785
- aConstraints.weighty = 0;
1871
+ cGridBag fog = new cGridBag();
1872
+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
1873
+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1874
+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
1875
+ textureSection.add(fog);
17861876
1787
- aConstraints.gridx = 0;
1788
- aConstraints.gridy = 0;
1789
- aConstraints.gridwidth = 1;
1877
+ cGridBag opacityPower = new cGridBag();
1878
+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
1879
+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1880
+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /*10 dec 2013*/)); // , aConstraints);
1881
+ textureSection.add(opacityPower);
1882
+
1883
+ panel.add(new JSeparator());
1884
+
1885
+ panel.add(textureSection);
1886
+
1887
+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
17901888
17911889 SetMaterial(copy); // .GetMaterial());
17921890
1793
- colorField.addChangeListener(this);
1794
- modulationField.addChangeListener(this);
1891
+ //colorField.addChangeListener(this);
1892
+// modulationField.addChangeListener(this);
17951893 metalnessField.addChangeListener(this);
17961894 diffuseField.addChangeListener(this);
17971895 specularField.addChangeListener(this);
....@@ -1821,12 +1919,15 @@
18211919 opacityPowerField.addChangeListener(this);
18221920 /**/
18231921
1824
- resetSlidersButton.addActionListener(this);
18251922 clearMaterialButton.addActionListener(this);
18261923 createMaterialButton.addActionListener(this);
1827
-
1828
- propagateToggle.addItemListener(this);
1829
- multiplyToggle.addItemListener(this);
1924
+
1925
+ if (Globals.ADVANCED)
1926
+ {
1927
+ resetSlidersButton.addActionListener(this);
1928
+ propagateToggle.addItemListener(this);
1929
+ multiplyToggle.addItemListener(this);
1930
+ }
18301931 }
18311932
18321933 void DropFile(java.io.File[] files, boolean textures)
....@@ -1997,7 +2098,7 @@
19972098
19982099 //? flashIt = false;
19992100 CameraPane pane = (CameraPane) cameraView;
2000
- pane.clickStart(location.x, location.y, 0);
2101
+ pane.clickStart(location.x, location.y, 0, 0);
20012102 pane.clickEnd(location.x, location.y, 0, true);
20022103
20032104 if (group.selection.size() == 1)
....@@ -2046,6 +2147,7 @@
20462147 e2.printStackTrace();
20472148 }
20482149 }
2150
+
20492151 LoadJMEThread loadThread;
20502152
20512153 class LoadJMEThread extends Thread
....@@ -2103,6 +2205,7 @@
21032205 //LoadFile0(filename, converter);
21042206 }
21052207 }
2208
+
21062209 LoadOBJThread loadObjThread;
21072210
21082211 class LoadOBJThread extends Thread
....@@ -2181,19 +2284,19 @@
21812284
21822285 void LoadObjFile(String fullname)
21832286 {
2184
- /*
2287
+ System.out.println("Loading " + fullname);
2288
+ /**/
21852289 //lastFilename = fullname;
21862290 if(loadObjThread == null)
21872291 {
2188
- loadObjThread = new LoadOBJThread();
2189
- loadObjThread.start();
2292
+ loadObjThread = new LoadOBJThread();
2293
+ loadObjThread.start();
21902294 }
21912295
21922296 loadObjThread.add(fullname);
2193
- */
2297
+ /**/
21942298
2195
- System.out.println("Loading " + fullname);
2196
- makeSomething(new FileObject(fullname, true), true);
2299
+ //makeSomething(new FileObject(fullname, true), true);
21972300 }
21982301
21992302 void LoadGFDFile(String fullname)
....@@ -2454,11 +2557,11 @@
24542557
24552558 void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
24562559 {
2457
- if (GrafreeD.standAlone)
2560
+ if (Grafreed.standAlone)
24582561 {
24592562 /**/
24602563 FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2461
- browser.show();
2564
+ browser.setVisible(true);
24622565 String filename = browser.getFile();
24632566 if (filename != null && filename.length() > 0)
24642567 {
....@@ -2603,6 +2706,7 @@
26032706 }
26042707 if (input == null)
26052708 {
2709
+ new Exception().printStackTrace();
26062710 System.exit(0);
26072711 }
26082712
....@@ -2809,6 +2913,8 @@
28092913
28102914 void SetMaterial(Object3D object)
28112915 {
2916
+ latestObject = object;
2917
+
28122918 cMaterial mat = object.material;
28132919
28142920 if (mat == null)
....@@ -2817,7 +2923,8 @@
28172923 return;
28182924 }
28192925
2820
- multiplyToggle.setSelected(mat.multiply);
2926
+ if (multiplyToggle != null)
2927
+ multiplyToggle.setSelected(mat.multiply);
28212928
28222929 assert (object.projectedVertices != null);
28232930
....@@ -2919,12 +3026,17 @@
29193026 // }
29203027
29213028 /**/
2922
- if (deselect)
3029
+ if (deselect || child == null)
29233030 {
29243031 //group.deselectAll();
29253032 //freeze = true;
29263033 GetTree().clearSelection();
29273034 //freeze = false;
3035
+
3036
+ if (child == null)
3037
+ {
3038
+ return;
3039
+ }
29283040 }
29293041
29303042 //group.addSelectee(child);
....@@ -2993,7 +3105,7 @@
29933105 cameraView.ToggleDL();
29943106 cameraView.repaint();
29953107 return;
2996
- } else if (event.getSource() == toggleTextureItem)
3108
+ } else if (event.getSource() == toggleTextureItem || event.getSource() == toggleTextureCB)
29973109 {
29983110 cameraView.ToggleTexture();
29993111 // june 2013 copy.HardTouch();
....@@ -3032,9 +3144,9 @@
30323144 frame.validate();
30333145
30343146 return;
3035
- } else if (event.getSource() == toggleRandomItem)
3147
+ } else if (event.getSource() == toggleSwitchItem || event.getSource() == toggleSwitchCB)
30363148 {
3037
- cameraView.ToggleRandom();
3149
+ cameraView.ToggleSwitch();
30383150 cameraView.repaint();
30393151 return;
30403152 } else if (event.getSource() == toggleHandleItem)
....@@ -3063,6 +3175,10 @@
30633175 {
30643176 copy.live ^= true;
30653177 return;
3178
+ } else if (event.getSource() == selectCB)
3179
+ {
3180
+ copy.dontselect ^= true;
3181
+ return;
30663182 } else if (event.getSource() == hideCB)
30673183 {
30683184 copy.hide ^= true;
....@@ -3077,6 +3193,7 @@
30773193 if (event.getSource() == randomCB)
30783194 {
30793195 copy.random ^= true;
3196
+ objEditor.refreshContents();
30803197 return;
30813198 }
30823199 if (event.getSource() == speedupCB)
....@@ -3100,8 +3217,9 @@
31003217
31013218 public void actionPerformed(ActionEvent event)
31023219 {
3220
+ Object source = event.getSource();
31033221 // SCRIPT DIALOG
3104
- if (event.getSource() == okbutton)
3222
+ if (source == okbutton)
31053223 {
31063224 textpanel.setVisible(false);
31073225 textpanel.remove(textarea);
....@@ -3113,7 +3231,7 @@
31133231 textarea = null;
31143232 textpanel = null;
31153233 }
3116
- if (event.getSource() == cancelbutton)
3234
+ if (source == cancelbutton)
31173235 {
31183236 textpanel.setVisible(false);
31193237 textpanel.remove(textarea);
....@@ -3125,49 +3243,50 @@
31253243 //applySelf();
31263244 //client.refreshEditWindow();
31273245 //refreshContents();
3128
- if (event.getSource() == nameField)
3246
+ if (source == nameField)
31293247 {
31303248 //System.out.println("ObjEditor " + event);
31313249 applySelf0(true);
31323250 //parent.applySelf();
31333251 objEditor.refreshContents();
3134
- } else if (event.getSource() == resetButton)
3252
+ } else if (source == resetButton)
31353253 {
31363254 CameraPane.fullreset = true;
31373255 copy.Reset(); // ResetMeshes();
31383256 copy.Touch();
31393257 objEditor.refreshContents();
3140
- } else if (event.getSource() == stepItem)
3258
+ } else if (source == stepItem)
31413259 {
3142
- cameraView.ONESTEP = true;
3260
+ //cameraView.ONESTEP = true;
3261
+ Globals.ONESTEP = true;
31433262 cameraView.repaint();
31443263 return;
3145
- } else if (event.getSource() == stepButton)
3264
+ } else if (source == stepButton)
31463265 {
31473266 copy.Step();
31483267 copy.Touch();
31493268 objEditor.refreshContents();
3150
- } else if (event.getSource() == slowerButton)
3269
+ } else if (source == slowerButton)
31513270 {
31523271 copy.Slower();
31533272 copy.Touch();
31543273 objEditor.refreshContents();
3155
- } else if (event.getSource() == fasterButton)
3274
+ } else if (source == fasterButton)
31563275 {
31573276 copy.Faster();
31583277 copy.Touch();
31593278 objEditor.refreshContents();
3160
- } else if (event.getSource() == remarkButton)
3279
+ } else if (source == remarkButton)
31613280 {
31623281 copy.Remark();
31633282 copy.Touch();
31643283 objEditor.refreshContents();
3165
- } else if (event.getSource() == stepAllButton)
3284
+ } else if (source == stepAllButton)
31663285 {
31673286 copy.StepAll();
31683287 copy.Touch();
31693288 objEditor.refreshContents();
3170
- } else if (event.getSource() == resetAllButton)
3289
+ } else if (source == resetAllButton)
31713290 {
31723291 //CameraPane.fullreset = true;
31733292 copy.ResetAll(); // ResetMeshes();
....@@ -3200,53 +3319,75 @@
32003319 // Close();
32013320 // }
32023321 // else
3203
- if (event.getSource() == resetSlidersButton)
3322
+ if (source == resetSlidersButton)
32043323 {
32053324 ResetSliders();
3206
- } else if (event.getSource() == clearMaterialButton)
3325
+ } else if (source == clearMaterialButton)
32073326 {
32083327 ClearMaterial();
3209
- } else if (event.getSource() == createMaterialButton)
3328
+ } else if (source == createMaterialButton)
32103329 {
32113330 CreateMaterial();
3212
- } else if (event.getSource() == clearPanelButton)
3331
+ } else if (source == clearPanelButton)
32133332 {
32143333 copy.ClearUI();
32153334 refreshContents(true);
3216
- } /*
3217
- }
3218
-
3219
- public boolean action(Event event, Object arg)
3220
- {
3221
- */ else if (event.getSource() == closeItem)
3335
+ } else if (source == importGFDItem)
3336
+ {
3337
+ ImportGFD();
3338
+ } else
3339
+ if (source == importVRMLX3DItem)
3340
+ {
3341
+ ImportVRMLX3D();
3342
+ } else
3343
+ if (source == import3DSItem)
3344
+ {
3345
+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
3346
+ } else
3347
+ if (source == importOBJItem)
3348
+ {
3349
+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
3350
+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
3351
+ browser.setVisible(true);
3352
+ String filename = browser.getFile();
3353
+ if (filename != null && filename.length() > 0)
3354
+ {
3355
+ String fullname = browser.getDirectory() + filename;
3356
+ makeSomething(ReadOBJ(fullname), true);
3357
+ }
3358
+ } else
3359
+ if (source == closeItem)
32223360 {
32233361 Close();
32243362 //return true;
3225
- } else if (event.getSource() == loadItem)
3363
+ } else if (source == loadItem)
32263364 {
32273365 load();
32283366 //return true;
3229
- } else if (event.getSource() == saveItem)
3367
+ } else if (source == newItem)
3368
+ {
3369
+ New();
3370
+ } else if (source == saveItem)
32303371 {
32313372 save();
32323373 //return true;
3233
- } else if (event.getSource() == saveAsItem)
3374
+ } else if (source == saveAsItem)
32343375 {
32353376 saveAs();
32363377 //return true;
3237
- } else if (event.getSource() == reexportItem)
3378
+ } else if (source == reexportItem)
32383379 {
32393380 reexport();
32403381 //return true;
3241
- } else if (event.getSource() == exportAsItem)
3382
+ } else if (source == exportAsItem)
32423383 {
32433384 export();
32443385 //return true;
3245
- } else if (event.getSource() == povItem)
3386
+ } else if (source == povItem)
32463387 {
32473388 generatePOV();
32483389 //return true;
3249
- } else if (event.getSource() == zBufferItem)
3390
+ } else if (source == zBufferItem)
32503391 {
32513392 try
32523393 {
....@@ -3268,21 +3409,8 @@
32683409 cameraView.repaint();
32693410 //return true;
32703411 }
3271
- */ else if (event.getSource() == editCameraItem)
3272
- {
3273
- cameraView.ProtectCamera();
3274
- cameraView.repaint();
3275
- return;
3276
- } else if (event.getSource() == revertCameraItem)
3277
- {
3278
- cameraView.RevertCamera();
3279
- cameraView.repaint();
3280
- return;
3281
-// } else if (event.getSource() == textureButton)
3282
-// {
3283
-// return; // true;
3284
- } else // combos...
3285
- if (event.getSource() == texresMenu)
3412
+ */ else // combos...
3413
+ if (source == texresMenu)
32863414 {
32873415 System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
32883416 copy.texres = texresMenu.getSelectedIndex();
....@@ -3294,27 +3422,302 @@
32943422 }
32953423 }
32963424
3297
- void ToggleAnimation()
3425
+ void New()
32983426 {
3299
- if (!CameraPane.ANIMATION)
3427
+ while (copy.Size() > 1)
33003428 {
3301
- FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3429
+ copy.remove(1);
3430
+ }
3431
+
3432
+ ResetModel();
3433
+ objEditor.refreshContents();
3434
+ }
3435
+
3436
+ static public byte[] Compress(Object3D o)
3437
+ {
3438
+ try
3439
+ {
3440
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
3441
+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3442
+ ObjectOutputStream out = new ObjectOutputStream(zstream);
3443
+
3444
+ Object3D parent = o.parent;
3445
+ o.parent = null;
3446
+
3447
+ out.writeObject(o);
3448
+
3449
+ o.parent = parent;
3450
+
3451
+ out.flush();
3452
+
3453
+ zstream.close();
3454
+ out.close();
3455
+
3456
+ return baos.toByteArray();
3457
+ } catch (Exception e)
3458
+ {
3459
+ System.err.println(e);
3460
+ return null;
3461
+ }
3462
+ }
3463
+
3464
+ static public Object Uncompress(byte[] bytes)
3465
+ {
3466
+ System.out.println("#bytes = " + bytes.length);
3467
+ try
3468
+ {
3469
+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3470
+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3471
+ ObjectInputStream in = new ObjectInputStream(istream);
3472
+ Object obj = in.readObject();
3473
+ in.close();
3474
+
3475
+ return obj;
3476
+ } catch (Exception e)
3477
+ {
3478
+ System.err.println(e);
3479
+ return null;
3480
+ }
3481
+ }
3482
+
3483
+ static public Object clone(Object o)
3484
+ {
3485
+ try
3486
+ {
3487
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
3488
+ ObjectOutputStream out = new ObjectOutputStream(baos);
3489
+
3490
+ out.writeObject(o);
3491
+
3492
+ out.flush();
3493
+ out.close();
3494
+
3495
+ byte[] bytes = baos.toByteArray();
3496
+
3497
+ System.out.println("clone = " + bytes.length);
3498
+
3499
+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3500
+ ObjectInputStream in = new ObjectInputStream(bais);
3501
+ Object obj = in.readObject();
3502
+ in.close();
3503
+
3504
+ return obj;
3505
+ } catch (Exception e)
3506
+ {
3507
+ System.err.println(e);
3508
+ return null;
3509
+ }
3510
+ }
3511
+
3512
+ cRadio GetCurrentTab()
3513
+ {
3514
+ cRadio ab;
3515
+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3516
+ {
3517
+ ab = (cRadio)e.nextElement();
3518
+ if(ab.GetObject() == copy)
3519
+ {
3520
+ return ab;
3521
+ }
3522
+ }
3523
+
3524
+ return null;
3525
+ }
3526
+
3527
+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3528
+
3529
+ public void Save()
3530
+ {
3531
+ System.err.println("Save");
3532
+
3533
+ cRadio tab = GetCurrentTab();
3534
+
3535
+ boolean temp = CameraPane.SWITCH;
3536
+ CameraPane.SWITCH = false;
3537
+
3538
+ copy.ExtractBigData(hashtable);
3539
+
3540
+ //EditorFrame.m_MainFrame.requestFocusInWindow();
3541
+ tab.graphs[tab.undoindex++] = Compress(copy);
3542
+
3543
+ copy.RestoreBigData(hashtable);
3544
+
3545
+ CameraPane.SWITCH = temp;
3546
+
3547
+ //assert(hashtable.isEmpty());
3548
+
3549
+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
3550
+ {
3551
+ tab.graphs[i] = null;
3552
+ }
3553
+
3554
+ SetUndoStates();
3555
+
3556
+ // test save
3557
+ if (false)
3558
+ {
3559
+ try
3560
+ {
3561
+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
3562
+ ObjectOutputStream p = new ObjectOutputStream(ostream);
3563
+
3564
+ p.writeObject(copy);
3565
+
3566
+ p.flush();
3567
+
3568
+ ostream.close();
3569
+ } catch (Exception e)
3570
+ {
3571
+ e.printStackTrace();
3572
+ }
3573
+ }
3574
+ }
3575
+
3576
+ void CopyChanged(Object3D obj)
3577
+ {
3578
+ SetUndoStates();
3579
+
3580
+ boolean temp = CameraPane.SWITCH;
3581
+ CameraPane.SWITCH = false;
3582
+
3583
+ copy.ExtractBigData(hashtable);
3584
+
3585
+ copy.clear();
3586
+
3587
+ for (int i=0; i<obj.Size(); i++)
3588
+ {
3589
+ copy.add(obj.get(i));
3590
+ }
3591
+
3592
+ copy.RestoreBigData(hashtable);
3593
+
3594
+ CameraPane.SWITCH = temp;
3595
+
3596
+ //assert(hashtable.isEmpty());
3597
+
3598
+ copy.Touch();
3599
+
3600
+ ResetModel();
3601
+ copy.HardTouch(); // recompile?
3602
+
3603
+ cRadio ab;
3604
+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3605
+ {
3606
+ ab = (cRadio)e.nextElement();
3607
+ Object3D test = copy.GetObject(ab.object.GetUUID());
3608
+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
3609
+ if (test != null)
3610
+ {
3611
+ test.editWindow = ab.object.editWindow;
3612
+ ab.object = test;
3613
+ }
3614
+ }
3615
+
3616
+ refreshContents();
3617
+ }
3618
+
3619
+ cButton undoButton;
3620
+ cButton redoButton;
3621
+
3622
+ void SetUndoStates()
3623
+ {
3624
+ cRadio tab = GetCurrentTab();
3625
+
3626
+ undoButton.setEnabled(tab.undoindex > 0);
3627
+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
3628
+ }
3629
+
3630
+ public void Undo()
3631
+ {
3632
+ System.err.println("Undo");
3633
+
3634
+ cRadio tab = GetCurrentTab();
3635
+
3636
+ if (tab.undoindex == 0)
3637
+ {
3638
+ java.awt.Toolkit.getDefaultToolkit().beep();
3639
+ return;
3640
+ }
3641
+
3642
+ if (tab.graphs[tab.undoindex] == null)
3643
+ {
3644
+ Save();
3645
+ tab.undoindex -= 1;
3646
+ }
3647
+
3648
+ tab.undoindex -= 1;
3649
+
3650
+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3651
+ }
3652
+
3653
+ public void Redo()
3654
+ {
3655
+ cRadio tab = GetCurrentTab();
3656
+
3657
+ if (tab.graphs[tab.undoindex + 1] == null)
3658
+ {
3659
+ java.awt.Toolkit.getDefaultToolkit().beep();
3660
+ return;
3661
+ }
3662
+
3663
+ tab.undoindex += 1;
3664
+
3665
+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3666
+ }
3667
+
3668
+ void ImportGFD()
3669
+ {
3670
+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
33023671 browser.show();
33033672 String filename = browser.getFile();
33043673 if (filename != null && filename.length() > 0)
33053674 {
3306
- CameraPane.filename = browser.getDirectory() + filename;
3675
+ String fullname = browser.getDirectory() + filename;
3676
+
3677
+ //Object3D readobj =
3678
+ objEditor.ReadGFD(fullname, objEditor);
3679
+ //makeSomething(readobj);
3680
+ }
3681
+ }
3682
+
3683
+ void ImportVRMLX3D()
3684
+ {
3685
+ if (Grafreed.standAlone)
3686
+ {
3687
+ /**/
3688
+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
3689
+ browser.show();
3690
+ String filename = browser.getFile();
3691
+ if (filename != null && filename.length() > 0)
3692
+ {
3693
+ String fullname = browser.getDirectory() + filename;
3694
+ LoadVRMLX3D(fullname);
3695
+ }
3696
+ /**/
3697
+ }
3698
+ }
3699
+
3700
+ void ToggleAnimation()
3701
+ {
3702
+ if (!Globals.ANIMATION)
3703
+ {
3704
+ FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3705
+ browser.setVisible(true);
3706
+ String filename = browser.getFile();
3707
+ if (filename != null && filename.length() > 0)
3708
+ {
3709
+ Globals.filename = browser.getDirectory() + filename;
33073710 //CameraPane.framecount = 0;
3308
- CameraPane.imagecount = 0;
3711
+ Globals.imagecount = 0;
33093712
3310
- CameraPane.ANIMATION ^= true;
3713
+ Globals.ANIMATION ^= true;
33113714
3312
- GrafreeD.wav.cursor = 0;
3313
- GrafreeD.wav.loop = 0;
3715
+ Grafreed.wav.cursor = 0;
3716
+ Grafreed.wav.loop = 0;
33143717 }
33153718 } else
33163719 {
3317
- CameraPane.ANIMATION ^= true;
3720
+ Globals.ANIMATION ^= true;
33183721 }
33193722 }
33203723
....@@ -3360,7 +3763,7 @@
33603763 void CreateMaterial()
33613764 {
33623765 //copy.ClearMaterial(); // PATCH
3363
- copy.CreateMaterialS(multiplyToggle.isSelected());
3766
+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
33643767 if (copy.selection.size() > 0)
33653768 //SetMaterial(copy);
33663769 {
....@@ -3411,7 +3814,7 @@
34113814 assert false;
34123815 }
34133816
3414
- void EditSelection()
3817
+ void EditSelection(boolean newWindow)
34153818 {
34163819 }
34173820
....@@ -3419,11 +3822,11 @@
34193822 {
34203823 copy.ResetBlockLoop(); // temporary problem
34213824
3422
- boolean random = CameraPane.RANDOM;
3423
- CameraPane.RANDOM = false; // parse everything
3825
+ boolean random = CameraPane.SWITCH;
3826
+ CameraPane.SWITCH = false; // parse everything
34243827 copy.ResetDisplayList();
34253828 copy.HardTouch();
3426
- CameraPane.RANDOM = random;
3829
+ CameraPane.SWITCH = random;
34273830 }
34283831
34293832 // public void applySelf()
....@@ -3493,10 +3896,40 @@
34933896 current.fakedepth = (float) fakedepthField.getFloat();
34943897 current.shadowbias = (float) shadowbiasField.getFloat();
34953898
3496
- if (!NumberSlider.frozen)
3899
+ if (!cNumberSlider.frozen)
34973900 {
34983901 //System.out.println("Propagate = " + propagate);
34993902 copy.UpdateMaterial(anchor, current, propagate);
3903
+
3904
+ if (copy.material != null)
3905
+ {
3906
+ cMaterial mat = copy.material;
3907
+
3908
+ colorField.SetToolTipValue((mat.color));
3909
+ modulationField.SetToolTipValue((mat.modulation));
3910
+ metalnessField.SetToolTipValue((mat.metalness));
3911
+ diffuseField.SetToolTipValue((mat.diffuse));
3912
+ specularField.SetToolTipValue((mat.specular));
3913
+ shininessField.SetToolTipValue((mat.shininess));
3914
+ shiftField.SetToolTipValue((mat.shift));
3915
+ ambientField.SetToolTipValue((mat.ambient));
3916
+ lightareaField.SetToolTipValue((mat.lightarea));
3917
+ diffusenessField.SetToolTipValue((mat.factor));
3918
+ velvetField.SetToolTipValue((mat.velvet));
3919
+ sheenField.SetToolTipValue((mat.sheen));
3920
+ subsurfaceField.SetToolTipValue((mat.subsurface));
3921
+ backlitField.SetToolTipValue((mat.bump));
3922
+ anisoField.SetToolTipValue((mat.aniso));
3923
+ anisoVField.SetToolTipValue((mat.anisoV));
3924
+ cameraField.SetToolTipValue((mat.cameralight));
3925
+ selfshadowField.SetToolTipValue((mat.diffuseness));
3926
+ shadowField.SetToolTipValue((mat.shadow));
3927
+ textureField.SetToolTipValue((mat.texture));
3928
+ opacityField.SetToolTipValue((mat.opacity));
3929
+ fakedepthField.SetToolTipValue((mat.fakedepth));
3930
+ shadowbiasField.SetToolTipValue((mat.shadowbias));
3931
+ }
3932
+
35003933 if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
35013934 {
35023935 copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
....@@ -3541,6 +3974,7 @@
35413974 || e.getSource() == apertureField
35423975 || e.getSource() == shadowblurField)
35433976 {
3977
+ new Exception().printStackTrace();
35443978 System.exit(0);
35453979 cameraView.options1[0] = (float) focusField.getFloat() * 10;
35463980 cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
....@@ -3611,7 +4045,7 @@
36114045 }
36124046
36134047 if (normalpushField != null)
3614
- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
4048
+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
36154049 }
36164050
36174051 void SnapObject()
....@@ -3866,7 +4300,7 @@
38664300
38674301 radioPanel.revalidate();
38684302 radioPanel.repaint();
3869
- ctrlPanel.revalidate(); // ? new
4303
+ ctrlPanel.validate(); // ? new
38704304 ctrlPanel.repaint();
38714305 }
38724306 }
....@@ -3875,6 +4309,8 @@
38754309
38764310 void makeSomething(Object3D thing, boolean resetmodel) // deselect)
38774311 {
4312
+ if (Globals.SAVEONMAKE) // && resetmodel)
4313
+ Save();
38784314 //Tween.set(thing, 0).target(1).start(tweenManager);
38794315 //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
38804316 // if (thing instanceof GenericJointDemo)
....@@ -3961,6 +4397,12 @@
39614397 {
39624398 ResetModel();
39634399 Select(thing.GetTreePath(), true, false); // unselect... false);
4400
+
4401
+ if (thing.Size() == 0)
4402
+ {
4403
+ //EditSelection(false);
4404
+ }
4405
+
39644406 refreshContents();
39654407 }
39664408
....@@ -4078,6 +4520,7 @@
40784520 }
40794521 }
40804522 }
4523
+
40814524 LoadGFDThread loadGFDThread;
40824525
40834526 void ReadGFD(String fullname, iCallBack cb)
....@@ -4097,8 +4540,10 @@
40974540
40984541 try
40994542 {
4543
+ // Try compressed version first.
41004544 java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4101
- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
4545
+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
4546
+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
41024547
41034548 readobj = (Object3D) p.readObject();
41044549 istream.close();
....@@ -4106,7 +4551,20 @@
41064551 readobj.ResetDisplayList();
41074552 } catch (Exception e)
41084553 {
4109
- e.printStackTrace();
4554
+ //e.printStackTrace();
4555
+ try
4556
+ {
4557
+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4558
+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
4559
+
4560
+ readobj = (Object3D) p.readObject();
4561
+ istream.close();
4562
+
4563
+ readobj.ResetDisplayList();
4564
+ } catch (Exception e2)
4565
+ {
4566
+ e2.printStackTrace();
4567
+ }
41104568 }
41114569 // catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
41124570 // catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
....@@ -4152,6 +4610,12 @@
41524610
41534611 void LoadIt(Object obj)
41544612 {
4613
+ if (obj == null)
4614
+ {
4615
+ // Invalid file
4616
+ return;
4617
+ }
4618
+
41554619 System.out.println("Loaded " + obj);
41564620 //new Exception().printStackTrace();
41574621 Object3D readobj = (Object3D) obj;
....@@ -4161,6 +4625,8 @@
41614625
41624626 if (readobj != null)
41634627 {
4628
+ if (Globals.SAVEONMAKE)
4629
+ Save();
41644630 try
41654631 {
41664632 //readobj.deepCopySelf(copy);
....@@ -4223,7 +4689,7 @@
42234689
42244690 void load() // throws ClassNotFoundException
42254691 {
4226
- if (GrafreeD.standAlone)
4692
+ if (Grafreed.standAlone)
42274693 {
42284694 FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
42294695 browser.show();
....@@ -4310,11 +4776,13 @@
43104776 try
43114777 {
43124778 FileOutputStream ostream = new FileOutputStream(lastname);
4313
- ObjectOutputStream p = new ObjectOutputStream(ostream);
4779
+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4780
+ ObjectOutputStream p = new ObjectOutputStream(zstream);
43144781
43154782 p.writeObject(copy);
43164783 p.flush();
43174784
4785
+ zstream.close();
43184786 ostream.close();
43194787
43204788 //FileOutputStream fos = new FileOutputStream(fullname);
....@@ -4324,17 +4792,20 @@
43244792 {
43254793 }
43264794 }
4795
+
43274796 String lastname;
43284797
43294798 void saveAs()
43304799 {
4331
- if (GrafreeD.standAlone)
4800
+ if (Grafreed.standAlone)
43324801 {
43334802 FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
43344803 browser.setVisible(true);
43354804 String filename = browser.getFile();
43364805 if (filename != null && filename.length() > 0)
43374806 {
4807
+ if (!filename.endsWith(".gfd"))
4808
+ filename += ".gfd";
43384809 lastname = browser.getDirectory() + filename;
43394810 save();
43404811 }
....@@ -4433,13 +4904,13 @@
44334904 try
44344905 {
44354906 FileOutputStream ostream = new FileOutputStream(filename);
4436
- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4437
- ObjectOutputStream p = new ObjectOutputStream(/*z*/ostream);
4907
+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4908
+ ObjectOutputStream p = new ObjectOutputStream(zstream);
44384909
44394910 Object3D objectparent = obj.parent;
44404911 obj.parent = null;
44414912
4442
- Object3D object = (Object3D) GrafreeD.clone(obj);
4913
+ Object3D object = (Object3D) Grafreed.clone(obj);
44434914
44444915 obj.parent = objectparent;
44454916
....@@ -4451,8 +4922,8 @@
44514922 p.writeObject(object);
44524923 p.flush();
44534924
4925
+ zstream.close();
44544926 ostream.close();
4455
- // zstream.close();
44564927
44574928 // group.selection.get(0).parent = parent;
44584929 //FileOutputStream fos = new FileOutputStream(fullname);
....@@ -4473,7 +4944,7 @@
44734944 buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
44744945 cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
44754946 copy.generatePOV(buffer);
4476
- if (GrafreeD.standAlone)
4947
+ if (Grafreed.standAlone)
44774948 {
44784949 FileDialog browser = new FileDialog(frame, "Export POV", 1);
44794950 browser.show();
....@@ -4499,7 +4970,8 @@
44994970 Object3D client;
45004971 Object3D copy;
45014972 MenuBar menuBar;
4502
- Menu windowMenu;
4973
+ Menu fileMenu;
4974
+ MenuItem newItem;
45034975 MenuItem loadItem;
45044976 MenuItem saveItem;
45054977 MenuItem saveAsItem;
....@@ -4507,13 +4979,11 @@
45074979 MenuItem reexportItem;
45084980 MenuItem povItem;
45094981 MenuItem closeItem;
4510
- Menu cameraMenu;
4982
+
45114983 CheckboxMenuItem zBufferItem;
45124984 //MenuItem normalLensItem;
4513
- MenuItem editCameraItem;
4514
- MenuItem revertCameraItem;
4515
- CheckboxMenuItem toggleLiveItem;
45164985 MenuItem stepItem;
4986
+ CheckboxMenuItem toggleLiveItem;
45174987 CheckboxMenuItem toggleFullScreenItem;
45184988 CheckboxMenuItem toggleTimelineItem;
45194989 CheckboxMenuItem toggleRenderItem;
....@@ -4522,28 +4992,41 @@
45224992 CheckboxMenuItem toggleFootContactItem;
45234993 CheckboxMenuItem toggleDLItem;
45244994 CheckboxMenuItem toggleTextureItem;
4525
- CheckboxMenuItem toggleRandomItem;
4995
+ CheckboxMenuItem toggleSwitchItem;
45264996 CheckboxMenuItem toggleRootItem;
45274997 CheckboxMenuItem animationItem;
45284998 CheckboxMenuItem toggleHandleItem;
45294999 CheckboxMenuItem togglePaintItem;
45305000 JSplitPane mainPanel;
45315001 JScrollPane scrollpane;
5002
+
45325003 JPanel toolbarPanel;
4533
- JPanel treePanel;
5004
+
5005
+ cGridBag treePanel;
5006
+
45345007 JPanel radioPanel;
45355008 ButtonGroup buttonGroup;
4536
- JPanel ctrlPanel;
4537
- JPanel materialPanel;
5009
+
5010
+ cGridBag toolboxPanel;
5011
+ cGridBag materialPanel;
5012
+ cGridBag ctrlPanel;
5013
+
45385014 JScrollPane infoPanel;
4539
- JPanel optionsPanel;
5015
+
5016
+ cGridBag optionsPanel;
5017
+
45405018 JTabbedPane objectPanel;
4541
- JPanel XYZPanel;
5019
+ boolean materialFlushed;
5020
+ Object3D latestObject;
5021
+
5022
+ cGridBag XYZPanel;
5023
+
45425024 JSplitPane gridPanel;
45435025 JSplitPane bigPanel;
4544
- JPanel bigThree;
4545
- JTabbedPane scenePanel;
4546
- JPanel centralPanel;
5026
+
5027
+ cGridBag bigThree;
5028
+ cGridBag scenePanel;
5029
+ cGridBag centralPanel;
45475030 JSplitPane cameraPanel;
45485031 JPanel timelinePanel;
45495032 JMenuBar timelineMenubar;
....@@ -4596,67 +5079,72 @@
45965079 // MATERIAL
45975080 JLabel materialLabel;
45985081 JLabel colorLabel;
4599
- NumberSlider colorField;
5082
+ cNumberSlider colorField;
46005083 JLabel modulationLabel;
4601
- NumberSlider modulationField;
5084
+ cNumberSlider modulationField;
46025085 JLabel metalnessLabel;
4603
- NumberSlider metalnessField;
5086
+ cNumberSlider metalnessField;
46045087 JLabel diffuseLabel;
4605
- NumberSlider diffuseField;
5088
+ cNumberSlider diffuseField;
46065089 JLabel specularLabel;
4607
- NumberSlider specularField;
5090
+ cNumberSlider specularField;
46085091 JLabel shininessLabel;
4609
- NumberSlider shininessField;
5092
+ cNumberSlider shininessField;
46105093 JLabel shiftLabel;
4611
- NumberSlider shiftField;
5094
+ cNumberSlider shiftField;
46125095 JLabel ambientLabel;
4613
- NumberSlider ambientField;
5096
+ cNumberSlider ambientField;
46145097 JLabel lightareaLabel;
4615
- NumberSlider lightareaField;
5098
+ cNumberSlider lightareaField;
46165099 JLabel diffusenessLabel;
4617
- NumberSlider diffusenessField;
5100
+ cNumberSlider diffusenessField;
46185101 JLabel velvetLabel;
4619
- NumberSlider velvetField;
5102
+ cNumberSlider velvetField;
46205103 JLabel sheenLabel;
4621
- NumberSlider sheenField;
5104
+ cNumberSlider sheenField;
46225105 JLabel subsurfaceLabel;
4623
- NumberSlider subsurfaceField;
5106
+ cNumberSlider subsurfaceField;
46245107 //JLabel bumpLabel;
46255108 //NumberSlider bumpField;
46265109 JLabel backlitLabel;
4627
- NumberSlider backlitField;
5110
+ cNumberSlider backlitField;
46285111 JLabel anisoLabel;
4629
- NumberSlider anisoField;
5112
+ cNumberSlider anisoField;
46305113 JLabel anisoVLabel;
4631
- NumberSlider anisoVField;
5114
+ cNumberSlider anisoVField;
46325115 JLabel cameraLabel;
4633
- NumberSlider cameraField;
5116
+ cNumberSlider cameraField;
46345117 JLabel selfshadowLabel;
4635
- NumberSlider selfshadowField;
5118
+ cNumberSlider selfshadowField;
46365119 JLabel shadowLabel;
4637
- NumberSlider shadowField;
5120
+ cNumberSlider shadowField;
46385121 JLabel textureLabel;
4639
- NumberSlider textureField;
5122
+ cNumberSlider textureField;
46405123 JLabel opacityLabel;
4641
- NumberSlider opacityField;
5124
+ cNumberSlider opacityField;
46425125 JLabel fakedepthLabel;
4643
- NumberSlider fakedepthField;
5126
+ cNumberSlider fakedepthField;
46445127 JLabel shadowbiasLabel;
4645
- NumberSlider shadowbiasField;
5128
+ cNumberSlider shadowbiasField;
46465129 JLabel bumpLabel;
4647
- NumberSlider bumpField;
5130
+ cNumberSlider bumpField;
46485131 JLabel noiseLabel;
4649
- NumberSlider noiseField;
5132
+ cNumberSlider noiseField;
46505133 JLabel powerLabel;
4651
- NumberSlider powerField;
5134
+ cNumberSlider powerField;
46525135 JLabel borderfadeLabel;
4653
- NumberSlider borderfadeField;
5136
+ cNumberSlider borderfadeField;
46545137 JLabel fogLabel;
4655
- NumberSlider fogField;
5138
+ cNumberSlider fogField;
46565139 JLabel opacityPowerLabel;
4657
- NumberSlider opacityPowerField;
4658
- JTree jTree;
5140
+ cNumberSlider opacityPowerField;
5141
+ cTree jTree;
46595142 //ObjectUI parent;
46605143
4661
- NumberSlider normalpushField;
5144
+ cNumberSlider normalpushField;
5145
+
5146
+ private MenuItem importGFDItem;
5147
+ private MenuItem importVRMLX3DItem;
5148
+ private MenuItem import3DSItem;
5149
+ private MenuItem importOBJItem;
46625150 }