~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
..	..	@@ -30,11 +34,87 @@
30	34	iSendInfo
31	35	//KeyListener
32	36	{
	37	+ public cToggleButton pinButton;
33	38	boolean timeline;
34	39	boolean wasFullScreen;
35	40
36	41	GroupEditor callee;
37	42	JFrame frame;
	43	+
	44	+ static ObjEditor theFrame;
	45	+
	46	+ public cGridBag GetSeparator()
	47	+ {
	48	+ cGridBag separator = new cGridBag();
	49	+ separator.add(new JSeparator());
	50	+ separator.preferredHeight = 5;
	51	+ return separator;
	52	+ }
	53	+
	54	+ cButton GetButton(String name, boolean border)
	55	+ {
	56	+ ImageIcon icon = GetIcon(name);
	57	+ return new cButton(icon, border);
	58	+ }
	59	+
	60	+ cLabel GetLabel(String name, boolean border)
	61	+ {
	62	+ //ImageIcon icon = GetIcon(name);
	63	+ return new cLabel(GetImage(name), border);
	64	+ }
	65	+
	66	+ cToggleButton GetToggleButton(String name, boolean border)
	67	+ {
	68	+ ImageIcon icon = GetIcon(name);
	69	+ return new cToggleButton(icon, border);
	70	+ }
	71	+
	72	+ cCheckBox GetCheckBox(String name, boolean border)
	73	+ {
	74	+ ImageIcon icon = GetIcon(name);
	75	+ return new cCheckBox(icon, border);
	76	+ }
	77	+
	78	+ ImageIcon GetIcon(String name)
	79	+ {
	80	+ try
	81	+ {
	82	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	83	+
	84	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	85	+// {
	86	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	87	+// Graphics2D g = resized.createGraphics();
	88	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	89	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	90	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	91	+// g.dispose();
	92	+//
	93	+// image = resized;
	94	+// }
	95	+
	96	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	97	+ return icon;
	98	+ }
	99	+ catch (Exception e)
	100	+ {
	101	+ return null;
	102	+ }
	103	+ }
	104	+
	105	+ BufferedImage GetImage(String name)
	106	+ {
	107	+ try
	108	+ {
	109	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	110	+
	111	+ return image;
	112	+ }
	113	+ catch (Exception e)
	114	+ {
	115	+ return null;
	116	+ }
	117	+ }
38	118
39	119	// SCRIPT
40	120
..	..	@@ -145,7 +225,7 @@
145	225
146	226	objEditor.ctrlPanel.remove(namePanel);
147	227
148		- if (!GroupEditor.allparams)
	228	+ if (!allparams)
149	229	return;
150	230
151	231	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -169,7 +249,7 @@
169	249
170	250	objEditor.ctrlPanel.remove(setupPanel);
171	251	objEditor.ctrlPanel.remove(setupPanel2);
172		- objEditor.ctrlPanel.remove(commandsPanel);
	252	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
173	253	objEditor.ctrlPanel.remove(pushPanel);
174	254	//objEditor.ctrlPanel.remove(fillPanel);
175	255
..	..	@@ -217,6 +297,14 @@
217	297	client = inClient;
218	298	copy = client;
219	299
	300	+// if (copy.versionlist == null)
	301	+// {
	302	+// copy.versionlist = new Object3D[100];
	303	+// copy.versionindex = -1;
	304	+//
	305	+// callee.Save(true);
	306	+// }
	307	+
220	308	// "this" is not called: SetupUI2(objEditor);
221	309	}
222	310
..	..	@@ -230,6 +318,14 @@
230	318	client = inClient;
231	319	copy = client;
232	320
	321	+ if (copy.versionlist == null)
	322	+ {
	323	+ copy.versionlist = new Object3D[100];
	324	+ copy.versionindex = -1;
	325	+
	326	+// Save(true);
	327	+ }
	328	+
233	329	SetupUI2(callee.GetEditor());
234	330	}
235	331
..	..	@@ -244,6 +340,7 @@
244	340	//localCopy.parent = null;
245	341
246	342	frame = new JFrame();
	343	+ frame.setUndecorated(false);
247	344	objEditor = this;
248	345	this.callee = callee;
249	346
..	..	@@ -261,6 +358,14 @@
261	358	copy = localCopy;
262	359	copy.editWindow = this;
263	360
	361	+// if (copy.versionlist == null)
	362	+// {
	363	+// copy.versionlist = new Object3D[100];
	364	+// copy.versionindex = -1;
	365	+//
	366	+// Save(true);
	367	+// }
	368	+
264	369	SetupMenu();
265	370
266	371	//SetupName(objEditor); // new
..	..	@@ -274,12 +379,17 @@
274	379	return frame.action(event, obj);
275	380	}
276	381
	382	+ // Cannot work without static
	383	+ static boolean allparams = true;
	384	+
	385	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	386	+
277	387	void SetupMenu()
278	388	{
279	389	frame.setMenuBar(menuBar = new MenuBar());
280	390	menuBar.add(fileMenu = new Menu("File"));
281	391	fileMenu.add(newItem = new MenuItem("New"));
282		- fileMenu.add(loadItem = new MenuItem("Open..."));
	392	+ fileMenu.add(openItem = new MenuItem("Open..."));
283	393
284	394	//oe.menuBar.add(menu = new Menu("Include"));
285	395	Menu menu = new Menu("Import");
..	..	@@ -311,7 +421,7 @@
311	421	}
312	422
313	423	newItem.addActionListener(this);
314		- loadItem.addActionListener(this);
	424	+ openItem.addActionListener(this);
315	425	saveItem.addActionListener(this);
316	426	saveAsItem.addActionListener(this);
317	427	exportAsItem.addActionListener(this);
..	..	@@ -320,28 +430,70 @@
320	430	closeItem.addActionListener(this);
321	431
322	432	objectPanel = new JTabbedPane();
	433	+
	434	+ ChangeListener changeListener = new ChangeListener()
	435	+ {
	436	+ public void stateChanged(ChangeEvent changeEvent)
	437	+ {
	438	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	439	+// {
	440	+// if (latestObject != null)
	441	+// {
	442	+// refreshContents(true);
	443	+// SetMaterial(latestObject);
	444	+// }
	445	+//
	446	+// materialFlushed = true;
	447	+// }
	448	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	449	+// {
	450	+// if (listUI.size() == 0)
	451	+// EditSelection(false);
	452	+// }
	453	+
	454	+// refreshContents(false); // To refresh Info tab
	455	+ }
	456	+ };
	457	+ objectPanel.addChangeListener(changeListener);
	458	+
323	459	toolbarPanel = new JPanel();
324	460	toolbarPanel.setName("Toolbar");
	461	+
325	462	treePanel = new cGridBag();
326	463	treePanel.setName("Tree");
	464	+
	465	+ editPanel = new cGridBag().setVertical(true);
	466	+ //editPanel.setName("Edit");
	467	+
327	468	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
328		- ctrlPanel.setName("Edit");
329		- materialPanel = new cGridBag().setVertical(true);
330		- materialPanel.setName("Material");
	469	+
	470	+ editCommandsPanel = new cGridBag();
	471	+ editPanel.add(editCommandsPanel);
	472	+ editPanel.add(ctrlPanel);
	473	+
	474	+ toolboxPanel = new cGridBag().setVertical(true);
	475	+ //toolboxPanel.setName("Toolbox");
	476	+
	477	+ skyboxPanel = new cGridBag().setVertical(true);
	478	+
	479	+ materialPanel = new cGridBag().setVertical(false);
	480	+ //materialPanel.setName("Material");
	481	+
331	482	/JTextPane/
332	483	infoarea = createTextPane();
333	484	doc = infoarea.getStyledDocument();
334	485
335	486	infoarea.setEditable(true);
336	487	SetText();
	488	+
337	489	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
338	490	// infoarea.setOpaque(false);
339	491	// //infoarea.setForeground(textcolor);
340	492	// TEXTAREA infoarea.setLineWrap(true);
341	493	// TEXTAREA infoarea.setWrapStyleWord(true);
342	494	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
343		- infoPanel.setPreferredSize(new Dimension(50, 200));
344		- infoPanel.setName("Info");
	495	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	496	+ //infoPanel.setName("Info");
345	497	//infoPanel.setLayout(new BorderLayout());
346	498	//infoPanel.add(createTextPane());
347	499
..	..	@@ -352,7 +504,14 @@
352	504	mainPanel.setDividerSize(9);
353	505	mainPanel.setDividerLocation(0.5); //1.0);
354	506	mainPanel.setResizeWeight(0.5);
355		-
	507	+
	508	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	509	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	510	+ divider.setDividerSize(15);
	511	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	512	+
	513	+ mainPanel.setUI(new BasicSplitPaneUI());
	514	+
356	515	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
357	516	//mainPanel.setLayout(new GridBagLayout());
358	517	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -583,21 +742,158 @@
583	742	}
584	743	}
585	744
	745	+//static GraphicsDevice device = GraphicsEnvironment
	746	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	747	+
	748	+ Rectangle keeprect;
	749	+ cRadio radio;
	750	+
	751	+cButton keepButton;
	752	+ cButton twoButton; // Full 3D
	753	+ cButton sixButton;
	754	+ cButton threeButton;
	755	+ cButton sevenButton;
	756	+ cButton fourButton; // full panel
	757	+ cButton oneButton; // full XYZ
	758	+ //cButton currentLayout;
	759	+
	760	+ boolean maximized;
	761	+
	762	+ cButton fullscreenLayout;
	763	+ cButton expandedLayout;
	764	+
	765	+ void Minimize()
	766	+ {
	767	+ frame.setState(Frame.ICONIFIED);
	768	+ frame.validate();
	769	+ }
	770	+
	771	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	772	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	773	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	774	+ void Maximize()
	775	+ {
	776	+ if (CameraPane.FULLSCREEN)
	777	+ {
	778	+ ToggleFullScreen();
	779	+ }
	780	+
	781	+ if (maximized)
	782	+ {
	783	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	784	+ }
	785	+ else
	786	+ {
	787	+ keeprect = frame.getBounds();
	788	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	789	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	790	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	791	+// frame.setState(Frame.MAXIMIZED_BOTH);
	792	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	793	+ }
	794	+
	795	+ maximized ^= true;
	796	+
	797	+ frame.validate();
	798	+ }
	799	+
	800	+ cButton minButton;
	801	+ cButton maxButton;
	802	+ cButton fullButton;
	803	+ cButton collapseButton;
	804	+ cButton maximize3DButton;
	805	+
586	806	void ToggleFullScreen()
587	807	{
588		- if (CameraPane.FULLSCREEN)
	808	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	809	+
	810	+ cameraView.ToggleFullScreen();
	811	+
	812	+ if (!CameraPane.FULLSCREEN)
589	813	{
590		- frame.getContentPane().remove(/"Center",/bigThree);
591		- framePanel.add(bigThree);
592		- frame.getContentPane().add(/"Center",/framePanel);
	814	+ device.setFullScreenWindow(null);
	815	+ frame.dispose();
	816	+ frame.setUndecorated(false);
	817	+ frame.validate();
	818	+ frame.setVisible(true);
	819	+
	820	+ //frame.setVisible(false);
	821	+// frame.removeNotify();
	822	+// frame.setUndecorated(false);
	823	+// frame.addNotify();
	824	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	825	+
	826	+// X frame.getContentPane().remove(/"Center",/bigThree);
	827	+// X framePanel.add(bigThree);
	828	+// X frame.getContentPane().add(/"Center",/framePanel);
	829	+// framePanel.setDividerLocation(46); // icons are 24x24
	830	+
	831	+ //frame.setVisible(true);
	832	+// radio.layout = keepButton;
	833	+ //theFrame = null;
	834	+ keepButton = null;
	835	+// radio.layout.doClick();
	836	+
593	837	} else
594	838	{
595		- frame.getContentPane().remove(/"Center",/framePanel);
596		- framePanel.remove(bigThree);
597		- frame.getContentPane().add(/"Center",/bigThree);
	839	+ keepButton = radio.layout;
	840	+ //keeprect = frame.getBounds();
	841	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	842	+// frame.getToolkit().getScreenSize().height);
	843	+ //frame.setVisible(false);
	844	+
	845	+ frame.dispose();
	846	+ frame.setUndecorated(true);
	847	+ device.setFullScreenWindow(frame);
	848	+ frame.validate();
	849	+ frame.setVisible(true);
	850	+// frame.removeNotify();
	851	+// frame.setUndecorated(true);
	852	+// frame.addNotify();
	853	+// X frame.getContentPane().remove(/"Center",/framePanel);
	854	+// X framePanel.remove(bigThree);
	855	+// X frame.getContentPane().add(/"Center",/bigThree);
	856	+// framePanel.setDividerLocation(0);
	857	+
	858	+// radio.layout = fullscreenLayout;
	859	+// radio.layout.doClick();
	860	+ //frame.setVisible(true);
598	861	}
599		- cameraView.ToggleFullScreen();
	862	+ frame.validate();
	863	+
	864	+ cameraView.requestFocusInWindow();
600	865	}
	866	+
	867	+ void CollapseToolbar()
	868	+ {
	869	+ framePanel.setDividerLocation(0);
	870	+ //frame.validate();
	871	+
	872	+ cameraView.requestFocusInWindow();
	873	+ }
	874	+
	875	+ private Object3D Duplicate(Object3D object)
	876	+ {
	877	+ boolean temp = CameraPane.SWITCH;
	878	+ CameraPane.SWITCH = false;
	879	+
	880	+ object.ExtractBigData(versiontable);
	881	+ // if (copy == client)
	882	+
	883	+ Object3D versions[] = object.versionlist;
	884	+ object.versionlist = null;
	885	+
	886	+ //byte[] compress = Compress(copy);
	887	+ Object3D compress = (Object3D)Grafreed.clone(object);
	888	+
	889	+ object.versionlist = versions;
	890	+
	891	+ object.RestoreBigData(versiontable);
	892	+
	893	+ CameraPane.SWITCH = temp;
	894	+
	895	+ return compress;
	896	+ }
601	897
602	898	private JTextPane createTextPane()
603	899	{
..	..	@@ -720,6 +1016,7 @@
720	1016	{
721	1017	SetupMaterial(materialPanel);
722	1018	}
	1019	+
723	1020	//SetupName();
724	1021	//SetupViews();
725	1022	}
..	..	@@ -729,7 +1026,7 @@
729	1026	// NumberSlider vDivsField;
730	1027	// JCheckBox endcaps;
731	1028	JCheckBox liveCB;
732		- JCheckBox selectCB;
	1029	+ JCheckBox selectableCB;
733	1030	JCheckBox hideCB;
734	1031	JCheckBox link2masterCB;
735	1032	JCheckBox markCB;
..	..	@@ -737,7 +1034,12 @@
737	1034	JCheckBox speedupCB;
738	1035	JCheckBox rewindCB;
739	1036	JCheckBox flipVCB;
	1037	+
	1038	+ cCheckBox toggleTextureCB;
	1039	+ cCheckBox toggleSwitchCB;
	1040	+
740	1041	JComboBox texresMenu;
	1042	+
741	1043	JButton resetButton;
742	1044	JButton stepButton;
743	1045	JButton stepAllButton;
..	..	@@ -746,10 +1048,13 @@
746	1048	JButton fasterButton;
747	1049	JButton remarkButton;
748	1050
	1051	+ cGridBag editPanel;
	1052	+ cGridBag editCommandsPanel;
	1053	+
749	1054	cGridBag namePanel;
750	1055	cGridBag setupPanel;
751	1056	cGridBag setupPanel2;
752		- cGridBag commandsPanel;
	1057	+ cGridBag objectCommandsPanel;
753	1058	cGridBag pushPanel;
754	1059	cGridBag fillPanel;
755	1060
..	..	@@ -920,39 +1225,55 @@
920	1225
921	1226	namePanel = new cGridBag();
922	1227
	1228	+ //if (copy.pinned)
	1229	+ {
	1230	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1231	+ pinButton.setSelected(copy.pinned);
	1232	+ cGridBag t = new cGridBag();
	1233	+ t.preferredWidth = 2;
	1234	+ t.add(pinButton);
	1235	+ namePanel.add(t);
	1236	+
	1237	+ pinButton.addItemListener(this);
	1238	+ }
	1239	+
923	1240	nameField = AddText(namePanel, copy.GetName());
924		- namePanel.add(nameField);
	1241	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
925	1242	oe.ctrlPanel.add(namePanel);
926	1243
927	1244	oe.ctrlPanel.Return();
928	1245
929		- if (!GroupEditor.allparams)
	1246	+ if (!allparams)
930	1247	return;
931	1248
932	1249	setupPanel = new cGridBag().setVertical(false);
933	1250
934	1251	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
935	1252	liveCB.setToolTipText("Animate object");
936		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
937		- selectCB.setToolTipText("Make object selectable");
	1253	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1254	+ selectableCB.setToolTipText("Make object selectable");
938	1255	// Return();
	1256	+
939	1257	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
940	1258	hideCB.setToolTipText("Hide object");
941	1259	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
942		- markCB.setToolTipText("Set the animation target transform");
	1260	+ markCB.setToolTipText("As animation target transform");
	1261	+
	1262	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
943	1263
944	1264	setupPanel2 = new cGridBag().setVertical(false);
945	1265
946	1266	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
947	1267	rewindCB.setToolTipText("Rewind animation");
948	1268
949		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
950		- randomCB.setToolTipText("Rewind or Go back and forth randomly");
	1269	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1270	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
951	1271
	1272	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1273	+ link2masterCB.setToolTipText("Attach to support");
	1274	+
952	1275	if (Globals.ADVANCED)
953	1276	{
954		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
955		- link2masterCB.setToolTipText("Attach to support");
956	1277	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
957	1278	speedupCB.setToolTipText("Option motion capture");
958	1279	}
..	..	@@ -962,23 +1283,23 @@
962	1283	oe.ctrlPanel.add(setupPanel2);
963	1284	oe.ctrlPanel.Return();
964	1285
965		- commandsPanel = new cGridBag().setVertical(false);
	1286	+ objectCommandsPanel = new cGridBag().setVertical(false);
966	1287
967		- resetButton = AddButton(commandsPanel, "Reset");
	1288	+ resetButton = AddButton(objectCommandsPanel, "Reset");
968	1289	resetButton.setToolTipText("Jump to frame zero");
969		- stepButton = AddButton(commandsPanel, "Step");
	1290	+ stepButton = AddButton(objectCommandsPanel, "Step");
970	1291	stepButton.setToolTipText("Step one frame");
971	1292	// resetAllButton = AddButton(oe, "Reset All");
972	1293	// stepAllButton = AddButton(oe, "Step All");
973	1294	// Return();
974		- slowerButton = AddButton(commandsPanel, "Slow");
	1295	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
975	1296	slowerButton.setToolTipText("Decrease animation speed");
976		- fasterButton = AddButton(commandsPanel, "Fast");
	1297	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
977	1298	fasterButton.setToolTipText("Increase animation speed");
978		- remarkButton = AddButton(commandsPanel, "Remark");
	1299	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
979	1300	remarkButton.setToolTipText("Set the current transform as the target");
980	1301
981		- oe.ctrlPanel.add(commandsPanel);
	1302	+ oe.ctrlPanel.add(objectCommandsPanel);
982	1303	oe.ctrlPanel.Return();
983	1304
984	1305	pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
..	..	@@ -1184,8 +1505,11 @@
1184	1505	//worldPanel.setName("World");
1185	1506	centralPanel = new cGridBag();
1186	1507	centralPanel.preferredWidth = 20;
1187		- timelinePanel = new JPanel(new BorderLayout());
1188		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1508	+
	1509	+ if (Globals.ADVANCED)
	1510	+ {
	1511	+ timelinePanel = new JPanel(new BorderLayout());
	1512	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1189	1513
1190	1514	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1191	1515	cameraPanel.setContinuousLayout(true);
..	..	@@ -1194,7 +1518,10 @@
1194	1518	// cameraPanel.setDividerSize(9);
1195	1519	cameraPanel.setResizeWeight(1.0);
1196	1520
	1521	+ }
	1522	+
1197	1523	centralPanel.add(cameraView);
	1524	+ centralPanel.setFocusable(true);
1198	1525	//frame.setJMenuBar(timelineMenubar);
1199	1526	//centralPanel.add(timelinePanel);
1200	1527
..	..	@@ -1220,6 +1547,7 @@
1220	1547	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1221	1548	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1222	1549	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1550	+ //XYZPanel.setName("XYZ");
1223	1551
1224	1552	/*
1225	1553	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1257,13 +1585,29 @@
1257	1585	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1258	1586	//tmp.setName("Edit");
1259	1587	objectPanel.add(materialPanel);
	1588	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1589	+ objectPanel.setToolTipTextAt(0, "Material");
	1590	+
	1591	+ objectPanel.add(toolboxPanel);
	1592	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1593	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1594	+
	1595	+ objectPanel.add(skyboxPanel);
	1596	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1597	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1598	+
1260	1599	// JPanel north = new JPanel(new BorderLayout());
1261	1600	// north.setName("Edit");
1262	1601	// north.add(ctrlPanel, BorderLayout.NORTH);
1263	1602	// objectPanel.add(north);
1264		- objectPanel.add(ctrlPanel);
1265		- objectPanel.add(infoPanel);
1266		-
	1603	+ objectPanel.add(editPanel);
	1604	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1605	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1606	+
	1607	+ objectPanel.add(XYZPanel);
	1608	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1609	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1610	+
1267	1611	/*
1268	1612	aConstraints.gridx = 0;
1269	1613	aConstraints.gridwidth = 1;
..	..	@@ -1271,7 +1615,7 @@
1271	1615	aConstraints.gridy += 1;
1272	1616	aConstraints.gridwidth = 1;
1273	1617	mainPanel.add(objectPanel, aConstraints);
1274		- */
	1618	+ */
1275	1619
1276	1620	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1277	1621	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1283,14 +1627,12 @@
1283	1627	scrollpane.addMouseWheelListener(this); // Default not fast enough
1284	1628
1285	1629	/JTabbedPane/ scenePanel = new cGridBag();
1286		- scenePanel.preferredWidth = 6;
	1630	+ scenePanel.preferredWidth = 5;
1287	1631
1288	1632	JTabbedPane tabbedPane = new JTabbedPane();
1289	1633	tabbedPane.add(scrollpane);
1290	1634
1291		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1292		-
1293		- optionsPanel = new cGridBag().setVertical(true);
	1635	+ optionsPanel = new cGridBag().setVertical(false);
1294	1636
1295	1637	optionsPanel.setName("Options");
1296	1638
..	..	@@ -1298,8 +1640,15 @@
1298	1640
1299	1641	tabbedPane.add(optionsPanel);
1300	1642
	1643	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1644	+
1301	1645	scenePanel.add(tabbedPane);
1302	1646
	1647	+ //if (Globals.ADVANCED)
	1648	+ tabbedPane.add(infoPanel);
	1649	+ tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1650	+ tabbedPane.setToolTipTextAt(3, "Information");
	1651	+
1303	1652	/*
1304	1653	cTree jTree = new cTree(null);
1305	1654	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1361,7 +1710,7 @@
1361	1710	bigThree = new cGridBag();
1362	1711	bigThree.addComponent(scenePanel);
1363	1712	bigThree.addComponent(centralPanel);
1364		- bigThree.addComponent(XYZPanel);
	1713	+ //bigThree.addComponent(XYZPanel);
1365	1714
1366	1715	// // SIDE EFFECT!!!
1367	1716	// aConstraints.gridx = 0;
..	..	@@ -1370,9 +1719,26 @@
1370	1719	// aConstraints.gridheight = 1;
1371	1720
1372	1721	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1373		- framePanel.setContinuousLayout(true);
1374		- framePanel.setOneTouchExpandable(true);
1375		- framePanel.setDividerLocation(0.8);
	1722	+
	1723	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1724	+ new java.beans.PropertyChangeListener()
	1725	+ {
	1726	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1727	+ {
	1728	+ if ((Integer)pce.getOldValue() == 1)
	1729	+ {
	1730	+ if (radio.layout != expandedLayout)
	1731	+ {
	1732	+ radio.layout = expandedLayout;
	1733	+ radio.layout.doClick();
	1734	+ }
	1735	+ }
	1736	+ }
	1737	+ });
	1738	+
	1739	+ framePanel.setContinuousLayout(false);
	1740	+ framePanel.setOneTouchExpandable(false);
	1741	+ //.setDividerLocation(0.8);
1376	1742	//framePanel.setDividerSize(15);
1377	1743	//framePanel.setResizeWeight(0.15);
1378	1744	framePanel.setName("Frame");
..	..	@@ -1390,14 +1756,18 @@
1390	1756	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1391	1757
1392	1758	frame.setSize(1280, 860);
1393		- frame.setVisible(true);
1394		-
	1759	+
	1760	+ cameraView.requestFocusInWindow();
	1761	+
1395	1762	gridPanel.setDividerLocation(1.0);
	1763	+
	1764	+ frame.validate();
	1765	+
	1766	+ frame.setVisible(true);
1396	1767
1397	1768	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1398	1769	frame.addWindowListener(new WindowAdapter()
1399	1770	{
1400		-
1401	1771	public void windowClosing(WindowEvent e)
1402	1772	{
1403	1773	Close();
..	..	@@ -1420,12 +1790,403 @@
1420	1790	ctrlPanel.removeAll();
1421	1791	}
1422	1792
1423		- void SetupMaterial(cGridBag panel)
	1793	+ void SetupMaterial(cGridBag materialpanel)
1424	1794	{
1425		- /*
	1795	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1796	+
	1797	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1798	+ skin.setToolTipText("Skin");
	1799	+ skin.addMouseListener(new MouseAdapter()
	1800	+ {
	1801	+ public void mouseClicked(MouseEvent e)
	1802	+ {
	1803	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1804	+ cMaterial material = object.material;
	1805	+
	1806	+ // Skin
	1807	+ colorField.setFloat(material.color);
	1808	+ saturationField.setFloat(material.modulation);
	1809	+ subsurfaceField.setFloat(material.subsurface);
	1810	+ selfshadowField.setFloat(material.diffuseness);
	1811	+ diffusenessField.setFloat(material.factor);
	1812	+ shininessField.setFloat(material.shininess);
	1813	+ shadowbiasField.setFloat(material.shadowbias);
	1814	+ diffuseField.setFloat(material.diffuse);
	1815	+ specularField.setFloat(material.specular);
	1816	+
	1817	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1818	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1819	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1820	+
	1821	+ materialtouched = true;
	1822	+ applySelf();
	1823	+ }
	1824	+ });
	1825	+ presetpanel.add(skin);
	1826	+
	1827	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1828	+ lambert.setToolTipText("Diffuse");
	1829	+ lambert.addMouseListener(new MouseAdapter()
	1830	+ {
	1831	+ public void mouseClicked(MouseEvent e)
	1832	+ {
	1833	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1834	+ cMaterial material = object.material;
	1835	+
	1836	+ diffusenessField.setFloat(material.factor);
	1837	+ selfshadowField.setFloat(material.diffuseness);
	1838	+
	1839	+ materialtouched = true;
	1840	+ applySelf();
	1841	+ }
	1842	+ });
	1843	+ presetpanel.add(lambert);
	1844	+
	1845	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1846	+ diffuse2.setToolTipText("Diffuse2");
	1847	+ diffuse2.addMouseListener(new MouseAdapter()
	1848	+ {
	1849	+ public void mouseClicked(MouseEvent e)
	1850	+ {
	1851	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1852	+ cMaterial material = object.material;
	1853	+
	1854	+ diffusenessField.setFloat(material.factor);
	1855	+ selfshadowField.setFloat(material.diffuseness);
	1856	+
	1857	+ materialtouched = true;
	1858	+ applySelf();
	1859	+ }
	1860	+ });
	1861	+ presetpanel.add(diffuse2);
	1862	+
	1863	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1864	+ diffusemoon.setToolTipText("Moon");
	1865	+ diffusemoon.addMouseListener(new MouseAdapter()
	1866	+ {
	1867	+ public void mouseClicked(MouseEvent e)
	1868	+ {
	1869	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1870	+ cMaterial material = object.material;
	1871	+
	1872	+ diffusenessField.setFloat(material.factor);
	1873	+ selfshadowField.setFloat(material.diffuseness);
	1874	+
	1875	+ materialtouched = true;
	1876	+ applySelf();
	1877	+ }
	1878	+ });
	1879	+ presetpanel.add(diffusemoon);
	1880	+
	1881	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1882	+ diffusemoon2.setToolTipText("Moon2");
	1883	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1884	+ {
	1885	+ public void mouseClicked(MouseEvent e)
	1886	+ {
	1887	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1888	+ cMaterial material = object.material;
	1889	+
	1890	+ diffusenessField.setFloat(material.factor);
	1891	+ selfshadowField.setFloat(material.diffuseness);
	1892	+
	1893	+ materialtouched = true;
	1894	+ applySelf();
	1895	+ }
	1896	+ });
	1897	+ presetpanel.add(diffusemoon2);
	1898	+
	1899	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1900	+ diffusemoon3.setToolTipText("Moon3");
	1901	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1902	+ {
	1903	+ public void mouseClicked(MouseEvent e)
	1904	+ {
	1905	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1906	+ cMaterial material = object.material;
	1907	+
	1908	+ diffusenessField.setFloat(material.factor);
	1909	+ selfshadowField.setFloat(material.diffuseness);
	1910	+
	1911	+ materialtouched = true;
	1912	+ applySelf();
	1913	+ }
	1914	+ });
	1915	+ presetpanel.add(diffusemoon3);
	1916	+
	1917	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1918	+ diffusesheen.setToolTipText("Sheen");
	1919	+ diffusesheen.addMouseListener(new MouseAdapter()
	1920	+ {
	1921	+ public void mouseClicked(MouseEvent e)
	1922	+ {
	1923	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1924	+ cMaterial material = object.material;
	1925	+
	1926	+ sheenField.setFloat(material.sheen);
	1927	+
	1928	+ materialtouched = true;
	1929	+ applySelf();
	1930	+ }
	1931	+ });
	1932	+ presetpanel.add(diffusesheen);
	1933	+
	1934	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	1935	+ rough.setToolTipText("Rough metal");
	1936	+ rough.addMouseListener(new MouseAdapter()
	1937	+ {
	1938	+ public void mouseClicked(MouseEvent e)
	1939	+ {
	1940	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	1941	+ cMaterial material = object.material;
	1942	+
	1943	+ shininessField.setFloat(material.shininess);
	1944	+ velvetField.setFloat(material.velvet);
	1945	+
	1946	+ materialtouched = true;
	1947	+ applySelf();
	1948	+ }
	1949	+ });
	1950	+ presetpanel.add(rough);
	1951	+
	1952	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	1953	+ rough2.setToolTipText("Medium metal");
	1954	+ rough2.addMouseListener(new MouseAdapter()
	1955	+ {
	1956	+ public void mouseClicked(MouseEvent e)
	1957	+ {
	1958	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	1959	+ cMaterial material = object.material;
	1960	+
	1961	+ shininessField.setFloat(material.shininess);
	1962	+ lightareaField.setFloat(material.lightarea);
	1963	+
	1964	+ materialtouched = true;
	1965	+ applySelf();
	1966	+ }
	1967	+ });
	1968	+ presetpanel.add(rough2);
	1969	+
	1970	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	1971	+ shini0.setToolTipText("Shiny");
	1972	+ shini0.addMouseListener(new MouseAdapter()
	1973	+ {
	1974	+ public void mouseClicked(MouseEvent e)
	1975	+ {
	1976	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	1977	+ cMaterial material = object.material;
	1978	+
	1979	+ shininessField.setFloat(material.shininess);
	1980	+ lightareaField.setFloat(material.lightarea);
	1981	+
	1982	+ materialtouched = true;
	1983	+ applySelf();
	1984	+ }
	1985	+ });
	1986	+ presetpanel.add(shini0);
	1987	+
	1988	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	1989	+ shini1.setToolTipText("Shiny2");
	1990	+ shini1.addMouseListener(new MouseAdapter()
	1991	+ {
	1992	+ public void mouseClicked(MouseEvent e)
	1993	+ {
	1994	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	1995	+ cMaterial material = object.material;
	1996	+
	1997	+ shininessField.setFloat(material.shininess);
	1998	+ lightareaField.setFloat(material.lightarea);
	1999	+
	2000	+ materialtouched = true;
	2001	+ applySelf();
	2002	+ }
	2003	+ });
	2004	+ presetpanel.add(shini1);
	2005	+
	2006	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2007	+ shini2.setToolTipText("Shiny3");
	2008	+ shini2.addMouseListener(new MouseAdapter()
	2009	+ {
	2010	+ public void mouseClicked(MouseEvent e)
	2011	+ {
	2012	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2013	+ cMaterial material = object.material;
	2014	+
	2015	+ shininessField.setFloat(material.shininess);
	2016	+ lightareaField.setFloat(material.lightarea);
	2017	+
	2018	+ materialtouched = true;
	2019	+ applySelf();
	2020	+ }
	2021	+ });
	2022	+ presetpanel.add(shini2);
	2023	+
	2024	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2025	+ aniso.setToolTipText("AnisoU");
	2026	+ aniso.addMouseListener(new MouseAdapter()
	2027	+ {
	2028	+ public void mouseClicked(MouseEvent e)
	2029	+ {
	2030	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2031	+ cMaterial material = object.material;
	2032	+
	2033	+ anisoField.setFloat(material.aniso);
	2034	+ anisoVField.setFloat(material.anisoV);
	2035	+
	2036	+ materialtouched = true;
	2037	+ applySelf();
	2038	+ }
	2039	+ });
	2040	+ presetpanel.add(aniso);
	2041	+
	2042	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2043	+ aniso2.setToolTipText("AnisoV");
	2044	+ aniso2.addMouseListener(new MouseAdapter()
	2045	+ {
	2046	+ public void mouseClicked(MouseEvent e)
	2047	+ {
	2048	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2049	+ cMaterial material = object.material;
	2050	+
	2051	+ anisoField.setFloat(material.aniso);
	2052	+ anisoVField.setFloat(material.anisoV);
	2053	+
	2054	+ materialtouched = true;
	2055	+ applySelf();
	2056	+ }
	2057	+ });
	2058	+ presetpanel.add(aniso2);
	2059	+
	2060	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2061	+ aniso3.setToolTipText("AnisoUV");
	2062	+ aniso3.addMouseListener(new MouseAdapter()
	2063	+ {
	2064	+ public void mouseClicked(MouseEvent e)
	2065	+ {
	2066	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2067	+ cMaterial material = object.material;
	2068	+
	2069	+ anisoField.setFloat(material.aniso);
	2070	+ anisoVField.setFloat(material.anisoV);
	2071	+
	2072	+ materialtouched = true;
	2073	+ applySelf();
	2074	+ }
	2075	+ });
	2076	+ presetpanel.add(aniso3);
	2077	+
	2078	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2079	+ velvet0.setToolTipText("Velvet");
	2080	+ velvet0.addMouseListener(new MouseAdapter()
	2081	+ {
	2082	+ public void mouseClicked(MouseEvent e)
	2083	+ {
	2084	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2085	+ cMaterial material = object.material;
	2086	+
	2087	+ diffusenessField.setFloat(material.factor);
	2088	+ selfshadowField.setFloat(material.diffuseness);
	2089	+ sheenField.setFloat(material.sheen);
	2090	+ shininessField.setFloat(material.shininess);
	2091	+ velvetField.setFloat(material.velvet);
	2092	+ shiftField.setFloat(material.shift);
	2093	+
	2094	+ materialtouched = true;
	2095	+ applySelf();
	2096	+ }
	2097	+ });
	2098	+ presetpanel.add(velvet0);
	2099	+
	2100	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2101	+ bump0.setToolTipText("Bump texture");
	2102	+ bump0.addMouseListener(new MouseAdapter()
	2103	+ {
	2104	+ public void mouseClicked(MouseEvent e)
	2105	+ {
	2106	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2107	+ cMaterial material = object.material;
	2108	+
	2109	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2110	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2111	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2112	+
	2113	+ materialtouched = true;
	2114	+ applySelf();
	2115	+ }
	2116	+ });
	2117	+ presetpanel.add(bump0);
	2118	+
	2119	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2120	+ halo.setToolTipText("Halo");
	2121	+ halo.addMouseListener(new MouseAdapter()
	2122	+ {
	2123	+ public void mouseClicked(MouseEvent e)
	2124	+ {
	2125	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2126	+ cMaterial material = object.material;
	2127	+
	2128	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2129	+
	2130	+ materialtouched = true;
	2131	+ applySelf();
	2132	+ }
	2133	+ });
	2134	+ presetpanel.add(halo);
	2135	+
	2136	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2137	+ candle.setToolTipText("Candle");
	2138	+ candle.addMouseListener(new MouseAdapter()
	2139	+ {
	2140	+ public void mouseClicked(MouseEvent e)
	2141	+ {
	2142	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2143	+ cMaterial material = object.material;
	2144	+
	2145	+ subsurfaceField.setFloat(material.subsurface);
	2146	+ shadowbiasField.setFloat(material.shadowbias);
	2147	+ ambientField.setFloat(material.ambient);
	2148	+ specularField.setFloat(material.specular);
	2149	+ lightareaField.setFloat(material.lightarea);
	2150	+ shininessField.setFloat(material.shininess);
	2151	+
	2152	+ materialtouched = true;
	2153	+ applySelf();
	2154	+ }
	2155	+ });
	2156	+ presetpanel.add(candle);
	2157	+
	2158	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2159	+ shadowShader.setToolTipText("Shadow");
	2160	+ shadowShader.addMouseListener(new MouseAdapter()
	2161	+ {
	2162	+ public void mouseClicked(MouseEvent e)
	2163	+ {
	2164	+ diffuseField.setFloat(0.001);
	2165	+ ambientField.setFloat(0.001);
	2166	+ cameraField.setFloat(0.001);
	2167	+ specularField.setFloat(0.001);
	2168	+ fakedepthField.setFloat(0.001);
	2169	+ opacityField.setFloat(0.6);
	2170	+
	2171	+ materialtouched = true;
	2172	+ applySelf();
	2173	+ }
	2174	+ });
	2175	+ presetpanel.add(shadowShader);
	2176	+
	2177	+ cGridBag panel = new cGridBag().setVertical(true);
	2178	+
	2179	+ presetpanel.preferredWidth = 1;
	2180	+
	2181	+ materialpanel.add(presetpanel);
	2182	+ materialpanel.add(panel);
	2183	+
	2184	+ panel.preferredWidth = 8;
	2185	+
	2186	+ /*
1426	2187	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1427	2188	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1428		- */
	2189	+ */
1429	2190
1430	2191	cGridBag editBar = new cGridBag().setVertical(false);
1431	2192
..	..	@@ -1459,45 +2220,50 @@
1459	2220	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1460	2221
1461	2222	cGridBag colorSection = new cGridBag().setVertical(true);
	2223	+
	2224	+ cGridBag huepanel = new cGridBag();
	2225	+ cGridBag huelabel = new cGridBag();
	2226	+ skin = GetLabel("icons/hue.png", false);
	2227	+ skin.fit = true;
	2228	+ huelabel.add(skin);
	2229	+ huelabel.preferredWidth = 20;
	2230	+ huepanel.add(new cGridBag()); // Label
	2231	+ huepanel.add(huelabel); // Field/slider
	2232	+
	2233	+ huepanel.preferredHeight = 7;
	2234	+
	2235	+ colorSection.add(huepanel);
1462	2236
1463	2237	cGridBag color = new cGridBag();
1464		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1465		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1466		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2238	+
	2239	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2240	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2241	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2242	+
1467	2243	//colorField.preferredWidth = 200;
1468	2244	colorSection.add(color);
1469	2245
1470	2246	cGridBag modulation = new cGridBag();
1471	2247	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1472	2248	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1473		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2249	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1474	2250	colorSection.add(modulation);
1475	2251
	2252	+ cGridBag opacity = new cGridBag();
	2253	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2254	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2255	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2256	+ colorSection.add(opacity);
	2257	+
	2258	+ colorSection.add(GetSeparator());
	2259	+
1476	2260	cGridBag texture = new cGridBag();
1477	2261	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1478	2262	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1479	2263	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1480	2264	colorSection.add(texture);
1481	2265
1482		- cGridBag anisoU = new cGridBag();
1483		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1484		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1485		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1486		- colorSection.add(anisoU);
1487		-
1488		- cGridBag anisoV = new cGridBag();
1489		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1490		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1491		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1492		- colorSection.add(anisoV);
1493		-
1494		- cGridBag shadowbias = new cGridBag();
1495		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1496		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1497		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1498		- colorSection.add(shadowbias);
1499		-
1500		- panel.add(new JSeparator());
	2266	+ panel.add(GetSeparator());
1501	2267
1502	2268	panel.add(colorSection);
1503	2269
..	..	@@ -1547,7 +2313,13 @@
1547	2313	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1548	2314	diffuseSection.add(fakedepth);
1549	2315
1550		- panel.add(new JSeparator());
	2316	+ cGridBag shadowbias = new cGridBag();
	2317	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2318	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2319	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2320	+ diffuseSection.add(shadowbias);
	2321	+
	2322	+ panel.add(GetSeparator());
1551	2323
1552	2324	panel.add(diffuseSection);
1553	2325
..	..	@@ -1597,42 +2369,48 @@
1597	2369	// aConstraints.gridy += 1;
1598	2370	// aConstraints.gridwidth = 1;
1599	2371
	2372	+ cGridBag anisoU = new cGridBag();
	2373	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2374	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2375	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2376	+ specularSection.add(anisoU);
1600	2377
1601		- panel.add(new JSeparator());
	2378	+ cGridBag anisoV = new cGridBag();
	2379	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2380	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2381	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2382	+ specularSection.add(anisoV);
	2383	+
	2384	+
	2385	+ panel.add(GetSeparator());
1602	2386
1603	2387	panel.add(specularSection);
1604	2388
1605	2389	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1606	2390
1607		- cGridBag globalSection = new cGridBag().setVertical(true);
	2391	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1608	2392
1609	2393	cGridBag camera = new cGridBag();
1610	2394	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1611	2395	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1612	2396	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1613		- globalSection.add(camera);
	2397	+ colorSection.add(camera);
1614	2398
1615	2399	cGridBag ambient = new cGridBag();
1616	2400	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1617	2401	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1618	2402	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1619		- globalSection.add(ambient);
	2403	+ colorSection.add(ambient);
1620	2404
1621	2405	cGridBag backlit = new cGridBag();
1622	2406	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1623	2407	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1624	2408	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1625		- globalSection.add(backlit);
	2409	+ colorSection.add(backlit);
1626	2410
1627		- cGridBag opacity = new cGridBag();
1628		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1629		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1630		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1631		- globalSection.add(opacity);
1632		-
1633		- panel.add(new JSeparator());
	2411	+ //panel.add(new JSeparator());
1634	2412
1635		- panel.add(globalSection);
	2413	+ //panel.add(globalSection);
1636	2414
1637	2415	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1638	2416
..	..	@@ -1674,7 +2452,7 @@
1674	2452	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1675	2453	textureSection.add(opacityPower);
1676	2454
1677		- panel.add(new JSeparator());
	2455	+ panel.add(GetSeparator());
1678	2456
1679	2457	panel.add(textureSection);
1680	2458
..	..	@@ -1739,8 +2517,9 @@
1739	2517	// 3D models
1740	2518	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1741	2519	{
1742		- lastConverter = new com.jmex.model.converters.MaxToJme();
1743		- LoadFile(filename, lastConverter);
	2520	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2521	+ //LoadFile(filename, lastConverter);
	2522	+ LoadObjFile(filename); // New 3ds loader
1744	2523	continue;
1745	2524	}
1746	2525	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2466,6 +3245,7 @@
2466	3245	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2467	3246	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2468	3247	}
	3248	+
2469	3249	//cJME.count++;
2470	3250	//cJME.count %= 12;
2471	3251	if (gc)
..	..	@@ -2649,6 +3429,7 @@
2649	3429	}
2650	3430	}
2651	3431	}
	3432	+
2652	3433	cFileSystemPane FSPane;
2653	3434
2654	3435	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2658,7 +3439,7 @@
2658	3439
2659	3440	freezematerial = true;
2660	3441	colorField.setFloat(mat.color);
2661		- modulationField.setFloat(mat.modulation);
	3442	+ saturationField.setFloat(mat.modulation);
2662	3443	metalnessField.setFloat(mat.metalness);
2663	3444	diffuseField.setFloat(mat.diffuse);
2664	3445	specularField.setFloat(mat.specular);
..	..	@@ -2702,11 +3483,14 @@
2702	3483	}
2703	3484	}
2704	3485	}
	3486	+
2705	3487	freezematerial = false;
2706	3488	}
2707	3489
2708	3490	void SetMaterial(Object3D object)
2709	3491	{
	3492	+ latestObject = object;
	3493	+
2710	3494	cMaterial mat = object.material;
2711	3495
2712	3496	if (mat == null)
..	..	@@ -2818,12 +3602,17 @@
2818	3602	// }
2819	3603
2820	3604	/**/
2821		- if (deselect)
	3605	+ if (deselect \|\| child == null)
2822	3606	{
2823	3607	//group.deselectAll();
2824	3608	//freeze = true;
2825	3609	GetTree().clearSelection();
2826	3610	//freeze = false;
	3611	+
	3612	+ if (child == null)
	3613	+ {
	3614	+ return;
	3615	+ }
2827	3616	}
2828	3617
2829	3618	//group.addSelectee(child);
..	..	@@ -2857,6 +3646,17 @@
2857	3646	public void itemStateChanged(ItemEvent event)
2858	3647	{
2859	3648	// System.out.println("Propagate = " + propagate);
	3649	+ if (event.getSource() == pinButton)
	3650	+ {
	3651	+ copy.pinned ^= true;
	3652	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3653	+ {
	3654	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3655	+ copy.CloseUI();
	3656	+ //copy.editWindow.refreshContents();
	3657	+ }
	3658	+ }
	3659	+ else
2860	3660	if (event.getSource() == propagateToggle)
2861	3661	{
2862	3662	propagate ^= true;
..	..	@@ -2892,7 +3692,7 @@
2892	3692	cameraView.ToggleDL();
2893	3693	cameraView.repaint();
2894	3694	return;
2895		- } else if (event.getSource() == toggleTextureItem)
	3695	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2896	3696	{
2897	3697	cameraView.ToggleTexture();
2898	3698	// june 2013 copy.HardTouch();
..	..	@@ -2931,7 +3731,7 @@
2931	3731	frame.validate();
2932	3732
2933	3733	return;
2934		- } else if (event.getSource() == toggleSwitchItem)
	3734	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2935	3735	{
2936	3736	cameraView.ToggleSwitch();
2937	3737	cameraView.repaint();
..	..	@@ -2961,8 +3761,9 @@
2961	3761	} else if (event.getSource() == liveCB)
2962	3762	{
2963	3763	copy.live ^= true;
	3764	+ objEditor.refreshContents(true); // To show item colors
2964	3765	return;
2965		- } else if (event.getSource() == selectCB)
	3766	+ } else if (event.getSource() == selectableCB)
2966	3767	{
2967	3768	copy.dontselect ^= true;
2968	3769	return;
..	..	@@ -2970,7 +3771,7 @@
2970	3771	{
2971	3772	copy.hide ^= true;
2972	3773	copy.Touch(); // display list issue
2973		- objEditor.refreshContents();
	3774	+ objEditor.refreshContents(true); // To show item colors
2974	3775	return;
2975	3776	} else if (event.getSource() == link2masterCB)
2976	3777	{
..	..	@@ -3147,9 +3948,9 @@
3147	3948	{
3148	3949	Close();
3149	3950	//return true;
3150		- } else if (source == loadItem)
	3951	+ } else if (source == openItem)
3151	3952	{
3152		- load();
	3953	+ Open();
3153	3954	//return true;
3154	3955	} else if (source == newItem)
3155	3956	{
..	..	@@ -3174,6 +3975,10 @@
3174	3975	{
3175	3976	generatePOV();
3176	3977	//return true;
	3978	+ } else if (event.getSource() == archiveItem)
	3979	+ {
	3980	+ cTools.Archive(frame);
	3981	+ return;
3177	3982	} else if (source == zBufferItem)
3178	3983	{
3179	3984	try
..	..	@@ -3222,11 +4027,12 @@
3222	4027
3223	4028	static public byte[] Compress(Object3D o)
3224	4029	{
	4030	+ // Slower to actually compress.
3225	4031	try
3226	4032	{
3227	4033	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3228		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3229		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	4034	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4035	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3230	4036
3231	4037	Object3D parent = o.parent;
3232	4038	o.parent = null;
..	..	@@ -3237,10 +4043,14 @@
3237	4043
3238	4044	out.flush();
3239	4045
3240		- zstream.close();
	4046	+ baos //zstream
	4047	+ .close();
3241	4048	out.close();
3242	4049
3243		- return baos.toByteArray();
	4050	+ byte[] bytes = baos.toByteArray();
	4051	+
	4052	+ System.out.println("save #bytes = " + bytes.length);
	4053	+ return bytes;
3244	4054	} catch (Exception e)
3245	4055	{
3246	4056	System.err.println(e);
..	..	@@ -3250,13 +4060,16 @@
3250	4060
3251	4061	static public Object Uncompress(byte[] bytes)
3252	4062	{
3253		- System.out.println("#bytes = " + bytes.length);
	4063	+ System.out.println("restore #bytes = " + bytes.length);
3254	4064	try
3255	4065	{
3256	4066	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3257		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3258		- ObjectInputStream in = new ObjectInputStream(istream);
	4067	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4068	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3259	4069	Object obj = in.readObject();
	4070	+
	4071	+ bais //istream
	4072	+ .close();
3260	4073	in.close();
3261	4074
3262	4075	return obj;
..	..	@@ -3311,37 +4124,95 @@
3311	4124	return null;
3312	4125	}
3313	4126
3314		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3315	4127
3316	4128	public void Save()
3317	4129	{
3318		- cRadio tab = GetCurrentTab();
	4130	+ //Save(true);
	4131	+ Replace();
	4132	+ SetUndoStates();
	4133	+ }
	4134	+
	4135	+ private boolean Equal(byte[] compress, byte[] name)
	4136	+ {
	4137	+ if (compress.length != name.length)
	4138	+ {
	4139	+ return false;
	4140	+ }
3319	4141
3320		- boolean temp = CameraPane.SWITCH;
3321		- CameraPane.SWITCH = false;
	4142	+ for (int i=compress.length; --i>=0;)
	4143	+ {
	4144	+ if (compress[i] != name[i])
	4145	+ return false;
	4146	+ }
3322	4147
3323		- copy.ExtractBigData(hashtable);
	4148	+ return true;
	4149	+ }
	4150	+
	4151	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4152	+
	4153	+ void DeleteVersion()
	4154	+ {
	4155	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4156	+ {
	4157	+ copy.versionlist[i] = copy.versionlist[i+1];
	4158	+ }
	4159	+
	4160	+ CopyChanged();
	4161	+
	4162	+ SetUndoStates();
	4163	+ }
	4164	+
	4165	+ public boolean Save(boolean user)
	4166	+ {
	4167	+ System.err.println("Save");
	4168	+ Replace();
	4169	+
	4170	+ //cRadio tab = GetCurrentTab();
	4171	+
	4172	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
	4173	+
	4174	+ boolean thesame = false;
	4175	+
	4176	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4177	+// {
	4178	+// thesame = true;
	4179	+// }
3324	4180
3325	4181	//EditorFrame.m_MainFrame.requestFocusInWindow();
3326		- tab.graphs[tab.undoindex++] = Compress(copy);
3327		-
3328		- copy.RestoreBigData(hashtable);
3329		-
3330		- CameraPane.SWITCH = temp;
3331		-
3332		- //assert(hashtable.isEmpty());
3333		-
3334		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	4182	+ if (!thesame)
3335	4183	{
3336		- tab.graphs[i] = null;
	4184	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4185	+ {
	4186	+ copy.versionlist[i] = copy.versionlist[i-1];
	4187	+ }
	4188	+
	4189	+ //tab.user[tab.versionindex] = user;
	4190	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4191	+
	4192	+ copy.versionlist[++copy.versionindex] = compress;
	4193	+
	4194	+ // if (increment)
	4195	+ // tab.versionindex++;
3337	4196	}
3338	4197
	4198	+ //copy.RestoreBigData(versiontable);
	4199	+
	4200	+ //assert(hashtable.isEmpty());
	4201	+
	4202	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4203	+// {
	4204	+// //tab.user[i] = false;
	4205	+// copy.versionlist[i] = null;
	4206	+// }
	4207	+
	4208	+ SetUndoStates();
	4209	+
3339	4210	// test save
3340	4211	if (false)
3341	4212	{
3342	4213	try
3343	4214	{
3344		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	4215	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3345	4216	ObjectOutputStream p = new ObjectOutputStream(ostream);
3346	4217
3347	4218	p.writeObject(copy);
..	..	@@ -3354,26 +4225,68 @@
3354	4225	e.printStackTrace();
3355	4226	}
3356	4227	}
	4228	+
	4229	+ return !thesame;
	4230	+ }
	4231	+
	4232	+ boolean flashIt = true;
	4233	+
	4234	+ void RefreshSelection()
	4235	+ {
	4236	+ Object3D selection = new Object3D();
	4237	+
	4238	+ for (int i = 0; i < copy.selection.size(); i++)
	4239	+ {
	4240	+ Object3D elem = copy.selection.elementAt(i);
	4241	+
	4242	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4243	+
	4244	+ if (obj == null)
	4245	+ {
	4246	+ copy.selection.remove(i--);
	4247	+ }
	4248	+ else
	4249	+ {
	4250	+ selection.add(obj);
	4251	+ copy.selection.setElementAt(obj, i);
	4252	+ }
	4253	+ }
	4254	+
	4255	+ flashIt = false;
	4256	+ GetTree().clearSelection();
	4257	+ for (int i = 0; i < selection.size(); i++)
	4258	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4259	+ flashIt = true;
	4260	+
	4261	+ //refreshContents(false);
3357	4262	}
3358	4263
3359		- void CopyChanged(Object3D obj)
	4264	+ void CopyChanged()
3360	4265	{
	4266	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4267	+
	4268	+ SetUndoStates();
	4269	+
3361	4270	boolean temp = CameraPane.SWITCH;
3362	4271	CameraPane.SWITCH = false;
3363	4272
3364		- copy.ExtractBigData(hashtable);
	4273	+ copy.ExtractBigData(versiontable);
3365	4274
3366	4275	copy.clear();
3367	4276
	4277	+ copy.skyboxname = obj.skyboxname;
	4278	+ copy.skyboxext = obj.skyboxext;
	4279	+
3368	4280	for (int i=0; i<obj.Size(); i++)
3369	4281	{
3370	4282	copy.add(obj.get(i));
3371	4283	}
3372	4284
3373		- copy.RestoreBigData(hashtable);
	4285	+ copy.RestoreBigData(versiontable);
3374	4286
3375	4287	CameraPane.SWITCH = temp;
3376	4288
	4289	+ RefreshSelection();
3377	4290	//assert(hashtable.isEmpty());
3378	4291
3379	4292	copy.Touch();
..	..	@@ -3394,43 +4307,144 @@
3394	4307	}
3395	4308	}
3396	4309
3397		- refreshContents();
	4310	+ refreshContents(true);
3398	4311	}
3399	4312
3400		- public void Undo()
3401		- {
3402		- cRadio tab = GetCurrentTab();
	4313	+ cButton previousVersionButton;
	4314	+ cButton restoreButton;
	4315	+ cButton replaceButton;
	4316	+ cButton nextVersionButton;
	4317	+ cButton saveVersionButton;
	4318	+ cButton deleteVersionButton;
3403	4319
3404		- if (tab.undoindex == 0)
	4320	+ boolean muteSlider;
	4321	+
	4322	+ int VersionCount()
	4323	+ {
	4324	+ int count = 0;
	4325	+
	4326	+ for (int i = copy.versionlist.length; --i >= 0;)
	4327	+ {
	4328	+ if (copy.versionlist[i] != null)
	4329	+ count++;
	4330	+ }
	4331	+
	4332	+ return count;
	4333	+ }
	4334	+
	4335	+ void SetUndoStates()
	4336	+ {
	4337	+ //if (true)
	4338	+ // return;
	4339	+
	4340	+ //cRadio tab = GetCurrentTab();
	4341	+
	4342	+ restoreButton.setEnabled(copy.versionindex != -1);
	4343	+ replaceButton.setEnabled(copy.versionindex != -1);
	4344	+
	4345	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4346	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4347	+
	4348	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4349	+ copy.versionlist[copy.versionindex + 1] != null);
	4350	+
	4351	+ muteSlider = true;
	4352	+ versionSlider.setMinimum(0);
	4353	+ versionSlider.setMaximum(VersionCount() - 1);
	4354	+ versionSlider.setInteger(copy.versionindex);
	4355	+ versionSlider.setEnabled(copy.versionindex != -1);
	4356	+ muteSlider = false;
	4357	+ }
	4358	+
	4359	+ public boolean PreviousVersion()
	4360	+ {
	4361	+ // Option?
	4362	+ Replace();
	4363	+
	4364	+ System.err.println("Undo");
	4365	+
	4366	+ //cRadio tab = GetCurrentTab();
	4367	+
	4368	+ if (copy.versionindex == 0)
3405	4369	{
3406	4370	java.awt.Toolkit.getDefaultToolkit().beep();
3407		- return;
	4371	+ return false;
3408	4372	}
3409	4373
3410		- if (tab.graphs[tab.undoindex] == null)
3411		- {
3412		- Save();
3413		- tab.undoindex -= 1;
3414		- }
	4374	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4375	+// {
	4376	+// if (Save(false))
	4377	+// tab.versionindex -= 1;
	4378	+// else
	4379	+// {
	4380	+// if (tab.versionindex <= 0)
	4381	+// return false;
	4382	+// else
	4383	+// tab.versionindex -= 1;
	4384	+// }
	4385	+// }
3415	4386
3416		- tab.undoindex -= 1;
	4387	+ copy.versionindex -= 1;
3417	4388
3418		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4389	+ CopyChanged();
	4390	+
	4391	+ return true;
3419	4392	}
3420	4393
3421		- public void Redo()
	4394	+ public boolean Restore()
3422	4395	{
3423		- cRadio tab = GetCurrentTab();
	4396	+ System.err.println("Restore");
3424	4397
3425		- if (tab.graphs[tab.undoindex + 1] == null)
	4398	+ //cRadio tab = GetCurrentTab();
	4399	+
	4400	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4401	+ {
	4402	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4403	+ return false;
	4404	+ }
	4405	+
	4406	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4407	+ CopyChanged();
	4408	+
	4409	+ return true;
	4410	+ }
	4411	+
	4412	+ public boolean Replace()
	4413	+ {
	4414	+ System.err.println("Replace");
	4415	+
	4416	+ //cRadio tab = GetCurrentTab();
	4417	+
	4418	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4419	+ {
	4420	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4421	+ return false;
	4422	+ }
	4423	+
	4424	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4425	+
	4426	+ return true;
	4427	+ }
	4428	+
	4429	+ public void NextVersion()
	4430	+ {
	4431	+ // Option?
	4432	+ Replace();
	4433	+
	4434	+ //cRadio tab = GetCurrentTab();
	4435	+
	4436	+ if (copy.versionlist[copy.versionindex + 1] == null)
3426	4437	{
3427	4438	java.awt.Toolkit.getDefaultToolkit().beep();
3428	4439	return;
3429	4440	}
3430	4441
3431		- tab.undoindex += 1;
	4442	+ copy.versionindex += 1;
3432	4443
3433		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4444	+ CopyChanged();
	4445	+
	4446	+ //if (!tab.user[tab.versionindex])
	4447	+ // tab.graphs[tab.versionindex] = null;
3434	4448	}
3435	4449
3436	4450	void ImportGFD()
..	..	@@ -3582,7 +4596,7 @@
3582	4596	assert false;
3583	4597	}
3584	4598
3585		- void EditSelection()
	4599	+ void EditSelection(boolean newWindow)
3586	4600	{
3587	4601	}
3588	4602
..	..	@@ -3641,7 +4655,7 @@
3641	4655	//copy.material = new cMaterial(copy.GetMaterial());
3642	4656
3643	4657	current.color = (float) colorField.getFloat();
3644		- current.modulation = (float) modulationField.getFloat();
	4658	+ current.modulation = (float) saturationField.getFloat();
3645	4659	current.metalness = (float) metalnessField.getFloat();
3646	4660	current.diffuse = (float) diffuseField.getFloat();
3647	4661	current.specular = (float) specularField.getFloat();
..	..	@@ -3674,7 +4688,7 @@
3674	4688	cMaterial mat = copy.material;
3675	4689
3676	4690	colorField.SetToolTipValue((mat.color));
3677		- modulationField.SetToolTipValue((mat.modulation));
	4691	+ saturationField.SetToolTipValue((mat.modulation));
3678	4692	metalnessField.SetToolTipValue((mat.metalness));
3679	4693	diffuseField.SetToolTipValue((mat.diffuse));
3680	4694	specularField.SetToolTipValue((mat.specular));
..	..	@@ -3726,9 +4740,26 @@
3726	4740	//copy.Touch();
3727	4741	}
3728	4742
	4743	+ cNumberSlider versionSlider;
	4744	+
3729	4745	public void stateChanged(ChangeEvent e)
3730	4746	{
3731	4747	// assert(false);
	4748	+ if (e.getSource() == versionSlider)
	4749	+ {
	4750	+ if (muteSlider)
	4751	+ return;
	4752	+
	4753	+ int version = versionSlider.getInteger();
	4754	+
	4755	+ if (version != -1 && copy.versionlist[version] != null)
	4756	+ {
	4757	+ copy.versionindex = version;
	4758	+ CopyChanged();
	4759	+ }
	4760	+
	4761	+ return;
	4762	+ }
3732	4763
3733	4764	if (freezematerial)
3734	4765	{
..	..	@@ -3764,6 +4795,12 @@
3764	4795	{
3765	4796	//System.out.println("stateChanged = " + this);
3766	4797	materialtouched = true;
	4798	+
	4799	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4800	+ {
	4801	+ saturationField.setFloat(1);
	4802	+ }
	4803	+
3767	4804	applySelf();
3768	4805	//System.out.println("this = " + this);
3769	4806	//System.out.println("PARENT = " + parent);
..	..	@@ -4063,6 +5100,7 @@
4063	5100	{
4064	5101	if (GetTree() != null)
4065	5102	{
	5103	+ GetTree().revalidate();
4066	5104	GetTree().repaint();
4067	5105	}
4068	5106
..	..	@@ -4071,13 +5109,17 @@
4071	5109	ctrlPanel.validate(); // ? new
4072	5110	ctrlPanel.repaint();
4073	5111	}
	5112	+
	5113	+ if (previousVersionButton != null && copy.versionlist != null)
	5114	+ SetUndoStates();
4074	5115	}
4075	5116
4076	5117	static TweenManager tweenManager = new TweenManager();
4077	5118
4078	5119	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4079	5120	{
4080		- Save();
	5121	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5122	+ Save();
4081	5123	//Tween.set(thing, 0).target(1).start(tweenManager);
4082	5124	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
4083	5125	// if (thing instanceof GenericJointDemo)
..	..	@@ -4164,6 +5206,12 @@
4164	5206	{
4165	5207	ResetModel();
4166	5208	Select(thing.GetTreePath(), true, false); // unselect... false);
	5209	+
	5210	+ if (thing.Size() == 0)
	5211	+ {
	5212	+ //EditSelection(false);
	5213	+ }
	5214	+
4167	5215	refreshContents();
4168	5216	}
4169	5217
..	..	@@ -4312,7 +5360,9 @@
4312	5360	readobj.ResetDisplayList();
4313	5361	} catch (Exception e)
4314	5362	{
4315		- //e.printStackTrace();
	5363	+ if (!e.toString().contains("GZIP"))
	5364	+ e.printStackTrace();
	5365	+
4316	5366	try
4317	5367	{
4318	5368	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4386,11 +5436,14 @@
4386	5436
4387	5437	if (readobj != null)
4388	5438	{
4389		- Save();
	5439	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5440	+ // Save();
4390	5441	try
4391	5442	{
4392	5443	//readobj.deepCopySelf(copy);
4393	5444	copy.clear(); // june 2014
	5445	+ copy.skyboxname = readobj.skyboxname;
	5446	+ copy.skyboxext = readobj.skyboxext;
4394	5447	for (int i = 0; i < readobj.size(); i++)
4395	5448	{
4396	5449	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4431,6 +5484,7 @@
4431	5484	}
4432	5485	} catch (ClassCastException e)
4433	5486	{
	5487	+ e.printStackTrace();
4434	5488	assert (false);
4435	5489	Composite c = (Composite) copy;
4436	5490	c.children.clear();
..	..	@@ -4441,17 +5495,31 @@
4441	5495	c.addChild(csg);
4442	5496	}
4443	5497
	5498	+ copy.versionlist = readobj.versionlist;
	5499	+ copy.versionindex = readobj.versionindex;
	5500	+
	5501	+ if (copy.versionlist == null)
	5502	+ {
	5503	+ // Backward compatibility
	5504	+ copy.versionlist = new Object3D[100];
	5505	+ copy.versionindex = -1;
	5506	+
	5507	+ Save(true);
	5508	+ }
	5509	+
	5510	+ //? SetUndoStates();
	5511	+
4444	5512	ResetModel();
4445	5513	copy.HardTouch(); // recompile?
4446	5514	refreshContents();
4447	5515	}
4448	5516	}
4449	5517
4450		- void load() // throws ClassNotFoundException
	5518	+ void Open() // throws ClassNotFoundException
4451	5519	{
4452	5520	if (Grafreed.standAlone)
4453	5521	{
4454		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5522	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4455	5523	browser.show();
4456	5524	String filename = browser.getFile();
4457	5525	if (filename != null && filename.length() > 0)
..	..	@@ -4550,6 +5618,7 @@
4550	5618	//ps.print(buffer.toString());
4551	5619	} catch (IOException e)
4552	5620	{
	5621	+ e.printStackTrace();
4553	5622	}
4554	5623	}
4555	5624
..	..	@@ -4564,6 +5633,8 @@
4564	5633	String filename = browser.getFile();
4565	5634	if (filename != null && filename.length() > 0)
4566	5635	{
	5636	+ if (!filename.endsWith(".gfd"))
	5637	+ filename += ".gfd";
4567	5638	lastname = browser.getDirectory() + filename;
4568	5639	save();
4569	5640	}
..	..	@@ -4730,7 +5801,7 @@
4730	5801	MenuBar menuBar;
4731	5802	Menu fileMenu;
4732	5803	MenuItem newItem;
4733		- MenuItem loadItem;
	5804	+ MenuItem openItem;
4734	5805	MenuItem saveItem;
4735	5806	MenuItem saveAsItem;
4736	5807	MenuItem exportAsItem;
..	..	@@ -4753,22 +5824,37 @@
4753	5824	CheckboxMenuItem toggleSwitchItem;
4754	5825	CheckboxMenuItem toggleRootItem;
4755	5826	CheckboxMenuItem animationItem;
	5827	+ MenuItem archiveItem;
4756	5828	CheckboxMenuItem toggleHandleItem;
4757	5829	CheckboxMenuItem togglePaintItem;
4758	5830	JSplitPane mainPanel;
4759	5831	JScrollPane scrollpane;
	5832	+
4760	5833	JPanel toolbarPanel;
	5834	+
4761	5835	cGridBag treePanel;
	5836	+
4762	5837	JPanel radioPanel;
4763	5838	ButtonGroup buttonGroup;
4764		- cGridBag ctrlPanel;
	5839	+
	5840	+ cGridBag toolboxPanel;
	5841	+ cGridBag skyboxPanel;
4765	5842	cGridBag materialPanel;
	5843	+ cGridBag ctrlPanel;
	5844	+
4766	5845	JScrollPane infoPanel;
	5846	+
4767	5847	cGridBag optionsPanel;
	5848	+
4768	5849	JTabbedPane objectPanel;
	5850	+ boolean materialFlushed;
	5851	+ Object3D latestObject;
	5852	+
4769	5853	cGridBag XYZPanel;
	5854	+
4770	5855	JSplitPane gridPanel;
4771	5856	JSplitPane bigPanel;
	5857	+
4772	5858	cGridBag bigThree;
4773	5859	cGridBag scenePanel;
4774	5860	cGridBag centralPanel;
..	..	@@ -4826,7 +5912,7 @@
4826	5912	JLabel colorLabel;
4827	5913	cNumberSlider colorField;
4828	5914	JLabel modulationLabel;
4829		- cNumberSlider modulationField;
	5915	+ cNumberSlider saturationField;
4830	5916	JLabel metalnessLabel;
4831	5917	cNumberSlider metalnessField;
4832	5918	JLabel diffuseLabel;
..	..	@@ -4857,6 +5943,7 @@
4857	5943	cNumberSlider anisoField;
4858	5944	JLabel anisoVLabel;
4859	5945	cNumberSlider anisoVField;
	5946	+
4860	5947	JLabel cameraLabel;
4861	5948	cNumberSlider cameraField;
4862	5949	JLabel selfshadowLabel;
..	..	@@ -4871,6 +5958,7 @@
4871	5958	cNumberSlider fakedepthField;
4872	5959	JLabel shadowbiasLabel;
4873	5960	cNumberSlider shadowbiasField;
	5961	+
4874	5962	JLabel bumpLabel;
4875	5963	cNumberSlider bumpField;
4876	5964	JLabel noiseLabel;
..	..	@@ -4883,7 +5971,7 @@
4883	5971	cNumberSlider fogField;
4884	5972	JLabel opacityPowerLabel;
4885	5973	cNumberSlider opacityPowerField;
4886		- JTree jTree;
	5974	+ cTree jTree;
4887	5975	//ObjectUI parent;
4888	5976
4889	5977	cNumberSlider normalpushField;