~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -15,6 +15,9 @@
15	15	//import javax.swing.plaf.ColorUIResource;
16	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
17	17
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
	20	+
18	21	//import javax.media.opengl.GLCanvas;
19	22
20	23	import //weka.core.
..	..	@@ -31,6 +34,7 @@
31	34	iSendInfo
32	35	//KeyListener
33	36	{
	37	+ public cToggleButton pinButton;
34	38	boolean timeline;
35	39	boolean wasFullScreen;
36	40
..	..	@@ -38,64 +42,119 @@
38	42	JFrame frame;
39	43
40	44	static ObjEditor theFrame;
	45	+
	46	+ public void AllocProjectedVertices(Object3D object)
	47	+ {
	48	+ assert (object.projectedVertices != null);
	49	+
	50	+ if (object.projectedVertices.length <= 2)
	51	+ {
	52	+ // Side effect...
	53	+ Object3D.cVector2[] keep = object.projectedVertices;
	54	+ object.projectedVertices = new Object3D.cVector2[3];
	55	+ for (int i = 0; i < 3; i++)
	56	+ {
	57	+ if (i < keep.length)
	58	+ {
	59	+ object.projectedVertices[i] = keep[i];
	60	+ } else
	61	+ {
	62	+ object.projectedVertices[i] = new Object3D.cVector2();
	63	+ }
	64	+ /*
	65	+ if(keep.length == 0)
	66	+ object.projectedVertices[0] = new Object3D.cVector2();
	67	+ else
	68	+ object.projectedVertices[0] = keep[0];
	69	+ object.projectedVertices[1] = new Object3D.cVector2();
	70	+ */
	71	+ }
	72	+ }
	73	+ }
	74	+
	75	+ public cGridBag GetSeparator()
	76	+ {
	77	+ cGridBag separator = new cGridBag();
	78	+ separator.add(new JSeparator());
	79	+ separator.preferredHeight = 5;
	80	+ return separator;
	81	+ }
41	82
42	83	cButton GetButton(String name, boolean border)
43	84	{
44		- try
45		- {
46		- ImageIcon icon = GetIcon(name);
47		- return new cButton(icon, border);
48		- }
49		- catch (Exception e)
50		- {
51		- return new cButton(name, border);
52		- }
	85	+ ImageIcon icon = GetIcon(name);
	86	+ return new cButton(icon, border);
	87	+ }
	88	+
	89	+ cLabel GetLabel(String name, boolean border)
	90	+ {
	91	+ //ImageIcon icon = GetIcon(name);
	92	+ return new cLabel(GetImage(name), border);
53	93	}
54	94
55	95	cToggleButton GetToggleButton(String name, boolean border)
56	96	{
57		- try
58		- {
59		- ImageIcon icon = GetIcon(name);
60		- return new cToggleButton(icon, border);
61		- }
62		- catch (Exception e)
63		- {
64		- return new cToggleButton(name, border);
65		- }
	97	+ ImageIcon icon = GetIcon(name);
	98	+ return new cToggleButton(icon, border);
66	99	}
67	100
68	101	cCheckBox GetCheckBox(String name, boolean border)
69	102	{
	103	+ ImageIcon icon = GetIcon(name);
	104	+ return new cCheckBox(icon, border);
	105	+ }
	106	+
	107	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	108	+
	109	+ ImageIcon GetIcon(String name)
	110	+ {
	111	+ javax.swing.ImageIcon iconCache = icons.get(name);
	112	+ if (iconCache != null)
	113	+ {
	114	+ return iconCache;
	115	+ }
	116	+
70	117	try
71	118	{
72		- ImageIcon icon = GetIcon(name);
73		- return new cCheckBox(icon, border);
	119	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	120	+
	121	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	122	+// {
	123	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	124	+// Graphics2D g = resized.createGraphics();
	125	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	126	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	127	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	128	+// g.dispose();
	129	+//
	130	+// image = resized;
	131	+// }
	132	+
	133	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	134	+
	135	+ icons.put(name, icon);
	136	+
	137	+ return icon;
74	138	}
75	139	catch (Exception e)
76	140	{
77		- return new cCheckBox(name, border);
	141	+ //icons.put(name, null);
	142	+ return null;
78	143	}
79	144	}
80		-
81		- private ImageIcon GetIcon(String name) throws IOException
	145	+
	146	+ BufferedImage GetImage(String name)
82	147	{
83		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
84		-
85		- if (image.getWidth() != 24 && image.getHeight() != 24)
	148	+ try
86	149	{
87		- BufferedImage resized = new BufferedImage(24, 24, image.getType());
88		- Graphics2D g = resized.createGraphics();
89		- g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
90		- //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
91		- g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
92		- g.dispose();
93		-
94		- image = resized;
	150	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	151	+
	152	+ return image;
95	153	}
96		-
97		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
98		- return icon;
	154	+ catch (Exception e)
	155	+ {
	156	+ return null;
	157	+ }
99	158	}
100	159
101	160	// SCRIPT
..	..	@@ -207,7 +266,7 @@
207	266
208	267	objEditor.ctrlPanel.remove(namePanel);
209	268
210		- if (!GroupEditor.allparams)
	269	+ if (!allparams)
211	270	return;
212	271
213	272	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -279,6 +338,14 @@
279	338	client = inClient;
280	339	copy = client;
281	340
	341	+// if (copy.versionlist == null)
	342	+// {
	343	+// copy.versionlist = new Object3D[100];
	344	+// copy.versionindex = -1;
	345	+//
	346	+// callee.Save(true);
	347	+// }
	348	+
282	349	// "this" is not called: SetupUI2(objEditor);
283	350	}
284	351
..	..	@@ -292,6 +359,14 @@
292	359	client = inClient;
293	360	copy = client;
294	361
	362	+ if (copy.versionlist == null)
	363	+ {
	364	+ copy.versionlist = new Object3D[100];
	365	+ copy.versionindex = -1;
	366	+
	367	+// Save(true);
	368	+ }
	369	+
295	370	SetupUI2(callee.GetEditor());
296	371	}
297	372
..	..	@@ -306,14 +381,15 @@
306	381	//localCopy.parent = null;
307	382
308	383	frame = new JFrame();
309		- frame.setUndecorated(true);
	384	+ frame.setUndecorated(false);
310	385	objEditor = this;
311	386	this.callee = callee;
312	387
313	388	//parent = p;
314	389
315	390	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
316		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	391	+ if (Globals.DEBUG)
	392	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
317	393	//gd.setFullScreenWindow(this);
318	394	//setResizable(false);
319	395	//if (!isDisplayable())
..	..	@@ -324,6 +400,14 @@
324	400	copy = localCopy;
325	401	copy.editWindow = this;
326	402
	403	+// if (copy.versionlist == null)
	404	+// {
	405	+// copy.versionlist = new Object3D[100];
	406	+// copy.versionindex = -1;
	407	+//
	408	+// Save(true);
	409	+// }
	410	+
327	411	SetupMenu();
328	412
329	413	//SetupName(objEditor); // new
..	..	@@ -337,12 +421,20 @@
337	421	return frame.action(event, obj);
338	422	}
339	423
	424	+ // Cannot work without static
	425	+ static boolean allparams = true;
	426	+
	427	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	428	+
	429	+ // This is to refresh the UI of the material panel.
	430	+ boolean patchMaterial;
	431	+
340	432	void SetupMenu()
341	433	{
342	434	frame.setMenuBar(menuBar = new MenuBar());
343	435	menuBar.add(fileMenu = new Menu("File"));
344	436	fileMenu.add(newItem = new MenuItem("New"));
345		- fileMenu.add(loadItem = new MenuItem("Open..."));
	437	+ fileMenu.add(openItem = new MenuItem("Open..."));
346	438
347	439	//oe.menuBar.add(menu = new Menu("Include"));
348	440	Menu menu = new Menu("Import");
..	..	@@ -374,7 +466,7 @@
374	466	}
375	467
376	468	newItem.addActionListener(this);
377		- loadItem.addActionListener(this);
	469	+ openItem.addActionListener(this);
378	470	saveItem.addActionListener(this);
379	471	saveAsItem.addActionListener(this);
380	472	exportAsItem.addActionListener(this);
..	..	@@ -386,6 +478,8 @@
386	478
387	479	ChangeListener changeListener = new ChangeListener()
388	480	{
	481	+ //String name;
	482	+
389	483	public void stateChanged(ChangeEvent changeEvent)
390	484	{
391	485	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -398,19 +492,55 @@
398	492	//
399	493	// materialFlushed = true;
400	494	// }
	495	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	496	+// {
	497	+// if (listUI.size() == 0)
	498	+// EditSelection(false);
	499	+// }
401	500
402		- refreshContents(false); // To refresh Info tab
	501	+// if (objectPanel.getSelectedIndex() == 4)
	502	+// {
	503	+// name = copy.skyboxname;
	504	+//
	505	+// if (name == null)
	506	+// {
	507	+// name = "";
	508	+// }
	509	+//
	510	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	511	+// copy.skyboxext = "jpg";
	512	+// }
	513	+// else
	514	+// {
	515	+// if (name != null)
	516	+// {
	517	+// if (name.equals(""))
	518	+// {
	519	+// copy.skyboxname = null;
	520	+// copy.skyboxext = null;
	521	+// }
	522	+// else
	523	+// {
	524	+// copy.skyboxname = name;
	525	+// }
	526	+// }
	527	+// }
	528	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	529	+
	530	+// refreshContents(false); // To refresh Info tab
	531	+ cameraView.repaint();
403	532	}
404	533	};
405	534	objectPanel.addChangeListener(changeListener);
406	535
407	536	toolbarPanel = new JPanel();
408	537	toolbarPanel.setName("Toolbar");
	538	+
409	539	treePanel = new cGridBag();
410	540	treePanel.setName("Tree");
411	541
412	542	editPanel = new cGridBag().setVertical(true);
413		- editPanel.setName("Edit");
	543	+ //editPanel.setName("Edit");
414	544
415	545	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
416	546
..	..	@@ -418,11 +548,13 @@
418	548	editPanel.add(editCommandsPanel);
419	549	editPanel.add(ctrlPanel);
420	550
421		- toolboxPanel = new cGridBag().setVertical(false);
422		- toolboxPanel.setName("Toolbox");
	551	+ toolboxPanel = new cGridBag().setVertical(true);
	552	+ //toolboxPanel.setName("Toolbox");
423	553
424		- materialPanel = new cGridBag().setVertical(true);
425		- materialPanel.setName("Material");
	554	+ skyboxPanel = new cGridBag().setVertical(true);
	555	+
	556	+ materialPanel = new cGridBag().setVertical(false);
	557	+ //materialPanel.setName("Material");
426	558
427	559	/JTextPane/
428	560	infoarea = createTextPane();
..	..	@@ -430,14 +562,15 @@
430	562
431	563	infoarea.setEditable(true);
432	564	SetText();
	565	+
433	566	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
434	567	// infoarea.setOpaque(false);
435	568	// //infoarea.setForeground(textcolor);
436	569	// TEXTAREA infoarea.setLineWrap(true);
437	570	// TEXTAREA infoarea.setWrapStyleWord(true);
438	571	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
439		- infoPanel.setPreferredSize(new Dimension(50, 200));
440		- infoPanel.setName("Info");
	572	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	573	+ //infoPanel.setName("Info");
441	574	//infoPanel.setLayout(new BorderLayout());
442	575	//infoPanel.add(createTextPane());
443	576
..	..	@@ -448,7 +581,14 @@
448	581	mainPanel.setDividerSize(9);
449	582	mainPanel.setDividerLocation(0.5); //1.0);
450	583	mainPanel.setResizeWeight(0.5);
451		-
	584	+
	585	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	586	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	587	+ divider.setDividerSize(15);
	588	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	589	+
	590	+ mainPanel.setUI(new BasicSplitPaneUI());
	591	+
452	592	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
453	593	//mainPanel.setLayout(new GridBagLayout());
454	594	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -679,8 +819,8 @@
679	819	}
680	820	}
681	821
682		-static GraphicsDevice device = GraphicsEnvironment
683		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	822	+//static GraphicsDevice device = GraphicsEnvironment
	823	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
684	824
685	825	Rectangle keeprect;
686	826	cRadio radio;
..	..	@@ -697,14 +837,24 @@
697	837	boolean maximized;
698	838
699	839	cButton fullscreenLayout;
	840	+ cButton expandedLayout;
700	841
701	842	void Minimize()
702	843	{
703	844	frame.setState(Frame.ICONIFIED);
	845	+ frame.validate();
704	846	}
705	847
	848	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	849	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	850	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
706	851	void Maximize()
707	852	{
	853	+ if (CameraPane.FULLSCREEN)
	854	+ {
	855	+ ToggleFullScreen();
	856	+ }
	857	+
708	858	if (maximized)
709	859	{
710	860	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -712,20 +862,38 @@
712	862	else
713	863	{
714	864	keeprect = frame.getBounds();
715		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
716		- Dimension rect2 = frame.getToolkit().getScreenSize();
717		- frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	865	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	866	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	867	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
718	868	// frame.setState(Frame.MAXIMIZED_BOTH);
	869	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
719	870	}
720	871
721	872	maximized ^= true;
	873	+
	874	+ frame.validate();
722	875	}
	876	+
	877	+ cButton minButton;
	878	+ cButton maxButton;
	879	+ cButton fullButton;
	880	+ cButton collapseButton;
	881	+ cButton maximize3DButton;
723	882
724	883	void ToggleFullScreen()
725	884	{
726		- if (CameraPane.FULLSCREEN)
	885	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	886	+
	887	+ cameraView.ToggleFullScreen();
	888	+
	889	+ if (!CameraPane.FULLSCREEN)
727	890	{
728	891	device.setFullScreenWindow(null);
	892	+ frame.dispose();
	893	+ frame.setUndecorated(false);
	894	+ frame.validate();
	895	+ frame.setVisible(true);
	896	+
729	897	//frame.setVisible(false);
730	898	// frame.removeNotify();
731	899	// frame.setUndecorated(false);
..	..	@@ -735,13 +903,13 @@
735	903	// X frame.getContentPane().remove(/"Center",/bigThree);
736	904	// X framePanel.add(bigThree);
737	905	// X frame.getContentPane().add(/"Center",/framePanel);
738		- framePanel.setDividerLocation(1);
	906	+// framePanel.setDividerLocation(46); // icons are 24x24
739	907
740	908	//frame.setVisible(true);
741		- radio.layout = keepButton;
	909	+// radio.layout = keepButton;
742	910	//theFrame = null;
743	911	keepButton = null;
744		- radio.layout.doClick();
	912	+// radio.layout.doClick();
745	913
746	914	} else
747	915	{
..	..	@@ -750,22 +918,65 @@
750	918	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
751	919	// frame.getToolkit().getScreenSize().height);
752	920	//frame.setVisible(false);
	921	+
	922	+ frame.dispose();
	923	+ frame.setUndecorated(true);
753	924	device.setFullScreenWindow(frame);
	925	+ frame.validate();
	926	+ frame.setVisible(true);
754	927	// frame.removeNotify();
755	928	// frame.setUndecorated(true);
756	929	// frame.addNotify();
757	930	// X frame.getContentPane().remove(/"Center",/framePanel);
758	931	// X framePanel.remove(bigThree);
759	932	// X frame.getContentPane().add(/"Center",/bigThree);
760		- framePanel.setDividerLocation(0);
	933	+// framePanel.setDividerLocation(0);
761	934
762		- radio.layout = fullscreenLayout;
763		- radio.layout.doClick();
	935	+// radio.layout = fullscreenLayout;
	936	+// radio.layout.doClick();
764	937	//frame.setVisible(true);
765	938	}
766		-
767		- cameraView.ToggleFullScreen();
	939	+ frame.validate();
	940	+
	941	+ cameraView.requestFocusInWindow();
768	942	}
	943	+
	944	+ void CollapseToolbar()
	945	+ {
	946	+ framePanel.setDividerLocation(0);
	947	+ //frame.validate();
	948	+
	949	+ cameraView.requestFocusInWindow();
	950	+ }
	951	+
	952	+ private Object3D Duplicate(Object3D object)
	953	+ {
	954	+ boolean temp = CameraPane.SWITCH;
	955	+ CameraPane.SWITCH = false;
	956	+
	957	+ if (Grafreed.grafreed.universe.versiontable == null)
	958	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	959	+
	960	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	961	+ // if (copy == client)
	962	+
	963	+ Object3D versions[] = object.versionlist;
	964	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	965	+ object.versionlist = null;
	966	+ object.versiontable = null;
	967	+
	968	+ //byte[] compress = Compress(copy);
	969	+ Object3D compress = (Object3D)Grafreed.clone(object);
	970	+
	971	+ object.versionlist = versions;
	972	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	973	+
	974	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	975	+
	976	+ CameraPane.SWITCH = temp;
	977	+
	978	+ return compress;
	979	+ }
769	980
770	981	private JTextPane createTextPane()
771	982	{
..	..	@@ -888,6 +1099,7 @@
888	1099	{
889	1100	SetupMaterial(materialPanel);
890	1101	}
	1102	+
891	1103	//SetupName();
892	1104	//SetupViews();
893	1105	}
..	..	@@ -897,7 +1109,7 @@
897	1109	// NumberSlider vDivsField;
898	1110	// JCheckBox endcaps;
899	1111	JCheckBox liveCB;
900		- JCheckBox selectCB;
	1112	+ JCheckBox selectableCB;
901	1113	JCheckBox hideCB;
902	1114	JCheckBox link2masterCB;
903	1115	JCheckBox markCB;
..	..	@@ -1096,39 +1308,55 @@
1096	1308
1097	1309	namePanel = new cGridBag();
1098	1310
	1311	+ //if (copy.pinned)
	1312	+ {
	1313	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1314	+ pinButton.setSelected(copy.pinned);
	1315	+ cGridBag t = new cGridBag();
	1316	+ t.preferredWidth = 2;
	1317	+ t.add(pinButton);
	1318	+ namePanel.add(t);
	1319	+
	1320	+ pinButton.addItemListener(this);
	1321	+ }
	1322	+
1099	1323	nameField = AddText(namePanel, copy.GetName());
1100		- namePanel.add(nameField);
	1324	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1101	1325	oe.ctrlPanel.add(namePanel);
1102	1326
1103	1327	oe.ctrlPanel.Return();
1104	1328
1105		- if (!GroupEditor.allparams)
	1329	+ if (!allparams)
1106	1330	return;
1107	1331
1108	1332	setupPanel = new cGridBag().setVertical(false);
1109	1333
1110	1334	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1111	1335	liveCB.setToolTipText("Animate object");
1112		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1113		- selectCB.setToolTipText("Make object selectable");
	1336	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1337	+ markCB.setToolTipText("Set target transform");
	1338	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1339	+ selectableCB.setToolTipText("Make object selectable");
1114	1340	// Return();
	1341	+
1115	1342	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1116	1343	hideCB.setToolTipText("Hide object");
1117		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1118		- markCB.setToolTipText("Set the animation target transform");
	1344	+
	1345	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1119	1346
1120	1347	setupPanel2 = new cGridBag().setVertical(false);
1121	1348
1122	1349	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1123	1350	rewindCB.setToolTipText("Rewind animation");
1124	1351
1125		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1126		- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1352	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1353	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1127	1354
	1355	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1356	+ link2masterCB.setToolTipText("Attach to support");
	1357	+
1128	1358	if (Globals.ADVANCED)
1129	1359	{
1130		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1131		- link2masterCB.setToolTipText("Attach to support");
1132	1360	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1133	1361	speedupCB.setToolTipText("Option motion capture");
1134	1362	}
..	..	@@ -1314,6 +1542,7 @@
1314	1542
1315	1543	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1316	1544	{
	1545	+ if (Globals.DEBUG)
1317	1546	System.out.println("CREATE CAMERAS");
1318	1547	cams = new cTemplate();
1319	1548	cams.name = "Cameras";
..	..	@@ -1402,6 +1631,7 @@
1402	1631	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1403	1632	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1404	1633	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1634	+ //XYZPanel.setName("XYZ");
1405	1635
1406	1636	/*
1407	1637	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1438,15 +1668,34 @@
1438	1668
1439	1669	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1440	1670	//tmp.setName("Edit");
1441		- objectPanel.add(materialPanel);
1442	1671	objectPanel.add(toolboxPanel);
	1672	+ objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
	1673	+ objectPanel.setToolTipTextAt(0, "Objects & textures");
	1674	+
	1675	+ objectPanel.add(materialPanel);
	1676	+ objectPanel.setIconAt(1, GetIcon("icons/material.png"));
	1677	+ objectPanel.setToolTipTextAt(1, "Material");
	1678	+
	1679	+ objectPanel.add(skyboxPanel);
	1680	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1681	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1682	+
1443	1683	// JPanel north = new JPanel(new BorderLayout());
1444	1684	// north.setName("Edit");
1445	1685	// north.add(ctrlPanel, BorderLayout.NORTH);
1446	1686	// objectPanel.add(north);
1447	1687	objectPanel.add(editPanel);
1448		- objectPanel.add(infoPanel);
1449		-
	1688	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1689	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1690	+
	1691	+ objectPanel.add(XYZPanel);
	1692	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1693	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1694	+
	1695	+ patchMaterial = true;
	1696	+ cameraView.patchMaterial = this;
	1697	+ objectPanel.setSelectedIndex(1);
	1698	+
1450	1699	/*
1451	1700	aConstraints.gridx = 0;
1452	1701	aConstraints.gridwidth = 1;
..	..	@@ -1454,7 +1703,7 @@
1454	1703	aConstraints.gridy += 1;
1455	1704	aConstraints.gridwidth = 1;
1456	1705	mainPanel.add(objectPanel, aConstraints);
1457		- */
	1706	+ */
1458	1707
1459	1708	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1460	1709	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1466,7 +1715,7 @@
1466	1715	scrollpane.addMouseWheelListener(this); // Default not fast enough
1467	1716
1468	1717	/JTabbedPane/ scenePanel = new cGridBag();
1469		- scenePanel.preferredWidth = 6;
	1718	+ scenePanel.preferredWidth = 5;
1470	1719
1471	1720	JTabbedPane tabbedPane = new JTabbedPane();
1472	1721	tabbedPane.add(scrollpane);
..	..	@@ -1483,6 +1732,11 @@
1483	1732
1484	1733	scenePanel.add(tabbedPane);
1485	1734
	1735	+ //if (Globals.ADVANCED)
	1736	+// tabbedPane.add(infoPanel);
	1737	+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1738	+// tabbedPane.setToolTipTextAt(3, "Information");
	1739	+
1486	1740	/*
1487	1741	cTree jTree = new cTree(null);
1488	1742	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1544,7 +1798,7 @@
1544	1798	bigThree = new cGridBag();
1545	1799	bigThree.addComponent(scenePanel);
1546	1800	bigThree.addComponent(centralPanel);
1547		- bigThree.addComponent(XYZPanel);
	1801	+ //bigThree.addComponent(XYZPanel);
1548	1802
1549	1803	// // SIDE EFFECT!!!
1550	1804	// aConstraints.gridx = 0;
..	..	@@ -1553,16 +1807,33 @@
1553	1807	// aConstraints.gridheight = 1;
1554	1808
1555	1809	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1556		- framePanel.setContinuousLayout(true);
1557		- framePanel.setOneTouchExpandable(true);
1558		- framePanel.setDividerLocation(0.8);
	1810	+
	1811	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1812	+ new java.beans.PropertyChangeListener()
	1813	+ {
	1814	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1815	+ {
	1816	+ if ((Integer)pce.getOldValue() == 1)
	1817	+ {
	1818	+ if (radio.layout != expandedLayout)
	1819	+ {
	1820	+ radio.layout = expandedLayout;
	1821	+ radio.layout.doClick();
	1822	+ }
	1823	+ }
	1824	+ }
	1825	+ });
	1826	+
	1827	+ framePanel.setContinuousLayout(false);
	1828	+ framePanel.setOneTouchExpandable(false);
	1829	+ //.setDividerLocation(0.8);
1559	1830	//framePanel.setDividerSize(15);
1560	1831	//framePanel.setResizeWeight(0.15);
1561	1832	framePanel.setName("Frame");
1562	1833
1563	1834	frame.getContentPane().setLayout(new BorderLayout());
1564	1835	/**/
1565		- JTabbedPane worldPane = new JTabbedPane();
	1836	+ //JTabbedPane worldPane = new JTabbedPane();
1566	1837	//worldPane.add(bigPanel);
1567	1838	//worldPane.add(worldPanel);
1568	1839	/**/
..	..	@@ -1574,17 +1845,17 @@
1574	1845
1575	1846	frame.setSize(1280, 860);
1576	1847
1577		- frame.validate();
1578		- frame.setVisible(true);
1579		-
1580	1848	cameraView.requestFocusInWindow();
1581	1849
1582	1850	gridPanel.setDividerLocation(1.0);
	1851	+
	1852	+ frame.validate();
	1853	+
	1854	+ frame.setVisible(true);
1583	1855
1584	1856	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1585	1857	frame.addWindowListener(new WindowAdapter()
1586	1858	{
1587		-
1588	1859	public void windowClosing(WindowEvent e)
1589	1860	{
1590	1861	Close();
..	..	@@ -1607,12 +1878,426 @@
1607	1878	ctrlPanel.removeAll();
1608	1879	}
1609	1880
1610		- void SetupMaterial(cGridBag panel)
	1881	+ void SetupMaterial(cGridBag materialpanel)
1611	1882	{
1612		- /*
	1883	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1884	+
	1885	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1886	+ skin.setToolTipText("Skin");
	1887	+ skin.addMouseListener(new MouseAdapter()
	1888	+ {
	1889	+ public void mouseClicked(MouseEvent e)
	1890	+ {
	1891	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1892	+ cMaterial material = object.material;
	1893	+
	1894	+ // Skin
	1895	+ colorField.setFloat(material.color);
	1896	+ float saturation = material.modulation;
	1897	+
	1898	+ if (!cameraView.Skinshader)
	1899	+ {
	1900	+ saturation /= 1.5;
	1901	+ }
	1902	+
	1903	+ saturationField.setFloat(saturation);
	1904	+
	1905	+ subsurfaceField.setFloat(material.subsurface);
	1906	+ selfshadowField.setFloat(material.diffuseness);
	1907	+ diffusenessField.setFloat(material.factor);
	1908	+ shininessField.setFloat(material.shininess);
	1909	+ shadowbiasField.setFloat(material.shadowbias);
	1910	+ diffuseField.setFloat(material.diffuse);
	1911	+ specularField.setFloat(material.specular);
	1912	+
	1913	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1914	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1915	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1916	+
	1917	+ materialtouched = true;
	1918	+ applySelf();
	1919	+ }
	1920	+ });
	1921	+ presetpanel.add(skin);
	1922	+
	1923	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1924	+ lambert.setToolTipText("Diffuse");
	1925	+ lambert.addMouseListener(new MouseAdapter()
	1926	+ {
	1927	+ public void mouseClicked(MouseEvent e)
	1928	+ {
	1929	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1930	+ cMaterial material = object.material;
	1931	+
	1932	+ diffusenessField.setFloat(material.factor);
	1933	+ selfshadowField.setFloat(material.diffuseness);
	1934	+
	1935	+ materialtouched = true;
	1936	+ applySelf();
	1937	+ }
	1938	+ });
	1939	+ presetpanel.add(lambert);
	1940	+
	1941	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1942	+ diffuse2.setToolTipText("Diffuse2");
	1943	+ diffuse2.addMouseListener(new MouseAdapter()
	1944	+ {
	1945	+ public void mouseClicked(MouseEvent e)
	1946	+ {
	1947	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1948	+ cMaterial material = object.material;
	1949	+
	1950	+ diffusenessField.setFloat(material.factor);
	1951	+ selfshadowField.setFloat(material.diffuseness);
	1952	+
	1953	+ materialtouched = true;
	1954	+ applySelf();
	1955	+ }
	1956	+ });
	1957	+ presetpanel.add(diffuse2);
	1958	+
	1959	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1960	+ diffusemoon.setToolTipText("Moon");
	1961	+ diffusemoon.addMouseListener(new MouseAdapter()
	1962	+ {
	1963	+ public void mouseClicked(MouseEvent e)
	1964	+ {
	1965	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1966	+ cMaterial material = object.material;
	1967	+
	1968	+ diffusenessField.setFloat(material.factor);
	1969	+ selfshadowField.setFloat(material.diffuseness);
	1970	+
	1971	+ materialtouched = true;
	1972	+ applySelf();
	1973	+ }
	1974	+ });
	1975	+ presetpanel.add(diffusemoon);
	1976	+
	1977	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1978	+ diffusemoon2.setToolTipText("Moon2");
	1979	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1980	+ {
	1981	+ public void mouseClicked(MouseEvent e)
	1982	+ {
	1983	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1984	+ cMaterial material = object.material;
	1985	+
	1986	+ diffusenessField.setFloat(material.factor);
	1987	+ selfshadowField.setFloat(material.diffuseness);
	1988	+
	1989	+ materialtouched = true;
	1990	+ applySelf();
	1991	+ }
	1992	+ });
	1993	+ presetpanel.add(diffusemoon2);
	1994	+
	1995	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1996	+ diffusemoon3.setToolTipText("Moon3");
	1997	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1998	+ {
	1999	+ public void mouseClicked(MouseEvent e)
	2000	+ {
	2001	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	2002	+ cMaterial material = object.material;
	2003	+
	2004	+ diffusenessField.setFloat(material.factor);
	2005	+ selfshadowField.setFloat(material.diffuseness);
	2006	+
	2007	+ materialtouched = true;
	2008	+ applySelf();
	2009	+ }
	2010	+ });
	2011	+ presetpanel.add(diffusemoon3);
	2012	+
	2013	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	2014	+ diffusesheen.setToolTipText("Sheen");
	2015	+ diffusesheen.addMouseListener(new MouseAdapter()
	2016	+ {
	2017	+ public void mouseClicked(MouseEvent e)
	2018	+ {
	2019	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2020	+ cMaterial material = object.material;
	2021	+
	2022	+ sheenField.setFloat(material.sheen);
	2023	+
	2024	+ materialtouched = true;
	2025	+ applySelf();
	2026	+ }
	2027	+ });
	2028	+ presetpanel.add(diffusesheen);
	2029	+
	2030	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2031	+ rough.setToolTipText("Rough metal");
	2032	+ rough.addMouseListener(new MouseAdapter()
	2033	+ {
	2034	+ public void mouseClicked(MouseEvent e)
	2035	+ {
	2036	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2037	+ cMaterial material = object.material;
	2038	+
	2039	+ shininessField.setFloat(material.shininess);
	2040	+ velvetField.setFloat(material.velvet);
	2041	+
	2042	+ materialtouched = true;
	2043	+ applySelf();
	2044	+ }
	2045	+ });
	2046	+ presetpanel.add(rough);
	2047	+
	2048	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2049	+ rough2.setToolTipText("Medium metal");
	2050	+ rough2.addMouseListener(new MouseAdapter()
	2051	+ {
	2052	+ public void mouseClicked(MouseEvent e)
	2053	+ {
	2054	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2055	+ cMaterial material = object.material;
	2056	+
	2057	+ shininessField.setFloat(material.shininess);
	2058	+ lightareaField.setFloat(material.lightarea);
	2059	+
	2060	+ materialtouched = true;
	2061	+ applySelf();
	2062	+ }
	2063	+ });
	2064	+ presetpanel.add(rough2);
	2065	+
	2066	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2067	+ shini0.setToolTipText("Shiny");
	2068	+ shini0.addMouseListener(new MouseAdapter()
	2069	+ {
	2070	+ public void mouseClicked(MouseEvent e)
	2071	+ {
	2072	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2073	+ cMaterial material = object.material;
	2074	+
	2075	+ shininessField.setFloat(material.shininess);
	2076	+ lightareaField.setFloat(material.lightarea);
	2077	+
	2078	+ materialtouched = true;
	2079	+ applySelf();
	2080	+ }
	2081	+ });
	2082	+ presetpanel.add(shini0);
	2083	+
	2084	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2085	+ shini1.setToolTipText("Shiny2");
	2086	+ shini1.addMouseListener(new MouseAdapter()
	2087	+ {
	2088	+ public void mouseClicked(MouseEvent e)
	2089	+ {
	2090	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2091	+ cMaterial material = object.material;
	2092	+
	2093	+ shininessField.setFloat(material.shininess);
	2094	+ lightareaField.setFloat(material.lightarea);
	2095	+
	2096	+ materialtouched = true;
	2097	+ applySelf();
	2098	+ }
	2099	+ });
	2100	+ presetpanel.add(shini1);
	2101	+
	2102	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2103	+ shini2.setToolTipText("Shiny3");
	2104	+ shini2.addMouseListener(new MouseAdapter()
	2105	+ {
	2106	+ public void mouseClicked(MouseEvent e)
	2107	+ {
	2108	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2109	+ cMaterial material = object.material;
	2110	+
	2111	+ shininessField.setFloat(material.shininess);
	2112	+ lightareaField.setFloat(material.lightarea);
	2113	+
	2114	+ materialtouched = true;
	2115	+ applySelf();
	2116	+ }
	2117	+ });
	2118	+ presetpanel.add(shini2);
	2119	+
	2120	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2121	+ aniso.setToolTipText("AnisoU");
	2122	+ aniso.addMouseListener(new MouseAdapter()
	2123	+ {
	2124	+ public void mouseClicked(MouseEvent e)
	2125	+ {
	2126	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2127	+ cMaterial material = object.material;
	2128	+
	2129	+ anisoField.setFloat(material.aniso);
	2130	+ anisoVField.setFloat(material.anisoV);
	2131	+
	2132	+ materialtouched = true;
	2133	+ applySelf();
	2134	+ }
	2135	+ });
	2136	+ presetpanel.add(aniso);
	2137	+
	2138	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2139	+ aniso2.setToolTipText("AnisoV");
	2140	+ aniso2.addMouseListener(new MouseAdapter()
	2141	+ {
	2142	+ public void mouseClicked(MouseEvent e)
	2143	+ {
	2144	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2145	+ cMaterial material = object.material;
	2146	+
	2147	+ anisoField.setFloat(material.aniso);
	2148	+ anisoVField.setFloat(material.anisoV);
	2149	+
	2150	+ materialtouched = true;
	2151	+ applySelf();
	2152	+ }
	2153	+ });
	2154	+ presetpanel.add(aniso2);
	2155	+
	2156	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2157	+ aniso3.setToolTipText("AnisoUV");
	2158	+ aniso3.addMouseListener(new MouseAdapter()
	2159	+ {
	2160	+ public void mouseClicked(MouseEvent e)
	2161	+ {
	2162	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2163	+ cMaterial material = object.material;
	2164	+
	2165	+ anisoField.setFloat(material.aniso);
	2166	+ anisoVField.setFloat(material.anisoV);
	2167	+
	2168	+ materialtouched = true;
	2169	+ applySelf();
	2170	+ }
	2171	+ });
	2172	+ presetpanel.add(aniso3);
	2173	+
	2174	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2175	+ velvet0.setToolTipText("Velvet");
	2176	+ velvet0.addMouseListener(new MouseAdapter()
	2177	+ {
	2178	+ public void mouseClicked(MouseEvent e)
	2179	+ {
	2180	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2181	+ cMaterial material = object.material;
	2182	+
	2183	+ diffusenessField.setFloat(material.factor);
	2184	+ selfshadowField.setFloat(material.diffuseness);
	2185	+ sheenField.setFloat(material.sheen);
	2186	+ shininessField.setFloat(material.shininess);
	2187	+ velvetField.setFloat(material.velvet);
	2188	+ shiftField.setFloat(material.shift);
	2189	+
	2190	+ materialtouched = true;
	2191	+ applySelf();
	2192	+ }
	2193	+ });
	2194	+ presetpanel.add(velvet0);
	2195	+
	2196	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2197	+ bump0.setToolTipText("Bump texture");
	2198	+ bump0.addMouseListener(new MouseAdapter()
	2199	+ {
	2200	+ public void mouseClicked(MouseEvent e)
	2201	+ {
	2202	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2203	+ cMaterial material = object.material;
	2204	+
	2205	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2206	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2207	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2208	+
	2209	+ materialtouched = true;
	2210	+ applySelf();
	2211	+ }
	2212	+ });
	2213	+ presetpanel.add(bump0);
	2214	+
	2215	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2216	+ borderShader.setToolTipText("Border fade");
	2217	+ borderShader.addMouseListener(new MouseAdapter()
	2218	+ {
	2219	+ public void mouseClicked(MouseEvent e)
	2220	+ {
	2221	+ borderfadeField.setFloat(0.5);
	2222	+ opacityField.setFloat(0.75);
	2223	+
	2224	+ materialtouched = true;
	2225	+ applySelf();
	2226	+ }
	2227	+ });
	2228	+ presetpanel.add(borderShader);
	2229	+
	2230	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2231	+ halo.setToolTipText("Halo");
	2232	+ halo.addMouseListener(new MouseAdapter()
	2233	+ {
	2234	+ public void mouseClicked(MouseEvent e)
	2235	+ {
	2236	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2237	+ cMaterial material = object.material;
	2238	+
	2239	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2240	+
	2241	+ materialtouched = true;
	2242	+ applySelf();
	2243	+ }
	2244	+ });
	2245	+ presetpanel.add(halo);
	2246	+
	2247	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2248	+ candle.setToolTipText("Candle");
	2249	+ candle.addMouseListener(new MouseAdapter()
	2250	+ {
	2251	+ public void mouseClicked(MouseEvent e)
	2252	+ {
	2253	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2254	+ cMaterial material = object.material;
	2255	+
	2256	+ subsurfaceField.setFloat(material.subsurface);
	2257	+ shadowbiasField.setFloat(material.shadowbias);
	2258	+ ambientField.setFloat(material.ambient);
	2259	+ specularField.setFloat(material.specular);
	2260	+ lightareaField.setFloat(material.lightarea);
	2261	+ shininessField.setFloat(material.shininess);
	2262	+
	2263	+ materialtouched = true;
	2264	+ applySelf();
	2265	+ }
	2266	+ });
	2267	+ presetpanel.add(candle);
	2268	+
	2269	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2270	+ shadowShader.setToolTipText("Shadow");
	2271	+ shadowShader.addMouseListener(new MouseAdapter()
	2272	+ {
	2273	+ public void mouseClicked(MouseEvent e)
	2274	+ {
	2275	+ diffuseField.setFloat(0.001);
	2276	+ ambientField.setFloat(0.001);
	2277	+ cameraField.setFloat(0.001);
	2278	+ specularField.setFloat(0.001);
	2279	+ fakedepthField.setFloat(0.001);
	2280	+ opacityField.setFloat(0.6);
	2281	+
	2282	+ materialtouched = true;
	2283	+ applySelf();
	2284	+ }
	2285	+ });
	2286	+ presetpanel.add(shadowShader);
	2287	+
	2288	+ cGridBag panel = new cGridBag().setVertical(true);
	2289	+
	2290	+ presetpanel.preferredWidth = 1;
	2291	+
	2292	+ materialpanel.add(presetpanel);
	2293	+ materialpanel.add(panel);
	2294	+
	2295	+ panel.preferredWidth = 8;
	2296	+
	2297	+ /*
1613	2298	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1614	2299	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1615		- */
	2300	+ */
1616	2301
1617	2302	cGridBag editBar = new cGridBag().setVertical(false);
1618	2303
..	..	@@ -1646,45 +2331,61 @@
1646	2331	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1647	2332
1648	2333	cGridBag colorSection = new cGridBag().setVertical(true);
	2334	+
	2335	+ cGridBag huepanel = new cGridBag();
	2336	+ cGridBag huelabel = new cGridBag();
	2337	+ cLabel hue = GetLabel("icons/hue.png", false);
	2338	+ hue.fit = true;
	2339	+
	2340	+ hue.addMouseListener(new MouseAdapter()
	2341	+ {
	2342	+ public void mousePressed(MouseEvent e)
	2343	+ {
	2344	+ int x = e.getX();
	2345	+
	2346	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2347	+ }
	2348	+ });
	2349	+
	2350	+ huelabel.add(hue);
	2351	+ huelabel.preferredWidth = 20;
	2352	+ huepanel.add(new cGridBag()); // Label
	2353	+ huepanel.add(huelabel); // Field/slider
	2354	+
	2355	+ huepanel.preferredHeight = 7;
	2356	+
	2357	+ colorSection.add(huepanel);
1649	2358
1650	2359	cGridBag color = new cGridBag();
1651		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1652		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1653		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2360	+
	2361	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2362	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2363	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2364	+
1654	2365	//colorField.preferredWidth = 200;
1655	2366	colorSection.add(color);
1656	2367
1657	2368	cGridBag modulation = new cGridBag();
1658	2369	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1659	2370	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1660		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2371	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1661	2372	colorSection.add(modulation);
1662	2373
	2374	+ cGridBag opacity = new cGridBag();
	2375	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2376	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2377	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2378	+ colorSection.add(opacity);
	2379	+
	2380	+ colorSection.add(GetSeparator());
	2381	+
1663	2382	cGridBag texture = new cGridBag();
1664	2383	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1665	2384	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1666	2385	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1667	2386	colorSection.add(texture);
1668	2387
1669		- cGridBag anisoU = new cGridBag();
1670		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1671		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1672		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1673		- colorSection.add(anisoU);
1674		-
1675		- cGridBag anisoV = new cGridBag();
1676		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1677		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1678		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1679		- colorSection.add(anisoV);
1680		-
1681		- cGridBag shadowbias = new cGridBag();
1682		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1683		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1684		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1685		- colorSection.add(shadowbias);
1686		-
1687		- panel.add(new JSeparator());
	2388	+ panel.add(GetSeparator());
1688	2389
1689	2390	panel.add(colorSection);
1690	2391
..	..	@@ -1734,7 +2435,13 @@
1734	2435	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1735	2436	diffuseSection.add(fakedepth);
1736	2437
1737		- panel.add(new JSeparator());
	2438	+ cGridBag shadowbias = new cGridBag();
	2439	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2440	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2441	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2442	+ diffuseSection.add(shadowbias);
	2443	+
	2444	+ panel.add(GetSeparator());
1738	2445
1739	2446	panel.add(diffuseSection);
1740	2447
..	..	@@ -1784,42 +2491,48 @@
1784	2491	// aConstraints.gridy += 1;
1785	2492	// aConstraints.gridwidth = 1;
1786	2493
	2494	+ cGridBag anisoU = new cGridBag();
	2495	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2496	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2497	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2498	+ specularSection.add(anisoU);
1787	2499
1788		- panel.add(new JSeparator());
	2500	+ cGridBag anisoV = new cGridBag();
	2501	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2502	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2503	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2504	+ specularSection.add(anisoV);
	2505	+
	2506	+
	2507	+ panel.add(GetSeparator());
1789	2508
1790	2509	panel.add(specularSection);
1791	2510
1792	2511	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1793	2512
1794		- cGridBag globalSection = new cGridBag().setVertical(true);
	2513	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1795	2514
1796	2515	cGridBag camera = new cGridBag();
1797	2516	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1798	2517	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1799	2518	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1800		- globalSection.add(camera);
	2519	+ colorSection.add(camera);
1801	2520
1802	2521	cGridBag ambient = new cGridBag();
1803	2522	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1804	2523	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1805	2524	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1806		- globalSection.add(ambient);
	2525	+ colorSection.add(ambient);
1807	2526
1808	2527	cGridBag backlit = new cGridBag();
1809	2528	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1810	2529	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1811	2530	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1812		- globalSection.add(backlit);
	2531	+ colorSection.add(backlit);
1813	2532
1814		- cGridBag opacity = new cGridBag();
1815		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1816		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1817		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1818		- globalSection.add(opacity);
1819		-
1820		- panel.add(new JSeparator());
	2533	+ //panel.add(new JSeparator());
1821	2534
1822		- panel.add(globalSection);
	2535	+ //panel.add(globalSection);
1823	2536
1824	2537	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1825	2538
..	..	@@ -1861,7 +2574,7 @@
1861	2574	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1862	2575	textureSection.add(opacityPower);
1863	2576
1864		- panel.add(new JSeparator());
	2577	+ panel.add(GetSeparator());
1865	2578
1866	2579	panel.add(textureSection);
1867	2580
..	..	@@ -1926,8 +2639,9 @@
1926	2639	// 3D models
1927	2640	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1928	2641	{
1929		- lastConverter = new com.jmex.model.converters.MaxToJme();
1930		- LoadFile(filename, lastConverter);
	2642	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2643	+ //LoadFile(filename, lastConverter);
	2644	+ LoadObjFile(filename); // New 3ds loader
1931	2645	continue;
1932	2646	}
1933	2647	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2653,6 +3367,7 @@
2653	3367	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2654	3368	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2655	3369	}
	3370	+
2656	3371	//cJME.count++;
2657	3372	//cJME.count %= 12;
2658	3373	if (gc)
..	..	@@ -2836,6 +3551,7 @@
2836	3551	}
2837	3552	}
2838	3553	}
	3554	+
2839	3555	cFileSystemPane FSPane;
2840	3556
2841	3557	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2845,7 +3561,7 @@
2845	3561
2846	3562	freezematerial = true;
2847	3563	colorField.setFloat(mat.color);
2848		- modulationField.setFloat(mat.modulation);
	3564	+ saturationField.setFloat(mat.modulation);
2849	3565	metalnessField.setFloat(mat.metalness);
2850	3566	diffuseField.setFloat(mat.diffuse);
2851	3567	specularField.setFloat(mat.specular);
..	..	@@ -2889,6 +3605,7 @@
2889	3605	}
2890	3606	}
2891	3607	}
	3608	+
2892	3609	freezematerial = false;
2893	3610	}
2894	3611
..	..	@@ -2906,32 +3623,8 @@
2906	3623
2907	3624	if (multiplyToggle != null)
2908	3625	multiplyToggle.setSelected(mat.multiply);
2909		-
2910		- assert (object.projectedVertices != null);
2911		-
2912		- if (object.projectedVertices.length <= 2)
2913		- {
2914		- // Side effect...
2915		- Object3D.cVector2[] keep = object.projectedVertices;
2916		- object.projectedVertices = new Object3D.cVector2[3];
2917		- for (int i = 0; i < 3; i++)
2918		- {
2919		- if (i < keep.length)
2920		- {
2921		- object.projectedVertices[i] = keep[i];
2922		- } else
2923		- {
2924		- object.projectedVertices[i] = new Object3D.cVector2();
2925		- }
2926		- /*
2927		- if(keep.length == 0)
2928		- object.projectedVertices[0] = new Object3D.cVector2();
2929		- else
2930		- object.projectedVertices[0] = keep[0];
2931		- object.projectedVertices[1] = new Object3D.cVector2();
2932		- */
2933		- }
2934		- }
	3626	+
	3627	+ AllocProjectedVertices(object);
2935	3628
2936	3629	SetMaterial(mat, object.projectedVertices);
2937	3630	}
..	..	@@ -3007,12 +3700,17 @@
3007	3700	// }
3008	3701
3009	3702	/**/
3010		- if (deselect)
	3703	+ if (deselect \|\| child == null)
3011	3704	{
3012	3705	//group.deselectAll();
3013	3706	//freeze = true;
3014	3707	GetTree().clearSelection();
3015	3708	//freeze = false;
	3709	+
	3710	+ if (child == null)
	3711	+ {
	3712	+ return;
	3713	+ }
3016	3714	}
3017	3715
3018	3716	//group.addSelectee(child);
..	..	@@ -3046,6 +3744,17 @@
3046	3744	public void itemStateChanged(ItemEvent event)
3047	3745	{
3048	3746	// System.out.println("Propagate = " + propagate);
	3747	+ if (event.getSource() == pinButton)
	3748	+ {
	3749	+ copy.pinned ^= true;
	3750	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3751	+ {
	3752	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3753	+ copy.CloseUI();
	3754	+ //copy.editWindow.refreshContents();
	3755	+ }
	3756	+ }
	3757	+ else
3049	3758	if (event.getSource() == propagateToggle)
3050	3759	{
3051	3760	propagate ^= true;
..	..	@@ -3150,8 +3859,9 @@
3150	3859	} else if (event.getSource() == liveCB)
3151	3860	{
3152	3861	copy.live ^= true;
	3862	+ objEditor.refreshContents(true); // To show item colors
3153	3863	return;
3154		- } else if (event.getSource() == selectCB)
	3864	+ } else if (event.getSource() == selectableCB)
3155	3865	{
3156	3866	copy.dontselect ^= true;
3157	3867	return;
..	..	@@ -3159,7 +3869,7 @@
3159	3869	{
3160	3870	copy.hide ^= true;
3161	3871	copy.Touch(); // display list issue
3162		- objEditor.refreshContents();
	3872	+ objEditor.refreshContents(true); // To show item colors
3163	3873	return;
3164	3874	} else if (event.getSource() == link2masterCB)
3165	3875	{
..	..	@@ -3224,7 +3934,7 @@
3224	3934	//System.out.println("ObjEditor " + event);
3225	3935	applySelf0(true);
3226	3936	//parent.applySelf();
3227		- objEditor.refreshContents();
	3937	+ // conflicts with requestFocus objEditor.refreshContents();
3228	3938	} else if (source == resetButton)
3229	3939	{
3230	3940	CameraPane.fullreset = true;
..	..	@@ -3336,9 +4046,9 @@
3336	4046	{
3337	4047	Close();
3338	4048	//return true;
3339		- } else if (source == loadItem)
	4049	+ } else if (source == openItem)
3340	4050	{
3341		- load();
	4051	+ Open();
3342	4052	//return true;
3343	4053	} else if (source == newItem)
3344	4054	{
..	..	@@ -3363,6 +4073,10 @@
3363	4073	{
3364	4074	generatePOV();
3365	4075	//return true;
	4076	+ } else if (event.getSource() == archiveItem)
	4077	+ {
	4078	+ cTools.Archive(frame);
	4079	+ return;
3366	4080	} else if (source == zBufferItem)
3367	4081	{
3368	4082	try
..	..	@@ -3411,11 +4125,12 @@
3411	4125
3412	4126	static public byte[] Compress(Object3D o)
3413	4127	{
	4128	+ // Slower to actually compress.
3414	4129	try
3415	4130	{
3416	4131	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3417		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3418		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	4132	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4133	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3419	4134
3420	4135	Object3D parent = o.parent;
3421	4136	o.parent = null;
..	..	@@ -3426,10 +4141,14 @@
3426	4141
3427	4142	out.flush();
3428	4143
3429		- zstream.close();
	4144	+ baos //zstream
	4145	+ .close();
3430	4146	out.close();
3431	4147
3432		- return baos.toByteArray();
	4148	+ byte[] bytes = baos.toByteArray();
	4149	+
	4150	+ System.out.println("save #bytes = " + bytes.length);
	4151	+ return bytes;
3433	4152	} catch (Exception e)
3434	4153	{
3435	4154	System.err.println(e);
..	..	@@ -3439,13 +4158,16 @@
3439	4158
3440	4159	static public Object Uncompress(byte[] bytes)
3441	4160	{
3442		- System.out.println("#bytes = " + bytes.length);
	4161	+ System.out.println("restore #bytes = " + bytes.length);
3443	4162	try
3444	4163	{
3445	4164	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3446		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3447		- ObjectInputStream in = new ObjectInputStream(istream);
	4165	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4166	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3448	4167	Object obj = in.readObject();
	4168	+
	4169	+ bais //istream
	4170	+ .close();
3449	4171	in.close();
3450	4172
3451	4173	return obj;
..	..	@@ -3500,39 +4222,97 @@
3500	4222	return null;
3501	4223	}
3502	4224
3503		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3504	4225
3505	4226	public void Save()
3506	4227	{
	4228	+ //Save(true);
	4229	+ Replace();
	4230	+ SetVersionStates();
	4231	+ }
	4232	+
	4233	+ private boolean Equal(byte[] compress, byte[] name)
	4234	+ {
	4235	+ if (compress.length != name.length)
	4236	+ {
	4237	+ return false;
	4238	+ }
	4239	+
	4240	+ for (int i=compress.length; --i>=0;)
	4241	+ {
	4242	+ if (compress[i] != name[i])
	4243	+ return false;
	4244	+ }
	4245	+
	4246	+ return true;
	4247	+ }
	4248	+
	4249	+ void DeleteVersion()
	4250	+ {
	4251	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4252	+ {
	4253	+ copy.versionlist[i] = copy.versionlist[i+1];
	4254	+ }
	4255	+
	4256	+ if (copy.versionlist[copy.versionindex] == null)
	4257	+ copy.versionindex -= 1;
	4258	+
	4259	+ if (copy.versionindex != -1)
	4260	+ CopyChanged();
	4261	+
	4262	+ SetVersionStates();
	4263	+ }
	4264	+
	4265	+ public boolean Save(boolean user)
	4266	+ {
3507	4267	System.err.println("Save");
	4268	+ Replace();
3508	4269
3509		- cRadio tab = GetCurrentTab();
	4270	+ //cRadio tab = GetCurrentTab();
3510	4271
3511		- boolean temp = CameraPane.SWITCH;
3512		- CameraPane.SWITCH = false;
	4272	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3513	4273
3514		- copy.ExtractBigData(hashtable);
	4274	+ boolean thesame = false;
	4275	+
	4276	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4277	+// {
	4278	+// thesame = true;
	4279	+// }
3515	4280
3516	4281	//EditorFrame.m_MainFrame.requestFocusInWindow();
3517		- tab.graphs[tab.undoindex++] = Compress(copy);
3518		-
3519		- copy.RestoreBigData(hashtable);
3520		-
3521		- CameraPane.SWITCH = temp;
3522		-
3523		- //assert(hashtable.isEmpty());
3524		-
3525		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	4282	+ if (!thesame)
3526	4283	{
3527		- tab.graphs[i] = null;
	4284	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4285	+ {
	4286	+ copy.versionlist[i] = copy.versionlist[i-1];
	4287	+ }
	4288	+
	4289	+ //tab.user[tab.versionindex] = user;
	4290	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4291	+
	4292	+ copy.versionlist[++copy.versionindex] = compress;
	4293	+
	4294	+ // if (increment)
	4295	+ // tab.versionindex++;
3528	4296	}
3529	4297
	4298	+ //copy.RestoreBigData(versiontable);
	4299	+
	4300	+ //assert(hashtable.isEmpty());
	4301	+
	4302	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4303	+// {
	4304	+// //tab.user[i] = false;
	4305	+// copy.versionlist[i] = null;
	4306	+// }
	4307	+
	4308	+ SetVersionStates();
	4309	+
3530	4310	// test save
3531	4311	if (false)
3532	4312	{
3533	4313	try
3534	4314	{
3535		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	4315	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3536	4316	ObjectOutputStream p = new ObjectOutputStream(ostream);
3537	4317
3538	4318	p.writeObject(copy);
..	..	@@ -3545,26 +4325,68 @@
3545	4325	e.printStackTrace();
3546	4326	}
3547	4327	}
	4328	+
	4329	+ return !thesame;
	4330	+ }
	4331	+
	4332	+ boolean flashIt = true;
	4333	+
	4334	+ void RefreshSelection()
	4335	+ {
	4336	+ Object3D selection = new Object3D();
	4337	+
	4338	+ for (int i = 0; i < copy.selection.size(); i++)
	4339	+ {
	4340	+ Object3D elem = copy.selection.elementAt(i);
	4341	+
	4342	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4343	+
	4344	+ if (obj == null)
	4345	+ {
	4346	+ copy.selection.remove(i--);
	4347	+ }
	4348	+ else
	4349	+ {
	4350	+ selection.add(obj);
	4351	+ copy.selection.setElementAt(obj, i);
	4352	+ }
	4353	+ }
	4354	+
	4355	+ flashIt = false;
	4356	+ GetTree().clearSelection();
	4357	+ for (int i = 0; i < selection.size(); i++)
	4358	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4359	+ flashIt = true;
	4360	+
	4361	+ //refreshContents(false);
3548	4362	}
3549	4363
3550		- void CopyChanged(Object3D obj)
	4364	+ void CopyChanged()
3551	4365	{
	4366	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4367	+
	4368	+ SetVersionStates();
	4369	+
3552	4370	boolean temp = CameraPane.SWITCH;
3553	4371	CameraPane.SWITCH = false;
3554	4372
3555		- copy.ExtractBigData(hashtable);
	4373	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
3556	4374
3557	4375	copy.clear();
3558	4376
	4377	+ copy.skyboxname = obj.skyboxname;
	4378	+ copy.skyboxext = obj.skyboxext;
	4379	+
3559	4380	for (int i=0; i<obj.Size(); i++)
3560	4381	{
3561	4382	copy.add(obj.get(i));
3562	4383	}
3563	4384
3564		- copy.RestoreBigData(hashtable);
	4385	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
3565	4386
3566	4387	CameraPane.SWITCH = temp;
3567	4388
	4389	+ RefreshSelection();
3568	4390	//assert(hashtable.isEmpty());
3569	4391
3570	4392	copy.Touch();
..	..	@@ -3585,45 +4407,144 @@
3585	4407	}
3586	4408	}
3587	4409
3588		- refreshContents();
	4410	+ refreshContents(true);
3589	4411	}
3590	4412
3591		- public void Undo()
	4413	+ cButton previousVersionButton;
	4414	+ cButton restoreButton;
	4415	+ cButton replaceButton;
	4416	+ cButton nextVersionButton;
	4417	+ cButton saveVersionButton;
	4418	+ cButton deleteVersionButton;
	4419	+
	4420	+ boolean muteSlider;
	4421	+
	4422	+ int VersionCount()
3592	4423	{
	4424	+ int count = 0;
	4425	+
	4426	+ for (int i = copy.versionlist.length; --i >= 0;)
	4427	+ {
	4428	+ if (copy.versionlist[i] != null)
	4429	+ count++;
	4430	+ }
	4431	+
	4432	+ return count;
	4433	+ }
	4434	+
	4435	+ void SetVersionStates()
	4436	+ {
	4437	+ //if (true)
	4438	+ // return;
	4439	+
	4440	+ //cRadio tab = GetCurrentTab();
	4441	+
	4442	+ restoreButton.setEnabled(copy.versionindex != -1);
	4443	+ replaceButton.setEnabled(copy.versionindex != -1);
	4444	+
	4445	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4446	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4447	+
	4448	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4449	+ //copy.versionlist[copy.versionindex + 1] != null);
	4450	+
	4451	+ muteSlider = true;
	4452	+ versionSlider.setMinimum(0);
	4453	+ versionSlider.setMaximum(VersionCount() - 1);
	4454	+ versionSlider.setInteger(copy.versionindex);
	4455	+ versionSlider.setEnabled(copy.versionindex != -1);
	4456	+ muteSlider = false;
	4457	+ }
	4458	+
	4459	+ public boolean PreviousVersion()
	4460	+ {
	4461	+ // Option?
	4462	+ Replace();
	4463	+
3593	4464	System.err.println("Undo");
3594	4465
3595		- cRadio tab = GetCurrentTab();
	4466	+ //cRadio tab = GetCurrentTab();
3596	4467
3597		- if (tab.undoindex == 0)
	4468	+ if (copy.versionindex == 0)
3598	4469	{
3599	4470	java.awt.Toolkit.getDefaultToolkit().beep();
3600		- return;
	4471	+ return false;
3601	4472	}
3602	4473
3603		- if (tab.graphs[tab.undoindex] == null)
3604		- {
3605		- Save();
3606		- tab.undoindex -= 1;
3607		- }
	4474	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4475	+// {
	4476	+// if (Save(false))
	4477	+// tab.versionindex -= 1;
	4478	+// else
	4479	+// {
	4480	+// if (tab.versionindex <= 0)
	4481	+// return false;
	4482	+// else
	4483	+// tab.versionindex -= 1;
	4484	+// }
	4485	+// }
3608	4486
3609		- tab.undoindex -= 1;
	4487	+ copy.versionindex -= 1;
3610	4488
3611		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4489	+ CopyChanged();
	4490	+
	4491	+ return true;
3612	4492	}
3613	4493
3614		- public void Redo()
	4494	+ public boolean Restore()
3615	4495	{
3616		- cRadio tab = GetCurrentTab();
	4496	+ System.err.println("Restore");
3617	4497
3618		- if (tab.graphs[tab.undoindex + 1] == null)
	4498	+ //cRadio tab = GetCurrentTab();
	4499	+
	4500	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4501	+ {
	4502	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4503	+ return false;
	4504	+ }
	4505	+
	4506	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4507	+ CopyChanged();
	4508	+
	4509	+ return true;
	4510	+ }
	4511	+
	4512	+ public boolean Replace()
	4513	+ {
	4514	+ //System.err.println("Replace");
	4515	+
	4516	+ //cRadio tab = GetCurrentTab();
	4517	+
	4518	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4519	+ {
	4520	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4521	+ return false;
	4522	+ }
	4523	+
	4524	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4525	+
	4526	+ return true;
	4527	+ }
	4528	+
	4529	+ public void NextVersion()
	4530	+ {
	4531	+ // Option?
	4532	+ Replace();
	4533	+
	4534	+ //cRadio tab = GetCurrentTab();
	4535	+
	4536	+ if (copy.versionlist[copy.versionindex + 1] == null)
3619	4537	{
3620	4538	java.awt.Toolkit.getDefaultToolkit().beep();
3621	4539	return;
3622	4540	}
3623	4541
3624		- tab.undoindex += 1;
	4542	+ copy.versionindex += 1;
3625	4543
3626		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4544	+ CopyChanged();
	4545	+
	4546	+ //if (!tab.user[tab.versionindex])
	4547	+ // tab.graphs[tab.versionindex] = null;
3627	4548	}
3628	4549
3629	4550	void ImportGFD()
..	..	@@ -3834,7 +4755,7 @@
3834	4755	//copy.material = new cMaterial(copy.GetMaterial());
3835	4756
3836	4757	current.color = (float) colorField.getFloat();
3837		- current.modulation = (float) modulationField.getFloat();
	4758	+ current.modulation = (float) saturationField.getFloat();
3838	4759	current.metalness = (float) metalnessField.getFloat();
3839	4760	current.diffuse = (float) diffuseField.getFloat();
3840	4761	current.specular = (float) specularField.getFloat();
..	..	@@ -3867,7 +4788,7 @@
3867	4788	cMaterial mat = copy.material;
3868	4789
3869	4790	colorField.SetToolTipValue((mat.color));
3870		- modulationField.SetToolTipValue((mat.modulation));
	4791	+ saturationField.SetToolTipValue((mat.modulation));
3871	4792	metalnessField.SetToolTipValue((mat.metalness));
3872	4793	diffuseField.SetToolTipValue((mat.diffuse));
3873	4794	specularField.SetToolTipValue((mat.specular));
..	..	@@ -3919,9 +4840,28 @@
3919	4840	//copy.Touch();
3920	4841	}
3921	4842
	4843	+ cNumberSlider versionSlider;
	4844	+
3922	4845	public void stateChanged(ChangeEvent e)
3923	4846	{
3924	4847	// assert(false);
	4848	+ if (e.getSource() == versionSlider)
	4849	+ {
	4850	+ if (muteSlider)
	4851	+ return;
	4852	+
	4853	+ Replace();
	4854	+
	4855	+ int version = versionSlider.getInteger();
	4856	+
	4857	+ if (version != -1 && copy.versionlist[version] != null)
	4858	+ {
	4859	+ copy.versionindex = version;
	4860	+ CopyChanged();
	4861	+ }
	4862	+
	4863	+ return;
	4864	+ }
3925	4865
3926	4866	if (freezematerial)
3927	4867	{
..	..	@@ -3957,6 +4897,12 @@
3957	4897	{
3958	4898	//System.out.println("stateChanged = " + this);
3959	4899	materialtouched = true;
	4900	+
	4901	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4902	+ {
	4903	+ saturationField.setFloat(1);
	4904	+ }
	4905	+
3960	4906	applySelf();
3961	4907	//System.out.println("this = " + this);
3962	4908	//System.out.println("PARENT = " + parent);
..	..	@@ -4256,6 +5202,7 @@
4256	5202	{
4257	5203	if (GetTree() != null)
4258	5204	{
	5205	+ GetTree().revalidate();
4259	5206	GetTree().repaint();
4260	5207	}
4261	5208
..	..	@@ -4264,13 +5211,18 @@
4264	5211	ctrlPanel.validate(); // ? new
4265	5212	ctrlPanel.repaint();
4266	5213	}
	5214	+
	5215	+ if (previousVersionButton != null && copy.versionlist != null)
	5216	+ SetVersionStates();
	5217	+
	5218	+ cameraView.requestFocusInWindow();
4267	5219	}
4268	5220
4269	5221	static TweenManager tweenManager = new TweenManager();
4270	5222
4271	5223	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4272	5224	{
4273		- if (Globals.SAVEONMAKE) // && resetmodel)
	5225	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4274	5226	Save();
4275	5227	//Tween.set(thing, 0).target(1).start(tweenManager);
4276	5228	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4295,7 +5247,7 @@
4295	5247	// group = (Composite) group.get(0);
4296	5248	// }
4297	5249
4298		- System.out.println("makeSomething of " + thing);
	5250	+ //System.out.println("makeSomething of " + thing);
4299	5251
4300	5252	/*
4301	5253	if (deselect && jList != null)
..	..	@@ -4512,7 +5464,9 @@
4512	5464	readobj.ResetDisplayList();
4513	5465	} catch (Exception e)
4514	5466	{
4515		- //e.printStackTrace();
	5467	+ if (!e.toString().contains("GZIP"))
	5468	+ e.printStackTrace();
	5469	+
4516	5470	try
4517	5471	{
4518	5472	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4586,12 +5540,14 @@
4586	5540
4587	5541	if (readobj != null)
4588	5542	{
4589		- if (Globals.SAVEONMAKE)
4590		- Save();
	5543	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5544	+ // Save();
4591	5545	try
4592	5546	{
4593	5547	//readobj.deepCopySelf(copy);
4594	5548	copy.clear(); // june 2014
	5549	+ copy.skyboxname = readobj.skyboxname;
	5550	+ copy.skyboxext = readobj.skyboxext;
4595	5551	for (int i = 0; i < readobj.size(); i++)
4596	5552	{
4597	5553	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4632,6 +5588,7 @@
4632	5588	}
4633	5589	} catch (ClassCastException e)
4634	5590	{
	5591	+ e.printStackTrace();
4635	5592	assert (false);
4636	5593	Composite c = (Composite) copy;
4637	5594	c.children.clear();
..	..	@@ -4642,17 +5599,32 @@
4642	5599	c.addChild(csg);
4643	5600	}
4644	5601
	5602	+ copy.versionlist = readobj.versionlist;
	5603	+ copy.versionindex = readobj.versionindex;
	5604	+ copy.versiontable = readobj.versiontable;
	5605	+
	5606	+ if (copy.versionlist == null)
	5607	+ {
	5608	+ // Backward compatibility
	5609	+ copy.versionlist = new Object3D[100];
	5610	+ copy.versionindex = -1;
	5611	+
	5612	+ //Save(true);
	5613	+ }
	5614	+
	5615	+ //? SetUndoStates();
	5616	+
4645	5617	ResetModel();
4646	5618	copy.HardTouch(); // recompile?
4647	5619	refreshContents();
4648	5620	}
4649	5621	}
4650	5622
4651		- void load() // throws ClassNotFoundException
	5623	+ void Open() // throws ClassNotFoundException
4652	5624	{
4653	5625	if (Grafreed.standAlone)
4654	5626	{
4655		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5627	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4656	5628	browser.show();
4657	5629	String filename = browser.getFile();
4658	5630	if (filename != null && filename.length() > 0)
..	..	@@ -4729,6 +5701,8 @@
4729	5701
4730	5702	void save()
4731	5703	{
	5704	+ Replace();
	5705	+
4732	5706	if (lastname == null)
4733	5707	{
4734	5708	return;
..	..	@@ -4751,6 +5725,7 @@
4751	5725	//ps.print(buffer.toString());
4752	5726	} catch (IOException e)
4753	5727	{
	5728	+ e.printStackTrace();
4754	5729	}
4755	5730	}
4756	5731
..	..	@@ -4765,6 +5740,8 @@
4765	5740	String filename = browser.getFile();
4766	5741	if (filename != null && filename.length() > 0)
4767	5742	{
	5743	+ if (!filename.endsWith(".gfd"))
	5744	+ filename += ".gfd";
4768	5745	lastname = browser.getDirectory() + filename;
4769	5746	save();
4770	5747	}
..	..	@@ -4931,7 +5908,7 @@
4931	5908	MenuBar menuBar;
4932	5909	Menu fileMenu;
4933	5910	MenuItem newItem;
4934		- MenuItem loadItem;
	5911	+ MenuItem openItem;
4935	5912	MenuItem saveItem;
4936	5913	MenuItem saveAsItem;
4937	5914	MenuItem exportAsItem;
..	..	@@ -4954,6 +5931,7 @@
4954	5931	CheckboxMenuItem toggleSwitchItem;
4955	5932	CheckboxMenuItem toggleRootItem;
4956	5933	CheckboxMenuItem animationItem;
	5934	+ MenuItem archiveItem;
4957	5935	CheckboxMenuItem toggleHandleItem;
4958	5936	CheckboxMenuItem togglePaintItem;
4959	5937	JSplitPane mainPanel;
..	..	@@ -4967,6 +5945,7 @@
4967	5945	ButtonGroup buttonGroup;
4968	5946
4969	5947	cGridBag toolboxPanel;
	5948	+ cGridBag skyboxPanel;
4970	5949	cGridBag materialPanel;
4971	5950	cGridBag ctrlPanel;
4972	5951
..	..	@@ -5040,7 +6019,7 @@
5040	6019	JLabel colorLabel;
5041	6020	cNumberSlider colorField;
5042	6021	JLabel modulationLabel;
5043		- cNumberSlider modulationField;
	6022	+ cNumberSlider saturationField;
5044	6023	JLabel metalnessLabel;
5045	6024	cNumberSlider metalnessField;
5046	6025	JLabel diffuseLabel;
..	..	@@ -5071,6 +6050,7 @@
5071	6050	cNumberSlider anisoField;
5072	6051	JLabel anisoVLabel;
5073	6052	cNumberSlider anisoVField;
	6053	+
5074	6054	JLabel cameraLabel;
5075	6055	cNumberSlider cameraField;
5076	6056	JLabel selfshadowLabel;
..	..	@@ -5085,6 +6065,7 @@
5085	6065	cNumberSlider fakedepthField;
5086	6066	JLabel shadowbiasLabel;
5087	6067	cNumberSlider shadowbiasField;
	6068	+
5088	6069	JLabel bumpLabel;
5089	6070	cNumberSlider bumpField;
5090	6071	JLabel noiseLabel;