~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -4,6 +4,7 @@
4	4
5	5	import java.awt.*;
6	6	import java.awt.event.*;
	7	+import java.awt.image.BufferedImage;
7	8	import javax.swing.*;
8	9	import javax.swing.event.*;
9	10	import javax.swing.text.*;
..	..	@@ -13,6 +14,9 @@
13	14	import javax.swing.plaf.metal.MetalLookAndFeel;
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
	17	+
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
16	20
17	21	//import javax.media.opengl.GLCanvas;
18	22
..	..	@@ -37,6 +41,79 @@
37	41	JFrame frame;
38	42
39	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	+ }
	52	+
	53	+ cButton GetButton(String name, boolean border)
	54	+ {
	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);
	69	+ }
	70	+
	71	+ cCheckBox GetCheckBox(String name, boolean border)
	72	+ {
	73	+ ImageIcon icon = GetIcon(name);
	74	+ return new cCheckBox(icon, border);
	75	+ }
	76	+
	77	+ ImageIcon GetIcon(String name)
	78	+ {
	79	+ try
	80	+ {
	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;
	97	+ }
	98	+ catch (Exception e)
	99	+ {
	100	+ return null;
	101	+ }
	102	+ }
	103	+
	104	+ BufferedImage GetImage(String name)
	105	+ {
	106	+ try
	107	+ {
	108	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	109	+
	110	+ return image;
	111	+ }
	112	+ catch (Exception e)
	113	+ {
	114	+ return null;
	115	+ }
	116	+ }
40	117
41	118	// SCRIPT
42	119
..	..	@@ -147,7 +224,7 @@
147	224
148	225	objEditor.ctrlPanel.remove(namePanel);
149	226
150		- if (!GroupEditor.allparams)
	227	+ if (!allparams)
151	228	return;
152	229
153	230	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -171,7 +248,7 @@
171	248
172	249	objEditor.ctrlPanel.remove(setupPanel);
173	250	objEditor.ctrlPanel.remove(setupPanel2);
174		- objEditor.ctrlPanel.remove(commandsPanel);
	251	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
175	252	objEditor.ctrlPanel.remove(pushPanel);
176	253	//objEditor.ctrlPanel.remove(fillPanel);
177	254
..	..	@@ -219,6 +296,12 @@
219	296	client = inClient;
220	297	copy = client;
221	298
	299	+ if (copy.versionlist == null)
	300	+ {
	301	+ copy.versionlist = new Object3D[100];
	302	+ copy.versionindex = -1;
	303	+ }
	304	+
222	305	// "this" is not called: SetupUI2(objEditor);
223	306	}
224	307
..	..	@@ -232,6 +315,12 @@
232	315	client = inClient;
233	316	copy = client;
234	317
	318	+ if (copy.versionlist == null)
	319	+ {
	320	+ copy.versionlist = new Object3D[100];
	321	+ copy.versionindex = -1;
	322	+ }
	323	+
235	324	SetupUI2(callee.GetEditor());
236	325	}
237	326
..	..	@@ -246,7 +335,7 @@
246	335	//localCopy.parent = null;
247	336
248	337	frame = new JFrame();
249		- frame.setUndecorated(true);
	338	+ frame.setUndecorated(false);
250	339	objEditor = this;
251	340	this.callee = callee;
252	341
..	..	@@ -264,6 +353,12 @@
264	353	copy = localCopy;
265	354	copy.editWindow = this;
266	355
	356	+ if (copy.versionlist == null)
	357	+ {
	358	+// copy.versions = new byte[100][];
	359	+// copy.versionindex = -1;
	360	+ }
	361	+
267	362	SetupMenu();
268	363
269	364	//SetupName(objEditor); // new
..	..	@@ -277,12 +372,17 @@
277	372	return frame.action(event, obj);
278	373	}
279	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	+
280	380	void SetupMenu()
281	381	{
282	382	frame.setMenuBar(menuBar = new MenuBar());
283	383	menuBar.add(fileMenu = new Menu("File"));
284	384	fileMenu.add(newItem = new MenuItem("New"));
285		- fileMenu.add(loadItem = new MenuItem("Open..."));
	385	+ fileMenu.add(openItem = new MenuItem("Open..."));
286	386
287	387	//oe.menuBar.add(menu = new Menu("Include"));
288	388	Menu menu = new Menu("Import");
..	..	@@ -314,7 +414,7 @@
314	414	}
315	415
316	416	newItem.addActionListener(this);
317		- loadItem.addActionListener(this);
	417	+ openItem.addActionListener(this);
318	418	saveItem.addActionListener(this);
319	419	saveAsItem.addActionListener(this);
320	420	exportAsItem.addActionListener(this);
..	..	@@ -323,28 +423,68 @@
323	423	closeItem.addActionListener(this);
324	424
325	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	+
326	452	toolbarPanel = new JPanel();
327	453	toolbarPanel.setName("Toolbar");
	454	+
328	455	treePanel = new cGridBag();
329	456	treePanel.setName("Tree");
	457	+
	458	+ editPanel = new cGridBag().setVertical(true);
	459	+ //editPanel.setName("Edit");
	460	+
330	461	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
331		- ctrlPanel.setName("Edit");
332		- materialPanel = new cGridBag().setVertical(true);
333		- materialPanel.setName("Material");
	462	+
	463	+ editCommandsPanel = new cGridBag();
	464	+ editPanel.add(editCommandsPanel);
	465	+ editPanel.add(ctrlPanel);
	466	+
	467	+ toolboxPanel = new cGridBag().setVertical(true);
	468	+ //toolboxPanel.setName("Toolbox");
	469	+
	470	+ materialPanel = new cGridBag().setVertical(false);
	471	+ //materialPanel.setName("Material");
	472	+
334	473	/JTextPane/
335	474	infoarea = createTextPane();
336	475	doc = infoarea.getStyledDocument();
337	476
338	477	infoarea.setEditable(true);
339	478	SetText();
	479	+
340	480	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
341	481	// infoarea.setOpaque(false);
342	482	// //infoarea.setForeground(textcolor);
343	483	// TEXTAREA infoarea.setLineWrap(true);
344	484	// TEXTAREA infoarea.setWrapStyleWord(true);
345	485	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
346		- infoPanel.setPreferredSize(new Dimension(50, 200));
347		- infoPanel.setName("Info");
	486	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	487	+ //infoPanel.setName("Info");
348	488	//infoPanel.setLayout(new BorderLayout());
349	489	//infoPanel.add(createTextPane());
350	490
..	..	@@ -355,7 +495,14 @@
355	495	mainPanel.setDividerSize(9);
356	496	mainPanel.setDividerLocation(0.5); //1.0);
357	497	mainPanel.setResizeWeight(0.5);
358		-
	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	+
359	506	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
360	507	//mainPanel.setLayout(new GridBagLayout());
361	508	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -586,8 +733,8 @@
586	733	}
587	734	}
588	735
589		-static GraphicsDevice device = GraphicsEnvironment
590		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	736	+//static GraphicsDevice device = GraphicsEnvironment
	737	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
591	738
592	739	Rectangle keeprect;
593	740	cRadio radio;
..	..	@@ -603,13 +750,24 @@
603	750
604	751	boolean maximized;
605	752
	753	+ cButton fullscreenLayout;
	754	+
606	755	void Minimize()
607	756	{
608	757	frame.setState(Frame.ICONIFIED);
	758	+ frame.validate();
609	759	}
610	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={}
611	764	void Maximize()
612	765	{
	766	+ if (CameraPane.FULLSCREEN)
	767	+ {
	768	+ ToggleFullScreen();
	769	+ }
	770	+
613	771	if (maximized)
614	772	{
615	773	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -617,20 +775,36 @@
617	775	else
618	776	{
619	777	keeprect = frame.getBounds();
620		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
621		- Dimension rect2 = frame.getToolkit().getScreenSize();
622		- 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);
623	781	// frame.setState(Frame.MAXIMIZED_BOTH);
	782	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
624	783	}
625	784
626	785	maximized ^= true;
	786	+
	787	+ frame.validate();
627	788	}
	789	+
	790	+ cButton minButton;
	791	+ cButton maxButton;
	792	+ cButton fullButton;
628	793
629	794	void ToggleFullScreen()
630	795	{
631		- if (CameraPane.FULLSCREEN)
	796	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	797	+
	798	+ cameraView.ToggleFullScreen();
	799	+
	800	+ if (!CameraPane.FULLSCREEN)
632	801	{
633	802	device.setFullScreenWindow(null);
	803	+ frame.dispose();
	804	+ frame.setUndecorated(false);
	805	+ frame.validate();
	806	+ frame.setVisible(true);
	807	+
634	808	//frame.setVisible(false);
635	809	// frame.removeNotify();
636	810	// frame.setUndecorated(false);
..	..	@@ -640,7 +814,7 @@
640	814	// X frame.getContentPane().remove(/"Center",/bigThree);
641	815	// X framePanel.add(bigThree);
642	816	// X frame.getContentPane().add(/"Center",/framePanel);
643		- framePanel.setDividerLocation(1);
	817	+ framePanel.setDividerLocation(46);
644	818
645	819	//frame.setVisible(true);
646	820	radio.layout = keepButton;
..	..	@@ -655,7 +829,12 @@
655	829	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
656	830	// frame.getToolkit().getScreenSize().height);
657	831	//frame.setVisible(false);
	832	+
	833	+ frame.dispose();
	834	+ frame.setUndecorated(true);
658	835	device.setFullScreenWindow(frame);
	836	+ frame.validate();
	837	+ frame.setVisible(true);
659	838	// frame.removeNotify();
660	839	// frame.setUndecorated(true);
661	840	// frame.addNotify();
..	..	@@ -664,13 +843,37 @@
664	843	// X frame.getContentPane().add(/"Center",/bigThree);
665	844	framePanel.setDividerLocation(0);
666	845
667		- radio.layout = twoButton;
	846	+ radio.layout = fullscreenLayout;
668	847	radio.layout.doClick();
669	848	//frame.setVisible(true);
670	849	}
671		-
672		- cameraView.ToggleFullScreen();
	850	+ frame.validate();
	851	+
	852	+ cameraView.requestFocusInWindow();
673	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	+ }
674	877
675	878	private JTextPane createTextPane()
676	879	{
..	..	@@ -793,6 +996,7 @@
793	996	{
794	997	SetupMaterial(materialPanel);
795	998	}
	999	+
796	1000	//SetupName();
797	1001	//SetupViews();
798	1002	}
..	..	@@ -802,7 +1006,7 @@
802	1006	// NumberSlider vDivsField;
803	1007	// JCheckBox endcaps;
804	1008	JCheckBox liveCB;
805		- JCheckBox selectCB;
	1009	+ JCheckBox selectableCB;
806	1010	JCheckBox hideCB;
807	1011	JCheckBox link2masterCB;
808	1012	JCheckBox markCB;
..	..	@@ -810,7 +1014,12 @@
810	1014	JCheckBox speedupCB;
811	1015	JCheckBox rewindCB;
812	1016	JCheckBox flipVCB;
	1017	+
	1018	+ cCheckBox toggleTextureCB;
	1019	+ cCheckBox toggleSwitchCB;
	1020	+
813	1021	JComboBox texresMenu;
	1022	+
814	1023	JButton resetButton;
815	1024	JButton stepButton;
816	1025	JButton stepAllButton;
..	..	@@ -819,10 +1028,13 @@
819	1028	JButton fasterButton;
820	1029	JButton remarkButton;
821	1030
	1031	+ cGridBag editPanel;
	1032	+ cGridBag editCommandsPanel;
	1033	+
822	1034	cGridBag namePanel;
823	1035	cGridBag setupPanel;
824	1036	cGridBag setupPanel2;
825		- cGridBag commandsPanel;
	1037	+ cGridBag objectCommandsPanel;
826	1038	cGridBag pushPanel;
827	1039	cGridBag fillPanel;
828	1040
..	..	@@ -994,38 +1206,42 @@
994	1206	namePanel = new cGridBag();
995	1207
996	1208	nameField = AddText(namePanel, copy.GetName());
997		- namePanel.add(nameField);
	1209	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
998	1210	oe.ctrlPanel.add(namePanel);
999	1211
1000	1212	oe.ctrlPanel.Return();
1001	1213
1002		- if (!GroupEditor.allparams)
	1214	+ if (!allparams)
1003	1215	return;
1004	1216
1005	1217	setupPanel = new cGridBag().setVertical(false);
1006	1218
1007	1219	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1008	1220	liveCB.setToolTipText("Animate object");
1009		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1010		- selectCB.setToolTipText("Make object selectable");
	1221	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1222	+ selectableCB.setToolTipText("Make object selectable");
1011	1223	// Return();
	1224	+
1012	1225	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1013	1226	hideCB.setToolTipText("Hide object");
1014	1227	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1015		- markCB.setToolTipText("Set the animation target transform");
	1228	+ markCB.setToolTipText("As animation target transform");
	1229	+
	1230	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1016	1231
1017	1232	setupPanel2 = new cGridBag().setVertical(false);
1018	1233
1019	1234	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1020	1235	rewindCB.setToolTipText("Rewind animation");
1021	1236
1022		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1023		- 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)");
1024	1239
	1240	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1241	+ link2masterCB.setToolTipText("Attach to support");
	1242	+
1025	1243	if (Globals.ADVANCED)
1026	1244	{
1027		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1028		- link2masterCB.setToolTipText("Attach to support");
1029	1245	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1030	1246	speedupCB.setToolTipText("Option motion capture");
1031	1247	}
..	..	@@ -1035,23 +1251,23 @@
1035	1251	oe.ctrlPanel.add(setupPanel2);
1036	1252	oe.ctrlPanel.Return();
1037	1253
1038		- commandsPanel = new cGridBag().setVertical(false);
	1254	+ objectCommandsPanel = new cGridBag().setVertical(false);
1039	1255
1040		- resetButton = AddButton(commandsPanel, "Reset");
	1256	+ resetButton = AddButton(objectCommandsPanel, "Reset");
1041	1257	resetButton.setToolTipText("Jump to frame zero");
1042		- stepButton = AddButton(commandsPanel, "Step");
	1258	+ stepButton = AddButton(objectCommandsPanel, "Step");
1043	1259	stepButton.setToolTipText("Step one frame");
1044	1260	// resetAllButton = AddButton(oe, "Reset All");
1045	1261	// stepAllButton = AddButton(oe, "Step All");
1046	1262	// Return();
1047		- slowerButton = AddButton(commandsPanel, "Slow");
	1263	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1048	1264	slowerButton.setToolTipText("Decrease animation speed");
1049		- fasterButton = AddButton(commandsPanel, "Fast");
	1265	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1050	1266	fasterButton.setToolTipText("Increase animation speed");
1051		- remarkButton = AddButton(commandsPanel, "Remark");
	1267	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1052	1268	remarkButton.setToolTipText("Set the current transform as the target");
1053	1269
1054		- oe.ctrlPanel.add(commandsPanel);
	1270	+ oe.ctrlPanel.add(objectCommandsPanel);
1055	1271	oe.ctrlPanel.Return();
1056	1272
1057	1273	pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
..	..	@@ -1299,6 +1515,7 @@
1299	1515	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1300	1516	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1301	1517	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1518	+ //XYZPanel.setName("XYZ");
1302	1519
1303	1520	/*
1304	1521	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1336,13 +1553,30 @@
1336	1553	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1337	1554	//tmp.setName("Edit");
1338	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	+
1339	1563	// JPanel north = new JPanel(new BorderLayout());
1340	1564	// north.setName("Edit");
1341	1565	// north.add(ctrlPanel, BorderLayout.NORTH);
1342	1566	// objectPanel.add(north);
1343		- objectPanel.add(ctrlPanel);
1344		- objectPanel.add(infoPanel);
1345		-
	1567	+ objectPanel.add(editPanel);
	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	+
1346	1580	/*
1347	1581	aConstraints.gridx = 0;
1348	1582	aConstraints.gridwidth = 1;
..	..	@@ -1350,7 +1584,7 @@
1350	1584	aConstraints.gridy += 1;
1351	1585	aConstraints.gridwidth = 1;
1352	1586	mainPanel.add(objectPanel, aConstraints);
1353		- */
	1587	+ */
1354	1588
1355	1589	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1356	1590	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1362,14 +1596,12 @@
1362	1596	scrollpane.addMouseWheelListener(this); // Default not fast enough
1363	1597
1364	1598	/JTabbedPane/ scenePanel = new cGridBag();
1365		- scenePanel.preferredWidth = 6;
	1599	+ scenePanel.preferredWidth = 5;
1366	1600
1367	1601	JTabbedPane tabbedPane = new JTabbedPane();
1368	1602	tabbedPane.add(scrollpane);
1369	1603
1370		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1371		-
1372		- optionsPanel = new cGridBag().setVertical(true);
	1604	+ optionsPanel = new cGridBag().setVertical(false);
1373	1605
1374	1606	optionsPanel.setName("Options");
1375	1607
..	..	@@ -1377,6 +1609,8 @@
1377	1609
1378	1610	tabbedPane.add(optionsPanel);
1379	1611
	1612	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1613	+
1380	1614	scenePanel.add(tabbedPane);
1381	1615
1382	1616	/*
..	..	@@ -1440,7 +1674,7 @@
1440	1674	bigThree = new cGridBag();
1441	1675	bigThree.addComponent(scenePanel);
1442	1676	bigThree.addComponent(centralPanel);
1443		- bigThree.addComponent(XYZPanel);
	1677	+ //bigThree.addComponent(XYZPanel);
1444	1678
1445	1679	// // SIDE EFFECT!!!
1446	1680	// aConstraints.gridx = 0;
..	..	@@ -1449,9 +1683,9 @@
1449	1683	// aConstraints.gridheight = 1;
1450	1684
1451	1685	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1452		- framePanel.setContinuousLayout(true);
1453		- framePanel.setOneTouchExpandable(true);
1454		- framePanel.setDividerLocation(0.8);
	1686	+ framePanel.setContinuousLayout(false);
	1687	+ framePanel.setOneTouchExpandable(false);
	1688	+ //.setDividerLocation(0.8);
1455	1689	//framePanel.setDividerSize(15);
1456	1690	//framePanel.setResizeWeight(0.15);
1457	1691	framePanel.setName("Frame");
..	..	@@ -1469,16 +1703,18 @@
1469	1703	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1470	1704
1471	1705	frame.setSize(1280, 860);
1472		- frame.setVisible(true);
1473		-
	1706	+
1474	1707	cameraView.requestFocusInWindow();
1475	1708
1476	1709	gridPanel.setDividerLocation(1.0);
	1710	+
	1711	+ frame.validate();
	1712	+
	1713	+ frame.setVisible(true);
1477	1714
1478	1715	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1479	1716	frame.addWindowListener(new WindowAdapter()
1480	1717	{
1481		-
1482	1718	public void windowClosing(WindowEvent e)
1483	1719	{
1484	1720	Close();
..	..	@@ -1501,12 +1737,384 @@
1501	1737	ctrlPanel.removeAll();
1502	1738	}
1503	1739
1504		- void SetupMaterial(cGridBag panel)
	1740	+ void SetupMaterial(cGridBag materialpanel)
1505	1741	{
1506		- /*
	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	+ /*
1507	2115	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1508	2116	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1509		- */
	2117	+ */
1510	2118
1511	2119	cGridBag editBar = new cGridBag().setVertical(false);
1512	2120
..	..	@@ -1540,45 +2148,50 @@
1540	2148	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1541	2149
1542	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);
1543	2164
1544	2165	cGridBag color = new cGridBag();
1545		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1546		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1547		- 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	+
1548	2171	//colorField.preferredWidth = 200;
1549	2172	colorSection.add(color);
1550	2173
1551	2174	cGridBag modulation = new cGridBag();
1552	2175	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1553	2176	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1554		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2177	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1555	2178	colorSection.add(modulation);
1556	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	+
1557	2188	cGridBag texture = new cGridBag();
1558	2189	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1559	2190	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1560	2191	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1561	2192	colorSection.add(texture);
1562	2193
1563		- cGridBag anisoU = new cGridBag();
1564		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1565		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1566		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1567		- colorSection.add(anisoU);
1568		-
1569		- cGridBag anisoV = new cGridBag();
1570		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1571		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1572		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1573		- colorSection.add(anisoV);
1574		-
1575		- cGridBag shadowbias = new cGridBag();
1576		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1577		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1578		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1579		- colorSection.add(shadowbias);
1580		-
1581		- panel.add(new JSeparator());
	2194	+ panel.add(GetSeparator());
1582	2195
1583	2196	panel.add(colorSection);
1584	2197
..	..	@@ -1628,7 +2241,13 @@
1628	2241	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1629	2242	diffuseSection.add(fakedepth);
1630	2243
1631		- 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());
1632	2251
1633	2252	panel.add(diffuseSection);
1634	2253
..	..	@@ -1678,42 +2297,48 @@
1678	2297	// aConstraints.gridy += 1;
1679	2298	// aConstraints.gridwidth = 1;
1680	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);
1681	2305
1682		- 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());
1683	2314
1684	2315	panel.add(specularSection);
1685	2316
1686	2317	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1687	2318
1688		- cGridBag globalSection = new cGridBag().setVertical(true);
	2319	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1689	2320
1690	2321	cGridBag camera = new cGridBag();
1691	2322	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1692	2323	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1693	2324	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1694		- globalSection.add(camera);
	2325	+ colorSection.add(camera);
1695	2326
1696	2327	cGridBag ambient = new cGridBag();
1697	2328	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1698	2329	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1699	2330	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1700		- globalSection.add(ambient);
	2331	+ colorSection.add(ambient);
1701	2332
1702	2333	cGridBag backlit = new cGridBag();
1703	2334	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1704	2335	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1705	2336	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1706		- globalSection.add(backlit);
	2337	+ colorSection.add(backlit);
1707	2338
1708		- cGridBag opacity = new cGridBag();
1709		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1710		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1711		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1712		- globalSection.add(opacity);
1713		-
1714		- panel.add(new JSeparator());
	2339	+ //panel.add(new JSeparator());
1715	2340
1716		- panel.add(globalSection);
	2341	+ //panel.add(globalSection);
1717	2342
1718	2343	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1719	2344
..	..	@@ -1755,7 +2380,7 @@
1755	2380	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1756	2381	textureSection.add(opacityPower);
1757	2382
1758		- panel.add(new JSeparator());
	2383	+ panel.add(GetSeparator());
1759	2384
1760	2385	panel.add(textureSection);
1761	2386
..	..	@@ -1820,8 +2445,9 @@
1820	2445	// 3D models
1821	2446	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1822	2447	{
1823		- lastConverter = new com.jmex.model.converters.MaxToJme();
1824		- LoadFile(filename, lastConverter);
	2448	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2449	+ //LoadFile(filename, lastConverter);
	2450	+ LoadObjFile(filename); // New 3ds loader
1825	2451	continue;
1826	2452	}
1827	2453	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2547,6 +3173,7 @@
2547	3173	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2548	3174	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2549	3175	}
	3176	+
2550	3177	//cJME.count++;
2551	3178	//cJME.count %= 12;
2552	3179	if (gc)
..	..	@@ -2730,6 +3357,7 @@
2730	3357	}
2731	3358	}
2732	3359	}
	3360	+
2733	3361	cFileSystemPane FSPane;
2734	3362
2735	3363	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2739,7 +3367,7 @@
2739	3367
2740	3368	freezematerial = true;
2741	3369	colorField.setFloat(mat.color);
2742		- modulationField.setFloat(mat.modulation);
	3370	+ saturationField.setFloat(mat.modulation);
2743	3371	metalnessField.setFloat(mat.metalness);
2744	3372	diffuseField.setFloat(mat.diffuse);
2745	3373	specularField.setFloat(mat.specular);
..	..	@@ -2783,11 +3411,14 @@
2783	3411	}
2784	3412	}
2785	3413	}
	3414	+
2786	3415	freezematerial = false;
2787	3416	}
2788	3417
2789	3418	void SetMaterial(Object3D object)
2790	3419	{
	3420	+ latestObject = object;
	3421	+
2791	3422	cMaterial mat = object.material;
2792	3423
2793	3424	if (mat == null)
..	..	@@ -2899,12 +3530,17 @@
2899	3530	// }
2900	3531
2901	3532	/**/
2902		- if (deselect)
	3533	+ if (deselect \|\| child == null)
2903	3534	{
2904	3535	//group.deselectAll();
2905	3536	//freeze = true;
2906	3537	GetTree().clearSelection();
2907	3538	//freeze = false;
	3539	+
	3540	+ if (child == null)
	3541	+ {
	3542	+ return;
	3543	+ }
2908	3544	}
2909	3545
2910	3546	//group.addSelectee(child);
..	..	@@ -2973,7 +3609,7 @@
2973	3609	cameraView.ToggleDL();
2974	3610	cameraView.repaint();
2975	3611	return;
2976		- } else if (event.getSource() == toggleTextureItem)
	3612	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2977	3613	{
2978	3614	cameraView.ToggleTexture();
2979	3615	// june 2013 copy.HardTouch();
..	..	@@ -3012,7 +3648,7 @@
3012	3648	frame.validate();
3013	3649
3014	3650	return;
3015		- } else if (event.getSource() == toggleSwitchItem)
	3651	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3016	3652	{
3017	3653	cameraView.ToggleSwitch();
3018	3654	cameraView.repaint();
..	..	@@ -3042,8 +3678,9 @@
3042	3678	} else if (event.getSource() == liveCB)
3043	3679	{
3044	3680	copy.live ^= true;
	3681	+ objEditor.refreshContents(true); // To show item colors
3045	3682	return;
3046		- } else if (event.getSource() == selectCB)
	3683	+ } else if (event.getSource() == selectableCB)
3047	3684	{
3048	3685	copy.dontselect ^= true;
3049	3686	return;
..	..	@@ -3051,7 +3688,7 @@
3051	3688	{
3052	3689	copy.hide ^= true;
3053	3690	copy.Touch(); // display list issue
3054		- objEditor.refreshContents();
	3691	+ objEditor.refreshContents(true); // To show item colors
3055	3692	return;
3056	3693	} else if (event.getSource() == link2masterCB)
3057	3694	{
..	..	@@ -3228,9 +3865,9 @@
3228	3865	{
3229	3866	Close();
3230	3867	//return true;
3231		- } else if (source == loadItem)
	3868	+ } else if (source == openItem)
3232	3869	{
3233		- load();
	3870	+ Open();
3234	3871	//return true;
3235	3872	} else if (source == newItem)
3236	3873	{
..	..	@@ -3255,6 +3892,10 @@
3255	3892	{
3256	3893	generatePOV();
3257	3894	//return true;
	3895	+ } else if (event.getSource() == archiveItem)
	3896	+ {
	3897	+ cTools.Archive(frame);
	3898	+ return;
3258	3899	} else if (source == zBufferItem)
3259	3900	{
3260	3901	try
..	..	@@ -3303,11 +3944,12 @@
3303	3944
3304	3945	static public byte[] Compress(Object3D o)
3305	3946	{
	3947	+ // Slower to actually compress.
3306	3948	try
3307	3949	{
3308	3950	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3309		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3310		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3951	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3952	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3311	3953
3312	3954	Object3D parent = o.parent;
3313	3955	o.parent = null;
..	..	@@ -3318,10 +3960,14 @@
3318	3960
3319	3961	out.flush();
3320	3962
3321		- zstream.close();
	3963	+ baos //zstream
	3964	+ .close();
3322	3965	out.close();
3323	3966
3324		- return baos.toByteArray();
	3967	+ byte[] bytes = baos.toByteArray();
	3968	+
	3969	+ System.out.println("save #bytes = " + bytes.length);
	3970	+ return bytes;
3325	3971	} catch (Exception e)
3326	3972	{
3327	3973	System.err.println(e);
..	..	@@ -3331,13 +3977,16 @@
3331	3977
3332	3978	static public Object Uncompress(byte[] bytes)
3333	3979	{
3334		- System.out.println("#bytes = " + bytes.length);
	3980	+ System.out.println("restore #bytes = " + bytes.length);
3335	3981	try
3336	3982	{
3337	3983	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3338		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3339		- ObjectInputStream in = new ObjectInputStream(istream);
	3984	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3985	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3340	3986	Object obj = in.readObject();
	3987	+
	3988	+ bais //istream
	3989	+ .close();
3341	3990	in.close();
3342	3991
3343	3992	return obj;
..	..	@@ -3392,37 +4041,95 @@
3392	4041	return null;
3393	4042	}
3394	4043
3395		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3396	4044
3397	4045	public void Save()
3398	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	+ {
	4084	+ System.err.println("Save");
	4085	+ //Replace();
	4086	+
3399	4087	cRadio tab = GetCurrentTab();
3400	4088
3401		- boolean temp = CameraPane.SWITCH;
3402		- CameraPane.SWITCH = false;
	4089	+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
3403	4090
3404		- 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	+// }
3405	4097
3406	4098	//EditorFrame.m_MainFrame.requestFocusInWindow();
3407		- tab.graphs[tab.undoindex++] = Compress(copy);
3408		-
3409		- copy.RestoreBigData(hashtable);
3410		-
3411		- CameraPane.SWITCH = temp;
3412		-
3413		- //assert(hashtable.isEmpty());
3414		-
3415		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	4099	+ if (!thesame)
3416	4100	{
3417		- 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++;
3418	4113	}
3419	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	+
3420	4127	// test save
3421	4128	if (false)
3422	4129	{
3423	4130	try
3424	4131	{
3425		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	4132	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3426	4133	ObjectOutputStream p = new ObjectOutputStream(ostream);
3427	4134
3428	4135	p.writeObject(copy);
..	..	@@ -3435,26 +4142,68 @@
3435	4142	e.printStackTrace();
3436	4143	}
3437	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);
3438	4179	}
3439	4180
3440		- void CopyChanged(Object3D obj)
	4181	+ void CopyChanged()
3441	4182	{
	4183	+ Object3D obj = copy.versionlist[copy.versionindex];
	4184	+
	4185	+ SetUndoStates();
	4186	+
3442	4187	boolean temp = CameraPane.SWITCH;
3443	4188	CameraPane.SWITCH = false;
3444	4189
3445		- copy.ExtractBigData(hashtable);
	4190	+ copy.ExtractBigData(versiontable);
3446	4191
3447	4192	copy.clear();
3448	4193
	4194	+ copy.skyboxname = obj.skyboxname;
	4195	+ copy.skyboxext = obj.skyboxext;
	4196	+
3449	4197	for (int i=0; i<obj.Size(); i++)
3450	4198	{
3451	4199	copy.add(obj.get(i));
3452	4200	}
3453	4201
3454		- copy.RestoreBigData(hashtable);
	4202	+ copy.RestoreBigData(versiontable);
3455	4203
3456	4204	CameraPane.SWITCH = temp;
3457	4205
	4206	+ RefreshSelection();
3458	4207	//assert(hashtable.isEmpty());
3459	4208
3460	4209	copy.Touch();
..	..	@@ -3475,43 +4224,139 @@
3475	4224	}
3476	4225	}
3477	4226
3478		- refreshContents();
	4227	+ refreshContents(true);
3479	4228	}
3480	4229
3481		- 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()
	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()
3482	4253	{
3483	4254	cRadio tab = GetCurrentTab();
3484	4255
3485		- if (tab.undoindex == 0)
	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	+
	4276	+ System.err.println("Undo");
	4277	+
	4278	+ cRadio tab = GetCurrentTab();
	4279	+
	4280	+ if (copy.versionindex == 0)
3486	4281	{
3487	4282	java.awt.Toolkit.getDefaultToolkit().beep();
3488		- return;
	4283	+ return false;
3489	4284	}
3490	4285
3491		- if (tab.graphs[tab.undoindex] == null)
3492		- {
3493		- Save();
3494		- tab.undoindex -= 1;
3495		- }
	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	+// }
3496	4298
3497		- tab.undoindex -= 1;
	4299	+ copy.versionindex -= 1;
3498	4300
3499		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4301	+ CopyChanged();
	4302	+
	4303	+ return true;
3500	4304	}
3501	4305
3502		- public void Redo()
	4306	+ public boolean Restore()
3503	4307	{
	4308	+ System.err.println("Restore");
	4309	+
3504	4310	cRadio tab = GetCurrentTab();
3505	4311
3506		- 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)
3507	4349	{
3508	4350	java.awt.Toolkit.getDefaultToolkit().beep();
3509	4351	return;
3510	4352	}
3511	4353
3512		- tab.undoindex += 1;
	4354	+ copy.versionindex += 1;
3513	4355
3514		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4356	+ CopyChanged();
	4357	+
	4358	+ //if (!tab.user[tab.versionindex])
	4359	+ // tab.graphs[tab.versionindex] = null;
3515	4360	}
3516	4361
3517	4362	void ImportGFD()
..	..	@@ -3663,7 +4508,7 @@
3663	4508	assert false;
3664	4509	}
3665	4510
3666		- void EditSelection()
	4511	+ void EditSelection(boolean newWindow)
3667	4512	{
3668	4513	}
3669	4514
..	..	@@ -3722,7 +4567,7 @@
3722	4567	//copy.material = new cMaterial(copy.GetMaterial());
3723	4568
3724	4569	current.color = (float) colorField.getFloat();
3725		- current.modulation = (float) modulationField.getFloat();
	4570	+ current.modulation = (float) saturationField.getFloat();
3726	4571	current.metalness = (float) metalnessField.getFloat();
3727	4572	current.diffuse = (float) diffuseField.getFloat();
3728	4573	current.specular = (float) specularField.getFloat();
..	..	@@ -3755,7 +4600,7 @@
3755	4600	cMaterial mat = copy.material;
3756	4601
3757	4602	colorField.SetToolTipValue((mat.color));
3758		- modulationField.SetToolTipValue((mat.modulation));
	4603	+ saturationField.SetToolTipValue((mat.modulation));
3759	4604	metalnessField.SetToolTipValue((mat.metalness));
3760	4605	diffuseField.SetToolTipValue((mat.diffuse));
3761	4606	specularField.SetToolTipValue((mat.specular));
..	..	@@ -3807,9 +4652,26 @@
3807	4652	//copy.Touch();
3808	4653	}
3809	4654
	4655	+ cNumberSlider versionSlider;
	4656	+
3810	4657	public void stateChanged(ChangeEvent e)
3811	4658	{
3812	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	+ }
3813	4675
3814	4676	if (freezematerial)
3815	4677	{
..	..	@@ -3845,6 +4707,12 @@
3845	4707	{
3846	4708	//System.out.println("stateChanged = " + this);
3847	4709	materialtouched = true;
	4710	+
	4711	+ if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4712	+ {
	4713	+ saturationField.setFloat(1);
	4714	+ }
	4715	+
3848	4716	applySelf();
3849	4717	//System.out.println("this = " + this);
3850	4718	//System.out.println("PARENT = " + parent);
..	..	@@ -4144,6 +5012,7 @@
4144	5012	{
4145	5013	if (GetTree() != null)
4146	5014	{
	5015	+ GetTree().revalidate();
4147	5016	GetTree().repaint();
4148	5017	}
4149	5018
..	..	@@ -4152,13 +5021,17 @@
4152	5021	ctrlPanel.validate(); // ? new
4153	5022	ctrlPanel.repaint();
4154	5023	}
	5024	+
	5025	+ if (previousVersionButton != null && copy.versionlist != null)
	5026	+ SetUndoStates();
4155	5027	}
4156	5028
4157	5029	static TweenManager tweenManager = new TweenManager();
4158	5030
4159	5031	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4160	5032	{
4161		- Save();
	5033	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5034	+ Save();
4162	5035	//Tween.set(thing, 0).target(1).start(tweenManager);
4163	5036	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
4164	5037	// if (thing instanceof GenericJointDemo)
..	..	@@ -4245,6 +5118,12 @@
4245	5118	{
4246	5119	ResetModel();
4247	5120	Select(thing.GetTreePath(), true, false); // unselect... false);
	5121	+
	5122	+ if (thing.Size() == 0)
	5123	+ {
	5124	+ //EditSelection(false);
	5125	+ }
	5126	+
4248	5127	refreshContents();
4249	5128	}
4250	5129
..	..	@@ -4393,7 +5272,9 @@
4393	5272	readobj.ResetDisplayList();
4394	5273	} catch (Exception e)
4395	5274	{
4396		- //e.printStackTrace();
	5275	+ if (!e.toString().contains("GZIP"))
	5276	+ e.printStackTrace();
	5277	+
4397	5278	try
4398	5279	{
4399	5280	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4467,11 +5348,14 @@
4467	5348
4468	5349	if (readobj != null)
4469	5350	{
4470		- Save();
	5351	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5352	+ // Save();
4471	5353	try
4472	5354	{
4473	5355	//readobj.deepCopySelf(copy);
4474	5356	copy.clear(); // june 2014
	5357	+ copy.skyboxname = readobj.skyboxname;
	5358	+ copy.skyboxext = readobj.skyboxext;
4475	5359	for (int i = 0; i < readobj.size(); i++)
4476	5360	{
4477	5361	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4512,6 +5396,7 @@
4512	5396	}
4513	5397	} catch (ClassCastException e)
4514	5398	{
	5399	+ e.printStackTrace();
4515	5400	assert (false);
4516	5401	Composite c = (Composite) copy;
4517	5402	c.children.clear();
..	..	@@ -4522,17 +5407,28 @@
4522	5407	c.addChild(csg);
4523	5408	}
4524	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	+
4525	5421	ResetModel();
4526	5422	copy.HardTouch(); // recompile?
4527	5423	refreshContents();
4528	5424	}
4529	5425	}
4530	5426
4531		- void load() // throws ClassNotFoundException
	5427	+ void Open() // throws ClassNotFoundException
4532	5428	{
4533	5429	if (Grafreed.standAlone)
4534	5430	{
4535		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5431	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4536	5432	browser.show();
4537	5433	String filename = browser.getFile();
4538	5434	if (filename != null && filename.length() > 0)
..	..	@@ -4631,6 +5527,7 @@
4631	5527	//ps.print(buffer.toString());
4632	5528	} catch (IOException e)
4633	5529	{
	5530	+ e.printStackTrace();
4634	5531	}
4635	5532	}
4636	5533
..	..	@@ -4645,6 +5542,8 @@
4645	5542	String filename = browser.getFile();
4646	5543	if (filename != null && filename.length() > 0)
4647	5544	{
	5545	+ if (!filename.endsWith(".gfd"))
	5546	+ filename += ".gfd";
4648	5547	lastname = browser.getDirectory() + filename;
4649	5548	save();
4650	5549	}
..	..	@@ -4811,7 +5710,7 @@
4811	5710	MenuBar menuBar;
4812	5711	Menu fileMenu;
4813	5712	MenuItem newItem;
4814		- MenuItem loadItem;
	5713	+ MenuItem openItem;
4815	5714	MenuItem saveItem;
4816	5715	MenuItem saveAsItem;
4817	5716	MenuItem exportAsItem;
..	..	@@ -4834,22 +5733,36 @@
4834	5733	CheckboxMenuItem toggleSwitchItem;
4835	5734	CheckboxMenuItem toggleRootItem;
4836	5735	CheckboxMenuItem animationItem;
	5736	+ MenuItem archiveItem;
4837	5737	CheckboxMenuItem toggleHandleItem;
4838	5738	CheckboxMenuItem togglePaintItem;
4839	5739	JSplitPane mainPanel;
4840	5740	JScrollPane scrollpane;
	5741	+
4841	5742	JPanel toolbarPanel;
	5743	+
4842	5744	cGridBag treePanel;
	5745	+
4843	5746	JPanel radioPanel;
4844	5747	ButtonGroup buttonGroup;
4845		- cGridBag ctrlPanel;
	5748	+
	5749	+ cGridBag toolboxPanel;
4846	5750	cGridBag materialPanel;
	5751	+ cGridBag ctrlPanel;
	5752	+
4847	5753	JScrollPane infoPanel;
	5754	+
4848	5755	cGridBag optionsPanel;
	5756	+
4849	5757	JTabbedPane objectPanel;
	5758	+ boolean materialFlushed;
	5759	+ Object3D latestObject;
	5760	+
4850	5761	cGridBag XYZPanel;
	5762	+
4851	5763	JSplitPane gridPanel;
4852	5764	JSplitPane bigPanel;
	5765	+
4853	5766	cGridBag bigThree;
4854	5767	cGridBag scenePanel;
4855	5768	cGridBag centralPanel;
..	..	@@ -4907,7 +5820,7 @@
4907	5820	JLabel colorLabel;
4908	5821	cNumberSlider colorField;
4909	5822	JLabel modulationLabel;
4910		- cNumberSlider modulationField;
	5823	+ cNumberSlider saturationField;
4911	5824	JLabel metalnessLabel;
4912	5825	cNumberSlider metalnessField;
4913	5826	JLabel diffuseLabel;
..	..	@@ -4964,7 +5877,7 @@
4964	5877	cNumberSlider fogField;
4965	5878	JLabel opacityPowerLabel;
4966	5879	cNumberSlider opacityPowerField;
4967		- JTree jTree;
	5880	+ cTree jTree;
4968	5881	//ObjectUI parent;
4969	5882
4970	5883	cNumberSlider normalpushField;