~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -4,6 +4,7 @@
4	4
5	5	import java.awt.*;
6	6	import java.awt.event.*;
	7	+import java.awt.image.BufferedImage;
7	8	import javax.swing.*;
8	9	import javax.swing.event.*;
9	10	import javax.swing.text.*;
..	..	@@ -13,6 +14,9 @@
13	14	import javax.swing.plaf.metal.MetalLookAndFeel;
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
	17	+
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
16	20
17	21	//import javax.media.opengl.GLCanvas;
18	22
..	..	@@ -30,6 +34,7 @@
30	34	iSendInfo
31	35	//KeyListener
32	36	{
	37	+ public cToggleButton pinButton;
33	38	boolean timeline;
34	39	boolean wasFullScreen;
35	40
..	..	@@ -37,6 +42,138 @@
37	42	JFrame frame;
38	43
39	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	+ }
40	177
41	178	// SCRIPT
42	179
..	..	@@ -147,7 +284,7 @@
147	284
148	285	objEditor.ctrlPanel.remove(namePanel);
149	286
150		- if (!GroupEditor.allparams)
	287	+ if (!allparams)
151	288	return;
152	289
153	290	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -171,7 +308,7 @@
171	308
172	309	objEditor.ctrlPanel.remove(setupPanel);
173	310	objEditor.ctrlPanel.remove(setupPanel2);
174		- objEditor.ctrlPanel.remove(commandsPanel);
	311	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
175	312	objEditor.ctrlPanel.remove(pushPanel);
176	313	//objEditor.ctrlPanel.remove(fillPanel);
177	314
..	..	@@ -219,6 +356,14 @@
219	356	client = inClient;
220	357	copy = client;
221	358
	359	+// if (copy.versionlist == null)
	360	+// {
	361	+// copy.versionlist = new Object3D[100];
	362	+// copy.versionindex = -1;
	363	+//
	364	+// callee.Save(true);
	365	+// }
	366	+
222	367	// "this" is not called: SetupUI2(objEditor);
223	368	}
224	369
..	..	@@ -232,6 +377,14 @@
232	377	client = inClient;
233	378	copy = client;
234	379
	380	+ if (copy.versionlist == null)
	381	+ {
	382	+ copy.versionlist = new Object3D[100];
	383	+ copy.versionindex = -1;
	384	+
	385	+// Save(true);
	386	+ }
	387	+
235	388	SetupUI2(callee.GetEditor());
236	389	}
237	390
..	..	@@ -246,14 +399,15 @@
246	399	//localCopy.parent = null;
247	400
248	401	frame = new JFrame();
249		- frame.setUndecorated(true);
	402	+ frame.setUndecorated(false);
250	403	objEditor = this;
251	404	this.callee = callee;
252	405
253	406	//parent = p;
254	407
255	408	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
256		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	409	+ if (Globals.DEBUG)
	410	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
257	411	//gd.setFullScreenWindow(this);
258	412	//setResizable(false);
259	413	//if (!isDisplayable())
..	..	@@ -264,6 +418,14 @@
264	418	copy = localCopy;
265	419	copy.editWindow = this;
266	420
	421	+// if (copy.versionlist == null)
	422	+// {
	423	+// copy.versionlist = new Object3D[100];
	424	+// copy.versionindex = -1;
	425	+//
	426	+// Save(true);
	427	+// }
	428	+
267	429	SetupMenu();
268	430
269	431	//SetupName(objEditor); // new
..	..	@@ -277,12 +439,20 @@
277	439	return frame.action(event, obj);
278	440	}
279	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	+
280	450	void SetupMenu()
281	451	{
282	452	frame.setMenuBar(menuBar = new MenuBar());
283	453	menuBar.add(fileMenu = new Menu("File"));
284	454	fileMenu.add(newItem = new MenuItem("New"));
285		- fileMenu.add(loadItem = new MenuItem("Open..."));
	455	+ fileMenu.add(openItem = new MenuItem("Open..."));
286	456
287	457	//oe.menuBar.add(menu = new Menu("Include"));
288	458	Menu menu = new Menu("Import");
..	..	@@ -314,7 +484,7 @@
314	484	}
315	485
316	486	newItem.addActionListener(this);
317		- loadItem.addActionListener(this);
	487	+ openItem.addActionListener(this);
318	488	saveItem.addActionListener(this);
319	489	saveAsItem.addActionListener(this);
320	490	exportAsItem.addActionListener(this);
..	..	@@ -323,28 +493,102 @@
323	493	closeItem.addActionListener(this);
324	494
325	495	objectPanel = new JTabbedPane();
	496	+
	497	+ ChangeListener changeListener = new ChangeListener()
	498	+ {
	499	+ //String name;
	500	+
	501	+ public void stateChanged(ChangeEvent changeEvent)
	502	+ {
	503	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	504	+// {
	505	+// if (latestObject != null)
	506	+// {
	507	+// refreshContents(true);
	508	+// SetMaterial(latestObject);
	509	+// }
	510	+//
	511	+// materialFlushed = true;
	512	+// }
	513	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	514	+// {
	515	+// if (listUI.size() == 0)
	516	+// EditSelection(false);
	517	+// }
	518	+
	519	+// if (objectPanel.getSelectedIndex() == 4)
	520	+// {
	521	+// name = copy.skyboxname;
	522	+//
	523	+// if (name == null)
	524	+// {
	525	+// name = "";
	526	+// }
	527	+//
	528	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	529	+// copy.skyboxext = "jpg";
	530	+// }
	531	+// else
	532	+// {
	533	+// if (name != null)
	534	+// {
	535	+// if (name.equals(""))
	536	+// {
	537	+// copy.skyboxname = null;
	538	+// copy.skyboxext = null;
	539	+// }
	540	+// else
	541	+// {
	542	+// copy.skyboxname = name;
	543	+// }
	544	+// }
	545	+// }
	546	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	547	+
	548	+// refreshContents(false); // To refresh Info tab
	549	+ cameraView.repaint();
	550	+ }
	551	+ };
	552	+ objectPanel.addChangeListener(changeListener);
	553	+
326	554	toolbarPanel = new JPanel();
327	555	toolbarPanel.setName("Toolbar");
	556	+
328	557	treePanel = new cGridBag();
329	558	treePanel.setName("Tree");
	559	+
	560	+ editPanel = new cGridBag().setVertical(true);
	561	+ //editPanel.setName("Edit");
	562	+
330	563	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
331		- ctrlPanel.setName("Edit");
332		- materialPanel = new cGridBag().setVertical(true);
333		- materialPanel.setName("Material");
	564	+
	565	+ editCommandsPanel = new cGridBag();
	566	+ editPanel.add(editCommandsPanel);
	567	+ editPanel.add(ctrlPanel);
	568	+
	569	+ toolboxPanel = new cGridBag().setVertical(true);
	570	+ //toolboxPanel.setName("Toolbox");
	571	+
	572	+ skyboxPanel = new cGridBag().setVertical(true);
	573	+
	574	+ materialPanel = new cGridBag().setVertical(false);
	575	+ //materialPanel.setName("Material");
	576	+
334	577	/JTextPane/
335	578	infoarea = createTextPane();
336	579	doc = infoarea.getStyledDocument();
337	580
338	581	infoarea.setEditable(true);
339	582	SetText();
	583	+
340	584	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
341	585	// infoarea.setOpaque(false);
342	586	// //infoarea.setForeground(textcolor);
343	587	// TEXTAREA infoarea.setLineWrap(true);
344	588	// TEXTAREA infoarea.setWrapStyleWord(true);
345	589	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
346		- infoPanel.setPreferredSize(new Dimension(50, 200));
347		- infoPanel.setName("Info");
	590	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	591	+ //infoPanel.setName("Info");
348	592	//infoPanel.setLayout(new BorderLayout());
349	593	//infoPanel.add(createTextPane());
350	594
..	..	@@ -355,7 +599,14 @@
355	599	mainPanel.setDividerSize(9);
356	600	mainPanel.setDividerLocation(0.5); //1.0);
357	601	mainPanel.setResizeWeight(0.5);
358		-
	602	+
	603	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	604	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	605	+ divider.setDividerSize(15);
	606	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	607	+
	608	+ mainPanel.setUI(new BasicSplitPaneUI());
	609	+
359	610	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
360	611	//mainPanel.setLayout(new GridBagLayout());
361	612	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -586,8 +837,8 @@
586	837	}
587	838	}
588	839
589		-static GraphicsDevice device = GraphicsEnvironment
590		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	840	+//static GraphicsDevice device = GraphicsEnvironment
	841	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
591	842
592	843	Rectangle keeprect;
593	844	cRadio radio;
..	..	@@ -603,13 +854,25 @@
603	854
604	855	boolean maximized;
605	856
	857	+ cButton fullscreenLayout;
	858	+ cButton expandedLayout;
	859	+
606	860	void Minimize()
607	861	{
608	862	frame.setState(Frame.ICONIFIED);
	863	+ frame.validate();
609	864	}
610	865
	866	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	867	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	868	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
611	869	void Maximize()
612	870	{
	871	+ if (CameraPane.FULLSCREEN)
	872	+ {
	873	+ ToggleFullScreen();
	874	+ }
	875	+
613	876	if (maximized)
614	877	{
615	878	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -617,20 +880,38 @@
617	880	else
618	881	{
619	882	keeprect = frame.getBounds();
620		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
621		- Dimension rect2 = frame.getToolkit().getScreenSize();
622		- frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	883	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	884	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	885	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
623	886	// frame.setState(Frame.MAXIMIZED_BOTH);
	887	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
624	888	}
625	889
626	890	maximized ^= true;
	891	+
	892	+ frame.validate();
627	893	}
	894	+
	895	+ cButton minButton;
	896	+ cButton maxButton;
	897	+ cButton fullButton;
	898	+ cButton collapseButton;
	899	+ cButton maximize3DButton;
628	900
629	901	void ToggleFullScreen()
630	902	{
631		- if (CameraPane.FULLSCREEN)
	903	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	904	+
	905	+ cameraView.ToggleFullScreen();
	906	+
	907	+ if (!CameraPane.FULLSCREEN)
632	908	{
633	909	device.setFullScreenWindow(null);
	910	+ frame.dispose();
	911	+ frame.setUndecorated(false);
	912	+ frame.validate();
	913	+ frame.setVisible(true);
	914	+
634	915	//frame.setVisible(false);
635	916	// frame.removeNotify();
636	917	// frame.setUndecorated(false);
..	..	@@ -640,13 +921,13 @@
640	921	// X frame.getContentPane().remove(/"Center",/bigThree);
641	922	// X framePanel.add(bigThree);
642	923	// X frame.getContentPane().add(/"Center",/framePanel);
643		- framePanel.setDividerLocation(1);
	924	+// framePanel.setDividerLocation(46); // icons are 24x24
644	925
645	926	//frame.setVisible(true);
646		- radio.layout = keepButton;
	927	+// radio.layout = keepButton;
647	928	//theFrame = null;
648	929	keepButton = null;
649		- radio.layout.doClick();
	930	+// radio.layout.doClick();
650	931
651	932	} else
652	933	{
..	..	@@ -655,22 +936,70 @@
655	936	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
656	937	// frame.getToolkit().getScreenSize().height);
657	938	//frame.setVisible(false);
	939	+
	940	+ frame.dispose();
	941	+ frame.setUndecorated(true);
658	942	device.setFullScreenWindow(frame);
	943	+ frame.validate();
	944	+ frame.setVisible(true);
659	945	// frame.removeNotify();
660	946	// frame.setUndecorated(true);
661	947	// frame.addNotify();
662	948	// X frame.getContentPane().remove(/"Center",/framePanel);
663	949	// X framePanel.remove(bigThree);
664	950	// X frame.getContentPane().add(/"Center",/bigThree);
665		- framePanel.setDividerLocation(0);
	951	+// framePanel.setDividerLocation(0);
666	952
667		- radio.layout = twoButton;
668		- radio.layout.doClick();
	953	+// radio.layout = fullscreenLayout;
	954	+// radio.layout.doClick();
669	955	//frame.setVisible(true);
670	956	}
671		-
672		- cameraView.ToggleFullScreen();
	957	+ frame.validate();
	958	+
	959	+ cameraView.requestFocusInWindow();
673	960	}
	961	+
	962	+ void CollapseToolbar()
	963	+ {
	964	+ framePanel.setDividerLocation(0);
	965	+ //frame.validate();
	966	+
	967	+ cameraView.requestFocusInWindow();
	968	+ }
	969	+
	970	+ private Object3D Duplicate(Object3D object)
	971	+ {
	972	+ boolean temp = CameraPane.SWITCH;
	973	+ CameraPane.SWITCH = false;
	974	+
	975	+ if (Grafreed.grafreed.universe.versiontable == null)
	976	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	977	+
	978	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	979	+ // if (copy == client)
	980	+
	981	+ Object3D versions[] = object.versionlist;
	982	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	983	+ object.versionlist = null;
	984	+ object.versiontable = null;
	985	+
	986	+ Object3D parent = object.parent;
	987	+ object.parent = null;
	988	+
	989	+ //byte[] compress = Compress(copy);
	990	+ Object3D compress = (Object3D)Grafreed.clone(object);
	991	+
	992	+ object.parent = parent;
	993	+
	994	+ object.versionlist = versions;
	995	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	996	+
	997	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	998	+
	999	+ CameraPane.SWITCH = temp;
	1000	+
	1001	+ return compress;
	1002	+ }
674	1003
675	1004	private JTextPane createTextPane()
676	1005	{
..	..	@@ -793,6 +1122,7 @@
793	1122	{
794	1123	SetupMaterial(materialPanel);
795	1124	}
	1125	+
796	1126	//SetupName();
797	1127	//SetupViews();
798	1128	}
..	..	@@ -802,7 +1132,7 @@
802	1132	// NumberSlider vDivsField;
803	1133	// JCheckBox endcaps;
804	1134	JCheckBox liveCB;
805		- JCheckBox selectCB;
	1135	+ JCheckBox selectableCB;
806	1136	JCheckBox hideCB;
807	1137	JCheckBox link2masterCB;
808	1138	JCheckBox markCB;
..	..	@@ -810,7 +1140,12 @@
810	1140	JCheckBox speedupCB;
811	1141	JCheckBox rewindCB;
812	1142	JCheckBox flipVCB;
	1143	+
	1144	+ cCheckBox toggleTextureCB;
	1145	+ cCheckBox toggleSwitchCB;
	1146	+
813	1147	JComboBox texresMenu;
	1148	+
814	1149	JButton resetButton;
815	1150	JButton stepButton;
816	1151	JButton stepAllButton;
..	..	@@ -819,10 +1154,13 @@
819	1154	JButton fasterButton;
820	1155	JButton remarkButton;
821	1156
	1157	+ cGridBag editPanel;
	1158	+ cGridBag editCommandsPanel;
	1159	+
822	1160	cGridBag namePanel;
823	1161	cGridBag setupPanel;
824	1162	cGridBag setupPanel2;
825		- cGridBag commandsPanel;
	1163	+ cGridBag objectCommandsPanel;
826	1164	cGridBag pushPanel;
827	1165	cGridBag fillPanel;
828	1166
..	..	@@ -993,39 +1331,55 @@
993	1331
994	1332	namePanel = new cGridBag();
995	1333
	1334	+ //if (copy.pinned)
	1335	+ {
	1336	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
	1337	+ pinButton.setSelected(copy.pinned);
	1338	+ cGridBag t = new cGridBag();
	1339	+ t.preferredWidth = 2;
	1340	+ t.add(pinButton);
	1341	+ namePanel.add(t);
	1342	+
	1343	+ pinButton.addItemListener(this);
	1344	+ }
	1345	+
996	1346	nameField = AddText(namePanel, copy.GetName());
997		- namePanel.add(nameField);
	1347	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
998	1348	oe.ctrlPanel.add(namePanel);
999	1349
1000	1350	oe.ctrlPanel.Return();
1001	1351
1002		- if (!GroupEditor.allparams)
	1352	+ if (!allparams)
1003	1353	return;
1004	1354
1005	1355	setupPanel = new cGridBag().setVertical(false);
1006	1356
1007	1357	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1008	1358	liveCB.setToolTipText("Animate object");
1009		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1010		- selectCB.setToolTipText("Make object selectable");
	1359	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1360	+ markCB.setToolTipText("Set target transform");
	1361	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1362	+ selectableCB.setToolTipText("Make object selectable");
1011	1363	// Return();
	1364	+
1012	1365	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1013	1366	hideCB.setToolTipText("Hide object");
1014		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1015		- markCB.setToolTipText("Set the animation target transform");
	1367	+
	1368	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1016	1369
1017	1370	setupPanel2 = new cGridBag().setVertical(false);
1018	1371
1019	1372	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1020	1373	rewindCB.setToolTipText("Rewind animation");
1021	1374
1022		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1023		- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1375	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1376	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1024	1377
	1378	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1379	+ link2masterCB.setToolTipText("Attach to support");
	1380	+
1025	1381	if (Globals.ADVANCED)
1026	1382	{
1027		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1028		- link2masterCB.setToolTipText("Attach to support");
1029	1383	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1030	1384	speedupCB.setToolTipText("Option motion capture");
1031	1385	}
..	..	@@ -1035,23 +1389,23 @@
1035	1389	oe.ctrlPanel.add(setupPanel2);
1036	1390	oe.ctrlPanel.Return();
1037	1391
1038		- commandsPanel = new cGridBag().setVertical(false);
	1392	+ objectCommandsPanel = new cGridBag().setVertical(false);
1039	1393
1040		- resetButton = AddButton(commandsPanel, "Reset");
	1394	+ resetButton = AddButton(objectCommandsPanel, "Reset");
1041	1395	resetButton.setToolTipText("Jump to frame zero");
1042		- stepButton = AddButton(commandsPanel, "Step");
	1396	+ stepButton = AddButton(objectCommandsPanel, "Step");
1043	1397	stepButton.setToolTipText("Step one frame");
1044	1398	// resetAllButton = AddButton(oe, "Reset All");
1045	1399	// stepAllButton = AddButton(oe, "Step All");
1046	1400	// Return();
1047		- slowerButton = AddButton(commandsPanel, "Slow");
	1401	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1048	1402	slowerButton.setToolTipText("Decrease animation speed");
1049		- fasterButton = AddButton(commandsPanel, "Fast");
	1403	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1050	1404	fasterButton.setToolTipText("Increase animation speed");
1051		- remarkButton = AddButton(commandsPanel, "Remark");
	1405	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1052	1406	remarkButton.setToolTipText("Set the current transform as the target");
1053	1407
1054		- oe.ctrlPanel.add(commandsPanel);
	1408	+ oe.ctrlPanel.add(objectCommandsPanel);
1055	1409	oe.ctrlPanel.Return();
1056	1410
1057	1411	pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
..	..	@@ -1211,22 +1565,9 @@
1211	1565
1212	1566	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1213	1567	{
1214		- System.out.println("CREATE CAMERAS");
1215		- cams = new cTemplate();
1216		- cams.name = "Cameras";
1217		- copy.insertElementAt(cams, 0);
1218		- //cams.parent = copy;
1219		-
1220		- cam = new Camera(); // LA.newVector(3, 2, 1));
1221		- cams.addChild(cam);
1222		- cam = new Camera(1);
1223		- cams.addChild(cam);
1224		- cam = new Camera(2);
1225		- cams.addChild(cam);
1226		- cam = new Camera(3);
1227		- cams.addChild(cam);
1228		- cam = new Camera(4); // Light
1229		- cams.addChild(cam);
	1568	+ if (Globals.DEBUG)
	1569	+ System.out.println("CREATE CAMERAS");
	1570	+ cams = CreateCameras();
1230	1571	} else
1231	1572	{
1232	1573	cams = (cGroup) copy.get(0);
..	..	@@ -1292,6 +1633,45 @@
1292	1633	//frontView.object = copy;
1293	1634	//sideView.object = copy;
1294	1635
	1636	+ transformPanel = new cGridBag().setVertical(true);
	1637	+
	1638	+ cGridBag resetTransformPanel = new cGridBag();
	1639	+
	1640	+ resetTransformPanel.preferredHeight = 2;
	1641	+
	1642	+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
	1643	+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
	1644	+ resetTransform.addMouseListener(new MouseAdapter()
	1645	+ {
	1646	+ public void mouseClicked(MouseEvent e)
	1647	+ {
	1648	+ ResetTransform();
	1649	+ }
	1650	+ });
	1651	+ resetTransformPanel.add(resetTransform);
	1652	+
	1653	+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
	1654	+ resetTransform.setToolTipText("Reset Translation only");
	1655	+ resetTransform.addMouseListener(new MouseAdapter()
	1656	+ {
	1657	+ public void mouseClicked(MouseEvent e)
	1658	+ {
	1659	+ ResetTransform(1);
	1660	+ }
	1661	+ });
	1662	+ resetTransformPanel.add(resetTransform);
	1663	+
	1664	+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
	1665	+ resetTransform.setToolTipText("Reset Rotation and Scale only");
	1666	+ resetTransform.addMouseListener(new MouseAdapter()
	1667	+ {
	1668	+ public void mouseClicked(MouseEvent e)
	1669	+ {
	1670	+ ResetTransform(2);
	1671	+ }
	1672	+ });
	1673	+ resetTransformPanel.add(resetTransform);
	1674	+
1295	1675	XYZPanel = new cGridBag().setVertical(true);
1296	1676	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1297	1677
..	..	@@ -1299,7 +1679,11 @@
1299	1679	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1300	1680	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1301	1681	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1682	+ //XYZPanel.setName("XYZ");
1302	1683
	1684	+ transformPanel.add(resetTransformPanel);
	1685	+ transformPanel.add(XYZPanel);
	1686	+
1303	1687	/*
1304	1688	gridPanel = new JPanel(); //new BorderLayout());
1305	1689	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1307,12 +1691,12 @@
1307	1691	gridPanel.add(cameraView);
1308	1692	gridPanel.add(XYZPanel);
1309	1693	*/
1310		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1311		- gridPanel.setContinuousLayout(true);
1312		- gridPanel.setOneTouchExpandable(true);
1313		- gridPanel.setDividerLocation(1.0);
1314		- gridPanel.setDividerSize(9);
1315		- gridPanel.setResizeWeight(0.85);
	1694	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1695	+// gridPanel.setContinuousLayout(true);
	1696	+// gridPanel.setOneTouchExpandable(true);
	1697	+// gridPanel.setDividerLocation(1.0);
	1698	+// gridPanel.setDividerSize(9);
	1699	+// gridPanel.setResizeWeight(0.85);
1316	1700
1317	1701	// aConstraints.weighty = 0;
1318	1702	//System.out.println("THIS = " + this);
..	..	@@ -1335,14 +1719,34 @@
1335	1719
1336	1720	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1337	1721	//tmp.setName("Edit");
	1722	+ objectPanel.add(skyboxPanel);
	1723	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1724	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1725	+
	1726	+ objectPanel.add(toolboxPanel);
	1727	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1728	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1729	+
1338	1730	objectPanel.add(materialPanel);
	1731	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1732	+ objectPanel.setToolTipTextAt(2, "Material");
	1733	+
1339	1734	// JPanel north = new JPanel(new BorderLayout());
1340	1735	// north.setName("Edit");
1341	1736	// north.add(ctrlPanel, BorderLayout.NORTH);
1342	1737	// objectPanel.add(north);
1343		- objectPanel.add(ctrlPanel);
1344		- objectPanel.add(infoPanel);
1345		-
	1738	+ objectPanel.add(editPanel);
	1739	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
	1740	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1741	+
	1742	+ objectPanel.add(transformPanel);
	1743	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1744	+ objectPanel.setToolTipTextAt(4, "TRS transform");
	1745	+
	1746	+ patchMaterial = true;
	1747	+ cameraView.patchMaterial = this;
	1748	+ objectPanel.setSelectedIndex(2);
	1749	+
1346	1750	/*
1347	1751	aConstraints.gridx = 0;
1348	1752	aConstraints.gridwidth = 1;
..	..	@@ -1350,7 +1754,7 @@
1350	1754	aConstraints.gridy += 1;
1351	1755	aConstraints.gridwidth = 1;
1352	1756	mainPanel.add(objectPanel, aConstraints);
1353		- */
	1757	+ */
1354	1758
1355	1759	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1356	1760	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1367,17 +1771,57 @@
1367	1771	JTabbedPane tabbedPane = new JTabbedPane();
1368	1772	tabbedPane.add(scrollpane);
1369	1773
1370		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1371		-
1372		- optionsPanel = new cGridBag().setVertical(true);
	1774	+ optionsPanel = new cGridBag().setVertical(false);
1373	1775
1374	1776	optionsPanel.setName("Options");
1375	1777
1376	1778	AddOptions(optionsPanel); //, aConstraints);
1377	1779
	1780	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1781	+
1378	1782	tabbedPane.add(optionsPanel);
1379	1783
1380	1784	scenePanel.add(tabbedPane);
	1785	+
	1786	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1787	+ creditsPanel.setName("Credits");
	1788	+
	1789	+ cLabel ogaLabel = new cLabel(" Most Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1790	+ creditsPanel.add(ogaLabel);
	1791	+
	1792	+ cButton opengameartButton;
	1793	+ creditsPanel.add(opengameartButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1794	+ opengameartButton.setToolTipText("https://opengameart.org");
	1795	+
	1796	+ opengameartButton.addMouseListener(new MouseAdapter()
	1797	+ {
	1798	+ public void mouseClicked(MouseEvent e)
	1799	+ {
	1800	+ try
	1801	+ {
	1802	+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
	1803	+ } catch (Exception e1)
	1804	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1805	+ {
	1806	+ e1.printStackTrace();
	1807	+ }
	1808	+ }
	1809	+ });
	1810	+
	1811	+ for (int i=10; --i>=0;)
	1812	+ {
	1813	+ creditsPanel.add(new cGridBag());
	1814	+ }
	1815	+
	1816	+ tabbedPane.add(creditsPanel);
	1817	+ tabbedPane.setToolTipTextAt(3, "Credits");
	1818	+
	1819	+ if (Globals.ADVANCED)
	1820	+ {
	1821	+ tabbedPane.add(infoPanel);
	1822	+ tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
	1823	+ tabbedPane.setToolTipTextAt(4, "Information");
	1824	+ }
1381	1825
1382	1826	/*
1383	1827	cTree jTree = new cTree(null);
..	..	@@ -1399,13 +1843,13 @@
1399	1843	jtp.add(tree);
1400	1844	*/
1401	1845
1402		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1403		- bigPanel.setContinuousLayout(true);
1404		- bigPanel.setOneTouchExpandable(true);
1405		- bigPanel.setDividerLocation(0.8);
1406		- bigPanel.setDividerSize(15);
1407		- bigPanel.setResizeWeight(0.15);
1408		- bigPanel.setName("Scene");
	1846	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1847	+// bigPanel.setContinuousLayout(true);
	1848	+// bigPanel.setOneTouchExpandable(true);
	1849	+// bigPanel.setDividerLocation(0.8);
	1850	+// bigPanel.setDividerSize(15);
	1851	+// bigPanel.setResizeWeight(0.15);
	1852	+// bigPanel.setName("Scene");
1409	1853
1410	1854	//bigPanel.setLayout(new BorderLayout());
1411	1855	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1440,7 +1884,7 @@
1440	1884	bigThree = new cGridBag();
1441	1885	bigThree.addComponent(scenePanel);
1442	1886	bigThree.addComponent(centralPanel);
1443		- bigThree.addComponent(XYZPanel);
	1887	+ //bigThree.addComponent(XYZPanel);
1444	1888
1445	1889	// // SIDE EFFECT!!!
1446	1890	// aConstraints.gridx = 0;
..	..	@@ -1449,16 +1893,33 @@
1449	1893	// aConstraints.gridheight = 1;
1450	1894
1451	1895	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1452		- framePanel.setContinuousLayout(true);
1453		- framePanel.setOneTouchExpandable(true);
1454		- framePanel.setDividerLocation(0.8);
	1896	+
	1897	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1898	+ new java.beans.PropertyChangeListener()
	1899	+ {
	1900	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1901	+ {
	1902	+ if ((Integer)pce.getOldValue() == 1)
	1903	+ {
	1904	+ if (radio.layout != expandedLayout)
	1905	+ {
	1906	+ radio.layout = expandedLayout;
	1907	+ radio.layout.doClick();
	1908	+ }
	1909	+ }
	1910	+ }
	1911	+ });
	1912	+
	1913	+ framePanel.setContinuousLayout(false);
	1914	+ framePanel.setOneTouchExpandable(false);
	1915	+ //.setDividerLocation(0.8);
1455	1916	//framePanel.setDividerSize(15);
1456	1917	//framePanel.setResizeWeight(0.15);
1457	1918	framePanel.setName("Frame");
1458	1919
1459	1920	frame.getContentPane().setLayout(new BorderLayout());
1460	1921	/**/
1461		- JTabbedPane worldPane = new JTabbedPane();
	1922	+ //JTabbedPane worldPane = new JTabbedPane();
1462	1923	//worldPane.add(bigPanel);
1463	1924	//worldPane.add(worldPanel);
1464	1925	/**/
..	..	@@ -1469,16 +1930,18 @@
1469	1930	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1470	1931
1471	1932	frame.setSize(1280, 860);
1472		- frame.setVisible(true);
1473		-
	1933	+
1474	1934	cameraView.requestFocusInWindow();
1475	1935
1476		- gridPanel.setDividerLocation(1.0);
	1936	+// gridPanel.setDividerLocation(1.0);
	1937	+
	1938	+ frame.validate();
	1939	+
	1940	+ frame.setVisible(true);
1477	1941
1478	1942	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1479	1943	frame.addWindowListener(new WindowAdapter()
1480	1944	{
1481		-
1482	1945	public void windowClosing(WindowEvent e)
1483	1946	{
1484	1947	Close();
..	..	@@ -1501,28 +1964,442 @@
1501	1964	ctrlPanel.removeAll();
1502	1965	}
1503	1966
1504		- void SetupMaterial(cGridBag panel)
	1967	+ void SetupMaterial(cGridBag materialpanel)
1505	1968	{
1506		- /*
	1969	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1970	+
	1971	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
	1972	+ skin.setToolTipText("Skin");
	1973	+ skin.addMouseListener(new MouseAdapter()
	1974	+ {
	1975	+ public void mouseClicked(MouseEvent e)
	1976	+ {
	1977	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1978	+ cMaterial material = object.material;
	1979	+
	1980	+ // Skin
	1981	+ colorField.setFloat(material.color);
	1982	+ float saturation = material.modulation;
	1983	+
	1984	+ if (!cameraView.Skinshader)
	1985	+ {
	1986	+ saturation /= 1.5;
	1987	+ }
	1988	+
	1989	+ saturationField.setFloat(saturation);
	1990	+
	1991	+ subsurfaceField.setFloat(material.subsurface);
	1992	+ selfshadowField.setFloat(material.diffuseness);
	1993	+ diffusenessField.setFloat(material.factor);
	1994	+ shininessField.setFloat(material.shininess);
	1995	+ shadowbiasField.setFloat(material.shadowbias);
	1996	+ diffuseField.setFloat(material.diffuse);
	1997	+ specularField.setFloat(material.specular);
	1998	+
	1999	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2000	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2001	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2002	+
	2003	+ materialtouched = true;
	2004	+ applySelf();
	2005	+ }
	2006	+ });
	2007	+ presetpanel.add(skin);
	2008	+
	2009	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
	2010	+ lambert.setToolTipText("Diffuse");
	2011	+ lambert.addMouseListener(new MouseAdapter()
	2012	+ {
	2013	+ public void mouseClicked(MouseEvent e)
	2014	+ {
	2015	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	2016	+ cMaterial material = object.material;
	2017	+
	2018	+ diffusenessField.setFloat(material.factor);
	2019	+ selfshadowField.setFloat(material.diffuseness);
	2020	+
	2021	+ materialtouched = true;
	2022	+ applySelf();
	2023	+ }
	2024	+ });
	2025	+ presetpanel.add(lambert);
	2026	+
	2027	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
	2028	+ diffuse2.setToolTipText("Diffuse2");
	2029	+ diffuse2.addMouseListener(new MouseAdapter()
	2030	+ {
	2031	+ public void mouseClicked(MouseEvent e)
	2032	+ {
	2033	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	2034	+ cMaterial material = object.material;
	2035	+
	2036	+ diffusenessField.setFloat(material.factor);
	2037	+ selfshadowField.setFloat(material.diffuseness);
	2038	+
	2039	+ materialtouched = true;
	2040	+ applySelf();
	2041	+ }
	2042	+ });
	2043	+ presetpanel.add(diffuse2);
	2044	+
	2045	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
	2046	+ diffusemoon.setToolTipText("Moon");
	2047	+ diffusemoon.addMouseListener(new MouseAdapter()
	2048	+ {
	2049	+ public void mouseClicked(MouseEvent e)
	2050	+ {
	2051	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	2052	+ cMaterial material = object.material;
	2053	+
	2054	+ diffusenessField.setFloat(material.factor);
	2055	+ selfshadowField.setFloat(material.diffuseness);
	2056	+
	2057	+ materialtouched = true;
	2058	+ applySelf();
	2059	+ }
	2060	+ });
	2061	+ presetpanel.add(diffusemoon);
	2062	+
	2063	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
	2064	+ diffusemoon2.setToolTipText("Moon2");
	2065	+ diffusemoon2.addMouseListener(new MouseAdapter()
	2066	+ {
	2067	+ public void mouseClicked(MouseEvent e)
	2068	+ {
	2069	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	2070	+ cMaterial material = object.material;
	2071	+
	2072	+ diffusenessField.setFloat(material.factor);
	2073	+ selfshadowField.setFloat(material.diffuseness);
	2074	+
	2075	+ materialtouched = true;
	2076	+ applySelf();
	2077	+ }
	2078	+ });
	2079	+ presetpanel.add(diffusemoon2);
	2080	+
	2081	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
	2082	+ diffusemoon3.setToolTipText("Moon3");
	2083	+ diffusemoon3.addMouseListener(new MouseAdapter()
	2084	+ {
	2085	+ public void mouseClicked(MouseEvent e)
	2086	+ {
	2087	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	2088	+ cMaterial material = object.material;
	2089	+
	2090	+ diffusenessField.setFloat(material.factor);
	2091	+ selfshadowField.setFloat(material.diffuseness);
	2092	+
	2093	+ materialtouched = true;
	2094	+ applySelf();
	2095	+ }
	2096	+ });
	2097	+ presetpanel.add(diffusemoon3);
	2098	+
	2099	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
	2100	+ diffusesheen.setToolTipText("Sheen");
	2101	+ diffusesheen.addMouseListener(new MouseAdapter()
	2102	+ {
	2103	+ public void mouseClicked(MouseEvent e)
	2104	+ {
	2105	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2106	+ cMaterial material = object.material;
	2107	+
	2108	+ sheenField.setFloat(material.sheen);
	2109	+
	2110	+ materialtouched = true;
	2111	+ applySelf();
	2112	+ }
	2113	+ });
	2114	+ presetpanel.add(diffusesheen);
	2115	+
	2116	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
	2117	+ rough.setToolTipText("Rough metal");
	2118	+ rough.addMouseListener(new MouseAdapter()
	2119	+ {
	2120	+ public void mouseClicked(MouseEvent e)
	2121	+ {
	2122	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2123	+ cMaterial material = object.material;
	2124	+
	2125	+ shininessField.setFloat(material.shininess);
	2126	+ velvetField.setFloat(material.velvet);
	2127	+
	2128	+ materialtouched = true;
	2129	+ applySelf();
	2130	+ }
	2131	+ });
	2132	+ presetpanel.add(rough);
	2133	+
	2134	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
	2135	+ rough2.setToolTipText("Medium metal");
	2136	+ rough2.addMouseListener(new MouseAdapter()
	2137	+ {
	2138	+ public void mouseClicked(MouseEvent e)
	2139	+ {
	2140	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2141	+ cMaterial material = object.material;
	2142	+
	2143	+ shininessField.setFloat(material.shininess);
	2144	+ lightareaField.setFloat(material.lightarea);
	2145	+
	2146	+ materialtouched = true;
	2147	+ applySelf();
	2148	+ }
	2149	+ });
	2150	+ presetpanel.add(rough2);
	2151	+
	2152	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
	2153	+ shini0.setToolTipText("Shiny");
	2154	+ shini0.addMouseListener(new MouseAdapter()
	2155	+ {
	2156	+ public void mouseClicked(MouseEvent e)
	2157	+ {
	2158	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2159	+ cMaterial material = object.material;
	2160	+
	2161	+ shininessField.setFloat(material.shininess);
	2162	+ lightareaField.setFloat(material.lightarea);
	2163	+
	2164	+ materialtouched = true;
	2165	+ applySelf();
	2166	+ }
	2167	+ });
	2168	+ presetpanel.add(shini0);
	2169	+
	2170	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
	2171	+ shini1.setToolTipText("Shiny2");
	2172	+ shini1.addMouseListener(new MouseAdapter()
	2173	+ {
	2174	+ public void mouseClicked(MouseEvent e)
	2175	+ {
	2176	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2177	+ cMaterial material = object.material;
	2178	+
	2179	+ shininessField.setFloat(material.shininess);
	2180	+ lightareaField.setFloat(material.lightarea);
	2181	+
	2182	+ materialtouched = true;
	2183	+ applySelf();
	2184	+ }
	2185	+ });
	2186	+ presetpanel.add(shini1);
	2187	+
	2188	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
	2189	+ shini2.setToolTipText("Shiny3");
	2190	+ shini2.addMouseListener(new MouseAdapter()
	2191	+ {
	2192	+ public void mouseClicked(MouseEvent e)
	2193	+ {
	2194	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2195	+ cMaterial material = object.material;
	2196	+
	2197	+ shininessField.setFloat(material.shininess);
	2198	+ lightareaField.setFloat(material.lightarea);
	2199	+
	2200	+ materialtouched = true;
	2201	+ applySelf();
	2202	+ }
	2203	+ });
	2204	+ presetpanel.add(shini2);
	2205	+
	2206	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
	2207	+ aniso.setToolTipText("AnisoU");
	2208	+ aniso.addMouseListener(new MouseAdapter()
	2209	+ {
	2210	+ public void mouseClicked(MouseEvent e)
	2211	+ {
	2212	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2213	+ cMaterial material = object.material;
	2214	+
	2215	+ anisoField.setFloat(material.aniso);
	2216	+ anisoVField.setFloat(material.anisoV);
	2217	+
	2218	+ materialtouched = true;
	2219	+ applySelf();
	2220	+ }
	2221	+ });
	2222	+ presetpanel.add(aniso);
	2223	+
	2224	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
	2225	+ aniso2.setToolTipText("AnisoV");
	2226	+ aniso2.addMouseListener(new MouseAdapter()
	2227	+ {
	2228	+ public void mouseClicked(MouseEvent e)
	2229	+ {
	2230	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2231	+ cMaterial material = object.material;
	2232	+
	2233	+ anisoField.setFloat(material.aniso);
	2234	+ anisoVField.setFloat(material.anisoV);
	2235	+
	2236	+ materialtouched = true;
	2237	+ applySelf();
	2238	+ }
	2239	+ });
	2240	+ presetpanel.add(aniso2);
	2241	+
	2242	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
	2243	+ aniso3.setToolTipText("AnisoUV");
	2244	+ aniso3.addMouseListener(new MouseAdapter()
	2245	+ {
	2246	+ public void mouseClicked(MouseEvent e)
	2247	+ {
	2248	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2249	+ cMaterial material = object.material;
	2250	+
	2251	+ anisoField.setFloat(material.aniso);
	2252	+ anisoVField.setFloat(material.anisoV);
	2253	+
	2254	+ materialtouched = true;
	2255	+ applySelf();
	2256	+ }
	2257	+ });
	2258	+ presetpanel.add(aniso3);
	2259	+
	2260	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
	2261	+ velvet0.setToolTipText("Velvet");
	2262	+ velvet0.addMouseListener(new MouseAdapter()
	2263	+ {
	2264	+ public void mouseClicked(MouseEvent e)
	2265	+ {
	2266	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2267	+ cMaterial material = object.material;
	2268	+
	2269	+ diffusenessField.setFloat(material.factor);
	2270	+ selfshadowField.setFloat(material.diffuseness);
	2271	+ sheenField.setFloat(material.sheen);
	2272	+ shininessField.setFloat(material.shininess);
	2273	+ velvetField.setFloat(material.velvet);
	2274	+ shiftField.setFloat(material.shift);
	2275	+
	2276	+ materialtouched = true;
	2277	+ applySelf();
	2278	+ }
	2279	+ });
	2280	+ presetpanel.add(velvet0);
	2281	+
	2282	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
	2283	+ bump0.setToolTipText("Bump texture");
	2284	+ bump0.addMouseListener(new MouseAdapter()
	2285	+ {
	2286	+ public void mouseClicked(MouseEvent e)
	2287	+ {
	2288	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2289	+ cMaterial material = object.material;
	2290	+
	2291	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2292	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2293	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2294	+
	2295	+ materialtouched = true;
	2296	+ applySelf();
	2297	+ }
	2298	+ });
	2299	+ presetpanel.add(bump0);
	2300	+
	2301	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
	2302	+ borderShader.setToolTipText("Border fade");
	2303	+ borderShader.addMouseListener(new MouseAdapter()
	2304	+ {
	2305	+ public void mouseClicked(MouseEvent e)
	2306	+ {
	2307	+ borderfadeField.setFloat(0.5);
	2308	+ opacityField.setFloat(0.75);
	2309	+
	2310	+ materialtouched = true;
	2311	+ applySelf();
	2312	+ }
	2313	+ });
	2314	+ presetpanel.add(borderShader);
	2315	+
	2316	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
	2317	+ halo.setToolTipText("Halo");
	2318	+ halo.addMouseListener(new MouseAdapter()
	2319	+ {
	2320	+ public void mouseClicked(MouseEvent e)
	2321	+ {
	2322	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2323	+ cMaterial material = object.material;
	2324	+
	2325	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2326	+
	2327	+ materialtouched = true;
	2328	+ applySelf();
	2329	+ }
	2330	+ });
	2331	+ presetpanel.add(halo);
	2332	+
	2333	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
	2334	+ candle.setToolTipText("Candle");
	2335	+ candle.addMouseListener(new MouseAdapter()
	2336	+ {
	2337	+ public void mouseClicked(MouseEvent e)
	2338	+ {
	2339	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2340	+ cMaterial material = object.material;
	2341	+
	2342	+ subsurfaceField.setFloat(material.subsurface);
	2343	+ shadowbiasField.setFloat(material.shadowbias);
	2344	+ ambientField.setFloat(material.ambient);
	2345	+ specularField.setFloat(material.specular);
	2346	+ lightareaField.setFloat(material.lightarea);
	2347	+ shininessField.setFloat(material.shininess);
	2348	+
	2349	+ materialtouched = true;
	2350	+ applySelf();
	2351	+ }
	2352	+ });
	2353	+ presetpanel.add(candle);
	2354	+
	2355	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
	2356	+ shadowShader.setToolTipText("Shadow");
	2357	+ shadowShader.addMouseListener(new MouseAdapter()
	2358	+ {
	2359	+ public void mouseClicked(MouseEvent e)
	2360	+ {
	2361	+ diffuseField.setFloat(0.001);
	2362	+ ambientField.setFloat(0.001);
	2363	+ cameraField.setFloat(0.001);
	2364	+ specularField.setFloat(0.001);
	2365	+ fakedepthField.setFloat(0.001);
	2366	+ opacityField.setFloat(0.6);
	2367	+
	2368	+ materialtouched = true;
	2369	+ applySelf();
	2370	+ }
	2371	+ });
	2372	+ presetpanel.add(shadowShader);
	2373	+
	2374	+ cGridBag panel = new cGridBag().setVertical(true);
	2375	+
	2376	+ presetpanel.preferredWidth = 1;
	2377	+
	2378	+ materialpanel.add(presetpanel);
	2379	+ materialpanel.add(panel);
	2380	+
	2381	+ panel.preferredWidth = 8;
	2382	+
	2383	+ /*
1507	2384	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1508	2385	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1509		- */
	2386	+ */
1510	2387
1511	2388	cGridBag editBar = new cGridBag().setVertical(false);
1512	2389
1513		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2390	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
1514	2391	createMaterialButton.setToolTipText("Create material");
1515	2392
1516	2393	/*
1517	2394	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1518	2395	*/
1519	2396
1520		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2397	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
1521	2398	clearMaterialButton.setToolTipText("Clear material");
1522	2399
1523	2400	if (Globals.ADVANCED)
1524	2401	{
1525		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2402	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
1526	2403	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1527	2404	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1528	2405	}
..	..	@@ -1540,45 +2417,61 @@
1540	2417	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1541	2418
1542	2419	cGridBag colorSection = new cGridBag().setVertical(true);
	2420	+
	2421	+ cGridBag huepanel = new cGridBag();
	2422	+ cGridBag huelabel = new cGridBag();
	2423	+ cLabel hue = GetLabel("icons/hue.png", false);
	2424	+ hue.fit = true;
	2425	+
	2426	+ hue.addMouseListener(new MouseAdapter()
	2427	+ {
	2428	+ public void mousePressed(MouseEvent e)
	2429	+ {
	2430	+ int x = e.getX();
	2431	+
	2432	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2433	+ }
	2434	+ });
	2435	+
	2436	+ huelabel.add(hue);
	2437	+ huelabel.preferredWidth = 20;
	2438	+ huepanel.add(new cGridBag()); // Label
	2439	+ huepanel.add(huelabel); // Field/slider
	2440	+
	2441	+ huepanel.preferredHeight = 7;
	2442	+
	2443	+ colorSection.add(huepanel);
1543	2444
1544	2445	cGridBag color = new cGridBag();
1545		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1546		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1547		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2446	+
	2447	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2448	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2449	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2450	+
1548	2451	//colorField.preferredWidth = 200;
1549	2452	colorSection.add(color);
1550	2453
1551	2454	cGridBag modulation = new cGridBag();
1552	2455	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1553	2456	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1554		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2457	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1555	2458	colorSection.add(modulation);
1556	2459
	2460	+ cGridBag opacity = new cGridBag();
	2461	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2462	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2463	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2464	+ colorSection.add(opacity);
	2465	+
	2466	+ colorSection.add(GetSeparator());
	2467	+
1557	2468	cGridBag texture = new cGridBag();
1558	2469	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1559	2470	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1560	2471	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1561	2472	colorSection.add(texture);
1562	2473
1563		- cGridBag anisoU = new cGridBag();
1564		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1565		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1566		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1567		- colorSection.add(anisoU);
1568		-
1569		- cGridBag anisoV = new cGridBag();
1570		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1571		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1572		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1573		- colorSection.add(anisoV);
1574		-
1575		- cGridBag shadowbias = new cGridBag();
1576		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1577		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1578		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1579		- colorSection.add(shadowbias);
1580		-
1581		- panel.add(new JSeparator());
	2474	+ panel.add(GetSeparator());
1582	2475
1583	2476	panel.add(colorSection);
1584	2477
..	..	@@ -1628,7 +2521,13 @@
1628	2521	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1629	2522	diffuseSection.add(fakedepth);
1630	2523
1631		- panel.add(new JSeparator());
	2524	+ cGridBag shadowbias = new cGridBag();
	2525	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2526	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2527	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2528	+ diffuseSection.add(shadowbias);
	2529	+
	2530	+ panel.add(GetSeparator());
1632	2531
1633	2532	panel.add(diffuseSection);
1634	2533
..	..	@@ -1678,42 +2577,48 @@
1678	2577	// aConstraints.gridy += 1;
1679	2578	// aConstraints.gridwidth = 1;
1680	2579
	2580	+ cGridBag anisoU = new cGridBag();
	2581	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2582	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2583	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2584	+ specularSection.add(anisoU);
1681	2585
1682		- panel.add(new JSeparator());
	2586	+ cGridBag anisoV = new cGridBag();
	2587	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2588	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2589	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2590	+ specularSection.add(anisoV);
	2591	+
	2592	+
	2593	+ panel.add(GetSeparator());
1683	2594
1684	2595	panel.add(specularSection);
1685	2596
1686	2597	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1687	2598
1688		- cGridBag globalSection = new cGridBag().setVertical(true);
	2599	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1689	2600
1690	2601	cGridBag camera = new cGridBag();
1691	2602	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1692	2603	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1693	2604	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1694		- globalSection.add(camera);
	2605	+ colorSection.add(camera);
1695	2606
1696	2607	cGridBag ambient = new cGridBag();
1697	2608	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1698	2609	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1699	2610	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1700		- globalSection.add(ambient);
	2611	+ colorSection.add(ambient);
1701	2612
1702	2613	cGridBag backlit = new cGridBag();
1703	2614	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1704	2615	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1705	2616	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1706		- globalSection.add(backlit);
	2617	+ colorSection.add(backlit);
1707	2618
1708		- cGridBag opacity = new cGridBag();
1709		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1710		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1711		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1712		- globalSection.add(opacity);
1713		-
1714		- panel.add(new JSeparator());
	2619	+ //panel.add(new JSeparator());
1715	2620
1716		- panel.add(globalSection);
	2621	+ //panel.add(globalSection);
1717	2622
1718	2623	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1719	2624
..	..	@@ -1755,7 +2660,7 @@
1755	2660	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1756	2661	textureSection.add(opacityPower);
1757	2662
1758		- panel.add(new JSeparator());
	2663	+ panel.add(GetSeparator());
1759	2664
1760	2665	panel.add(textureSection);
1761	2666
..	..	@@ -1820,8 +2725,9 @@
1820	2725	// 3D models
1821	2726	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1822	2727	{
1823		- lastConverter = new com.jmex.model.converters.MaxToJme();
1824		- LoadFile(filename, lastConverter);
	2728	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2729	+ //LoadFile(filename, lastConverter);
	2730	+ LoadObjFile(filename); // New 3ds loader
1825	2731	continue;
1826	2732	}
1827	2733	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2547,6 +3453,7 @@
2547	3453	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2548	3454	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2549	3455	}
	3456	+
2550	3457	//cJME.count++;
2551	3458	//cJME.count %= 12;
2552	3459	if (gc)
..	..	@@ -2730,6 +3637,7 @@
2730	3637	}
2731	3638	}
2732	3639	}
	3640	+
2733	3641	cFileSystemPane FSPane;
2734	3642
2735	3643	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2739,7 +3647,7 @@
2739	3647
2740	3648	freezematerial = true;
2741	3649	colorField.setFloat(mat.color);
2742		- modulationField.setFloat(mat.modulation);
	3650	+ saturationField.setFloat(mat.modulation);
2743	3651	metalnessField.setFloat(mat.metalness);
2744	3652	diffuseField.setFloat(mat.diffuse);
2745	3653	specularField.setFloat(mat.specular);
..	..	@@ -2783,11 +3691,14 @@
2783	3691	}
2784	3692	}
2785	3693	}
	3694	+
2786	3695	freezematerial = false;
2787	3696	}
2788	3697
2789	3698	void SetMaterial(Object3D object)
2790	3699	{
	3700	+ latestObject = object;
	3701	+
2791	3702	cMaterial mat = object.material;
2792	3703
2793	3704	if (mat == null)
..	..	@@ -2798,32 +3709,8 @@
2798	3709
2799	3710	if (multiplyToggle != null)
2800	3711	multiplyToggle.setSelected(mat.multiply);
2801		-
2802		- assert (object.projectedVertices != null);
2803		-
2804		- if (object.projectedVertices.length <= 2)
2805		- {
2806		- // Side effect...
2807		- Object3D.cVector2[] keep = object.projectedVertices;
2808		- object.projectedVertices = new Object3D.cVector2[3];
2809		- for (int i = 0; i < 3; i++)
2810		- {
2811		- if (i < keep.length)
2812		- {
2813		- object.projectedVertices[i] = keep[i];
2814		- } else
2815		- {
2816		- object.projectedVertices[i] = new Object3D.cVector2();
2817		- }
2818		- /*
2819		- if(keep.length == 0)
2820		- object.projectedVertices[0] = new Object3D.cVector2();
2821		- else
2822		- object.projectedVertices[0] = keep[0];
2823		- object.projectedVertices[1] = new Object3D.cVector2();
2824		- */
2825		- }
2826		- }
	3712	+
	3713	+ AllocProjectedVertices(object);
2827	3714
2828	3715	SetMaterial(mat, object.projectedVertices);
2829	3716	}
..	..	@@ -2899,12 +3786,17 @@
2899	3786	// }
2900	3787
2901	3788	/**/
2902		- if (deselect)
	3789	+ if (deselect \|\| child == null)
2903	3790	{
2904	3791	//group.deselectAll();
2905	3792	//freeze = true;
2906	3793	GetTree().clearSelection();
2907	3794	//freeze = false;
	3795	+
	3796	+ if (child == null)
	3797	+ {
	3798	+ return;
	3799	+ }
2908	3800	}
2909	3801
2910	3802	//group.addSelectee(child);
..	..	@@ -2938,6 +3830,17 @@
2938	3830	public void itemStateChanged(ItemEvent event)
2939	3831	{
2940	3832	// System.out.println("Propagate = " + propagate);
	3833	+ if (event.getSource() == pinButton)
	3834	+ {
	3835	+ copy.pinned ^= true;
	3836	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3837	+ {
	3838	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3839	+ copy.CloseUI();
	3840	+ //copy.editWindow.refreshContents();
	3841	+ }
	3842	+ }
	3843	+ else
2941	3844	if (event.getSource() == propagateToggle)
2942	3845	{
2943	3846	propagate ^= true;
..	..	@@ -2973,7 +3876,7 @@
2973	3876	cameraView.ToggleDL();
2974	3877	cameraView.repaint();
2975	3878	return;
2976		- } else if (event.getSource() == toggleTextureItem)
	3879	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2977	3880	{
2978	3881	cameraView.ToggleTexture();
2979	3882	// june 2013 copy.HardTouch();
..	..	@@ -3012,7 +3915,7 @@
3012	3915	frame.validate();
3013	3916
3014	3917	return;
3015		- } else if (event.getSource() == toggleSwitchItem)
	3918	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3016	3919	{
3017	3920	cameraView.ToggleSwitch();
3018	3921	cameraView.repaint();
..	..	@@ -3042,8 +3945,9 @@
3042	3945	} else if (event.getSource() == liveCB)
3043	3946	{
3044	3947	copy.live ^= true;
	3948	+ objEditor.refreshContents(true); // To show item colors
3045	3949	return;
3046		- } else if (event.getSource() == selectCB)
	3950	+ } else if (event.getSource() == selectableCB)
3047	3951	{
3048	3952	copy.dontselect ^= true;
3049	3953	return;
..	..	@@ -3051,7 +3955,7 @@
3051	3955	{
3052	3956	copy.hide ^= true;
3053	3957	copy.Touch(); // display list issue
3054		- objEditor.refreshContents();
	3958	+ objEditor.refreshContents(true); // To show item colors
3055	3959	return;
3056	3960	} else if (event.getSource() == link2masterCB)
3057	3961	{
..	..	@@ -3116,7 +4020,7 @@
3116	4020	//System.out.println("ObjEditor " + event);
3117	4021	applySelf0(true);
3118	4022	//parent.applySelf();
3119		- objEditor.refreshContents();
	4023	+ // conflicts with requestFocus objEditor.refreshContents();
3120	4024	} else if (source == resetButton)
3121	4025	{
3122	4026	CameraPane.fullreset = true;
..	..	@@ -3228,9 +4132,9 @@
3228	4132	{
3229	4133	Close();
3230	4134	//return true;
3231		- } else if (source == loadItem)
	4135	+ } else if (source == openItem)
3232	4136	{
3233		- load();
	4137	+ Open();
3234	4138	//return true;
3235	4139	} else if (source == newItem)
3236	4140	{
..	..	@@ -3255,6 +4159,10 @@
3255	4159	{
3256	4160	generatePOV();
3257	4161	//return true;
	4162	+ } else if (event.getSource() == archiveItem)
	4163	+ {
	4164	+ cTools.Archive(frame);
	4165	+ return;
3258	4166	} else if (source == zBufferItem)
3259	4167	{
3260	4168	try
..	..	@@ -3292,22 +4200,30 @@
3292	4200
3293	4201	void New()
3294	4202	{
3295		- while (copy.Size() > 1)
	4203	+ while (copy.Size() > 0)
3296	4204	{
3297		- copy.remove(1);
	4205	+ copy.remove(0);
3298	4206	}
3299	4207
	4208	+ copy.selection.clear();
	4209	+
	4210	+ if (copy == Grafreed.grafreed.universe)
	4211	+ {
	4212	+ CreateCameras();
	4213	+ cameraView.SetCamera(GetCamera(copy, 0));
	4214	+ }
3300	4215	ResetModel();
3301	4216	objEditor.refreshContents();
3302	4217	}
3303	4218
3304	4219	static public byte[] Compress(Object3D o)
3305	4220	{
	4221	+ // Slower to actually compress.
3306	4222	try
3307	4223	{
3308	4224	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3309		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3310		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	4225	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4226	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3311	4227
3312	4228	Object3D parent = o.parent;
3313	4229	o.parent = null;
..	..	@@ -3318,10 +4234,14 @@
3318	4234
3319	4235	out.flush();
3320	4236
3321		- zstream.close();
	4237	+ baos //zstream
	4238	+ .close();
3322	4239	out.close();
3323	4240
3324		- return baos.toByteArray();
	4241	+ byte[] bytes = baos.toByteArray();
	4242	+
	4243	+ System.out.println("save #bytes = " + bytes.length);
	4244	+ return bytes;
3325	4245	} catch (Exception e)
3326	4246	{
3327	4247	System.err.println(e);
..	..	@@ -3331,13 +4251,16 @@
3331	4251
3332	4252	static public Object Uncompress(byte[] bytes)
3333	4253	{
3334		- System.out.println("#bytes = " + bytes.length);
	4254	+ System.out.println("restore #bytes = " + bytes.length);
3335	4255	try
3336	4256	{
3337	4257	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3338		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3339		- ObjectInputStream in = new ObjectInputStream(istream);
	4258	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4259	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3340	4260	Object obj = in.readObject();
	4261	+
	4262	+ bais //istream
	4263	+ .close();
3341	4264	in.close();
3342	4265
3343	4266	return obj;
..	..	@@ -3392,37 +4315,97 @@
3392	4315	return null;
3393	4316	}
3394	4317
3395		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3396	4318
3397	4319	public void Save()
3398	4320	{
3399		- cRadio tab = GetCurrentTab();
	4321	+ //Save(true);
	4322	+ Replace();
	4323	+ SetVersionStates();
	4324	+ }
	4325	+
	4326	+ private boolean Equal(byte[] compress, byte[] name)
	4327	+ {
	4328	+ if (compress.length != name.length)
	4329	+ {
	4330	+ return false;
	4331	+ }
3400	4332
3401		- boolean temp = CameraPane.SWITCH;
3402		- CameraPane.SWITCH = false;
	4333	+ for (int i=compress.length; --i>=0;)
	4334	+ {
	4335	+ if (compress[i] != name[i])
	4336	+ return false;
	4337	+ }
3403	4338
3404		- copy.ExtractBigData(hashtable);
	4339	+ return true;
	4340	+ }
	4341	+
	4342	+ void DeleteVersion()
	4343	+ {
	4344	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4345	+ {
	4346	+ copy.versionlist[i] = copy.versionlist[i+1];
	4347	+ }
	4348	+
	4349	+ if (copy.versionlist[copy.versionindex] == null)
	4350	+ copy.versionindex -= 1;
	4351	+
	4352	+ if (copy.versionindex != -1)
	4353	+ CopyChanged();
	4354	+
	4355	+ SetVersionStates();
	4356	+ }
	4357	+
	4358	+ public boolean Save(boolean user)
	4359	+ {
	4360	+ System.err.println("Save");
	4361	+ Replace();
	4362	+
	4363	+ //cRadio tab = GetCurrentTab();
	4364	+
	4365	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
	4366	+
	4367	+ boolean thesame = false;
	4368	+
	4369	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4370	+// {
	4371	+// thesame = true;
	4372	+// }
3405	4373
3406	4374	//EditorFrame.m_MainFrame.requestFocusInWindow();
3407		- tab.graphs[tab.undoindex++] = Compress(copy);
3408		-
3409		- copy.RestoreBigData(hashtable);
3410		-
3411		- CameraPane.SWITCH = temp;
3412		-
3413		- //assert(hashtable.isEmpty());
3414		-
3415		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	4375	+ if (!thesame)
3416	4376	{
3417		- tab.graphs[i] = null;
	4377	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4378	+ {
	4379	+ copy.versionlist[i] = copy.versionlist[i-1];
	4380	+ }
	4381	+
	4382	+ //tab.user[tab.versionindex] = user;
	4383	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4384	+
	4385	+ copy.versionlist[++copy.versionindex] = compress;
	4386	+
	4387	+ // if (increment)
	4388	+ // tab.versionindex++;
3418	4389	}
3419	4390
	4391	+ //copy.RestoreBigData(versiontable);
	4392	+
	4393	+ //assert(hashtable.isEmpty());
	4394	+
	4395	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4396	+// {
	4397	+// //tab.user[i] = false;
	4398	+// copy.versionlist[i] = null;
	4399	+// }
	4400	+
	4401	+ SetVersionStates();
	4402	+
3420	4403	// test save
3421	4404	if (false)
3422	4405	{
3423	4406	try
3424	4407	{
3425		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	4408	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3426	4409	ObjectOutputStream p = new ObjectOutputStream(ostream);
3427	4410
3428	4411	p.writeObject(copy);
..	..	@@ -3435,26 +4418,68 @@
3435	4418	e.printStackTrace();
3436	4419	}
3437	4420	}
	4421	+
	4422	+ return !thesame;
	4423	+ }
	4424	+
	4425	+ boolean flashIt = true;
	4426	+
	4427	+ void RefreshSelection()
	4428	+ {
	4429	+ Object3D selection = new Object3D();
	4430	+
	4431	+ for (int i = 0; i < copy.selection.size(); i++)
	4432	+ {
	4433	+ Object3D elem = copy.selection.elementAt(i);
	4434	+
	4435	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4436	+
	4437	+ if (obj == null)
	4438	+ {
	4439	+ copy.selection.remove(i--);
	4440	+ }
	4441	+ else
	4442	+ {
	4443	+ selection.add(obj);
	4444	+ copy.selection.setElementAt(obj, i);
	4445	+ }
	4446	+ }
	4447	+
	4448	+ flashIt = false;
	4449	+ GetTree().clearSelection();
	4450	+ for (int i = 0; i < selection.size(); i++)
	4451	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4452	+ flashIt = true;
	4453	+
	4454	+ //refreshContents(false);
3438	4455	}
3439	4456
3440		- void CopyChanged(Object3D obj)
	4457	+ void CopyChanged()
3441	4458	{
	4459	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4460	+
	4461	+ SetVersionStates();
	4462	+
3442	4463	boolean temp = CameraPane.SWITCH;
3443	4464	CameraPane.SWITCH = false;
3444	4465
3445		- copy.ExtractBigData(hashtable);
	4466	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
3446	4467
3447	4468	copy.clear();
3448	4469
	4470	+ copy.skyboxname = obj.skyboxname;
	4471	+ copy.skyboxext = obj.skyboxext;
	4472	+
3449	4473	for (int i=0; i<obj.Size(); i++)
3450	4474	{
3451	4475	copy.add(obj.get(i));
3452	4476	}
3453	4477
3454		- copy.RestoreBigData(hashtable);
	4478	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
3455	4479
3456	4480	CameraPane.SWITCH = temp;
3457	4481
	4482	+ RefreshSelection();
3458	4483	//assert(hashtable.isEmpty());
3459	4484
3460	4485	copy.Touch();
..	..	@@ -3475,43 +4500,161 @@
3475	4500	}
3476	4501	}
3477	4502
3478		- refreshContents();
	4503	+ refreshContents(true);
3479	4504	}
3480	4505
3481		- public void Undo()
3482		- {
3483		- cRadio tab = GetCurrentTab();
	4506	+ cButton previousVersionButton;
	4507	+ cButton restoreButton;
	4508	+ cButton replaceButton;
	4509	+ cButton nextVersionButton;
	4510	+ cButton saveVersionButton;
	4511	+ cButton deleteVersionButton;
3484	4512
3485		- if (tab.undoindex == 0)
	4513	+ boolean muteSlider;
	4514	+
	4515	+ int VersionCount()
	4516	+ {
	4517	+ int count = 0;
	4518	+
	4519	+ for (int i = copy.versionlist.length; --i >= 0;)
	4520	+ {
	4521	+ if (copy.versionlist[i] != null)
	4522	+ count++;
	4523	+ }
	4524	+
	4525	+ return count;
	4526	+ }
	4527	+
	4528	+ public cGridBag versionSliderPane;
	4529	+
	4530	+ void SetVersionStates()
	4531	+ {
	4532	+ //if (true)
	4533	+ // return;
	4534	+
	4535	+ //cRadio tab = GetCurrentTab();
	4536	+
	4537	+ if (copy.versionlist == null)
	4538	+ {
	4539	+ saveVersionButton.setEnabled(false);
	4540	+ restoreButton.setEnabled(false);
	4541	+ replaceButton.setEnabled(false);
	4542	+ previousVersionButton.setEnabled(false);
	4543	+ nextVersionButton.setEnabled(false);
	4544	+ deleteVersionButton.setEnabled(false);
	4545	+ versionSliderPane.setVisible(false);
	4546	+ }
	4547	+ else
	4548	+ {
	4549	+ restoreButton.setEnabled(copy.versionindex != -1);
	4550	+ replaceButton.setEnabled(copy.versionindex != -1);
	4551	+
	4552	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4553	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4554	+
	4555	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4556	+ //copy.versionlist[copy.versionindex + 1] != null);
	4557	+
	4558	+ muteSlider = true;
	4559	+ versionSlider.setMinimum(0);
	4560	+ versionSlider.setMaximum(VersionCount() - 1);
	4561	+ versionSlider.setInteger(copy.versionindex);
	4562	+ versionSlider.setEnabled(copy.versionindex != -1);
	4563	+ muteSlider = false;
	4564	+
	4565	+ versionSliderPane.setVisible(true);
	4566	+ }
	4567	+ }
	4568	+
	4569	+ public boolean PreviousVersion()
	4570	+ {
	4571	+ // Option?
	4572	+ Replace();
	4573	+
	4574	+ System.err.println("Undo");
	4575	+
	4576	+ //cRadio tab = GetCurrentTab();
	4577	+
	4578	+ if (copy.versionindex == 0)
3486	4579	{
3487	4580	java.awt.Toolkit.getDefaultToolkit().beep();
3488		- return;
	4581	+ return false;
3489	4582	}
3490	4583
3491		- if (tab.graphs[tab.undoindex] == null)
3492		- {
3493		- Save();
3494		- tab.undoindex -= 1;
3495		- }
	4584	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4585	+// {
	4586	+// if (Save(false))
	4587	+// tab.versionindex -= 1;
	4588	+// else
	4589	+// {
	4590	+// if (tab.versionindex <= 0)
	4591	+// return false;
	4592	+// else
	4593	+// tab.versionindex -= 1;
	4594	+// }
	4595	+// }
3496	4596
3497		- tab.undoindex -= 1;
	4597	+ copy.versionindex -= 1;
3498	4598
3499		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4599	+ CopyChanged();
	4600	+
	4601	+ return true;
3500	4602	}
3501	4603
3502		- public void Redo()
	4604	+ public boolean Restore()
3503	4605	{
3504		- cRadio tab = GetCurrentTab();
	4606	+ System.err.println("Restore");
3505	4607
3506		- if (tab.graphs[tab.undoindex + 1] == null)
	4608	+ //cRadio tab = GetCurrentTab();
	4609	+
	4610	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4611	+ {
	4612	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4613	+ return false;
	4614	+ }
	4615	+
	4616	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4617	+ CopyChanged();
	4618	+
	4619	+ return true;
	4620	+ }
	4621	+
	4622	+ public boolean Replace()
	4623	+ {
	4624	+ //System.err.println("Replace");
	4625	+
	4626	+ //cRadio tab = GetCurrentTab();
	4627	+
	4628	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4629	+ {
	4630	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4631	+ return false;
	4632	+ }
	4633	+
	4634	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4635	+
	4636	+ return true;
	4637	+ }
	4638	+
	4639	+ public void NextVersion()
	4640	+ {
	4641	+ // Option?
	4642	+ Replace();
	4643	+
	4644	+ //cRadio tab = GetCurrentTab();
	4645	+
	4646	+ if (copy.versionlist[copy.versionindex + 1] == null)
3507	4647	{
3508	4648	java.awt.Toolkit.getDefaultToolkit().beep();
3509	4649	return;
3510	4650	}
3511	4651
3512		- tab.undoindex += 1;
	4652	+ copy.versionindex += 1;
3513	4653
3514		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4654	+ CopyChanged();
	4655	+
	4656	+ //if (!tab.user[tab.versionindex])
	4657	+ // tab.graphs[tab.versionindex] = null;
3515	4658	}
3516	4659
3517	4660	void ImportGFD()
..	..	@@ -3663,7 +4806,7 @@
3663	4806	assert false;
3664	4807	}
3665	4808
3666		- void EditSelection()
	4809	+ void EditSelection(boolean newWindow)
3667	4810	{
3668	4811	}
3669	4812
..	..	@@ -3705,6 +4848,12 @@
3705	4848	// else
3706	4849	// applySelf(true);
3707	4850	// }
	4851	+
	4852	+ boolean Equal(double a, double b)
	4853	+ {
	4854	+ return Math.abs(a - b) < 0.001;
	4855	+ }
	4856	+
3708	4857	void applySelf0(boolean name)
3709	4858	{
3710	4859	if (name)
..	..	@@ -3722,7 +4871,7 @@
3722	4871	//copy.material = new cMaterial(copy.GetMaterial());
3723	4872
3724	4873	current.color = (float) colorField.getFloat();
3725		- current.modulation = (float) modulationField.getFloat();
	4874	+ current.modulation = (float) saturationField.getFloat();
3726	4875	current.metalness = (float) metalnessField.getFloat();
3727	4876	current.diffuse = (float) diffuseField.getFloat();
3728	4877	current.specular = (float) specularField.getFloat();
..	..	@@ -3754,29 +4903,52 @@
3754	4903	{
3755	4904	cMaterial mat = copy.material;
3756	4905
3757		- colorField.SetToolTipValue((mat.color));
3758		- modulationField.SetToolTipValue((mat.modulation));
3759		- metalnessField.SetToolTipValue((mat.metalness));
3760		- diffuseField.SetToolTipValue((mat.diffuse));
3761		- specularField.SetToolTipValue((mat.specular));
3762		- shininessField.SetToolTipValue((mat.shininess));
3763		- shiftField.SetToolTipValue((mat.shift));
3764		- ambientField.SetToolTipValue((mat.ambient));
3765		- lightareaField.SetToolTipValue((mat.lightarea));
3766		- diffusenessField.SetToolTipValue((mat.factor));
3767		- velvetField.SetToolTipValue((mat.velvet));
3768		- sheenField.SetToolTipValue((mat.sheen));
3769		- subsurfaceField.SetToolTipValue((mat.subsurface));
3770		- backlitField.SetToolTipValue((mat.bump));
3771		- anisoField.SetToolTipValue((mat.aniso));
3772		- anisoVField.SetToolTipValue((mat.anisoV));
3773		- cameraField.SetToolTipValue((mat.cameralight));
3774		- selfshadowField.SetToolTipValue((mat.diffuseness));
3775		- shadowField.SetToolTipValue((mat.shadow));
3776		- textureField.SetToolTipValue((mat.texture));
3777		- opacityField.SetToolTipValue((mat.opacity));
3778		- fakedepthField.SetToolTipValue((mat.fakedepth));
3779		- shadowbiasField.SetToolTipValue((mat.shadowbias));
	4906	+ if (!Equal(colorField.getFloat(), mat.color))
	4907	+ colorField.SetToolTipValue((mat.color));
	4908	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	4909	+ saturationField.SetToolTipValue((mat.modulation));
	4910	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	4911	+ metalnessField.SetToolTipValue((mat.metalness));
	4912	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	4913	+ diffuseField.SetToolTipValue((mat.diffuse));
	4914	+ if (!Equal(specularField.getFloat(), mat.specular))
	4915	+ specularField.SetToolTipValue((mat.specular));
	4916	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	4917	+ shininessField.SetToolTipValue((mat.shininess));
	4918	+ if (!Equal(shiftField.getFloat(), mat.shift))
	4919	+ shiftField.SetToolTipValue((mat.shift));
	4920	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	4921	+ ambientField.SetToolTipValue((mat.ambient));
	4922	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	4923	+ lightareaField.SetToolTipValue((mat.lightarea));
	4924	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	4925	+ diffusenessField.SetToolTipValue((mat.factor));
	4926	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	4927	+ velvetField.SetToolTipValue((mat.velvet));
	4928	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	4929	+ sheenField.SetToolTipValue((mat.sheen));
	4930	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	4931	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4932	+ if (!Equal(backlitField.getFloat(), mat.bump))
	4933	+ backlitField.SetToolTipValue((mat.bump));
	4934	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	4935	+ anisoField.SetToolTipValue((mat.aniso));
	4936	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	4937	+ anisoVField.SetToolTipValue((mat.anisoV));
	4938	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	4939	+ cameraField.SetToolTipValue((mat.cameralight));
	4940	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	4941	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4942	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	4943	+ shadowField.SetToolTipValue((mat.shadow));
	4944	+ if (!Equal(textureField.getFloat(), mat.texture))
	4945	+ textureField.SetToolTipValue((mat.texture));
	4946	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	4947	+ opacityField.SetToolTipValue((mat.opacity));
	4948	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	4949	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4950	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	4951	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
3780	4952	}
3781	4953
3782	4954	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -3807,9 +4979,28 @@
3807	4979	//copy.Touch();
3808	4980	}
3809	4981
	4982	+ cNumberSlider versionSlider;
	4983	+
3810	4984	public void stateChanged(ChangeEvent e)
3811	4985	{
3812		- // assert(false);
	4986	+ // assert(false);
	4987	+ if (e.getSource() == versionSlider)
	4988	+ {
	4989	+ if (muteSlider)
	4990	+ return;
	4991	+
	4992	+ Replace();
	4993	+
	4994	+ int version = versionSlider.getInteger();
	4995	+
	4996	+ if (version != -1 && copy.versionlist[version] != null)
	4997	+ {
	4998	+ copy.versionindex = version;
	4999	+ CopyChanged();
	5000	+ }
	5001	+
	5002	+ return;
	5003	+ }
3813	5004
3814	5005	if (freezematerial)
3815	5006	{
..	..	@@ -3845,6 +5036,12 @@
3845	5036	{
3846	5037	//System.out.println("stateChanged = " + this);
3847	5038	materialtouched = true;
	5039	+
	5040	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	5041	+ {
	5042	+ saturationField.setFloat(1);
	5043	+ }
	5044	+
3848	5045	applySelf();
3849	5046	//System.out.println("this = " + this);
3850	5047	//System.out.println("PARENT = " + parent);
..	..	@@ -4144,6 +5341,7 @@
4144	5341	{
4145	5342	if (GetTree() != null)
4146	5343	{
	5344	+ GetTree().revalidate();
4147	5345	GetTree().repaint();
4148	5346	}
4149	5347
..	..	@@ -4152,13 +5350,19 @@
4152	5350	ctrlPanel.validate(); // ? new
4153	5351	ctrlPanel.repaint();
4154	5352	}
	5353	+
	5354	+ if (previousVersionButton != null && copy.versionlist != null)
	5355	+ SetVersionStates();
	5356	+
	5357	+ cameraView.requestFocusInWindow();
4155	5358	}
4156	5359
4157	5360	static TweenManager tweenManager = new TweenManager();
4158	5361
4159	5362	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4160	5363	{
4161		- Save();
	5364	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5365	+ Save();
4162	5366	//Tween.set(thing, 0).target(1).start(tweenManager);
4163	5367	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
4164	5368	// if (thing instanceof GenericJointDemo)
..	..	@@ -4182,7 +5386,7 @@
4182	5386	// group = (Composite) group.get(0);
4183	5387	// }
4184	5388
4185		- System.out.println("makeSomething of " + thing);
	5389	+ //System.out.println("makeSomething of " + thing);
4186	5390
4187	5391	/*
4188	5392	if (deselect && jList != null)
..	..	@@ -4245,6 +5449,12 @@
4245	5449	{
4246	5450	ResetModel();
4247	5451	Select(thing.GetTreePath(), true, false); // unselect... false);
	5452	+
	5453	+ if (thing.Size() == 0)
	5454	+ {
	5455	+ //EditSelection(false);
	5456	+ }
	5457	+
4248	5458	refreshContents();
4249	5459	}
4250	5460
..	..	@@ -4393,7 +5603,9 @@
4393	5603	readobj.ResetDisplayList();
4394	5604	} catch (Exception e)
4395	5605	{
4396		- //e.printStackTrace();
	5606	+ if (!e.toString().contains("GZIP"))
	5607	+ e.printStackTrace();
	5608	+
4397	5609	try
4398	5610	{
4399	5611	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4467,11 +5679,14 @@
4467	5679
4468	5680	if (readobj != null)
4469	5681	{
4470		- Save();
	5682	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5683	+ // Save();
4471	5684	try
4472	5685	{
4473	5686	//readobj.deepCopySelf(copy);
4474	5687	copy.clear(); // june 2014
	5688	+ copy.skyboxname = readobj.skyboxname;
	5689	+ copy.skyboxext = readobj.skyboxext;
4475	5690	for (int i = 0; i < readobj.size(); i++)
4476	5691	{
4477	5692	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4512,6 +5727,7 @@
4512	5727	}
4513	5728	} catch (ClassCastException e)
4514	5729	{
	5730	+ e.printStackTrace();
4515	5731	assert (false);
4516	5732	Composite c = (Composite) copy;
4517	5733	c.children.clear();
..	..	@@ -4522,17 +5738,32 @@
4522	5738	c.addChild(csg);
4523	5739	}
4524	5740
	5741	+ copy.versionlist = readobj.versionlist;
	5742	+ copy.versionindex = readobj.versionindex;
	5743	+ copy.versiontable = readobj.versiontable;
	5744	+
	5745	+ if (copy.versionlist == null)
	5746	+ {
	5747	+ // Backward compatibility
	5748	+ copy.versionlist = new Object3D[100];
	5749	+ copy.versionindex = -1;
	5750	+
	5751	+ //Save(true);
	5752	+ }
	5753	+
	5754	+ //? SetUndoStates();
	5755	+
4525	5756	ResetModel();
4526	5757	copy.HardTouch(); // recompile?
4527	5758	refreshContents();
4528	5759	}
4529	5760	}
4530	5761
4531		- void load() // throws ClassNotFoundException
	5762	+ void Open() // throws ClassNotFoundException
4532	5763	{
4533	5764	if (Grafreed.standAlone)
4534	5765	{
4535		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5766	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4536	5767	browser.show();
4537	5768	String filename = browser.getFile();
4538	5769	if (filename != null && filename.length() > 0)
..	..	@@ -4609,6 +5840,8 @@
4609	5840
4610	5841	void save()
4611	5842	{
	5843	+ Replace();
	5844	+
4612	5845	if (lastname == null)
4613	5846	{
4614	5847	return;
..	..	@@ -4631,6 +5864,7 @@
4631	5864	//ps.print(buffer.toString());
4632	5865	} catch (IOException e)
4633	5866	{
	5867	+ e.printStackTrace();
4634	5868	}
4635	5869	}
4636	5870
..	..	@@ -4645,6 +5879,8 @@
4645	5879	String filename = browser.getFile();
4646	5880	if (filename != null && filename.length() > 0)
4647	5881	{
	5882	+ if (!filename.endsWith(".gfd"))
	5883	+ filename += ".gfd";
4648	5884	lastname = browser.getDirectory() + filename;
4649	5885	save();
4650	5886	}
..	..	@@ -4811,7 +6047,7 @@
4811	6047	MenuBar menuBar;
4812	6048	Menu fileMenu;
4813	6049	MenuItem newItem;
4814		- MenuItem loadItem;
	6050	+ MenuItem openItem;
4815	6051	MenuItem saveItem;
4816	6052	MenuItem saveAsItem;
4817	6053	MenuItem exportAsItem;
..	..	@@ -4834,22 +6070,38 @@
4834	6070	CheckboxMenuItem toggleSwitchItem;
4835	6071	CheckboxMenuItem toggleRootItem;
4836	6072	CheckboxMenuItem animationItem;
	6073	+ MenuItem archiveItem;
4837	6074	CheckboxMenuItem toggleHandleItem;
4838	6075	CheckboxMenuItem togglePaintItem;
4839	6076	JSplitPane mainPanel;
4840	6077	JScrollPane scrollpane;
	6078	+
4841	6079	JPanel toolbarPanel;
	6080	+
4842	6081	cGridBag treePanel;
	6082	+
4843	6083	JPanel radioPanel;
4844	6084	ButtonGroup buttonGroup;
4845		- cGridBag ctrlPanel;
	6085	+
	6086	+ cGridBag toolboxPanel;
	6087	+ cGridBag skyboxPanel;
4846	6088	cGridBag materialPanel;
	6089	+ cGridBag ctrlPanel;
	6090	+
4847	6091	JScrollPane infoPanel;
	6092	+
4848	6093	cGridBag optionsPanel;
	6094	+
4849	6095	JTabbedPane objectPanel;
	6096	+ boolean materialFlushed;
	6097	+ Object3D latestObject;
	6098	+
	6099	+ cGridBag transformPanel;
4850	6100	cGridBag XYZPanel;
	6101	+
4851	6102	JSplitPane gridPanel;
4852	6103	JSplitPane bigPanel;
	6104	+
4853	6105	cGridBag bigThree;
4854	6106	cGridBag scenePanel;
4855	6107	cGridBag centralPanel;
..	..	@@ -4907,7 +6159,7 @@
4907	6159	JLabel colorLabel;
4908	6160	cNumberSlider colorField;
4909	6161	JLabel modulationLabel;
4910		- cNumberSlider modulationField;
	6162	+ cNumberSlider saturationField;
4911	6163	JLabel metalnessLabel;
4912	6164	cNumberSlider metalnessField;
4913	6165	JLabel diffuseLabel;
..	..	@@ -4938,6 +6190,7 @@
4938	6190	cNumberSlider anisoField;
4939	6191	JLabel anisoVLabel;
4940	6192	cNumberSlider anisoVField;
	6193	+
4941	6194	JLabel cameraLabel;
4942	6195	cNumberSlider cameraField;
4943	6196	JLabel selfshadowLabel;
..	..	@@ -4952,6 +6205,7 @@
4952	6205	cNumberSlider fakedepthField;
4953	6206	JLabel shadowbiasLabel;
4954	6207	cNumberSlider shadowbiasField;
	6208	+
4955	6209	JLabel bumpLabel;
4956	6210	cNumberSlider bumpField;
4957	6211	JLabel noiseLabel;
..	..	@@ -4964,7 +6218,7 @@
4964	6218	cNumberSlider fogField;
4965	6219	JLabel opacityPowerLabel;
4966	6220	cNumberSlider opacityPowerField;
4967		- JTree jTree;
	6221	+ cTree jTree;
4968	6222	//ObjectUI parent;
4969	6223
4970	6224	cNumberSlider normalpushField;