~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
..	..	@@ -35,6 +39,81 @@
35	39
36	40	GroupEditor callee;
37	41	JFrame frame;
	42	+
	43	+ static ObjEditor theFrame;
	44	+
	45	+ public cGridBag GetSeparator()
	46	+ {
	47	+ cGridBag separator = new cGridBag();
	48	+ separator.add(new JSeparator());
	49	+ separator.preferredHeight = 5;
	50	+ return separator;
	51	+ }
	52	+
	53	+ cButton GetButton(String name, boolean border)
	54	+ {
	55	+ ImageIcon icon = GetIcon(name);
	56	+ return new cButton(icon, border);
	57	+ }
	58	+
	59	+ cLabel GetLabel(String name, boolean border)
	60	+ {
	61	+ //ImageIcon icon = GetIcon(name);
	62	+ return new cLabel(GetImage(name), border);
	63	+ }
	64	+
	65	+ cToggleButton GetToggleButton(String name, boolean border)
	66	+ {
	67	+ ImageIcon icon = GetIcon(name);
	68	+ return new cToggleButton(icon, border);
	69	+ }
	70	+
	71	+ cCheckBox GetCheckBox(String name, boolean border)
	72	+ {
	73	+ ImageIcon icon = GetIcon(name);
	74	+ return new cCheckBox(icon, border);
	75	+ }
	76	+
	77	+ ImageIcon GetIcon(String name)
	78	+ {
	79	+ try
	80	+ {
	81	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	82	+
	83	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	84	+// {
	85	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	86	+// Graphics2D g = resized.createGraphics();
	87	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	88	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	89	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	90	+// g.dispose();
	91	+//
	92	+// image = resized;
	93	+// }
	94	+
	95	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	96	+ return icon;
	97	+ }
	98	+ catch (Exception e)
	99	+ {
	100	+ return null;
	101	+ }
	102	+ }
	103	+
	104	+ BufferedImage GetImage(String name)
	105	+ {
	106	+ try
	107	+ {
	108	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	109	+
	110	+ return image;
	111	+ }
	112	+ catch (Exception e)
	113	+ {
	114	+ return null;
	115	+ }
	116	+ }
38	117
39	118	// SCRIPT
40	119
..	..	@@ -145,7 +224,7 @@
145	224
146	225	objEditor.ctrlPanel.remove(namePanel);
147	226
148		- if (!GroupEditor.allparams)
	227	+ if (!allparams)
149	228	return;
150	229
151	230	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -168,7 +247,8 @@
168	247	// objEditor.ctrlPanel.remove(remarkButton);
169	248
170	249	objEditor.ctrlPanel.remove(setupPanel);
171		- objEditor.ctrlPanel.remove(commandsPanel);
	250	+ objEditor.ctrlPanel.remove(setupPanel2);
	251	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
172	252	objEditor.ctrlPanel.remove(pushPanel);
173	253	//objEditor.ctrlPanel.remove(fillPanel);
174	254
..	..	@@ -216,6 +296,12 @@
216	296	client = inClient;
217	297	copy = client;
218	298
	299	+ if (copy.versionlist == null)
	300	+ {
	301	+ copy.versionlist = new Object3D[100];
	302	+ copy.versionindex = -1;
	303	+ }
	304	+
219	305	// "this" is not called: SetupUI2(objEditor);
220	306	}
221	307
..	..	@@ -229,6 +315,12 @@
229	315	client = inClient;
230	316	copy = client;
231	317
	318	+ if (copy.versionlist == null)
	319	+ {
	320	+ copy.versionlist = new Object3D[100];
	321	+ copy.versionindex = -1;
	322	+ }
	323	+
232	324	SetupUI2(callee.GetEditor());
233	325	}
234	326
..	..	@@ -243,6 +335,7 @@
243	335	//localCopy.parent = null;
244	336
245	337	frame = new JFrame();
	338	+ frame.setUndecorated(false);
246	339	objEditor = this;
247	340	this.callee = callee;
248	341
..	..	@@ -260,6 +353,12 @@
260	353	copy = localCopy;
261	354	copy.editWindow = this;
262	355
	356	+ if (copy.versionlist == null)
	357	+ {
	358	+// copy.versions = new byte[100][];
	359	+// copy.versionindex = -1;
	360	+ }
	361	+
263	362	SetupMenu();
264	363
265	364	//SetupName(objEditor); // new
..	..	@@ -273,12 +372,17 @@
273	372	return frame.action(event, obj);
274	373	}
275	374
	375	+ // Cannot work without static
	376	+ static boolean allparams = true;
	377	+
	378	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	379	+
276	380	void SetupMenu()
277	381	{
278	382	frame.setMenuBar(menuBar = new MenuBar());
279	383	menuBar.add(fileMenu = new Menu("File"));
280	384	fileMenu.add(newItem = new MenuItem("New"));
281		- fileMenu.add(loadItem = new MenuItem("Load..."));
	385	+ fileMenu.add(openItem = new MenuItem("Open..."));
282	386
283	387	//oe.menuBar.add(menu = new Menu("Include"));
284	388	Menu menu = new Menu("Import");
..	..	@@ -310,7 +414,7 @@
310	414	}
311	415
312	416	newItem.addActionListener(this);
313		- loadItem.addActionListener(this);
	417	+ openItem.addActionListener(this);
314	418	saveItem.addActionListener(this);
315	419	saveAsItem.addActionListener(this);
316	420	exportAsItem.addActionListener(this);
..	..	@@ -319,28 +423,68 @@
319	423	closeItem.addActionListener(this);
320	424
321	425	objectPanel = new JTabbedPane();
	426	+
	427	+ ChangeListener changeListener = new ChangeListener()
	428	+ {
	429	+ public void stateChanged(ChangeEvent changeEvent)
	430	+ {
	431	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	432	+// {
	433	+// if (latestObject != null)
	434	+// {
	435	+// refreshContents(true);
	436	+// SetMaterial(latestObject);
	437	+// }
	438	+//
	439	+// materialFlushed = true;
	440	+// }
	441	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	442	+// {
	443	+// if (listUI.size() == 0)
	444	+// EditSelection(false);
	445	+// }
	446	+
	447	+ refreshContents(false); // To refresh Info tab
	448	+ }
	449	+ };
	450	+ objectPanel.addChangeListener(changeListener);
	451	+
322	452	toolbarPanel = new JPanel();
323	453	toolbarPanel.setName("Toolbar");
	454	+
324	455	treePanel = new cGridBag();
325	456	treePanel.setName("Tree");
	457	+
	458	+ editPanel = new cGridBag().setVertical(true);
	459	+ //editPanel.setName("Edit");
	460	+
326	461	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
327		- ctrlPanel.setName("Edit");
328		- materialPanel = new cGridBag().setVertical(true);
329		- materialPanel.setName("Material");
	462	+
	463	+ editCommandsPanel = new cGridBag();
	464	+ editPanel.add(editCommandsPanel);
	465	+ editPanel.add(ctrlPanel);
	466	+
	467	+ toolboxPanel = new cGridBag().setVertical(true);
	468	+ //toolboxPanel.setName("Toolbox");
	469	+
	470	+ materialPanel = new cGridBag().setVertical(false);
	471	+ //materialPanel.setName("Material");
	472	+
330	473	/JTextPane/
331	474	infoarea = createTextPane();
332	475	doc = infoarea.getStyledDocument();
333	476
334	477	infoarea.setEditable(true);
335	478	SetText();
	479	+
336	480	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
337	481	// infoarea.setOpaque(false);
338	482	// //infoarea.setForeground(textcolor);
339	483	// TEXTAREA infoarea.setLineWrap(true);
340	484	// TEXTAREA infoarea.setWrapStyleWord(true);
341	485	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
342		- infoPanel.setPreferredSize(new Dimension(50, 200));
343		- infoPanel.setName("Info");
	486	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	487	+ //infoPanel.setName("Info");
344	488	//infoPanel.setLayout(new BorderLayout());
345	489	//infoPanel.add(createTextPane());
346	490
..	..	@@ -351,7 +495,14 @@
351	495	mainPanel.setDividerSize(9);
352	496	mainPanel.setDividerLocation(0.5); //1.0);
353	497	mainPanel.setResizeWeight(0.5);
354		-
	498	+
	499	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	500	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	501	+ divider.setDividerSize(15);
	502	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	503	+
	504	+ mainPanel.setUI(new BasicSplitPaneUI());
	505	+
355	506	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
356	507	//mainPanel.setLayout(new GridBagLayout());
357	508	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -419,10 +570,10 @@
419	570	e.printStackTrace();
420	571	}
421	572
422		- String selection = infoarea.getText();
423		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
424		- java.awt.datatransfer.Clipboard clipboard =
425		- Toolkit.getDefaultToolkit().getSystemClipboard();
	573	+// String selection = infoarea.getText();
	574	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	575	+// java.awt.datatransfer.Clipboard clipboard =
	576	+// Toolkit.getDefaultToolkit().getSystemClipboard();
426	577	//clipboard.setContents(data, data);
427	578	}
428	579
..	..	@@ -582,21 +733,147 @@
582	733	}
583	734	}
584	735
	736	+//static GraphicsDevice device = GraphicsEnvironment
	737	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	738	+
	739	+ Rectangle keeprect;
	740	+ cRadio radio;
	741	+
	742	+cButton keepButton;
	743	+ cButton twoButton; // Full 3D
	744	+ cButton sixButton;
	745	+ cButton threeButton;
	746	+ cButton sevenButton;
	747	+ cButton fourButton; // full panel
	748	+ cButton oneButton; // full XYZ
	749	+ //cButton currentLayout;
	750	+
	751	+ boolean maximized;
	752	+
	753	+ cButton fullscreenLayout;
	754	+
	755	+ void Minimize()
	756	+ {
	757	+ frame.setState(Frame.ICONIFIED);
	758	+ frame.validate();
	759	+ }
	760	+
	761	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	762	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	763	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	764	+ void Maximize()
	765	+ {
	766	+ if (CameraPane.FULLSCREEN)
	767	+ {
	768	+ ToggleFullScreen();
	769	+ }
	770	+
	771	+ if (maximized)
	772	+ {
	773	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	774	+ }
	775	+ else
	776	+ {
	777	+ keeprect = frame.getBounds();
	778	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	779	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	780	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	781	+// frame.setState(Frame.MAXIMIZED_BOTH);
	782	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	783	+ }
	784	+
	785	+ maximized ^= true;
	786	+
	787	+ frame.validate();
	788	+ }
	789	+
	790	+ cButton minButton;
	791	+ cButton maxButton;
	792	+ cButton fullButton;
	793	+
585	794	void ToggleFullScreen()
586	795	{
587		- if (CameraPane.FULLSCREEN)
	796	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	797	+
	798	+ cameraView.ToggleFullScreen();
	799	+
	800	+ if (!CameraPane.FULLSCREEN)
588	801	{
589		- frame.getContentPane().remove(/"Center",/bigThree);
590		- framePanel.add(bigThree);
591		- frame.getContentPane().add(/"Center",/framePanel);
	802	+ device.setFullScreenWindow(null);
	803	+ frame.dispose();
	804	+ frame.setUndecorated(false);
	805	+ frame.validate();
	806	+ frame.setVisible(true);
	807	+
	808	+ //frame.setVisible(false);
	809	+// frame.removeNotify();
	810	+// frame.setUndecorated(false);
	811	+// frame.addNotify();
	812	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	813	+
	814	+// X frame.getContentPane().remove(/"Center",/bigThree);
	815	+// X framePanel.add(bigThree);
	816	+// X frame.getContentPane().add(/"Center",/framePanel);
	817	+ framePanel.setDividerLocation(46);
	818	+
	819	+ //frame.setVisible(true);
	820	+ radio.layout = keepButton;
	821	+ //theFrame = null;
	822	+ keepButton = null;
	823	+ radio.layout.doClick();
	824	+
592	825	} else
593	826	{
594		- frame.getContentPane().remove(/"Center",/framePanel);
595		- framePanel.remove(bigThree);
596		- frame.getContentPane().add(/"Center",/bigThree);
	827	+ keepButton = radio.layout;
	828	+ //keeprect = frame.getBounds();
	829	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	830	+// frame.getToolkit().getScreenSize().height);
	831	+ //frame.setVisible(false);
	832	+
	833	+ frame.dispose();
	834	+ frame.setUndecorated(true);
	835	+ device.setFullScreenWindow(frame);
	836	+ frame.validate();
	837	+ frame.setVisible(true);
	838	+// frame.removeNotify();
	839	+// frame.setUndecorated(true);
	840	+// frame.addNotify();
	841	+// X frame.getContentPane().remove(/"Center",/framePanel);
	842	+// X framePanel.remove(bigThree);
	843	+// X frame.getContentPane().add(/"Center",/bigThree);
	844	+ framePanel.setDividerLocation(0);
	845	+
	846	+ radio.layout = fullscreenLayout;
	847	+ radio.layout.doClick();
	848	+ //frame.setVisible(true);
597	849	}
598		- cameraView.ToggleFullScreen();
	850	+ frame.validate();
	851	+
	852	+ cameraView.requestFocusInWindow();
599	853	}
	854	+
	855	+ private Object3D CompressCopy()
	856	+ {
	857	+ boolean temp = CameraPane.SWITCH;
	858	+ CameraPane.SWITCH = false;
	859	+
	860	+ copy.ExtractBigData(versiontable);
	861	+ // if (copy == client)
	862	+
	863	+ Object3D versions[] = copy.versionlist;
	864	+ copy.versionlist = null;
	865	+
	866	+ //byte[] compress = Compress(copy);
	867	+ Object3D compress = (Object3D)Grafreed.clone(copy);
	868	+
	869	+ copy.versionlist = versions;
	870	+
	871	+ copy.RestoreBigData(versiontable);
	872	+
	873	+ CameraPane.SWITCH = temp;
	874	+
	875	+ return compress;
	876	+ }
600	877
601	878	private JTextPane createTextPane()
602	879	{
..	..	@@ -719,6 +996,7 @@
719	996	{
720	997	SetupMaterial(materialPanel);
721	998	}
	999	+
722	1000	//SetupName();
723	1001	//SetupViews();
724	1002	}
..	..	@@ -728,7 +1006,7 @@
728	1006	// NumberSlider vDivsField;
729	1007	// JCheckBox endcaps;
730	1008	JCheckBox liveCB;
731		- JCheckBox selectCB;
	1009	+ JCheckBox selectableCB;
732	1010	JCheckBox hideCB;
733	1011	JCheckBox link2masterCB;
734	1012	JCheckBox markCB;
..	..	@@ -736,7 +1014,12 @@
736	1014	JCheckBox speedupCB;
737	1015	JCheckBox rewindCB;
738	1016	JCheckBox flipVCB;
	1017	+
	1018	+ cCheckBox toggleTextureCB;
	1019	+ cCheckBox toggleSwitchCB;
	1020	+
739	1021	JComboBox texresMenu;
	1022	+
740	1023	JButton resetButton;
741	1024	JButton stepButton;
742	1025	JButton stepAllButton;
..	..	@@ -745,9 +1028,13 @@
745	1028	JButton fasterButton;
746	1029	JButton remarkButton;
747	1030
	1031	+ cGridBag editPanel;
	1032	+ cGridBag editCommandsPanel;
	1033	+
748	1034	cGridBag namePanel;
749	1035	cGridBag setupPanel;
750		- cGridBag commandsPanel;
	1036	+ cGridBag setupPanel2;
	1037	+ cGridBag objectCommandsPanel;
751	1038	cGridBag pushPanel;
752	1039	cGridBag fillPanel;
753	1040
..	..	@@ -919,60 +1206,68 @@
919	1206	namePanel = new cGridBag();
920	1207
921	1208	nameField = AddText(namePanel, copy.GetName());
922		- namePanel.add(nameField);
	1209	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
923	1210	oe.ctrlPanel.add(namePanel);
924	1211
925	1212	oe.ctrlPanel.Return();
926	1213
927		- if (!GroupEditor.allparams)
	1214	+ if (!allparams)
928	1215	return;
929	1216
930	1217	setupPanel = new cGridBag().setVertical(false);
931	1218
932	1219	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
933	1220	liveCB.setToolTipText("Animate object");
934		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
935		- selectCB.setToolTipText("Make object selectable");
	1221	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1222	+ selectableCB.setToolTipText("Make object selectable");
936	1223	// Return();
	1224	+
937	1225	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
938	1226	hideCB.setToolTipText("Hide object");
939	1227	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
940		- markCB.setToolTipText("Set the animation target transform");
	1228	+ markCB.setToolTipText("As animation target transform");
941	1229
942		- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	1230	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1231	+
	1232	+ setupPanel2 = new cGridBag().setVertical(false);
	1233	+
	1234	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
943	1235	rewindCB.setToolTipText("Rewind animation");
944	1236
945		- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
946		- randomCB.setToolTipText("Option for switch node");
	1237	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1238	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
947	1239
	1240	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1241	+ link2masterCB.setToolTipText("Attach to support");
	1242	+
948	1243	if (Globals.ADVANCED)
949	1244	{
950		- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
951		- link2masterCB.setToolTipText("Attach to support");
952		- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1245	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
953	1246	speedupCB.setToolTipText("Option motion capture");
954	1247	}
955	1248
956	1249	oe.ctrlPanel.add(setupPanel);
957	1250	oe.ctrlPanel.Return();
	1251	+ oe.ctrlPanel.add(setupPanel2);
	1252	+ oe.ctrlPanel.Return();
958	1253
959		- commandsPanel = new cGridBag().setVertical(false);
	1254	+ objectCommandsPanel = new cGridBag().setVertical(false);
960	1255
961		- resetButton = AddButton(commandsPanel, "Reset");
	1256	+ resetButton = AddButton(objectCommandsPanel, "Reset");
962	1257	resetButton.setToolTipText("Jump to frame zero");
963		- stepButton = AddButton(commandsPanel, "Step");
	1258	+ stepButton = AddButton(objectCommandsPanel, "Step");
964	1259	stepButton.setToolTipText("Step one frame");
965	1260	// resetAllButton = AddButton(oe, "Reset All");
966	1261	// stepAllButton = AddButton(oe, "Step All");
967	1262	// Return();
968		- slowerButton = AddButton(commandsPanel, "Slow");
	1263	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
969	1264	slowerButton.setToolTipText("Decrease animation speed");
970		- fasterButton = AddButton(commandsPanel, "Fast");
	1265	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
971	1266	fasterButton.setToolTipText("Increase animation speed");
972		- remarkButton = AddButton(commandsPanel, "Remark");
	1267	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
973	1268	remarkButton.setToolTipText("Set the current transform as the target");
974	1269
975		- oe.ctrlPanel.add(commandsPanel);
	1270	+ oe.ctrlPanel.add(objectCommandsPanel);
976	1271	oe.ctrlPanel.Return();
977	1272
978	1273	pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
..	..	@@ -1178,8 +1473,11 @@
1178	1473	//worldPanel.setName("World");
1179	1474	centralPanel = new cGridBag();
1180	1475	centralPanel.preferredWidth = 20;
1181		- timelinePanel = new JPanel(new BorderLayout());
1182		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1476	+
	1477	+ if (Globals.ADVANCED)
	1478	+ {
	1479	+ timelinePanel = new JPanel(new BorderLayout());
	1480	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1183	1481
1184	1482	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1185	1483	cameraPanel.setContinuousLayout(true);
..	..	@@ -1188,7 +1486,10 @@
1188	1486	// cameraPanel.setDividerSize(9);
1189	1487	cameraPanel.setResizeWeight(1.0);
1190	1488
	1489	+ }
	1490	+
1191	1491	centralPanel.add(cameraView);
	1492	+ centralPanel.setFocusable(true);
1192	1493	//frame.setJMenuBar(timelineMenubar);
1193	1494	//centralPanel.add(timelinePanel);
1194	1495
..	..	@@ -1214,6 +1515,7 @@
1214	1515	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1215	1516	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1216	1517	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1518	+ //XYZPanel.setName("XYZ");
1217	1519
1218	1520	/*
1219	1521	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1251,13 +1553,30 @@
1251	1553	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1252	1554	//tmp.setName("Edit");
1253	1555	objectPanel.add(materialPanel);
	1556	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1557	+ objectPanel.setToolTipTextAt(0, "Material");
	1558	+
	1559	+ objectPanel.add(toolboxPanel);
	1560	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1561	+ objectPanel.setToolTipTextAt(1, "Objects & backgrounds");
	1562	+
1254	1563	// JPanel north = new JPanel(new BorderLayout());
1255	1564	// north.setName("Edit");
1256	1565	// north.add(ctrlPanel, BorderLayout.NORTH);
1257	1566	// objectPanel.add(north);
1258		- objectPanel.add(ctrlPanel);
1259		- objectPanel.add(infoPanel);
1260		-
	1567	+ objectPanel.add(editPanel);
	1568	+ objectPanel.setIconAt(2, GetIcon("icons/write.png"));
	1569	+ objectPanel.setToolTipTextAt(2, "Edit controls");
	1570	+
	1571	+ //if (Globals.ADVANCED)
	1572	+ objectPanel.add(infoPanel);
	1573	+ objectPanel.setIconAt(3, GetIcon("icons/info.png"));
	1574	+ objectPanel.setToolTipTextAt(3, "Information");
	1575	+
	1576	+ objectPanel.add(XYZPanel);
	1577	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1578	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1579	+
1261	1580	/*
1262	1581	aConstraints.gridx = 0;
1263	1582	aConstraints.gridwidth = 1;
..	..	@@ -1265,7 +1584,7 @@
1265	1584	aConstraints.gridy += 1;
1266	1585	aConstraints.gridwidth = 1;
1267	1586	mainPanel.add(objectPanel, aConstraints);
1268		- */
	1587	+ */
1269	1588
1270	1589	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1271	1590	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1277,14 +1596,12 @@
1277	1596	scrollpane.addMouseWheelListener(this); // Default not fast enough
1278	1597
1279	1598	/JTabbedPane/ scenePanel = new cGridBag();
1280		- scenePanel.preferredWidth = 6;
	1599	+ scenePanel.preferredWidth = 5;
1281	1600
1282	1601	JTabbedPane tabbedPane = new JTabbedPane();
1283	1602	tabbedPane.add(scrollpane);
1284	1603
1285		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1286		-
1287		- optionsPanel = new cGridBag().setVertical(true);
	1604	+ optionsPanel = new cGridBag().setVertical(false);
1288	1605
1289	1606	optionsPanel.setName("Options");
1290	1607
..	..	@@ -1292,6 +1609,8 @@
1292	1609
1293	1610	tabbedPane.add(optionsPanel);
1294	1611
	1612	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1613	+
1295	1614	scenePanel.add(tabbedPane);
1296	1615
1297	1616	/*
..	..	@@ -1355,7 +1674,7 @@
1355	1674	bigThree = new cGridBag();
1356	1675	bigThree.addComponent(scenePanel);
1357	1676	bigThree.addComponent(centralPanel);
1358		- bigThree.addComponent(XYZPanel);
	1677	+ //bigThree.addComponent(XYZPanel);
1359	1678
1360	1679	// // SIDE EFFECT!!!
1361	1680	// aConstraints.gridx = 0;
..	..	@@ -1364,9 +1683,9 @@
1364	1683	// aConstraints.gridheight = 1;
1365	1684
1366	1685	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1367		- framePanel.setContinuousLayout(true);
1368		- framePanel.setOneTouchExpandable(true);
1369		- framePanel.setDividerLocation(0.8);
	1686	+ framePanel.setContinuousLayout(false);
	1687	+ framePanel.setOneTouchExpandable(false);
	1688	+ //.setDividerLocation(0.8);
1370	1689	//framePanel.setDividerSize(15);
1371	1690	//framePanel.setResizeWeight(0.15);
1372	1691	framePanel.setName("Frame");
..	..	@@ -1384,14 +1703,18 @@
1384	1703	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1385	1704
1386	1705	frame.setSize(1280, 860);
1387		- frame.setVisible(true);
1388		-
	1706	+
	1707	+ cameraView.requestFocusInWindow();
	1708	+
1389	1709	gridPanel.setDividerLocation(1.0);
	1710	+
	1711	+ frame.validate();
	1712	+
	1713	+ frame.setVisible(true);
1390	1714
1391	1715	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1392	1716	frame.addWindowListener(new WindowAdapter()
1393	1717	{
1394		-
1395	1718	public void windowClosing(WindowEvent e)
1396	1719	{
1397	1720	Close();
..	..	@@ -1414,12 +1737,384 @@
1414	1737	ctrlPanel.removeAll();
1415	1738	}
1416	1739
1417		- void SetupMaterial(cGridBag panel)
	1740	+ void SetupMaterial(cGridBag materialpanel)
1418	1741	{
1419		- /*
	1742	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1743	+
	1744	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1745	+ skin.setToolTipText("Skin");
	1746	+ skin.addMouseListener(new MouseAdapter()
	1747	+ {
	1748	+ public void mouseClicked(MouseEvent e)
	1749	+ {
	1750	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1751	+ cMaterial material = object.material;
	1752	+
	1753	+ // Skin
	1754	+ colorField.setFloat(material.color);
	1755	+ saturationField.setFloat(material.modulation);
	1756	+ subsurfaceField.setFloat(material.subsurface);
	1757	+ selfshadowField.setFloat(material.diffuseness);
	1758	+ diffusenessField.setFloat(material.factor);
	1759	+ shininessField.setFloat(material.shininess);
	1760	+ shadowbiasField.setFloat(material.shadowbias);
	1761	+ diffuseField.setFloat(material.diffuse);
	1762	+ specularField.setFloat(material.specular);
	1763	+
	1764	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1765	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1766	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1767	+
	1768	+ materialtouched = true;
	1769	+ applySelf();
	1770	+ }
	1771	+ });
	1772	+ presetpanel.add(skin);
	1773	+
	1774	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1775	+ lambert.setToolTipText("Diffuse");
	1776	+ lambert.addMouseListener(new MouseAdapter()
	1777	+ {
	1778	+ public void mouseClicked(MouseEvent e)
	1779	+ {
	1780	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1781	+ cMaterial material = object.material;
	1782	+
	1783	+ diffusenessField.setFloat(material.factor);
	1784	+ selfshadowField.setFloat(material.diffuseness);
	1785	+
	1786	+ materialtouched = true;
	1787	+ applySelf();
	1788	+ }
	1789	+ });
	1790	+ presetpanel.add(lambert);
	1791	+
	1792	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1793	+ diffuse2.setToolTipText("Diffuse2");
	1794	+ diffuse2.addMouseListener(new MouseAdapter()
	1795	+ {
	1796	+ public void mouseClicked(MouseEvent e)
	1797	+ {
	1798	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1799	+ cMaterial material = object.material;
	1800	+
	1801	+ diffusenessField.setFloat(material.factor);
	1802	+ selfshadowField.setFloat(material.diffuseness);
	1803	+
	1804	+ materialtouched = true;
	1805	+ applySelf();
	1806	+ }
	1807	+ });
	1808	+ presetpanel.add(diffuse2);
	1809	+
	1810	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1811	+ diffusemoon.setToolTipText("Moon");
	1812	+ diffusemoon.addMouseListener(new MouseAdapter()
	1813	+ {
	1814	+ public void mouseClicked(MouseEvent e)
	1815	+ {
	1816	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1817	+ cMaterial material = object.material;
	1818	+
	1819	+ diffusenessField.setFloat(material.factor);
	1820	+ selfshadowField.setFloat(material.diffuseness);
	1821	+
	1822	+ materialtouched = true;
	1823	+ applySelf();
	1824	+ }
	1825	+ });
	1826	+ presetpanel.add(diffusemoon);
	1827	+
	1828	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1829	+ diffusemoon2.setToolTipText("Moon2");
	1830	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1831	+ {
	1832	+ public void mouseClicked(MouseEvent e)
	1833	+ {
	1834	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1835	+ cMaterial material = object.material;
	1836	+
	1837	+ diffusenessField.setFloat(material.factor);
	1838	+ selfshadowField.setFloat(material.diffuseness);
	1839	+
	1840	+ materialtouched = true;
	1841	+ applySelf();
	1842	+ }
	1843	+ });
	1844	+ presetpanel.add(diffusemoon2);
	1845	+
	1846	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1847	+ diffusemoon3.setToolTipText("Moon3");
	1848	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1849	+ {
	1850	+ public void mouseClicked(MouseEvent e)
	1851	+ {
	1852	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1853	+ cMaterial material = object.material;
	1854	+
	1855	+ diffusenessField.setFloat(material.factor);
	1856	+ selfshadowField.setFloat(material.diffuseness);
	1857	+
	1858	+ materialtouched = true;
	1859	+ applySelf();
	1860	+ }
	1861	+ });
	1862	+ presetpanel.add(diffusemoon3);
	1863	+
	1864	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1865	+ diffusesheen.setToolTipText("Sheen");
	1866	+ diffusesheen.addMouseListener(new MouseAdapter()
	1867	+ {
	1868	+ public void mouseClicked(MouseEvent e)
	1869	+ {
	1870	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1871	+ cMaterial material = object.material;
	1872	+
	1873	+ sheenField.setFloat(material.sheen);
	1874	+
	1875	+ materialtouched = true;
	1876	+ applySelf();
	1877	+ }
	1878	+ });
	1879	+ presetpanel.add(diffusesheen);
	1880	+
	1881	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	1882	+ rough.setToolTipText("Rough metal");
	1883	+ rough.addMouseListener(new MouseAdapter()
	1884	+ {
	1885	+ public void mouseClicked(MouseEvent e)
	1886	+ {
	1887	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	1888	+ cMaterial material = object.material;
	1889	+
	1890	+ shininessField.setFloat(material.shininess);
	1891	+ velvetField.setFloat(material.velvet);
	1892	+
	1893	+ materialtouched = true;
	1894	+ applySelf();
	1895	+ }
	1896	+ });
	1897	+ presetpanel.add(rough);
	1898	+
	1899	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	1900	+ rough2.setToolTipText("Medium metal");
	1901	+ rough2.addMouseListener(new MouseAdapter()
	1902	+ {
	1903	+ public void mouseClicked(MouseEvent e)
	1904	+ {
	1905	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	1906	+ cMaterial material = object.material;
	1907	+
	1908	+ shininessField.setFloat(material.shininess);
	1909	+ lightareaField.setFloat(material.lightarea);
	1910	+
	1911	+ materialtouched = true;
	1912	+ applySelf();
	1913	+ }
	1914	+ });
	1915	+ presetpanel.add(rough2);
	1916	+
	1917	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	1918	+ shini0.setToolTipText("Shiny");
	1919	+ shini0.addMouseListener(new MouseAdapter()
	1920	+ {
	1921	+ public void mouseClicked(MouseEvent e)
	1922	+ {
	1923	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	1924	+ cMaterial material = object.material;
	1925	+
	1926	+ shininessField.setFloat(material.shininess);
	1927	+ lightareaField.setFloat(material.lightarea);
	1928	+
	1929	+ materialtouched = true;
	1930	+ applySelf();
	1931	+ }
	1932	+ });
	1933	+ presetpanel.add(shini0);
	1934	+
	1935	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	1936	+ shini1.setToolTipText("Shiny2");
	1937	+ shini1.addMouseListener(new MouseAdapter()
	1938	+ {
	1939	+ public void mouseClicked(MouseEvent e)
	1940	+ {
	1941	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	1942	+ cMaterial material = object.material;
	1943	+
	1944	+ shininessField.setFloat(material.shininess);
	1945	+ lightareaField.setFloat(material.lightarea);
	1946	+
	1947	+ materialtouched = true;
	1948	+ applySelf();
	1949	+ }
	1950	+ });
	1951	+ presetpanel.add(shini1);
	1952	+
	1953	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	1954	+ shini2.setToolTipText("Shiny3");
	1955	+ shini2.addMouseListener(new MouseAdapter()
	1956	+ {
	1957	+ public void mouseClicked(MouseEvent e)
	1958	+ {
	1959	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	1960	+ cMaterial material = object.material;
	1961	+
	1962	+ shininessField.setFloat(material.shininess);
	1963	+ lightareaField.setFloat(material.lightarea);
	1964	+
	1965	+ materialtouched = true;
	1966	+ applySelf();
	1967	+ }
	1968	+ });
	1969	+ presetpanel.add(shini2);
	1970	+
	1971	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	1972	+ aniso.setToolTipText("AnisoU");
	1973	+ aniso.addMouseListener(new MouseAdapter()
	1974	+ {
	1975	+ public void mouseClicked(MouseEvent e)
	1976	+ {
	1977	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	1978	+ cMaterial material = object.material;
	1979	+
	1980	+ anisoField.setFloat(material.aniso);
	1981	+ anisoVField.setFloat(material.anisoV);
	1982	+
	1983	+ materialtouched = true;
	1984	+ applySelf();
	1985	+ }
	1986	+ });
	1987	+ presetpanel.add(aniso);
	1988	+
	1989	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	1990	+ aniso2.setToolTipText("AnisoV");
	1991	+ aniso2.addMouseListener(new MouseAdapter()
	1992	+ {
	1993	+ public void mouseClicked(MouseEvent e)
	1994	+ {
	1995	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	1996	+ cMaterial material = object.material;
	1997	+
	1998	+ anisoField.setFloat(material.aniso);
	1999	+ anisoVField.setFloat(material.anisoV);
	2000	+
	2001	+ materialtouched = true;
	2002	+ applySelf();
	2003	+ }
	2004	+ });
	2005	+ presetpanel.add(aniso2);
	2006	+
	2007	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2008	+ aniso3.setToolTipText("AnisoUV");
	2009	+ aniso3.addMouseListener(new MouseAdapter()
	2010	+ {
	2011	+ public void mouseClicked(MouseEvent e)
	2012	+ {
	2013	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2014	+ cMaterial material = object.material;
	2015	+
	2016	+ anisoField.setFloat(material.aniso);
	2017	+ anisoVField.setFloat(material.anisoV);
	2018	+
	2019	+ materialtouched = true;
	2020	+ applySelf();
	2021	+ }
	2022	+ });
	2023	+ presetpanel.add(aniso3);
	2024	+
	2025	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2026	+ velvet0.setToolTipText("Velvet");
	2027	+ velvet0.addMouseListener(new MouseAdapter()
	2028	+ {
	2029	+ public void mouseClicked(MouseEvent e)
	2030	+ {
	2031	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2032	+ cMaterial material = object.material;
	2033	+
	2034	+ diffusenessField.setFloat(material.factor);
	2035	+ selfshadowField.setFloat(material.diffuseness);
	2036	+ sheenField.setFloat(material.sheen);
	2037	+ shininessField.setFloat(material.shininess);
	2038	+ velvetField.setFloat(material.velvet);
	2039	+ shiftField.setFloat(material.shift);
	2040	+
	2041	+ materialtouched = true;
	2042	+ applySelf();
	2043	+ }
	2044	+ });
	2045	+ presetpanel.add(velvet0);
	2046	+
	2047	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2048	+ bump0.setToolTipText("Bump texture");
	2049	+ bump0.addMouseListener(new MouseAdapter()
	2050	+ {
	2051	+ public void mouseClicked(MouseEvent e)
	2052	+ {
	2053	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2054	+ cMaterial material = object.material;
	2055	+
	2056	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2057	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2058	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2059	+
	2060	+ materialtouched = true;
	2061	+ applySelf();
	2062	+ }
	2063	+ });
	2064	+ presetpanel.add(bump0);
	2065	+
	2066	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2067	+ halo.setToolTipText("Halo");
	2068	+ halo.addMouseListener(new MouseAdapter()
	2069	+ {
	2070	+ public void mouseClicked(MouseEvent e)
	2071	+ {
	2072	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2073	+ cMaterial material = object.material;
	2074	+
	2075	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2076	+
	2077	+ materialtouched = true;
	2078	+ applySelf();
	2079	+ }
	2080	+ });
	2081	+ presetpanel.add(halo);
	2082	+
	2083	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2084	+ candle.setToolTipText("Candle");
	2085	+ candle.addMouseListener(new MouseAdapter()
	2086	+ {
	2087	+ public void mouseClicked(MouseEvent e)
	2088	+ {
	2089	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2090	+ cMaterial material = object.material;
	2091	+
	2092	+ subsurfaceField.setFloat(material.subsurface);
	2093	+ shadowbiasField.setFloat(material.shadowbias);
	2094	+ ambientField.setFloat(material.ambient);
	2095	+ specularField.setFloat(material.specular);
	2096	+ lightareaField.setFloat(material.lightarea);
	2097	+ shininessField.setFloat(material.shininess);
	2098	+
	2099	+ materialtouched = true;
	2100	+ applySelf();
	2101	+ }
	2102	+ });
	2103	+ presetpanel.add(candle);
	2104	+
	2105	+ cGridBag panel = new cGridBag().setVertical(true);
	2106	+
	2107	+ presetpanel.preferredWidth = 1;
	2108	+
	2109	+ materialpanel.add(presetpanel);
	2110	+ materialpanel.add(panel);
	2111	+
	2112	+ panel.preferredWidth = 8;
	2113	+
	2114	+ /*
1420	2115	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1421	2116	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1422		- */
	2117	+ */
1423	2118
1424	2119	cGridBag editBar = new cGridBag().setVertical(false);
1425	2120
..	..	@@ -1453,45 +2148,50 @@
1453	2148	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1454	2149
1455	2150	cGridBag colorSection = new cGridBag().setVertical(true);
	2151	+
	2152	+ cGridBag huepanel = new cGridBag();
	2153	+ cGridBag huelabel = new cGridBag();
	2154	+ skin = GetLabel("icons/hue.png", false);
	2155	+ skin.fit = true;
	2156	+ huelabel.add(skin);
	2157	+ huelabel.preferredWidth = 20;
	2158	+ huepanel.add(new cGridBag()); // Label
	2159	+ huepanel.add(huelabel); // Field/slider
	2160	+
	2161	+ huepanel.preferredHeight = 7;
	2162	+
	2163	+ colorSection.add(huepanel);
1456	2164
1457	2165	cGridBag color = new cGridBag();
1458		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1459		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1460		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2166	+
	2167	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2168	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2169	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2170	+
1461	2171	//colorField.preferredWidth = 200;
1462	2172	colorSection.add(color);
1463	2173
1464	2174	cGridBag modulation = new cGridBag();
1465	2175	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1466	2176	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1467		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2177	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1468	2178	colorSection.add(modulation);
1469	2179
	2180	+ cGridBag opacity = new cGridBag();
	2181	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2182	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2183	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2184	+ colorSection.add(opacity);
	2185	+
	2186	+ colorSection.add(GetSeparator());
	2187	+
1470	2188	cGridBag texture = new cGridBag();
1471	2189	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1472	2190	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1473	2191	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1474	2192	colorSection.add(texture);
1475	2193
1476		- cGridBag anisoU = new cGridBag();
1477		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1478		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1479		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1480		- colorSection.add(anisoU);
1481		-
1482		- cGridBag anisoV = new cGridBag();
1483		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1484		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1485		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1486		- colorSection.add(anisoV);
1487		-
1488		- cGridBag shadowbias = new cGridBag();
1489		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1490		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1491		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1492		- colorSection.add(shadowbias);
1493		-
1494		- panel.add(new JSeparator());
	2194	+ panel.add(GetSeparator());
1495	2195
1496	2196	panel.add(colorSection);
1497	2197
..	..	@@ -1541,7 +2241,13 @@
1541	2241	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1542	2242	diffuseSection.add(fakedepth);
1543	2243
1544		- panel.add(new JSeparator());
	2244	+ cGridBag shadowbias = new cGridBag();
	2245	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2246	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2247	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2248	+ diffuseSection.add(shadowbias);
	2249	+
	2250	+ panel.add(GetSeparator());
1545	2251
1546	2252	panel.add(diffuseSection);
1547	2253
..	..	@@ -1591,42 +2297,48 @@
1591	2297	// aConstraints.gridy += 1;
1592	2298	// aConstraints.gridwidth = 1;
1593	2299
	2300	+ cGridBag anisoU = new cGridBag();
	2301	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2302	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2303	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2304	+ specularSection.add(anisoU);
1594	2305
1595		- panel.add(new JSeparator());
	2306	+ cGridBag anisoV = new cGridBag();
	2307	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2308	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2309	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2310	+ specularSection.add(anisoV);
	2311	+
	2312	+
	2313	+ panel.add(GetSeparator());
1596	2314
1597	2315	panel.add(specularSection);
1598	2316
1599	2317	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1600	2318
1601		- cGridBag globalSection = new cGridBag().setVertical(true);
	2319	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1602	2320
1603	2321	cGridBag camera = new cGridBag();
1604	2322	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1605	2323	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1606	2324	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1607		- globalSection.add(camera);
	2325	+ colorSection.add(camera);
1608	2326
1609	2327	cGridBag ambient = new cGridBag();
1610	2328	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1611	2329	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1612	2330	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1613		- globalSection.add(ambient);
	2331	+ colorSection.add(ambient);
1614	2332
1615	2333	cGridBag backlit = new cGridBag();
1616	2334	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1617	2335	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1618	2336	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1619		- globalSection.add(backlit);
	2337	+ colorSection.add(backlit);
1620	2338
1621		- cGridBag opacity = new cGridBag();
1622		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1623		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1624		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1625		- globalSection.add(opacity);
1626		-
1627		- panel.add(new JSeparator());
	2339	+ //panel.add(new JSeparator());
1628	2340
1629		- panel.add(globalSection);
	2341	+ //panel.add(globalSection);
1630	2342
1631	2343	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1632	2344
..	..	@@ -1668,7 +2380,7 @@
1668	2380	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1669	2381	textureSection.add(opacityPower);
1670	2382
1671		- panel.add(new JSeparator());
	2383	+ panel.add(GetSeparator());
1672	2384
1673	2385	panel.add(textureSection);
1674	2386
..	..	@@ -1733,8 +2445,9 @@
1733	2445	// 3D models
1734	2446	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1735	2447	{
1736		- lastConverter = new com.jmex.model.converters.MaxToJme();
1737		- LoadFile(filename, lastConverter);
	2448	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2449	+ //LoadFile(filename, lastConverter);
	2450	+ LoadObjFile(filename); // New 3ds loader
1738	2451	continue;
1739	2452	}
1740	2453	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2072,19 +2785,19 @@
2072	2785
2073	2786	void LoadObjFile(String fullname)
2074	2787	{
2075		- /*
	2788	+ System.out.println("Loading " + fullname);
	2789	+ /**/
2076	2790	//lastFilename = fullname;
2077	2791	if(loadObjThread == null)
2078	2792	{
2079		- loadObjThread = new LoadOBJThread();
2080		- loadObjThread.start();
	2793	+ loadObjThread = new LoadOBJThread();
	2794	+ loadObjThread.start();
2081	2795	}
2082	2796
2083	2797	loadObjThread.add(fullname);
2084		- */
	2798	+ /**/
2085	2799
2086		- System.out.println("Loading " + fullname);
2087		- makeSomething(new FileObject(fullname, true), true);
	2800	+ //makeSomething(new FileObject(fullname, true), true);
2088	2801	}
2089	2802
2090	2803	void LoadGFDFile(String fullname)
..	..	@@ -2460,6 +3173,7 @@
2460	3173	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2461	3174	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2462	3175	}
	3176	+
2463	3177	//cJME.count++;
2464	3178	//cJME.count %= 12;
2465	3179	if (gc)
..	..	@@ -2643,6 +3357,7 @@
2643	3357	}
2644	3358	}
2645	3359	}
	3360	+
2646	3361	cFileSystemPane FSPane;
2647	3362
2648	3363	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2652,7 +3367,7 @@
2652	3367
2653	3368	freezematerial = true;
2654	3369	colorField.setFloat(mat.color);
2655		- modulationField.setFloat(mat.modulation);
	3370	+ saturationField.setFloat(mat.modulation);
2656	3371	metalnessField.setFloat(mat.metalness);
2657	3372	diffuseField.setFloat(mat.diffuse);
2658	3373	specularField.setFloat(mat.specular);
..	..	@@ -2696,11 +3411,14 @@
2696	3411	}
2697	3412	}
2698	3413	}
	3414	+
2699	3415	freezematerial = false;
2700	3416	}
2701	3417
2702	3418	void SetMaterial(Object3D object)
2703	3419	{
	3420	+ latestObject = object;
	3421	+
2704	3422	cMaterial mat = object.material;
2705	3423
2706	3424	if (mat == null)
..	..	@@ -2812,12 +3530,17 @@
2812	3530	// }
2813	3531
2814	3532	/**/
2815		- if (deselect)
	3533	+ if (deselect \|\| child == null)
2816	3534	{
2817	3535	//group.deselectAll();
2818	3536	//freeze = true;
2819	3537	GetTree().clearSelection();
2820	3538	//freeze = false;
	3539	+
	3540	+ if (child == null)
	3541	+ {
	3542	+ return;
	3543	+ }
2821	3544	}
2822	3545
2823	3546	//group.addSelectee(child);
..	..	@@ -2886,7 +3609,7 @@
2886	3609	cameraView.ToggleDL();
2887	3610	cameraView.repaint();
2888	3611	return;
2889		- } else if (event.getSource() == toggleTextureItem)
	3612	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2890	3613	{
2891	3614	cameraView.ToggleTexture();
2892	3615	// june 2013 copy.HardTouch();
..	..	@@ -2925,9 +3648,9 @@
2925	3648	frame.validate();
2926	3649
2927	3650	return;
2928		- } else if (event.getSource() == toggleSwitchItem)
	3651	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2929	3652	{
2930		- cameraView.ToggleRandom();
	3653	+ cameraView.ToggleSwitch();
2931	3654	cameraView.repaint();
2932	3655	return;
2933	3656	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2955,8 +3678,9 @@
2955	3678	} else if (event.getSource() == liveCB)
2956	3679	{
2957	3680	copy.live ^= true;
	3681	+ objEditor.refreshContents(true); // To show item colors
2958	3682	return;
2959		- } else if (event.getSource() == selectCB)
	3683	+ } else if (event.getSource() == selectableCB)
2960	3684	{
2961	3685	copy.dontselect ^= true;
2962	3686	return;
..	..	@@ -2964,7 +3688,7 @@
2964	3688	{
2965	3689	copy.hide ^= true;
2966	3690	copy.Touch(); // display list issue
2967		- objEditor.refreshContents();
	3691	+ objEditor.refreshContents(true); // To show item colors
2968	3692	return;
2969	3693	} else if (event.getSource() == link2masterCB)
2970	3694	{
..	..	@@ -3141,9 +3865,9 @@
3141	3865	{
3142	3866	Close();
3143	3867	//return true;
3144		- } else if (source == loadItem)
	3868	+ } else if (source == openItem)
3145	3869	{
3146		- load();
	3870	+ Open();
3147	3871	//return true;
3148	3872	} else if (source == newItem)
3149	3873	{
..	..	@@ -3168,6 +3892,10 @@
3168	3892	{
3169	3893	generatePOV();
3170	3894	//return true;
	3895	+ } else if (event.getSource() == archiveItem)
	3896	+ {
	3897	+ cTools.Archive(frame);
	3898	+ return;
3171	3899	} else if (source == zBufferItem)
3172	3900	{
3173	3901	try
..	..	@@ -3214,6 +3942,61 @@
3214	3942	objEditor.refreshContents();
3215	3943	}
3216	3944
	3945	+ static public byte[] Compress(Object3D o)
	3946	+ {
	3947	+ // Slower to actually compress.
	3948	+ try
	3949	+ {
	3950	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3951	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3952	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	3953	+
	3954	+ Object3D parent = o.parent;
	3955	+ o.parent = null;
	3956	+
	3957	+ out.writeObject(o);
	3958	+
	3959	+ o.parent = parent;
	3960	+
	3961	+ out.flush();
	3962	+
	3963	+ baos //zstream
	3964	+ .close();
	3965	+ out.close();
	3966	+
	3967	+ byte[] bytes = baos.toByteArray();
	3968	+
	3969	+ System.out.println("save #bytes = " + bytes.length);
	3970	+ return bytes;
	3971	+ } catch (Exception e)
	3972	+ {
	3973	+ System.err.println(e);
	3974	+ return null;
	3975	+ }
	3976	+ }
	3977	+
	3978	+ static public Object Uncompress(byte[] bytes)
	3979	+ {
	3980	+ System.out.println("restore #bytes = " + bytes.length);
	3981	+ try
	3982	+ {
	3983	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3984	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3985	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	3986	+ Object obj = in.readObject();
	3987	+
	3988	+ bais //istream
	3989	+ .close();
	3990	+ in.close();
	3991	+
	3992	+ return obj;
	3993	+ } catch (Exception e)
	3994	+ {
	3995	+ System.err.println(e);
	3996	+ return null;
	3997	+ }
	3998	+ }
	3999	+
3217	4000	static public Object clone(Object o)
3218	4001	{
3219	4002	try
..	..	@@ -3222,12 +4005,19 @@
3222	4005	ObjectOutputStream out = new ObjectOutputStream(baos);
3223	4006
3224	4007	out.writeObject(o);
	4008	+
	4009	+ out.flush();
	4010	+ out.close();
	4011	+
	4012	+ byte[] bytes = baos.toByteArray();
	4013	+
	4014	+ System.out.println("clone = " + bytes.length);
3225	4015
3226		- ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
	4016	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3227	4017	ObjectInputStream in = new ObjectInputStream(bais);
3228	4018	Object obj = in.readObject();
3229	4019	in.close();
3230		- out.close();
	4020	+
3231	4021	return obj;
3232	4022	} catch (Exception e)
3233	4023	{
..	..	@@ -3251,24 +4041,95 @@
3251	4041	return null;
3252	4042	}
3253	4043
	4044	+
3254	4045	public void Save()
3255	4046	{
	4047	+ //Save(true);
	4048	+ Replace();
	4049	+ SetUndoStates();
	4050	+ }
	4051	+
	4052	+ private boolean Equal(byte[] compress, byte[] name)
	4053	+ {
	4054	+ if (compress.length != name.length)
	4055	+ {
	4056	+ return false;
	4057	+ }
	4058	+
	4059	+ for (int i=compress.length; --i>=0;)
	4060	+ {
	4061	+ if (compress[i] != name[i])
	4062	+ return false;
	4063	+ }
	4064	+
	4065	+ return true;
	4066	+ }
	4067	+
	4068	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4069	+
	4070	+ void DeleteVersion()
	4071	+ {
	4072	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4073	+ {
	4074	+ copy.versionlist[i] = copy.versionlist[i+1];
	4075	+ }
	4076	+
	4077	+ CopyChanged();
	4078	+
	4079	+ SetUndoStates();
	4080	+ }
	4081	+
	4082	+ public boolean Save(boolean user)
	4083	+ {
	4084	+ System.err.println("Save");
	4085	+ //Replace();
	4086	+
3256	4087	cRadio tab = GetCurrentTab();
3257	4088
	4089	+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
	4090	+
	4091	+ boolean thesame = false;
	4092	+
	4093	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4094	+// {
	4095	+// thesame = true;
	4096	+// }
	4097	+
3258	4098	//EditorFrame.m_MainFrame.requestFocusInWindow();
3259		- tab.graphs[tab.undoindex++] = (Object3D)clone(copy);
3260		-
3261		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	4099	+ if (!thesame)
3262	4100	{
3263		- tab.graphs[i] = null;
	4101	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4102	+ {
	4103	+ copy.versionlist[i] = copy.versionlist[i-1];
	4104	+ }
	4105	+
	4106	+ //tab.user[tab.versionindex] = user;
	4107	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4108	+
	4109	+ copy.versionlist[++copy.versionindex] = compress;
	4110	+
	4111	+ // if (increment)
	4112	+ // tab.versionindex++;
3264	4113	}
3265	4114
	4115	+ //copy.RestoreBigData(versiontable);
	4116	+
	4117	+ //assert(hashtable.isEmpty());
	4118	+
	4119	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4120	+// {
	4121	+// //tab.user[i] = false;
	4122	+// copy.versionlist[i] = null;
	4123	+// }
	4124	+
	4125	+ SetUndoStates();
	4126	+
3266	4127	// test save
3267	4128	if (false)
3268	4129	{
3269	4130	try
3270	4131	{
3271		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	4132	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3272	4133	ObjectOutputStream p = new ObjectOutputStream(ostream);
3273	4134
3274	4135	p.writeObject(copy);
..	..	@@ -3281,16 +4142,69 @@
3281	4142	e.printStackTrace();
3282	4143	}
3283	4144	}
	4145	+
	4146	+ return !thesame;
	4147	+ }
	4148	+
	4149	+ boolean flashIt = true;
	4150	+
	4151	+ void RefreshSelection()
	4152	+ {
	4153	+ Object3D selection = new Object3D();
	4154	+
	4155	+ for (int i = 0; i < copy.selection.size(); i++)
	4156	+ {
	4157	+ Object3D elem = copy.selection.elementAt(i);
	4158	+
	4159	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4160	+
	4161	+ if (obj == null)
	4162	+ {
	4163	+ copy.selection.remove(i--);
	4164	+ }
	4165	+ else
	4166	+ {
	4167	+ selection.add(obj);
	4168	+ copy.selection.setElementAt(obj, i);
	4169	+ }
	4170	+ }
	4171	+
	4172	+ flashIt = false;
	4173	+ GetTree().clearSelection();
	4174	+ for (int i = 0; i < selection.size(); i++)
	4175	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4176	+ flashIt = true;
	4177	+
	4178	+ //refreshContents(false);
3284	4179	}
3285	4180
3286		- void CopyChanged(Object3D obj)
	4181	+ void CopyChanged()
3287	4182	{
	4183	+ Object3D obj = copy.versionlist[copy.versionindex];
	4184	+
	4185	+ SetUndoStates();
	4186	+
	4187	+ boolean temp = CameraPane.SWITCH;
	4188	+ CameraPane.SWITCH = false;
	4189	+
	4190	+ copy.ExtractBigData(versiontable);
	4191	+
3288	4192	copy.clear();
3289	4193
	4194	+ copy.skyboxname = obj.skyboxname;
	4195	+ copy.skyboxext = obj.skyboxext;
	4196	+
3290	4197	for (int i=0; i<obj.Size(); i++)
3291	4198	{
3292	4199	copy.add(obj.get(i));
3293	4200	}
	4201	+
	4202	+ copy.RestoreBigData(versiontable);
	4203	+
	4204	+ CameraPane.SWITCH = temp;
	4205	+
	4206	+ RefreshSelection();
	4207	+ //assert(hashtable.isEmpty());
3294	4208
3295	4209	copy.Touch();
3296	4210
..	..	@@ -3310,43 +4224,139 @@
3310	4224	}
3311	4225	}
3312	4226
3313		- refreshContents();
	4227	+ refreshContents(true);
3314	4228	}
3315	4229
3316		- public void Undo()
	4230	+ cButton previousVersionButton;
	4231	+ cButton restoreButton;
	4232	+ cButton replaceButton;
	4233	+ cButton nextVersionButton;
	4234	+ cButton saveVersionButton;
	4235	+ cButton deleteVersionButton;
	4236	+
	4237	+ boolean muteSlider;
	4238	+
	4239	+ int VersionCount()
	4240	+ {
	4241	+ int count = 0;
	4242	+
	4243	+ for (int i = copy.versionlist.length; --i >= 0;)
	4244	+ {
	4245	+ if (copy.versionlist[i] != null)
	4246	+ count++;
	4247	+ }
	4248	+
	4249	+ return count;
	4250	+ }
	4251	+
	4252	+ void SetUndoStates()
3317	4253	{
3318	4254	cRadio tab = GetCurrentTab();
3319	4255
3320		- if (tab.undoindex == 0)
	4256	+ restoreButton.setEnabled(true); // copy.versionindex != -1);
	4257	+ replaceButton.setEnabled(true); // copy.versionindex != -1);
	4258	+
	4259	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4260	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4261	+
	4262	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4263	+ copy.versionlist[copy.versionindex + 1] != null);
	4264	+
	4265	+ muteSlider = true;
	4266	+ versionSlider.setMaximum(VersionCount() - 1);
	4267	+ versionSlider.setInteger(copy.versionindex);
	4268	+ muteSlider = false;
	4269	+ }
	4270	+
	4271	+ public boolean PreviousVersion()
	4272	+ {
	4273	+ // Option?
	4274	+ Replace();
	4275	+
	4276	+ System.err.println("Undo");
	4277	+
	4278	+ cRadio tab = GetCurrentTab();
	4279	+
	4280	+ if (copy.versionindex == 0)
3321	4281	{
3322	4282	java.awt.Toolkit.getDefaultToolkit().beep();
3323		- return;
	4283	+ return false;
3324	4284	}
3325	4285
3326		- if (tab.graphs[tab.undoindex] == null)
3327		- {
3328		- Save();
3329		- tab.undoindex -= 1;
3330		- }
	4286	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4287	+// {
	4288	+// if (Save(false))
	4289	+// tab.versionindex -= 1;
	4290	+// else
	4291	+// {
	4292	+// if (tab.versionindex <= 0)
	4293	+// return false;
	4294	+// else
	4295	+// tab.versionindex -= 1;
	4296	+// }
	4297	+// }
3331	4298
3332		- tab.undoindex -= 1;
	4299	+ copy.versionindex -= 1;
3333	4300
3334		- CopyChanged(tab.graphs[tab.undoindex]);
	4301	+ CopyChanged();
	4302	+
	4303	+ return true;
3335	4304	}
3336	4305
3337		- public void Redo()
	4306	+ public boolean Restore()
3338	4307	{
	4308	+ System.err.println("Restore");
	4309	+
3339	4310	cRadio tab = GetCurrentTab();
3340	4311
3341		- if (tab.graphs[tab.undoindex + 1] == null)
	4312	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4313	+ {
	4314	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4315	+ return false;
	4316	+ }
	4317	+
	4318	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4319	+ CopyChanged();
	4320	+
	4321	+ return true;
	4322	+ }
	4323	+
	4324	+ public boolean Replace()
	4325	+ {
	4326	+ System.err.println("Replace");
	4327	+
	4328	+ cRadio tab = GetCurrentTab();
	4329	+
	4330	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4331	+ {
	4332	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4333	+ return false;
	4334	+ }
	4335	+
	4336	+ copy.versionlist[copy.versionindex] = CompressCopy();
	4337	+
	4338	+ return true;
	4339	+ }
	4340	+
	4341	+ public void NextVersion()
	4342	+ {
	4343	+ // Option?
	4344	+ Replace();
	4345	+
	4346	+ cRadio tab = GetCurrentTab();
	4347	+
	4348	+ if (copy.versionlist[copy.versionindex + 1] == null)
3342	4349	{
3343	4350	java.awt.Toolkit.getDefaultToolkit().beep();
3344	4351	return;
3345	4352	}
3346	4353
3347		- tab.undoindex += 1;
	4354	+ copy.versionindex += 1;
3348	4355
3349		- CopyChanged(tab.graphs[tab.undoindex]);
	4356	+ CopyChanged();
	4357	+
	4358	+ //if (!tab.user[tab.versionindex])
	4359	+ // tab.graphs[tab.versionindex] = null;
3350	4360	}
3351	4361
3352	4362	void ImportGFD()
..	..	@@ -3498,7 +4508,7 @@
3498	4508	assert false;
3499	4509	}
3500	4510
3501		- void EditSelection()
	4511	+ void EditSelection(boolean newWindow)
3502	4512	{
3503	4513	}
3504	4514
..	..	@@ -3557,7 +4567,7 @@
3557	4567	//copy.material = new cMaterial(copy.GetMaterial());
3558	4568
3559	4569	current.color = (float) colorField.getFloat();
3560		- current.modulation = (float) modulationField.getFloat();
	4570	+ current.modulation = (float) saturationField.getFloat();
3561	4571	current.metalness = (float) metalnessField.getFloat();
3562	4572	current.diffuse = (float) diffuseField.getFloat();
3563	4573	current.specular = (float) specularField.getFloat();
..	..	@@ -3590,7 +4600,7 @@
3590	4600	cMaterial mat = copy.material;
3591	4601
3592	4602	colorField.SetToolTipValue((mat.color));
3593		- modulationField.SetToolTipValue((mat.modulation));
	4603	+ saturationField.SetToolTipValue((mat.modulation));
3594	4604	metalnessField.SetToolTipValue((mat.metalness));
3595	4605	diffuseField.SetToolTipValue((mat.diffuse));
3596	4606	specularField.SetToolTipValue((mat.specular));
..	..	@@ -3642,9 +4652,26 @@
3642	4652	//copy.Touch();
3643	4653	}
3644	4654
	4655	+ cNumberSlider versionSlider;
	4656	+
3645	4657	public void stateChanged(ChangeEvent e)
3646	4658	{
3647	4659	// assert(false);
	4660	+ if (e.getSource() == versionSlider)
	4661	+ {
	4662	+ if (muteSlider)
	4663	+ return;
	4664	+
	4665	+ int version = versionSlider.getInteger();
	4666	+
	4667	+ if (copy.versionlist[version] != null)
	4668	+ {
	4669	+ copy.versionindex = version;
	4670	+ CopyChanged();
	4671	+ }
	4672	+
	4673	+ return;
	4674	+ }
3648	4675
3649	4676	if (freezematerial)
3650	4677	{
..	..	@@ -3680,6 +4707,12 @@
3680	4707	{
3681	4708	//System.out.println("stateChanged = " + this);
3682	4709	materialtouched = true;
	4710	+
	4711	+ if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4712	+ {
	4713	+ saturationField.setFloat(1);
	4714	+ }
	4715	+
3683	4716	applySelf();
3684	4717	//System.out.println("this = " + this);
3685	4718	//System.out.println("PARENT = " + parent);
..	..	@@ -3979,6 +5012,7 @@
3979	5012	{
3980	5013	if (GetTree() != null)
3981	5014	{
	5015	+ GetTree().revalidate();
3982	5016	GetTree().repaint();
3983	5017	}
3984	5018
..	..	@@ -3987,13 +5021,17 @@
3987	5021	ctrlPanel.validate(); // ? new
3988	5022	ctrlPanel.repaint();
3989	5023	}
	5024	+
	5025	+ if (previousVersionButton != null && copy.versionlist != null)
	5026	+ SetUndoStates();
3990	5027	}
3991	5028
3992	5029	static TweenManager tweenManager = new TweenManager();
3993	5030
3994	5031	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3995	5032	{
3996		- Save();
	5033	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5034	+ Save();
3997	5035	//Tween.set(thing, 0).target(1).start(tweenManager);
3998	5036	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3999	5037	// if (thing instanceof GenericJointDemo)
..	..	@@ -4080,6 +5118,12 @@
4080	5118	{
4081	5119	ResetModel();
4082	5120	Select(thing.GetTreePath(), true, false); // unselect... false);
	5121	+
	5122	+ if (thing.Size() == 0)
	5123	+ {
	5124	+ //EditSelection(false);
	5125	+ }
	5126	+
4083	5127	refreshContents();
4084	5128	}
4085	5129
..	..	@@ -4217,6 +5261,7 @@
4217	5261
4218	5262	try
4219	5263	{
	5264	+ // Try compressed version first.
4220	5265	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4221	5266	java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
4222	5267	java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
..	..	@@ -4227,7 +5272,9 @@
4227	5272	readobj.ResetDisplayList();
4228	5273	} catch (Exception e)
4229	5274	{
4230		- //e.printStackTrace();
	5275	+ if (!e.toString().contains("GZIP"))
	5276	+ e.printStackTrace();
	5277	+
4231	5278	try
4232	5279	{
4233	5280	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4286,6 +5333,12 @@
4286	5333
4287	5334	void LoadIt(Object obj)
4288	5335	{
	5336	+ if (obj == null)
	5337	+ {
	5338	+ // Invalid file
	5339	+ return;
	5340	+ }
	5341	+
4289	5342	System.out.println("Loaded " + obj);
4290	5343	//new Exception().printStackTrace();
4291	5344	Object3D readobj = (Object3D) obj;
..	..	@@ -4295,10 +5348,14 @@
4295	5348
4296	5349	if (readobj != null)
4297	5350	{
	5351	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5352	+ // Save();
4298	5353	try
4299	5354	{
4300	5355	//readobj.deepCopySelf(copy);
4301	5356	copy.clear(); // june 2014
	5357	+ copy.skyboxname = readobj.skyboxname;
	5358	+ copy.skyboxext = readobj.skyboxext;
4302	5359	for (int i = 0; i < readobj.size(); i++)
4303	5360	{
4304	5361	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4339,6 +5396,7 @@
4339	5396	}
4340	5397	} catch (ClassCastException e)
4341	5398	{
	5399	+ e.printStackTrace();
4342	5400	assert (false);
4343	5401	Composite c = (Composite) copy;
4344	5402	c.children.clear();
..	..	@@ -4349,17 +5407,28 @@
4349	5407	c.addChild(csg);
4350	5408	}
4351	5409
	5410	+ copy.versionlist = readobj.versionlist;
	5411	+ copy.versionindex = readobj.versionindex;
	5412	+
	5413	+ if (copy.versionlist == null)
	5414	+ {
	5415	+ copy.versionlist = new Object3D[100];
	5416	+ copy.versionindex = -1;
	5417	+ }
	5418	+
	5419	+ //? SetUndoStates();
	5420	+
4352	5421	ResetModel();
4353	5422	copy.HardTouch(); // recompile?
4354	5423	refreshContents();
4355	5424	}
4356	5425	}
4357	5426
4358		- void load() // throws ClassNotFoundException
	5427	+ void Open() // throws ClassNotFoundException
4359	5428	{
4360	5429	if (Grafreed.standAlone)
4361	5430	{
4362		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5431	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4363	5432	browser.show();
4364	5433	String filename = browser.getFile();
4365	5434	if (filename != null && filename.length() > 0)
..	..	@@ -4458,6 +5527,7 @@
4458	5527	//ps.print(buffer.toString());
4459	5528	} catch (IOException e)
4460	5529	{
	5530	+ e.printStackTrace();
4461	5531	}
4462	5532	}
4463	5533
..	..	@@ -4472,6 +5542,8 @@
4472	5542	String filename = browser.getFile();
4473	5543	if (filename != null && filename.length() > 0)
4474	5544	{
	5545	+ if (!filename.endsWith(".gfd"))
	5546	+ filename += ".gfd";
4475	5547	lastname = browser.getDirectory() + filename;
4476	5548	save();
4477	5549	}
..	..	@@ -4638,7 +5710,7 @@
4638	5710	MenuBar menuBar;
4639	5711	Menu fileMenu;
4640	5712	MenuItem newItem;
4641		- MenuItem loadItem;
	5713	+ MenuItem openItem;
4642	5714	MenuItem saveItem;
4643	5715	MenuItem saveAsItem;
4644	5716	MenuItem exportAsItem;
..	..	@@ -4661,22 +5733,36 @@
4661	5733	CheckboxMenuItem toggleSwitchItem;
4662	5734	CheckboxMenuItem toggleRootItem;
4663	5735	CheckboxMenuItem animationItem;
	5736	+ MenuItem archiveItem;
4664	5737	CheckboxMenuItem toggleHandleItem;
4665	5738	CheckboxMenuItem togglePaintItem;
4666	5739	JSplitPane mainPanel;
4667	5740	JScrollPane scrollpane;
	5741	+
4668	5742	JPanel toolbarPanel;
	5743	+
4669	5744	cGridBag treePanel;
	5745	+
4670	5746	JPanel radioPanel;
4671	5747	ButtonGroup buttonGroup;
4672		- cGridBag ctrlPanel;
	5748	+
	5749	+ cGridBag toolboxPanel;
4673	5750	cGridBag materialPanel;
	5751	+ cGridBag ctrlPanel;
	5752	+
4674	5753	JScrollPane infoPanel;
	5754	+
4675	5755	cGridBag optionsPanel;
	5756	+
4676	5757	JTabbedPane objectPanel;
	5758	+ boolean materialFlushed;
	5759	+ Object3D latestObject;
	5760	+
4677	5761	cGridBag XYZPanel;
	5762	+
4678	5763	JSplitPane gridPanel;
4679	5764	JSplitPane bigPanel;
	5765	+
4680	5766	cGridBag bigThree;
4681	5767	cGridBag scenePanel;
4682	5768	cGridBag centralPanel;
..	..	@@ -4734,7 +5820,7 @@
4734	5820	JLabel colorLabel;
4735	5821	cNumberSlider colorField;
4736	5822	JLabel modulationLabel;
4737		- cNumberSlider modulationField;
	5823	+ cNumberSlider saturationField;
4738	5824	JLabel metalnessLabel;
4739	5825	cNumberSlider metalnessField;
4740	5826	JLabel diffuseLabel;
..	..	@@ -4791,7 +5877,7 @@
4791	5877	cNumberSlider fogField;
4792	5878	JLabel opacityPowerLabel;
4793	5879	cNumberSlider opacityPowerField;
4794		- JTree jTree;
	5880	+ cTree jTree;
4795	5881	//ObjectUI parent;
4796	5882
4797	5883	cNumberSlider normalpushField;