~nbriere/GrafreeD.git - Noware Git Repository

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