~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -15,6 +15,9 @@
15	15	//import javax.swing.plaf.ColorUIResource;
16	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
17	17
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
	20	+
18	21	//import javax.media.opengl.GLCanvas;
19	22
20	23	import //weka.core.
..	..	@@ -31,6 +34,7 @@
31	34	iSendInfo
32	35	//KeyListener
33	36	{
	37	+ public cToggleButton pinButton;
34	38	boolean timeline;
35	39	boolean wasFullScreen;
36	40
..	..	@@ -38,64 +42,78 @@
38	42	JFrame frame;
39	43
40	44	static ObjEditor theFrame;
	45	+
	46	+ public cGridBag GetSeparator()
	47	+ {
	48	+ cGridBag separator = new cGridBag();
	49	+ separator.add(new JSeparator());
	50	+ separator.preferredHeight = 5;
	51	+ return separator;
	52	+ }
41	53
42	54	cButton GetButton(String name, boolean border)
43	55	{
44		- try
45		- {
46		- ImageIcon icon = GetIcon(name);
47		- return new cButton(icon, border);
48		- }
49		- catch (Exception e)
50		- {
51		- return new cButton(name, border);
52		- }
	56	+ ImageIcon icon = GetIcon(name);
	57	+ return new cButton(icon, border);
	58	+ }
	59	+
	60	+ cLabel GetLabel(String name, boolean border)
	61	+ {
	62	+ //ImageIcon icon = GetIcon(name);
	63	+ return new cLabel(GetImage(name), border);
53	64	}
54	65
55	66	cToggleButton GetToggleButton(String name, boolean border)
56	67	{
57		- try
58		- {
59		- ImageIcon icon = GetIcon(name);
60		- return new cToggleButton(icon, border);
61		- }
62		- catch (Exception e)
63		- {
64		- return new cToggleButton(name, border);
65		- }
	68	+ ImageIcon icon = GetIcon(name);
	69	+ return new cToggleButton(icon, border);
66	70	}
67	71
68	72	cCheckBox GetCheckBox(String name, boolean border)
69	73	{
	74	+ ImageIcon icon = GetIcon(name);
	75	+ return new cCheckBox(icon, border);
	76	+ }
	77	+
	78	+ ImageIcon GetIcon(String name)
	79	+ {
70	80	try
71	81	{
72		- ImageIcon icon = GetIcon(name);
73		- return new cCheckBox(icon, border);
	82	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	83	+
	84	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	85	+// {
	86	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	87	+// Graphics2D g = resized.createGraphics();
	88	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	89	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	90	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	91	+// g.dispose();
	92	+//
	93	+// image = resized;
	94	+// }
	95	+
	96	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	97	+ return icon;
74	98	}
75	99	catch (Exception e)
76	100	{
77		- return new cCheckBox(name, border);
	101	+ return null;
78	102	}
79	103	}
80		-
81		- private ImageIcon GetIcon(String name) throws IOException
	104	+
	105	+ BufferedImage GetImage(String name)
82	106	{
83		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
84		-
85		- if (image.getWidth() != 24 && image.getHeight() != 24)
	107	+ try
86	108	{
87		- BufferedImage resized = new BufferedImage(24, 24, image.getType());
88		- Graphics2D g = resized.createGraphics();
89		- g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
90		- //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
91		- g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
92		- g.dispose();
93		-
94		- image = resized;
	109	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	110	+
	111	+ return image;
95	112	}
96		-
97		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
98		- return icon;
	113	+ catch (Exception e)
	114	+ {
	115	+ return null;
	116	+ }
99	117	}
100	118
101	119	// SCRIPT
..	..	@@ -207,7 +225,7 @@
207	225
208	226	objEditor.ctrlPanel.remove(namePanel);
209	227
210		- if (!GroupEditor.allparams)
	228	+ if (!allparams)
211	229	return;
212	230
213	231	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -279,6 +297,12 @@
279	297	client = inClient;
280	298	copy = client;
281	299
	300	+ if (copy.versionlist == null)
	301	+ {
	302	+ copy.versionlist = new Object3D[100];
	303	+ copy.versionindex = -1;
	304	+ }
	305	+
282	306	// "this" is not called: SetupUI2(objEditor);
283	307	}
284	308
..	..	@@ -292,6 +316,12 @@
292	316	client = inClient;
293	317	copy = client;
294	318
	319	+ if (copy.versionlist == null)
	320	+ {
	321	+ copy.versionlist = new Object3D[100];
	322	+ copy.versionindex = -1;
	323	+ }
	324	+
295	325	SetupUI2(callee.GetEditor());
296	326	}
297	327
..	..	@@ -306,7 +336,7 @@
306	336	//localCopy.parent = null;
307	337
308	338	frame = new JFrame();
309		- frame.setUndecorated(true);
	339	+ frame.setUndecorated(false);
310	340	objEditor = this;
311	341	this.callee = callee;
312	342
..	..	@@ -324,6 +354,12 @@
324	354	copy = localCopy;
325	355	copy.editWindow = this;
326	356
	357	+ if (copy.versionlist == null)
	358	+ {
	359	+// copy.versions = new byte[100][];
	360	+// copy.versionindex = -1;
	361	+ }
	362	+
327	363	SetupMenu();
328	364
329	365	//SetupName(objEditor); // new
..	..	@@ -337,12 +373,17 @@
337	373	return frame.action(event, obj);
338	374	}
339	375
	376	+ // Cannot work without static
	377	+ static boolean allparams = true;
	378	+
	379	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	380	+
340	381	void SetupMenu()
341	382	{
342	383	frame.setMenuBar(menuBar = new MenuBar());
343	384	menuBar.add(fileMenu = new Menu("File"));
344	385	fileMenu.add(newItem = new MenuItem("New"));
345		- fileMenu.add(loadItem = new MenuItem("Open..."));
	386	+ fileMenu.add(openItem = new MenuItem("Open..."));
346	387
347	388	//oe.menuBar.add(menu = new Menu("Include"));
348	389	Menu menu = new Menu("Import");
..	..	@@ -374,7 +415,7 @@
374	415	}
375	416
376	417	newItem.addActionListener(this);
377		- loadItem.addActionListener(this);
	418	+ openItem.addActionListener(this);
378	419	saveItem.addActionListener(this);
379	420	saveAsItem.addActionListener(this);
380	421	exportAsItem.addActionListener(this);
..	..	@@ -398,6 +439,11 @@
398	439	//
399	440	// materialFlushed = true;
400	441	// }
	442	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	443	+// {
	444	+// if (listUI.size() == 0)
	445	+// EditSelection(false);
	446	+// }
401	447
402	448	refreshContents(false); // To refresh Info tab
403	449	}
..	..	@@ -406,11 +452,12 @@
406	452
407	453	toolbarPanel = new JPanel();
408	454	toolbarPanel.setName("Toolbar");
	455	+
409	456	treePanel = new cGridBag();
410	457	treePanel.setName("Tree");
411	458
412	459	editPanel = new cGridBag().setVertical(true);
413		- editPanel.setName("Edit");
	460	+ //editPanel.setName("Edit");
414	461
415	462	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
416	463
..	..	@@ -418,11 +465,13 @@
418	465	editPanel.add(editCommandsPanel);
419	466	editPanel.add(ctrlPanel);
420	467
421		- toolboxPanel = new cGridBag().setVertical(false);
422		- toolboxPanel.setName("Toolbox");
	468	+ toolboxPanel = new cGridBag().setVertical(true);
	469	+ //toolboxPanel.setName("Toolbox");
423	470
424		- materialPanel = new cGridBag().setVertical(true);
425		- materialPanel.setName("Material");
	471	+ skyboxPanel = new cGridBag().setVertical(true);
	472	+
	473	+ materialPanel = new cGridBag().setVertical(false);
	474	+ //materialPanel.setName("Material");
426	475
427	476	/JTextPane/
428	477	infoarea = createTextPane();
..	..	@@ -430,14 +479,15 @@
430	479
431	480	infoarea.setEditable(true);
432	481	SetText();
	482	+
433	483	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
434	484	// infoarea.setOpaque(false);
435	485	// //infoarea.setForeground(textcolor);
436	486	// TEXTAREA infoarea.setLineWrap(true);
437	487	// TEXTAREA infoarea.setWrapStyleWord(true);
438	488	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
439		- infoPanel.setPreferredSize(new Dimension(50, 200));
440		- infoPanel.setName("Info");
	489	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	490	+ //infoPanel.setName("Info");
441	491	//infoPanel.setLayout(new BorderLayout());
442	492	//infoPanel.add(createTextPane());
443	493
..	..	@@ -448,7 +498,14 @@
448	498	mainPanel.setDividerSize(9);
449	499	mainPanel.setDividerLocation(0.5); //1.0);
450	500	mainPanel.setResizeWeight(0.5);
451		-
	501	+
	502	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	503	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	504	+ divider.setDividerSize(15);
	505	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	506	+
	507	+ mainPanel.setUI(new BasicSplitPaneUI());
	508	+
452	509	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
453	510	//mainPanel.setLayout(new GridBagLayout());
454	511	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -679,8 +736,8 @@
679	736	}
680	737	}
681	738
682		-static GraphicsDevice device = GraphicsEnvironment
683		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	739	+//static GraphicsDevice device = GraphicsEnvironment
	740	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
684	741
685	742	Rectangle keeprect;
686	743	cRadio radio;
..	..	@@ -697,14 +754,24 @@
697	754	boolean maximized;
698	755
699	756	cButton fullscreenLayout;
	757	+ cButton expandedLayout;
700	758
701	759	void Minimize()
702	760	{
703	761	frame.setState(Frame.ICONIFIED);
	762	+ frame.validate();
704	763	}
705	764
	765	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	766	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	767	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
706	768	void Maximize()
707	769	{
	770	+ if (CameraPane.FULLSCREEN)
	771	+ {
	772	+ ToggleFullScreen();
	773	+ }
	774	+
708	775	if (maximized)
709	776	{
710	777	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -712,20 +779,38 @@
712	779	else
713	780	{
714	781	keeprect = frame.getBounds();
715		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
716		- Dimension rect2 = frame.getToolkit().getScreenSize();
717		- frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	782	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	783	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	784	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
718	785	// frame.setState(Frame.MAXIMIZED_BOTH);
	786	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
719	787	}
720	788
721	789	maximized ^= true;
	790	+
	791	+ frame.validate();
722	792	}
	793	+
	794	+ cButton minButton;
	795	+ cButton maxButton;
	796	+ cButton fullButton;
	797	+ cButton collapseButton;
	798	+ cButton maximize3DButton;
723	799
724	800	void ToggleFullScreen()
725	801	{
726		- if (CameraPane.FULLSCREEN)
	802	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	803	+
	804	+ cameraView.ToggleFullScreen();
	805	+
	806	+ if (!CameraPane.FULLSCREEN)
727	807	{
728	808	device.setFullScreenWindow(null);
	809	+ frame.dispose();
	810	+ frame.setUndecorated(false);
	811	+ frame.validate();
	812	+ frame.setVisible(true);
	813	+
729	814	//frame.setVisible(false);
730	815	// frame.removeNotify();
731	816	// frame.setUndecorated(false);
..	..	@@ -735,13 +820,13 @@
735	820	// X frame.getContentPane().remove(/"Center",/bigThree);
736	821	// X framePanel.add(bigThree);
737	822	// X frame.getContentPane().add(/"Center",/framePanel);
738		- framePanel.setDividerLocation(1);
	823	+// framePanel.setDividerLocation(46); // icons are 24x24
739	824
740	825	//frame.setVisible(true);
741		- radio.layout = keepButton;
	826	+// radio.layout = keepButton;
742	827	//theFrame = null;
743	828	keepButton = null;
744		- radio.layout.doClick();
	829	+// radio.layout.doClick();
745	830
746	831	} else
747	832	{
..	..	@@ -750,22 +835,59 @@
750	835	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
751	836	// frame.getToolkit().getScreenSize().height);
752	837	//frame.setVisible(false);
	838	+
	839	+ frame.dispose();
	840	+ frame.setUndecorated(true);
753	841	device.setFullScreenWindow(frame);
	842	+ frame.validate();
	843	+ frame.setVisible(true);
754	844	// frame.removeNotify();
755	845	// frame.setUndecorated(true);
756	846	// frame.addNotify();
757	847	// X frame.getContentPane().remove(/"Center",/framePanel);
758	848	// X framePanel.remove(bigThree);
759	849	// X frame.getContentPane().add(/"Center",/bigThree);
760		- framePanel.setDividerLocation(0);
	850	+// framePanel.setDividerLocation(0);
761	851
762		- radio.layout = fullscreenLayout;
763		- radio.layout.doClick();
	852	+// radio.layout = fullscreenLayout;
	853	+// radio.layout.doClick();
764	854	//frame.setVisible(true);
765	855	}
766		-
767		- cameraView.ToggleFullScreen();
	856	+ frame.validate();
	857	+
	858	+ cameraView.requestFocusInWindow();
768	859	}
	860	+
	861	+ void CollapseToolbar()
	862	+ {
	863	+ framePanel.setDividerLocation(0);
	864	+ //frame.validate();
	865	+
	866	+ cameraView.requestFocusInWindow();
	867	+ }
	868	+
	869	+ private Object3D Duplicate(Object3D object)
	870	+ {
	871	+ boolean temp = CameraPane.SWITCH;
	872	+ CameraPane.SWITCH = false;
	873	+
	874	+ object.ExtractBigData(versiontable);
	875	+ // if (copy == client)
	876	+
	877	+ Object3D versions[] = object.versionlist;
	878	+ object.versionlist = null;
	879	+
	880	+ //byte[] compress = Compress(copy);
	881	+ Object3D compress = (Object3D)Grafreed.clone(object);
	882	+
	883	+ object.versionlist = versions;
	884	+
	885	+ object.RestoreBigData(versiontable);
	886	+
	887	+ CameraPane.SWITCH = temp;
	888	+
	889	+ return compress;
	890	+ }
769	891
770	892	private JTextPane createTextPane()
771	893	{
..	..	@@ -888,6 +1010,7 @@
888	1010	{
889	1011	SetupMaterial(materialPanel);
890	1012	}
	1013	+
891	1014	//SetupName();
892	1015	//SetupViews();
893	1016	}
..	..	@@ -897,7 +1020,7 @@
897	1020	// NumberSlider vDivsField;
898	1021	// JCheckBox endcaps;
899	1022	JCheckBox liveCB;
900		- JCheckBox selectCB;
	1023	+ JCheckBox selectableCB;
901	1024	JCheckBox hideCB;
902	1025	JCheckBox link2masterCB;
903	1026	JCheckBox markCB;
..	..	@@ -1096,39 +1219,55 @@
1096	1219
1097	1220	namePanel = new cGridBag();
1098	1221
	1222	+ //if (copy.pinned)
	1223	+ {
	1224	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1225	+ pinButton.setSelected(copy.pinned);
	1226	+ cGridBag t = new cGridBag();
	1227	+ t.preferredWidth = 2;
	1228	+ t.add(pinButton);
	1229	+ namePanel.add(t);
	1230	+
	1231	+ pinButton.addItemListener(this);
	1232	+ }
	1233	+
1099	1234	nameField = AddText(namePanel, copy.GetName());
1100		- namePanel.add(nameField);
	1235	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1101	1236	oe.ctrlPanel.add(namePanel);
1102	1237
1103	1238	oe.ctrlPanel.Return();
1104	1239
1105		- if (!GroupEditor.allparams)
	1240	+ if (!allparams)
1106	1241	return;
1107	1242
1108	1243	setupPanel = new cGridBag().setVertical(false);
1109	1244
1110	1245	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1111	1246	liveCB.setToolTipText("Animate object");
1112		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1113		- selectCB.setToolTipText("Make object selectable");
	1247	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1248	+ selectableCB.setToolTipText("Make object selectable");
1114	1249	// Return();
	1250	+
1115	1251	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1116	1252	hideCB.setToolTipText("Hide object");
1117	1253	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1118		- markCB.setToolTipText("Set the animation target transform");
	1254	+ markCB.setToolTipText("As animation target transform");
	1255	+
	1256	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1119	1257
1120	1258	setupPanel2 = new cGridBag().setVertical(false);
1121	1259
1122	1260	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1123	1261	rewindCB.setToolTipText("Rewind animation");
1124	1262
1125		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1126		- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1263	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1264	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1127	1265
	1266	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1267	+ link2masterCB.setToolTipText("Attach to support");
	1268	+
1128	1269	if (Globals.ADVANCED)
1129	1270	{
1130		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1131		- link2masterCB.setToolTipText("Attach to support");
1132	1271	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1133	1272	speedupCB.setToolTipText("Option motion capture");
1134	1273	}
..	..	@@ -1402,6 +1541,7 @@
1402	1541	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1403	1542	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1404	1543	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1544	+ //XYZPanel.setName("XYZ");
1405	1545
1406	1546	/*
1407	1547	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1439,14 +1579,29 @@
1439	1579	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1440	1580	//tmp.setName("Edit");
1441	1581	objectPanel.add(materialPanel);
	1582	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1583	+ objectPanel.setToolTipTextAt(0, "Material");
	1584	+
1442	1585	objectPanel.add(toolboxPanel);
	1586	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1587	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1588	+
	1589	+ objectPanel.add(skyboxPanel);
	1590	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1591	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1592	+
1443	1593	// JPanel north = new JPanel(new BorderLayout());
1444	1594	// north.setName("Edit");
1445	1595	// north.add(ctrlPanel, BorderLayout.NORTH);
1446	1596	// objectPanel.add(north);
1447	1597	objectPanel.add(editPanel);
1448		- objectPanel.add(infoPanel);
1449		-
	1598	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1599	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1600	+
	1601	+ objectPanel.add(XYZPanel);
	1602	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1603	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1604	+
1450	1605	/*
1451	1606	aConstraints.gridx = 0;
1452	1607	aConstraints.gridwidth = 1;
..	..	@@ -1454,7 +1609,7 @@
1454	1609	aConstraints.gridy += 1;
1455	1610	aConstraints.gridwidth = 1;
1456	1611	mainPanel.add(objectPanel, aConstraints);
1457		- */
	1612	+ */
1458	1613
1459	1614	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1460	1615	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1466,7 +1621,7 @@
1466	1621	scrollpane.addMouseWheelListener(this); // Default not fast enough
1467	1622
1468	1623	/JTabbedPane/ scenePanel = new cGridBag();
1469		- scenePanel.preferredWidth = 6;
	1624	+ scenePanel.preferredWidth = 5;
1470	1625
1471	1626	JTabbedPane tabbedPane = new JTabbedPane();
1472	1627	tabbedPane.add(scrollpane);
..	..	@@ -1483,6 +1638,11 @@
1483	1638
1484	1639	scenePanel.add(tabbedPane);
1485	1640
	1641	+ //if (Globals.ADVANCED)
	1642	+ tabbedPane.add(infoPanel);
	1643	+ tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1644	+ tabbedPane.setToolTipTextAt(3, "Information");
	1645	+
1486	1646	/*
1487	1647	cTree jTree = new cTree(null);
1488	1648	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1544,7 +1704,7 @@
1544	1704	bigThree = new cGridBag();
1545	1705	bigThree.addComponent(scenePanel);
1546	1706	bigThree.addComponent(centralPanel);
1547		- bigThree.addComponent(XYZPanel);
	1707	+ //bigThree.addComponent(XYZPanel);
1548	1708
1549	1709	// // SIDE EFFECT!!!
1550	1710	// aConstraints.gridx = 0;
..	..	@@ -1553,9 +1713,26 @@
1553	1713	// aConstraints.gridheight = 1;
1554	1714
1555	1715	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1556		- framePanel.setContinuousLayout(true);
1557		- framePanel.setOneTouchExpandable(true);
1558		- framePanel.setDividerLocation(0.8);
	1716	+
	1717	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1718	+ new java.beans.PropertyChangeListener()
	1719	+ {
	1720	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1721	+ {
	1722	+ if ((Integer)pce.getOldValue() == 1)
	1723	+ {
	1724	+ if (radio.layout != expandedLayout)
	1725	+ {
	1726	+ radio.layout = expandedLayout;
	1727	+ radio.layout.doClick();
	1728	+ }
	1729	+ }
	1730	+ }
	1731	+ });
	1732	+
	1733	+ framePanel.setContinuousLayout(false);
	1734	+ framePanel.setOneTouchExpandable(false);
	1735	+ //.setDividerLocation(0.8);
1559	1736	//framePanel.setDividerSize(15);
1560	1737	//framePanel.setResizeWeight(0.15);
1561	1738	framePanel.setName("Frame");
..	..	@@ -1574,17 +1751,17 @@
1574	1751
1575	1752	frame.setSize(1280, 860);
1576	1753
1577		- frame.validate();
1578		- frame.setVisible(true);
1579		-
1580	1754	cameraView.requestFocusInWindow();
1581	1755
1582	1756	gridPanel.setDividerLocation(1.0);
	1757	+
	1758	+ frame.validate();
	1759	+
	1760	+ frame.setVisible(true);
1583	1761
1584	1762	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1585	1763	frame.addWindowListener(new WindowAdapter()
1586	1764	{
1587		-
1588	1765	public void windowClosing(WindowEvent e)
1589	1766	{
1590	1767	Close();
..	..	@@ -1607,12 +1784,403 @@
1607	1784	ctrlPanel.removeAll();
1608	1785	}
1609	1786
1610		- void SetupMaterial(cGridBag panel)
	1787	+ void SetupMaterial(cGridBag materialpanel)
1611	1788	{
1612		- /*
	1789	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1790	+
	1791	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1792	+ skin.setToolTipText("Skin");
	1793	+ skin.addMouseListener(new MouseAdapter()
	1794	+ {
	1795	+ public void mouseClicked(MouseEvent e)
	1796	+ {
	1797	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1798	+ cMaterial material = object.material;
	1799	+
	1800	+ // Skin
	1801	+ colorField.setFloat(material.color);
	1802	+ saturationField.setFloat(material.modulation);
	1803	+ subsurfaceField.setFloat(material.subsurface);
	1804	+ selfshadowField.setFloat(material.diffuseness);
	1805	+ diffusenessField.setFloat(material.factor);
	1806	+ shininessField.setFloat(material.shininess);
	1807	+ shadowbiasField.setFloat(material.shadowbias);
	1808	+ diffuseField.setFloat(material.diffuse);
	1809	+ specularField.setFloat(material.specular);
	1810	+
	1811	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1812	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1813	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1814	+
	1815	+ materialtouched = true;
	1816	+ applySelf();
	1817	+ }
	1818	+ });
	1819	+ presetpanel.add(skin);
	1820	+
	1821	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1822	+ lambert.setToolTipText("Diffuse");
	1823	+ lambert.addMouseListener(new MouseAdapter()
	1824	+ {
	1825	+ public void mouseClicked(MouseEvent e)
	1826	+ {
	1827	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1828	+ cMaterial material = object.material;
	1829	+
	1830	+ diffusenessField.setFloat(material.factor);
	1831	+ selfshadowField.setFloat(material.diffuseness);
	1832	+
	1833	+ materialtouched = true;
	1834	+ applySelf();
	1835	+ }
	1836	+ });
	1837	+ presetpanel.add(lambert);
	1838	+
	1839	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1840	+ diffuse2.setToolTipText("Diffuse2");
	1841	+ diffuse2.addMouseListener(new MouseAdapter()
	1842	+ {
	1843	+ public void mouseClicked(MouseEvent e)
	1844	+ {
	1845	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1846	+ cMaterial material = object.material;
	1847	+
	1848	+ diffusenessField.setFloat(material.factor);
	1849	+ selfshadowField.setFloat(material.diffuseness);
	1850	+
	1851	+ materialtouched = true;
	1852	+ applySelf();
	1853	+ }
	1854	+ });
	1855	+ presetpanel.add(diffuse2);
	1856	+
	1857	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1858	+ diffusemoon.setToolTipText("Moon");
	1859	+ diffusemoon.addMouseListener(new MouseAdapter()
	1860	+ {
	1861	+ public void mouseClicked(MouseEvent e)
	1862	+ {
	1863	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1864	+ cMaterial material = object.material;
	1865	+
	1866	+ diffusenessField.setFloat(material.factor);
	1867	+ selfshadowField.setFloat(material.diffuseness);
	1868	+
	1869	+ materialtouched = true;
	1870	+ applySelf();
	1871	+ }
	1872	+ });
	1873	+ presetpanel.add(diffusemoon);
	1874	+
	1875	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1876	+ diffusemoon2.setToolTipText("Moon2");
	1877	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1878	+ {
	1879	+ public void mouseClicked(MouseEvent e)
	1880	+ {
	1881	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1882	+ cMaterial material = object.material;
	1883	+
	1884	+ diffusenessField.setFloat(material.factor);
	1885	+ selfshadowField.setFloat(material.diffuseness);
	1886	+
	1887	+ materialtouched = true;
	1888	+ applySelf();
	1889	+ }
	1890	+ });
	1891	+ presetpanel.add(diffusemoon2);
	1892	+
	1893	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1894	+ diffusemoon3.setToolTipText("Moon3");
	1895	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1896	+ {
	1897	+ public void mouseClicked(MouseEvent e)
	1898	+ {
	1899	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1900	+ cMaterial material = object.material;
	1901	+
	1902	+ diffusenessField.setFloat(material.factor);
	1903	+ selfshadowField.setFloat(material.diffuseness);
	1904	+
	1905	+ materialtouched = true;
	1906	+ applySelf();
	1907	+ }
	1908	+ });
	1909	+ presetpanel.add(diffusemoon3);
	1910	+
	1911	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1912	+ diffusesheen.setToolTipText("Sheen");
	1913	+ diffusesheen.addMouseListener(new MouseAdapter()
	1914	+ {
	1915	+ public void mouseClicked(MouseEvent e)
	1916	+ {
	1917	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1918	+ cMaterial material = object.material;
	1919	+
	1920	+ sheenField.setFloat(material.sheen);
	1921	+
	1922	+ materialtouched = true;
	1923	+ applySelf();
	1924	+ }
	1925	+ });
	1926	+ presetpanel.add(diffusesheen);
	1927	+
	1928	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	1929	+ rough.setToolTipText("Rough metal");
	1930	+ rough.addMouseListener(new MouseAdapter()
	1931	+ {
	1932	+ public void mouseClicked(MouseEvent e)
	1933	+ {
	1934	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	1935	+ cMaterial material = object.material;
	1936	+
	1937	+ shininessField.setFloat(material.shininess);
	1938	+ velvetField.setFloat(material.velvet);
	1939	+
	1940	+ materialtouched = true;
	1941	+ applySelf();
	1942	+ }
	1943	+ });
	1944	+ presetpanel.add(rough);
	1945	+
	1946	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	1947	+ rough2.setToolTipText("Medium metal");
	1948	+ rough2.addMouseListener(new MouseAdapter()
	1949	+ {
	1950	+ public void mouseClicked(MouseEvent e)
	1951	+ {
	1952	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	1953	+ cMaterial material = object.material;
	1954	+
	1955	+ shininessField.setFloat(material.shininess);
	1956	+ lightareaField.setFloat(material.lightarea);
	1957	+
	1958	+ materialtouched = true;
	1959	+ applySelf();
	1960	+ }
	1961	+ });
	1962	+ presetpanel.add(rough2);
	1963	+
	1964	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	1965	+ shini0.setToolTipText("Shiny");
	1966	+ shini0.addMouseListener(new MouseAdapter()
	1967	+ {
	1968	+ public void mouseClicked(MouseEvent e)
	1969	+ {
	1970	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	1971	+ cMaterial material = object.material;
	1972	+
	1973	+ shininessField.setFloat(material.shininess);
	1974	+ lightareaField.setFloat(material.lightarea);
	1975	+
	1976	+ materialtouched = true;
	1977	+ applySelf();
	1978	+ }
	1979	+ });
	1980	+ presetpanel.add(shini0);
	1981	+
	1982	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	1983	+ shini1.setToolTipText("Shiny2");
	1984	+ shini1.addMouseListener(new MouseAdapter()
	1985	+ {
	1986	+ public void mouseClicked(MouseEvent e)
	1987	+ {
	1988	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	1989	+ cMaterial material = object.material;
	1990	+
	1991	+ shininessField.setFloat(material.shininess);
	1992	+ lightareaField.setFloat(material.lightarea);
	1993	+
	1994	+ materialtouched = true;
	1995	+ applySelf();
	1996	+ }
	1997	+ });
	1998	+ presetpanel.add(shini1);
	1999	+
	2000	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2001	+ shini2.setToolTipText("Shiny3");
	2002	+ shini2.addMouseListener(new MouseAdapter()
	2003	+ {
	2004	+ public void mouseClicked(MouseEvent e)
	2005	+ {
	2006	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2007	+ cMaterial material = object.material;
	2008	+
	2009	+ shininessField.setFloat(material.shininess);
	2010	+ lightareaField.setFloat(material.lightarea);
	2011	+
	2012	+ materialtouched = true;
	2013	+ applySelf();
	2014	+ }
	2015	+ });
	2016	+ presetpanel.add(shini2);
	2017	+
	2018	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2019	+ aniso.setToolTipText("AnisoU");
	2020	+ aniso.addMouseListener(new MouseAdapter()
	2021	+ {
	2022	+ public void mouseClicked(MouseEvent e)
	2023	+ {
	2024	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2025	+ cMaterial material = object.material;
	2026	+
	2027	+ anisoField.setFloat(material.aniso);
	2028	+ anisoVField.setFloat(material.anisoV);
	2029	+
	2030	+ materialtouched = true;
	2031	+ applySelf();
	2032	+ }
	2033	+ });
	2034	+ presetpanel.add(aniso);
	2035	+
	2036	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2037	+ aniso2.setToolTipText("AnisoV");
	2038	+ aniso2.addMouseListener(new MouseAdapter()
	2039	+ {
	2040	+ public void mouseClicked(MouseEvent e)
	2041	+ {
	2042	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2043	+ cMaterial material = object.material;
	2044	+
	2045	+ anisoField.setFloat(material.aniso);
	2046	+ anisoVField.setFloat(material.anisoV);
	2047	+
	2048	+ materialtouched = true;
	2049	+ applySelf();
	2050	+ }
	2051	+ });
	2052	+ presetpanel.add(aniso2);
	2053	+
	2054	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2055	+ aniso3.setToolTipText("AnisoUV");
	2056	+ aniso3.addMouseListener(new MouseAdapter()
	2057	+ {
	2058	+ public void mouseClicked(MouseEvent e)
	2059	+ {
	2060	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2061	+ cMaterial material = object.material;
	2062	+
	2063	+ anisoField.setFloat(material.aniso);
	2064	+ anisoVField.setFloat(material.anisoV);
	2065	+
	2066	+ materialtouched = true;
	2067	+ applySelf();
	2068	+ }
	2069	+ });
	2070	+ presetpanel.add(aniso3);
	2071	+
	2072	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2073	+ velvet0.setToolTipText("Velvet");
	2074	+ velvet0.addMouseListener(new MouseAdapter()
	2075	+ {
	2076	+ public void mouseClicked(MouseEvent e)
	2077	+ {
	2078	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2079	+ cMaterial material = object.material;
	2080	+
	2081	+ diffusenessField.setFloat(material.factor);
	2082	+ selfshadowField.setFloat(material.diffuseness);
	2083	+ sheenField.setFloat(material.sheen);
	2084	+ shininessField.setFloat(material.shininess);
	2085	+ velvetField.setFloat(material.velvet);
	2086	+ shiftField.setFloat(material.shift);
	2087	+
	2088	+ materialtouched = true;
	2089	+ applySelf();
	2090	+ }
	2091	+ });
	2092	+ presetpanel.add(velvet0);
	2093	+
	2094	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2095	+ bump0.setToolTipText("Bump texture");
	2096	+ bump0.addMouseListener(new MouseAdapter()
	2097	+ {
	2098	+ public void mouseClicked(MouseEvent e)
	2099	+ {
	2100	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2101	+ cMaterial material = object.material;
	2102	+
	2103	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2104	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2105	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2106	+
	2107	+ materialtouched = true;
	2108	+ applySelf();
	2109	+ }
	2110	+ });
	2111	+ presetpanel.add(bump0);
	2112	+
	2113	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2114	+ halo.setToolTipText("Halo");
	2115	+ halo.addMouseListener(new MouseAdapter()
	2116	+ {
	2117	+ public void mouseClicked(MouseEvent e)
	2118	+ {
	2119	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2120	+ cMaterial material = object.material;
	2121	+
	2122	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2123	+
	2124	+ materialtouched = true;
	2125	+ applySelf();
	2126	+ }
	2127	+ });
	2128	+ presetpanel.add(halo);
	2129	+
	2130	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2131	+ candle.setToolTipText("Candle");
	2132	+ candle.addMouseListener(new MouseAdapter()
	2133	+ {
	2134	+ public void mouseClicked(MouseEvent e)
	2135	+ {
	2136	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2137	+ cMaterial material = object.material;
	2138	+
	2139	+ subsurfaceField.setFloat(material.subsurface);
	2140	+ shadowbiasField.setFloat(material.shadowbias);
	2141	+ ambientField.setFloat(material.ambient);
	2142	+ specularField.setFloat(material.specular);
	2143	+ lightareaField.setFloat(material.lightarea);
	2144	+ shininessField.setFloat(material.shininess);
	2145	+
	2146	+ materialtouched = true;
	2147	+ applySelf();
	2148	+ }
	2149	+ });
	2150	+ presetpanel.add(candle);
	2151	+
	2152	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2153	+ shadowShader.setToolTipText("Shadow");
	2154	+ shadowShader.addMouseListener(new MouseAdapter()
	2155	+ {
	2156	+ public void mouseClicked(MouseEvent e)
	2157	+ {
	2158	+ diffuseField.setFloat(0.001);
	2159	+ ambientField.setFloat(0.001);
	2160	+ cameraField.setFloat(0.001);
	2161	+ specularField.setFloat(0.001);
	2162	+ fakedepthField.setFloat(0.001);
	2163	+ opacityField.setFloat(0.6);
	2164	+
	2165	+ materialtouched = true;
	2166	+ applySelf();
	2167	+ }
	2168	+ });
	2169	+ presetpanel.add(shadowShader);
	2170	+
	2171	+ cGridBag panel = new cGridBag().setVertical(true);
	2172	+
	2173	+ presetpanel.preferredWidth = 1;
	2174	+
	2175	+ materialpanel.add(presetpanel);
	2176	+ materialpanel.add(panel);
	2177	+
	2178	+ panel.preferredWidth = 8;
	2179	+
	2180	+ /*
1613	2181	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1614	2182	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1615		- */
	2183	+ */
1616	2184
1617	2185	cGridBag editBar = new cGridBag().setVertical(false);
1618	2186
..	..	@@ -1646,45 +2214,50 @@
1646	2214	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1647	2215
1648	2216	cGridBag colorSection = new cGridBag().setVertical(true);
	2217	+
	2218	+ cGridBag huepanel = new cGridBag();
	2219	+ cGridBag huelabel = new cGridBag();
	2220	+ skin = GetLabel("icons/hue.png", false);
	2221	+ skin.fit = true;
	2222	+ huelabel.add(skin);
	2223	+ huelabel.preferredWidth = 20;
	2224	+ huepanel.add(new cGridBag()); // Label
	2225	+ huepanel.add(huelabel); // Field/slider
	2226	+
	2227	+ huepanel.preferredHeight = 7;
	2228	+
	2229	+ colorSection.add(huepanel);
1649	2230
1650	2231	cGridBag color = new cGridBag();
1651		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1652		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1653		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2232	+
	2233	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2234	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2235	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2236	+
1654	2237	//colorField.preferredWidth = 200;
1655	2238	colorSection.add(color);
1656	2239
1657	2240	cGridBag modulation = new cGridBag();
1658	2241	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1659	2242	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1660		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2243	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1661	2244	colorSection.add(modulation);
1662	2245
	2246	+ cGridBag opacity = new cGridBag();
	2247	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2248	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2249	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2250	+ colorSection.add(opacity);
	2251	+
	2252	+ colorSection.add(GetSeparator());
	2253	+
1663	2254	cGridBag texture = new cGridBag();
1664	2255	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1665	2256	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1666	2257	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1667	2258	colorSection.add(texture);
1668	2259
1669		- cGridBag anisoU = new cGridBag();
1670		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1671		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1672		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1673		- colorSection.add(anisoU);
1674		-
1675		- cGridBag anisoV = new cGridBag();
1676		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1677		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1678		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1679		- colorSection.add(anisoV);
1680		-
1681		- cGridBag shadowbias = new cGridBag();
1682		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1683		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1684		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1685		- colorSection.add(shadowbias);
1686		-
1687		- panel.add(new JSeparator());
	2260	+ panel.add(GetSeparator());
1688	2261
1689	2262	panel.add(colorSection);
1690	2263
..	..	@@ -1734,7 +2307,13 @@
1734	2307	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1735	2308	diffuseSection.add(fakedepth);
1736	2309
1737		- panel.add(new JSeparator());
	2310	+ cGridBag shadowbias = new cGridBag();
	2311	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2312	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2313	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2314	+ diffuseSection.add(shadowbias);
	2315	+
	2316	+ panel.add(GetSeparator());
1738	2317
1739	2318	panel.add(diffuseSection);
1740	2319
..	..	@@ -1784,42 +2363,48 @@
1784	2363	// aConstraints.gridy += 1;
1785	2364	// aConstraints.gridwidth = 1;
1786	2365
	2366	+ cGridBag anisoU = new cGridBag();
	2367	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2368	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2369	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2370	+ specularSection.add(anisoU);
1787	2371
1788		- panel.add(new JSeparator());
	2372	+ cGridBag anisoV = new cGridBag();
	2373	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2374	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2375	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2376	+ specularSection.add(anisoV);
	2377	+
	2378	+
	2379	+ panel.add(GetSeparator());
1789	2380
1790	2381	panel.add(specularSection);
1791	2382
1792	2383	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1793	2384
1794		- cGridBag globalSection = new cGridBag().setVertical(true);
	2385	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1795	2386
1796	2387	cGridBag camera = new cGridBag();
1797	2388	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1798	2389	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1799	2390	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1800		- globalSection.add(camera);
	2391	+ colorSection.add(camera);
1801	2392
1802	2393	cGridBag ambient = new cGridBag();
1803	2394	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1804	2395	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1805	2396	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1806		- globalSection.add(ambient);
	2397	+ colorSection.add(ambient);
1807	2398
1808	2399	cGridBag backlit = new cGridBag();
1809	2400	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1810	2401	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1811	2402	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1812		- globalSection.add(backlit);
	2403	+ colorSection.add(backlit);
1813	2404
1814		- cGridBag opacity = new cGridBag();
1815		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1816		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1817		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1818		- globalSection.add(opacity);
1819		-
1820		- panel.add(new JSeparator());
	2405	+ //panel.add(new JSeparator());
1821	2406
1822		- panel.add(globalSection);
	2407	+ //panel.add(globalSection);
1823	2408
1824	2409	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1825	2410
..	..	@@ -1861,7 +2446,7 @@
1861	2446	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1862	2447	textureSection.add(opacityPower);
1863	2448
1864		- panel.add(new JSeparator());
	2449	+ panel.add(GetSeparator());
1865	2450
1866	2451	panel.add(textureSection);
1867	2452
..	..	@@ -1926,8 +2511,9 @@
1926	2511	// 3D models
1927	2512	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1928	2513	{
1929		- lastConverter = new com.jmex.model.converters.MaxToJme();
1930		- LoadFile(filename, lastConverter);
	2514	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2515	+ //LoadFile(filename, lastConverter);
	2516	+ LoadObjFile(filename); // New 3ds loader
1931	2517	continue;
1932	2518	}
1933	2519	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2653,6 +3239,7 @@
2653	3239	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2654	3240	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2655	3241	}
	3242	+
2656	3243	//cJME.count++;
2657	3244	//cJME.count %= 12;
2658	3245	if (gc)
..	..	@@ -2836,6 +3423,7 @@
2836	3423	}
2837	3424	}
2838	3425	}
	3426	+
2839	3427	cFileSystemPane FSPane;
2840	3428
2841	3429	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2845,7 +3433,7 @@
2845	3433
2846	3434	freezematerial = true;
2847	3435	colorField.setFloat(mat.color);
2848		- modulationField.setFloat(mat.modulation);
	3436	+ saturationField.setFloat(mat.modulation);
2849	3437	metalnessField.setFloat(mat.metalness);
2850	3438	diffuseField.setFloat(mat.diffuse);
2851	3439	specularField.setFloat(mat.specular);
..	..	@@ -2889,6 +3477,7 @@
2889	3477	}
2890	3478	}
2891	3479	}
	3480	+
2892	3481	freezematerial = false;
2893	3482	}
2894	3483
..	..	@@ -3007,12 +3596,17 @@
3007	3596	// }
3008	3597
3009	3598	/**/
3010		- if (deselect)
	3599	+ if (deselect \|\| child == null)
3011	3600	{
3012	3601	//group.deselectAll();
3013	3602	//freeze = true;
3014	3603	GetTree().clearSelection();
3015	3604	//freeze = false;
	3605	+
	3606	+ if (child == null)
	3607	+ {
	3608	+ return;
	3609	+ }
3016	3610	}
3017	3611
3018	3612	//group.addSelectee(child);
..	..	@@ -3046,6 +3640,17 @@
3046	3640	public void itemStateChanged(ItemEvent event)
3047	3641	{
3048	3642	// System.out.println("Propagate = " + propagate);
	3643	+ if (event.getSource() == pinButton)
	3644	+ {
	3645	+ copy.pinned ^= true;
	3646	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3647	+ {
	3648	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3649	+ copy.CloseUI();
	3650	+ //copy.editWindow.refreshContents();
	3651	+ }
	3652	+ }
	3653	+ else
3049	3654	if (event.getSource() == propagateToggle)
3050	3655	{
3051	3656	propagate ^= true;
..	..	@@ -3150,8 +3755,9 @@
3150	3755	} else if (event.getSource() == liveCB)
3151	3756	{
3152	3757	copy.live ^= true;
	3758	+ objEditor.refreshContents(true); // To show item colors
3153	3759	return;
3154		- } else if (event.getSource() == selectCB)
	3760	+ } else if (event.getSource() == selectableCB)
3155	3761	{
3156	3762	copy.dontselect ^= true;
3157	3763	return;
..	..	@@ -3159,7 +3765,7 @@
3159	3765	{
3160	3766	copy.hide ^= true;
3161	3767	copy.Touch(); // display list issue
3162		- objEditor.refreshContents();
	3768	+ objEditor.refreshContents(true); // To show item colors
3163	3769	return;
3164	3770	} else if (event.getSource() == link2masterCB)
3165	3771	{
..	..	@@ -3336,9 +3942,9 @@
3336	3942	{
3337	3943	Close();
3338	3944	//return true;
3339		- } else if (source == loadItem)
	3945	+ } else if (source == openItem)
3340	3946	{
3341		- load();
	3947	+ Open();
3342	3948	//return true;
3343	3949	} else if (source == newItem)
3344	3950	{
..	..	@@ -3363,6 +3969,10 @@
3363	3969	{
3364	3970	generatePOV();
3365	3971	//return true;
	3972	+ } else if (event.getSource() == archiveItem)
	3973	+ {
	3974	+ cTools.Archive(frame);
	3975	+ return;
3366	3976	} else if (source == zBufferItem)
3367	3977	{
3368	3978	try
..	..	@@ -3411,11 +4021,12 @@
3411	4021
3412	4022	static public byte[] Compress(Object3D o)
3413	4023	{
	4024	+ // Slower to actually compress.
3414	4025	try
3415	4026	{
3416	4027	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3417		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3418		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	4028	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4029	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3419	4030
3420	4031	Object3D parent = o.parent;
3421	4032	o.parent = null;
..	..	@@ -3426,10 +4037,14 @@
3426	4037
3427	4038	out.flush();
3428	4039
3429		- zstream.close();
	4040	+ baos //zstream
	4041	+ .close();
3430	4042	out.close();
3431	4043
3432		- return baos.toByteArray();
	4044	+ byte[] bytes = baos.toByteArray();
	4045	+
	4046	+ System.out.println("save #bytes = " + bytes.length);
	4047	+ return bytes;
3433	4048	} catch (Exception e)
3434	4049	{
3435	4050	System.err.println(e);
..	..	@@ -3439,13 +4054,16 @@
3439	4054
3440	4055	static public Object Uncompress(byte[] bytes)
3441	4056	{
3442		- System.out.println("#bytes = " + bytes.length);
	4057	+ System.out.println("restore #bytes = " + bytes.length);
3443	4058	try
3444	4059	{
3445	4060	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3446		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3447		- ObjectInputStream in = new ObjectInputStream(istream);
	4061	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4062	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3448	4063	Object obj = in.readObject();
	4064	+
	4065	+ bais //istream
	4066	+ .close();
3449	4067	in.close();
3450	4068
3451	4069	return obj;
..	..	@@ -3500,39 +4118,95 @@
3500	4118	return null;
3501	4119	}
3502	4120
3503		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3504	4121
3505	4122	public void Save()
3506	4123	{
	4124	+ //Save(true);
	4125	+ Replace();
	4126	+ SetUndoStates();
	4127	+ }
	4128	+
	4129	+ private boolean Equal(byte[] compress, byte[] name)
	4130	+ {
	4131	+ if (compress.length != name.length)
	4132	+ {
	4133	+ return false;
	4134	+ }
	4135	+
	4136	+ for (int i=compress.length; --i>=0;)
	4137	+ {
	4138	+ if (compress[i] != name[i])
	4139	+ return false;
	4140	+ }
	4141	+
	4142	+ return true;
	4143	+ }
	4144	+
	4145	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4146	+
	4147	+ void DeleteVersion()
	4148	+ {
	4149	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4150	+ {
	4151	+ copy.versionlist[i] = copy.versionlist[i+1];
	4152	+ }
	4153	+
	4154	+ CopyChanged();
	4155	+
	4156	+ SetUndoStates();
	4157	+ }
	4158	+
	4159	+ public boolean Save(boolean user)
	4160	+ {
3507	4161	System.err.println("Save");
	4162	+ Replace();
3508	4163
3509	4164	cRadio tab = GetCurrentTab();
3510	4165
3511		- boolean temp = CameraPane.SWITCH;
3512		- CameraPane.SWITCH = false;
	4166	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3513	4167
3514		- copy.ExtractBigData(hashtable);
	4168	+ boolean thesame = false;
	4169	+
	4170	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4171	+// {
	4172	+// thesame = true;
	4173	+// }
3515	4174
3516	4175	//EditorFrame.m_MainFrame.requestFocusInWindow();
3517		- tab.graphs[tab.undoindex++] = Compress(copy);
3518		-
3519		- copy.RestoreBigData(hashtable);
3520		-
3521		- CameraPane.SWITCH = temp;
3522		-
3523		- //assert(hashtable.isEmpty());
3524		-
3525		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	4176	+ if (!thesame)
3526	4177	{
3527		- tab.graphs[i] = null;
	4178	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4179	+ {
	4180	+ copy.versionlist[i] = copy.versionlist[i-1];
	4181	+ }
	4182	+
	4183	+ //tab.user[tab.versionindex] = user;
	4184	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4185	+
	4186	+ copy.versionlist[++copy.versionindex] = compress;
	4187	+
	4188	+ // if (increment)
	4189	+ // tab.versionindex++;
3528	4190	}
3529	4191
	4192	+ //copy.RestoreBigData(versiontable);
	4193	+
	4194	+ //assert(hashtable.isEmpty());
	4195	+
	4196	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4197	+// {
	4198	+// //tab.user[i] = false;
	4199	+// copy.versionlist[i] = null;
	4200	+// }
	4201	+
	4202	+ SetUndoStates();
	4203	+
3530	4204	// test save
3531	4205	if (false)
3532	4206	{
3533	4207	try
3534	4208	{
3535		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	4209	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3536	4210	ObjectOutputStream p = new ObjectOutputStream(ostream);
3537	4211
3538	4212	p.writeObject(copy);
..	..	@@ -3545,26 +4219,68 @@
3545	4219	e.printStackTrace();
3546	4220	}
3547	4221	}
	4222	+
	4223	+ return !thesame;
	4224	+ }
	4225	+
	4226	+ boolean flashIt = true;
	4227	+
	4228	+ void RefreshSelection()
	4229	+ {
	4230	+ Object3D selection = new Object3D();
	4231	+
	4232	+ for (int i = 0; i < copy.selection.size(); i++)
	4233	+ {
	4234	+ Object3D elem = copy.selection.elementAt(i);
	4235	+
	4236	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4237	+
	4238	+ if (obj == null)
	4239	+ {
	4240	+ copy.selection.remove(i--);
	4241	+ }
	4242	+ else
	4243	+ {
	4244	+ selection.add(obj);
	4245	+ copy.selection.setElementAt(obj, i);
	4246	+ }
	4247	+ }
	4248	+
	4249	+ flashIt = false;
	4250	+ GetTree().clearSelection();
	4251	+ for (int i = 0; i < selection.size(); i++)
	4252	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4253	+ flashIt = true;
	4254	+
	4255	+ //refreshContents(false);
3548	4256	}
3549	4257
3550		- void CopyChanged(Object3D obj)
	4258	+ void CopyChanged()
3551	4259	{
	4260	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4261	+
	4262	+ SetUndoStates();
	4263	+
3552	4264	boolean temp = CameraPane.SWITCH;
3553	4265	CameraPane.SWITCH = false;
3554	4266
3555		- copy.ExtractBigData(hashtable);
	4267	+ copy.ExtractBigData(versiontable);
3556	4268
3557	4269	copy.clear();
3558	4270
	4271	+ copy.skyboxname = obj.skyboxname;
	4272	+ copy.skyboxext = obj.skyboxext;
	4273	+
3559	4274	for (int i=0; i<obj.Size(); i++)
3560	4275	{
3561	4276	copy.add(obj.get(i));
3562	4277	}
3563	4278
3564		- copy.RestoreBigData(hashtable);
	4279	+ copy.RestoreBigData(versiontable);
3565	4280
3566	4281	CameraPane.SWITCH = temp;
3567	4282
	4283	+ RefreshSelection();
3568	4284	//assert(hashtable.isEmpty());
3569	4285
3570	4286	copy.Touch();
..	..	@@ -3585,45 +4301,139 @@
3585	4301	}
3586	4302	}
3587	4303
3588		- refreshContents();
	4304	+ refreshContents(true);
3589	4305	}
3590	4306
3591		- public void Undo()
	4307	+ cButton previousVersionButton;
	4308	+ cButton restoreButton;
	4309	+ cButton replaceButton;
	4310	+ cButton nextVersionButton;
	4311	+ cButton saveVersionButton;
	4312	+ cButton deleteVersionButton;
	4313	+
	4314	+ boolean muteSlider;
	4315	+
	4316	+ int VersionCount()
3592	4317	{
	4318	+ int count = 0;
	4319	+
	4320	+ for (int i = copy.versionlist.length; --i >= 0;)
	4321	+ {
	4322	+ if (copy.versionlist[i] != null)
	4323	+ count++;
	4324	+ }
	4325	+
	4326	+ return count;
	4327	+ }
	4328	+
	4329	+ void SetUndoStates()
	4330	+ {
	4331	+ cRadio tab = GetCurrentTab();
	4332	+
	4333	+ restoreButton.setEnabled(true); // copy.versionindex != -1);
	4334	+ replaceButton.setEnabled(true); // copy.versionindex != -1);
	4335	+
	4336	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4337	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4338	+
	4339	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4340	+ copy.versionlist[copy.versionindex + 1] != null);
	4341	+
	4342	+ muteSlider = true;
	4343	+ versionSlider.setMaximum(VersionCount() - 1);
	4344	+ versionSlider.setInteger(copy.versionindex);
	4345	+ muteSlider = false;
	4346	+ }
	4347	+
	4348	+ public boolean PreviousVersion()
	4349	+ {
	4350	+ // Option?
	4351	+ Replace();
	4352	+
3593	4353	System.err.println("Undo");
3594	4354
3595	4355	cRadio tab = GetCurrentTab();
3596	4356
3597		- if (tab.undoindex == 0)
	4357	+ if (copy.versionindex == 0)
3598	4358	{
3599	4359	java.awt.Toolkit.getDefaultToolkit().beep();
3600		- return;
	4360	+ return false;
3601	4361	}
3602	4362
3603		- if (tab.graphs[tab.undoindex] == null)
3604		- {
3605		- Save();
3606		- tab.undoindex -= 1;
3607		- }
	4363	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4364	+// {
	4365	+// if (Save(false))
	4366	+// tab.versionindex -= 1;
	4367	+// else
	4368	+// {
	4369	+// if (tab.versionindex <= 0)
	4370	+// return false;
	4371	+// else
	4372	+// tab.versionindex -= 1;
	4373	+// }
	4374	+// }
3608	4375
3609		- tab.undoindex -= 1;
	4376	+ copy.versionindex -= 1;
3610	4377
3611		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4378	+ CopyChanged();
	4379	+
	4380	+ return true;
3612	4381	}
3613	4382
3614		- public void Redo()
	4383	+ public boolean Restore()
3615	4384	{
	4385	+ System.err.println("Restore");
	4386	+
3616	4387	cRadio tab = GetCurrentTab();
3617	4388
3618		- if (tab.graphs[tab.undoindex + 1] == null)
	4389	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4390	+ {
	4391	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4392	+ return false;
	4393	+ }
	4394	+
	4395	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4396	+ CopyChanged();
	4397	+
	4398	+ return true;
	4399	+ }
	4400	+
	4401	+ public boolean Replace()
	4402	+ {
	4403	+ System.err.println("Replace");
	4404	+
	4405	+ cRadio tab = GetCurrentTab();
	4406	+
	4407	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4408	+ {
	4409	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4410	+ return false;
	4411	+ }
	4412	+
	4413	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4414	+
	4415	+ return true;
	4416	+ }
	4417	+
	4418	+ public void NextVersion()
	4419	+ {
	4420	+ // Option?
	4421	+ Replace();
	4422	+
	4423	+ cRadio tab = GetCurrentTab();
	4424	+
	4425	+ if (copy.versionlist[copy.versionindex + 1] == null)
3619	4426	{
3620	4427	java.awt.Toolkit.getDefaultToolkit().beep();
3621	4428	return;
3622	4429	}
3623	4430
3624		- tab.undoindex += 1;
	4431	+ copy.versionindex += 1;
3625	4432
3626		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4433	+ CopyChanged();
	4434	+
	4435	+ //if (!tab.user[tab.versionindex])
	4436	+ // tab.graphs[tab.versionindex] = null;
3627	4437	}
3628	4438
3629	4439	void ImportGFD()
..	..	@@ -3834,7 +4644,7 @@
3834	4644	//copy.material = new cMaterial(copy.GetMaterial());
3835	4645
3836	4646	current.color = (float) colorField.getFloat();
3837		- current.modulation = (float) modulationField.getFloat();
	4647	+ current.modulation = (float) saturationField.getFloat();
3838	4648	current.metalness = (float) metalnessField.getFloat();
3839	4649	current.diffuse = (float) diffuseField.getFloat();
3840	4650	current.specular = (float) specularField.getFloat();
..	..	@@ -3867,7 +4677,7 @@
3867	4677	cMaterial mat = copy.material;
3868	4678
3869	4679	colorField.SetToolTipValue((mat.color));
3870		- modulationField.SetToolTipValue((mat.modulation));
	4680	+ saturationField.SetToolTipValue((mat.modulation));
3871	4681	metalnessField.SetToolTipValue((mat.metalness));
3872	4682	diffuseField.SetToolTipValue((mat.diffuse));
3873	4683	specularField.SetToolTipValue((mat.specular));
..	..	@@ -3919,9 +4729,26 @@
3919	4729	//copy.Touch();
3920	4730	}
3921	4731
	4732	+ cNumberSlider versionSlider;
	4733	+
3922	4734	public void stateChanged(ChangeEvent e)
3923	4735	{
3924	4736	// assert(false);
	4737	+ if (e.getSource() == versionSlider)
	4738	+ {
	4739	+ if (muteSlider)
	4740	+ return;
	4741	+
	4742	+ int version = versionSlider.getInteger();
	4743	+
	4744	+ if (copy.versionlist[version] != null)
	4745	+ {
	4746	+ copy.versionindex = version;
	4747	+ CopyChanged();
	4748	+ }
	4749	+
	4750	+ return;
	4751	+ }
3925	4752
3926	4753	if (freezematerial)
3927	4754	{
..	..	@@ -3957,6 +4784,12 @@
3957	4784	{
3958	4785	//System.out.println("stateChanged = " + this);
3959	4786	materialtouched = true;
	4787	+
	4788	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4789	+ {
	4790	+ saturationField.setFloat(1);
	4791	+ }
	4792	+
3960	4793	applySelf();
3961	4794	//System.out.println("this = " + this);
3962	4795	//System.out.println("PARENT = " + parent);
..	..	@@ -4256,6 +5089,7 @@
4256	5089	{
4257	5090	if (GetTree() != null)
4258	5091	{
	5092	+ GetTree().revalidate();
4259	5093	GetTree().repaint();
4260	5094	}
4261	5095
..	..	@@ -4264,13 +5098,16 @@
4264	5098	ctrlPanel.validate(); // ? new
4265	5099	ctrlPanel.repaint();
4266	5100	}
	5101	+
	5102	+ if (previousVersionButton != null && copy.versionlist != null)
	5103	+ SetUndoStates();
4267	5104	}
4268	5105
4269	5106	static TweenManager tweenManager = new TweenManager();
4270	5107
4271	5108	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4272	5109	{
4273		- if (Globals.SAVEONMAKE) // && resetmodel)
	5110	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4274	5111	Save();
4275	5112	//Tween.set(thing, 0).target(1).start(tweenManager);
4276	5113	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4512,7 +5349,9 @@
4512	5349	readobj.ResetDisplayList();
4513	5350	} catch (Exception e)
4514	5351	{
4515		- //e.printStackTrace();
	5352	+ if (!e.toString().contains("GZIP"))
	5353	+ e.printStackTrace();
	5354	+
4516	5355	try
4517	5356	{
4518	5357	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4586,12 +5425,14 @@
4586	5425
4587	5426	if (readobj != null)
4588	5427	{
4589		- if (Globals.SAVEONMAKE)
4590		- Save();
	5428	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5429	+ // Save();
4591	5430	try
4592	5431	{
4593	5432	//readobj.deepCopySelf(copy);
4594	5433	copy.clear(); // june 2014
	5434	+ copy.skyboxname = readobj.skyboxname;
	5435	+ copy.skyboxext = readobj.skyboxext;
4595	5436	for (int i = 0; i < readobj.size(); i++)
4596	5437	{
4597	5438	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4632,6 +5473,7 @@
4632	5473	}
4633	5474	} catch (ClassCastException e)
4634	5475	{
	5476	+ e.printStackTrace();
4635	5477	assert (false);
4636	5478	Composite c = (Composite) copy;
4637	5479	c.children.clear();
..	..	@@ -4642,17 +5484,28 @@
4642	5484	c.addChild(csg);
4643	5485	}
4644	5486
	5487	+ copy.versionlist = readobj.versionlist;
	5488	+ copy.versionindex = readobj.versionindex;
	5489	+
	5490	+ if (copy.versionlist == null)
	5491	+ {
	5492	+ copy.versionlist = new Object3D[100];
	5493	+ copy.versionindex = -1;
	5494	+ }
	5495	+
	5496	+ //? SetUndoStates();
	5497	+
4645	5498	ResetModel();
4646	5499	copy.HardTouch(); // recompile?
4647	5500	refreshContents();
4648	5501	}
4649	5502	}
4650	5503
4651		- void load() // throws ClassNotFoundException
	5504	+ void Open() // throws ClassNotFoundException
4652	5505	{
4653	5506	if (Grafreed.standAlone)
4654	5507	{
4655		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5508	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4656	5509	browser.show();
4657	5510	String filename = browser.getFile();
4658	5511	if (filename != null && filename.length() > 0)
..	..	@@ -4751,6 +5604,7 @@
4751	5604	//ps.print(buffer.toString());
4752	5605	} catch (IOException e)
4753	5606	{
	5607	+ e.printStackTrace();
4754	5608	}
4755	5609	}
4756	5610
..	..	@@ -4765,6 +5619,8 @@
4765	5619	String filename = browser.getFile();
4766	5620	if (filename != null && filename.length() > 0)
4767	5621	{
	5622	+ if (!filename.endsWith(".gfd"))
	5623	+ filename += ".gfd";
4768	5624	lastname = browser.getDirectory() + filename;
4769	5625	save();
4770	5626	}
..	..	@@ -4931,7 +5787,7 @@
4931	5787	MenuBar menuBar;
4932	5788	Menu fileMenu;
4933	5789	MenuItem newItem;
4934		- MenuItem loadItem;
	5790	+ MenuItem openItem;
4935	5791	MenuItem saveItem;
4936	5792	MenuItem saveAsItem;
4937	5793	MenuItem exportAsItem;
..	..	@@ -4954,6 +5810,7 @@
4954	5810	CheckboxMenuItem toggleSwitchItem;
4955	5811	CheckboxMenuItem toggleRootItem;
4956	5812	CheckboxMenuItem animationItem;
	5813	+ MenuItem archiveItem;
4957	5814	CheckboxMenuItem toggleHandleItem;
4958	5815	CheckboxMenuItem togglePaintItem;
4959	5816	JSplitPane mainPanel;
..	..	@@ -4967,6 +5824,7 @@
4967	5824	ButtonGroup buttonGroup;
4968	5825
4969	5826	cGridBag toolboxPanel;
	5827	+ cGridBag skyboxPanel;
4970	5828	cGridBag materialPanel;
4971	5829	cGridBag ctrlPanel;
4972	5830
..	..	@@ -5040,7 +5898,7 @@
5040	5898	JLabel colorLabel;
5041	5899	cNumberSlider colorField;
5042	5900	JLabel modulationLabel;
5043		- cNumberSlider modulationField;
	5901	+ cNumberSlider saturationField;
5044	5902	JLabel metalnessLabel;
5045	5903	cNumberSlider metalnessField;
5046	5904	JLabel diffuseLabel;
..	..	@@ -5071,6 +5929,7 @@
5071	5929	cNumberSlider anisoField;
5072	5930	JLabel anisoVLabel;
5073	5931	cNumberSlider anisoVField;
	5932	+
5074	5933	JLabel cameraLabel;
5075	5934	cNumberSlider cameraField;
5076	5935	JLabel selfshadowLabel;
..	..	@@ -5085,6 +5944,7 @@
5085	5944	cNumberSlider fakedepthField;
5086	5945	JLabel shadowbiasLabel;
5087	5946	cNumberSlider shadowbiasField;
	5947	+
5088	5948	JLabel bumpLabel;
5089	5949	cNumberSlider bumpField;
5090	5950	JLabel noiseLabel;