~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,146 @@
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 void AllocProjectedVertices(Object3D object)
	47	+ {
	48	+ assert (object.projectedVertices != null);
	49	+
	50	+ if (object.projectedVertices.length <= 2)
	51	+ {
	52	+ // Side effect...
	53	+ Object3D.cVector2[] keep = object.projectedVertices;
	54	+ object.projectedVertices = new Object3D.cVector2[3];
	55	+ for (int i = 0; i < 3; i++)
	56	+ {
	57	+ if (i < keep.length)
	58	+ {
	59	+ object.projectedVertices[i] = keep[i];
	60	+ } else
	61	+ {
	62	+ object.projectedVertices[i] = new Object3D.cVector2();
	63	+ }
	64	+ /*
	65	+ if(keep.length == 0)
	66	+ object.projectedVertices[0] = new Object3D.cVector2();
	67	+ else
	68	+ object.projectedVertices[0] = keep[0];
	69	+ object.projectedVertices[1] = new Object3D.cVector2();
	70	+ */
	71	+ }
	72	+ }
	73	+ }
	74	+
	75	+ public Composite CreateCameras()
	76	+ {
	77	+ Composite cams = new cTemplate();
	78	+ cams.name = "Cameras";
	79	+ copy.insertElementAt(cams, 0);
	80	+
	81	+ cams.addChild(new Camera());
	82	+ cams.addChild(new Camera(1));
	83	+ cams.addChild(new Camera(2));
	84	+ cams.addChild(new Camera(3));
	85	+ cams.addChild(new Camera(4));
	86	+
	87	+ return cams;
	88	+ }
	89	+
	90	+ public cGridBag GetSeparator()
	91	+ {
	92	+ cGridBag separator = new cGridBag();
	93	+ separator.add(new JSeparator());
	94	+ separator.preferredHeight = 5;
	95	+ return separator;
	96	+ }
	97	+
	98	+ cButton GetButton(String name, boolean border)
	99	+ {
	100	+ ImageIcon icon = GetIcon(name);
	101	+ if (icon != null \|\| name.contains("/"))
	102	+ return new cButton(icon, border);
	103	+ else
	104	+ return new cButton(name, border);
	105	+ }
	106	+
	107	+ cLabel GetLabel(String name, boolean border)
	108	+ {
	109	+ //ImageIcon icon = GetIcon(name);
	110	+ return new cLabel(GetImage(name), border);
	111	+ }
	112	+
	113	+ cToggleButton GetToggleButton(String name, boolean border)
	114	+ {
	115	+ ImageIcon icon = GetIcon(name);
	116	+ return new cToggleButton(icon, border);
	117	+ }
	118	+
	119	+ cCheckBox GetCheckBox(String name, boolean border)
	120	+ {
	121	+ ImageIcon icon = GetIcon(name);
	122	+ return new cCheckBox(icon, border);
	123	+ }
	124	+
	125	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	126	+
	127	+ static ImageIcon GetIcon(String name)
	128	+ {
	129	+ javax.swing.ImageIcon iconCache = icons.get(name);
	130	+ if (iconCache != null)
	131	+ {
	132	+ return iconCache;
	133	+ }
	134	+
	135	+ try
	136	+ {
	137	+ BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
	138	+
	139	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	140	+// {
	141	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	142	+// Graphics2D g = resized.createGraphics();
	143	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	144	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	145	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	146	+// g.dispose();
	147	+//
	148	+// image = resized;
	149	+// }
	150	+
	151	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	152	+
	153	+ icons.put(name, icon);
	154	+
	155	+ return icon;
	156	+ }
	157	+ catch (Exception e)
	158	+ {
	159	+ //icons.put(name, null);
	160	+ return null;
	161	+ }
	162	+ }
	163	+
	164	+ BufferedImage GetImage(String name)
	165	+ {
	166	+ try
	167	+ {
	168	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	169	+
	170	+ return image;
	171	+ }
	172	+ catch (Exception e)
	173	+ {
	174	+ return null;
	175	+ }
	176	+ }
38	177
39	178	// SCRIPT
40	179
..	..	@@ -145,7 +284,7 @@
145	284
146	285	objEditor.ctrlPanel.remove(namePanel);
147	286
148		- if (!GroupEditor.allparams)
	287	+ if (!allparams)
149	288	return;
150	289
151	290	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -168,7 +307,8 @@
168	307	// objEditor.ctrlPanel.remove(remarkButton);
169	308
170	309	objEditor.ctrlPanel.remove(setupPanel);
171		- objEditor.ctrlPanel.remove(commandsPanel);
	310	+ objEditor.ctrlPanel.remove(setupPanel2);
	311	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
172	312	objEditor.ctrlPanel.remove(pushPanel);
173	313	//objEditor.ctrlPanel.remove(fillPanel);
174	314
..	..	@@ -216,6 +356,14 @@
216	356	client = inClient;
217	357	copy = client;
218	358
	359	+// if (copy.versionlist == null)
	360	+// {
	361	+// copy.versionlist = new Object3D[100];
	362	+// copy.versionindex = -1;
	363	+//
	364	+// callee.Save(true);
	365	+// }
	366	+
219	367	// "this" is not called: SetupUI2(objEditor);
220	368	}
221	369
..	..	@@ -229,6 +377,14 @@
229	377	client = inClient;
230	378	copy = client;
231	379
	380	+ if (copy.versionlist == null)
	381	+ {
	382	+ copy.versionlist = new Object3D[100];
	383	+ copy.versionindex = -1;
	384	+
	385	+// Save(true);
	386	+ }
	387	+
232	388	SetupUI2(callee.GetEditor());
233	389	}
234	390
..	..	@@ -243,13 +399,15 @@
243	399	//localCopy.parent = null;
244	400
245	401	frame = new JFrame();
	402	+ frame.setUndecorated(false);
246	403	objEditor = this;
247	404	this.callee = callee;
248	405
249	406	//parent = p;
250	407
251	408	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
252		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	409	+ if (Globals.DEBUG)
	410	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
253	411	//gd.setFullScreenWindow(this);
254	412	//setResizable(false);
255	413	//if (!isDisplayable())
..	..	@@ -260,6 +418,14 @@
260	418	copy = localCopy;
261	419	copy.editWindow = this;
262	420
	421	+// if (copy.versionlist == null)
	422	+// {
	423	+// copy.versionlist = new Object3D[100];
	424	+// copy.versionindex = -1;
	425	+//
	426	+// Save(true);
	427	+// }
	428	+
263	429	SetupMenu();
264	430
265	431	//SetupName(objEditor); // new
..	..	@@ -273,12 +439,20 @@
273	439	return frame.action(event, obj);
274	440	}
275	441
	442	+ // Cannot work without static
	443	+ static boolean allparams = true;
	444	+
	445	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	446	+
	447	+ // This is to refresh the UI of the material panel.
	448	+ boolean patchMaterial;
	449	+
276	450	void SetupMenu()
277	451	{
278	452	frame.setMenuBar(menuBar = new MenuBar());
279	453	menuBar.add(fileMenu = new Menu("File"));
280	454	fileMenu.add(newItem = new MenuItem("New"));
281		- fileMenu.add(loadItem = new MenuItem("Load..."));
	455	+ fileMenu.add(openItem = new MenuItem("Open..."));
282	456
283	457	//oe.menuBar.add(menu = new Menu("Include"));
284	458	Menu menu = new Menu("Import");
..	..	@@ -286,8 +460,11 @@
286	460	importOBJItem.addActionListener(this);
287	461	import3DSItem = menu.add(new MenuItem("3DS file..."));
288	462	import3DSItem.addActionListener(this);
	463	+ if (Globals.ADVANCED)
	464	+ {
289	465	importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
290	466	importVRMLX3DItem.addActionListener(this);
	467	+ }
291	468	menu.add("-");
292	469	importGFDItem = menu.add(new MenuItem("Grafreed file..."));
293	470	importGFDItem.addActionListener(this);
..	..	@@ -310,7 +487,7 @@
310	487	}
311	488
312	489	newItem.addActionListener(this);
313		- loadItem.addActionListener(this);
	490	+ openItem.addActionListener(this);
314	491	saveItem.addActionListener(this);
315	492	saveAsItem.addActionListener(this);
316	493	exportAsItem.addActionListener(this);
..	..	@@ -319,28 +496,102 @@
319	496	closeItem.addActionListener(this);
320	497
321	498	objectPanel = new JTabbedPane();
	499	+
	500	+ ChangeListener changeListener = new ChangeListener()
	501	+ {
	502	+ //String name;
	503	+
	504	+ public void stateChanged(ChangeEvent changeEvent)
	505	+ {
	506	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	507	+// {
	508	+// if (latestObject != null)
	509	+// {
	510	+// refreshContents(true);
	511	+// SetMaterial(latestObject);
	512	+// }
	513	+//
	514	+// materialFlushed = true;
	515	+// }
	516	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	517	+// {
	518	+// if (listUI.size() == 0)
	519	+// EditSelection(false);
	520	+// }
	521	+
	522	+// if (objectPanel.getSelectedIndex() == 4)
	523	+// {
	524	+// name = copy.skyboxname;
	525	+//
	526	+// if (name == null)
	527	+// {
	528	+// name = "";
	529	+// }
	530	+//
	531	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	532	+// copy.skyboxext = "jpg";
	533	+// }
	534	+// else
	535	+// {
	536	+// if (name != null)
	537	+// {
	538	+// if (name.equals(""))
	539	+// {
	540	+// copy.skyboxname = null;
	541	+// copy.skyboxext = null;
	542	+// }
	543	+// else
	544	+// {
	545	+// copy.skyboxname = name;
	546	+// }
	547	+// }
	548	+// }
	549	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	550	+
	551	+// refreshContents(false); // To refresh Info tab
	552	+ cameraView.repaint();
	553	+ }
	554	+ };
	555	+ objectPanel.addChangeListener(changeListener);
	556	+
322	557	toolbarPanel = new JPanel();
323	558	toolbarPanel.setName("Toolbar");
	559	+
324	560	treePanel = new cGridBag();
325	561	treePanel.setName("Tree");
	562	+
	563	+ editPanel = new cGridBag().setVertical(true);
	564	+ //editPanel.setName("Edit");
	565	+
326	566	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
327		- ctrlPanel.setName("Edit");
328		- materialPanel = new cGridBag().setVertical(true);
329		- materialPanel.setName("Material");
	567	+
	568	+ editCommandsPanel = new cGridBag();
	569	+ editPanel.add(editCommandsPanel);
	570	+ editPanel.add(ctrlPanel);
	571	+
	572	+ toolboxPanel = new cGridBag().setVertical(true);
	573	+ //toolboxPanel.setName("Toolbox");
	574	+
	575	+ skyboxPanel = new cGridBag().setVertical(true);
	576	+
	577	+ materialPanel = new cGridBag().setVertical(false);
	578	+ //materialPanel.setName("Material");
	579	+
330	580	/JTextPane/
331	581	infoarea = createTextPane();
332	582	doc = infoarea.getStyledDocument();
333	583
334	584	infoarea.setEditable(true);
335	585	SetText();
	586	+
336	587	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
337	588	// infoarea.setOpaque(false);
338	589	// //infoarea.setForeground(textcolor);
339	590	// TEXTAREA infoarea.setLineWrap(true);
340	591	// TEXTAREA infoarea.setWrapStyleWord(true);
341	592	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");
	593	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	594	+ //infoPanel.setName("Info");
344	595	//infoPanel.setLayout(new BorderLayout());
345	596	//infoPanel.add(createTextPane());
346	597
..	..	@@ -351,7 +602,14 @@
351	602	mainPanel.setDividerSize(9);
352	603	mainPanel.setDividerLocation(0.5); //1.0);
353	604	mainPanel.setResizeWeight(0.5);
354		-
	605	+
	606	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	607	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	608	+ divider.setDividerSize(15);
	609	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	610	+
	611	+ mainPanel.setUI(new BasicSplitPaneUI());
	612	+
355	613	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
356	614	//mainPanel.setLayout(new GridBagLayout());
357	615	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -419,10 +677,10 @@
419	677	e.printStackTrace();
420	678	}
421	679
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();
	680	+// String selection = infoarea.getText();
	681	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	682	+// java.awt.datatransfer.Clipboard clipboard =
	683	+// Toolkit.getDefaultToolkit().getSystemClipboard();
426	684	//clipboard.setContents(data, data);
427	685	}
428	686
..	..	@@ -582,21 +840,169 @@
582	840	}
583	841	}
584	842
	843	+//static GraphicsDevice device = GraphicsEnvironment
	844	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	845	+
	846	+ Rectangle keeprect;
	847	+ cRadio radio;
	848	+
	849	+cButton keepButton;
	850	+ cButton twoButton; // Full 3D
	851	+ cButton sixButton;
	852	+ cButton threeButton;
	853	+ cButton sevenButton;
	854	+ cButton fourButton; // full panel
	855	+ cButton oneButton; // full XYZ
	856	+ //cButton currentLayout;
	857	+
	858	+ boolean maximized;
	859	+
	860	+ cButton fullscreenLayout;
	861	+ cButton expandedLayout;
	862	+
	863	+ void Minimize()
	864	+ {
	865	+ frame.setState(Frame.ICONIFIED);
	866	+ frame.validate();
	867	+ }
	868	+
	869	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	870	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	871	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	872	+ void Maximize()
	873	+ {
	874	+ if (CameraPane.FULLSCREEN)
	875	+ {
	876	+ ToggleFullScreen();
	877	+ }
	878	+
	879	+ if (maximized)
	880	+ {
	881	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	882	+ }
	883	+ else
	884	+ {
	885	+ keeprect = frame.getBounds();
	886	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	887	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	888	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	889	+// frame.setState(Frame.MAXIMIZED_BOTH);
	890	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	891	+ }
	892	+
	893	+ maximized ^= true;
	894	+
	895	+ frame.validate();
	896	+ }
	897	+
	898	+ cButton minButton;
	899	+ cButton maxButton;
	900	+ cButton fullButton;
	901	+ cButton collapseButton;
	902	+ cButton maximize3DButton;
	903	+
585	904	void ToggleFullScreen()
586	905	{
587		- if (CameraPane.FULLSCREEN)
	906	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	907	+
	908	+ cameraView.ToggleFullScreen();
	909	+
	910	+ if (!CameraPane.FULLSCREEN)
588	911	{
589		- frame.getContentPane().remove(/"Center",/bigThree);
590		- framePanel.add(bigThree);
591		- frame.getContentPane().add(/"Center",/framePanel);
	912	+ device.setFullScreenWindow(null);
	913	+ frame.dispose();
	914	+ frame.setUndecorated(false);
	915	+ frame.validate();
	916	+ frame.setVisible(true);
	917	+
	918	+ //frame.setVisible(false);
	919	+// frame.removeNotify();
	920	+// frame.setUndecorated(false);
	921	+// frame.addNotify();
	922	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	923	+
	924	+// X frame.getContentPane().remove(/"Center",/bigThree);
	925	+// X framePanel.add(bigThree);
	926	+// X frame.getContentPane().add(/"Center",/framePanel);
	927	+// framePanel.setDividerLocation(46); // icons are 24x24
	928	+
	929	+ //frame.setVisible(true);
	930	+// radio.layout = keepButton;
	931	+ //theFrame = null;
	932	+ keepButton = null;
	933	+// radio.layout.doClick();
	934	+
592	935	} else
593	936	{
594		- frame.getContentPane().remove(/"Center",/framePanel);
595		- framePanel.remove(bigThree);
596		- frame.getContentPane().add(/"Center",/bigThree);
	937	+ keepButton = radio.layout;
	938	+ //keeprect = frame.getBounds();
	939	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	940	+// frame.getToolkit().getScreenSize().height);
	941	+ //frame.setVisible(false);
	942	+
	943	+ frame.dispose();
	944	+ frame.setUndecorated(true);
	945	+ device.setFullScreenWindow(frame);
	946	+ frame.validate();
	947	+ frame.setVisible(true);
	948	+// frame.removeNotify();
	949	+// frame.setUndecorated(true);
	950	+// frame.addNotify();
	951	+// X frame.getContentPane().remove(/"Center",/framePanel);
	952	+// X framePanel.remove(bigThree);
	953	+// X frame.getContentPane().add(/"Center",/bigThree);
	954	+// framePanel.setDividerLocation(0);
	955	+
	956	+// radio.layout = fullscreenLayout;
	957	+// radio.layout.doClick();
	958	+ //frame.setVisible(true);
597	959	}
598		- cameraView.ToggleFullScreen();
	960	+ frame.validate();
	961	+
	962	+ cameraView.requestFocusInWindow();
599	963	}
	964	+
	965	+ void CollapseToolbar()
	966	+ {
	967	+ framePanel.setDividerLocation(0);
	968	+ //frame.validate();
	969	+
	970	+ cameraView.requestFocusInWindow();
	971	+ }
	972	+
	973	+ private Object3D Duplicate(Object3D object)
	974	+ {
	975	+ boolean temp = CameraPane.SWITCH;
	976	+ CameraPane.SWITCH = false;
	977	+
	978	+ if (Grafreed.grafreed.universe.versiontable == null)
	979	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	980	+
	981	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	982	+ // if (copy == client)
	983	+
	984	+ Object3D versions[] = object.versionlist;
	985	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	986	+ object.versionlist = null;
	987	+ object.versiontable = null;
	988	+
	989	+ Object3D parent = object.parent;
	990	+ object.parent = null;
	991	+
	992	+ //byte[] compress = Compress(copy);
	993	+ Object3D compress = (Object3D)Grafreed.clone(object);
	994	+
	995	+ object.parent = parent;
	996	+
	997	+ object.versionlist = versions;
	998	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	999	+
	1000	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	1001	+
	1002	+ CameraPane.SWITCH = temp;
	1003	+
	1004	+ return compress;
	1005	+ }
600	1006
601	1007	private JTextPane createTextPane()
602	1008	{
..	..	@@ -719,6 +1125,7 @@
719	1125	{
720	1126	SetupMaterial(materialPanel);
721	1127	}
	1128	+
722	1129	//SetupName();
723	1130	//SetupViews();
724	1131	}
..	..	@@ -728,7 +1135,7 @@
728	1135	// NumberSlider vDivsField;
729	1136	// JCheckBox endcaps;
730	1137	JCheckBox liveCB;
731		- JCheckBox selectCB;
	1138	+ JCheckBox selectableCB;
732	1139	JCheckBox hideCB;
733	1140	JCheckBox link2masterCB;
734	1141	JCheckBox markCB;
..	..	@@ -736,7 +1143,12 @@
736	1143	JCheckBox speedupCB;
737	1144	JCheckBox rewindCB;
738	1145	JCheckBox flipVCB;
	1146	+
	1147	+ cCheckBox toggleTextureCB;
	1148	+ cCheckBox toggleSwitchCB;
	1149	+
739	1150	JComboBox texresMenu;
	1151	+
740	1152	JButton resetButton;
741	1153	JButton stepButton;
742	1154	JButton stepAllButton;
..	..	@@ -745,9 +1157,13 @@
745	1157	JButton fasterButton;
746	1158	JButton remarkButton;
747	1159
	1160	+ cGridBag editPanel;
	1161	+ cGridBag editCommandsPanel;
	1162	+
748	1163	cGridBag namePanel;
749	1164	cGridBag setupPanel;
750		- cGridBag commandsPanel;
	1165	+ cGridBag setupPanel2;
	1166	+ cGridBag objectCommandsPanel;
751	1167	cGridBag pushPanel;
752	1168	cGridBag fillPanel;
753	1169
..	..	@@ -918,61 +1334,81 @@
918	1334
919	1335	namePanel = new cGridBag();
920	1336
	1337	+ //if (copy.pinned)
	1338	+ {
	1339	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
	1340	+ pinButton.setSelected(copy.pinned);
	1341	+ cGridBag t = new cGridBag();
	1342	+ t.preferredWidth = 2;
	1343	+ t.add(pinButton);
	1344	+ namePanel.add(t);
	1345	+
	1346	+ pinButton.addItemListener(this);
	1347	+ }
	1348	+
921	1349	nameField = AddText(namePanel, copy.GetName());
922		- namePanel.add(nameField);
	1350	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
923	1351	oe.ctrlPanel.add(namePanel);
924	1352
925	1353	oe.ctrlPanel.Return();
926	1354
927		- if (!GroupEditor.allparams)
	1355	+ if (!allparams)
928	1356	return;
929	1357
930	1358	setupPanel = new cGridBag().setVertical(false);
931	1359
932	1360	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
933	1361	liveCB.setToolTipText("Animate object");
934		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
935		- selectCB.setToolTipText("Make object selectable");
	1362	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1363	+ markCB.setToolTipText("Set target transform");
	1364	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1365	+ selectableCB.setToolTipText("Make object selectable");
936	1366	// Return();
	1367	+
937	1368	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
938	1369	hideCB.setToolTipText("Hide object");
939		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
940		- markCB.setToolTipText("Set the animation target transform");
941	1370
942		- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	1371	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1372	+
	1373	+ setupPanel2 = new cGridBag().setVertical(false);
	1374	+
	1375	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
943	1376	rewindCB.setToolTipText("Rewind animation");
944	1377
945		- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
946		- randomCB.setToolTipText("Option for switch node");
	1378	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1379	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
947	1380
	1381	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1382	+ link2masterCB.setToolTipText("Attach to support");
	1383	+
948	1384	if (Globals.ADVANCED)
949	1385	{
950		- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
951		- link2masterCB.setToolTipText("Attach to support");
952		- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1386	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
953	1387	speedupCB.setToolTipText("Option motion capture");
954	1388	}
955	1389
956	1390	oe.ctrlPanel.add(setupPanel);
957	1391	oe.ctrlPanel.Return();
	1392	+ oe.ctrlPanel.add(setupPanel2);
	1393	+ oe.ctrlPanel.Return();
958	1394
959		- commandsPanel = new cGridBag().setVertical(false);
	1395	+ objectCommandsPanel = new cGridBag().setVertical(false);
960	1396
961		- resetButton = AddButton(commandsPanel, "Reset");
	1397	+ resetButton = AddButton(objectCommandsPanel, "Reset");
962	1398	resetButton.setToolTipText("Jump to frame zero");
963		- stepButton = AddButton(commandsPanel, "Step");
	1399	+ stepButton = AddButton(objectCommandsPanel, "Step");
964	1400	stepButton.setToolTipText("Step one frame");
965	1401	// resetAllButton = AddButton(oe, "Reset All");
966	1402	// stepAllButton = AddButton(oe, "Step All");
967	1403	// Return();
968		- slowerButton = AddButton(commandsPanel, "Slow");
	1404	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
969	1405	slowerButton.setToolTipText("Decrease animation speed");
970		- fasterButton = AddButton(commandsPanel, "Fast");
	1406	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
971	1407	fasterButton.setToolTipText("Increase animation speed");
972		- remarkButton = AddButton(commandsPanel, "Remark");
	1408	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
973	1409	remarkButton.setToolTipText("Set the current transform as the target");
974	1410
975		- oe.ctrlPanel.add(commandsPanel);
	1411	+ oe.ctrlPanel.add(objectCommandsPanel);
976	1412	oe.ctrlPanel.Return();
977	1413
978	1414	pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
..	..	@@ -1132,22 +1568,9 @@
1132	1568
1133	1569	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1134	1570	{
1135		- System.out.println("CREATE CAMERAS");
1136		- cams = new cTemplate();
1137		- cams.name = "Cameras";
1138		- copy.insertElementAt(cams, 0);
1139		- //cams.parent = copy;
1140		-
1141		- cam = new Camera(); // LA.newVector(3, 2, 1));
1142		- cams.addChild(cam);
1143		- cam = new Camera(1);
1144		- cams.addChild(cam);
1145		- cam = new Camera(2);
1146		- cams.addChild(cam);
1147		- cam = new Camera(3);
1148		- cams.addChild(cam);
1149		- cam = new Camera(4); // Light
1150		- cams.addChild(cam);
	1571	+ if (Globals.DEBUG)
	1572	+ System.out.println("CREATE CAMERAS");
	1573	+ cams = CreateCameras();
1151	1574	} else
1152	1575	{
1153	1576	cams = (cGroup) copy.get(0);
..	..	@@ -1178,8 +1601,11 @@
1178	1601	//worldPanel.setName("World");
1179	1602	centralPanel = new cGridBag();
1180	1603	centralPanel.preferredWidth = 20;
1181		- timelinePanel = new JPanel(new BorderLayout());
1182		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1604	+
	1605	+ if (Globals.ADVANCED)
	1606	+ {
	1607	+ timelinePanel = new JPanel(new BorderLayout());
	1608	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1183	1609
1184	1610	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1185	1611	cameraPanel.setContinuousLayout(true);
..	..	@@ -1188,7 +1614,10 @@
1188	1614	// cameraPanel.setDividerSize(9);
1189	1615	cameraPanel.setResizeWeight(1.0);
1190	1616
	1617	+ }
	1618	+
1191	1619	centralPanel.add(cameraView);
	1620	+ centralPanel.setFocusable(true);
1192	1621	//frame.setJMenuBar(timelineMenubar);
1193	1622	//centralPanel.add(timelinePanel);
1194	1623
..	..	@@ -1207,6 +1636,45 @@
1207	1636	//frontView.object = copy;
1208	1637	//sideView.object = copy;
1209	1638
	1639	+ transformPanel = new cGridBag().setVertical(true);
	1640	+
	1641	+ cGridBag resetTransformPanel = new cGridBag();
	1642	+
	1643	+ resetTransformPanel.preferredHeight = 2;
	1644	+
	1645	+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
	1646	+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
	1647	+ resetTransform.addMouseListener(new MouseAdapter()
	1648	+ {
	1649	+ public void mouseClicked(MouseEvent e)
	1650	+ {
	1651	+ ResetTransform();
	1652	+ }
	1653	+ });
	1654	+ resetTransformPanel.add(resetTransform);
	1655	+
	1656	+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
	1657	+ resetTransform.setToolTipText("Reset Translation only");
	1658	+ resetTransform.addMouseListener(new MouseAdapter()
	1659	+ {
	1660	+ public void mouseClicked(MouseEvent e)
	1661	+ {
	1662	+ ResetTransform(1);
	1663	+ }
	1664	+ });
	1665	+ resetTransformPanel.add(resetTransform);
	1666	+
	1667	+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
	1668	+ resetTransform.setToolTipText("Reset Rotation and Scale only");
	1669	+ resetTransform.addMouseListener(new MouseAdapter()
	1670	+ {
	1671	+ public void mouseClicked(MouseEvent e)
	1672	+ {
	1673	+ ResetTransform(2);
	1674	+ }
	1675	+ });
	1676	+ resetTransformPanel.add(resetTransform);
	1677	+
1210	1678	XYZPanel = new cGridBag().setVertical(true);
1211	1679	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1212	1680
..	..	@@ -1214,7 +1682,11 @@
1214	1682	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1215	1683	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1216	1684	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1685	+ //XYZPanel.setName("XYZ");
1217	1686
	1687	+ transformPanel.add(resetTransformPanel);
	1688	+ transformPanel.add(XYZPanel);
	1689	+
1218	1690	/*
1219	1691	gridPanel = new JPanel(); //new BorderLayout());
1220	1692	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1222,12 +1694,12 @@
1222	1694	gridPanel.add(cameraView);
1223	1695	gridPanel.add(XYZPanel);
1224	1696	*/
1225		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1226		- gridPanel.setContinuousLayout(true);
1227		- gridPanel.setOneTouchExpandable(true);
1228		- gridPanel.setDividerLocation(1.0);
1229		- gridPanel.setDividerSize(9);
1230		- gridPanel.setResizeWeight(0.85);
	1697	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1698	+// gridPanel.setContinuousLayout(true);
	1699	+// gridPanel.setOneTouchExpandable(true);
	1700	+// gridPanel.setDividerLocation(1.0);
	1701	+// gridPanel.setDividerSize(9);
	1702	+// gridPanel.setResizeWeight(0.85);
1231	1703
1232	1704	// aConstraints.weighty = 0;
1233	1705	//System.out.println("THIS = " + this);
..	..	@@ -1250,14 +1722,34 @@
1250	1722
1251	1723	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1252	1724	//tmp.setName("Edit");
	1725	+ objectPanel.add(skyboxPanel);
	1726	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1727	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1728	+
	1729	+ objectPanel.add(toolboxPanel);
	1730	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1731	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1732	+
1253	1733	objectPanel.add(materialPanel);
	1734	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1735	+ objectPanel.setToolTipTextAt(2, "Material");
	1736	+
1254	1737	// JPanel north = new JPanel(new BorderLayout());
1255	1738	// north.setName("Edit");
1256	1739	// north.add(ctrlPanel, BorderLayout.NORTH);
1257	1740	// objectPanel.add(north);
1258		- objectPanel.add(ctrlPanel);
1259		- objectPanel.add(infoPanel);
1260		-
	1741	+ objectPanel.add(editPanel);
	1742	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
	1743	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1744	+
	1745	+ objectPanel.add(transformPanel);
	1746	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1747	+ objectPanel.setToolTipTextAt(4, "TRS transform");
	1748	+
	1749	+ patchMaterial = true;
	1750	+ cameraView.patchMaterial = this;
	1751	+ objectPanel.setSelectedIndex(2);
	1752	+
1261	1753	/*
1262	1754	aConstraints.gridx = 0;
1263	1755	aConstraints.gridwidth = 1;
..	..	@@ -1265,7 +1757,7 @@
1265	1757	aConstraints.gridy += 1;
1266	1758	aConstraints.gridwidth = 1;
1267	1759	mainPanel.add(objectPanel, aConstraints);
1268		- */
	1760	+ */
1269	1761
1270	1762	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1271	1763	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1282,17 +1774,114 @@
1282	1774	JTabbedPane tabbedPane = new JTabbedPane();
1283	1775	tabbedPane.add(scrollpane);
1284	1776
1285		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1286		-
1287		- optionsPanel = new cGridBag().setVertical(true);
	1777	+ optionsPanel = new cGridBag().setVertical(false);
1288	1778
1289	1779	optionsPanel.setName("Options");
1290	1780
1291	1781	AddOptions(optionsPanel); //, aConstraints);
1292	1782
	1783	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1784	+
1293	1785	tabbedPane.add(optionsPanel);
1294	1786
1295	1787	scenePanel.add(tabbedPane);
	1788	+
	1789	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1790	+ creditsPanel.setName("Credits");
	1791	+
	1792	+ cLabel ogaLabel = new cLabel(" Most Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1793	+ creditsPanel.add(ogaLabel);
	1794	+
	1795	+ cButton creditButton;
	1796	+ creditsPanel.add(creditButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1797	+ creditButton.setToolTipText("https://opengameart.org");
	1798	+
	1799	+ creditButton.addMouseListener(new MouseAdapter()
	1800	+ {
	1801	+ public void mouseClicked(MouseEvent e)
	1802	+ {
	1803	+ try
	1804	+ {
	1805	+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
	1806	+ } catch (Exception e1)
	1807	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1808	+ {
	1809	+ e1.printStackTrace();
	1810	+ }
	1811	+ }
	1812	+ });
	1813	+
	1814	+ ogaLabel = new cLabel(" Download 3D models! (.3ds and .obj only)", !Globals.NIMBUSLAF);
	1815	+ creditsPanel.add(ogaLabel);
	1816	+
	1817	+ creditsPanel.add(creditButton = GetButton("icons/3delicious.png", !Globals.NIMBUSLAF));
	1818	+ creditButton.setToolTipText("https://3delicious.net");
	1819	+
	1820	+ creditButton.addMouseListener(new MouseAdapter()
	1821	+ {
	1822	+ public void mouseClicked(MouseEvent e)
	1823	+ {
	1824	+ try
	1825	+ {
	1826	+ Desktop.getDesktop().browse(new java.net.URI("https://3delicious.net"));
	1827	+ } catch (Exception e1)
	1828	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1829	+ {
	1830	+ e1.printStackTrace();
	1831	+ }
	1832	+ }
	1833	+ });
	1834	+
	1835	+ creditsPanel.add(creditButton = GetButton("icons/archive3d.png", !Globals.NIMBUSLAF));
	1836	+ creditButton.setToolTipText("https://archive3d.net");
	1837	+
	1838	+ creditButton.addMouseListener(new MouseAdapter()
	1839	+ {
	1840	+ public void mouseClicked(MouseEvent e)
	1841	+ {
	1842	+ try
	1843	+ {
	1844	+ Desktop.getDesktop().browse(new java.net.URI("https://archive3d.net"));
	1845	+ } catch (Exception e1)
	1846	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1847	+ {
	1848	+ e1.printStackTrace();
	1849	+ }
	1850	+ }
	1851	+ });
	1852	+
	1853	+ creditsPanel.add(creditButton = GetButton("icons/turbosquid.png", !Globals.NIMBUSLAF));
	1854	+ creditButton.setToolTipText("https://turbosquid.com");
	1855	+
	1856	+ creditButton.addMouseListener(new MouseAdapter()
	1857	+ {
	1858	+ public void mouseClicked(MouseEvent e)
	1859	+ {
	1860	+ try
	1861	+ {
	1862	+ Desktop.getDesktop().browse(new java.net.URI("https://www.turbosquid.com/Search/3D-Models/free"));
	1863	+ } catch (Exception e1)
	1864	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1865	+ {
	1866	+ e1.printStackTrace();
	1867	+ }
	1868	+ }
	1869	+ });
	1870	+
	1871	+ for (int i=6; --i>=0;)
	1872	+ {
	1873	+ creditsPanel.add(new cGridBag());
	1874	+ }
	1875	+
	1876	+ tabbedPane.add(creditsPanel);
	1877	+ tabbedPane.setToolTipTextAt(3, "Credits");
	1878	+
	1879	+ if (Globals.ADVANCED)
	1880	+ {
	1881	+ tabbedPane.add(infoPanel);
	1882	+ tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
	1883	+ tabbedPane.setToolTipTextAt(4, "Information");
	1884	+ }
1296	1885
1297	1886	/*
1298	1887	cTree jTree = new cTree(null);
..	..	@@ -1314,13 +1903,13 @@
1314	1903	jtp.add(tree);
1315	1904	*/
1316	1905
1317		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1318		- bigPanel.setContinuousLayout(true);
1319		- bigPanel.setOneTouchExpandable(true);
1320		- bigPanel.setDividerLocation(0.8);
1321		- bigPanel.setDividerSize(15);
1322		- bigPanel.setResizeWeight(0.15);
1323		- bigPanel.setName("Scene");
	1906	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1907	+// bigPanel.setContinuousLayout(true);
	1908	+// bigPanel.setOneTouchExpandable(true);
	1909	+// bigPanel.setDividerLocation(0.8);
	1910	+// bigPanel.setDividerSize(15);
	1911	+// bigPanel.setResizeWeight(0.15);
	1912	+// bigPanel.setName("Scene");
1324	1913
1325	1914	//bigPanel.setLayout(new BorderLayout());
1326	1915	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1355,7 +1944,7 @@
1355	1944	bigThree = new cGridBag();
1356	1945	bigThree.addComponent(scenePanel);
1357	1946	bigThree.addComponent(centralPanel);
1358		- bigThree.addComponent(XYZPanel);
	1947	+ //bigThree.addComponent(XYZPanel);
1359	1948
1360	1949	// // SIDE EFFECT!!!
1361	1950	// aConstraints.gridx = 0;
..	..	@@ -1364,16 +1953,33 @@
1364	1953	// aConstraints.gridheight = 1;
1365	1954
1366	1955	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1367		- framePanel.setContinuousLayout(true);
1368		- framePanel.setOneTouchExpandable(true);
1369		- framePanel.setDividerLocation(0.8);
	1956	+
	1957	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1958	+ new java.beans.PropertyChangeListener()
	1959	+ {
	1960	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1961	+ {
	1962	+ if ((Integer)pce.getOldValue() == 1)
	1963	+ {
	1964	+ if (radio.layout != expandedLayout)
	1965	+ {
	1966	+ radio.layout = expandedLayout;
	1967	+ radio.layout.doClick();
	1968	+ }
	1969	+ }
	1970	+ }
	1971	+ });
	1972	+
	1973	+ framePanel.setContinuousLayout(false);
	1974	+ framePanel.setOneTouchExpandable(false);
	1975	+ //.setDividerLocation(0.8);
1370	1976	//framePanel.setDividerSize(15);
1371	1977	//framePanel.setResizeWeight(0.15);
1372	1978	framePanel.setName("Frame");
1373	1979
1374	1980	frame.getContentPane().setLayout(new BorderLayout());
1375	1981	/**/
1376		- JTabbedPane worldPane = new JTabbedPane();
	1982	+ //JTabbedPane worldPane = new JTabbedPane();
1377	1983	//worldPane.add(bigPanel);
1378	1984	//worldPane.add(worldPanel);
1379	1985	/**/
..	..	@@ -1384,14 +1990,18 @@
1384	1990	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1385	1991
1386	1992	frame.setSize(1280, 860);
1387		- frame.setVisible(true);
	1993	+
	1994	+ cameraView.requestFocusInWindow();
	1995	+
	1996	+// gridPanel.setDividerLocation(1.0);
	1997	+
	1998	+ frame.validate();
1388	1999
1389		- gridPanel.setDividerLocation(1.0);
	2000	+ frame.setVisible(true);
1390	2001
1391	2002	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1392	2003	frame.addWindowListener(new WindowAdapter()
1393	2004	{
1394		-
1395	2005	public void windowClosing(WindowEvent e)
1396	2006	{
1397	2007	Close();
..	..	@@ -1414,28 +2024,442 @@
1414	2024	ctrlPanel.removeAll();
1415	2025	}
1416	2026
1417		- void SetupMaterial(cGridBag panel)
	2027	+ void SetupMaterial(cGridBag materialpanel)
1418	2028	{
1419		- /*
	2029	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	2030	+
	2031	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
	2032	+ skin.setToolTipText("Skin");
	2033	+ skin.addMouseListener(new MouseAdapter()
	2034	+ {
	2035	+ public void mouseClicked(MouseEvent e)
	2036	+ {
	2037	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	2038	+ cMaterial material = object.material;
	2039	+
	2040	+ // Skin
	2041	+ colorField.setFloat(material.color);
	2042	+ float saturation = material.modulation;
	2043	+
	2044	+ if (!cameraView.Skinshader)
	2045	+ {
	2046	+ saturation /= 1.5;
	2047	+ }
	2048	+
	2049	+ saturationField.setFloat(saturation);
	2050	+
	2051	+ subsurfaceField.setFloat(material.subsurface);
	2052	+ selfshadowField.setFloat(material.diffuseness);
	2053	+ diffusenessField.setFloat(material.factor);
	2054	+ shininessField.setFloat(material.shininess);
	2055	+ shadowbiasField.setFloat(material.shadowbias);
	2056	+ diffuseField.setFloat(material.diffuse);
	2057	+ specularField.setFloat(material.specular);
	2058	+
	2059	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2060	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2061	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2062	+
	2063	+ materialtouched = true;
	2064	+ applySelf();
	2065	+ }
	2066	+ });
	2067	+ presetpanel.add(skin);
	2068	+
	2069	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
	2070	+ lambert.setToolTipText("Diffuse");
	2071	+ lambert.addMouseListener(new MouseAdapter()
	2072	+ {
	2073	+ public void mouseClicked(MouseEvent e)
	2074	+ {
	2075	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	2076	+ cMaterial material = object.material;
	2077	+
	2078	+ diffusenessField.setFloat(material.factor);
	2079	+ selfshadowField.setFloat(material.diffuseness);
	2080	+
	2081	+ materialtouched = true;
	2082	+ applySelf();
	2083	+ }
	2084	+ });
	2085	+ presetpanel.add(lambert);
	2086	+
	2087	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
	2088	+ diffuse2.setToolTipText("Diffuse2");
	2089	+ diffuse2.addMouseListener(new MouseAdapter()
	2090	+ {
	2091	+ public void mouseClicked(MouseEvent e)
	2092	+ {
	2093	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	2094	+ cMaterial material = object.material;
	2095	+
	2096	+ diffusenessField.setFloat(material.factor);
	2097	+ selfshadowField.setFloat(material.diffuseness);
	2098	+
	2099	+ materialtouched = true;
	2100	+ applySelf();
	2101	+ }
	2102	+ });
	2103	+ presetpanel.add(diffuse2);
	2104	+
	2105	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
	2106	+ diffusemoon.setToolTipText("Moon");
	2107	+ diffusemoon.addMouseListener(new MouseAdapter()
	2108	+ {
	2109	+ public void mouseClicked(MouseEvent e)
	2110	+ {
	2111	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	2112	+ cMaterial material = object.material;
	2113	+
	2114	+ diffusenessField.setFloat(material.factor);
	2115	+ selfshadowField.setFloat(material.diffuseness);
	2116	+
	2117	+ materialtouched = true;
	2118	+ applySelf();
	2119	+ }
	2120	+ });
	2121	+ presetpanel.add(diffusemoon);
	2122	+
	2123	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
	2124	+ diffusemoon2.setToolTipText("Moon2");
	2125	+ diffusemoon2.addMouseListener(new MouseAdapter()
	2126	+ {
	2127	+ public void mouseClicked(MouseEvent e)
	2128	+ {
	2129	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	2130	+ cMaterial material = object.material;
	2131	+
	2132	+ diffusenessField.setFloat(material.factor);
	2133	+ selfshadowField.setFloat(material.diffuseness);
	2134	+
	2135	+ materialtouched = true;
	2136	+ applySelf();
	2137	+ }
	2138	+ });
	2139	+ presetpanel.add(diffusemoon2);
	2140	+
	2141	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
	2142	+ diffusemoon3.setToolTipText("Moon3");
	2143	+ diffusemoon3.addMouseListener(new MouseAdapter()
	2144	+ {
	2145	+ public void mouseClicked(MouseEvent e)
	2146	+ {
	2147	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	2148	+ cMaterial material = object.material;
	2149	+
	2150	+ diffusenessField.setFloat(material.factor);
	2151	+ selfshadowField.setFloat(material.diffuseness);
	2152	+
	2153	+ materialtouched = true;
	2154	+ applySelf();
	2155	+ }
	2156	+ });
	2157	+ presetpanel.add(diffusemoon3);
	2158	+
	2159	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
	2160	+ diffusesheen.setToolTipText("Sheen");
	2161	+ diffusesheen.addMouseListener(new MouseAdapter()
	2162	+ {
	2163	+ public void mouseClicked(MouseEvent e)
	2164	+ {
	2165	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2166	+ cMaterial material = object.material;
	2167	+
	2168	+ sheenField.setFloat(material.sheen);
	2169	+
	2170	+ materialtouched = true;
	2171	+ applySelf();
	2172	+ }
	2173	+ });
	2174	+ presetpanel.add(diffusesheen);
	2175	+
	2176	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
	2177	+ rough.setToolTipText("Rough metal");
	2178	+ rough.addMouseListener(new MouseAdapter()
	2179	+ {
	2180	+ public void mouseClicked(MouseEvent e)
	2181	+ {
	2182	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2183	+ cMaterial material = object.material;
	2184	+
	2185	+ shininessField.setFloat(material.shininess);
	2186	+ velvetField.setFloat(material.velvet);
	2187	+
	2188	+ materialtouched = true;
	2189	+ applySelf();
	2190	+ }
	2191	+ });
	2192	+ presetpanel.add(rough);
	2193	+
	2194	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
	2195	+ rough2.setToolTipText("Medium metal");
	2196	+ rough2.addMouseListener(new MouseAdapter()
	2197	+ {
	2198	+ public void mouseClicked(MouseEvent e)
	2199	+ {
	2200	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2201	+ cMaterial material = object.material;
	2202	+
	2203	+ shininessField.setFloat(material.shininess);
	2204	+ lightareaField.setFloat(material.lightarea);
	2205	+
	2206	+ materialtouched = true;
	2207	+ applySelf();
	2208	+ }
	2209	+ });
	2210	+ presetpanel.add(rough2);
	2211	+
	2212	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
	2213	+ shini0.setToolTipText("Shiny");
	2214	+ shini0.addMouseListener(new MouseAdapter()
	2215	+ {
	2216	+ public void mouseClicked(MouseEvent e)
	2217	+ {
	2218	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2219	+ cMaterial material = object.material;
	2220	+
	2221	+ shininessField.setFloat(material.shininess);
	2222	+ lightareaField.setFloat(material.lightarea);
	2223	+
	2224	+ materialtouched = true;
	2225	+ applySelf();
	2226	+ }
	2227	+ });
	2228	+ presetpanel.add(shini0);
	2229	+
	2230	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
	2231	+ shini1.setToolTipText("Shiny2");
	2232	+ shini1.addMouseListener(new MouseAdapter()
	2233	+ {
	2234	+ public void mouseClicked(MouseEvent e)
	2235	+ {
	2236	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2237	+ cMaterial material = object.material;
	2238	+
	2239	+ shininessField.setFloat(material.shininess);
	2240	+ lightareaField.setFloat(material.lightarea);
	2241	+
	2242	+ materialtouched = true;
	2243	+ applySelf();
	2244	+ }
	2245	+ });
	2246	+ presetpanel.add(shini1);
	2247	+
	2248	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
	2249	+ shini2.setToolTipText("Shiny3");
	2250	+ shini2.addMouseListener(new MouseAdapter()
	2251	+ {
	2252	+ public void mouseClicked(MouseEvent e)
	2253	+ {
	2254	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2255	+ cMaterial material = object.material;
	2256	+
	2257	+ shininessField.setFloat(material.shininess);
	2258	+ lightareaField.setFloat(material.lightarea);
	2259	+
	2260	+ materialtouched = true;
	2261	+ applySelf();
	2262	+ }
	2263	+ });
	2264	+ presetpanel.add(shini2);
	2265	+
	2266	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
	2267	+ aniso.setToolTipText("AnisoU");
	2268	+ aniso.addMouseListener(new MouseAdapter()
	2269	+ {
	2270	+ public void mouseClicked(MouseEvent e)
	2271	+ {
	2272	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2273	+ cMaterial material = object.material;
	2274	+
	2275	+ anisoField.setFloat(material.aniso);
	2276	+ anisoVField.setFloat(material.anisoV);
	2277	+
	2278	+ materialtouched = true;
	2279	+ applySelf();
	2280	+ }
	2281	+ });
	2282	+ presetpanel.add(aniso);
	2283	+
	2284	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
	2285	+ aniso2.setToolTipText("AnisoV");
	2286	+ aniso2.addMouseListener(new MouseAdapter()
	2287	+ {
	2288	+ public void mouseClicked(MouseEvent e)
	2289	+ {
	2290	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2291	+ cMaterial material = object.material;
	2292	+
	2293	+ anisoField.setFloat(material.aniso);
	2294	+ anisoVField.setFloat(material.anisoV);
	2295	+
	2296	+ materialtouched = true;
	2297	+ applySelf();
	2298	+ }
	2299	+ });
	2300	+ presetpanel.add(aniso2);
	2301	+
	2302	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
	2303	+ aniso3.setToolTipText("AnisoUV");
	2304	+ aniso3.addMouseListener(new MouseAdapter()
	2305	+ {
	2306	+ public void mouseClicked(MouseEvent e)
	2307	+ {
	2308	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2309	+ cMaterial material = object.material;
	2310	+
	2311	+ anisoField.setFloat(material.aniso);
	2312	+ anisoVField.setFloat(material.anisoV);
	2313	+
	2314	+ materialtouched = true;
	2315	+ applySelf();
	2316	+ }
	2317	+ });
	2318	+ presetpanel.add(aniso3);
	2319	+
	2320	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
	2321	+ velvet0.setToolTipText("Velvet");
	2322	+ velvet0.addMouseListener(new MouseAdapter()
	2323	+ {
	2324	+ public void mouseClicked(MouseEvent e)
	2325	+ {
	2326	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2327	+ cMaterial material = object.material;
	2328	+
	2329	+ diffusenessField.setFloat(material.factor);
	2330	+ selfshadowField.setFloat(material.diffuseness);
	2331	+ sheenField.setFloat(material.sheen);
	2332	+ shininessField.setFloat(material.shininess);
	2333	+ velvetField.setFloat(material.velvet);
	2334	+ shiftField.setFloat(material.shift);
	2335	+
	2336	+ materialtouched = true;
	2337	+ applySelf();
	2338	+ }
	2339	+ });
	2340	+ presetpanel.add(velvet0);
	2341	+
	2342	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
	2343	+ bump0.setToolTipText("Bump texture");
	2344	+ bump0.addMouseListener(new MouseAdapter()
	2345	+ {
	2346	+ public void mouseClicked(MouseEvent e)
	2347	+ {
	2348	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2349	+ cMaterial material = object.material;
	2350	+
	2351	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2352	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2353	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2354	+
	2355	+ materialtouched = true;
	2356	+ applySelf();
	2357	+ }
	2358	+ });
	2359	+ presetpanel.add(bump0);
	2360	+
	2361	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
	2362	+ borderShader.setToolTipText("Border fade");
	2363	+ borderShader.addMouseListener(new MouseAdapter()
	2364	+ {
	2365	+ public void mouseClicked(MouseEvent e)
	2366	+ {
	2367	+ borderfadeField.setFloat(0.5);
	2368	+ opacityField.setFloat(0.75);
	2369	+
	2370	+ materialtouched = true;
	2371	+ applySelf();
	2372	+ }
	2373	+ });
	2374	+ presetpanel.add(borderShader);
	2375	+
	2376	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
	2377	+ halo.setToolTipText("Halo");
	2378	+ halo.addMouseListener(new MouseAdapter()
	2379	+ {
	2380	+ public void mouseClicked(MouseEvent e)
	2381	+ {
	2382	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2383	+ cMaterial material = object.material;
	2384	+
	2385	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2386	+
	2387	+ materialtouched = true;
	2388	+ applySelf();
	2389	+ }
	2390	+ });
	2391	+ presetpanel.add(halo);
	2392	+
	2393	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
	2394	+ candle.setToolTipText("Candle");
	2395	+ candle.addMouseListener(new MouseAdapter()
	2396	+ {
	2397	+ public void mouseClicked(MouseEvent e)
	2398	+ {
	2399	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2400	+ cMaterial material = object.material;
	2401	+
	2402	+ subsurfaceField.setFloat(material.subsurface);
	2403	+ shadowbiasField.setFloat(material.shadowbias);
	2404	+ ambientField.setFloat(material.ambient);
	2405	+ specularField.setFloat(material.specular);
	2406	+ lightareaField.setFloat(material.lightarea);
	2407	+ shininessField.setFloat(material.shininess);
	2408	+
	2409	+ materialtouched = true;
	2410	+ applySelf();
	2411	+ }
	2412	+ });
	2413	+ presetpanel.add(candle);
	2414	+
	2415	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
	2416	+ shadowShader.setToolTipText("Shadow");
	2417	+ shadowShader.addMouseListener(new MouseAdapter()
	2418	+ {
	2419	+ public void mouseClicked(MouseEvent e)
	2420	+ {
	2421	+ diffuseField.setFloat(0.001);
	2422	+ ambientField.setFloat(0.001);
	2423	+ cameraField.setFloat(0.001);
	2424	+ specularField.setFloat(0.001);
	2425	+ fakedepthField.setFloat(0.001);
	2426	+ opacityField.setFloat(0.6);
	2427	+
	2428	+ materialtouched = true;
	2429	+ applySelf();
	2430	+ }
	2431	+ });
	2432	+ presetpanel.add(shadowShader);
	2433	+
	2434	+ cGridBag panel = new cGridBag().setVertical(true);
	2435	+
	2436	+ presetpanel.preferredWidth = 1;
	2437	+
	2438	+ materialpanel.add(presetpanel);
	2439	+ materialpanel.add(panel);
	2440	+
	2441	+ panel.preferredWidth = 8;
	2442	+
	2443	+ /*
1420	2444	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1421	2445	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1422		- */
	2446	+ */
1423	2447
1424	2448	cGridBag editBar = new cGridBag().setVertical(false);
1425	2449
1426		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2450	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
1427	2451	createMaterialButton.setToolTipText("Create material");
1428	2452
1429	2453	/*
1430	2454	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1431	2455	*/
1432	2456
1433		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2457	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
1434	2458	clearMaterialButton.setToolTipText("Clear material");
1435	2459
1436	2460	if (Globals.ADVANCED)
1437	2461	{
1438		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2462	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
1439	2463	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1440	2464	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1441	2465	}
..	..	@@ -1453,45 +2477,61 @@
1453	2477	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1454	2478
1455	2479	cGridBag colorSection = new cGridBag().setVertical(true);
	2480	+
	2481	+ cGridBag huepanel = new cGridBag();
	2482	+ cGridBag huelabel = new cGridBag();
	2483	+ cLabel hue = GetLabel("icons/hue.png", false);
	2484	+ hue.fit = true;
	2485	+
	2486	+ hue.addMouseListener(new MouseAdapter()
	2487	+ {
	2488	+ public void mousePressed(MouseEvent e)
	2489	+ {
	2490	+ int x = e.getX();
	2491	+
	2492	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2493	+ }
	2494	+ });
	2495	+
	2496	+ huelabel.add(hue);
	2497	+ huelabel.preferredWidth = 20;
	2498	+ huepanel.add(new cGridBag()); // Label
	2499	+ huepanel.add(huelabel); // Field/slider
	2500	+
	2501	+ huepanel.preferredHeight = 7;
	2502	+
	2503	+ colorSection.add(huepanel);
1456	2504
1457	2505	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);
	2506	+
	2507	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2508	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2509	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2510	+
1461	2511	//colorField.preferredWidth = 200;
1462	2512	colorSection.add(color);
1463	2513
1464	2514	cGridBag modulation = new cGridBag();
1465	2515	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1466	2516	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1467		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2517	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1468	2518	colorSection.add(modulation);
1469	2519
	2520	+ cGridBag opacity = new cGridBag();
	2521	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2522	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2523	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2524	+ colorSection.add(opacity);
	2525	+
	2526	+ colorSection.add(GetSeparator());
	2527	+
1470	2528	cGridBag texture = new cGridBag();
1471	2529	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1472	2530	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1473	2531	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1474	2532	colorSection.add(texture);
1475	2533
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());
	2534	+ panel.add(GetSeparator());
1495	2535
1496	2536	panel.add(colorSection);
1497	2537
..	..	@@ -1541,7 +2581,13 @@
1541	2581	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1542	2582	diffuseSection.add(fakedepth);
1543	2583
1544		- panel.add(new JSeparator());
	2584	+ cGridBag shadowbias = new cGridBag();
	2585	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2586	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2587	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2588	+ diffuseSection.add(shadowbias);
	2589	+
	2590	+ panel.add(GetSeparator());
1545	2591
1546	2592	panel.add(diffuseSection);
1547	2593
..	..	@@ -1591,42 +2637,48 @@
1591	2637	// aConstraints.gridy += 1;
1592	2638	// aConstraints.gridwidth = 1;
1593	2639
	2640	+ cGridBag anisoU = new cGridBag();
	2641	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2642	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2643	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2644	+ specularSection.add(anisoU);
1594	2645
1595		- panel.add(new JSeparator());
	2646	+ cGridBag anisoV = new cGridBag();
	2647	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2648	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2649	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2650	+ specularSection.add(anisoV);
	2651	+
	2652	+
	2653	+ panel.add(GetSeparator());
1596	2654
1597	2655	panel.add(specularSection);
1598	2656
1599	2657	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1600	2658
1601		- cGridBag globalSection = new cGridBag().setVertical(true);
	2659	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1602	2660
1603	2661	cGridBag camera = new cGridBag();
1604	2662	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1605	2663	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1606	2664	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1607		- globalSection.add(camera);
	2665	+ colorSection.add(camera);
1608	2666
1609	2667	cGridBag ambient = new cGridBag();
1610	2668	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1611	2669	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1612	2670	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1613		- globalSection.add(ambient);
	2671	+ colorSection.add(ambient);
1614	2672
1615	2673	cGridBag backlit = new cGridBag();
1616	2674	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1617	2675	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1618	2676	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1619		- globalSection.add(backlit);
	2677	+ colorSection.add(backlit);
1620	2678
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());
	2679	+ //panel.add(new JSeparator());
1628	2680
1629		- panel.add(globalSection);
	2681	+ //panel.add(globalSection);
1630	2682
1631	2683	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1632	2684
..	..	@@ -1668,7 +2720,7 @@
1668	2720	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1669	2721	textureSection.add(opacityPower);
1670	2722
1671		- panel.add(new JSeparator());
	2723	+ panel.add(GetSeparator());
1672	2724
1673	2725	panel.add(textureSection);
1674	2726
..	..	@@ -1733,8 +2785,9 @@
1733	2785	// 3D models
1734	2786	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1735	2787	{
1736		- lastConverter = new com.jmex.model.converters.MaxToJme();
1737		- LoadFile(filename, lastConverter);
	2788	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2789	+ //LoadFile(filename, lastConverter);
	2790	+ LoadObjFile(filename); // New 3ds loader
1738	2791	continue;
1739	2792	}
1740	2793	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2072,19 +3125,19 @@
2072	3125
2073	3126	void LoadObjFile(String fullname)
2074	3127	{
2075		- /*
	3128	+ System.out.println("Loading " + fullname);
	3129	+ /**/
2076	3130	//lastFilename = fullname;
2077	3131	if(loadObjThread == null)
2078	3132	{
2079		- loadObjThread = new LoadOBJThread();
2080		- loadObjThread.start();
	3133	+ loadObjThread = new LoadOBJThread();
	3134	+ loadObjThread.start();
2081	3135	}
2082	3136
2083	3137	loadObjThread.add(fullname);
2084		- */
	3138	+ /**/
2085	3139
2086		- System.out.println("Loading " + fullname);
2087		- makeSomething(new FileObject(fullname, true), true);
	3140	+ //makeSomething(new FileObject(fullname, true), true);
2088	3141	}
2089	3142
2090	3143	void LoadGFDFile(String fullname)
..	..	@@ -2460,6 +3513,7 @@
2460	3513	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2461	3514	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2462	3515	}
	3516	+
2463	3517	//cJME.count++;
2464	3518	//cJME.count %= 12;
2465	3519	if (gc)
..	..	@@ -2643,6 +3697,7 @@
2643	3697	}
2644	3698	}
2645	3699	}
	3700	+
2646	3701	cFileSystemPane FSPane;
2647	3702
2648	3703	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2652,7 +3707,7 @@
2652	3707
2653	3708	freezematerial = true;
2654	3709	colorField.setFloat(mat.color);
2655		- modulationField.setFloat(mat.modulation);
	3710	+ saturationField.setFloat(mat.modulation);
2656	3711	metalnessField.setFloat(mat.metalness);
2657	3712	diffuseField.setFloat(mat.diffuse);
2658	3713	specularField.setFloat(mat.specular);
..	..	@@ -2696,11 +3751,14 @@
2696	3751	}
2697	3752	}
2698	3753	}
	3754	+
2699	3755	freezematerial = false;
2700	3756	}
2701	3757
2702	3758	void SetMaterial(Object3D object)
2703	3759	{
	3760	+ latestObject = object;
	3761	+
2704	3762	cMaterial mat = object.material;
2705	3763
2706	3764	if (mat == null)
..	..	@@ -2711,32 +3769,8 @@
2711	3769
2712	3770	if (multiplyToggle != null)
2713	3771	multiplyToggle.setSelected(mat.multiply);
2714		-
2715		- assert (object.projectedVertices != null);
2716		-
2717		- if (object.projectedVertices.length <= 2)
2718		- {
2719		- // Side effect...
2720		- Object3D.cVector2[] keep = object.projectedVertices;
2721		- object.projectedVertices = new Object3D.cVector2[3];
2722		- for (int i = 0; i < 3; i++)
2723		- {
2724		- if (i < keep.length)
2725		- {
2726		- object.projectedVertices[i] = keep[i];
2727		- } else
2728		- {
2729		- object.projectedVertices[i] = new Object3D.cVector2();
2730		- }
2731		- /*
2732		- if(keep.length == 0)
2733		- object.projectedVertices[0] = new Object3D.cVector2();
2734		- else
2735		- object.projectedVertices[0] = keep[0];
2736		- object.projectedVertices[1] = new Object3D.cVector2();
2737		- */
2738		- }
2739		- }
	3772	+
	3773	+ AllocProjectedVertices(object);
2740	3774
2741	3775	SetMaterial(mat, object.projectedVertices);
2742	3776	}
..	..	@@ -2812,12 +3846,17 @@
2812	3846	// }
2813	3847
2814	3848	/**/
2815		- if (deselect)
	3849	+ if (deselect \|\| child == null)
2816	3850	{
2817	3851	//group.deselectAll();
2818	3852	//freeze = true;
2819	3853	GetTree().clearSelection();
2820	3854	//freeze = false;
	3855	+
	3856	+ if (child == null)
	3857	+ {
	3858	+ return;
	3859	+ }
2821	3860	}
2822	3861
2823	3862	//group.addSelectee(child);
..	..	@@ -2851,6 +3890,17 @@
2851	3890	public void itemStateChanged(ItemEvent event)
2852	3891	{
2853	3892	// System.out.println("Propagate = " + propagate);
	3893	+ if (event.getSource() == pinButton)
	3894	+ {
	3895	+ copy.pinned ^= true;
	3896	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3897	+ {
	3898	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3899	+ copy.CloseUI();
	3900	+ //copy.editWindow.refreshContents();
	3901	+ }
	3902	+ }
	3903	+ else
2854	3904	if (event.getSource() == propagateToggle)
2855	3905	{
2856	3906	propagate ^= true;
..	..	@@ -2886,7 +3936,7 @@
2886	3936	cameraView.ToggleDL();
2887	3937	cameraView.repaint();
2888	3938	return;
2889		- } else if (event.getSource() == toggleTextureItem)
	3939	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2890	3940	{
2891	3941	cameraView.ToggleTexture();
2892	3942	// june 2013 copy.HardTouch();
..	..	@@ -2925,7 +3975,7 @@
2925	3975	frame.validate();
2926	3976
2927	3977	return;
2928		- } else if (event.getSource() == toggleSwitchItem)
	3978	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2929	3979	{
2930	3980	cameraView.ToggleSwitch();
2931	3981	cameraView.repaint();
..	..	@@ -2955,8 +4005,9 @@
2955	4005	} else if (event.getSource() == liveCB)
2956	4006	{
2957	4007	copy.live ^= true;
	4008	+ objEditor.refreshContents(true); // To show item colors
2958	4009	return;
2959		- } else if (event.getSource() == selectCB)
	4010	+ } else if (event.getSource() == selectableCB)
2960	4011	{
2961	4012	copy.dontselect ^= true;
2962	4013	return;
..	..	@@ -2964,7 +4015,7 @@
2964	4015	{
2965	4016	copy.hide ^= true;
2966	4017	copy.Touch(); // display list issue
2967		- objEditor.refreshContents();
	4018	+ objEditor.refreshContents(true); // To show item colors
2968	4019	return;
2969	4020	} else if (event.getSource() == link2masterCB)
2970	4021	{
..	..	@@ -3029,7 +4080,7 @@
3029	4080	//System.out.println("ObjEditor " + event);
3030	4081	applySelf0(true);
3031	4082	//parent.applySelf();
3032		- objEditor.refreshContents();
	4083	+ // conflicts with requestFocus objEditor.refreshContents();
3033	4084	} else if (source == resetButton)
3034	4085	{
3035	4086	CameraPane.fullreset = true;
..	..	@@ -3141,9 +4192,9 @@
3141	4192	{
3142	4193	Close();
3143	4194	//return true;
3144		- } else if (source == loadItem)
	4195	+ } else if (source == openItem)
3145	4196	{
3146		- load();
	4197	+ Open();
3147	4198	//return true;
3148	4199	} else if (source == newItem)
3149	4200	{
..	..	@@ -3168,6 +4219,10 @@
3168	4219	{
3169	4220	generatePOV();
3170	4221	//return true;
	4222	+ } else if (event.getSource() == archiveItem)
	4223	+ {
	4224	+ cTools.Archive(frame);
	4225	+ return;
3171	4226	} else if (source == zBufferItem)
3172	4227	{
3173	4228	try
..	..	@@ -3205,31 +4260,48 @@
3205	4260
3206	4261	void New()
3207	4262	{
3208		- while (copy.Size() > 1)
	4263	+ while (copy.Size() > 0)
3209	4264	{
3210		- copy.remove(1);
	4265	+ copy.remove(0);
3211	4266	}
3212	4267
	4268	+ copy.selection.clear();
	4269	+
	4270	+ if (copy == Grafreed.grafreed.universe)
	4271	+ {
	4272	+ CreateCameras();
	4273	+ cameraView.SetCamera(GetCamera(copy, 0));
	4274	+ }
3213	4275	ResetModel();
3214	4276	objEditor.refreshContents();
3215	4277	}
3216	4278
3217		- static public byte[] Compress(Object o)
	4279	+ static public byte[] Compress(Object3D o)
3218	4280	{
	4281	+ // Slower to actually compress.
3219	4282	try
3220	4283	{
3221	4284	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3222		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3223		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	4285	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4286	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3224	4287
	4288	+ Object3D parent = o.parent;
	4289	+ o.parent = null;
	4290	+
3225	4291	out.writeObject(o);
3226	4292
	4293	+ o.parent = parent;
	4294	+
3227	4295	out.flush();
3228	4296
3229		- zstream.close();
	4297	+ baos //zstream
	4298	+ .close();
3230	4299	out.close();
3231	4300
3232		- return baos.toByteArray();
	4301	+ byte[] bytes = baos.toByteArray();
	4302	+
	4303	+ System.out.println("save #bytes = " + bytes.length);
	4304	+ return bytes;
3233	4305	} catch (Exception e)
3234	4306	{
3235	4307	System.err.println(e);
..	..	@@ -3239,13 +4311,16 @@
3239	4311
3240	4312	static public Object Uncompress(byte[] bytes)
3241	4313	{
3242		- System.out.println("#bytes = " + bytes.length);
	4314	+ System.out.println("restore #bytes = " + bytes.length);
3243	4315	try
3244	4316	{
3245	4317	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3246		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3247		- ObjectInputStream in = new ObjectInputStream(istream);
	4318	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4319	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3248	4320	Object obj = in.readObject();
	4321	+
	4322	+ bais //istream
	4323	+ .close();
3249	4324	in.close();
3250	4325
3251	4326	return obj;
..	..	@@ -3300,32 +4375,97 @@
3300	4375	return null;
3301	4376	}
3302	4377
3303		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3304	4378
3305	4379	public void Save()
3306	4380	{
3307		- cRadio tab = GetCurrentTab();
	4381	+ //Save(true);
	4382	+ Replace();
	4383	+ SetVersionStates();
	4384	+ }
	4385	+
	4386	+ private boolean Equal(byte[] compress, byte[] name)
	4387	+ {
	4388	+ if (compress.length != name.length)
	4389	+ {
	4390	+ return false;
	4391	+ }
3308	4392
3309		- copy.ExtractBigData(hashtable);
	4393	+ for (int i=compress.length; --i>=0;)
	4394	+ {
	4395	+ if (compress[i] != name[i])
	4396	+ return false;
	4397	+ }
	4398	+
	4399	+ return true;
	4400	+ }
	4401	+
	4402	+ void DeleteVersion()
	4403	+ {
	4404	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4405	+ {
	4406	+ copy.versionlist[i] = copy.versionlist[i+1];
	4407	+ }
	4408	+
	4409	+ if (copy.versionlist[copy.versionindex] == null)
	4410	+ copy.versionindex -= 1;
	4411	+
	4412	+ if (copy.versionindex != -1)
	4413	+ CopyChanged();
	4414	+
	4415	+ SetVersionStates();
	4416	+ }
	4417	+
	4418	+ public boolean Save(boolean user)
	4419	+ {
	4420	+ System.err.println("Save");
	4421	+ Replace();
	4422	+
	4423	+ //cRadio tab = GetCurrentTab();
	4424	+
	4425	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
	4426	+
	4427	+ boolean thesame = false;
	4428	+
	4429	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4430	+// {
	4431	+// thesame = true;
	4432	+// }
3310	4433
3311	4434	//EditorFrame.m_MainFrame.requestFocusInWindow();
3312		- tab.graphs[tab.undoindex++] = Compress(copy);
3313		-
3314		- copy.RestoreBigData(hashtable);
3315		-
3316		- //assert(hashtable.isEmpty());
3317		-
3318		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	4435	+ if (!thesame)
3319	4436	{
3320		- tab.graphs[i] = null;
	4437	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4438	+ {
	4439	+ copy.versionlist[i] = copy.versionlist[i-1];
	4440	+ }
	4441	+
	4442	+ //tab.user[tab.versionindex] = user;
	4443	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4444	+
	4445	+ copy.versionlist[++copy.versionindex] = compress;
	4446	+
	4447	+ // if (increment)
	4448	+ // tab.versionindex++;
3321	4449	}
3322	4450
	4451	+ //copy.RestoreBigData(versiontable);
	4452	+
	4453	+ //assert(hashtable.isEmpty());
	4454	+
	4455	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4456	+// {
	4457	+// //tab.user[i] = false;
	4458	+// copy.versionlist[i] = null;
	4459	+// }
	4460	+
	4461	+ SetVersionStates();
	4462	+
3323	4463	// test save
3324	4464	if (false)
3325	4465	{
3326	4466	try
3327	4467	{
3328		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	4468	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3329	4469	ObjectOutputStream p = new ObjectOutputStream(ostream);
3330	4470
3331	4471	p.writeObject(copy);
..	..	@@ -3338,21 +4478,68 @@
3338	4478	e.printStackTrace();
3339	4479	}
3340	4480	}
	4481	+
	4482	+ return !thesame;
	4483	+ }
	4484	+
	4485	+ boolean flashIt = true;
	4486	+
	4487	+ void RefreshSelection()
	4488	+ {
	4489	+ Object3D selection = new Object3D();
	4490	+
	4491	+ for (int i = 0; i < copy.selection.size(); i++)
	4492	+ {
	4493	+ Object3D elem = copy.selection.elementAt(i);
	4494	+
	4495	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4496	+
	4497	+ if (obj == null)
	4498	+ {
	4499	+ copy.selection.remove(i--);
	4500	+ }
	4501	+ else
	4502	+ {
	4503	+ selection.add(obj);
	4504	+ copy.selection.setElementAt(obj, i);
	4505	+ }
	4506	+ }
	4507	+
	4508	+ flashIt = false;
	4509	+ GetTree().clearSelection();
	4510	+ for (int i = 0; i < selection.size(); i++)
	4511	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4512	+ flashIt = true;
	4513	+
	4514	+ //refreshContents(false);
3341	4515	}
3342	4516
3343		- void CopyChanged(Object3D obj)
	4517	+ void CopyChanged()
3344	4518	{
3345		- copy.ExtractBigData(hashtable);
	4519	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4520	+
	4521	+ SetVersionStates();
	4522	+
	4523	+ boolean temp = CameraPane.SWITCH;
	4524	+ CameraPane.SWITCH = false;
	4525	+
	4526	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
3346	4527
3347	4528	copy.clear();
3348	4529
	4530	+ copy.skyboxname = obj.skyboxname;
	4531	+ copy.skyboxext = obj.skyboxext;
	4532	+
3349	4533	for (int i=0; i<obj.Size(); i++)
3350	4534	{
3351	4535	copy.add(obj.get(i));
3352	4536	}
3353	4537
3354		- copy.RestoreBigData(hashtable);
	4538	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
3355	4539
	4540	+ CameraPane.SWITCH = temp;
	4541	+
	4542	+ RefreshSelection();
3356	4543	//assert(hashtable.isEmpty());
3357	4544
3358	4545	copy.Touch();
..	..	@@ -3373,43 +4560,161 @@
3373	4560	}
3374	4561	}
3375	4562
3376		- refreshContents();
	4563	+ refreshContents(true);
3377	4564	}
3378	4565
3379		- public void Undo()
3380		- {
3381		- cRadio tab = GetCurrentTab();
	4566	+ cButton previousVersionButton;
	4567	+ cButton restoreButton;
	4568	+ cButton replaceButton;
	4569	+ cButton nextVersionButton;
	4570	+ cButton saveVersionButton;
	4571	+ cButton deleteVersionButton;
3382	4572
3383		- if (tab.undoindex == 0)
	4573	+ boolean muteSlider;
	4574	+
	4575	+ int VersionCount()
	4576	+ {
	4577	+ int count = 0;
	4578	+
	4579	+ for (int i = copy.versionlist.length; --i >= 0;)
	4580	+ {
	4581	+ if (copy.versionlist[i] != null)
	4582	+ count++;
	4583	+ }
	4584	+
	4585	+ return count;
	4586	+ }
	4587	+
	4588	+ public cGridBag versionSliderPane;
	4589	+
	4590	+ void SetVersionStates()
	4591	+ {
	4592	+ //if (true)
	4593	+ // return;
	4594	+
	4595	+ //cRadio tab = GetCurrentTab();
	4596	+
	4597	+ if (copy.versionlist == null)
	4598	+ {
	4599	+ saveVersionButton.setEnabled(false);
	4600	+ restoreButton.setEnabled(false);
	4601	+ replaceButton.setEnabled(false);
	4602	+ previousVersionButton.setEnabled(false);
	4603	+ nextVersionButton.setEnabled(false);
	4604	+ deleteVersionButton.setEnabled(false);
	4605	+ versionSliderPane.setVisible(false);
	4606	+ }
	4607	+ else
	4608	+ {
	4609	+ restoreButton.setEnabled(copy.versionindex != -1);
	4610	+ replaceButton.setEnabled(copy.versionindex != -1);
	4611	+
	4612	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4613	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4614	+
	4615	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4616	+ //copy.versionlist[copy.versionindex + 1] != null);
	4617	+
	4618	+ muteSlider = true;
	4619	+ versionSlider.setMinimum(0);
	4620	+ versionSlider.setMaximum(VersionCount() - 1);
	4621	+ versionSlider.setInteger(copy.versionindex);
	4622	+ versionSlider.setEnabled(copy.versionindex != -1);
	4623	+ muteSlider = false;
	4624	+
	4625	+ versionSliderPane.setVisible(true);
	4626	+ }
	4627	+ }
	4628	+
	4629	+ public boolean PreviousVersion()
	4630	+ {
	4631	+ // Option?
	4632	+ Replace();
	4633	+
	4634	+ System.err.println("Undo");
	4635	+
	4636	+ //cRadio tab = GetCurrentTab();
	4637	+
	4638	+ if (copy.versionindex == 0)
3384	4639	{
3385	4640	java.awt.Toolkit.getDefaultToolkit().beep();
3386		- return;
	4641	+ return false;
3387	4642	}
3388	4643
3389		- if (tab.graphs[tab.undoindex] == null)
3390		- {
3391		- Save();
3392		- tab.undoindex -= 1;
3393		- }
	4644	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4645	+// {
	4646	+// if (Save(false))
	4647	+// tab.versionindex -= 1;
	4648	+// else
	4649	+// {
	4650	+// if (tab.versionindex <= 0)
	4651	+// return false;
	4652	+// else
	4653	+// tab.versionindex -= 1;
	4654	+// }
	4655	+// }
3394	4656
3395		- tab.undoindex -= 1;
	4657	+ copy.versionindex -= 1;
3396	4658
3397		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4659	+ CopyChanged();
	4660	+
	4661	+ return true;
3398	4662	}
3399	4663
3400		- public void Redo()
	4664	+ public boolean Restore()
3401	4665	{
3402		- cRadio tab = GetCurrentTab();
	4666	+ System.err.println("Restore");
3403	4667
3404		- if (tab.graphs[tab.undoindex + 1] == null)
	4668	+ //cRadio tab = GetCurrentTab();
	4669	+
	4670	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4671	+ {
	4672	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4673	+ return false;
	4674	+ }
	4675	+
	4676	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4677	+ CopyChanged();
	4678	+
	4679	+ return true;
	4680	+ }
	4681	+
	4682	+ public boolean Replace()
	4683	+ {
	4684	+ //System.err.println("Replace");
	4685	+
	4686	+ //cRadio tab = GetCurrentTab();
	4687	+
	4688	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4689	+ {
	4690	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4691	+ return false;
	4692	+ }
	4693	+
	4694	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4695	+
	4696	+ return true;
	4697	+ }
	4698	+
	4699	+ public void NextVersion()
	4700	+ {
	4701	+ // Option?
	4702	+ Replace();
	4703	+
	4704	+ //cRadio tab = GetCurrentTab();
	4705	+
	4706	+ if (copy.versionlist[copy.versionindex + 1] == null)
3405	4707	{
3406	4708	java.awt.Toolkit.getDefaultToolkit().beep();
3407	4709	return;
3408	4710	}
3409	4711
3410		- tab.undoindex += 1;
	4712	+ copy.versionindex += 1;
3411	4713
3412		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4714	+ CopyChanged();
	4715	+
	4716	+ //if (!tab.user[tab.versionindex])
	4717	+ // tab.graphs[tab.versionindex] = null;
3413	4718	}
3414	4719
3415	4720	void ImportGFD()
..	..	@@ -3561,7 +4866,7 @@
3561	4866	assert false;
3562	4867	}
3563	4868
3564		- void EditSelection()
	4869	+ void EditSelection(boolean newWindow)
3565	4870	{
3566	4871	}
3567	4872
..	..	@@ -3603,6 +4908,12 @@
3603	4908	// else
3604	4909	// applySelf(true);
3605	4910	// }
	4911	+
	4912	+ boolean Equal(double a, double b)
	4913	+ {
	4914	+ return Math.abs(a - b) < 0.001;
	4915	+ }
	4916	+
3606	4917	void applySelf0(boolean name)
3607	4918	{
3608	4919	if (name)
..	..	@@ -3620,7 +4931,7 @@
3620	4931	//copy.material = new cMaterial(copy.GetMaterial());
3621	4932
3622	4933	current.color = (float) colorField.getFloat();
3623		- current.modulation = (float) modulationField.getFloat();
	4934	+ current.modulation = (float) saturationField.getFloat();
3624	4935	current.metalness = (float) metalnessField.getFloat();
3625	4936	current.diffuse = (float) diffuseField.getFloat();
3626	4937	current.specular = (float) specularField.getFloat();
..	..	@@ -3652,29 +4963,52 @@
3652	4963	{
3653	4964	cMaterial mat = copy.material;
3654	4965
3655		- colorField.SetToolTipValue((mat.color));
3656		- modulationField.SetToolTipValue((mat.modulation));
3657		- metalnessField.SetToolTipValue((mat.metalness));
3658		- diffuseField.SetToolTipValue((mat.diffuse));
3659		- specularField.SetToolTipValue((mat.specular));
3660		- shininessField.SetToolTipValue((mat.shininess));
3661		- shiftField.SetToolTipValue((mat.shift));
3662		- ambientField.SetToolTipValue((mat.ambient));
3663		- lightareaField.SetToolTipValue((mat.lightarea));
3664		- diffusenessField.SetToolTipValue((mat.factor));
3665		- velvetField.SetToolTipValue((mat.velvet));
3666		- sheenField.SetToolTipValue((mat.sheen));
3667		- subsurfaceField.SetToolTipValue((mat.subsurface));
3668		- backlitField.SetToolTipValue((mat.bump));
3669		- anisoField.SetToolTipValue((mat.aniso));
3670		- anisoVField.SetToolTipValue((mat.anisoV));
3671		- cameraField.SetToolTipValue((mat.cameralight));
3672		- selfshadowField.SetToolTipValue((mat.diffuseness));
3673		- shadowField.SetToolTipValue((mat.shadow));
3674		- textureField.SetToolTipValue((mat.texture));
3675		- opacityField.SetToolTipValue((mat.opacity));
3676		- fakedepthField.SetToolTipValue((mat.fakedepth));
3677		- shadowbiasField.SetToolTipValue((mat.shadowbias));
	4966	+ if (!Equal(colorField.getFloat(), mat.color))
	4967	+ colorField.SetToolTipValue((mat.color));
	4968	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	4969	+ saturationField.SetToolTipValue((mat.modulation));
	4970	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	4971	+ metalnessField.SetToolTipValue((mat.metalness));
	4972	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	4973	+ diffuseField.SetToolTipValue((mat.diffuse));
	4974	+ if (!Equal(specularField.getFloat(), mat.specular))
	4975	+ specularField.SetToolTipValue((mat.specular));
	4976	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	4977	+ shininessField.SetToolTipValue((mat.shininess));
	4978	+ if (!Equal(shiftField.getFloat(), mat.shift))
	4979	+ shiftField.SetToolTipValue((mat.shift));
	4980	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	4981	+ ambientField.SetToolTipValue((mat.ambient));
	4982	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	4983	+ lightareaField.SetToolTipValue((mat.lightarea));
	4984	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	4985	+ diffusenessField.SetToolTipValue((mat.factor));
	4986	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	4987	+ velvetField.SetToolTipValue((mat.velvet));
	4988	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	4989	+ sheenField.SetToolTipValue((mat.sheen));
	4990	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	4991	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4992	+ if (!Equal(backlitField.getFloat(), mat.bump))
	4993	+ backlitField.SetToolTipValue((mat.bump));
	4994	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	4995	+ anisoField.SetToolTipValue((mat.aniso));
	4996	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	4997	+ anisoVField.SetToolTipValue((mat.anisoV));
	4998	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	4999	+ cameraField.SetToolTipValue((mat.cameralight));
	5000	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	5001	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	5002	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	5003	+ shadowField.SetToolTipValue((mat.shadow));
	5004	+ if (!Equal(textureField.getFloat(), mat.texture))
	5005	+ textureField.SetToolTipValue((mat.texture));
	5006	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	5007	+ opacityField.SetToolTipValue((mat.opacity));
	5008	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	5009	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	5010	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	5011	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
3678	5012	}
3679	5013
3680	5014	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -3705,9 +5039,28 @@
3705	5039	//copy.Touch();
3706	5040	}
3707	5041
	5042	+ cNumberSlider versionSlider;
	5043	+
3708	5044	public void stateChanged(ChangeEvent e)
3709	5045	{
3710		- // assert(false);
	5046	+ // assert(false);
	5047	+ if (e.getSource() == versionSlider)
	5048	+ {
	5049	+ if (muteSlider)
	5050	+ return;
	5051	+
	5052	+ Replace();
	5053	+
	5054	+ int version = versionSlider.getInteger();
	5055	+
	5056	+ if (version != -1 && copy.versionlist[version] != null)
	5057	+ {
	5058	+ copy.versionindex = version;
	5059	+ CopyChanged();
	5060	+ }
	5061	+
	5062	+ return;
	5063	+ }
3711	5064
3712	5065	if (freezematerial)
3713	5066	{
..	..	@@ -3743,6 +5096,12 @@
3743	5096	{
3744	5097	//System.out.println("stateChanged = " + this);
3745	5098	materialtouched = true;
	5099	+
	5100	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	5101	+ {
	5102	+ saturationField.setFloat(1);
	5103	+ }
	5104	+
3746	5105	applySelf();
3747	5106	//System.out.println("this = " + this);
3748	5107	//System.out.println("PARENT = " + parent);
..	..	@@ -4042,6 +5401,7 @@
4042	5401	{
4043	5402	if (GetTree() != null)
4044	5403	{
	5404	+ GetTree().revalidate();
4045	5405	GetTree().repaint();
4046	5406	}
4047	5407
..	..	@@ -4050,13 +5410,19 @@
4050	5410	ctrlPanel.validate(); // ? new
4051	5411	ctrlPanel.repaint();
4052	5412	}
	5413	+
	5414	+ if (previousVersionButton != null && copy.versionlist != null)
	5415	+ SetVersionStates();
	5416	+
	5417	+ cameraView.requestFocusInWindow();
4053	5418	}
4054	5419
4055	5420	static TweenManager tweenManager = new TweenManager();
4056	5421
4057	5422	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4058	5423	{
4059		- Save();
	5424	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5425	+ Save();
4060	5426	//Tween.set(thing, 0).target(1).start(tweenManager);
4061	5427	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
4062	5428	// if (thing instanceof GenericJointDemo)
..	..	@@ -4080,7 +5446,7 @@
4080	5446	// group = (Composite) group.get(0);
4081	5447	// }
4082	5448
4083		- System.out.println("makeSomething of " + thing);
	5449	+ //System.out.println("makeSomething of " + thing);
4084	5450
4085	5451	/*
4086	5452	if (deselect && jList != null)
..	..	@@ -4143,6 +5509,12 @@
4143	5509	{
4144	5510	ResetModel();
4145	5511	Select(thing.GetTreePath(), true, false); // unselect... false);
	5512	+
	5513	+ if (thing.Size() == 0)
	5514	+ {
	5515	+ //EditSelection(false);
	5516	+ }
	5517	+
4146	5518	refreshContents();
4147	5519	}
4148	5520
..	..	@@ -4280,6 +5652,7 @@
4280	5652
4281	5653	try
4282	5654	{
	5655	+ // Try compressed version first.
4283	5656	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4284	5657	java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
4285	5658	java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
..	..	@@ -4290,7 +5663,9 @@
4290	5663	readobj.ResetDisplayList();
4291	5664	} catch (Exception e)
4292	5665	{
4293		- //e.printStackTrace();
	5666	+ if (!e.toString().contains("GZIP"))
	5667	+ e.printStackTrace();
	5668	+
4294	5669	try
4295	5670	{
4296	5671	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4349,6 +5724,12 @@
4349	5724
4350	5725	void LoadIt(Object obj)
4351	5726	{
	5727	+ if (obj == null)
	5728	+ {
	5729	+ // Invalid file
	5730	+ return;
	5731	+ }
	5732	+
4352	5733	System.out.println("Loaded " + obj);
4353	5734	//new Exception().printStackTrace();
4354	5735	Object3D readobj = (Object3D) obj;
..	..	@@ -4358,11 +5739,14 @@
4358	5739
4359	5740	if (readobj != null)
4360	5741	{
4361		- Save();
	5742	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5743	+ // Save();
4362	5744	try
4363	5745	{
4364	5746	//readobj.deepCopySelf(copy);
4365	5747	copy.clear(); // june 2014
	5748	+ copy.skyboxname = readobj.skyboxname;
	5749	+ copy.skyboxext = readobj.skyboxext;
4366	5750	for (int i = 0; i < readobj.size(); i++)
4367	5751	{
4368	5752	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4403,6 +5787,7 @@
4403	5787	}
4404	5788	} catch (ClassCastException e)
4405	5789	{
	5790	+ e.printStackTrace();
4406	5791	assert (false);
4407	5792	Composite c = (Composite) copy;
4408	5793	c.children.clear();
..	..	@@ -4413,17 +5798,32 @@
4413	5798	c.addChild(csg);
4414	5799	}
4415	5800
	5801	+ copy.versionlist = readobj.versionlist;
	5802	+ copy.versionindex = readobj.versionindex;
	5803	+ copy.versiontable = readobj.versiontable;
	5804	+
	5805	+ if (copy.versionlist == null)
	5806	+ {
	5807	+ // Backward compatibility
	5808	+ copy.versionlist = new Object3D[100];
	5809	+ copy.versionindex = -1;
	5810	+
	5811	+ //Save(true);
	5812	+ }
	5813	+
	5814	+ //? SetUndoStates();
	5815	+
4416	5816	ResetModel();
4417	5817	copy.HardTouch(); // recompile?
4418	5818	refreshContents();
4419	5819	}
4420	5820	}
4421	5821
4422		- void load() // throws ClassNotFoundException
	5822	+ void Open() // throws ClassNotFoundException
4423	5823	{
4424	5824	if (Grafreed.standAlone)
4425	5825	{
4426		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5826	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4427	5827	browser.show();
4428	5828	String filename = browser.getFile();
4429	5829	if (filename != null && filename.length() > 0)
..	..	@@ -4500,6 +5900,8 @@
4500	5900
4501	5901	void save()
4502	5902	{
	5903	+ Replace();
	5904	+
4503	5905	if (lastname == null)
4504	5906	{
4505	5907	return;
..	..	@@ -4522,6 +5924,7 @@
4522	5924	//ps.print(buffer.toString());
4523	5925	} catch (IOException e)
4524	5926	{
	5927	+ e.printStackTrace();
4525	5928	}
4526	5929	}
4527	5930
..	..	@@ -4536,6 +5939,8 @@
4536	5939	String filename = browser.getFile();
4537	5940	if (filename != null && filename.length() > 0)
4538	5941	{
	5942	+ if (!filename.endsWith(".gfd"))
	5943	+ filename += ".gfd";
4539	5944	lastname = browser.getDirectory() + filename;
4540	5945	save();
4541	5946	}
..	..	@@ -4702,7 +6107,7 @@
4702	6107	MenuBar menuBar;
4703	6108	Menu fileMenu;
4704	6109	MenuItem newItem;
4705		- MenuItem loadItem;
	6110	+ MenuItem openItem;
4706	6111	MenuItem saveItem;
4707	6112	MenuItem saveAsItem;
4708	6113	MenuItem exportAsItem;
..	..	@@ -4725,22 +6130,38 @@
4725	6130	CheckboxMenuItem toggleSwitchItem;
4726	6131	CheckboxMenuItem toggleRootItem;
4727	6132	CheckboxMenuItem animationItem;
	6133	+ MenuItem archiveItem;
4728	6134	CheckboxMenuItem toggleHandleItem;
4729	6135	CheckboxMenuItem togglePaintItem;
4730	6136	JSplitPane mainPanel;
4731	6137	JScrollPane scrollpane;
	6138	+
4732	6139	JPanel toolbarPanel;
	6140	+
4733	6141	cGridBag treePanel;
	6142	+
4734	6143	JPanel radioPanel;
4735	6144	ButtonGroup buttonGroup;
4736		- cGridBag ctrlPanel;
	6145	+
	6146	+ cGridBag toolboxPanel;
	6147	+ cGridBag skyboxPanel;
4737	6148	cGridBag materialPanel;
	6149	+ cGridBag ctrlPanel;
	6150	+
4738	6151	JScrollPane infoPanel;
	6152	+
4739	6153	cGridBag optionsPanel;
	6154	+
4740	6155	JTabbedPane objectPanel;
	6156	+ boolean materialFlushed;
	6157	+ Object3D latestObject;
	6158	+
	6159	+ cGridBag transformPanel;
4741	6160	cGridBag XYZPanel;
	6161	+
4742	6162	JSplitPane gridPanel;
4743	6163	JSplitPane bigPanel;
	6164	+
4744	6165	cGridBag bigThree;
4745	6166	cGridBag scenePanel;
4746	6167	cGridBag centralPanel;
..	..	@@ -4798,7 +6219,7 @@
4798	6219	JLabel colorLabel;
4799	6220	cNumberSlider colorField;
4800	6221	JLabel modulationLabel;
4801		- cNumberSlider modulationField;
	6222	+ cNumberSlider saturationField;
4802	6223	JLabel metalnessLabel;
4803	6224	cNumberSlider metalnessField;
4804	6225	JLabel diffuseLabel;
..	..	@@ -4829,6 +6250,7 @@
4829	6250	cNumberSlider anisoField;
4830	6251	JLabel anisoVLabel;
4831	6252	cNumberSlider anisoVField;
	6253	+
4832	6254	JLabel cameraLabel;
4833	6255	cNumberSlider cameraField;
4834	6256	JLabel selfshadowLabel;
..	..	@@ -4843,6 +6265,7 @@
4843	6265	cNumberSlider fakedepthField;
4844	6266	JLabel shadowbiasLabel;
4845	6267	cNumberSlider shadowbiasField;
	6268	+
4846	6269	JLabel bumpLabel;
4847	6270	cNumberSlider bumpField;
4848	6271	JLabel noiseLabel;
..	..	@@ -4855,7 +6278,7 @@
4855	6278	cNumberSlider fogField;
4856	6279	JLabel opacityPowerLabel;
4857	6280	cNumberSlider opacityPowerField;
4858		- JTree jTree;
	6281	+ cTree jTree;
4859	6282	//ObjectUI parent;
4860	6283
4861	6284	cNumberSlider normalpushField;