~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);
..	..	@@ -171,7 +314,7 @@
171	314
172	315	objEditor.ctrlPanel.remove(setupPanel);
173	316	objEditor.ctrlPanel.remove(setupPanel2);
174		- objEditor.ctrlPanel.remove(commandsPanel);
	317	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
175	318	objEditor.ctrlPanel.remove(pushPanel);
176	319	//objEditor.ctrlPanel.remove(fillPanel);
177	320
..	..	@@ -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
..	..	@@ -246,14 +397,15 @@
246	397	//localCopy.parent = null;
247	398
248	399	frame = new JFrame();
249		- frame.setUndecorated(true);
	400	+ frame.setUndecorated(false);
250	401	objEditor = this;
251	402	this.callee = callee;
252	403
253	404	//parent = p;
254	405
255	406	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
256		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	407	+ if (Globals.DEBUG)
	408	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
257	409	//gd.setFullScreenWindow(this);
258	410	//setResizable(false);
259	411	//if (!isDisplayable())
..	..	@@ -264,6 +416,14 @@
264	416	copy = localCopy;
265	417	copy.editWindow = this;
266	418
	419	+// if (copy.versionlist == null)
	420	+// {
	421	+// copy.versionlist = new Object3D[100];
	422	+// copy.versionindex = -1;
	423	+//
	424	+// Save(true);
	425	+// }
	426	+
267	427	SetupMenu();
268	428
269	429	//SetupName(objEditor); // new
..	..	@@ -277,12 +437,20 @@
277	437	return frame.action(event, obj);
278	438	}
279	439
	440	+ // Cannot work without static
	441	+ static boolean allparams = true;
	442	+
	443	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	444	+
	445	+ // This is to refresh the UI of the material panel.
	446	+ boolean patchMaterial;
	447	+
280	448	void SetupMenu()
281	449	{
282	450	frame.setMenuBar(menuBar = new MenuBar());
283	451	menuBar.add(fileMenu = new Menu("File"));
284	452	fileMenu.add(newItem = new MenuItem("New"));
285		- fileMenu.add(loadItem = new MenuItem("Open..."));
	453	+ fileMenu.add(openItem = new MenuItem("Open..."));
286	454
287	455	//oe.menuBar.add(menu = new Menu("Include"));
288	456	Menu menu = new Menu("Import");
..	..	@@ -290,8 +458,11 @@
290	458	importOBJItem.addActionListener(this);
291	459	import3DSItem = menu.add(new MenuItem("3DS file..."));
292	460	import3DSItem.addActionListener(this);
	461	+ if (Globals.ADVANCED)
	462	+ {
293	463	importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
294	464	importVRMLX3DItem.addActionListener(this);
	465	+ }
295	466	menu.add("-");
296	467	importGFDItem = menu.add(new MenuItem("Grafreed file..."));
297	468	importGFDItem.addActionListener(this);
..	..	@@ -314,7 +485,7 @@
314	485	}
315	486
316	487	newItem.addActionListener(this);
317		- loadItem.addActionListener(this);
	488	+ openItem.addActionListener(this);
318	489	saveItem.addActionListener(this);
319	490	saveAsItem.addActionListener(this);
320	491	exportAsItem.addActionListener(this);
..	..	@@ -323,28 +494,102 @@
323	494	closeItem.addActionListener(this);
324	495
325	496	objectPanel = new JTabbedPane();
	497	+
	498	+ ChangeListener changeListener = new ChangeListener()
	499	+ {
	500	+ //String name;
	501	+
	502	+ public void stateChanged(ChangeEvent changeEvent)
	503	+ {
	504	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	505	+// {
	506	+// if (latestObject != null)
	507	+// {
	508	+// refreshContents(true);
	509	+// SetMaterial(latestObject);
	510	+// }
	511	+//
	512	+// materialFlushed = true;
	513	+// }
	514	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	515	+// {
	516	+// if (listUI.size() == 0)
	517	+// EditSelection(false);
	518	+// }
	519	+
	520	+// if (objectPanel.getSelectedIndex() == 4)
	521	+// {
	522	+// name = copy.skyboxname;
	523	+//
	524	+// if (name == null)
	525	+// {
	526	+// name = "";
	527	+// }
	528	+//
	529	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	530	+// copy.skyboxext = "jpg";
	531	+// }
	532	+// else
	533	+// {
	534	+// if (name != null)
	535	+// {
	536	+// if (name.equals(""))
	537	+// {
	538	+// copy.skyboxname = null;
	539	+// copy.skyboxext = null;
	540	+// }
	541	+// else
	542	+// {
	543	+// copy.skyboxname = name;
	544	+// }
	545	+// }
	546	+// }
	547	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	548	+
	549	+// refreshContents(false); // To refresh Info tab
	550	+ cameraView.repaint();
	551	+ }
	552	+ };
	553	+ objectPanel.addChangeListener(changeListener);
	554	+
326	555	toolbarPanel = new JPanel();
327	556	toolbarPanel.setName("Toolbar");
	557	+
328	558	treePanel = new cGridBag();
329	559	treePanel.setName("Tree");
	560	+
	561	+ editPanel = new cGridBag().setVertical(true);
	562	+ //editPanel.setName("Edit");
	563	+
330	564	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
331		- ctrlPanel.setName("Edit");
332		- materialPanel = new cGridBag().setVertical(true);
333		- materialPanel.setName("Material");
	565	+
	566	+ editCommandsPanel = new cGridBag();
	567	+ editPanel.add(editCommandsPanel);
	568	+ editPanel.add(ctrlPanel);
	569	+
	570	+ toolboxPanel = new cGridBag().setVertical(true);
	571	+ //toolboxPanel.setName("Toolbox");
	572	+
	573	+ skyboxPanel = new cGridBag().setVertical(true);
	574	+
	575	+ materialPanel = new cGridBag().setVertical(false);
	576	+ //materialPanel.setName("Material");
	577	+
334	578	/JTextPane/
335	579	infoarea = createTextPane();
336	580	doc = infoarea.getStyledDocument();
337	581
338	582	infoarea.setEditable(true);
339	583	SetText();
	584	+
340	585	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
341	586	// infoarea.setOpaque(false);
342	587	// //infoarea.setForeground(textcolor);
343	588	// TEXTAREA infoarea.setLineWrap(true);
344	589	// TEXTAREA infoarea.setWrapStyleWord(true);
345	590	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
346		- infoPanel.setPreferredSize(new Dimension(50, 200));
347		- infoPanel.setName("Info");
	591	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	592	+ //infoPanel.setName("Info");
348	593	//infoPanel.setLayout(new BorderLayout());
349	594	//infoPanel.add(createTextPane());
350	595
..	..	@@ -355,7 +600,14 @@
355	600	mainPanel.setDividerSize(9);
356	601	mainPanel.setDividerLocation(0.5); //1.0);
357	602	mainPanel.setResizeWeight(0.5);
358		-
	603	+
	604	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	605	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	606	+ divider.setDividerSize(15);
	607	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	608	+
	609	+ mainPanel.setUI(new BasicSplitPaneUI());
	610	+
359	611	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
360	612	//mainPanel.setLayout(new GridBagLayout());
361	613	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -586,8 +838,8 @@
586	838	}
587	839	}
588	840
589		-static GraphicsDevice device = GraphicsEnvironment
590		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	841	+//static GraphicsDevice device = GraphicsEnvironment
	842	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
591	843
592	844	Rectangle keeprect;
593	845	cRadio radio;
..	..	@@ -603,13 +855,25 @@
603	855
604	856	boolean maximized;
605	857
	858	+ cButton fullscreenLayout;
	859	+ cButton expandedLayout;
	860	+
606	861	void Minimize()
607	862	{
608	863	frame.setState(Frame.ICONIFIED);
	864	+ frame.validate();
609	865	}
610	866
	867	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	868	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	869	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
611	870	void Maximize()
612	871	{
	872	+ if (CameraPane.FULLSCREEN)
	873	+ {
	874	+ ToggleFullScreen();
	875	+ }
	876	+
613	877	if (maximized)
614	878	{
615	879	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -617,20 +881,38 @@
617	881	else
618	882	{
619	883	keeprect = frame.getBounds();
620		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
621		- Dimension rect2 = frame.getToolkit().getScreenSize();
622		- frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	884	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	885	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	886	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
623	887	// frame.setState(Frame.MAXIMIZED_BOTH);
	888	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
624	889	}
625	890
626	891	maximized ^= true;
	892	+
	893	+ frame.validate();
627	894	}
	895	+
	896	+ cButton minButton;
	897	+ cButton maxButton;
	898	+ cButton fullButton;
	899	+ cButton collapseButton;
	900	+ cButton maximize3DButton;
628	901
629	902	void ToggleFullScreen()
630	903	{
631		- if (CameraPane.FULLSCREEN)
	904	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	905	+
	906	+ cameraView.ToggleFullScreen();
	907	+
	908	+ if (!CameraPane.FULLSCREEN)
632	909	{
633	910	device.setFullScreenWindow(null);
	911	+ frame.dispose();
	912	+ frame.setUndecorated(false);
	913	+ frame.validate();
	914	+ frame.setVisible(true);
	915	+
634	916	//frame.setVisible(false);
635	917	// frame.removeNotify();
636	918	// frame.setUndecorated(false);
..	..	@@ -640,13 +922,13 @@
640	922	// X frame.getContentPane().remove(/"Center",/bigThree);
641	923	// X framePanel.add(bigThree);
642	924	// X frame.getContentPane().add(/"Center",/framePanel);
643		- framePanel.setDividerLocation(1);
	925	+// framePanel.setDividerLocation(46); // icons are 24x24
644	926
645	927	//frame.setVisible(true);
646		- radio.layout = keepButton;
	928	+// radio.layout = keepButton;
647	929	//theFrame = null;
648	930	keepButton = null;
649		- radio.layout.doClick();
	931	+// radio.layout.doClick();
650	932
651	933	} else
652	934	{
..	..	@@ -655,22 +937,70 @@
655	937	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
656	938	// frame.getToolkit().getScreenSize().height);
657	939	//frame.setVisible(false);
	940	+
	941	+ frame.dispose();
	942	+ frame.setUndecorated(true);
658	943	device.setFullScreenWindow(frame);
	944	+ frame.validate();
	945	+ frame.setVisible(true);
659	946	// frame.removeNotify();
660	947	// frame.setUndecorated(true);
661	948	// frame.addNotify();
662	949	// X frame.getContentPane().remove(/"Center",/framePanel);
663	950	// X framePanel.remove(bigThree);
664	951	// X frame.getContentPane().add(/"Center",/bigThree);
665		- framePanel.setDividerLocation(0);
	952	+// framePanel.setDividerLocation(0);
666	953
667		- radio.layout = twoButton;
668		- radio.layout.doClick();
	954	+// radio.layout = fullscreenLayout;
	955	+// radio.layout.doClick();
669	956	//frame.setVisible(true);
670	957	}
671		-
672		- cameraView.ToggleFullScreen();
	958	+ frame.validate();
	959	+
	960	+ cameraView.requestFocusInWindow();
673	961	}
	962	+
	963	+ void CollapseToolbar()
	964	+ {
	965	+ framePanel.setDividerLocation(0);
	966	+ //frame.validate();
	967	+
	968	+ cameraView.requestFocusInWindow();
	969	+ }
	970	+
	971	+ private Object3D Duplicate(Object3D object)
	972	+ {
	973	+ boolean temp = CameraPane.SWITCH;
	974	+ CameraPane.SWITCH = false;
	975	+
	976	+ if (Grafreed.grafreed.universe.versiontable == null)
	977	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	978	+
	979	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	980	+ // if (copy == client)
	981	+
	982	+ Object3D versions[] = object.versionlist;
	983	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	984	+ object.versionlist = null;
	985	+ object.versiontable = null;
	986	+
	987	+ Object3D parent = object.parent;
	988	+ object.parent = null;
	989	+
	990	+ //byte[] compress = Compress(copy);
	991	+ Object3D compress = (Object3D)Grafreed.clone(object);
	992	+
	993	+ object.parent = parent;
	994	+
	995	+ object.versionlist = versions;
	996	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	997	+
	998	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	999	+
	1000	+ CameraPane.SWITCH = temp;
	1001	+
	1002	+ return compress;
	1003	+ }
674	1004
675	1005	private JTextPane createTextPane()
676	1006	{
..	..	@@ -793,6 +1123,7 @@
793	1123	{
794	1124	SetupMaterial(materialPanel);
795	1125	}
	1126	+
796	1127	//SetupName();
797	1128	//SetupViews();
798	1129	}
..	..	@@ -802,7 +1133,7 @@
802	1133	// NumberSlider vDivsField;
803	1134	// JCheckBox endcaps;
804	1135	JCheckBox liveCB;
805		- JCheckBox selectCB;
	1136	+ JCheckBox selectableCB;
806	1137	JCheckBox hideCB;
807	1138	JCheckBox link2masterCB;
808	1139	JCheckBox markCB;
..	..	@@ -810,7 +1141,12 @@
810	1141	JCheckBox speedupCB;
811	1142	JCheckBox rewindCB;
812	1143	JCheckBox flipVCB;
	1144	+
	1145	+ cCheckBox toggleTextureCB;
	1146	+ cCheckBox toggleSwitchCB;
	1147	+
813	1148	JComboBox texresMenu;
	1149	+
814	1150	JButton resetButton;
815	1151	JButton stepButton;
816	1152	JButton stepAllButton;
..	..	@@ -819,10 +1155,13 @@
819	1155	JButton fasterButton;
820	1156	JButton remarkButton;
821	1157
	1158	+ cGridBag editPanel;
	1159	+ cGridBag editCommandsPanel;
	1160	+
822	1161	cGridBag namePanel;
823	1162	cGridBag setupPanel;
824	1163	cGridBag setupPanel2;
825		- cGridBag commandsPanel;
	1164	+ cGridBag objectCommandsPanel;
826	1165	cGridBag pushPanel;
827	1166	cGridBag fillPanel;
828	1167
..	..	@@ -993,39 +1332,55 @@
993	1332
994	1333	namePanel = new cGridBag();
995	1334
	1335	+ //if (copy.pinned)
	1336	+ {
	1337	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
	1338	+ pinButton.setSelected(copy.pinned);
	1339	+ cGridBag t = new cGridBag();
	1340	+ t.preferredWidth = 2;
	1341	+ t.add(pinButton);
	1342	+ namePanel.add(t);
	1343	+
	1344	+ pinButton.addItemListener(this);
	1345	+ }
	1346	+
996	1347	nameField = AddText(namePanel, copy.GetName());
997		- namePanel.add(nameField);
	1348	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
998	1349	oe.ctrlPanel.add(namePanel);
999	1350
1000	1351	oe.ctrlPanel.Return();
1001	1352
1002		- if (!GroupEditor.allparams)
	1353	+ if (!allparams)
1003	1354	return;
1004	1355
1005	1356	setupPanel = new cGridBag().setVertical(false);
1006	1357
1007	1358	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1008	1359	liveCB.setToolTipText("Animate object");
1009		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1010		- selectCB.setToolTipText("Make object selectable");
	1360	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1361	+ markCB.setToolTipText("Set target transform");
	1362	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1363	+ selectableCB.setToolTipText("Make object selectable");
1011	1364	// Return();
	1365	+
1012	1366	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1013	1367	hideCB.setToolTipText("Hide object");
1014		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1015		- markCB.setToolTipText("Set the animation target transform");
	1368	+
	1369	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1016	1370
1017	1371	setupPanel2 = new cGridBag().setVertical(false);
1018	1372
1019	1373	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1020	1374	rewindCB.setToolTipText("Rewind animation");
1021	1375
1022		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1023		- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1376	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1377	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1024	1378
	1379	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1380	+ link2masterCB.setToolTipText("Attach to support");
	1381	+
1025	1382	if (Globals.ADVANCED)
1026	1383	{
1027		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1028		- link2masterCB.setToolTipText("Attach to support");
1029	1384	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1030	1385	speedupCB.setToolTipText("Option motion capture");
1031	1386	}
..	..	@@ -1035,23 +1390,23 @@
1035	1390	oe.ctrlPanel.add(setupPanel2);
1036	1391	oe.ctrlPanel.Return();
1037	1392
1038		- commandsPanel = new cGridBag().setVertical(false);
	1393	+ objectCommandsPanel = new cGridBag().setVertical(false);
1039	1394
1040		- resetButton = AddButton(commandsPanel, "Reset");
	1395	+ resetButton = AddButton(objectCommandsPanel, "Reset");
1041	1396	resetButton.setToolTipText("Jump to frame zero");
1042		- stepButton = AddButton(commandsPanel, "Step");
	1397	+ stepButton = AddButton(objectCommandsPanel, "Step");
1043	1398	stepButton.setToolTipText("Step one frame");
1044	1399	// resetAllButton = AddButton(oe, "Reset All");
1045	1400	// stepAllButton = AddButton(oe, "Step All");
1046	1401	// Return();
1047		- slowerButton = AddButton(commandsPanel, "Slow");
	1402	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1048	1403	slowerButton.setToolTipText("Decrease animation speed");
1049		- fasterButton = AddButton(commandsPanel, "Fast");
	1404	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1050	1405	fasterButton.setToolTipText("Increase animation speed");
1051		- remarkButton = AddButton(commandsPanel, "Remark");
	1406	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1052	1407	remarkButton.setToolTipText("Set the current transform as the target");
1053	1408
1054		- oe.ctrlPanel.add(commandsPanel);
	1409	+ oe.ctrlPanel.add(objectCommandsPanel);
1055	1410	oe.ctrlPanel.Return();
1056	1411
1057	1412	pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
..	..	@@ -1211,22 +1566,9 @@
1211	1566
1212	1567	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1213	1568	{
1214		- System.out.println("CREATE CAMERAS");
1215		- cams = new cTemplate();
1216		- cams.name = "Cameras";
1217		- copy.insertElementAt(cams, 0);
1218		- //cams.parent = copy;
1219		-
1220		- cam = new Camera(); // LA.newVector(3, 2, 1));
1221		- cams.addChild(cam);
1222		- cam = new Camera(1);
1223		- cams.addChild(cam);
1224		- cam = new Camera(2);
1225		- cams.addChild(cam);
1226		- cam = new Camera(3);
1227		- cams.addChild(cam);
1228		- cam = new Camera(4); // Light
1229		- cams.addChild(cam);
	1569	+ if (Globals.DEBUG)
	1570	+ System.out.println("CREATE CAMERAS");
	1571	+ cams = CreateCameras();
1230	1572	} else
1231	1573	{
1232	1574	cams = (cGroup) copy.get(0);
..	..	@@ -1292,6 +1634,45 @@
1292	1634	//frontView.object = copy;
1293	1635	//sideView.object = copy;
1294	1636
	1637	+ transformPanel = new cGridBag().setVertical(true);
	1638	+
	1639	+ cGridBag resetTransformPanel = new cGridBag();
	1640	+
	1641	+ resetTransformPanel.preferredHeight = 2;
	1642	+
	1643	+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
	1644	+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
	1645	+ resetTransform.addMouseListener(new MouseAdapter()
	1646	+ {
	1647	+ public void mouseClicked(MouseEvent e)
	1648	+ {
	1649	+ ResetTransform();
	1650	+ }
	1651	+ });
	1652	+ resetTransformPanel.add(resetTransform);
	1653	+
	1654	+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
	1655	+ resetTransform.setToolTipText("Reset Translation only");
	1656	+ resetTransform.addMouseListener(new MouseAdapter()
	1657	+ {
	1658	+ public void mouseClicked(MouseEvent e)
	1659	+ {
	1660	+ ResetTransform(1);
	1661	+ }
	1662	+ });
	1663	+ resetTransformPanel.add(resetTransform);
	1664	+
	1665	+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
	1666	+ resetTransform.setToolTipText("Reset Rotation and Scale only");
	1667	+ resetTransform.addMouseListener(new MouseAdapter()
	1668	+ {
	1669	+ public void mouseClicked(MouseEvent e)
	1670	+ {
	1671	+ ResetTransform(2);
	1672	+ }
	1673	+ });
	1674	+ resetTransformPanel.add(resetTransform);
	1675	+
1295	1676	XYZPanel = new cGridBag().setVertical(true);
1296	1677	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1297	1678
..	..	@@ -1299,7 +1680,11 @@
1299	1680	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1300	1681	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1301	1682	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1683	+ //XYZPanel.setName("XYZ");
1302	1684
	1685	+ transformPanel.add(resetTransformPanel);
	1686	+ transformPanel.add(XYZPanel);
	1687	+
1303	1688	/*
1304	1689	gridPanel = new JPanel(); //new BorderLayout());
1305	1690	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1307,12 +1692,12 @@
1307	1692	gridPanel.add(cameraView);
1308	1693	gridPanel.add(XYZPanel);
1309	1694	*/
1310		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1311		- gridPanel.setContinuousLayout(true);
1312		- gridPanel.setOneTouchExpandable(true);
1313		- gridPanel.setDividerLocation(1.0);
1314		- gridPanel.setDividerSize(9);
1315		- gridPanel.setResizeWeight(0.85);
	1695	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1696	+// gridPanel.setContinuousLayout(true);
	1697	+// gridPanel.setOneTouchExpandable(true);
	1698	+// gridPanel.setDividerLocation(1.0);
	1699	+// gridPanel.setDividerSize(9);
	1700	+// gridPanel.setResizeWeight(0.85);
1316	1701
1317	1702	// aConstraints.weighty = 0;
1318	1703	//System.out.println("THIS = " + this);
..	..	@@ -1335,14 +1720,34 @@
1335	1720
1336	1721	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1337	1722	//tmp.setName("Edit");
	1723	+ objectPanel.add(skyboxPanel);
	1724	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1725	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1726	+
	1727	+ objectPanel.add(toolboxPanel);
	1728	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1729	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1730	+
1338	1731	objectPanel.add(materialPanel);
	1732	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1733	+ objectPanel.setToolTipTextAt(2, "Material");
	1734	+
1339	1735	// JPanel north = new JPanel(new BorderLayout());
1340	1736	// north.setName("Edit");
1341	1737	// north.add(ctrlPanel, BorderLayout.NORTH);
1342	1738	// objectPanel.add(north);
1343		- objectPanel.add(ctrlPanel);
1344		- objectPanel.add(infoPanel);
1345		-
	1739	+ objectPanel.add(editPanel);
	1740	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
	1741	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1742	+
	1743	+ objectPanel.add(transformPanel);
	1744	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1745	+ objectPanel.setToolTipTextAt(4, "TRS transform");
	1746	+
	1747	+ patchMaterial = true;
	1748	+ cameraView.patchMaterial = this;
	1749	+ objectPanel.setSelectedIndex(2);
	1750	+
1346	1751	/*
1347	1752	aConstraints.gridx = 0;
1348	1753	aConstraints.gridwidth = 1;
..	..	@@ -1350,7 +1755,7 @@
1350	1755	aConstraints.gridy += 1;
1351	1756	aConstraints.gridwidth = 1;
1352	1757	mainPanel.add(objectPanel, aConstraints);
1353		- */
	1758	+ */
1354	1759
1355	1760	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1356	1761	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1362,22 +1767,119 @@
1362	1767	scrollpane.addMouseWheelListener(this); // Default not fast enough
1363	1768
1364	1769	/JTabbedPane/ scenePanel = new cGridBag();
1365		- scenePanel.preferredWidth = 6;
	1770	+ scenePanel.preferredWidth = 5;
1366	1771
1367	1772	JTabbedPane tabbedPane = new JTabbedPane();
1368	1773	tabbedPane.add(scrollpane);
1369	1774
1370		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1371		-
1372		- optionsPanel = new cGridBag().setVertical(true);
	1775	+ optionsPanel = new cGridBag().setVertical(false);
1373	1776
1374	1777	optionsPanel.setName("Options");
1375	1778
1376	1779	AddOptions(optionsPanel); //, aConstraints);
1377	1780
	1781	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1782	+
1378	1783	tabbedPane.add(optionsPanel);
1379	1784
1380	1785	scenePanel.add(tabbedPane);
	1786	+
	1787	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1788	+ creditsPanel.setName("Credits");
	1789	+
	1790	+ cLabel ogaLabel = new cLabel(" Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1791	+ creditsPanel.add(ogaLabel);
	1792	+
	1793	+ cButton creditButton;
	1794	+ creditsPanel.add(creditButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1795	+ creditButton.setToolTipText("https://opengameart.org");
	1796	+
	1797	+ creditButton.addMouseListener(new MouseAdapter()
	1798	+ {
	1799	+ public void mouseClicked(MouseEvent e)
	1800	+ {
	1801	+ try
	1802	+ {
	1803	+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
	1804	+ } catch (Exception e1)
	1805	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1806	+ {
	1807	+ e1.printStackTrace();
	1808	+ }
	1809	+ }
	1810	+ });
	1811	+
	1812	+ ogaLabel = new cLabel(" Download 3D models! (.3ds and .obj only)", !Globals.NIMBUSLAF);
	1813	+ creditsPanel.add(ogaLabel);
	1814	+
	1815	+ creditsPanel.add(creditButton = GetButton("icons/3delicious.png", !Globals.NIMBUSLAF));
	1816	+ creditButton.setToolTipText("https://3delicious.net");
	1817	+
	1818	+ creditButton.addMouseListener(new MouseAdapter()
	1819	+ {
	1820	+ public void mouseClicked(MouseEvent e)
	1821	+ {
	1822	+ try
	1823	+ {
	1824	+ Desktop.getDesktop().browse(new java.net.URI("https://3delicious.net"));
	1825	+ } catch (Exception e1)
	1826	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1827	+ {
	1828	+ e1.printStackTrace();
	1829	+ }
	1830	+ }
	1831	+ });
	1832	+
	1833	+ creditsPanel.add(creditButton = GetButton("icons/archive3d.png", !Globals.NIMBUSLAF));
	1834	+ creditButton.setToolTipText("https://archive3d.net");
	1835	+
	1836	+ creditButton.addMouseListener(new MouseAdapter()
	1837	+ {
	1838	+ public void mouseClicked(MouseEvent e)
	1839	+ {
	1840	+ try
	1841	+ {
	1842	+ Desktop.getDesktop().browse(new java.net.URI("https://archive3d.net"));
	1843	+ } catch (Exception e1)
	1844	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1845	+ {
	1846	+ e1.printStackTrace();
	1847	+ }
	1848	+ }
	1849	+ });
	1850	+
	1851	+ creditsPanel.add(creditButton = GetButton("icons/turbosquid.png", !Globals.NIMBUSLAF));
	1852	+ creditButton.setToolTipText("https://turbosquid.com");
	1853	+
	1854	+ creditButton.addMouseListener(new MouseAdapter()
	1855	+ {
	1856	+ public void mouseClicked(MouseEvent e)
	1857	+ {
	1858	+ try
	1859	+ {
	1860	+ Desktop.getDesktop().browse(new java.net.URI("https://www.turbosquid.com/Search/3D-Models/free"));
	1861	+ } catch (Exception e1)
	1862	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1863	+ {
	1864	+ e1.printStackTrace();
	1865	+ }
	1866	+ }
	1867	+ });
	1868	+
	1869	+ for (int i=6; --i>=0;)
	1870	+ {
	1871	+ creditsPanel.add(new cGridBag());
	1872	+ }
	1873	+
	1874	+ tabbedPane.add(creditsPanel);
	1875	+ tabbedPane.setToolTipTextAt(3, "Credits");
	1876	+
	1877	+ if (Globals.ADVANCED)
	1878	+ {
	1879	+ objectPanel.add(infoPanel);
	1880	+ objectPanel.setIconAt(5, GetIcon("icons/info.png"));
	1881	+ objectPanel.setToolTipTextAt(4, "Information");
	1882	+ }
1381	1883
1382	1884	/*
1383	1885	cTree jTree = new cTree(null);
..	..	@@ -1399,13 +1901,13 @@
1399	1901	jtp.add(tree);
1400	1902	*/
1401	1903
1402		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1403		- bigPanel.setContinuousLayout(true);
1404		- bigPanel.setOneTouchExpandable(true);
1405		- bigPanel.setDividerLocation(0.8);
1406		- bigPanel.setDividerSize(15);
1407		- bigPanel.setResizeWeight(0.15);
1408		- bigPanel.setName("Scene");
	1904	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1905	+// bigPanel.setContinuousLayout(true);
	1906	+// bigPanel.setOneTouchExpandable(true);
	1907	+// bigPanel.setDividerLocation(0.8);
	1908	+// bigPanel.setDividerSize(15);
	1909	+// bigPanel.setResizeWeight(0.15);
	1910	+// bigPanel.setName("Scene");
1409	1911
1410	1912	//bigPanel.setLayout(new BorderLayout());
1411	1913	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1440,7 +1942,7 @@
1440	1942	bigThree = new cGridBag();
1441	1943	bigThree.addComponent(scenePanel);
1442	1944	bigThree.addComponent(centralPanel);
1443		- bigThree.addComponent(XYZPanel);
	1945	+ //bigThree.addComponent(XYZPanel);
1444	1946
1445	1947	// // SIDE EFFECT!!!
1446	1948	// aConstraints.gridx = 0;
..	..	@@ -1449,16 +1951,33 @@
1449	1951	// aConstraints.gridheight = 1;
1450	1952
1451	1953	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1452		- framePanel.setContinuousLayout(true);
1453		- framePanel.setOneTouchExpandable(true);
1454		- framePanel.setDividerLocation(0.8);
	1954	+
	1955	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1956	+ new java.beans.PropertyChangeListener()
	1957	+ {
	1958	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1959	+ {
	1960	+ if ((Integer)pce.getOldValue() == 1)
	1961	+ {
	1962	+ if (radio.layout != expandedLayout)
	1963	+ {
	1964	+ radio.layout = expandedLayout;
	1965	+ radio.layout.doClick();
	1966	+ }
	1967	+ }
	1968	+ }
	1969	+ });
	1970	+
	1971	+ framePanel.setContinuousLayout(false);
	1972	+ framePanel.setOneTouchExpandable(false);
	1973	+ //.setDividerLocation(0.8);
1455	1974	//framePanel.setDividerSize(15);
1456	1975	//framePanel.setResizeWeight(0.15);
1457	1976	framePanel.setName("Frame");
1458	1977
1459	1978	frame.getContentPane().setLayout(new BorderLayout());
1460	1979	/**/
1461		- JTabbedPane worldPane = new JTabbedPane();
	1980	+ //JTabbedPane worldPane = new JTabbedPane();
1462	1981	//worldPane.add(bigPanel);
1463	1982	//worldPane.add(worldPanel);
1464	1983	/**/
..	..	@@ -1469,16 +1988,18 @@
1469	1988	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1470	1989
1471	1990	frame.setSize(1280, 860);
1472		- frame.setVisible(true);
1473		-
	1991	+
1474	1992	cameraView.requestFocusInWindow();
1475	1993
1476		- gridPanel.setDividerLocation(1.0);
	1994	+// gridPanel.setDividerLocation(1.0);
	1995	+
	1996	+ frame.validate();
	1997	+
	1998	+ frame.setVisible(true);
1477	1999
1478	2000	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1479	2001	frame.addWindowListener(new WindowAdapter()
1480	2002	{
1481		-
1482	2003	public void windowClosing(WindowEvent e)
1483	2004	{
1484	2005	Close();
..	..	@@ -1501,28 +2022,484 @@
1501	2022	ctrlPanel.removeAll();
1502	2023	}
1503	2024
1504		- void SetupMaterial(cGridBag panel)
	2025	+ void SetupMaterial(cGridBag materialpanel)
1505	2026	{
1506		- /*
	2027	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	2028	+
	2029	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
	2030	+ skin.setToolTipText("Skin");
	2031	+ skin.addMouseListener(new MouseAdapter()
	2032	+ {
	2033	+ public void mouseClicked(MouseEvent e)
	2034	+ {
	2035	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	2036	+ cMaterial material = object.material;
	2037	+
	2038	+ // Skin
	2039	+ colorField.setFloat(material.color);
	2040	+ float saturation = material.modulation;
	2041	+
	2042	+ if (!cameraView.Skinshader)
	2043	+ {
	2044	+ saturation /= 1.5;
	2045	+ }
	2046	+
	2047	+ saturationField.setFloat(saturation);
	2048	+
	2049	+ subsurfaceField.setFloat(material.subsurface);
	2050	+ selfshadowField.setFloat(material.diffuseness);
	2051	+ diffusenessField.setFloat(material.factor);
	2052	+ shininessField.setFloat(material.shininess);
	2053	+ shadowbiasField.setFloat(material.shadowbias);
	2054	+ diffuseField.setFloat(material.diffuse);
	2055	+ specularField.setFloat(material.specular);
	2056	+
	2057	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2058	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2059	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2060	+
	2061	+ materialtouched = true;
	2062	+ applySelf();
	2063	+ }
	2064	+ });
	2065	+ presetpanel.add(skin);
	2066	+
	2067	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
	2068	+ lambert.setToolTipText("Diffuse");
	2069	+ lambert.addMouseListener(new MouseAdapter()
	2070	+ {
	2071	+ public void mouseClicked(MouseEvent e)
	2072	+ {
	2073	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	2074	+ cMaterial material = object.material;
	2075	+
	2076	+ diffusenessField.setFloat(material.factor);
	2077	+ selfshadowField.setFloat(material.diffuseness);
	2078	+
	2079	+ materialtouched = true;
	2080	+ applySelf();
	2081	+ }
	2082	+ });
	2083	+ presetpanel.add(lambert);
	2084	+
	2085	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
	2086	+ diffuse2.setToolTipText("Diffuse2");
	2087	+ diffuse2.addMouseListener(new MouseAdapter()
	2088	+ {
	2089	+ public void mouseClicked(MouseEvent e)
	2090	+ {
	2091	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	2092	+ cMaterial material = object.material;
	2093	+
	2094	+ diffusenessField.setFloat(material.factor);
	2095	+ selfshadowField.setFloat(material.diffuseness);
	2096	+
	2097	+ materialtouched = true;
	2098	+ applySelf();
	2099	+ }
	2100	+ });
	2101	+ presetpanel.add(diffuse2);
	2102	+
	2103	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
	2104	+ diffusemoon.setToolTipText("Moon");
	2105	+ diffusemoon.addMouseListener(new MouseAdapter()
	2106	+ {
	2107	+ public void mouseClicked(MouseEvent e)
	2108	+ {
	2109	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	2110	+ cMaterial material = object.material;
	2111	+
	2112	+ diffusenessField.setFloat(material.factor);
	2113	+ selfshadowField.setFloat(material.diffuseness);
	2114	+
	2115	+ materialtouched = true;
	2116	+ applySelf();
	2117	+ }
	2118	+ });
	2119	+ presetpanel.add(diffusemoon);
	2120	+
	2121	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
	2122	+ diffusemoon2.setToolTipText("Moon2");
	2123	+ diffusemoon2.addMouseListener(new MouseAdapter()
	2124	+ {
	2125	+ public void mouseClicked(MouseEvent e)
	2126	+ {
	2127	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	2128	+ cMaterial material = object.material;
	2129	+
	2130	+ diffusenessField.setFloat(material.factor);
	2131	+ selfshadowField.setFloat(material.diffuseness);
	2132	+
	2133	+ materialtouched = true;
	2134	+ applySelf();
	2135	+ }
	2136	+ });
	2137	+ presetpanel.add(diffusemoon2);
	2138	+
	2139	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
	2140	+ diffusemoon3.setToolTipText("Moon3");
	2141	+ diffusemoon3.addMouseListener(new MouseAdapter()
	2142	+ {
	2143	+ public void mouseClicked(MouseEvent e)
	2144	+ {
	2145	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	2146	+ cMaterial material = object.material;
	2147	+
	2148	+ diffusenessField.setFloat(material.factor);
	2149	+ selfshadowField.setFloat(material.diffuseness);
	2150	+
	2151	+ materialtouched = true;
	2152	+ applySelf();
	2153	+ }
	2154	+ });
	2155	+ presetpanel.add(diffusemoon3);
	2156	+
	2157	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
	2158	+ diffusesheen.setToolTipText("Sheen");
	2159	+ diffusesheen.addMouseListener(new MouseAdapter()
	2160	+ {
	2161	+ public void mouseClicked(MouseEvent e)
	2162	+ {
	2163	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2164	+ cMaterial material = object.material;
	2165	+
	2166	+ sheenField.setFloat(material.sheen);
	2167	+
	2168	+ materialtouched = true;
	2169	+ applySelf();
	2170	+ }
	2171	+ });
	2172	+ presetpanel.add(diffusesheen);
	2173	+
	2174	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
	2175	+ rough.setToolTipText("Rough metal");
	2176	+ rough.addMouseListener(new MouseAdapter()
	2177	+ {
	2178	+ public void mouseClicked(MouseEvent e)
	2179	+ {
	2180	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2181	+ cMaterial material = object.material;
	2182	+
	2183	+ shininessField.setFloat(material.shininess);
	2184	+ velvetField.setFloat(material.velvet);
	2185	+
	2186	+ materialtouched = true;
	2187	+ applySelf();
	2188	+ }
	2189	+ });
	2190	+ presetpanel.add(rough);
	2191	+
	2192	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
	2193	+ rough2.setToolTipText("Medium metal");
	2194	+ rough2.addMouseListener(new MouseAdapter()
	2195	+ {
	2196	+ public void mouseClicked(MouseEvent e)
	2197	+ {
	2198	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2199	+ cMaterial material = object.material;
	2200	+
	2201	+ shininessField.setFloat(material.shininess);
	2202	+ lightareaField.setFloat(material.lightarea);
	2203	+
	2204	+ materialtouched = true;
	2205	+ applySelf();
	2206	+ }
	2207	+ });
	2208	+ presetpanel.add(rough2);
	2209	+
	2210	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
	2211	+ shini0.setToolTipText("Shiny");
	2212	+ shini0.addMouseListener(new MouseAdapter()
	2213	+ {
	2214	+ public void mouseClicked(MouseEvent e)
	2215	+ {
	2216	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2217	+ cMaterial material = object.material;
	2218	+
	2219	+ shininessField.setFloat(material.shininess);
	2220	+ lightareaField.setFloat(material.lightarea);
	2221	+
	2222	+ materialtouched = true;
	2223	+ applySelf();
	2224	+ }
	2225	+ });
	2226	+ presetpanel.add(shini0);
	2227	+
	2228	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
	2229	+ shini1.setToolTipText("Shiny2");
	2230	+ shini1.addMouseListener(new MouseAdapter()
	2231	+ {
	2232	+ public void mouseClicked(MouseEvent e)
	2233	+ {
	2234	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2235	+ cMaterial material = object.material;
	2236	+
	2237	+ shininessField.setFloat(material.shininess);
	2238	+ lightareaField.setFloat(material.lightarea);
	2239	+
	2240	+ materialtouched = true;
	2241	+ applySelf();
	2242	+ }
	2243	+ });
	2244	+ presetpanel.add(shini1);
	2245	+
	2246	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
	2247	+ shini2.setToolTipText("Shiny3");
	2248	+ shini2.addMouseListener(new MouseAdapter()
	2249	+ {
	2250	+ public void mouseClicked(MouseEvent e)
	2251	+ {
	2252	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2253	+ cMaterial material = object.material;
	2254	+
	2255	+ shininessField.setFloat(material.shininess);
	2256	+ lightareaField.setFloat(material.lightarea);
	2257	+
	2258	+ materialtouched = true;
	2259	+ applySelf();
	2260	+ }
	2261	+ });
	2262	+ presetpanel.add(shini2);
	2263	+
	2264	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
	2265	+ aniso.setToolTipText("AnisoU");
	2266	+ aniso.addMouseListener(new MouseAdapter()
	2267	+ {
	2268	+ public void mouseClicked(MouseEvent e)
	2269	+ {
	2270	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2271	+ cMaterial material = object.material;
	2272	+
	2273	+ anisoField.setFloat(material.aniso);
	2274	+ anisoVField.setFloat(material.anisoV);
	2275	+
	2276	+ materialtouched = true;
	2277	+ applySelf();
	2278	+ }
	2279	+ });
	2280	+ presetpanel.add(aniso);
	2281	+
	2282	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
	2283	+ aniso2.setToolTipText("AnisoV");
	2284	+ aniso2.addMouseListener(new MouseAdapter()
	2285	+ {
	2286	+ public void mouseClicked(MouseEvent e)
	2287	+ {
	2288	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2289	+ cMaterial material = object.material;
	2290	+
	2291	+ anisoField.setFloat(material.aniso);
	2292	+ anisoVField.setFloat(material.anisoV);
	2293	+
	2294	+ materialtouched = true;
	2295	+ applySelf();
	2296	+ }
	2297	+ });
	2298	+ presetpanel.add(aniso2);
	2299	+
	2300	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
	2301	+ aniso3.setToolTipText("AnisoUV");
	2302	+ aniso3.addMouseListener(new MouseAdapter()
	2303	+ {
	2304	+ public void mouseClicked(MouseEvent e)
	2305	+ {
	2306	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2307	+ cMaterial material = object.material;
	2308	+
	2309	+ anisoField.setFloat(material.aniso);
	2310	+ anisoVField.setFloat(material.anisoV);
	2311	+
	2312	+ materialtouched = true;
	2313	+ applySelf();
	2314	+ }
	2315	+ });
	2316	+ presetpanel.add(aniso3);
	2317	+
	2318	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
	2319	+ velvet0.setToolTipText("Velvet");
	2320	+ velvet0.addMouseListener(new MouseAdapter()
	2321	+ {
	2322	+ public void mouseClicked(MouseEvent e)
	2323	+ {
	2324	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2325	+ cMaterial material = object.material;
	2326	+
	2327	+ diffusenessField.setFloat(material.factor);
	2328	+ selfshadowField.setFloat(material.diffuseness);
	2329	+ sheenField.setFloat(material.sheen);
	2330	+ shininessField.setFloat(material.shininess);
	2331	+ velvetField.setFloat(material.velvet);
	2332	+ shiftField.setFloat(material.shift);
	2333	+
	2334	+ materialtouched = true;
	2335	+ applySelf();
	2336	+ }
	2337	+ });
	2338	+ presetpanel.add(velvet0);
	2339	+
	2340	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
	2341	+ bump0.setToolTipText("Bump texture");
	2342	+ bump0.addMouseListener(new MouseAdapter()
	2343	+ {
	2344	+ public void mouseClicked(MouseEvent e)
	2345	+ {
	2346	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2347	+ cMaterial material = object.material;
	2348	+
	2349	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2350	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2351	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2352	+
	2353	+ materialtouched = true;
	2354	+ applySelf();
	2355	+ }
	2356	+ });
	2357	+ presetpanel.add(bump0);
	2358	+
	2359	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
	2360	+ borderShader.setToolTipText("Border fade");
	2361	+ borderShader.addMouseListener(new MouseAdapter()
	2362	+ {
	2363	+ public void mouseClicked(MouseEvent e)
	2364	+ {
	2365	+ borderfadeField.setFloat(0.4);
	2366	+ opacityField.setFloat(0.75);
	2367	+
	2368	+ materialtouched = true;
	2369	+ applySelf();
	2370	+ }
	2371	+ });
	2372	+ presetpanel.add(borderShader);
	2373	+
	2374	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
	2375	+ halo.setToolTipText("Halo");
	2376	+ halo.addMouseListener(new MouseAdapter()
	2377	+ {
	2378	+ public void mouseClicked(MouseEvent e)
	2379	+ {
	2380	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2381	+ cMaterial material = object.material;
	2382	+
	2383	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2384	+
	2385	+ materialtouched = true;
	2386	+ applySelf();
	2387	+ }
	2388	+ });
	2389	+ presetpanel.add(halo);
	2390	+
	2391	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
	2392	+ candle.setToolTipText("Candle");
	2393	+ candle.addMouseListener(new MouseAdapter()
	2394	+ {
	2395	+ public void mouseClicked(MouseEvent e)
	2396	+ {
	2397	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2398	+ cMaterial material = object.material;
	2399	+
	2400	+ subsurfaceField.setFloat(material.subsurface);
	2401	+ shadowbiasField.setFloat(material.shadowbias);
	2402	+ ambientField.setFloat(material.ambient);
	2403	+ specularField.setFloat(material.specular);
	2404	+ lightareaField.setFloat(material.lightarea);
	2405	+ shininessField.setFloat(material.shininess);
	2406	+
	2407	+ materialtouched = true;
	2408	+ applySelf();
	2409	+ }
	2410	+ });
	2411	+ presetpanel.add(candle);
	2412	+
	2413	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
	2414	+ shadowShader.setToolTipText("Shadow");
	2415	+ shadowShader.addMouseListener(new MouseAdapter()
	2416	+ {
	2417	+ public void mouseClicked(MouseEvent e)
	2418	+ {
	2419	+ diffuseField.setFloat(0.001);
	2420	+ ambientField.setFloat(0.001);
	2421	+ cameraField.setFloat(0.001);
	2422	+ specularField.setFloat(0.001);
	2423	+ fakedepthField.setFloat(0.001);
	2424	+ opacityField.setFloat(0.6);
	2425	+
	2426	+ materialtouched = true;
	2427	+ applySelf();
	2428	+ }
	2429	+ });
	2430	+ presetpanel.add(shadowShader);
	2431	+
	2432	+ cLabel para0 = GetLabel("icons/shadericons/parallax0.png", !Globals.NIMBUSLAF);
	2433	+ para0.setToolTipText("No parallax");
	2434	+ para0.addMouseListener(new MouseAdapter()
	2435	+ {
	2436	+ public void mouseClicked(MouseEvent e)
	2437	+ {
	2438	+ parallaxField.setFloat(0.125);
	2439	+
	2440	+ materialtouched = true;
	2441	+ applySelf();
	2442	+ }
	2443	+ });
	2444	+ presetpanel.add(para0);
	2445	+
	2446	+ cLabel para1 = GetLabel("icons/shadericons/parallax1.png", !Globals.NIMBUSLAF);
	2447	+ para1.setToolTipText("With parallax");
	2448	+ para1.addMouseListener(new MouseAdapter()
	2449	+ {
	2450	+ public void mouseClicked(MouseEvent e)
	2451	+ {
	2452	+ parallaxField.setFloat(0.13);
	2453	+
	2454	+ materialtouched = true;
	2455	+ applySelf();
	2456	+ }
	2457	+ });
	2458	+ presetpanel.add(para1);
	2459	+
	2460	+ cLabel para2 = GetLabel("icons/shadericons/parallax2.png", !Globals.NIMBUSLAF);
	2461	+ para2.setToolTipText("Reset parallax");
	2462	+ para2.addMouseListener(new MouseAdapter()
	2463	+ {
	2464	+ public void mouseClicked(MouseEvent e)
	2465	+ {
	2466	+ parallaxField.setFloat(0.14);
	2467	+
	2468	+ materialtouched = true;
	2469	+ applySelf();
	2470	+ }
	2471	+ });
	2472	+ presetpanel.add(para2);
	2473	+
	2474	+ cGridBag panel = new cGridBag().setVertical(true);
	2475	+
	2476	+ presetpanel.preferredWidth = 1;
	2477	+
	2478	+ materialpanel.add(presetpanel);
	2479	+ materialpanel.add(panel);
	2480	+
	2481	+ panel.preferredWidth = 8;
	2482	+
	2483	+ /*
1507	2484	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1508	2485	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1509		- */
	2486	+ */
1510	2487
1511	2488	cGridBag editBar = new cGridBag().setVertical(false);
1512	2489
1513		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2490	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
1514	2491	createMaterialButton.setToolTipText("Create material");
1515	2492
1516	2493	/*
1517	2494	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1518	2495	*/
1519	2496
1520		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2497	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
1521	2498	clearMaterialButton.setToolTipText("Clear material");
1522	2499
1523	2500	if (Globals.ADVANCED)
1524	2501	{
1525		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2502	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
1526	2503	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1527	2504	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1528	2505	}
..	..	@@ -1540,45 +2517,61 @@
1540	2517	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1541	2518
1542	2519	cGridBag colorSection = new cGridBag().setVertical(true);
	2520	+
	2521	+ cGridBag huepanel = new cGridBag();
	2522	+ cGridBag huelabel = new cGridBag();
	2523	+ cLabel hue = GetLabel("icons/hue.png", false);
	2524	+ hue.fit = true;
	2525	+
	2526	+ hue.addMouseListener(new MouseAdapter()
	2527	+ {
	2528	+ public void mousePressed(MouseEvent e)
	2529	+ {
	2530	+ int x = e.getX();
	2531	+
	2532	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2533	+ }
	2534	+ });
	2535	+
	2536	+ huelabel.add(hue);
	2537	+ huelabel.preferredWidth = 20;
	2538	+ huepanel.add(new cGridBag()); // Label
	2539	+ huepanel.add(huelabel); // Field/slider
	2540	+
	2541	+ huepanel.preferredHeight = 7;
	2542	+
	2543	+ colorSection.add(huepanel);
1543	2544
1544	2545	cGridBag color = new cGridBag();
1545		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1546		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1547		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2546	+
	2547	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2548	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2549	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2550	+
1548	2551	//colorField.preferredWidth = 200;
1549	2552	colorSection.add(color);
1550	2553
1551	2554	cGridBag modulation = new cGridBag();
1552	2555	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1553	2556	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1554		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2557	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1555	2558	colorSection.add(modulation);
1556	2559
	2560	+ cGridBag opacity = new cGridBag();
	2561	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2562	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2563	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2564	+ colorSection.add(opacity);
	2565	+
	2566	+ colorSection.add(GetSeparator());
	2567	+
1557	2568	cGridBag texture = new cGridBag();
1558	2569	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1559	2570	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1560	2571	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1561	2572	colorSection.add(texture);
1562	2573
1563		- cGridBag anisoU = new cGridBag();
1564		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1565		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1566		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1567		- colorSection.add(anisoU);
1568		-
1569		- cGridBag anisoV = new cGridBag();
1570		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1571		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1572		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1573		- colorSection.add(anisoV);
1574		-
1575		- cGridBag shadowbias = new cGridBag();
1576		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1577		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1578		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1579		- colorSection.add(shadowbias);
1580		-
1581		- panel.add(new JSeparator());
	2574	+ panel.add(GetSeparator());
1582	2575
1583	2576	panel.add(colorSection);
1584	2577
..	..	@@ -1628,7 +2621,13 @@
1628	2621	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1629	2622	diffuseSection.add(fakedepth);
1630	2623
1631		- panel.add(new JSeparator());
	2624	+ cGridBag shadowbias = new cGridBag();
	2625	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2626	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2627	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2628	+ diffuseSection.add(shadowbias);
	2629	+
	2630	+ panel.add(GetSeparator());
1632	2631
1633	2632	panel.add(diffuseSection);
1634	2633
..	..	@@ -1678,42 +2677,54 @@
1678	2677	// aConstraints.gridy += 1;
1679	2678	// aConstraints.gridwidth = 1;
1680	2679
	2680	+ cGridBag anisoU = new cGridBag();
	2681	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2682	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2683	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2684	+ specularSection.add(anisoU);
1681	2685
1682		- panel.add(new JSeparator());
	2686	+ cGridBag anisoV = new cGridBag();
	2687	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2688	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2689	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2690	+ specularSection.add(anisoV);
	2691	+
	2692	+
	2693	+ panel.add(GetSeparator());
1683	2694
1684	2695	panel.add(specularSection);
1685	2696
1686	2697	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1687	2698
1688		- cGridBag globalSection = new cGridBag().setVertical(true);
	2699	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1689	2700
1690	2701	cGridBag camera = new cGridBag();
1691	2702	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1692	2703	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1693	2704	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1694		- globalSection.add(camera);
	2705	+ colorSection.add(camera);
1695	2706
1696	2707	cGridBag ambient = new cGridBag();
1697	2708	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1698	2709	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1699	2710	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1700		- globalSection.add(ambient);
	2711	+ colorSection.add(ambient);
1701	2712
1702	2713	cGridBag backlit = new cGridBag();
1703	2714	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1704	2715	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1705	2716	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1706		- globalSection.add(backlit);
	2717	+ colorSection.add(backlit);
1707	2718
1708		- cGridBag opacity = new cGridBag();
1709		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1710		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1711		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1712		- globalSection.add(opacity);
1713		-
1714		- panel.add(new JSeparator());
	2719	+ cGridBag parallax = new cGridBag();
	2720	+ parallax.add(parallaxLabel = new JLabel("Parallax")); // , aConstraints);
	2721	+ parallaxLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2722	+ parallax.add(parallaxField = new cNumberSlider(this, 0.001, 0.25, -0.125)); // , aConstraints);
	2723	+ colorSection.add(parallax);
1715	2724
1716		- panel.add(globalSection);
	2725	+ //panel.add(new JSeparator());
	2726	+
	2727	+ //panel.add(globalSection);
1717	2728
1718	2729	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1719	2730
..	..	@@ -1755,7 +2766,7 @@
1755	2766	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1756	2767	textureSection.add(opacityPower);
1757	2768
1758		- panel.add(new JSeparator());
	2769	+ panel.add(GetSeparator());
1759	2770
1760	2771	panel.add(textureSection);
1761	2772
..	..	@@ -1820,8 +2831,9 @@
1820	2831	// 3D models
1821	2832	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1822	2833	{
1823		- lastConverter = new com.jmex.model.converters.MaxToJme();
1824		- LoadFile(filename, lastConverter);
	2834	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2835	+ //LoadFile(filename, lastConverter);
	2836	+ LoadObjFile(filename); // New 3ds loader
1825	2837	continue;
1826	2838	}
1827	2839	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2547,6 +3559,7 @@
2547	3559	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2548	3560	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2549	3561	}
	3562	+
2550	3563	//cJME.count++;
2551	3564	//cJME.count %= 12;
2552	3565	if (gc)
..	..	@@ -2730,6 +3743,7 @@
2730	3743	}
2731	3744	}
2732	3745	}
	3746	+
2733	3747	cFileSystemPane FSPane;
2734	3748
2735	3749	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2739,7 +3753,7 @@
2739	3753
2740	3754	freezematerial = true;
2741	3755	colorField.setFloat(mat.color);
2742		- modulationField.setFloat(mat.modulation);
	3756	+ saturationField.setFloat(mat.modulation);
2743	3757	metalnessField.setFloat(mat.metalness);
2744	3758	diffuseField.setFloat(mat.diffuse);
2745	3759	specularField.setFloat(mat.specular);
..	..	@@ -2759,6 +3773,7 @@
2759	3773	shadowField.setFloat(mat.shadow);
2760	3774	textureField.setFloat(mat.texture);
2761	3775	opacityField.setFloat(mat.opacity);
	3776	+ parallaxField.setFloat(mat.parallax + 0.125f);
2762	3777	fakedepthField.setFloat(mat.fakedepth);
2763	3778	shadowbiasField.setFloat(mat.shadowbias);
2764	3779	bumpField.setInteger(1); // dec 2013
..	..	@@ -2783,11 +3798,14 @@
2783	3798	}
2784	3799	}
2785	3800	}
	3801	+
2786	3802	freezematerial = false;
2787	3803	}
2788	3804
2789	3805	void SetMaterial(Object3D object)
2790	3806	{
	3807	+ latestObject = object;
	3808	+
2791	3809	cMaterial mat = object.material;
2792	3810
2793	3811	if (mat == null)
..	..	@@ -2798,32 +3816,8 @@
2798	3816
2799	3817	if (multiplyToggle != null)
2800	3818	multiplyToggle.setSelected(mat.multiply);
2801		-
2802		- assert (object.projectedVertices != null);
2803		-
2804		- if (object.projectedVertices.length <= 2)
2805		- {
2806		- // Side effect...
2807		- Object3D.cVector2[] keep = object.projectedVertices;
2808		- object.projectedVertices = new Object3D.cVector2[3];
2809		- for (int i = 0; i < 3; i++)
2810		- {
2811		- if (i < keep.length)
2812		- {
2813		- object.projectedVertices[i] = keep[i];
2814		- } else
2815		- {
2816		- object.projectedVertices[i] = new Object3D.cVector2();
2817		- }
2818		- /*
2819		- if(keep.length == 0)
2820		- object.projectedVertices[0] = new Object3D.cVector2();
2821		- else
2822		- object.projectedVertices[0] = keep[0];
2823		- object.projectedVertices[1] = new Object3D.cVector2();
2824		- */
2825		- }
2826		- }
	3819	+
	3820	+ AllocProjectedVertices(object);
2827	3821
2828	3822	SetMaterial(mat, object.projectedVertices);
2829	3823	}
..	..	@@ -2899,12 +3893,17 @@
2899	3893	// }
2900	3894
2901	3895	/**/
2902		- if (deselect)
	3896	+ if (deselect \|\| child == null)
2903	3897	{
2904	3898	//group.deselectAll();
2905	3899	//freeze = true;
2906	3900	GetTree().clearSelection();
2907	3901	//freeze = false;
	3902	+
	3903	+ if (child == null)
	3904	+ {
	3905	+ return;
	3906	+ }
2908	3907	}
2909	3908
2910	3909	//group.addSelectee(child);
..	..	@@ -2938,6 +3937,17 @@
2938	3937	public void itemStateChanged(ItemEvent event)
2939	3938	{
2940	3939	// System.out.println("Propagate = " + propagate);
	3940	+ if (event.getSource() == pinButton)
	3941	+ {
	3942	+ copy.pinned ^= true;
	3943	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3944	+ {
	3945	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3946	+ copy.CloseUI();
	3947	+ //copy.editWindow.refreshContents();
	3948	+ }
	3949	+ }
	3950	+ else
2941	3951	if (event.getSource() == propagateToggle)
2942	3952	{
2943	3953	propagate ^= true;
..	..	@@ -2973,7 +3983,7 @@
2973	3983	cameraView.ToggleDL();
2974	3984	cameraView.repaint();
2975	3985	return;
2976		- } else if (event.getSource() == toggleTextureItem)
	3986	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2977	3987	{
2978	3988	cameraView.ToggleTexture();
2979	3989	// june 2013 copy.HardTouch();
..	..	@@ -3012,7 +4022,7 @@
3012	4022	frame.validate();
3013	4023
3014	4024	return;
3015		- } else if (event.getSource() == toggleSwitchItem)
	4025	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3016	4026	{
3017	4027	cameraView.ToggleSwitch();
3018	4028	cameraView.repaint();
..	..	@@ -3042,8 +4052,9 @@
3042	4052	} else if (event.getSource() == liveCB)
3043	4053	{
3044	4054	copy.live ^= true;
	4055	+ objEditor.refreshContents(true); // To show item colors
3045	4056	return;
3046		- } else if (event.getSource() == selectCB)
	4057	+ } else if (event.getSource() == selectableCB)
3047	4058	{
3048	4059	copy.dontselect ^= true;
3049	4060	return;
..	..	@@ -3051,7 +4062,7 @@
3051	4062	{
3052	4063	copy.hide ^= true;
3053	4064	copy.Touch(); // display list issue
3054		- objEditor.refreshContents();
	4065	+ objEditor.refreshContents(true); // To show item colors
3055	4066	return;
3056	4067	} else if (event.getSource() == link2masterCB)
3057	4068	{
..	..	@@ -3116,7 +4127,7 @@
3116	4127	//System.out.println("ObjEditor " + event);
3117	4128	applySelf0(true);
3118	4129	//parent.applySelf();
3119		- objEditor.refreshContents();
	4130	+ // conflicts with requestFocus objEditor.refreshContents();
3120	4131	} else if (source == resetButton)
3121	4132	{
3122	4133	CameraPane.fullreset = true;
..	..	@@ -3228,9 +4239,9 @@
3228	4239	{
3229	4240	Close();
3230	4241	//return true;
3231		- } else if (source == loadItem)
	4242	+ } else if (source == openItem)
3232	4243	{
3233		- load();
	4244	+ Open();
3234	4245	//return true;
3235	4246	} else if (source == newItem)
3236	4247	{
..	..	@@ -3255,6 +4266,10 @@
3255	4266	{
3256	4267	generatePOV();
3257	4268	//return true;
	4269	+ } else if (event.getSource() == archiveItem)
	4270	+ {
	4271	+ cTools.Archive(frame);
	4272	+ return;
3258	4273	} else if (source == zBufferItem)
3259	4274	{
3260	4275	try
..	..	@@ -3292,22 +4307,30 @@
3292	4307
3293	4308	void New()
3294	4309	{
3295		- while (copy.Size() > 1)
	4310	+ while (copy.Size() > 0)
3296	4311	{
3297		- copy.remove(1);
	4312	+ copy.remove(0);
3298	4313	}
3299	4314
	4315	+ copy.selection.clear();
	4316	+
	4317	+ if (copy == Grafreed.grafreed.universe)
	4318	+ {
	4319	+ CreateCameras();
	4320	+ cameraView.SetCamera(GetCamera(copy, 0));
	4321	+ }
3300	4322	ResetModel();
3301	4323	objEditor.refreshContents();
3302	4324	}
3303	4325
3304	4326	static public byte[] Compress(Object3D o)
3305	4327	{
	4328	+ // Slower to actually compress.
3306	4329	try
3307	4330	{
3308	4331	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3309		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3310		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	4332	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4333	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3311	4334
3312	4335	Object3D parent = o.parent;
3313	4336	o.parent = null;
..	..	@@ -3318,10 +4341,14 @@
3318	4341
3319	4342	out.flush();
3320	4343
3321		- zstream.close();
	4344	+ baos //zstream
	4345	+ .close();
3322	4346	out.close();
3323	4347
3324		- return baos.toByteArray();
	4348	+ byte[] bytes = baos.toByteArray();
	4349	+
	4350	+ System.out.println("save #bytes = " + bytes.length);
	4351	+ return bytes;
3325	4352	} catch (Exception e)
3326	4353	{
3327	4354	System.err.println(e);
..	..	@@ -3331,13 +4358,16 @@
3331	4358
3332	4359	static public Object Uncompress(byte[] bytes)
3333	4360	{
3334		- System.out.println("#bytes = " + bytes.length);
	4361	+ System.out.println("restore #bytes = " + bytes.length);
3335	4362	try
3336	4363	{
3337	4364	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3338		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3339		- ObjectInputStream in = new ObjectInputStream(istream);
	4365	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4366	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3340	4367	Object obj = in.readObject();
	4368	+
	4369	+ bais //istream
	4370	+ .close();
3341	4371	in.close();
3342	4372
3343	4373	return obj;
..	..	@@ -3392,37 +4422,101 @@
3392	4422	return null;
3393	4423	}
3394	4424
3395		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3396	4425
3397	4426	public void Save()
3398	4427	{
3399		- cRadio tab = GetCurrentTab();
	4428	+ //Save(true);
	4429	+ Replace();
	4430	+ SetVersionStates();
	4431	+ }
	4432	+
	4433	+ private boolean Equal(byte[] compress, byte[] name)
	4434	+ {
	4435	+ if (compress.length != name.length)
	4436	+ {
	4437	+ return false;
	4438	+ }
3400	4439
3401		- boolean temp = CameraPane.SWITCH;
3402		- CameraPane.SWITCH = false;
	4440	+ for (int i=compress.length; --i>=0;)
	4441	+ {
	4442	+ if (compress[i] != name[i])
	4443	+ return false;
	4444	+ }
3403	4445
3404		- copy.ExtractBigData(hashtable);
	4446	+ return true;
	4447	+ }
	4448	+
	4449	+ void DeleteVersion()
	4450	+ {
	4451	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4452	+ {
	4453	+ copy.versionlist[i] = copy.versionlist[i+1];
	4454	+ }
	4455	+
	4456	+ if (copy.versionlist[copy.versionindex] == null)
	4457	+ copy.versionindex -= 1;
	4458	+
	4459	+ if (copy.versionindex != -1)
	4460	+ CopyChanged();
	4461	+
	4462	+ SetVersionStates();
	4463	+ }
	4464	+
	4465	+ public boolean Save(boolean user)
	4466	+ {
	4467	+ System.err.println("Save");
	4468	+ Replace();
	4469	+
	4470	+ if (copy.versionlist == null)
	4471	+ {
	4472	+ copy.versionlist = new Object3D[100];
	4473	+ copy.versionindex = -1;
	4474	+ }
	4475	+
	4476	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
	4477	+
	4478	+ boolean thesame = false;
	4479	+
	4480	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4481	+// {
	4482	+// thesame = true;
	4483	+// }
3405	4484
3406	4485	//EditorFrame.m_MainFrame.requestFocusInWindow();
3407		- tab.graphs[tab.undoindex++] = Compress(copy);
3408		-
3409		- copy.RestoreBigData(hashtable);
3410		-
3411		- CameraPane.SWITCH = temp;
3412		-
3413		- //assert(hashtable.isEmpty());
3414		-
3415		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	4486	+ if (!thesame)
3416	4487	{
3417		- tab.graphs[i] = null;
	4488	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4489	+ {
	4490	+ copy.versionlist[i] = copy.versionlist[i-1];
	4491	+ }
	4492	+
	4493	+ //tab.user[tab.versionindex] = user;
	4494	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4495	+
	4496	+ copy.versionlist[++copy.versionindex] = compress;
	4497	+
	4498	+ // if (increment)
	4499	+ // tab.versionindex++;
3418	4500	}
3419	4501
	4502	+ //copy.RestoreBigData(versiontable);
	4503	+
	4504	+ //assert(hashtable.isEmpty());
	4505	+
	4506	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4507	+// {
	4508	+// //tab.user[i] = false;
	4509	+// copy.versionlist[i] = null;
	4510	+// }
	4511	+
	4512	+ SetVersionStates();
	4513	+
3420	4514	// test save
3421	4515	if (false)
3422	4516	{
3423	4517	try
3424	4518	{
3425		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	4519	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3426	4520	ObjectOutputStream p = new ObjectOutputStream(ostream);
3427	4521
3428	4522	p.writeObject(copy);
..	..	@@ -3435,26 +4529,68 @@
3435	4529	e.printStackTrace();
3436	4530	}
3437	4531	}
	4532	+
	4533	+ return !thesame;
	4534	+ }
	4535	+
	4536	+ boolean flashIt = true;
	4537	+
	4538	+ void RefreshSelection()
	4539	+ {
	4540	+ Object3D selection = new Object3D();
	4541	+
	4542	+ for (int i = 0; i < copy.selection.size(); i++)
	4543	+ {
	4544	+ Object3D elem = copy.selection.elementAt(i);
	4545	+
	4546	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4547	+
	4548	+ if (obj == null)
	4549	+ {
	4550	+ copy.selection.remove(i--);
	4551	+ }
	4552	+ else
	4553	+ {
	4554	+ selection.add(obj);
	4555	+ copy.selection.setElementAt(obj, i);
	4556	+ }
	4557	+ }
	4558	+
	4559	+ flashIt = false;
	4560	+ GetTree().clearSelection();
	4561	+ for (int i = 0; i < selection.size(); i++)
	4562	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4563	+ flashIt = true;
	4564	+
	4565	+ //refreshContents(false);
3438	4566	}
3439	4567
3440		- void CopyChanged(Object3D obj)
	4568	+ void CopyChanged()
3441	4569	{
	4570	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4571	+
	4572	+ SetVersionStates();
	4573	+
3442	4574	boolean temp = CameraPane.SWITCH;
3443	4575	CameraPane.SWITCH = false;
3444	4576
3445		- copy.ExtractBigData(hashtable);
	4577	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
3446	4578
3447	4579	copy.clear();
3448	4580
	4581	+ copy.skyboxname = obj.skyboxname;
	4582	+ copy.skyboxext = obj.skyboxext;
	4583	+
3449	4584	for (int i=0; i<obj.Size(); i++)
3450	4585	{
3451	4586	copy.add(obj.get(i));
3452	4587	}
3453	4588
3454		- copy.RestoreBigData(hashtable);
	4589	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
3455	4590
3456	4591	CameraPane.SWITCH = temp;
3457	4592
	4593	+ RefreshSelection();
3458	4594	//assert(hashtable.isEmpty());
3459	4595
3460	4596	copy.Touch();
..	..	@@ -3475,43 +4611,161 @@
3475	4611	}
3476	4612	}
3477	4613
3478		- refreshContents();
	4614	+ refreshContents(true);
3479	4615	}
3480	4616
3481		- public void Undo()
3482		- {
3483		- cRadio tab = GetCurrentTab();
	4617	+ cButton previousVersionButton;
	4618	+ cButton restoreButton;
	4619	+ cButton replaceButton;
	4620	+ cButton nextVersionButton;
	4621	+ cButton saveVersionButton;
	4622	+ cButton deleteVersionButton;
3484	4623
3485		- if (tab.undoindex == 0)
	4624	+ boolean muteSlider;
	4625	+
	4626	+ int VersionCount()
	4627	+ {
	4628	+ int count = 0;
	4629	+
	4630	+ for (int i = copy.versionlist.length; --i >= 0;)
	4631	+ {
	4632	+ if (copy.versionlist[i] != null)
	4633	+ count++;
	4634	+ }
	4635	+
	4636	+ return count;
	4637	+ }
	4638	+
	4639	+ public cGridBag versionSliderPane;
	4640	+
	4641	+ void SetVersionStates()
	4642	+ {
	4643	+ //if (true)
	4644	+ // return;
	4645	+
	4646	+ //cRadio tab = GetCurrentTab();
	4647	+
	4648	+ if (copy.versionindex == -2)
	4649	+ {
	4650	+ saveVersionButton.setEnabled(false);
	4651	+ restoreButton.setEnabled(false);
	4652	+ replaceButton.setEnabled(false);
	4653	+ previousVersionButton.setEnabled(false);
	4654	+ nextVersionButton.setEnabled(false);
	4655	+ deleteVersionButton.setEnabled(false);
	4656	+ versionSliderPane.setVisible(false);
	4657	+ }
	4658	+ else
	4659	+ {
	4660	+ restoreButton.setEnabled(copy.versionindex != -1);
	4661	+ replaceButton.setEnabled(copy.versionindex != -1);
	4662	+
	4663	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4664	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4665	+
	4666	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4667	+ //copy.versionlist[copy.versionindex + 1] != null);
	4668	+
	4669	+ muteSlider = true;
	4670	+ versionSlider.setMinimum(0);
	4671	+ versionSlider.setMaximum(VersionCount() - 1);
	4672	+ versionSlider.setInteger(copy.versionindex);
	4673	+ versionSlider.setEnabled(copy.versionindex != -1);
	4674	+ muteSlider = false;
	4675	+
	4676	+ versionSliderPane.setVisible(true);
	4677	+ }
	4678	+ }
	4679	+
	4680	+ public boolean PreviousVersion()
	4681	+ {
	4682	+ // Option?
	4683	+ Replace();
	4684	+
	4685	+ System.err.println("Undo");
	4686	+
	4687	+ //cRadio tab = GetCurrentTab();
	4688	+
	4689	+ if (copy.versionindex == 0)
3486	4690	{
3487	4691	java.awt.Toolkit.getDefaultToolkit().beep();
3488		- return;
	4692	+ return false;
3489	4693	}
3490	4694
3491		- if (tab.graphs[tab.undoindex] == null)
3492		- {
3493		- Save();
3494		- tab.undoindex -= 1;
3495		- }
	4695	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4696	+// {
	4697	+// if (Save(false))
	4698	+// tab.versionindex -= 1;
	4699	+// else
	4700	+// {
	4701	+// if (tab.versionindex <= 0)
	4702	+// return false;
	4703	+// else
	4704	+// tab.versionindex -= 1;
	4705	+// }
	4706	+// }
3496	4707
3497		- tab.undoindex -= 1;
	4708	+ copy.versionindex -= 1;
3498	4709
3499		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4710	+ CopyChanged();
	4711	+
	4712	+ return true;
3500	4713	}
3501	4714
3502		- public void Redo()
	4715	+ public boolean Restore()
3503	4716	{
3504		- cRadio tab = GetCurrentTab();
	4717	+ System.err.println("Restore");
3505	4718
3506		- if (tab.graphs[tab.undoindex + 1] == null)
	4719	+ //cRadio tab = GetCurrentTab();
	4720	+
	4721	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4722	+ {
	4723	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4724	+ return false;
	4725	+ }
	4726	+
	4727	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4728	+ CopyChanged();
	4729	+
	4730	+ return true;
	4731	+ }
	4732	+
	4733	+ public boolean Replace()
	4734	+ {
	4735	+ //System.err.println("Replace");
	4736	+
	4737	+ //cRadio tab = GetCurrentTab();
	4738	+
	4739	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4740	+ {
	4741	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4742	+ return false;
	4743	+ }
	4744	+
	4745	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4746	+
	4747	+ return true;
	4748	+ }
	4749	+
	4750	+ public void NextVersion()
	4751	+ {
	4752	+ // Option?
	4753	+ Replace();
	4754	+
	4755	+ //cRadio tab = GetCurrentTab();
	4756	+
	4757	+ if (copy.versionlist[copy.versionindex + 1] == null)
3507	4758	{
3508	4759	java.awt.Toolkit.getDefaultToolkit().beep();
3509	4760	return;
3510	4761	}
3511	4762
3512		- tab.undoindex += 1;
	4763	+ copy.versionindex += 1;
3513	4764
3514		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4765	+ CopyChanged();
	4766	+
	4767	+ //if (!tab.user[tab.versionindex])
	4768	+ // tab.graphs[tab.versionindex] = null;
3515	4769	}
3516	4770
3517	4771	void ImportGFD()
..	..	@@ -3663,7 +4917,7 @@
3663	4917	assert false;
3664	4918	}
3665	4919
3666		- void EditSelection()
	4920	+ void EditSelection(boolean newWindow)
3667	4921	{
3668	4922	}
3669	4923
..	..	@@ -3705,6 +4959,12 @@
3705	4959	// else
3706	4960	// applySelf(true);
3707	4961	// }
	4962	+
	4963	+ boolean Equal(double a, double b)
	4964	+ {
	4965	+ return Math.abs(a - b) < 0.001;
	4966	+ }
	4967	+
3708	4968	void applySelf0(boolean name)
3709	4969	{
3710	4970	if (name)
..	..	@@ -3722,7 +4982,7 @@
3722	4982	//copy.material = new cMaterial(copy.GetMaterial());
3723	4983
3724	4984	current.color = (float) colorField.getFloat();
3725		- current.modulation = (float) modulationField.getFloat();
	4985	+ current.modulation = (float) saturationField.getFloat();
3726	4986	current.metalness = (float) metalnessField.getFloat();
3727	4987	current.diffuse = (float) diffuseField.getFloat();
3728	4988	current.specular = (float) specularField.getFloat();
..	..	@@ -3742,6 +5002,7 @@
3742	5002	current.shadow = (float) shadowField.getFloat();
3743	5003	current.texture = (float) textureField.getFloat();
3744	5004	current.opacity = (float) opacityField.getFloat();
	5005	+ current.parallax = (float) parallaxField.getFloat() - 0.125f;
3745	5006	current.fakedepth = (float) fakedepthField.getFloat();
3746	5007	current.shadowbias = (float) shadowbiasField.getFloat();
3747	5008
..	..	@@ -3754,29 +5015,54 @@
3754	5015	{
3755	5016	cMaterial mat = copy.material;
3756	5017
3757		- colorField.SetToolTipValue((mat.color));
3758		- modulationField.SetToolTipValue((mat.modulation));
3759		- metalnessField.SetToolTipValue((mat.metalness));
3760		- diffuseField.SetToolTipValue((mat.diffuse));
3761		- specularField.SetToolTipValue((mat.specular));
3762		- shininessField.SetToolTipValue((mat.shininess));
3763		- shiftField.SetToolTipValue((mat.shift));
3764		- ambientField.SetToolTipValue((mat.ambient));
3765		- lightareaField.SetToolTipValue((mat.lightarea));
3766		- diffusenessField.SetToolTipValue((mat.factor));
3767		- velvetField.SetToolTipValue((mat.velvet));
3768		- sheenField.SetToolTipValue((mat.sheen));
3769		- subsurfaceField.SetToolTipValue((mat.subsurface));
3770		- backlitField.SetToolTipValue((mat.bump));
3771		- anisoField.SetToolTipValue((mat.aniso));
3772		- anisoVField.SetToolTipValue((mat.anisoV));
3773		- cameraField.SetToolTipValue((mat.cameralight));
3774		- selfshadowField.SetToolTipValue((mat.diffuseness));
3775		- shadowField.SetToolTipValue((mat.shadow));
3776		- textureField.SetToolTipValue((mat.texture));
3777		- opacityField.SetToolTipValue((mat.opacity));
3778		- fakedepthField.SetToolTipValue((mat.fakedepth));
3779		- shadowbiasField.SetToolTipValue((mat.shadowbias));
	5018	+ if (!Equal(colorField.getFloat(), mat.color))
	5019	+ colorField.SetToolTipValue((mat.color));
	5020	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	5021	+ saturationField.SetToolTipValue((mat.modulation));
	5022	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	5023	+ metalnessField.SetToolTipValue((mat.metalness));
	5024	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	5025	+ diffuseField.SetToolTipValue((mat.diffuse));
	5026	+ if (!Equal(specularField.getFloat(), mat.specular))
	5027	+ specularField.SetToolTipValue((mat.specular));
	5028	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	5029	+ shininessField.SetToolTipValue((mat.shininess));
	5030	+ if (!Equal(shiftField.getFloat(), mat.shift))
	5031	+ shiftField.SetToolTipValue((mat.shift));
	5032	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	5033	+ ambientField.SetToolTipValue((mat.ambient));
	5034	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	5035	+ lightareaField.SetToolTipValue((mat.lightarea));
	5036	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	5037	+ diffusenessField.SetToolTipValue((mat.factor));
	5038	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	5039	+ velvetField.SetToolTipValue((mat.velvet));
	5040	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	5041	+ sheenField.SetToolTipValue((mat.sheen));
	5042	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	5043	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	5044	+ if (!Equal(backlitField.getFloat(), mat.bump))
	5045	+ backlitField.SetToolTipValue((mat.bump));
	5046	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	5047	+ anisoField.SetToolTipValue((mat.aniso));
	5048	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	5049	+ anisoVField.SetToolTipValue((mat.anisoV));
	5050	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	5051	+ cameraField.SetToolTipValue((mat.cameralight));
	5052	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	5053	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	5054	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	5055	+ shadowField.SetToolTipValue((mat.shadow));
	5056	+ if (!Equal(textureField.getFloat(), mat.texture))
	5057	+ textureField.SetToolTipValue((mat.texture));
	5058	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	5059	+ opacityField.SetToolTipValue((mat.opacity));
	5060	+ //if (!Equal(parallaxField.getFloat(), mat.parallax))
	5061	+ parallaxField.SetToolTipValue((mat.parallax));
	5062	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	5063	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	5064	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	5065	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
3780	5066	}
3781	5067
3782	5068	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -3807,9 +5093,28 @@
3807	5093	//copy.Touch();
3808	5094	}
3809	5095
	5096	+ cNumberSlider versionSlider;
	5097	+
3810	5098	public void stateChanged(ChangeEvent e)
3811	5099	{
3812		- // assert(false);
	5100	+ // assert(false);
	5101	+ if (e.getSource() == versionSlider)
	5102	+ {
	5103	+ if (muteSlider)
	5104	+ return;
	5105	+
	5106	+ Replace();
	5107	+
	5108	+ int version = versionSlider.getInteger();
	5109	+
	5110	+ if (version != -1 && copy.versionlist[version] != null)
	5111	+ {
	5112	+ copy.versionindex = version;
	5113	+ CopyChanged();
	5114	+ }
	5115	+
	5116	+ return;
	5117	+ }
3813	5118
3814	5119	if (freezematerial)
3815	5120	{
..	..	@@ -3845,6 +5150,12 @@
3845	5150	{
3846	5151	//System.out.println("stateChanged = " + this);
3847	5152	materialtouched = true;
	5153	+
	5154	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	5155	+ {
	5156	+ saturationField.setFloat(1);
	5157	+ }
	5158	+
3848	5159	applySelf();
3849	5160	//System.out.println("this = " + this);
3850	5161	//System.out.println("PARENT = " + parent);
..	..	@@ -4144,6 +5455,7 @@
4144	5455	{
4145	5456	if (GetTree() != null)
4146	5457	{
	5458	+ GetTree().revalidate();
4147	5459	GetTree().repaint();
4148	5460	}
4149	5461
..	..	@@ -4152,13 +5464,19 @@
4152	5464	ctrlPanel.validate(); // ? new
4153	5465	ctrlPanel.repaint();
4154	5466	}
	5467	+
	5468	+ if (previousVersionButton != null && copy.versionlist != null)
	5469	+ SetVersionStates();
	5470	+
	5471	+ cameraView.requestFocusInWindow();
4155	5472	}
4156	5473
4157	5474	static TweenManager tweenManager = new TweenManager();
4158	5475
4159	5476	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4160	5477	{
4161		- Save();
	5478	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5479	+ Save();
4162	5480	//Tween.set(thing, 0).target(1).start(tweenManager);
4163	5481	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
4164	5482	// if (thing instanceof GenericJointDemo)
..	..	@@ -4182,7 +5500,7 @@
4182	5500	// group = (Composite) group.get(0);
4183	5501	// }
4184	5502
4185		- System.out.println("makeSomething of " + thing);
	5503	+ //System.out.println("makeSomething of " + thing);
4186	5504
4187	5505	/*
4188	5506	if (deselect && jList != null)
..	..	@@ -4245,6 +5563,12 @@
4245	5563	{
4246	5564	ResetModel();
4247	5565	Select(thing.GetTreePath(), true, false); // unselect... false);
	5566	+
	5567	+ if (thing.Size() == 0)
	5568	+ {
	5569	+ //EditSelection(false);
	5570	+ }
	5571	+
4248	5572	refreshContents();
4249	5573	}
4250	5574
..	..	@@ -4393,7 +5717,9 @@
4393	5717	readobj.ResetDisplayList();
4394	5718	} catch (Exception e)
4395	5719	{
4396		- //e.printStackTrace();
	5720	+ if (!e.toString().contains("GZIP"))
	5721	+ e.printStackTrace();
	5722	+
4397	5723	try
4398	5724	{
4399	5725	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4467,11 +5793,14 @@
4467	5793
4468	5794	if (readobj != null)
4469	5795	{
4470		- Save();
	5796	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5797	+ // Save();
4471	5798	try
4472	5799	{
4473	5800	//readobj.deepCopySelf(copy);
4474	5801	copy.clear(); // june 2014
	5802	+ copy.skyboxname = readobj.skyboxname;
	5803	+ copy.skyboxext = readobj.skyboxext;
4475	5804	for (int i = 0; i < readobj.size(); i++)
4476	5805	{
4477	5806	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4512,6 +5841,7 @@
4512	5841	}
4513	5842	} catch (ClassCastException e)
4514	5843	{
	5844	+ e.printStackTrace();
4515	5845	assert (false);
4516	5846	Composite c = (Composite) copy;
4517	5847	c.children.clear();
..	..	@@ -4522,17 +5852,32 @@
4522	5852	c.addChild(csg);
4523	5853	}
4524	5854
	5855	+ copy.versionlist = readobj.versionlist;
	5856	+ copy.versionindex = readobj.versionindex;
	5857	+ copy.versiontable = readobj.versiontable;
	5858	+
	5859	+ if (copy.versionlist == null)
	5860	+ {
	5861	+ // Backward compatibility
	5862	+ copy.versionlist = new Object3D[100];
	5863	+ copy.versionindex = -1;
	5864	+
	5865	+ //Save(true);
	5866	+ }
	5867	+
	5868	+ //? SetUndoStates();
	5869	+
4525	5870	ResetModel();
4526	5871	copy.HardTouch(); // recompile?
4527	5872	refreshContents();
4528	5873	}
4529	5874	}
4530	5875
4531		- void load() // throws ClassNotFoundException
	5876	+ void Open() // throws ClassNotFoundException
4532	5877	{
4533	5878	if (Grafreed.standAlone)
4534	5879	{
4535		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5880	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4536	5881	browser.show();
4537	5882	String filename = browser.getFile();
4538	5883	if (filename != null && filename.length() > 0)
..	..	@@ -4609,6 +5954,8 @@
4609	5954
4610	5955	void save()
4611	5956	{
	5957	+ Replace();
	5958	+
4612	5959	if (lastname == null)
4613	5960	{
4614	5961	return;
..	..	@@ -4631,6 +5978,7 @@
4631	5978	//ps.print(buffer.toString());
4632	5979	} catch (IOException e)
4633	5980	{
	5981	+ e.printStackTrace();
4634	5982	}
4635	5983	}
4636	5984
..	..	@@ -4645,6 +5993,8 @@
4645	5993	String filename = browser.getFile();
4646	5994	if (filename != null && filename.length() > 0)
4647	5995	{
	5996	+ if (!filename.endsWith(".gfd"))
	5997	+ filename += ".gfd";
4648	5998	lastname = browser.getDirectory() + filename;
4649	5999	save();
4650	6000	}
..	..	@@ -4811,7 +6161,7 @@
4811	6161	MenuBar menuBar;
4812	6162	Menu fileMenu;
4813	6163	MenuItem newItem;
4814		- MenuItem loadItem;
	6164	+ MenuItem openItem;
4815	6165	MenuItem saveItem;
4816	6166	MenuItem saveAsItem;
4817	6167	MenuItem exportAsItem;
..	..	@@ -4834,22 +6184,38 @@
4834	6184	CheckboxMenuItem toggleSwitchItem;
4835	6185	CheckboxMenuItem toggleRootItem;
4836	6186	CheckboxMenuItem animationItem;
	6187	+ MenuItem archiveItem;
4837	6188	CheckboxMenuItem toggleHandleItem;
4838	6189	CheckboxMenuItem togglePaintItem;
4839	6190	JSplitPane mainPanel;
4840	6191	JScrollPane scrollpane;
	6192	+
4841	6193	JPanel toolbarPanel;
	6194	+
4842	6195	cGridBag treePanel;
	6196	+
4843	6197	JPanel radioPanel;
4844	6198	ButtonGroup buttonGroup;
4845		- cGridBag ctrlPanel;
	6199	+
	6200	+ cGridBag toolboxPanel;
	6201	+ cGridBag skyboxPanel;
4846	6202	cGridBag materialPanel;
	6203	+ cGridBag ctrlPanel;
	6204	+
4847	6205	JScrollPane infoPanel;
	6206	+
4848	6207	cGridBag optionsPanel;
	6208	+
4849	6209	JTabbedPane objectPanel;
	6210	+ boolean materialFlushed;
	6211	+ Object3D latestObject;
	6212	+
	6213	+ cGridBag transformPanel;
4850	6214	cGridBag XYZPanel;
	6215	+
4851	6216	JSplitPane gridPanel;
4852	6217	JSplitPane bigPanel;
	6218	+
4853	6219	cGridBag bigThree;
4854	6220	cGridBag scenePanel;
4855	6221	cGridBag centralPanel;
..	..	@@ -4907,7 +6273,7 @@
4907	6273	JLabel colorLabel;
4908	6274	cNumberSlider colorField;
4909	6275	JLabel modulationLabel;
4910		- cNumberSlider modulationField;
	6276	+ cNumberSlider saturationField;
4911	6277	JLabel metalnessLabel;
4912	6278	cNumberSlider metalnessField;
4913	6279	JLabel diffuseLabel;
..	..	@@ -4938,6 +6304,7 @@
4938	6304	cNumberSlider anisoField;
4939	6305	JLabel anisoVLabel;
4940	6306	cNumberSlider anisoVField;
	6307	+
4941	6308	JLabel cameraLabel;
4942	6309	cNumberSlider cameraField;
4943	6310	JLabel selfshadowLabel;
..	..	@@ -4948,10 +6315,13 @@
4948	6315	cNumberSlider textureField;
4949	6316	JLabel opacityLabel;
4950	6317	cNumberSlider opacityField;
	6318	+ JLabel parallaxLabel;
	6319	+ cNumberSlider parallaxField;
4951	6320	JLabel fakedepthLabel;
4952	6321	cNumberSlider fakedepthField;
4953	6322	JLabel shadowbiasLabel;
4954	6323	cNumberSlider shadowbiasField;
	6324	+
4955	6325	JLabel bumpLabel;
4956	6326	cNumberSlider bumpField;
4957	6327	JLabel noiseLabel;
..	..	@@ -4964,7 +6334,7 @@
4964	6334	cNumberSlider fogField;
4965	6335	JLabel opacityPowerLabel;
4966	6336	cNumberSlider opacityPowerField;
4967		- JTree jTree;
	6337	+ cTree jTree;
4968	6338	//ObjectUI parent;
4969	6339
4970	6340	cNumberSlider normalpushField;