~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,131 @@
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 cGridBag GetSeparator()
	76	+ {
	77	+ cGridBag separator = new cGridBag();
	78	+ separator.add(new JSeparator());
	79	+ separator.preferredHeight = 5;
	80	+ return separator;
	81	+ }
	82	+
	83	+ cButton GetButton(String name, boolean border)
	84	+ {
	85	+ ImageIcon icon = GetIcon(name);
	86	+ if (icon != null \|\| name.contains("/"))
	87	+ return new cButton(icon, border);
	88	+ else
	89	+ return new cButton(name, border);
	90	+ }
	91	+
	92	+ cLabel GetLabel(String name, boolean border)
	93	+ {
	94	+ //ImageIcon icon = GetIcon(name);
	95	+ return new cLabel(GetImage(name), border);
	96	+ }
	97	+
	98	+ cToggleButton GetToggleButton(String name, boolean border)
	99	+ {
	100	+ ImageIcon icon = GetIcon(name);
	101	+ return new cToggleButton(icon, border);
	102	+ }
	103	+
	104	+ cCheckBox GetCheckBox(String name, boolean border)
	105	+ {
	106	+ ImageIcon icon = GetIcon(name);
	107	+ return new cCheckBox(icon, border);
	108	+ }
	109	+
	110	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	111	+
	112	+ static ImageIcon GetIcon(String name)
	113	+ {
	114	+ javax.swing.ImageIcon iconCache = icons.get(name);
	115	+ if (iconCache != null)
	116	+ {
	117	+ return iconCache;
	118	+ }
	119	+
	120	+ try
	121	+ {
	122	+ BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
	123	+
	124	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	125	+// {
	126	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	127	+// Graphics2D g = resized.createGraphics();
	128	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	129	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	130	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	131	+// g.dispose();
	132	+//
	133	+// image = resized;
	134	+// }
	135	+
	136	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	137	+
	138	+ icons.put(name, icon);
	139	+
	140	+ return icon;
	141	+ }
	142	+ catch (Exception e)
	143	+ {
	144	+ //icons.put(name, null);
	145	+ return null;
	146	+ }
	147	+ }
	148	+
	149	+ BufferedImage GetImage(String name)
	150	+ {
	151	+ try
	152	+ {
	153	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	154	+
	155	+ return image;
	156	+ }
	157	+ catch (Exception e)
	158	+ {
	159	+ return null;
	160	+ }
	161	+ }
38	162
39	163	// SCRIPT
40	164
..	..	@@ -145,7 +269,7 @@
145	269
146	270	objEditor.ctrlPanel.remove(namePanel);
147	271
148		- if (!GroupEditor.allparams)
	272	+ if (!allparams)
149	273	return;
150	274
151	275	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -168,7 +292,8 @@
168	292	// objEditor.ctrlPanel.remove(remarkButton);
169	293
170	294	objEditor.ctrlPanel.remove(setupPanel);
171		- objEditor.ctrlPanel.remove(commandsPanel);
	295	+ objEditor.ctrlPanel.remove(setupPanel2);
	296	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
172	297	objEditor.ctrlPanel.remove(pushPanel);
173	298	//objEditor.ctrlPanel.remove(fillPanel);
174	299
..	..	@@ -216,6 +341,14 @@
216	341	client = inClient;
217	342	copy = client;
218	343
	344	+// if (copy.versionlist == null)
	345	+// {
	346	+// copy.versionlist = new Object3D[100];
	347	+// copy.versionindex = -1;
	348	+//
	349	+// callee.Save(true);
	350	+// }
	351	+
219	352	// "this" is not called: SetupUI2(objEditor);
220	353	}
221	354
..	..	@@ -229,6 +362,14 @@
229	362	client = inClient;
230	363	copy = client;
231	364
	365	+ if (copy.versionlist == null)
	366	+ {
	367	+ copy.versionlist = new Object3D[100];
	368	+ copy.versionindex = -1;
	369	+
	370	+// Save(true);
	371	+ }
	372	+
232	373	SetupUI2(callee.GetEditor());
233	374	}
234	375
..	..	@@ -243,13 +384,15 @@
243	384	//localCopy.parent = null;
244	385
245	386	frame = new JFrame();
	387	+ frame.setUndecorated(false);
246	388	objEditor = this;
247	389	this.callee = callee;
248	390
249	391	//parent = p;
250	392
251	393	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
252		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	394	+ if (Globals.DEBUG)
	395	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
253	396	//gd.setFullScreenWindow(this);
254	397	//setResizable(false);
255	398	//if (!isDisplayable())
..	..	@@ -260,6 +403,14 @@
260	403	copy = localCopy;
261	404	copy.editWindow = this;
262	405
	406	+// if (copy.versionlist == null)
	407	+// {
	408	+// copy.versionlist = new Object3D[100];
	409	+// copy.versionindex = -1;
	410	+//
	411	+// Save(true);
	412	+// }
	413	+
263	414	SetupMenu();
264	415
265	416	//SetupName(objEditor); // new
..	..	@@ -273,12 +424,20 @@
273	424	return frame.action(event, obj);
274	425	}
275	426
	427	+ // Cannot work without static
	428	+ static boolean allparams = true;
	429	+
	430	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	431	+
	432	+ // This is to refresh the UI of the material panel.
	433	+ boolean patchMaterial;
	434	+
276	435	void SetupMenu()
277	436	{
278	437	frame.setMenuBar(menuBar = new MenuBar());
279	438	menuBar.add(fileMenu = new Menu("File"));
280	439	fileMenu.add(newItem = new MenuItem("New"));
281		- fileMenu.add(loadItem = new MenuItem("Load..."));
	440	+ fileMenu.add(openItem = new MenuItem("Open..."));
282	441
283	442	//oe.menuBar.add(menu = new Menu("Include"));
284	443	Menu menu = new Menu("Import");
..	..	@@ -310,7 +469,7 @@
310	469	}
311	470
312	471	newItem.addActionListener(this);
313		- loadItem.addActionListener(this);
	472	+ openItem.addActionListener(this);
314	473	saveItem.addActionListener(this);
315	474	saveAsItem.addActionListener(this);
316	475	exportAsItem.addActionListener(this);
..	..	@@ -319,28 +478,102 @@
319	478	closeItem.addActionListener(this);
320	479
321	480	objectPanel = new JTabbedPane();
	481	+
	482	+ ChangeListener changeListener = new ChangeListener()
	483	+ {
	484	+ //String name;
	485	+
	486	+ public void stateChanged(ChangeEvent changeEvent)
	487	+ {
	488	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	489	+// {
	490	+// if (latestObject != null)
	491	+// {
	492	+// refreshContents(true);
	493	+// SetMaterial(latestObject);
	494	+// }
	495	+//
	496	+// materialFlushed = true;
	497	+// }
	498	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	499	+// {
	500	+// if (listUI.size() == 0)
	501	+// EditSelection(false);
	502	+// }
	503	+
	504	+// if (objectPanel.getSelectedIndex() == 4)
	505	+// {
	506	+// name = copy.skyboxname;
	507	+//
	508	+// if (name == null)
	509	+// {
	510	+// name = "";
	511	+// }
	512	+//
	513	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	514	+// copy.skyboxext = "jpg";
	515	+// }
	516	+// else
	517	+// {
	518	+// if (name != null)
	519	+// {
	520	+// if (name.equals(""))
	521	+// {
	522	+// copy.skyboxname = null;
	523	+// copy.skyboxext = null;
	524	+// }
	525	+// else
	526	+// {
	527	+// copy.skyboxname = name;
	528	+// }
	529	+// }
	530	+// }
	531	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	532	+
	533	+// refreshContents(false); // To refresh Info tab
	534	+ cameraView.repaint();
	535	+ }
	536	+ };
	537	+ objectPanel.addChangeListener(changeListener);
	538	+
322	539	toolbarPanel = new JPanel();
323	540	toolbarPanel.setName("Toolbar");
	541	+
324	542	treePanel = new cGridBag();
325	543	treePanel.setName("Tree");
	544	+
	545	+ editPanel = new cGridBag().setVertical(true);
	546	+ //editPanel.setName("Edit");
	547	+
326	548	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
327		- ctrlPanel.setName("Edit");
328		- materialPanel = new cGridBag().setVertical(true);
329		- materialPanel.setName("Material");
	549	+
	550	+ editCommandsPanel = new cGridBag();
	551	+ editPanel.add(editCommandsPanel);
	552	+ editPanel.add(ctrlPanel);
	553	+
	554	+ toolboxPanel = new cGridBag().setVertical(true);
	555	+ //toolboxPanel.setName("Toolbox");
	556	+
	557	+ skyboxPanel = new cGridBag().setVertical(true);
	558	+
	559	+ materialPanel = new cGridBag().setVertical(false);
	560	+ //materialPanel.setName("Material");
	561	+
330	562	/JTextPane/
331	563	infoarea = createTextPane();
332	564	doc = infoarea.getStyledDocument();
333	565
334	566	infoarea.setEditable(true);
335	567	SetText();
	568	+
336	569	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
337	570	// infoarea.setOpaque(false);
338	571	// //infoarea.setForeground(textcolor);
339	572	// TEXTAREA infoarea.setLineWrap(true);
340	573	// TEXTAREA infoarea.setWrapStyleWord(true);
341	574	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");
	575	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	576	+ //infoPanel.setName("Info");
344	577	//infoPanel.setLayout(new BorderLayout());
345	578	//infoPanel.add(createTextPane());
346	579
..	..	@@ -351,7 +584,14 @@
351	584	mainPanel.setDividerSize(9);
352	585	mainPanel.setDividerLocation(0.5); //1.0);
353	586	mainPanel.setResizeWeight(0.5);
354		-
	587	+
	588	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	589	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	590	+ divider.setDividerSize(15);
	591	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	592	+
	593	+ mainPanel.setUI(new BasicSplitPaneUI());
	594	+
355	595	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
356	596	//mainPanel.setLayout(new GridBagLayout());
357	597	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -419,10 +659,10 @@
419	659	e.printStackTrace();
420	660	}
421	661
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();
	662	+// String selection = infoarea.getText();
	663	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	664	+// java.awt.datatransfer.Clipboard clipboard =
	665	+// Toolkit.getDefaultToolkit().getSystemClipboard();
426	666	//clipboard.setContents(data, data);
427	667	}
428	668
..	..	@@ -582,21 +822,169 @@
582	822	}
583	823	}
584	824
	825	+//static GraphicsDevice device = GraphicsEnvironment
	826	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	827	+
	828	+ Rectangle keeprect;
	829	+ cRadio radio;
	830	+
	831	+cButton keepButton;
	832	+ cButton twoButton; // Full 3D
	833	+ cButton sixButton;
	834	+ cButton threeButton;
	835	+ cButton sevenButton;
	836	+ cButton fourButton; // full panel
	837	+ cButton oneButton; // full XYZ
	838	+ //cButton currentLayout;
	839	+
	840	+ boolean maximized;
	841	+
	842	+ cButton fullscreenLayout;
	843	+ cButton expandedLayout;
	844	+
	845	+ void Minimize()
	846	+ {
	847	+ frame.setState(Frame.ICONIFIED);
	848	+ frame.validate();
	849	+ }
	850	+
	851	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	852	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	853	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	854	+ void Maximize()
	855	+ {
	856	+ if (CameraPane.FULLSCREEN)
	857	+ {
	858	+ ToggleFullScreen();
	859	+ }
	860	+
	861	+ if (maximized)
	862	+ {
	863	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	864	+ }
	865	+ else
	866	+ {
	867	+ keeprect = frame.getBounds();
	868	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	869	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	870	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	871	+// frame.setState(Frame.MAXIMIZED_BOTH);
	872	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	873	+ }
	874	+
	875	+ maximized ^= true;
	876	+
	877	+ frame.validate();
	878	+ }
	879	+
	880	+ cButton minButton;
	881	+ cButton maxButton;
	882	+ cButton fullButton;
	883	+ cButton collapseButton;
	884	+ cButton maximize3DButton;
	885	+
585	886	void ToggleFullScreen()
586	887	{
587		- if (CameraPane.FULLSCREEN)
	888	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	889	+
	890	+ cameraView.ToggleFullScreen();
	891	+
	892	+ if (!CameraPane.FULLSCREEN)
588	893	{
589		- frame.getContentPane().remove(/"Center",/bigThree);
590		- framePanel.add(bigThree);
591		- frame.getContentPane().add(/"Center",/framePanel);
	894	+ device.setFullScreenWindow(null);
	895	+ frame.dispose();
	896	+ frame.setUndecorated(false);
	897	+ frame.validate();
	898	+ frame.setVisible(true);
	899	+
	900	+ //frame.setVisible(false);
	901	+// frame.removeNotify();
	902	+// frame.setUndecorated(false);
	903	+// frame.addNotify();
	904	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	905	+
	906	+// X frame.getContentPane().remove(/"Center",/bigThree);
	907	+// X framePanel.add(bigThree);
	908	+// X frame.getContentPane().add(/"Center",/framePanel);
	909	+// framePanel.setDividerLocation(46); // icons are 24x24
	910	+
	911	+ //frame.setVisible(true);
	912	+// radio.layout = keepButton;
	913	+ //theFrame = null;
	914	+ keepButton = null;
	915	+// radio.layout.doClick();
	916	+
592	917	} else
593	918	{
594		- frame.getContentPane().remove(/"Center",/framePanel);
595		- framePanel.remove(bigThree);
596		- frame.getContentPane().add(/"Center",/bigThree);
	919	+ keepButton = radio.layout;
	920	+ //keeprect = frame.getBounds();
	921	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	922	+// frame.getToolkit().getScreenSize().height);
	923	+ //frame.setVisible(false);
	924	+
	925	+ frame.dispose();
	926	+ frame.setUndecorated(true);
	927	+ device.setFullScreenWindow(frame);
	928	+ frame.validate();
	929	+ frame.setVisible(true);
	930	+// frame.removeNotify();
	931	+// frame.setUndecorated(true);
	932	+// frame.addNotify();
	933	+// X frame.getContentPane().remove(/"Center",/framePanel);
	934	+// X framePanel.remove(bigThree);
	935	+// X frame.getContentPane().add(/"Center",/bigThree);
	936	+// framePanel.setDividerLocation(0);
	937	+
	938	+// radio.layout = fullscreenLayout;
	939	+// radio.layout.doClick();
	940	+ //frame.setVisible(true);
597	941	}
598		- cameraView.ToggleFullScreen();
	942	+ frame.validate();
	943	+
	944	+ cameraView.requestFocusInWindow();
599	945	}
	946	+
	947	+ void CollapseToolbar()
	948	+ {
	949	+ framePanel.setDividerLocation(0);
	950	+ //frame.validate();
	951	+
	952	+ cameraView.requestFocusInWindow();
	953	+ }
	954	+
	955	+ private Object3D Duplicate(Object3D object)
	956	+ {
	957	+ boolean temp = CameraPane.SWITCH;
	958	+ CameraPane.SWITCH = false;
	959	+
	960	+ if (Grafreed.grafreed.universe.versiontable == null)
	961	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	962	+
	963	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	964	+ // if (copy == client)
	965	+
	966	+ Object3D versions[] = object.versionlist;
	967	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	968	+ object.versionlist = null;
	969	+ object.versiontable = null;
	970	+
	971	+ Object3D parent = object.parent;
	972	+ object.parent = null;
	973	+
	974	+ //byte[] compress = Compress(copy);
	975	+ Object3D compress = (Object3D)Grafreed.clone(object);
	976	+
	977	+ object.parent = parent;
	978	+
	979	+ object.versionlist = versions;
	980	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	981	+
	982	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	983	+
	984	+ CameraPane.SWITCH = temp;
	985	+
	986	+ return compress;
	987	+ }
600	988
601	989	private JTextPane createTextPane()
602	990	{
..	..	@@ -719,6 +1107,7 @@
719	1107	{
720	1108	SetupMaterial(materialPanel);
721	1109	}
	1110	+
722	1111	//SetupName();
723	1112	//SetupViews();
724	1113	}
..	..	@@ -728,7 +1117,7 @@
728	1117	// NumberSlider vDivsField;
729	1118	// JCheckBox endcaps;
730	1119	JCheckBox liveCB;
731		- JCheckBox selectCB;
	1120	+ JCheckBox selectableCB;
732	1121	JCheckBox hideCB;
733	1122	JCheckBox link2masterCB;
734	1123	JCheckBox markCB;
..	..	@@ -736,7 +1125,12 @@
736	1125	JCheckBox speedupCB;
737	1126	JCheckBox rewindCB;
738	1127	JCheckBox flipVCB;
	1128	+
	1129	+ cCheckBox toggleTextureCB;
	1130	+ cCheckBox toggleSwitchCB;
	1131	+
739	1132	JComboBox texresMenu;
	1133	+
740	1134	JButton resetButton;
741	1135	JButton stepButton;
742	1136	JButton stepAllButton;
..	..	@@ -745,9 +1139,13 @@
745	1139	JButton fasterButton;
746	1140	JButton remarkButton;
747	1141
	1142	+ cGridBag editPanel;
	1143	+ cGridBag editCommandsPanel;
	1144	+
748	1145	cGridBag namePanel;
749	1146	cGridBag setupPanel;
750		- cGridBag commandsPanel;
	1147	+ cGridBag setupPanel2;
	1148	+ cGridBag objectCommandsPanel;
751	1149	cGridBag pushPanel;
752	1150	cGridBag fillPanel;
753	1151
..	..	@@ -918,61 +1316,81 @@
918	1316
919	1317	namePanel = new cGridBag();
920	1318
	1319	+ //if (copy.pinned)
	1320	+ {
	1321	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
	1322	+ pinButton.setSelected(copy.pinned);
	1323	+ cGridBag t = new cGridBag();
	1324	+ t.preferredWidth = 2;
	1325	+ t.add(pinButton);
	1326	+ namePanel.add(t);
	1327	+
	1328	+ pinButton.addItemListener(this);
	1329	+ }
	1330	+
921	1331	nameField = AddText(namePanel, copy.GetName());
922		- namePanel.add(nameField);
	1332	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
923	1333	oe.ctrlPanel.add(namePanel);
924	1334
925	1335	oe.ctrlPanel.Return();
926	1336
927		- if (!GroupEditor.allparams)
	1337	+ if (!allparams)
928	1338	return;
929	1339
930	1340	setupPanel = new cGridBag().setVertical(false);
931	1341
932	1342	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
933	1343	liveCB.setToolTipText("Animate object");
934		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
935		- selectCB.setToolTipText("Make object selectable");
	1344	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1345	+ markCB.setToolTipText("Set target transform");
	1346	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1347	+ selectableCB.setToolTipText("Make object selectable");
936	1348	// Return();
	1349	+
937	1350	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
938	1351	hideCB.setToolTipText("Hide object");
939		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
940		- markCB.setToolTipText("Set the animation target transform");
941	1352
942		- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	1353	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1354	+
	1355	+ setupPanel2 = new cGridBag().setVertical(false);
	1356	+
	1357	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
943	1358	rewindCB.setToolTipText("Rewind animation");
944	1359
945		- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
946		- randomCB.setToolTipText("Option for switch node");
	1360	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1361	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
947	1362
	1363	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1364	+ link2masterCB.setToolTipText("Attach to support");
	1365	+
948	1366	if (Globals.ADVANCED)
949	1367	{
950		- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
951		- link2masterCB.setToolTipText("Attach to support");
952		- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1368	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
953	1369	speedupCB.setToolTipText("Option motion capture");
954	1370	}
955	1371
956	1372	oe.ctrlPanel.add(setupPanel);
957	1373	oe.ctrlPanel.Return();
	1374	+ oe.ctrlPanel.add(setupPanel2);
	1375	+ oe.ctrlPanel.Return();
958	1376
959		- commandsPanel = new cGridBag().setVertical(false);
	1377	+ objectCommandsPanel = new cGridBag().setVertical(false);
960	1378
961		- resetButton = AddButton(commandsPanel, "Reset");
	1379	+ resetButton = AddButton(objectCommandsPanel, "Reset");
962	1380	resetButton.setToolTipText("Jump to frame zero");
963		- stepButton = AddButton(commandsPanel, "Step");
	1381	+ stepButton = AddButton(objectCommandsPanel, "Step");
964	1382	stepButton.setToolTipText("Step one frame");
965	1383	// resetAllButton = AddButton(oe, "Reset All");
966	1384	// stepAllButton = AddButton(oe, "Step All");
967	1385	// Return();
968		- slowerButton = AddButton(commandsPanel, "Slow");
	1386	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
969	1387	slowerButton.setToolTipText("Decrease animation speed");
970		- fasterButton = AddButton(commandsPanel, "Fast");
	1388	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
971	1389	fasterButton.setToolTipText("Increase animation speed");
972		- remarkButton = AddButton(commandsPanel, "Remark");
	1390	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
973	1391	remarkButton.setToolTipText("Set the current transform as the target");
974	1392
975		- oe.ctrlPanel.add(commandsPanel);
	1393	+ oe.ctrlPanel.add(objectCommandsPanel);
976	1394	oe.ctrlPanel.Return();
977	1395
978	1396	pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
..	..	@@ -1132,6 +1550,7 @@
1132	1550
1133	1551	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1134	1552	{
	1553	+ if (Globals.DEBUG)
1135	1554	System.out.println("CREATE CAMERAS");
1136	1555	cams = new cTemplate();
1137	1556	cams.name = "Cameras";
..	..	@@ -1178,8 +1597,11 @@
1178	1597	//worldPanel.setName("World");
1179	1598	centralPanel = new cGridBag();
1180	1599	centralPanel.preferredWidth = 20;
1181		- timelinePanel = new JPanel(new BorderLayout());
1182		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1600	+
	1601	+ if (Globals.ADVANCED)
	1602	+ {
	1603	+ timelinePanel = new JPanel(new BorderLayout());
	1604	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1183	1605
1184	1606	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1185	1607	cameraPanel.setContinuousLayout(true);
..	..	@@ -1188,7 +1610,10 @@
1188	1610	// cameraPanel.setDividerSize(9);
1189	1611	cameraPanel.setResizeWeight(1.0);
1190	1612
	1613	+ }
	1614	+
1191	1615	centralPanel.add(cameraView);
	1616	+ centralPanel.setFocusable(true);
1192	1617	//frame.setJMenuBar(timelineMenubar);
1193	1618	//centralPanel.add(timelinePanel);
1194	1619
..	..	@@ -1207,6 +1632,45 @@
1207	1632	//frontView.object = copy;
1208	1633	//sideView.object = copy;
1209	1634
	1635	+ transformPanel = new cGridBag().setVertical(true);
	1636	+
	1637	+ cGridBag resetTransformPanel = new cGridBag();
	1638	+
	1639	+ resetTransformPanel.preferredHeight = 2;
	1640	+
	1641	+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
	1642	+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
	1643	+ resetTransform.addMouseListener(new MouseAdapter()
	1644	+ {
	1645	+ public void mouseClicked(MouseEvent e)
	1646	+ {
	1647	+ ResetTransform();
	1648	+ }
	1649	+ });
	1650	+ resetTransformPanel.add(resetTransform);
	1651	+
	1652	+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
	1653	+ resetTransform.setToolTipText("Reset Translation only");
	1654	+ resetTransform.addMouseListener(new MouseAdapter()
	1655	+ {
	1656	+ public void mouseClicked(MouseEvent e)
	1657	+ {
	1658	+ ResetTransform(1);
	1659	+ }
	1660	+ });
	1661	+ resetTransformPanel.add(resetTransform);
	1662	+
	1663	+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
	1664	+ resetTransform.setToolTipText("Reset Rotation and Scale only");
	1665	+ resetTransform.addMouseListener(new MouseAdapter()
	1666	+ {
	1667	+ public void mouseClicked(MouseEvent e)
	1668	+ {
	1669	+ ResetTransform(2);
	1670	+ }
	1671	+ });
	1672	+ resetTransformPanel.add(resetTransform);
	1673	+
1210	1674	XYZPanel = new cGridBag().setVertical(true);
1211	1675	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1212	1676
..	..	@@ -1214,7 +1678,11 @@
1214	1678	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1215	1679	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1216	1680	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1681	+ //XYZPanel.setName("XYZ");
1217	1682
	1683	+ transformPanel.add(resetTransformPanel);
	1684	+ transformPanel.add(XYZPanel);
	1685	+
1218	1686	/*
1219	1687	gridPanel = new JPanel(); //new BorderLayout());
1220	1688	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1222,12 +1690,12 @@
1222	1690	gridPanel.add(cameraView);
1223	1691	gridPanel.add(XYZPanel);
1224	1692	*/
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);
	1693	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1694	+// gridPanel.setContinuousLayout(true);
	1695	+// gridPanel.setOneTouchExpandable(true);
	1696	+// gridPanel.setDividerLocation(1.0);
	1697	+// gridPanel.setDividerSize(9);
	1698	+// gridPanel.setResizeWeight(0.85);
1231	1699
1232	1700	// aConstraints.weighty = 0;
1233	1701	//System.out.println("THIS = " + this);
..	..	@@ -1250,14 +1718,34 @@
1250	1718
1251	1719	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1252	1720	//tmp.setName("Edit");
	1721	+ objectPanel.add(toolboxPanel);
	1722	+ objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
	1723	+ objectPanel.setToolTipTextAt(0, "Objects & textures");
	1724	+
1253	1725	objectPanel.add(materialPanel);
	1726	+ objectPanel.setIconAt(1, GetIcon("icons/material.png"));
	1727	+ objectPanel.setToolTipTextAt(1, "Material");
	1728	+
	1729	+ objectPanel.add(skyboxPanel);
	1730	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1731	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1732	+
1254	1733	// JPanel north = new JPanel(new BorderLayout());
1255	1734	// north.setName("Edit");
1256	1735	// north.add(ctrlPanel, BorderLayout.NORTH);
1257	1736	// objectPanel.add(north);
1258		- objectPanel.add(ctrlPanel);
1259		- objectPanel.add(infoPanel);
1260		-
	1737	+ objectPanel.add(editPanel);
	1738	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1739	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1740	+
	1741	+ objectPanel.add(transformPanel);
	1742	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1743	+ objectPanel.setToolTipTextAt(4, "TRS transform");
	1744	+
	1745	+ patchMaterial = true;
	1746	+ cameraView.patchMaterial = this;
	1747	+ objectPanel.setSelectedIndex(1);
	1748	+
1261	1749	/*
1262	1750	aConstraints.gridx = 0;
1263	1751	aConstraints.gridwidth = 1;
..	..	@@ -1265,7 +1753,7 @@
1265	1753	aConstraints.gridy += 1;
1266	1754	aConstraints.gridwidth = 1;
1267	1755	mainPanel.add(objectPanel, aConstraints);
1268		- */
	1756	+ */
1269	1757
1270	1758	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1271	1759	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1282,17 +1770,57 @@
1282	1770	JTabbedPane tabbedPane = new JTabbedPane();
1283	1771	tabbedPane.add(scrollpane);
1284	1772
1285		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1286		-
1287		- optionsPanel = new cGridBag().setVertical(true);
	1773	+ optionsPanel = new cGridBag().setVertical(false);
1288	1774
1289	1775	optionsPanel.setName("Options");
1290	1776
1291	1777	AddOptions(optionsPanel); //, aConstraints);
1292	1778
	1779	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1780	+
1293	1781	tabbedPane.add(optionsPanel);
1294	1782
1295	1783	scenePanel.add(tabbedPane);
	1784	+
	1785	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1786	+ creditsPanel.setName("Credits");
	1787	+
	1788	+ cLabel ogaLabel = new cLabel(" Most Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1789	+ creditsPanel.add(ogaLabel);
	1790	+
	1791	+ cButton opengameartButton;
	1792	+ creditsPanel.add(opengameartButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1793	+ opengameartButton.setToolTipText("https://opengameart.org");
	1794	+
	1795	+ opengameartButton.addMouseListener(new MouseAdapter()
	1796	+ {
	1797	+ public void mouseClicked(MouseEvent e)
	1798	+ {
	1799	+ try
	1800	+ {
	1801	+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
	1802	+ } catch (Exception e1)
	1803	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1804	+ {
	1805	+ e1.printStackTrace();
	1806	+ }
	1807	+ }
	1808	+ });
	1809	+
	1810	+ for (int i=10; --i>=0;)
	1811	+ {
	1812	+ creditsPanel.add(new cGridBag());
	1813	+ }
	1814	+
	1815	+ tabbedPane.add(creditsPanel);
	1816	+ tabbedPane.setToolTipTextAt(3, "Credits");
	1817	+
	1818	+ if (Globals.ADVANCED)
	1819	+ {
	1820	+ tabbedPane.add(infoPanel);
	1821	+ tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
	1822	+ tabbedPane.setToolTipTextAt(4, "Information");
	1823	+ }
1296	1824
1297	1825	/*
1298	1826	cTree jTree = new cTree(null);
..	..	@@ -1314,13 +1842,13 @@
1314	1842	jtp.add(tree);
1315	1843	*/
1316	1844
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");
	1845	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1846	+// bigPanel.setContinuousLayout(true);
	1847	+// bigPanel.setOneTouchExpandable(true);
	1848	+// bigPanel.setDividerLocation(0.8);
	1849	+// bigPanel.setDividerSize(15);
	1850	+// bigPanel.setResizeWeight(0.15);
	1851	+// bigPanel.setName("Scene");
1324	1852
1325	1853	//bigPanel.setLayout(new BorderLayout());
1326	1854	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1355,7 +1883,7 @@
1355	1883	bigThree = new cGridBag();
1356	1884	bigThree.addComponent(scenePanel);
1357	1885	bigThree.addComponent(centralPanel);
1358		- bigThree.addComponent(XYZPanel);
	1886	+ //bigThree.addComponent(XYZPanel);
1359	1887
1360	1888	// // SIDE EFFECT!!!
1361	1889	// aConstraints.gridx = 0;
..	..	@@ -1364,16 +1892,33 @@
1364	1892	// aConstraints.gridheight = 1;
1365	1893
1366	1894	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1367		- framePanel.setContinuousLayout(true);
1368		- framePanel.setOneTouchExpandable(true);
1369		- framePanel.setDividerLocation(0.8);
	1895	+
	1896	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1897	+ new java.beans.PropertyChangeListener()
	1898	+ {
	1899	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1900	+ {
	1901	+ if ((Integer)pce.getOldValue() == 1)
	1902	+ {
	1903	+ if (radio.layout != expandedLayout)
	1904	+ {
	1905	+ radio.layout = expandedLayout;
	1906	+ radio.layout.doClick();
	1907	+ }
	1908	+ }
	1909	+ }
	1910	+ });
	1911	+
	1912	+ framePanel.setContinuousLayout(false);
	1913	+ framePanel.setOneTouchExpandable(false);
	1914	+ //.setDividerLocation(0.8);
1370	1915	//framePanel.setDividerSize(15);
1371	1916	//framePanel.setResizeWeight(0.15);
1372	1917	framePanel.setName("Frame");
1373	1918
1374	1919	frame.getContentPane().setLayout(new BorderLayout());
1375	1920	/**/
1376		- JTabbedPane worldPane = new JTabbedPane();
	1921	+ //JTabbedPane worldPane = new JTabbedPane();
1377	1922	//worldPane.add(bigPanel);
1378	1923	//worldPane.add(worldPanel);
1379	1924	/**/
..	..	@@ -1384,14 +1929,18 @@
1384	1929	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1385	1930
1386	1931	frame.setSize(1280, 860);
1387		- frame.setVisible(true);
	1932	+
	1933	+ cameraView.requestFocusInWindow();
	1934	+
	1935	+// gridPanel.setDividerLocation(1.0);
	1936	+
	1937	+ frame.validate();
1388	1938
1389		- gridPanel.setDividerLocation(1.0);
	1939	+ frame.setVisible(true);
1390	1940
1391	1941	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1392	1942	frame.addWindowListener(new WindowAdapter()
1393	1943	{
1394		-
1395	1944	public void windowClosing(WindowEvent e)
1396	1945	{
1397	1946	Close();
..	..	@@ -1414,28 +1963,442 @@
1414	1963	ctrlPanel.removeAll();
1415	1964	}
1416	1965
1417		- void SetupMaterial(cGridBag panel)
	1966	+ void SetupMaterial(cGridBag materialpanel)
1418	1967	{
1419		- /*
	1968	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1969	+
	1970	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
	1971	+ skin.setToolTipText("Skin");
	1972	+ skin.addMouseListener(new MouseAdapter()
	1973	+ {
	1974	+ public void mouseClicked(MouseEvent e)
	1975	+ {
	1976	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1977	+ cMaterial material = object.material;
	1978	+
	1979	+ // Skin
	1980	+ colorField.setFloat(material.color);
	1981	+ float saturation = material.modulation;
	1982	+
	1983	+ if (!cameraView.Skinshader)
	1984	+ {
	1985	+ saturation /= 1.5;
	1986	+ }
	1987	+
	1988	+ saturationField.setFloat(saturation);
	1989	+
	1990	+ subsurfaceField.setFloat(material.subsurface);
	1991	+ selfshadowField.setFloat(material.diffuseness);
	1992	+ diffusenessField.setFloat(material.factor);
	1993	+ shininessField.setFloat(material.shininess);
	1994	+ shadowbiasField.setFloat(material.shadowbias);
	1995	+ diffuseField.setFloat(material.diffuse);
	1996	+ specularField.setFloat(material.specular);
	1997	+
	1998	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1999	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2000	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2001	+
	2002	+ materialtouched = true;
	2003	+ applySelf();
	2004	+ }
	2005	+ });
	2006	+ presetpanel.add(skin);
	2007	+
	2008	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
	2009	+ lambert.setToolTipText("Diffuse");
	2010	+ lambert.addMouseListener(new MouseAdapter()
	2011	+ {
	2012	+ public void mouseClicked(MouseEvent e)
	2013	+ {
	2014	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	2015	+ cMaterial material = object.material;
	2016	+
	2017	+ diffusenessField.setFloat(material.factor);
	2018	+ selfshadowField.setFloat(material.diffuseness);
	2019	+
	2020	+ materialtouched = true;
	2021	+ applySelf();
	2022	+ }
	2023	+ });
	2024	+ presetpanel.add(lambert);
	2025	+
	2026	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
	2027	+ diffuse2.setToolTipText("Diffuse2");
	2028	+ diffuse2.addMouseListener(new MouseAdapter()
	2029	+ {
	2030	+ public void mouseClicked(MouseEvent e)
	2031	+ {
	2032	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	2033	+ cMaterial material = object.material;
	2034	+
	2035	+ diffusenessField.setFloat(material.factor);
	2036	+ selfshadowField.setFloat(material.diffuseness);
	2037	+
	2038	+ materialtouched = true;
	2039	+ applySelf();
	2040	+ }
	2041	+ });
	2042	+ presetpanel.add(diffuse2);
	2043	+
	2044	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
	2045	+ diffusemoon.setToolTipText("Moon");
	2046	+ diffusemoon.addMouseListener(new MouseAdapter()
	2047	+ {
	2048	+ public void mouseClicked(MouseEvent e)
	2049	+ {
	2050	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	2051	+ cMaterial material = object.material;
	2052	+
	2053	+ diffusenessField.setFloat(material.factor);
	2054	+ selfshadowField.setFloat(material.diffuseness);
	2055	+
	2056	+ materialtouched = true;
	2057	+ applySelf();
	2058	+ }
	2059	+ });
	2060	+ presetpanel.add(diffusemoon);
	2061	+
	2062	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
	2063	+ diffusemoon2.setToolTipText("Moon2");
	2064	+ diffusemoon2.addMouseListener(new MouseAdapter()
	2065	+ {
	2066	+ public void mouseClicked(MouseEvent e)
	2067	+ {
	2068	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	2069	+ cMaterial material = object.material;
	2070	+
	2071	+ diffusenessField.setFloat(material.factor);
	2072	+ selfshadowField.setFloat(material.diffuseness);
	2073	+
	2074	+ materialtouched = true;
	2075	+ applySelf();
	2076	+ }
	2077	+ });
	2078	+ presetpanel.add(diffusemoon2);
	2079	+
	2080	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
	2081	+ diffusemoon3.setToolTipText("Moon3");
	2082	+ diffusemoon3.addMouseListener(new MouseAdapter()
	2083	+ {
	2084	+ public void mouseClicked(MouseEvent e)
	2085	+ {
	2086	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	2087	+ cMaterial material = object.material;
	2088	+
	2089	+ diffusenessField.setFloat(material.factor);
	2090	+ selfshadowField.setFloat(material.diffuseness);
	2091	+
	2092	+ materialtouched = true;
	2093	+ applySelf();
	2094	+ }
	2095	+ });
	2096	+ presetpanel.add(diffusemoon3);
	2097	+
	2098	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
	2099	+ diffusesheen.setToolTipText("Sheen");
	2100	+ diffusesheen.addMouseListener(new MouseAdapter()
	2101	+ {
	2102	+ public void mouseClicked(MouseEvent e)
	2103	+ {
	2104	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2105	+ cMaterial material = object.material;
	2106	+
	2107	+ sheenField.setFloat(material.sheen);
	2108	+
	2109	+ materialtouched = true;
	2110	+ applySelf();
	2111	+ }
	2112	+ });
	2113	+ presetpanel.add(diffusesheen);
	2114	+
	2115	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
	2116	+ rough.setToolTipText("Rough metal");
	2117	+ rough.addMouseListener(new MouseAdapter()
	2118	+ {
	2119	+ public void mouseClicked(MouseEvent e)
	2120	+ {
	2121	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2122	+ cMaterial material = object.material;
	2123	+
	2124	+ shininessField.setFloat(material.shininess);
	2125	+ velvetField.setFloat(material.velvet);
	2126	+
	2127	+ materialtouched = true;
	2128	+ applySelf();
	2129	+ }
	2130	+ });
	2131	+ presetpanel.add(rough);
	2132	+
	2133	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
	2134	+ rough2.setToolTipText("Medium metal");
	2135	+ rough2.addMouseListener(new MouseAdapter()
	2136	+ {
	2137	+ public void mouseClicked(MouseEvent e)
	2138	+ {
	2139	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2140	+ cMaterial material = object.material;
	2141	+
	2142	+ shininessField.setFloat(material.shininess);
	2143	+ lightareaField.setFloat(material.lightarea);
	2144	+
	2145	+ materialtouched = true;
	2146	+ applySelf();
	2147	+ }
	2148	+ });
	2149	+ presetpanel.add(rough2);
	2150	+
	2151	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
	2152	+ shini0.setToolTipText("Shiny");
	2153	+ shini0.addMouseListener(new MouseAdapter()
	2154	+ {
	2155	+ public void mouseClicked(MouseEvent e)
	2156	+ {
	2157	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2158	+ cMaterial material = object.material;
	2159	+
	2160	+ shininessField.setFloat(material.shininess);
	2161	+ lightareaField.setFloat(material.lightarea);
	2162	+
	2163	+ materialtouched = true;
	2164	+ applySelf();
	2165	+ }
	2166	+ });
	2167	+ presetpanel.add(shini0);
	2168	+
	2169	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
	2170	+ shini1.setToolTipText("Shiny2");
	2171	+ shini1.addMouseListener(new MouseAdapter()
	2172	+ {
	2173	+ public void mouseClicked(MouseEvent e)
	2174	+ {
	2175	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2176	+ cMaterial material = object.material;
	2177	+
	2178	+ shininessField.setFloat(material.shininess);
	2179	+ lightareaField.setFloat(material.lightarea);
	2180	+
	2181	+ materialtouched = true;
	2182	+ applySelf();
	2183	+ }
	2184	+ });
	2185	+ presetpanel.add(shini1);
	2186	+
	2187	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
	2188	+ shini2.setToolTipText("Shiny3");
	2189	+ shini2.addMouseListener(new MouseAdapter()
	2190	+ {
	2191	+ public void mouseClicked(MouseEvent e)
	2192	+ {
	2193	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2194	+ cMaterial material = object.material;
	2195	+
	2196	+ shininessField.setFloat(material.shininess);
	2197	+ lightareaField.setFloat(material.lightarea);
	2198	+
	2199	+ materialtouched = true;
	2200	+ applySelf();
	2201	+ }
	2202	+ });
	2203	+ presetpanel.add(shini2);
	2204	+
	2205	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
	2206	+ aniso.setToolTipText("AnisoU");
	2207	+ aniso.addMouseListener(new MouseAdapter()
	2208	+ {
	2209	+ public void mouseClicked(MouseEvent e)
	2210	+ {
	2211	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2212	+ cMaterial material = object.material;
	2213	+
	2214	+ anisoField.setFloat(material.aniso);
	2215	+ anisoVField.setFloat(material.anisoV);
	2216	+
	2217	+ materialtouched = true;
	2218	+ applySelf();
	2219	+ }
	2220	+ });
	2221	+ presetpanel.add(aniso);
	2222	+
	2223	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
	2224	+ aniso2.setToolTipText("AnisoV");
	2225	+ aniso2.addMouseListener(new MouseAdapter()
	2226	+ {
	2227	+ public void mouseClicked(MouseEvent e)
	2228	+ {
	2229	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2230	+ cMaterial material = object.material;
	2231	+
	2232	+ anisoField.setFloat(material.aniso);
	2233	+ anisoVField.setFloat(material.anisoV);
	2234	+
	2235	+ materialtouched = true;
	2236	+ applySelf();
	2237	+ }
	2238	+ });
	2239	+ presetpanel.add(aniso2);
	2240	+
	2241	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
	2242	+ aniso3.setToolTipText("AnisoUV");
	2243	+ aniso3.addMouseListener(new MouseAdapter()
	2244	+ {
	2245	+ public void mouseClicked(MouseEvent e)
	2246	+ {
	2247	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2248	+ cMaterial material = object.material;
	2249	+
	2250	+ anisoField.setFloat(material.aniso);
	2251	+ anisoVField.setFloat(material.anisoV);
	2252	+
	2253	+ materialtouched = true;
	2254	+ applySelf();
	2255	+ }
	2256	+ });
	2257	+ presetpanel.add(aniso3);
	2258	+
	2259	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
	2260	+ velvet0.setToolTipText("Velvet");
	2261	+ velvet0.addMouseListener(new MouseAdapter()
	2262	+ {
	2263	+ public void mouseClicked(MouseEvent e)
	2264	+ {
	2265	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2266	+ cMaterial material = object.material;
	2267	+
	2268	+ diffusenessField.setFloat(material.factor);
	2269	+ selfshadowField.setFloat(material.diffuseness);
	2270	+ sheenField.setFloat(material.sheen);
	2271	+ shininessField.setFloat(material.shininess);
	2272	+ velvetField.setFloat(material.velvet);
	2273	+ shiftField.setFloat(material.shift);
	2274	+
	2275	+ materialtouched = true;
	2276	+ applySelf();
	2277	+ }
	2278	+ });
	2279	+ presetpanel.add(velvet0);
	2280	+
	2281	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
	2282	+ bump0.setToolTipText("Bump texture");
	2283	+ bump0.addMouseListener(new MouseAdapter()
	2284	+ {
	2285	+ public void mouseClicked(MouseEvent e)
	2286	+ {
	2287	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2288	+ cMaterial material = object.material;
	2289	+
	2290	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2291	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2292	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2293	+
	2294	+ materialtouched = true;
	2295	+ applySelf();
	2296	+ }
	2297	+ });
	2298	+ presetpanel.add(bump0);
	2299	+
	2300	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
	2301	+ borderShader.setToolTipText("Border fade");
	2302	+ borderShader.addMouseListener(new MouseAdapter()
	2303	+ {
	2304	+ public void mouseClicked(MouseEvent e)
	2305	+ {
	2306	+ borderfadeField.setFloat(0.5);
	2307	+ opacityField.setFloat(0.75);
	2308	+
	2309	+ materialtouched = true;
	2310	+ applySelf();
	2311	+ }
	2312	+ });
	2313	+ presetpanel.add(borderShader);
	2314	+
	2315	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
	2316	+ halo.setToolTipText("Halo");
	2317	+ halo.addMouseListener(new MouseAdapter()
	2318	+ {
	2319	+ public void mouseClicked(MouseEvent e)
	2320	+ {
	2321	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2322	+ cMaterial material = object.material;
	2323	+
	2324	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2325	+
	2326	+ materialtouched = true;
	2327	+ applySelf();
	2328	+ }
	2329	+ });
	2330	+ presetpanel.add(halo);
	2331	+
	2332	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
	2333	+ candle.setToolTipText("Candle");
	2334	+ candle.addMouseListener(new MouseAdapter()
	2335	+ {
	2336	+ public void mouseClicked(MouseEvent e)
	2337	+ {
	2338	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2339	+ cMaterial material = object.material;
	2340	+
	2341	+ subsurfaceField.setFloat(material.subsurface);
	2342	+ shadowbiasField.setFloat(material.shadowbias);
	2343	+ ambientField.setFloat(material.ambient);
	2344	+ specularField.setFloat(material.specular);
	2345	+ lightareaField.setFloat(material.lightarea);
	2346	+ shininessField.setFloat(material.shininess);
	2347	+
	2348	+ materialtouched = true;
	2349	+ applySelf();
	2350	+ }
	2351	+ });
	2352	+ presetpanel.add(candle);
	2353	+
	2354	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
	2355	+ shadowShader.setToolTipText("Shadow");
	2356	+ shadowShader.addMouseListener(new MouseAdapter()
	2357	+ {
	2358	+ public void mouseClicked(MouseEvent e)
	2359	+ {
	2360	+ diffuseField.setFloat(0.001);
	2361	+ ambientField.setFloat(0.001);
	2362	+ cameraField.setFloat(0.001);
	2363	+ specularField.setFloat(0.001);
	2364	+ fakedepthField.setFloat(0.001);
	2365	+ opacityField.setFloat(0.6);
	2366	+
	2367	+ materialtouched = true;
	2368	+ applySelf();
	2369	+ }
	2370	+ });
	2371	+ presetpanel.add(shadowShader);
	2372	+
	2373	+ cGridBag panel = new cGridBag().setVertical(true);
	2374	+
	2375	+ presetpanel.preferredWidth = 1;
	2376	+
	2377	+ materialpanel.add(presetpanel);
	2378	+ materialpanel.add(panel);
	2379	+
	2380	+ panel.preferredWidth = 8;
	2381	+
	2382	+ /*
1420	2383	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1421	2384	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1422		- */
	2385	+ */
1423	2386
1424	2387	cGridBag editBar = new cGridBag().setVertical(false);
1425	2388
1426		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2389	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
1427	2390	createMaterialButton.setToolTipText("Create material");
1428	2391
1429	2392	/*
1430	2393	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1431	2394	*/
1432	2395
1433		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2396	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
1434	2397	clearMaterialButton.setToolTipText("Clear material");
1435	2398
1436	2399	if (Globals.ADVANCED)
1437	2400	{
1438		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2401	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
1439	2402	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1440	2403	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1441	2404	}
..	..	@@ -1453,45 +2416,61 @@
1453	2416	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1454	2417
1455	2418	cGridBag colorSection = new cGridBag().setVertical(true);
	2419	+
	2420	+ cGridBag huepanel = new cGridBag();
	2421	+ cGridBag huelabel = new cGridBag();
	2422	+ cLabel hue = GetLabel("icons/hue.png", false);
	2423	+ hue.fit = true;
	2424	+
	2425	+ hue.addMouseListener(new MouseAdapter()
	2426	+ {
	2427	+ public void mousePressed(MouseEvent e)
	2428	+ {
	2429	+ int x = e.getX();
	2430	+
	2431	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2432	+ }
	2433	+ });
	2434	+
	2435	+ huelabel.add(hue);
	2436	+ huelabel.preferredWidth = 20;
	2437	+ huepanel.add(new cGridBag()); // Label
	2438	+ huepanel.add(huelabel); // Field/slider
	2439	+
	2440	+ huepanel.preferredHeight = 7;
	2441	+
	2442	+ colorSection.add(huepanel);
1456	2443
1457	2444	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);
	2445	+
	2446	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2447	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2448	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2449	+
1461	2450	//colorField.preferredWidth = 200;
1462	2451	colorSection.add(color);
1463	2452
1464	2453	cGridBag modulation = new cGridBag();
1465	2454	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1466	2455	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1467		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2456	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1468	2457	colorSection.add(modulation);
1469	2458
	2459	+ cGridBag opacity = new cGridBag();
	2460	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2461	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2462	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2463	+ colorSection.add(opacity);
	2464	+
	2465	+ colorSection.add(GetSeparator());
	2466	+
1470	2467	cGridBag texture = new cGridBag();
1471	2468	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1472	2469	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1473	2470	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1474	2471	colorSection.add(texture);
1475	2472
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());
	2473	+ panel.add(GetSeparator());
1495	2474
1496	2475	panel.add(colorSection);
1497	2476
..	..	@@ -1541,7 +2520,13 @@
1541	2520	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1542	2521	diffuseSection.add(fakedepth);
1543	2522
1544		- panel.add(new JSeparator());
	2523	+ cGridBag shadowbias = new cGridBag();
	2524	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2525	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2526	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2527	+ diffuseSection.add(shadowbias);
	2528	+
	2529	+ panel.add(GetSeparator());
1545	2530
1546	2531	panel.add(diffuseSection);
1547	2532
..	..	@@ -1591,42 +2576,48 @@
1591	2576	// aConstraints.gridy += 1;
1592	2577	// aConstraints.gridwidth = 1;
1593	2578
	2579	+ cGridBag anisoU = new cGridBag();
	2580	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2581	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2582	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2583	+ specularSection.add(anisoU);
1594	2584
1595		- panel.add(new JSeparator());
	2585	+ cGridBag anisoV = new cGridBag();
	2586	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2587	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2588	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2589	+ specularSection.add(anisoV);
	2590	+
	2591	+
	2592	+ panel.add(GetSeparator());
1596	2593
1597	2594	panel.add(specularSection);
1598	2595
1599	2596	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1600	2597
1601		- cGridBag globalSection = new cGridBag().setVertical(true);
	2598	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1602	2599
1603	2600	cGridBag camera = new cGridBag();
1604	2601	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1605	2602	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1606	2603	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1607		- globalSection.add(camera);
	2604	+ colorSection.add(camera);
1608	2605
1609	2606	cGridBag ambient = new cGridBag();
1610	2607	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1611	2608	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1612	2609	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1613		- globalSection.add(ambient);
	2610	+ colorSection.add(ambient);
1614	2611
1615	2612	cGridBag backlit = new cGridBag();
1616	2613	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1617	2614	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1618	2615	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1619		- globalSection.add(backlit);
	2616	+ colorSection.add(backlit);
1620	2617
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());
	2618	+ //panel.add(new JSeparator());
1628	2619
1629		- panel.add(globalSection);
	2620	+ //panel.add(globalSection);
1630	2621
1631	2622	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1632	2623
..	..	@@ -1668,7 +2659,7 @@
1668	2659	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1669	2660	textureSection.add(opacityPower);
1670	2661
1671		- panel.add(new JSeparator());
	2662	+ panel.add(GetSeparator());
1672	2663
1673	2664	panel.add(textureSection);
1674	2665
..	..	@@ -1733,8 +2724,9 @@
1733	2724	// 3D models
1734	2725	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1735	2726	{
1736		- lastConverter = new com.jmex.model.converters.MaxToJme();
1737		- LoadFile(filename, lastConverter);
	2727	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2728	+ //LoadFile(filename, lastConverter);
	2729	+ LoadObjFile(filename); // New 3ds loader
1738	2730	continue;
1739	2731	}
1740	2732	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2072,19 +3064,19 @@
2072	3064
2073	3065	void LoadObjFile(String fullname)
2074	3066	{
2075		- /*
	3067	+ System.out.println("Loading " + fullname);
	3068	+ /**/
2076	3069	//lastFilename = fullname;
2077	3070	if(loadObjThread == null)
2078	3071	{
2079		- loadObjThread = new LoadOBJThread();
2080		- loadObjThread.start();
	3072	+ loadObjThread = new LoadOBJThread();
	3073	+ loadObjThread.start();
2081	3074	}
2082	3075
2083	3076	loadObjThread.add(fullname);
2084		- */
	3077	+ /**/
2085	3078
2086		- System.out.println("Loading " + fullname);
2087		- makeSomething(new FileObject(fullname, true), true);
	3079	+ //makeSomething(new FileObject(fullname, true), true);
2088	3080	}
2089	3081
2090	3082	void LoadGFDFile(String fullname)
..	..	@@ -2460,6 +3452,7 @@
2460	3452	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2461	3453	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2462	3454	}
	3455	+
2463	3456	//cJME.count++;
2464	3457	//cJME.count %= 12;
2465	3458	if (gc)
..	..	@@ -2643,6 +3636,7 @@
2643	3636	}
2644	3637	}
2645	3638	}
	3639	+
2646	3640	cFileSystemPane FSPane;
2647	3641
2648	3642	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2652,7 +3646,7 @@
2652	3646
2653	3647	freezematerial = true;
2654	3648	colorField.setFloat(mat.color);
2655		- modulationField.setFloat(mat.modulation);
	3649	+ saturationField.setFloat(mat.modulation);
2656	3650	metalnessField.setFloat(mat.metalness);
2657	3651	diffuseField.setFloat(mat.diffuse);
2658	3652	specularField.setFloat(mat.specular);
..	..	@@ -2696,11 +3690,14 @@
2696	3690	}
2697	3691	}
2698	3692	}
	3693	+
2699	3694	freezematerial = false;
2700	3695	}
2701	3696
2702	3697	void SetMaterial(Object3D object)
2703	3698	{
	3699	+ latestObject = object;
	3700	+
2704	3701	cMaterial mat = object.material;
2705	3702
2706	3703	if (mat == null)
..	..	@@ -2711,32 +3708,8 @@
2711	3708
2712	3709	if (multiplyToggle != null)
2713	3710	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		- }
	3711	+
	3712	+ AllocProjectedVertices(object);
2740	3713
2741	3714	SetMaterial(mat, object.projectedVertices);
2742	3715	}
..	..	@@ -2812,12 +3785,17 @@
2812	3785	// }
2813	3786
2814	3787	/**/
2815		- if (deselect)
	3788	+ if (deselect \|\| child == null)
2816	3789	{
2817	3790	//group.deselectAll();
2818	3791	//freeze = true;
2819	3792	GetTree().clearSelection();
2820	3793	//freeze = false;
	3794	+
	3795	+ if (child == null)
	3796	+ {
	3797	+ return;
	3798	+ }
2821	3799	}
2822	3800
2823	3801	//group.addSelectee(child);
..	..	@@ -2851,6 +3829,17 @@
2851	3829	public void itemStateChanged(ItemEvent event)
2852	3830	{
2853	3831	// System.out.println("Propagate = " + propagate);
	3832	+ if (event.getSource() == pinButton)
	3833	+ {
	3834	+ copy.pinned ^= true;
	3835	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3836	+ {
	3837	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3838	+ copy.CloseUI();
	3839	+ //copy.editWindow.refreshContents();
	3840	+ }
	3841	+ }
	3842	+ else
2854	3843	if (event.getSource() == propagateToggle)
2855	3844	{
2856	3845	propagate ^= true;
..	..	@@ -2886,7 +3875,7 @@
2886	3875	cameraView.ToggleDL();
2887	3876	cameraView.repaint();
2888	3877	return;
2889		- } else if (event.getSource() == toggleTextureItem)
	3878	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2890	3879	{
2891	3880	cameraView.ToggleTexture();
2892	3881	// june 2013 copy.HardTouch();
..	..	@@ -2925,9 +3914,9 @@
2925	3914	frame.validate();
2926	3915
2927	3916	return;
2928		- } else if (event.getSource() == toggleSwitchItem)
	3917	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2929	3918	{
2930		- cameraView.ToggleRandom();
	3919	+ cameraView.ToggleSwitch();
2931	3920	cameraView.repaint();
2932	3921	return;
2933	3922	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2955,8 +3944,9 @@
2955	3944	} else if (event.getSource() == liveCB)
2956	3945	{
2957	3946	copy.live ^= true;
	3947	+ objEditor.refreshContents(true); // To show item colors
2958	3948	return;
2959		- } else if (event.getSource() == selectCB)
	3949	+ } else if (event.getSource() == selectableCB)
2960	3950	{
2961	3951	copy.dontselect ^= true;
2962	3952	return;
..	..	@@ -2964,7 +3954,7 @@
2964	3954	{
2965	3955	copy.hide ^= true;
2966	3956	copy.Touch(); // display list issue
2967		- objEditor.refreshContents();
	3957	+ objEditor.refreshContents(true); // To show item colors
2968	3958	return;
2969	3959	} else if (event.getSource() == link2masterCB)
2970	3960	{
..	..	@@ -3029,7 +4019,7 @@
3029	4019	//System.out.println("ObjEditor " + event);
3030	4020	applySelf0(true);
3031	4021	//parent.applySelf();
3032		- objEditor.refreshContents();
	4022	+ // conflicts with requestFocus objEditor.refreshContents();
3033	4023	} else if (source == resetButton)
3034	4024	{
3035	4025	CameraPane.fullreset = true;
..	..	@@ -3141,9 +4131,9 @@
3141	4131	{
3142	4132	Close();
3143	4133	//return true;
3144		- } else if (source == loadItem)
	4134	+ } else if (source == openItem)
3145	4135	{
3146		- load();
	4136	+ Open();
3147	4137	//return true;
3148	4138	} else if (source == newItem)
3149	4139	{
..	..	@@ -3168,6 +4158,10 @@
3168	4158	{
3169	4159	generatePOV();
3170	4160	//return true;
	4161	+ } else if (event.getSource() == archiveItem)
	4162	+ {
	4163	+ cTools.Archive(frame);
	4164	+ return;
3171	4165	} else if (source == zBufferItem)
3172	4166	{
3173	4167	try
..	..	@@ -3205,15 +4199,73 @@
3205	4199
3206	4200	void New()
3207	4201	{
3208		- while (copy.Size() > 1)
	4202	+ while (copy.Size() > 0)
3209	4203	{
3210		- copy.remove(1);
	4204	+ copy.remove(0);
3211	4205	}
3212	4206
	4207	+ copy.selection.clear();
	4208	+
3213	4209	ResetModel();
	4210	+ SetupViews();
3214	4211	objEditor.refreshContents();
3215	4212	}
3216	4213
	4214	+ static public byte[] Compress(Object3D o)
	4215	+ {
	4216	+ // Slower to actually compress.
	4217	+ try
	4218	+ {
	4219	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4220	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4221	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	4222	+
	4223	+ Object3D parent = o.parent;
	4224	+ o.parent = null;
	4225	+
	4226	+ out.writeObject(o);
	4227	+
	4228	+ o.parent = parent;
	4229	+
	4230	+ out.flush();
	4231	+
	4232	+ baos //zstream
	4233	+ .close();
	4234	+ out.close();
	4235	+
	4236	+ byte[] bytes = baos.toByteArray();
	4237	+
	4238	+ System.out.println("save #bytes = " + bytes.length);
	4239	+ return bytes;
	4240	+ } catch (Exception e)
	4241	+ {
	4242	+ System.err.println(e);
	4243	+ return null;
	4244	+ }
	4245	+ }
	4246	+
	4247	+ static public Object Uncompress(byte[] bytes)
	4248	+ {
	4249	+ System.out.println("restore #bytes = " + bytes.length);
	4250	+ try
	4251	+ {
	4252	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4253	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4254	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	4255	+ Object obj = in.readObject();
	4256	+
	4257	+ bais //istream
	4258	+ .close();
	4259	+ in.close();
	4260	+
	4261	+ return obj;
	4262	+ } catch (Exception e)
	4263	+ {
	4264	+ System.err.println(e);
	4265	+ return null;
	4266	+ }
	4267	+ }
	4268	+
3217	4269	static public Object clone(Object o)
3218	4270	{
3219	4271	try
..	..	@@ -3222,12 +4274,19 @@
3222	4274	ObjectOutputStream out = new ObjectOutputStream(baos);
3223	4275
3224	4276	out.writeObject(o);
	4277	+
	4278	+ out.flush();
	4279	+ out.close();
	4280	+
	4281	+ byte[] bytes = baos.toByteArray();
	4282	+
	4283	+ System.out.println("clone = " + bytes.length);
3225	4284
3226		- ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
	4285	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3227	4286	ObjectInputStream in = new ObjectInputStream(bais);
3228	4287	Object obj = in.readObject();
3229	4288	in.close();
3230		- out.close();
	4289	+
3231	4290	return obj;
3232	4291	} catch (Exception e)
3233	4292	{
..	..	@@ -3242,7 +4301,7 @@
3242	4301	for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3243	4302	{
3244	4303	ab = (cRadio)e.nextElement();
3245		- if(ab.GetObject() == client)
	4304	+ if(ab.GetObject() == copy)
3246	4305	{
3247	4306	return ab;
3248	4307	}
..	..	@@ -3251,24 +4310,97 @@
3251	4310	return null;
3252	4311	}
3253	4312
	4313	+
3254	4314	public void Save()
3255	4315	{
3256		- cRadio tab = GetCurrentTab();
	4316	+ //Save(true);
	4317	+ Replace();
	4318	+ SetVersionStates();
	4319	+ }
	4320	+
	4321	+ private boolean Equal(byte[] compress, byte[] name)
	4322	+ {
	4323	+ if (compress.length != name.length)
	4324	+ {
	4325	+ return false;
	4326	+ }
	4327	+
	4328	+ for (int i=compress.length; --i>=0;)
	4329	+ {
	4330	+ if (compress[i] != name[i])
	4331	+ return false;
	4332	+ }
	4333	+
	4334	+ return true;
	4335	+ }
	4336	+
	4337	+ void DeleteVersion()
	4338	+ {
	4339	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4340	+ {
	4341	+ copy.versionlist[i] = copy.versionlist[i+1];
	4342	+ }
	4343	+
	4344	+ if (copy.versionlist[copy.versionindex] == null)
	4345	+ copy.versionindex -= 1;
	4346	+
	4347	+ if (copy.versionindex != -1)
	4348	+ CopyChanged();
	4349	+
	4350	+ SetVersionStates();
	4351	+ }
	4352	+
	4353	+ public boolean Save(boolean user)
	4354	+ {
	4355	+ System.err.println("Save");
	4356	+ Replace();
	4357	+
	4358	+ //cRadio tab = GetCurrentTab();
	4359	+
	4360	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
	4361	+
	4362	+ boolean thesame = false;
	4363	+
	4364	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4365	+// {
	4366	+// thesame = true;
	4367	+// }
3257	4368
3258	4369	//EditorFrame.m_MainFrame.requestFocusInWindow();
3259		- tab.graphs[tab.undoindex++] = (Object3D)clone(copy);
3260		-
3261		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	4370	+ if (!thesame)
3262	4371	{
3263		- tab.graphs[i] = null;
	4372	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4373	+ {
	4374	+ copy.versionlist[i] = copy.versionlist[i-1];
	4375	+ }
	4376	+
	4377	+ //tab.user[tab.versionindex] = user;
	4378	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4379	+
	4380	+ copy.versionlist[++copy.versionindex] = compress;
	4381	+
	4382	+ // if (increment)
	4383	+ // tab.versionindex++;
3264	4384	}
3265	4385
	4386	+ //copy.RestoreBigData(versiontable);
	4387	+
	4388	+ //assert(hashtable.isEmpty());
	4389	+
	4390	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4391	+// {
	4392	+// //tab.user[i] = false;
	4393	+// copy.versionlist[i] = null;
	4394	+// }
	4395	+
	4396	+ SetVersionStates();
	4397	+
3266	4398	// test save
3267	4399	if (false)
3268	4400	{
3269	4401	try
3270	4402	{
3271		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	4403	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3272	4404	ObjectOutputStream p = new ObjectOutputStream(ostream);
3273	4405
3274	4406	p.writeObject(copy);
..	..	@@ -3281,16 +4413,69 @@
3281	4413	e.printStackTrace();
3282	4414	}
3283	4415	}
	4416	+
	4417	+ return !thesame;
	4418	+ }
	4419	+
	4420	+ boolean flashIt = true;
	4421	+
	4422	+ void RefreshSelection()
	4423	+ {
	4424	+ Object3D selection = new Object3D();
	4425	+
	4426	+ for (int i = 0; i < copy.selection.size(); i++)
	4427	+ {
	4428	+ Object3D elem = copy.selection.elementAt(i);
	4429	+
	4430	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4431	+
	4432	+ if (obj == null)
	4433	+ {
	4434	+ copy.selection.remove(i--);
	4435	+ }
	4436	+ else
	4437	+ {
	4438	+ selection.add(obj);
	4439	+ copy.selection.setElementAt(obj, i);
	4440	+ }
	4441	+ }
	4442	+
	4443	+ flashIt = false;
	4444	+ GetTree().clearSelection();
	4445	+ for (int i = 0; i < selection.size(); i++)
	4446	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4447	+ flashIt = true;
	4448	+
	4449	+ //refreshContents(false);
3284	4450	}
3285	4451
3286		- void CopyChanged(Object3D obj)
	4452	+ void CopyChanged()
3287	4453	{
	4454	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4455	+
	4456	+ SetVersionStates();
	4457	+
	4458	+ boolean temp = CameraPane.SWITCH;
	4459	+ CameraPane.SWITCH = false;
	4460	+
	4461	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	4462	+
3288	4463	copy.clear();
3289	4464
	4465	+ copy.skyboxname = obj.skyboxname;
	4466	+ copy.skyboxext = obj.skyboxext;
	4467	+
3290	4468	for (int i=0; i<obj.Size(); i++)
3291	4469	{
3292	4470	copy.add(obj.get(i));
3293	4471	}
	4472	+
	4473	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	4474	+
	4475	+ CameraPane.SWITCH = temp;
	4476	+
	4477	+ RefreshSelection();
	4478	+ //assert(hashtable.isEmpty());
3294	4479
3295	4480	copy.Touch();
3296	4481
..	..	@@ -3310,43 +4495,161 @@
3310	4495	}
3311	4496	}
3312	4497
3313		- refreshContents();
	4498	+ refreshContents(true);
3314	4499	}
3315	4500
3316		- public void Undo()
3317		- {
3318		- cRadio tab = GetCurrentTab();
	4501	+ cButton previousVersionButton;
	4502	+ cButton restoreButton;
	4503	+ cButton replaceButton;
	4504	+ cButton nextVersionButton;
	4505	+ cButton saveVersionButton;
	4506	+ cButton deleteVersionButton;
3319	4507
3320		- if (tab.undoindex == 0)
	4508	+ boolean muteSlider;
	4509	+
	4510	+ int VersionCount()
	4511	+ {
	4512	+ int count = 0;
	4513	+
	4514	+ for (int i = copy.versionlist.length; --i >= 0;)
	4515	+ {
	4516	+ if (copy.versionlist[i] != null)
	4517	+ count++;
	4518	+ }
	4519	+
	4520	+ return count;
	4521	+ }
	4522	+
	4523	+ public cGridBag versionSliderPane;
	4524	+
	4525	+ void SetVersionStates()
	4526	+ {
	4527	+ //if (true)
	4528	+ // return;
	4529	+
	4530	+ //cRadio tab = GetCurrentTab();
	4531	+
	4532	+ if (copy.versionlist == null)
	4533	+ {
	4534	+ saveVersionButton.setEnabled(false);
	4535	+ restoreButton.setEnabled(false);
	4536	+ replaceButton.setEnabled(false);
	4537	+ previousVersionButton.setEnabled(false);
	4538	+ nextVersionButton.setEnabled(false);
	4539	+ deleteVersionButton.setEnabled(false);
	4540	+ versionSliderPane.setVisible(false);
	4541	+ }
	4542	+ else
	4543	+ {
	4544	+ restoreButton.setEnabled(copy.versionindex != -1);
	4545	+ replaceButton.setEnabled(copy.versionindex != -1);
	4546	+
	4547	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4548	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4549	+
	4550	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4551	+ //copy.versionlist[copy.versionindex + 1] != null);
	4552	+
	4553	+ muteSlider = true;
	4554	+ versionSlider.setMinimum(0);
	4555	+ versionSlider.setMaximum(VersionCount() - 1);
	4556	+ versionSlider.setInteger(copy.versionindex);
	4557	+ versionSlider.setEnabled(copy.versionindex != -1);
	4558	+ muteSlider = false;
	4559	+
	4560	+ versionSliderPane.setVisible(true);
	4561	+ }
	4562	+ }
	4563	+
	4564	+ public boolean PreviousVersion()
	4565	+ {
	4566	+ // Option?
	4567	+ Replace();
	4568	+
	4569	+ System.err.println("Undo");
	4570	+
	4571	+ //cRadio tab = GetCurrentTab();
	4572	+
	4573	+ if (copy.versionindex == 0)
3321	4574	{
3322	4575	java.awt.Toolkit.getDefaultToolkit().beep();
3323		- return;
	4576	+ return false;
3324	4577	}
3325	4578
3326		- if (tab.graphs[tab.undoindex] == null)
3327		- {
3328		- Save();
3329		- tab.undoindex -= 1;
3330		- }
	4579	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4580	+// {
	4581	+// if (Save(false))
	4582	+// tab.versionindex -= 1;
	4583	+// else
	4584	+// {
	4585	+// if (tab.versionindex <= 0)
	4586	+// return false;
	4587	+// else
	4588	+// tab.versionindex -= 1;
	4589	+// }
	4590	+// }
3331	4591
3332		- tab.undoindex -= 1;
	4592	+ copy.versionindex -= 1;
3333	4593
3334		- CopyChanged(tab.graphs[tab.undoindex]);
	4594	+ CopyChanged();
	4595	+
	4596	+ return true;
3335	4597	}
3336	4598
3337		- public void Redo()
	4599	+ public boolean Restore()
3338	4600	{
3339		- cRadio tab = GetCurrentTab();
	4601	+ System.err.println("Restore");
3340	4602
3341		- if (tab.graphs[tab.undoindex + 1] == null)
	4603	+ //cRadio tab = GetCurrentTab();
	4604	+
	4605	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4606	+ {
	4607	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4608	+ return false;
	4609	+ }
	4610	+
	4611	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4612	+ CopyChanged();
	4613	+
	4614	+ return true;
	4615	+ }
	4616	+
	4617	+ public boolean Replace()
	4618	+ {
	4619	+ //System.err.println("Replace");
	4620	+
	4621	+ //cRadio tab = GetCurrentTab();
	4622	+
	4623	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4624	+ {
	4625	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4626	+ return false;
	4627	+ }
	4628	+
	4629	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4630	+
	4631	+ return true;
	4632	+ }
	4633	+
	4634	+ public void NextVersion()
	4635	+ {
	4636	+ // Option?
	4637	+ Replace();
	4638	+
	4639	+ //cRadio tab = GetCurrentTab();
	4640	+
	4641	+ if (copy.versionlist[copy.versionindex + 1] == null)
3342	4642	{
3343	4643	java.awt.Toolkit.getDefaultToolkit().beep();
3344	4644	return;
3345	4645	}
3346	4646
3347		- tab.undoindex += 1;
	4647	+ copy.versionindex += 1;
3348	4648
3349		- CopyChanged(tab.graphs[tab.undoindex]);
	4649	+ CopyChanged();
	4650	+
	4651	+ //if (!tab.user[tab.versionindex])
	4652	+ // tab.graphs[tab.versionindex] = null;
3350	4653	}
3351	4654
3352	4655	void ImportGFD()
..	..	@@ -3498,7 +4801,7 @@
3498	4801	assert false;
3499	4802	}
3500	4803
3501		- void EditSelection()
	4804	+ void EditSelection(boolean newWindow)
3502	4805	{
3503	4806	}
3504	4807
..	..	@@ -3540,6 +4843,12 @@
3540	4843	// else
3541	4844	// applySelf(true);
3542	4845	// }
	4846	+
	4847	+ boolean Equal(double a, double b)
	4848	+ {
	4849	+ return Math.abs(a - b) < 0.001;
	4850	+ }
	4851	+
3543	4852	void applySelf0(boolean name)
3544	4853	{
3545	4854	if (name)
..	..	@@ -3557,7 +4866,7 @@
3557	4866	//copy.material = new cMaterial(copy.GetMaterial());
3558	4867
3559	4868	current.color = (float) colorField.getFloat();
3560		- current.modulation = (float) modulationField.getFloat();
	4869	+ current.modulation = (float) saturationField.getFloat();
3561	4870	current.metalness = (float) metalnessField.getFloat();
3562	4871	current.diffuse = (float) diffuseField.getFloat();
3563	4872	current.specular = (float) specularField.getFloat();
..	..	@@ -3589,29 +4898,52 @@
3589	4898	{
3590	4899	cMaterial mat = copy.material;
3591	4900
3592		- colorField.SetToolTipValue((mat.color));
3593		- modulationField.SetToolTipValue((mat.modulation));
3594		- metalnessField.SetToolTipValue((mat.metalness));
3595		- diffuseField.SetToolTipValue((mat.diffuse));
3596		- specularField.SetToolTipValue((mat.specular));
3597		- shininessField.SetToolTipValue((mat.shininess));
3598		- shiftField.SetToolTipValue((mat.shift));
3599		- ambientField.SetToolTipValue((mat.ambient));
3600		- lightareaField.SetToolTipValue((mat.lightarea));
3601		- diffusenessField.SetToolTipValue((mat.factor));
3602		- velvetField.SetToolTipValue((mat.velvet));
3603		- sheenField.SetToolTipValue((mat.sheen));
3604		- subsurfaceField.SetToolTipValue((mat.subsurface));
3605		- backlitField.SetToolTipValue((mat.bump));
3606		- anisoField.SetToolTipValue((mat.aniso));
3607		- anisoVField.SetToolTipValue((mat.anisoV));
3608		- cameraField.SetToolTipValue((mat.cameralight));
3609		- selfshadowField.SetToolTipValue((mat.diffuseness));
3610		- shadowField.SetToolTipValue((mat.shadow));
3611		- textureField.SetToolTipValue((mat.texture));
3612		- opacityField.SetToolTipValue((mat.opacity));
3613		- fakedepthField.SetToolTipValue((mat.fakedepth));
3614		- shadowbiasField.SetToolTipValue((mat.shadowbias));
	4901	+ if (!Equal(colorField.getFloat(), mat.color))
	4902	+ colorField.SetToolTipValue((mat.color));
	4903	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	4904	+ saturationField.SetToolTipValue((mat.modulation));
	4905	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	4906	+ metalnessField.SetToolTipValue((mat.metalness));
	4907	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	4908	+ diffuseField.SetToolTipValue((mat.diffuse));
	4909	+ if (!Equal(specularField.getFloat(), mat.specular))
	4910	+ specularField.SetToolTipValue((mat.specular));
	4911	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	4912	+ shininessField.SetToolTipValue((mat.shininess));
	4913	+ if (!Equal(shiftField.getFloat(), mat.shift))
	4914	+ shiftField.SetToolTipValue((mat.shift));
	4915	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	4916	+ ambientField.SetToolTipValue((mat.ambient));
	4917	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	4918	+ lightareaField.SetToolTipValue((mat.lightarea));
	4919	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	4920	+ diffusenessField.SetToolTipValue((mat.factor));
	4921	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	4922	+ velvetField.SetToolTipValue((mat.velvet));
	4923	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	4924	+ sheenField.SetToolTipValue((mat.sheen));
	4925	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	4926	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4927	+ if (!Equal(backlitField.getFloat(), mat.bump))
	4928	+ backlitField.SetToolTipValue((mat.bump));
	4929	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	4930	+ anisoField.SetToolTipValue((mat.aniso));
	4931	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	4932	+ anisoVField.SetToolTipValue((mat.anisoV));
	4933	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	4934	+ cameraField.SetToolTipValue((mat.cameralight));
	4935	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	4936	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4937	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	4938	+ shadowField.SetToolTipValue((mat.shadow));
	4939	+ if (!Equal(textureField.getFloat(), mat.texture))
	4940	+ textureField.SetToolTipValue((mat.texture));
	4941	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	4942	+ opacityField.SetToolTipValue((mat.opacity));
	4943	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	4944	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4945	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	4946	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
3615	4947	}
3616	4948
3617	4949	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -3642,9 +4974,28 @@
3642	4974	//copy.Touch();
3643	4975	}
3644	4976
	4977	+ cNumberSlider versionSlider;
	4978	+
3645	4979	public void stateChanged(ChangeEvent e)
3646	4980	{
3647		- // assert(false);
	4981	+ // assert(false);
	4982	+ if (e.getSource() == versionSlider)
	4983	+ {
	4984	+ if (muteSlider)
	4985	+ return;
	4986	+
	4987	+ Replace();
	4988	+
	4989	+ int version = versionSlider.getInteger();
	4990	+
	4991	+ if (version != -1 && copy.versionlist[version] != null)
	4992	+ {
	4993	+ copy.versionindex = version;
	4994	+ CopyChanged();
	4995	+ }
	4996	+
	4997	+ return;
	4998	+ }
3648	4999
3649	5000	if (freezematerial)
3650	5001	{
..	..	@@ -3680,6 +5031,12 @@
3680	5031	{
3681	5032	//System.out.println("stateChanged = " + this);
3682	5033	materialtouched = true;
	5034	+
	5035	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	5036	+ {
	5037	+ saturationField.setFloat(1);
	5038	+ }
	5039	+
3683	5040	applySelf();
3684	5041	//System.out.println("this = " + this);
3685	5042	//System.out.println("PARENT = " + parent);
..	..	@@ -3979,6 +5336,7 @@
3979	5336	{
3980	5337	if (GetTree() != null)
3981	5338	{
	5339	+ GetTree().revalidate();
3982	5340	GetTree().repaint();
3983	5341	}
3984	5342
..	..	@@ -3987,13 +5345,19 @@
3987	5345	ctrlPanel.validate(); // ? new
3988	5346	ctrlPanel.repaint();
3989	5347	}
	5348	+
	5349	+ if (previousVersionButton != null && copy.versionlist != null)
	5350	+ SetVersionStates();
	5351	+
	5352	+ cameraView.requestFocusInWindow();
3990	5353	}
3991	5354
3992	5355	static TweenManager tweenManager = new TweenManager();
3993	5356
3994	5357	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3995	5358	{
3996		- Save();
	5359	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5360	+ Save();
3997	5361	//Tween.set(thing, 0).target(1).start(tweenManager);
3998	5362	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3999	5363	// if (thing instanceof GenericJointDemo)
..	..	@@ -4017,7 +5381,7 @@
4017	5381	// group = (Composite) group.get(0);
4018	5382	// }
4019	5383
4020		- System.out.println("makeSomething of " + thing);
	5384	+ //System.out.println("makeSomething of " + thing);
4021	5385
4022	5386	/*
4023	5387	if (deselect && jList != null)
..	..	@@ -4080,6 +5444,12 @@
4080	5444	{
4081	5445	ResetModel();
4082	5446	Select(thing.GetTreePath(), true, false); // unselect... false);
	5447	+
	5448	+ if (thing.Size() == 0)
	5449	+ {
	5450	+ //EditSelection(false);
	5451	+ }
	5452	+
4083	5453	refreshContents();
4084	5454	}
4085	5455
..	..	@@ -4217,6 +5587,7 @@
4217	5587
4218	5588	try
4219	5589	{
	5590	+ // Try compressed version first.
4220	5591	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4221	5592	java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
4222	5593	java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
..	..	@@ -4227,7 +5598,9 @@
4227	5598	readobj.ResetDisplayList();
4228	5599	} catch (Exception e)
4229	5600	{
4230		- //e.printStackTrace();
	5601	+ if (!e.toString().contains("GZIP"))
	5602	+ e.printStackTrace();
	5603	+
4231	5604	try
4232	5605	{
4233	5606	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4286,6 +5659,12 @@
4286	5659
4287	5660	void LoadIt(Object obj)
4288	5661	{
	5662	+ if (obj == null)
	5663	+ {
	5664	+ // Invalid file
	5665	+ return;
	5666	+ }
	5667	+
4289	5668	System.out.println("Loaded " + obj);
4290	5669	//new Exception().printStackTrace();
4291	5670	Object3D readobj = (Object3D) obj;
..	..	@@ -4295,10 +5674,14 @@
4295	5674
4296	5675	if (readobj != null)
4297	5676	{
	5677	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5678	+ // Save();
4298	5679	try
4299	5680	{
4300	5681	//readobj.deepCopySelf(copy);
4301	5682	copy.clear(); // june 2014
	5683	+ copy.skyboxname = readobj.skyboxname;
	5684	+ copy.skyboxext = readobj.skyboxext;
4302	5685	for (int i = 0; i < readobj.size(); i++)
4303	5686	{
4304	5687	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4339,6 +5722,7 @@
4339	5722	}
4340	5723	} catch (ClassCastException e)
4341	5724	{
	5725	+ e.printStackTrace();
4342	5726	assert (false);
4343	5727	Composite c = (Composite) copy;
4344	5728	c.children.clear();
..	..	@@ -4349,17 +5733,32 @@
4349	5733	c.addChild(csg);
4350	5734	}
4351	5735
	5736	+ copy.versionlist = readobj.versionlist;
	5737	+ copy.versionindex = readobj.versionindex;
	5738	+ copy.versiontable = readobj.versiontable;
	5739	+
	5740	+ if (copy.versionlist == null)
	5741	+ {
	5742	+ // Backward compatibility
	5743	+ copy.versionlist = new Object3D[100];
	5744	+ copy.versionindex = -1;
	5745	+
	5746	+ //Save(true);
	5747	+ }
	5748	+
	5749	+ //? SetUndoStates();
	5750	+
4352	5751	ResetModel();
4353	5752	copy.HardTouch(); // recompile?
4354	5753	refreshContents();
4355	5754	}
4356	5755	}
4357	5756
4358		- void load() // throws ClassNotFoundException
	5757	+ void Open() // throws ClassNotFoundException
4359	5758	{
4360	5759	if (Grafreed.standAlone)
4361	5760	{
4362		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5761	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4363	5762	browser.show();
4364	5763	String filename = browser.getFile();
4365	5764	if (filename != null && filename.length() > 0)
..	..	@@ -4436,6 +5835,8 @@
4436	5835
4437	5836	void save()
4438	5837	{
	5838	+ Replace();
	5839	+
4439	5840	if (lastname == null)
4440	5841	{
4441	5842	return;
..	..	@@ -4458,6 +5859,7 @@
4458	5859	//ps.print(buffer.toString());
4459	5860	} catch (IOException e)
4460	5861	{
	5862	+ e.printStackTrace();
4461	5863	}
4462	5864	}
4463	5865
..	..	@@ -4472,6 +5874,8 @@
4472	5874	String filename = browser.getFile();
4473	5875	if (filename != null && filename.length() > 0)
4474	5876	{
	5877	+ if (!filename.endsWith(".gfd"))
	5878	+ filename += ".gfd";
4475	5879	lastname = browser.getDirectory() + filename;
4476	5880	save();
4477	5881	}
..	..	@@ -4638,7 +6042,7 @@
4638	6042	MenuBar menuBar;
4639	6043	Menu fileMenu;
4640	6044	MenuItem newItem;
4641		- MenuItem loadItem;
	6045	+ MenuItem openItem;
4642	6046	MenuItem saveItem;
4643	6047	MenuItem saveAsItem;
4644	6048	MenuItem exportAsItem;
..	..	@@ -4661,22 +6065,38 @@
4661	6065	CheckboxMenuItem toggleSwitchItem;
4662	6066	CheckboxMenuItem toggleRootItem;
4663	6067	CheckboxMenuItem animationItem;
	6068	+ MenuItem archiveItem;
4664	6069	CheckboxMenuItem toggleHandleItem;
4665	6070	CheckboxMenuItem togglePaintItem;
4666	6071	JSplitPane mainPanel;
4667	6072	JScrollPane scrollpane;
	6073	+
4668	6074	JPanel toolbarPanel;
	6075	+
4669	6076	cGridBag treePanel;
	6077	+
4670	6078	JPanel radioPanel;
4671	6079	ButtonGroup buttonGroup;
4672		- cGridBag ctrlPanel;
	6080	+
	6081	+ cGridBag toolboxPanel;
	6082	+ cGridBag skyboxPanel;
4673	6083	cGridBag materialPanel;
	6084	+ cGridBag ctrlPanel;
	6085	+
4674	6086	JScrollPane infoPanel;
	6087	+
4675	6088	cGridBag optionsPanel;
	6089	+
4676	6090	JTabbedPane objectPanel;
	6091	+ boolean materialFlushed;
	6092	+ Object3D latestObject;
	6093	+
	6094	+ cGridBag transformPanel;
4677	6095	cGridBag XYZPanel;
	6096	+
4678	6097	JSplitPane gridPanel;
4679	6098	JSplitPane bigPanel;
	6099	+
4680	6100	cGridBag bigThree;
4681	6101	cGridBag scenePanel;
4682	6102	cGridBag centralPanel;
..	..	@@ -4734,7 +6154,7 @@
4734	6154	JLabel colorLabel;
4735	6155	cNumberSlider colorField;
4736	6156	JLabel modulationLabel;
4737		- cNumberSlider modulationField;
	6157	+ cNumberSlider saturationField;
4738	6158	JLabel metalnessLabel;
4739	6159	cNumberSlider metalnessField;
4740	6160	JLabel diffuseLabel;
..	..	@@ -4765,6 +6185,7 @@
4765	6185	cNumberSlider anisoField;
4766	6186	JLabel anisoVLabel;
4767	6187	cNumberSlider anisoVField;
	6188	+
4768	6189	JLabel cameraLabel;
4769	6190	cNumberSlider cameraField;
4770	6191	JLabel selfshadowLabel;
..	..	@@ -4779,6 +6200,7 @@
4779	6200	cNumberSlider fakedepthField;
4780	6201	JLabel shadowbiasLabel;
4781	6202	cNumberSlider shadowbiasField;
	6203	+
4782	6204	JLabel bumpLabel;
4783	6205	cNumberSlider bumpField;
4784	6206	JLabel noiseLabel;
..	..	@@ -4791,7 +6213,7 @@
4791	6213	cNumberSlider fogField;
4792	6214	JLabel opacityPowerLabel;
4793	6215	cNumberSlider opacityPowerField;
4794		- JTree jTree;
	6216	+ cTree jTree;
4795	6217	//ObjectUI parent;
4796	6218
4797	6219	cNumberSlider normalpushField;