~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -4,6 +4,7 @@
4	4
5	5	import java.awt.*;
6	6	import java.awt.event.*;
	7	+import java.awt.image.BufferedImage;
7	8	import javax.swing.*;
8	9	import javax.swing.event.*;
9	10	import javax.swing.text.*;
..	..	@@ -13,6 +14,9 @@
13	14	import javax.swing.plaf.metal.MetalLookAndFeel;
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
	17	+
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
16	20
17	21	//import javax.media.opengl.GLCanvas;
18	22
..	..	@@ -30,6 +34,7 @@
30	34	iSendInfo
31	35	//KeyListener
32	36	{
	37	+ public cToggleButton pinButton;
33	38	boolean timeline;
34	39	boolean wasFullScreen;
35	40
..	..	@@ -37,6 +42,91 @@
37	42	JFrame frame;
38	43
39	44	static ObjEditor theFrame;
	45	+
	46	+ public cGridBag GetSeparator()
	47	+ {
	48	+ cGridBag separator = new cGridBag();
	49	+ separator.add(new JSeparator());
	50	+ separator.preferredHeight = 5;
	51	+ return separator;
	52	+ }
	53	+
	54	+ cButton GetButton(String name, boolean border)
	55	+ {
	56	+ ImageIcon icon = GetIcon(name);
	57	+ return new cButton(icon, border);
	58	+ }
	59	+
	60	+ cLabel GetLabel(String name, boolean border)
	61	+ {
	62	+ //ImageIcon icon = GetIcon(name);
	63	+ return new cLabel(GetImage(name), border);
	64	+ }
	65	+
	66	+ cToggleButton GetToggleButton(String name, boolean border)
	67	+ {
	68	+ ImageIcon icon = GetIcon(name);
	69	+ return new cToggleButton(icon, border);
	70	+ }
	71	+
	72	+ cCheckBox GetCheckBox(String name, boolean border)
	73	+ {
	74	+ ImageIcon icon = GetIcon(name);
	75	+ return new cCheckBox(icon, border);
	76	+ }
	77	+
	78	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	79	+
	80	+ ImageIcon GetIcon(String name)
	81	+ {
	82	+ javax.swing.ImageIcon iconCache = icons.get(name);
	83	+ if (iconCache != null)
	84	+ {
	85	+ return iconCache;
	86	+ }
	87	+
	88	+ try
	89	+ {
	90	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	91	+
	92	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	93	+// {
	94	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	95	+// Graphics2D g = resized.createGraphics();
	96	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	97	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	98	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	99	+// g.dispose();
	100	+//
	101	+// image = resized;
	102	+// }
	103	+
	104	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	105	+
	106	+ icons.put(name, icon);
	107	+
	108	+ return icon;
	109	+ }
	110	+ catch (Exception e)
	111	+ {
	112	+ //icons.put(name, null);
	113	+ return null;
	114	+ }
	115	+ }
	116	+
	117	+ BufferedImage GetImage(String name)
	118	+ {
	119	+ try
	120	+ {
	121	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	122	+
	123	+ return image;
	124	+ }
	125	+ catch (Exception e)
	126	+ {
	127	+ return null;
	128	+ }
	129	+ }
40	130
41	131	// SCRIPT
42	132
..	..	@@ -147,7 +237,7 @@
147	237
148	238	objEditor.ctrlPanel.remove(namePanel);
149	239
150		- if (!GroupEditor.allparams)
	240	+ if (!allparams)
151	241	return;
152	242
153	243	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -171,7 +261,7 @@
171	261
172	262	objEditor.ctrlPanel.remove(setupPanel);
173	263	objEditor.ctrlPanel.remove(setupPanel2);
174		- objEditor.ctrlPanel.remove(commandsPanel);
	264	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
175	265	objEditor.ctrlPanel.remove(pushPanel);
176	266	//objEditor.ctrlPanel.remove(fillPanel);
177	267
..	..	@@ -219,6 +309,14 @@
219	309	client = inClient;
220	310	copy = client;
221	311
	312	+// if (copy.versionlist == null)
	313	+// {
	314	+// copy.versionlist = new Object3D[100];
	315	+// copy.versionindex = -1;
	316	+//
	317	+// callee.Save(true);
	318	+// }
	319	+
222	320	// "this" is not called: SetupUI2(objEditor);
223	321	}
224	322
..	..	@@ -232,6 +330,14 @@
232	330	client = inClient;
233	331	copy = client;
234	332
	333	+ if (copy.versionlist == null)
	334	+ {
	335	+ copy.versionlist = new Object3D[100];
	336	+ copy.versionindex = -1;
	337	+
	338	+// Save(true);
	339	+ }
	340	+
235	341	SetupUI2(callee.GetEditor());
236	342	}
237	343
..	..	@@ -246,7 +352,7 @@
246	352	//localCopy.parent = null;
247	353
248	354	frame = new JFrame();
249		- frame.setUndecorated(true);
	355	+ frame.setUndecorated(false);
250	356	objEditor = this;
251	357	this.callee = callee;
252	358
..	..	@@ -264,6 +370,14 @@
264	370	copy = localCopy;
265	371	copy.editWindow = this;
266	372
	373	+// if (copy.versionlist == null)
	374	+// {
	375	+// copy.versionlist = new Object3D[100];
	376	+// copy.versionindex = -1;
	377	+//
	378	+// Save(true);
	379	+// }
	380	+
267	381	SetupMenu();
268	382
269	383	//SetupName(objEditor); // new
..	..	@@ -277,12 +391,17 @@
277	391	return frame.action(event, obj);
278	392	}
279	393
	394	+ // Cannot work without static
	395	+ static boolean allparams = true;
	396	+
	397	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	398	+
280	399	void SetupMenu()
281	400	{
282	401	frame.setMenuBar(menuBar = new MenuBar());
283	402	menuBar.add(fileMenu = new Menu("File"));
284	403	fileMenu.add(newItem = new MenuItem("New"));
285		- fileMenu.add(loadItem = new MenuItem("Open..."));
	404	+ fileMenu.add(openItem = new MenuItem("Open..."));
286	405
287	406	//oe.menuBar.add(menu = new Menu("Include"));
288	407	Menu menu = new Menu("Import");
..	..	@@ -314,7 +433,7 @@
314	433	}
315	434
316	435	newItem.addActionListener(this);
317		- loadItem.addActionListener(this);
	436	+ openItem.addActionListener(this);
318	437	saveItem.addActionListener(this);
319	438	saveAsItem.addActionListener(this);
320	439	exportAsItem.addActionListener(this);
..	..	@@ -323,28 +442,102 @@
323	442	closeItem.addActionListener(this);
324	443
325	444	objectPanel = new JTabbedPane();
	445	+
	446	+ ChangeListener changeListener = new ChangeListener()
	447	+ {
	448	+ //String name;
	449	+
	450	+ public void stateChanged(ChangeEvent changeEvent)
	451	+ {
	452	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	453	+// {
	454	+// if (latestObject != null)
	455	+// {
	456	+// refreshContents(true);
	457	+// SetMaterial(latestObject);
	458	+// }
	459	+//
	460	+// materialFlushed = true;
	461	+// }
	462	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	463	+// {
	464	+// if (listUI.size() == 0)
	465	+// EditSelection(false);
	466	+// }
	467	+
	468	+// if (objectPanel.getSelectedIndex() == 4)
	469	+// {
	470	+// name = copy.skyboxname;
	471	+//
	472	+// if (name == null)
	473	+// {
	474	+// name = "";
	475	+// }
	476	+//
	477	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	478	+// copy.skyboxext = "jpg";
	479	+// }
	480	+// else
	481	+// {
	482	+// if (name != null)
	483	+// {
	484	+// if (name.equals(""))
	485	+// {
	486	+// copy.skyboxname = null;
	487	+// copy.skyboxext = null;
	488	+// }
	489	+// else
	490	+// {
	491	+// copy.skyboxname = name;
	492	+// }
	493	+// }
	494	+// }
	495	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	496	+
	497	+// refreshContents(false); // To refresh Info tab
	498	+ cameraView.repaint();
	499	+ }
	500	+ };
	501	+ objectPanel.addChangeListener(changeListener);
	502	+
326	503	toolbarPanel = new JPanel();
327	504	toolbarPanel.setName("Toolbar");
	505	+
328	506	treePanel = new cGridBag();
329	507	treePanel.setName("Tree");
	508	+
	509	+ editPanel = new cGridBag().setVertical(true);
	510	+ //editPanel.setName("Edit");
	511	+
330	512	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
331		- ctrlPanel.setName("Edit");
332		- materialPanel = new cGridBag().setVertical(true);
333		- materialPanel.setName("Material");
	513	+
	514	+ editCommandsPanel = new cGridBag();
	515	+ editPanel.add(editCommandsPanel);
	516	+ editPanel.add(ctrlPanel);
	517	+
	518	+ toolboxPanel = new cGridBag().setVertical(true);
	519	+ //toolboxPanel.setName("Toolbox");
	520	+
	521	+ skyboxPanel = new cGridBag().setVertical(true);
	522	+
	523	+ materialPanel = new cGridBag().setVertical(false);
	524	+ //materialPanel.setName("Material");
	525	+
334	526	/JTextPane/
335	527	infoarea = createTextPane();
336	528	doc = infoarea.getStyledDocument();
337	529
338	530	infoarea.setEditable(true);
339	531	SetText();
	532	+
340	533	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
341	534	// infoarea.setOpaque(false);
342	535	// //infoarea.setForeground(textcolor);
343	536	// TEXTAREA infoarea.setLineWrap(true);
344	537	// TEXTAREA infoarea.setWrapStyleWord(true);
345	538	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
346		- infoPanel.setPreferredSize(new Dimension(50, 200));
347		- infoPanel.setName("Info");
	539	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	540	+ //infoPanel.setName("Info");
348	541	//infoPanel.setLayout(new BorderLayout());
349	542	//infoPanel.add(createTextPane());
350	543
..	..	@@ -355,7 +548,14 @@
355	548	mainPanel.setDividerSize(9);
356	549	mainPanel.setDividerLocation(0.5); //1.0);
357	550	mainPanel.setResizeWeight(0.5);
358		-
	551	+
	552	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	553	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	554	+ divider.setDividerSize(15);
	555	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	556	+
	557	+ mainPanel.setUI(new BasicSplitPaneUI());
	558	+
359	559	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
360	560	//mainPanel.setLayout(new GridBagLayout());
361	561	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -586,8 +786,8 @@
586	786	}
587	787	}
588	788
589		-static GraphicsDevice device = GraphicsEnvironment
590		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	789	+//static GraphicsDevice device = GraphicsEnvironment
	790	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
591	791
592	792	Rectangle keeprect;
593	793	cRadio radio;
..	..	@@ -603,13 +803,25 @@
603	803
604	804	boolean maximized;
605	805
	806	+ cButton fullscreenLayout;
	807	+ cButton expandedLayout;
	808	+
606	809	void Minimize()
607	810	{
608	811	frame.setState(Frame.ICONIFIED);
	812	+ frame.validate();
609	813	}
610	814
	815	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	816	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	817	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
611	818	void Maximize()
612	819	{
	820	+ if (CameraPane.FULLSCREEN)
	821	+ {
	822	+ ToggleFullScreen();
	823	+ }
	824	+
613	825	if (maximized)
614	826	{
615	827	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -617,20 +829,38 @@
617	829	else
618	830	{
619	831	keeprect = frame.getBounds();
620		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
621		- Dimension rect2 = frame.getToolkit().getScreenSize();
622		- frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	832	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	833	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	834	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
623	835	// frame.setState(Frame.MAXIMIZED_BOTH);
	836	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
624	837	}
625	838
626	839	maximized ^= true;
	840	+
	841	+ frame.validate();
627	842	}
	843	+
	844	+ cButton minButton;
	845	+ cButton maxButton;
	846	+ cButton fullButton;
	847	+ cButton collapseButton;
	848	+ cButton maximize3DButton;
628	849
629	850	void ToggleFullScreen()
630	851	{
631		- if (CameraPane.FULLSCREEN)
	852	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	853	+
	854	+ cameraView.ToggleFullScreen();
	855	+
	856	+ if (!CameraPane.FULLSCREEN)
632	857	{
633	858	device.setFullScreenWindow(null);
	859	+ frame.dispose();
	860	+ frame.setUndecorated(false);
	861	+ frame.validate();
	862	+ frame.setVisible(true);
	863	+
634	864	//frame.setVisible(false);
635	865	// frame.removeNotify();
636	866	// frame.setUndecorated(false);
..	..	@@ -640,13 +870,13 @@
640	870	// X frame.getContentPane().remove(/"Center",/bigThree);
641	871	// X framePanel.add(bigThree);
642	872	// X frame.getContentPane().add(/"Center",/framePanel);
643		- framePanel.setDividerLocation(1);
	873	+// framePanel.setDividerLocation(46); // icons are 24x24
644	874
645	875	//frame.setVisible(true);
646		- radio.layout = keepButton;
	876	+// radio.layout = keepButton;
647	877	//theFrame = null;
648	878	keepButton = null;
649		- radio.layout.doClick();
	879	+// radio.layout.doClick();
650	880
651	881	} else
652	882	{
..	..	@@ -655,22 +885,59 @@
655	885	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
656	886	// frame.getToolkit().getScreenSize().height);
657	887	//frame.setVisible(false);
	888	+
	889	+ frame.dispose();
	890	+ frame.setUndecorated(true);
658	891	device.setFullScreenWindow(frame);
	892	+ frame.validate();
	893	+ frame.setVisible(true);
659	894	// frame.removeNotify();
660	895	// frame.setUndecorated(true);
661	896	// frame.addNotify();
662	897	// X frame.getContentPane().remove(/"Center",/framePanel);
663	898	// X framePanel.remove(bigThree);
664	899	// X frame.getContentPane().add(/"Center",/bigThree);
665		- framePanel.setDividerLocation(0);
	900	+// framePanel.setDividerLocation(0);
666	901
667		- radio.layout = twoButton;
668		- radio.layout.doClick();
	902	+// radio.layout = fullscreenLayout;
	903	+// radio.layout.doClick();
669	904	//frame.setVisible(true);
670	905	}
671		-
672		- cameraView.ToggleFullScreen();
	906	+ frame.validate();
	907	+
	908	+ cameraView.requestFocusInWindow();
673	909	}
	910	+
	911	+ void CollapseToolbar()
	912	+ {
	913	+ framePanel.setDividerLocation(0);
	914	+ //frame.validate();
	915	+
	916	+ cameraView.requestFocusInWindow();
	917	+ }
	918	+
	919	+ private Object3D Duplicate(Object3D object)
	920	+ {
	921	+ boolean temp = CameraPane.SWITCH;
	922	+ CameraPane.SWITCH = false;
	923	+
	924	+ object.ExtractBigData(versiontable);
	925	+ // if (copy == client)
	926	+
	927	+ Object3D versions[] = object.versionlist;
	928	+ object.versionlist = null;
	929	+
	930	+ //byte[] compress = Compress(copy);
	931	+ Object3D compress = (Object3D)Grafreed.clone(object);
	932	+
	933	+ object.versionlist = versions;
	934	+
	935	+ object.RestoreBigData(versiontable);
	936	+
	937	+ CameraPane.SWITCH = temp;
	938	+
	939	+ return compress;
	940	+ }
674	941
675	942	private JTextPane createTextPane()
676	943	{
..	..	@@ -793,6 +1060,7 @@
793	1060	{
794	1061	SetupMaterial(materialPanel);
795	1062	}
	1063	+
796	1064	//SetupName();
797	1065	//SetupViews();
798	1066	}
..	..	@@ -802,7 +1070,7 @@
802	1070	// NumberSlider vDivsField;
803	1071	// JCheckBox endcaps;
804	1072	JCheckBox liveCB;
805		- JCheckBox selectCB;
	1073	+ JCheckBox selectableCB;
806	1074	JCheckBox hideCB;
807	1075	JCheckBox link2masterCB;
808	1076	JCheckBox markCB;
..	..	@@ -810,7 +1078,12 @@
810	1078	JCheckBox speedupCB;
811	1079	JCheckBox rewindCB;
812	1080	JCheckBox flipVCB;
	1081	+
	1082	+ cCheckBox toggleTextureCB;
	1083	+ cCheckBox toggleSwitchCB;
	1084	+
813	1085	JComboBox texresMenu;
	1086	+
814	1087	JButton resetButton;
815	1088	JButton stepButton;
816	1089	JButton stepAllButton;
..	..	@@ -819,10 +1092,13 @@
819	1092	JButton fasterButton;
820	1093	JButton remarkButton;
821	1094
	1095	+ cGridBag editPanel;
	1096	+ cGridBag editCommandsPanel;
	1097	+
822	1098	cGridBag namePanel;
823	1099	cGridBag setupPanel;
824	1100	cGridBag setupPanel2;
825		- cGridBag commandsPanel;
	1101	+ cGridBag objectCommandsPanel;
826	1102	cGridBag pushPanel;
827	1103	cGridBag fillPanel;
828	1104
..	..	@@ -993,39 +1269,55 @@
993	1269
994	1270	namePanel = new cGridBag();
995	1271
	1272	+ //if (copy.pinned)
	1273	+ {
	1274	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1275	+ pinButton.setSelected(copy.pinned);
	1276	+ cGridBag t = new cGridBag();
	1277	+ t.preferredWidth = 2;
	1278	+ t.add(pinButton);
	1279	+ namePanel.add(t);
	1280	+
	1281	+ pinButton.addItemListener(this);
	1282	+ }
	1283	+
996	1284	nameField = AddText(namePanel, copy.GetName());
997		- namePanel.add(nameField);
	1285	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
998	1286	oe.ctrlPanel.add(namePanel);
999	1287
1000	1288	oe.ctrlPanel.Return();
1001	1289
1002		- if (!GroupEditor.allparams)
	1290	+ if (!allparams)
1003	1291	return;
1004	1292
1005	1293	setupPanel = new cGridBag().setVertical(false);
1006	1294
1007	1295	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1008	1296	liveCB.setToolTipText("Animate object");
1009		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1010		- selectCB.setToolTipText("Make object selectable");
	1297	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1298	+ selectableCB.setToolTipText("Make object selectable");
1011	1299	// Return();
	1300	+
1012	1301	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1013	1302	hideCB.setToolTipText("Hide object");
1014	1303	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1015		- markCB.setToolTipText("Set the animation target transform");
	1304	+ markCB.setToolTipText("As animation target transform");
	1305	+
	1306	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1016	1307
1017	1308	setupPanel2 = new cGridBag().setVertical(false);
1018	1309
1019	1310	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1020	1311	rewindCB.setToolTipText("Rewind animation");
1021	1312
1022		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1023		- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1313	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1314	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1024	1315
	1316	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1317	+ link2masterCB.setToolTipText("Attach to support");
	1318	+
1025	1319	if (Globals.ADVANCED)
1026	1320	{
1027		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1028		- link2masterCB.setToolTipText("Attach to support");
1029	1321	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1030	1322	speedupCB.setToolTipText("Option motion capture");
1031	1323	}
..	..	@@ -1035,23 +1327,23 @@
1035	1327	oe.ctrlPanel.add(setupPanel2);
1036	1328	oe.ctrlPanel.Return();
1037	1329
1038		- commandsPanel = new cGridBag().setVertical(false);
	1330	+ objectCommandsPanel = new cGridBag().setVertical(false);
1039	1331
1040		- resetButton = AddButton(commandsPanel, "Reset");
	1332	+ resetButton = AddButton(objectCommandsPanel, "Reset");
1041	1333	resetButton.setToolTipText("Jump to frame zero");
1042		- stepButton = AddButton(commandsPanel, "Step");
	1334	+ stepButton = AddButton(objectCommandsPanel, "Step");
1043	1335	stepButton.setToolTipText("Step one frame");
1044	1336	// resetAllButton = AddButton(oe, "Reset All");
1045	1337	// stepAllButton = AddButton(oe, "Step All");
1046	1338	// Return();
1047		- slowerButton = AddButton(commandsPanel, "Slow");
	1339	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1048	1340	slowerButton.setToolTipText("Decrease animation speed");
1049		- fasterButton = AddButton(commandsPanel, "Fast");
	1341	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1050	1342	fasterButton.setToolTipText("Increase animation speed");
1051		- remarkButton = AddButton(commandsPanel, "Remark");
	1343	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1052	1344	remarkButton.setToolTipText("Set the current transform as the target");
1053	1345
1054		- oe.ctrlPanel.add(commandsPanel);
	1346	+ oe.ctrlPanel.add(objectCommandsPanel);
1055	1347	oe.ctrlPanel.Return();
1056	1348
1057	1349	pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
..	..	@@ -1299,6 +1591,7 @@
1299	1591	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1300	1592	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1301	1593	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1594	+ //XYZPanel.setName("XYZ");
1302	1595
1303	1596	/*
1304	1597	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1336,13 +1629,29 @@
1336	1629	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1337	1630	//tmp.setName("Edit");
1338	1631	objectPanel.add(materialPanel);
	1632	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1633	+ objectPanel.setToolTipTextAt(0, "Material");
	1634	+
	1635	+ objectPanel.add(toolboxPanel);
	1636	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1637	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1638	+
	1639	+ objectPanel.add(skyboxPanel);
	1640	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1641	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1642	+
1339	1643	// JPanel north = new JPanel(new BorderLayout());
1340	1644	// north.setName("Edit");
1341	1645	// north.add(ctrlPanel, BorderLayout.NORTH);
1342	1646	// objectPanel.add(north);
1343		- objectPanel.add(ctrlPanel);
1344		- objectPanel.add(infoPanel);
1345		-
	1647	+ objectPanel.add(editPanel);
	1648	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1649	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1650	+
	1651	+ objectPanel.add(XYZPanel);
	1652	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1653	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1654	+
1346	1655	/*
1347	1656	aConstraints.gridx = 0;
1348	1657	aConstraints.gridwidth = 1;
..	..	@@ -1350,7 +1659,7 @@
1350	1659	aConstraints.gridy += 1;
1351	1660	aConstraints.gridwidth = 1;
1352	1661	mainPanel.add(objectPanel, aConstraints);
1353		- */
	1662	+ */
1354	1663
1355	1664	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1356	1665	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1362,14 +1671,12 @@
1362	1671	scrollpane.addMouseWheelListener(this); // Default not fast enough
1363	1672
1364	1673	/JTabbedPane/ scenePanel = new cGridBag();
1365		- scenePanel.preferredWidth = 6;
	1674	+ scenePanel.preferredWidth = 5;
1366	1675
1367	1676	JTabbedPane tabbedPane = new JTabbedPane();
1368	1677	tabbedPane.add(scrollpane);
1369	1678
1370		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1371		-
1372		- optionsPanel = new cGridBag().setVertical(true);
	1679	+ optionsPanel = new cGridBag().setVertical(false);
1373	1680
1374	1681	optionsPanel.setName("Options");
1375	1682
..	..	@@ -1377,8 +1684,15 @@
1377	1684
1378	1685	tabbedPane.add(optionsPanel);
1379	1686
	1687	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1688	+
1380	1689	scenePanel.add(tabbedPane);
1381	1690
	1691	+ //if (Globals.ADVANCED)
	1692	+// tabbedPane.add(infoPanel);
	1693	+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1694	+// tabbedPane.setToolTipTextAt(3, "Information");
	1695	+
1382	1696	/*
1383	1697	cTree jTree = new cTree(null);
1384	1698	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1440,7 +1754,7 @@
1440	1754	bigThree = new cGridBag();
1441	1755	bigThree.addComponent(scenePanel);
1442	1756	bigThree.addComponent(centralPanel);
1443		- bigThree.addComponent(XYZPanel);
	1757	+ //bigThree.addComponent(XYZPanel);
1444	1758
1445	1759	// // SIDE EFFECT!!!
1446	1760	// aConstraints.gridx = 0;
..	..	@@ -1449,16 +1763,33 @@
1449	1763	// aConstraints.gridheight = 1;
1450	1764
1451	1765	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1452		- framePanel.setContinuousLayout(true);
1453		- framePanel.setOneTouchExpandable(true);
1454		- framePanel.setDividerLocation(0.8);
	1766	+
	1767	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1768	+ new java.beans.PropertyChangeListener()
	1769	+ {
	1770	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1771	+ {
	1772	+ if ((Integer)pce.getOldValue() == 1)
	1773	+ {
	1774	+ if (radio.layout != expandedLayout)
	1775	+ {
	1776	+ radio.layout = expandedLayout;
	1777	+ radio.layout.doClick();
	1778	+ }
	1779	+ }
	1780	+ }
	1781	+ });
	1782	+
	1783	+ framePanel.setContinuousLayout(false);
	1784	+ framePanel.setOneTouchExpandable(false);
	1785	+ //.setDividerLocation(0.8);
1455	1786	//framePanel.setDividerSize(15);
1456	1787	//framePanel.setResizeWeight(0.15);
1457	1788	framePanel.setName("Frame");
1458	1789
1459	1790	frame.getContentPane().setLayout(new BorderLayout());
1460	1791	/**/
1461		- JTabbedPane worldPane = new JTabbedPane();
	1792	+ //JTabbedPane worldPane = new JTabbedPane();
1462	1793	//worldPane.add(bigPanel);
1463	1794	//worldPane.add(worldPanel);
1464	1795	/**/
..	..	@@ -1469,16 +1800,18 @@
1469	1800	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1470	1801
1471	1802	frame.setSize(1280, 860);
1472		- frame.setVisible(true);
1473		-
	1803	+
1474	1804	cameraView.requestFocusInWindow();
1475	1805
1476	1806	gridPanel.setDividerLocation(1.0);
	1807	+
	1808	+ frame.validate();
	1809	+
	1810	+ frame.setVisible(true);
1477	1811
1478	1812	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1479	1813	frame.addWindowListener(new WindowAdapter()
1480	1814	{
1481		-
1482	1815	public void windowClosing(WindowEvent e)
1483	1816	{
1484	1817	Close();
..	..	@@ -1501,12 +1834,403 @@
1501	1834	ctrlPanel.removeAll();
1502	1835	}
1503	1836
1504		- void SetupMaterial(cGridBag panel)
	1837	+ void SetupMaterial(cGridBag materialpanel)
1505	1838	{
1506		- /*
	1839	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1840	+
	1841	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1842	+ skin.setToolTipText("Skin");
	1843	+ skin.addMouseListener(new MouseAdapter()
	1844	+ {
	1845	+ public void mouseClicked(MouseEvent e)
	1846	+ {
	1847	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1848	+ cMaterial material = object.material;
	1849	+
	1850	+ // Skin
	1851	+ colorField.setFloat(material.color);
	1852	+ saturationField.setFloat(material.modulation);
	1853	+ subsurfaceField.setFloat(material.subsurface);
	1854	+ selfshadowField.setFloat(material.diffuseness);
	1855	+ diffusenessField.setFloat(material.factor);
	1856	+ shininessField.setFloat(material.shininess);
	1857	+ shadowbiasField.setFloat(material.shadowbias);
	1858	+ diffuseField.setFloat(material.diffuse);
	1859	+ specularField.setFloat(material.specular);
	1860	+
	1861	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1862	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1863	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1864	+
	1865	+ materialtouched = true;
	1866	+ applySelf();
	1867	+ }
	1868	+ });
	1869	+ presetpanel.add(skin);
	1870	+
	1871	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1872	+ lambert.setToolTipText("Diffuse");
	1873	+ lambert.addMouseListener(new MouseAdapter()
	1874	+ {
	1875	+ public void mouseClicked(MouseEvent e)
	1876	+ {
	1877	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1878	+ cMaterial material = object.material;
	1879	+
	1880	+ diffusenessField.setFloat(material.factor);
	1881	+ selfshadowField.setFloat(material.diffuseness);
	1882	+
	1883	+ materialtouched = true;
	1884	+ applySelf();
	1885	+ }
	1886	+ });
	1887	+ presetpanel.add(lambert);
	1888	+
	1889	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1890	+ diffuse2.setToolTipText("Diffuse2");
	1891	+ diffuse2.addMouseListener(new MouseAdapter()
	1892	+ {
	1893	+ public void mouseClicked(MouseEvent e)
	1894	+ {
	1895	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1896	+ cMaterial material = object.material;
	1897	+
	1898	+ diffusenessField.setFloat(material.factor);
	1899	+ selfshadowField.setFloat(material.diffuseness);
	1900	+
	1901	+ materialtouched = true;
	1902	+ applySelf();
	1903	+ }
	1904	+ });
	1905	+ presetpanel.add(diffuse2);
	1906	+
	1907	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1908	+ diffusemoon.setToolTipText("Moon");
	1909	+ diffusemoon.addMouseListener(new MouseAdapter()
	1910	+ {
	1911	+ public void mouseClicked(MouseEvent e)
	1912	+ {
	1913	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1914	+ cMaterial material = object.material;
	1915	+
	1916	+ diffusenessField.setFloat(material.factor);
	1917	+ selfshadowField.setFloat(material.diffuseness);
	1918	+
	1919	+ materialtouched = true;
	1920	+ applySelf();
	1921	+ }
	1922	+ });
	1923	+ presetpanel.add(diffusemoon);
	1924	+
	1925	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1926	+ diffusemoon2.setToolTipText("Moon2");
	1927	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1928	+ {
	1929	+ public void mouseClicked(MouseEvent e)
	1930	+ {
	1931	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1932	+ cMaterial material = object.material;
	1933	+
	1934	+ diffusenessField.setFloat(material.factor);
	1935	+ selfshadowField.setFloat(material.diffuseness);
	1936	+
	1937	+ materialtouched = true;
	1938	+ applySelf();
	1939	+ }
	1940	+ });
	1941	+ presetpanel.add(diffusemoon2);
	1942	+
	1943	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1944	+ diffusemoon3.setToolTipText("Moon3");
	1945	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1946	+ {
	1947	+ public void mouseClicked(MouseEvent e)
	1948	+ {
	1949	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1950	+ cMaterial material = object.material;
	1951	+
	1952	+ diffusenessField.setFloat(material.factor);
	1953	+ selfshadowField.setFloat(material.diffuseness);
	1954	+
	1955	+ materialtouched = true;
	1956	+ applySelf();
	1957	+ }
	1958	+ });
	1959	+ presetpanel.add(diffusemoon3);
	1960	+
	1961	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1962	+ diffusesheen.setToolTipText("Sheen");
	1963	+ diffusesheen.addMouseListener(new MouseAdapter()
	1964	+ {
	1965	+ public void mouseClicked(MouseEvent e)
	1966	+ {
	1967	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1968	+ cMaterial material = object.material;
	1969	+
	1970	+ sheenField.setFloat(material.sheen);
	1971	+
	1972	+ materialtouched = true;
	1973	+ applySelf();
	1974	+ }
	1975	+ });
	1976	+ presetpanel.add(diffusesheen);
	1977	+
	1978	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	1979	+ rough.setToolTipText("Rough metal");
	1980	+ rough.addMouseListener(new MouseAdapter()
	1981	+ {
	1982	+ public void mouseClicked(MouseEvent e)
	1983	+ {
	1984	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	1985	+ cMaterial material = object.material;
	1986	+
	1987	+ shininessField.setFloat(material.shininess);
	1988	+ velvetField.setFloat(material.velvet);
	1989	+
	1990	+ materialtouched = true;
	1991	+ applySelf();
	1992	+ }
	1993	+ });
	1994	+ presetpanel.add(rough);
	1995	+
	1996	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	1997	+ rough2.setToolTipText("Medium metal");
	1998	+ rough2.addMouseListener(new MouseAdapter()
	1999	+ {
	2000	+ public void mouseClicked(MouseEvent e)
	2001	+ {
	2002	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2003	+ cMaterial material = object.material;
	2004	+
	2005	+ shininessField.setFloat(material.shininess);
	2006	+ lightareaField.setFloat(material.lightarea);
	2007	+
	2008	+ materialtouched = true;
	2009	+ applySelf();
	2010	+ }
	2011	+ });
	2012	+ presetpanel.add(rough2);
	2013	+
	2014	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2015	+ shini0.setToolTipText("Shiny");
	2016	+ shini0.addMouseListener(new MouseAdapter()
	2017	+ {
	2018	+ public void mouseClicked(MouseEvent e)
	2019	+ {
	2020	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2021	+ cMaterial material = object.material;
	2022	+
	2023	+ shininessField.setFloat(material.shininess);
	2024	+ lightareaField.setFloat(material.lightarea);
	2025	+
	2026	+ materialtouched = true;
	2027	+ applySelf();
	2028	+ }
	2029	+ });
	2030	+ presetpanel.add(shini0);
	2031	+
	2032	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2033	+ shini1.setToolTipText("Shiny2");
	2034	+ shini1.addMouseListener(new MouseAdapter()
	2035	+ {
	2036	+ public void mouseClicked(MouseEvent e)
	2037	+ {
	2038	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2039	+ cMaterial material = object.material;
	2040	+
	2041	+ shininessField.setFloat(material.shininess);
	2042	+ lightareaField.setFloat(material.lightarea);
	2043	+
	2044	+ materialtouched = true;
	2045	+ applySelf();
	2046	+ }
	2047	+ });
	2048	+ presetpanel.add(shini1);
	2049	+
	2050	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2051	+ shini2.setToolTipText("Shiny3");
	2052	+ shini2.addMouseListener(new MouseAdapter()
	2053	+ {
	2054	+ public void mouseClicked(MouseEvent e)
	2055	+ {
	2056	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2057	+ cMaterial material = object.material;
	2058	+
	2059	+ shininessField.setFloat(material.shininess);
	2060	+ lightareaField.setFloat(material.lightarea);
	2061	+
	2062	+ materialtouched = true;
	2063	+ applySelf();
	2064	+ }
	2065	+ });
	2066	+ presetpanel.add(shini2);
	2067	+
	2068	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2069	+ aniso.setToolTipText("AnisoU");
	2070	+ aniso.addMouseListener(new MouseAdapter()
	2071	+ {
	2072	+ public void mouseClicked(MouseEvent e)
	2073	+ {
	2074	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2075	+ cMaterial material = object.material;
	2076	+
	2077	+ anisoField.setFloat(material.aniso);
	2078	+ anisoVField.setFloat(material.anisoV);
	2079	+
	2080	+ materialtouched = true;
	2081	+ applySelf();
	2082	+ }
	2083	+ });
	2084	+ presetpanel.add(aniso);
	2085	+
	2086	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2087	+ aniso2.setToolTipText("AnisoV");
	2088	+ aniso2.addMouseListener(new MouseAdapter()
	2089	+ {
	2090	+ public void mouseClicked(MouseEvent e)
	2091	+ {
	2092	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2093	+ cMaterial material = object.material;
	2094	+
	2095	+ anisoField.setFloat(material.aniso);
	2096	+ anisoVField.setFloat(material.anisoV);
	2097	+
	2098	+ materialtouched = true;
	2099	+ applySelf();
	2100	+ }
	2101	+ });
	2102	+ presetpanel.add(aniso2);
	2103	+
	2104	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2105	+ aniso3.setToolTipText("AnisoUV");
	2106	+ aniso3.addMouseListener(new MouseAdapter()
	2107	+ {
	2108	+ public void mouseClicked(MouseEvent e)
	2109	+ {
	2110	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2111	+ cMaterial material = object.material;
	2112	+
	2113	+ anisoField.setFloat(material.aniso);
	2114	+ anisoVField.setFloat(material.anisoV);
	2115	+
	2116	+ materialtouched = true;
	2117	+ applySelf();
	2118	+ }
	2119	+ });
	2120	+ presetpanel.add(aniso3);
	2121	+
	2122	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2123	+ velvet0.setToolTipText("Velvet");
	2124	+ velvet0.addMouseListener(new MouseAdapter()
	2125	+ {
	2126	+ public void mouseClicked(MouseEvent e)
	2127	+ {
	2128	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2129	+ cMaterial material = object.material;
	2130	+
	2131	+ diffusenessField.setFloat(material.factor);
	2132	+ selfshadowField.setFloat(material.diffuseness);
	2133	+ sheenField.setFloat(material.sheen);
	2134	+ shininessField.setFloat(material.shininess);
	2135	+ velvetField.setFloat(material.velvet);
	2136	+ shiftField.setFloat(material.shift);
	2137	+
	2138	+ materialtouched = true;
	2139	+ applySelf();
	2140	+ }
	2141	+ });
	2142	+ presetpanel.add(velvet0);
	2143	+
	2144	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2145	+ bump0.setToolTipText("Bump texture");
	2146	+ bump0.addMouseListener(new MouseAdapter()
	2147	+ {
	2148	+ public void mouseClicked(MouseEvent e)
	2149	+ {
	2150	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2151	+ cMaterial material = object.material;
	2152	+
	2153	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2154	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2155	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2156	+
	2157	+ materialtouched = true;
	2158	+ applySelf();
	2159	+ }
	2160	+ });
	2161	+ presetpanel.add(bump0);
	2162	+
	2163	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2164	+ halo.setToolTipText("Halo");
	2165	+ halo.addMouseListener(new MouseAdapter()
	2166	+ {
	2167	+ public void mouseClicked(MouseEvent e)
	2168	+ {
	2169	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2170	+ cMaterial material = object.material;
	2171	+
	2172	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2173	+
	2174	+ materialtouched = true;
	2175	+ applySelf();
	2176	+ }
	2177	+ });
	2178	+ presetpanel.add(halo);
	2179	+
	2180	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2181	+ candle.setToolTipText("Candle");
	2182	+ candle.addMouseListener(new MouseAdapter()
	2183	+ {
	2184	+ public void mouseClicked(MouseEvent e)
	2185	+ {
	2186	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2187	+ cMaterial material = object.material;
	2188	+
	2189	+ subsurfaceField.setFloat(material.subsurface);
	2190	+ shadowbiasField.setFloat(material.shadowbias);
	2191	+ ambientField.setFloat(material.ambient);
	2192	+ specularField.setFloat(material.specular);
	2193	+ lightareaField.setFloat(material.lightarea);
	2194	+ shininessField.setFloat(material.shininess);
	2195	+
	2196	+ materialtouched = true;
	2197	+ applySelf();
	2198	+ }
	2199	+ });
	2200	+ presetpanel.add(candle);
	2201	+
	2202	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2203	+ shadowShader.setToolTipText("Shadow");
	2204	+ shadowShader.addMouseListener(new MouseAdapter()
	2205	+ {
	2206	+ public void mouseClicked(MouseEvent e)
	2207	+ {
	2208	+ diffuseField.setFloat(0.001);
	2209	+ ambientField.setFloat(0.001);
	2210	+ cameraField.setFloat(0.001);
	2211	+ specularField.setFloat(0.001);
	2212	+ fakedepthField.setFloat(0.001);
	2213	+ opacityField.setFloat(0.6);
	2214	+
	2215	+ materialtouched = true;
	2216	+ applySelf();
	2217	+ }
	2218	+ });
	2219	+ presetpanel.add(shadowShader);
	2220	+
	2221	+ cGridBag panel = new cGridBag().setVertical(true);
	2222	+
	2223	+ presetpanel.preferredWidth = 1;
	2224	+
	2225	+ materialpanel.add(presetpanel);
	2226	+ materialpanel.add(panel);
	2227	+
	2228	+ panel.preferredWidth = 8;
	2229	+
	2230	+ /*
1507	2231	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1508	2232	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1509		- */
	2233	+ */
1510	2234
1511	2235	cGridBag editBar = new cGridBag().setVertical(false);
1512	2236
..	..	@@ -1540,45 +2264,50 @@
1540	2264	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1541	2265
1542	2266	cGridBag colorSection = new cGridBag().setVertical(true);
	2267	+
	2268	+ cGridBag huepanel = new cGridBag();
	2269	+ cGridBag huelabel = new cGridBag();
	2270	+ skin = GetLabel("icons/hue.png", false);
	2271	+ skin.fit = true;
	2272	+ huelabel.add(skin);
	2273	+ huelabel.preferredWidth = 20;
	2274	+ huepanel.add(new cGridBag()); // Label
	2275	+ huepanel.add(huelabel); // Field/slider
	2276	+
	2277	+ huepanel.preferredHeight = 7;
	2278	+
	2279	+ colorSection.add(huepanel);
1543	2280
1544	2281	cGridBag color = new cGridBag();
1545		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1546		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1547		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2282	+
	2283	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2284	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2285	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2286	+
1548	2287	//colorField.preferredWidth = 200;
1549	2288	colorSection.add(color);
1550	2289
1551	2290	cGridBag modulation = new cGridBag();
1552	2291	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1553	2292	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1554		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2293	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1555	2294	colorSection.add(modulation);
1556	2295
	2296	+ cGridBag opacity = new cGridBag();
	2297	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2298	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2299	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2300	+ colorSection.add(opacity);
	2301	+
	2302	+ colorSection.add(GetSeparator());
	2303	+
1557	2304	cGridBag texture = new cGridBag();
1558	2305	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1559	2306	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1560	2307	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1561	2308	colorSection.add(texture);
1562	2309
1563		- cGridBag anisoU = new cGridBag();
1564		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1565		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1566		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1567		- colorSection.add(anisoU);
1568		-
1569		- cGridBag anisoV = new cGridBag();
1570		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1571		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1572		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1573		- colorSection.add(anisoV);
1574		-
1575		- cGridBag shadowbias = new cGridBag();
1576		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1577		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1578		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1579		- colorSection.add(shadowbias);
1580		-
1581		- panel.add(new JSeparator());
	2310	+ panel.add(GetSeparator());
1582	2311
1583	2312	panel.add(colorSection);
1584	2313
..	..	@@ -1628,7 +2357,13 @@
1628	2357	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1629	2358	diffuseSection.add(fakedepth);
1630	2359
1631		- panel.add(new JSeparator());
	2360	+ cGridBag shadowbias = new cGridBag();
	2361	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2362	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2363	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2364	+ diffuseSection.add(shadowbias);
	2365	+
	2366	+ panel.add(GetSeparator());
1632	2367
1633	2368	panel.add(diffuseSection);
1634	2369
..	..	@@ -1678,42 +2413,48 @@
1678	2413	// aConstraints.gridy += 1;
1679	2414	// aConstraints.gridwidth = 1;
1680	2415
	2416	+ cGridBag anisoU = new cGridBag();
	2417	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2418	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2419	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2420	+ specularSection.add(anisoU);
1681	2421
1682		- panel.add(new JSeparator());
	2422	+ cGridBag anisoV = new cGridBag();
	2423	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2424	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2425	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2426	+ specularSection.add(anisoV);
	2427	+
	2428	+
	2429	+ panel.add(GetSeparator());
1683	2430
1684	2431	panel.add(specularSection);
1685	2432
1686	2433	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1687	2434
1688		- cGridBag globalSection = new cGridBag().setVertical(true);
	2435	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1689	2436
1690	2437	cGridBag camera = new cGridBag();
1691	2438	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1692	2439	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1693	2440	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1694		- globalSection.add(camera);
	2441	+ colorSection.add(camera);
1695	2442
1696	2443	cGridBag ambient = new cGridBag();
1697	2444	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1698	2445	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1699	2446	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1700		- globalSection.add(ambient);
	2447	+ colorSection.add(ambient);
1701	2448
1702	2449	cGridBag backlit = new cGridBag();
1703	2450	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1704	2451	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1705	2452	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1706		- globalSection.add(backlit);
	2453	+ colorSection.add(backlit);
1707	2454
1708		- cGridBag opacity = new cGridBag();
1709		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1710		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1711		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1712		- globalSection.add(opacity);
1713		-
1714		- panel.add(new JSeparator());
	2455	+ //panel.add(new JSeparator());
1715	2456
1716		- panel.add(globalSection);
	2457	+ //panel.add(globalSection);
1717	2458
1718	2459	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1719	2460
..	..	@@ -1755,7 +2496,7 @@
1755	2496	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1756	2497	textureSection.add(opacityPower);
1757	2498
1758		- panel.add(new JSeparator());
	2499	+ panel.add(GetSeparator());
1759	2500
1760	2501	panel.add(textureSection);
1761	2502
..	..	@@ -1820,8 +2561,9 @@
1820	2561	// 3D models
1821	2562	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1822	2563	{
1823		- lastConverter = new com.jmex.model.converters.MaxToJme();
1824		- LoadFile(filename, lastConverter);
	2564	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2565	+ //LoadFile(filename, lastConverter);
	2566	+ LoadObjFile(filename); // New 3ds loader
1825	2567	continue;
1826	2568	}
1827	2569	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2547,6 +3289,7 @@
2547	3289	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2548	3290	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2549	3291	}
	3292	+
2550	3293	//cJME.count++;
2551	3294	//cJME.count %= 12;
2552	3295	if (gc)
..	..	@@ -2730,6 +3473,7 @@
2730	3473	}
2731	3474	}
2732	3475	}
	3476	+
2733	3477	cFileSystemPane FSPane;
2734	3478
2735	3479	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2739,7 +3483,7 @@
2739	3483
2740	3484	freezematerial = true;
2741	3485	colorField.setFloat(mat.color);
2742		- modulationField.setFloat(mat.modulation);
	3486	+ saturationField.setFloat(mat.modulation);
2743	3487	metalnessField.setFloat(mat.metalness);
2744	3488	diffuseField.setFloat(mat.diffuse);
2745	3489	specularField.setFloat(mat.specular);
..	..	@@ -2783,11 +3527,14 @@
2783	3527	}
2784	3528	}
2785	3529	}
	3530	+
2786	3531	freezematerial = false;
2787	3532	}
2788	3533
2789	3534	void SetMaterial(Object3D object)
2790	3535	{
	3536	+ latestObject = object;
	3537	+
2791	3538	cMaterial mat = object.material;
2792	3539
2793	3540	if (mat == null)
..	..	@@ -2899,12 +3646,17 @@
2899	3646	// }
2900	3647
2901	3648	/**/
2902		- if (deselect)
	3649	+ if (deselect \|\| child == null)
2903	3650	{
2904	3651	//group.deselectAll();
2905	3652	//freeze = true;
2906	3653	GetTree().clearSelection();
2907	3654	//freeze = false;
	3655	+
	3656	+ if (child == null)
	3657	+ {
	3658	+ return;
	3659	+ }
2908	3660	}
2909	3661
2910	3662	//group.addSelectee(child);
..	..	@@ -2938,6 +3690,17 @@
2938	3690	public void itemStateChanged(ItemEvent event)
2939	3691	{
2940	3692	// System.out.println("Propagate = " + propagate);
	3693	+ if (event.getSource() == pinButton)
	3694	+ {
	3695	+ copy.pinned ^= true;
	3696	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3697	+ {
	3698	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3699	+ copy.CloseUI();
	3700	+ //copy.editWindow.refreshContents();
	3701	+ }
	3702	+ }
	3703	+ else
2941	3704	if (event.getSource() == propagateToggle)
2942	3705	{
2943	3706	propagate ^= true;
..	..	@@ -2973,7 +3736,7 @@
2973	3736	cameraView.ToggleDL();
2974	3737	cameraView.repaint();
2975	3738	return;
2976		- } else if (event.getSource() == toggleTextureItem)
	3739	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2977	3740	{
2978	3741	cameraView.ToggleTexture();
2979	3742	// june 2013 copy.HardTouch();
..	..	@@ -3012,7 +3775,7 @@
3012	3775	frame.validate();
3013	3776
3014	3777	return;
3015		- } else if (event.getSource() == toggleSwitchItem)
	3778	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3016	3779	{
3017	3780	cameraView.ToggleSwitch();
3018	3781	cameraView.repaint();
..	..	@@ -3042,8 +3805,9 @@
3042	3805	} else if (event.getSource() == liveCB)
3043	3806	{
3044	3807	copy.live ^= true;
	3808	+ objEditor.refreshContents(true); // To show item colors
3045	3809	return;
3046		- } else if (event.getSource() == selectCB)
	3810	+ } else if (event.getSource() == selectableCB)
3047	3811	{
3048	3812	copy.dontselect ^= true;
3049	3813	return;
..	..	@@ -3051,7 +3815,7 @@
3051	3815	{
3052	3816	copy.hide ^= true;
3053	3817	copy.Touch(); // display list issue
3054		- objEditor.refreshContents();
	3818	+ objEditor.refreshContents(true); // To show item colors
3055	3819	return;
3056	3820	} else if (event.getSource() == link2masterCB)
3057	3821	{
..	..	@@ -3228,9 +3992,9 @@
3228	3992	{
3229	3993	Close();
3230	3994	//return true;
3231		- } else if (source == loadItem)
	3995	+ } else if (source == openItem)
3232	3996	{
3233		- load();
	3997	+ Open();
3234	3998	//return true;
3235	3999	} else if (source == newItem)
3236	4000	{
..	..	@@ -3255,6 +4019,10 @@
3255	4019	{
3256	4020	generatePOV();
3257	4021	//return true;
	4022	+ } else if (event.getSource() == archiveItem)
	4023	+ {
	4024	+ cTools.Archive(frame);
	4025	+ return;
3258	4026	} else if (source == zBufferItem)
3259	4027	{
3260	4028	try
..	..	@@ -3303,11 +4071,12 @@
3303	4071
3304	4072	static public byte[] Compress(Object3D o)
3305	4073	{
	4074	+ // Slower to actually compress.
3306	4075	try
3307	4076	{
3308	4077	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3309		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3310		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	4078	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4079	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3311	4080
3312	4081	Object3D parent = o.parent;
3313	4082	o.parent = null;
..	..	@@ -3318,10 +4087,14 @@
3318	4087
3319	4088	out.flush();
3320	4089
3321		- zstream.close();
	4090	+ baos //zstream
	4091	+ .close();
3322	4092	out.close();
3323	4093
3324		- return baos.toByteArray();
	4094	+ byte[] bytes = baos.toByteArray();
	4095	+
	4096	+ System.out.println("save #bytes = " + bytes.length);
	4097	+ return bytes;
3325	4098	} catch (Exception e)
3326	4099	{
3327	4100	System.err.println(e);
..	..	@@ -3331,13 +4104,16 @@
3331	4104
3332	4105	static public Object Uncompress(byte[] bytes)
3333	4106	{
3334		- System.out.println("#bytes = " + bytes.length);
	4107	+ System.out.println("restore #bytes = " + bytes.length);
3335	4108	try
3336	4109	{
3337	4110	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3338		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3339		- ObjectInputStream in = new ObjectInputStream(istream);
	4111	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4112	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3340	4113	Object obj = in.readObject();
	4114	+
	4115	+ bais //istream
	4116	+ .close();
3341	4117	in.close();
3342	4118
3343	4119	return obj;
..	..	@@ -3392,37 +4168,95 @@
3392	4168	return null;
3393	4169	}
3394	4170
3395		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3396	4171
3397	4172	public void Save()
3398	4173	{
3399		- cRadio tab = GetCurrentTab();
	4174	+ //Save(true);
	4175	+ Replace();
	4176	+ SetVersionStates();
	4177	+ }
	4178	+
	4179	+ private boolean Equal(byte[] compress, byte[] name)
	4180	+ {
	4181	+ if (compress.length != name.length)
	4182	+ {
	4183	+ return false;
	4184	+ }
3400	4185
3401		- boolean temp = CameraPane.SWITCH;
3402		- CameraPane.SWITCH = false;
	4186	+ for (int i=compress.length; --i>=0;)
	4187	+ {
	4188	+ if (compress[i] != name[i])
	4189	+ return false;
	4190	+ }
3403	4191
3404		- copy.ExtractBigData(hashtable);
	4192	+ return true;
	4193	+ }
	4194	+
	4195	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4196	+
	4197	+ void DeleteVersion()
	4198	+ {
	4199	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4200	+ {
	4201	+ copy.versionlist[i] = copy.versionlist[i+1];
	4202	+ }
	4203	+
	4204	+ CopyChanged();
	4205	+
	4206	+ SetVersionStates();
	4207	+ }
	4208	+
	4209	+ public boolean Save(boolean user)
	4210	+ {
	4211	+ System.err.println("Save");
	4212	+ Replace();
	4213	+
	4214	+ //cRadio tab = GetCurrentTab();
	4215	+
	4216	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
	4217	+
	4218	+ boolean thesame = false;
	4219	+
	4220	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4221	+// {
	4222	+// thesame = true;
	4223	+// }
3405	4224
3406	4225	//EditorFrame.m_MainFrame.requestFocusInWindow();
3407		- tab.graphs[tab.undoindex++] = Compress(copy);
3408		-
3409		- copy.RestoreBigData(hashtable);
3410		-
3411		- CameraPane.SWITCH = temp;
3412		-
3413		- //assert(hashtable.isEmpty());
3414		-
3415		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	4226	+ if (!thesame)
3416	4227	{
3417		- tab.graphs[i] = null;
	4228	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4229	+ {
	4230	+ copy.versionlist[i] = copy.versionlist[i-1];
	4231	+ }
	4232	+
	4233	+ //tab.user[tab.versionindex] = user;
	4234	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4235	+
	4236	+ copy.versionlist[++copy.versionindex] = compress;
	4237	+
	4238	+ // if (increment)
	4239	+ // tab.versionindex++;
3418	4240	}
3419	4241
	4242	+ //copy.RestoreBigData(versiontable);
	4243	+
	4244	+ //assert(hashtable.isEmpty());
	4245	+
	4246	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4247	+// {
	4248	+// //tab.user[i] = false;
	4249	+// copy.versionlist[i] = null;
	4250	+// }
	4251	+
	4252	+ SetVersionStates();
	4253	+
3420	4254	// test save
3421	4255	if (false)
3422	4256	{
3423	4257	try
3424	4258	{
3425		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	4259	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3426	4260	ObjectOutputStream p = new ObjectOutputStream(ostream);
3427	4261
3428	4262	p.writeObject(copy);
..	..	@@ -3435,26 +4269,68 @@
3435	4269	e.printStackTrace();
3436	4270	}
3437	4271	}
	4272	+
	4273	+ return !thesame;
	4274	+ }
	4275	+
	4276	+ boolean flashIt = true;
	4277	+
	4278	+ void RefreshSelection()
	4279	+ {
	4280	+ Object3D selection = new Object3D();
	4281	+
	4282	+ for (int i = 0; i < copy.selection.size(); i++)
	4283	+ {
	4284	+ Object3D elem = copy.selection.elementAt(i);
	4285	+
	4286	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4287	+
	4288	+ if (obj == null)
	4289	+ {
	4290	+ copy.selection.remove(i--);
	4291	+ }
	4292	+ else
	4293	+ {
	4294	+ selection.add(obj);
	4295	+ copy.selection.setElementAt(obj, i);
	4296	+ }
	4297	+ }
	4298	+
	4299	+ flashIt = false;
	4300	+ GetTree().clearSelection();
	4301	+ for (int i = 0; i < selection.size(); i++)
	4302	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4303	+ flashIt = true;
	4304	+
	4305	+ //refreshContents(false);
3438	4306	}
3439	4307
3440		- void CopyChanged(Object3D obj)
	4308	+ void CopyChanged()
3441	4309	{
	4310	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4311	+
	4312	+ SetVersionStates();
	4313	+
3442	4314	boolean temp = CameraPane.SWITCH;
3443	4315	CameraPane.SWITCH = false;
3444	4316
3445		- copy.ExtractBigData(hashtable);
	4317	+ copy.ExtractBigData(versiontable);
3446	4318
3447	4319	copy.clear();
3448	4320
	4321	+ copy.skyboxname = obj.skyboxname;
	4322	+ copy.skyboxext = obj.skyboxext;
	4323	+
3449	4324	for (int i=0; i<obj.Size(); i++)
3450	4325	{
3451	4326	copy.add(obj.get(i));
3452	4327	}
3453	4328
3454		- copy.RestoreBigData(hashtable);
	4329	+ copy.RestoreBigData(versiontable);
3455	4330
3456	4331	CameraPane.SWITCH = temp;
3457	4332
	4333	+ RefreshSelection();
3458	4334	//assert(hashtable.isEmpty());
3459	4335
3460	4336	copy.Touch();
..	..	@@ -3475,43 +4351,144 @@
3475	4351	}
3476	4352	}
3477	4353
3478		- refreshContents();
	4354	+ refreshContents(true);
3479	4355	}
3480	4356
3481		- public void Undo()
3482		- {
3483		- cRadio tab = GetCurrentTab();
	4357	+ cButton previousVersionButton;
	4358	+ cButton restoreButton;
	4359	+ cButton replaceButton;
	4360	+ cButton nextVersionButton;
	4361	+ cButton saveVersionButton;
	4362	+ cButton deleteVersionButton;
3484	4363
3485		- if (tab.undoindex == 0)
	4364	+ boolean muteSlider;
	4365	+
	4366	+ int VersionCount()
	4367	+ {
	4368	+ int count = 0;
	4369	+
	4370	+ for (int i = copy.versionlist.length; --i >= 0;)
	4371	+ {
	4372	+ if (copy.versionlist[i] != null)
	4373	+ count++;
	4374	+ }
	4375	+
	4376	+ return count;
	4377	+ }
	4378	+
	4379	+ void SetVersionStates()
	4380	+ {
	4381	+ //if (true)
	4382	+ // return;
	4383	+
	4384	+ //cRadio tab = GetCurrentTab();
	4385	+
	4386	+ restoreButton.setEnabled(copy.versionindex != -1);
	4387	+ replaceButton.setEnabled(copy.versionindex != -1);
	4388	+
	4389	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4390	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4391	+
	4392	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4393	+ copy.versionlist[copy.versionindex + 1] != null);
	4394	+
	4395	+ muteSlider = true;
	4396	+ versionSlider.setMinimum(0);
	4397	+ versionSlider.setMaximum(VersionCount() - 1);
	4398	+ versionSlider.setInteger(copy.versionindex);
	4399	+ versionSlider.setEnabled(copy.versionindex != -1);
	4400	+ muteSlider = false;
	4401	+ }
	4402	+
	4403	+ public boolean PreviousVersion()
	4404	+ {
	4405	+ // Option?
	4406	+ Replace();
	4407	+
	4408	+ System.err.println("Undo");
	4409	+
	4410	+ //cRadio tab = GetCurrentTab();
	4411	+
	4412	+ if (copy.versionindex == 0)
3486	4413	{
3487	4414	java.awt.Toolkit.getDefaultToolkit().beep();
3488		- return;
	4415	+ return false;
3489	4416	}
3490	4417
3491		- if (tab.graphs[tab.undoindex] == null)
3492		- {
3493		- Save();
3494		- tab.undoindex -= 1;
3495		- }
	4418	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4419	+// {
	4420	+// if (Save(false))
	4421	+// tab.versionindex -= 1;
	4422	+// else
	4423	+// {
	4424	+// if (tab.versionindex <= 0)
	4425	+// return false;
	4426	+// else
	4427	+// tab.versionindex -= 1;
	4428	+// }
	4429	+// }
3496	4430
3497		- tab.undoindex -= 1;
	4431	+ copy.versionindex -= 1;
3498	4432
3499		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4433	+ CopyChanged();
	4434	+
	4435	+ return true;
3500	4436	}
3501	4437
3502		- public void Redo()
	4438	+ public boolean Restore()
3503	4439	{
3504		- cRadio tab = GetCurrentTab();
	4440	+ System.err.println("Restore");
3505	4441
3506		- if (tab.graphs[tab.undoindex + 1] == null)
	4442	+ //cRadio tab = GetCurrentTab();
	4443	+
	4444	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4445	+ {
	4446	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4447	+ return false;
	4448	+ }
	4449	+
	4450	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4451	+ CopyChanged();
	4452	+
	4453	+ return true;
	4454	+ }
	4455	+
	4456	+ public boolean Replace()
	4457	+ {
	4458	+ System.err.println("Replace");
	4459	+
	4460	+ //cRadio tab = GetCurrentTab();
	4461	+
	4462	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4463	+ {
	4464	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4465	+ return false;
	4466	+ }
	4467	+
	4468	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4469	+
	4470	+ return true;
	4471	+ }
	4472	+
	4473	+ public void NextVersion()
	4474	+ {
	4475	+ // Option?
	4476	+ Replace();
	4477	+
	4478	+ //cRadio tab = GetCurrentTab();
	4479	+
	4480	+ if (copy.versionlist[copy.versionindex + 1] == null)
3507	4481	{
3508	4482	java.awt.Toolkit.getDefaultToolkit().beep();
3509	4483	return;
3510	4484	}
3511	4485
3512		- tab.undoindex += 1;
	4486	+ copy.versionindex += 1;
3513	4487
3514		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4488	+ CopyChanged();
	4489	+
	4490	+ //if (!tab.user[tab.versionindex])
	4491	+ // tab.graphs[tab.versionindex] = null;
3515	4492	}
3516	4493
3517	4494	void ImportGFD()
..	..	@@ -3663,7 +4640,7 @@
3663	4640	assert false;
3664	4641	}
3665	4642
3666		- void EditSelection()
	4643	+ void EditSelection(boolean newWindow)
3667	4644	{
3668	4645	}
3669	4646
..	..	@@ -3722,7 +4699,7 @@
3722	4699	//copy.material = new cMaterial(copy.GetMaterial());
3723	4700
3724	4701	current.color = (float) colorField.getFloat();
3725		- current.modulation = (float) modulationField.getFloat();
	4702	+ current.modulation = (float) saturationField.getFloat();
3726	4703	current.metalness = (float) metalnessField.getFloat();
3727	4704	current.diffuse = (float) diffuseField.getFloat();
3728	4705	current.specular = (float) specularField.getFloat();
..	..	@@ -3755,7 +4732,7 @@
3755	4732	cMaterial mat = copy.material;
3756	4733
3757	4734	colorField.SetToolTipValue((mat.color));
3758		- modulationField.SetToolTipValue((mat.modulation));
	4735	+ saturationField.SetToolTipValue((mat.modulation));
3759	4736	metalnessField.SetToolTipValue((mat.metalness));
3760	4737	diffuseField.SetToolTipValue((mat.diffuse));
3761	4738	specularField.SetToolTipValue((mat.specular));
..	..	@@ -3807,9 +4784,28 @@
3807	4784	//copy.Touch();
3808	4785	}
3809	4786
	4787	+ cNumberSlider versionSlider;
	4788	+
3810	4789	public void stateChanged(ChangeEvent e)
3811	4790	{
3812	4791	// assert(false);
	4792	+ if (e.getSource() == versionSlider)
	4793	+ {
	4794	+ if (muteSlider)
	4795	+ return;
	4796	+
	4797	+ Replace();
	4798	+
	4799	+ int version = versionSlider.getInteger();
	4800	+
	4801	+ if (version != -1 && copy.versionlist[version] != null)
	4802	+ {
	4803	+ copy.versionindex = version;
	4804	+ CopyChanged();
	4805	+ }
	4806	+
	4807	+ return;
	4808	+ }
3813	4809
3814	4810	if (freezematerial)
3815	4811	{
..	..	@@ -3845,6 +4841,12 @@
3845	4841	{
3846	4842	//System.out.println("stateChanged = " + this);
3847	4843	materialtouched = true;
	4844	+
	4845	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4846	+ {
	4847	+ saturationField.setFloat(1);
	4848	+ }
	4849	+
3848	4850	applySelf();
3849	4851	//System.out.println("this = " + this);
3850	4852	//System.out.println("PARENT = " + parent);
..	..	@@ -4144,6 +5146,7 @@
4144	5146	{
4145	5147	if (GetTree() != null)
4146	5148	{
	5149	+ GetTree().revalidate();
4147	5150	GetTree().repaint();
4148	5151	}
4149	5152
..	..	@@ -4152,13 +5155,17 @@
4152	5155	ctrlPanel.validate(); // ? new
4153	5156	ctrlPanel.repaint();
4154	5157	}
	5158	+
	5159	+ if (previousVersionButton != null && copy.versionlist != null)
	5160	+ SetVersionStates();
4155	5161	}
4156	5162
4157	5163	static TweenManager tweenManager = new TweenManager();
4158	5164
4159	5165	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4160	5166	{
4161		- Save();
	5167	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5168	+ Save();
4162	5169	//Tween.set(thing, 0).target(1).start(tweenManager);
4163	5170	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
4164	5171	// if (thing instanceof GenericJointDemo)
..	..	@@ -4245,6 +5252,12 @@
4245	5252	{
4246	5253	ResetModel();
4247	5254	Select(thing.GetTreePath(), true, false); // unselect... false);
	5255	+
	5256	+ if (thing.Size() == 0)
	5257	+ {
	5258	+ //EditSelection(false);
	5259	+ }
	5260	+
4248	5261	refreshContents();
4249	5262	}
4250	5263
..	..	@@ -4393,7 +5406,9 @@
4393	5406	readobj.ResetDisplayList();
4394	5407	} catch (Exception e)
4395	5408	{
4396		- //e.printStackTrace();
	5409	+ if (!e.toString().contains("GZIP"))
	5410	+ e.printStackTrace();
	5411	+
4397	5412	try
4398	5413	{
4399	5414	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4467,11 +5482,14 @@
4467	5482
4468	5483	if (readobj != null)
4469	5484	{
4470		- Save();
	5485	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5486	+ // Save();
4471	5487	try
4472	5488	{
4473	5489	//readobj.deepCopySelf(copy);
4474	5490	copy.clear(); // june 2014
	5491	+ copy.skyboxname = readobj.skyboxname;
	5492	+ copy.skyboxext = readobj.skyboxext;
4475	5493	for (int i = 0; i < readobj.size(); i++)
4476	5494	{
4477	5495	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4512,6 +5530,7 @@
4512	5530	}
4513	5531	} catch (ClassCastException e)
4514	5532	{
	5533	+ e.printStackTrace();
4515	5534	assert (false);
4516	5535	Composite c = (Composite) copy;
4517	5536	c.children.clear();
..	..	@@ -4522,17 +5541,31 @@
4522	5541	c.addChild(csg);
4523	5542	}
4524	5543
	5544	+ copy.versionlist = readobj.versionlist;
	5545	+ copy.versionindex = readobj.versionindex;
	5546	+
	5547	+ if (copy.versionlist == null)
	5548	+ {
	5549	+ // Backward compatibility
	5550	+ copy.versionlist = new Object3D[100];
	5551	+ copy.versionindex = -1;
	5552	+
	5553	+ //Save(true);
	5554	+ }
	5555	+
	5556	+ //? SetUndoStates();
	5557	+
4525	5558	ResetModel();
4526	5559	copy.HardTouch(); // recompile?
4527	5560	refreshContents();
4528	5561	}
4529	5562	}
4530	5563
4531		- void load() // throws ClassNotFoundException
	5564	+ void Open() // throws ClassNotFoundException
4532	5565	{
4533	5566	if (Grafreed.standAlone)
4534	5567	{
4535		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5568	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4536	5569	browser.show();
4537	5570	String filename = browser.getFile();
4538	5571	if (filename != null && filename.length() > 0)
..	..	@@ -4609,6 +5642,8 @@
4609	5642
4610	5643	void save()
4611	5644	{
	5645	+ Replace();
	5646	+
4612	5647	if (lastname == null)
4613	5648	{
4614	5649	return;
..	..	@@ -4631,6 +5666,7 @@
4631	5666	//ps.print(buffer.toString());
4632	5667	} catch (IOException e)
4633	5668	{
	5669	+ e.printStackTrace();
4634	5670	}
4635	5671	}
4636	5672
..	..	@@ -4645,6 +5681,8 @@
4645	5681	String filename = browser.getFile();
4646	5682	if (filename != null && filename.length() > 0)
4647	5683	{
	5684	+ if (!filename.endsWith(".gfd"))
	5685	+ filename += ".gfd";
4648	5686	lastname = browser.getDirectory() + filename;
4649	5687	save();
4650	5688	}
..	..	@@ -4811,7 +5849,7 @@
4811	5849	MenuBar menuBar;
4812	5850	Menu fileMenu;
4813	5851	MenuItem newItem;
4814		- MenuItem loadItem;
	5852	+ MenuItem openItem;
4815	5853	MenuItem saveItem;
4816	5854	MenuItem saveAsItem;
4817	5855	MenuItem exportAsItem;
..	..	@@ -4834,22 +5872,37 @@
4834	5872	CheckboxMenuItem toggleSwitchItem;
4835	5873	CheckboxMenuItem toggleRootItem;
4836	5874	CheckboxMenuItem animationItem;
	5875	+ MenuItem archiveItem;
4837	5876	CheckboxMenuItem toggleHandleItem;
4838	5877	CheckboxMenuItem togglePaintItem;
4839	5878	JSplitPane mainPanel;
4840	5879	JScrollPane scrollpane;
	5880	+
4841	5881	JPanel toolbarPanel;
	5882	+
4842	5883	cGridBag treePanel;
	5884	+
4843	5885	JPanel radioPanel;
4844	5886	ButtonGroup buttonGroup;
4845		- cGridBag ctrlPanel;
	5887	+
	5888	+ cGridBag toolboxPanel;
	5889	+ cGridBag skyboxPanel;
4846	5890	cGridBag materialPanel;
	5891	+ cGridBag ctrlPanel;
	5892	+
4847	5893	JScrollPane infoPanel;
	5894	+
4848	5895	cGridBag optionsPanel;
	5896	+
4849	5897	JTabbedPane objectPanel;
	5898	+ boolean materialFlushed;
	5899	+ Object3D latestObject;
	5900	+
4850	5901	cGridBag XYZPanel;
	5902	+
4851	5903	JSplitPane gridPanel;
4852	5904	JSplitPane bigPanel;
	5905	+
4853	5906	cGridBag bigThree;
4854	5907	cGridBag scenePanel;
4855	5908	cGridBag centralPanel;
..	..	@@ -4907,7 +5960,7 @@
4907	5960	JLabel colorLabel;
4908	5961	cNumberSlider colorField;
4909	5962	JLabel modulationLabel;
4910		- cNumberSlider modulationField;
	5963	+ cNumberSlider saturationField;
4911	5964	JLabel metalnessLabel;
4912	5965	cNumberSlider metalnessField;
4913	5966	JLabel diffuseLabel;
..	..	@@ -4938,6 +5991,7 @@
4938	5991	cNumberSlider anisoField;
4939	5992	JLabel anisoVLabel;
4940	5993	cNumberSlider anisoVField;
	5994	+
4941	5995	JLabel cameraLabel;
4942	5996	cNumberSlider cameraField;
4943	5997	JLabel selfshadowLabel;
..	..	@@ -4952,6 +6006,7 @@
4952	6006	cNumberSlider fakedepthField;
4953	6007	JLabel shadowbiasLabel;
4954	6008	cNumberSlider shadowbiasField;
	6009	+
4955	6010	JLabel bumpLabel;
4956	6011	cNumberSlider bumpField;
4957	6012	JLabel noiseLabel;
..	..	@@ -4964,7 +6019,7 @@
4964	6019	cNumberSlider fogField;
4965	6020	JLabel opacityPowerLabel;
4966	6021	cNumberSlider opacityPowerField;
4967		- JTree jTree;
	6022	+ cTree jTree;
4968	6023	//ObjectUI parent;
4969	6024
4970	6025	cNumberSlider normalpushField;