~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,51 +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);
	63	+ }
	64	+
	65	+ cToggleButton GetToggleButton(String name, boolean border)
	66	+ {
	67	+ ImageIcon icon = GetIcon(name);
	68	+ return new cToggleButton(icon, border);
53	69	}
54	70
55	71	cCheckBox GetCheckBox(String name, boolean border)
56	72	{
	73	+ ImageIcon icon = GetIcon(name);
	74	+ return new cCheckBox(icon, border);
	75	+ }
	76	+
	77	+ ImageIcon GetIcon(String name)
	78	+ {
57	79	try
58	80	{
59		- ImageIcon icon = GetIcon(name);
60		- 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;
61	97	}
62	98	catch (Exception e)
63	99	{
64		- return new cCheckBox(name, border);
	100	+ return null;
65	101	}
66	102	}
67		-
68		- private ImageIcon GetIcon(String name) throws IOException
	103	+
	104	+ BufferedImage GetImage(String name)
69	105	{
70		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
71		-
72		- if (image.getWidth() != 24 && image.getHeight() != 24)
	106	+ try
73	107	{
74		- BufferedImage resized = new BufferedImage(24, 24, image.getType());
75		- Graphics2D g = resized.createGraphics();
76		- g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
77		- //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
78		- g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
79		- g.dispose();
80		-
81		- image = resized;
	108	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	109	+
	110	+ return image;
82	111	}
83		-
84		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
85		- return icon;
	112	+ catch (Exception e)
	113	+ {
	114	+ return null;
	115	+ }
86	116	}
87	117
88	118	// SCRIPT
..	..	@@ -194,7 +224,7 @@
194	224
195	225	objEditor.ctrlPanel.remove(namePanel);
196	226
197		- if (!GroupEditor.allparams)
	227	+ if (!allparams)
198	228	return;
199	229
200	230	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -266,6 +296,12 @@
266	296	client = inClient;
267	297	copy = client;
268	298
	299	+ if (copy.versionlist == null)
	300	+ {
	301	+ copy.versionlist = new Object3D[100];
	302	+ copy.versionindex = -1;
	303	+ }
	304	+
269	305	// "this" is not called: SetupUI2(objEditor);
270	306	}
271	307
..	..	@@ -279,6 +315,12 @@
279	315	client = inClient;
280	316	copy = client;
281	317
	318	+ if (copy.versionlist == null)
	319	+ {
	320	+ copy.versionlist = new Object3D[100];
	321	+ copy.versionindex = -1;
	322	+ }
	323	+
282	324	SetupUI2(callee.GetEditor());
283	325	}
284	326
..	..	@@ -293,7 +335,7 @@
293	335	//localCopy.parent = null;
294	336
295	337	frame = new JFrame();
296		- frame.setUndecorated(true);
	338	+ frame.setUndecorated(false);
297	339	objEditor = this;
298	340	this.callee = callee;
299	341
..	..	@@ -311,6 +353,12 @@
311	353	copy = localCopy;
312	354	copy.editWindow = this;
313	355
	356	+ if (copy.versionlist == null)
	357	+ {
	358	+// copy.versions = new byte[100][];
	359	+// copy.versionindex = -1;
	360	+ }
	361	+
314	362	SetupMenu();
315	363
316	364	//SetupName(objEditor); // new
..	..	@@ -324,12 +372,17 @@
324	372	return frame.action(event, obj);
325	373	}
326	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	+
327	380	void SetupMenu()
328	381	{
329	382	frame.setMenuBar(menuBar = new MenuBar());
330	383	menuBar.add(fileMenu = new Menu("File"));
331	384	fileMenu.add(newItem = new MenuItem("New"));
332		- fileMenu.add(loadItem = new MenuItem("Open..."));
	385	+ fileMenu.add(openItem = new MenuItem("Open..."));
333	386
334	387	//oe.menuBar.add(menu = new Menu("Include"));
335	388	Menu menu = new Menu("Import");
..	..	@@ -361,7 +414,7 @@
361	414	}
362	415
363	416	newItem.addActionListener(this);
364		- loadItem.addActionListener(this);
	417	+ openItem.addActionListener(this);
365	418	saveItem.addActionListener(this);
366	419	saveAsItem.addActionListener(this);
367	420	exportAsItem.addActionListener(this);
..	..	@@ -370,13 +423,40 @@
370	423	closeItem.addActionListener(this);
371	424
372	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	+
373	452	toolbarPanel = new JPanel();
374	453	toolbarPanel.setName("Toolbar");
	454	+
375	455	treePanel = new cGridBag();
376	456	treePanel.setName("Tree");
377	457
378	458	editPanel = new cGridBag().setVertical(true);
379		- editPanel.setName("Edit");
	459	+ //editPanel.setName("Edit");
380	460
381	461	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
382	462
..	..	@@ -384,23 +464,27 @@
384	464	editPanel.add(editCommandsPanel);
385	465	editPanel.add(ctrlPanel);
386	466
387		- materialPanel = new cGridBag().setVertical(true);
	467	+ toolboxPanel = new cGridBag().setVertical(true);
	468	+ //toolboxPanel.setName("Toolbox");
388	469
389		- materialPanel.setName("Material");
	470	+ materialPanel = new cGridBag().setVertical(false);
	471	+ //materialPanel.setName("Material");
	472	+
390	473	/JTextPane/
391	474	infoarea = createTextPane();
392	475	doc = infoarea.getStyledDocument();
393	476
394	477	infoarea.setEditable(true);
395	478	SetText();
	479	+
396	480	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
397	481	// infoarea.setOpaque(false);
398	482	// //infoarea.setForeground(textcolor);
399	483	// TEXTAREA infoarea.setLineWrap(true);
400	484	// TEXTAREA infoarea.setWrapStyleWord(true);
401	485	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
402		- infoPanel.setPreferredSize(new Dimension(50, 200));
403		- infoPanel.setName("Info");
	486	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	487	+ //infoPanel.setName("Info");
404	488	//infoPanel.setLayout(new BorderLayout());
405	489	//infoPanel.add(createTextPane());
406	490
..	..	@@ -411,7 +495,14 @@
411	495	mainPanel.setDividerSize(9);
412	496	mainPanel.setDividerLocation(0.5); //1.0);
413	497	mainPanel.setResizeWeight(0.5);
414		-
	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	+
415	506	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
416	507	//mainPanel.setLayout(new GridBagLayout());
417	508	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -642,8 +733,8 @@
642	733	}
643	734	}
644	735
645		-static GraphicsDevice device = GraphicsEnvironment
646		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	736	+//static GraphicsDevice device = GraphicsEnvironment
	737	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
647	738
648	739	Rectangle keeprect;
649	740	cRadio radio;
..	..	@@ -659,13 +750,24 @@
659	750
660	751	boolean maximized;
661	752
	753	+ cButton fullscreenLayout;
	754	+
662	755	void Minimize()
663	756	{
664	757	frame.setState(Frame.ICONIFIED);
	758	+ frame.validate();
665	759	}
666	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={}
667	764	void Maximize()
668	765	{
	766	+ if (CameraPane.FULLSCREEN)
	767	+ {
	768	+ ToggleFullScreen();
	769	+ }
	770	+
669	771	if (maximized)
670	772	{
671	773	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -673,20 +775,36 @@
673	775	else
674	776	{
675	777	keeprect = frame.getBounds();
676		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
677		- Dimension rect2 = frame.getToolkit().getScreenSize();
678		- 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);
679	781	// frame.setState(Frame.MAXIMIZED_BOTH);
	782	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
680	783	}
681	784
682	785	maximized ^= true;
	786	+
	787	+ frame.validate();
683	788	}
	789	+
	790	+ cButton minButton;
	791	+ cButton maxButton;
	792	+ cButton fullButton;
684	793
685	794	void ToggleFullScreen()
686	795	{
687		- if (CameraPane.FULLSCREEN)
	796	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	797	+
	798	+ cameraView.ToggleFullScreen();
	799	+
	800	+ if (!CameraPane.FULLSCREEN)
688	801	{
689	802	device.setFullScreenWindow(null);
	803	+ frame.dispose();
	804	+ frame.setUndecorated(false);
	805	+ frame.validate();
	806	+ frame.setVisible(true);
	807	+
690	808	//frame.setVisible(false);
691	809	// frame.removeNotify();
692	810	// frame.setUndecorated(false);
..	..	@@ -696,7 +814,7 @@
696	814	// X frame.getContentPane().remove(/"Center",/bigThree);
697	815	// X framePanel.add(bigThree);
698	816	// X frame.getContentPane().add(/"Center",/framePanel);
699		- framePanel.setDividerLocation(1);
	817	+ framePanel.setDividerLocation(46);
700	818
701	819	//frame.setVisible(true);
702	820	radio.layout = keepButton;
..	..	@@ -711,7 +829,12 @@
711	829	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
712	830	// frame.getToolkit().getScreenSize().height);
713	831	//frame.setVisible(false);
	832	+
	833	+ frame.dispose();
	834	+ frame.setUndecorated(true);
714	835	device.setFullScreenWindow(frame);
	836	+ frame.validate();
	837	+ frame.setVisible(true);
715	838	// frame.removeNotify();
716	839	// frame.setUndecorated(true);
717	840	// frame.addNotify();
..	..	@@ -720,13 +843,37 @@
720	843	// X frame.getContentPane().add(/"Center",/bigThree);
721	844	framePanel.setDividerLocation(0);
722	845
723		- radio.layout = twoButton;
	846	+ radio.layout = fullscreenLayout;
724	847	radio.layout.doClick();
725	848	//frame.setVisible(true);
726	849	}
727		-
728		- cameraView.ToggleFullScreen();
	850	+ frame.validate();
	851	+
	852	+ cameraView.requestFocusInWindow();
729	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	+ }
730	877
731	878	private JTextPane createTextPane()
732	879	{
..	..	@@ -849,6 +996,7 @@
849	996	{
850	997	SetupMaterial(materialPanel);
851	998	}
	999	+
852	1000	//SetupName();
853	1001	//SetupViews();
854	1002	}
..	..	@@ -858,7 +1006,7 @@
858	1006	// NumberSlider vDivsField;
859	1007	// JCheckBox endcaps;
860	1008	JCheckBox liveCB;
861		- JCheckBox selectCB;
	1009	+ JCheckBox selectableCB;
862	1010	JCheckBox hideCB;
863	1011	JCheckBox link2masterCB;
864	1012	JCheckBox markCB;
..	..	@@ -866,7 +1014,12 @@
866	1014	JCheckBox speedupCB;
867	1015	JCheckBox rewindCB;
868	1016	JCheckBox flipVCB;
	1017	+
	1018	+ cCheckBox toggleTextureCB;
	1019	+ cCheckBox toggleSwitchCB;
	1020	+
869	1021	JComboBox texresMenu;
	1022	+
870	1023	JButton resetButton;
871	1024	JButton stepButton;
872	1025	JButton stepAllButton;
..	..	@@ -1053,38 +1206,42 @@
1053	1206	namePanel = new cGridBag();
1054	1207
1055	1208	nameField = AddText(namePanel, copy.GetName());
1056		- namePanel.add(nameField);
	1209	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1057	1210	oe.ctrlPanel.add(namePanel);
1058	1211
1059	1212	oe.ctrlPanel.Return();
1060	1213
1061		- if (!GroupEditor.allparams)
	1214	+ if (!allparams)
1062	1215	return;
1063	1216
1064	1217	setupPanel = new cGridBag().setVertical(false);
1065	1218
1066	1219	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1067	1220	liveCB.setToolTipText("Animate object");
1068		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1069		- selectCB.setToolTipText("Make object selectable");
	1221	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1222	+ selectableCB.setToolTipText("Make object selectable");
1070	1223	// Return();
	1224	+
1071	1225	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1072	1226	hideCB.setToolTipText("Hide object");
1073	1227	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1074		- markCB.setToolTipText("Set the animation target transform");
	1228	+ markCB.setToolTipText("As animation target transform");
	1229	+
	1230	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1075	1231
1076	1232	setupPanel2 = new cGridBag().setVertical(false);
1077	1233
1078	1234	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1079	1235	rewindCB.setToolTipText("Rewind animation");
1080	1236
1081		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1082		- 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)");
1083	1239
	1240	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1241	+ link2masterCB.setToolTipText("Attach to support");
	1242	+
1084	1243	if (Globals.ADVANCED)
1085	1244	{
1086		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1087		- link2masterCB.setToolTipText("Attach to support");
1088	1245	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1089	1246	speedupCB.setToolTipText("Option motion capture");
1090	1247	}
..	..	@@ -1358,6 +1515,7 @@
1358	1515	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1359	1516	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1360	1517	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1518	+ //XYZPanel.setName("XYZ");
1361	1519
1362	1520	/*
1363	1521	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1395,13 +1553,30 @@
1395	1553	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1396	1554	//tmp.setName("Edit");
1397	1555	objectPanel.add(materialPanel);
	1556	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1557	+ objectPanel.setToolTipTextAt(0, "Material");
	1558	+
	1559	+ objectPanel.add(toolboxPanel);
	1560	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1561	+ objectPanel.setToolTipTextAt(1, "Objects & backgrounds");
	1562	+
1398	1563	// JPanel north = new JPanel(new BorderLayout());
1399	1564	// north.setName("Edit");
1400	1565	// north.add(ctrlPanel, BorderLayout.NORTH);
1401	1566	// objectPanel.add(north);
1402	1567	objectPanel.add(editPanel);
1403		- objectPanel.add(infoPanel);
1404		-
	1568	+ objectPanel.setIconAt(2, GetIcon("icons/write.png"));
	1569	+ objectPanel.setToolTipTextAt(2, "Edit controls");
	1570	+
	1571	+ //if (Globals.ADVANCED)
	1572	+ objectPanel.add(infoPanel);
	1573	+ objectPanel.setIconAt(3, GetIcon("icons/info.png"));
	1574	+ objectPanel.setToolTipTextAt(3, "Information");
	1575	+
	1576	+ objectPanel.add(XYZPanel);
	1577	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1578	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1579	+
1405	1580	/*
1406	1581	aConstraints.gridx = 0;
1407	1582	aConstraints.gridwidth = 1;
..	..	@@ -1409,7 +1584,7 @@
1409	1584	aConstraints.gridy += 1;
1410	1585	aConstraints.gridwidth = 1;
1411	1586	mainPanel.add(objectPanel, aConstraints);
1412		- */
	1587	+ */
1413	1588
1414	1589	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1415	1590	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1421,14 +1596,12 @@
1421	1596	scrollpane.addMouseWheelListener(this); // Default not fast enough
1422	1597
1423	1598	/JTabbedPane/ scenePanel = new cGridBag();
1424		- scenePanel.preferredWidth = 6;
	1599	+ scenePanel.preferredWidth = 5;
1425	1600
1426	1601	JTabbedPane tabbedPane = new JTabbedPane();
1427	1602	tabbedPane.add(scrollpane);
1428	1603
1429		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1430		-
1431		- optionsPanel = new cGridBag().setVertical(true);
	1604	+ optionsPanel = new cGridBag().setVertical(false);
1432	1605
1433	1606	optionsPanel.setName("Options");
1434	1607
..	..	@@ -1436,6 +1609,8 @@
1436	1609
1437	1610	tabbedPane.add(optionsPanel);
1438	1611
	1612	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1613	+
1439	1614	scenePanel.add(tabbedPane);
1440	1615
1441	1616	/*
..	..	@@ -1499,7 +1674,7 @@
1499	1674	bigThree = new cGridBag();
1500	1675	bigThree.addComponent(scenePanel);
1501	1676	bigThree.addComponent(centralPanel);
1502		- bigThree.addComponent(XYZPanel);
	1677	+ //bigThree.addComponent(XYZPanel);
1503	1678
1504	1679	// // SIDE EFFECT!!!
1505	1680	// aConstraints.gridx = 0;
..	..	@@ -1508,9 +1683,9 @@
1508	1683	// aConstraints.gridheight = 1;
1509	1684
1510	1685	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1511		- framePanel.setContinuousLayout(true);
1512		- framePanel.setOneTouchExpandable(true);
1513		- framePanel.setDividerLocation(0.8);
	1686	+ framePanel.setContinuousLayout(false);
	1687	+ framePanel.setOneTouchExpandable(false);
	1688	+ //.setDividerLocation(0.8);
1514	1689	//framePanel.setDividerSize(15);
1515	1690	//framePanel.setResizeWeight(0.15);
1516	1691	framePanel.setName("Frame");
..	..	@@ -1528,16 +1703,18 @@
1528	1703	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1529	1704
1530	1705	frame.setSize(1280, 860);
1531		- frame.setVisible(true);
1532		-
	1706	+
1533	1707	cameraView.requestFocusInWindow();
1534	1708
1535	1709	gridPanel.setDividerLocation(1.0);
	1710	+
	1711	+ frame.validate();
	1712	+
	1713	+ frame.setVisible(true);
1536	1714
1537	1715	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1538	1716	frame.addWindowListener(new WindowAdapter()
1539	1717	{
1540		-
1541	1718	public void windowClosing(WindowEvent e)
1542	1719	{
1543	1720	Close();
..	..	@@ -1560,12 +1737,384 @@
1560	1737	ctrlPanel.removeAll();
1561	1738	}
1562	1739
1563		- void SetupMaterial(cGridBag panel)
	1740	+ void SetupMaterial(cGridBag materialpanel)
1564	1741	{
1565		- /*
	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	+ /*
1566	2115	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1567	2116	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1568		- */
	2117	+ */
1569	2118
1570	2119	cGridBag editBar = new cGridBag().setVertical(false);
1571	2120
..	..	@@ -1599,45 +2148,50 @@
1599	2148	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1600	2149
1601	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);
1602	2164
1603	2165	cGridBag color = new cGridBag();
1604		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1605		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1606		- 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	+
1607	2171	//colorField.preferredWidth = 200;
1608	2172	colorSection.add(color);
1609	2173
1610	2174	cGridBag modulation = new cGridBag();
1611	2175	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1612	2176	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1613		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2177	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1614	2178	colorSection.add(modulation);
1615	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	+
1616	2188	cGridBag texture = new cGridBag();
1617	2189	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1618	2190	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1619	2191	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1620	2192	colorSection.add(texture);
1621	2193
1622		- cGridBag anisoU = new cGridBag();
1623		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1624		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1625		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1626		- colorSection.add(anisoU);
1627		-
1628		- cGridBag anisoV = new cGridBag();
1629		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1630		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1631		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1632		- colorSection.add(anisoV);
1633		-
1634		- cGridBag shadowbias = new cGridBag();
1635		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1636		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1637		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1638		- colorSection.add(shadowbias);
1639		-
1640		- panel.add(new JSeparator());
	2194	+ panel.add(GetSeparator());
1641	2195
1642	2196	panel.add(colorSection);
1643	2197
..	..	@@ -1687,7 +2241,13 @@
1687	2241	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1688	2242	diffuseSection.add(fakedepth);
1689	2243
1690		- 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());
1691	2251
1692	2252	panel.add(diffuseSection);
1693	2253
..	..	@@ -1737,42 +2297,48 @@
1737	2297	// aConstraints.gridy += 1;
1738	2298	// aConstraints.gridwidth = 1;
1739	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);
1740	2305
1741		- 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());
1742	2314
1743	2315	panel.add(specularSection);
1744	2316
1745	2317	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1746	2318
1747		- cGridBag globalSection = new cGridBag().setVertical(true);
	2319	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1748	2320
1749	2321	cGridBag camera = new cGridBag();
1750	2322	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1751	2323	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1752	2324	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1753		- globalSection.add(camera);
	2325	+ colorSection.add(camera);
1754	2326
1755	2327	cGridBag ambient = new cGridBag();
1756	2328	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1757	2329	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1758	2330	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1759		- globalSection.add(ambient);
	2331	+ colorSection.add(ambient);
1760	2332
1761	2333	cGridBag backlit = new cGridBag();
1762	2334	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1763	2335	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1764	2336	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1765		- globalSection.add(backlit);
	2337	+ colorSection.add(backlit);
1766	2338
1767		- cGridBag opacity = new cGridBag();
1768		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1769		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1770		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1771		- globalSection.add(opacity);
1772		-
1773		- panel.add(new JSeparator());
	2339	+ //panel.add(new JSeparator());
1774	2340
1775		- panel.add(globalSection);
	2341	+ //panel.add(globalSection);
1776	2342
1777	2343	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1778	2344
..	..	@@ -1814,7 +2380,7 @@
1814	2380	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1815	2381	textureSection.add(opacityPower);
1816	2382
1817		- panel.add(new JSeparator());
	2383	+ panel.add(GetSeparator());
1818	2384
1819	2385	panel.add(textureSection);
1820	2386
..	..	@@ -1879,8 +2445,9 @@
1879	2445	// 3D models
1880	2446	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1881	2447	{
1882		- lastConverter = new com.jmex.model.converters.MaxToJme();
1883		- LoadFile(filename, lastConverter);
	2448	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2449	+ //LoadFile(filename, lastConverter);
	2450	+ LoadObjFile(filename); // New 3ds loader
1884	2451	continue;
1885	2452	}
1886	2453	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2606,6 +3173,7 @@
2606	3173	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2607	3174	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2608	3175	}
	3176	+
2609	3177	//cJME.count++;
2610	3178	//cJME.count %= 12;
2611	3179	if (gc)
..	..	@@ -2789,6 +3357,7 @@
2789	3357	}
2790	3358	}
2791	3359	}
	3360	+
2792	3361	cFileSystemPane FSPane;
2793	3362
2794	3363	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2798,7 +3367,7 @@
2798	3367
2799	3368	freezematerial = true;
2800	3369	colorField.setFloat(mat.color);
2801		- modulationField.setFloat(mat.modulation);
	3370	+ saturationField.setFloat(mat.modulation);
2802	3371	metalnessField.setFloat(mat.metalness);
2803	3372	diffuseField.setFloat(mat.diffuse);
2804	3373	specularField.setFloat(mat.specular);
..	..	@@ -2842,11 +3411,14 @@
2842	3411	}
2843	3412	}
2844	3413	}
	3414	+
2845	3415	freezematerial = false;
2846	3416	}
2847	3417
2848	3418	void SetMaterial(Object3D object)
2849	3419	{
	3420	+ latestObject = object;
	3421	+
2850	3422	cMaterial mat = object.material;
2851	3423
2852	3424	if (mat == null)
..	..	@@ -2958,12 +3530,17 @@
2958	3530	// }
2959	3531
2960	3532	/**/
2961		- if (deselect)
	3533	+ if (deselect \|\| child == null)
2962	3534	{
2963	3535	//group.deselectAll();
2964	3536	//freeze = true;
2965	3537	GetTree().clearSelection();
2966	3538	//freeze = false;
	3539	+
	3540	+ if (child == null)
	3541	+ {
	3542	+ return;
	3543	+ }
2967	3544	}
2968	3545
2969	3546	//group.addSelectee(child);
..	..	@@ -3032,7 +3609,7 @@
3032	3609	cameraView.ToggleDL();
3033	3610	cameraView.repaint();
3034	3611	return;
3035		- } else if (event.getSource() == toggleTextureItem)
	3612	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
3036	3613	{
3037	3614	cameraView.ToggleTexture();
3038	3615	// june 2013 copy.HardTouch();
..	..	@@ -3071,7 +3648,7 @@
3071	3648	frame.validate();
3072	3649
3073	3650	return;
3074		- } else if (event.getSource() == toggleSwitchItem)
	3651	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3075	3652	{
3076	3653	cameraView.ToggleSwitch();
3077	3654	cameraView.repaint();
..	..	@@ -3101,8 +3678,9 @@
3101	3678	} else if (event.getSource() == liveCB)
3102	3679	{
3103	3680	copy.live ^= true;
	3681	+ objEditor.refreshContents(true); // To show item colors
3104	3682	return;
3105		- } else if (event.getSource() == selectCB)
	3683	+ } else if (event.getSource() == selectableCB)
3106	3684	{
3107	3685	copy.dontselect ^= true;
3108	3686	return;
..	..	@@ -3110,7 +3688,7 @@
3110	3688	{
3111	3689	copy.hide ^= true;
3112	3690	copy.Touch(); // display list issue
3113		- objEditor.refreshContents();
	3691	+ objEditor.refreshContents(true); // To show item colors
3114	3692	return;
3115	3693	} else if (event.getSource() == link2masterCB)
3116	3694	{
..	..	@@ -3287,9 +3865,9 @@
3287	3865	{
3288	3866	Close();
3289	3867	//return true;
3290		- } else if (source == loadItem)
	3868	+ } else if (source == openItem)
3291	3869	{
3292		- load();
	3870	+ Open();
3293	3871	//return true;
3294	3872	} else if (source == newItem)
3295	3873	{
..	..	@@ -3314,6 +3892,10 @@
3314	3892	{
3315	3893	generatePOV();
3316	3894	//return true;
	3895	+ } else if (event.getSource() == archiveItem)
	3896	+ {
	3897	+ cTools.Archive(frame);
	3898	+ return;
3317	3899	} else if (source == zBufferItem)
3318	3900	{
3319	3901	try
..	..	@@ -3362,11 +3944,12 @@
3362	3944
3363	3945	static public byte[] Compress(Object3D o)
3364	3946	{
	3947	+ // Slower to actually compress.
3365	3948	try
3366	3949	{
3367	3950	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3368		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3369		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3951	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3952	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3370	3953
3371	3954	Object3D parent = o.parent;
3372	3955	o.parent = null;
..	..	@@ -3377,10 +3960,14 @@
3377	3960
3378	3961	out.flush();
3379	3962
3380		- zstream.close();
	3963	+ baos //zstream
	3964	+ .close();
3381	3965	out.close();
3382	3966
3383		- return baos.toByteArray();
	3967	+ byte[] bytes = baos.toByteArray();
	3968	+
	3969	+ System.out.println("save #bytes = " + bytes.length);
	3970	+ return bytes;
3384	3971	} catch (Exception e)
3385	3972	{
3386	3973	System.err.println(e);
..	..	@@ -3390,13 +3977,16 @@
3390	3977
3391	3978	static public Object Uncompress(byte[] bytes)
3392	3979	{
3393		- System.out.println("#bytes = " + bytes.length);
	3980	+ System.out.println("restore #bytes = " + bytes.length);
3394	3981	try
3395	3982	{
3396	3983	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3397		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3398		- ObjectInputStream in = new ObjectInputStream(istream);
	3984	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3985	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3399	3986	Object obj = in.readObject();
	3987	+
	3988	+ bais //istream
	3989	+ .close();
3400	3990	in.close();
3401	3991
3402	3992	return obj;
..	..	@@ -3451,39 +4041,95 @@
3451	4041	return null;
3452	4042	}
3453	4043
3454		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3455	4044
3456	4045	public void Save()
3457	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	+ {
3458	4084	System.err.println("Save");
	4085	+ //Replace();
3459	4086
3460	4087	cRadio tab = GetCurrentTab();
3461	4088
3462		- boolean temp = CameraPane.SWITCH;
3463		- CameraPane.SWITCH = false;
	4089	+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
3464	4090
3465		- 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	+// }
3466	4097
3467	4098	//EditorFrame.m_MainFrame.requestFocusInWindow();
3468		- tab.graphs[tab.undoindex++] = Compress(copy);
3469		-
3470		- copy.RestoreBigData(hashtable);
3471		-
3472		- CameraPane.SWITCH = temp;
3473		-
3474		- //assert(hashtable.isEmpty());
3475		-
3476		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	4099	+ if (!thesame)
3477	4100	{
3478		- 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++;
3479	4113	}
3480	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	+
3481	4127	// test save
3482	4128	if (false)
3483	4129	{
3484	4130	try
3485	4131	{
3486		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	4132	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3487	4133	ObjectOutputStream p = new ObjectOutputStream(ostream);
3488	4134
3489	4135	p.writeObject(copy);
..	..	@@ -3496,26 +4142,68 @@
3496	4142	e.printStackTrace();
3497	4143	}
3498	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);
3499	4179	}
3500	4180
3501		- void CopyChanged(Object3D obj)
	4181	+ void CopyChanged()
3502	4182	{
	4183	+ Object3D obj = copy.versionlist[copy.versionindex];
	4184	+
	4185	+ SetUndoStates();
	4186	+
3503	4187	boolean temp = CameraPane.SWITCH;
3504	4188	CameraPane.SWITCH = false;
3505	4189
3506		- copy.ExtractBigData(hashtable);
	4190	+ copy.ExtractBigData(versiontable);
3507	4191
3508	4192	copy.clear();
3509	4193
	4194	+ copy.skyboxname = obj.skyboxname;
	4195	+ copy.skyboxext = obj.skyboxext;
	4196	+
3510	4197	for (int i=0; i<obj.Size(); i++)
3511	4198	{
3512	4199	copy.add(obj.get(i));
3513	4200	}
3514	4201
3515		- copy.RestoreBigData(hashtable);
	4202	+ copy.RestoreBigData(versiontable);
3516	4203
3517	4204	CameraPane.SWITCH = temp;
3518	4205
	4206	+ RefreshSelection();
3519	4207	//assert(hashtable.isEmpty());
3520	4208
3521	4209	copy.Touch();
..	..	@@ -3536,45 +4224,139 @@
3536	4224	}
3537	4225	}
3538	4226
3539		- refreshContents();
	4227	+ refreshContents(true);
3540	4228	}
3541	4229
3542		- 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()
3543	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	+
3544	4276	System.err.println("Undo");
3545	4277
3546	4278	cRadio tab = GetCurrentTab();
3547	4279
3548		- if (tab.undoindex == 0)
	4280	+ if (copy.versionindex == 0)
3549	4281	{
3550	4282	java.awt.Toolkit.getDefaultToolkit().beep();
3551		- return;
	4283	+ return false;
3552	4284	}
3553	4285
3554		- if (tab.graphs[tab.undoindex] == null)
3555		- {
3556		- Save();
3557		- tab.undoindex -= 1;
3558		- }
	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	+// }
3559	4298
3560		- tab.undoindex -= 1;
	4299	+ copy.versionindex -= 1;
3561	4300
3562		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4301	+ CopyChanged();
	4302	+
	4303	+ return true;
3563	4304	}
3564	4305
3565		- public void Redo()
	4306	+ public boolean Restore()
3566	4307	{
	4308	+ System.err.println("Restore");
	4309	+
3567	4310	cRadio tab = GetCurrentTab();
3568	4311
3569		- 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)
3570	4349	{
3571	4350	java.awt.Toolkit.getDefaultToolkit().beep();
3572	4351	return;
3573	4352	}
3574	4353
3575		- tab.undoindex += 1;
	4354	+ copy.versionindex += 1;
3576	4355
3577		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4356	+ CopyChanged();
	4357	+
	4358	+ //if (!tab.user[tab.versionindex])
	4359	+ // tab.graphs[tab.versionindex] = null;
3578	4360	}
3579	4361
3580	4362	void ImportGFD()
..	..	@@ -3726,7 +4508,7 @@
3726	4508	assert false;
3727	4509	}
3728	4510
3729		- void EditSelection()
	4511	+ void EditSelection(boolean newWindow)
3730	4512	{
3731	4513	}
3732	4514
..	..	@@ -3785,7 +4567,7 @@
3785	4567	//copy.material = new cMaterial(copy.GetMaterial());
3786	4568
3787	4569	current.color = (float) colorField.getFloat();
3788		- current.modulation = (float) modulationField.getFloat();
	4570	+ current.modulation = (float) saturationField.getFloat();
3789	4571	current.metalness = (float) metalnessField.getFloat();
3790	4572	current.diffuse = (float) diffuseField.getFloat();
3791	4573	current.specular = (float) specularField.getFloat();
..	..	@@ -3818,7 +4600,7 @@
3818	4600	cMaterial mat = copy.material;
3819	4601
3820	4602	colorField.SetToolTipValue((mat.color));
3821		- modulationField.SetToolTipValue((mat.modulation));
	4603	+ saturationField.SetToolTipValue((mat.modulation));
3822	4604	metalnessField.SetToolTipValue((mat.metalness));
3823	4605	diffuseField.SetToolTipValue((mat.diffuse));
3824	4606	specularField.SetToolTipValue((mat.specular));
..	..	@@ -3870,9 +4652,26 @@
3870	4652	//copy.Touch();
3871	4653	}
3872	4654
	4655	+ cNumberSlider versionSlider;
	4656	+
3873	4657	public void stateChanged(ChangeEvent e)
3874	4658	{
3875	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	+ }
3876	4675
3877	4676	if (freezematerial)
3878	4677	{
..	..	@@ -3908,6 +4707,12 @@
3908	4707	{
3909	4708	//System.out.println("stateChanged = " + this);
3910	4709	materialtouched = true;
	4710	+
	4711	+ if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4712	+ {
	4713	+ saturationField.setFloat(1);
	4714	+ }
	4715	+
3911	4716	applySelf();
3912	4717	//System.out.println("this = " + this);
3913	4718	//System.out.println("PARENT = " + parent);
..	..	@@ -4207,6 +5012,7 @@
4207	5012	{
4208	5013	if (GetTree() != null)
4209	5014	{
	5015	+ GetTree().revalidate();
4210	5016	GetTree().repaint();
4211	5017	}
4212	5018
..	..	@@ -4215,13 +5021,16 @@
4215	5021	ctrlPanel.validate(); // ? new
4216	5022	ctrlPanel.repaint();
4217	5023	}
	5024	+
	5025	+ if (previousVersionButton != null && copy.versionlist != null)
	5026	+ SetUndoStates();
4218	5027	}
4219	5028
4220	5029	static TweenManager tweenManager = new TweenManager();
4221	5030
4222	5031	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4223	5032	{
4224		- if (Globals.SAVEONMAKE)
	5033	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4225	5034	Save();
4226	5035	//Tween.set(thing, 0).target(1).start(tweenManager);
4227	5036	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4309,6 +5118,12 @@
4309	5118	{
4310	5119	ResetModel();
4311	5120	Select(thing.GetTreePath(), true, false); // unselect... false);
	5121	+
	5122	+ if (thing.Size() == 0)
	5123	+ {
	5124	+ //EditSelection(false);
	5125	+ }
	5126	+
4312	5127	refreshContents();
4313	5128	}
4314	5129
..	..	@@ -4457,7 +5272,9 @@
4457	5272	readobj.ResetDisplayList();
4458	5273	} catch (Exception e)
4459	5274	{
4460		- //e.printStackTrace();
	5275	+ if (!e.toString().contains("GZIP"))
	5276	+ e.printStackTrace();
	5277	+
4461	5278	try
4462	5279	{
4463	5280	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4531,12 +5348,14 @@
4531	5348
4532	5349	if (readobj != null)
4533	5350	{
4534		- if (Globals.SAVEONMAKE)
4535		- Save();
	5351	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5352	+ // Save();
4536	5353	try
4537	5354	{
4538	5355	//readobj.deepCopySelf(copy);
4539	5356	copy.clear(); // june 2014
	5357	+ copy.skyboxname = readobj.skyboxname;
	5358	+ copy.skyboxext = readobj.skyboxext;
4540	5359	for (int i = 0; i < readobj.size(); i++)
4541	5360	{
4542	5361	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4577,6 +5396,7 @@
4577	5396	}
4578	5397	} catch (ClassCastException e)
4579	5398	{
	5399	+ e.printStackTrace();
4580	5400	assert (false);
4581	5401	Composite c = (Composite) copy;
4582	5402	c.children.clear();
..	..	@@ -4587,17 +5407,28 @@
4587	5407	c.addChild(csg);
4588	5408	}
4589	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	+
4590	5421	ResetModel();
4591	5422	copy.HardTouch(); // recompile?
4592	5423	refreshContents();
4593	5424	}
4594	5425	}
4595	5426
4596		- void load() // throws ClassNotFoundException
	5427	+ void Open() // throws ClassNotFoundException
4597	5428	{
4598	5429	if (Grafreed.standAlone)
4599	5430	{
4600		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5431	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4601	5432	browser.show();
4602	5433	String filename = browser.getFile();
4603	5434	if (filename != null && filename.length() > 0)
..	..	@@ -4696,6 +5527,7 @@
4696	5527	//ps.print(buffer.toString());
4697	5528	} catch (IOException e)
4698	5529	{
	5530	+ e.printStackTrace();
4699	5531	}
4700	5532	}
4701	5533
..	..	@@ -4710,6 +5542,8 @@
4710	5542	String filename = browser.getFile();
4711	5543	if (filename != null && filename.length() > 0)
4712	5544	{
	5545	+ if (!filename.endsWith(".gfd"))
	5546	+ filename += ".gfd";
4713	5547	lastname = browser.getDirectory() + filename;
4714	5548	save();
4715	5549	}
..	..	@@ -4876,7 +5710,7 @@
4876	5710	MenuBar menuBar;
4877	5711	Menu fileMenu;
4878	5712	MenuItem newItem;
4879		- MenuItem loadItem;
	5713	+ MenuItem openItem;
4880	5714	MenuItem saveItem;
4881	5715	MenuItem saveAsItem;
4882	5716	MenuItem exportAsItem;
..	..	@@ -4899,22 +5733,36 @@
4899	5733	CheckboxMenuItem toggleSwitchItem;
4900	5734	CheckboxMenuItem toggleRootItem;
4901	5735	CheckboxMenuItem animationItem;
	5736	+ MenuItem archiveItem;
4902	5737	CheckboxMenuItem toggleHandleItem;
4903	5738	CheckboxMenuItem togglePaintItem;
4904	5739	JSplitPane mainPanel;
4905	5740	JScrollPane scrollpane;
	5741	+
4906	5742	JPanel toolbarPanel;
	5743	+
4907	5744	cGridBag treePanel;
	5745	+
4908	5746	JPanel radioPanel;
4909	5747	ButtonGroup buttonGroup;
4910		- cGridBag ctrlPanel;
	5748	+
	5749	+ cGridBag toolboxPanel;
4911	5750	cGridBag materialPanel;
	5751	+ cGridBag ctrlPanel;
	5752	+
4912	5753	JScrollPane infoPanel;
	5754	+
4913	5755	cGridBag optionsPanel;
	5756	+
4914	5757	JTabbedPane objectPanel;
	5758	+ boolean materialFlushed;
	5759	+ Object3D latestObject;
	5760	+
4915	5761	cGridBag XYZPanel;
	5762	+
4916	5763	JSplitPane gridPanel;
4917	5764	JSplitPane bigPanel;
	5765	+
4918	5766	cGridBag bigThree;
4919	5767	cGridBag scenePanel;
4920	5768	cGridBag centralPanel;
..	..	@@ -4972,7 +5820,7 @@
4972	5820	JLabel colorLabel;
4973	5821	cNumberSlider colorField;
4974	5822	JLabel modulationLabel;
4975		- cNumberSlider modulationField;
	5823	+ cNumberSlider saturationField;
4976	5824	JLabel metalnessLabel;
4977	5825	cNumberSlider metalnessField;
4978	5826	JLabel diffuseLabel;
..	..	@@ -5029,7 +5877,7 @@
5029	5877	cNumberSlider fogField;
5030	5878	JLabel opacityPowerLabel;
5031	5879	cNumberSlider opacityPowerField;
5032		- JTree jTree;
	5880	+ cTree jTree;
5033	5881	//ObjectUI parent;
5034	5882
5035	5883	cNumberSlider normalpushField;