~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,144 @@
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;
	138	+
	139	+ if (name.endsWith("jpg"))
	140	+ // Much faster!
	141	+ image = new sun.awt.image.codec.JPEGImageDecoderImpl(ObjEditor.class.getClassLoader().getResourceAsStream(name)).decodeAsBufferedImage();
	142	+ else
	143	+ image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
	144	+
	145	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	146	+// {
	147	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	148	+// Graphics2D g = resized.createGraphics();
	149	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	150	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	151	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	152	+// g.dispose();
	153	+//
	154	+// image = resized;
	155	+// }
	156	+
	157	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	158	+
	159	+ icons.put(name, icon);
	160	+
	161	+ return icon;
	162	+ }
	163	+ catch (Exception e)
	164	+ {
	165	+ //icons.put(name, null);
	166	+ return null;
	167	+ }
	168	+ }
	169	+
	170	+ BufferedImage GetImage(String name)
	171	+ {
	172	+ try
	173	+ {
	174	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	175	+
	176	+ return image;
	177	+ }
	178	+ catch (Exception e)
	179	+ {
	180	+ return null;
	181	+ }
	182	+ }
40	183
41	184	// SCRIPT
42	185
..	..	@@ -147,7 +290,7 @@
147	290
148	291	objEditor.ctrlPanel.remove(namePanel);
149	292
150		- if (!GroupEditor.allparams)
	293	+ if (!allparams)
151	294	return;
152	295
153	296	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -219,6 +362,14 @@
219	362	client = inClient;
220	363	copy = client;
221	364
	365	+// if (copy.versionlist == null)
	366	+// {
	367	+// copy.versionlist = new Object3D[100];
	368	+// copy.versionindex = -1;
	369	+//
	370	+// callee.Save(true);
	371	+// }
	372	+
222	373	// "this" is not called: SetupUI2(objEditor);
223	374	}
224	375
..	..	@@ -232,6 +383,14 @@
232	383	client = inClient;
233	384	copy = client;
234	385
	386	+ if (copy.versionlist == null)
	387	+ {
	388	+ copy.versionlist = new Object3D[100];
	389	+ copy.versionindex = -1;
	390	+
	391	+// Save(true);
	392	+ }
	393	+
235	394	SetupUI2(callee.GetEditor());
236	395	}
237	396
..	..	@@ -246,14 +405,15 @@
246	405	//localCopy.parent = null;
247	406
248	407	frame = new JFrame();
249		- frame.setUndecorated(true);
	408	+ frame.setUndecorated(false);
250	409	objEditor = this;
251	410	this.callee = callee;
252	411
253	412	//parent = p;
254	413
255	414	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
256		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	415	+ if (Globals.DEBUG)
	416	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
257	417	//gd.setFullScreenWindow(this);
258	418	//setResizable(false);
259	419	//if (!isDisplayable())
..	..	@@ -264,6 +424,14 @@
264	424	copy = localCopy;
265	425	copy.editWindow = this;
266	426
	427	+// if (copy.versionlist == null)
	428	+// {
	429	+// copy.versionlist = new Object3D[100];
	430	+// copy.versionindex = -1;
	431	+//
	432	+// Save(true);
	433	+// }
	434	+
267	435	SetupMenu();
268	436
269	437	//SetupName(objEditor); // new
..	..	@@ -277,12 +445,20 @@
277	445	return frame.action(event, obj);
278	446	}
279	447
	448	+ // Cannot work without static
	449	+ static boolean allparams = true;
	450	+
	451	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	452	+
	453	+ // This is to refresh the UI of the material panel.
	454	+ boolean patchMaterial;
	455	+
280	456	void SetupMenu()
281	457	{
282	458	frame.setMenuBar(menuBar = new MenuBar());
283	459	menuBar.add(fileMenu = new Menu("File"));
284	460	fileMenu.add(newItem = new MenuItem("New"));
285		- fileMenu.add(loadItem = new MenuItem("Open..."));
	461	+ fileMenu.add(openItem = new MenuItem("Open..."));
286	462
287	463	//oe.menuBar.add(menu = new Menu("Include"));
288	464	Menu menu = new Menu("Import");
..	..	@@ -290,8 +466,11 @@
290	466	importOBJItem.addActionListener(this);
291	467	import3DSItem = menu.add(new MenuItem("3DS file..."));
292	468	import3DSItem.addActionListener(this);
	469	+ if (Globals.ADVANCED)
	470	+ {
293	471	importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
294	472	importVRMLX3DItem.addActionListener(this);
	473	+ }
295	474	menu.add("-");
296	475	importGFDItem = menu.add(new MenuItem("Grafreed file..."));
297	476	importGFDItem.addActionListener(this);
..	..	@@ -314,7 +493,7 @@
314	493	}
315	494
316	495	newItem.addActionListener(this);
317		- loadItem.addActionListener(this);
	496	+ openItem.addActionListener(this);
318	497	saveItem.addActionListener(this);
319	498	saveAsItem.addActionListener(this);
320	499	exportAsItem.addActionListener(this);
..	..	@@ -323,13 +502,72 @@
323	502	closeItem.addActionListener(this);
324	503
325	504	objectPanel = new JTabbedPane();
	505	+
	506	+ ChangeListener changeListener = new ChangeListener()
	507	+ {
	508	+ //String name;
	509	+
	510	+ public void stateChanged(ChangeEvent changeEvent)
	511	+ {
	512	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	513	+// {
	514	+// if (latestObject != null)
	515	+// {
	516	+// refreshContents(true);
	517	+// SetMaterial(latestObject);
	518	+// }
	519	+//
	520	+// materialFlushed = true;
	521	+// }
	522	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	523	+// {
	524	+// if (listUI.size() == 0)
	525	+// EditSelection(false);
	526	+// }
	527	+
	528	+// if (objectPanel.getSelectedIndex() == 4)
	529	+// {
	530	+// name = copy.skyboxname;
	531	+//
	532	+// if (name == null)
	533	+// {
	534	+// name = "";
	535	+// }
	536	+//
	537	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	538	+// copy.skyboxext = "jpg";
	539	+// }
	540	+// else
	541	+// {
	542	+// if (name != null)
	543	+// {
	544	+// if (name.equals(""))
	545	+// {
	546	+// copy.skyboxname = null;
	547	+// copy.skyboxext = null;
	548	+// }
	549	+// else
	550	+// {
	551	+// copy.skyboxname = name;
	552	+// }
	553	+// }
	554	+// }
	555	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	556	+
	557	+// refreshContents(false); // To refresh Info tab
	558	+ cameraView.repaint();
	559	+ }
	560	+ };
	561	+ objectPanel.addChangeListener(changeListener);
	562	+
326	563	toolbarPanel = new JPanel();
327	564	toolbarPanel.setName("Toolbar");
	565	+
328	566	treePanel = new cGridBag();
329	567	treePanel.setName("Tree");
330	568
331	569	editPanel = new cGridBag().setVertical(true);
332		- editPanel.setName("Edit");
	570	+ //editPanel.setName("Edit");
333	571
334	572	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
335	573
..	..	@@ -337,23 +575,29 @@
337	575	editPanel.add(editCommandsPanel);
338	576	editPanel.add(ctrlPanel);
339	577
340		- materialPanel = new cGridBag().setVertical(true);
	578	+ toolboxPanel = new cGridBag().setVertical(true);
	579	+ //toolboxPanel.setName("Toolbox");
341	580
342		- materialPanel.setName("Material");
	581	+ skyboxPanel = new cGridBag().setVertical(true);
	582	+
	583	+ materialPanel = new cGridBag().setVertical(false);
	584	+ //materialPanel.setName("Material");
	585	+
343	586	/JTextPane/
344	587	infoarea = createTextPane();
345	588	doc = infoarea.getStyledDocument();
346	589
347	590	infoarea.setEditable(true);
348	591	SetText();
	592	+
349	593	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
350	594	// infoarea.setOpaque(false);
351	595	// //infoarea.setForeground(textcolor);
352	596	// TEXTAREA infoarea.setLineWrap(true);
353	597	// TEXTAREA infoarea.setWrapStyleWord(true);
354	598	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
355		- infoPanel.setPreferredSize(new Dimension(50, 200));
356		- infoPanel.setName("Info");
	599	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	600	+ //infoPanel.setName("Info");
357	601	//infoPanel.setLayout(new BorderLayout());
358	602	//infoPanel.add(createTextPane());
359	603
..	..	@@ -364,7 +608,14 @@
364	608	mainPanel.setDividerSize(9);
365	609	mainPanel.setDividerLocation(0.5); //1.0);
366	610	mainPanel.setResizeWeight(0.5);
367		-
	611	+
	612	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	613	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	614	+ divider.setDividerSize(15);
	615	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	616	+
	617	+ mainPanel.setUI(new BasicSplitPaneUI());
	618	+
368	619	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
369	620	//mainPanel.setLayout(new GridBagLayout());
370	621	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -595,8 +846,8 @@
595	846	}
596	847	}
597	848
598		-static GraphicsDevice device = GraphicsEnvironment
599		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	849	+//static GraphicsDevice device = GraphicsEnvironment
	850	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
600	851
601	852	Rectangle keeprect;
602	853	cRadio radio;
..	..	@@ -612,13 +863,25 @@
612	863
613	864	boolean maximized;
614	865
	866	+ cButton fullscreenLayout;
	867	+ cButton expandedLayout;
	868	+
615	869	void Minimize()
616	870	{
617	871	frame.setState(Frame.ICONIFIED);
	872	+ frame.validate();
618	873	}
619	874
	875	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	876	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	877	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
620	878	void Maximize()
621	879	{
	880	+ if (CameraPane.FULLSCREEN)
	881	+ {
	882	+ ToggleFullScreen();
	883	+ }
	884	+
622	885	if (maximized)
623	886	{
624	887	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -626,20 +889,38 @@
626	889	else
627	890	{
628	891	keeprect = frame.getBounds();
629		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
630		- Dimension rect2 = frame.getToolkit().getScreenSize();
631		- frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	892	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	893	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	894	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
632	895	// frame.setState(Frame.MAXIMIZED_BOTH);
	896	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
633	897	}
634	898
635	899	maximized ^= true;
	900	+
	901	+ frame.validate();
636	902	}
	903	+
	904	+ cButton minButton;
	905	+ cButton maxButton;
	906	+ cButton fullButton;
	907	+ cButton collapseButton;
	908	+ cButton maximize3DButton;
637	909
638	910	void ToggleFullScreen()
639	911	{
640		- if (CameraPane.FULLSCREEN)
	912	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	913	+
	914	+ cameraView.ToggleFullScreen();
	915	+
	916	+ if (!CameraPane.FULLSCREEN)
641	917	{
642	918	device.setFullScreenWindow(null);
	919	+ frame.dispose();
	920	+ frame.setUndecorated(false);
	921	+ frame.validate();
	922	+ frame.setVisible(true);
	923	+
643	924	//frame.setVisible(false);
644	925	// frame.removeNotify();
645	926	// frame.setUndecorated(false);
..	..	@@ -649,13 +930,13 @@
649	930	// X frame.getContentPane().remove(/"Center",/bigThree);
650	931	// X framePanel.add(bigThree);
651	932	// X frame.getContentPane().add(/"Center",/framePanel);
652		- framePanel.setDividerLocation(1);
	933	+// framePanel.setDividerLocation(46); // icons are 24x24
653	934
654	935	//frame.setVisible(true);
655		- radio.layout = keepButton;
	936	+// radio.layout = keepButton;
656	937	//theFrame = null;
657	938	keepButton = null;
658		- radio.layout.doClick();
	939	+// radio.layout.doClick();
659	940
660	941	} else
661	942	{
..	..	@@ -664,22 +945,70 @@
664	945	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
665	946	// frame.getToolkit().getScreenSize().height);
666	947	//frame.setVisible(false);
	948	+
	949	+ frame.dispose();
	950	+ frame.setUndecorated(true);
667	951	device.setFullScreenWindow(frame);
	952	+ frame.validate();
	953	+ frame.setVisible(true);
668	954	// frame.removeNotify();
669	955	// frame.setUndecorated(true);
670	956	// frame.addNotify();
671	957	// X frame.getContentPane().remove(/"Center",/framePanel);
672	958	// X framePanel.remove(bigThree);
673	959	// X frame.getContentPane().add(/"Center",/bigThree);
674		- framePanel.setDividerLocation(0);
	960	+// framePanel.setDividerLocation(0);
675	961
676		- radio.layout = twoButton;
677		- radio.layout.doClick();
	962	+// radio.layout = fullscreenLayout;
	963	+// radio.layout.doClick();
678	964	//frame.setVisible(true);
679	965	}
680		-
681		- cameraView.ToggleFullScreen();
	966	+ frame.validate();
	967	+
	968	+ cameraView.requestFocusInWindow();
682	969	}
	970	+
	971	+ void CollapseToolbar()
	972	+ {
	973	+ framePanel.setDividerLocation(0);
	974	+ //frame.validate();
	975	+
	976	+ cameraView.requestFocusInWindow();
	977	+ }
	978	+
	979	+ private Object3D Duplicate(Object3D object)
	980	+ {
	981	+ boolean temp = CameraPane.SWITCH;
	982	+ CameraPane.SWITCH = false;
	983	+
	984	+ if (Grafreed.grafreed.universe.versiontable == null)
	985	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	986	+
	987	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	988	+ // if (copy == client)
	989	+
	990	+ Object3D versions[] = object.versionlist;
	991	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	992	+ object.versionlist = null;
	993	+ object.versiontable = null;
	994	+
	995	+ Object3D parent = object.parent;
	996	+ object.parent = null;
	997	+
	998	+ //byte[] compress = Compress(copy);
	999	+ Object3D compress = (Object3D)Grafreed.clone(object);
	1000	+
	1001	+ object.parent = parent;
	1002	+
	1003	+ object.versionlist = versions;
	1004	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	1005	+
	1006	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	1007	+
	1008	+ CameraPane.SWITCH = temp;
	1009	+
	1010	+ return compress;
	1011	+ }
683	1012
684	1013	private JTextPane createTextPane()
685	1014	{
..	..	@@ -802,6 +1131,7 @@
802	1131	{
803	1132	SetupMaterial(materialPanel);
804	1133	}
	1134	+
805	1135	//SetupName();
806	1136	//SetupViews();
807	1137	}
..	..	@@ -811,7 +1141,7 @@
811	1141	// NumberSlider vDivsField;
812	1142	// JCheckBox endcaps;
813	1143	JCheckBox liveCB;
814		- JCheckBox selectCB;
	1144	+ JCheckBox selectableCB;
815	1145	JCheckBox hideCB;
816	1146	JCheckBox link2masterCB;
817	1147	JCheckBox markCB;
..	..	@@ -819,7 +1149,12 @@
819	1149	JCheckBox speedupCB;
820	1150	JCheckBox rewindCB;
821	1151	JCheckBox flipVCB;
	1152	+
	1153	+ cCheckBox toggleTextureCB;
	1154	+ cCheckBox toggleSwitchCB;
	1155	+
822	1156	JComboBox texresMenu;
	1157	+
823	1158	JButton resetButton;
824	1159	JButton stepButton;
825	1160	JButton stepAllButton;
..	..	@@ -1005,39 +1340,55 @@
1005	1340
1006	1341	namePanel = new cGridBag();
1007	1342
	1343	+ //if (copy.pinned)
	1344	+ {
	1345	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
	1346	+ pinButton.setSelected(copy.pinned);
	1347	+ cGridBag t = new cGridBag();
	1348	+ t.preferredWidth = 2;
	1349	+ t.add(pinButton);
	1350	+ namePanel.add(t);
	1351	+
	1352	+ pinButton.addItemListener(this);
	1353	+ }
	1354	+
1008	1355	nameField = AddText(namePanel, copy.GetName());
1009		- namePanel.add(nameField);
	1356	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1010	1357	oe.ctrlPanel.add(namePanel);
1011	1358
1012	1359	oe.ctrlPanel.Return();
1013	1360
1014		- if (!GroupEditor.allparams)
	1361	+ if (!allparams)
1015	1362	return;
1016	1363
1017	1364	setupPanel = new cGridBag().setVertical(false);
1018	1365
1019	1366	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1020	1367	liveCB.setToolTipText("Animate object");
1021		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1022		- selectCB.setToolTipText("Make object selectable");
	1368	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1369	+ markCB.setToolTipText("Set target transform");
	1370	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1371	+ selectableCB.setToolTipText("Make object selectable");
1023	1372	// Return();
	1373	+
1024	1374	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1025	1375	hideCB.setToolTipText("Hide object");
1026		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1027		- markCB.setToolTipText("Set the animation target transform");
	1376	+
	1377	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1028	1378
1029	1379	setupPanel2 = new cGridBag().setVertical(false);
1030	1380
1031	1381	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1032	1382	rewindCB.setToolTipText("Rewind animation");
1033	1383
1034		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1035		- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1384	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1385	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1036	1386
	1387	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1388	+ link2masterCB.setToolTipText("Attach to support");
	1389	+
1037	1390	if (Globals.ADVANCED)
1038	1391	{
1039		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1040		- link2masterCB.setToolTipText("Attach to support");
1041	1392	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1042	1393	speedupCB.setToolTipText("Option motion capture");
1043	1394	}
..	..	@@ -1223,22 +1574,9 @@
1223	1574
1224	1575	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1225	1576	{
1226		- System.out.println("CREATE CAMERAS");
1227		- cams = new cTemplate();
1228		- cams.name = "Cameras";
1229		- copy.insertElementAt(cams, 0);
1230		- //cams.parent = copy;
1231		-
1232		- cam = new Camera(); // LA.newVector(3, 2, 1));
1233		- cams.addChild(cam);
1234		- cam = new Camera(1);
1235		- cams.addChild(cam);
1236		- cam = new Camera(2);
1237		- cams.addChild(cam);
1238		- cam = new Camera(3);
1239		- cams.addChild(cam);
1240		- cam = new Camera(4); // Light
1241		- cams.addChild(cam);
	1577	+ if (Globals.DEBUG)
	1578	+ System.out.println("CREATE CAMERAS");
	1579	+ cams = CreateCameras();
1242	1580	} else
1243	1581	{
1244	1582	cams = (cGroup) copy.get(0);
..	..	@@ -1304,6 +1642,45 @@
1304	1642	//frontView.object = copy;
1305	1643	//sideView.object = copy;
1306	1644
	1645	+ transformPanel = new cGridBag().setVertical(true);
	1646	+
	1647	+ cGridBag resetTransformPanel = new cGridBag();
	1648	+
	1649	+ resetTransformPanel.preferredHeight = 2;
	1650	+
	1651	+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
	1652	+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
	1653	+ resetTransform.addMouseListener(new MouseAdapter()
	1654	+ {
	1655	+ public void mouseClicked(MouseEvent e)
	1656	+ {
	1657	+ ResetTransform();
	1658	+ }
	1659	+ });
	1660	+ resetTransformPanel.add(resetTransform);
	1661	+
	1662	+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
	1663	+ resetTransform.setToolTipText("Reset Translation only");
	1664	+ resetTransform.addMouseListener(new MouseAdapter()
	1665	+ {
	1666	+ public void mouseClicked(MouseEvent e)
	1667	+ {
	1668	+ ResetTransform(1);
	1669	+ }
	1670	+ });
	1671	+ resetTransformPanel.add(resetTransform);
	1672	+
	1673	+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
	1674	+ resetTransform.setToolTipText("Reset Rotation and Scale only");
	1675	+ resetTransform.addMouseListener(new MouseAdapter()
	1676	+ {
	1677	+ public void mouseClicked(MouseEvent e)
	1678	+ {
	1679	+ ResetTransform(2);
	1680	+ }
	1681	+ });
	1682	+ resetTransformPanel.add(resetTransform);
	1683	+
1307	1684	XYZPanel = new cGridBag().setVertical(true);
1308	1685	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1309	1686
..	..	@@ -1311,7 +1688,11 @@
1311	1688	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1312	1689	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1313	1690	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1691	+ //XYZPanel.setName("XYZ");
1314	1692
	1693	+ transformPanel.add(resetTransformPanel);
	1694	+ transformPanel.add(XYZPanel);
	1695	+
1315	1696	/*
1316	1697	gridPanel = new JPanel(); //new BorderLayout());
1317	1698	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1319,12 +1700,12 @@
1319	1700	gridPanel.add(cameraView);
1320	1701	gridPanel.add(XYZPanel);
1321	1702	*/
1322		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1323		- gridPanel.setContinuousLayout(true);
1324		- gridPanel.setOneTouchExpandable(true);
1325		- gridPanel.setDividerLocation(1.0);
1326		- gridPanel.setDividerSize(9);
1327		- gridPanel.setResizeWeight(0.85);
	1703	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1704	+// gridPanel.setContinuousLayout(true);
	1705	+// gridPanel.setOneTouchExpandable(true);
	1706	+// gridPanel.setDividerLocation(1.0);
	1707	+// gridPanel.setDividerSize(9);
	1708	+// gridPanel.setResizeWeight(0.85);
1328	1709
1329	1710	// aConstraints.weighty = 0;
1330	1711	//System.out.println("THIS = " + this);
..	..	@@ -1347,14 +1728,34 @@
1347	1728
1348	1729	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1349	1730	//tmp.setName("Edit");
	1731	+ objectPanel.add(skyboxPanel);
	1732	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1733	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1734	+
	1735	+ objectPanel.add(toolboxPanel);
	1736	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1737	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1738	+
1350	1739	objectPanel.add(materialPanel);
	1740	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1741	+ objectPanel.setToolTipTextAt(2, "Material");
	1742	+
1351	1743	// JPanel north = new JPanel(new BorderLayout());
1352	1744	// north.setName("Edit");
1353	1745	// north.add(ctrlPanel, BorderLayout.NORTH);
1354	1746	// objectPanel.add(north);
1355	1747	objectPanel.add(editPanel);
1356		- objectPanel.add(infoPanel);
1357		-
	1748	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
	1749	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1750	+
	1751	+ objectPanel.add(transformPanel);
	1752	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1753	+ objectPanel.setToolTipTextAt(4, "TRS transform");
	1754	+
	1755	+ patchMaterial = true;
	1756	+ cameraView.patchMaterial = this;
	1757	+ objectPanel.setSelectedIndex(2);
	1758	+
1358	1759	/*
1359	1760	aConstraints.gridx = 0;
1360	1761	aConstraints.gridwidth = 1;
..	..	@@ -1362,7 +1763,7 @@
1362	1763	aConstraints.gridy += 1;
1363	1764	aConstraints.gridwidth = 1;
1364	1765	mainPanel.add(objectPanel, aConstraints);
1365		- */
	1766	+ */
1366	1767
1367	1768	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1368	1769	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1379,17 +1780,114 @@
1379	1780	JTabbedPane tabbedPane = new JTabbedPane();
1380	1781	tabbedPane.add(scrollpane);
1381	1782
1382		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1383		-
1384		- optionsPanel = new cGridBag().setVertical(true);
	1783	+ optionsPanel = new cGridBag().setVertical(false);
1385	1784
1386	1785	optionsPanel.setName("Options");
1387	1786
1388	1787	AddOptions(optionsPanel); //, aConstraints);
1389	1788
	1789	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1790	+
1390	1791	tabbedPane.add(optionsPanel);
1391	1792
1392	1793	scenePanel.add(tabbedPane);
	1794	+
	1795	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1796	+ creditsPanel.setName("Credits");
	1797	+
	1798	+ cLabel ogaLabel = new cLabel(" Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1799	+ creditsPanel.add(ogaLabel);
	1800	+
	1801	+ cButton creditButton;
	1802	+ creditsPanel.add(creditButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1803	+ creditButton.setToolTipText("https://opengameart.org");
	1804	+
	1805	+ creditButton.addMouseListener(new MouseAdapter()
	1806	+ {
	1807	+ public void mouseClicked(MouseEvent e)
	1808	+ {
	1809	+ try
	1810	+ {
	1811	+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
	1812	+ } catch (Exception e1)
	1813	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1814	+ {
	1815	+ e1.printStackTrace();
	1816	+ }
	1817	+ }
	1818	+ });
	1819	+
	1820	+ ogaLabel = new cLabel(" Download 3D models! (.3ds and .obj only)", !Globals.NIMBUSLAF);
	1821	+ creditsPanel.add(ogaLabel);
	1822	+
	1823	+ creditsPanel.add(creditButton = GetButton("icons/3delicious.png", !Globals.NIMBUSLAF));
	1824	+ creditButton.setToolTipText("https://3delicious.net");
	1825	+
	1826	+ creditButton.addMouseListener(new MouseAdapter()
	1827	+ {
	1828	+ public void mouseClicked(MouseEvent e)
	1829	+ {
	1830	+ try
	1831	+ {
	1832	+ Desktop.getDesktop().browse(new java.net.URI("https://3delicious.net"));
	1833	+ } catch (Exception e1)
	1834	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1835	+ {
	1836	+ e1.printStackTrace();
	1837	+ }
	1838	+ }
	1839	+ });
	1840	+
	1841	+ creditsPanel.add(creditButton = GetButton("icons/archive3d.png", !Globals.NIMBUSLAF));
	1842	+ creditButton.setToolTipText("https://archive3d.net");
	1843	+
	1844	+ creditButton.addMouseListener(new MouseAdapter()
	1845	+ {
	1846	+ public void mouseClicked(MouseEvent e)
	1847	+ {
	1848	+ try
	1849	+ {
	1850	+ Desktop.getDesktop().browse(new java.net.URI("https://archive3d.net"));
	1851	+ } catch (Exception e1)
	1852	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1853	+ {
	1854	+ e1.printStackTrace();
	1855	+ }
	1856	+ }
	1857	+ });
	1858	+
	1859	+ creditsPanel.add(creditButton = GetButton("icons/turbosquid.png", !Globals.NIMBUSLAF));
	1860	+ creditButton.setToolTipText("https://turbosquid.com");
	1861	+
	1862	+ creditButton.addMouseListener(new MouseAdapter()
	1863	+ {
	1864	+ public void mouseClicked(MouseEvent e)
	1865	+ {
	1866	+ try
	1867	+ {
	1868	+ Desktop.getDesktop().browse(new java.net.URI("https://www.turbosquid.com/Search/3D-Models/free"));
	1869	+ } catch (Exception e1)
	1870	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1871	+ {
	1872	+ e1.printStackTrace();
	1873	+ }
	1874	+ }
	1875	+ });
	1876	+
	1877	+ for (int i=6; --i>=0;)
	1878	+ {
	1879	+ creditsPanel.add(new cGridBag());
	1880	+ }
	1881	+
	1882	+ tabbedPane.add(creditsPanel);
	1883	+ tabbedPane.setToolTipTextAt(3, "Credits");
	1884	+
	1885	+ if (Globals.ADVANCED)
	1886	+ {
	1887	+ tabbedPane.add(infoPanel);
	1888	+ tabbedPane.setIconAt(4, GetIcon("icons/info.png"));
	1889	+ tabbedPane.setToolTipTextAt(4, "Information");
	1890	+ }
1393	1891
1394	1892	/*
1395	1893	cTree jTree = new cTree(null);
..	..	@@ -1411,13 +1909,13 @@
1411	1909	jtp.add(tree);
1412	1910	*/
1413	1911
1414		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1415		- bigPanel.setContinuousLayout(true);
1416		- bigPanel.setOneTouchExpandable(true);
1417		- bigPanel.setDividerLocation(0.8);
1418		- bigPanel.setDividerSize(15);
1419		- bigPanel.setResizeWeight(0.15);
1420		- bigPanel.setName("Scene");
	1912	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1913	+// bigPanel.setContinuousLayout(true);
	1914	+// bigPanel.setOneTouchExpandable(true);
	1915	+// bigPanel.setDividerLocation(0.8);
	1916	+// bigPanel.setDividerSize(15);
	1917	+// bigPanel.setResizeWeight(0.15);
	1918	+// bigPanel.setName("Scene");
1421	1919
1422	1920	//bigPanel.setLayout(new BorderLayout());
1423	1921	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1452,7 +1950,7 @@
1452	1950	bigThree = new cGridBag();
1453	1951	bigThree.addComponent(scenePanel);
1454	1952	bigThree.addComponent(centralPanel);
1455		- bigThree.addComponent(XYZPanel);
	1953	+ //bigThree.addComponent(XYZPanel);
1456	1954
1457	1955	// // SIDE EFFECT!!!
1458	1956	// aConstraints.gridx = 0;
..	..	@@ -1461,16 +1959,33 @@
1461	1959	// aConstraints.gridheight = 1;
1462	1960
1463	1961	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1464		- framePanel.setContinuousLayout(true);
1465		- framePanel.setOneTouchExpandable(true);
1466		- framePanel.setDividerLocation(0.8);
	1962	+
	1963	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1964	+ new java.beans.PropertyChangeListener()
	1965	+ {
	1966	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1967	+ {
	1968	+ if ((Integer)pce.getOldValue() == 1)
	1969	+ {
	1970	+ if (radio.layout != expandedLayout)
	1971	+ {
	1972	+ radio.layout = expandedLayout;
	1973	+ radio.layout.doClick();
	1974	+ }
	1975	+ }
	1976	+ }
	1977	+ });
	1978	+
	1979	+ framePanel.setContinuousLayout(false);
	1980	+ framePanel.setOneTouchExpandable(false);
	1981	+ //.setDividerLocation(0.8);
1467	1982	//framePanel.setDividerSize(15);
1468	1983	//framePanel.setResizeWeight(0.15);
1469	1984	framePanel.setName("Frame");
1470	1985
1471	1986	frame.getContentPane().setLayout(new BorderLayout());
1472	1987	/**/
1473		- JTabbedPane worldPane = new JTabbedPane();
	1988	+ //JTabbedPane worldPane = new JTabbedPane();
1474	1989	//worldPane.add(bigPanel);
1475	1990	//worldPane.add(worldPanel);
1476	1991	/**/
..	..	@@ -1481,16 +1996,18 @@
1481	1996	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1482	1997
1483	1998	frame.setSize(1280, 860);
1484		- frame.setVisible(true);
1485		-
	1999	+
1486	2000	cameraView.requestFocusInWindow();
1487	2001
1488		- gridPanel.setDividerLocation(1.0);
	2002	+// gridPanel.setDividerLocation(1.0);
	2003	+
	2004	+ frame.validate();
	2005	+
	2006	+ frame.setVisible(true);
1489	2007
1490	2008	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1491	2009	frame.addWindowListener(new WindowAdapter()
1492	2010	{
1493		-
1494	2011	public void windowClosing(WindowEvent e)
1495	2012	{
1496	2013	Close();
..	..	@@ -1513,28 +2030,442 @@
1513	2030	ctrlPanel.removeAll();
1514	2031	}
1515	2032
1516		- void SetupMaterial(cGridBag panel)
	2033	+ void SetupMaterial(cGridBag materialpanel)
1517	2034	{
1518		- /*
	2035	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	2036	+
	2037	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
	2038	+ skin.setToolTipText("Skin");
	2039	+ skin.addMouseListener(new MouseAdapter()
	2040	+ {
	2041	+ public void mouseClicked(MouseEvent e)
	2042	+ {
	2043	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	2044	+ cMaterial material = object.material;
	2045	+
	2046	+ // Skin
	2047	+ colorField.setFloat(material.color);
	2048	+ float saturation = material.modulation;
	2049	+
	2050	+ if (!cameraView.Skinshader)
	2051	+ {
	2052	+ saturation /= 1.5;
	2053	+ }
	2054	+
	2055	+ saturationField.setFloat(saturation);
	2056	+
	2057	+ subsurfaceField.setFloat(material.subsurface);
	2058	+ selfshadowField.setFloat(material.diffuseness);
	2059	+ diffusenessField.setFloat(material.factor);
	2060	+ shininessField.setFloat(material.shininess);
	2061	+ shadowbiasField.setFloat(material.shadowbias);
	2062	+ diffuseField.setFloat(material.diffuse);
	2063	+ specularField.setFloat(material.specular);
	2064	+
	2065	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2066	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2067	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2068	+
	2069	+ materialtouched = true;
	2070	+ applySelf();
	2071	+ }
	2072	+ });
	2073	+ presetpanel.add(skin);
	2074	+
	2075	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
	2076	+ lambert.setToolTipText("Diffuse");
	2077	+ lambert.addMouseListener(new MouseAdapter()
	2078	+ {
	2079	+ public void mouseClicked(MouseEvent e)
	2080	+ {
	2081	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	2082	+ cMaterial material = object.material;
	2083	+
	2084	+ diffusenessField.setFloat(material.factor);
	2085	+ selfshadowField.setFloat(material.diffuseness);
	2086	+
	2087	+ materialtouched = true;
	2088	+ applySelf();
	2089	+ }
	2090	+ });
	2091	+ presetpanel.add(lambert);
	2092	+
	2093	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
	2094	+ diffuse2.setToolTipText("Diffuse2");
	2095	+ diffuse2.addMouseListener(new MouseAdapter()
	2096	+ {
	2097	+ public void mouseClicked(MouseEvent e)
	2098	+ {
	2099	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	2100	+ cMaterial material = object.material;
	2101	+
	2102	+ diffusenessField.setFloat(material.factor);
	2103	+ selfshadowField.setFloat(material.diffuseness);
	2104	+
	2105	+ materialtouched = true;
	2106	+ applySelf();
	2107	+ }
	2108	+ });
	2109	+ presetpanel.add(diffuse2);
	2110	+
	2111	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
	2112	+ diffusemoon.setToolTipText("Moon");
	2113	+ diffusemoon.addMouseListener(new MouseAdapter()
	2114	+ {
	2115	+ public void mouseClicked(MouseEvent e)
	2116	+ {
	2117	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	2118	+ cMaterial material = object.material;
	2119	+
	2120	+ diffusenessField.setFloat(material.factor);
	2121	+ selfshadowField.setFloat(material.diffuseness);
	2122	+
	2123	+ materialtouched = true;
	2124	+ applySelf();
	2125	+ }
	2126	+ });
	2127	+ presetpanel.add(diffusemoon);
	2128	+
	2129	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
	2130	+ diffusemoon2.setToolTipText("Moon2");
	2131	+ diffusemoon2.addMouseListener(new MouseAdapter()
	2132	+ {
	2133	+ public void mouseClicked(MouseEvent e)
	2134	+ {
	2135	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	2136	+ cMaterial material = object.material;
	2137	+
	2138	+ diffusenessField.setFloat(material.factor);
	2139	+ selfshadowField.setFloat(material.diffuseness);
	2140	+
	2141	+ materialtouched = true;
	2142	+ applySelf();
	2143	+ }
	2144	+ });
	2145	+ presetpanel.add(diffusemoon2);
	2146	+
	2147	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
	2148	+ diffusemoon3.setToolTipText("Moon3");
	2149	+ diffusemoon3.addMouseListener(new MouseAdapter()
	2150	+ {
	2151	+ public void mouseClicked(MouseEvent e)
	2152	+ {
	2153	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	2154	+ cMaterial material = object.material;
	2155	+
	2156	+ diffusenessField.setFloat(material.factor);
	2157	+ selfshadowField.setFloat(material.diffuseness);
	2158	+
	2159	+ materialtouched = true;
	2160	+ applySelf();
	2161	+ }
	2162	+ });
	2163	+ presetpanel.add(diffusemoon3);
	2164	+
	2165	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
	2166	+ diffusesheen.setToolTipText("Sheen");
	2167	+ diffusesheen.addMouseListener(new MouseAdapter()
	2168	+ {
	2169	+ public void mouseClicked(MouseEvent e)
	2170	+ {
	2171	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2172	+ cMaterial material = object.material;
	2173	+
	2174	+ sheenField.setFloat(material.sheen);
	2175	+
	2176	+ materialtouched = true;
	2177	+ applySelf();
	2178	+ }
	2179	+ });
	2180	+ presetpanel.add(diffusesheen);
	2181	+
	2182	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
	2183	+ rough.setToolTipText("Rough metal");
	2184	+ rough.addMouseListener(new MouseAdapter()
	2185	+ {
	2186	+ public void mouseClicked(MouseEvent e)
	2187	+ {
	2188	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2189	+ cMaterial material = object.material;
	2190	+
	2191	+ shininessField.setFloat(material.shininess);
	2192	+ velvetField.setFloat(material.velvet);
	2193	+
	2194	+ materialtouched = true;
	2195	+ applySelf();
	2196	+ }
	2197	+ });
	2198	+ presetpanel.add(rough);
	2199	+
	2200	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
	2201	+ rough2.setToolTipText("Medium metal");
	2202	+ rough2.addMouseListener(new MouseAdapter()
	2203	+ {
	2204	+ public void mouseClicked(MouseEvent e)
	2205	+ {
	2206	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2207	+ cMaterial material = object.material;
	2208	+
	2209	+ shininessField.setFloat(material.shininess);
	2210	+ lightareaField.setFloat(material.lightarea);
	2211	+
	2212	+ materialtouched = true;
	2213	+ applySelf();
	2214	+ }
	2215	+ });
	2216	+ presetpanel.add(rough2);
	2217	+
	2218	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
	2219	+ shini0.setToolTipText("Shiny");
	2220	+ shini0.addMouseListener(new MouseAdapter()
	2221	+ {
	2222	+ public void mouseClicked(MouseEvent e)
	2223	+ {
	2224	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2225	+ cMaterial material = object.material;
	2226	+
	2227	+ shininessField.setFloat(material.shininess);
	2228	+ lightareaField.setFloat(material.lightarea);
	2229	+
	2230	+ materialtouched = true;
	2231	+ applySelf();
	2232	+ }
	2233	+ });
	2234	+ presetpanel.add(shini0);
	2235	+
	2236	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
	2237	+ shini1.setToolTipText("Shiny2");
	2238	+ shini1.addMouseListener(new MouseAdapter()
	2239	+ {
	2240	+ public void mouseClicked(MouseEvent e)
	2241	+ {
	2242	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2243	+ cMaterial material = object.material;
	2244	+
	2245	+ shininessField.setFloat(material.shininess);
	2246	+ lightareaField.setFloat(material.lightarea);
	2247	+
	2248	+ materialtouched = true;
	2249	+ applySelf();
	2250	+ }
	2251	+ });
	2252	+ presetpanel.add(shini1);
	2253	+
	2254	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
	2255	+ shini2.setToolTipText("Shiny3");
	2256	+ shini2.addMouseListener(new MouseAdapter()
	2257	+ {
	2258	+ public void mouseClicked(MouseEvent e)
	2259	+ {
	2260	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2261	+ cMaterial material = object.material;
	2262	+
	2263	+ shininessField.setFloat(material.shininess);
	2264	+ lightareaField.setFloat(material.lightarea);
	2265	+
	2266	+ materialtouched = true;
	2267	+ applySelf();
	2268	+ }
	2269	+ });
	2270	+ presetpanel.add(shini2);
	2271	+
	2272	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
	2273	+ aniso.setToolTipText("AnisoU");
	2274	+ aniso.addMouseListener(new MouseAdapter()
	2275	+ {
	2276	+ public void mouseClicked(MouseEvent e)
	2277	+ {
	2278	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2279	+ cMaterial material = object.material;
	2280	+
	2281	+ anisoField.setFloat(material.aniso);
	2282	+ anisoVField.setFloat(material.anisoV);
	2283	+
	2284	+ materialtouched = true;
	2285	+ applySelf();
	2286	+ }
	2287	+ });
	2288	+ presetpanel.add(aniso);
	2289	+
	2290	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
	2291	+ aniso2.setToolTipText("AnisoV");
	2292	+ aniso2.addMouseListener(new MouseAdapter()
	2293	+ {
	2294	+ public void mouseClicked(MouseEvent e)
	2295	+ {
	2296	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2297	+ cMaterial material = object.material;
	2298	+
	2299	+ anisoField.setFloat(material.aniso);
	2300	+ anisoVField.setFloat(material.anisoV);
	2301	+
	2302	+ materialtouched = true;
	2303	+ applySelf();
	2304	+ }
	2305	+ });
	2306	+ presetpanel.add(aniso2);
	2307	+
	2308	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
	2309	+ aniso3.setToolTipText("AnisoUV");
	2310	+ aniso3.addMouseListener(new MouseAdapter()
	2311	+ {
	2312	+ public void mouseClicked(MouseEvent e)
	2313	+ {
	2314	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2315	+ cMaterial material = object.material;
	2316	+
	2317	+ anisoField.setFloat(material.aniso);
	2318	+ anisoVField.setFloat(material.anisoV);
	2319	+
	2320	+ materialtouched = true;
	2321	+ applySelf();
	2322	+ }
	2323	+ });
	2324	+ presetpanel.add(aniso3);
	2325	+
	2326	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
	2327	+ velvet0.setToolTipText("Velvet");
	2328	+ velvet0.addMouseListener(new MouseAdapter()
	2329	+ {
	2330	+ public void mouseClicked(MouseEvent e)
	2331	+ {
	2332	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2333	+ cMaterial material = object.material;
	2334	+
	2335	+ diffusenessField.setFloat(material.factor);
	2336	+ selfshadowField.setFloat(material.diffuseness);
	2337	+ sheenField.setFloat(material.sheen);
	2338	+ shininessField.setFloat(material.shininess);
	2339	+ velvetField.setFloat(material.velvet);
	2340	+ shiftField.setFloat(material.shift);
	2341	+
	2342	+ materialtouched = true;
	2343	+ applySelf();
	2344	+ }
	2345	+ });
	2346	+ presetpanel.add(velvet0);
	2347	+
	2348	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
	2349	+ bump0.setToolTipText("Bump texture");
	2350	+ bump0.addMouseListener(new MouseAdapter()
	2351	+ {
	2352	+ public void mouseClicked(MouseEvent e)
	2353	+ {
	2354	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2355	+ cMaterial material = object.material;
	2356	+
	2357	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2358	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2359	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2360	+
	2361	+ materialtouched = true;
	2362	+ applySelf();
	2363	+ }
	2364	+ });
	2365	+ presetpanel.add(bump0);
	2366	+
	2367	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
	2368	+ borderShader.setToolTipText("Border fade");
	2369	+ borderShader.addMouseListener(new MouseAdapter()
	2370	+ {
	2371	+ public void mouseClicked(MouseEvent e)
	2372	+ {
	2373	+ borderfadeField.setFloat(0.5);
	2374	+ opacityField.setFloat(0.75);
	2375	+
	2376	+ materialtouched = true;
	2377	+ applySelf();
	2378	+ }
	2379	+ });
	2380	+ presetpanel.add(borderShader);
	2381	+
	2382	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
	2383	+ halo.setToolTipText("Halo");
	2384	+ halo.addMouseListener(new MouseAdapter()
	2385	+ {
	2386	+ public void mouseClicked(MouseEvent e)
	2387	+ {
	2388	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2389	+ cMaterial material = object.material;
	2390	+
	2391	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2392	+
	2393	+ materialtouched = true;
	2394	+ applySelf();
	2395	+ }
	2396	+ });
	2397	+ presetpanel.add(halo);
	2398	+
	2399	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
	2400	+ candle.setToolTipText("Candle");
	2401	+ candle.addMouseListener(new MouseAdapter()
	2402	+ {
	2403	+ public void mouseClicked(MouseEvent e)
	2404	+ {
	2405	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2406	+ cMaterial material = object.material;
	2407	+
	2408	+ subsurfaceField.setFloat(material.subsurface);
	2409	+ shadowbiasField.setFloat(material.shadowbias);
	2410	+ ambientField.setFloat(material.ambient);
	2411	+ specularField.setFloat(material.specular);
	2412	+ lightareaField.setFloat(material.lightarea);
	2413	+ shininessField.setFloat(material.shininess);
	2414	+
	2415	+ materialtouched = true;
	2416	+ applySelf();
	2417	+ }
	2418	+ });
	2419	+ presetpanel.add(candle);
	2420	+
	2421	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
	2422	+ shadowShader.setToolTipText("Shadow");
	2423	+ shadowShader.addMouseListener(new MouseAdapter()
	2424	+ {
	2425	+ public void mouseClicked(MouseEvent e)
	2426	+ {
	2427	+ diffuseField.setFloat(0.001);
	2428	+ ambientField.setFloat(0.001);
	2429	+ cameraField.setFloat(0.001);
	2430	+ specularField.setFloat(0.001);
	2431	+ fakedepthField.setFloat(0.001);
	2432	+ opacityField.setFloat(0.6);
	2433	+
	2434	+ materialtouched = true;
	2435	+ applySelf();
	2436	+ }
	2437	+ });
	2438	+ presetpanel.add(shadowShader);
	2439	+
	2440	+ cGridBag panel = new cGridBag().setVertical(true);
	2441	+
	2442	+ presetpanel.preferredWidth = 1;
	2443	+
	2444	+ materialpanel.add(presetpanel);
	2445	+ materialpanel.add(panel);
	2446	+
	2447	+ panel.preferredWidth = 8;
	2448	+
	2449	+ /*
1519	2450	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1520	2451	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1521		- */
	2452	+ */
1522	2453
1523	2454	cGridBag editBar = new cGridBag().setVertical(false);
1524	2455
1525		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2456	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
1526	2457	createMaterialButton.setToolTipText("Create material");
1527	2458
1528	2459	/*
1529	2460	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1530	2461	*/
1531	2462
1532		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2463	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
1533	2464	clearMaterialButton.setToolTipText("Clear material");
1534	2465
1535	2466	if (Globals.ADVANCED)
1536	2467	{
1537		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2468	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
1538	2469	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1539	2470	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1540	2471	}
..	..	@@ -1552,45 +2483,61 @@
1552	2483	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1553	2484
1554	2485	cGridBag colorSection = new cGridBag().setVertical(true);
	2486	+
	2487	+ cGridBag huepanel = new cGridBag();
	2488	+ cGridBag huelabel = new cGridBag();
	2489	+ cLabel hue = GetLabel("icons/hue.png", false);
	2490	+ hue.fit = true;
	2491	+
	2492	+ hue.addMouseListener(new MouseAdapter()
	2493	+ {
	2494	+ public void mousePressed(MouseEvent e)
	2495	+ {
	2496	+ int x = e.getX();
	2497	+
	2498	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2499	+ }
	2500	+ });
	2501	+
	2502	+ huelabel.add(hue);
	2503	+ huelabel.preferredWidth = 20;
	2504	+ huepanel.add(new cGridBag()); // Label
	2505	+ huepanel.add(huelabel); // Field/slider
	2506	+
	2507	+ huepanel.preferredHeight = 7;
	2508	+
	2509	+ colorSection.add(huepanel);
1555	2510
1556	2511	cGridBag color = new cGridBag();
1557		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1558		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1559		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2512	+
	2513	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2514	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2515	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2516	+
1560	2517	//colorField.preferredWidth = 200;
1561	2518	colorSection.add(color);
1562	2519
1563	2520	cGridBag modulation = new cGridBag();
1564	2521	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1565	2522	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1566		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2523	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1567	2524	colorSection.add(modulation);
1568	2525
	2526	+ cGridBag opacity = new cGridBag();
	2527	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2528	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2529	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2530	+ colorSection.add(opacity);
	2531	+
	2532	+ colorSection.add(GetSeparator());
	2533	+
1569	2534	cGridBag texture = new cGridBag();
1570	2535	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1571	2536	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1572	2537	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1573	2538	colorSection.add(texture);
1574	2539
1575		- cGridBag anisoU = new cGridBag();
1576		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1577		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1578		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1579		- colorSection.add(anisoU);
1580		-
1581		- cGridBag anisoV = new cGridBag();
1582		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1583		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1584		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1585		- colorSection.add(anisoV);
1586		-
1587		- cGridBag shadowbias = new cGridBag();
1588		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1589		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1590		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1591		- colorSection.add(shadowbias);
1592		-
1593		- panel.add(new JSeparator());
	2540	+ panel.add(GetSeparator());
1594	2541
1595	2542	panel.add(colorSection);
1596	2543
..	..	@@ -1640,7 +2587,13 @@
1640	2587	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1641	2588	diffuseSection.add(fakedepth);
1642	2589
1643		- panel.add(new JSeparator());
	2590	+ cGridBag shadowbias = new cGridBag();
	2591	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2592	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2593	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2594	+ diffuseSection.add(shadowbias);
	2595	+
	2596	+ panel.add(GetSeparator());
1644	2597
1645	2598	panel.add(diffuseSection);
1646	2599
..	..	@@ -1690,42 +2643,54 @@
1690	2643	// aConstraints.gridy += 1;
1691	2644	// aConstraints.gridwidth = 1;
1692	2645
	2646	+ cGridBag anisoU = new cGridBag();
	2647	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2648	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2649	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2650	+ specularSection.add(anisoU);
1693	2651
1694		- panel.add(new JSeparator());
	2652	+ cGridBag anisoV = new cGridBag();
	2653	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2654	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2655	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2656	+ specularSection.add(anisoV);
	2657	+
	2658	+
	2659	+ panel.add(GetSeparator());
1695	2660
1696	2661	panel.add(specularSection);
1697	2662
1698	2663	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1699	2664
1700		- cGridBag globalSection = new cGridBag().setVertical(true);
	2665	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1701	2666
1702	2667	cGridBag camera = new cGridBag();
1703	2668	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1704	2669	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1705	2670	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1706		- globalSection.add(camera);
	2671	+ colorSection.add(camera);
1707	2672
1708	2673	cGridBag ambient = new cGridBag();
1709	2674	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1710	2675	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1711	2676	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1712		- globalSection.add(ambient);
	2677	+ colorSection.add(ambient);
1713	2678
1714	2679	cGridBag backlit = new cGridBag();
1715	2680	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1716	2681	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1717	2682	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1718		- globalSection.add(backlit);
	2683	+ colorSection.add(backlit);
1719	2684
1720		- cGridBag opacity = new cGridBag();
1721		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1722		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1723		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1724		- globalSection.add(opacity);
1725		-
1726		- panel.add(new JSeparator());
	2685	+ cGridBag parallax = new cGridBag();
	2686	+ parallax.add(parallaxLabel = new JLabel("Parallax")); // , aConstraints);
	2687	+ parallaxLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2688	+ parallax.add(parallaxField = new cNumberSlider(this, 0.001, 0.5, -0.25)); // , aConstraints);
	2689	+ colorSection.add(parallax);
1727	2690
1728		- panel.add(globalSection);
	2691	+ //panel.add(new JSeparator());
	2692	+
	2693	+ //panel.add(globalSection);
1729	2694
1730	2695	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1731	2696
..	..	@@ -1767,7 +2732,7 @@
1767	2732	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1768	2733	textureSection.add(opacityPower);
1769	2734
1770		- panel.add(new JSeparator());
	2735	+ panel.add(GetSeparator());
1771	2736
1772	2737	panel.add(textureSection);
1773	2738
..	..	@@ -1832,8 +2797,9 @@
1832	2797	// 3D models
1833	2798	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1834	2799	{
1835		- lastConverter = new com.jmex.model.converters.MaxToJme();
1836		- LoadFile(filename, lastConverter);
	2800	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2801	+ //LoadFile(filename, lastConverter);
	2802	+ LoadObjFile(filename); // New 3ds loader
1837	2803	continue;
1838	2804	}
1839	2805	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2559,6 +3525,7 @@
2559	3525	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2560	3526	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2561	3527	}
	3528	+
2562	3529	//cJME.count++;
2563	3530	//cJME.count %= 12;
2564	3531	if (gc)
..	..	@@ -2742,6 +3709,7 @@
2742	3709	}
2743	3710	}
2744	3711	}
	3712	+
2745	3713	cFileSystemPane FSPane;
2746	3714
2747	3715	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2751,7 +3719,7 @@
2751	3719
2752	3720	freezematerial = true;
2753	3721	colorField.setFloat(mat.color);
2754		- modulationField.setFloat(mat.modulation);
	3722	+ saturationField.setFloat(mat.modulation);
2755	3723	metalnessField.setFloat(mat.metalness);
2756	3724	diffuseField.setFloat(mat.diffuse);
2757	3725	specularField.setFloat(mat.specular);
..	..	@@ -2771,6 +3739,7 @@
2771	3739	shadowField.setFloat(mat.shadow);
2772	3740	textureField.setFloat(mat.texture);
2773	3741	opacityField.setFloat(mat.opacity);
	3742	+ parallaxField.setFloat(mat.parallax + 0.25f);
2774	3743	fakedepthField.setFloat(mat.fakedepth);
2775	3744	shadowbiasField.setFloat(mat.shadowbias);
2776	3745	bumpField.setInteger(1); // dec 2013
..	..	@@ -2795,11 +3764,14 @@
2795	3764	}
2796	3765	}
2797	3766	}
	3767	+
2798	3768	freezematerial = false;
2799	3769	}
2800	3770
2801	3771	void SetMaterial(Object3D object)
2802	3772	{
	3773	+ latestObject = object;
	3774	+
2803	3775	cMaterial mat = object.material;
2804	3776
2805	3777	if (mat == null)
..	..	@@ -2810,32 +3782,8 @@
2810	3782
2811	3783	if (multiplyToggle != null)
2812	3784	multiplyToggle.setSelected(mat.multiply);
2813		-
2814		- assert (object.projectedVertices != null);
2815		-
2816		- if (object.projectedVertices.length <= 2)
2817		- {
2818		- // Side effect...
2819		- Object3D.cVector2[] keep = object.projectedVertices;
2820		- object.projectedVertices = new Object3D.cVector2[3];
2821		- for (int i = 0; i < 3; i++)
2822		- {
2823		- if (i < keep.length)
2824		- {
2825		- object.projectedVertices[i] = keep[i];
2826		- } else
2827		- {
2828		- object.projectedVertices[i] = new Object3D.cVector2();
2829		- }
2830		- /*
2831		- if(keep.length == 0)
2832		- object.projectedVertices[0] = new Object3D.cVector2();
2833		- else
2834		- object.projectedVertices[0] = keep[0];
2835		- object.projectedVertices[1] = new Object3D.cVector2();
2836		- */
2837		- }
2838		- }
	3785	+
	3786	+ AllocProjectedVertices(object);
2839	3787
2840	3788	SetMaterial(mat, object.projectedVertices);
2841	3789	}
..	..	@@ -2911,12 +3859,17 @@
2911	3859	// }
2912	3860
2913	3861	/**/
2914		- if (deselect)
	3862	+ if (deselect \|\| child == null)
2915	3863	{
2916	3864	//group.deselectAll();
2917	3865	//freeze = true;
2918	3866	GetTree().clearSelection();
2919	3867	//freeze = false;
	3868	+
	3869	+ if (child == null)
	3870	+ {
	3871	+ return;
	3872	+ }
2920	3873	}
2921	3874
2922	3875	//group.addSelectee(child);
..	..	@@ -2950,6 +3903,17 @@
2950	3903	public void itemStateChanged(ItemEvent event)
2951	3904	{
2952	3905	// System.out.println("Propagate = " + propagate);
	3906	+ if (event.getSource() == pinButton)
	3907	+ {
	3908	+ copy.pinned ^= true;
	3909	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3910	+ {
	3911	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3912	+ copy.CloseUI();
	3913	+ //copy.editWindow.refreshContents();
	3914	+ }
	3915	+ }
	3916	+ else
2953	3917	if (event.getSource() == propagateToggle)
2954	3918	{
2955	3919	propagate ^= true;
..	..	@@ -2985,7 +3949,7 @@
2985	3949	cameraView.ToggleDL();
2986	3950	cameraView.repaint();
2987	3951	return;
2988		- } else if (event.getSource() == toggleTextureItem)
	3952	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2989	3953	{
2990	3954	cameraView.ToggleTexture();
2991	3955	// june 2013 copy.HardTouch();
..	..	@@ -3024,7 +3988,7 @@
3024	3988	frame.validate();
3025	3989
3026	3990	return;
3027		- } else if (event.getSource() == toggleSwitchItem)
	3991	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3028	3992	{
3029	3993	cameraView.ToggleSwitch();
3030	3994	cameraView.repaint();
..	..	@@ -3054,8 +4018,9 @@
3054	4018	} else if (event.getSource() == liveCB)
3055	4019	{
3056	4020	copy.live ^= true;
	4021	+ objEditor.refreshContents(true); // To show item colors
3057	4022	return;
3058		- } else if (event.getSource() == selectCB)
	4023	+ } else if (event.getSource() == selectableCB)
3059	4024	{
3060	4025	copy.dontselect ^= true;
3061	4026	return;
..	..	@@ -3063,7 +4028,7 @@
3063	4028	{
3064	4029	copy.hide ^= true;
3065	4030	copy.Touch(); // display list issue
3066		- objEditor.refreshContents();
	4031	+ objEditor.refreshContents(true); // To show item colors
3067	4032	return;
3068	4033	} else if (event.getSource() == link2masterCB)
3069	4034	{
..	..	@@ -3128,7 +4093,7 @@
3128	4093	//System.out.println("ObjEditor " + event);
3129	4094	applySelf0(true);
3130	4095	//parent.applySelf();
3131		- objEditor.refreshContents();
	4096	+ // conflicts with requestFocus objEditor.refreshContents();
3132	4097	} else if (source == resetButton)
3133	4098	{
3134	4099	CameraPane.fullreset = true;
..	..	@@ -3240,9 +4205,9 @@
3240	4205	{
3241	4206	Close();
3242	4207	//return true;
3243		- } else if (source == loadItem)
	4208	+ } else if (source == openItem)
3244	4209	{
3245		- load();
	4210	+ Open();
3246	4211	//return true;
3247	4212	} else if (source == newItem)
3248	4213	{
..	..	@@ -3267,6 +4232,10 @@
3267	4232	{
3268	4233	generatePOV();
3269	4234	//return true;
	4235	+ } else if (event.getSource() == archiveItem)
	4236	+ {
	4237	+ cTools.Archive(frame);
	4238	+ return;
3270	4239	} else if (source == zBufferItem)
3271	4240	{
3272	4241	try
..	..	@@ -3304,22 +4273,30 @@
3304	4273
3305	4274	void New()
3306	4275	{
3307		- while (copy.Size() > 1)
	4276	+ while (copy.Size() > 0)
3308	4277	{
3309		- copy.remove(1);
	4278	+ copy.remove(0);
3310	4279	}
3311	4280
	4281	+ copy.selection.clear();
	4282	+
	4283	+ if (copy == Grafreed.grafreed.universe)
	4284	+ {
	4285	+ CreateCameras();
	4286	+ cameraView.SetCamera(GetCamera(copy, 0));
	4287	+ }
3312	4288	ResetModel();
3313	4289	objEditor.refreshContents();
3314	4290	}
3315	4291
3316	4292	static public byte[] Compress(Object3D o)
3317	4293	{
	4294	+ // Slower to actually compress.
3318	4295	try
3319	4296	{
3320	4297	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3321		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3322		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	4298	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4299	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3323	4300
3324	4301	Object3D parent = o.parent;
3325	4302	o.parent = null;
..	..	@@ -3330,10 +4307,14 @@
3330	4307
3331	4308	out.flush();
3332	4309
3333		- zstream.close();
	4310	+ baos //zstream
	4311	+ .close();
3334	4312	out.close();
3335	4313
3336		- return baos.toByteArray();
	4314	+ byte[] bytes = baos.toByteArray();
	4315	+
	4316	+ System.out.println("save #bytes = " + bytes.length);
	4317	+ return bytes;
3337	4318	} catch (Exception e)
3338	4319	{
3339	4320	System.err.println(e);
..	..	@@ -3343,13 +4324,16 @@
3343	4324
3344	4325	static public Object Uncompress(byte[] bytes)
3345	4326	{
3346		- System.out.println("#bytes = " + bytes.length);
	4327	+ System.out.println("restore #bytes = " + bytes.length);
3347	4328	try
3348	4329	{
3349	4330	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3350		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3351		- ObjectInputStream in = new ObjectInputStream(istream);
	4331	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4332	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3352	4333	Object obj = in.readObject();
	4334	+
	4335	+ bais //istream
	4336	+ .close();
3353	4337	in.close();
3354	4338
3355	4339	return obj;
..	..	@@ -3404,37 +4388,97 @@
3404	4388	return null;
3405	4389	}
3406	4390
3407		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3408	4391
3409	4392	public void Save()
3410	4393	{
3411		- cRadio tab = GetCurrentTab();
	4394	+ //Save(true);
	4395	+ Replace();
	4396	+ SetVersionStates();
	4397	+ }
	4398	+
	4399	+ private boolean Equal(byte[] compress, byte[] name)
	4400	+ {
	4401	+ if (compress.length != name.length)
	4402	+ {
	4403	+ return false;
	4404	+ }
3412	4405
3413		- boolean temp = CameraPane.SWITCH;
3414		- CameraPane.SWITCH = false;
	4406	+ for (int i=compress.length; --i>=0;)
	4407	+ {
	4408	+ if (compress[i] != name[i])
	4409	+ return false;
	4410	+ }
3415	4411
3416		- copy.ExtractBigData(hashtable);
	4412	+ return true;
	4413	+ }
	4414	+
	4415	+ void DeleteVersion()
	4416	+ {
	4417	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4418	+ {
	4419	+ copy.versionlist[i] = copy.versionlist[i+1];
	4420	+ }
	4421	+
	4422	+ if (copy.versionlist[copy.versionindex] == null)
	4423	+ copy.versionindex -= 1;
	4424	+
	4425	+ if (copy.versionindex != -1)
	4426	+ CopyChanged();
	4427	+
	4428	+ SetVersionStates();
	4429	+ }
	4430	+
	4431	+ public boolean Save(boolean user)
	4432	+ {
	4433	+ System.err.println("Save");
	4434	+ Replace();
	4435	+
	4436	+ //cRadio tab = GetCurrentTab();
	4437	+
	4438	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
	4439	+
	4440	+ boolean thesame = false;
	4441	+
	4442	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4443	+// {
	4444	+// thesame = true;
	4445	+// }
3417	4446
3418	4447	//EditorFrame.m_MainFrame.requestFocusInWindow();
3419		- tab.graphs[tab.undoindex++] = Compress(copy);
3420		-
3421		- copy.RestoreBigData(hashtable);
3422		-
3423		- CameraPane.SWITCH = temp;
3424		-
3425		- //assert(hashtable.isEmpty());
3426		-
3427		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	4448	+ if (!thesame)
3428	4449	{
3429		- tab.graphs[i] = null;
	4450	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4451	+ {
	4452	+ copy.versionlist[i] = copy.versionlist[i-1];
	4453	+ }
	4454	+
	4455	+ //tab.user[tab.versionindex] = user;
	4456	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4457	+
	4458	+ copy.versionlist[++copy.versionindex] = compress;
	4459	+
	4460	+ // if (increment)
	4461	+ // tab.versionindex++;
3430	4462	}
3431	4463
	4464	+ //copy.RestoreBigData(versiontable);
	4465	+
	4466	+ //assert(hashtable.isEmpty());
	4467	+
	4468	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4469	+// {
	4470	+// //tab.user[i] = false;
	4471	+// copy.versionlist[i] = null;
	4472	+// }
	4473	+
	4474	+ SetVersionStates();
	4475	+
3432	4476	// test save
3433	4477	if (false)
3434	4478	{
3435	4479	try
3436	4480	{
3437		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	4481	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3438	4482	ObjectOutputStream p = new ObjectOutputStream(ostream);
3439	4483
3440	4484	p.writeObject(copy);
..	..	@@ -3447,26 +4491,68 @@
3447	4491	e.printStackTrace();
3448	4492	}
3449	4493	}
	4494	+
	4495	+ return !thesame;
	4496	+ }
	4497	+
	4498	+ boolean flashIt = true;
	4499	+
	4500	+ void RefreshSelection()
	4501	+ {
	4502	+ Object3D selection = new Object3D();
	4503	+
	4504	+ for (int i = 0; i < copy.selection.size(); i++)
	4505	+ {
	4506	+ Object3D elem = copy.selection.elementAt(i);
	4507	+
	4508	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4509	+
	4510	+ if (obj == null)
	4511	+ {
	4512	+ copy.selection.remove(i--);
	4513	+ }
	4514	+ else
	4515	+ {
	4516	+ selection.add(obj);
	4517	+ copy.selection.setElementAt(obj, i);
	4518	+ }
	4519	+ }
	4520	+
	4521	+ flashIt = false;
	4522	+ GetTree().clearSelection();
	4523	+ for (int i = 0; i < selection.size(); i++)
	4524	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4525	+ flashIt = true;
	4526	+
	4527	+ //refreshContents(false);
3450	4528	}
3451	4529
3452		- void CopyChanged(Object3D obj)
	4530	+ void CopyChanged()
3453	4531	{
	4532	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4533	+
	4534	+ SetVersionStates();
	4535	+
3454	4536	boolean temp = CameraPane.SWITCH;
3455	4537	CameraPane.SWITCH = false;
3456	4538
3457		- copy.ExtractBigData(hashtable);
	4539	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
3458	4540
3459	4541	copy.clear();
3460	4542
	4543	+ copy.skyboxname = obj.skyboxname;
	4544	+ copy.skyboxext = obj.skyboxext;
	4545	+
3461	4546	for (int i=0; i<obj.Size(); i++)
3462	4547	{
3463	4548	copy.add(obj.get(i));
3464	4549	}
3465	4550
3466		- copy.RestoreBigData(hashtable);
	4551	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
3467	4552
3468	4553	CameraPane.SWITCH = temp;
3469	4554
	4555	+ RefreshSelection();
3470	4556	//assert(hashtable.isEmpty());
3471	4557
3472	4558	copy.Touch();
..	..	@@ -3487,43 +4573,161 @@
3487	4573	}
3488	4574	}
3489	4575
3490		- refreshContents();
	4576	+ refreshContents(true);
3491	4577	}
3492	4578
3493		- public void Undo()
3494		- {
3495		- cRadio tab = GetCurrentTab();
	4579	+ cButton previousVersionButton;
	4580	+ cButton restoreButton;
	4581	+ cButton replaceButton;
	4582	+ cButton nextVersionButton;
	4583	+ cButton saveVersionButton;
	4584	+ cButton deleteVersionButton;
3496	4585
3497		- if (tab.undoindex == 0)
	4586	+ boolean muteSlider;
	4587	+
	4588	+ int VersionCount()
	4589	+ {
	4590	+ int count = 0;
	4591	+
	4592	+ for (int i = copy.versionlist.length; --i >= 0;)
	4593	+ {
	4594	+ if (copy.versionlist[i] != null)
	4595	+ count++;
	4596	+ }
	4597	+
	4598	+ return count;
	4599	+ }
	4600	+
	4601	+ public cGridBag versionSliderPane;
	4602	+
	4603	+ void SetVersionStates()
	4604	+ {
	4605	+ //if (true)
	4606	+ // return;
	4607	+
	4608	+ //cRadio tab = GetCurrentTab();
	4609	+
	4610	+ if (copy.versionlist == null)
	4611	+ {
	4612	+ saveVersionButton.setEnabled(false);
	4613	+ restoreButton.setEnabled(false);
	4614	+ replaceButton.setEnabled(false);
	4615	+ previousVersionButton.setEnabled(false);
	4616	+ nextVersionButton.setEnabled(false);
	4617	+ deleteVersionButton.setEnabled(false);
	4618	+ versionSliderPane.setVisible(false);
	4619	+ }
	4620	+ else
	4621	+ {
	4622	+ restoreButton.setEnabled(copy.versionindex != -1);
	4623	+ replaceButton.setEnabled(copy.versionindex != -1);
	4624	+
	4625	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4626	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4627	+
	4628	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4629	+ //copy.versionlist[copy.versionindex + 1] != null);
	4630	+
	4631	+ muteSlider = true;
	4632	+ versionSlider.setMinimum(0);
	4633	+ versionSlider.setMaximum(VersionCount() - 1);
	4634	+ versionSlider.setInteger(copy.versionindex);
	4635	+ versionSlider.setEnabled(copy.versionindex != -1);
	4636	+ muteSlider = false;
	4637	+
	4638	+ versionSliderPane.setVisible(true);
	4639	+ }
	4640	+ }
	4641	+
	4642	+ public boolean PreviousVersion()
	4643	+ {
	4644	+ // Option?
	4645	+ Replace();
	4646	+
	4647	+ System.err.println("Undo");
	4648	+
	4649	+ //cRadio tab = GetCurrentTab();
	4650	+
	4651	+ if (copy.versionindex == 0)
3498	4652	{
3499	4653	java.awt.Toolkit.getDefaultToolkit().beep();
3500		- return;
	4654	+ return false;
3501	4655	}
3502	4656
3503		- if (tab.graphs[tab.undoindex] == null)
3504		- {
3505		- Save();
3506		- tab.undoindex -= 1;
3507		- }
	4657	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4658	+// {
	4659	+// if (Save(false))
	4660	+// tab.versionindex -= 1;
	4661	+// else
	4662	+// {
	4663	+// if (tab.versionindex <= 0)
	4664	+// return false;
	4665	+// else
	4666	+// tab.versionindex -= 1;
	4667	+// }
	4668	+// }
3508	4669
3509		- tab.undoindex -= 1;
	4670	+ copy.versionindex -= 1;
3510	4671
3511		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4672	+ CopyChanged();
	4673	+
	4674	+ return true;
3512	4675	}
3513	4676
3514		- public void Redo()
	4677	+ public boolean Restore()
3515	4678	{
3516		- cRadio tab = GetCurrentTab();
	4679	+ System.err.println("Restore");
3517	4680
3518		- if (tab.graphs[tab.undoindex + 1] == null)
	4681	+ //cRadio tab = GetCurrentTab();
	4682	+
	4683	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4684	+ {
	4685	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4686	+ return false;
	4687	+ }
	4688	+
	4689	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4690	+ CopyChanged();
	4691	+
	4692	+ return true;
	4693	+ }
	4694	+
	4695	+ public boolean Replace()
	4696	+ {
	4697	+ //System.err.println("Replace");
	4698	+
	4699	+ //cRadio tab = GetCurrentTab();
	4700	+
	4701	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4702	+ {
	4703	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4704	+ return false;
	4705	+ }
	4706	+
	4707	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4708	+
	4709	+ return true;
	4710	+ }
	4711	+
	4712	+ public void NextVersion()
	4713	+ {
	4714	+ // Option?
	4715	+ Replace();
	4716	+
	4717	+ //cRadio tab = GetCurrentTab();
	4718	+
	4719	+ if (copy.versionlist[copy.versionindex + 1] == null)
3519	4720	{
3520	4721	java.awt.Toolkit.getDefaultToolkit().beep();
3521	4722	return;
3522	4723	}
3523	4724
3524		- tab.undoindex += 1;
	4725	+ copy.versionindex += 1;
3525	4726
3526		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4727	+ CopyChanged();
	4728	+
	4729	+ //if (!tab.user[tab.versionindex])
	4730	+ // tab.graphs[tab.versionindex] = null;
3527	4731	}
3528	4732
3529	4733	void ImportGFD()
..	..	@@ -3675,7 +4879,7 @@
3675	4879	assert false;
3676	4880	}
3677	4881
3678		- void EditSelection()
	4882	+ void EditSelection(boolean newWindow)
3679	4883	{
3680	4884	}
3681	4885
..	..	@@ -3717,6 +4921,12 @@
3717	4921	// else
3718	4922	// applySelf(true);
3719	4923	// }
	4924	+
	4925	+ boolean Equal(double a, double b)
	4926	+ {
	4927	+ return Math.abs(a - b) < 0.001;
	4928	+ }
	4929	+
3720	4930	void applySelf0(boolean name)
3721	4931	{
3722	4932	if (name)
..	..	@@ -3734,7 +4944,7 @@
3734	4944	//copy.material = new cMaterial(copy.GetMaterial());
3735	4945
3736	4946	current.color = (float) colorField.getFloat();
3737		- current.modulation = (float) modulationField.getFloat();
	4947	+ current.modulation = (float) saturationField.getFloat();
3738	4948	current.metalness = (float) metalnessField.getFloat();
3739	4949	current.diffuse = (float) diffuseField.getFloat();
3740	4950	current.specular = (float) specularField.getFloat();
..	..	@@ -3754,6 +4964,7 @@
3754	4964	current.shadow = (float) shadowField.getFloat();
3755	4965	current.texture = (float) textureField.getFloat();
3756	4966	current.opacity = (float) opacityField.getFloat();
	4967	+ current.parallax = (float) parallaxField.getFloat() - 0.25f;
3757	4968	current.fakedepth = (float) fakedepthField.getFloat();
3758	4969	current.shadowbias = (float) shadowbiasField.getFloat();
3759	4970
..	..	@@ -3766,29 +4977,54 @@
3766	4977	{
3767	4978	cMaterial mat = copy.material;
3768	4979
3769		- colorField.SetToolTipValue((mat.color));
3770		- modulationField.SetToolTipValue((mat.modulation));
3771		- metalnessField.SetToolTipValue((mat.metalness));
3772		- diffuseField.SetToolTipValue((mat.diffuse));
3773		- specularField.SetToolTipValue((mat.specular));
3774		- shininessField.SetToolTipValue((mat.shininess));
3775		- shiftField.SetToolTipValue((mat.shift));
3776		- ambientField.SetToolTipValue((mat.ambient));
3777		- lightareaField.SetToolTipValue((mat.lightarea));
3778		- diffusenessField.SetToolTipValue((mat.factor));
3779		- velvetField.SetToolTipValue((mat.velvet));
3780		- sheenField.SetToolTipValue((mat.sheen));
3781		- subsurfaceField.SetToolTipValue((mat.subsurface));
3782		- backlitField.SetToolTipValue((mat.bump));
3783		- anisoField.SetToolTipValue((mat.aniso));
3784		- anisoVField.SetToolTipValue((mat.anisoV));
3785		- cameraField.SetToolTipValue((mat.cameralight));
3786		- selfshadowField.SetToolTipValue((mat.diffuseness));
3787		- shadowField.SetToolTipValue((mat.shadow));
3788		- textureField.SetToolTipValue((mat.texture));
3789		- opacityField.SetToolTipValue((mat.opacity));
3790		- fakedepthField.SetToolTipValue((mat.fakedepth));
3791		- shadowbiasField.SetToolTipValue((mat.shadowbias));
	4980	+ if (!Equal(colorField.getFloat(), mat.color))
	4981	+ colorField.SetToolTipValue((mat.color));
	4982	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	4983	+ saturationField.SetToolTipValue((mat.modulation));
	4984	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	4985	+ metalnessField.SetToolTipValue((mat.metalness));
	4986	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	4987	+ diffuseField.SetToolTipValue((mat.diffuse));
	4988	+ if (!Equal(specularField.getFloat(), mat.specular))
	4989	+ specularField.SetToolTipValue((mat.specular));
	4990	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	4991	+ shininessField.SetToolTipValue((mat.shininess));
	4992	+ if (!Equal(shiftField.getFloat(), mat.shift))
	4993	+ shiftField.SetToolTipValue((mat.shift));
	4994	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	4995	+ ambientField.SetToolTipValue((mat.ambient));
	4996	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	4997	+ lightareaField.SetToolTipValue((mat.lightarea));
	4998	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	4999	+ diffusenessField.SetToolTipValue((mat.factor));
	5000	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	5001	+ velvetField.SetToolTipValue((mat.velvet));
	5002	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	5003	+ sheenField.SetToolTipValue((mat.sheen));
	5004	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	5005	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	5006	+ if (!Equal(backlitField.getFloat(), mat.bump))
	5007	+ backlitField.SetToolTipValue((mat.bump));
	5008	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	5009	+ anisoField.SetToolTipValue((mat.aniso));
	5010	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	5011	+ anisoVField.SetToolTipValue((mat.anisoV));
	5012	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	5013	+ cameraField.SetToolTipValue((mat.cameralight));
	5014	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	5015	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	5016	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	5017	+ shadowField.SetToolTipValue((mat.shadow));
	5018	+ if (!Equal(textureField.getFloat(), mat.texture))
	5019	+ textureField.SetToolTipValue((mat.texture));
	5020	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	5021	+ opacityField.SetToolTipValue((mat.opacity));
	5022	+ //if (!Equal(parallaxField.getFloat(), mat.parallax))
	5023	+ parallaxField.SetToolTipValue((mat.parallax));
	5024	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	5025	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	5026	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	5027	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
3792	5028	}
3793	5029
3794	5030	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -3819,9 +5055,28 @@
3819	5055	//copy.Touch();
3820	5056	}
3821	5057
	5058	+ cNumberSlider versionSlider;
	5059	+
3822	5060	public void stateChanged(ChangeEvent e)
3823	5061	{
3824		- // assert(false);
	5062	+ // assert(false);
	5063	+ if (e.getSource() == versionSlider)
	5064	+ {
	5065	+ if (muteSlider)
	5066	+ return;
	5067	+
	5068	+ Replace();
	5069	+
	5070	+ int version = versionSlider.getInteger();
	5071	+
	5072	+ if (version != -1 && copy.versionlist[version] != null)
	5073	+ {
	5074	+ copy.versionindex = version;
	5075	+ CopyChanged();
	5076	+ }
	5077	+
	5078	+ return;
	5079	+ }
3825	5080
3826	5081	if (freezematerial)
3827	5082	{
..	..	@@ -3857,6 +5112,12 @@
3857	5112	{
3858	5113	//System.out.println("stateChanged = " + this);
3859	5114	materialtouched = true;
	5115	+
	5116	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	5117	+ {
	5118	+ saturationField.setFloat(1);
	5119	+ }
	5120	+
3860	5121	applySelf();
3861	5122	//System.out.println("this = " + this);
3862	5123	//System.out.println("PARENT = " + parent);
..	..	@@ -4156,6 +5417,7 @@
4156	5417	{
4157	5418	if (GetTree() != null)
4158	5419	{
	5420	+ GetTree().revalidate();
4159	5421	GetTree().repaint();
4160	5422	}
4161	5423
..	..	@@ -4164,13 +5426,19 @@
4164	5426	ctrlPanel.validate(); // ? new
4165	5427	ctrlPanel.repaint();
4166	5428	}
	5429	+
	5430	+ if (previousVersionButton != null && copy.versionlist != null)
	5431	+ SetVersionStates();
	5432	+
	5433	+ cameraView.requestFocusInWindow();
4167	5434	}
4168	5435
4169	5436	static TweenManager tweenManager = new TweenManager();
4170	5437
4171	5438	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4172	5439	{
4173		- Save();
	5440	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5441	+ Save();
4174	5442	//Tween.set(thing, 0).target(1).start(tweenManager);
4175	5443	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
4176	5444	// if (thing instanceof GenericJointDemo)
..	..	@@ -4194,7 +5462,7 @@
4194	5462	// group = (Composite) group.get(0);
4195	5463	// }
4196	5464
4197		- System.out.println("makeSomething of " + thing);
	5465	+ //System.out.println("makeSomething of " + thing);
4198	5466
4199	5467	/*
4200	5468	if (deselect && jList != null)
..	..	@@ -4257,6 +5525,12 @@
4257	5525	{
4258	5526	ResetModel();
4259	5527	Select(thing.GetTreePath(), true, false); // unselect... false);
	5528	+
	5529	+ if (thing.Size() == 0)
	5530	+ {
	5531	+ //EditSelection(false);
	5532	+ }
	5533	+
4260	5534	refreshContents();
4261	5535	}
4262	5536
..	..	@@ -4405,7 +5679,9 @@
4405	5679	readobj.ResetDisplayList();
4406	5680	} catch (Exception e)
4407	5681	{
4408		- //e.printStackTrace();
	5682	+ if (!e.toString().contains("GZIP"))
	5683	+ e.printStackTrace();
	5684	+
4409	5685	try
4410	5686	{
4411	5687	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4479,11 +5755,14 @@
4479	5755
4480	5756	if (readobj != null)
4481	5757	{
4482		- Save();
	5758	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5759	+ // Save();
4483	5760	try
4484	5761	{
4485	5762	//readobj.deepCopySelf(copy);
4486	5763	copy.clear(); // june 2014
	5764	+ copy.skyboxname = readobj.skyboxname;
	5765	+ copy.skyboxext = readobj.skyboxext;
4487	5766	for (int i = 0; i < readobj.size(); i++)
4488	5767	{
4489	5768	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4524,6 +5803,7 @@
4524	5803	}
4525	5804	} catch (ClassCastException e)
4526	5805	{
	5806	+ e.printStackTrace();
4527	5807	assert (false);
4528	5808	Composite c = (Composite) copy;
4529	5809	c.children.clear();
..	..	@@ -4534,17 +5814,32 @@
4534	5814	c.addChild(csg);
4535	5815	}
4536	5816
	5817	+ copy.versionlist = readobj.versionlist;
	5818	+ copy.versionindex = readobj.versionindex;
	5819	+ copy.versiontable = readobj.versiontable;
	5820	+
	5821	+ if (copy.versionlist == null)
	5822	+ {
	5823	+ // Backward compatibility
	5824	+ copy.versionlist = new Object3D[100];
	5825	+ copy.versionindex = -1;
	5826	+
	5827	+ //Save(true);
	5828	+ }
	5829	+
	5830	+ //? SetUndoStates();
	5831	+
4537	5832	ResetModel();
4538	5833	copy.HardTouch(); // recompile?
4539	5834	refreshContents();
4540	5835	}
4541	5836	}
4542	5837
4543		- void load() // throws ClassNotFoundException
	5838	+ void Open() // throws ClassNotFoundException
4544	5839	{
4545	5840	if (Grafreed.standAlone)
4546	5841	{
4547		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5842	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4548	5843	browser.show();
4549	5844	String filename = browser.getFile();
4550	5845	if (filename != null && filename.length() > 0)
..	..	@@ -4621,6 +5916,8 @@
4621	5916
4622	5917	void save()
4623	5918	{
	5919	+ Replace();
	5920	+
4624	5921	if (lastname == null)
4625	5922	{
4626	5923	return;
..	..	@@ -4643,6 +5940,7 @@
4643	5940	//ps.print(buffer.toString());
4644	5941	} catch (IOException e)
4645	5942	{
	5943	+ e.printStackTrace();
4646	5944	}
4647	5945	}
4648	5946
..	..	@@ -4657,6 +5955,8 @@
4657	5955	String filename = browser.getFile();
4658	5956	if (filename != null && filename.length() > 0)
4659	5957	{
	5958	+ if (!filename.endsWith(".gfd"))
	5959	+ filename += ".gfd";
4660	5960	lastname = browser.getDirectory() + filename;
4661	5961	save();
4662	5962	}
..	..	@@ -4823,7 +6123,7 @@
4823	6123	MenuBar menuBar;
4824	6124	Menu fileMenu;
4825	6125	MenuItem newItem;
4826		- MenuItem loadItem;
	6126	+ MenuItem openItem;
4827	6127	MenuItem saveItem;
4828	6128	MenuItem saveAsItem;
4829	6129	MenuItem exportAsItem;
..	..	@@ -4846,22 +6146,38 @@
4846	6146	CheckboxMenuItem toggleSwitchItem;
4847	6147	CheckboxMenuItem toggleRootItem;
4848	6148	CheckboxMenuItem animationItem;
	6149	+ MenuItem archiveItem;
4849	6150	CheckboxMenuItem toggleHandleItem;
4850	6151	CheckboxMenuItem togglePaintItem;
4851	6152	JSplitPane mainPanel;
4852	6153	JScrollPane scrollpane;
	6154	+
4853	6155	JPanel toolbarPanel;
	6156	+
4854	6157	cGridBag treePanel;
	6158	+
4855	6159	JPanel radioPanel;
4856	6160	ButtonGroup buttonGroup;
4857		- cGridBag ctrlPanel;
	6161	+
	6162	+ cGridBag toolboxPanel;
	6163	+ cGridBag skyboxPanel;
4858	6164	cGridBag materialPanel;
	6165	+ cGridBag ctrlPanel;
	6166	+
4859	6167	JScrollPane infoPanel;
	6168	+
4860	6169	cGridBag optionsPanel;
	6170	+
4861	6171	JTabbedPane objectPanel;
	6172	+ boolean materialFlushed;
	6173	+ Object3D latestObject;
	6174	+
	6175	+ cGridBag transformPanel;
4862	6176	cGridBag XYZPanel;
	6177	+
4863	6178	JSplitPane gridPanel;
4864	6179	JSplitPane bigPanel;
	6180	+
4865	6181	cGridBag bigThree;
4866	6182	cGridBag scenePanel;
4867	6183	cGridBag centralPanel;
..	..	@@ -4919,7 +6235,7 @@
4919	6235	JLabel colorLabel;
4920	6236	cNumberSlider colorField;
4921	6237	JLabel modulationLabel;
4922		- cNumberSlider modulationField;
	6238	+ cNumberSlider saturationField;
4923	6239	JLabel metalnessLabel;
4924	6240	cNumberSlider metalnessField;
4925	6241	JLabel diffuseLabel;
..	..	@@ -4950,6 +6266,7 @@
4950	6266	cNumberSlider anisoField;
4951	6267	JLabel anisoVLabel;
4952	6268	cNumberSlider anisoVField;
	6269	+
4953	6270	JLabel cameraLabel;
4954	6271	cNumberSlider cameraField;
4955	6272	JLabel selfshadowLabel;
..	..	@@ -4960,10 +6277,13 @@
4960	6277	cNumberSlider textureField;
4961	6278	JLabel opacityLabel;
4962	6279	cNumberSlider opacityField;
	6280	+ JLabel parallaxLabel;
	6281	+ cNumberSlider parallaxField;
4963	6282	JLabel fakedepthLabel;
4964	6283	cNumberSlider fakedepthField;
4965	6284	JLabel shadowbiasLabel;
4966	6285	cNumberSlider shadowbiasField;
	6286	+
4967	6287	JLabel bumpLabel;
4968	6288	cNumberSlider bumpField;
4969	6289	JLabel noiseLabel;
..	..	@@ -4976,7 +6296,7 @@
4976	6296	cNumberSlider fogField;
4977	6297	JLabel opacityPowerLabel;
4978	6298	cNumberSlider opacityPowerField;
4979		- JTree jTree;
	6299	+ cTree jTree;
4980	6300	//ObjectUI parent;
4981	6301
4982	6302	cNumberSlider normalpushField;