Normand Briere
2019-08-16 64e20f390e4b8e58bd0006dde8fa10fba1dac1d5
ObjEditor.java
....@@ -34,6 +34,7 @@
3434 iSendInfo
3535 //KeyListener
3636 {
37
+ public cToggleButton pinButton;
3738 boolean timeline;
3839 boolean wasFullScreen;
3940
....@@ -41,64 +42,119 @@
4142 JFrame frame;
4243
4344 static ObjEditor theFrame;
45
+
46
+ public void AllocProjectedVertices(Object3D object)
47
+ {
48
+ assert (object.projectedVertices != null);
49
+
50
+ if (object.projectedVertices.length <= 2)
51
+ {
52
+ // Side effect...
53
+ Object3D.cVector2[] keep = object.projectedVertices;
54
+ object.projectedVertices = new Object3D.cVector2[3];
55
+ for (int i = 0; i < 3; i++)
56
+ {
57
+ if (i < keep.length)
58
+ {
59
+ object.projectedVertices[i] = keep[i];
60
+ } else
61
+ {
62
+ object.projectedVertices[i] = new Object3D.cVector2();
63
+ }
64
+ /*
65
+ if(keep.length == 0)
66
+ object.projectedVertices[0] = new Object3D.cVector2();
67
+ else
68
+ object.projectedVertices[0] = keep[0];
69
+ object.projectedVertices[1] = new Object3D.cVector2();
70
+ */
71
+ }
72
+ }
73
+ }
74
+
75
+ public cGridBag GetSeparator()
76
+ {
77
+ cGridBag separator = new cGridBag();
78
+ separator.add(new JSeparator());
79
+ separator.preferredHeight = 5;
80
+ return separator;
81
+ }
4482
4583 cButton GetButton(String name, boolean border)
4684 {
47
- try
48
- {
49
- ImageIcon icon = GetIcon(name);
50
- return new cButton(icon, border);
51
- }
52
- catch (Exception e)
53
- {
54
- return new cButton(name, border);
55
- }
85
+ ImageIcon icon = GetIcon(name);
86
+ return new cButton(icon, border);
87
+ }
88
+
89
+ cLabel GetLabel(String name, boolean border)
90
+ {
91
+ //ImageIcon icon = GetIcon(name);
92
+ return new cLabel(GetImage(name), border);
5693 }
5794
5895 cToggleButton GetToggleButton(String name, boolean border)
5996 {
60
- try
61
- {
62
- ImageIcon icon = GetIcon(name);
63
- return new cToggleButton(icon, border);
64
- }
65
- catch (Exception e)
66
- {
67
- return new cToggleButton(name, border);
68
- }
97
+ ImageIcon icon = GetIcon(name);
98
+ return new cToggleButton(icon, border);
6999 }
70100
71101 cCheckBox GetCheckBox(String name, boolean border)
72102 {
103
+ ImageIcon icon = GetIcon(name);
104
+ return new cCheckBox(icon, border);
105
+ }
106
+
107
+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
108
+
109
+ ImageIcon GetIcon(String name)
110
+ {
111
+ javax.swing.ImageIcon iconCache = icons.get(name);
112
+ if (iconCache != null)
113
+ {
114
+ return iconCache;
115
+ }
116
+
73117 try
74118 {
75
- ImageIcon icon = GetIcon(name);
76
- return new cCheckBox(icon, border);
119
+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
120
+
121
+// if (image.getWidth() > 48 && image.getHeight() > 48)
122
+// {
123
+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
124
+// Graphics2D g = resized.createGraphics();
125
+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
126
+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
127
+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
128
+// g.dispose();
129
+//
130
+// image = resized;
131
+// }
132
+
133
+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
134
+
135
+ icons.put(name, icon);
136
+
137
+ return icon;
77138 }
78139 catch (Exception e)
79140 {
80
- return new cCheckBox(name, border);
141
+ //icons.put(name, null);
142
+ return null;
81143 }
82144 }
83
-
84
- private ImageIcon GetIcon(String name) throws IOException
145
+
146
+ BufferedImage GetImage(String name)
85147 {
86
- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
87
-
88
- if (image.getWidth() != 24 && image.getHeight() != 24)
148
+ try
89149 {
90
- BufferedImage resized = new BufferedImage(24, 24, image.getType());
91
- Graphics2D g = resized.createGraphics();
92
- g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
93
- //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
94
- g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
95
- g.dispose();
96
-
97
- image = resized;
150
+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
151
+
152
+ return image;
98153 }
99
-
100
- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
101
- return icon;
154
+ catch (Exception e)
155
+ {
156
+ return null;
157
+ }
102158 }
103159
104160 // SCRIPT
....@@ -282,6 +338,14 @@
282338 client = inClient;
283339 copy = client;
284340
341
+// if (copy.versionlist == null)
342
+// {
343
+// copy.versionlist = new Object3D[100];
344
+// copy.versionindex = -1;
345
+//
346
+// callee.Save(true);
347
+// }
348
+
285349 // "this" is not called: SetupUI2(objEditor);
286350 }
287351
....@@ -295,6 +359,14 @@
295359 client = inClient;
296360 copy = client;
297361
362
+ if (copy.versionlist == null)
363
+ {
364
+ copy.versionlist = new Object3D[100];
365
+ copy.versionindex = -1;
366
+
367
+// Save(true);
368
+ }
369
+
298370 SetupUI2(callee.GetEditor());
299371 }
300372
....@@ -309,14 +381,15 @@
309381 //localCopy.parent = null;
310382
311383 frame = new JFrame();
312
- frame.setUndecorated(true);
384
+ frame.setUndecorated(false);
313385 objEditor = this;
314386 this.callee = callee;
315387
316388 //parent = p;
317389
318390 GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
319
- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
391
+ if (Globals.DEBUG)
392
+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
320393 //gd.setFullScreenWindow(this);
321394 //setResizable(false);
322395 //if (!isDisplayable())
....@@ -327,6 +400,14 @@
327400 copy = localCopy;
328401 copy.editWindow = this;
329402
403
+// if (copy.versionlist == null)
404
+// {
405
+// copy.versionlist = new Object3D[100];
406
+// copy.versionindex = -1;
407
+//
408
+// Save(true);
409
+// }
410
+
330411 SetupMenu();
331412
332413 //SetupName(objEditor); // new
....@@ -350,7 +431,7 @@
350431 frame.setMenuBar(menuBar = new MenuBar());
351432 menuBar.add(fileMenu = new Menu("File"));
352433 fileMenu.add(newItem = new MenuItem("New"));
353
- fileMenu.add(loadItem = new MenuItem("Open..."));
434
+ fileMenu.add(openItem = new MenuItem("Open..."));
354435
355436 //oe.menuBar.add(menu = new Menu("Include"));
356437 Menu menu = new Menu("Import");
....@@ -382,7 +463,7 @@
382463 }
383464
384465 newItem.addActionListener(this);
385
- loadItem.addActionListener(this);
466
+ openItem.addActionListener(this);
386467 saveItem.addActionListener(this);
387468 saveAsItem.addActionListener(this);
388469 exportAsItem.addActionListener(this);
....@@ -394,6 +475,8 @@
394475
395476 ChangeListener changeListener = new ChangeListener()
396477 {
478
+ //String name;
479
+
397480 public void stateChanged(ChangeEvent changeEvent)
398481 {
399482 // if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
....@@ -412,18 +495,49 @@
412495 // EditSelection(false);
413496 // }
414497
415
- refreshContents(false); // To refresh Info tab
498
+// if (objectPanel.getSelectedIndex() == 4)
499
+// {
500
+// name = copy.skyboxname;
501
+//
502
+// if (name == null)
503
+// {
504
+// name = "";
505
+// }
506
+//
507
+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
508
+// copy.skyboxext = "jpg";
509
+// }
510
+// else
511
+// {
512
+// if (name != null)
513
+// {
514
+// if (name.equals(""))
515
+// {
516
+// copy.skyboxname = null;
517
+// copy.skyboxext = null;
518
+// }
519
+// else
520
+// {
521
+// copy.skyboxname = name;
522
+// }
523
+// }
524
+// }
525
+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
526
+
527
+// refreshContents(false); // To refresh Info tab
528
+ cameraView.repaint();
416529 }
417530 };
418531 objectPanel.addChangeListener(changeListener);
419532
420533 toolbarPanel = new JPanel();
421534 toolbarPanel.setName("Toolbar");
535
+
422536 treePanel = new cGridBag();
423537 treePanel.setName("Tree");
424538
425539 editPanel = new cGridBag().setVertical(true);
426
- editPanel.setName("Edit");
540
+ //editPanel.setName("Edit");
427541
428542 ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
429543
....@@ -431,11 +545,13 @@
431545 editPanel.add(editCommandsPanel);
432546 editPanel.add(ctrlPanel);
433547
434
- toolboxPanel = new cGridBag().setVertical(false);
435
- toolboxPanel.setName("Toolbox");
548
+ toolboxPanel = new cGridBag().setVertical(true);
549
+ //toolboxPanel.setName("Toolbox");
436550
437
- materialPanel = new cGridBag().setVertical(true);
438
- materialPanel.setName("Material");
551
+ skyboxPanel = new cGridBag().setVertical(true);
552
+
553
+ materialPanel = new cGridBag().setVertical(false);
554
+ //materialPanel.setName("Material");
439555
440556 /*JTextPane*/
441557 infoarea = createTextPane();
....@@ -443,14 +559,15 @@
443559
444560 infoarea.setEditable(true);
445561 SetText();
562
+
446563 // infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
447564 // infoarea.setOpaque(false);
448565 // //infoarea.setForeground(textcolor);
449566 // TEXTAREA infoarea.setLineWrap(true);
450567 // TEXTAREA infoarea.setWrapStyleWord(true);
451568 infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
452
- infoPanel.setPreferredSize(new Dimension(50, 200));
453
- infoPanel.setName("Info");
569
+ infoPanel.setPreferredSize(new Dimension(1, 1));
570
+ //infoPanel.setName("Info");
454571 //infoPanel.setLayout(new BorderLayout());
455572 //infoPanel.add(createTextPane());
456573
....@@ -699,8 +816,8 @@
699816 }
700817 }
701818
702
-static GraphicsDevice device = GraphicsEnvironment
703
- .getLocalGraphicsEnvironment().getScreenDevices()[0];
819
+//static GraphicsDevice device = GraphicsEnvironment
820
+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
704821
705822 Rectangle keeprect;
706823 cRadio radio;
....@@ -717,14 +834,24 @@
717834 boolean maximized;
718835
719836 cButton fullscreenLayout;
837
+ cButton expandedLayout;
720838
721839 void Minimize()
722840 {
723841 frame.setState(Frame.ICONIFIED);
842
+ frame.validate();
724843 }
725844
845
+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
846
+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
847
+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
726848 void Maximize()
727849 {
850
+ if (CameraPane.FULLSCREEN)
851
+ {
852
+ ToggleFullScreen();
853
+ }
854
+
728855 if (maximized)
729856 {
730857 frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
....@@ -732,22 +859,38 @@
732859 else
733860 {
734861 keeprect = frame.getBounds();
735
- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
736
- Dimension rect2 = frame.getToolkit().getScreenSize();
737
- frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
862
+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
863
+// Dimension rect2 = frame.getToolkit().getScreenSize();
864
+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
738865 // frame.setState(Frame.MAXIMIZED_BOTH);
866
+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
739867 }
740868
741869 maximized ^= true;
870
+
871
+ frame.validate();
742872 }
873
+
874
+ cButton minButton;
875
+ cButton maxButton;
876
+ cButton fullButton;
877
+ cButton collapseButton;
878
+ cButton maximize3DButton;
743879
744880 void ToggleFullScreen()
745881 {
882
+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
883
+
746884 cameraView.ToggleFullScreen();
747885
748886 if (!CameraPane.FULLSCREEN)
749887 {
750888 device.setFullScreenWindow(null);
889
+ frame.dispose();
890
+ frame.setUndecorated(false);
891
+ frame.validate();
892
+ frame.setVisible(true);
893
+
751894 //frame.setVisible(false);
752895 // frame.removeNotify();
753896 // frame.setUndecorated(false);
....@@ -757,13 +900,13 @@
757900 // X frame.getContentPane().remove(/*"Center",*/bigThree);
758901 // X framePanel.add(bigThree);
759902 // X frame.getContentPane().add(/*"Center",*/framePanel);
760
- framePanel.setDividerLocation(1);
903
+// framePanel.setDividerLocation(46); // icons are 24x24
761904
762905 //frame.setVisible(true);
763
- radio.layout = keepButton;
906
+// radio.layout = keepButton;
764907 //theFrame = null;
765908 keepButton = null;
766
- radio.layout.doClick();
909
+// radio.layout.doClick();
767910
768911 } else
769912 {
....@@ -772,20 +915,59 @@
772915 // frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
773916 // frame.getToolkit().getScreenSize().height);
774917 //frame.setVisible(false);
918
+
919
+ frame.dispose();
920
+ frame.setUndecorated(true);
775921 device.setFullScreenWindow(frame);
922
+ frame.validate();
923
+ frame.setVisible(true);
776924 // frame.removeNotify();
777925 // frame.setUndecorated(true);
778926 // frame.addNotify();
779927 // X frame.getContentPane().remove(/*"Center",*/framePanel);
780928 // X framePanel.remove(bigThree);
781929 // X frame.getContentPane().add(/*"Center",*/bigThree);
782
- framePanel.setDividerLocation(0);
930
+// framePanel.setDividerLocation(0);
783931
784
- radio.layout = fullscreenLayout;
785
- radio.layout.doClick();
932
+// radio.layout = fullscreenLayout;
933
+// radio.layout.doClick();
786934 //frame.setVisible(true);
787935 }
936
+ frame.validate();
937
+
938
+ cameraView.requestFocusInWindow();
788939 }
940
+
941
+ void CollapseToolbar()
942
+ {
943
+ framePanel.setDividerLocation(0);
944
+ //frame.validate();
945
+
946
+ cameraView.requestFocusInWindow();
947
+ }
948
+
949
+ private Object3D Duplicate(Object3D object)
950
+ {
951
+ boolean temp = CameraPane.SWITCH;
952
+ CameraPane.SWITCH = false;
953
+
954
+ object.ExtractBigData(versiontable);
955
+ // if (copy == client)
956
+
957
+ Object3D versions[] = object.versionlist;
958
+ object.versionlist = null;
959
+
960
+ //byte[] compress = Compress(copy);
961
+ Object3D compress = (Object3D)Grafreed.clone(object);
962
+
963
+ object.versionlist = versions;
964
+
965
+ object.RestoreBigData(versiontable);
966
+
967
+ CameraPane.SWITCH = temp;
968
+
969
+ return compress;
970
+ }
789971
790972 private JTextPane createTextPane()
791973 {
....@@ -908,6 +1090,7 @@
9081090 {
9091091 SetupMaterial(materialPanel);
9101092 }
1093
+
9111094 //SetupName();
9121095 //SetupViews();
9131096 }
....@@ -917,7 +1100,7 @@
9171100 // NumberSlider vDivsField;
9181101 // JCheckBox endcaps;
9191102 JCheckBox liveCB;
920
- JCheckBox selectCB;
1103
+ JCheckBox selectableCB;
9211104 JCheckBox hideCB;
9221105 JCheckBox link2masterCB;
9231106 JCheckBox markCB;
....@@ -1116,8 +1299,20 @@
11161299
11171300 namePanel = new cGridBag();
11181301
1302
+ //if (copy.pinned)
1303
+ {
1304
+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
1305
+ pinButton.setSelected(copy.pinned);
1306
+ cGridBag t = new cGridBag();
1307
+ t.preferredWidth = 2;
1308
+ t.add(pinButton);
1309
+ namePanel.add(t);
1310
+
1311
+ pinButton.addItemListener(this);
1312
+ }
1313
+
11191314 nameField = AddText(namePanel, copy.GetName());
1120
- namePanel.add(nameField);
1315
+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
11211316 oe.ctrlPanel.add(namePanel);
11221317
11231318 oe.ctrlPanel.Return();
....@@ -1129,26 +1324,30 @@
11291324
11301325 liveCB = AddCheckBox(setupPanel, "Live", copy.live);
11311326 liveCB.setToolTipText("Animate object");
1132
- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1133
- selectCB.setToolTipText("Make object selectable");
1327
+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
1328
+ markCB.setToolTipText("Set target transform");
1329
+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1330
+ selectableCB.setToolTipText("Make object selectable");
11341331 // Return();
1332
+
11351333 hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
11361334 hideCB.setToolTipText("Hide object");
1137
- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1138
- markCB.setToolTipText("As animation target transform");
1335
+
1336
+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
11391337
11401338 setupPanel2 = new cGridBag().setVertical(false);
11411339
11421340 rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
11431341 rewindCB.setToolTipText("Rewind animation");
11441342
1145
- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1343
+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
11461344 randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
11471345
1346
+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
1347
+ link2masterCB.setToolTipText("Attach to support");
1348
+
11481349 if (Globals.ADVANCED)
11491350 {
1150
- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1151
- link2masterCB.setToolTipText("Attach to support");
11521351 speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
11531352 speedupCB.setToolTipText("Option motion capture");
11541353 }
....@@ -1334,6 +1533,7 @@
13341533
13351534 if (cam == null || !(copy.get(0) instanceof cGroup))
13361535 {
1536
+ if (Globals.DEBUG)
13371537 System.out.println("CREATE CAMERAS");
13381538 cams = new cTemplate();
13391539 cams.name = "Cameras";
....@@ -1422,6 +1622,7 @@
14221622 XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll);
14231623 XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll);
14241624 XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
1625
+ //XYZPanel.setName("XYZ");
14251626
14261627 /*
14271628 gridPanel = new JPanel(); //new BorderLayout());
....@@ -1459,14 +1660,29 @@
14591660 //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
14601661 //tmp.setName("Edit");
14611662 objectPanel.add(materialPanel);
1663
+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1664
+ objectPanel.setToolTipTextAt(0, "Material");
1665
+
1666
+ objectPanel.add(toolboxPanel);
1667
+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1668
+ objectPanel.setToolTipTextAt(1, "Objects & textures");
1669
+
1670
+ objectPanel.add(skyboxPanel);
1671
+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1672
+ objectPanel.setToolTipTextAt(2, "Backgrounds");
1673
+
14621674 // JPanel north = new JPanel(new BorderLayout());
14631675 // north.setName("Edit");
14641676 // north.add(ctrlPanel, BorderLayout.NORTH);
14651677 // objectPanel.add(north);
14661678 objectPanel.add(editPanel);
1467
- objectPanel.add(infoPanel);
1468
- objectPanel.add(toolboxPanel);
1469
-
1679
+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
1680
+ objectPanel.setToolTipTextAt(3, "Edit controls");
1681
+
1682
+ objectPanel.add(XYZPanel);
1683
+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1684
+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
1685
+
14701686 /*
14711687 aConstraints.gridx = 0;
14721688 aConstraints.gridwidth = 1;
....@@ -1486,7 +1702,7 @@
14861702 scrollpane.addMouseWheelListener(this); // Default not fast enough
14871703
14881704 /*JTabbedPane*/ scenePanel = new cGridBag();
1489
- scenePanel.preferredWidth = 6;
1705
+ scenePanel.preferredWidth = 5;
14901706
14911707 JTabbedPane tabbedPane = new JTabbedPane();
14921708 tabbedPane.add(scrollpane);
....@@ -1503,6 +1719,11 @@
15031719
15041720 scenePanel.add(tabbedPane);
15051721
1722
+ //if (Globals.ADVANCED)
1723
+// tabbedPane.add(infoPanel);
1724
+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1725
+// tabbedPane.setToolTipTextAt(3, "Information");
1726
+
15061727 /*
15071728 cTree jTree = new cTree(null);
15081729 ToolTipManager.sharedInstance().registerComponent(jTree);
....@@ -1564,7 +1785,7 @@
15641785 bigThree = new cGridBag();
15651786 bigThree.addComponent(scenePanel);
15661787 bigThree.addComponent(centralPanel);
1567
- bigThree.addComponent(XYZPanel);
1788
+ //bigThree.addComponent(XYZPanel);
15681789
15691790 // // SIDE EFFECT!!!
15701791 // aConstraints.gridx = 0;
....@@ -1573,16 +1794,33 @@
15731794 // aConstraints.gridheight = 1;
15741795
15751796 framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1576
- framePanel.setContinuousLayout(true);
1577
- framePanel.setOneTouchExpandable(true);
1578
- framePanel.setDividerLocation(0.8);
1797
+
1798
+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
1799
+ new java.beans.PropertyChangeListener()
1800
+ {
1801
+ public void propertyChange(java.beans.PropertyChangeEvent pce)
1802
+ {
1803
+ if ((Integer)pce.getOldValue() == 1)
1804
+ {
1805
+ if (radio.layout != expandedLayout)
1806
+ {
1807
+ radio.layout = expandedLayout;
1808
+ radio.layout.doClick();
1809
+ }
1810
+ }
1811
+ }
1812
+ });
1813
+
1814
+ framePanel.setContinuousLayout(false);
1815
+ framePanel.setOneTouchExpandable(false);
1816
+ //.setDividerLocation(0.8);
15791817 //framePanel.setDividerSize(15);
15801818 //framePanel.setResizeWeight(0.15);
15811819 framePanel.setName("Frame");
15821820
15831821 frame.getContentPane().setLayout(new BorderLayout());
15841822 /**/
1585
- JTabbedPane worldPane = new JTabbedPane();
1823
+ //JTabbedPane worldPane = new JTabbedPane();
15861824 //worldPane.add(bigPanel);
15871825 //worldPane.add(worldPanel);
15881826 /**/
....@@ -1594,17 +1832,17 @@
15941832
15951833 frame.setSize(1280, 860);
15961834
1597
- frame.validate();
1598
- frame.setVisible(true);
1599
-
16001835 cameraView.requestFocusInWindow();
16011836
16021837 gridPanel.setDividerLocation(1.0);
1838
+
1839
+ frame.validate();
1840
+
1841
+ frame.setVisible(true);
16031842
16041843 frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
16051844 frame.addWindowListener(new WindowAdapter()
16061845 {
1607
-
16081846 public void windowClosing(WindowEvent e)
16091847 {
16101848 Close();
....@@ -1627,12 +1865,418 @@
16271865 ctrlPanel.removeAll();
16281866 }
16291867
1630
- void SetupMaterial(cGridBag panel)
1868
+ void SetupMaterial(cGridBag materialpanel)
16311869 {
1632
- /*
1870
+ cGridBag presetpanel = new cGridBag().setVertical(true);
1871
+
1872
+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
1873
+ skin.setToolTipText("Skin");
1874
+ skin.addMouseListener(new MouseAdapter()
1875
+ {
1876
+ public void mouseClicked(MouseEvent e)
1877
+ {
1878
+ Object3D object = Grafreed.materials.versionlist[0].get(0);
1879
+ cMaterial material = object.material;
1880
+
1881
+ // Skin
1882
+ colorField.setFloat(material.color);
1883
+ saturationField.setFloat(material.modulation);
1884
+ subsurfaceField.setFloat(material.subsurface);
1885
+ selfshadowField.setFloat(material.diffuseness);
1886
+ diffusenessField.setFloat(material.factor);
1887
+ shininessField.setFloat(material.shininess);
1888
+ shadowbiasField.setFloat(material.shadowbias);
1889
+ diffuseField.setFloat(material.diffuse);
1890
+ specularField.setFloat(material.specular);
1891
+
1892
+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
1893
+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
1894
+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
1895
+
1896
+ materialtouched = true;
1897
+ applySelf();
1898
+ }
1899
+ });
1900
+ presetpanel.add(skin);
1901
+
1902
+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
1903
+ lambert.setToolTipText("Diffuse");
1904
+ lambert.addMouseListener(new MouseAdapter()
1905
+ {
1906
+ public void mouseClicked(MouseEvent e)
1907
+ {
1908
+ Object3D object = Grafreed.materials.versionlist[2].get(0);
1909
+ cMaterial material = object.material;
1910
+
1911
+ diffusenessField.setFloat(material.factor);
1912
+ selfshadowField.setFloat(material.diffuseness);
1913
+
1914
+ materialtouched = true;
1915
+ applySelf();
1916
+ }
1917
+ });
1918
+ presetpanel.add(lambert);
1919
+
1920
+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
1921
+ diffuse2.setToolTipText("Diffuse2");
1922
+ diffuse2.addMouseListener(new MouseAdapter()
1923
+ {
1924
+ public void mouseClicked(MouseEvent e)
1925
+ {
1926
+ Object3D object = Grafreed.materials.versionlist[3].get(0);
1927
+ cMaterial material = object.material;
1928
+
1929
+ diffusenessField.setFloat(material.factor);
1930
+ selfshadowField.setFloat(material.diffuseness);
1931
+
1932
+ materialtouched = true;
1933
+ applySelf();
1934
+ }
1935
+ });
1936
+ presetpanel.add(diffuse2);
1937
+
1938
+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
1939
+ diffusemoon.setToolTipText("Moon");
1940
+ diffusemoon.addMouseListener(new MouseAdapter()
1941
+ {
1942
+ public void mouseClicked(MouseEvent e)
1943
+ {
1944
+ Object3D object = Grafreed.materials.versionlist[4].get(0);
1945
+ cMaterial material = object.material;
1946
+
1947
+ diffusenessField.setFloat(material.factor);
1948
+ selfshadowField.setFloat(material.diffuseness);
1949
+
1950
+ materialtouched = true;
1951
+ applySelf();
1952
+ }
1953
+ });
1954
+ presetpanel.add(diffusemoon);
1955
+
1956
+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
1957
+ diffusemoon2.setToolTipText("Moon2");
1958
+ diffusemoon2.addMouseListener(new MouseAdapter()
1959
+ {
1960
+ public void mouseClicked(MouseEvent e)
1961
+ {
1962
+ Object3D object = Grafreed.materials.versionlist[5].get(0);
1963
+ cMaterial material = object.material;
1964
+
1965
+ diffusenessField.setFloat(material.factor);
1966
+ selfshadowField.setFloat(material.diffuseness);
1967
+
1968
+ materialtouched = true;
1969
+ applySelf();
1970
+ }
1971
+ });
1972
+ presetpanel.add(diffusemoon2);
1973
+
1974
+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
1975
+ diffusemoon3.setToolTipText("Moon3");
1976
+ diffusemoon3.addMouseListener(new MouseAdapter()
1977
+ {
1978
+ public void mouseClicked(MouseEvent e)
1979
+ {
1980
+ Object3D object = Grafreed.materials.versionlist[6].get(0);
1981
+ cMaterial material = object.material;
1982
+
1983
+ diffusenessField.setFloat(material.factor);
1984
+ selfshadowField.setFloat(material.diffuseness);
1985
+
1986
+ materialtouched = true;
1987
+ applySelf();
1988
+ }
1989
+ });
1990
+ presetpanel.add(diffusemoon3);
1991
+
1992
+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
1993
+ diffusesheen.setToolTipText("Sheen");
1994
+ diffusesheen.addMouseListener(new MouseAdapter()
1995
+ {
1996
+ public void mouseClicked(MouseEvent e)
1997
+ {
1998
+ Object3D object = Grafreed.materials.versionlist[7].get(0);
1999
+ cMaterial material = object.material;
2000
+
2001
+ sheenField.setFloat(material.sheen);
2002
+
2003
+ materialtouched = true;
2004
+ applySelf();
2005
+ }
2006
+ });
2007
+ presetpanel.add(diffusesheen);
2008
+
2009
+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
2010
+ rough.setToolTipText("Rough metal");
2011
+ rough.addMouseListener(new MouseAdapter()
2012
+ {
2013
+ public void mouseClicked(MouseEvent e)
2014
+ {
2015
+ Object3D object = Grafreed.materials.versionlist[1].get(0);
2016
+ cMaterial material = object.material;
2017
+
2018
+ shininessField.setFloat(material.shininess);
2019
+ velvetField.setFloat(material.velvet);
2020
+
2021
+ materialtouched = true;
2022
+ applySelf();
2023
+ }
2024
+ });
2025
+ presetpanel.add(rough);
2026
+
2027
+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
2028
+ rough2.setToolTipText("Medium metal");
2029
+ rough2.addMouseListener(new MouseAdapter()
2030
+ {
2031
+ public void mouseClicked(MouseEvent e)
2032
+ {
2033
+ Object3D object = Grafreed.materials.versionlist[13].get(0);
2034
+ cMaterial material = object.material;
2035
+
2036
+ shininessField.setFloat(material.shininess);
2037
+ lightareaField.setFloat(material.lightarea);
2038
+
2039
+ materialtouched = true;
2040
+ applySelf();
2041
+ }
2042
+ });
2043
+ presetpanel.add(rough2);
2044
+
2045
+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
2046
+ shini0.setToolTipText("Shiny");
2047
+ shini0.addMouseListener(new MouseAdapter()
2048
+ {
2049
+ public void mouseClicked(MouseEvent e)
2050
+ {
2051
+ Object3D object = Grafreed.materials.versionlist[14].get(0);
2052
+ cMaterial material = object.material;
2053
+
2054
+ shininessField.setFloat(material.shininess);
2055
+ lightareaField.setFloat(material.lightarea);
2056
+
2057
+ materialtouched = true;
2058
+ applySelf();
2059
+ }
2060
+ });
2061
+ presetpanel.add(shini0);
2062
+
2063
+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
2064
+ shini1.setToolTipText("Shiny2");
2065
+ shini1.addMouseListener(new MouseAdapter()
2066
+ {
2067
+ public void mouseClicked(MouseEvent e)
2068
+ {
2069
+ Object3D object = Grafreed.materials.versionlist[11].get(0);
2070
+ cMaterial material = object.material;
2071
+
2072
+ shininessField.setFloat(material.shininess);
2073
+ lightareaField.setFloat(material.lightarea);
2074
+
2075
+ materialtouched = true;
2076
+ applySelf();
2077
+ }
2078
+ });
2079
+ presetpanel.add(shini1);
2080
+
2081
+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
2082
+ shini2.setToolTipText("Shiny3");
2083
+ shini2.addMouseListener(new MouseAdapter()
2084
+ {
2085
+ public void mouseClicked(MouseEvent e)
2086
+ {
2087
+ Object3D object = Grafreed.materials.versionlist[12].get(0);
2088
+ cMaterial material = object.material;
2089
+
2090
+ shininessField.setFloat(material.shininess);
2091
+ lightareaField.setFloat(material.lightarea);
2092
+
2093
+ materialtouched = true;
2094
+ applySelf();
2095
+ }
2096
+ });
2097
+ presetpanel.add(shini2);
2098
+
2099
+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
2100
+ aniso.setToolTipText("AnisoU");
2101
+ aniso.addMouseListener(new MouseAdapter()
2102
+ {
2103
+ public void mouseClicked(MouseEvent e)
2104
+ {
2105
+ Object3D object = Grafreed.materials.versionlist[8].get(0);
2106
+ cMaterial material = object.material;
2107
+
2108
+ anisoField.setFloat(material.aniso);
2109
+ anisoVField.setFloat(material.anisoV);
2110
+
2111
+ materialtouched = true;
2112
+ applySelf();
2113
+ }
2114
+ });
2115
+ presetpanel.add(aniso);
2116
+
2117
+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
2118
+ aniso2.setToolTipText("AnisoV");
2119
+ aniso2.addMouseListener(new MouseAdapter()
2120
+ {
2121
+ public void mouseClicked(MouseEvent e)
2122
+ {
2123
+ Object3D object = Grafreed.materials.versionlist[9].get(0);
2124
+ cMaterial material = object.material;
2125
+
2126
+ anisoField.setFloat(material.aniso);
2127
+ anisoVField.setFloat(material.anisoV);
2128
+
2129
+ materialtouched = true;
2130
+ applySelf();
2131
+ }
2132
+ });
2133
+ presetpanel.add(aniso2);
2134
+
2135
+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
2136
+ aniso3.setToolTipText("AnisoUV");
2137
+ aniso3.addMouseListener(new MouseAdapter()
2138
+ {
2139
+ public void mouseClicked(MouseEvent e)
2140
+ {
2141
+ Object3D object = Grafreed.materials.versionlist[10].get(0);
2142
+ cMaterial material = object.material;
2143
+
2144
+ anisoField.setFloat(material.aniso);
2145
+ anisoVField.setFloat(material.anisoV);
2146
+
2147
+ materialtouched = true;
2148
+ applySelf();
2149
+ }
2150
+ });
2151
+ presetpanel.add(aniso3);
2152
+
2153
+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
2154
+ velvet0.setToolTipText("Velvet");
2155
+ velvet0.addMouseListener(new MouseAdapter()
2156
+ {
2157
+ public void mouseClicked(MouseEvent e)
2158
+ {
2159
+ Object3D object = Grafreed.materials.versionlist[15].get(0);
2160
+ cMaterial material = object.material;
2161
+
2162
+ diffusenessField.setFloat(material.factor);
2163
+ selfshadowField.setFloat(material.diffuseness);
2164
+ sheenField.setFloat(material.sheen);
2165
+ shininessField.setFloat(material.shininess);
2166
+ velvetField.setFloat(material.velvet);
2167
+ shiftField.setFloat(material.shift);
2168
+
2169
+ materialtouched = true;
2170
+ applySelf();
2171
+ }
2172
+ });
2173
+ presetpanel.add(velvet0);
2174
+
2175
+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
2176
+ bump0.setToolTipText("Bump texture");
2177
+ bump0.addMouseListener(new MouseAdapter()
2178
+ {
2179
+ public void mouseClicked(MouseEvent e)
2180
+ {
2181
+ Object3D object = Grafreed.materials.versionlist[16].get(0);
2182
+ cMaterial material = object.material;
2183
+
2184
+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
2185
+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
2186
+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
2187
+
2188
+ materialtouched = true;
2189
+ applySelf();
2190
+ }
2191
+ });
2192
+ presetpanel.add(bump0);
2193
+
2194
+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
2195
+ borderShader.setToolTipText("Border fade");
2196
+ borderShader.addMouseListener(new MouseAdapter()
2197
+ {
2198
+ public void mouseClicked(MouseEvent e)
2199
+ {
2200
+ borderfadeField.setFloat(0.5);
2201
+ opacityField.setFloat(0.75);
2202
+
2203
+ materialtouched = true;
2204
+ applySelf();
2205
+ }
2206
+ });
2207
+ presetpanel.add(borderShader);
2208
+
2209
+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
2210
+ halo.setToolTipText("Halo");
2211
+ halo.addMouseListener(new MouseAdapter()
2212
+ {
2213
+ public void mouseClicked(MouseEvent e)
2214
+ {
2215
+ Object3D object = Grafreed.materials.versionlist[17].get(0);
2216
+ cMaterial material = object.material;
2217
+
2218
+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
2219
+
2220
+ materialtouched = true;
2221
+ applySelf();
2222
+ }
2223
+ });
2224
+ presetpanel.add(halo);
2225
+
2226
+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
2227
+ candle.setToolTipText("Candle");
2228
+ candle.addMouseListener(new MouseAdapter()
2229
+ {
2230
+ public void mouseClicked(MouseEvent e)
2231
+ {
2232
+ Object3D object = Grafreed.materials.versionlist[18].get(0);
2233
+ cMaterial material = object.material;
2234
+
2235
+ subsurfaceField.setFloat(material.subsurface);
2236
+ shadowbiasField.setFloat(material.shadowbias);
2237
+ ambientField.setFloat(material.ambient);
2238
+ specularField.setFloat(material.specular);
2239
+ lightareaField.setFloat(material.lightarea);
2240
+ shininessField.setFloat(material.shininess);
2241
+
2242
+ materialtouched = true;
2243
+ applySelf();
2244
+ }
2245
+ });
2246
+ presetpanel.add(candle);
2247
+
2248
+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
2249
+ shadowShader.setToolTipText("Shadow");
2250
+ shadowShader.addMouseListener(new MouseAdapter()
2251
+ {
2252
+ public void mouseClicked(MouseEvent e)
2253
+ {
2254
+ diffuseField.setFloat(0.001);
2255
+ ambientField.setFloat(0.001);
2256
+ cameraField.setFloat(0.001);
2257
+ specularField.setFloat(0.001);
2258
+ fakedepthField.setFloat(0.001);
2259
+ opacityField.setFloat(0.6);
2260
+
2261
+ materialtouched = true;
2262
+ applySelf();
2263
+ }
2264
+ });
2265
+ presetpanel.add(shadowShader);
2266
+
2267
+ cGridBag panel = new cGridBag().setVertical(true);
2268
+
2269
+ presetpanel.preferredWidth = 1;
2270
+
2271
+ materialpanel.add(presetpanel);
2272
+ materialpanel.add(panel);
2273
+
2274
+ panel.preferredWidth = 8;
2275
+
2276
+ /*
16332277 ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
16342278 materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1635
- */
2279
+ */
16362280
16372281 cGridBag editBar = new cGridBag().setVertical(false);
16382282
....@@ -1666,45 +2310,61 @@
16662310 //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
16672311
16682312 cGridBag colorSection = new cGridBag().setVertical(true);
2313
+
2314
+ cGridBag huepanel = new cGridBag();
2315
+ cGridBag huelabel = new cGridBag();
2316
+ cLabel hue = GetLabel("icons/hue.png", false);
2317
+ hue.fit = true;
2318
+
2319
+ hue.addMouseListener(new MouseAdapter()
2320
+ {
2321
+ public void mousePressed(MouseEvent e)
2322
+ {
2323
+ int x = e.getX();
2324
+
2325
+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
2326
+ }
2327
+ });
2328
+
2329
+ huelabel.add(hue);
2330
+ huelabel.preferredWidth = 20;
2331
+ huepanel.add(new cGridBag()); // Label
2332
+ huepanel.add(huelabel); // Field/slider
2333
+
2334
+ huepanel.preferredHeight = 7;
2335
+
2336
+ colorSection.add(huepanel);
16692337
16702338 cGridBag color = new cGridBag();
1671
- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1672
- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1673
- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2339
+
2340
+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
2341
+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2342
+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
2343
+
16742344 //colorField.preferredWidth = 200;
16752345 colorSection.add(color);
16762346
16772347 cGridBag modulation = new cGridBag();
16782348 modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
16792349 modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1680
- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2350
+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
16812351 colorSection.add(modulation);
16822352
2353
+ cGridBag opacity = new cGridBag();
2354
+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
2355
+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2356
+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
2357
+ colorSection.add(opacity);
2358
+
2359
+ colorSection.add(GetSeparator());
2360
+
16832361 cGridBag texture = new cGridBag();
16842362 texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
16852363 textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
16862364 texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
16872365 colorSection.add(texture);
16882366
1689
- cGridBag anisoU = new cGridBag();
1690
- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1691
- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1692
- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1693
- colorSection.add(anisoU);
1694
-
1695
- cGridBag anisoV = new cGridBag();
1696
- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1697
- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1698
- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1699
- colorSection.add(anisoV);
1700
-
1701
- cGridBag shadowbias = new cGridBag();
1702
- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1703
- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1704
- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1705
- colorSection.add(shadowbias);
1706
-
1707
- panel.add(new JSeparator());
2367
+ panel.add(GetSeparator());
17082368
17092369 panel.add(colorSection);
17102370
....@@ -1754,7 +2414,13 @@
17542414 fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
17552415 diffuseSection.add(fakedepth);
17562416
1757
- panel.add(new JSeparator());
2417
+ cGridBag shadowbias = new cGridBag();
2418
+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
2419
+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2420
+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
2421
+ diffuseSection.add(shadowbias);
2422
+
2423
+ panel.add(GetSeparator());
17582424
17592425 panel.add(diffuseSection);
17602426
....@@ -1804,42 +2470,48 @@
18042470 // aConstraints.gridy += 1;
18052471 // aConstraints.gridwidth = 1;
18062472
2473
+ cGridBag anisoU = new cGridBag();
2474
+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
2475
+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2476
+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2477
+ specularSection.add(anisoU);
18072478
1808
- panel.add(new JSeparator());
2479
+ cGridBag anisoV = new cGridBag();
2480
+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
2481
+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
2482
+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
2483
+ specularSection.add(anisoV);
2484
+
2485
+
2486
+ panel.add(GetSeparator());
18092487
18102488 panel.add(specularSection);
18112489
18122490 //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
18132491
1814
- cGridBag globalSection = new cGridBag().setVertical(true);
2492
+ //cGridBag globalSection = new cGridBag().setVertical(true);
18152493
18162494 cGridBag camera = new cGridBag();
18172495 camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
18182496 cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
18192497 camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1820
- globalSection.add(camera);
2498
+ colorSection.add(camera);
18212499
18222500 cGridBag ambient = new cGridBag();
18232501 ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
18242502 ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
18252503 ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1826
- globalSection.add(ambient);
2504
+ colorSection.add(ambient);
18272505
18282506 cGridBag backlit = new cGridBag();
18292507 backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
18302508 backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
18312509 backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1832
- globalSection.add(backlit);
2510
+ colorSection.add(backlit);
18332511
1834
- cGridBag opacity = new cGridBag();
1835
- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1836
- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1837
- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1838
- globalSection.add(opacity);
1839
-
1840
- panel.add(new JSeparator());
2512
+ //panel.add(new JSeparator());
18412513
1842
- panel.add(globalSection);
2514
+ //panel.add(globalSection);
18432515
18442516 //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
18452517
....@@ -1881,7 +2553,7 @@
18812553 opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /*10 dec 2013*/)); // , aConstraints);
18822554 textureSection.add(opacityPower);
18832555
1884
- panel.add(new JSeparator());
2556
+ panel.add(GetSeparator());
18852557
18862558 panel.add(textureSection);
18872559
....@@ -1946,8 +2618,9 @@
19462618 // 3D models
19472619 if (filename.endsWith(".3ds") || filename.endsWith(".3DS"))
19482620 {
1949
- lastConverter = new com.jmex.model.converters.MaxToJme();
1950
- LoadFile(filename, lastConverter);
2621
+ //lastConverter = new com.jmex.model.converters.MaxToJme();
2622
+ //LoadFile(filename, lastConverter);
2623
+ LoadObjFile(filename); // New 3ds loader
19512624 continue;
19522625 }
19532626 if (filename.endsWith(".dae") || filename.endsWith(".DAE"))
....@@ -2673,6 +3346,7 @@
26733346 LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
26743347 LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
26753348 }
3349
+
26763350 //cJME.count++;
26773351 //cJME.count %= 12;
26783352 if (gc)
....@@ -2856,6 +3530,7 @@
28563530 }
28573531 }
28583532 }
3533
+
28593534 cFileSystemPane FSPane;
28603535
28613536 void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
....@@ -2865,7 +3540,7 @@
28653540
28663541 freezematerial = true;
28673542 colorField.setFloat(mat.color);
2868
- modulationField.setFloat(mat.modulation);
3543
+ saturationField.setFloat(mat.modulation);
28693544 metalnessField.setFloat(mat.metalness);
28703545 diffuseField.setFloat(mat.diffuse);
28713546 specularField.setFloat(mat.specular);
....@@ -2909,6 +3584,7 @@
29093584 }
29103585 }
29113586 }
3587
+
29123588 freezematerial = false;
29133589 }
29143590
....@@ -2926,32 +3602,8 @@
29263602
29273603 if (multiplyToggle != null)
29283604 multiplyToggle.setSelected(mat.multiply);
2929
-
2930
- assert (object.projectedVertices != null);
2931
-
2932
- if (object.projectedVertices.length <= 2)
2933
- {
2934
- // Side effect...
2935
- Object3D.cVector2[] keep = object.projectedVertices;
2936
- object.projectedVertices = new Object3D.cVector2[3];
2937
- for (int i = 0; i < 3; i++)
2938
- {
2939
- if (i < keep.length)
2940
- {
2941
- object.projectedVertices[i] = keep[i];
2942
- } else
2943
- {
2944
- object.projectedVertices[i] = new Object3D.cVector2();
2945
- }
2946
- /*
2947
- if(keep.length == 0)
2948
- object.projectedVertices[0] = new Object3D.cVector2();
2949
- else
2950
- object.projectedVertices[0] = keep[0];
2951
- object.projectedVertices[1] = new Object3D.cVector2();
2952
- */
2953
- }
2954
- }
3605
+
3606
+ AllocProjectedVertices(object);
29553607
29563608 SetMaterial(mat, object.projectedVertices);
29573609 }
....@@ -3071,6 +3723,17 @@
30713723 public void itemStateChanged(ItemEvent event)
30723724 {
30733725 // System.out.println("Propagate = " + propagate);
3726
+ if (event.getSource() == pinButton)
3727
+ {
3728
+ copy.pinned ^= true;
3729
+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
3730
+ {
3731
+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
3732
+ copy.CloseUI();
3733
+ //copy.editWindow.refreshContents();
3734
+ }
3735
+ }
3736
+ else
30743737 if (event.getSource() == propagateToggle)
30753738 {
30763739 propagate ^= true;
....@@ -3175,8 +3838,9 @@
31753838 } else if (event.getSource() == liveCB)
31763839 {
31773840 copy.live ^= true;
3841
+ objEditor.refreshContents(true); // To show item colors
31783842 return;
3179
- } else if (event.getSource() == selectCB)
3843
+ } else if (event.getSource() == selectableCB)
31803844 {
31813845 copy.dontselect ^= true;
31823846 return;
....@@ -3184,7 +3848,7 @@
31843848 {
31853849 copy.hide ^= true;
31863850 copy.Touch(); // display list issue
3187
- objEditor.refreshContents();
3851
+ objEditor.refreshContents(true); // To show item colors
31883852 return;
31893853 } else if (event.getSource() == link2masterCB)
31903854 {
....@@ -3361,9 +4025,9 @@
33614025 {
33624026 Close();
33634027 //return true;
3364
- } else if (source == loadItem)
4028
+ } else if (source == openItem)
33654029 {
3366
- load();
4030
+ Open();
33674031 //return true;
33684032 } else if (source == newItem)
33694033 {
....@@ -3388,6 +4052,10 @@
33884052 {
33894053 generatePOV();
33904054 //return true;
4055
+ } else if (event.getSource() == archiveItem)
4056
+ {
4057
+ cTools.Archive(frame);
4058
+ return;
33914059 } else if (source == zBufferItem)
33924060 {
33934061 try
....@@ -3436,11 +4104,12 @@
34364104
34374105 static public byte[] Compress(Object3D o)
34384106 {
4107
+ // Slower to actually compress.
34394108 try
34404109 {
34414110 ByteArrayOutputStream baos = new ByteArrayOutputStream();
3442
- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3443
- ObjectOutputStream out = new ObjectOutputStream(zstream);
4111
+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
4112
+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
34444113
34454114 Object3D parent = o.parent;
34464115 o.parent = null;
....@@ -3451,10 +4120,14 @@
34514120
34524121 out.flush();
34534122
3454
- zstream.close();
4123
+ baos //zstream
4124
+ .close();
34554125 out.close();
34564126
3457
- return baos.toByteArray();
4127
+ byte[] bytes = baos.toByteArray();
4128
+
4129
+ System.out.println("save #bytes = " + bytes.length);
4130
+ return bytes;
34584131 } catch (Exception e)
34594132 {
34604133 System.err.println(e);
....@@ -3464,13 +4137,16 @@
34644137
34654138 static public Object Uncompress(byte[] bytes)
34664139 {
3467
- System.out.println("#bytes = " + bytes.length);
4140
+ System.out.println("restore #bytes = " + bytes.length);
34684141 try
34694142 {
34704143 ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3471
- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3472
- ObjectInputStream in = new ObjectInputStream(istream);
4144
+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
4145
+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
34734146 Object obj = in.readObject();
4147
+
4148
+ bais //istream
4149
+ .close();
34744150 in.close();
34754151
34764152 return obj;
....@@ -3525,41 +4201,95 @@
35254201 return null;
35264202 }
35274203
3528
- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
35294204
35304205 public void Save()
35314206 {
4207
+ //Save(true);
4208
+ Replace();
4209
+ SetVersionStates();
4210
+ }
4211
+
4212
+ private boolean Equal(byte[] compress, byte[] name)
4213
+ {
4214
+ if (compress.length != name.length)
4215
+ {
4216
+ return false;
4217
+ }
4218
+
4219
+ for (int i=compress.length; --i>=0;)
4220
+ {
4221
+ if (compress[i] != name[i])
4222
+ return false;
4223
+ }
4224
+
4225
+ return true;
4226
+ }
4227
+
4228
+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4229
+
4230
+ void DeleteVersion()
4231
+ {
4232
+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
4233
+ {
4234
+ copy.versionlist[i] = copy.versionlist[i+1];
4235
+ }
4236
+
4237
+ CopyChanged();
4238
+
4239
+ SetVersionStates();
4240
+ }
4241
+
4242
+ public boolean Save(boolean user)
4243
+ {
35324244 System.err.println("Save");
4245
+ Replace();
35334246
3534
- cRadio tab = GetCurrentTab();
4247
+ //cRadio tab = GetCurrentTab();
35354248
3536
- boolean temp = CameraPane.SWITCH;
3537
- CameraPane.SWITCH = false;
4249
+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
35384250
3539
- copy.ExtractBigData(hashtable);
4251
+ boolean thesame = false;
4252
+
4253
+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
4254
+// {
4255
+// thesame = true;
4256
+// }
35404257
35414258 //EditorFrame.m_MainFrame.requestFocusInWindow();
3542
- tab.graphs[tab.undoindex++] = Compress(copy);
3543
-
3544
- copy.RestoreBigData(hashtable);
3545
-
3546
- CameraPane.SWITCH = temp;
3547
-
3548
- //assert(hashtable.isEmpty());
3549
-
3550
- for (int i = tab.undoindex; i < tab.graphs.length; i++)
4259
+ if (!thesame)
35514260 {
3552
- tab.graphs[i] = null;
4261
+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
4262
+ {
4263
+ copy.versionlist[i] = copy.versionlist[i-1];
4264
+ }
4265
+
4266
+ //tab.user[tab.versionindex] = user;
4267
+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
4268
+
4269
+ copy.versionlist[++copy.versionindex] = compress;
4270
+
4271
+ // if (increment)
4272
+ // tab.versionindex++;
35534273 }
35544274
3555
- SetUndoStates();
4275
+ //copy.RestoreBigData(versiontable);
4276
+
4277
+ //assert(hashtable.isEmpty());
4278
+
4279
+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
4280
+// {
4281
+// //tab.user[i] = false;
4282
+// copy.versionlist[i] = null;
4283
+// }
4284
+
4285
+ SetVersionStates();
35564286
35574287 // test save
35584288 if (false)
35594289 {
35604290 try
35614291 {
3562
- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
4292
+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
35634293 ObjectOutputStream p = new ObjectOutputStream(ostream);
35644294
35654295 p.writeObject(copy);
....@@ -3572,28 +4302,68 @@
35724302 e.printStackTrace();
35734303 }
35744304 }
4305
+
4306
+ return !thesame;
4307
+ }
4308
+
4309
+ boolean flashIt = true;
4310
+
4311
+ void RefreshSelection()
4312
+ {
4313
+ Object3D selection = new Object3D();
4314
+
4315
+ for (int i = 0; i < copy.selection.size(); i++)
4316
+ {
4317
+ Object3D elem = copy.selection.elementAt(i);
4318
+
4319
+ Object3D obj = copy.GetObject(elem.GetUUID());
4320
+
4321
+ if (obj == null)
4322
+ {
4323
+ copy.selection.remove(i--);
4324
+ }
4325
+ else
4326
+ {
4327
+ selection.add(obj);
4328
+ copy.selection.setElementAt(obj, i);
4329
+ }
4330
+ }
4331
+
4332
+ flashIt = false;
4333
+ GetTree().clearSelection();
4334
+ for (int i = 0; i < selection.size(); i++)
4335
+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
4336
+ flashIt = true;
4337
+
4338
+ //refreshContents(false);
35754339 }
35764340
3577
- void CopyChanged(Object3D obj)
4341
+ void CopyChanged()
35784342 {
3579
- SetUndoStates();
4343
+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
4344
+
4345
+ SetVersionStates();
35804346
35814347 boolean temp = CameraPane.SWITCH;
35824348 CameraPane.SWITCH = false;
35834349
3584
- copy.ExtractBigData(hashtable);
4350
+ copy.ExtractBigData(versiontable);
35854351
35864352 copy.clear();
35874353
4354
+ copy.skyboxname = obj.skyboxname;
4355
+ copy.skyboxext = obj.skyboxext;
4356
+
35884357 for (int i=0; i<obj.Size(); i++)
35894358 {
35904359 copy.add(obj.get(i));
35914360 }
35924361
3593
- copy.RestoreBigData(hashtable);
4362
+ copy.RestoreBigData(versiontable);
35944363
35954364 CameraPane.SWITCH = temp;
35964365
4366
+ RefreshSelection();
35974367 //assert(hashtable.isEmpty());
35984368
35994369 copy.Touch();
....@@ -3614,56 +4384,144 @@
36144384 }
36154385 }
36164386
3617
- refreshContents();
4387
+ refreshContents(true);
36184388 }
36194389
3620
- cButton undoButton;
3621
- cButton redoButton;
4390
+ cButton previousVersionButton;
4391
+ cButton restoreButton;
4392
+ cButton replaceButton;
4393
+ cButton nextVersionButton;
4394
+ cButton saveVersionButton;
4395
+ cButton deleteVersionButton;
36224396
3623
- void SetUndoStates()
4397
+ boolean muteSlider;
4398
+
4399
+ int VersionCount()
36244400 {
3625
- cRadio tab = GetCurrentTab();
4401
+ int count = 0;
36264402
3627
- undoButton.setEnabled(tab.undoindex > 0);
3628
- redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
4403
+ for (int i = copy.versionlist.length; --i >= 0;)
4404
+ {
4405
+ if (copy.versionlist[i] != null)
4406
+ count++;
4407
+ }
4408
+
4409
+ return count;
36294410 }
36304411
3631
- public void Undo()
4412
+ void SetVersionStates()
36324413 {
4414
+ //if (true)
4415
+ // return;
4416
+
4417
+ //cRadio tab = GetCurrentTab();
4418
+
4419
+ restoreButton.setEnabled(copy.versionindex != -1);
4420
+ replaceButton.setEnabled(copy.versionindex != -1);
4421
+
4422
+ previousVersionButton.setEnabled(copy.versionindex > 0);
4423
+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4424
+
4425
+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4426
+ copy.versionlist[copy.versionindex + 1] != null);
4427
+
4428
+ muteSlider = true;
4429
+ versionSlider.setMinimum(0);
4430
+ versionSlider.setMaximum(VersionCount() - 1);
4431
+ versionSlider.setInteger(copy.versionindex);
4432
+ versionSlider.setEnabled(copy.versionindex != -1);
4433
+ muteSlider = false;
4434
+ }
4435
+
4436
+ public boolean PreviousVersion()
4437
+ {
4438
+ // Option?
4439
+ Replace();
4440
+
36334441 System.err.println("Undo");
36344442
3635
- cRadio tab = GetCurrentTab();
4443
+ //cRadio tab = GetCurrentTab();
36364444
3637
- if (tab.undoindex == 0)
4445
+ if (copy.versionindex == 0)
36384446 {
36394447 java.awt.Toolkit.getDefaultToolkit().beep();
3640
- return;
4448
+ return false;
36414449 }
36424450
3643
- if (tab.graphs[tab.undoindex] == null)
3644
- {
3645
- Save();
3646
- tab.undoindex -= 1;
3647
- }
4451
+// if (tab.graphs[tab.versionindex] == null) // || !tab.user[tab.versionindex])
4452
+// {
4453
+// if (Save(false))
4454
+// tab.versionindex -= 1;
4455
+// else
4456
+// {
4457
+// if (tab.versionindex <= 0)
4458
+// return false;
4459
+// else
4460
+// tab.versionindex -= 1;
4461
+// }
4462
+// }
36484463
3649
- tab.undoindex -= 1;
4464
+ copy.versionindex -= 1;
36504465
3651
- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
4466
+ CopyChanged();
4467
+
4468
+ return true;
36524469 }
36534470
3654
- public void Redo()
4471
+ public boolean Restore()
36554472 {
3656
- cRadio tab = GetCurrentTab();
4473
+ System.err.println("Restore");
36574474
3658
- if (tab.graphs[tab.undoindex + 1] == null)
4475
+ //cRadio tab = GetCurrentTab();
4476
+
4477
+ if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
4478
+ {
4479
+ java.awt.Toolkit.getDefaultToolkit().beep();
4480
+ return false;
4481
+ }
4482
+
4483
+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
4484
+ CopyChanged();
4485
+
4486
+ return true;
4487
+ }
4488
+
4489
+ public boolean Replace()
4490
+ {
4491
+ System.err.println("Replace");
4492
+
4493
+ //cRadio tab = GetCurrentTab();
4494
+
4495
+ if (copy.versionindex == -1 || copy.versionlist[copy.versionindex] == null)
4496
+ {
4497
+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
4498
+ return false;
4499
+ }
4500
+
4501
+ copy.versionlist[copy.versionindex] = Duplicate(copy);
4502
+
4503
+ return true;
4504
+ }
4505
+
4506
+ public void NextVersion()
4507
+ {
4508
+ // Option?
4509
+ Replace();
4510
+
4511
+ //cRadio tab = GetCurrentTab();
4512
+
4513
+ if (copy.versionlist[copy.versionindex + 1] == null)
36594514 {
36604515 java.awt.Toolkit.getDefaultToolkit().beep();
36614516 return;
36624517 }
36634518
3664
- tab.undoindex += 1;
4519
+ copy.versionindex += 1;
36654520
3666
- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
4521
+ CopyChanged();
4522
+
4523
+ //if (!tab.user[tab.versionindex])
4524
+ // tab.graphs[tab.versionindex] = null;
36674525 }
36684526
36694527 void ImportGFD()
....@@ -3874,7 +4732,7 @@
38744732 //copy.material = new cMaterial(copy.GetMaterial());
38754733
38764734 current.color = (float) colorField.getFloat();
3877
- current.modulation = (float) modulationField.getFloat();
4735
+ current.modulation = (float) saturationField.getFloat();
38784736 current.metalness = (float) metalnessField.getFloat();
38794737 current.diffuse = (float) diffuseField.getFloat();
38804738 current.specular = (float) specularField.getFloat();
....@@ -3907,7 +4765,7 @@
39074765 cMaterial mat = copy.material;
39084766
39094767 colorField.SetToolTipValue((mat.color));
3910
- modulationField.SetToolTipValue((mat.modulation));
4768
+ saturationField.SetToolTipValue((mat.modulation));
39114769 metalnessField.SetToolTipValue((mat.metalness));
39124770 diffuseField.SetToolTipValue((mat.diffuse));
39134771 specularField.SetToolTipValue((mat.specular));
....@@ -3959,9 +4817,28 @@
39594817 //copy.Touch();
39604818 }
39614819
4820
+ cNumberSlider versionSlider;
4821
+
39624822 public void stateChanged(ChangeEvent e)
39634823 {
39644824 // assert(false);
4825
+ if (e.getSource() == versionSlider)
4826
+ {
4827
+ if (muteSlider)
4828
+ return;
4829
+
4830
+ Replace();
4831
+
4832
+ int version = versionSlider.getInteger();
4833
+
4834
+ if (version != -1 && copy.versionlist[version] != null)
4835
+ {
4836
+ copy.versionindex = version;
4837
+ CopyChanged();
4838
+ }
4839
+
4840
+ return;
4841
+ }
39654842
39664843 if (freezematerial)
39674844 {
....@@ -3997,6 +4874,12 @@
39974874 {
39984875 //System.out.println("stateChanged = " + this);
39994876 materialtouched = true;
4877
+
4878
+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
4879
+ {
4880
+ saturationField.setFloat(1);
4881
+ }
4882
+
40004883 applySelf();
40014884 //System.out.println("this = " + this);
40024885 //System.out.println("PARENT = " + parent);
....@@ -4296,6 +5179,7 @@
42965179 {
42975180 if (GetTree() != null)
42985181 {
5182
+ GetTree().revalidate();
42995183 GetTree().repaint();
43005184 }
43015185
....@@ -4304,13 +5188,18 @@
43045188 ctrlPanel.validate(); // ? new
43055189 ctrlPanel.repaint();
43065190 }
5191
+
5192
+ if (previousVersionButton != null && copy.versionlist != null)
5193
+ SetVersionStates();
5194
+
5195
+ cameraView.requestFocusInWindow();
43075196 }
43085197
43095198 static TweenManager tweenManager = new TweenManager();
43105199
43115200 void makeSomething(Object3D thing, boolean resetmodel) // deselect)
43125201 {
4313
- if (Globals.SAVEONMAKE) // && resetmodel)
5202
+ if (Globals.REPLACEONMAKE) // && resetmodel)
43145203 Save();
43155204 //Tween.set(thing, 0).target(1).start(tweenManager);
43165205 //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
....@@ -4335,7 +5224,7 @@
43355224 // group = (Composite) group.get(0);
43365225 // }
43375226
4338
- System.out.println("makeSomething of " + thing);
5227
+ //System.out.println("makeSomething of " + thing);
43395228
43405229 /*
43415230 if (deselect && jList != null)
....@@ -4552,7 +5441,9 @@
45525441 readobj.ResetDisplayList();
45535442 } catch (Exception e)
45545443 {
4555
- //e.printStackTrace();
5444
+ if (!e.toString().contains("GZIP"))
5445
+ e.printStackTrace();
5446
+
45565447 try
45575448 {
45585449 java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
....@@ -4626,12 +5517,14 @@
46265517
46275518 if (readobj != null)
46285519 {
4629
- if (Globals.SAVEONMAKE)
4630
- Save();
5520
+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
5521
+ // Save();
46315522 try
46325523 {
46335524 //readobj.deepCopySelf(copy);
46345525 copy.clear(); // june 2014
5526
+ copy.skyboxname = readobj.skyboxname;
5527
+ copy.skyboxext = readobj.skyboxext;
46355528 for (int i = 0; i < readobj.size(); i++)
46365529 {
46375530 Object3D child = readobj.get(i); // reserve(i);
....@@ -4672,6 +5565,7 @@
46725565 }
46735566 } catch (ClassCastException e)
46745567 {
5568
+ e.printStackTrace();
46755569 assert (false);
46765570 Composite c = (Composite) copy;
46775571 c.children.clear();
....@@ -4682,17 +5576,31 @@
46825576 c.addChild(csg);
46835577 }
46845578
5579
+ copy.versionlist = readobj.versionlist;
5580
+ copy.versionindex = readobj.versionindex;
5581
+
5582
+ if (copy.versionlist == null)
5583
+ {
5584
+ // Backward compatibility
5585
+ copy.versionlist = new Object3D[100];
5586
+ copy.versionindex = -1;
5587
+
5588
+ //Save(true);
5589
+ }
5590
+
5591
+ //? SetUndoStates();
5592
+
46855593 ResetModel();
46865594 copy.HardTouch(); // recompile?
46875595 refreshContents();
46885596 }
46895597 }
46905598
4691
- void load() // throws ClassNotFoundException
5599
+ void Open() // throws ClassNotFoundException
46925600 {
46935601 if (Grafreed.standAlone)
46945602 {
4695
- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
5603
+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
46965604 browser.show();
46975605 String filename = browser.getFile();
46985606 if (filename != null && filename.length() > 0)
....@@ -4769,6 +5677,8 @@
47695677
47705678 void save()
47715679 {
5680
+ Replace();
5681
+
47725682 if (lastname == null)
47735683 {
47745684 return;
....@@ -4791,6 +5701,7 @@
47915701 //ps.print(buffer.toString());
47925702 } catch (IOException e)
47935703 {
5704
+ e.printStackTrace();
47945705 }
47955706 }
47965707
....@@ -4973,7 +5884,7 @@
49735884 MenuBar menuBar;
49745885 Menu fileMenu;
49755886 MenuItem newItem;
4976
- MenuItem loadItem;
5887
+ MenuItem openItem;
49775888 MenuItem saveItem;
49785889 MenuItem saveAsItem;
49795890 MenuItem exportAsItem;
....@@ -4996,6 +5907,7 @@
49965907 CheckboxMenuItem toggleSwitchItem;
49975908 CheckboxMenuItem toggleRootItem;
49985909 CheckboxMenuItem animationItem;
5910
+ MenuItem archiveItem;
49995911 CheckboxMenuItem toggleHandleItem;
50005912 CheckboxMenuItem togglePaintItem;
50015913 JSplitPane mainPanel;
....@@ -5009,6 +5921,7 @@
50095921 ButtonGroup buttonGroup;
50105922
50115923 cGridBag toolboxPanel;
5924
+ cGridBag skyboxPanel;
50125925 cGridBag materialPanel;
50135926 cGridBag ctrlPanel;
50145927
....@@ -5082,7 +5995,7 @@
50825995 JLabel colorLabel;
50835996 cNumberSlider colorField;
50845997 JLabel modulationLabel;
5085
- cNumberSlider modulationField;
5998
+ cNumberSlider saturationField;
50865999 JLabel metalnessLabel;
50876000 cNumberSlider metalnessField;
50886001 JLabel diffuseLabel;
....@@ -5113,6 +6026,7 @@
51136026 cNumberSlider anisoField;
51146027 JLabel anisoVLabel;
51156028 cNumberSlider anisoVField;
6029
+
51166030 JLabel cameraLabel;
51176031 cNumberSlider cameraField;
51186032 JLabel selfshadowLabel;
....@@ -5127,6 +6041,7 @@
51276041 cNumberSlider fakedepthField;
51286042 JLabel shadowbiasLabel;
51296043 cNumberSlider shadowbiasField;
6044
+
51306045 JLabel bumpLabel;
51316046 cNumberSlider bumpField;
51326047 JLabel noiseLabel;