~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,51 +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);
	93	+ }
	94	+
	95	+ cToggleButton GetToggleButton(String name, boolean border)
	96	+ {
	97	+ ImageIcon icon = GetIcon(name);
	98	+ return new cToggleButton(icon, border);
53	99	}
54	100
55	101	cCheckBox GetCheckBox(String name, boolean border)
56	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	+
57	117	try
58	118	{
59		- ImageIcon icon = GetIcon(name);
60		- 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;
61	138	}
62	139	catch (Exception e)
63	140	{
64		- return new cCheckBox(name, border);
	141	+ //icons.put(name, null);
	142	+ return null;
65	143	}
66	144	}
67		-
68		- private ImageIcon GetIcon(String name) throws IOException
	145	+
	146	+ BufferedImage GetImage(String name)
69	147	{
70		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
71		-
72		- if (image.getWidth() != 24 && image.getHeight() != 24)
	148	+ try
73	149	{
74		- BufferedImage resized = new BufferedImage(24, 24, image.getType());
75		- Graphics2D g = resized.createGraphics();
76		- g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
77		- //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
78		- g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
79		- g.dispose();
80		-
81		- image = resized;
	150	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	151	+
	152	+ return image;
82	153	}
83		-
84		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
85		- return icon;
	154	+ catch (Exception e)
	155	+ {
	156	+ return null;
	157	+ }
86	158	}
87	159
88	160	// SCRIPT
..	..	@@ -194,7 +266,7 @@
194	266
195	267	objEditor.ctrlPanel.remove(namePanel);
196	268
197		- if (!GroupEditor.allparams)
	269	+ if (!allparams)
198	270	return;
199	271
200	272	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -266,6 +338,14 @@
266	338	client = inClient;
267	339	copy = client;
268	340
	341	+// if (copy.versionlist == null)
	342	+// {
	343	+// copy.versionlist = new Object3D[100];
	344	+// copy.versionindex = -1;
	345	+//
	346	+// callee.Save(true);
	347	+// }
	348	+
269	349	// "this" is not called: SetupUI2(objEditor);
270	350	}
271	351
..	..	@@ -279,6 +359,14 @@
279	359	client = inClient;
280	360	copy = client;
281	361
	362	+ if (copy.versionlist == null)
	363	+ {
	364	+ copy.versionlist = new Object3D[100];
	365	+ copy.versionindex = -1;
	366	+
	367	+// Save(true);
	368	+ }
	369	+
282	370	SetupUI2(callee.GetEditor());
283	371	}
284	372
..	..	@@ -293,14 +381,15 @@
293	381	//localCopy.parent = null;
294	382
295	383	frame = new JFrame();
296		- frame.setUndecorated(true);
	384	+ frame.setUndecorated(false);
297	385	objEditor = this;
298	386	this.callee = callee;
299	387
300	388	//parent = p;
301	389
302	390	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
303		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	391	+ if (Globals.DEBUG)
	392	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
304	393	//gd.setFullScreenWindow(this);
305	394	//setResizable(false);
306	395	//if (!isDisplayable())
..	..	@@ -311,6 +400,14 @@
311	400	copy = localCopy;
312	401	copy.editWindow = this;
313	402
	403	+// if (copy.versionlist == null)
	404	+// {
	405	+// copy.versionlist = new Object3D[100];
	406	+// copy.versionindex = -1;
	407	+//
	408	+// Save(true);
	409	+// }
	410	+
314	411	SetupMenu();
315	412
316	413	//SetupName(objEditor); // new
..	..	@@ -324,12 +421,20 @@
324	421	return frame.action(event, obj);
325	422	}
326	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	+
327	432	void SetupMenu()
328	433	{
329	434	frame.setMenuBar(menuBar = new MenuBar());
330	435	menuBar.add(fileMenu = new Menu("File"));
331	436	fileMenu.add(newItem = new MenuItem("New"));
332		- fileMenu.add(loadItem = new MenuItem("Open..."));
	437	+ fileMenu.add(openItem = new MenuItem("Open..."));
333	438
334	439	//oe.menuBar.add(menu = new Menu("Include"));
335	440	Menu menu = new Menu("Import");
..	..	@@ -361,7 +466,7 @@
361	466	}
362	467
363	468	newItem.addActionListener(this);
364		- loadItem.addActionListener(this);
	469	+ openItem.addActionListener(this);
365	470	saveItem.addActionListener(this);
366	471	saveAsItem.addActionListener(this);
367	472	exportAsItem.addActionListener(this);
..	..	@@ -370,13 +475,72 @@
370	475	closeItem.addActionListener(this);
371	476
372	477	objectPanel = new JTabbedPane();
	478	+
	479	+ ChangeListener changeListener = new ChangeListener()
	480	+ {
	481	+ //String name;
	482	+
	483	+ public void stateChanged(ChangeEvent changeEvent)
	484	+ {
	485	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	486	+// {
	487	+// if (latestObject != null)
	488	+// {
	489	+// refreshContents(true);
	490	+// SetMaterial(latestObject);
	491	+// }
	492	+//
	493	+// materialFlushed = true;
	494	+// }
	495	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	496	+// {
	497	+// if (listUI.size() == 0)
	498	+// EditSelection(false);
	499	+// }
	500	+
	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();
	532	+ }
	533	+ };
	534	+ objectPanel.addChangeListener(changeListener);
	535	+
373	536	toolbarPanel = new JPanel();
374	537	toolbarPanel.setName("Toolbar");
	538	+
375	539	treePanel = new cGridBag();
376	540	treePanel.setName("Tree");
377	541
378	542	editPanel = new cGridBag().setVertical(true);
379		- editPanel.setName("Edit");
	543	+ //editPanel.setName("Edit");
380	544
381	545	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
382	546
..	..	@@ -384,23 +548,29 @@
384	548	editPanel.add(editCommandsPanel);
385	549	editPanel.add(ctrlPanel);
386	550
387		- materialPanel = new cGridBag().setVertical(true);
	551	+ toolboxPanel = new cGridBag().setVertical(true);
	552	+ //toolboxPanel.setName("Toolbox");
388	553
389		- materialPanel.setName("Material");
	554	+ skyboxPanel = new cGridBag().setVertical(true);
	555	+
	556	+ materialPanel = new cGridBag().setVertical(false);
	557	+ //materialPanel.setName("Material");
	558	+
390	559	/JTextPane/
391	560	infoarea = createTextPane();
392	561	doc = infoarea.getStyledDocument();
393	562
394	563	infoarea.setEditable(true);
395	564	SetText();
	565	+
396	566	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
397	567	// infoarea.setOpaque(false);
398	568	// //infoarea.setForeground(textcolor);
399	569	// TEXTAREA infoarea.setLineWrap(true);
400	570	// TEXTAREA infoarea.setWrapStyleWord(true);
401	571	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
402		- infoPanel.setPreferredSize(new Dimension(50, 200));
403		- infoPanel.setName("Info");
	572	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	573	+ //infoPanel.setName("Info");
404	574	//infoPanel.setLayout(new BorderLayout());
405	575	//infoPanel.add(createTextPane());
406	576
..	..	@@ -411,7 +581,14 @@
411	581	mainPanel.setDividerSize(9);
412	582	mainPanel.setDividerLocation(0.5); //1.0);
413	583	mainPanel.setResizeWeight(0.5);
414		-
	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	+
415	592	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
416	593	//mainPanel.setLayout(new GridBagLayout());
417	594	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -642,8 +819,8 @@
642	819	}
643	820	}
644	821
645		-static GraphicsDevice device = GraphicsEnvironment
646		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	822	+//static GraphicsDevice device = GraphicsEnvironment
	823	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
647	824
648	825	Rectangle keeprect;
649	826	cRadio radio;
..	..	@@ -659,13 +836,25 @@
659	836
660	837	boolean maximized;
661	838
	839	+ cButton fullscreenLayout;
	840	+ cButton expandedLayout;
	841	+
662	842	void Minimize()
663	843	{
664	844	frame.setState(Frame.ICONIFIED);
	845	+ frame.validate();
665	846	}
666	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={}
667	851	void Maximize()
668	852	{
	853	+ if (CameraPane.FULLSCREEN)
	854	+ {
	855	+ ToggleFullScreen();
	856	+ }
	857	+
669	858	if (maximized)
670	859	{
671	860	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -673,20 +862,38 @@
673	862	else
674	863	{
675	864	keeprect = frame.getBounds();
676		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
677		- Dimension rect2 = frame.getToolkit().getScreenSize();
678		- frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	865	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	866	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	867	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
679	868	// frame.setState(Frame.MAXIMIZED_BOTH);
	869	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
680	870	}
681	871
682	872	maximized ^= true;
	873	+
	874	+ frame.validate();
683	875	}
	876	+
	877	+ cButton minButton;
	878	+ cButton maxButton;
	879	+ cButton fullButton;
	880	+ cButton collapseButton;
	881	+ cButton maximize3DButton;
684	882
685	883	void ToggleFullScreen()
686	884	{
687		- if (CameraPane.FULLSCREEN)
	885	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	886	+
	887	+ cameraView.ToggleFullScreen();
	888	+
	889	+ if (!CameraPane.FULLSCREEN)
688	890	{
689	891	device.setFullScreenWindow(null);
	892	+ frame.dispose();
	893	+ frame.setUndecorated(false);
	894	+ frame.validate();
	895	+ frame.setVisible(true);
	896	+
690	897	//frame.setVisible(false);
691	898	// frame.removeNotify();
692	899	// frame.setUndecorated(false);
..	..	@@ -696,13 +903,13 @@
696	903	// X frame.getContentPane().remove(/"Center",/bigThree);
697	904	// X framePanel.add(bigThree);
698	905	// X frame.getContentPane().add(/"Center",/framePanel);
699		- framePanel.setDividerLocation(1);
	906	+// framePanel.setDividerLocation(46); // icons are 24x24
700	907
701	908	//frame.setVisible(true);
702		- radio.layout = keepButton;
	909	+// radio.layout = keepButton;
703	910	//theFrame = null;
704	911	keepButton = null;
705		- radio.layout.doClick();
	912	+// radio.layout.doClick();
706	913
707	914	} else
708	915	{
..	..	@@ -711,22 +918,65 @@
711	918	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
712	919	// frame.getToolkit().getScreenSize().height);
713	920	//frame.setVisible(false);
	921	+
	922	+ frame.dispose();
	923	+ frame.setUndecorated(true);
714	924	device.setFullScreenWindow(frame);
	925	+ frame.validate();
	926	+ frame.setVisible(true);
715	927	// frame.removeNotify();
716	928	// frame.setUndecorated(true);
717	929	// frame.addNotify();
718	930	// X frame.getContentPane().remove(/"Center",/framePanel);
719	931	// X framePanel.remove(bigThree);
720	932	// X frame.getContentPane().add(/"Center",/bigThree);
721		- framePanel.setDividerLocation(0);
	933	+// framePanel.setDividerLocation(0);
722	934
723		- radio.layout = twoButton;
724		- radio.layout.doClick();
	935	+// radio.layout = fullscreenLayout;
	936	+// radio.layout.doClick();
725	937	//frame.setVisible(true);
726	938	}
727		-
728		- cameraView.ToggleFullScreen();
	939	+ frame.validate();
	940	+
	941	+ cameraView.requestFocusInWindow();
729	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	+ }
730	980
731	981	private JTextPane createTextPane()
732	982	{
..	..	@@ -849,6 +1099,7 @@
849	1099	{
850	1100	SetupMaterial(materialPanel);
851	1101	}
	1102	+
852	1103	//SetupName();
853	1104	//SetupViews();
854	1105	}
..	..	@@ -858,7 +1109,7 @@
858	1109	// NumberSlider vDivsField;
859	1110	// JCheckBox endcaps;
860	1111	JCheckBox liveCB;
861		- JCheckBox selectCB;
	1112	+ JCheckBox selectableCB;
862	1113	JCheckBox hideCB;
863	1114	JCheckBox link2masterCB;
864	1115	JCheckBox markCB;
..	..	@@ -866,7 +1117,12 @@
866	1117	JCheckBox speedupCB;
867	1118	JCheckBox rewindCB;
868	1119	JCheckBox flipVCB;
	1120	+
	1121	+ cCheckBox toggleTextureCB;
	1122	+ cCheckBox toggleSwitchCB;
	1123	+
869	1124	JComboBox texresMenu;
	1125	+
870	1126	JButton resetButton;
871	1127	JButton stepButton;
872	1128	JButton stepAllButton;
..	..	@@ -1052,39 +1308,55 @@
1052	1308
1053	1309	namePanel = new cGridBag();
1054	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	+
1055	1323	nameField = AddText(namePanel, copy.GetName());
1056		- namePanel.add(nameField);
	1324	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1057	1325	oe.ctrlPanel.add(namePanel);
1058	1326
1059	1327	oe.ctrlPanel.Return();
1060	1328
1061		- if (!GroupEditor.allparams)
	1329	+ if (!allparams)
1062	1330	return;
1063	1331
1064	1332	setupPanel = new cGridBag().setVertical(false);
1065	1333
1066	1334	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1067	1335	liveCB.setToolTipText("Animate object");
1068		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1069		- 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");
1070	1340	// Return();
	1341	+
1071	1342	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1072	1343	hideCB.setToolTipText("Hide object");
1073		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1074		- markCB.setToolTipText("Set the animation target transform");
	1344	+
	1345	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1075	1346
1076	1347	setupPanel2 = new cGridBag().setVertical(false);
1077	1348
1078	1349	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1079	1350	rewindCB.setToolTipText("Rewind animation");
1080	1351
1081		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1082		- 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)");
1083	1354
	1355	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1356	+ link2masterCB.setToolTipText("Attach to support");
	1357	+
1084	1358	if (Globals.ADVANCED)
1085	1359	{
1086		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1087		- link2masterCB.setToolTipText("Attach to support");
1088	1360	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1089	1361	speedupCB.setToolTipText("Option motion capture");
1090	1362	}
..	..	@@ -1270,6 +1542,7 @@
1270	1542
1271	1543	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1272	1544	{
	1545	+ if (Globals.DEBUG)
1273	1546	System.out.println("CREATE CAMERAS");
1274	1547	cams = new cTemplate();
1275	1548	cams.name = "Cameras";
..	..	@@ -1358,6 +1631,7 @@
1358	1631	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1359	1632	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1360	1633	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1634	+ //XYZPanel.setName("XYZ");
1361	1635
1362	1636	/*
1363	1637	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1394,14 +1668,34 @@
1394	1668
1395	1669	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1396	1670	//tmp.setName("Edit");
	1671	+ objectPanel.add(toolboxPanel);
	1672	+ objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
	1673	+ objectPanel.setToolTipTextAt(0, "Objects & textures");
	1674	+
1397	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	+
1398	1683	// JPanel north = new JPanel(new BorderLayout());
1399	1684	// north.setName("Edit");
1400	1685	// north.add(ctrlPanel, BorderLayout.NORTH);
1401	1686	// objectPanel.add(north);
1402	1687	objectPanel.add(editPanel);
1403		- objectPanel.add(infoPanel);
1404		-
	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	+
1405	1699	/*
1406	1700	aConstraints.gridx = 0;
1407	1701	aConstraints.gridwidth = 1;
..	..	@@ -1409,7 +1703,7 @@
1409	1703	aConstraints.gridy += 1;
1410	1704	aConstraints.gridwidth = 1;
1411	1705	mainPanel.add(objectPanel, aConstraints);
1412		- */
	1706	+ */
1413	1707
1414	1708	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1415	1709	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1421,14 +1715,12 @@
1421	1715	scrollpane.addMouseWheelListener(this); // Default not fast enough
1422	1716
1423	1717	/JTabbedPane/ scenePanel = new cGridBag();
1424		- scenePanel.preferredWidth = 6;
	1718	+ scenePanel.preferredWidth = 5;
1425	1719
1426	1720	JTabbedPane tabbedPane = new JTabbedPane();
1427	1721	tabbedPane.add(scrollpane);
1428	1722
1429		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1430		-
1431		- optionsPanel = new cGridBag().setVertical(true);
	1723	+ optionsPanel = new cGridBag().setVertical(false);
1432	1724
1433	1725	optionsPanel.setName("Options");
1434	1726
..	..	@@ -1436,8 +1728,15 @@
1436	1728
1437	1729	tabbedPane.add(optionsPanel);
1438	1730
	1731	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1732	+
1439	1733	scenePanel.add(tabbedPane);
1440	1734
	1735	+ //if (Globals.ADVANCED)
	1736	+// tabbedPane.add(infoPanel);
	1737	+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1738	+// tabbedPane.setToolTipTextAt(3, "Information");
	1739	+
1441	1740	/*
1442	1741	cTree jTree = new cTree(null);
1443	1742	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1499,7 +1798,7 @@
1499	1798	bigThree = new cGridBag();
1500	1799	bigThree.addComponent(scenePanel);
1501	1800	bigThree.addComponent(centralPanel);
1502		- bigThree.addComponent(XYZPanel);
	1801	+ //bigThree.addComponent(XYZPanel);
1503	1802
1504	1803	// // SIDE EFFECT!!!
1505	1804	// aConstraints.gridx = 0;
..	..	@@ -1508,16 +1807,33 @@
1508	1807	// aConstraints.gridheight = 1;
1509	1808
1510	1809	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1511		- framePanel.setContinuousLayout(true);
1512		- framePanel.setOneTouchExpandable(true);
1513		- 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);
1514	1830	//framePanel.setDividerSize(15);
1515	1831	//framePanel.setResizeWeight(0.15);
1516	1832	framePanel.setName("Frame");
1517	1833
1518	1834	frame.getContentPane().setLayout(new BorderLayout());
1519	1835	/**/
1520		- JTabbedPane worldPane = new JTabbedPane();
	1836	+ //JTabbedPane worldPane = new JTabbedPane();
1521	1837	//worldPane.add(bigPanel);
1522	1838	//worldPane.add(worldPanel);
1523	1839	/**/
..	..	@@ -1528,16 +1844,18 @@
1528	1844	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1529	1845
1530	1846	frame.setSize(1280, 860);
1531		- frame.setVisible(true);
1532		-
	1847	+
1533	1848	cameraView.requestFocusInWindow();
1534	1849
1535	1850	gridPanel.setDividerLocation(1.0);
	1851	+
	1852	+ frame.validate();
	1853	+
	1854	+ frame.setVisible(true);
1536	1855
1537	1856	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1538	1857	frame.addWindowListener(new WindowAdapter()
1539	1858	{
1540		-
1541	1859	public void windowClosing(WindowEvent e)
1542	1860	{
1543	1861	Close();
..	..	@@ -1560,12 +1878,426 @@
1560	1878	ctrlPanel.removeAll();
1561	1879	}
1562	1880
1563		- void SetupMaterial(cGridBag panel)
	1881	+ void SetupMaterial(cGridBag materialpanel)
1564	1882	{
1565		- /*
	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	+ /*
1566	2298	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1567	2299	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1568		- */
	2300	+ */
1569	2301
1570	2302	cGridBag editBar = new cGridBag().setVertical(false);
1571	2303
..	..	@@ -1599,45 +2331,61 @@
1599	2331	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1600	2332
1601	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);
1602	2358
1603	2359	cGridBag color = new cGridBag();
1604		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1605		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1606		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	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	+
1607	2365	//colorField.preferredWidth = 200;
1608	2366	colorSection.add(color);
1609	2367
1610	2368	cGridBag modulation = new cGridBag();
1611	2369	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1612	2370	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1613		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2371	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1614	2372	colorSection.add(modulation);
1615	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	+
1616	2382	cGridBag texture = new cGridBag();
1617	2383	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1618	2384	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1619	2385	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1620	2386	colorSection.add(texture);
1621	2387
1622		- cGridBag anisoU = new cGridBag();
1623		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1624		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1625		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1626		- colorSection.add(anisoU);
1627		-
1628		- cGridBag anisoV = new cGridBag();
1629		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1630		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1631		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1632		- colorSection.add(anisoV);
1633		-
1634		- cGridBag shadowbias = new cGridBag();
1635		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1636		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1637		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1638		- colorSection.add(shadowbias);
1639		-
1640		- panel.add(new JSeparator());
	2388	+ panel.add(GetSeparator());
1641	2389
1642	2390	panel.add(colorSection);
1643	2391
..	..	@@ -1687,7 +2435,13 @@
1687	2435	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1688	2436	diffuseSection.add(fakedepth);
1689	2437
1690		- 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());
1691	2445
1692	2446	panel.add(diffuseSection);
1693	2447
..	..	@@ -1737,42 +2491,48 @@
1737	2491	// aConstraints.gridy += 1;
1738	2492	// aConstraints.gridwidth = 1;
1739	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);
1740	2499
1741		- 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());
1742	2508
1743	2509	panel.add(specularSection);
1744	2510
1745	2511	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1746	2512
1747		- cGridBag globalSection = new cGridBag().setVertical(true);
	2513	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1748	2514
1749	2515	cGridBag camera = new cGridBag();
1750	2516	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1751	2517	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1752	2518	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1753		- globalSection.add(camera);
	2519	+ colorSection.add(camera);
1754	2520
1755	2521	cGridBag ambient = new cGridBag();
1756	2522	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1757	2523	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1758	2524	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1759		- globalSection.add(ambient);
	2525	+ colorSection.add(ambient);
1760	2526
1761	2527	cGridBag backlit = new cGridBag();
1762	2528	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1763	2529	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1764	2530	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1765		- globalSection.add(backlit);
	2531	+ colorSection.add(backlit);
1766	2532
1767		- cGridBag opacity = new cGridBag();
1768		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1769		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1770		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1771		- globalSection.add(opacity);
1772		-
1773		- panel.add(new JSeparator());
	2533	+ //panel.add(new JSeparator());
1774	2534
1775		- panel.add(globalSection);
	2535	+ //panel.add(globalSection);
1776	2536
1777	2537	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1778	2538
..	..	@@ -1814,7 +2574,7 @@
1814	2574	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1815	2575	textureSection.add(opacityPower);
1816	2576
1817		- panel.add(new JSeparator());
	2577	+ panel.add(GetSeparator());
1818	2578
1819	2579	panel.add(textureSection);
1820	2580
..	..	@@ -1879,8 +2639,9 @@
1879	2639	// 3D models
1880	2640	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1881	2641	{
1882		- lastConverter = new com.jmex.model.converters.MaxToJme();
1883		- LoadFile(filename, lastConverter);
	2642	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2643	+ //LoadFile(filename, lastConverter);
	2644	+ LoadObjFile(filename); // New 3ds loader
1884	2645	continue;
1885	2646	}
1886	2647	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2606,6 +3367,7 @@
2606	3367	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2607	3368	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2608	3369	}
	3370	+
2609	3371	//cJME.count++;
2610	3372	//cJME.count %= 12;
2611	3373	if (gc)
..	..	@@ -2789,6 +3551,7 @@
2789	3551	}
2790	3552	}
2791	3553	}
	3554	+
2792	3555	cFileSystemPane FSPane;
2793	3556
2794	3557	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2798,7 +3561,7 @@
2798	3561
2799	3562	freezematerial = true;
2800	3563	colorField.setFloat(mat.color);
2801		- modulationField.setFloat(mat.modulation);
	3564	+ saturationField.setFloat(mat.modulation);
2802	3565	metalnessField.setFloat(mat.metalness);
2803	3566	diffuseField.setFloat(mat.diffuse);
2804	3567	specularField.setFloat(mat.specular);
..	..	@@ -2842,11 +3605,14 @@
2842	3605	}
2843	3606	}
2844	3607	}
	3608	+
2845	3609	freezematerial = false;
2846	3610	}
2847	3611
2848	3612	void SetMaterial(Object3D object)
2849	3613	{
	3614	+ latestObject = object;
	3615	+
2850	3616	cMaterial mat = object.material;
2851	3617
2852	3618	if (mat == null)
..	..	@@ -2857,32 +3623,8 @@
2857	3623
2858	3624	if (multiplyToggle != null)
2859	3625	multiplyToggle.setSelected(mat.multiply);
2860		-
2861		- assert (object.projectedVertices != null);
2862		-
2863		- if (object.projectedVertices.length <= 2)
2864		- {
2865		- // Side effect...
2866		- Object3D.cVector2[] keep = object.projectedVertices;
2867		- object.projectedVertices = new Object3D.cVector2[3];
2868		- for (int i = 0; i < 3; i++)
2869		- {
2870		- if (i < keep.length)
2871		- {
2872		- object.projectedVertices[i] = keep[i];
2873		- } else
2874		- {
2875		- object.projectedVertices[i] = new Object3D.cVector2();
2876		- }
2877		- /*
2878		- if(keep.length == 0)
2879		- object.projectedVertices[0] = new Object3D.cVector2();
2880		- else
2881		- object.projectedVertices[0] = keep[0];
2882		- object.projectedVertices[1] = new Object3D.cVector2();
2883		- */
2884		- }
2885		- }
	3626	+
	3627	+ AllocProjectedVertices(object);
2886	3628
2887	3629	SetMaterial(mat, object.projectedVertices);
2888	3630	}
..	..	@@ -2958,12 +3700,17 @@
2958	3700	// }
2959	3701
2960	3702	/**/
2961		- if (deselect)
	3703	+ if (deselect \|\| child == null)
2962	3704	{
2963	3705	//group.deselectAll();
2964	3706	//freeze = true;
2965	3707	GetTree().clearSelection();
2966	3708	//freeze = false;
	3709	+
	3710	+ if (child == null)
	3711	+ {
	3712	+ return;
	3713	+ }
2967	3714	}
2968	3715
2969	3716	//group.addSelectee(child);
..	..	@@ -2997,6 +3744,17 @@
2997	3744	public void itemStateChanged(ItemEvent event)
2998	3745	{
2999	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
3000	3758	if (event.getSource() == propagateToggle)
3001	3759	{
3002	3760	propagate ^= true;
..	..	@@ -3032,7 +3790,7 @@
3032	3790	cameraView.ToggleDL();
3033	3791	cameraView.repaint();
3034	3792	return;
3035		- } else if (event.getSource() == toggleTextureItem)
	3793	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
3036	3794	{
3037	3795	cameraView.ToggleTexture();
3038	3796	// june 2013 copy.HardTouch();
..	..	@@ -3071,7 +3829,7 @@
3071	3829	frame.validate();
3072	3830
3073	3831	return;
3074		- } else if (event.getSource() == toggleSwitchItem)
	3832	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3075	3833	{
3076	3834	cameraView.ToggleSwitch();
3077	3835	cameraView.repaint();
..	..	@@ -3101,8 +3859,9 @@
3101	3859	} else if (event.getSource() == liveCB)
3102	3860	{
3103	3861	copy.live ^= true;
	3862	+ objEditor.refreshContents(true); // To show item colors
3104	3863	return;
3105		- } else if (event.getSource() == selectCB)
	3864	+ } else if (event.getSource() == selectableCB)
3106	3865	{
3107	3866	copy.dontselect ^= true;
3108	3867	return;
..	..	@@ -3110,7 +3869,7 @@
3110	3869	{
3111	3870	copy.hide ^= true;
3112	3871	copy.Touch(); // display list issue
3113		- objEditor.refreshContents();
	3872	+ objEditor.refreshContents(true); // To show item colors
3114	3873	return;
3115	3874	} else if (event.getSource() == link2masterCB)
3116	3875	{
..	..	@@ -3175,7 +3934,7 @@
3175	3934	//System.out.println("ObjEditor " + event);
3176	3935	applySelf0(true);
3177	3936	//parent.applySelf();
3178		- objEditor.refreshContents();
	3937	+ // conflicts with requestFocus objEditor.refreshContents();
3179	3938	} else if (source == resetButton)
3180	3939	{
3181	3940	CameraPane.fullreset = true;
..	..	@@ -3287,9 +4046,9 @@
3287	4046	{
3288	4047	Close();
3289	4048	//return true;
3290		- } else if (source == loadItem)
	4049	+ } else if (source == openItem)
3291	4050	{
3292		- load();
	4051	+ Open();
3293	4052	//return true;
3294	4053	} else if (source == newItem)
3295	4054	{
..	..	@@ -3314,6 +4073,10 @@
3314	4073	{
3315	4074	generatePOV();
3316	4075	//return true;
	4076	+ } else if (event.getSource() == archiveItem)
	4077	+ {
	4078	+ cTools.Archive(frame);
	4079	+ return;
3317	4080	} else if (source == zBufferItem)
3318	4081	{
3319	4082	try
..	..	@@ -3362,11 +4125,12 @@
3362	4125
3363	4126	static public byte[] Compress(Object3D o)
3364	4127	{
	4128	+ // Slower to actually compress.
3365	4129	try
3366	4130	{
3367	4131	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3368		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3369		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	4132	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4133	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3370	4134
3371	4135	Object3D parent = o.parent;
3372	4136	o.parent = null;
..	..	@@ -3377,10 +4141,14 @@
3377	4141
3378	4142	out.flush();
3379	4143
3380		- zstream.close();
	4144	+ baos //zstream
	4145	+ .close();
3381	4146	out.close();
3382	4147
3383		- return baos.toByteArray();
	4148	+ byte[] bytes = baos.toByteArray();
	4149	+
	4150	+ System.out.println("save #bytes = " + bytes.length);
	4151	+ return bytes;
3384	4152	} catch (Exception e)
3385	4153	{
3386	4154	System.err.println(e);
..	..	@@ -3390,13 +4158,16 @@
3390	4158
3391	4159	static public Object Uncompress(byte[] bytes)
3392	4160	{
3393		- System.out.println("#bytes = " + bytes.length);
	4161	+ System.out.println("restore #bytes = " + bytes.length);
3394	4162	try
3395	4163	{
3396	4164	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3397		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3398		- ObjectInputStream in = new ObjectInputStream(istream);
	4165	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4166	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3399	4167	Object obj = in.readObject();
	4168	+
	4169	+ bais //istream
	4170	+ .close();
3400	4171	in.close();
3401	4172
3402	4173	return obj;
..	..	@@ -3451,39 +4222,97 @@
3451	4222	return null;
3452	4223	}
3453	4224
3454		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3455	4225
3456	4226	public void Save()
3457	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	+ {
3458	4267	System.err.println("Save");
	4268	+ Replace();
3459	4269
3460		- cRadio tab = GetCurrentTab();
	4270	+ //cRadio tab = GetCurrentTab();
3461	4271
3462		- boolean temp = CameraPane.SWITCH;
3463		- CameraPane.SWITCH = false;
	4272	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3464	4273
3465		- 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	+// }
3466	4280
3467	4281	//EditorFrame.m_MainFrame.requestFocusInWindow();
3468		- tab.graphs[tab.undoindex++] = Compress(copy);
3469		-
3470		- copy.RestoreBigData(hashtable);
3471		-
3472		- CameraPane.SWITCH = temp;
3473		-
3474		- //assert(hashtable.isEmpty());
3475		-
3476		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	4282	+ if (!thesame)
3477	4283	{
3478		- 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++;
3479	4296	}
3480	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	+
3481	4310	// test save
3482	4311	if (false)
3483	4312	{
3484	4313	try
3485	4314	{
3486		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	4315	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3487	4316	ObjectOutputStream p = new ObjectOutputStream(ostream);
3488	4317
3489	4318	p.writeObject(copy);
..	..	@@ -3496,26 +4325,68 @@
3496	4325	e.printStackTrace();
3497	4326	}
3498	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);
3499	4362	}
3500	4363
3501		- void CopyChanged(Object3D obj)
	4364	+ void CopyChanged()
3502	4365	{
	4366	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4367	+
	4368	+ SetVersionStates();
	4369	+
3503	4370	boolean temp = CameraPane.SWITCH;
3504	4371	CameraPane.SWITCH = false;
3505	4372
3506		- copy.ExtractBigData(hashtable);
	4373	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
3507	4374
3508	4375	copy.clear();
3509	4376
	4377	+ copy.skyboxname = obj.skyboxname;
	4378	+ copy.skyboxext = obj.skyboxext;
	4379	+
3510	4380	for (int i=0; i<obj.Size(); i++)
3511	4381	{
3512	4382	copy.add(obj.get(i));
3513	4383	}
3514	4384
3515		- copy.RestoreBigData(hashtable);
	4385	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
3516	4386
3517	4387	CameraPane.SWITCH = temp;
3518	4388
	4389	+ RefreshSelection();
3519	4390	//assert(hashtable.isEmpty());
3520	4391
3521	4392	copy.Touch();
..	..	@@ -3536,45 +4407,144 @@
3536	4407	}
3537	4408	}
3538	4409
3539		- refreshContents();
	4410	+ refreshContents(true);
3540	4411	}
3541	4412
3542		- 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()
3543	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	+
3544	4464	System.err.println("Undo");
3545	4465
3546		- cRadio tab = GetCurrentTab();
	4466	+ //cRadio tab = GetCurrentTab();
3547	4467
3548		- if (tab.undoindex == 0)
	4468	+ if (copy.versionindex == 0)
3549	4469	{
3550	4470	java.awt.Toolkit.getDefaultToolkit().beep();
3551		- return;
	4471	+ return false;
3552	4472	}
3553	4473
3554		- if (tab.graphs[tab.undoindex] == null)
3555		- {
3556		- Save();
3557		- tab.undoindex -= 1;
3558		- }
	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	+// }
3559	4486
3560		- tab.undoindex -= 1;
	4487	+ copy.versionindex -= 1;
3561	4488
3562		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4489	+ CopyChanged();
	4490	+
	4491	+ return true;
3563	4492	}
3564	4493
3565		- public void Redo()
	4494	+ public boolean Restore()
3566	4495	{
3567		- cRadio tab = GetCurrentTab();
	4496	+ System.err.println("Restore");
3568	4497
3569		- 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)
3570	4537	{
3571	4538	java.awt.Toolkit.getDefaultToolkit().beep();
3572	4539	return;
3573	4540	}
3574	4541
3575		- tab.undoindex += 1;
	4542	+ copy.versionindex += 1;
3576	4543
3577		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4544	+ CopyChanged();
	4545	+
	4546	+ //if (!tab.user[tab.versionindex])
	4547	+ // tab.graphs[tab.versionindex] = null;
3578	4548	}
3579	4549
3580	4550	void ImportGFD()
..	..	@@ -3726,7 +4696,7 @@
3726	4696	assert false;
3727	4697	}
3728	4698
3729		- void EditSelection()
	4699	+ void EditSelection(boolean newWindow)
3730	4700	{
3731	4701	}
3732	4702
..	..	@@ -3785,7 +4755,7 @@
3785	4755	//copy.material = new cMaterial(copy.GetMaterial());
3786	4756
3787	4757	current.color = (float) colorField.getFloat();
3788		- current.modulation = (float) modulationField.getFloat();
	4758	+ current.modulation = (float) saturationField.getFloat();
3789	4759	current.metalness = (float) metalnessField.getFloat();
3790	4760	current.diffuse = (float) diffuseField.getFloat();
3791	4761	current.specular = (float) specularField.getFloat();
..	..	@@ -3818,7 +4788,7 @@
3818	4788	cMaterial mat = copy.material;
3819	4789
3820	4790	colorField.SetToolTipValue((mat.color));
3821		- modulationField.SetToolTipValue((mat.modulation));
	4791	+ saturationField.SetToolTipValue((mat.modulation));
3822	4792	metalnessField.SetToolTipValue((mat.metalness));
3823	4793	diffuseField.SetToolTipValue((mat.diffuse));
3824	4794	specularField.SetToolTipValue((mat.specular));
..	..	@@ -3870,9 +4840,28 @@
3870	4840	//copy.Touch();
3871	4841	}
3872	4842
	4843	+ cNumberSlider versionSlider;
	4844	+
3873	4845	public void stateChanged(ChangeEvent e)
3874	4846	{
3875	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	+ }
3876	4865
3877	4866	if (freezematerial)
3878	4867	{
..	..	@@ -3908,6 +4897,12 @@
3908	4897	{
3909	4898	//System.out.println("stateChanged = " + this);
3910	4899	materialtouched = true;
	4900	+
	4901	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4902	+ {
	4903	+ saturationField.setFloat(1);
	4904	+ }
	4905	+
3911	4906	applySelf();
3912	4907	//System.out.println("this = " + this);
3913	4908	//System.out.println("PARENT = " + parent);
..	..	@@ -4207,6 +5202,7 @@
4207	5202	{
4208	5203	if (GetTree() != null)
4209	5204	{
	5205	+ GetTree().revalidate();
4210	5206	GetTree().repaint();
4211	5207	}
4212	5208
..	..	@@ -4215,13 +5211,18 @@
4215	5211	ctrlPanel.validate(); // ? new
4216	5212	ctrlPanel.repaint();
4217	5213	}
	5214	+
	5215	+ if (previousVersionButton != null && copy.versionlist != null)
	5216	+ SetVersionStates();
	5217	+
	5218	+ cameraView.requestFocusInWindow();
4218	5219	}
4219	5220
4220	5221	static TweenManager tweenManager = new TweenManager();
4221	5222
4222	5223	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4223	5224	{
4224		- if (Globals.SAVEONMAKE)
	5225	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4225	5226	Save();
4226	5227	//Tween.set(thing, 0).target(1).start(tweenManager);
4227	5228	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4246,7 +5247,7 @@
4246	5247	// group = (Composite) group.get(0);
4247	5248	// }
4248	5249
4249		- System.out.println("makeSomething of " + thing);
	5250	+ //System.out.println("makeSomething of " + thing);
4250	5251
4251	5252	/*
4252	5253	if (deselect && jList != null)
..	..	@@ -4309,6 +5310,12 @@
4309	5310	{
4310	5311	ResetModel();
4311	5312	Select(thing.GetTreePath(), true, false); // unselect... false);
	5313	+
	5314	+ if (thing.Size() == 0)
	5315	+ {
	5316	+ //EditSelection(false);
	5317	+ }
	5318	+
4312	5319	refreshContents();
4313	5320	}
4314	5321
..	..	@@ -4457,7 +5464,9 @@
4457	5464	readobj.ResetDisplayList();
4458	5465	} catch (Exception e)
4459	5466	{
4460		- //e.printStackTrace();
	5467	+ if (!e.toString().contains("GZIP"))
	5468	+ e.printStackTrace();
	5469	+
4461	5470	try
4462	5471	{
4463	5472	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4531,12 +5540,14 @@
4531	5540
4532	5541	if (readobj != null)
4533	5542	{
4534		- if (Globals.SAVEONMAKE)
4535		- Save();
	5543	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5544	+ // Save();
4536	5545	try
4537	5546	{
4538	5547	//readobj.deepCopySelf(copy);
4539	5548	copy.clear(); // june 2014
	5549	+ copy.skyboxname = readobj.skyboxname;
	5550	+ copy.skyboxext = readobj.skyboxext;
4540	5551	for (int i = 0; i < readobj.size(); i++)
4541	5552	{
4542	5553	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4577,6 +5588,7 @@
4577	5588	}
4578	5589	} catch (ClassCastException e)
4579	5590	{
	5591	+ e.printStackTrace();
4580	5592	assert (false);
4581	5593	Composite c = (Composite) copy;
4582	5594	c.children.clear();
..	..	@@ -4587,17 +5599,32 @@
4587	5599	c.addChild(csg);
4588	5600	}
4589	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	+
4590	5617	ResetModel();
4591	5618	copy.HardTouch(); // recompile?
4592	5619	refreshContents();
4593	5620	}
4594	5621	}
4595	5622
4596		- void load() // throws ClassNotFoundException
	5623	+ void Open() // throws ClassNotFoundException
4597	5624	{
4598	5625	if (Grafreed.standAlone)
4599	5626	{
4600		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5627	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4601	5628	browser.show();
4602	5629	String filename = browser.getFile();
4603	5630	if (filename != null && filename.length() > 0)
..	..	@@ -4674,6 +5701,8 @@
4674	5701
4675	5702	void save()
4676	5703	{
	5704	+ Replace();
	5705	+
4677	5706	if (lastname == null)
4678	5707	{
4679	5708	return;
..	..	@@ -4696,6 +5725,7 @@
4696	5725	//ps.print(buffer.toString());
4697	5726	} catch (IOException e)
4698	5727	{
	5728	+ e.printStackTrace();
4699	5729	}
4700	5730	}
4701	5731
..	..	@@ -4710,6 +5740,8 @@
4710	5740	String filename = browser.getFile();
4711	5741	if (filename != null && filename.length() > 0)
4712	5742	{
	5743	+ if (!filename.endsWith(".gfd"))
	5744	+ filename += ".gfd";
4713	5745	lastname = browser.getDirectory() + filename;
4714	5746	save();
4715	5747	}
..	..	@@ -4876,7 +5908,7 @@
4876	5908	MenuBar menuBar;
4877	5909	Menu fileMenu;
4878	5910	MenuItem newItem;
4879		- MenuItem loadItem;
	5911	+ MenuItem openItem;
4880	5912	MenuItem saveItem;
4881	5913	MenuItem saveAsItem;
4882	5914	MenuItem exportAsItem;
..	..	@@ -4899,22 +5931,37 @@
4899	5931	CheckboxMenuItem toggleSwitchItem;
4900	5932	CheckboxMenuItem toggleRootItem;
4901	5933	CheckboxMenuItem animationItem;
	5934	+ MenuItem archiveItem;
4902	5935	CheckboxMenuItem toggleHandleItem;
4903	5936	CheckboxMenuItem togglePaintItem;
4904	5937	JSplitPane mainPanel;
4905	5938	JScrollPane scrollpane;
	5939	+
4906	5940	JPanel toolbarPanel;
	5941	+
4907	5942	cGridBag treePanel;
	5943	+
4908	5944	JPanel radioPanel;
4909	5945	ButtonGroup buttonGroup;
4910		- cGridBag ctrlPanel;
	5946	+
	5947	+ cGridBag toolboxPanel;
	5948	+ cGridBag skyboxPanel;
4911	5949	cGridBag materialPanel;
	5950	+ cGridBag ctrlPanel;
	5951	+
4912	5952	JScrollPane infoPanel;
	5953	+
4913	5954	cGridBag optionsPanel;
	5955	+
4914	5956	JTabbedPane objectPanel;
	5957	+ boolean materialFlushed;
	5958	+ Object3D latestObject;
	5959	+
4915	5960	cGridBag XYZPanel;
	5961	+
4916	5962	JSplitPane gridPanel;
4917	5963	JSplitPane bigPanel;
	5964	+
4918	5965	cGridBag bigThree;
4919	5966	cGridBag scenePanel;
4920	5967	cGridBag centralPanel;
..	..	@@ -4972,7 +6019,7 @@
4972	6019	JLabel colorLabel;
4973	6020	cNumberSlider colorField;
4974	6021	JLabel modulationLabel;
4975		- cNumberSlider modulationField;
	6022	+ cNumberSlider saturationField;
4976	6023	JLabel metalnessLabel;
4977	6024	cNumberSlider metalnessField;
4978	6025	JLabel diffuseLabel;
..	..	@@ -5003,6 +6050,7 @@
5003	6050	cNumberSlider anisoField;
5004	6051	JLabel anisoVLabel;
5005	6052	cNumberSlider anisoVField;
	6053	+
5006	6054	JLabel cameraLabel;
5007	6055	cNumberSlider cameraField;
5008	6056	JLabel selfshadowLabel;
..	..	@@ -5017,6 +6065,7 @@
5017	6065	cNumberSlider fakedepthField;
5018	6066	JLabel shadowbiasLabel;
5019	6067	cNumberSlider shadowbiasField;
	6068	+
5020	6069	JLabel bumpLabel;
5021	6070	cNumberSlider bumpField;
5022	6071	JLabel noiseLabel;
..	..	@@ -5029,7 +6078,7 @@
5029	6078	cNumberSlider fogField;
5030	6079	JLabel opacityPowerLabel;
5031	6080	cNumberSlider opacityPowerField;
5032		- JTree jTree;
	6081	+ cTree jTree;
5033	6082	//ObjectUI parent;
5034	6083
5035	6084	cNumberSlider normalpushField;