~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.
..	..	@@ -38,64 +41,78 @@
38	41	JFrame frame;
39	42
40	43	static ObjEditor theFrame;
	44	+
	45	+ public cGridBag GetSeparator()
	46	+ {
	47	+ cGridBag separator = new cGridBag();
	48	+ separator.add(new JSeparator());
	49	+ separator.preferredHeight = 5;
	50	+ return separator;
	51	+ }
41	52
42	53	cButton GetButton(String name, boolean border)
43	54	{
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		- }
	55	+ ImageIcon icon = GetIcon(name);
	56	+ return new cButton(icon, border);
	57	+ }
	58	+
	59	+ cLabel GetLabel(String name, boolean border)
	60	+ {
	61	+ //ImageIcon icon = GetIcon(name);
	62	+ return new cLabel(GetImage(name), border);
53	63	}
54	64
55	65	cToggleButton GetToggleButton(String name, boolean border)
56	66	{
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		- }
	67	+ ImageIcon icon = GetIcon(name);
	68	+ return new cToggleButton(icon, border);
66	69	}
67	70
68	71	cCheckBox GetCheckBox(String name, boolean border)
69	72	{
	73	+ ImageIcon icon = GetIcon(name);
	74	+ return new cCheckBox(icon, border);
	75	+ }
	76	+
	77	+ ImageIcon GetIcon(String name)
	78	+ {
70	79	try
71	80	{
72		- ImageIcon icon = GetIcon(name);
73		- return new cCheckBox(icon, border);
	81	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	82	+
	83	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	84	+// {
	85	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	86	+// Graphics2D g = resized.createGraphics();
	87	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	88	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	89	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	90	+// g.dispose();
	91	+//
	92	+// image = resized;
	93	+// }
	94	+
	95	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	96	+ return icon;
74	97	}
75	98	catch (Exception e)
76	99	{
77		- return new cCheckBox(name, border);
	100	+ return null;
78	101	}
79	102	}
80		-
81		- private ImageIcon GetIcon(String name) throws IOException
	103	+
	104	+ BufferedImage GetImage(String name)
82	105	{
83		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
84		-
85		- if (image.getWidth() != 24 && image.getHeight() != 24)
	106	+ try
86	107	{
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;
	108	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	109	+
	110	+ return image;
95	111	}
96		-
97		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
98		- return icon;
	112	+ catch (Exception e)
	113	+ {
	114	+ return null;
	115	+ }
99	116	}
100	117
101	118	// SCRIPT
..	..	@@ -207,7 +224,7 @@
207	224
208	225	objEditor.ctrlPanel.remove(namePanel);
209	226
210		- if (!GroupEditor.allparams)
	227	+ if (!allparams)
211	228	return;
212	229
213	230	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -279,6 +296,12 @@
279	296	client = inClient;
280	297	copy = client;
281	298
	299	+ if (copy.versionlist == null)
	300	+ {
	301	+ copy.versionlist = new Object3D[100];
	302	+ copy.versionindex = -1;
	303	+ }
	304	+
282	305	// "this" is not called: SetupUI2(objEditor);
283	306	}
284	307
..	..	@@ -292,6 +315,12 @@
292	315	client = inClient;
293	316	copy = client;
294	317
	318	+ if (copy.versionlist == null)
	319	+ {
	320	+ copy.versionlist = new Object3D[100];
	321	+ copy.versionindex = -1;
	322	+ }
	323	+
295	324	SetupUI2(callee.GetEditor());
296	325	}
297	326
..	..	@@ -306,7 +335,7 @@
306	335	//localCopy.parent = null;
307	336
308	337	frame = new JFrame();
309		- frame.setUndecorated(true);
	338	+ frame.setUndecorated(false);
310	339	objEditor = this;
311	340	this.callee = callee;
312	341
..	..	@@ -324,6 +353,12 @@
324	353	copy = localCopy;
325	354	copy.editWindow = this;
326	355
	356	+ if (copy.versionlist == null)
	357	+ {
	358	+// copy.versions = new byte[100][];
	359	+// copy.versionindex = -1;
	360	+ }
	361	+
327	362	SetupMenu();
328	363
329	364	//SetupName(objEditor); // new
..	..	@@ -337,12 +372,17 @@
337	372	return frame.action(event, obj);
338	373	}
339	374
	375	+ // Cannot work without static
	376	+ static boolean allparams = true;
	377	+
	378	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	379	+
340	380	void SetupMenu()
341	381	{
342	382	frame.setMenuBar(menuBar = new MenuBar());
343	383	menuBar.add(fileMenu = new Menu("File"));
344	384	fileMenu.add(newItem = new MenuItem("New"));
345		- fileMenu.add(loadItem = new MenuItem("Open..."));
	385	+ fileMenu.add(openItem = new MenuItem("Open..."));
346	386
347	387	//oe.menuBar.add(menu = new Menu("Include"));
348	388	Menu menu = new Menu("Import");
..	..	@@ -374,7 +414,7 @@
374	414	}
375	415
376	416	newItem.addActionListener(this);
377		- loadItem.addActionListener(this);
	417	+ openItem.addActionListener(this);
378	418	saveItem.addActionListener(this);
379	419	saveAsItem.addActionListener(this);
380	420	exportAsItem.addActionListener(this);
..	..	@@ -383,13 +423,40 @@
383	423	closeItem.addActionListener(this);
384	424
385	425	objectPanel = new JTabbedPane();
	426	+
	427	+ ChangeListener changeListener = new ChangeListener()
	428	+ {
	429	+ public void stateChanged(ChangeEvent changeEvent)
	430	+ {
	431	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	432	+// {
	433	+// if (latestObject != null)
	434	+// {
	435	+// refreshContents(true);
	436	+// SetMaterial(latestObject);
	437	+// }
	438	+//
	439	+// materialFlushed = true;
	440	+// }
	441	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	442	+// {
	443	+// if (listUI.size() == 0)
	444	+// EditSelection(false);
	445	+// }
	446	+
	447	+ refreshContents(false); // To refresh Info tab
	448	+ }
	449	+ };
	450	+ objectPanel.addChangeListener(changeListener);
	451	+
386	452	toolbarPanel = new JPanel();
387	453	toolbarPanel.setName("Toolbar");
	454	+
388	455	treePanel = new cGridBag();
389	456	treePanel.setName("Tree");
390	457
391	458	editPanel = new cGridBag().setVertical(true);
392		- editPanel.setName("Edit");
	459	+ //editPanel.setName("Edit");
393	460
394	461	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
395	462
..	..	@@ -397,11 +464,11 @@
397	464	editPanel.add(editCommandsPanel);
398	465	editPanel.add(ctrlPanel);
399	466
400		- toolboxPanel = new cGridBag().setVertical(false);
401		- toolboxPanel.setName("Toolbox");
	467	+ toolboxPanel = new cGridBag().setVertical(true);
	468	+ //toolboxPanel.setName("Toolbox");
402	469
403		- materialPanel = new cGridBag().setVertical(true);
404		- materialPanel.setName("Material");
	470	+ materialPanel = new cGridBag().setVertical(false);
	471	+ //materialPanel.setName("Material");
405	472
406	473	/JTextPane/
407	474	infoarea = createTextPane();
..	..	@@ -409,14 +476,15 @@
409	476
410	477	infoarea.setEditable(true);
411	478	SetText();
	479	+
412	480	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
413	481	// infoarea.setOpaque(false);
414	482	// //infoarea.setForeground(textcolor);
415	483	// TEXTAREA infoarea.setLineWrap(true);
416	484	// TEXTAREA infoarea.setWrapStyleWord(true);
417	485	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
418		- infoPanel.setPreferredSize(new Dimension(50, 200));
419		- infoPanel.setName("Info");
	486	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	487	+ //infoPanel.setName("Info");
420	488	//infoPanel.setLayout(new BorderLayout());
421	489	//infoPanel.add(createTextPane());
422	490
..	..	@@ -427,7 +495,14 @@
427	495	mainPanel.setDividerSize(9);
428	496	mainPanel.setDividerLocation(0.5); //1.0);
429	497	mainPanel.setResizeWeight(0.5);
430		-
	498	+
	499	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	500	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	501	+ divider.setDividerSize(15);
	502	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	503	+
	504	+ mainPanel.setUI(new BasicSplitPaneUI());
	505	+
431	506	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
432	507	//mainPanel.setLayout(new GridBagLayout());
433	508	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -658,8 +733,8 @@
658	733	}
659	734	}
660	735
661		-static GraphicsDevice device = GraphicsEnvironment
662		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	736	+//static GraphicsDevice device = GraphicsEnvironment
	737	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
663	738
664	739	Rectangle keeprect;
665	740	cRadio radio;
..	..	@@ -680,10 +755,19 @@
680	755	void Minimize()
681	756	{
682	757	frame.setState(Frame.ICONIFIED);
	758	+ frame.validate();
683	759	}
684	760
	761	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	762	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	763	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
685	764	void Maximize()
686	765	{
	766	+ if (CameraPane.FULLSCREEN)
	767	+ {
	768	+ ToggleFullScreen();
	769	+ }
	770	+
687	771	if (maximized)
688	772	{
689	773	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -691,20 +775,36 @@
691	775	else
692	776	{
693	777	keeprect = frame.getBounds();
694		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
695		- Dimension rect2 = frame.getToolkit().getScreenSize();
696		- frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	778	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	779	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	780	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
697	781	// frame.setState(Frame.MAXIMIZED_BOTH);
	782	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
698	783	}
699	784
700	785	maximized ^= true;
	786	+
	787	+ frame.validate();
701	788	}
	789	+
	790	+ cButton minButton;
	791	+ cButton maxButton;
	792	+ cButton fullButton;
702	793
703	794	void ToggleFullScreen()
704	795	{
705		- if (CameraPane.FULLSCREEN)
	796	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	797	+
	798	+ cameraView.ToggleFullScreen();
	799	+
	800	+ if (!CameraPane.FULLSCREEN)
706	801	{
707	802	device.setFullScreenWindow(null);
	803	+ frame.dispose();
	804	+ frame.setUndecorated(false);
	805	+ frame.validate();
	806	+ frame.setVisible(true);
	807	+
708	808	//frame.setVisible(false);
709	809	// frame.removeNotify();
710	810	// frame.setUndecorated(false);
..	..	@@ -714,7 +814,7 @@
714	814	// X frame.getContentPane().remove(/"Center",/bigThree);
715	815	// X framePanel.add(bigThree);
716	816	// X frame.getContentPane().add(/"Center",/framePanel);
717		- framePanel.setDividerLocation(1);
	817	+ framePanel.setDividerLocation(46);
718	818
719	819	//frame.setVisible(true);
720	820	radio.layout = keepButton;
..	..	@@ -729,7 +829,12 @@
729	829	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
730	830	// frame.getToolkit().getScreenSize().height);
731	831	//frame.setVisible(false);
	832	+
	833	+ frame.dispose();
	834	+ frame.setUndecorated(true);
732	835	device.setFullScreenWindow(frame);
	836	+ frame.validate();
	837	+ frame.setVisible(true);
733	838	// frame.removeNotify();
734	839	// frame.setUndecorated(true);
735	840	// frame.addNotify();
..	..	@@ -742,9 +847,33 @@
742	847	radio.layout.doClick();
743	848	//frame.setVisible(true);
744	849	}
745		-
746		- cameraView.ToggleFullScreen();
	850	+ frame.validate();
	851	+
	852	+ cameraView.requestFocusInWindow();
747	853	}
	854	+
	855	+ private Object3D CompressCopy()
	856	+ {
	857	+ boolean temp = CameraPane.SWITCH;
	858	+ CameraPane.SWITCH = false;
	859	+
	860	+ copy.ExtractBigData(versiontable);
	861	+ // if (copy == client)
	862	+
	863	+ Object3D versions[] = copy.versionlist;
	864	+ copy.versionlist = null;
	865	+
	866	+ //byte[] compress = Compress(copy);
	867	+ Object3D compress = (Object3D)Grafreed.clone(copy);
	868	+
	869	+ copy.versionlist = versions;
	870	+
	871	+ copy.RestoreBigData(versiontable);
	872	+
	873	+ CameraPane.SWITCH = temp;
	874	+
	875	+ return compress;
	876	+ }
748	877
749	878	private JTextPane createTextPane()
750	879	{
..	..	@@ -867,6 +996,7 @@
867	996	{
868	997	SetupMaterial(materialPanel);
869	998	}
	999	+
870	1000	//SetupName();
871	1001	//SetupViews();
872	1002	}
..	..	@@ -876,7 +1006,7 @@
876	1006	// NumberSlider vDivsField;
877	1007	// JCheckBox endcaps;
878	1008	JCheckBox liveCB;
879		- JCheckBox selectCB;
	1009	+ JCheckBox selectableCB;
880	1010	JCheckBox hideCB;
881	1011	JCheckBox link2masterCB;
882	1012	JCheckBox markCB;
..	..	@@ -884,7 +1014,12 @@
884	1014	JCheckBox speedupCB;
885	1015	JCheckBox rewindCB;
886	1016	JCheckBox flipVCB;
	1017	+
	1018	+ cCheckBox toggleTextureCB;
	1019	+ cCheckBox toggleSwitchCB;
	1020	+
887	1021	JComboBox texresMenu;
	1022	+
888	1023	JButton resetButton;
889	1024	JButton stepButton;
890	1025	JButton stepAllButton;
..	..	@@ -1071,38 +1206,42 @@
1071	1206	namePanel = new cGridBag();
1072	1207
1073	1208	nameField = AddText(namePanel, copy.GetName());
1074		- namePanel.add(nameField);
	1209	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1075	1210	oe.ctrlPanel.add(namePanel);
1076	1211
1077	1212	oe.ctrlPanel.Return();
1078	1213
1079		- if (!GroupEditor.allparams)
	1214	+ if (!allparams)
1080	1215	return;
1081	1216
1082	1217	setupPanel = new cGridBag().setVertical(false);
1083	1218
1084	1219	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1085	1220	liveCB.setToolTipText("Animate object");
1086		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1087		- selectCB.setToolTipText("Make object selectable");
	1221	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1222	+ selectableCB.setToolTipText("Make object selectable");
1088	1223	// Return();
	1224	+
1089	1225	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1090	1226	hideCB.setToolTipText("Hide object");
1091	1227	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1092		- markCB.setToolTipText("Set the animation target transform");
	1228	+ markCB.setToolTipText("As animation target transform");
	1229	+
	1230	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1093	1231
1094	1232	setupPanel2 = new cGridBag().setVertical(false);
1095	1233
1096	1234	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1097	1235	rewindCB.setToolTipText("Rewind animation");
1098	1236
1099		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1100		- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1237	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1238	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1101	1239
	1240	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1241	+ link2masterCB.setToolTipText("Attach to support");
	1242	+
1102	1243	if (Globals.ADVANCED)
1103	1244	{
1104		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1105		- link2masterCB.setToolTipText("Attach to support");
1106	1245	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1107	1246	speedupCB.setToolTipText("Option motion capture");
1108	1247	}
..	..	@@ -1376,6 +1515,7 @@
1376	1515	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1377	1516	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1378	1517	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1518	+ //XYZPanel.setName("XYZ");
1379	1519
1380	1520	/*
1381	1521	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1412,14 +1552,30 @@
1412	1552
1413	1553	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1414	1554	//tmp.setName("Edit");
1415		- objectPanel.add(toolboxPanel);
1416	1555	objectPanel.add(materialPanel);
	1556	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1557	+ objectPanel.setToolTipTextAt(0, "Material");
	1558	+
1417	1559	// JPanel north = new JPanel(new BorderLayout());
1418	1560	// north.setName("Edit");
1419	1561	// north.add(ctrlPanel, BorderLayout.NORTH);
1420	1562	// objectPanel.add(north);
1421	1563	objectPanel.add(editPanel);
1422		- objectPanel.add(infoPanel);
	1564	+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1565	+ objectPanel.setToolTipTextAt(1, "Edit controls");
	1566	+
	1567	+ //if (Globals.ADVANCED)
	1568	+ objectPanel.add(infoPanel);
	1569	+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1570	+ objectPanel.setToolTipTextAt(2, "Information");
	1571	+
	1572	+ objectPanel.add(XYZPanel);
	1573	+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
	1574	+ objectPanel.setToolTipTextAt(3, "XYZ/RGB transform");
	1575	+
	1576	+ objectPanel.add(toolboxPanel);
	1577	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
	1578	+ objectPanel.setToolTipTextAt(4, "Objects & backgrounds");
1423	1579
1424	1580	/*
1425	1581	aConstraints.gridx = 0;
..	..	@@ -1428,7 +1584,7 @@
1428	1584	aConstraints.gridy += 1;
1429	1585	aConstraints.gridwidth = 1;
1430	1586	mainPanel.add(objectPanel, aConstraints);
1431		- */
	1587	+ */
1432	1588
1433	1589	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1434	1590	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1440,14 +1596,12 @@
1440	1596	scrollpane.addMouseWheelListener(this); // Default not fast enough
1441	1597
1442	1598	/JTabbedPane/ scenePanel = new cGridBag();
1443		- scenePanel.preferredWidth = 6;
	1599	+ scenePanel.preferredWidth = 5;
1444	1600
1445	1601	JTabbedPane tabbedPane = new JTabbedPane();
1446	1602	tabbedPane.add(scrollpane);
1447	1603
1448		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1449		-
1450		- optionsPanel = new cGridBag().setVertical(true);
	1604	+ optionsPanel = new cGridBag().setVertical(false);
1451	1605
1452	1606	optionsPanel.setName("Options");
1453	1607
..	..	@@ -1455,6 +1609,8 @@
1455	1609
1456	1610	tabbedPane.add(optionsPanel);
1457	1611
	1612	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1613	+
1458	1614	scenePanel.add(tabbedPane);
1459	1615
1460	1616	/*
..	..	@@ -1518,7 +1674,7 @@
1518	1674	bigThree = new cGridBag();
1519	1675	bigThree.addComponent(scenePanel);
1520	1676	bigThree.addComponent(centralPanel);
1521		- bigThree.addComponent(XYZPanel);
	1677	+ //bigThree.addComponent(XYZPanel);
1522	1678
1523	1679	// // SIDE EFFECT!!!
1524	1680	// aConstraints.gridx = 0;
..	..	@@ -1527,9 +1683,9 @@
1527	1683	// aConstraints.gridheight = 1;
1528	1684
1529	1685	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1530		- framePanel.setContinuousLayout(true);
1531		- framePanel.setOneTouchExpandable(true);
1532		- framePanel.setDividerLocation(0.8);
	1686	+ framePanel.setContinuousLayout(false);
	1687	+ framePanel.setOneTouchExpandable(false);
	1688	+ //.setDividerLocation(0.8);
1533	1689	//framePanel.setDividerSize(15);
1534	1690	//framePanel.setResizeWeight(0.15);
1535	1691	framePanel.setName("Frame");
..	..	@@ -1547,16 +1703,18 @@
1547	1703	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1548	1704
1549	1705	frame.setSize(1280, 860);
1550		- frame.setVisible(true);
1551		-
	1706	+
1552	1707	cameraView.requestFocusInWindow();
1553	1708
1554	1709	gridPanel.setDividerLocation(1.0);
	1710	+
	1711	+ frame.validate();
	1712	+
	1713	+ frame.setVisible(true);
1555	1714
1556	1715	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1557	1716	frame.addWindowListener(new WindowAdapter()
1558	1717	{
1559		-
1560	1718	public void windowClosing(WindowEvent e)
1561	1719	{
1562	1720	Close();
..	..	@@ -1579,12 +1737,384 @@
1579	1737	ctrlPanel.removeAll();
1580	1738	}
1581	1739
1582		- void SetupMaterial(cGridBag panel)
	1740	+ void SetupMaterial(cGridBag materialpanel)
1583	1741	{
1584		- /*
	1742	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1743	+
	1744	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1745	+ skin.setToolTipText("Skin");
	1746	+ skin.addMouseListener(new MouseAdapter()
	1747	+ {
	1748	+ public void mouseClicked(MouseEvent e)
	1749	+ {
	1750	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1751	+ cMaterial material = object.material;
	1752	+
	1753	+ // Skin
	1754	+ colorField.setFloat(material.color);
	1755	+ saturationField.setFloat(material.modulation);
	1756	+ subsurfaceField.setFloat(material.subsurface);
	1757	+ selfshadowField.setFloat(material.diffuseness);
	1758	+ diffusenessField.setFloat(material.factor);
	1759	+ shininessField.setFloat(material.shininess);
	1760	+ shadowbiasField.setFloat(material.shadowbias);
	1761	+ diffuseField.setFloat(material.diffuse);
	1762	+ specularField.setFloat(material.specular);
	1763	+
	1764	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1765	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1766	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1767	+
	1768	+ materialtouched = true;
	1769	+ applySelf();
	1770	+ }
	1771	+ });
	1772	+ presetpanel.add(skin);
	1773	+
	1774	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1775	+ lambert.setToolTipText("Diffuse");
	1776	+ lambert.addMouseListener(new MouseAdapter()
	1777	+ {
	1778	+ public void mouseClicked(MouseEvent e)
	1779	+ {
	1780	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1781	+ cMaterial material = object.material;
	1782	+
	1783	+ diffusenessField.setFloat(material.factor);
	1784	+ selfshadowField.setFloat(material.diffuseness);
	1785	+
	1786	+ materialtouched = true;
	1787	+ applySelf();
	1788	+ }
	1789	+ });
	1790	+ presetpanel.add(lambert);
	1791	+
	1792	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1793	+ diffuse2.setToolTipText("Diffuse2");
	1794	+ diffuse2.addMouseListener(new MouseAdapter()
	1795	+ {
	1796	+ public void mouseClicked(MouseEvent e)
	1797	+ {
	1798	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1799	+ cMaterial material = object.material;
	1800	+
	1801	+ diffusenessField.setFloat(material.factor);
	1802	+ selfshadowField.setFloat(material.diffuseness);
	1803	+
	1804	+ materialtouched = true;
	1805	+ applySelf();
	1806	+ }
	1807	+ });
	1808	+ presetpanel.add(diffuse2);
	1809	+
	1810	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1811	+ diffusemoon.setToolTipText("Moon");
	1812	+ diffusemoon.addMouseListener(new MouseAdapter()
	1813	+ {
	1814	+ public void mouseClicked(MouseEvent e)
	1815	+ {
	1816	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1817	+ cMaterial material = object.material;
	1818	+
	1819	+ diffusenessField.setFloat(material.factor);
	1820	+ selfshadowField.setFloat(material.diffuseness);
	1821	+
	1822	+ materialtouched = true;
	1823	+ applySelf();
	1824	+ }
	1825	+ });
	1826	+ presetpanel.add(diffusemoon);
	1827	+
	1828	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1829	+ diffusemoon2.setToolTipText("Moon2");
	1830	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1831	+ {
	1832	+ public void mouseClicked(MouseEvent e)
	1833	+ {
	1834	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1835	+ cMaterial material = object.material;
	1836	+
	1837	+ diffusenessField.setFloat(material.factor);
	1838	+ selfshadowField.setFloat(material.diffuseness);
	1839	+
	1840	+ materialtouched = true;
	1841	+ applySelf();
	1842	+ }
	1843	+ });
	1844	+ presetpanel.add(diffusemoon2);
	1845	+
	1846	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1847	+ diffusemoon3.setToolTipText("Moon3");
	1848	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1849	+ {
	1850	+ public void mouseClicked(MouseEvent e)
	1851	+ {
	1852	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1853	+ cMaterial material = object.material;
	1854	+
	1855	+ diffusenessField.setFloat(material.factor);
	1856	+ selfshadowField.setFloat(material.diffuseness);
	1857	+
	1858	+ materialtouched = true;
	1859	+ applySelf();
	1860	+ }
	1861	+ });
	1862	+ presetpanel.add(diffusemoon3);
	1863	+
	1864	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1865	+ diffusesheen.setToolTipText("Sheen");
	1866	+ diffusesheen.addMouseListener(new MouseAdapter()
	1867	+ {
	1868	+ public void mouseClicked(MouseEvent e)
	1869	+ {
	1870	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1871	+ cMaterial material = object.material;
	1872	+
	1873	+ sheenField.setFloat(material.sheen);
	1874	+
	1875	+ materialtouched = true;
	1876	+ applySelf();
	1877	+ }
	1878	+ });
	1879	+ presetpanel.add(diffusesheen);
	1880	+
	1881	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	1882	+ rough.setToolTipText("Rough metal");
	1883	+ rough.addMouseListener(new MouseAdapter()
	1884	+ {
	1885	+ public void mouseClicked(MouseEvent e)
	1886	+ {
	1887	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	1888	+ cMaterial material = object.material;
	1889	+
	1890	+ shininessField.setFloat(material.shininess);
	1891	+ velvetField.setFloat(material.velvet);
	1892	+
	1893	+ materialtouched = true;
	1894	+ applySelf();
	1895	+ }
	1896	+ });
	1897	+ presetpanel.add(rough);
	1898	+
	1899	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	1900	+ rough2.setToolTipText("Medium metal");
	1901	+ rough2.addMouseListener(new MouseAdapter()
	1902	+ {
	1903	+ public void mouseClicked(MouseEvent e)
	1904	+ {
	1905	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	1906	+ cMaterial material = object.material;
	1907	+
	1908	+ shininessField.setFloat(material.shininess);
	1909	+ lightareaField.setFloat(material.lightarea);
	1910	+
	1911	+ materialtouched = true;
	1912	+ applySelf();
	1913	+ }
	1914	+ });
	1915	+ presetpanel.add(rough2);
	1916	+
	1917	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	1918	+ shini0.setToolTipText("Shiny");
	1919	+ shini0.addMouseListener(new MouseAdapter()
	1920	+ {
	1921	+ public void mouseClicked(MouseEvent e)
	1922	+ {
	1923	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	1924	+ cMaterial material = object.material;
	1925	+
	1926	+ shininessField.setFloat(material.shininess);
	1927	+ lightareaField.setFloat(material.lightarea);
	1928	+
	1929	+ materialtouched = true;
	1930	+ applySelf();
	1931	+ }
	1932	+ });
	1933	+ presetpanel.add(shini0);
	1934	+
	1935	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	1936	+ shini1.setToolTipText("Shiny2");
	1937	+ shini1.addMouseListener(new MouseAdapter()
	1938	+ {
	1939	+ public void mouseClicked(MouseEvent e)
	1940	+ {
	1941	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	1942	+ cMaterial material = object.material;
	1943	+
	1944	+ shininessField.setFloat(material.shininess);
	1945	+ lightareaField.setFloat(material.lightarea);
	1946	+
	1947	+ materialtouched = true;
	1948	+ applySelf();
	1949	+ }
	1950	+ });
	1951	+ presetpanel.add(shini1);
	1952	+
	1953	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	1954	+ shini2.setToolTipText("Shiny3");
	1955	+ shini2.addMouseListener(new MouseAdapter()
	1956	+ {
	1957	+ public void mouseClicked(MouseEvent e)
	1958	+ {
	1959	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	1960	+ cMaterial material = object.material;
	1961	+
	1962	+ shininessField.setFloat(material.shininess);
	1963	+ lightareaField.setFloat(material.lightarea);
	1964	+
	1965	+ materialtouched = true;
	1966	+ applySelf();
	1967	+ }
	1968	+ });
	1969	+ presetpanel.add(shini2);
	1970	+
	1971	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	1972	+ aniso.setToolTipText("AnisoU");
	1973	+ aniso.addMouseListener(new MouseAdapter()
	1974	+ {
	1975	+ public void mouseClicked(MouseEvent e)
	1976	+ {
	1977	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	1978	+ cMaterial material = object.material;
	1979	+
	1980	+ anisoField.setFloat(material.aniso);
	1981	+ anisoVField.setFloat(material.anisoV);
	1982	+
	1983	+ materialtouched = true;
	1984	+ applySelf();
	1985	+ }
	1986	+ });
	1987	+ presetpanel.add(aniso);
	1988	+
	1989	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	1990	+ aniso2.setToolTipText("AnisoV");
	1991	+ aniso2.addMouseListener(new MouseAdapter()
	1992	+ {
	1993	+ public void mouseClicked(MouseEvent e)
	1994	+ {
	1995	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	1996	+ cMaterial material = object.material;
	1997	+
	1998	+ anisoField.setFloat(material.aniso);
	1999	+ anisoVField.setFloat(material.anisoV);
	2000	+
	2001	+ materialtouched = true;
	2002	+ applySelf();
	2003	+ }
	2004	+ });
	2005	+ presetpanel.add(aniso2);
	2006	+
	2007	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2008	+ aniso3.setToolTipText("AnisoUV");
	2009	+ aniso3.addMouseListener(new MouseAdapter()
	2010	+ {
	2011	+ public void mouseClicked(MouseEvent e)
	2012	+ {
	2013	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2014	+ cMaterial material = object.material;
	2015	+
	2016	+ anisoField.setFloat(material.aniso);
	2017	+ anisoVField.setFloat(material.anisoV);
	2018	+
	2019	+ materialtouched = true;
	2020	+ applySelf();
	2021	+ }
	2022	+ });
	2023	+ presetpanel.add(aniso3);
	2024	+
	2025	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2026	+ velvet0.setToolTipText("Velvet");
	2027	+ velvet0.addMouseListener(new MouseAdapter()
	2028	+ {
	2029	+ public void mouseClicked(MouseEvent e)
	2030	+ {
	2031	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2032	+ cMaterial material = object.material;
	2033	+
	2034	+ diffusenessField.setFloat(material.factor);
	2035	+ selfshadowField.setFloat(material.diffuseness);
	2036	+ sheenField.setFloat(material.sheen);
	2037	+ shininessField.setFloat(material.shininess);
	2038	+ velvetField.setFloat(material.velvet);
	2039	+ shiftField.setFloat(material.shift);
	2040	+
	2041	+ materialtouched = true;
	2042	+ applySelf();
	2043	+ }
	2044	+ });
	2045	+ presetpanel.add(velvet0);
	2046	+
	2047	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2048	+ bump0.setToolTipText("Bump texture");
	2049	+ bump0.addMouseListener(new MouseAdapter()
	2050	+ {
	2051	+ public void mouseClicked(MouseEvent e)
	2052	+ {
	2053	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2054	+ cMaterial material = object.material;
	2055	+
	2056	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2057	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2058	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2059	+
	2060	+ materialtouched = true;
	2061	+ applySelf();
	2062	+ }
	2063	+ });
	2064	+ presetpanel.add(bump0);
	2065	+
	2066	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2067	+ halo.setToolTipText("Halo");
	2068	+ halo.addMouseListener(new MouseAdapter()
	2069	+ {
	2070	+ public void mouseClicked(MouseEvent e)
	2071	+ {
	2072	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2073	+ cMaterial material = object.material;
	2074	+
	2075	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2076	+
	2077	+ materialtouched = true;
	2078	+ applySelf();
	2079	+ }
	2080	+ });
	2081	+ presetpanel.add(halo);
	2082	+
	2083	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2084	+ candle.setToolTipText("Candle");
	2085	+ candle.addMouseListener(new MouseAdapter()
	2086	+ {
	2087	+ public void mouseClicked(MouseEvent e)
	2088	+ {
	2089	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2090	+ cMaterial material = object.material;
	2091	+
	2092	+ subsurfaceField.setFloat(material.subsurface);
	2093	+ shadowbiasField.setFloat(material.shadowbias);
	2094	+ ambientField.setFloat(material.ambient);
	2095	+ specularField.setFloat(material.specular);
	2096	+ lightareaField.setFloat(material.lightarea);
	2097	+ shininessField.setFloat(material.shininess);
	2098	+
	2099	+ materialtouched = true;
	2100	+ applySelf();
	2101	+ }
	2102	+ });
	2103	+ presetpanel.add(candle);
	2104	+
	2105	+ cGridBag panel = new cGridBag().setVertical(true);
	2106	+
	2107	+ presetpanel.preferredWidth = 1;
	2108	+
	2109	+ materialpanel.add(presetpanel);
	2110	+ materialpanel.add(panel);
	2111	+
	2112	+ panel.preferredWidth = 8;
	2113	+
	2114	+ /*
1585	2115	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1586	2116	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1587		- */
	2117	+ */
1588	2118
1589	2119	cGridBag editBar = new cGridBag().setVertical(false);
1590	2120
..	..	@@ -1618,45 +2148,50 @@
1618	2148	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1619	2149
1620	2150	cGridBag colorSection = new cGridBag().setVertical(true);
	2151	+
	2152	+ cGridBag huepanel = new cGridBag();
	2153	+ cGridBag huelabel = new cGridBag();
	2154	+ skin = GetLabel("icons/hue.png", false);
	2155	+ skin.fit = true;
	2156	+ huelabel.add(skin);
	2157	+ huelabel.preferredWidth = 20;
	2158	+ huepanel.add(new cGridBag()); // Label
	2159	+ huepanel.add(huelabel); // Field/slider
	2160	+
	2161	+ huepanel.preferredHeight = 7;
	2162	+
	2163	+ colorSection.add(huepanel);
1621	2164
1622	2165	cGridBag color = new cGridBag();
1623		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1624		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1625		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2166	+
	2167	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2168	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2169	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2170	+
1626	2171	//colorField.preferredWidth = 200;
1627	2172	colorSection.add(color);
1628	2173
1629	2174	cGridBag modulation = new cGridBag();
1630	2175	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1631	2176	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1632		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2177	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1633	2178	colorSection.add(modulation);
1634	2179
	2180	+ cGridBag opacity = new cGridBag();
	2181	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2182	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2183	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2184	+ colorSection.add(opacity);
	2185	+
	2186	+ colorSection.add(GetSeparator());
	2187	+
1635	2188	cGridBag texture = new cGridBag();
1636	2189	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1637	2190	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1638	2191	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1639	2192	colorSection.add(texture);
1640	2193
1641		- cGridBag anisoU = new cGridBag();
1642		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1643		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1644		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1645		- colorSection.add(anisoU);
1646		-
1647		- cGridBag anisoV = new cGridBag();
1648		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1649		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1650		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1651		- colorSection.add(anisoV);
1652		-
1653		- cGridBag shadowbias = new cGridBag();
1654		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1655		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1656		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1657		- colorSection.add(shadowbias);
1658		-
1659		- panel.add(new JSeparator());
	2194	+ panel.add(GetSeparator());
1660	2195
1661	2196	panel.add(colorSection);
1662	2197
..	..	@@ -1706,7 +2241,13 @@
1706	2241	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1707	2242	diffuseSection.add(fakedepth);
1708	2243
1709		- panel.add(new JSeparator());
	2244	+ cGridBag shadowbias = new cGridBag();
	2245	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2246	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2247	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2248	+ diffuseSection.add(shadowbias);
	2249	+
	2250	+ panel.add(GetSeparator());
1710	2251
1711	2252	panel.add(diffuseSection);
1712	2253
..	..	@@ -1756,42 +2297,48 @@
1756	2297	// aConstraints.gridy += 1;
1757	2298	// aConstraints.gridwidth = 1;
1758	2299
	2300	+ cGridBag anisoU = new cGridBag();
	2301	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2302	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2303	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2304	+ specularSection.add(anisoU);
1759	2305
1760		- panel.add(new JSeparator());
	2306	+ cGridBag anisoV = new cGridBag();
	2307	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2308	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2309	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2310	+ specularSection.add(anisoV);
	2311	+
	2312	+
	2313	+ panel.add(GetSeparator());
1761	2314
1762	2315	panel.add(specularSection);
1763	2316
1764	2317	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1765	2318
1766		- cGridBag globalSection = new cGridBag().setVertical(true);
	2319	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1767	2320
1768	2321	cGridBag camera = new cGridBag();
1769	2322	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1770	2323	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1771	2324	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1772		- globalSection.add(camera);
	2325	+ colorSection.add(camera);
1773	2326
1774	2327	cGridBag ambient = new cGridBag();
1775	2328	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1776	2329	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1777	2330	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1778		- globalSection.add(ambient);
	2331	+ colorSection.add(ambient);
1779	2332
1780	2333	cGridBag backlit = new cGridBag();
1781	2334	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1782	2335	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1783	2336	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1784		- globalSection.add(backlit);
	2337	+ colorSection.add(backlit);
1785	2338
1786		- cGridBag opacity = new cGridBag();
1787		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1788		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1789		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1790		- globalSection.add(opacity);
1791		-
1792		- panel.add(new JSeparator());
	2339	+ //panel.add(new JSeparator());
1793	2340
1794		- panel.add(globalSection);
	2341	+ //panel.add(globalSection);
1795	2342
1796	2343	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1797	2344
..	..	@@ -1833,7 +2380,7 @@
1833	2380	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1834	2381	textureSection.add(opacityPower);
1835	2382
1836		- panel.add(new JSeparator());
	2383	+ panel.add(GetSeparator());
1837	2384
1838	2385	panel.add(textureSection);
1839	2386
..	..	@@ -1898,8 +2445,9 @@
1898	2445	// 3D models
1899	2446	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1900	2447	{
1901		- lastConverter = new com.jmex.model.converters.MaxToJme();
1902		- LoadFile(filename, lastConverter);
	2448	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2449	+ //LoadFile(filename, lastConverter);
	2450	+ LoadObjFile(filename); // New 3ds loader
1903	2451	continue;
1904	2452	}
1905	2453	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2625,6 +3173,7 @@
2625	3173	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2626	3174	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2627	3175	}
	3176	+
2628	3177	//cJME.count++;
2629	3178	//cJME.count %= 12;
2630	3179	if (gc)
..	..	@@ -2808,6 +3357,7 @@
2808	3357	}
2809	3358	}
2810	3359	}
	3360	+
2811	3361	cFileSystemPane FSPane;
2812	3362
2813	3363	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2817,7 +3367,7 @@
2817	3367
2818	3368	freezematerial = true;
2819	3369	colorField.setFloat(mat.color);
2820		- modulationField.setFloat(mat.modulation);
	3370	+ saturationField.setFloat(mat.modulation);
2821	3371	metalnessField.setFloat(mat.metalness);
2822	3372	diffuseField.setFloat(mat.diffuse);
2823	3373	specularField.setFloat(mat.specular);
..	..	@@ -2861,11 +3411,14 @@
2861	3411	}
2862	3412	}
2863	3413	}
	3414	+
2864	3415	freezematerial = false;
2865	3416	}
2866	3417
2867	3418	void SetMaterial(Object3D object)
2868	3419	{
	3420	+ latestObject = object;
	3421	+
2869	3422	cMaterial mat = object.material;
2870	3423
2871	3424	if (mat == null)
..	..	@@ -2977,12 +3530,17 @@
2977	3530	// }
2978	3531
2979	3532	/**/
2980		- if (deselect)
	3533	+ if (deselect \|\| child == null)
2981	3534	{
2982	3535	//group.deselectAll();
2983	3536	//freeze = true;
2984	3537	GetTree().clearSelection();
2985	3538	//freeze = false;
	3539	+
	3540	+ if (child == null)
	3541	+ {
	3542	+ return;
	3543	+ }
2986	3544	}
2987	3545
2988	3546	//group.addSelectee(child);
..	..	@@ -3051,7 +3609,7 @@
3051	3609	cameraView.ToggleDL();
3052	3610	cameraView.repaint();
3053	3611	return;
3054		- } else if (event.getSource() == toggleTextureItem)
	3612	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
3055	3613	{
3056	3614	cameraView.ToggleTexture();
3057	3615	// june 2013 copy.HardTouch();
..	..	@@ -3090,7 +3648,7 @@
3090	3648	frame.validate();
3091	3649
3092	3650	return;
3093		- } else if (event.getSource() == toggleSwitchItem)
	3651	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3094	3652	{
3095	3653	cameraView.ToggleSwitch();
3096	3654	cameraView.repaint();
..	..	@@ -3120,8 +3678,9 @@
3120	3678	} else if (event.getSource() == liveCB)
3121	3679	{
3122	3680	copy.live ^= true;
	3681	+ objEditor.refreshContents(true); // To show item colors
3123	3682	return;
3124		- } else if (event.getSource() == selectCB)
	3683	+ } else if (event.getSource() == selectableCB)
3125	3684	{
3126	3685	copy.dontselect ^= true;
3127	3686	return;
..	..	@@ -3129,7 +3688,7 @@
3129	3688	{
3130	3689	copy.hide ^= true;
3131	3690	copy.Touch(); // display list issue
3132		- objEditor.refreshContents();
	3691	+ objEditor.refreshContents(true); // To show item colors
3133	3692	return;
3134	3693	} else if (event.getSource() == link2masterCB)
3135	3694	{
..	..	@@ -3306,9 +3865,9 @@
3306	3865	{
3307	3866	Close();
3308	3867	//return true;
3309		- } else if (source == loadItem)
	3868	+ } else if (source == openItem)
3310	3869	{
3311		- load();
	3870	+ Open();
3312	3871	//return true;
3313	3872	} else if (source == newItem)
3314	3873	{
..	..	@@ -3333,6 +3892,10 @@
3333	3892	{
3334	3893	generatePOV();
3335	3894	//return true;
	3895	+ } else if (event.getSource() == archiveItem)
	3896	+ {
	3897	+ cTools.Archive(frame);
	3898	+ return;
3336	3899	} else if (source == zBufferItem)
3337	3900	{
3338	3901	try
..	..	@@ -3381,11 +3944,12 @@
3381	3944
3382	3945	static public byte[] Compress(Object3D o)
3383	3946	{
	3947	+ // Slower to actually compress.
3384	3948	try
3385	3949	{
3386	3950	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3387		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3388		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3951	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3952	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3389	3953
3390	3954	Object3D parent = o.parent;
3391	3955	o.parent = null;
..	..	@@ -3396,10 +3960,14 @@
3396	3960
3397	3961	out.flush();
3398	3962
3399		- zstream.close();
	3963	+ baos //zstream
	3964	+ .close();
3400	3965	out.close();
3401	3966
3402		- return baos.toByteArray();
	3967	+ byte[] bytes = baos.toByteArray();
	3968	+
	3969	+ System.out.println("save #bytes = " + bytes.length);
	3970	+ return bytes;
3403	3971	} catch (Exception e)
3404	3972	{
3405	3973	System.err.println(e);
..	..	@@ -3409,13 +3977,16 @@
3409	3977
3410	3978	static public Object Uncompress(byte[] bytes)
3411	3979	{
3412		- System.out.println("#bytes = " + bytes.length);
	3980	+ System.out.println("restore #bytes = " + bytes.length);
3413	3981	try
3414	3982	{
3415	3983	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3416		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3417		- ObjectInputStream in = new ObjectInputStream(istream);
	3984	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3985	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3418	3986	Object obj = in.readObject();
	3987	+
	3988	+ bais //istream
	3989	+ .close();
3419	3990	in.close();
3420	3991
3421	3992	return obj;
..	..	@@ -3470,39 +4041,95 @@
3470	4041	return null;
3471	4042	}
3472	4043
3473		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3474	4044
3475	4045	public void Save()
3476	4046	{
	4047	+ //Save(true);
	4048	+ Replace();
	4049	+ SetUndoStates();
	4050	+ }
	4051	+
	4052	+ private boolean Equal(byte[] compress, byte[] name)
	4053	+ {
	4054	+ if (compress.length != name.length)
	4055	+ {
	4056	+ return false;
	4057	+ }
	4058	+
	4059	+ for (int i=compress.length; --i>=0;)
	4060	+ {
	4061	+ if (compress[i] != name[i])
	4062	+ return false;
	4063	+ }
	4064	+
	4065	+ return true;
	4066	+ }
	4067	+
	4068	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4069	+
	4070	+ void DeleteVersion()
	4071	+ {
	4072	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4073	+ {
	4074	+ copy.versionlist[i] = copy.versionlist[i+1];
	4075	+ }
	4076	+
	4077	+ CopyChanged();
	4078	+
	4079	+ SetUndoStates();
	4080	+ }
	4081	+
	4082	+ public boolean Save(boolean user)
	4083	+ {
3477	4084	System.err.println("Save");
	4085	+ //Replace();
3478	4086
3479	4087	cRadio tab = GetCurrentTab();
3480	4088
3481		- boolean temp = CameraPane.SWITCH;
3482		- CameraPane.SWITCH = false;
	4089	+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
3483	4090
3484		- copy.ExtractBigData(hashtable);
	4091	+ boolean thesame = false;
	4092	+
	4093	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4094	+// {
	4095	+// thesame = true;
	4096	+// }
3485	4097
3486	4098	//EditorFrame.m_MainFrame.requestFocusInWindow();
3487		- tab.graphs[tab.undoindex++] = Compress(copy);
3488		-
3489		- copy.RestoreBigData(hashtable);
3490		-
3491		- CameraPane.SWITCH = temp;
3492		-
3493		- //assert(hashtable.isEmpty());
3494		-
3495		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	4099	+ if (!thesame)
3496	4100	{
3497		- tab.graphs[i] = null;
	4101	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4102	+ {
	4103	+ copy.versionlist[i] = copy.versionlist[i-1];
	4104	+ }
	4105	+
	4106	+ //tab.user[tab.versionindex] = user;
	4107	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4108	+
	4109	+ copy.versionlist[++copy.versionindex] = compress;
	4110	+
	4111	+ // if (increment)
	4112	+ // tab.versionindex++;
3498	4113	}
3499	4114
	4115	+ //copy.RestoreBigData(versiontable);
	4116	+
	4117	+ //assert(hashtable.isEmpty());
	4118	+
	4119	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4120	+// {
	4121	+// //tab.user[i] = false;
	4122	+// copy.versionlist[i] = null;
	4123	+// }
	4124	+
	4125	+ SetUndoStates();
	4126	+
3500	4127	// test save
3501	4128	if (false)
3502	4129	{
3503	4130	try
3504	4131	{
3505		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	4132	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3506	4133	ObjectOutputStream p = new ObjectOutputStream(ostream);
3507	4134
3508	4135	p.writeObject(copy);
..	..	@@ -3515,26 +4142,68 @@
3515	4142	e.printStackTrace();
3516	4143	}
3517	4144	}
	4145	+
	4146	+ return !thesame;
	4147	+ }
	4148	+
	4149	+ boolean flashIt = true;
	4150	+
	4151	+ void RefreshSelection()
	4152	+ {
	4153	+ Object3D selection = new Object3D();
	4154	+
	4155	+ for (int i = 0; i < copy.selection.size(); i++)
	4156	+ {
	4157	+ Object3D elem = copy.selection.elementAt(i);
	4158	+
	4159	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4160	+
	4161	+ if (obj == null)
	4162	+ {
	4163	+ copy.selection.remove(i--);
	4164	+ }
	4165	+ else
	4166	+ {
	4167	+ selection.add(obj);
	4168	+ copy.selection.setElementAt(obj, i);
	4169	+ }
	4170	+ }
	4171	+
	4172	+ flashIt = false;
	4173	+ GetTree().clearSelection();
	4174	+ for (int i = 0; i < selection.size(); i++)
	4175	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4176	+ flashIt = true;
	4177	+
	4178	+ //refreshContents(false);
3518	4179	}
3519	4180
3520		- void CopyChanged(Object3D obj)
	4181	+ void CopyChanged()
3521	4182	{
	4183	+ Object3D obj = copy.versionlist[copy.versionindex];
	4184	+
	4185	+ SetUndoStates();
	4186	+
3522	4187	boolean temp = CameraPane.SWITCH;
3523	4188	CameraPane.SWITCH = false;
3524	4189
3525		- copy.ExtractBigData(hashtable);
	4190	+ copy.ExtractBigData(versiontable);
3526	4191
3527	4192	copy.clear();
3528	4193
	4194	+ copy.skyboxname = obj.skyboxname;
	4195	+ copy.skyboxext = obj.skyboxext;
	4196	+
3529	4197	for (int i=0; i<obj.Size(); i++)
3530	4198	{
3531	4199	copy.add(obj.get(i));
3532	4200	}
3533	4201
3534		- copy.RestoreBigData(hashtable);
	4202	+ copy.RestoreBigData(versiontable);
3535	4203
3536	4204	CameraPane.SWITCH = temp;
3537	4205
	4206	+ RefreshSelection();
3538	4207	//assert(hashtable.isEmpty());
3539	4208
3540	4209	copy.Touch();
..	..	@@ -3555,45 +4224,139 @@
3555	4224	}
3556	4225	}
3557	4226
3558		- refreshContents();
	4227	+ refreshContents(true);
3559	4228	}
3560	4229
3561		- public void Undo()
	4230	+ cButton previousVersionButton;
	4231	+ cButton restoreButton;
	4232	+ cButton replaceButton;
	4233	+ cButton nextVersionButton;
	4234	+ cButton saveVersionButton;
	4235	+ cButton deleteVersionButton;
	4236	+
	4237	+ boolean muteSlider;
	4238	+
	4239	+ int VersionCount()
3562	4240	{
	4241	+ int count = 0;
	4242	+
	4243	+ for (int i = copy.versionlist.length; --i >= 0;)
	4244	+ {
	4245	+ if (copy.versionlist[i] != null)
	4246	+ count++;
	4247	+ }
	4248	+
	4249	+ return count;
	4250	+ }
	4251	+
	4252	+ void SetUndoStates()
	4253	+ {
	4254	+ cRadio tab = GetCurrentTab();
	4255	+
	4256	+ restoreButton.setEnabled(true); // copy.versionindex != -1);
	4257	+ replaceButton.setEnabled(true); // copy.versionindex != -1);
	4258	+
	4259	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4260	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4261	+
	4262	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4263	+ copy.versionlist[copy.versionindex + 1] != null);
	4264	+
	4265	+ muteSlider = true;
	4266	+ versionSlider.setMaximum(VersionCount() - 1);
	4267	+ versionSlider.setInteger(copy.versionindex);
	4268	+ muteSlider = false;
	4269	+ }
	4270	+
	4271	+ public boolean PreviousVersion()
	4272	+ {
	4273	+ // Option?
	4274	+ Replace();
	4275	+
3563	4276	System.err.println("Undo");
3564	4277
3565	4278	cRadio tab = GetCurrentTab();
3566	4279
3567		- if (tab.undoindex == 0)
	4280	+ if (copy.versionindex == 0)
3568	4281	{
3569	4282	java.awt.Toolkit.getDefaultToolkit().beep();
3570		- return;
	4283	+ return false;
3571	4284	}
3572	4285
3573		- if (tab.graphs[tab.undoindex] == null)
3574		- {
3575		- Save();
3576		- tab.undoindex -= 1;
3577		- }
	4286	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4287	+// {
	4288	+// if (Save(false))
	4289	+// tab.versionindex -= 1;
	4290	+// else
	4291	+// {
	4292	+// if (tab.versionindex <= 0)
	4293	+// return false;
	4294	+// else
	4295	+// tab.versionindex -= 1;
	4296	+// }
	4297	+// }
3578	4298
3579		- tab.undoindex -= 1;
	4299	+ copy.versionindex -= 1;
3580	4300
3581		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4301	+ CopyChanged();
	4302	+
	4303	+ return true;
3582	4304	}
3583	4305
3584		- public void Redo()
	4306	+ public boolean Restore()
3585	4307	{
	4308	+ System.err.println("Restore");
	4309	+
3586	4310	cRadio tab = GetCurrentTab();
3587	4311
3588		- if (tab.graphs[tab.undoindex + 1] == null)
	4312	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4313	+ {
	4314	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4315	+ return false;
	4316	+ }
	4317	+
	4318	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4319	+ CopyChanged();
	4320	+
	4321	+ return true;
	4322	+ }
	4323	+
	4324	+ public boolean Replace()
	4325	+ {
	4326	+ System.err.println("Replace");
	4327	+
	4328	+ cRadio tab = GetCurrentTab();
	4329	+
	4330	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4331	+ {
	4332	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4333	+ return false;
	4334	+ }
	4335	+
	4336	+ copy.versionlist[copy.versionindex] = CompressCopy();
	4337	+
	4338	+ return true;
	4339	+ }
	4340	+
	4341	+ public void NextVersion()
	4342	+ {
	4343	+ // Option?
	4344	+ Replace();
	4345	+
	4346	+ cRadio tab = GetCurrentTab();
	4347	+
	4348	+ if (copy.versionlist[copy.versionindex + 1] == null)
3589	4349	{
3590	4350	java.awt.Toolkit.getDefaultToolkit().beep();
3591	4351	return;
3592	4352	}
3593	4353
3594		- tab.undoindex += 1;
	4354	+ copy.versionindex += 1;
3595	4355
3596		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4356	+ CopyChanged();
	4357	+
	4358	+ //if (!tab.user[tab.versionindex])
	4359	+ // tab.graphs[tab.versionindex] = null;
3597	4360	}
3598	4361
3599	4362	void ImportGFD()
..	..	@@ -3804,7 +4567,7 @@
3804	4567	//copy.material = new cMaterial(copy.GetMaterial());
3805	4568
3806	4569	current.color = (float) colorField.getFloat();
3807		- current.modulation = (float) modulationField.getFloat();
	4570	+ current.modulation = (float) saturationField.getFloat();
3808	4571	current.metalness = (float) metalnessField.getFloat();
3809	4572	current.diffuse = (float) diffuseField.getFloat();
3810	4573	current.specular = (float) specularField.getFloat();
..	..	@@ -3837,7 +4600,7 @@
3837	4600	cMaterial mat = copy.material;
3838	4601
3839	4602	colorField.SetToolTipValue((mat.color));
3840		- modulationField.SetToolTipValue((mat.modulation));
	4603	+ saturationField.SetToolTipValue((mat.modulation));
3841	4604	metalnessField.SetToolTipValue((mat.metalness));
3842	4605	diffuseField.SetToolTipValue((mat.diffuse));
3843	4606	specularField.SetToolTipValue((mat.specular));
..	..	@@ -3889,9 +4652,26 @@
3889	4652	//copy.Touch();
3890	4653	}
3891	4654
	4655	+ cNumberSlider versionSlider;
	4656	+
3892	4657	public void stateChanged(ChangeEvent e)
3893	4658	{
3894	4659	// assert(false);
	4660	+ if (e.getSource() == versionSlider)
	4661	+ {
	4662	+ if (muteSlider)
	4663	+ return;
	4664	+
	4665	+ int version = versionSlider.getInteger();
	4666	+
	4667	+ if (copy.versionlist[version] != null)
	4668	+ {
	4669	+ copy.versionindex = version;
	4670	+ CopyChanged();
	4671	+ }
	4672	+
	4673	+ return;
	4674	+ }
3895	4675
3896	4676	if (freezematerial)
3897	4677	{
..	..	@@ -3927,6 +4707,12 @@
3927	4707	{
3928	4708	//System.out.println("stateChanged = " + this);
3929	4709	materialtouched = true;
	4710	+
	4711	+ if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4712	+ {
	4713	+ saturationField.setFloat(1);
	4714	+ }
	4715	+
3930	4716	applySelf();
3931	4717	//System.out.println("this = " + this);
3932	4718	//System.out.println("PARENT = " + parent);
..	..	@@ -4226,6 +5012,7 @@
4226	5012	{
4227	5013	if (GetTree() != null)
4228	5014	{
	5015	+ GetTree().revalidate();
4229	5016	GetTree().repaint();
4230	5017	}
4231	5018
..	..	@@ -4234,13 +5021,16 @@
4234	5021	ctrlPanel.validate(); // ? new
4235	5022	ctrlPanel.repaint();
4236	5023	}
	5024	+
	5025	+ if (previousVersionButton != null && copy.versionlist != null)
	5026	+ SetUndoStates();
4237	5027	}
4238	5028
4239	5029	static TweenManager tweenManager = new TweenManager();
4240	5030
4241	5031	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4242	5032	{
4243		- if (Globals.SAVEONMAKE) // && resetmodel)
	5033	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4244	5034	Save();
4245	5035	//Tween.set(thing, 0).target(1).start(tweenManager);
4246	5036	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4482,7 +5272,9 @@
4482	5272	readobj.ResetDisplayList();
4483	5273	} catch (Exception e)
4484	5274	{
4485		- //e.printStackTrace();
	5275	+ if (!e.toString().contains("GZIP"))
	5276	+ e.printStackTrace();
	5277	+
4486	5278	try
4487	5279	{
4488	5280	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4556,12 +5348,14 @@
4556	5348
4557	5349	if (readobj != null)
4558	5350	{
4559		- if (Globals.SAVEONMAKE)
4560		- Save();
	5351	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5352	+ // Save();
4561	5353	try
4562	5354	{
4563	5355	//readobj.deepCopySelf(copy);
4564	5356	copy.clear(); // june 2014
	5357	+ copy.skyboxname = readobj.skyboxname;
	5358	+ copy.skyboxext = readobj.skyboxext;
4565	5359	for (int i = 0; i < readobj.size(); i++)
4566	5360	{
4567	5361	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4602,6 +5396,7 @@
4602	5396	}
4603	5397	} catch (ClassCastException e)
4604	5398	{
	5399	+ e.printStackTrace();
4605	5400	assert (false);
4606	5401	Composite c = (Composite) copy;
4607	5402	c.children.clear();
..	..	@@ -4612,17 +5407,28 @@
4612	5407	c.addChild(csg);
4613	5408	}
4614	5409
	5410	+ copy.versionlist = readobj.versionlist;
	5411	+ copy.versionindex = readobj.versionindex;
	5412	+
	5413	+ if (copy.versionlist == null)
	5414	+ {
	5415	+ copy.versionlist = new Object3D[100];
	5416	+ copy.versionindex = -1;
	5417	+ }
	5418	+
	5419	+ //? SetUndoStates();
	5420	+
4615	5421	ResetModel();
4616	5422	copy.HardTouch(); // recompile?
4617	5423	refreshContents();
4618	5424	}
4619	5425	}
4620	5426
4621		- void load() // throws ClassNotFoundException
	5427	+ void Open() // throws ClassNotFoundException
4622	5428	{
4623	5429	if (Grafreed.standAlone)
4624	5430	{
4625		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5431	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4626	5432	browser.show();
4627	5433	String filename = browser.getFile();
4628	5434	if (filename != null && filename.length() > 0)
..	..	@@ -4721,6 +5527,7 @@
4721	5527	//ps.print(buffer.toString());
4722	5528	} catch (IOException e)
4723	5529	{
	5530	+ e.printStackTrace();
4724	5531	}
4725	5532	}
4726	5533
..	..	@@ -4735,6 +5542,8 @@
4735	5542	String filename = browser.getFile();
4736	5543	if (filename != null && filename.length() > 0)
4737	5544	{
	5545	+ if (!filename.endsWith(".gfd"))
	5546	+ filename += ".gfd";
4738	5547	lastname = browser.getDirectory() + filename;
4739	5548	save();
4740	5549	}
..	..	@@ -4901,7 +5710,7 @@
4901	5710	MenuBar menuBar;
4902	5711	Menu fileMenu;
4903	5712	MenuItem newItem;
4904		- MenuItem loadItem;
	5713	+ MenuItem openItem;
4905	5714	MenuItem saveItem;
4906	5715	MenuItem saveAsItem;
4907	5716	MenuItem exportAsItem;
..	..	@@ -4924,6 +5733,7 @@
4924	5733	CheckboxMenuItem toggleSwitchItem;
4925	5734	CheckboxMenuItem toggleRootItem;
4926	5735	CheckboxMenuItem animationItem;
	5736	+ MenuItem archiveItem;
4927	5737	CheckboxMenuItem toggleHandleItem;
4928	5738	CheckboxMenuItem togglePaintItem;
4929	5739	JSplitPane mainPanel;
..	..	@@ -4945,6 +5755,8 @@
4945	5755	cGridBag optionsPanel;
4946	5756
4947	5757	JTabbedPane objectPanel;
	5758	+ boolean materialFlushed;
	5759	+ Object3D latestObject;
4948	5760
4949	5761	cGridBag XYZPanel;
4950	5762
..	..	@@ -5008,7 +5820,7 @@
5008	5820	JLabel colorLabel;
5009	5821	cNumberSlider colorField;
5010	5822	JLabel modulationLabel;
5011		- cNumberSlider modulationField;
	5823	+ cNumberSlider saturationField;
5012	5824	JLabel metalnessLabel;
5013	5825	cNumberSlider metalnessField;
5014	5826	JLabel diffuseLabel;