~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
..	..	@@ -279,6 +297,14 @@
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	+// callee.Save(true);
	306	+// }
	307	+
282	308	// "this" is not called: SetupUI2(objEditor);
283	309	}
284	310
..	..	@@ -292,6 +318,14 @@
292	318	client = inClient;
293	319	copy = client;
294	320
	321	+ if (copy.versionlist == null)
	322	+ {
	323	+ copy.versionlist = new Object3D[100];
	324	+ copy.versionindex = -1;
	325	+
	326	+// Save(true);
	327	+ }
	328	+
295	329	SetupUI2(callee.GetEditor());
296	330	}
297	331
..	..	@@ -306,7 +340,7 @@
306	340	//localCopy.parent = null;
307	341
308	342	frame = new JFrame();
309		- frame.setUndecorated(true);
	343	+ frame.setUndecorated(false);
310	344	objEditor = this;
311	345	this.callee = callee;
312	346
..	..	@@ -324,6 +358,14 @@
324	358	copy = localCopy;
325	359	copy.editWindow = this;
326	360
	361	+// if (copy.versionlist == null)
	362	+// {
	363	+// copy.versionlist = new Object3D[100];
	364	+// copy.versionindex = -1;
	365	+//
	366	+// Save(true);
	367	+// }
	368	+
327	369	SetupMenu();
328	370
329	371	//SetupName(objEditor); // new
..	..	@@ -347,7 +389,7 @@
347	389	frame.setMenuBar(menuBar = new MenuBar());
348	390	menuBar.add(fileMenu = new Menu("File"));
349	391	fileMenu.add(newItem = new MenuItem("New"));
350		- fileMenu.add(loadItem = new MenuItem("Open..."));
	392	+ fileMenu.add(openItem = new MenuItem("Open..."));
351	393
352	394	//oe.menuBar.add(menu = new Menu("Include"));
353	395	Menu menu = new Menu("Import");
..	..	@@ -379,7 +421,7 @@
379	421	}
380	422
381	423	newItem.addActionListener(this);
382		- loadItem.addActionListener(this);
	424	+ openItem.addActionListener(this);
383	425	saveItem.addActionListener(this);
384	426	saveAsItem.addActionListener(this);
385	427	exportAsItem.addActionListener(this);
..	..	@@ -409,18 +451,19 @@
409	451	// EditSelection(false);
410	452	// }
411	453
412		- refreshContents(false); // To refresh Info tab
	454	+// refreshContents(false); // To refresh Info tab
413	455	}
414	456	};
415	457	objectPanel.addChangeListener(changeListener);
416	458
417	459	toolbarPanel = new JPanel();
418	460	toolbarPanel.setName("Toolbar");
	461	+
419	462	treePanel = new cGridBag();
420	463	treePanel.setName("Tree");
421	464
422	465	editPanel = new cGridBag().setVertical(true);
423		- editPanel.setName("Edit");
	466	+ //editPanel.setName("Edit");
424	467
425	468	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
426	469
..	..	@@ -428,11 +471,13 @@
428	471	editPanel.add(editCommandsPanel);
429	472	editPanel.add(ctrlPanel);
430	473
431		- toolboxPanel = new cGridBag().setVertical(false);
432		- toolboxPanel.setName("Toolbox");
	474	+ toolboxPanel = new cGridBag().setVertical(true);
	475	+ //toolboxPanel.setName("Toolbox");
433	476
434		- materialPanel = new cGridBag().setVertical(true);
435		- materialPanel.setName("Material");
	477	+ skyboxPanel = new cGridBag().setVertical(true);
	478	+
	479	+ materialPanel = new cGridBag().setVertical(false);
	480	+ //materialPanel.setName("Material");
436	481
437	482	/JTextPane/
438	483	infoarea = createTextPane();
..	..	@@ -440,14 +485,15 @@
440	485
441	486	infoarea.setEditable(true);
442	487	SetText();
	488	+
443	489	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
444	490	// infoarea.setOpaque(false);
445	491	// //infoarea.setForeground(textcolor);
446	492	// TEXTAREA infoarea.setLineWrap(true);
447	493	// TEXTAREA infoarea.setWrapStyleWord(true);
448	494	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
449		- infoPanel.setPreferredSize(new Dimension(50, 200));
450		- infoPanel.setName("Info");
	495	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	496	+ //infoPanel.setName("Info");
451	497	//infoPanel.setLayout(new BorderLayout());
452	498	//infoPanel.add(createTextPane());
453	499
..	..	@@ -458,7 +504,14 @@
458	504	mainPanel.setDividerSize(9);
459	505	mainPanel.setDividerLocation(0.5); //1.0);
460	506	mainPanel.setResizeWeight(0.5);
461		-
	507	+
	508	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	509	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	510	+ divider.setDividerSize(15);
	511	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	512	+
	513	+ mainPanel.setUI(new BasicSplitPaneUI());
	514	+
462	515	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
463	516	//mainPanel.setLayout(new GridBagLayout());
464	517	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -689,8 +742,8 @@
689	742	}
690	743	}
691	744
692		-static GraphicsDevice device = GraphicsEnvironment
693		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	745	+//static GraphicsDevice device = GraphicsEnvironment
	746	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
694	747
695	748	Rectangle keeprect;
696	749	cRadio radio;
..	..	@@ -707,14 +760,24 @@
707	760	boolean maximized;
708	761
709	762	cButton fullscreenLayout;
	763	+ cButton expandedLayout;
710	764
711	765	void Minimize()
712	766	{
713	767	frame.setState(Frame.ICONIFIED);
	768	+ frame.validate();
714	769	}
715	770
	771	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	772	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	773	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
716	774	void Maximize()
717	775	{
	776	+ if (CameraPane.FULLSCREEN)
	777	+ {
	778	+ ToggleFullScreen();
	779	+ }
	780	+
718	781	if (maximized)
719	782	{
720	783	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -722,22 +785,38 @@
722	785	else
723	786	{
724	787	keeprect = frame.getBounds();
725		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
726		- Dimension rect2 = frame.getToolkit().getScreenSize();
727		- frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	788	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	789	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	790	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
728	791	// frame.setState(Frame.MAXIMIZED_BOTH);
	792	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
729	793	}
730	794
731	795	maximized ^= true;
	796	+
	797	+ frame.validate();
732	798	}
	799	+
	800	+ cButton minButton;
	801	+ cButton maxButton;
	802	+ cButton fullButton;
	803	+ cButton collapseButton;
	804	+ cButton maximize3DButton;
733	805
734	806	void ToggleFullScreen()
735	807	{
	808	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	809	+
736	810	cameraView.ToggleFullScreen();
737	811
738	812	if (!CameraPane.FULLSCREEN)
739	813	{
740	814	device.setFullScreenWindow(null);
	815	+ frame.dispose();
	816	+ frame.setUndecorated(false);
	817	+ frame.validate();
	818	+ frame.setVisible(true);
	819	+
741	820	//frame.setVisible(false);
742	821	// frame.removeNotify();
743	822	// frame.setUndecorated(false);
..	..	@@ -747,13 +826,13 @@
747	826	// X frame.getContentPane().remove(/"Center",/bigThree);
748	827	// X framePanel.add(bigThree);
749	828	// X frame.getContentPane().add(/"Center",/framePanel);
750		- framePanel.setDividerLocation(1);
	829	+// framePanel.setDividerLocation(46); // icons are 24x24
751	830
752	831	//frame.setVisible(true);
753		- radio.layout = keepButton;
	832	+// radio.layout = keepButton;
754	833	//theFrame = null;
755	834	keepButton = null;
756		- radio.layout.doClick();
	835	+// radio.layout.doClick();
757	836
758	837	} else
759	838	{
..	..	@@ -762,20 +841,59 @@
762	841	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
763	842	// frame.getToolkit().getScreenSize().height);
764	843	//frame.setVisible(false);
	844	+
	845	+ frame.dispose();
	846	+ frame.setUndecorated(true);
765	847	device.setFullScreenWindow(frame);
	848	+ frame.validate();
	849	+ frame.setVisible(true);
766	850	// frame.removeNotify();
767	851	// frame.setUndecorated(true);
768	852	// frame.addNotify();
769	853	// X frame.getContentPane().remove(/"Center",/framePanel);
770	854	// X framePanel.remove(bigThree);
771	855	// X frame.getContentPane().add(/"Center",/bigThree);
772		- framePanel.setDividerLocation(0);
	856	+// framePanel.setDividerLocation(0);
773	857
774		- radio.layout = fullscreenLayout;
775		- radio.layout.doClick();
	858	+// radio.layout = fullscreenLayout;
	859	+// radio.layout.doClick();
776	860	//frame.setVisible(true);
777	861	}
	862	+ frame.validate();
	863	+
	864	+ cameraView.requestFocusInWindow();
778	865	}
	866	+
	867	+ void CollapseToolbar()
	868	+ {
	869	+ framePanel.setDividerLocation(0);
	870	+ //frame.validate();
	871	+
	872	+ cameraView.requestFocusInWindow();
	873	+ }
	874	+
	875	+ private Object3D Duplicate(Object3D object)
	876	+ {
	877	+ boolean temp = CameraPane.SWITCH;
	878	+ CameraPane.SWITCH = false;
	879	+
	880	+ object.ExtractBigData(versiontable);
	881	+ // if (copy == client)
	882	+
	883	+ Object3D versions[] = object.versionlist;
	884	+ object.versionlist = null;
	885	+
	886	+ //byte[] compress = Compress(copy);
	887	+ Object3D compress = (Object3D)Grafreed.clone(object);
	888	+
	889	+ object.versionlist = versions;
	890	+
	891	+ object.RestoreBigData(versiontable);
	892	+
	893	+ CameraPane.SWITCH = temp;
	894	+
	895	+ return compress;
	896	+ }
779	897
780	898	private JTextPane createTextPane()
781	899	{
..	..	@@ -898,6 +1016,7 @@
898	1016	{
899	1017	SetupMaterial(materialPanel);
900	1018	}
	1019	+
901	1020	//SetupName();
902	1021	//SetupViews();
903	1022	}
..	..	@@ -907,7 +1026,7 @@
907	1026	// NumberSlider vDivsField;
908	1027	// JCheckBox endcaps;
909	1028	JCheckBox liveCB;
910		- JCheckBox selectCB;
	1029	+ JCheckBox selectableCB;
911	1030	JCheckBox hideCB;
912	1031	JCheckBox link2masterCB;
913	1032	JCheckBox markCB;
..	..	@@ -1106,8 +1225,20 @@
1106	1225
1107	1226	namePanel = new cGridBag();
1108	1227
	1228	+ //if (copy.pinned)
	1229	+ {
	1230	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1231	+ pinButton.setSelected(copy.pinned);
	1232	+ cGridBag t = new cGridBag();
	1233	+ t.preferredWidth = 2;
	1234	+ t.add(pinButton);
	1235	+ namePanel.add(t);
	1236	+
	1237	+ pinButton.addItemListener(this);
	1238	+ }
	1239	+
1109	1240	nameField = AddText(namePanel, copy.GetName());
1110		- namePanel.add(nameField);
	1241	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1111	1242	oe.ctrlPanel.add(namePanel);
1112	1243
1113	1244	oe.ctrlPanel.Return();
..	..	@@ -1119,26 +1250,30 @@
1119	1250
1120	1251	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1121	1252	liveCB.setToolTipText("Animate object");
1122		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1123		- selectCB.setToolTipText("Make object selectable");
	1253	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1254	+ selectableCB.setToolTipText("Make object selectable");
1124	1255	// Return();
	1256	+
1125	1257	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1126	1258	hideCB.setToolTipText("Hide object");
1127	1259	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1128		- markCB.setToolTipText("Set the animation target transform");
	1260	+ markCB.setToolTipText("As animation target transform");
	1261	+
	1262	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1129	1263
1130	1264	setupPanel2 = new cGridBag().setVertical(false);
1131	1265
1132	1266	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1133	1267	rewindCB.setToolTipText("Rewind animation");
1134	1268
1135		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1136		- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1269	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1270	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1137	1271
	1272	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1273	+ link2masterCB.setToolTipText("Attach to support");
	1274	+
1138	1275	if (Globals.ADVANCED)
1139	1276	{
1140		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1141		- link2masterCB.setToolTipText("Attach to support");
1142	1277	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1143	1278	speedupCB.setToolTipText("Option motion capture");
1144	1279	}
..	..	@@ -1412,6 +1547,7 @@
1412	1547	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1413	1548	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1414	1549	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1550	+ //XYZPanel.setName("XYZ");
1415	1551
1416	1552	/*
1417	1553	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1449,14 +1585,29 @@
1449	1585	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1450	1586	//tmp.setName("Edit");
1451	1587	objectPanel.add(materialPanel);
	1588	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1589	+ objectPanel.setToolTipTextAt(0, "Material");
	1590	+
	1591	+ objectPanel.add(toolboxPanel);
	1592	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1593	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1594	+
	1595	+ objectPanel.add(skyboxPanel);
	1596	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1597	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1598	+
1452	1599	// JPanel north = new JPanel(new BorderLayout());
1453	1600	// north.setName("Edit");
1454	1601	// north.add(ctrlPanel, BorderLayout.NORTH);
1455	1602	// objectPanel.add(north);
1456	1603	objectPanel.add(editPanel);
1457		- objectPanel.add(infoPanel);
1458		- objectPanel.add(toolboxPanel);
1459		-
	1604	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1605	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1606	+
	1607	+ objectPanel.add(XYZPanel);
	1608	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1609	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1610	+
1460	1611	/*
1461	1612	aConstraints.gridx = 0;
1462	1613	aConstraints.gridwidth = 1;
..	..	@@ -1476,7 +1627,7 @@
1476	1627	scrollpane.addMouseWheelListener(this); // Default not fast enough
1477	1628
1478	1629	/JTabbedPane/ scenePanel = new cGridBag();
1479		- scenePanel.preferredWidth = 6;
	1630	+ scenePanel.preferredWidth = 5;
1480	1631
1481	1632	JTabbedPane tabbedPane = new JTabbedPane();
1482	1633	tabbedPane.add(scrollpane);
..	..	@@ -1493,6 +1644,11 @@
1493	1644
1494	1645	scenePanel.add(tabbedPane);
1495	1646
	1647	+ //if (Globals.ADVANCED)
	1648	+ tabbedPane.add(infoPanel);
	1649	+ tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1650	+ tabbedPane.setToolTipTextAt(3, "Information");
	1651	+
1496	1652	/*
1497	1653	cTree jTree = new cTree(null);
1498	1654	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1554,7 +1710,7 @@
1554	1710	bigThree = new cGridBag();
1555	1711	bigThree.addComponent(scenePanel);
1556	1712	bigThree.addComponent(centralPanel);
1557		- bigThree.addComponent(XYZPanel);
	1713	+ //bigThree.addComponent(XYZPanel);
1558	1714
1559	1715	// // SIDE EFFECT!!!
1560	1716	// aConstraints.gridx = 0;
..	..	@@ -1563,9 +1719,26 @@
1563	1719	// aConstraints.gridheight = 1;
1564	1720
1565	1721	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1566		- framePanel.setContinuousLayout(true);
1567		- framePanel.setOneTouchExpandable(true);
1568		- framePanel.setDividerLocation(0.8);
	1722	+
	1723	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1724	+ new java.beans.PropertyChangeListener()
	1725	+ {
	1726	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1727	+ {
	1728	+ if ((Integer)pce.getOldValue() == 1)
	1729	+ {
	1730	+ if (radio.layout != expandedLayout)
	1731	+ {
	1732	+ radio.layout = expandedLayout;
	1733	+ radio.layout.doClick();
	1734	+ }
	1735	+ }
	1736	+ }
	1737	+ });
	1738	+
	1739	+ framePanel.setContinuousLayout(false);
	1740	+ framePanel.setOneTouchExpandable(false);
	1741	+ //.setDividerLocation(0.8);
1569	1742	//framePanel.setDividerSize(15);
1570	1743	//framePanel.setResizeWeight(0.15);
1571	1744	framePanel.setName("Frame");
..	..	@@ -1584,17 +1757,17 @@
1584	1757
1585	1758	frame.setSize(1280, 860);
1586	1759
1587		- frame.validate();
1588		- frame.setVisible(true);
1589		-
1590	1760	cameraView.requestFocusInWindow();
1591	1761
1592	1762	gridPanel.setDividerLocation(1.0);
	1763	+
	1764	+ frame.validate();
	1765	+
	1766	+ frame.setVisible(true);
1593	1767
1594	1768	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1595	1769	frame.addWindowListener(new WindowAdapter()
1596	1770	{
1597		-
1598	1771	public void windowClosing(WindowEvent e)
1599	1772	{
1600	1773	Close();
..	..	@@ -1617,12 +1790,403 @@
1617	1790	ctrlPanel.removeAll();
1618	1791	}
1619	1792
1620		- void SetupMaterial(cGridBag panel)
	1793	+ void SetupMaterial(cGridBag materialpanel)
1621	1794	{
1622		- /*
	1795	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1796	+
	1797	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1798	+ skin.setToolTipText("Skin");
	1799	+ skin.addMouseListener(new MouseAdapter()
	1800	+ {
	1801	+ public void mouseClicked(MouseEvent e)
	1802	+ {
	1803	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1804	+ cMaterial material = object.material;
	1805	+
	1806	+ // Skin
	1807	+ colorField.setFloat(material.color);
	1808	+ saturationField.setFloat(material.modulation);
	1809	+ subsurfaceField.setFloat(material.subsurface);
	1810	+ selfshadowField.setFloat(material.diffuseness);
	1811	+ diffusenessField.setFloat(material.factor);
	1812	+ shininessField.setFloat(material.shininess);
	1813	+ shadowbiasField.setFloat(material.shadowbias);
	1814	+ diffuseField.setFloat(material.diffuse);
	1815	+ specularField.setFloat(material.specular);
	1816	+
	1817	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1818	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1819	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1820	+
	1821	+ materialtouched = true;
	1822	+ applySelf();
	1823	+ }
	1824	+ });
	1825	+ presetpanel.add(skin);
	1826	+
	1827	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1828	+ lambert.setToolTipText("Diffuse");
	1829	+ lambert.addMouseListener(new MouseAdapter()
	1830	+ {
	1831	+ public void mouseClicked(MouseEvent e)
	1832	+ {
	1833	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1834	+ cMaterial material = object.material;
	1835	+
	1836	+ diffusenessField.setFloat(material.factor);
	1837	+ selfshadowField.setFloat(material.diffuseness);
	1838	+
	1839	+ materialtouched = true;
	1840	+ applySelf();
	1841	+ }
	1842	+ });
	1843	+ presetpanel.add(lambert);
	1844	+
	1845	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1846	+ diffuse2.setToolTipText("Diffuse2");
	1847	+ diffuse2.addMouseListener(new MouseAdapter()
	1848	+ {
	1849	+ public void mouseClicked(MouseEvent e)
	1850	+ {
	1851	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1852	+ cMaterial material = object.material;
	1853	+
	1854	+ diffusenessField.setFloat(material.factor);
	1855	+ selfshadowField.setFloat(material.diffuseness);
	1856	+
	1857	+ materialtouched = true;
	1858	+ applySelf();
	1859	+ }
	1860	+ });
	1861	+ presetpanel.add(diffuse2);
	1862	+
	1863	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1864	+ diffusemoon.setToolTipText("Moon");
	1865	+ diffusemoon.addMouseListener(new MouseAdapter()
	1866	+ {
	1867	+ public void mouseClicked(MouseEvent e)
	1868	+ {
	1869	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1870	+ cMaterial material = object.material;
	1871	+
	1872	+ diffusenessField.setFloat(material.factor);
	1873	+ selfshadowField.setFloat(material.diffuseness);
	1874	+
	1875	+ materialtouched = true;
	1876	+ applySelf();
	1877	+ }
	1878	+ });
	1879	+ presetpanel.add(diffusemoon);
	1880	+
	1881	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1882	+ diffusemoon2.setToolTipText("Moon2");
	1883	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1884	+ {
	1885	+ public void mouseClicked(MouseEvent e)
	1886	+ {
	1887	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1888	+ cMaterial material = object.material;
	1889	+
	1890	+ diffusenessField.setFloat(material.factor);
	1891	+ selfshadowField.setFloat(material.diffuseness);
	1892	+
	1893	+ materialtouched = true;
	1894	+ applySelf();
	1895	+ }
	1896	+ });
	1897	+ presetpanel.add(diffusemoon2);
	1898	+
	1899	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1900	+ diffusemoon3.setToolTipText("Moon3");
	1901	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1902	+ {
	1903	+ public void mouseClicked(MouseEvent e)
	1904	+ {
	1905	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1906	+ cMaterial material = object.material;
	1907	+
	1908	+ diffusenessField.setFloat(material.factor);
	1909	+ selfshadowField.setFloat(material.diffuseness);
	1910	+
	1911	+ materialtouched = true;
	1912	+ applySelf();
	1913	+ }
	1914	+ });
	1915	+ presetpanel.add(diffusemoon3);
	1916	+
	1917	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1918	+ diffusesheen.setToolTipText("Sheen");
	1919	+ diffusesheen.addMouseListener(new MouseAdapter()
	1920	+ {
	1921	+ public void mouseClicked(MouseEvent e)
	1922	+ {
	1923	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1924	+ cMaterial material = object.material;
	1925	+
	1926	+ sheenField.setFloat(material.sheen);
	1927	+
	1928	+ materialtouched = true;
	1929	+ applySelf();
	1930	+ }
	1931	+ });
	1932	+ presetpanel.add(diffusesheen);
	1933	+
	1934	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	1935	+ rough.setToolTipText("Rough metal");
	1936	+ rough.addMouseListener(new MouseAdapter()
	1937	+ {
	1938	+ public void mouseClicked(MouseEvent e)
	1939	+ {
	1940	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	1941	+ cMaterial material = object.material;
	1942	+
	1943	+ shininessField.setFloat(material.shininess);
	1944	+ velvetField.setFloat(material.velvet);
	1945	+
	1946	+ materialtouched = true;
	1947	+ applySelf();
	1948	+ }
	1949	+ });
	1950	+ presetpanel.add(rough);
	1951	+
	1952	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	1953	+ rough2.setToolTipText("Medium metal");
	1954	+ rough2.addMouseListener(new MouseAdapter()
	1955	+ {
	1956	+ public void mouseClicked(MouseEvent e)
	1957	+ {
	1958	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	1959	+ cMaterial material = object.material;
	1960	+
	1961	+ shininessField.setFloat(material.shininess);
	1962	+ lightareaField.setFloat(material.lightarea);
	1963	+
	1964	+ materialtouched = true;
	1965	+ applySelf();
	1966	+ }
	1967	+ });
	1968	+ presetpanel.add(rough2);
	1969	+
	1970	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	1971	+ shini0.setToolTipText("Shiny");
	1972	+ shini0.addMouseListener(new MouseAdapter()
	1973	+ {
	1974	+ public void mouseClicked(MouseEvent e)
	1975	+ {
	1976	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	1977	+ cMaterial material = object.material;
	1978	+
	1979	+ shininessField.setFloat(material.shininess);
	1980	+ lightareaField.setFloat(material.lightarea);
	1981	+
	1982	+ materialtouched = true;
	1983	+ applySelf();
	1984	+ }
	1985	+ });
	1986	+ presetpanel.add(shini0);
	1987	+
	1988	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	1989	+ shini1.setToolTipText("Shiny2");
	1990	+ shini1.addMouseListener(new MouseAdapter()
	1991	+ {
	1992	+ public void mouseClicked(MouseEvent e)
	1993	+ {
	1994	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	1995	+ cMaterial material = object.material;
	1996	+
	1997	+ shininessField.setFloat(material.shininess);
	1998	+ lightareaField.setFloat(material.lightarea);
	1999	+
	2000	+ materialtouched = true;
	2001	+ applySelf();
	2002	+ }
	2003	+ });
	2004	+ presetpanel.add(shini1);
	2005	+
	2006	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2007	+ shini2.setToolTipText("Shiny3");
	2008	+ shini2.addMouseListener(new MouseAdapter()
	2009	+ {
	2010	+ public void mouseClicked(MouseEvent e)
	2011	+ {
	2012	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2013	+ cMaterial material = object.material;
	2014	+
	2015	+ shininessField.setFloat(material.shininess);
	2016	+ lightareaField.setFloat(material.lightarea);
	2017	+
	2018	+ materialtouched = true;
	2019	+ applySelf();
	2020	+ }
	2021	+ });
	2022	+ presetpanel.add(shini2);
	2023	+
	2024	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2025	+ aniso.setToolTipText("AnisoU");
	2026	+ aniso.addMouseListener(new MouseAdapter()
	2027	+ {
	2028	+ public void mouseClicked(MouseEvent e)
	2029	+ {
	2030	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2031	+ cMaterial material = object.material;
	2032	+
	2033	+ anisoField.setFloat(material.aniso);
	2034	+ anisoVField.setFloat(material.anisoV);
	2035	+
	2036	+ materialtouched = true;
	2037	+ applySelf();
	2038	+ }
	2039	+ });
	2040	+ presetpanel.add(aniso);
	2041	+
	2042	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2043	+ aniso2.setToolTipText("AnisoV");
	2044	+ aniso2.addMouseListener(new MouseAdapter()
	2045	+ {
	2046	+ public void mouseClicked(MouseEvent e)
	2047	+ {
	2048	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2049	+ cMaterial material = object.material;
	2050	+
	2051	+ anisoField.setFloat(material.aniso);
	2052	+ anisoVField.setFloat(material.anisoV);
	2053	+
	2054	+ materialtouched = true;
	2055	+ applySelf();
	2056	+ }
	2057	+ });
	2058	+ presetpanel.add(aniso2);
	2059	+
	2060	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2061	+ aniso3.setToolTipText("AnisoUV");
	2062	+ aniso3.addMouseListener(new MouseAdapter()
	2063	+ {
	2064	+ public void mouseClicked(MouseEvent e)
	2065	+ {
	2066	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2067	+ cMaterial material = object.material;
	2068	+
	2069	+ anisoField.setFloat(material.aniso);
	2070	+ anisoVField.setFloat(material.anisoV);
	2071	+
	2072	+ materialtouched = true;
	2073	+ applySelf();
	2074	+ }
	2075	+ });
	2076	+ presetpanel.add(aniso3);
	2077	+
	2078	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2079	+ velvet0.setToolTipText("Velvet");
	2080	+ velvet0.addMouseListener(new MouseAdapter()
	2081	+ {
	2082	+ public void mouseClicked(MouseEvent e)
	2083	+ {
	2084	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2085	+ cMaterial material = object.material;
	2086	+
	2087	+ diffusenessField.setFloat(material.factor);
	2088	+ selfshadowField.setFloat(material.diffuseness);
	2089	+ sheenField.setFloat(material.sheen);
	2090	+ shininessField.setFloat(material.shininess);
	2091	+ velvetField.setFloat(material.velvet);
	2092	+ shiftField.setFloat(material.shift);
	2093	+
	2094	+ materialtouched = true;
	2095	+ applySelf();
	2096	+ }
	2097	+ });
	2098	+ presetpanel.add(velvet0);
	2099	+
	2100	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2101	+ bump0.setToolTipText("Bump texture");
	2102	+ bump0.addMouseListener(new MouseAdapter()
	2103	+ {
	2104	+ public void mouseClicked(MouseEvent e)
	2105	+ {
	2106	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2107	+ cMaterial material = object.material;
	2108	+
	2109	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2110	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2111	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2112	+
	2113	+ materialtouched = true;
	2114	+ applySelf();
	2115	+ }
	2116	+ });
	2117	+ presetpanel.add(bump0);
	2118	+
	2119	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2120	+ halo.setToolTipText("Halo");
	2121	+ halo.addMouseListener(new MouseAdapter()
	2122	+ {
	2123	+ public void mouseClicked(MouseEvent e)
	2124	+ {
	2125	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2126	+ cMaterial material = object.material;
	2127	+
	2128	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2129	+
	2130	+ materialtouched = true;
	2131	+ applySelf();
	2132	+ }
	2133	+ });
	2134	+ presetpanel.add(halo);
	2135	+
	2136	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2137	+ candle.setToolTipText("Candle");
	2138	+ candle.addMouseListener(new MouseAdapter()
	2139	+ {
	2140	+ public void mouseClicked(MouseEvent e)
	2141	+ {
	2142	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2143	+ cMaterial material = object.material;
	2144	+
	2145	+ subsurfaceField.setFloat(material.subsurface);
	2146	+ shadowbiasField.setFloat(material.shadowbias);
	2147	+ ambientField.setFloat(material.ambient);
	2148	+ specularField.setFloat(material.specular);
	2149	+ lightareaField.setFloat(material.lightarea);
	2150	+ shininessField.setFloat(material.shininess);
	2151	+
	2152	+ materialtouched = true;
	2153	+ applySelf();
	2154	+ }
	2155	+ });
	2156	+ presetpanel.add(candle);
	2157	+
	2158	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2159	+ shadowShader.setToolTipText("Shadow");
	2160	+ shadowShader.addMouseListener(new MouseAdapter()
	2161	+ {
	2162	+ public void mouseClicked(MouseEvent e)
	2163	+ {
	2164	+ diffuseField.setFloat(0.001);
	2165	+ ambientField.setFloat(0.001);
	2166	+ cameraField.setFloat(0.001);
	2167	+ specularField.setFloat(0.001);
	2168	+ fakedepthField.setFloat(0.001);
	2169	+ opacityField.setFloat(0.6);
	2170	+
	2171	+ materialtouched = true;
	2172	+ applySelf();
	2173	+ }
	2174	+ });
	2175	+ presetpanel.add(shadowShader);
	2176	+
	2177	+ cGridBag panel = new cGridBag().setVertical(true);
	2178	+
	2179	+ presetpanel.preferredWidth = 1;
	2180	+
	2181	+ materialpanel.add(presetpanel);
	2182	+ materialpanel.add(panel);
	2183	+
	2184	+ panel.preferredWidth = 8;
	2185	+
	2186	+ /*
1623	2187	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1624	2188	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1625		- */
	2189	+ */
1626	2190
1627	2191	cGridBag editBar = new cGridBag().setVertical(false);
1628	2192
..	..	@@ -1656,45 +2220,50 @@
1656	2220	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1657	2221
1658	2222	cGridBag colorSection = new cGridBag().setVertical(true);
	2223	+
	2224	+ cGridBag huepanel = new cGridBag();
	2225	+ cGridBag huelabel = new cGridBag();
	2226	+ skin = GetLabel("icons/hue.png", false);
	2227	+ skin.fit = true;
	2228	+ huelabel.add(skin);
	2229	+ huelabel.preferredWidth = 20;
	2230	+ huepanel.add(new cGridBag()); // Label
	2231	+ huepanel.add(huelabel); // Field/slider
	2232	+
	2233	+ huepanel.preferredHeight = 7;
	2234	+
	2235	+ colorSection.add(huepanel);
1659	2236
1660	2237	cGridBag color = new cGridBag();
1661		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1662		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1663		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2238	+
	2239	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2240	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2241	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2242	+
1664	2243	//colorField.preferredWidth = 200;
1665	2244	colorSection.add(color);
1666	2245
1667	2246	cGridBag modulation = new cGridBag();
1668	2247	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1669	2248	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1670		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2249	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1671	2250	colorSection.add(modulation);
1672	2251
	2252	+ cGridBag opacity = new cGridBag();
	2253	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2254	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2255	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2256	+ colorSection.add(opacity);
	2257	+
	2258	+ colorSection.add(GetSeparator());
	2259	+
1673	2260	cGridBag texture = new cGridBag();
1674	2261	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1675	2262	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1676	2263	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1677	2264	colorSection.add(texture);
1678	2265
1679		- cGridBag anisoU = new cGridBag();
1680		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1681		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1682		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1683		- colorSection.add(anisoU);
1684		-
1685		- cGridBag anisoV = new cGridBag();
1686		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1687		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1688		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1689		- colorSection.add(anisoV);
1690		-
1691		- cGridBag shadowbias = new cGridBag();
1692		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1693		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1694		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1695		- colorSection.add(shadowbias);
1696		-
1697		- panel.add(new JSeparator());
	2266	+ panel.add(GetSeparator());
1698	2267
1699	2268	panel.add(colorSection);
1700	2269
..	..	@@ -1744,7 +2313,13 @@
1744	2313	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1745	2314	diffuseSection.add(fakedepth);
1746	2315
1747		- panel.add(new JSeparator());
	2316	+ cGridBag shadowbias = new cGridBag();
	2317	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2318	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2319	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2320	+ diffuseSection.add(shadowbias);
	2321	+
	2322	+ panel.add(GetSeparator());
1748	2323
1749	2324	panel.add(diffuseSection);
1750	2325
..	..	@@ -1794,42 +2369,48 @@
1794	2369	// aConstraints.gridy += 1;
1795	2370	// aConstraints.gridwidth = 1;
1796	2371
	2372	+ cGridBag anisoU = new cGridBag();
	2373	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2374	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2375	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2376	+ specularSection.add(anisoU);
1797	2377
1798		- panel.add(new JSeparator());
	2378	+ cGridBag anisoV = new cGridBag();
	2379	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2380	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2381	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2382	+ specularSection.add(anisoV);
	2383	+
	2384	+
	2385	+ panel.add(GetSeparator());
1799	2386
1800	2387	panel.add(specularSection);
1801	2388
1802	2389	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1803	2390
1804		- cGridBag globalSection = new cGridBag().setVertical(true);
	2391	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1805	2392
1806	2393	cGridBag camera = new cGridBag();
1807	2394	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1808	2395	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1809	2396	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1810		- globalSection.add(camera);
	2397	+ colorSection.add(camera);
1811	2398
1812	2399	cGridBag ambient = new cGridBag();
1813	2400	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1814	2401	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1815	2402	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1816		- globalSection.add(ambient);
	2403	+ colorSection.add(ambient);
1817	2404
1818	2405	cGridBag backlit = new cGridBag();
1819	2406	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1820	2407	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1821	2408	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1822		- globalSection.add(backlit);
	2409	+ colorSection.add(backlit);
1823	2410
1824		- cGridBag opacity = new cGridBag();
1825		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1826		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1827		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1828		- globalSection.add(opacity);
1829		-
1830		- panel.add(new JSeparator());
	2411	+ //panel.add(new JSeparator());
1831	2412
1832		- panel.add(globalSection);
	2413	+ //panel.add(globalSection);
1833	2414
1834	2415	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1835	2416
..	..	@@ -1871,7 +2452,7 @@
1871	2452	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1872	2453	textureSection.add(opacityPower);
1873	2454
1874		- panel.add(new JSeparator());
	2455	+ panel.add(GetSeparator());
1875	2456
1876	2457	panel.add(textureSection);
1877	2458
..	..	@@ -1936,8 +2517,9 @@
1936	2517	// 3D models
1937	2518	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1938	2519	{
1939		- lastConverter = new com.jmex.model.converters.MaxToJme();
1940		- LoadFile(filename, lastConverter);
	2520	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2521	+ //LoadFile(filename, lastConverter);
	2522	+ LoadObjFile(filename); // New 3ds loader
1941	2523	continue;
1942	2524	}
1943	2525	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2663,6 +3245,7 @@
2663	3245	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2664	3246	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2665	3247	}
	3248	+
2666	3249	//cJME.count++;
2667	3250	//cJME.count %= 12;
2668	3251	if (gc)
..	..	@@ -2846,6 +3429,7 @@
2846	3429	}
2847	3430	}
2848	3431	}
	3432	+
2849	3433	cFileSystemPane FSPane;
2850	3434
2851	3435	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2855,7 +3439,7 @@
2855	3439
2856	3440	freezematerial = true;
2857	3441	colorField.setFloat(mat.color);
2858		- modulationField.setFloat(mat.modulation);
	3442	+ saturationField.setFloat(mat.modulation);
2859	3443	metalnessField.setFloat(mat.metalness);
2860	3444	diffuseField.setFloat(mat.diffuse);
2861	3445	specularField.setFloat(mat.specular);
..	..	@@ -2899,6 +3483,7 @@
2899	3483	}
2900	3484	}
2901	3485	}
	3486	+
2902	3487	freezematerial = false;
2903	3488	}
2904	3489
..	..	@@ -3017,12 +3602,17 @@
3017	3602	// }
3018	3603
3019	3604	/**/
3020		- if (deselect)
	3605	+ if (deselect \|\| child == null)
3021	3606	{
3022	3607	//group.deselectAll();
3023	3608	//freeze = true;
3024	3609	GetTree().clearSelection();
3025	3610	//freeze = false;
	3611	+
	3612	+ if (child == null)
	3613	+ {
	3614	+ return;
	3615	+ }
3026	3616	}
3027	3617
3028	3618	//group.addSelectee(child);
..	..	@@ -3056,6 +3646,17 @@
3056	3646	public void itemStateChanged(ItemEvent event)
3057	3647	{
3058	3648	// System.out.println("Propagate = " + propagate);
	3649	+ if (event.getSource() == pinButton)
	3650	+ {
	3651	+ copy.pinned ^= true;
	3652	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3653	+ {
	3654	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3655	+ copy.CloseUI();
	3656	+ //copy.editWindow.refreshContents();
	3657	+ }
	3658	+ }
	3659	+ else
3059	3660	if (event.getSource() == propagateToggle)
3060	3661	{
3061	3662	propagate ^= true;
..	..	@@ -3160,8 +3761,9 @@
3160	3761	} else if (event.getSource() == liveCB)
3161	3762	{
3162	3763	copy.live ^= true;
	3764	+ objEditor.refreshContents(true); // To show item colors
3163	3765	return;
3164		- } else if (event.getSource() == selectCB)
	3766	+ } else if (event.getSource() == selectableCB)
3165	3767	{
3166	3768	copy.dontselect ^= true;
3167	3769	return;
..	..	@@ -3169,7 +3771,7 @@
3169	3771	{
3170	3772	copy.hide ^= true;
3171	3773	copy.Touch(); // display list issue
3172		- objEditor.refreshContents();
	3774	+ objEditor.refreshContents(true); // To show item colors
3173	3775	return;
3174	3776	} else if (event.getSource() == link2masterCB)
3175	3777	{
..	..	@@ -3346,9 +3948,9 @@
3346	3948	{
3347	3949	Close();
3348	3950	//return true;
3349		- } else if (source == loadItem)
	3951	+ } else if (source == openItem)
3350	3952	{
3351		- load();
	3953	+ Open();
3352	3954	//return true;
3353	3955	} else if (source == newItem)
3354	3956	{
..	..	@@ -3373,6 +3975,10 @@
3373	3975	{
3374	3976	generatePOV();
3375	3977	//return true;
	3978	+ } else if (event.getSource() == archiveItem)
	3979	+ {
	3980	+ cTools.Archive(frame);
	3981	+ return;
3376	3982	} else if (source == zBufferItem)
3377	3983	{
3378	3984	try
..	..	@@ -3421,11 +4027,12 @@
3421	4027
3422	4028	static public byte[] Compress(Object3D o)
3423	4029	{
	4030	+ // Slower to actually compress.
3424	4031	try
3425	4032	{
3426	4033	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3427		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3428		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	4034	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4035	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3429	4036
3430	4037	Object3D parent = o.parent;
3431	4038	o.parent = null;
..	..	@@ -3436,10 +4043,14 @@
3436	4043
3437	4044	out.flush();
3438	4045
3439		- zstream.close();
	4046	+ baos //zstream
	4047	+ .close();
3440	4048	out.close();
3441	4049
3442		- return baos.toByteArray();
	4050	+ byte[] bytes = baos.toByteArray();
	4051	+
	4052	+ System.out.println("save #bytes = " + bytes.length);
	4053	+ return bytes;
3443	4054	} catch (Exception e)
3444	4055	{
3445	4056	System.err.println(e);
..	..	@@ -3449,13 +4060,16 @@
3449	4060
3450	4061	static public Object Uncompress(byte[] bytes)
3451	4062	{
3452		- System.out.println("#bytes = " + bytes.length);
	4063	+ System.out.println("restore #bytes = " + bytes.length);
3453	4064	try
3454	4065	{
3455	4066	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3456		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3457		- ObjectInputStream in = new ObjectInputStream(istream);
	4067	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4068	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3458	4069	Object obj = in.readObject();
	4070	+
	4071	+ bais //istream
	4072	+ .close();
3459	4073	in.close();
3460	4074
3461	4075	return obj;
..	..	@@ -3510,32 +4124,86 @@
3510	4124	return null;
3511	4125	}
3512	4126
3513		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3514	4127
3515	4128	public void Save()
3516	4129	{
	4130	+ //Save(true);
	4131	+ Replace();
	4132	+ SetUndoStates();
	4133	+ }
	4134	+
	4135	+ private boolean Equal(byte[] compress, byte[] name)
	4136	+ {
	4137	+ if (compress.length != name.length)
	4138	+ {
	4139	+ return false;
	4140	+ }
	4141	+
	4142	+ for (int i=compress.length; --i>=0;)
	4143	+ {
	4144	+ if (compress[i] != name[i])
	4145	+ return false;
	4146	+ }
	4147	+
	4148	+ return true;
	4149	+ }
	4150	+
	4151	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4152	+
	4153	+ void DeleteVersion()
	4154	+ {
	4155	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4156	+ {
	4157	+ copy.versionlist[i] = copy.versionlist[i+1];
	4158	+ }
	4159	+
	4160	+ CopyChanged();
	4161	+
	4162	+ SetUndoStates();
	4163	+ }
	4164	+
	4165	+ public boolean Save(boolean user)
	4166	+ {
3517	4167	System.err.println("Save");
	4168	+ Replace();
3518	4169
3519		- cRadio tab = GetCurrentTab();
	4170	+ //cRadio tab = GetCurrentTab();
3520	4171
3521		- boolean temp = CameraPane.SWITCH;
3522		- CameraPane.SWITCH = false;
	4172	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3523	4173
3524		- copy.ExtractBigData(hashtable);
	4174	+ boolean thesame = false;
	4175	+
	4176	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4177	+// {
	4178	+// thesame = true;
	4179	+// }
3525	4180
3526	4181	//EditorFrame.m_MainFrame.requestFocusInWindow();
3527		- tab.graphs[tab.undoindex++] = Compress(copy);
	4182	+ if (!thesame)
	4183	+ {
	4184	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4185	+ {
	4186	+ copy.versionlist[i] = copy.versionlist[i-1];
	4187	+ }
	4188	+
	4189	+ //tab.user[tab.versionindex] = user;
	4190	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4191	+
	4192	+ copy.versionlist[++copy.versionindex] = compress;
	4193	+
	4194	+ // if (increment)
	4195	+ // tab.versionindex++;
	4196	+ }
3528	4197
3529		- copy.RestoreBigData(hashtable);
	4198	+ //copy.RestoreBigData(versiontable);
3530	4199
3531		- CameraPane.SWITCH = temp;
3532		-
3533	4200	//assert(hashtable.isEmpty());
3534	4201
3535		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
3536		- {
3537		- tab.graphs[i] = null;
3538		- }
	4202	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4203	+// {
	4204	+// //tab.user[i] = false;
	4205	+// copy.versionlist[i] = null;
	4206	+// }
3539	4207
3540	4208	SetUndoStates();
3541	4209
..	..	@@ -3544,7 +4212,7 @@
3544	4212	{
3545	4213	try
3546	4214	{
3547		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	4215	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3548	4216	ObjectOutputStream p = new ObjectOutputStream(ostream);
3549	4217
3550	4218	p.writeObject(copy);
..	..	@@ -3557,28 +4225,68 @@
3557	4225	e.printStackTrace();
3558	4226	}
3559	4227	}
	4228	+
	4229	+ return !thesame;
	4230	+ }
	4231	+
	4232	+ boolean flashIt = true;
	4233	+
	4234	+ void RefreshSelection()
	4235	+ {
	4236	+ Object3D selection = new Object3D();
	4237	+
	4238	+ for (int i = 0; i < copy.selection.size(); i++)
	4239	+ {
	4240	+ Object3D elem = copy.selection.elementAt(i);
	4241	+
	4242	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4243	+
	4244	+ if (obj == null)
	4245	+ {
	4246	+ copy.selection.remove(i--);
	4247	+ }
	4248	+ else
	4249	+ {
	4250	+ selection.add(obj);
	4251	+ copy.selection.setElementAt(obj, i);
	4252	+ }
	4253	+ }
	4254	+
	4255	+ flashIt = false;
	4256	+ GetTree().clearSelection();
	4257	+ for (int i = 0; i < selection.size(); i++)
	4258	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4259	+ flashIt = true;
	4260	+
	4261	+ //refreshContents(false);
3560	4262	}
3561	4263
3562		- void CopyChanged(Object3D obj)
	4264	+ void CopyChanged()
3563	4265	{
	4266	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4267	+
3564	4268	SetUndoStates();
3565	4269
3566	4270	boolean temp = CameraPane.SWITCH;
3567	4271	CameraPane.SWITCH = false;
3568	4272
3569		- copy.ExtractBigData(hashtable);
	4273	+ copy.ExtractBigData(versiontable);
3570	4274
3571	4275	copy.clear();
3572	4276
	4277	+ copy.skyboxname = obj.skyboxname;
	4278	+ copy.skyboxext = obj.skyboxext;
	4279	+
3573	4280	for (int i=0; i<obj.Size(); i++)
3574	4281	{
3575	4282	copy.add(obj.get(i));
3576	4283	}
3577	4284
3578		- copy.RestoreBigData(hashtable);
	4285	+ copy.RestoreBigData(versiontable);
3579	4286
3580	4287	CameraPane.SWITCH = temp;
3581	4288
	4289	+ RefreshSelection();
3582	4290	//assert(hashtable.isEmpty());
3583	4291
3584	4292	copy.Touch();
..	..	@@ -3599,56 +4307,144 @@
3599	4307	}
3600	4308	}
3601	4309
3602		- refreshContents();
	4310	+ refreshContents(true);
3603	4311	}
3604	4312
3605		- cButton undoButton;
3606		- cButton redoButton;
	4313	+ cButton previousVersionButton;
	4314	+ cButton restoreButton;
	4315	+ cButton replaceButton;
	4316	+ cButton nextVersionButton;
	4317	+ cButton saveVersionButton;
	4318	+ cButton deleteVersionButton;
3607	4319
	4320	+ boolean muteSlider;
	4321	+
	4322	+ int VersionCount()
	4323	+ {
	4324	+ int count = 0;
	4325	+
	4326	+ for (int i = copy.versionlist.length; --i >= 0;)
	4327	+ {
	4328	+ if (copy.versionlist[i] != null)
	4329	+ count++;
	4330	+ }
	4331	+
	4332	+ return count;
	4333	+ }
	4334	+
3608	4335	void SetUndoStates()
3609	4336	{
3610		- cRadio tab = GetCurrentTab();
	4337	+ //if (true)
	4338	+ // return;
	4339	+
	4340	+ //cRadio tab = GetCurrentTab();
3611	4341
3612		- undoButton.setEnabled(tab.undoindex > 0);
3613		- redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	4342	+ restoreButton.setEnabled(copy.versionindex != -1);
	4343	+ replaceButton.setEnabled(copy.versionindex != -1);
	4344	+
	4345	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4346	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4347	+
	4348	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4349	+ copy.versionlist[copy.versionindex + 1] != null);
	4350	+
	4351	+ muteSlider = true;
	4352	+ versionSlider.setMinimum(0);
	4353	+ versionSlider.setMaximum(VersionCount() - 1);
	4354	+ versionSlider.setInteger(copy.versionindex);
	4355	+ versionSlider.setEnabled(copy.versionindex != -1);
	4356	+ muteSlider = false;
3614	4357	}
3615	4358
3616		- public void Undo()
	4359	+ public boolean PreviousVersion()
3617	4360	{
	4361	+ // Option?
	4362	+ Replace();
	4363	+
3618	4364	System.err.println("Undo");
3619	4365
3620		- cRadio tab = GetCurrentTab();
	4366	+ //cRadio tab = GetCurrentTab();
3621	4367
3622		- if (tab.undoindex == 0)
	4368	+ if (copy.versionindex == 0)
3623	4369	{
3624	4370	java.awt.Toolkit.getDefaultToolkit().beep();
3625		- return;
	4371	+ return false;
3626	4372	}
3627	4373
3628		- if (tab.graphs[tab.undoindex] == null)
3629		- {
3630		- Save();
3631		- tab.undoindex -= 1;
3632		- }
	4374	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4375	+// {
	4376	+// if (Save(false))
	4377	+// tab.versionindex -= 1;
	4378	+// else
	4379	+// {
	4380	+// if (tab.versionindex <= 0)
	4381	+// return false;
	4382	+// else
	4383	+// tab.versionindex -= 1;
	4384	+// }
	4385	+// }
3633	4386
3634		- tab.undoindex -= 1;
	4387	+ copy.versionindex -= 1;
3635	4388
3636		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4389	+ CopyChanged();
	4390	+
	4391	+ return true;
3637	4392	}
3638	4393
3639		- public void Redo()
	4394	+ public boolean Restore()
3640	4395	{
3641		- cRadio tab = GetCurrentTab();
	4396	+ System.err.println("Restore");
3642	4397
3643		- if (tab.graphs[tab.undoindex + 1] == null)
	4398	+ //cRadio tab = GetCurrentTab();
	4399	+
	4400	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4401	+ {
	4402	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4403	+ return false;
	4404	+ }
	4405	+
	4406	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4407	+ CopyChanged();
	4408	+
	4409	+ return true;
	4410	+ }
	4411	+
	4412	+ public boolean Replace()
	4413	+ {
	4414	+ System.err.println("Replace");
	4415	+
	4416	+ //cRadio tab = GetCurrentTab();
	4417	+
	4418	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4419	+ {
	4420	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4421	+ return false;
	4422	+ }
	4423	+
	4424	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4425	+
	4426	+ return true;
	4427	+ }
	4428	+
	4429	+ public void NextVersion()
	4430	+ {
	4431	+ // Option?
	4432	+ Replace();
	4433	+
	4434	+ //cRadio tab = GetCurrentTab();
	4435	+
	4436	+ if (copy.versionlist[copy.versionindex + 1] == null)
3644	4437	{
3645	4438	java.awt.Toolkit.getDefaultToolkit().beep();
3646	4439	return;
3647	4440	}
3648	4441
3649		- tab.undoindex += 1;
	4442	+ copy.versionindex += 1;
3650	4443
3651		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4444	+ CopyChanged();
	4445	+
	4446	+ //if (!tab.user[tab.versionindex])
	4447	+ // tab.graphs[tab.versionindex] = null;
3652	4448	}
3653	4449
3654	4450	void ImportGFD()
..	..	@@ -3859,7 +4655,7 @@
3859	4655	//copy.material = new cMaterial(copy.GetMaterial());
3860	4656
3861	4657	current.color = (float) colorField.getFloat();
3862		- current.modulation = (float) modulationField.getFloat();
	4658	+ current.modulation = (float) saturationField.getFloat();
3863	4659	current.metalness = (float) metalnessField.getFloat();
3864	4660	current.diffuse = (float) diffuseField.getFloat();
3865	4661	current.specular = (float) specularField.getFloat();
..	..	@@ -3892,7 +4688,7 @@
3892	4688	cMaterial mat = copy.material;
3893	4689
3894	4690	colorField.SetToolTipValue((mat.color));
3895		- modulationField.SetToolTipValue((mat.modulation));
	4691	+ saturationField.SetToolTipValue((mat.modulation));
3896	4692	metalnessField.SetToolTipValue((mat.metalness));
3897	4693	diffuseField.SetToolTipValue((mat.diffuse));
3898	4694	specularField.SetToolTipValue((mat.specular));
..	..	@@ -3944,9 +4740,26 @@
3944	4740	//copy.Touch();
3945	4741	}
3946	4742
	4743	+ cNumberSlider versionSlider;
	4744	+
3947	4745	public void stateChanged(ChangeEvent e)
3948	4746	{
3949	4747	// assert(false);
	4748	+ if (e.getSource() == versionSlider)
	4749	+ {
	4750	+ if (muteSlider)
	4751	+ return;
	4752	+
	4753	+ int version = versionSlider.getInteger();
	4754	+
	4755	+ if (version != -1 && copy.versionlist[version] != null)
	4756	+ {
	4757	+ copy.versionindex = version;
	4758	+ CopyChanged();
	4759	+ }
	4760	+
	4761	+ return;
	4762	+ }
3950	4763
3951	4764	if (freezematerial)
3952	4765	{
..	..	@@ -3982,6 +4795,12 @@
3982	4795	{
3983	4796	//System.out.println("stateChanged = " + this);
3984	4797	materialtouched = true;
	4798	+
	4799	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4800	+ {
	4801	+ saturationField.setFloat(1);
	4802	+ }
	4803	+
3985	4804	applySelf();
3986	4805	//System.out.println("this = " + this);
3987	4806	//System.out.println("PARENT = " + parent);
..	..	@@ -4281,6 +5100,7 @@
4281	5100	{
4282	5101	if (GetTree() != null)
4283	5102	{
	5103	+ GetTree().revalidate();
4284	5104	GetTree().repaint();
4285	5105	}
4286	5106
..	..	@@ -4289,13 +5109,16 @@
4289	5109	ctrlPanel.validate(); // ? new
4290	5110	ctrlPanel.repaint();
4291	5111	}
	5112	+
	5113	+ if (previousVersionButton != null && copy.versionlist != null)
	5114	+ SetUndoStates();
4292	5115	}
4293	5116
4294	5117	static TweenManager tweenManager = new TweenManager();
4295	5118
4296	5119	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4297	5120	{
4298		- if (Globals.SAVEONMAKE) // && resetmodel)
	5121	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4299	5122	Save();
4300	5123	//Tween.set(thing, 0).target(1).start(tweenManager);
4301	5124	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4537,7 +5360,9 @@
4537	5360	readobj.ResetDisplayList();
4538	5361	} catch (Exception e)
4539	5362	{
4540		- //e.printStackTrace();
	5363	+ if (!e.toString().contains("GZIP"))
	5364	+ e.printStackTrace();
	5365	+
4541	5366	try
4542	5367	{
4543	5368	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4611,12 +5436,14 @@
4611	5436
4612	5437	if (readobj != null)
4613	5438	{
4614		- if (Globals.SAVEONMAKE)
4615		- Save();
	5439	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5440	+ // Save();
4616	5441	try
4617	5442	{
4618	5443	//readobj.deepCopySelf(copy);
4619	5444	copy.clear(); // june 2014
	5445	+ copy.skyboxname = readobj.skyboxname;
	5446	+ copy.skyboxext = readobj.skyboxext;
4620	5447	for (int i = 0; i < readobj.size(); i++)
4621	5448	{
4622	5449	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4657,6 +5484,7 @@
4657	5484	}
4658	5485	} catch (ClassCastException e)
4659	5486	{
	5487	+ e.printStackTrace();
4660	5488	assert (false);
4661	5489	Composite c = (Composite) copy;
4662	5490	c.children.clear();
..	..	@@ -4667,17 +5495,31 @@
4667	5495	c.addChild(csg);
4668	5496	}
4669	5497
	5498	+ copy.versionlist = readobj.versionlist;
	5499	+ copy.versionindex = readobj.versionindex;
	5500	+
	5501	+ if (copy.versionlist == null)
	5502	+ {
	5503	+ // Backward compatibility
	5504	+ copy.versionlist = new Object3D[100];
	5505	+ copy.versionindex = -1;
	5506	+
	5507	+ Save(true);
	5508	+ }
	5509	+
	5510	+ //? SetUndoStates();
	5511	+
4670	5512	ResetModel();
4671	5513	copy.HardTouch(); // recompile?
4672	5514	refreshContents();
4673	5515	}
4674	5516	}
4675	5517
4676		- void load() // throws ClassNotFoundException
	5518	+ void Open() // throws ClassNotFoundException
4677	5519	{
4678	5520	if (Grafreed.standAlone)
4679	5521	{
4680		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5522	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4681	5523	browser.show();
4682	5524	String filename = browser.getFile();
4683	5525	if (filename != null && filename.length() > 0)
..	..	@@ -4776,6 +5618,7 @@
4776	5618	//ps.print(buffer.toString());
4777	5619	} catch (IOException e)
4778	5620	{
	5621	+ e.printStackTrace();
4779	5622	}
4780	5623	}
4781	5624
..	..	@@ -4958,7 +5801,7 @@
4958	5801	MenuBar menuBar;
4959	5802	Menu fileMenu;
4960	5803	MenuItem newItem;
4961		- MenuItem loadItem;
	5804	+ MenuItem openItem;
4962	5805	MenuItem saveItem;
4963	5806	MenuItem saveAsItem;
4964	5807	MenuItem exportAsItem;
..	..	@@ -4981,6 +5824,7 @@
4981	5824	CheckboxMenuItem toggleSwitchItem;
4982	5825	CheckboxMenuItem toggleRootItem;
4983	5826	CheckboxMenuItem animationItem;
	5827	+ MenuItem archiveItem;
4984	5828	CheckboxMenuItem toggleHandleItem;
4985	5829	CheckboxMenuItem togglePaintItem;
4986	5830	JSplitPane mainPanel;
..	..	@@ -4994,6 +5838,7 @@
4994	5838	ButtonGroup buttonGroup;
4995	5839
4996	5840	cGridBag toolboxPanel;
	5841	+ cGridBag skyboxPanel;
4997	5842	cGridBag materialPanel;
4998	5843	cGridBag ctrlPanel;
4999	5844
..	..	@@ -5067,7 +5912,7 @@
5067	5912	JLabel colorLabel;
5068	5913	cNumberSlider colorField;
5069	5914	JLabel modulationLabel;
5070		- cNumberSlider modulationField;
	5915	+ cNumberSlider saturationField;
5071	5916	JLabel metalnessLabel;
5072	5917	cNumberSlider metalnessField;
5073	5918	JLabel diffuseLabel;
..	..	@@ -5098,6 +5943,7 @@
5098	5943	cNumberSlider anisoField;
5099	5944	JLabel anisoVLabel;
5100	5945	cNumberSlider anisoVField;
	5946	+
5101	5947	JLabel cameraLabel;
5102	5948	cNumberSlider cameraField;
5103	5949	JLabel selfshadowLabel;
..	..	@@ -5112,6 +5958,7 @@
5112	5958	cNumberSlider fakedepthField;
5113	5959	JLabel shadowbiasLabel;
5114	5960	cNumberSlider shadowbiasField;
	5961	+
5115	5962	JLabel bumpLabel;
5116	5963	cNumberSlider bumpField;
5117	5964	JLabel noiseLabel;