~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,6 +34,7 @@
30	34	iSendInfo
31	35	//KeyListener
32	36	{
	37	+ public cToggleButton pinButton;
33	38	boolean timeline;
34	39	boolean wasFullScreen;
35	40
..	..	@@ -37,6 +42,79 @@
37	42	JFrame frame;
38	43
39	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	+ }
40	118
41	119	// SCRIPT
42	120
..	..	@@ -147,7 +225,7 @@
147	225
148	226	objEditor.ctrlPanel.remove(namePanel);
149	227
150		- if (!GroupEditor.allparams)
	228	+ if (!allparams)
151	229	return;
152	230
153	231	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -171,7 +249,7 @@
171	249
172	250	objEditor.ctrlPanel.remove(setupPanel);
173	251	objEditor.ctrlPanel.remove(setupPanel2);
174		- objEditor.ctrlPanel.remove(commandsPanel);
	252	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
175	253	objEditor.ctrlPanel.remove(pushPanel);
176	254	//objEditor.ctrlPanel.remove(fillPanel);
177	255
..	..	@@ -219,6 +297,12 @@
219	297	client = inClient;
220	298	copy = client;
221	299
	300	+ if (copy.versionlist == null)
	301	+ {
	302	+ copy.versionlist = new Object3D[100];
	303	+ copy.versionindex = -1;
	304	+ }
	305	+
222	306	// "this" is not called: SetupUI2(objEditor);
223	307	}
224	308
..	..	@@ -232,6 +316,12 @@
232	316	client = inClient;
233	317	copy = client;
234	318
	319	+ if (copy.versionlist == null)
	320	+ {
	321	+ copy.versionlist = new Object3D[100];
	322	+ copy.versionindex = -1;
	323	+ }
	324	+
235	325	SetupUI2(callee.GetEditor());
236	326	}
237	327
..	..	@@ -246,7 +336,7 @@
246	336	//localCopy.parent = null;
247	337
248	338	frame = new JFrame();
249		- frame.setUndecorated(true);
	339	+ frame.setUndecorated(false);
250	340	objEditor = this;
251	341	this.callee = callee;
252	342
..	..	@@ -264,6 +354,12 @@
264	354	copy = localCopy;
265	355	copy.editWindow = this;
266	356
	357	+ if (copy.versionlist == null)
	358	+ {
	359	+// copy.versions = new byte[100][];
	360	+// copy.versionindex = -1;
	361	+ }
	362	+
267	363	SetupMenu();
268	364
269	365	//SetupName(objEditor); // new
..	..	@@ -277,12 +373,17 @@
277	373	return frame.action(event, obj);
278	374	}
279	375
	376	+ // Cannot work without static
	377	+ static boolean allparams = true;
	378	+
	379	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	380	+
280	381	void SetupMenu()
281	382	{
282	383	frame.setMenuBar(menuBar = new MenuBar());
283	384	menuBar.add(fileMenu = new Menu("File"));
284	385	fileMenu.add(newItem = new MenuItem("New"));
285		- fileMenu.add(loadItem = new MenuItem("Open..."));
	386	+ fileMenu.add(openItem = new MenuItem("Open..."));
286	387
287	388	//oe.menuBar.add(menu = new Menu("Include"));
288	389	Menu menu = new Menu("Import");
..	..	@@ -314,7 +415,7 @@
314	415	}
315	416
316	417	newItem.addActionListener(this);
317		- loadItem.addActionListener(this);
	418	+ openItem.addActionListener(this);
318	419	saveItem.addActionListener(this);
319	420	saveAsItem.addActionListener(this);
320	421	exportAsItem.addActionListener(this);
..	..	@@ -323,28 +424,70 @@
323	424	closeItem.addActionListener(this);
324	425
325	426	objectPanel = new JTabbedPane();
	427	+
	428	+ ChangeListener changeListener = new ChangeListener()
	429	+ {
	430	+ public void stateChanged(ChangeEvent changeEvent)
	431	+ {
	432	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	433	+// {
	434	+// if (latestObject != null)
	435	+// {
	436	+// refreshContents(true);
	437	+// SetMaterial(latestObject);
	438	+// }
	439	+//
	440	+// materialFlushed = true;
	441	+// }
	442	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	443	+// {
	444	+// if (listUI.size() == 0)
	445	+// EditSelection(false);
	446	+// }
	447	+
	448	+ refreshContents(false); // To refresh Info tab
	449	+ }
	450	+ };
	451	+ objectPanel.addChangeListener(changeListener);
	452	+
326	453	toolbarPanel = new JPanel();
327	454	toolbarPanel.setName("Toolbar");
	455	+
328	456	treePanel = new cGridBag();
329	457	treePanel.setName("Tree");
	458	+
	459	+ editPanel = new cGridBag().setVertical(true);
	460	+ //editPanel.setName("Edit");
	461	+
330	462	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
331		- ctrlPanel.setName("Edit");
332		- materialPanel = new cGridBag().setVertical(true);
333		- materialPanel.setName("Material");
	463	+
	464	+ editCommandsPanel = new cGridBag();
	465	+ editPanel.add(editCommandsPanel);
	466	+ editPanel.add(ctrlPanel);
	467	+
	468	+ toolboxPanel = new cGridBag().setVertical(true);
	469	+ //toolboxPanel.setName("Toolbox");
	470	+
	471	+ skyboxPanel = new cGridBag().setVertical(true);
	472	+
	473	+ materialPanel = new cGridBag().setVertical(false);
	474	+ //materialPanel.setName("Material");
	475	+
334	476	/JTextPane/
335	477	infoarea = createTextPane();
336	478	doc = infoarea.getStyledDocument();
337	479
338	480	infoarea.setEditable(true);
339	481	SetText();
	482	+
340	483	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
341	484	// infoarea.setOpaque(false);
342	485	// //infoarea.setForeground(textcolor);
343	486	// TEXTAREA infoarea.setLineWrap(true);
344	487	// TEXTAREA infoarea.setWrapStyleWord(true);
345	488	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");
	489	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	490	+ //infoPanel.setName("Info");
348	491	//infoPanel.setLayout(new BorderLayout());
349	492	//infoPanel.add(createTextPane());
350	493
..	..	@@ -355,7 +498,14 @@
355	498	mainPanel.setDividerSize(9);
356	499	mainPanel.setDividerLocation(0.5); //1.0);
357	500	mainPanel.setResizeWeight(0.5);
358		-
	501	+
	502	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	503	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	504	+ divider.setDividerSize(15);
	505	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	506	+
	507	+ mainPanel.setUI(new BasicSplitPaneUI());
	508	+
359	509	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
360	510	//mainPanel.setLayout(new GridBagLayout());
361	511	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -586,8 +736,8 @@
586	736	}
587	737	}
588	738
589		-static GraphicsDevice device = GraphicsEnvironment
590		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	739	+//static GraphicsDevice device = GraphicsEnvironment
	740	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
591	741
592	742	Rectangle keeprect;
593	743	cRadio radio;
..	..	@@ -603,13 +753,25 @@
603	753
604	754	boolean maximized;
605	755
	756	+ cButton fullscreenLayout;
	757	+ cButton expandedLayout;
	758	+
606	759	void Minimize()
607	760	{
608	761	frame.setState(Frame.ICONIFIED);
	762	+ frame.validate();
609	763	}
610	764
	765	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	766	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	767	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
611	768	void Maximize()
612	769	{
	770	+ if (CameraPane.FULLSCREEN)
	771	+ {
	772	+ ToggleFullScreen();
	773	+ }
	774	+
613	775	if (maximized)
614	776	{
615	777	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -617,20 +779,38 @@
617	779	else
618	780	{
619	781	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);
	782	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	783	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	784	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
623	785	// frame.setState(Frame.MAXIMIZED_BOTH);
	786	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
624	787	}
625	788
626	789	maximized ^= true;
	790	+
	791	+ frame.validate();
627	792	}
	793	+
	794	+ cButton minButton;
	795	+ cButton maxButton;
	796	+ cButton fullButton;
	797	+ cButton collapseButton;
	798	+ cButton maximize3DButton;
628	799
629	800	void ToggleFullScreen()
630	801	{
631		- if (CameraPane.FULLSCREEN)
	802	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	803	+
	804	+ cameraView.ToggleFullScreen();
	805	+
	806	+ if (!CameraPane.FULLSCREEN)
632	807	{
633	808	device.setFullScreenWindow(null);
	809	+ frame.dispose();
	810	+ frame.setUndecorated(false);
	811	+ frame.validate();
	812	+ frame.setVisible(true);
	813	+
634	814	//frame.setVisible(false);
635	815	// frame.removeNotify();
636	816	// frame.setUndecorated(false);
..	..	@@ -640,13 +820,13 @@
640	820	// X frame.getContentPane().remove(/"Center",/bigThree);
641	821	// X framePanel.add(bigThree);
642	822	// X frame.getContentPane().add(/"Center",/framePanel);
643		- framePanel.setDividerLocation(1);
	823	+// framePanel.setDividerLocation(46); // icons are 24x24
644	824
645	825	//frame.setVisible(true);
646		- radio.layout = keepButton;
	826	+// radio.layout = keepButton;
647	827	//theFrame = null;
648	828	keepButton = null;
649		- radio.layout.doClick();
	829	+// radio.layout.doClick();
650	830
651	831	} else
652	832	{
..	..	@@ -655,22 +835,59 @@
655	835	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
656	836	// frame.getToolkit().getScreenSize().height);
657	837	//frame.setVisible(false);
	838	+
	839	+ frame.dispose();
	840	+ frame.setUndecorated(true);
658	841	device.setFullScreenWindow(frame);
	842	+ frame.validate();
	843	+ frame.setVisible(true);
659	844	// frame.removeNotify();
660	845	// frame.setUndecorated(true);
661	846	// frame.addNotify();
662	847	// X frame.getContentPane().remove(/"Center",/framePanel);
663	848	// X framePanel.remove(bigThree);
664	849	// X frame.getContentPane().add(/"Center",/bigThree);
665		- framePanel.setDividerLocation(0);
	850	+// framePanel.setDividerLocation(0);
666	851
667		- radio.layout = twoButton;
668		- radio.layout.doClick();
	852	+// radio.layout = fullscreenLayout;
	853	+// radio.layout.doClick();
669	854	//frame.setVisible(true);
670	855	}
671		-
672		- cameraView.ToggleFullScreen();
	856	+ frame.validate();
	857	+
	858	+ cameraView.requestFocusInWindow();
673	859	}
	860	+
	861	+ void CollapseToolbar()
	862	+ {
	863	+ framePanel.setDividerLocation(0);
	864	+ //frame.validate();
	865	+
	866	+ cameraView.requestFocusInWindow();
	867	+ }
	868	+
	869	+ private Object3D Duplicate(Object3D object)
	870	+ {
	871	+ boolean temp = CameraPane.SWITCH;
	872	+ CameraPane.SWITCH = false;
	873	+
	874	+ object.ExtractBigData(versiontable);
	875	+ // if (copy == client)
	876	+
	877	+ Object3D versions[] = object.versionlist;
	878	+ object.versionlist = null;
	879	+
	880	+ //byte[] compress = Compress(copy);
	881	+ Object3D compress = (Object3D)Grafreed.clone(object);
	882	+
	883	+ object.versionlist = versions;
	884	+
	885	+ object.RestoreBigData(versiontable);
	886	+
	887	+ CameraPane.SWITCH = temp;
	888	+
	889	+ return compress;
	890	+ }
674	891
675	892	private JTextPane createTextPane()
676	893	{
..	..	@@ -793,6 +1010,7 @@
793	1010	{
794	1011	SetupMaterial(materialPanel);
795	1012	}
	1013	+
796	1014	//SetupName();
797	1015	//SetupViews();
798	1016	}
..	..	@@ -802,7 +1020,7 @@
802	1020	// NumberSlider vDivsField;
803	1021	// JCheckBox endcaps;
804	1022	JCheckBox liveCB;
805		- JCheckBox selectCB;
	1023	+ JCheckBox selectableCB;
806	1024	JCheckBox hideCB;
807	1025	JCheckBox link2masterCB;
808	1026	JCheckBox markCB;
..	..	@@ -810,7 +1028,12 @@
810	1028	JCheckBox speedupCB;
811	1029	JCheckBox rewindCB;
812	1030	JCheckBox flipVCB;
	1031	+
	1032	+ cCheckBox toggleTextureCB;
	1033	+ cCheckBox toggleSwitchCB;
	1034	+
813	1035	JComboBox texresMenu;
	1036	+
814	1037	JButton resetButton;
815	1038	JButton stepButton;
816	1039	JButton stepAllButton;
..	..	@@ -819,10 +1042,13 @@
819	1042	JButton fasterButton;
820	1043	JButton remarkButton;
821	1044
	1045	+ cGridBag editPanel;
	1046	+ cGridBag editCommandsPanel;
	1047	+
822	1048	cGridBag namePanel;
823	1049	cGridBag setupPanel;
824	1050	cGridBag setupPanel2;
825		- cGridBag commandsPanel;
	1051	+ cGridBag objectCommandsPanel;
826	1052	cGridBag pushPanel;
827	1053	cGridBag fillPanel;
828	1054
..	..	@@ -993,39 +1219,55 @@
993	1219
994	1220	namePanel = new cGridBag();
995	1221
	1222	+ //if (copy.pinned)
	1223	+ {
	1224	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1225	+ pinButton.setSelected(copy.pinned);
	1226	+ cGridBag t = new cGridBag();
	1227	+ t.preferredWidth = 2;
	1228	+ t.add(pinButton);
	1229	+ namePanel.add(t);
	1230	+
	1231	+ pinButton.addItemListener(this);
	1232	+ }
	1233	+
996	1234	nameField = AddText(namePanel, copy.GetName());
997		- namePanel.add(nameField);
	1235	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
998	1236	oe.ctrlPanel.add(namePanel);
999	1237
1000	1238	oe.ctrlPanel.Return();
1001	1239
1002		- if (!GroupEditor.allparams)
	1240	+ if (!allparams)
1003	1241	return;
1004	1242
1005	1243	setupPanel = new cGridBag().setVertical(false);
1006	1244
1007	1245	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1008	1246	liveCB.setToolTipText("Animate object");
1009		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1010		- selectCB.setToolTipText("Make object selectable");
	1247	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1248	+ selectableCB.setToolTipText("Make object selectable");
1011	1249	// Return();
	1250	+
1012	1251	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1013	1252	hideCB.setToolTipText("Hide object");
1014	1253	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1015		- markCB.setToolTipText("Set the animation target transform");
	1254	+ markCB.setToolTipText("As animation target transform");
	1255	+
	1256	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1016	1257
1017	1258	setupPanel2 = new cGridBag().setVertical(false);
1018	1259
1019	1260	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1020	1261	rewindCB.setToolTipText("Rewind animation");
1021	1262
1022		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1023		- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1263	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1264	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1024	1265
	1266	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1267	+ link2masterCB.setToolTipText("Attach to support");
	1268	+
1025	1269	if (Globals.ADVANCED)
1026	1270	{
1027		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1028		- link2masterCB.setToolTipText("Attach to support");
1029	1271	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1030	1272	speedupCB.setToolTipText("Option motion capture");
1031	1273	}
..	..	@@ -1035,23 +1277,23 @@
1035	1277	oe.ctrlPanel.add(setupPanel2);
1036	1278	oe.ctrlPanel.Return();
1037	1279
1038		- commandsPanel = new cGridBag().setVertical(false);
	1280	+ objectCommandsPanel = new cGridBag().setVertical(false);
1039	1281
1040		- resetButton = AddButton(commandsPanel, "Reset");
	1282	+ resetButton = AddButton(objectCommandsPanel, "Reset");
1041	1283	resetButton.setToolTipText("Jump to frame zero");
1042		- stepButton = AddButton(commandsPanel, "Step");
	1284	+ stepButton = AddButton(objectCommandsPanel, "Step");
1043	1285	stepButton.setToolTipText("Step one frame");
1044	1286	// resetAllButton = AddButton(oe, "Reset All");
1045	1287	// stepAllButton = AddButton(oe, "Step All");
1046	1288	// Return();
1047		- slowerButton = AddButton(commandsPanel, "Slow");
	1289	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1048	1290	slowerButton.setToolTipText("Decrease animation speed");
1049		- fasterButton = AddButton(commandsPanel, "Fast");
	1291	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1050	1292	fasterButton.setToolTipText("Increase animation speed");
1051		- remarkButton = AddButton(commandsPanel, "Remark");
	1293	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1052	1294	remarkButton.setToolTipText("Set the current transform as the target");
1053	1295
1054		- oe.ctrlPanel.add(commandsPanel);
	1296	+ oe.ctrlPanel.add(objectCommandsPanel);
1055	1297	oe.ctrlPanel.Return();
1056	1298
1057	1299	pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
..	..	@@ -1299,6 +1541,7 @@
1299	1541	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1300	1542	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1301	1543	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1544	+ //XYZPanel.setName("XYZ");
1302	1545
1303	1546	/*
1304	1547	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1336,13 +1579,29 @@
1336	1579	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1337	1580	//tmp.setName("Edit");
1338	1581	objectPanel.add(materialPanel);
	1582	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1583	+ objectPanel.setToolTipTextAt(0, "Material");
	1584	+
	1585	+ objectPanel.add(toolboxPanel);
	1586	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1587	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1588	+
	1589	+ objectPanel.add(skyboxPanel);
	1590	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1591	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1592	+
1339	1593	// JPanel north = new JPanel(new BorderLayout());
1340	1594	// north.setName("Edit");
1341	1595	// north.add(ctrlPanel, BorderLayout.NORTH);
1342	1596	// objectPanel.add(north);
1343		- objectPanel.add(ctrlPanel);
1344		- objectPanel.add(infoPanel);
1345		-
	1597	+ objectPanel.add(editPanel);
	1598	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1599	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1600	+
	1601	+ objectPanel.add(XYZPanel);
	1602	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1603	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1604	+
1346	1605	/*
1347	1606	aConstraints.gridx = 0;
1348	1607	aConstraints.gridwidth = 1;
..	..	@@ -1350,7 +1609,7 @@
1350	1609	aConstraints.gridy += 1;
1351	1610	aConstraints.gridwidth = 1;
1352	1611	mainPanel.add(objectPanel, aConstraints);
1353		- */
	1612	+ */
1354	1613
1355	1614	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1356	1615	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1362,14 +1621,12 @@
1362	1621	scrollpane.addMouseWheelListener(this); // Default not fast enough
1363	1622
1364	1623	/JTabbedPane/ scenePanel = new cGridBag();
1365		- scenePanel.preferredWidth = 6;
	1624	+ scenePanel.preferredWidth = 5;
1366	1625
1367	1626	JTabbedPane tabbedPane = new JTabbedPane();
1368	1627	tabbedPane.add(scrollpane);
1369	1628
1370		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1371		-
1372		- optionsPanel = new cGridBag().setVertical(true);
	1629	+ optionsPanel = new cGridBag().setVertical(false);
1373	1630
1374	1631	optionsPanel.setName("Options");
1375	1632
..	..	@@ -1377,8 +1634,15 @@
1377	1634
1378	1635	tabbedPane.add(optionsPanel);
1379	1636
	1637	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1638	+
1380	1639	scenePanel.add(tabbedPane);
1381	1640
	1641	+ //if (Globals.ADVANCED)
	1642	+ tabbedPane.add(infoPanel);
	1643	+ tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1644	+ tabbedPane.setToolTipTextAt(3, "Information");
	1645	+
1382	1646	/*
1383	1647	cTree jTree = new cTree(null);
1384	1648	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1440,7 +1704,7 @@
1440	1704	bigThree = new cGridBag();
1441	1705	bigThree.addComponent(scenePanel);
1442	1706	bigThree.addComponent(centralPanel);
1443		- bigThree.addComponent(XYZPanel);
	1707	+ //bigThree.addComponent(XYZPanel);
1444	1708
1445	1709	// // SIDE EFFECT!!!
1446	1710	// aConstraints.gridx = 0;
..	..	@@ -1449,9 +1713,26 @@
1449	1713	// aConstraints.gridheight = 1;
1450	1714
1451	1715	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1452		- framePanel.setContinuousLayout(true);
1453		- framePanel.setOneTouchExpandable(true);
1454		- framePanel.setDividerLocation(0.8);
	1716	+
	1717	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1718	+ new java.beans.PropertyChangeListener()
	1719	+ {
	1720	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1721	+ {
	1722	+ if ((Integer)pce.getOldValue() == 1)
	1723	+ {
	1724	+ if (radio.layout != expandedLayout)
	1725	+ {
	1726	+ radio.layout = expandedLayout;
	1727	+ radio.layout.doClick();
	1728	+ }
	1729	+ }
	1730	+ }
	1731	+ });
	1732	+
	1733	+ framePanel.setContinuousLayout(false);
	1734	+ framePanel.setOneTouchExpandable(false);
	1735	+ //.setDividerLocation(0.8);
1455	1736	//framePanel.setDividerSize(15);
1456	1737	//framePanel.setResizeWeight(0.15);
1457	1738	framePanel.setName("Frame");
..	..	@@ -1469,16 +1750,18 @@
1469	1750	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1470	1751
1471	1752	frame.setSize(1280, 860);
1472		- frame.setVisible(true);
1473		-
	1753	+
1474	1754	cameraView.requestFocusInWindow();
1475	1755
1476	1756	gridPanel.setDividerLocation(1.0);
	1757	+
	1758	+ frame.validate();
	1759	+
	1760	+ frame.setVisible(true);
1477	1761
1478	1762	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1479	1763	frame.addWindowListener(new WindowAdapter()
1480	1764	{
1481		-
1482	1765	public void windowClosing(WindowEvent e)
1483	1766	{
1484	1767	Close();
..	..	@@ -1501,12 +1784,403 @@
1501	1784	ctrlPanel.removeAll();
1502	1785	}
1503	1786
1504		- void SetupMaterial(cGridBag panel)
	1787	+ void SetupMaterial(cGridBag materialpanel)
1505	1788	{
1506		- /*
	1789	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1790	+
	1791	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1792	+ skin.setToolTipText("Skin");
	1793	+ skin.addMouseListener(new MouseAdapter()
	1794	+ {
	1795	+ public void mouseClicked(MouseEvent e)
	1796	+ {
	1797	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1798	+ cMaterial material = object.material;
	1799	+
	1800	+ // Skin
	1801	+ colorField.setFloat(material.color);
	1802	+ saturationField.setFloat(material.modulation);
	1803	+ subsurfaceField.setFloat(material.subsurface);
	1804	+ selfshadowField.setFloat(material.diffuseness);
	1805	+ diffusenessField.setFloat(material.factor);
	1806	+ shininessField.setFloat(material.shininess);
	1807	+ shadowbiasField.setFloat(material.shadowbias);
	1808	+ diffuseField.setFloat(material.diffuse);
	1809	+ specularField.setFloat(material.specular);
	1810	+
	1811	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1812	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1813	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1814	+
	1815	+ materialtouched = true;
	1816	+ applySelf();
	1817	+ }
	1818	+ });
	1819	+ presetpanel.add(skin);
	1820	+
	1821	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1822	+ lambert.setToolTipText("Diffuse");
	1823	+ lambert.addMouseListener(new MouseAdapter()
	1824	+ {
	1825	+ public void mouseClicked(MouseEvent e)
	1826	+ {
	1827	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1828	+ cMaterial material = object.material;
	1829	+
	1830	+ diffusenessField.setFloat(material.factor);
	1831	+ selfshadowField.setFloat(material.diffuseness);
	1832	+
	1833	+ materialtouched = true;
	1834	+ applySelf();
	1835	+ }
	1836	+ });
	1837	+ presetpanel.add(lambert);
	1838	+
	1839	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1840	+ diffuse2.setToolTipText("Diffuse2");
	1841	+ diffuse2.addMouseListener(new MouseAdapter()
	1842	+ {
	1843	+ public void mouseClicked(MouseEvent e)
	1844	+ {
	1845	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1846	+ cMaterial material = object.material;
	1847	+
	1848	+ diffusenessField.setFloat(material.factor);
	1849	+ selfshadowField.setFloat(material.diffuseness);
	1850	+
	1851	+ materialtouched = true;
	1852	+ applySelf();
	1853	+ }
	1854	+ });
	1855	+ presetpanel.add(diffuse2);
	1856	+
	1857	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1858	+ diffusemoon.setToolTipText("Moon");
	1859	+ diffusemoon.addMouseListener(new MouseAdapter()
	1860	+ {
	1861	+ public void mouseClicked(MouseEvent e)
	1862	+ {
	1863	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1864	+ cMaterial material = object.material;
	1865	+
	1866	+ diffusenessField.setFloat(material.factor);
	1867	+ selfshadowField.setFloat(material.diffuseness);
	1868	+
	1869	+ materialtouched = true;
	1870	+ applySelf();
	1871	+ }
	1872	+ });
	1873	+ presetpanel.add(diffusemoon);
	1874	+
	1875	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1876	+ diffusemoon2.setToolTipText("Moon2");
	1877	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1878	+ {
	1879	+ public void mouseClicked(MouseEvent e)
	1880	+ {
	1881	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1882	+ cMaterial material = object.material;
	1883	+
	1884	+ diffusenessField.setFloat(material.factor);
	1885	+ selfshadowField.setFloat(material.diffuseness);
	1886	+
	1887	+ materialtouched = true;
	1888	+ applySelf();
	1889	+ }
	1890	+ });
	1891	+ presetpanel.add(diffusemoon2);
	1892	+
	1893	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1894	+ diffusemoon3.setToolTipText("Moon3");
	1895	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1896	+ {
	1897	+ public void mouseClicked(MouseEvent e)
	1898	+ {
	1899	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1900	+ cMaterial material = object.material;
	1901	+
	1902	+ diffusenessField.setFloat(material.factor);
	1903	+ selfshadowField.setFloat(material.diffuseness);
	1904	+
	1905	+ materialtouched = true;
	1906	+ applySelf();
	1907	+ }
	1908	+ });
	1909	+ presetpanel.add(diffusemoon3);
	1910	+
	1911	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1912	+ diffusesheen.setToolTipText("Sheen");
	1913	+ diffusesheen.addMouseListener(new MouseAdapter()
	1914	+ {
	1915	+ public void mouseClicked(MouseEvent e)
	1916	+ {
	1917	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1918	+ cMaterial material = object.material;
	1919	+
	1920	+ sheenField.setFloat(material.sheen);
	1921	+
	1922	+ materialtouched = true;
	1923	+ applySelf();
	1924	+ }
	1925	+ });
	1926	+ presetpanel.add(diffusesheen);
	1927	+
	1928	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	1929	+ rough.setToolTipText("Rough metal");
	1930	+ rough.addMouseListener(new MouseAdapter()
	1931	+ {
	1932	+ public void mouseClicked(MouseEvent e)
	1933	+ {
	1934	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	1935	+ cMaterial material = object.material;
	1936	+
	1937	+ shininessField.setFloat(material.shininess);
	1938	+ velvetField.setFloat(material.velvet);
	1939	+
	1940	+ materialtouched = true;
	1941	+ applySelf();
	1942	+ }
	1943	+ });
	1944	+ presetpanel.add(rough);
	1945	+
	1946	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	1947	+ rough2.setToolTipText("Medium metal");
	1948	+ rough2.addMouseListener(new MouseAdapter()
	1949	+ {
	1950	+ public void mouseClicked(MouseEvent e)
	1951	+ {
	1952	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	1953	+ cMaterial material = object.material;
	1954	+
	1955	+ shininessField.setFloat(material.shininess);
	1956	+ lightareaField.setFloat(material.lightarea);
	1957	+
	1958	+ materialtouched = true;
	1959	+ applySelf();
	1960	+ }
	1961	+ });
	1962	+ presetpanel.add(rough2);
	1963	+
	1964	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	1965	+ shini0.setToolTipText("Shiny");
	1966	+ shini0.addMouseListener(new MouseAdapter()
	1967	+ {
	1968	+ public void mouseClicked(MouseEvent e)
	1969	+ {
	1970	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	1971	+ cMaterial material = object.material;
	1972	+
	1973	+ shininessField.setFloat(material.shininess);
	1974	+ lightareaField.setFloat(material.lightarea);
	1975	+
	1976	+ materialtouched = true;
	1977	+ applySelf();
	1978	+ }
	1979	+ });
	1980	+ presetpanel.add(shini0);
	1981	+
	1982	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	1983	+ shini1.setToolTipText("Shiny2");
	1984	+ shini1.addMouseListener(new MouseAdapter()
	1985	+ {
	1986	+ public void mouseClicked(MouseEvent e)
	1987	+ {
	1988	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	1989	+ cMaterial material = object.material;
	1990	+
	1991	+ shininessField.setFloat(material.shininess);
	1992	+ lightareaField.setFloat(material.lightarea);
	1993	+
	1994	+ materialtouched = true;
	1995	+ applySelf();
	1996	+ }
	1997	+ });
	1998	+ presetpanel.add(shini1);
	1999	+
	2000	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2001	+ shini2.setToolTipText("Shiny3");
	2002	+ shini2.addMouseListener(new MouseAdapter()
	2003	+ {
	2004	+ public void mouseClicked(MouseEvent e)
	2005	+ {
	2006	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2007	+ cMaterial material = object.material;
	2008	+
	2009	+ shininessField.setFloat(material.shininess);
	2010	+ lightareaField.setFloat(material.lightarea);
	2011	+
	2012	+ materialtouched = true;
	2013	+ applySelf();
	2014	+ }
	2015	+ });
	2016	+ presetpanel.add(shini2);
	2017	+
	2018	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2019	+ aniso.setToolTipText("AnisoU");
	2020	+ aniso.addMouseListener(new MouseAdapter()
	2021	+ {
	2022	+ public void mouseClicked(MouseEvent e)
	2023	+ {
	2024	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2025	+ cMaterial material = object.material;
	2026	+
	2027	+ anisoField.setFloat(material.aniso);
	2028	+ anisoVField.setFloat(material.anisoV);
	2029	+
	2030	+ materialtouched = true;
	2031	+ applySelf();
	2032	+ }
	2033	+ });
	2034	+ presetpanel.add(aniso);
	2035	+
	2036	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2037	+ aniso2.setToolTipText("AnisoV");
	2038	+ aniso2.addMouseListener(new MouseAdapter()
	2039	+ {
	2040	+ public void mouseClicked(MouseEvent e)
	2041	+ {
	2042	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2043	+ cMaterial material = object.material;
	2044	+
	2045	+ anisoField.setFloat(material.aniso);
	2046	+ anisoVField.setFloat(material.anisoV);
	2047	+
	2048	+ materialtouched = true;
	2049	+ applySelf();
	2050	+ }
	2051	+ });
	2052	+ presetpanel.add(aniso2);
	2053	+
	2054	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2055	+ aniso3.setToolTipText("AnisoUV");
	2056	+ aniso3.addMouseListener(new MouseAdapter()
	2057	+ {
	2058	+ public void mouseClicked(MouseEvent e)
	2059	+ {
	2060	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2061	+ cMaterial material = object.material;
	2062	+
	2063	+ anisoField.setFloat(material.aniso);
	2064	+ anisoVField.setFloat(material.anisoV);
	2065	+
	2066	+ materialtouched = true;
	2067	+ applySelf();
	2068	+ }
	2069	+ });
	2070	+ presetpanel.add(aniso3);
	2071	+
	2072	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2073	+ velvet0.setToolTipText("Velvet");
	2074	+ velvet0.addMouseListener(new MouseAdapter()
	2075	+ {
	2076	+ public void mouseClicked(MouseEvent e)
	2077	+ {
	2078	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2079	+ cMaterial material = object.material;
	2080	+
	2081	+ diffusenessField.setFloat(material.factor);
	2082	+ selfshadowField.setFloat(material.diffuseness);
	2083	+ sheenField.setFloat(material.sheen);
	2084	+ shininessField.setFloat(material.shininess);
	2085	+ velvetField.setFloat(material.velvet);
	2086	+ shiftField.setFloat(material.shift);
	2087	+
	2088	+ materialtouched = true;
	2089	+ applySelf();
	2090	+ }
	2091	+ });
	2092	+ presetpanel.add(velvet0);
	2093	+
	2094	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2095	+ bump0.setToolTipText("Bump texture");
	2096	+ bump0.addMouseListener(new MouseAdapter()
	2097	+ {
	2098	+ public void mouseClicked(MouseEvent e)
	2099	+ {
	2100	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2101	+ cMaterial material = object.material;
	2102	+
	2103	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2104	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2105	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2106	+
	2107	+ materialtouched = true;
	2108	+ applySelf();
	2109	+ }
	2110	+ });
	2111	+ presetpanel.add(bump0);
	2112	+
	2113	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2114	+ halo.setToolTipText("Halo");
	2115	+ halo.addMouseListener(new MouseAdapter()
	2116	+ {
	2117	+ public void mouseClicked(MouseEvent e)
	2118	+ {
	2119	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2120	+ cMaterial material = object.material;
	2121	+
	2122	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2123	+
	2124	+ materialtouched = true;
	2125	+ applySelf();
	2126	+ }
	2127	+ });
	2128	+ presetpanel.add(halo);
	2129	+
	2130	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2131	+ candle.setToolTipText("Candle");
	2132	+ candle.addMouseListener(new MouseAdapter()
	2133	+ {
	2134	+ public void mouseClicked(MouseEvent e)
	2135	+ {
	2136	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2137	+ cMaterial material = object.material;
	2138	+
	2139	+ subsurfaceField.setFloat(material.subsurface);
	2140	+ shadowbiasField.setFloat(material.shadowbias);
	2141	+ ambientField.setFloat(material.ambient);
	2142	+ specularField.setFloat(material.specular);
	2143	+ lightareaField.setFloat(material.lightarea);
	2144	+ shininessField.setFloat(material.shininess);
	2145	+
	2146	+ materialtouched = true;
	2147	+ applySelf();
	2148	+ }
	2149	+ });
	2150	+ presetpanel.add(candle);
	2151	+
	2152	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2153	+ shadowShader.setToolTipText("Shadow");
	2154	+ shadowShader.addMouseListener(new MouseAdapter()
	2155	+ {
	2156	+ public void mouseClicked(MouseEvent e)
	2157	+ {
	2158	+ diffuseField.setFloat(0.001);
	2159	+ ambientField.setFloat(0.001);
	2160	+ cameraField.setFloat(0.001);
	2161	+ specularField.setFloat(0.001);
	2162	+ fakedepthField.setFloat(0.001);
	2163	+ opacityField.setFloat(0.6);
	2164	+
	2165	+ materialtouched = true;
	2166	+ applySelf();
	2167	+ }
	2168	+ });
	2169	+ presetpanel.add(shadowShader);
	2170	+
	2171	+ cGridBag panel = new cGridBag().setVertical(true);
	2172	+
	2173	+ presetpanel.preferredWidth = 1;
	2174	+
	2175	+ materialpanel.add(presetpanel);
	2176	+ materialpanel.add(panel);
	2177	+
	2178	+ panel.preferredWidth = 8;
	2179	+
	2180	+ /*
1507	2181	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1508	2182	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1509		- */
	2183	+ */
1510	2184
1511	2185	cGridBag editBar = new cGridBag().setVertical(false);
1512	2186
..	..	@@ -1540,45 +2214,50 @@
1540	2214	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1541	2215
1542	2216	cGridBag colorSection = new cGridBag().setVertical(true);
	2217	+
	2218	+ cGridBag huepanel = new cGridBag();
	2219	+ cGridBag huelabel = new cGridBag();
	2220	+ skin = GetLabel("icons/hue.png", false);
	2221	+ skin.fit = true;
	2222	+ huelabel.add(skin);
	2223	+ huelabel.preferredWidth = 20;
	2224	+ huepanel.add(new cGridBag()); // Label
	2225	+ huepanel.add(huelabel); // Field/slider
	2226	+
	2227	+ huepanel.preferredHeight = 7;
	2228	+
	2229	+ colorSection.add(huepanel);
1543	2230
1544	2231	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);
	2232	+
	2233	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2234	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2235	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2236	+
1548	2237	//colorField.preferredWidth = 200;
1549	2238	colorSection.add(color);
1550	2239
1551	2240	cGridBag modulation = new cGridBag();
1552	2241	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1553	2242	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1554		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2243	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1555	2244	colorSection.add(modulation);
1556	2245
	2246	+ cGridBag opacity = new cGridBag();
	2247	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2248	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2249	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2250	+ colorSection.add(opacity);
	2251	+
	2252	+ colorSection.add(GetSeparator());
	2253	+
1557	2254	cGridBag texture = new cGridBag();
1558	2255	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1559	2256	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1560	2257	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1561	2258	colorSection.add(texture);
1562	2259
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());
	2260	+ panel.add(GetSeparator());
1582	2261
1583	2262	panel.add(colorSection);
1584	2263
..	..	@@ -1628,7 +2307,13 @@
1628	2307	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1629	2308	diffuseSection.add(fakedepth);
1630	2309
1631		- panel.add(new JSeparator());
	2310	+ cGridBag shadowbias = new cGridBag();
	2311	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2312	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2313	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2314	+ diffuseSection.add(shadowbias);
	2315	+
	2316	+ panel.add(GetSeparator());
1632	2317
1633	2318	panel.add(diffuseSection);
1634	2319
..	..	@@ -1678,42 +2363,48 @@
1678	2363	// aConstraints.gridy += 1;
1679	2364	// aConstraints.gridwidth = 1;
1680	2365
	2366	+ cGridBag anisoU = new cGridBag();
	2367	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2368	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2369	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2370	+ specularSection.add(anisoU);
1681	2371
1682		- panel.add(new JSeparator());
	2372	+ cGridBag anisoV = new cGridBag();
	2373	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2374	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2375	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2376	+ specularSection.add(anisoV);
	2377	+
	2378	+
	2379	+ panel.add(GetSeparator());
1683	2380
1684	2381	panel.add(specularSection);
1685	2382
1686	2383	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1687	2384
1688		- cGridBag globalSection = new cGridBag().setVertical(true);
	2385	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1689	2386
1690	2387	cGridBag camera = new cGridBag();
1691	2388	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1692	2389	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1693	2390	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1694		- globalSection.add(camera);
	2391	+ colorSection.add(camera);
1695	2392
1696	2393	cGridBag ambient = new cGridBag();
1697	2394	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1698	2395	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1699	2396	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1700		- globalSection.add(ambient);
	2397	+ colorSection.add(ambient);
1701	2398
1702	2399	cGridBag backlit = new cGridBag();
1703	2400	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1704	2401	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1705	2402	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1706		- globalSection.add(backlit);
	2403	+ colorSection.add(backlit);
1707	2404
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());
	2405	+ //panel.add(new JSeparator());
1715	2406
1716		- panel.add(globalSection);
	2407	+ //panel.add(globalSection);
1717	2408
1718	2409	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1719	2410
..	..	@@ -1755,7 +2446,7 @@
1755	2446	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1756	2447	textureSection.add(opacityPower);
1757	2448
1758		- panel.add(new JSeparator());
	2449	+ panel.add(GetSeparator());
1759	2450
1760	2451	panel.add(textureSection);
1761	2452
..	..	@@ -1820,8 +2511,9 @@
1820	2511	// 3D models
1821	2512	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1822	2513	{
1823		- lastConverter = new com.jmex.model.converters.MaxToJme();
1824		- LoadFile(filename, lastConverter);
	2514	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2515	+ //LoadFile(filename, lastConverter);
	2516	+ LoadObjFile(filename); // New 3ds loader
1825	2517	continue;
1826	2518	}
1827	2519	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2547,6 +3239,7 @@
2547	3239	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2548	3240	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2549	3241	}
	3242	+
2550	3243	//cJME.count++;
2551	3244	//cJME.count %= 12;
2552	3245	if (gc)
..	..	@@ -2730,6 +3423,7 @@
2730	3423	}
2731	3424	}
2732	3425	}
	3426	+
2733	3427	cFileSystemPane FSPane;
2734	3428
2735	3429	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2739,7 +3433,7 @@
2739	3433
2740	3434	freezematerial = true;
2741	3435	colorField.setFloat(mat.color);
2742		- modulationField.setFloat(mat.modulation);
	3436	+ saturationField.setFloat(mat.modulation);
2743	3437	metalnessField.setFloat(mat.metalness);
2744	3438	diffuseField.setFloat(mat.diffuse);
2745	3439	specularField.setFloat(mat.specular);
..	..	@@ -2783,11 +3477,14 @@
2783	3477	}
2784	3478	}
2785	3479	}
	3480	+
2786	3481	freezematerial = false;
2787	3482	}
2788	3483
2789	3484	void SetMaterial(Object3D object)
2790	3485	{
	3486	+ latestObject = object;
	3487	+
2791	3488	cMaterial mat = object.material;
2792	3489
2793	3490	if (mat == null)
..	..	@@ -2899,12 +3596,17 @@
2899	3596	// }
2900	3597
2901	3598	/**/
2902		- if (deselect)
	3599	+ if (deselect \|\| child == null)
2903	3600	{
2904	3601	//group.deselectAll();
2905	3602	//freeze = true;
2906	3603	GetTree().clearSelection();
2907	3604	//freeze = false;
	3605	+
	3606	+ if (child == null)
	3607	+ {
	3608	+ return;
	3609	+ }
2908	3610	}
2909	3611
2910	3612	//group.addSelectee(child);
..	..	@@ -2938,6 +3640,17 @@
2938	3640	public void itemStateChanged(ItemEvent event)
2939	3641	{
2940	3642	// System.out.println("Propagate = " + propagate);
	3643	+ if (event.getSource() == pinButton)
	3644	+ {
	3645	+ copy.pinned ^= true;
	3646	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3647	+ {
	3648	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3649	+ copy.CloseUI();
	3650	+ //copy.editWindow.refreshContents();
	3651	+ }
	3652	+ }
	3653	+ else
2941	3654	if (event.getSource() == propagateToggle)
2942	3655	{
2943	3656	propagate ^= true;
..	..	@@ -2973,7 +3686,7 @@
2973	3686	cameraView.ToggleDL();
2974	3687	cameraView.repaint();
2975	3688	return;
2976		- } else if (event.getSource() == toggleTextureItem)
	3689	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2977	3690	{
2978	3691	cameraView.ToggleTexture();
2979	3692	// june 2013 copy.HardTouch();
..	..	@@ -3012,7 +3725,7 @@
3012	3725	frame.validate();
3013	3726
3014	3727	return;
3015		- } else if (event.getSource() == toggleSwitchItem)
	3728	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3016	3729	{
3017	3730	cameraView.ToggleSwitch();
3018	3731	cameraView.repaint();
..	..	@@ -3042,8 +3755,9 @@
3042	3755	} else if (event.getSource() == liveCB)
3043	3756	{
3044	3757	copy.live ^= true;
	3758	+ objEditor.refreshContents(true); // To show item colors
3045	3759	return;
3046		- } else if (event.getSource() == selectCB)
	3760	+ } else if (event.getSource() == selectableCB)
3047	3761	{
3048	3762	copy.dontselect ^= true;
3049	3763	return;
..	..	@@ -3051,7 +3765,7 @@
3051	3765	{
3052	3766	copy.hide ^= true;
3053	3767	copy.Touch(); // display list issue
3054		- objEditor.refreshContents();
	3768	+ objEditor.refreshContents(true); // To show item colors
3055	3769	return;
3056	3770	} else if (event.getSource() == link2masterCB)
3057	3771	{
..	..	@@ -3228,9 +3942,9 @@
3228	3942	{
3229	3943	Close();
3230	3944	//return true;
3231		- } else if (source == loadItem)
	3945	+ } else if (source == openItem)
3232	3946	{
3233		- load();
	3947	+ Open();
3234	3948	//return true;
3235	3949	} else if (source == newItem)
3236	3950	{
..	..	@@ -3255,6 +3969,10 @@
3255	3969	{
3256	3970	generatePOV();
3257	3971	//return true;
	3972	+ } else if (event.getSource() == archiveItem)
	3973	+ {
	3974	+ cTools.Archive(frame);
	3975	+ return;
3258	3976	} else if (source == zBufferItem)
3259	3977	{
3260	3978	try
..	..	@@ -3303,11 +4021,12 @@
3303	4021
3304	4022	static public byte[] Compress(Object3D o)
3305	4023	{
	4024	+ // Slower to actually compress.
3306	4025	try
3307	4026	{
3308	4027	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3309		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3310		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	4028	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4029	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3311	4030
3312	4031	Object3D parent = o.parent;
3313	4032	o.parent = null;
..	..	@@ -3318,10 +4037,14 @@
3318	4037
3319	4038	out.flush();
3320	4039
3321		- zstream.close();
	4040	+ baos //zstream
	4041	+ .close();
3322	4042	out.close();
3323	4043
3324		- return baos.toByteArray();
	4044	+ byte[] bytes = baos.toByteArray();
	4045	+
	4046	+ System.out.println("save #bytes = " + bytes.length);
	4047	+ return bytes;
3325	4048	} catch (Exception e)
3326	4049	{
3327	4050	System.err.println(e);
..	..	@@ -3331,13 +4054,16 @@
3331	4054
3332	4055	static public Object Uncompress(byte[] bytes)
3333	4056	{
3334		- System.out.println("#bytes = " + bytes.length);
	4057	+ System.out.println("restore #bytes = " + bytes.length);
3335	4058	try
3336	4059	{
3337	4060	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3338		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3339		- ObjectInputStream in = new ObjectInputStream(istream);
	4061	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4062	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3340	4063	Object obj = in.readObject();
	4064	+
	4065	+ bais //istream
	4066	+ .close();
3341	4067	in.close();
3342	4068
3343	4069	return obj;
..	..	@@ -3392,37 +4118,95 @@
3392	4118	return null;
3393	4119	}
3394	4120
3395		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3396	4121
3397	4122	public void Save()
3398	4123	{
	4124	+ //Save(true);
	4125	+ Replace();
	4126	+ SetUndoStates();
	4127	+ }
	4128	+
	4129	+ private boolean Equal(byte[] compress, byte[] name)
	4130	+ {
	4131	+ if (compress.length != name.length)
	4132	+ {
	4133	+ return false;
	4134	+ }
	4135	+
	4136	+ for (int i=compress.length; --i>=0;)
	4137	+ {
	4138	+ if (compress[i] != name[i])
	4139	+ return false;
	4140	+ }
	4141	+
	4142	+ return true;
	4143	+ }
	4144	+
	4145	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4146	+
	4147	+ void DeleteVersion()
	4148	+ {
	4149	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4150	+ {
	4151	+ copy.versionlist[i] = copy.versionlist[i+1];
	4152	+ }
	4153	+
	4154	+ CopyChanged();
	4155	+
	4156	+ SetUndoStates();
	4157	+ }
	4158	+
	4159	+ public boolean Save(boolean user)
	4160	+ {
	4161	+ System.err.println("Save");
	4162	+ Replace();
	4163	+
3399	4164	cRadio tab = GetCurrentTab();
3400	4165
3401		- boolean temp = CameraPane.SWITCH;
3402		- CameraPane.SWITCH = false;
	4166	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3403	4167
3404		- copy.ExtractBigData(hashtable);
	4168	+ boolean thesame = false;
	4169	+
	4170	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4171	+// {
	4172	+// thesame = true;
	4173	+// }
3405	4174
3406	4175	//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++)
	4176	+ if (!thesame)
3416	4177	{
3417		- tab.graphs[i] = null;
	4178	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4179	+ {
	4180	+ copy.versionlist[i] = copy.versionlist[i-1];
	4181	+ }
	4182	+
	4183	+ //tab.user[tab.versionindex] = user;
	4184	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4185	+
	4186	+ copy.versionlist[++copy.versionindex] = compress;
	4187	+
	4188	+ // if (increment)
	4189	+ // tab.versionindex++;
3418	4190	}
3419	4191
	4192	+ //copy.RestoreBigData(versiontable);
	4193	+
	4194	+ //assert(hashtable.isEmpty());
	4195	+
	4196	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4197	+// {
	4198	+// //tab.user[i] = false;
	4199	+// copy.versionlist[i] = null;
	4200	+// }
	4201	+
	4202	+ SetUndoStates();
	4203	+
3420	4204	// test save
3421	4205	if (false)
3422	4206	{
3423	4207	try
3424	4208	{
3425		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	4209	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3426	4210	ObjectOutputStream p = new ObjectOutputStream(ostream);
3427	4211
3428	4212	p.writeObject(copy);
..	..	@@ -3435,26 +4219,68 @@
3435	4219	e.printStackTrace();
3436	4220	}
3437	4221	}
	4222	+
	4223	+ return !thesame;
	4224	+ }
	4225	+
	4226	+ boolean flashIt = true;
	4227	+
	4228	+ void RefreshSelection()
	4229	+ {
	4230	+ Object3D selection = new Object3D();
	4231	+
	4232	+ for (int i = 0; i < copy.selection.size(); i++)
	4233	+ {
	4234	+ Object3D elem = copy.selection.elementAt(i);
	4235	+
	4236	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4237	+
	4238	+ if (obj == null)
	4239	+ {
	4240	+ copy.selection.remove(i--);
	4241	+ }
	4242	+ else
	4243	+ {
	4244	+ selection.add(obj);
	4245	+ copy.selection.setElementAt(obj, i);
	4246	+ }
	4247	+ }
	4248	+
	4249	+ flashIt = false;
	4250	+ GetTree().clearSelection();
	4251	+ for (int i = 0; i < selection.size(); i++)
	4252	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4253	+ flashIt = true;
	4254	+
	4255	+ //refreshContents(false);
3438	4256	}
3439	4257
3440		- void CopyChanged(Object3D obj)
	4258	+ void CopyChanged()
3441	4259	{
	4260	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4261	+
	4262	+ SetUndoStates();
	4263	+
3442	4264	boolean temp = CameraPane.SWITCH;
3443	4265	CameraPane.SWITCH = false;
3444	4266
3445		- copy.ExtractBigData(hashtable);
	4267	+ copy.ExtractBigData(versiontable);
3446	4268
3447	4269	copy.clear();
3448	4270
	4271	+ copy.skyboxname = obj.skyboxname;
	4272	+ copy.skyboxext = obj.skyboxext;
	4273	+
3449	4274	for (int i=0; i<obj.Size(); i++)
3450	4275	{
3451	4276	copy.add(obj.get(i));
3452	4277	}
3453	4278
3454		- copy.RestoreBigData(hashtable);
	4279	+ copy.RestoreBigData(versiontable);
3455	4280
3456	4281	CameraPane.SWITCH = temp;
3457	4282
	4283	+ RefreshSelection();
3458	4284	//assert(hashtable.isEmpty());
3459	4285
3460	4286	copy.Touch();
..	..	@@ -3475,43 +4301,139 @@
3475	4301	}
3476	4302	}
3477	4303
3478		- refreshContents();
	4304	+ refreshContents(true);
3479	4305	}
3480	4306
3481		- public void Undo()
	4307	+ cButton previousVersionButton;
	4308	+ cButton restoreButton;
	4309	+ cButton replaceButton;
	4310	+ cButton nextVersionButton;
	4311	+ cButton saveVersionButton;
	4312	+ cButton deleteVersionButton;
	4313	+
	4314	+ boolean muteSlider;
	4315	+
	4316	+ int VersionCount()
	4317	+ {
	4318	+ int count = 0;
	4319	+
	4320	+ for (int i = copy.versionlist.length; --i >= 0;)
	4321	+ {
	4322	+ if (copy.versionlist[i] != null)
	4323	+ count++;
	4324	+ }
	4325	+
	4326	+ return count;
	4327	+ }
	4328	+
	4329	+ void SetUndoStates()
3482	4330	{
3483	4331	cRadio tab = GetCurrentTab();
3484	4332
3485		- if (tab.undoindex == 0)
	4333	+ restoreButton.setEnabled(true); // copy.versionindex != -1);
	4334	+ replaceButton.setEnabled(true); // copy.versionindex != -1);
	4335	+
	4336	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4337	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4338	+
	4339	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4340	+ copy.versionlist[copy.versionindex + 1] != null);
	4341	+
	4342	+ muteSlider = true;
	4343	+ versionSlider.setMaximum(VersionCount() - 1);
	4344	+ versionSlider.setInteger(copy.versionindex);
	4345	+ muteSlider = false;
	4346	+ }
	4347	+
	4348	+ public boolean PreviousVersion()
	4349	+ {
	4350	+ // Option?
	4351	+ Replace();
	4352	+
	4353	+ System.err.println("Undo");
	4354	+
	4355	+ cRadio tab = GetCurrentTab();
	4356	+
	4357	+ if (copy.versionindex == 0)
3486	4358	{
3487	4359	java.awt.Toolkit.getDefaultToolkit().beep();
3488		- return;
	4360	+ return false;
3489	4361	}
3490	4362
3491		- if (tab.graphs[tab.undoindex] == null)
3492		- {
3493		- Save();
3494		- tab.undoindex -= 1;
3495		- }
	4363	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4364	+// {
	4365	+// if (Save(false))
	4366	+// tab.versionindex -= 1;
	4367	+// else
	4368	+// {
	4369	+// if (tab.versionindex <= 0)
	4370	+// return false;
	4371	+// else
	4372	+// tab.versionindex -= 1;
	4373	+// }
	4374	+// }
3496	4375
3497		- tab.undoindex -= 1;
	4376	+ copy.versionindex -= 1;
3498	4377
3499		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4378	+ CopyChanged();
	4379	+
	4380	+ return true;
3500	4381	}
3501	4382
3502		- public void Redo()
	4383	+ public boolean Restore()
3503	4384	{
	4385	+ System.err.println("Restore");
	4386	+
3504	4387	cRadio tab = GetCurrentTab();
3505	4388
3506		- if (tab.graphs[tab.undoindex + 1] == null)
	4389	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4390	+ {
	4391	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4392	+ return false;
	4393	+ }
	4394	+
	4395	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4396	+ CopyChanged();
	4397	+
	4398	+ return true;
	4399	+ }
	4400	+
	4401	+ public boolean Replace()
	4402	+ {
	4403	+ System.err.println("Replace");
	4404	+
	4405	+ cRadio tab = GetCurrentTab();
	4406	+
	4407	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4408	+ {
	4409	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4410	+ return false;
	4411	+ }
	4412	+
	4413	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4414	+
	4415	+ return true;
	4416	+ }
	4417	+
	4418	+ public void NextVersion()
	4419	+ {
	4420	+ // Option?
	4421	+ Replace();
	4422	+
	4423	+ cRadio tab = GetCurrentTab();
	4424	+
	4425	+ if (copy.versionlist[copy.versionindex + 1] == null)
3507	4426	{
3508	4427	java.awt.Toolkit.getDefaultToolkit().beep();
3509	4428	return;
3510	4429	}
3511	4430
3512		- tab.undoindex += 1;
	4431	+ copy.versionindex += 1;
3513	4432
3514		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4433	+ CopyChanged();
	4434	+
	4435	+ //if (!tab.user[tab.versionindex])
	4436	+ // tab.graphs[tab.versionindex] = null;
3515	4437	}
3516	4438
3517	4439	void ImportGFD()
..	..	@@ -3663,7 +4585,7 @@
3663	4585	assert false;
3664	4586	}
3665	4587
3666		- void EditSelection()
	4588	+ void EditSelection(boolean newWindow)
3667	4589	{
3668	4590	}
3669	4591
..	..	@@ -3722,7 +4644,7 @@
3722	4644	//copy.material = new cMaterial(copy.GetMaterial());
3723	4645
3724	4646	current.color = (float) colorField.getFloat();
3725		- current.modulation = (float) modulationField.getFloat();
	4647	+ current.modulation = (float) saturationField.getFloat();
3726	4648	current.metalness = (float) metalnessField.getFloat();
3727	4649	current.diffuse = (float) diffuseField.getFloat();
3728	4650	current.specular = (float) specularField.getFloat();
..	..	@@ -3755,7 +4677,7 @@
3755	4677	cMaterial mat = copy.material;
3756	4678
3757	4679	colorField.SetToolTipValue((mat.color));
3758		- modulationField.SetToolTipValue((mat.modulation));
	4680	+ saturationField.SetToolTipValue((mat.modulation));
3759	4681	metalnessField.SetToolTipValue((mat.metalness));
3760	4682	diffuseField.SetToolTipValue((mat.diffuse));
3761	4683	specularField.SetToolTipValue((mat.specular));
..	..	@@ -3807,9 +4729,26 @@
3807	4729	//copy.Touch();
3808	4730	}
3809	4731
	4732	+ cNumberSlider versionSlider;
	4733	+
3810	4734	public void stateChanged(ChangeEvent e)
3811	4735	{
3812	4736	// assert(false);
	4737	+ if (e.getSource() == versionSlider)
	4738	+ {
	4739	+ if (muteSlider)
	4740	+ return;
	4741	+
	4742	+ int version = versionSlider.getInteger();
	4743	+
	4744	+ if (copy.versionlist[version] != null)
	4745	+ {
	4746	+ copy.versionindex = version;
	4747	+ CopyChanged();
	4748	+ }
	4749	+
	4750	+ return;
	4751	+ }
3813	4752
3814	4753	if (freezematerial)
3815	4754	{
..	..	@@ -3845,6 +4784,12 @@
3845	4784	{
3846	4785	//System.out.println("stateChanged = " + this);
3847	4786	materialtouched = true;
	4787	+
	4788	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4789	+ {
	4790	+ saturationField.setFloat(1);
	4791	+ }
	4792	+
3848	4793	applySelf();
3849	4794	//System.out.println("this = " + this);
3850	4795	//System.out.println("PARENT = " + parent);
..	..	@@ -4144,6 +5089,7 @@
4144	5089	{
4145	5090	if (GetTree() != null)
4146	5091	{
	5092	+ GetTree().revalidate();
4147	5093	GetTree().repaint();
4148	5094	}
4149	5095
..	..	@@ -4152,13 +5098,17 @@
4152	5098	ctrlPanel.validate(); // ? new
4153	5099	ctrlPanel.repaint();
4154	5100	}
	5101	+
	5102	+ if (previousVersionButton != null && copy.versionlist != null)
	5103	+ SetUndoStates();
4155	5104	}
4156	5105
4157	5106	static TweenManager tweenManager = new TweenManager();
4158	5107
4159	5108	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4160	5109	{
4161		- Save();
	5110	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5111	+ Save();
4162	5112	//Tween.set(thing, 0).target(1).start(tweenManager);
4163	5113	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
4164	5114	// if (thing instanceof GenericJointDemo)
..	..	@@ -4245,6 +5195,12 @@
4245	5195	{
4246	5196	ResetModel();
4247	5197	Select(thing.GetTreePath(), true, false); // unselect... false);
	5198	+
	5199	+ if (thing.Size() == 0)
	5200	+ {
	5201	+ //EditSelection(false);
	5202	+ }
	5203	+
4248	5204	refreshContents();
4249	5205	}
4250	5206
..	..	@@ -4393,7 +5349,9 @@
4393	5349	readobj.ResetDisplayList();
4394	5350	} catch (Exception e)
4395	5351	{
4396		- //e.printStackTrace();
	5352	+ if (!e.toString().contains("GZIP"))
	5353	+ e.printStackTrace();
	5354	+
4397	5355	try
4398	5356	{
4399	5357	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4467,11 +5425,14 @@
4467	5425
4468	5426	if (readobj != null)
4469	5427	{
4470		- Save();
	5428	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5429	+ // Save();
4471	5430	try
4472	5431	{
4473	5432	//readobj.deepCopySelf(copy);
4474	5433	copy.clear(); // june 2014
	5434	+ copy.skyboxname = readobj.skyboxname;
	5435	+ copy.skyboxext = readobj.skyboxext;
4475	5436	for (int i = 0; i < readobj.size(); i++)
4476	5437	{
4477	5438	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4512,6 +5473,7 @@
4512	5473	}
4513	5474	} catch (ClassCastException e)
4514	5475	{
	5476	+ e.printStackTrace();
4515	5477	assert (false);
4516	5478	Composite c = (Composite) copy;
4517	5479	c.children.clear();
..	..	@@ -4522,17 +5484,28 @@
4522	5484	c.addChild(csg);
4523	5485	}
4524	5486
	5487	+ copy.versionlist = readobj.versionlist;
	5488	+ copy.versionindex = readobj.versionindex;
	5489	+
	5490	+ if (copy.versionlist == null)
	5491	+ {
	5492	+ copy.versionlist = new Object3D[100];
	5493	+ copy.versionindex = -1;
	5494	+ }
	5495	+
	5496	+ //? SetUndoStates();
	5497	+
4525	5498	ResetModel();
4526	5499	copy.HardTouch(); // recompile?
4527	5500	refreshContents();
4528	5501	}
4529	5502	}
4530	5503
4531		- void load() // throws ClassNotFoundException
	5504	+ void Open() // throws ClassNotFoundException
4532	5505	{
4533	5506	if (Grafreed.standAlone)
4534	5507	{
4535		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5508	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4536	5509	browser.show();
4537	5510	String filename = browser.getFile();
4538	5511	if (filename != null && filename.length() > 0)
..	..	@@ -4631,6 +5604,7 @@
4631	5604	//ps.print(buffer.toString());
4632	5605	} catch (IOException e)
4633	5606	{
	5607	+ e.printStackTrace();
4634	5608	}
4635	5609	}
4636	5610
..	..	@@ -4645,6 +5619,8 @@
4645	5619	String filename = browser.getFile();
4646	5620	if (filename != null && filename.length() > 0)
4647	5621	{
	5622	+ if (!filename.endsWith(".gfd"))
	5623	+ filename += ".gfd";
4648	5624	lastname = browser.getDirectory() + filename;
4649	5625	save();
4650	5626	}
..	..	@@ -4811,7 +5787,7 @@
4811	5787	MenuBar menuBar;
4812	5788	Menu fileMenu;
4813	5789	MenuItem newItem;
4814		- MenuItem loadItem;
	5790	+ MenuItem openItem;
4815	5791	MenuItem saveItem;
4816	5792	MenuItem saveAsItem;
4817	5793	MenuItem exportAsItem;
..	..	@@ -4834,22 +5810,37 @@
4834	5810	CheckboxMenuItem toggleSwitchItem;
4835	5811	CheckboxMenuItem toggleRootItem;
4836	5812	CheckboxMenuItem animationItem;
	5813	+ MenuItem archiveItem;
4837	5814	CheckboxMenuItem toggleHandleItem;
4838	5815	CheckboxMenuItem togglePaintItem;
4839	5816	JSplitPane mainPanel;
4840	5817	JScrollPane scrollpane;
	5818	+
4841	5819	JPanel toolbarPanel;
	5820	+
4842	5821	cGridBag treePanel;
	5822	+
4843	5823	JPanel radioPanel;
4844	5824	ButtonGroup buttonGroup;
4845		- cGridBag ctrlPanel;
	5825	+
	5826	+ cGridBag toolboxPanel;
	5827	+ cGridBag skyboxPanel;
4846	5828	cGridBag materialPanel;
	5829	+ cGridBag ctrlPanel;
	5830	+
4847	5831	JScrollPane infoPanel;
	5832	+
4848	5833	cGridBag optionsPanel;
	5834	+
4849	5835	JTabbedPane objectPanel;
	5836	+ boolean materialFlushed;
	5837	+ Object3D latestObject;
	5838	+
4850	5839	cGridBag XYZPanel;
	5840	+
4851	5841	JSplitPane gridPanel;
4852	5842	JSplitPane bigPanel;
	5843	+
4853	5844	cGridBag bigThree;
4854	5845	cGridBag scenePanel;
4855	5846	cGridBag centralPanel;
..	..	@@ -4907,7 +5898,7 @@
4907	5898	JLabel colorLabel;
4908	5899	cNumberSlider colorField;
4909	5900	JLabel modulationLabel;
4910		- cNumberSlider modulationField;
	5901	+ cNumberSlider saturationField;
4911	5902	JLabel metalnessLabel;
4912	5903	cNumberSlider metalnessField;
4913	5904	JLabel diffuseLabel;
..	..	@@ -4938,6 +5929,7 @@
4938	5929	cNumberSlider anisoField;
4939	5930	JLabel anisoVLabel;
4940	5931	cNumberSlider anisoVField;
	5932	+
4941	5933	JLabel cameraLabel;
4942	5934	cNumberSlider cameraField;
4943	5935	JLabel selfshadowLabel;
..	..	@@ -4952,6 +5944,7 @@
4952	5944	cNumberSlider fakedepthField;
4953	5945	JLabel shadowbiasLabel;
4954	5946	cNumberSlider shadowbiasField;
	5947	+
4955	5948	JLabel bumpLabel;
4956	5949	cNumberSlider bumpField;
4957	5950	JLabel noiseLabel;
..	..	@@ -4964,7 +5957,7 @@
4964	5957	cNumberSlider fogField;
4965	5958	JLabel opacityPowerLabel;
4966	5959	cNumberSlider opacityPowerField;
4967		- JTree jTree;
	5960	+ cTree jTree;
4968	5961	//ObjectUI parent;
4969	5962
4970	5963	cNumberSlider normalpushField;