~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -15,6 +15,9 @@
15	15	//import javax.swing.plaf.ColorUIResource;
16	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
17	17
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
	20	+
18	21	//import javax.media.opengl.GLCanvas;
19	22
20	23	import //weka.core.
..	..	@@ -31,6 +34,7 @@
31	34	iSendInfo
32	35	//KeyListener
33	36	{
	37	+ public cToggleButton pinButton;
34	38	boolean timeline;
35	39	boolean wasFullScreen;
36	40
..	..	@@ -38,64 +42,143 @@
38	42	JFrame frame;
39	43
40	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	+ }
41	97
42	98	cButton GetButton(String name, boolean border)
43	99	{
44		- try
45		- {
46		- ImageIcon icon = GetIcon(name);
	100	+ ImageIcon icon = GetIcon(name);
	101	+ if (icon != null \|\| name.contains("/"))
47	102	return new cButton(icon, border);
48		- }
49		- catch (Exception e)
50		- {
	103	+ else
51	104	return new cButton(name, border);
52		- }
	105	+ }
	106	+
	107	+ cLabel GetLabel(String name, boolean border)
	108	+ {
	109	+ //ImageIcon icon = GetIcon(name);
	110	+ return new cLabel(GetImage(name), border);
53	111	}
54	112
55	113	cToggleButton GetToggleButton(String name, boolean border)
56	114	{
57		- try
58		- {
59		- ImageIcon icon = GetIcon(name);
60		- return new cToggleButton(icon, border);
61		- }
62		- catch (Exception e)
63		- {
64		- return new cToggleButton(name, border);
65		- }
	115	+ ImageIcon icon = GetIcon(name);
	116	+ return new cToggleButton(icon, border);
66	117	}
67	118
68	119	cCheckBox GetCheckBox(String name, boolean border)
69	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	+
70	135	try
71	136	{
72		- ImageIcon icon = GetIcon(name);
73		- return new cCheckBox(icon, border);
	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;
74	162	}
75	163	catch (Exception e)
76	164	{
77		- return new cCheckBox(name, border);
	165	+ //icons.put(name, null);
	166	+ return null;
78	167	}
79	168	}
80		-
81		- private ImageIcon GetIcon(String name) throws IOException
	169	+
	170	+ BufferedImage GetImage(String name)
82	171	{
83		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
84		-
85		- if (image.getWidth() != 24 && image.getHeight() != 24)
	172	+ try
86	173	{
87		- BufferedImage resized = new BufferedImage(24, 24, image.getType());
88		- Graphics2D g = resized.createGraphics();
89		- g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
90		- //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
91		- g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
92		- g.dispose();
93		-
94		- image = resized;
	174	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	175	+
	176	+ return image;
95	177	}
96		-
97		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
98		- return icon;
	178	+ catch (Exception e)
	179	+ {
	180	+ return null;
	181	+ }
99	182	}
100	183
101	184	// SCRIPT
..	..	@@ -207,7 +290,7 @@
207	290
208	291	objEditor.ctrlPanel.remove(namePanel);
209	292
210		- if (!GroupEditor.allparams)
	293	+ if (!allparams)
211	294	return;
212	295
213	296	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -279,6 +362,14 @@
279	362	client = inClient;
280	363	copy = client;
281	364
	365	+// if (copy.versionlist == null)
	366	+// {
	367	+// copy.versionlist = new Object3D[100];
	368	+// copy.versionindex = -1;
	369	+//
	370	+// callee.Save(true);
	371	+// }
	372	+
282	373	// "this" is not called: SetupUI2(objEditor);
283	374	}
284	375
..	..	@@ -292,6 +383,14 @@
292	383	client = inClient;
293	384	copy = client;
294	385
	386	+ if (copy.versionlist == null)
	387	+ {
	388	+ copy.versionlist = new Object3D[100];
	389	+ copy.versionindex = -1;
	390	+
	391	+// Save(true);
	392	+ }
	393	+
295	394	SetupUI2(callee.GetEditor());
296	395	}
297	396
..	..	@@ -306,14 +405,15 @@
306	405	//localCopy.parent = null;
307	406
308	407	frame = new JFrame();
309		- frame.setUndecorated(true);
	408	+ frame.setUndecorated(false);
310	409	objEditor = this;
311	410	this.callee = callee;
312	411
313	412	//parent = p;
314	413
315	414	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
316		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	415	+ if (Globals.DEBUG)
	416	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
317	417	//gd.setFullScreenWindow(this);
318	418	//setResizable(false);
319	419	//if (!isDisplayable())
..	..	@@ -324,6 +424,14 @@
324	424	copy = localCopy;
325	425	copy.editWindow = this;
326	426
	427	+// if (copy.versionlist == null)
	428	+// {
	429	+// copy.versionlist = new Object3D[100];
	430	+// copy.versionindex = -1;
	431	+//
	432	+// Save(true);
	433	+// }
	434	+
327	435	SetupMenu();
328	436
329	437	//SetupName(objEditor); // new
..	..	@@ -337,12 +445,20 @@
337	445	return frame.action(event, obj);
338	446	}
339	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	+
340	456	void SetupMenu()
341	457	{
342	458	frame.setMenuBar(menuBar = new MenuBar());
343	459	menuBar.add(fileMenu = new Menu("File"));
344	460	fileMenu.add(newItem = new MenuItem("New"));
345		- fileMenu.add(loadItem = new MenuItem("Open..."));
	461	+ fileMenu.add(openItem = new MenuItem("Open..."));
346	462
347	463	//oe.menuBar.add(menu = new Menu("Include"));
348	464	Menu menu = new Menu("Import");
..	..	@@ -350,8 +466,11 @@
350	466	importOBJItem.addActionListener(this);
351	467	import3DSItem = menu.add(new MenuItem("3DS file..."));
352	468	import3DSItem.addActionListener(this);
	469	+ if (Globals.ADVANCED)
	470	+ {
353	471	importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
354	472	importVRMLX3DItem.addActionListener(this);
	473	+ }
355	474	menu.add("-");
356	475	importGFDItem = menu.add(new MenuItem("Grafreed file..."));
357	476	importGFDItem.addActionListener(this);
..	..	@@ -374,7 +493,7 @@
374	493	}
375	494
376	495	newItem.addActionListener(this);
377		- loadItem.addActionListener(this);
	496	+ openItem.addActionListener(this);
378	497	saveItem.addActionListener(this);
379	498	saveAsItem.addActionListener(this);
380	499	exportAsItem.addActionListener(this);
..	..	@@ -383,13 +502,72 @@
383	502	closeItem.addActionListener(this);
384	503
385	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	+
386	563	toolbarPanel = new JPanel();
387	564	toolbarPanel.setName("Toolbar");
	565	+
388	566	treePanel = new cGridBag();
389	567	treePanel.setName("Tree");
390	568
391	569	editPanel = new cGridBag().setVertical(true);
392		- editPanel.setName("Edit");
	570	+ //editPanel.setName("Edit");
393	571
394	572	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
395	573
..	..	@@ -397,11 +575,13 @@
397	575	editPanel.add(editCommandsPanel);
398	576	editPanel.add(ctrlPanel);
399	577
400		- toolboxPanel = new cGridBag().setVertical(false);
401		- toolboxPanel.setName("Toolbox");
	578	+ toolboxPanel = new cGridBag().setVertical(true);
	579	+ //toolboxPanel.setName("Toolbox");
402	580
403		- materialPanel = new cGridBag().setVertical(true);
404		- materialPanel.setName("Material");
	581	+ skyboxPanel = new cGridBag().setVertical(true);
	582	+
	583	+ materialPanel = new cGridBag().setVertical(false);
	584	+ //materialPanel.setName("Material");
405	585
406	586	/JTextPane/
407	587	infoarea = createTextPane();
..	..	@@ -409,14 +589,15 @@
409	589
410	590	infoarea.setEditable(true);
411	591	SetText();
	592	+
412	593	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
413	594	// infoarea.setOpaque(false);
414	595	// //infoarea.setForeground(textcolor);
415	596	// TEXTAREA infoarea.setLineWrap(true);
416	597	// TEXTAREA infoarea.setWrapStyleWord(true);
417	598	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
418		- infoPanel.setPreferredSize(new Dimension(50, 200));
419		- infoPanel.setName("Info");
	599	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	600	+ //infoPanel.setName("Info");
420	601	//infoPanel.setLayout(new BorderLayout());
421	602	//infoPanel.add(createTextPane());
422	603
..	..	@@ -427,7 +608,14 @@
427	608	mainPanel.setDividerSize(9);
428	609	mainPanel.setDividerLocation(0.5); //1.0);
429	610	mainPanel.setResizeWeight(0.5);
430		-
	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	+
431	619	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
432	620	//mainPanel.setLayout(new GridBagLayout());
433	621	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -658,8 +846,8 @@
658	846	}
659	847	}
660	848
661		-static GraphicsDevice device = GraphicsEnvironment
662		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	849	+//static GraphicsDevice device = GraphicsEnvironment
	850	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
663	851
664	852	Rectangle keeprect;
665	853	cRadio radio;
..	..	@@ -676,14 +864,24 @@
676	864	boolean maximized;
677	865
678	866	cButton fullscreenLayout;
	867	+ cButton expandedLayout;
679	868
680	869	void Minimize()
681	870	{
682	871	frame.setState(Frame.ICONIFIED);
	872	+ frame.validate();
683	873	}
684	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={}
685	878	void Maximize()
686	879	{
	880	+ if (CameraPane.FULLSCREEN)
	881	+ {
	882	+ ToggleFullScreen();
	883	+ }
	884	+
687	885	if (maximized)
688	886	{
689	887	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -691,20 +889,38 @@
691	889	else
692	890	{
693	891	keeprect = frame.getBounds();
694		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
695		- Dimension rect2 = frame.getToolkit().getScreenSize();
696		- 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);
697	895	// frame.setState(Frame.MAXIMIZED_BOTH);
	896	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
698	897	}
699	898
700	899	maximized ^= true;
	900	+
	901	+ frame.validate();
701	902	}
	903	+
	904	+ cButton minButton;
	905	+ cButton maxButton;
	906	+ cButton fullButton;
	907	+ cButton collapseButton;
	908	+ cButton maximize3DButton;
702	909
703	910	void ToggleFullScreen()
704	911	{
705		- if (CameraPane.FULLSCREEN)
	912	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	913	+
	914	+ cameraView.ToggleFullScreen();
	915	+
	916	+ if (!CameraPane.FULLSCREEN)
706	917	{
707	918	device.setFullScreenWindow(null);
	919	+ frame.dispose();
	920	+ frame.setUndecorated(false);
	921	+ frame.validate();
	922	+ frame.setVisible(true);
	923	+
708	924	//frame.setVisible(false);
709	925	// frame.removeNotify();
710	926	// frame.setUndecorated(false);
..	..	@@ -714,13 +930,13 @@
714	930	// X frame.getContentPane().remove(/"Center",/bigThree);
715	931	// X framePanel.add(bigThree);
716	932	// X frame.getContentPane().add(/"Center",/framePanel);
717		- framePanel.setDividerLocation(1);
	933	+// framePanel.setDividerLocation(46); // icons are 24x24
718	934
719	935	//frame.setVisible(true);
720		- radio.layout = keepButton;
	936	+// radio.layout = keepButton;
721	937	//theFrame = null;
722	938	keepButton = null;
723		- radio.layout.doClick();
	939	+// radio.layout.doClick();
724	940
725	941	} else
726	942	{
..	..	@@ -729,22 +945,70 @@
729	945	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
730	946	// frame.getToolkit().getScreenSize().height);
731	947	//frame.setVisible(false);
	948	+
	949	+ frame.dispose();
	950	+ frame.setUndecorated(true);
732	951	device.setFullScreenWindow(frame);
	952	+ frame.validate();
	953	+ frame.setVisible(true);
733	954	// frame.removeNotify();
734	955	// frame.setUndecorated(true);
735	956	// frame.addNotify();
736	957	// X frame.getContentPane().remove(/"Center",/framePanel);
737	958	// X framePanel.remove(bigThree);
738	959	// X frame.getContentPane().add(/"Center",/bigThree);
739		- framePanel.setDividerLocation(0);
	960	+// framePanel.setDividerLocation(0);
740	961
741		- radio.layout = fullscreenLayout;
742		- radio.layout.doClick();
	962	+// radio.layout = fullscreenLayout;
	963	+// radio.layout.doClick();
743	964	//frame.setVisible(true);
744	965	}
745		-
746		- cameraView.ToggleFullScreen();
	966	+ frame.validate();
	967	+
	968	+ cameraView.requestFocusInWindow();
747	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	+ }
748	1012
749	1013	private JTextPane createTextPane()
750	1014	{
..	..	@@ -867,6 +1131,7 @@
867	1131	{
868	1132	SetupMaterial(materialPanel);
869	1133	}
	1134	+
870	1135	//SetupName();
871	1136	//SetupViews();
872	1137	}
..	..	@@ -876,7 +1141,7 @@
876	1141	// NumberSlider vDivsField;
877	1142	// JCheckBox endcaps;
878	1143	JCheckBox liveCB;
879		- JCheckBox selectCB;
	1144	+ JCheckBox selectableCB;
880	1145	JCheckBox hideCB;
881	1146	JCheckBox link2masterCB;
882	1147	JCheckBox markCB;
..	..	@@ -884,7 +1149,12 @@
884	1149	JCheckBox speedupCB;
885	1150	JCheckBox rewindCB;
886	1151	JCheckBox flipVCB;
	1152	+
	1153	+ cCheckBox toggleTextureCB;
	1154	+ cCheckBox toggleSwitchCB;
	1155	+
887	1156	JComboBox texresMenu;
	1157	+
888	1158	JButton resetButton;
889	1159	JButton stepButton;
890	1160	JButton stepAllButton;
..	..	@@ -1070,39 +1340,55 @@
1070	1340
1071	1341	namePanel = new cGridBag();
1072	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	+
1073	1355	nameField = AddText(namePanel, copy.GetName());
1074		- namePanel.add(nameField);
	1356	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1075	1357	oe.ctrlPanel.add(namePanel);
1076	1358
1077	1359	oe.ctrlPanel.Return();
1078	1360
1079		- if (!GroupEditor.allparams)
	1361	+ if (!allparams)
1080	1362	return;
1081	1363
1082	1364	setupPanel = new cGridBag().setVertical(false);
1083	1365
1084	1366	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1085	1367	liveCB.setToolTipText("Animate object");
1086		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1087		- 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");
1088	1372	// Return();
	1373	+
1089	1374	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1090	1375	hideCB.setToolTipText("Hide object");
1091		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1092		- markCB.setToolTipText("Set the animation target transform");
	1376	+
	1377	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1093	1378
1094	1379	setupPanel2 = new cGridBag().setVertical(false);
1095	1380
1096	1381	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1097	1382	rewindCB.setToolTipText("Rewind animation");
1098	1383
1099		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1100		- 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)");
1101	1386
	1387	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1388	+ link2masterCB.setToolTipText("Attach to support");
	1389	+
1102	1390	if (Globals.ADVANCED)
1103	1391	{
1104		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1105		- link2masterCB.setToolTipText("Attach to support");
1106	1392	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1107	1393	speedupCB.setToolTipText("Option motion capture");
1108	1394	}
..	..	@@ -1288,22 +1574,9 @@
1288	1574
1289	1575	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1290	1576	{
1291		- System.out.println("CREATE CAMERAS");
1292		- cams = new cTemplate();
1293		- cams.name = "Cameras";
1294		- copy.insertElementAt(cams, 0);
1295		- //cams.parent = copy;
1296		-
1297		- cam = new Camera(); // LA.newVector(3, 2, 1));
1298		- cams.addChild(cam);
1299		- cam = new Camera(1);
1300		- cams.addChild(cam);
1301		- cam = new Camera(2);
1302		- cams.addChild(cam);
1303		- cam = new Camera(3);
1304		- cams.addChild(cam);
1305		- cam = new Camera(4); // Light
1306		- cams.addChild(cam);
	1577	+ if (Globals.DEBUG)
	1578	+ System.out.println("CREATE CAMERAS");
	1579	+ cams = CreateCameras();
1307	1580	} else
1308	1581	{
1309	1582	cams = (cGroup) copy.get(0);
..	..	@@ -1369,6 +1642,45 @@
1369	1642	//frontView.object = copy;
1370	1643	//sideView.object = copy;
1371	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	+
1372	1684	XYZPanel = new cGridBag().setVertical(true);
1373	1685	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1374	1686
..	..	@@ -1376,7 +1688,11 @@
1376	1688	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1377	1689	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1378	1690	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1691	+ //XYZPanel.setName("XYZ");
1379	1692
	1693	+ transformPanel.add(resetTransformPanel);
	1694	+ transformPanel.add(XYZPanel);
	1695	+
1380	1696	/*
1381	1697	gridPanel = new JPanel(); //new BorderLayout());
1382	1698	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1384,12 +1700,12 @@
1384	1700	gridPanel.add(cameraView);
1385	1701	gridPanel.add(XYZPanel);
1386	1702	*/
1387		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1388		- gridPanel.setContinuousLayout(true);
1389		- gridPanel.setOneTouchExpandable(true);
1390		- gridPanel.setDividerLocation(1.0);
1391		- gridPanel.setDividerSize(9);
1392		- 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);
1393	1709
1394	1710	// aConstraints.weighty = 0;
1395	1711	//System.out.println("THIS = " + this);
..	..	@@ -1412,15 +1728,34 @@
1412	1728
1413	1729	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1414	1730	//tmp.setName("Edit");
	1731	+ objectPanel.add(skyboxPanel);
	1732	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1733	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1734	+
1415	1735	objectPanel.add(toolboxPanel);
	1736	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1737	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1738	+
1416	1739	objectPanel.add(materialPanel);
	1740	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1741	+ objectPanel.setToolTipTextAt(2, "Material");
	1742	+
1417	1743	// JPanel north = new JPanel(new BorderLayout());
1418	1744	// north.setName("Edit");
1419	1745	// north.add(ctrlPanel, BorderLayout.NORTH);
1420	1746	// objectPanel.add(north);
1421	1747	objectPanel.add(editPanel);
1422		- objectPanel.add(infoPanel);
1423		-
	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	+
1424	1759	/*
1425	1760	aConstraints.gridx = 0;
1426	1761	aConstraints.gridwidth = 1;
..	..	@@ -1428,7 +1763,7 @@
1428	1763	aConstraints.gridy += 1;
1429	1764	aConstraints.gridwidth = 1;
1430	1765	mainPanel.add(objectPanel, aConstraints);
1431		- */
	1766	+ */
1432	1767
1433	1768	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1434	1769	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1445,17 +1780,114 @@
1445	1780	JTabbedPane tabbedPane = new JTabbedPane();
1446	1781	tabbedPane.add(scrollpane);
1447	1782
1448		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1449		-
1450		- optionsPanel = new cGridBag().setVertical(true);
	1783	+ optionsPanel = new cGridBag().setVertical(false);
1451	1784
1452	1785	optionsPanel.setName("Options");
1453	1786
1454	1787	AddOptions(optionsPanel); //, aConstraints);
1455	1788
	1789	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1790	+
1456	1791	tabbedPane.add(optionsPanel);
1457	1792
1458	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	+ }
1459	1891
1460	1892	/*
1461	1893	cTree jTree = new cTree(null);
..	..	@@ -1477,13 +1909,13 @@
1477	1909	jtp.add(tree);
1478	1910	*/
1479	1911
1480		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1481		- bigPanel.setContinuousLayout(true);
1482		- bigPanel.setOneTouchExpandable(true);
1483		- bigPanel.setDividerLocation(0.8);
1484		- bigPanel.setDividerSize(15);
1485		- bigPanel.setResizeWeight(0.15);
1486		- 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");
1487	1919
1488	1920	//bigPanel.setLayout(new BorderLayout());
1489	1921	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1518,7 +1950,7 @@
1518	1950	bigThree = new cGridBag();
1519	1951	bigThree.addComponent(scenePanel);
1520	1952	bigThree.addComponent(centralPanel);
1521		- bigThree.addComponent(XYZPanel);
	1953	+ //bigThree.addComponent(XYZPanel);
1522	1954
1523	1955	// // SIDE EFFECT!!!
1524	1956	// aConstraints.gridx = 0;
..	..	@@ -1527,16 +1959,33 @@
1527	1959	// aConstraints.gridheight = 1;
1528	1960
1529	1961	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1530		- framePanel.setContinuousLayout(true);
1531		- framePanel.setOneTouchExpandable(true);
1532		- 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);
1533	1982	//framePanel.setDividerSize(15);
1534	1983	//framePanel.setResizeWeight(0.15);
1535	1984	framePanel.setName("Frame");
1536	1985
1537	1986	frame.getContentPane().setLayout(new BorderLayout());
1538	1987	/**/
1539		- JTabbedPane worldPane = new JTabbedPane();
	1988	+ //JTabbedPane worldPane = new JTabbedPane();
1540	1989	//worldPane.add(bigPanel);
1541	1990	//worldPane.add(worldPanel);
1542	1991	/**/
..	..	@@ -1547,16 +1996,18 @@
1547	1996	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1548	1997
1549	1998	frame.setSize(1280, 860);
1550		- frame.setVisible(true);
1551		-
	1999	+
1552	2000	cameraView.requestFocusInWindow();
1553	2001
1554		- gridPanel.setDividerLocation(1.0);
	2002	+// gridPanel.setDividerLocation(1.0);
	2003	+
	2004	+ frame.validate();
	2005	+
	2006	+ frame.setVisible(true);
1555	2007
1556	2008	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1557	2009	frame.addWindowListener(new WindowAdapter()
1558	2010	{
1559		-
1560	2011	public void windowClosing(WindowEvent e)
1561	2012	{
1562	2013	Close();
..	..	@@ -1579,28 +2030,442 @@
1579	2030	ctrlPanel.removeAll();
1580	2031	}
1581	2032
1582		- void SetupMaterial(cGridBag panel)
	2033	+ void SetupMaterial(cGridBag materialpanel)
1583	2034	{
1584		- /*
	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	+ /*
1585	2450	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1586	2451	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1587		- */
	2452	+ */
1588	2453
1589	2454	cGridBag editBar = new cGridBag().setVertical(false);
1590	2455
1591		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2456	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
1592	2457	createMaterialButton.setToolTipText("Create material");
1593	2458
1594	2459	/*
1595	2460	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1596	2461	*/
1597	2462
1598		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2463	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
1599	2464	clearMaterialButton.setToolTipText("Clear material");
1600	2465
1601	2466	if (Globals.ADVANCED)
1602	2467	{
1603		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2468	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
1604	2469	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1605	2470	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1606	2471	}
..	..	@@ -1618,45 +2483,61 @@
1618	2483	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1619	2484
1620	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);
1621	2510
1622	2511	cGridBag color = new cGridBag();
1623		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1624		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1625		- 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	+
1626	2517	//colorField.preferredWidth = 200;
1627	2518	colorSection.add(color);
1628	2519
1629	2520	cGridBag modulation = new cGridBag();
1630	2521	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1631	2522	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1632		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2523	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1633	2524	colorSection.add(modulation);
1634	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	+
1635	2534	cGridBag texture = new cGridBag();
1636	2535	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1637	2536	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1638	2537	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1639	2538	colorSection.add(texture);
1640	2539
1641		- cGridBag anisoU = new cGridBag();
1642		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1643		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1644		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1645		- colorSection.add(anisoU);
1646		-
1647		- cGridBag anisoV = new cGridBag();
1648		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1649		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1650		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1651		- colorSection.add(anisoV);
1652		-
1653		- cGridBag shadowbias = new cGridBag();
1654		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1655		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1656		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1657		- colorSection.add(shadowbias);
1658		-
1659		- panel.add(new JSeparator());
	2540	+ panel.add(GetSeparator());
1660	2541
1661	2542	panel.add(colorSection);
1662	2543
..	..	@@ -1706,7 +2587,13 @@
1706	2587	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1707	2588	diffuseSection.add(fakedepth);
1708	2589
1709		- 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());
1710	2597
1711	2598	panel.add(diffuseSection);
1712	2599
..	..	@@ -1756,42 +2643,48 @@
1756	2643	// aConstraints.gridy += 1;
1757	2644	// aConstraints.gridwidth = 1;
1758	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);
1759	2651
1760		- 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());
1761	2660
1762	2661	panel.add(specularSection);
1763	2662
1764	2663	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1765	2664
1766		- cGridBag globalSection = new cGridBag().setVertical(true);
	2665	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1767	2666
1768	2667	cGridBag camera = new cGridBag();
1769	2668	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1770	2669	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1771	2670	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1772		- globalSection.add(camera);
	2671	+ colorSection.add(camera);
1773	2672
1774	2673	cGridBag ambient = new cGridBag();
1775	2674	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1776	2675	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1777	2676	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1778		- globalSection.add(ambient);
	2677	+ colorSection.add(ambient);
1779	2678
1780	2679	cGridBag backlit = new cGridBag();
1781	2680	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1782	2681	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1783	2682	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1784		- globalSection.add(backlit);
	2683	+ colorSection.add(backlit);
1785	2684
1786		- cGridBag opacity = new cGridBag();
1787		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1788		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1789		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1790		- globalSection.add(opacity);
1791		-
1792		- panel.add(new JSeparator());
	2685	+ //panel.add(new JSeparator());
1793	2686
1794		- panel.add(globalSection);
	2687	+ //panel.add(globalSection);
1795	2688
1796	2689	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1797	2690
..	..	@@ -1833,7 +2726,7 @@
1833	2726	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1834	2727	textureSection.add(opacityPower);
1835	2728
1836		- panel.add(new JSeparator());
	2729	+ panel.add(GetSeparator());
1837	2730
1838	2731	panel.add(textureSection);
1839	2732
..	..	@@ -1898,8 +2791,9 @@
1898	2791	// 3D models
1899	2792	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1900	2793	{
1901		- lastConverter = new com.jmex.model.converters.MaxToJme();
1902		- LoadFile(filename, lastConverter);
	2794	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2795	+ //LoadFile(filename, lastConverter);
	2796	+ LoadObjFile(filename); // New 3ds loader
1903	2797	continue;
1904	2798	}
1905	2799	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2625,6 +3519,7 @@
2625	3519	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2626	3520	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2627	3521	}
	3522	+
2628	3523	//cJME.count++;
2629	3524	//cJME.count %= 12;
2630	3525	if (gc)
..	..	@@ -2808,6 +3703,7 @@
2808	3703	}
2809	3704	}
2810	3705	}
	3706	+
2811	3707	cFileSystemPane FSPane;
2812	3708
2813	3709	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2817,7 +3713,7 @@
2817	3713
2818	3714	freezematerial = true;
2819	3715	colorField.setFloat(mat.color);
2820		- modulationField.setFloat(mat.modulation);
	3716	+ saturationField.setFloat(mat.modulation);
2821	3717	metalnessField.setFloat(mat.metalness);
2822	3718	diffuseField.setFloat(mat.diffuse);
2823	3719	specularField.setFloat(mat.specular);
..	..	@@ -2861,11 +3757,14 @@
2861	3757	}
2862	3758	}
2863	3759	}
	3760	+
2864	3761	freezematerial = false;
2865	3762	}
2866	3763
2867	3764	void SetMaterial(Object3D object)
2868	3765	{
	3766	+ latestObject = object;
	3767	+
2869	3768	cMaterial mat = object.material;
2870	3769
2871	3770	if (mat == null)
..	..	@@ -2876,32 +3775,8 @@
2876	3775
2877	3776	if (multiplyToggle != null)
2878	3777	multiplyToggle.setSelected(mat.multiply);
2879		-
2880		- assert (object.projectedVertices != null);
2881		-
2882		- if (object.projectedVertices.length <= 2)
2883		- {
2884		- // Side effect...
2885		- Object3D.cVector2[] keep = object.projectedVertices;
2886		- object.projectedVertices = new Object3D.cVector2[3];
2887		- for (int i = 0; i < 3; i++)
2888		- {
2889		- if (i < keep.length)
2890		- {
2891		- object.projectedVertices[i] = keep[i];
2892		- } else
2893		- {
2894		- object.projectedVertices[i] = new Object3D.cVector2();
2895		- }
2896		- /*
2897		- if(keep.length == 0)
2898		- object.projectedVertices[0] = new Object3D.cVector2();
2899		- else
2900		- object.projectedVertices[0] = keep[0];
2901		- object.projectedVertices[1] = new Object3D.cVector2();
2902		- */
2903		- }
2904		- }
	3778	+
	3779	+ AllocProjectedVertices(object);
2905	3780
2906	3781	SetMaterial(mat, object.projectedVertices);
2907	3782	}
..	..	@@ -2977,12 +3852,17 @@
2977	3852	// }
2978	3853
2979	3854	/**/
2980		- if (deselect)
	3855	+ if (deselect \|\| child == null)
2981	3856	{
2982	3857	//group.deselectAll();
2983	3858	//freeze = true;
2984	3859	GetTree().clearSelection();
2985	3860	//freeze = false;
	3861	+
	3862	+ if (child == null)
	3863	+ {
	3864	+ return;
	3865	+ }
2986	3866	}
2987	3867
2988	3868	//group.addSelectee(child);
..	..	@@ -3016,6 +3896,17 @@
3016	3896	public void itemStateChanged(ItemEvent event)
3017	3897	{
3018	3898	// System.out.println("Propagate = " + propagate);
	3899	+ if (event.getSource() == pinButton)
	3900	+ {
	3901	+ copy.pinned ^= true;
	3902	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3903	+ {
	3904	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3905	+ copy.CloseUI();
	3906	+ //copy.editWindow.refreshContents();
	3907	+ }
	3908	+ }
	3909	+ else
3019	3910	if (event.getSource() == propagateToggle)
3020	3911	{
3021	3912	propagate ^= true;
..	..	@@ -3051,7 +3942,7 @@
3051	3942	cameraView.ToggleDL();
3052	3943	cameraView.repaint();
3053	3944	return;
3054		- } else if (event.getSource() == toggleTextureItem)
	3945	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
3055	3946	{
3056	3947	cameraView.ToggleTexture();
3057	3948	// june 2013 copy.HardTouch();
..	..	@@ -3090,7 +3981,7 @@
3090	3981	frame.validate();
3091	3982
3092	3983	return;
3093		- } else if (event.getSource() == toggleSwitchItem)
	3984	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3094	3985	{
3095	3986	cameraView.ToggleSwitch();
3096	3987	cameraView.repaint();
..	..	@@ -3120,8 +4011,9 @@
3120	4011	} else if (event.getSource() == liveCB)
3121	4012	{
3122	4013	copy.live ^= true;
	4014	+ objEditor.refreshContents(true); // To show item colors
3123	4015	return;
3124		- } else if (event.getSource() == selectCB)
	4016	+ } else if (event.getSource() == selectableCB)
3125	4017	{
3126	4018	copy.dontselect ^= true;
3127	4019	return;
..	..	@@ -3129,7 +4021,7 @@
3129	4021	{
3130	4022	copy.hide ^= true;
3131	4023	copy.Touch(); // display list issue
3132		- objEditor.refreshContents();
	4024	+ objEditor.refreshContents(true); // To show item colors
3133	4025	return;
3134	4026	} else if (event.getSource() == link2masterCB)
3135	4027	{
..	..	@@ -3194,7 +4086,7 @@
3194	4086	//System.out.println("ObjEditor " + event);
3195	4087	applySelf0(true);
3196	4088	//parent.applySelf();
3197		- objEditor.refreshContents();
	4089	+ // conflicts with requestFocus objEditor.refreshContents();
3198	4090	} else if (source == resetButton)
3199	4091	{
3200	4092	CameraPane.fullreset = true;
..	..	@@ -3306,9 +4198,9 @@
3306	4198	{
3307	4199	Close();
3308	4200	//return true;
3309		- } else if (source == loadItem)
	4201	+ } else if (source == openItem)
3310	4202	{
3311		- load();
	4203	+ Open();
3312	4204	//return true;
3313	4205	} else if (source == newItem)
3314	4206	{
..	..	@@ -3333,6 +4225,10 @@
3333	4225	{
3334	4226	generatePOV();
3335	4227	//return true;
	4228	+ } else if (event.getSource() == archiveItem)
	4229	+ {
	4230	+ cTools.Archive(frame);
	4231	+ return;
3336	4232	} else if (source == zBufferItem)
3337	4233	{
3338	4234	try
..	..	@@ -3370,22 +4266,30 @@
3370	4266
3371	4267	void New()
3372	4268	{
3373		- while (copy.Size() > 1)
	4269	+ while (copy.Size() > 0)
3374	4270	{
3375		- copy.remove(1);
	4271	+ copy.remove(0);
3376	4272	}
3377	4273
	4274	+ copy.selection.clear();
	4275	+
	4276	+ if (copy == Grafreed.grafreed.universe)
	4277	+ {
	4278	+ CreateCameras();
	4279	+ cameraView.SetCamera(GetCamera(copy, 0));
	4280	+ }
3378	4281	ResetModel();
3379	4282	objEditor.refreshContents();
3380	4283	}
3381	4284
3382	4285	static public byte[] Compress(Object3D o)
3383	4286	{
	4287	+ // Slower to actually compress.
3384	4288	try
3385	4289	{
3386	4290	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3387		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3388		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	4291	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4292	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3389	4293
3390	4294	Object3D parent = o.parent;
3391	4295	o.parent = null;
..	..	@@ -3396,10 +4300,14 @@
3396	4300
3397	4301	out.flush();
3398	4302
3399		- zstream.close();
	4303	+ baos //zstream
	4304	+ .close();
3400	4305	out.close();
3401	4306
3402		- return baos.toByteArray();
	4307	+ byte[] bytes = baos.toByteArray();
	4308	+
	4309	+ System.out.println("save #bytes = " + bytes.length);
	4310	+ return bytes;
3403	4311	} catch (Exception e)
3404	4312	{
3405	4313	System.err.println(e);
..	..	@@ -3409,13 +4317,16 @@
3409	4317
3410	4318	static public Object Uncompress(byte[] bytes)
3411	4319	{
3412		- System.out.println("#bytes = " + bytes.length);
	4320	+ System.out.println("restore #bytes = " + bytes.length);
3413	4321	try
3414	4322	{
3415	4323	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3416		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3417		- ObjectInputStream in = new ObjectInputStream(istream);
	4324	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4325	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3418	4326	Object obj = in.readObject();
	4327	+
	4328	+ bais //istream
	4329	+ .close();
3419	4330	in.close();
3420	4331
3421	4332	return obj;
..	..	@@ -3470,39 +4381,97 @@
3470	4381	return null;
3471	4382	}
3472	4383
3473		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3474	4384
3475	4385	public void Save()
3476	4386	{
	4387	+ //Save(true);
	4388	+ Replace();
	4389	+ SetVersionStates();
	4390	+ }
	4391	+
	4392	+ private boolean Equal(byte[] compress, byte[] name)
	4393	+ {
	4394	+ if (compress.length != name.length)
	4395	+ {
	4396	+ return false;
	4397	+ }
	4398	+
	4399	+ for (int i=compress.length; --i>=0;)
	4400	+ {
	4401	+ if (compress[i] != name[i])
	4402	+ return false;
	4403	+ }
	4404	+
	4405	+ return true;
	4406	+ }
	4407	+
	4408	+ void DeleteVersion()
	4409	+ {
	4410	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4411	+ {
	4412	+ copy.versionlist[i] = copy.versionlist[i+1];
	4413	+ }
	4414	+
	4415	+ if (copy.versionlist[copy.versionindex] == null)
	4416	+ copy.versionindex -= 1;
	4417	+
	4418	+ if (copy.versionindex != -1)
	4419	+ CopyChanged();
	4420	+
	4421	+ SetVersionStates();
	4422	+ }
	4423	+
	4424	+ public boolean Save(boolean user)
	4425	+ {
3477	4426	System.err.println("Save");
	4427	+ Replace();
3478	4428
3479		- cRadio tab = GetCurrentTab();
	4429	+ //cRadio tab = GetCurrentTab();
3480	4430
3481		- boolean temp = CameraPane.SWITCH;
3482		- CameraPane.SWITCH = false;
	4431	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3483	4432
3484		- copy.ExtractBigData(hashtable);
	4433	+ boolean thesame = false;
	4434	+
	4435	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4436	+// {
	4437	+// thesame = true;
	4438	+// }
3485	4439
3486	4440	//EditorFrame.m_MainFrame.requestFocusInWindow();
3487		- tab.graphs[tab.undoindex++] = Compress(copy);
3488		-
3489		- copy.RestoreBigData(hashtable);
3490		-
3491		- CameraPane.SWITCH = temp;
3492		-
3493		- //assert(hashtable.isEmpty());
3494		-
3495		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	4441	+ if (!thesame)
3496	4442	{
3497		- tab.graphs[i] = null;
	4443	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4444	+ {
	4445	+ copy.versionlist[i] = copy.versionlist[i-1];
	4446	+ }
	4447	+
	4448	+ //tab.user[tab.versionindex] = user;
	4449	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4450	+
	4451	+ copy.versionlist[++copy.versionindex] = compress;
	4452	+
	4453	+ // if (increment)
	4454	+ // tab.versionindex++;
3498	4455	}
3499	4456
	4457	+ //copy.RestoreBigData(versiontable);
	4458	+
	4459	+ //assert(hashtable.isEmpty());
	4460	+
	4461	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4462	+// {
	4463	+// //tab.user[i] = false;
	4464	+// copy.versionlist[i] = null;
	4465	+// }
	4466	+
	4467	+ SetVersionStates();
	4468	+
3500	4469	// test save
3501	4470	if (false)
3502	4471	{
3503	4472	try
3504	4473	{
3505		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	4474	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3506	4475	ObjectOutputStream p = new ObjectOutputStream(ostream);
3507	4476
3508	4477	p.writeObject(copy);
..	..	@@ -3515,26 +4484,68 @@
3515	4484	e.printStackTrace();
3516	4485	}
3517	4486	}
	4487	+
	4488	+ return !thesame;
	4489	+ }
	4490	+
	4491	+ boolean flashIt = true;
	4492	+
	4493	+ void RefreshSelection()
	4494	+ {
	4495	+ Object3D selection = new Object3D();
	4496	+
	4497	+ for (int i = 0; i < copy.selection.size(); i++)
	4498	+ {
	4499	+ Object3D elem = copy.selection.elementAt(i);
	4500	+
	4501	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4502	+
	4503	+ if (obj == null)
	4504	+ {
	4505	+ copy.selection.remove(i--);
	4506	+ }
	4507	+ else
	4508	+ {
	4509	+ selection.add(obj);
	4510	+ copy.selection.setElementAt(obj, i);
	4511	+ }
	4512	+ }
	4513	+
	4514	+ flashIt = false;
	4515	+ GetTree().clearSelection();
	4516	+ for (int i = 0; i < selection.size(); i++)
	4517	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4518	+ flashIt = true;
	4519	+
	4520	+ //refreshContents(false);
3518	4521	}
3519	4522
3520		- void CopyChanged(Object3D obj)
	4523	+ void CopyChanged()
3521	4524	{
	4525	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4526	+
	4527	+ SetVersionStates();
	4528	+
3522	4529	boolean temp = CameraPane.SWITCH;
3523	4530	CameraPane.SWITCH = false;
3524	4531
3525		- copy.ExtractBigData(hashtable);
	4532	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
3526	4533
3527	4534	copy.clear();
3528	4535
	4536	+ copy.skyboxname = obj.skyboxname;
	4537	+ copy.skyboxext = obj.skyboxext;
	4538	+
3529	4539	for (int i=0; i<obj.Size(); i++)
3530	4540	{
3531	4541	copy.add(obj.get(i));
3532	4542	}
3533	4543
3534		- copy.RestoreBigData(hashtable);
	4544	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
3535	4545
3536	4546	CameraPane.SWITCH = temp;
3537	4547
	4548	+ RefreshSelection();
3538	4549	//assert(hashtable.isEmpty());
3539	4550
3540	4551	copy.Touch();
..	..	@@ -3555,45 +4566,161 @@
3555	4566	}
3556	4567	}
3557	4568
3558		- refreshContents();
	4569	+ refreshContents(true);
3559	4570	}
3560	4571
3561		- public void Undo()
	4572	+ cButton previousVersionButton;
	4573	+ cButton restoreButton;
	4574	+ cButton replaceButton;
	4575	+ cButton nextVersionButton;
	4576	+ cButton saveVersionButton;
	4577	+ cButton deleteVersionButton;
	4578	+
	4579	+ boolean muteSlider;
	4580	+
	4581	+ int VersionCount()
3562	4582	{
	4583	+ int count = 0;
	4584	+
	4585	+ for (int i = copy.versionlist.length; --i >= 0;)
	4586	+ {
	4587	+ if (copy.versionlist[i] != null)
	4588	+ count++;
	4589	+ }
	4590	+
	4591	+ return count;
	4592	+ }
	4593	+
	4594	+ public cGridBag versionSliderPane;
	4595	+
	4596	+ void SetVersionStates()
	4597	+ {
	4598	+ //if (true)
	4599	+ // return;
	4600	+
	4601	+ //cRadio tab = GetCurrentTab();
	4602	+
	4603	+ if (copy.versionlist == null)
	4604	+ {
	4605	+ saveVersionButton.setEnabled(false);
	4606	+ restoreButton.setEnabled(false);
	4607	+ replaceButton.setEnabled(false);
	4608	+ previousVersionButton.setEnabled(false);
	4609	+ nextVersionButton.setEnabled(false);
	4610	+ deleteVersionButton.setEnabled(false);
	4611	+ versionSliderPane.setVisible(false);
	4612	+ }
	4613	+ else
	4614	+ {
	4615	+ restoreButton.setEnabled(copy.versionindex != -1);
	4616	+ replaceButton.setEnabled(copy.versionindex != -1);
	4617	+
	4618	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4619	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4620	+
	4621	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4622	+ //copy.versionlist[copy.versionindex + 1] != null);
	4623	+
	4624	+ muteSlider = true;
	4625	+ versionSlider.setMinimum(0);
	4626	+ versionSlider.setMaximum(VersionCount() - 1);
	4627	+ versionSlider.setInteger(copy.versionindex);
	4628	+ versionSlider.setEnabled(copy.versionindex != -1);
	4629	+ muteSlider = false;
	4630	+
	4631	+ versionSliderPane.setVisible(true);
	4632	+ }
	4633	+ }
	4634	+
	4635	+ public boolean PreviousVersion()
	4636	+ {
	4637	+ // Option?
	4638	+ Replace();
	4639	+
3563	4640	System.err.println("Undo");
3564	4641
3565		- cRadio tab = GetCurrentTab();
	4642	+ //cRadio tab = GetCurrentTab();
3566	4643
3567		- if (tab.undoindex == 0)
	4644	+ if (copy.versionindex == 0)
3568	4645	{
3569	4646	java.awt.Toolkit.getDefaultToolkit().beep();
3570		- return;
	4647	+ return false;
3571	4648	}
3572	4649
3573		- if (tab.graphs[tab.undoindex] == null)
3574		- {
3575		- Save();
3576		- tab.undoindex -= 1;
3577		- }
	4650	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4651	+// {
	4652	+// if (Save(false))
	4653	+// tab.versionindex -= 1;
	4654	+// else
	4655	+// {
	4656	+// if (tab.versionindex <= 0)
	4657	+// return false;
	4658	+// else
	4659	+// tab.versionindex -= 1;
	4660	+// }
	4661	+// }
3578	4662
3579		- tab.undoindex -= 1;
	4663	+ copy.versionindex -= 1;
3580	4664
3581		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4665	+ CopyChanged();
	4666	+
	4667	+ return true;
3582	4668	}
3583	4669
3584		- public void Redo()
	4670	+ public boolean Restore()
3585	4671	{
3586		- cRadio tab = GetCurrentTab();
	4672	+ System.err.println("Restore");
3587	4673
3588		- if (tab.graphs[tab.undoindex + 1] == null)
	4674	+ //cRadio tab = GetCurrentTab();
	4675	+
	4676	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4677	+ {
	4678	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4679	+ return false;
	4680	+ }
	4681	+
	4682	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4683	+ CopyChanged();
	4684	+
	4685	+ return true;
	4686	+ }
	4687	+
	4688	+ public boolean Replace()
	4689	+ {
	4690	+ //System.err.println("Replace");
	4691	+
	4692	+ //cRadio tab = GetCurrentTab();
	4693	+
	4694	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4695	+ {
	4696	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4697	+ return false;
	4698	+ }
	4699	+
	4700	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4701	+
	4702	+ return true;
	4703	+ }
	4704	+
	4705	+ public void NextVersion()
	4706	+ {
	4707	+ // Option?
	4708	+ Replace();
	4709	+
	4710	+ //cRadio tab = GetCurrentTab();
	4711	+
	4712	+ if (copy.versionlist[copy.versionindex + 1] == null)
3589	4713	{
3590	4714	java.awt.Toolkit.getDefaultToolkit().beep();
3591	4715	return;
3592	4716	}
3593	4717
3594		- tab.undoindex += 1;
	4718	+ copy.versionindex += 1;
3595	4719
3596		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4720	+ CopyChanged();
	4721	+
	4722	+ //if (!tab.user[tab.versionindex])
	4723	+ // tab.graphs[tab.versionindex] = null;
3597	4724	}
3598	4725
3599	4726	void ImportGFD()
..	..	@@ -3787,6 +4914,12 @@
3787	4914	// else
3788	4915	// applySelf(true);
3789	4916	// }
	4917	+
	4918	+ boolean Equal(double a, double b)
	4919	+ {
	4920	+ return Math.abs(a - b) < 0.001;
	4921	+ }
	4922	+
3790	4923	void applySelf0(boolean name)
3791	4924	{
3792	4925	if (name)
..	..	@@ -3804,7 +4937,7 @@
3804	4937	//copy.material = new cMaterial(copy.GetMaterial());
3805	4938
3806	4939	current.color = (float) colorField.getFloat();
3807		- current.modulation = (float) modulationField.getFloat();
	4940	+ current.modulation = (float) saturationField.getFloat();
3808	4941	current.metalness = (float) metalnessField.getFloat();
3809	4942	current.diffuse = (float) diffuseField.getFloat();
3810	4943	current.specular = (float) specularField.getFloat();
..	..	@@ -3836,29 +4969,52 @@
3836	4969	{
3837	4970	cMaterial mat = copy.material;
3838	4971
3839		- colorField.SetToolTipValue((mat.color));
3840		- modulationField.SetToolTipValue((mat.modulation));
3841		- metalnessField.SetToolTipValue((mat.metalness));
3842		- diffuseField.SetToolTipValue((mat.diffuse));
3843		- specularField.SetToolTipValue((mat.specular));
3844		- shininessField.SetToolTipValue((mat.shininess));
3845		- shiftField.SetToolTipValue((mat.shift));
3846		- ambientField.SetToolTipValue((mat.ambient));
3847		- lightareaField.SetToolTipValue((mat.lightarea));
3848		- diffusenessField.SetToolTipValue((mat.factor));
3849		- velvetField.SetToolTipValue((mat.velvet));
3850		- sheenField.SetToolTipValue((mat.sheen));
3851		- subsurfaceField.SetToolTipValue((mat.subsurface));
3852		- backlitField.SetToolTipValue((mat.bump));
3853		- anisoField.SetToolTipValue((mat.aniso));
3854		- anisoVField.SetToolTipValue((mat.anisoV));
3855		- cameraField.SetToolTipValue((mat.cameralight));
3856		- selfshadowField.SetToolTipValue((mat.diffuseness));
3857		- shadowField.SetToolTipValue((mat.shadow));
3858		- textureField.SetToolTipValue((mat.texture));
3859		- opacityField.SetToolTipValue((mat.opacity));
3860		- fakedepthField.SetToolTipValue((mat.fakedepth));
3861		- shadowbiasField.SetToolTipValue((mat.shadowbias));
	4972	+ if (!Equal(colorField.getFloat(), mat.color))
	4973	+ colorField.SetToolTipValue((mat.color));
	4974	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	4975	+ saturationField.SetToolTipValue((mat.modulation));
	4976	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	4977	+ metalnessField.SetToolTipValue((mat.metalness));
	4978	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	4979	+ diffuseField.SetToolTipValue((mat.diffuse));
	4980	+ if (!Equal(specularField.getFloat(), mat.specular))
	4981	+ specularField.SetToolTipValue((mat.specular));
	4982	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	4983	+ shininessField.SetToolTipValue((mat.shininess));
	4984	+ if (!Equal(shiftField.getFloat(), mat.shift))
	4985	+ shiftField.SetToolTipValue((mat.shift));
	4986	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	4987	+ ambientField.SetToolTipValue((mat.ambient));
	4988	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	4989	+ lightareaField.SetToolTipValue((mat.lightarea));
	4990	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	4991	+ diffusenessField.SetToolTipValue((mat.factor));
	4992	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	4993	+ velvetField.SetToolTipValue((mat.velvet));
	4994	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	4995	+ sheenField.SetToolTipValue((mat.sheen));
	4996	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	4997	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4998	+ if (!Equal(backlitField.getFloat(), mat.bump))
	4999	+ backlitField.SetToolTipValue((mat.bump));
	5000	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	5001	+ anisoField.SetToolTipValue((mat.aniso));
	5002	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	5003	+ anisoVField.SetToolTipValue((mat.anisoV));
	5004	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	5005	+ cameraField.SetToolTipValue((mat.cameralight));
	5006	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	5007	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	5008	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	5009	+ shadowField.SetToolTipValue((mat.shadow));
	5010	+ if (!Equal(textureField.getFloat(), mat.texture))
	5011	+ textureField.SetToolTipValue((mat.texture));
	5012	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	5013	+ opacityField.SetToolTipValue((mat.opacity));
	5014	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	5015	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	5016	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	5017	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
3862	5018	}
3863	5019
3864	5020	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -3889,9 +5045,28 @@
3889	5045	//copy.Touch();
3890	5046	}
3891	5047
	5048	+ cNumberSlider versionSlider;
	5049	+
3892	5050	public void stateChanged(ChangeEvent e)
3893	5051	{
3894		- // assert(false);
	5052	+ // assert(false);
	5053	+ if (e.getSource() == versionSlider)
	5054	+ {
	5055	+ if (muteSlider)
	5056	+ return;
	5057	+
	5058	+ Replace();
	5059	+
	5060	+ int version = versionSlider.getInteger();
	5061	+
	5062	+ if (version != -1 && copy.versionlist[version] != null)
	5063	+ {
	5064	+ copy.versionindex = version;
	5065	+ CopyChanged();
	5066	+ }
	5067	+
	5068	+ return;
	5069	+ }
3895	5070
3896	5071	if (freezematerial)
3897	5072	{
..	..	@@ -3927,6 +5102,12 @@
3927	5102	{
3928	5103	//System.out.println("stateChanged = " + this);
3929	5104	materialtouched = true;
	5105	+
	5106	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	5107	+ {
	5108	+ saturationField.setFloat(1);
	5109	+ }
	5110	+
3930	5111	applySelf();
3931	5112	//System.out.println("this = " + this);
3932	5113	//System.out.println("PARENT = " + parent);
..	..	@@ -4226,6 +5407,7 @@
4226	5407	{
4227	5408	if (GetTree() != null)
4228	5409	{
	5410	+ GetTree().revalidate();
4229	5411	GetTree().repaint();
4230	5412	}
4231	5413
..	..	@@ -4234,13 +5416,18 @@
4234	5416	ctrlPanel.validate(); // ? new
4235	5417	ctrlPanel.repaint();
4236	5418	}
	5419	+
	5420	+ if (previousVersionButton != null && copy.versionlist != null)
	5421	+ SetVersionStates();
	5422	+
	5423	+ cameraView.requestFocusInWindow();
4237	5424	}
4238	5425
4239	5426	static TweenManager tweenManager = new TweenManager();
4240	5427
4241	5428	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4242	5429	{
4243		- if (Globals.SAVEONMAKE) // && resetmodel)
	5430	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4244	5431	Save();
4245	5432	//Tween.set(thing, 0).target(1).start(tweenManager);
4246	5433	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4265,7 +5452,7 @@
4265	5452	// group = (Composite) group.get(0);
4266	5453	// }
4267	5454
4268		- System.out.println("makeSomething of " + thing);
	5455	+ //System.out.println("makeSomething of " + thing);
4269	5456
4270	5457	/*
4271	5458	if (deselect && jList != null)
..	..	@@ -4482,7 +5669,9 @@
4482	5669	readobj.ResetDisplayList();
4483	5670	} catch (Exception e)
4484	5671	{
4485		- //e.printStackTrace();
	5672	+ if (!e.toString().contains("GZIP"))
	5673	+ e.printStackTrace();
	5674	+
4486	5675	try
4487	5676	{
4488	5677	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4556,12 +5745,14 @@
4556	5745
4557	5746	if (readobj != null)
4558	5747	{
4559		- if (Globals.SAVEONMAKE)
4560		- Save();
	5748	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5749	+ // Save();
4561	5750	try
4562	5751	{
4563	5752	//readobj.deepCopySelf(copy);
4564	5753	copy.clear(); // june 2014
	5754	+ copy.skyboxname = readobj.skyboxname;
	5755	+ copy.skyboxext = readobj.skyboxext;
4565	5756	for (int i = 0; i < readobj.size(); i++)
4566	5757	{
4567	5758	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4602,6 +5793,7 @@
4602	5793	}
4603	5794	} catch (ClassCastException e)
4604	5795	{
	5796	+ e.printStackTrace();
4605	5797	assert (false);
4606	5798	Composite c = (Composite) copy;
4607	5799	c.children.clear();
..	..	@@ -4612,17 +5804,32 @@
4612	5804	c.addChild(csg);
4613	5805	}
4614	5806
	5807	+ copy.versionlist = readobj.versionlist;
	5808	+ copy.versionindex = readobj.versionindex;
	5809	+ copy.versiontable = readobj.versiontable;
	5810	+
	5811	+ if (copy.versionlist == null)
	5812	+ {
	5813	+ // Backward compatibility
	5814	+ copy.versionlist = new Object3D[100];
	5815	+ copy.versionindex = -1;
	5816	+
	5817	+ //Save(true);
	5818	+ }
	5819	+
	5820	+ //? SetUndoStates();
	5821	+
4615	5822	ResetModel();
4616	5823	copy.HardTouch(); // recompile?
4617	5824	refreshContents();
4618	5825	}
4619	5826	}
4620	5827
4621		- void load() // throws ClassNotFoundException
	5828	+ void Open() // throws ClassNotFoundException
4622	5829	{
4623	5830	if (Grafreed.standAlone)
4624	5831	{
4625		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5832	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4626	5833	browser.show();
4627	5834	String filename = browser.getFile();
4628	5835	if (filename != null && filename.length() > 0)
..	..	@@ -4699,6 +5906,8 @@
4699	5906
4700	5907	void save()
4701	5908	{
	5909	+ Replace();
	5910	+
4702	5911	if (lastname == null)
4703	5912	{
4704	5913	return;
..	..	@@ -4721,6 +5930,7 @@
4721	5930	//ps.print(buffer.toString());
4722	5931	} catch (IOException e)
4723	5932	{
	5933	+ e.printStackTrace();
4724	5934	}
4725	5935	}
4726	5936
..	..	@@ -4735,6 +5945,8 @@
4735	5945	String filename = browser.getFile();
4736	5946	if (filename != null && filename.length() > 0)
4737	5947	{
	5948	+ if (!filename.endsWith(".gfd"))
	5949	+ filename += ".gfd";
4738	5950	lastname = browser.getDirectory() + filename;
4739	5951	save();
4740	5952	}
..	..	@@ -4901,7 +6113,7 @@
4901	6113	MenuBar menuBar;
4902	6114	Menu fileMenu;
4903	6115	MenuItem newItem;
4904		- MenuItem loadItem;
	6116	+ MenuItem openItem;
4905	6117	MenuItem saveItem;
4906	6118	MenuItem saveAsItem;
4907	6119	MenuItem exportAsItem;
..	..	@@ -4924,6 +6136,7 @@
4924	6136	CheckboxMenuItem toggleSwitchItem;
4925	6137	CheckboxMenuItem toggleRootItem;
4926	6138	CheckboxMenuItem animationItem;
	6139	+ MenuItem archiveItem;
4927	6140	CheckboxMenuItem toggleHandleItem;
4928	6141	CheckboxMenuItem togglePaintItem;
4929	6142	JSplitPane mainPanel;
..	..	@@ -4937,6 +6150,7 @@
4937	6150	ButtonGroup buttonGroup;
4938	6151
4939	6152	cGridBag toolboxPanel;
	6153	+ cGridBag skyboxPanel;
4940	6154	cGridBag materialPanel;
4941	6155	cGridBag ctrlPanel;
4942	6156
..	..	@@ -4945,7 +6159,10 @@
4945	6159	cGridBag optionsPanel;
4946	6160
4947	6161	JTabbedPane objectPanel;
	6162	+ boolean materialFlushed;
	6163	+ Object3D latestObject;
4948	6164
	6165	+ cGridBag transformPanel;
4949	6166	cGridBag XYZPanel;
4950	6167
4951	6168	JSplitPane gridPanel;
..	..	@@ -5008,7 +6225,7 @@
5008	6225	JLabel colorLabel;
5009	6226	cNumberSlider colorField;
5010	6227	JLabel modulationLabel;
5011		- cNumberSlider modulationField;
	6228	+ cNumberSlider saturationField;
5012	6229	JLabel metalnessLabel;
5013	6230	cNumberSlider metalnessField;
5014	6231	JLabel diffuseLabel;
..	..	@@ -5039,6 +6256,7 @@
5039	6256	cNumberSlider anisoField;
5040	6257	JLabel anisoVLabel;
5041	6258	cNumberSlider anisoVField;
	6259	+
5042	6260	JLabel cameraLabel;
5043	6261	cNumberSlider cameraField;
5044	6262	JLabel selfshadowLabel;
..	..	@@ -5053,6 +6271,7 @@
5053	6271	cNumberSlider fakedepthField;
5054	6272	JLabel shadowbiasLabel;
5055	6273	cNumberSlider shadowbiasField;
	6274	+
5056	6275	JLabel bumpLabel;
5057	6276	cNumberSlider bumpField;
5058	6277	JLabel noiseLabel;