Normand Briere
2019-08-05 de0d8d87447fea5faea469ccf8072a7aead35b6d
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,81 @@
3339
3440 GroupEditor callee;
3541 JFrame frame;
42
+
43
+ static ObjEditor theFrame;
44
+
45
+ public cGridBag GetSeparator()
46
+ {
47
+ cGridBag separator = new cGridBag();
48
+ separator.add(new JSeparator());
49
+ separator.preferredHeight = 5;
50
+ return separator;
51
+ }
52
+
53
+ cButton GetButton(String name, boolean border)
54
+ {
55
+ ImageIcon icon = GetIcon(name);
56
+ return new cButton(icon, border);
57
+ }
58
+
59
+ cLabel GetLabel(String name, boolean border)
60
+ {
61
+ //ImageIcon icon = GetIcon(name);
62
+ return new cLabel(GetImage(name), border);
63
+ }
64
+
65
+ cToggleButton GetToggleButton(String name, boolean border)
66
+ {
67
+ ImageIcon icon = GetIcon(name);
68
+ return new cToggleButton(icon, border);
69
+ }
70
+
71
+ cCheckBox GetCheckBox(String name, boolean border)
72
+ {
73
+ ImageIcon icon = GetIcon(name);
74
+ return new cCheckBox(icon, border);
75
+ }
76
+
77
+ ImageIcon GetIcon(String name)
78
+ {
79
+ try
80
+ {
81
+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
82
+
83
+// if (image.getWidth() > 48 && image.getHeight() > 48)
84
+// {
85
+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
86
+// Graphics2D g = resized.createGraphics();
87
+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
88
+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
89
+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
90
+// g.dispose();
91
+//
92
+// image = resized;
93
+// }
94
+
95
+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
96
+ return icon;
97
+ }
98
+ catch (Exception e)
99
+ {
100
+ return null;
101
+ }
102
+ }
103
+
104
+ BufferedImage GetImage(String name)
105
+ {
106
+ try
107
+ {
108
+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
109
+
110
+ return image;
111
+ }
112
+ catch (Exception e)
113
+ {
114
+ return null;
115
+ }
116
+ }
36117
37118 // SCRIPT
38119
....@@ -136,34 +217,42 @@
136217 public void closeUI()
137218 {
138219 //new Exception().printStackTrace();
139
- System.out.println("this = " + this);
140
- System.out.println("objEditor = " + objEditor);
220
+// System.out.println("this = " + this);
221
+// System.out.println("objEditor = " + objEditor);
141222 //nameField.removeActionListener(this);
142
- objEditor.ctrlPanel.remove(nameField);
223
+// objEditor.ctrlPanel.remove(nameField);
143224
144
- if (!GroupEditor.allparams)
225
+ objEditor.ctrlPanel.remove(namePanel);
226
+
227
+ if (!allparams)
145228 return;
146229
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);
230
+// objEditor.ctrlPanel.remove(liveCB);
231
+// objEditor.ctrlPanel.remove(hideCB);
232
+// objEditor.ctrlPanel.remove(markCB);
233
+//
234
+// objEditor.ctrlPanel.remove(randomCB);
235
+// objEditor.ctrlPanel.remove(speedupCB);
236
+// objEditor.ctrlPanel.remove(rewindCB);
237
+//
238
+// objEditor.ctrlPanel.remove(resetButton);
239
+// objEditor.ctrlPanel.remove(stepButton);
240
+//// objEditor.ctrlPanel.remove(stepAllButton);
241
+//// objEditor.ctrlPanel.remove(resetAllButton);
242
+// objEditor.ctrlPanel.remove(link2masterCB);
243
+// //objEditor.ctrlPanel.remove(flipVCB);
244
+// //objEditor.ctrlPanel.remove(texresMenu);
245
+// objEditor.ctrlPanel.remove(slowerButton);
246
+// objEditor.ctrlPanel.remove(fasterButton);
247
+// objEditor.ctrlPanel.remove(remarkButton);
165248
166
- Remove(normalpushField);
249
+ objEditor.ctrlPanel.remove(setupPanel);
250
+ objEditor.ctrlPanel.remove(setupPanel2);
251
+ objEditor.ctrlPanel.remove(objectCommandsPanel);
252
+ objEditor.ctrlPanel.remove(pushPanel);
253
+ //objEditor.ctrlPanel.remove(fillPanel);
254
+
255
+ //Remove(normalpushField);
167256 }
168257
169258 public ObjEditor GetEditor()
....@@ -207,6 +296,12 @@
207296 client = inClient;
208297 copy = client;
209298
299
+ if (copy.versionlist == null)
300
+ {
301
+ copy.versionlist = new Object3D[100];
302
+ copy.versionindex = -1;
303
+ }
304
+
210305 // "this" is not called: SetupUI2(objEditor);
211306 }
212307
....@@ -220,6 +315,12 @@
220315 client = inClient;
221316 copy = client;
222317
318
+ if (copy.versionlist == null)
319
+ {
320
+ copy.versionlist = new Object3D[100];
321
+ copy.versionindex = -1;
322
+ }
323
+
223324 SetupUI2(callee.GetEditor());
224325 }
225326
....@@ -234,6 +335,7 @@
234335 //localCopy.parent = null;
235336
236337 frame = new JFrame();
338
+ frame.setUndecorated(false);
237339 objEditor = this;
238340 this.callee = callee;
239341
....@@ -251,6 +353,12 @@
251353 copy = localCopy;
252354 copy.editWindow = this;
253355
356
+ if (copy.versionlist == null)
357
+ {
358
+// copy.versions = new byte[100][];
359
+// copy.versionindex = -1;
360
+ }
361
+
254362 SetupMenu();
255363
256364 //SetupName(objEditor); // new
....@@ -264,28 +372,49 @@
264372 return frame.action(event, obj);
265373 }
266374
375
+ // Cannot work without static
376
+ static boolean allparams = true;
377
+
378
+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
379
+
267380 void SetupMenu()
268381 {
269382 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..."));
383
+ menuBar.add(fileMenu = new Menu("File"));
384
+ fileMenu.add(newItem = new MenuItem("New"));
385
+ fileMenu.add(openItem = new MenuItem("Open..."));
386
+
387
+ //oe.menuBar.add(menu = new Menu("Include"));
388
+ Menu menu = new Menu("Import");
389
+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
390
+ importOBJItem.addActionListener(this);
391
+ import3DSItem = menu.add(new MenuItem("3DS file..."));
392
+ import3DSItem.addActionListener(this);
393
+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
394
+ importVRMLX3DItem.addActionListener(this);
395
+ menu.add("-");
396
+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
397
+ importGFDItem.addActionListener(this);
398
+ fileMenu.add(menu);
399
+ fileMenu.add("-");
400
+
401
+ fileMenu.add(saveItem = new MenuItem("Save"));
402
+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
275403 //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("-");
404
+ fileMenu.add("-");
405
+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
406
+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
407
+ fileMenu.add("-");
280408 if (client.parent != null)
281409 {
282
- windowMenu.add(closeItem = new MenuItem("Close"));
410
+ fileMenu.add(closeItem = new MenuItem("Close"));
283411 } else
284412 {
285
- windowMenu.add(closeItem = new MenuItem("Exit"));
413
+ fileMenu.add(closeItem = new MenuItem("Exit"));
286414 }
287415
288
- loadItem.addActionListener(this);
416
+ newItem.addActionListener(this);
417
+ openItem.addActionListener(this);
289418 saveItem.addActionListener(this);
290419 saveAsItem.addActionListener(this);
291420 exportAsItem.addActionListener(this);
....@@ -293,82 +422,69 @@
293422 //povItem.addActionListener(this);
294423 closeItem.addActionListener(this);
295424
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(Globals.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
-
351425 objectPanel = new JTabbedPane();
426
+
427
+ ChangeListener changeListener = new ChangeListener()
428
+ {
429
+ public void stateChanged(ChangeEvent changeEvent)
430
+ {
431
+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
432
+// {
433
+// if (latestObject != null)
434
+// {
435
+// refreshContents(true);
436
+// SetMaterial(latestObject);
437
+// }
438
+//
439
+// materialFlushed = true;
440
+// }
441
+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
442
+// {
443
+// if (listUI.size() == 0)
444
+// EditSelection(false);
445
+// }
446
+
447
+ refreshContents(false); // To refresh Info tab
448
+ }
449
+ };
450
+ objectPanel.addChangeListener(changeListener);
451
+
352452 toolbarPanel = new JPanel();
353453 toolbarPanel.setName("Toolbar");
354
- treePanel = new JPanel();
454
+
455
+ treePanel = new cGridBag();
355456 treePanel.setName("Tree");
356
- ctrlPanel = new JPanel(); // new GridBagLayout());
357
- ctrlPanel.setName("Edit");
358
- materialPanel = new JPanel();
359
- materialPanel.setName("Material");
457
+
458
+ editPanel = new cGridBag().setVertical(true);
459
+ //editPanel.setName("Edit");
460
+
461
+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
462
+
463
+ editCommandsPanel = new cGridBag();
464
+ editPanel.add(editCommandsPanel);
465
+ editPanel.add(ctrlPanel);
466
+
467
+ toolboxPanel = new cGridBag().setVertical(true);
468
+ //toolboxPanel.setName("Toolbox");
469
+
470
+ materialPanel = new cGridBag().setVertical(false);
471
+ //materialPanel.setName("Material");
472
+
360473 /*JTextPane*/
361474 infoarea = createTextPane();
475
+ doc = infoarea.getStyledDocument();
476
+
362477 infoarea.setEditable(true);
363478 SetText();
479
+
364480 // infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
365481 // infoarea.setOpaque(false);
366482 // //infoarea.setForeground(textcolor);
367
- infoarea.setLineWrap(true);
368
- infoarea.setWrapStyleWord(true);
483
+// TEXTAREA infoarea.setLineWrap(true);
484
+// TEXTAREA infoarea.setWrapStyleWord(true);
369485 infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
370
- infoPanel.setPreferredSize(new Dimension(50, 200));
371
- infoPanel.setName("Info");
486
+ infoPanel.setPreferredSize(new Dimension(1, 1));
487
+ //infoPanel.setName("Info");
372488 //infoPanel.setLayout(new BorderLayout());
373489 //infoPanel.add(createTextPane());
374490
....@@ -376,16 +492,23 @@
376492 mainPanel.setName("Main");
377493 mainPanel.setContinuousLayout(true);
378494 mainPanel.setOneTouchExpandable(true);
379
- mainPanel.setDividerLocation(1.0);
380495 mainPanel.setDividerSize(9);
381
- mainPanel.setResizeWeight(0);
382
-
496
+ mainPanel.setDividerLocation(0.5); //1.0);
497
+ mainPanel.setResizeWeight(0.5);
498
+
499
+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
500
+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
501
+ divider.setDividerSize(15);
502
+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
503
+
504
+ mainPanel.setUI(new BasicSplitPaneUI());
505
+
383506 //ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
384507 //mainPanel.setLayout(new GridBagLayout());
385508 toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
386
- treePanel.setLayout(new GridBagLayout());
387
- ctrlPanel.setLayout(new GridBagLayout());
388
- materialPanel.setLayout(new GridBagLayout());
509
+// treePanel.setLayout(new GridBagLayout());
510
+ //ctrlPanel.setLayout(new GridBagLayout());
511
+ //materialPanel.setLayout(new GridBagLayout());
389512
390513 aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
391514 GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
....@@ -424,7 +547,7 @@
424547 static String newline = "\n";
425548 protected static final String buttonString = "JButton";
426549 StyledDocument doc;
427
- JTextArea infoarea;
550
+ JTextPane infoarea;
428551
429552 void ClearInfo()
430553 {
....@@ -447,10 +570,10 @@
447570 e.printStackTrace();
448571 }
449572
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();
573
+// String selection = infoarea.getText();
574
+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
575
+// java.awt.datatransfer.Clipboard clipboard =
576
+// Toolkit.getDefaultToolkit().getSystemClipboard();
454577 //clipboard.setContents(data, data);
455578 }
456579
....@@ -473,13 +596,13 @@
473596 //SendInfo("Name:", "bold");
474597 if (sel.GetTextures() != null || debug)
475598 {
476
- si.SendInfo(sel.toString(), "bold");
599
+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
477600 //SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
478601 if (sel.Size() > 0)
479602 {
480603 si.SendInfo("#children = " + sel.Size(), "regular");
481604 }
482
- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
605
+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
483606 if (debug)
484607 {
485608 try
....@@ -491,7 +614,10 @@
491614 }
492615
493616 if (full)
494
- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
617
+ {
618
+ si.SendInfo(" BBox min: " + minima, "regular");
619
+ si.SendInfo(" BBox max: " + maxima, "regular");
620
+ }
495621
496622 if (sel.bRep != null)
497623 {
....@@ -518,7 +644,7 @@
518644 }
519645 if (sel.support != null)
520646 {
521
- si.SendInfo(" support: " + sel.support, "regular");
647
+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
522648 }
523649 if (sel.scriptnode != null)
524650 {
....@@ -589,6 +715,9 @@
589715 {
590716 CameraPane.pointflow = (PointFlow) sel;
591717 }
718
+
719
+ si.SendInfo("_____________________", "regular");
720
+ si.SendInfo("", "regular");
592721 }
593722 }
594723
....@@ -604,68 +733,194 @@
604733 }
605734 }
606735
736
+//static GraphicsDevice device = GraphicsEnvironment
737
+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
738
+
739
+ Rectangle keeprect;
740
+ cRadio radio;
741
+
742
+cButton keepButton;
743
+ cButton twoButton; // Full 3D
744
+ cButton sixButton;
745
+ cButton threeButton;
746
+ cButton sevenButton;
747
+ cButton fourButton; // full panel
748
+ cButton oneButton; // full XYZ
749
+ //cButton currentLayout;
750
+
751
+ boolean maximized;
752
+
753
+ cButton fullscreenLayout;
754
+
755
+ void Minimize()
756
+ {
757
+ frame.setState(Frame.ICONIFIED);
758
+ frame.validate();
759
+ }
760
+
761
+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
762
+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
763
+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
764
+ void Maximize()
765
+ {
766
+ if (CameraPane.FULLSCREEN)
767
+ {
768
+ ToggleFullScreen();
769
+ }
770
+
771
+ if (maximized)
772
+ {
773
+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
774
+ }
775
+ else
776
+ {
777
+ keeprect = frame.getBounds();
778
+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
779
+// Dimension rect2 = frame.getToolkit().getScreenSize();
780
+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
781
+// frame.setState(Frame.MAXIMIZED_BOTH);
782
+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
783
+ }
784
+
785
+ maximized ^= true;
786
+
787
+ frame.validate();
788
+ }
789
+
790
+ cButton minButton;
791
+ cButton maxButton;
792
+ cButton fullButton;
793
+
607794 void ToggleFullScreen()
608795 {
609
- if (CameraPane.FULLSCREEN)
796
+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
797
+
798
+ cameraView.ToggleFullScreen();
799
+
800
+ if (!CameraPane.FULLSCREEN)
610801 {
611
- frame.getContentPane().remove(/*"Center",*/bigThree);
612
- framePanel.add(bigThree);
613
- frame.getContentPane().add(/*"Center",*/framePanel);
802
+ device.setFullScreenWindow(null);
803
+ frame.dispose();
804
+ frame.setUndecorated(false);
805
+ frame.validate();
806
+ frame.setVisible(true);
807
+
808
+ //frame.setVisible(false);
809
+// frame.removeNotify();
810
+// frame.setUndecorated(false);
811
+// frame.addNotify();
812
+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
813
+
814
+// X frame.getContentPane().remove(/*"Center",*/bigThree);
815
+// X framePanel.add(bigThree);
816
+// X frame.getContentPane().add(/*"Center",*/framePanel);
817
+ framePanel.setDividerLocation(46);
818
+
819
+ //frame.setVisible(true);
820
+ radio.layout = keepButton;
821
+ //theFrame = null;
822
+ keepButton = null;
823
+ radio.layout.doClick();
824
+
614825 } else
615826 {
616
- frame.getContentPane().remove(/*"Center",*/framePanel);
617
- framePanel.remove(bigThree);
618
- frame.getContentPane().add(/*"Center",*/bigThree);
827
+ keepButton = radio.layout;
828
+ //keeprect = frame.getBounds();
829
+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
830
+// frame.getToolkit().getScreenSize().height);
831
+ //frame.setVisible(false);
832
+
833
+ frame.dispose();
834
+ frame.setUndecorated(true);
835
+ device.setFullScreenWindow(frame);
836
+ frame.validate();
837
+ frame.setVisible(true);
838
+// frame.removeNotify();
839
+// frame.setUndecorated(true);
840
+// frame.addNotify();
841
+// X frame.getContentPane().remove(/*"Center",*/framePanel);
842
+// X framePanel.remove(bigThree);
843
+// X frame.getContentPane().add(/*"Center",*/bigThree);
844
+ framePanel.setDividerLocation(0);
845
+
846
+ radio.layout = fullscreenLayout;
847
+ radio.layout.doClick();
848
+ //frame.setVisible(true);
619849 }
620
- cameraView.ToggleFullScreen();
850
+ frame.validate();
851
+
852
+ cameraView.requestFocusInWindow();
621853 }
622854
623
- private JTextArea createTextPane()
855
+ private Object3D CompressCopy()
624856 {
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
- };
857
+ boolean temp = CameraPane.SWITCH;
858
+ CameraPane.SWITCH = false;
859
+
860
+ copy.ExtractBigData(versiontable);
861
+ // if (copy == client)
862
+
863
+ Object3D versions[] = copy.versionlist;
864
+ copy.versionlist = null;
865
+
866
+ //byte[] compress = Compress(copy);
867
+ Object3D compress = (Object3D)Grafreed.clone(copy);
868
+
869
+ copy.versionlist = versions;
870
+
871
+ copy.RestoreBigData(versiontable);
872
+
873
+ CameraPane.SWITCH = temp;
874
+
875
+ return compress;
876
+ }
640877
641
- String[] initStyles =
642
- {
643
- "regular", "italic", "bold", "small", "large",
644
- "regular", "button", "regular", "icon",
645
- "regular"
646
- };
878
+ private JTextPane createTextPane()
879
+ {
880
+// TEXTAREA String[] initString =
881
+// {
882
+// "This is an editable JTextPane, ", //regular
883
+// "another ", //italic
884
+// "styled ", //bold
885
+// "text ", //small
886
+// "component, ", //large
887
+// "which supports embedded components..." + newline,//regular
888
+// " " + newline, //button
889
+// "...and embedded icons..." + newline, //regular
890
+// " ", //icon
891
+// newline + "JTextPane is a subclass of JEditorPane that "
892
+// + "uses a StyledEditorKit and StyledDocument, and provides "
893
+// + "cover methods for interacting with those objects."
894
+// };
895
+//
896
+// String[] initStyles =
897
+// {
898
+// "regular", "italic", "bold", "small", "large",
899
+// "regular", "button", "regular", "icon",
900
+// "regular"
901
+// };
902
+//
903
+// JTextPane textPane = new JTextPane();
904
+// textPane.setEditable(true);
905
+// /*StyledDocument*/ doc = textPane.getStyledDocument();
906
+// addStylesToDocument(doc);
907
+//
908
+// try
909
+// {
910
+// for (int j = 0; j < 2; j++)
911
+// {
912
+// for (int i = 0; i < initString.length; i++)
913
+// {
914
+// doc.insertString(doc.getLength(), initString[i],
915
+// doc.getStyle(initStyles[i]));
916
+// }
917
+// }
918
+// } catch (BadLocationException ble)
919
+// {
920
+// System.err.println("Couldn't insert initial text into text pane.");
921
+// }
647922
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;
923
+ return new JTextPane(); // textPane;
669924 }
670925
671926 protected void addStylesToDocument(StyledDocument doc)
....@@ -718,7 +973,7 @@
718973 protected static ImageIcon createImageIcon(String path,
719974 String description)
720975 {
721
- java.net.URL imgURL = GrafreeD.class.getResource(path);
976
+ java.net.URL imgURL = Grafreed.class.getResource(path);
722977 if (imgURL != null)
723978 {
724979 return new ImageIcon(imgURL, description);
....@@ -741,6 +996,7 @@
741996 {
742997 SetupMaterial(materialPanel);
743998 }
999
+
7441000 //SetupName();
7451001 //SetupViews();
7461002 }
....@@ -750,6 +1006,7 @@
7501006 // NumberSlider vDivsField;
7511007 // JCheckBox endcaps;
7521008 JCheckBox liveCB;
1009
+ JCheckBox selectableCB;
7531010 JCheckBox hideCB;
7541011 JCheckBox link2masterCB;
7551012 JCheckBox markCB;
....@@ -757,7 +1014,12 @@
7571014 JCheckBox speedupCB;
7581015 JCheckBox rewindCB;
7591016 JCheckBox flipVCB;
1017
+
1018
+ cCheckBox toggleTextureCB;
1019
+ cCheckBox toggleSwitchCB;
1020
+
7601021 JComboBox texresMenu;
1022
+
7611023 JButton resetButton;
7621024 JButton stepButton;
7631025 JButton stepAllButton;
....@@ -765,115 +1027,87 @@
7651027 JButton slowerButton;
7661028 JButton fasterButton;
7671029 JButton remarkButton;
1030
+
1031
+ cGridBag editPanel;
1032
+ cGridBag editCommandsPanel;
1033
+
1034
+ cGridBag namePanel;
1035
+ cGridBag setupPanel;
1036
+ cGridBag setupPanel2;
1037
+ cGridBag objectCommandsPanel;
1038
+ cGridBag pushPanel;
1039
+ cGridBag fillPanel;
7681040
769
- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
1041
+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
7701042 {
7711043 JCheckBox cb;
7721044
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);
1045
+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
7781046 cb.addItemListener(this);
779
-// oe.aConstraints.anchor = GridBagConstraints.EAST;
780
- oe.aConstraints.gridwidth = 1;
781
- oe.aConstraints.gridx += 1;
7821047
7831048 return cb;
7841049 }
7851050
786
- cButton AddButton(ObjEditor oe, String label)
1051
+ cButton AddButton(cGridBag panel, String label)
7871052 {
7881053 cButton cb;
7891054
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);
1055
+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
7951056 cb.addActionListener(this);
796
-// oe.aConstraints.anchor = GridBagConstraints.EAST;
797
- oe.aConstraints.gridwidth = 1;
798
- oe.aConstraints.gridx += 1;
7991057
8001058 return cb;
8011059 }
8021060
803
- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
1061
+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
8041062 {
8051063 JComboBox combo;
8061064
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;
1065
+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
8101066 combo.addActionListener(this);
8111067
8121068 return combo;
8131069 }
8141070
815
- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
1071
+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
8161072 {
817
- NumberSlider combo;
1073
+ cGridBag control = new cGridBag();
1074
+
1075
+ cNumberSlider combo;
8181076
8191077 JLabel jlabel = new JLabel(label);
820
-
821
- aConstraints.fill = GridBagConstraints.VERTICAL;
8221078 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
-
1079
+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
1080
+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
8321081 combo.setFloat(current);
833
-
834
- combo.label = jlabel;
835
-
836
- combo.addChangeListener(this);
837
-
838
- return combo;
1082
+
1083
+ panel.add(control);
1084
+
1085
+ return control;
8391086 }
8401087
841
- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
1088
+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
8421089 {
843
- NumberSlider combo;
1090
+ cGridBag control = new cGridBag();
1091
+
1092
+ cNumberSlider combo;
8441093
8451094 JLabel jlabel = new JLabel(label);
846
-
847
- aConstraints.fill = GridBagConstraints.VERTICAL;
8481095 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
-
1096
+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
1097
+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
8581098 combo.setInteger(current);
8591099
860
- combo.label = jlabel;
861
-
862
- combo.addChangeListener(this);
863
-
864
- return combo;
1100
+ panel.add(control);
1101
+
1102
+ return control;
8651103 }
8661104
867
- JTextArea AddText(JPanel ctrlPanel, String name)
1105
+ JTextArea AddText(cGridBag ctrlPanel, String name)
8681106 {
8691107 JTextArea text;
8701108
871
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
872
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
873
- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
1109
+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
8741110 text.addCaretListener(this);
875
- aConstraints.gridx += 1;
876
- aConstraints.gridwidth = 1;
8771111
8781112 return text;
8791113 }
....@@ -903,9 +1137,16 @@
9031137 objEditor.ctrlPanel.remove(j);
9041138 }
9051139
1140
+ void Remove(cNumberSlider j)
1141
+ {
1142
+ j.removeChangeListener(this);
1143
+ //objEditor.ctrlPanel.remove(j.label);
1144
+ objEditor.ctrlPanel.remove(j);
1145
+ }
1146
+
9061147 /*
9071148 */
908
- void Return() // ObjEditor oe)
1149
+ void Return0() // ObjEditor oe)
9091150 {
9101151 aConstraints.gridy += 1;
9111152 aConstraints.gridx = 0;
....@@ -960,37 +1201,80 @@
9601201
9611202 void SetupUI2(ObjEditor oe)
9621203 {
963
-// oe.aConstraints.weightx = 0;
964
-// oe.aConstraints.weighty = 0;
965
-// oe.aConstraints.gridx = 0;
966
-// oe.aConstraints.gridy = 0;
967
- SetupName(oe);
1204
+ //SetupName(oe);
9681205
969
- if (!GroupEditor.allparams)
1206
+ namePanel = new cGridBag();
1207
+
1208
+ nameField = AddText(namePanel, copy.GetName());
1209
+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1210
+ oe.ctrlPanel.add(namePanel);
1211
+
1212
+ oe.ctrlPanel.Return();
1213
+
1214
+ if (!allparams)
9701215 return;
9711216
972
- liveCB = AddCheckBox(oe, "Live", copy.live);
973
- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
974
- hideCB = AddCheckBox(oe, "Hide", copy.hide);
1217
+ setupPanel = new cGridBag().setVertical(false);
1218
+
1219
+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1220
+ liveCB.setToolTipText("Animate object");
1221
+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1222
+ selectableCB.setToolTipText("Make object selectable");
9751223 // 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");
1224
+
1225
+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1226
+ hideCB.setToolTipText("Hide object");
1227
+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1228
+ markCB.setToolTipText("As animation target transform");
1229
+
1230
+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1231
+
1232
+ setupPanel2 = new cGridBag().setVertical(false);
1233
+
1234
+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1235
+ rewindCB.setToolTipText("Rewind animation");
1236
+
1237
+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
1238
+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1239
+
1240
+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
1241
+ link2masterCB.setToolTipText("Attach to support");
1242
+
1243
+ if (Globals.ADVANCED)
1244
+ {
1245
+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1246
+ speedupCB.setToolTipText("Option motion capture");
1247
+ }
1248
+
1249
+ oe.ctrlPanel.add(setupPanel);
1250
+ oe.ctrlPanel.Return();
1251
+ oe.ctrlPanel.add(setupPanel2);
1252
+ oe.ctrlPanel.Return();
1253
+
1254
+ objectCommandsPanel = new cGridBag().setVertical(false);
1255
+
1256
+ resetButton = AddButton(objectCommandsPanel, "Reset");
1257
+ resetButton.setToolTipText("Jump to frame zero");
1258
+ stepButton = AddButton(objectCommandsPanel, "Step");
1259
+ stepButton.setToolTipText("Step one frame");
9821260 // resetAllButton = AddButton(oe, "Reset All");
9831261 // stepAllButton = AddButton(oe, "Step All");
984
- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
9851262 // Return();
986
- slowerButton = AddButton(oe, "Slow");
987
- fasterButton = AddButton(oe, "Fast");
988
- remarkButton = AddButton(oe, "Rem");
1263
+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1264
+ slowerButton.setToolTipText("Decrease animation speed");
1265
+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1266
+ fasterButton.setToolTipText("Increase animation speed");
1267
+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1268
+ remarkButton.setToolTipText("Set the current transform as the target");
9891269
990
- Return();
1270
+ oe.ctrlPanel.add(objectCommandsPanel);
1271
+ oe.ctrlPanel.Return();
9911272
992
- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
993
- Return();
1273
+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
1274
+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1275
+ //Return();
1276
+
1277
+ oe.ctrlPanel.Return();
9941278
9951279 // oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
9961280 // ObjEditor.aConstraints.gridx += 1;
....@@ -1085,7 +1369,7 @@
10851369 oe.aConstraints.gridwidth = 1;
10861370 /**/
10871371 nameField = AddText(oe.ctrlPanel, copy.GetName());
1088
- Return();
1372
+ oe.ctrlPanel.Return();
10891373
10901374 //ctrlPanel.add(textureButton = new Button("Texture..."));
10911375 //textureButton.setEnabled(false);
....@@ -1187,9 +1471,13 @@
11871471 //JPanel worldPanel =
11881472 // new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
11891473 //worldPanel.setName("World");
1190
- centralPanel = new JPanel(new BorderLayout());
1191
- timelinePanel = new JPanel(new BorderLayout());
1192
- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1474
+ centralPanel = new cGridBag();
1475
+ centralPanel.preferredWidth = 20;
1476
+
1477
+ if (Globals.ADVANCED)
1478
+ {
1479
+ timelinePanel = new JPanel(new BorderLayout());
1480
+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
11931481
11941482 cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
11951483 cameraPanel.setContinuousLayout(true);
....@@ -1198,7 +1486,10 @@
11981486 // cameraPanel.setDividerSize(9);
11991487 cameraPanel.setResizeWeight(1.0);
12001488
1489
+ }
1490
+
12011491 centralPanel.add(cameraView);
1492
+ centralPanel.setFocusable(true);
12021493 //frame.setJMenuBar(timelineMenubar);
12031494 //centralPanel.add(timelinePanel);
12041495
....@@ -1217,12 +1508,14 @@
12171508 //frontView.object = copy;
12181509 //sideView.object = copy;
12191510
1220
- XYZPanel = new JPanel();
1221
- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1511
+ XYZPanel = new cGridBag().setVertical(true);
1512
+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
12221513
1223
- XYZPanel.add(/*BorderLayout.SOUTH,*/sideView); // Scroll);
1224
- XYZPanel.add(/*BorderLayout.CENTER,*/frontView); // Scroll);
1225
- XYZPanel.add(/*BorderLayout.NORTH,*/topView); // Scroll);
1514
+ XYZPanel.preferredWidth = 5;
1515
+ XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll);
1516
+ XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll);
1517
+ XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
1518
+ //XYZPanel.setName("XYZ");
12261519
12271520 /*
12281521 gridPanel = new JPanel(); //new BorderLayout());
....@@ -1260,11 +1553,29 @@
12601553 //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
12611554 //tmp.setName("Edit");
12621555 objectPanel.add(materialPanel);
1263
- JPanel north = new JPanel(new BorderLayout());
1264
- north.setName("Edit");
1265
- north.add(ctrlPanel, BorderLayout.NORTH);
1266
- objectPanel.add(north);
1267
- objectPanel.add(infoPanel);
1556
+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1557
+ objectPanel.setToolTipTextAt(0, "Material");
1558
+
1559
+// JPanel north = new JPanel(new BorderLayout());
1560
+// north.setName("Edit");
1561
+// north.add(ctrlPanel, BorderLayout.NORTH);
1562
+// objectPanel.add(north);
1563
+ objectPanel.add(editPanel);
1564
+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
1565
+ objectPanel.setToolTipTextAt(1, "Edit controls");
1566
+
1567
+ //if (Globals.ADVANCED)
1568
+ objectPanel.add(infoPanel);
1569
+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
1570
+ objectPanel.setToolTipTextAt(2, "Information");
1571
+
1572
+ objectPanel.add(XYZPanel);
1573
+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1574
+ objectPanel.setToolTipTextAt(3, "XYZ/RGB transform");
1575
+
1576
+ objectPanel.add(toolboxPanel);
1577
+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1578
+ objectPanel.setToolTipTextAt(4, "Objects & backgrounds");
12681579
12691580 /*
12701581 aConstraints.gridx = 0;
....@@ -1273,7 +1584,7 @@
12731584 aConstraints.gridy += 1;
12741585 aConstraints.gridwidth = 1;
12751586 mainPanel.add(objectPanel, aConstraints);
1276
- */
1587
+ */
12771588
12781589 scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
12791590 VERTICAL_SCROLLBAR_AS_NEEDED,
....@@ -1284,19 +1595,23 @@
12841595 scrollpane.setWheelScrollingEnabled(true);
12851596 scrollpane.addMouseWheelListener(this); // Default not fast enough
12861597
1287
- /*JTabbedPane*/ scenePanel = new JTabbedPane();
1288
- scenePanel.add(scrollpane);
1598
+ /*JTabbedPane*/ scenePanel = new cGridBag();
1599
+ scenePanel.preferredWidth = 5;
1600
+
1601
+ JTabbedPane tabbedPane = new JTabbedPane();
1602
+ tabbedPane.add(scrollpane);
12891603
1290
- scenePanel.add(FSPane = new cFileSystemPane(this));
1291
-
1292
- optionsPanel = new JPanel(new GridBagLayout());
1604
+ optionsPanel = new cGridBag().setVertical(false);
12931605
12941606 optionsPanel.setName("Options");
12951607
1296
- AddOptions(optionsPanel, aConstraints);
1608
+ AddOptions(optionsPanel); //, aConstraints);
12971609
1298
- scenePanel.add(optionsPanel);
1610
+ tabbedPane.add(optionsPanel);
1611
+
1612
+ tabbedPane.add(FSPane = new cFileSystemPane(this));
12991613
1614
+ scenePanel.add(tabbedPane);
13001615
13011616 /*
13021617 cTree jTree = new cTree(null);
....@@ -1330,6 +1645,7 @@
13301645 //bigPanel.setSize(new Dimension(10,10));
13311646 //bigPanel.add(ctrlPanel);
13321647 //bigPanel.add(gridPanel);
1648
+ /**
13331649 bigThree = new JPanel();
13341650 //big.setLayout(new FlowLayout(FlowLayout.LEFT));
13351651 bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
....@@ -1353,7 +1669,13 @@
13531669 // aConstraints.gridheight = 3;
13541670 aWindowConstraints.fill = GridBagConstraints.VERTICAL;
13551671 bigThree.add(XYZPanel, aWindowConstraints);
1672
+ /**/
13561673
1674
+ bigThree = new cGridBag();
1675
+ bigThree.addComponent(scenePanel);
1676
+ bigThree.addComponent(centralPanel);
1677
+ //bigThree.addComponent(XYZPanel);
1678
+
13571679 // // SIDE EFFECT!!!
13581680 // aConstraints.gridx = 0;
13591681 // aConstraints.gridy = 0;
....@@ -1361,9 +1683,9 @@
13611683 // aConstraints.gridheight = 1;
13621684
13631685 framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1364
- framePanel.setContinuousLayout(true);
1365
- framePanel.setOneTouchExpandable(true);
1366
- framePanel.setDividerLocation(0.8);
1686
+ framePanel.setContinuousLayout(false);
1687
+ framePanel.setOneTouchExpandable(false);
1688
+ //.setDividerLocation(0.8);
13671689 //framePanel.setDividerSize(15);
13681690 //framePanel.setResizeWeight(0.15);
13691691 framePanel.setName("Frame");
....@@ -1380,15 +1702,19 @@
13801702
13811703 // aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
13821704
1383
- frame.setSize(1024, 768);
1384
- frame.show();
1385
-
1705
+ frame.setSize(1280, 860);
1706
+
1707
+ cameraView.requestFocusInWindow();
1708
+
13861709 gridPanel.setDividerLocation(1.0);
1710
+
1711
+ frame.validate();
1712
+
1713
+ frame.setVisible(true);
13871714
13881715 frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
13891716 frame.addWindowListener(new WindowAdapter()
13901717 {
1391
-
13921718 public void windowClosing(WindowEvent e)
13931719 {
13941720 Close();
....@@ -1396,7 +1722,7 @@
13961722 });
13971723 }
13981724
1399
- void AddOptions(JPanel panel, GridBagConstraints constraints)
1725
+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
14001726 {
14011727 }
14021728
....@@ -1411,260 +1737,257 @@
14111737 ctrlPanel.removeAll();
14121738 }
14131739
1414
- void SetupMaterial(JPanel ctrlPanel)
1740
+ void SetupMaterial(cGridBag materialpanel)
14151741 {
1416
- aConstraints.weighty = 0;
1417
- //aConstraints.weightx = 1;
1418
- /*
1742
+ cGridBag presetpanel = new cGridBag().setVertical(true);
1743
+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
1744
+ skin.addMouseListener(new MouseAdapter()
1745
+ {
1746
+ public void mouseClicked(MouseEvent e)
1747
+ {
1748
+ Object3D object = Grafreed.materials.versionlist[0].get(0);
1749
+ cMaterial material = object.material;
1750
+
1751
+ // Skin
1752
+ colorField.setFloat(material.color);
1753
+ saturationField.setFloat(material.modulation);
1754
+ subsurfaceField.setFloat(material.subsurface);
1755
+ selfshadowField.setFloat(material.diffuseness);
1756
+ diffusenessField.setFloat(material.factor);
1757
+ shininessField.setFloat(material.shininess);
1758
+ shadowbiasField.setFloat(material.shadowbias);
1759
+ diffuseField.setFloat(material.diffuse);
1760
+ specularField.setFloat(material.specular);
1761
+
1762
+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
1763
+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
1764
+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
1765
+
1766
+ materialtouched = true;
1767
+ applySelf();
1768
+ }
1769
+ });
1770
+ presetpanel.add(skin);
1771
+
1772
+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
1773
+ rough2.addMouseListener(new MouseAdapter()
1774
+ {
1775
+ public void mouseClicked(MouseEvent e)
1776
+ {
1777
+ Object3D object = Grafreed.materials.versionlist[1].get(0);
1778
+ cMaterial material = object.material;
1779
+
1780
+ shininessField.setFloat(material.shininess);
1781
+ velvetField.setFloat(material.velvet);
1782
+
1783
+ materialtouched = true;
1784
+ applySelf();
1785
+ }
1786
+ });
1787
+ presetpanel.add(rough2);
1788
+
1789
+ presetpanel.add(GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF));
1790
+ presetpanel.add(GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF));
1791
+ presetpanel.add(GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF));
1792
+ presetpanel.add(GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF));
1793
+ presetpanel.add(GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF));
1794
+ presetpanel.add(GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF));
1795
+ presetpanel.add(GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF));
1796
+ presetpanel.add(GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF));
1797
+ presetpanel.add(GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF));
1798
+ presetpanel.add(GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF));
1799
+ presetpanel.add(GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF));
1800
+ presetpanel.add(GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF));
1801
+ presetpanel.add(GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF));
1802
+ presetpanel.add(GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF));
1803
+ presetpanel.add(GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF));
1804
+ presetpanel.add(GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF));
1805
+
1806
+ cGridBag panel = new cGridBag().setVertical(true);
1807
+
1808
+ presetpanel.preferredWidth = 1;
1809
+
1810
+ materialpanel.add(panel);
1811
+ materialpanel.add(presetpanel);
1812
+
1813
+ panel.preferredWidth = 8;
1814
+
1815
+ /*
14191816 ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
14201817 materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1421
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1422
- aConstraints.gridx += 1;
1423
- */
1818
+ */
14241819
1425
- aConstraints.gridwidth = 1;
1426
- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1427
- aConstraints.gridx += 1;
1428
- aConstraints.weighty = 0;
1429
- aConstraints.gridwidth = 1;
1820
+ cGridBag editBar = new cGridBag().setVertical(false);
1821
+
1822
+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1823
+ createMaterialButton.setToolTipText("Create material");
14301824
14311825 /*
14321826 ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1433
- aConstraints.gridx += 1;
1434
- aConstraints.weighty = 0;
1435
- aConstraints.gridwidth = 1;
14361827 */
14371828
1438
- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1439
- aConstraints.gridx += 1;
1829
+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1830
+ clearMaterialButton.setToolTipText("Clear material");
1831
+
1832
+ if (Globals.ADVANCED)
1833
+ {
1834
+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
1835
+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1836
+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1837
+ }
14401838
1441
- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1442
-
1443
- aConstraints.gridx += 1;
1444
-
1445
- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1446
-
1447
- aConstraints.gridx += 1;
1448
-
1449
- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1450
-
1451
- aConstraints.gridx = 0;
1452
- aConstraints.gridy += 1;
1453
- aConstraints.weighty = 0;
1454
- aConstraints.gridwidth = 1;
1839
+ editBar.preferredHeight = 15;
1840
+
1841
+ panel.add(editBar);
1842
+
14551843 /**/
14561844 //aConstraints.weighty = 0;
14571845 ////aConstraints.weightx = 1;
14581846 //aConstraints.weighty = 1;
14591847 aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
14601848 //aConstraints.gridx += 1;
1461
- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1462
- aConstraints.weighty = 0;
1463
- aConstraints.gridx = 0;
1464
- aConstraints.gridy += 1;
1465
- aConstraints.gridwidth = 1;
1849
+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
14661850
1467
- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1468
- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1469
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1470
- aConstraints.gridx += 1;
1471
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1472
- //aConstraints.weightx = 0;
1473
- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1474
- aConstraints.gridx = 0;
1475
- aConstraints.gridy += 1;
1476
- aConstraints.gridwidth = 1;
1851
+ cGridBag colorSection = new cGridBag().setVertical(true);
14771852
1478
- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1479
- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1480
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1481
- aConstraints.gridx += 1;
1482
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1483
- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1484
- aConstraints.gridx = 0;
1485
- aConstraints.gridy += 1;
1486
- aConstraints.gridwidth = 1;
1853
+ cGridBag huepanel = new cGridBag();
1854
+ cGridBag huelabel = new cGridBag();
1855
+ skin = GetLabel("icons/hue.png", false);
1856
+ skin.fit = true;
1857
+ huelabel.add(skin);
1858
+ huelabel.preferredWidth = 20;
1859
+ huepanel.add(new cGridBag()); // Label
1860
+ huepanel.add(huelabel); // Field/slider
1861
+
1862
+ huepanel.preferredHeight = 7;
14871863
1488
- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1489
- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1490
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1491
- aConstraints.gridx += 1;
1492
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1493
- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1494
- aConstraints.gridx = 0;
1495
- aConstraints.gridy += 1;
1496
- aConstraints.gridwidth = 1;
1864
+ colorSection.add(huepanel);
1865
+
1866
+ cGridBag color = new cGridBag();
1867
+
1868
+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1869
+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1870
+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
14971871
1498
- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1499
- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1500
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1501
- aConstraints.gridx += 1;
1502
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1503
- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1504
- aConstraints.gridx = 0;
1505
- aConstraints.gridy += 1;
1506
- aConstraints.gridwidth = 1;
1872
+ //colorField.preferredWidth = 200;
1873
+ colorSection.add(color);
15071874
1508
- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1509
- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1510
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1511
- aConstraints.gridx += 1;
1512
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1513
- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1514
- aConstraints.gridx = 0;
1515
- aConstraints.gridy += 1;
1516
- aConstraints.gridwidth = 1;
1875
+ cGridBag modulation = new cGridBag();
1876
+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1877
+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1878
+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1879
+ colorSection.add(modulation);
15171880
1518
- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1519
- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1520
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1521
- aConstraints.gridx += 1;
1522
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1523
- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1524
- aConstraints.gridx = 0;
1525
- aConstraints.gridy += 1;
1526
- aConstraints.gridwidth = 1;
1881
+ cGridBag opacity = new cGridBag();
1882
+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1883
+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1884
+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1885
+ colorSection.add(opacity);
15271886
1528
- //aConstraints.weighty = 1;
1529
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1530
- //aConstraints.gridx += 1;
1531
- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1532
- aConstraints.weighty = 0;
1533
- aConstraints.gridx = 0;
1534
- aConstraints.gridy += 1;
1535
- aConstraints.gridwidth = 1;
1887
+ colorSection.add(GetSeparator());
1888
+
1889
+ cGridBag texture = new cGridBag();
1890
+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1891
+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1892
+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1893
+ colorSection.add(texture);
15361894
1537
- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1538
- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1539
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1540
- aConstraints.gridx += 1;
1541
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1542
- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1543
- aConstraints.gridx = 0;
1544
- aConstraints.gridy += 1;
1545
- aConstraints.gridwidth = 1;
1895
+ panel.add(GetSeparator());
1896
+
1897
+ panel.add(colorSection);
1898
+
1899
+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1900
+
1901
+ cGridBag diffuseSection = new cGridBag().setVertical(true);
1902
+
1903
+ cGridBag diffuse = new cGridBag();
1904
+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
1905
+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1906
+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1907
+ diffuseSection.add(diffuse);
15461908
1547
- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1548
- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1549
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1550
- aConstraints.gridx += 1;
1551
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1552
- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1553
- aConstraints.gridx = 0;
1554
- aConstraints.gridy += 1;
1555
- aConstraints.gridwidth = 1;
1909
+ cGridBag diffuseness = new cGridBag();
1910
+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
1911
+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1912
+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1913
+ diffuseSection.add(diffuseness);
15561914
1557
- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1558
- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1559
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1560
- aConstraints.gridx += 1;
1561
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1562
- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1563
- aConstraints.gridx = 0;
1564
- aConstraints.gridy += 1;
1565
- aConstraints.gridwidth = 1;
1915
+ cGridBag selfshadow = new cGridBag();
1916
+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
1917
+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1918
+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1919
+ diffuseSection.add(selfshadow);
15661920
1567
- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1568
- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1569
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1570
- aConstraints.gridx += 1;
1571
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1572
- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1573
- aConstraints.gridx = 0;
1574
- aConstraints.gridy += 1;
1575
- aConstraints.gridwidth = 1;
1921
+ cGridBag sheen = new cGridBag();
1922
+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
1923
+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1924
+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1925
+ diffuseSection.add(sheen);
15761926
1577
- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1578
- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1579
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1580
- aConstraints.gridx += 1;
1581
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1582
- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1583
- aConstraints.gridx = 0;
1584
- aConstraints.gridy += 1;
1585
- aConstraints.gridwidth = 1;
1927
+ cGridBag subsurface = new cGridBag();
1928
+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
1929
+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1930
+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1931
+ diffuseSection.add(subsurface);
15861932
1587
- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1588
- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1589
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1590
- aConstraints.gridx += 1;
1591
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1592
- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1593
- aConstraints.gridx = 0;
1594
- aConstraints.gridy += 1;
1595
- aConstraints.gridwidth = 1;
1933
+ cGridBag shadow = new cGridBag();
1934
+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
1935
+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1936
+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1937
+ diffuseSection.add(shadow);
15961938
1597
- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1598
- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1599
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1600
- aConstraints.gridx += 1;
1601
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1602
- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1603
- aConstraints.gridx = 0;
1604
- aConstraints.gridy += 1;
1605
- aConstraints.gridwidth = 1;
1939
+ cGridBag fakedepth = new cGridBag();
1940
+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
1941
+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1942
+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1943
+ diffuseSection.add(fakedepth);
16061944
1607
- //aConstraints.weighty = 1;
1608
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1609
- //aConstraints.gridx += 1;
1610
- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1611
- aConstraints.weighty = 0;
1612
- aConstraints.gridx = 0;
1613
- aConstraints.gridy += 1;
1614
- aConstraints.gridwidth = 1;
1945
+ cGridBag shadowbias = new cGridBag();
1946
+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1947
+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1948
+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1949
+ diffuseSection.add(shadowbias);
16151950
1616
- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1617
- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1618
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1619
- aConstraints.gridx += 1;
1620
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1621
- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1622
- aConstraints.gridx = 0;
1623
- aConstraints.gridy += 1;
1624
- aConstraints.gridwidth = 1;
1951
+ panel.add(GetSeparator());
1952
+
1953
+ panel.add(diffuseSection);
1954
+
1955
+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1956
+
1957
+ cGridBag specularSection = new cGridBag().setVertical(true);
16251958
1626
- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1627
- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1628
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1629
- aConstraints.gridx += 1;
1630
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1631
- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1632
- aConstraints.gridx = 0;
1633
- aConstraints.gridy += 1;
1634
- aConstraints.gridwidth = 1;
1959
+ cGridBag specular = new cGridBag();
1960
+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
1961
+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1962
+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1963
+ specularSection.add(specular);
16351964
1636
- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1637
- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1638
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1639
- aConstraints.gridx += 1;
1640
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1641
- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1642
- aConstraints.gridx = 0;
1643
- aConstraints.gridy += 1;
1644
- aConstraints.gridwidth = 1;
1965
+ cGridBag lightarea = new cGridBag();
1966
+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
1967
+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1968
+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1969
+ specularSection.add(lightarea);
16451970
1646
- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1647
- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1648
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1649
- aConstraints.gridx += 1;
1650
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1651
- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1652
- aConstraints.gridx = 0;
1653
- aConstraints.gridy += 1;
1654
- aConstraints.gridwidth = 1;
1971
+ cGridBag shininess = new cGridBag();
1972
+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
1973
+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1974
+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1975
+ specularSection.add(shininess);
16551976
1656
- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1657
- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1658
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1659
- aConstraints.gridx += 1;
1660
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1661
- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1662
- aConstraints.gridx = 0;
1663
- aConstraints.gridy += 1;
1664
- aConstraints.gridwidth = 1;
1977
+ cGridBag metalness = new cGridBag();
1978
+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
1979
+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1980
+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1981
+ specularSection.add(metalness);
16651982
1666
- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1667
- Return();
1983
+ cGridBag velvet = new cGridBag();
1984
+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
1985
+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1986
+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1987
+ specularSection.add(velvet);
1988
+
1989
+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
1990
+ //Return();
16681991 // ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
16691992 // shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
16701993 // aConstraints.fill = GridBagConstraints.HORIZONTAL;
....@@ -1675,130 +1998,99 @@
16751998 // aConstraints.gridy += 1;
16761999 // aConstraints.gridwidth = 1;
16772000
1678
- //aConstraints.weighty = 1;
1679
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1680
- //aConstraints.gridx += 1;
1681
- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1682
- aConstraints.weighty = 0;
1683
- aConstraints.gridx = 0;
1684
- aConstraints.gridy += 1;
1685
- aConstraints.gridwidth = 1;
2001
+ cGridBag anisoU = new cGridBag();
2002
+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
2003
+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2004
+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2005
+ specularSection.add(anisoU);
16862006
1687
- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1688
- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1689
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1690
- aConstraints.gridx += 1;
1691
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1692
- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1693
- aConstraints.gridx = 0;
1694
- aConstraints.gridy += 1;
1695
- aConstraints.gridwidth = 1;
2007
+ cGridBag anisoV = new cGridBag();
2008
+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
2009
+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2010
+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2011
+ specularSection.add(anisoV);
16962012
1697
- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1698
- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1699
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1700
- aConstraints.gridx += 1;
1701
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1702
- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1703
- aConstraints.gridx = 0;
1704
- aConstraints.gridy += 1;
1705
- aConstraints.gridwidth = 1;
17062013
1707
- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1708
- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1709
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1710
- aConstraints.gridx += 1;
1711
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1712
- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1713
- aConstraints.gridx = 0;
1714
- aConstraints.gridy += 1;
1715
- aConstraints.gridwidth = 1;
2014
+ panel.add(GetSeparator());
2015
+
2016
+ panel.add(specularSection);
2017
+
2018
+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
2019
+
2020
+ //cGridBag globalSection = new cGridBag().setVertical(true);
17162021
1717
- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1718
- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1719
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1720
- aConstraints.gridx += 1;
1721
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1722
- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1723
- aConstraints.gridx = 0;
1724
- aConstraints.gridy += 1;
1725
- aConstraints.gridwidth = 1;
1726
- aConstraints.weighty = 0;
2022
+ cGridBag camera = new cGridBag();
2023
+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
2024
+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2025
+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
2026
+ colorSection.add(camera);
17272027
1728
- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1729
- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1730
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1731
- aConstraints.gridx += 1;
1732
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1733
- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1734
- aConstraints.gridx = 0;
1735
- aConstraints.gridy += 1;
1736
- aConstraints.gridwidth = 1;
2028
+ cGridBag ambient = new cGridBag();
2029
+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
2030
+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2031
+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
2032
+ colorSection.add(ambient);
17372033
1738
- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1739
- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1740
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1741
- aConstraints.gridx += 1;
1742
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1743
- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/*5*/), aConstraints);
1744
- aConstraints.gridx = 0;
1745
- aConstraints.gridy += 1;
1746
- aConstraints.gridwidth = 1;
2034
+ cGridBag backlit = new cGridBag();
2035
+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
2036
+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2037
+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
2038
+ colorSection.add(backlit);
17472039
1748
- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1749
- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1750
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1751
- aConstraints.gridx += 1;
1752
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1753
- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1754
- aConstraints.gridx = 0;
1755
- aConstraints.gridy += 1;
1756
- aConstraints.gridwidth = 1;
2040
+ //panel.add(new JSeparator());
2041
+
2042
+ //panel.add(globalSection);
2043
+
2044
+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
2045
+
2046
+ cGridBag textureSection = new cGridBag().setVertical(true);
17572047
1758
- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1759
- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1760
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1761
- aConstraints.gridx += 1;
1762
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1763
- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1764
- aConstraints.gridx = 0;
1765
- aConstraints.gridy += 1;
1766
- aConstraints.gridwidth = 1;
2048
+ cGridBag bump = new cGridBag();
2049
+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
2050
+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2051
+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
2052
+ textureSection.add(bump);
17672053
1768
- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1769
- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1770
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1771
- aConstraints.gridx += 1;
1772
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1773
- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1774
- aConstraints.gridx = 0;
1775
- aConstraints.gridy += 1;
1776
- aConstraints.gridwidth = 1;
2054
+ cGridBag noise = new cGridBag();
2055
+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
2056
+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2057
+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/*5*/)); // , aConstraints);
2058
+ textureSection.add(noise);
17772059
1778
- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1779
- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1780
- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1781
- aConstraints.gridx += 1;
1782
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1783
- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /*10 dec 2013*/), aConstraints);
1784
- aConstraints.gridx = 0;
1785
- aConstraints.gridy += 1;
1786
- aConstraints.gridwidth = 1;
2060
+ cGridBag power = new cGridBag();
2061
+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
2062
+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2063
+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
2064
+ textureSection.add(power);
17872065
1788
- //aConstraints.weighty = 1;
1789
- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1790
- //aConstraints.gridx += 1;
1791
- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1792
- aConstraints.weighty = 0;
2066
+ cGridBag borderfade = new cGridBag();
2067
+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
2068
+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2069
+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
2070
+ textureSection.add(borderfade);
17932071
1794
- aConstraints.gridx = 0;
1795
- aConstraints.gridy = 0;
1796
- aConstraints.gridwidth = 1;
2072
+ cGridBag fog = new cGridBag();
2073
+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
2074
+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2075
+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
2076
+ textureSection.add(fog);
2077
+
2078
+ cGridBag opacityPower = new cGridBag();
2079
+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
2080
+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2081
+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /*10 dec 2013*/)); // , aConstraints);
2082
+ textureSection.add(opacityPower);
2083
+
2084
+ panel.add(GetSeparator());
2085
+
2086
+ panel.add(textureSection);
2087
+
2088
+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
17972089
17982090 SetMaterial(copy); // .GetMaterial());
17992091
1800
- colorField.addChangeListener(this);
1801
- modulationField.addChangeListener(this);
2092
+ //colorField.addChangeListener(this);
2093
+// modulationField.addChangeListener(this);
18022094 metalnessField.addChangeListener(this);
18032095 diffuseField.addChangeListener(this);
18042096 specularField.addChangeListener(this);
....@@ -1828,12 +2120,15 @@
18282120 opacityPowerField.addChangeListener(this);
18292121 /**/
18302122
1831
- resetSlidersButton.addActionListener(this);
18322123 clearMaterialButton.addActionListener(this);
18332124 createMaterialButton.addActionListener(this);
1834
-
1835
- propagateToggle.addItemListener(this);
1836
- multiplyToggle.addItemListener(this);
2125
+
2126
+ if (Globals.ADVANCED)
2127
+ {
2128
+ resetSlidersButton.addActionListener(this);
2129
+ propagateToggle.addItemListener(this);
2130
+ multiplyToggle.addItemListener(this);
2131
+ }
18372132 }
18382133
18392134 void DropFile(java.io.File[] files, boolean textures)
....@@ -1851,8 +2146,9 @@
18512146 // 3D models
18522147 if (filename.endsWith(".3ds") || filename.endsWith(".3DS"))
18532148 {
1854
- lastConverter = new com.jmex.model.converters.MaxToJme();
1855
- LoadFile(filename, lastConverter);
2149
+ //lastConverter = new com.jmex.model.converters.MaxToJme();
2150
+ //LoadFile(filename, lastConverter);
2151
+ LoadObjFile(filename); // New 3ds loader
18562152 continue;
18572153 }
18582154 if (filename.endsWith(".dae") || filename.endsWith(".DAE"))
....@@ -2004,7 +2300,7 @@
20042300
20052301 //? flashIt = false;
20062302 CameraPane pane = (CameraPane) cameraView;
2007
- pane.clickStart(location.x, location.y, 0);
2303
+ pane.clickStart(location.x, location.y, 0, 0);
20082304 pane.clickEnd(location.x, location.y, 0, true);
20092305
20102306 if (group.selection.size() == 1)
....@@ -2053,6 +2349,7 @@
20532349 e2.printStackTrace();
20542350 }
20552351 }
2352
+
20562353 LoadJMEThread loadThread;
20572354
20582355 class LoadJMEThread extends Thread
....@@ -2110,6 +2407,7 @@
21102407 //LoadFile0(filename, converter);
21112408 }
21122409 }
2410
+
21132411 LoadOBJThread loadObjThread;
21142412
21152413 class LoadOBJThread extends Thread
....@@ -2188,19 +2486,19 @@
21882486
21892487 void LoadObjFile(String fullname)
21902488 {
2191
- /*
2489
+ System.out.println("Loading " + fullname);
2490
+ /**/
21922491 //lastFilename = fullname;
21932492 if(loadObjThread == null)
21942493 {
2195
- loadObjThread = new LoadOBJThread();
2196
- loadObjThread.start();
2494
+ loadObjThread = new LoadOBJThread();
2495
+ loadObjThread.start();
21972496 }
21982497
21992498 loadObjThread.add(fullname);
2200
- */
2499
+ /**/
22012500
2202
- System.out.println("Loading " + fullname);
2203
- makeSomething(new FileObject(fullname, true), true);
2501
+ //makeSomething(new FileObject(fullname, true), true);
22042502 }
22052503
22062504 void LoadGFDFile(String fullname)
....@@ -2461,11 +2759,11 @@
24612759
24622760 void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
24632761 {
2464
- if (GrafreeD.standAlone)
2762
+ if (Grafreed.standAlone)
24652763 {
24662764 /**/
24672765 FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2468
- browser.show();
2766
+ browser.setVisible(true);
24692767 String filename = browser.getFile();
24702768 if (filename != null && filename.length() > 0)
24712769 {
....@@ -2576,6 +2874,7 @@
25762874 LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
25772875 LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
25782876 }
2877
+
25792878 //cJME.count++;
25802879 //cJME.count %= 12;
25812880 if (gc)
....@@ -2610,6 +2909,7 @@
26102909 }
26112910 if (input == null)
26122911 {
2912
+ new Exception().printStackTrace();
26132913 System.exit(0);
26142914 }
26152915
....@@ -2758,6 +3058,7 @@
27583058 }
27593059 }
27603060 }
3061
+
27613062 cFileSystemPane FSPane;
27623063
27633064 void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
....@@ -2767,7 +3068,7 @@
27673068
27683069 freezematerial = true;
27693070 colorField.setFloat(mat.color);
2770
- modulationField.setFloat(mat.modulation);
3071
+ saturationField.setFloat(mat.modulation);
27713072 metalnessField.setFloat(mat.metalness);
27723073 diffuseField.setFloat(mat.diffuse);
27733074 specularField.setFloat(mat.specular);
....@@ -2811,11 +3112,14 @@
28113112 }
28123113 }
28133114 }
3115
+
28143116 freezematerial = false;
28153117 }
28163118
28173119 void SetMaterial(Object3D object)
28183120 {
3121
+ latestObject = object;
3122
+
28193123 cMaterial mat = object.material;
28203124
28213125 if (mat == null)
....@@ -2824,7 +3128,8 @@
28243128 return;
28253129 }
28263130
2827
- multiplyToggle.setSelected(mat.multiply);
3131
+ if (multiplyToggle != null)
3132
+ multiplyToggle.setSelected(mat.multiply);
28283133
28293134 assert (object.projectedVertices != null);
28303135
....@@ -2926,12 +3231,17 @@
29263231 // }
29273232
29283233 /**/
2929
- if (deselect)
3234
+ if (deselect || child == null)
29303235 {
29313236 //group.deselectAll();
29323237 //freeze = true;
29333238 GetTree().clearSelection();
29343239 //freeze = false;
3240
+
3241
+ if (child == null)
3242
+ {
3243
+ return;
3244
+ }
29353245 }
29363246
29373247 //group.addSelectee(child);
....@@ -3000,7 +3310,7 @@
30003310 cameraView.ToggleDL();
30013311 cameraView.repaint();
30023312 return;
3003
- } else if (event.getSource() == toggleTextureItem)
3313
+ } else if (event.getSource() == toggleTextureItem || event.getSource() == toggleTextureCB)
30043314 {
30053315 cameraView.ToggleTexture();
30063316 // june 2013 copy.HardTouch();
....@@ -3039,9 +3349,9 @@
30393349 frame.validate();
30403350
30413351 return;
3042
- } else if (event.getSource() == toggleRandomItem)
3352
+ } else if (event.getSource() == toggleSwitchItem || event.getSource() == toggleSwitchCB)
30433353 {
3044
- cameraView.ToggleRandom();
3354
+ cameraView.ToggleSwitch();
30453355 cameraView.repaint();
30463356 return;
30473357 } else if (event.getSource() == toggleHandleItem)
....@@ -3069,12 +3379,17 @@
30693379 } else if (event.getSource() == liveCB)
30703380 {
30713381 copy.live ^= true;
3382
+ objEditor.refreshContents(true); // To show item colors
3383
+ return;
3384
+ } else if (event.getSource() == selectableCB)
3385
+ {
3386
+ copy.dontselect ^= true;
30723387 return;
30733388 } else if (event.getSource() == hideCB)
30743389 {
30753390 copy.hide ^= true;
30763391 copy.Touch(); // display list issue
3077
- objEditor.refreshContents();
3392
+ objEditor.refreshContents(true); // To show item colors
30783393 return;
30793394 } else if (event.getSource() == link2masterCB)
30803395 {
....@@ -3084,6 +3399,7 @@
30843399 if (event.getSource() == randomCB)
30853400 {
30863401 copy.random ^= true;
3402
+ objEditor.refreshContents();
30873403 return;
30883404 }
30893405 if (event.getSource() == speedupCB)
....@@ -3107,8 +3423,9 @@
31073423
31083424 public void actionPerformed(ActionEvent event)
31093425 {
3426
+ Object source = event.getSource();
31103427 // SCRIPT DIALOG
3111
- if (event.getSource() == okbutton)
3428
+ if (source == okbutton)
31123429 {
31133430 textpanel.setVisible(false);
31143431 textpanel.remove(textarea);
....@@ -3120,7 +3437,7 @@
31203437 textarea = null;
31213438 textpanel = null;
31223439 }
3123
- if (event.getSource() == cancelbutton)
3440
+ if (source == cancelbutton)
31243441 {
31253442 textpanel.setVisible(false);
31263443 textpanel.remove(textarea);
....@@ -3132,50 +3449,50 @@
31323449 //applySelf();
31333450 //client.refreshEditWindow();
31343451 //refreshContents();
3135
- if (event.getSource() == nameField)
3452
+ if (source == nameField)
31363453 {
31373454 //System.out.println("ObjEditor " + event);
31383455 applySelf0(true);
31393456 //parent.applySelf();
31403457 objEditor.refreshContents();
3141
- } else if (event.getSource() == resetButton)
3458
+ } else if (source == resetButton)
31423459 {
31433460 CameraPane.fullreset = true;
31443461 copy.Reset(); // ResetMeshes();
31453462 copy.Touch();
31463463 objEditor.refreshContents();
3147
- } else if (event.getSource() == stepItem)
3464
+ } else if (source == stepItem)
31483465 {
31493466 //cameraView.ONESTEP = true;
31503467 Globals.ONESTEP = true;
31513468 cameraView.repaint();
31523469 return;
3153
- } else if (event.getSource() == stepButton)
3470
+ } else if (source == stepButton)
31543471 {
31553472 copy.Step();
31563473 copy.Touch();
31573474 objEditor.refreshContents();
3158
- } else if (event.getSource() == slowerButton)
3475
+ } else if (source == slowerButton)
31593476 {
31603477 copy.Slower();
31613478 copy.Touch();
31623479 objEditor.refreshContents();
3163
- } else if (event.getSource() == fasterButton)
3480
+ } else if (source == fasterButton)
31643481 {
31653482 copy.Faster();
31663483 copy.Touch();
31673484 objEditor.refreshContents();
3168
- } else if (event.getSource() == remarkButton)
3485
+ } else if (source == remarkButton)
31693486 {
31703487 copy.Remark();
31713488 copy.Touch();
31723489 objEditor.refreshContents();
3173
- } else if (event.getSource() == stepAllButton)
3490
+ } else if (source == stepAllButton)
31743491 {
31753492 copy.StepAll();
31763493 copy.Touch();
31773494 objEditor.refreshContents();
3178
- } else if (event.getSource() == resetAllButton)
3495
+ } else if (source == resetAllButton)
31793496 {
31803497 //CameraPane.fullreset = true;
31813498 copy.ResetAll(); // ResetMeshes();
....@@ -3208,53 +3525,79 @@
32083525 // Close();
32093526 // }
32103527 // else
3211
- if (event.getSource() == resetSlidersButton)
3528
+ if (source == resetSlidersButton)
32123529 {
32133530 ResetSliders();
3214
- } else if (event.getSource() == clearMaterialButton)
3531
+ } else if (source == clearMaterialButton)
32153532 {
32163533 ClearMaterial();
3217
- } else if (event.getSource() == createMaterialButton)
3534
+ } else if (source == createMaterialButton)
32183535 {
32193536 CreateMaterial();
3220
- } else if (event.getSource() == clearPanelButton)
3537
+ } else if (source == clearPanelButton)
32213538 {
32223539 copy.ClearUI();
32233540 refreshContents(true);
3224
- } /*
3225
- }
3226
-
3227
- public boolean action(Event event, Object arg)
3228
- {
3229
- */ else if (event.getSource() == closeItem)
3541
+ } else if (source == importGFDItem)
3542
+ {
3543
+ ImportGFD();
3544
+ } else
3545
+ if (source == importVRMLX3DItem)
3546
+ {
3547
+ ImportVRMLX3D();
3548
+ } else
3549
+ if (source == import3DSItem)
3550
+ {
3551
+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
3552
+ } else
3553
+ if (source == importOBJItem)
3554
+ {
3555
+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
3556
+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
3557
+ browser.setVisible(true);
3558
+ String filename = browser.getFile();
3559
+ if (filename != null && filename.length() > 0)
3560
+ {
3561
+ String fullname = browser.getDirectory() + filename;
3562
+ makeSomething(ReadOBJ(fullname), true);
3563
+ }
3564
+ } else
3565
+ if (source == closeItem)
32303566 {
32313567 Close();
32323568 //return true;
3233
- } else if (event.getSource() == loadItem)
3569
+ } else if (source == openItem)
32343570 {
3235
- load();
3571
+ Open();
32363572 //return true;
3237
- } else if (event.getSource() == saveItem)
3573
+ } else if (source == newItem)
3574
+ {
3575
+ New();
3576
+ } else if (source == saveItem)
32383577 {
32393578 save();
32403579 //return true;
3241
- } else if (event.getSource() == saveAsItem)
3580
+ } else if (source == saveAsItem)
32423581 {
32433582 saveAs();
32443583 //return true;
3245
- } else if (event.getSource() == reexportItem)
3584
+ } else if (source == reexportItem)
32463585 {
32473586 reexport();
32483587 //return true;
3249
- } else if (event.getSource() == exportAsItem)
3588
+ } else if (source == exportAsItem)
32503589 {
32513590 export();
32523591 //return true;
3253
- } else if (event.getSource() == povItem)
3592
+ } else if (source == povItem)
32543593 {
32553594 generatePOV();
32563595 //return true;
3257
- } else if (event.getSource() == zBufferItem)
3596
+ } else if (event.getSource() == archiveItem)
3597
+ {
3598
+ cTools.Archive(frame);
3599
+ return;
3600
+ } else if (source == zBufferItem)
32583601 {
32593602 try
32603603 {
....@@ -3276,21 +3619,8 @@
32763619 cameraView.repaint();
32773620 //return true;
32783621 }
3279
- */ else if (event.getSource() == editCameraItem)
3280
- {
3281
- cameraView.ProtectCamera();
3282
- cameraView.repaint();
3283
- return;
3284
- } else if (event.getSource() == revertCameraItem)
3285
- {
3286
- cameraView.RevertCamera();
3287
- cameraView.repaint();
3288
- return;
3289
-// } else if (event.getSource() == textureButton)
3290
-// {
3291
-// return; // true;
3292
- } else // combos...
3293
- if (event.getSource() == texresMenu)
3622
+ */ else // combos...
3623
+ if (source == texresMenu)
32943624 {
32953625 System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
32963626 copy.texres = texresMenu.getSelectedIndex();
....@@ -3302,12 +3632,472 @@
33023632 }
33033633 }
33043634
3635
+ void New()
3636
+ {
3637
+ while (copy.Size() > 1)
3638
+ {
3639
+ copy.remove(1);
3640
+ }
3641
+
3642
+ ResetModel();
3643
+ objEditor.refreshContents();
3644
+ }
3645
+
3646
+ static public byte[] Compress(Object3D o)
3647
+ {
3648
+ // Slower to actually compress.
3649
+ try
3650
+ {
3651
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
3652
+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3653
+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3654
+
3655
+ Object3D parent = o.parent;
3656
+ o.parent = null;
3657
+
3658
+ out.writeObject(o);
3659
+
3660
+ o.parent = parent;
3661
+
3662
+ out.flush();
3663
+
3664
+ baos //zstream
3665
+ .close();
3666
+ out.close();
3667
+
3668
+ byte[] bytes = baos.toByteArray();
3669
+
3670
+ System.out.println("save #bytes = " + bytes.length);
3671
+ return bytes;
3672
+ } catch (Exception e)
3673
+ {
3674
+ System.err.println(e);
3675
+ return null;
3676
+ }
3677
+ }
3678
+
3679
+ static public Object Uncompress(byte[] bytes)
3680
+ {
3681
+ System.out.println("restore #bytes = " + bytes.length);
3682
+ try
3683
+ {
3684
+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3685
+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3686
+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3687
+ Object obj = in.readObject();
3688
+
3689
+ bais //istream
3690
+ .close();
3691
+ in.close();
3692
+
3693
+ return obj;
3694
+ } catch (Exception e)
3695
+ {
3696
+ System.err.println(e);
3697
+ return null;
3698
+ }
3699
+ }
3700
+
3701
+ static public Object clone(Object o)
3702
+ {
3703
+ try
3704
+ {
3705
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
3706
+ ObjectOutputStream out = new ObjectOutputStream(baos);
3707
+
3708
+ out.writeObject(o);
3709
+
3710
+ out.flush();
3711
+ out.close();
3712
+
3713
+ byte[] bytes = baos.toByteArray();
3714
+
3715
+ System.out.println("clone = " + bytes.length);
3716
+
3717
+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3718
+ ObjectInputStream in = new ObjectInputStream(bais);
3719
+ Object obj = in.readObject();
3720
+ in.close();
3721
+
3722
+ return obj;
3723
+ } catch (Exception e)
3724
+ {
3725
+ System.err.println(e);
3726
+ return null;
3727
+ }
3728
+ }
3729
+
3730
+ cRadio GetCurrentTab()
3731
+ {
3732
+ cRadio ab;
3733
+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3734
+ {
3735
+ ab = (cRadio)e.nextElement();
3736
+ if(ab.GetObject() == copy)
3737
+ {
3738
+ return ab;
3739
+ }
3740
+ }
3741
+
3742
+ return null;
3743
+ }
3744
+
3745
+
3746
+ public void Save()
3747
+ {
3748
+ //Save(true);
3749
+ Replace();
3750
+ SetUndoStates();
3751
+ }
3752
+
3753
+ private boolean Equal(byte[] compress, byte[] name)
3754
+ {
3755
+ if (compress.length != name.length)
3756
+ {
3757
+ return false;
3758
+ }
3759
+
3760
+ for (int i=compress.length; --i>=0;)
3761
+ {
3762
+ if (compress[i] != name[i])
3763
+ return false;
3764
+ }
3765
+
3766
+ return true;
3767
+ }
3768
+
3769
+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
3770
+
3771
+ void DeleteVersion()
3772
+ {
3773
+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
3774
+ {
3775
+ copy.versionlist[i] = copy.versionlist[i+1];
3776
+ }
3777
+
3778
+ CopyChanged();
3779
+
3780
+ SetUndoStates();
3781
+ }
3782
+
3783
+ public boolean Save(boolean user)
3784
+ {
3785
+ System.err.println("Save");
3786
+ //Replace();
3787
+
3788
+ cRadio tab = GetCurrentTab();
3789
+
3790
+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
3791
+
3792
+ boolean thesame = false;
3793
+
3794
+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
3795
+// {
3796
+// thesame = true;
3797
+// }
3798
+
3799
+ //EditorFrame.m_MainFrame.requestFocusInWindow();
3800
+ if (!thesame)
3801
+ {
3802
+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
3803
+ {
3804
+ copy.versionlist[i] = copy.versionlist[i-1];
3805
+ }
3806
+
3807
+ //tab.user[tab.versionindex] = user;
3808
+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
3809
+
3810
+ copy.versionlist[++copy.versionindex] = compress;
3811
+
3812
+ // if (increment)
3813
+ // tab.versionindex++;
3814
+ }
3815
+
3816
+ //copy.RestoreBigData(versiontable);
3817
+
3818
+ //assert(hashtable.isEmpty());
3819
+
3820
+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
3821
+// {
3822
+// //tab.user[i] = false;
3823
+// copy.versionlist[i] = null;
3824
+// }
3825
+
3826
+ SetUndoStates();
3827
+
3828
+ // test save
3829
+ if (false)
3830
+ {
3831
+ try
3832
+ {
3833
+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3834
+ ObjectOutputStream p = new ObjectOutputStream(ostream);
3835
+
3836
+ p.writeObject(copy);
3837
+
3838
+ p.flush();
3839
+
3840
+ ostream.close();
3841
+ } catch (Exception e)
3842
+ {
3843
+ e.printStackTrace();
3844
+ }
3845
+ }
3846
+
3847
+ return !thesame;
3848
+ }
3849
+
3850
+ boolean flashIt = true;
3851
+
3852
+ void RefreshSelection()
3853
+ {
3854
+ Object3D selection = new Object3D();
3855
+
3856
+ for (int i = 0; i < copy.selection.size(); i++)
3857
+ {
3858
+ Object3D elem = copy.selection.elementAt(i);
3859
+
3860
+ Object3D obj = copy.GetObject(elem.GetUUID());
3861
+
3862
+ if (obj == null)
3863
+ {
3864
+ copy.selection.remove(i--);
3865
+ }
3866
+ else
3867
+ {
3868
+ selection.add(obj);
3869
+ copy.selection.setElementAt(obj, i);
3870
+ }
3871
+ }
3872
+
3873
+ flashIt = false;
3874
+ GetTree().clearSelection();
3875
+ for (int i = 0; i < selection.size(); i++)
3876
+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
3877
+ flashIt = true;
3878
+
3879
+ //refreshContents(false);
3880
+ }
3881
+
3882
+ void CopyChanged()
3883
+ {
3884
+ Object3D obj = copy.versionlist[copy.versionindex];
3885
+
3886
+ SetUndoStates();
3887
+
3888
+ boolean temp = CameraPane.SWITCH;
3889
+ CameraPane.SWITCH = false;
3890
+
3891
+ copy.ExtractBigData(versiontable);
3892
+
3893
+ copy.clear();
3894
+
3895
+ copy.skyboxname = obj.skyboxname;
3896
+ copy.skyboxext = obj.skyboxext;
3897
+
3898
+ for (int i=0; i<obj.Size(); i++)
3899
+ {
3900
+ copy.add(obj.get(i));
3901
+ }
3902
+
3903
+ copy.RestoreBigData(versiontable);
3904
+
3905
+ CameraPane.SWITCH = temp;
3906
+
3907
+ RefreshSelection();
3908
+ //assert(hashtable.isEmpty());
3909
+
3910
+ copy.Touch();
3911
+
3912
+ ResetModel();
3913
+ copy.HardTouch(); // recompile?
3914
+
3915
+ cRadio ab;
3916
+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3917
+ {
3918
+ ab = (cRadio)e.nextElement();
3919
+ Object3D test = copy.GetObject(ab.object.GetUUID());
3920
+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
3921
+ if (test != null)
3922
+ {
3923
+ test.editWindow = ab.object.editWindow;
3924
+ ab.object = test;
3925
+ }
3926
+ }
3927
+
3928
+ refreshContents(true);
3929
+ }
3930
+
3931
+ cButton previousVersionButton;
3932
+ cButton restoreButton;
3933
+ cButton replaceButton;
3934
+ cButton nextVersionButton;
3935
+ cButton saveVersionButton;
3936
+ cButton deleteVersionButton;
3937
+
3938
+ boolean muteSlider;
3939
+
3940
+ int VersionCount()
3941
+ {
3942
+ int count = 0;
3943
+
3944
+ for (int i = copy.versionlist.length; --i >= 0;)
3945
+ {
3946
+ if (copy.versionlist[i] != null)
3947
+ count++;
3948
+ }
3949
+
3950
+ return count;
3951
+ }
3952
+
3953
+ void SetUndoStates()
3954
+ {
3955
+ cRadio tab = GetCurrentTab();
3956
+
3957
+ restoreButton.setEnabled(true); // copy.versionindex != -1);
3958
+ replaceButton.setEnabled(true); // copy.versionindex != -1);
3959
+
3960
+ previousVersionButton.setEnabled(copy.versionindex > 0);
3961
+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
3962
+
3963
+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
3964
+ copy.versionlist[copy.versionindex + 1] != null);
3965
+
3966
+ muteSlider = true;
3967
+ versionSlider.setMaximum(VersionCount() - 1);
3968
+ versionSlider.setInteger(copy.versionindex);
3969
+ muteSlider = false;
3970
+ }
3971
+
3972
+ public boolean PreviousVersion()
3973
+ {
3974
+ // Option?
3975
+ Replace();
3976
+
3977
+ System.err.println("Undo");
3978
+
3979
+ cRadio tab = GetCurrentTab();
3980
+
3981
+ if (copy.versionindex == 0)
3982
+ {
3983
+ java.awt.Toolkit.getDefaultToolkit().beep();
3984
+ return false;
3985
+ }
3986
+
3987
+// if (tab.graphs[tab.versionindex] == null) // || !tab.user[tab.versionindex])
3988
+// {
3989
+// if (Save(false))
3990
+// tab.versionindex -= 1;
3991
+// else
3992
+// {
3993
+// if (tab.versionindex <= 0)
3994
+// return false;
3995
+// else
3996
+// tab.versionindex -= 1;
3997
+// }
3998
+// }
3999
+
4000
+ copy.versionindex -= 1;
4001
+
4002
+ CopyChanged();
4003
+
4004
+ return true;
4005
+ }
4006
+
4007
+ public boolean Restore()
4008
+ {
4009
+ System.err.println("Restore");
4010
+
4011
+ cRadio tab = GetCurrentTab();
4012
+
4013
+ if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
4014
+ {
4015
+ java.awt.Toolkit.getDefaultToolkit().beep();
4016
+ return false;
4017
+ }
4018
+
4019
+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4020
+ CopyChanged();
4021
+
4022
+ return true;
4023
+ }
4024
+
4025
+ public boolean Replace()
4026
+ {
4027
+ System.err.println("Replace");
4028
+
4029
+ cRadio tab = GetCurrentTab();
4030
+
4031
+ if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
4032
+ {
4033
+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
4034
+ return false;
4035
+ }
4036
+
4037
+ copy.versionlist[copy.versionindex] = CompressCopy();
4038
+
4039
+ return true;
4040
+ }
4041
+
4042
+ public void NextVersion()
4043
+ {
4044
+ // Option?
4045
+ Replace();
4046
+
4047
+ cRadio tab = GetCurrentTab();
4048
+
4049
+ if (copy.versionlist[copy.versionindex + 1] == null)
4050
+ {
4051
+ java.awt.Toolkit.getDefaultToolkit().beep();
4052
+ return;
4053
+ }
4054
+
4055
+ copy.versionindex += 1;
4056
+
4057
+ CopyChanged();
4058
+
4059
+ //if (!tab.user[tab.versionindex])
4060
+ // tab.graphs[tab.versionindex] = null;
4061
+ }
4062
+
4063
+ void ImportGFD()
4064
+ {
4065
+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
4066
+ browser.show();
4067
+ String filename = browser.getFile();
4068
+ if (filename != null && filename.length() > 0)
4069
+ {
4070
+ String fullname = browser.getDirectory() + filename;
4071
+
4072
+ //Object3D readobj =
4073
+ objEditor.ReadGFD(fullname, objEditor);
4074
+ //makeSomething(readobj);
4075
+ }
4076
+ }
4077
+
4078
+ void ImportVRMLX3D()
4079
+ {
4080
+ if (Grafreed.standAlone)
4081
+ {
4082
+ /**/
4083
+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
4084
+ browser.show();
4085
+ String filename = browser.getFile();
4086
+ if (filename != null && filename.length() > 0)
4087
+ {
4088
+ String fullname = browser.getDirectory() + filename;
4089
+ LoadVRMLX3D(fullname);
4090
+ }
4091
+ /**/
4092
+ }
4093
+ }
4094
+
33054095 void ToggleAnimation()
33064096 {
33074097 if (!Globals.ANIMATION)
33084098 {
33094099 FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3310
- browser.show();
4100
+ browser.setVisible(true);
33114101 String filename = browser.getFile();
33124102 if (filename != null && filename.length() > 0)
33134103 {
....@@ -3317,8 +4107,8 @@
33174107
33184108 Globals.ANIMATION ^= true;
33194109
3320
- GrafreeD.wav.cursor = 0;
3321
- GrafreeD.wav.loop = 0;
4110
+ Grafreed.wav.cursor = 0;
4111
+ Grafreed.wav.loop = 0;
33224112 }
33234113 } else
33244114 {
....@@ -3368,7 +4158,7 @@
33684158 void CreateMaterial()
33694159 {
33704160 //copy.ClearMaterial(); // PATCH
3371
- copy.CreateMaterialS(multiplyToggle.isSelected());
4161
+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
33724162 if (copy.selection.size() > 0)
33734163 //SetMaterial(copy);
33744164 {
....@@ -3419,7 +4209,7 @@
34194209 assert false;
34204210 }
34214211
3422
- void EditSelection()
4212
+ void EditSelection(boolean newWindow)
34234213 {
34244214 }
34254215
....@@ -3427,11 +4217,11 @@
34274217 {
34284218 copy.ResetBlockLoop(); // temporary problem
34294219
3430
- boolean random = CameraPane.RANDOM;
3431
- CameraPane.RANDOM = false; // parse everything
4220
+ boolean random = CameraPane.SWITCH;
4221
+ CameraPane.SWITCH = false; // parse everything
34324222 copy.ResetDisplayList();
34334223 copy.HardTouch();
3434
- CameraPane.RANDOM = random;
4224
+ CameraPane.SWITCH = random;
34354225 }
34364226
34374227 // public void applySelf()
....@@ -3478,7 +4268,7 @@
34784268 //copy.material = new cMaterial(copy.GetMaterial());
34794269
34804270 current.color = (float) colorField.getFloat();
3481
- current.modulation = (float) modulationField.getFloat();
4271
+ current.modulation = (float) saturationField.getFloat();
34824272 current.metalness = (float) metalnessField.getFloat();
34834273 current.diffuse = (float) diffuseField.getFloat();
34844274 current.specular = (float) specularField.getFloat();
....@@ -3501,10 +4291,40 @@
35014291 current.fakedepth = (float) fakedepthField.getFloat();
35024292 current.shadowbias = (float) shadowbiasField.getFloat();
35034293
3504
- if (!NumberSlider.frozen)
4294
+ if (!cNumberSlider.frozen)
35054295 {
35064296 //System.out.println("Propagate = " + propagate);
35074297 copy.UpdateMaterial(anchor, current, propagate);
4298
+
4299
+ if (copy.material != null)
4300
+ {
4301
+ cMaterial mat = copy.material;
4302
+
4303
+ colorField.SetToolTipValue((mat.color));
4304
+ saturationField.SetToolTipValue((mat.modulation));
4305
+ metalnessField.SetToolTipValue((mat.metalness));
4306
+ diffuseField.SetToolTipValue((mat.diffuse));
4307
+ specularField.SetToolTipValue((mat.specular));
4308
+ shininessField.SetToolTipValue((mat.shininess));
4309
+ shiftField.SetToolTipValue((mat.shift));
4310
+ ambientField.SetToolTipValue((mat.ambient));
4311
+ lightareaField.SetToolTipValue((mat.lightarea));
4312
+ diffusenessField.SetToolTipValue((mat.factor));
4313
+ velvetField.SetToolTipValue((mat.velvet));
4314
+ sheenField.SetToolTipValue((mat.sheen));
4315
+ subsurfaceField.SetToolTipValue((mat.subsurface));
4316
+ backlitField.SetToolTipValue((mat.bump));
4317
+ anisoField.SetToolTipValue((mat.aniso));
4318
+ anisoVField.SetToolTipValue((mat.anisoV));
4319
+ cameraField.SetToolTipValue((mat.cameralight));
4320
+ selfshadowField.SetToolTipValue((mat.diffuseness));
4321
+ shadowField.SetToolTipValue((mat.shadow));
4322
+ textureField.SetToolTipValue((mat.texture));
4323
+ opacityField.SetToolTipValue((mat.opacity));
4324
+ fakedepthField.SetToolTipValue((mat.fakedepth));
4325
+ shadowbiasField.SetToolTipValue((mat.shadowbias));
4326
+ }
4327
+
35084328 if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
35094329 {
35104330 copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
....@@ -3533,9 +4353,26 @@
35334353 //copy.Touch();
35344354 }
35354355
4356
+ cNumberSlider versionSlider;
4357
+
35364358 public void stateChanged(ChangeEvent e)
35374359 {
35384360 // assert(false);
4361
+ if (e.getSource() == versionSlider)
4362
+ {
4363
+ if (muteSlider)
4364
+ return;
4365
+
4366
+ int version = versionSlider.getInteger();
4367
+
4368
+ if (copy.versionlist[version] != null)
4369
+ {
4370
+ copy.versionindex = version;
4371
+ CopyChanged();
4372
+ }
4373
+
4374
+ return;
4375
+ }
35394376
35404377 if (freezematerial)
35414378 {
....@@ -3549,6 +4386,7 @@
35494386 || e.getSource() == apertureField
35504387 || e.getSource() == shadowblurField)
35514388 {
4389
+ new Exception().printStackTrace();
35524390 System.exit(0);
35534391 cameraView.options1[0] = (float) focusField.getFloat() * 10;
35544392 cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
....@@ -3570,6 +4408,12 @@
35704408 {
35714409 //System.out.println("stateChanged = " + this);
35724410 materialtouched = true;
4411
+
4412
+ if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
4413
+ {
4414
+ saturationField.setFloat(1);
4415
+ }
4416
+
35734417 applySelf();
35744418 //System.out.println("this = " + this);
35754419 //System.out.println("PARENT = " + parent);
....@@ -3619,7 +4463,7 @@
36194463 }
36204464
36214465 if (normalpushField != null)
3622
- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
4466
+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
36234467 }
36244468
36254469 void SnapObject()
....@@ -3869,20 +4713,26 @@
38694713 {
38704714 if (GetTree() != null)
38714715 {
4716
+ GetTree().revalidate();
38724717 GetTree().repaint();
38734718 }
38744719
38754720 radioPanel.revalidate();
38764721 radioPanel.repaint();
3877
- ctrlPanel.revalidate(); // ? new
4722
+ ctrlPanel.validate(); // ? new
38784723 ctrlPanel.repaint();
38794724 }
4725
+
4726
+ if (previousVersionButton != null && copy.versionlist != null)
4727
+ SetUndoStates();
38804728 }
38814729
38824730 static TweenManager tweenManager = new TweenManager();
38834731
38844732 void makeSomething(Object3D thing, boolean resetmodel) // deselect)
38854733 {
4734
+ if (Globals.REPLACEONMAKE) // && resetmodel)
4735
+ Save();
38864736 //Tween.set(thing, 0).target(1).start(tweenManager);
38874737 //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
38884738 // if (thing instanceof GenericJointDemo)
....@@ -3969,6 +4819,12 @@
39694819 {
39704820 ResetModel();
39714821 Select(thing.GetTreePath(), true, false); // unselect... false);
4822
+
4823
+ if (thing.Size() == 0)
4824
+ {
4825
+ //EditSelection(false);
4826
+ }
4827
+
39724828 refreshContents();
39734829 }
39744830
....@@ -4086,6 +4942,7 @@
40864942 }
40874943 }
40884944 }
4945
+
40894946 LoadGFDThread loadGFDThread;
40904947
40914948 void ReadGFD(String fullname, iCallBack cb)
....@@ -4105,8 +4962,10 @@
41054962
41064963 try
41074964 {
4965
+ // Try compressed version first.
41084966 java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4109
- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
4967
+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
4968
+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
41104969
41114970 readobj = (Object3D) p.readObject();
41124971 istream.close();
....@@ -4114,7 +4973,22 @@
41144973 readobj.ResetDisplayList();
41154974 } catch (Exception e)
41164975 {
4117
- e.printStackTrace();
4976
+ if (!e.toString().contains("GZIP"))
4977
+ e.printStackTrace();
4978
+
4979
+ try
4980
+ {
4981
+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4982
+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
4983
+
4984
+ readobj = (Object3D) p.readObject();
4985
+ istream.close();
4986
+
4987
+ readobj.ResetDisplayList();
4988
+ } catch (Exception e2)
4989
+ {
4990
+ e2.printStackTrace();
4991
+ }
41184992 }
41194993 // catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
41204994 // catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
....@@ -4160,6 +5034,12 @@
41605034
41615035 void LoadIt(Object obj)
41625036 {
5037
+ if (obj == null)
5038
+ {
5039
+ // Invalid file
5040
+ return;
5041
+ }
5042
+
41635043 System.out.println("Loaded " + obj);
41645044 //new Exception().printStackTrace();
41655045 Object3D readobj = (Object3D) obj;
....@@ -4169,10 +5049,14 @@
41695049
41705050 if (readobj != null)
41715051 {
5052
+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
5053
+ // Save();
41725054 try
41735055 {
41745056 //readobj.deepCopySelf(copy);
41755057 copy.clear(); // june 2014
5058
+ copy.skyboxname = readobj.skyboxname;
5059
+ copy.skyboxext = readobj.skyboxext;
41765060 for (int i = 0; i < readobj.size(); i++)
41775061 {
41785062 Object3D child = readobj.get(i); // reserve(i);
....@@ -4213,6 +5097,7 @@
42135097 }
42145098 } catch (ClassCastException e)
42155099 {
5100
+ e.printStackTrace();
42165101 assert (false);
42175102 Composite c = (Composite) copy;
42185103 c.children.clear();
....@@ -4223,17 +5108,28 @@
42235108 c.addChild(csg);
42245109 }
42255110
5111
+ copy.versionlist = readobj.versionlist;
5112
+ copy.versionindex = readobj.versionindex;
5113
+
5114
+ if (copy.versionlist == null)
5115
+ {
5116
+ copy.versionlist = new Object3D[100];
5117
+ copy.versionindex = -1;
5118
+ }
5119
+
5120
+ //? SetUndoStates();
5121
+
42265122 ResetModel();
42275123 copy.HardTouch(); // recompile?
42285124 refreshContents();
42295125 }
42305126 }
42315127
4232
- void load() // throws ClassNotFoundException
5128
+ void Open() // throws ClassNotFoundException
42335129 {
4234
- if (GrafreeD.standAlone)
5130
+ if (Grafreed.standAlone)
42355131 {
4236
- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
5132
+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
42375133 browser.show();
42385134 String filename = browser.getFile();
42395135 if (filename != null && filename.length() > 0)
....@@ -4318,11 +5214,13 @@
43185214 try
43195215 {
43205216 FileOutputStream ostream = new FileOutputStream(lastname);
4321
- ObjectOutputStream p = new ObjectOutputStream(ostream);
5217
+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
5218
+ ObjectOutputStream p = new ObjectOutputStream(zstream);
43225219
43235220 p.writeObject(copy);
43245221 p.flush();
43255222
5223
+ zstream.close();
43265224 ostream.close();
43275225
43285226 //FileOutputStream fos = new FileOutputStream(fullname);
....@@ -4330,19 +5228,23 @@
43305228 //ps.print(buffer.toString());
43315229 } catch (IOException e)
43325230 {
5231
+ e.printStackTrace();
43335232 }
43345233 }
5234
+
43355235 String lastname;
43365236
43375237 void saveAs()
43385238 {
4339
- if (GrafreeD.standAlone)
5239
+ if (Grafreed.standAlone)
43405240 {
43415241 FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
43425242 browser.setVisible(true);
43435243 String filename = browser.getFile();
43445244 if (filename != null && filename.length() > 0)
43455245 {
5246
+ if (!filename.endsWith(".gfd"))
5247
+ filename += ".gfd";
43465248 lastname = browser.getDirectory() + filename;
43475249 save();
43485250 }
....@@ -4441,13 +5343,13 @@
44415343 try
44425344 {
44435345 FileOutputStream ostream = new FileOutputStream(filename);
4444
- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4445
- ObjectOutputStream p = new ObjectOutputStream(/*z*/ostream);
5346
+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
5347
+ ObjectOutputStream p = new ObjectOutputStream(zstream);
44465348
44475349 Object3D objectparent = obj.parent;
44485350 obj.parent = null;
44495351
4450
- Object3D object = (Object3D) GrafreeD.clone(obj);
5352
+ Object3D object = (Object3D) Grafreed.clone(obj);
44515353
44525354 obj.parent = objectparent;
44535355
....@@ -4459,8 +5361,8 @@
44595361 p.writeObject(object);
44605362 p.flush();
44615363
5364
+ zstream.close();
44625365 ostream.close();
4463
- // zstream.close();
44645366
44655367 // group.selection.get(0).parent = parent;
44665368 //FileOutputStream fos = new FileOutputStream(fullname);
....@@ -4481,7 +5383,7 @@
44815383 buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
44825384 cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
44835385 copy.generatePOV(buffer);
4484
- if (GrafreeD.standAlone)
5386
+ if (Grafreed.standAlone)
44855387 {
44865388 FileDialog browser = new FileDialog(frame, "Export POV", 1);
44875389 browser.show();
....@@ -4507,21 +5409,20 @@
45075409 Object3D client;
45085410 Object3D copy;
45095411 MenuBar menuBar;
4510
- Menu windowMenu;
4511
- MenuItem loadItem;
5412
+ Menu fileMenu;
5413
+ MenuItem newItem;
5414
+ MenuItem openItem;
45125415 MenuItem saveItem;
45135416 MenuItem saveAsItem;
45145417 MenuItem exportAsItem;
45155418 MenuItem reexportItem;
45165419 MenuItem povItem;
45175420 MenuItem closeItem;
4518
- Menu cameraMenu;
5421
+
45195422 CheckboxMenuItem zBufferItem;
45205423 //MenuItem normalLensItem;
4521
- MenuItem editCameraItem;
4522
- MenuItem revertCameraItem;
4523
- CheckboxMenuItem toggleLiveItem;
45245424 MenuItem stepItem;
5425
+ CheckboxMenuItem toggleLiveItem;
45255426 CheckboxMenuItem toggleFullScreenItem;
45265427 CheckboxMenuItem toggleTimelineItem;
45275428 CheckboxMenuItem toggleRenderItem;
....@@ -4530,28 +5431,42 @@
45305431 CheckboxMenuItem toggleFootContactItem;
45315432 CheckboxMenuItem toggleDLItem;
45325433 CheckboxMenuItem toggleTextureItem;
4533
- CheckboxMenuItem toggleRandomItem;
5434
+ CheckboxMenuItem toggleSwitchItem;
45345435 CheckboxMenuItem toggleRootItem;
45355436 CheckboxMenuItem animationItem;
5437
+ MenuItem archiveItem;
45365438 CheckboxMenuItem toggleHandleItem;
45375439 CheckboxMenuItem togglePaintItem;
45385440 JSplitPane mainPanel;
45395441 JScrollPane scrollpane;
5442
+
45405443 JPanel toolbarPanel;
4541
- JPanel treePanel;
5444
+
5445
+ cGridBag treePanel;
5446
+
45425447 JPanel radioPanel;
45435448 ButtonGroup buttonGroup;
4544
- JPanel ctrlPanel;
4545
- JPanel materialPanel;
5449
+
5450
+ cGridBag toolboxPanel;
5451
+ cGridBag materialPanel;
5452
+ cGridBag ctrlPanel;
5453
+
45465454 JScrollPane infoPanel;
4547
- JPanel optionsPanel;
5455
+
5456
+ cGridBag optionsPanel;
5457
+
45485458 JTabbedPane objectPanel;
4549
- JPanel XYZPanel;
5459
+ boolean materialFlushed;
5460
+ Object3D latestObject;
5461
+
5462
+ cGridBag XYZPanel;
5463
+
45505464 JSplitPane gridPanel;
45515465 JSplitPane bigPanel;
4552
- JPanel bigThree;
4553
- JTabbedPane scenePanel;
4554
- JPanel centralPanel;
5466
+
5467
+ cGridBag bigThree;
5468
+ cGridBag scenePanel;
5469
+ cGridBag centralPanel;
45555470 JSplitPane cameraPanel;
45565471 JPanel timelinePanel;
45575472 JMenuBar timelineMenubar;
....@@ -4604,67 +5519,72 @@
46045519 // MATERIAL
46055520 JLabel materialLabel;
46065521 JLabel colorLabel;
4607
- NumberSlider colorField;
5522
+ cNumberSlider colorField;
46085523 JLabel modulationLabel;
4609
- NumberSlider modulationField;
5524
+ cNumberSlider saturationField;
46105525 JLabel metalnessLabel;
4611
- NumberSlider metalnessField;
5526
+ cNumberSlider metalnessField;
46125527 JLabel diffuseLabel;
4613
- NumberSlider diffuseField;
5528
+ cNumberSlider diffuseField;
46145529 JLabel specularLabel;
4615
- NumberSlider specularField;
5530
+ cNumberSlider specularField;
46165531 JLabel shininessLabel;
4617
- NumberSlider shininessField;
5532
+ cNumberSlider shininessField;
46185533 JLabel shiftLabel;
4619
- NumberSlider shiftField;
5534
+ cNumberSlider shiftField;
46205535 JLabel ambientLabel;
4621
- NumberSlider ambientField;
5536
+ cNumberSlider ambientField;
46225537 JLabel lightareaLabel;
4623
- NumberSlider lightareaField;
5538
+ cNumberSlider lightareaField;
46245539 JLabel diffusenessLabel;
4625
- NumberSlider diffusenessField;
5540
+ cNumberSlider diffusenessField;
46265541 JLabel velvetLabel;
4627
- NumberSlider velvetField;
5542
+ cNumberSlider velvetField;
46285543 JLabel sheenLabel;
4629
- NumberSlider sheenField;
5544
+ cNumberSlider sheenField;
46305545 JLabel subsurfaceLabel;
4631
- NumberSlider subsurfaceField;
5546
+ cNumberSlider subsurfaceField;
46325547 //JLabel bumpLabel;
46335548 //NumberSlider bumpField;
46345549 JLabel backlitLabel;
4635
- NumberSlider backlitField;
5550
+ cNumberSlider backlitField;
46365551 JLabel anisoLabel;
4637
- NumberSlider anisoField;
5552
+ cNumberSlider anisoField;
46385553 JLabel anisoVLabel;
4639
- NumberSlider anisoVField;
5554
+ cNumberSlider anisoVField;
46405555 JLabel cameraLabel;
4641
- NumberSlider cameraField;
5556
+ cNumberSlider cameraField;
46425557 JLabel selfshadowLabel;
4643
- NumberSlider selfshadowField;
5558
+ cNumberSlider selfshadowField;
46445559 JLabel shadowLabel;
4645
- NumberSlider shadowField;
5560
+ cNumberSlider shadowField;
46465561 JLabel textureLabel;
4647
- NumberSlider textureField;
5562
+ cNumberSlider textureField;
46485563 JLabel opacityLabel;
4649
- NumberSlider opacityField;
5564
+ cNumberSlider opacityField;
46505565 JLabel fakedepthLabel;
4651
- NumberSlider fakedepthField;
5566
+ cNumberSlider fakedepthField;
46525567 JLabel shadowbiasLabel;
4653
- NumberSlider shadowbiasField;
5568
+ cNumberSlider shadowbiasField;
46545569 JLabel bumpLabel;
4655
- NumberSlider bumpField;
5570
+ cNumberSlider bumpField;
46565571 JLabel noiseLabel;
4657
- NumberSlider noiseField;
5572
+ cNumberSlider noiseField;
46585573 JLabel powerLabel;
4659
- NumberSlider powerField;
5574
+ cNumberSlider powerField;
46605575 JLabel borderfadeLabel;
4661
- NumberSlider borderfadeField;
5576
+ cNumberSlider borderfadeField;
46625577 JLabel fogLabel;
4663
- NumberSlider fogField;
5578
+ cNumberSlider fogField;
46645579 JLabel opacityPowerLabel;
4665
- NumberSlider opacityPowerField;
4666
- JTree jTree;
5580
+ cNumberSlider opacityPowerField;
5581
+ cTree jTree;
46675582 //ObjectUI parent;
46685583
4669
- NumberSlider normalpushField;
5584
+ cNumberSlider normalpushField;
5585
+
5586
+ private MenuItem importGFDItem;
5587
+ private MenuItem importVRMLX3DItem;
5588
+ private MenuItem import3DSItem;
5589
+ private MenuItem importOBJItem;
46705590 }