~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -15,6 +15,9 @@
15	15	//import javax.swing.plaf.ColorUIResource;
16	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
17	17
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
	20	+
18	21	//import javax.media.opengl.GLCanvas;
19	22
20	23	import //weka.core.
..	..	@@ -31,6 +34,7 @@
31	34	iSendInfo
32	35	//KeyListener
33	36	{
	37	+ public cToggleButton pinButton;
34	38	boolean timeline;
35	39	boolean wasFullScreen;
36	40
..	..	@@ -38,64 +42,143 @@
38	42	JFrame frame;
39	43
40	44	static ObjEditor theFrame;
	45	+
	46	+ public void AllocProjectedVertices(Object3D object)
	47	+ {
	48	+ assert (object.projectedVertices != null);
	49	+
	50	+ if (object.projectedVertices.length <= 2)
	51	+ {
	52	+ // Side effect...
	53	+ Object3D.cVector2[] keep = object.projectedVertices;
	54	+ object.projectedVertices = new Object3D.cVector2[3];
	55	+ for (int i = 0; i < 3; i++)
	56	+ {
	57	+ if (i < keep.length)
	58	+ {
	59	+ object.projectedVertices[i] = keep[i];
	60	+ } else
	61	+ {
	62	+ object.projectedVertices[i] = new Object3D.cVector2();
	63	+ }
	64	+ /*
	65	+ if(keep.length == 0)
	66	+ object.projectedVertices[0] = new Object3D.cVector2();
	67	+ else
	68	+ object.projectedVertices[0] = keep[0];
	69	+ object.projectedVertices[1] = new Object3D.cVector2();
	70	+ */
	71	+ }
	72	+ }
	73	+ }
	74	+
	75	+ public Composite CreateCameras()
	76	+ {
	77	+ Composite cams = new cTemplate();
	78	+ cams.name = "Cameras";
	79	+ copy.insertElementAt(cams, 0);
	80	+
	81	+ cams.addChild(new Camera());
	82	+ cams.addChild(new Camera(1));
	83	+ cams.addChild(new Camera(2));
	84	+ cams.addChild(new Camera(3));
	85	+ cams.addChild(new Camera(4));
	86	+
	87	+ return cams;
	88	+ }
	89	+
	90	+ public cGridBag GetSeparator()
	91	+ {
	92	+ cGridBag separator = new cGridBag();
	93	+ separator.add(new JSeparator());
	94	+ separator.preferredHeight = 5;
	95	+ return separator;
	96	+ }
41	97
42	98	cButton GetButton(String name, boolean border)
43	99	{
44		- try
45		- {
46		- ImageIcon icon = GetIcon(name);
	100	+ ImageIcon icon = GetIcon(name);
	101	+ if (icon != null \|\| name.contains("/"))
47	102	return new cButton(icon, border);
48		- }
49		- catch (Exception e)
50		- {
	103	+ else
51	104	return new cButton(name, border);
52		- }
	105	+ }
	106	+
	107	+ cLabel GetLabel(String name, boolean border)
	108	+ {
	109	+ //ImageIcon icon = GetIcon(name);
	110	+ return new cLabel(GetImage(name), border);
53	111	}
54	112
55	113	cToggleButton GetToggleButton(String name, boolean border)
56	114	{
57		- try
58		- {
59		- ImageIcon icon = GetIcon(name);
60		- return new cToggleButton(icon, border);
61		- }
62		- catch (Exception e)
63		- {
64		- return new cToggleButton(name, border);
65		- }
	115	+ ImageIcon icon = GetIcon(name);
	116	+ return new cToggleButton(icon, border);
66	117	}
67	118
68	119	cCheckBox GetCheckBox(String name, boolean border)
69	120	{
	121	+ ImageIcon icon = GetIcon(name);
	122	+ return new cCheckBox(icon, border);
	123	+ }
	124	+
	125	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	126	+
	127	+ static ImageIcon GetIcon(String name)
	128	+ {
	129	+ javax.swing.ImageIcon iconCache = icons.get(name);
	130	+ if (iconCache != null)
	131	+ {
	132	+ return iconCache;
	133	+ }
	134	+
70	135	try
71	136	{
72		- ImageIcon icon = GetIcon(name);
73		- return new cCheckBox(icon, border);
	137	+ BufferedImage image;
	138	+
	139	+ if (name.endsWith("jpg"))
	140	+ // Much faster!
	141	+ image = new sun.awt.image.codec.JPEGImageDecoderImpl(ObjEditor.class.getClassLoader().getResourceAsStream(name)).decodeAsBufferedImage();
	142	+ else
	143	+ image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
	144	+
	145	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	146	+// {
	147	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	148	+// Graphics2D g = resized.createGraphics();
	149	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	150	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	151	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	152	+// g.dispose();
	153	+//
	154	+// image = resized;
	155	+// }
	156	+
	157	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	158	+
	159	+ icons.put(name, icon);
	160	+
	161	+ return icon;
74	162	}
75	163	catch (Exception e)
76	164	{
77		- return new cCheckBox(name, border);
	165	+ //icons.put(name, null);
	166	+ return null;
78	167	}
79	168	}
80		-
81		- private ImageIcon GetIcon(String name) throws IOException
	169	+
	170	+ BufferedImage GetImage(String name)
82	171	{
83		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
84		-
85		- if (image.getWidth() != 24 && image.getHeight() != 24)
	172	+ try
86	173	{
87		- BufferedImage resized = new BufferedImage(24, 24, image.getType());
88		- Graphics2D g = resized.createGraphics();
89		- g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
90		- //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
91		- g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
92		- g.dispose();
93		-
94		- image = resized;
	174	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	175	+
	176	+ return image;
95	177	}
96		-
97		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
98		- return icon;
	178	+ catch (Exception e)
	179	+ {
	180	+ return null;
	181	+ }
99	182	}
100	183
101	184	// SCRIPT
..	..	@@ -233,6 +316,8 @@
233	316	objEditor.ctrlPanel.remove(setupPanel2);
234	317	objEditor.ctrlPanel.remove(objectCommandsPanel);
235	318	objEditor.ctrlPanel.remove(pushPanel);
	319	+ if (versionPanel != null)
	320	+ objEditor.ctrlPanel.remove(versionPanel);
236	321	//objEditor.ctrlPanel.remove(fillPanel);
237	322
238	323	//Remove(normalpushField);
..	..	@@ -279,6 +364,14 @@
279	364	client = inClient;
280	365	copy = client;
281	366
	367	+// if (copy.versionlist == null)
	368	+// {
	369	+// copy.versionlist = new Object3D[100];
	370	+// copy.versionindex = -1;
	371	+//
	372	+// callee.Save(true);
	373	+// }
	374	+
282	375	// "this" is not called: SetupUI2(objEditor);
283	376	}
284	377
..	..	@@ -306,14 +399,15 @@
306	399	//localCopy.parent = null;
307	400
308	401	frame = new JFrame();
309		- frame.setUndecorated(true);
	402	+ frame.setUndecorated(false);
310	403	objEditor = this;
311	404	this.callee = callee;
312	405
313	406	//parent = p;
314	407
315	408	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
316		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	409	+ if (Globals.DEBUG)
	410	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
317	411	//gd.setFullScreenWindow(this);
318	412	//setResizable(false);
319	413	//if (!isDisplayable())
..	..	@@ -324,6 +418,14 @@
324	418	copy = localCopy;
325	419	copy.editWindow = this;
326	420
	421	+// if (copy.versionlist == null)
	422	+// {
	423	+// copy.versionlist = new Object3D[100];
	424	+// copy.versionindex = -1;
	425	+//
	426	+// Save(true);
	427	+// }
	428	+
327	429	SetupMenu();
328	430
329	431	//SetupName(objEditor); // new
..	..	@@ -342,12 +444,15 @@
342	444
343	445	static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
344	446
	447	+ // This is to refresh the UI of the material panel.
	448	+ boolean patchMaterial;
	449	+
345	450	void SetupMenu()
346	451	{
347	452	frame.setMenuBar(menuBar = new MenuBar());
348	453	menuBar.add(fileMenu = new Menu("File"));
349	454	fileMenu.add(newItem = new MenuItem("New"));
350		- fileMenu.add(loadItem = new MenuItem("Open..."));
	455	+ fileMenu.add(openItem = new MenuItem("Open..."));
351	456
352	457	//oe.menuBar.add(menu = new Menu("Include"));
353	458	Menu menu = new Menu("Import");
..	..	@@ -355,8 +460,11 @@
355	460	importOBJItem.addActionListener(this);
356	461	import3DSItem = menu.add(new MenuItem("3DS file..."));
357	462	import3DSItem.addActionListener(this);
	463	+ if (Globals.ADVANCED)
	464	+ {
358	465	importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
359	466	importVRMLX3DItem.addActionListener(this);
	467	+ }
360	468	menu.add("-");
361	469	importGFDItem = menu.add(new MenuItem("Grafreed file..."));
362	470	importGFDItem.addActionListener(this);
..	..	@@ -379,7 +487,7 @@
379	487	}
380	488
381	489	newItem.addActionListener(this);
382		- loadItem.addActionListener(this);
	490	+ openItem.addActionListener(this);
383	491	saveItem.addActionListener(this);
384	492	saveAsItem.addActionListener(this);
385	493	exportAsItem.addActionListener(this);
..	..	@@ -391,6 +499,8 @@
391	499
392	500	ChangeListener changeListener = new ChangeListener()
393	501	{
	502	+ //String name;
	503	+
394	504	public void stateChanged(ChangeEvent changeEvent)
395	505	{
396	506	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -409,18 +519,49 @@
409	519	// EditSelection(false);
410	520	// }
411	521
412		- refreshContents(false); // To refresh Info tab
	522	+// if (objectPanel.getSelectedIndex() == 4)
	523	+// {
	524	+// name = copy.skyboxname;
	525	+//
	526	+// if (name == null)
	527	+// {
	528	+// name = "";
	529	+// }
	530	+//
	531	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	532	+// copy.skyboxext = "jpg";
	533	+// }
	534	+// else
	535	+// {
	536	+// if (name != null)
	537	+// {
	538	+// if (name.equals(""))
	539	+// {
	540	+// copy.skyboxname = null;
	541	+// copy.skyboxext = null;
	542	+// }
	543	+// else
	544	+// {
	545	+// copy.skyboxname = name;
	546	+// }
	547	+// }
	548	+// }
	549	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	550	+
	551	+// refreshContents(false); // To refresh Info tab
	552	+ cameraView.repaint();
413	553	}
414	554	};
415	555	objectPanel.addChangeListener(changeListener);
416	556
417	557	toolbarPanel = new JPanel();
418	558	toolbarPanel.setName("Toolbar");
	559	+
419	560	treePanel = new cGridBag();
420	561	treePanel.setName("Tree");
421	562
422	563	editPanel = new cGridBag().setVertical(true);
423		- editPanel.setName("Edit");
	564	+ //editPanel.setName("Edit");
424	565
425	566	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
426	567
..	..	@@ -428,11 +569,13 @@
428	569	editPanel.add(editCommandsPanel);
429	570	editPanel.add(ctrlPanel);
430	571
431		- toolboxPanel = new cGridBag().setVertical(false);
432		- toolboxPanel.setName("Toolbox");
	572	+ toolboxPanel = new cGridBag().setVertical(true);
	573	+ //toolboxPanel.setName("Toolbox");
433	574
434		- materialPanel = new cGridBag().setVertical(true);
435		- materialPanel.setName("Material");
	575	+ skyboxPanel = new cGridBag().setVertical(true);
	576	+
	577	+ materialPanel = new cGridBag().setVertical(false);
	578	+ //materialPanel.setName("Material");
436	579
437	580	/JTextPane/
438	581	infoarea = createTextPane();
..	..	@@ -440,14 +583,15 @@
440	583
441	584	infoarea.setEditable(true);
442	585	SetText();
	586	+
443	587	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
444	588	// infoarea.setOpaque(false);
445	589	// //infoarea.setForeground(textcolor);
446	590	// TEXTAREA infoarea.setLineWrap(true);
447	591	// TEXTAREA infoarea.setWrapStyleWord(true);
448	592	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
449		- infoPanel.setPreferredSize(new Dimension(50, 200));
450		- infoPanel.setName("Info");
	593	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	594	+ //infoPanel.setName("Info");
451	595	//infoPanel.setLayout(new BorderLayout());
452	596	//infoPanel.add(createTextPane());
453	597
..	..	@@ -458,7 +602,14 @@
458	602	mainPanel.setDividerSize(9);
459	603	mainPanel.setDividerLocation(0.5); //1.0);
460	604	mainPanel.setResizeWeight(0.5);
461		-
	605	+
	606	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	607	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	608	+ divider.setDividerSize(15);
	609	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	610	+
	611	+ mainPanel.setUI(new BasicSplitPaneUI());
	612	+
462	613	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
463	614	//mainPanel.setLayout(new GridBagLayout());
464	615	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -689,8 +840,8 @@
689	840	}
690	841	}
691	842
692		-static GraphicsDevice device = GraphicsEnvironment
693		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	843	+//static GraphicsDevice device = GraphicsEnvironment
	844	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
694	845
695	846	Rectangle keeprect;
696	847	cRadio radio;
..	..	@@ -707,14 +858,24 @@
707	858	boolean maximized;
708	859
709	860	cButton fullscreenLayout;
	861	+ cButton expandedLayout;
710	862
711	863	void Minimize()
712	864	{
713	865	frame.setState(Frame.ICONIFIED);
	866	+ frame.validate();
714	867	}
715	868
	869	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	870	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	871	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
716	872	void Maximize()
717	873	{
	874	+ if (CameraPane.FULLSCREEN)
	875	+ {
	876	+ ToggleFullScreen();
	877	+ }
	878	+
718	879	if (maximized)
719	880	{
720	881	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -722,22 +883,38 @@
722	883	else
723	884	{
724	885	keeprect = frame.getBounds();
725		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
726		- Dimension rect2 = frame.getToolkit().getScreenSize();
727		- frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	886	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	887	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	888	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
728	889	// frame.setState(Frame.MAXIMIZED_BOTH);
	890	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
729	891	}
730	892
731	893	maximized ^= true;
	894	+
	895	+ frame.validate();
732	896	}
	897	+
	898	+ cButton minButton;
	899	+ cButton maxButton;
	900	+ cButton fullButton;
	901	+ cButton collapseButton;
	902	+ cButton maximize3DButton;
733	903
734	904	void ToggleFullScreen()
735	905	{
	906	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	907	+
736	908	cameraView.ToggleFullScreen();
737	909
738	910	if (!CameraPane.FULLSCREEN)
739	911	{
740	912	device.setFullScreenWindow(null);
	913	+ frame.dispose();
	914	+ frame.setUndecorated(false);
	915	+ frame.validate();
	916	+ frame.setVisible(true);
	917	+
741	918	//frame.setVisible(false);
742	919	// frame.removeNotify();
743	920	// frame.setUndecorated(false);
..	..	@@ -747,13 +924,13 @@
747	924	// X frame.getContentPane().remove(/"Center",/bigThree);
748	925	// X framePanel.add(bigThree);
749	926	// X frame.getContentPane().add(/"Center",/framePanel);
750		- framePanel.setDividerLocation(1);
	927	+// framePanel.setDividerLocation(46); // icons are 24x24
751	928
752	929	//frame.setVisible(true);
753		- radio.layout = keepButton;
	930	+// radio.layout = keepButton;
754	931	//theFrame = null;
755	932	keepButton = null;
756		- radio.layout.doClick();
	933	+// radio.layout.doClick();
757	934
758	935	} else
759	936	{
..	..	@@ -762,20 +939,70 @@
762	939	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
763	940	// frame.getToolkit().getScreenSize().height);
764	941	//frame.setVisible(false);
	942	+
	943	+ frame.dispose();
	944	+ frame.setUndecorated(true);
765	945	device.setFullScreenWindow(frame);
	946	+ frame.validate();
	947	+ frame.setVisible(true);
766	948	// frame.removeNotify();
767	949	// frame.setUndecorated(true);
768	950	// frame.addNotify();
769	951	// X frame.getContentPane().remove(/"Center",/framePanel);
770	952	// X framePanel.remove(bigThree);
771	953	// X frame.getContentPane().add(/"Center",/bigThree);
772		- framePanel.setDividerLocation(0);
	954	+// framePanel.setDividerLocation(0);
773	955
774		- radio.layout = fullscreenLayout;
775		- radio.layout.doClick();
	956	+// radio.layout = fullscreenLayout;
	957	+// radio.layout.doClick();
776	958	//frame.setVisible(true);
777	959	}
	960	+ frame.validate();
	961	+
	962	+ cameraView.requestFocusInWindow();
778	963	}
	964	+
	965	+ void CollapseToolbar()
	966	+ {
	967	+ framePanel.setDividerLocation(0);
	968	+ //frame.validate();
	969	+
	970	+ cameraView.requestFocusInWindow();
	971	+ }
	972	+
	973	+ private Object3D Duplicate(Object3D object)
	974	+ {
	975	+ boolean temp = CameraPane.SWITCH;
	976	+ CameraPane.SWITCH = false;
	977	+
	978	+ if (Grafreed.grafreed.universe.versiontable == null)
	979	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	980	+
	981	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	982	+ // if (copy == client)
	983	+
	984	+ Object3D versions[] = object.versionlist;
	985	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	986	+ object.versionlist = null;
	987	+ object.versiontable = null;
	988	+
	989	+ Object3D parent = object.parent;
	990	+ object.parent = null;
	991	+
	992	+ //byte[] compress = Compress(copy);
	993	+ Object3D compress = (Object3D)Grafreed.clone(object);
	994	+
	995	+ object.parent = parent;
	996	+
	997	+ object.versionlist = versions;
	998	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	999	+
	1000	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	1001	+
	1002	+ CameraPane.SWITCH = temp;
	1003	+
	1004	+ return compress;
	1005	+ }
779	1006
780	1007	private JTextPane createTextPane()
781	1008	{
..	..	@@ -898,6 +1125,7 @@
898	1125	{
899	1126	SetupMaterial(materialPanel);
900	1127	}
	1128	+
901	1129	//SetupName();
902	1130	//SetupViews();
903	1131	}
..	..	@@ -907,7 +1135,7 @@
907	1135	// NumberSlider vDivsField;
908	1136	// JCheckBox endcaps;
909	1137	JCheckBox liveCB;
910		- JCheckBox selectCB;
	1138	+ JCheckBox selectableCB;
911	1139	JCheckBox hideCB;
912	1140	JCheckBox link2masterCB;
913	1141	JCheckBox markCB;
..	..	@@ -937,6 +1165,7 @@
937	1165	cGridBag setupPanel2;
938	1166	cGridBag objectCommandsPanel;
939	1167	cGridBag pushPanel;
	1168	+ cGridBag versionPanel;
940	1169	cGridBag fillPanel;
941	1170
942	1171	JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
..	..	@@ -1106,8 +1335,20 @@
1106	1335
1107	1336	namePanel = new cGridBag();
1108	1337
	1338	+ //if (copy.pinned)
	1339	+ {
	1340	+ pinButton = GetToggleButton("icons/pin.png", !Globals.NIMBUSLAF);
	1341	+ pinButton.setSelected(copy.pinned);
	1342	+ cGridBag t = new cGridBag();
	1343	+ t.preferredWidth = 2;
	1344	+ t.add(pinButton);
	1345	+ namePanel.add(t);
	1346	+
	1347	+ pinButton.addItemListener(this);
	1348	+ }
	1349	+
1109	1350	nameField = AddText(namePanel, copy.GetName());
1110		- namePanel.add(nameField);
	1351	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1111	1352	oe.ctrlPanel.add(namePanel);
1112	1353
1113	1354	oe.ctrlPanel.Return();
..	..	@@ -1119,26 +1360,30 @@
1119	1360
1120	1361	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1121	1362	liveCB.setToolTipText("Animate object");
1122		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1123		- selectCB.setToolTipText("Make object selectable");
	1363	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1364	+ markCB.setToolTipText("Set target transform");
	1365	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1366	+ selectableCB.setToolTipText("Make object selectable");
1124	1367	// Return();
	1368	+
1125	1369	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1126	1370	hideCB.setToolTipText("Hide object");
1127		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1128		- markCB.setToolTipText("Set the animation target transform");
	1371	+
	1372	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1129	1373
1130	1374	setupPanel2 = new cGridBag().setVertical(false);
1131	1375
1132	1376	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1133	1377	rewindCB.setToolTipText("Rewind animation");
1134	1378
1135		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1136		- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1379	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1380	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1137	1381
	1382	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1383	+ link2masterCB.setToolTipText("Attach to support");
	1384	+
1138	1385	if (Globals.ADVANCED)
1139	1386	{
1140		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1141		- link2masterCB.setToolTipText("Attach to support");
1142	1387	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1143	1388	speedupCB.setToolTipText("Option motion capture");
1144	1389	}
..	..	@@ -1167,9 +1412,14 @@
1167	1412	oe.ctrlPanel.add(objectCommandsPanel);
1168	1413	oe.ctrlPanel.Return();
1169	1414
1170		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1415	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH * 100, 1.1); // To have the buttons
1171	1416	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1172		- //Return();
	1417	+ if (false && copy.versionlist != null && copy.versionindex != -1)
	1418	+ {
	1419	+ oe.ctrlPanel.Return();
	1420	+ versionPanel = AddSlider(oe.ctrlPanel, "Version", 0, copy.VersionCount() - 1, copy.versionindex);
	1421	+ versionField = (cNumberSlider)versionPanel.getComponent(1);
	1422	+ }
1173	1423
1174	1424	oe.ctrlPanel.Return();
1175	1425
..	..	@@ -1324,22 +1574,9 @@
1324	1574
1325	1575	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1326	1576	{
1327		- System.out.println("CREATE CAMERAS");
1328		- cams = new cTemplate();
1329		- cams.name = "Cameras";
1330		- copy.insertElementAt(cams, 0);
1331		- //cams.parent = copy;
1332		-
1333		- cam = new Camera(); // LA.newVector(3, 2, 1));
1334		- cams.addChild(cam);
1335		- cam = new Camera(1);
1336		- cams.addChild(cam);
1337		- cam = new Camera(2);
1338		- cams.addChild(cam);
1339		- cam = new Camera(3);
1340		- cams.addChild(cam);
1341		- cam = new Camera(4); // Light
1342		- cams.addChild(cam);
	1577	+ if (Globals.DEBUG)
	1578	+ System.out.println("CREATE CAMERAS");
	1579	+ cams = CreateCameras();
1343	1580	} else
1344	1581	{
1345	1582	cams = (cGroup) copy.get(0);
..	..	@@ -1405,6 +1642,45 @@
1405	1642	//frontView.object = copy;
1406	1643	//sideView.object = copy;
1407	1644
	1645	+ transformPanel = new cGridBag().setVertical(true);
	1646	+
	1647	+ cGridBag resetTransformPanel = new cGridBag();
	1648	+
	1649	+ resetTransformPanel.preferredHeight = 2;
	1650	+
	1651	+ cButton resetTransform = GetButton("Reset all", !Globals.NIMBUSLAF);
	1652	+ resetTransform.setToolTipText("Reset Translation, Rotation and Scale");
	1653	+ resetTransform.addMouseListener(new MouseAdapter()
	1654	+ {
	1655	+ public void mouseClicked(MouseEvent e)
	1656	+ {
	1657	+ ResetTransform();
	1658	+ }
	1659	+ });
	1660	+ resetTransformPanel.add(resetTransform);
	1661	+
	1662	+ resetTransform = GetButton("T only", !Globals.NIMBUSLAF);
	1663	+ resetTransform.setToolTipText("Reset Translation only");
	1664	+ resetTransform.addMouseListener(new MouseAdapter()
	1665	+ {
	1666	+ public void mouseClicked(MouseEvent e)
	1667	+ {
	1668	+ ResetTransform(1);
	1669	+ }
	1670	+ });
	1671	+ resetTransformPanel.add(resetTransform);
	1672	+
	1673	+ resetTransform = GetButton("RS only", !Globals.NIMBUSLAF);
	1674	+ resetTransform.setToolTipText("Reset Rotation and Scale only");
	1675	+ resetTransform.addMouseListener(new MouseAdapter()
	1676	+ {
	1677	+ public void mouseClicked(MouseEvent e)
	1678	+ {
	1679	+ ResetTransform(2);
	1680	+ }
	1681	+ });
	1682	+ resetTransformPanel.add(resetTransform);
	1683	+
1408	1684	XYZPanel = new cGridBag().setVertical(true);
1409	1685	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1410	1686
..	..	@@ -1412,7 +1688,11 @@
1412	1688	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1413	1689	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1414	1690	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1691	+ //XYZPanel.setName("XYZ");
1415	1692
	1693	+ transformPanel.add(resetTransformPanel);
	1694	+ transformPanel.add(XYZPanel);
	1695	+
1416	1696	/*
1417	1697	gridPanel = new JPanel(); //new BorderLayout());
1418	1698	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1420,12 +1700,12 @@
1420	1700	gridPanel.add(cameraView);
1421	1701	gridPanel.add(XYZPanel);
1422	1702	*/
1423		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1424		- gridPanel.setContinuousLayout(true);
1425		- gridPanel.setOneTouchExpandable(true);
1426		- gridPanel.setDividerLocation(1.0);
1427		- gridPanel.setDividerSize(9);
1428		- gridPanel.setResizeWeight(0.85);
	1703	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1704	+// gridPanel.setContinuousLayout(true);
	1705	+// gridPanel.setOneTouchExpandable(true);
	1706	+// gridPanel.setDividerLocation(1.0);
	1707	+// gridPanel.setDividerSize(9);
	1708	+// gridPanel.setResizeWeight(0.85);
1429	1709
1430	1710	// aConstraints.weighty = 0;
1431	1711	//System.out.println("THIS = " + this);
..	..	@@ -1448,15 +1728,34 @@
1448	1728
1449	1729	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1450	1730	//tmp.setName("Edit");
	1731	+ objectPanel.add(skyboxPanel);
	1732	+ objectPanel.setIconAt(0, GetIcon("icons/skybox.jpg"));
	1733	+ objectPanel.setToolTipTextAt(0, "Backgrounds");
	1734	+
	1735	+ objectPanel.add(toolboxPanel);
	1736	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1737	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1738	+
1451	1739	objectPanel.add(materialPanel);
	1740	+ objectPanel.setIconAt(2, GetIcon("icons/material.png"));
	1741	+ objectPanel.setToolTipTextAt(2, "Material");
	1742	+
1452	1743	// JPanel north = new JPanel(new BorderLayout());
1453	1744	// north.setName("Edit");
1454	1745	// north.add(ctrlPanel, BorderLayout.NORTH);
1455	1746	// objectPanel.add(north);
1456	1747	objectPanel.add(editPanel);
1457		- objectPanel.add(infoPanel);
1458		- objectPanel.add(toolboxPanel);
1459		-
	1748	+ objectPanel.setIconAt(3, GetIcon("icons/writewhite.png"));
	1749	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1750	+
	1751	+ objectPanel.add(transformPanel);
	1752	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1753	+ objectPanel.setToolTipTextAt(4, "TRS transform");
	1754	+
	1755	+ patchMaterial = true;
	1756	+ cameraView.patchMaterial = this;
	1757	+ objectPanel.setSelectedIndex(2);
	1758	+
1460	1759	/*
1461	1760	aConstraints.gridx = 0;
1462	1761	aConstraints.gridwidth = 1;
..	..	@@ -1476,7 +1775,7 @@
1476	1775	scrollpane.addMouseWheelListener(this); // Default not fast enough
1477	1776
1478	1777	/JTabbedPane/ scenePanel = new cGridBag();
1479		- scenePanel.preferredWidth = 6;
	1778	+ scenePanel.preferredWidth = 5;
1480	1779
1481	1780	JTabbedPane tabbedPane = new JTabbedPane();
1482	1781	tabbedPane.add(scrollpane);
..	..	@@ -1487,11 +1786,108 @@
1487	1786
1488	1787	AddOptions(optionsPanel); //, aConstraints);
1489	1788
1490		- tabbedPane.add(optionsPanel);
1491		-
1492	1789	tabbedPane.add(FSPane = new cFileSystemPane(this));
1493	1790
	1791	+ tabbedPane.add(optionsPanel);
	1792	+
1494	1793	scenePanel.add(tabbedPane);
	1794	+
	1795	+ cGridBag creditsPanel = new cGridBag().setVertical(true);
	1796	+ creditsPanel.setName("Credits");
	1797	+
	1798	+ cLabel ogaLabel = new cLabel(" Skyboxes courtesy of OpenGameArt!", !Globals.NIMBUSLAF);
	1799	+ creditsPanel.add(ogaLabel);
	1800	+
	1801	+ cButton creditButton;
	1802	+ creditsPanel.add(creditButton = GetButton("icons/sara-logo.png", !Globals.NIMBUSLAF));
	1803	+ creditButton.setToolTipText("https://opengameart.org");
	1804	+
	1805	+ creditButton.addMouseListener(new MouseAdapter()
	1806	+ {
	1807	+ public void mouseClicked(MouseEvent e)
	1808	+ {
	1809	+ try
	1810	+ {
	1811	+ Desktop.getDesktop().browse(new java.net.URI("https://opengameart.org/"));
	1812	+ } catch (Exception e1)
	1813	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1814	+ {
	1815	+ e1.printStackTrace();
	1816	+ }
	1817	+ }
	1818	+ });
	1819	+
	1820	+ ogaLabel = new cLabel(" Download 3D models! (.3ds and .obj only)", !Globals.NIMBUSLAF);
	1821	+ creditsPanel.add(ogaLabel);
	1822	+
	1823	+ creditsPanel.add(creditButton = GetButton("icons/3delicious.png", !Globals.NIMBUSLAF));
	1824	+ creditButton.setToolTipText("https://3delicious.net");
	1825	+
	1826	+ creditButton.addMouseListener(new MouseAdapter()
	1827	+ {
	1828	+ public void mouseClicked(MouseEvent e)
	1829	+ {
	1830	+ try
	1831	+ {
	1832	+ Desktop.getDesktop().browse(new java.net.URI("https://3delicious.net"));
	1833	+ } catch (Exception e1)
	1834	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1835	+ {
	1836	+ e1.printStackTrace();
	1837	+ }
	1838	+ }
	1839	+ });
	1840	+
	1841	+ creditsPanel.add(creditButton = GetButton("icons/archive3d.png", !Globals.NIMBUSLAF));
	1842	+ creditButton.setToolTipText("https://archive3d.net");
	1843	+
	1844	+ creditButton.addMouseListener(new MouseAdapter()
	1845	+ {
	1846	+ public void mouseClicked(MouseEvent e)
	1847	+ {
	1848	+ try
	1849	+ {
	1850	+ Desktop.getDesktop().browse(new java.net.URI("https://archive3d.net"));
	1851	+ } catch (Exception e1)
	1852	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1853	+ {
	1854	+ e1.printStackTrace();
	1855	+ }
	1856	+ }
	1857	+ });
	1858	+
	1859	+ creditsPanel.add(creditButton = GetButton("icons/turbosquid.png", !Globals.NIMBUSLAF));
	1860	+ creditButton.setToolTipText("https://turbosquid.com");
	1861	+
	1862	+ creditButton.addMouseListener(new MouseAdapter()
	1863	+ {
	1864	+ public void mouseClicked(MouseEvent e)
	1865	+ {
	1866	+ try
	1867	+ {
	1868	+ Desktop.getDesktop().browse(new java.net.URI("https://www.turbosquid.com/Search/3D-Models/free"));
	1869	+ } catch (Exception e1)
	1870	+// } catch (java.io.IOException \| java.net.URISyntaxException e1)
	1871	+ {
	1872	+ e1.printStackTrace();
	1873	+ }
	1874	+ }
	1875	+ });
	1876	+
	1877	+ for (int i=6; --i>=0;)
	1878	+ {
	1879	+ creditsPanel.add(new cGridBag());
	1880	+ }
	1881	+
	1882	+ tabbedPane.add(creditsPanel);
	1883	+ tabbedPane.setToolTipTextAt(3, "Credits");
	1884	+
	1885	+ if (Globals.ADVANCED)
	1886	+ {
	1887	+ objectPanel.add(infoPanel);
	1888	+ objectPanel.setIconAt(5, GetIcon("icons/info.png"));
	1889	+ objectPanel.setToolTipTextAt(4, "Information");
	1890	+ }
1495	1891
1496	1892	/*
1497	1893	cTree jTree = new cTree(null);
..	..	@@ -1513,13 +1909,13 @@
1513	1909	jtp.add(tree);
1514	1910	*/
1515	1911
1516		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1517		- bigPanel.setContinuousLayout(true);
1518		- bigPanel.setOneTouchExpandable(true);
1519		- bigPanel.setDividerLocation(0.8);
1520		- bigPanel.setDividerSize(15);
1521		- bigPanel.setResizeWeight(0.15);
1522		- bigPanel.setName("Scene");
	1912	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1913	+// bigPanel.setContinuousLayout(true);
	1914	+// bigPanel.setOneTouchExpandable(true);
	1915	+// bigPanel.setDividerLocation(0.8);
	1916	+// bigPanel.setDividerSize(15);
	1917	+// bigPanel.setResizeWeight(0.15);
	1918	+// bigPanel.setName("Scene");
1523	1919
1524	1920	//bigPanel.setLayout(new BorderLayout());
1525	1921	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1554,7 +1950,7 @@
1554	1950	bigThree = new cGridBag();
1555	1951	bigThree.addComponent(scenePanel);
1556	1952	bigThree.addComponent(centralPanel);
1557		- bigThree.addComponent(XYZPanel);
	1953	+ //bigThree.addComponent(XYZPanel);
1558	1954
1559	1955	// // SIDE EFFECT!!!
1560	1956	// aConstraints.gridx = 0;
..	..	@@ -1563,16 +1959,33 @@
1563	1959	// aConstraints.gridheight = 1;
1564	1960
1565	1961	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1566		- framePanel.setContinuousLayout(true);
1567		- framePanel.setOneTouchExpandable(true);
1568		- framePanel.setDividerLocation(0.8);
	1962	+
	1963	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1964	+ new java.beans.PropertyChangeListener()
	1965	+ {
	1966	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1967	+ {
	1968	+ if ((Integer)pce.getOldValue() == 1)
	1969	+ {
	1970	+ if (radio.layout != expandedLayout)
	1971	+ {
	1972	+ radio.layout = expandedLayout;
	1973	+ radio.layout.doClick();
	1974	+ }
	1975	+ }
	1976	+ }
	1977	+ });
	1978	+
	1979	+ framePanel.setContinuousLayout(false);
	1980	+ framePanel.setOneTouchExpandable(false);
	1981	+ //.setDividerLocation(0.8);
1569	1982	//framePanel.setDividerSize(15);
1570	1983	//framePanel.setResizeWeight(0.15);
1571	1984	framePanel.setName("Frame");
1572	1985
1573	1986	frame.getContentPane().setLayout(new BorderLayout());
1574	1987	/**/
1575		- JTabbedPane worldPane = new JTabbedPane();
	1988	+ //JTabbedPane worldPane = new JTabbedPane();
1576	1989	//worldPane.add(bigPanel);
1577	1990	//worldPane.add(worldPanel);
1578	1991	/**/
..	..	@@ -1584,17 +1997,17 @@
1584	1997
1585	1998	frame.setSize(1280, 860);
1586	1999
1587		- frame.validate();
1588		- frame.setVisible(true);
1589		-
1590	2000	cameraView.requestFocusInWindow();
1591	2001
1592		- gridPanel.setDividerLocation(1.0);
	2002	+// gridPanel.setDividerLocation(1.0);
	2003	+
	2004	+ frame.validate();
	2005	+
	2006	+ frame.setVisible(true);
1593	2007
1594	2008	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1595	2009	frame.addWindowListener(new WindowAdapter()
1596	2010	{
1597		-
1598	2011	public void windowClosing(WindowEvent e)
1599	2012	{
1600	2013	Close();
..	..	@@ -1617,28 +2030,484 @@
1617	2030	ctrlPanel.removeAll();
1618	2031	}
1619	2032
1620		- void SetupMaterial(cGridBag panel)
	2033	+ void SetupMaterial(cGridBag materialpanel)
1621	2034	{
1622		- /*
	2035	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	2036	+
	2037	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Globals.NIMBUSLAF);
	2038	+ skin.setToolTipText("Skin");
	2039	+ skin.addMouseListener(new MouseAdapter()
	2040	+ {
	2041	+ public void mouseClicked(MouseEvent e)
	2042	+ {
	2043	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	2044	+ cMaterial material = object.material;
	2045	+
	2046	+ // Skin
	2047	+ colorField.setFloat(material.color);
	2048	+ float saturation = material.modulation;
	2049	+
	2050	+ if (!cameraView.Skinshader)
	2051	+ {
	2052	+ saturation /= 1.5;
	2053	+ }
	2054	+
	2055	+ saturationField.setFloat(saturation);
	2056	+
	2057	+ subsurfaceField.setFloat(material.subsurface);
	2058	+ selfshadowField.setFloat(material.diffuseness);
	2059	+ diffusenessField.setFloat(material.factor);
	2060	+ shininessField.setFloat(material.shininess);
	2061	+ shadowbiasField.setFloat(material.shadowbias);
	2062	+ diffuseField.setFloat(material.diffuse);
	2063	+ specularField.setFloat(material.specular);
	2064	+
	2065	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2066	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2067	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2068	+
	2069	+ materialtouched = true;
	2070	+ applySelf();
	2071	+ }
	2072	+ });
	2073	+ presetpanel.add(skin);
	2074	+
	2075	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Globals.NIMBUSLAF);
	2076	+ lambert.setToolTipText("Diffuse");
	2077	+ lambert.addMouseListener(new MouseAdapter()
	2078	+ {
	2079	+ public void mouseClicked(MouseEvent e)
	2080	+ {
	2081	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	2082	+ cMaterial material = object.material;
	2083	+
	2084	+ diffusenessField.setFloat(material.factor);
	2085	+ selfshadowField.setFloat(material.diffuseness);
	2086	+
	2087	+ materialtouched = true;
	2088	+ applySelf();
	2089	+ }
	2090	+ });
	2091	+ presetpanel.add(lambert);
	2092	+
	2093	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Globals.NIMBUSLAF);
	2094	+ diffuse2.setToolTipText("Diffuse2");
	2095	+ diffuse2.addMouseListener(new MouseAdapter()
	2096	+ {
	2097	+ public void mouseClicked(MouseEvent e)
	2098	+ {
	2099	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	2100	+ cMaterial material = object.material;
	2101	+
	2102	+ diffusenessField.setFloat(material.factor);
	2103	+ selfshadowField.setFloat(material.diffuseness);
	2104	+
	2105	+ materialtouched = true;
	2106	+ applySelf();
	2107	+ }
	2108	+ });
	2109	+ presetpanel.add(diffuse2);
	2110	+
	2111	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Globals.NIMBUSLAF);
	2112	+ diffusemoon.setToolTipText("Moon");
	2113	+ diffusemoon.addMouseListener(new MouseAdapter()
	2114	+ {
	2115	+ public void mouseClicked(MouseEvent e)
	2116	+ {
	2117	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	2118	+ cMaterial material = object.material;
	2119	+
	2120	+ diffusenessField.setFloat(material.factor);
	2121	+ selfshadowField.setFloat(material.diffuseness);
	2122	+
	2123	+ materialtouched = true;
	2124	+ applySelf();
	2125	+ }
	2126	+ });
	2127	+ presetpanel.add(diffusemoon);
	2128	+
	2129	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Globals.NIMBUSLAF);
	2130	+ diffusemoon2.setToolTipText("Moon2");
	2131	+ diffusemoon2.addMouseListener(new MouseAdapter()
	2132	+ {
	2133	+ public void mouseClicked(MouseEvent e)
	2134	+ {
	2135	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	2136	+ cMaterial material = object.material;
	2137	+
	2138	+ diffusenessField.setFloat(material.factor);
	2139	+ selfshadowField.setFloat(material.diffuseness);
	2140	+
	2141	+ materialtouched = true;
	2142	+ applySelf();
	2143	+ }
	2144	+ });
	2145	+ presetpanel.add(diffusemoon2);
	2146	+
	2147	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Globals.NIMBUSLAF);
	2148	+ diffusemoon3.setToolTipText("Moon3");
	2149	+ diffusemoon3.addMouseListener(new MouseAdapter()
	2150	+ {
	2151	+ public void mouseClicked(MouseEvent e)
	2152	+ {
	2153	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	2154	+ cMaterial material = object.material;
	2155	+
	2156	+ diffusenessField.setFloat(material.factor);
	2157	+ selfshadowField.setFloat(material.diffuseness);
	2158	+
	2159	+ materialtouched = true;
	2160	+ applySelf();
	2161	+ }
	2162	+ });
	2163	+ presetpanel.add(diffusemoon3);
	2164	+
	2165	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Globals.NIMBUSLAF);
	2166	+ diffusesheen.setToolTipText("Sheen");
	2167	+ diffusesheen.addMouseListener(new MouseAdapter()
	2168	+ {
	2169	+ public void mouseClicked(MouseEvent e)
	2170	+ {
	2171	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2172	+ cMaterial material = object.material;
	2173	+
	2174	+ sheenField.setFloat(material.sheen);
	2175	+
	2176	+ materialtouched = true;
	2177	+ applySelf();
	2178	+ }
	2179	+ });
	2180	+ presetpanel.add(diffusesheen);
	2181	+
	2182	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Globals.NIMBUSLAF);
	2183	+ rough.setToolTipText("Rough metal");
	2184	+ rough.addMouseListener(new MouseAdapter()
	2185	+ {
	2186	+ public void mouseClicked(MouseEvent e)
	2187	+ {
	2188	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2189	+ cMaterial material = object.material;
	2190	+
	2191	+ shininessField.setFloat(material.shininess);
	2192	+ velvetField.setFloat(material.velvet);
	2193	+
	2194	+ materialtouched = true;
	2195	+ applySelf();
	2196	+ }
	2197	+ });
	2198	+ presetpanel.add(rough);
	2199	+
	2200	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Globals.NIMBUSLAF);
	2201	+ rough2.setToolTipText("Medium metal");
	2202	+ rough2.addMouseListener(new MouseAdapter()
	2203	+ {
	2204	+ public void mouseClicked(MouseEvent e)
	2205	+ {
	2206	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2207	+ cMaterial material = object.material;
	2208	+
	2209	+ shininessField.setFloat(material.shininess);
	2210	+ lightareaField.setFloat(material.lightarea);
	2211	+
	2212	+ materialtouched = true;
	2213	+ applySelf();
	2214	+ }
	2215	+ });
	2216	+ presetpanel.add(rough2);
	2217	+
	2218	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Globals.NIMBUSLAF);
	2219	+ shini0.setToolTipText("Shiny");
	2220	+ shini0.addMouseListener(new MouseAdapter()
	2221	+ {
	2222	+ public void mouseClicked(MouseEvent e)
	2223	+ {
	2224	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2225	+ cMaterial material = object.material;
	2226	+
	2227	+ shininessField.setFloat(material.shininess);
	2228	+ lightareaField.setFloat(material.lightarea);
	2229	+
	2230	+ materialtouched = true;
	2231	+ applySelf();
	2232	+ }
	2233	+ });
	2234	+ presetpanel.add(shini0);
	2235	+
	2236	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Globals.NIMBUSLAF);
	2237	+ shini1.setToolTipText("Shiny2");
	2238	+ shini1.addMouseListener(new MouseAdapter()
	2239	+ {
	2240	+ public void mouseClicked(MouseEvent e)
	2241	+ {
	2242	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2243	+ cMaterial material = object.material;
	2244	+
	2245	+ shininessField.setFloat(material.shininess);
	2246	+ lightareaField.setFloat(material.lightarea);
	2247	+
	2248	+ materialtouched = true;
	2249	+ applySelf();
	2250	+ }
	2251	+ });
	2252	+ presetpanel.add(shini1);
	2253	+
	2254	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Globals.NIMBUSLAF);
	2255	+ shini2.setToolTipText("Shiny3");
	2256	+ shini2.addMouseListener(new MouseAdapter()
	2257	+ {
	2258	+ public void mouseClicked(MouseEvent e)
	2259	+ {
	2260	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2261	+ cMaterial material = object.material;
	2262	+
	2263	+ shininessField.setFloat(material.shininess);
	2264	+ lightareaField.setFloat(material.lightarea);
	2265	+
	2266	+ materialtouched = true;
	2267	+ applySelf();
	2268	+ }
	2269	+ });
	2270	+ presetpanel.add(shini2);
	2271	+
	2272	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Globals.NIMBUSLAF);
	2273	+ aniso.setToolTipText("AnisoU");
	2274	+ aniso.addMouseListener(new MouseAdapter()
	2275	+ {
	2276	+ public void mouseClicked(MouseEvent e)
	2277	+ {
	2278	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2279	+ cMaterial material = object.material;
	2280	+
	2281	+ anisoField.setFloat(material.aniso);
	2282	+ anisoVField.setFloat(material.anisoV);
	2283	+
	2284	+ materialtouched = true;
	2285	+ applySelf();
	2286	+ }
	2287	+ });
	2288	+ presetpanel.add(aniso);
	2289	+
	2290	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Globals.NIMBUSLAF);
	2291	+ aniso2.setToolTipText("AnisoV");
	2292	+ aniso2.addMouseListener(new MouseAdapter()
	2293	+ {
	2294	+ public void mouseClicked(MouseEvent e)
	2295	+ {
	2296	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2297	+ cMaterial material = object.material;
	2298	+
	2299	+ anisoField.setFloat(material.aniso);
	2300	+ anisoVField.setFloat(material.anisoV);
	2301	+
	2302	+ materialtouched = true;
	2303	+ applySelf();
	2304	+ }
	2305	+ });
	2306	+ presetpanel.add(aniso2);
	2307	+
	2308	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Globals.NIMBUSLAF);
	2309	+ aniso3.setToolTipText("AnisoUV");
	2310	+ aniso3.addMouseListener(new MouseAdapter()
	2311	+ {
	2312	+ public void mouseClicked(MouseEvent e)
	2313	+ {
	2314	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2315	+ cMaterial material = object.material;
	2316	+
	2317	+ anisoField.setFloat(material.aniso);
	2318	+ anisoVField.setFloat(material.anisoV);
	2319	+
	2320	+ materialtouched = true;
	2321	+ applySelf();
	2322	+ }
	2323	+ });
	2324	+ presetpanel.add(aniso3);
	2325	+
	2326	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Globals.NIMBUSLAF);
	2327	+ velvet0.setToolTipText("Velvet");
	2328	+ velvet0.addMouseListener(new MouseAdapter()
	2329	+ {
	2330	+ public void mouseClicked(MouseEvent e)
	2331	+ {
	2332	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2333	+ cMaterial material = object.material;
	2334	+
	2335	+ diffusenessField.setFloat(material.factor);
	2336	+ selfshadowField.setFloat(material.diffuseness);
	2337	+ sheenField.setFloat(material.sheen);
	2338	+ shininessField.setFloat(material.shininess);
	2339	+ velvetField.setFloat(material.velvet);
	2340	+ shiftField.setFloat(material.shift);
	2341	+
	2342	+ materialtouched = true;
	2343	+ applySelf();
	2344	+ }
	2345	+ });
	2346	+ presetpanel.add(velvet0);
	2347	+
	2348	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Globals.NIMBUSLAF);
	2349	+ bump0.setToolTipText("Bump texture");
	2350	+ bump0.addMouseListener(new MouseAdapter()
	2351	+ {
	2352	+ public void mouseClicked(MouseEvent e)
	2353	+ {
	2354	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2355	+ cMaterial material = object.material;
	2356	+
	2357	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2358	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2359	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2360	+
	2361	+ materialtouched = true;
	2362	+ applySelf();
	2363	+ }
	2364	+ });
	2365	+ presetpanel.add(bump0);
	2366	+
	2367	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Globals.NIMBUSLAF);
	2368	+ borderShader.setToolTipText("Border fade");
	2369	+ borderShader.addMouseListener(new MouseAdapter()
	2370	+ {
	2371	+ public void mouseClicked(MouseEvent e)
	2372	+ {
	2373	+ borderfadeField.setFloat(0.4);
	2374	+ opacityField.setFloat(0.75);
	2375	+
	2376	+ materialtouched = true;
	2377	+ applySelf();
	2378	+ }
	2379	+ });
	2380	+ presetpanel.add(borderShader);
	2381	+
	2382	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Globals.NIMBUSLAF);
	2383	+ halo.setToolTipText("Halo");
	2384	+ halo.addMouseListener(new MouseAdapter()
	2385	+ {
	2386	+ public void mouseClicked(MouseEvent e)
	2387	+ {
	2388	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2389	+ cMaterial material = object.material;
	2390	+
	2391	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2392	+
	2393	+ materialtouched = true;
	2394	+ applySelf();
	2395	+ }
	2396	+ });
	2397	+ presetpanel.add(halo);
	2398	+
	2399	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Globals.NIMBUSLAF);
	2400	+ candle.setToolTipText("Candle");
	2401	+ candle.addMouseListener(new MouseAdapter()
	2402	+ {
	2403	+ public void mouseClicked(MouseEvent e)
	2404	+ {
	2405	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2406	+ cMaterial material = object.material;
	2407	+
	2408	+ subsurfaceField.setFloat(material.subsurface);
	2409	+ shadowbiasField.setFloat(material.shadowbias);
	2410	+ ambientField.setFloat(material.ambient);
	2411	+ specularField.setFloat(material.specular);
	2412	+ lightareaField.setFloat(material.lightarea);
	2413	+ shininessField.setFloat(material.shininess);
	2414	+
	2415	+ materialtouched = true;
	2416	+ applySelf();
	2417	+ }
	2418	+ });
	2419	+ presetpanel.add(candle);
	2420	+
	2421	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Globals.NIMBUSLAF);
	2422	+ shadowShader.setToolTipText("Shadow");
	2423	+ shadowShader.addMouseListener(new MouseAdapter()
	2424	+ {
	2425	+ public void mouseClicked(MouseEvent e)
	2426	+ {
	2427	+ diffuseField.setFloat(0.001);
	2428	+ ambientField.setFloat(0.001);
	2429	+ cameraField.setFloat(0.001);
	2430	+ specularField.setFloat(0.001);
	2431	+ fakedepthField.setFloat(0.001);
	2432	+ opacityField.setFloat(0.4);
	2433	+
	2434	+ materialtouched = true;
	2435	+ applySelf();
	2436	+ }
	2437	+ });
	2438	+ presetpanel.add(shadowShader);
	2439	+
	2440	+ cLabel para0 = GetLabel("icons/shadericons/parallax0.png", !Globals.NIMBUSLAF);
	2441	+ para0.setToolTipText("No parallax");
	2442	+ para0.addMouseListener(new MouseAdapter()
	2443	+ {
	2444	+ public void mouseClicked(MouseEvent e)
	2445	+ {
	2446	+ parallaxField.setFloat(0.125);
	2447	+
	2448	+ materialtouched = true;
	2449	+ applySelf();
	2450	+ }
	2451	+ });
	2452	+ presetpanel.add(para0);
	2453	+
	2454	+ cLabel para1 = GetLabel("icons/shadericons/parallax1.png", !Globals.NIMBUSLAF);
	2455	+ para1.setToolTipText("With parallax");
	2456	+ para1.addMouseListener(new MouseAdapter()
	2457	+ {
	2458	+ public void mouseClicked(MouseEvent e)
	2459	+ {
	2460	+ parallaxField.setFloat(0.13);
	2461	+
	2462	+ materialtouched = true;
	2463	+ applySelf();
	2464	+ }
	2465	+ });
	2466	+ presetpanel.add(para1);
	2467	+
	2468	+ cLabel para2 = GetLabel("icons/shadericons/parallax2.png", !Globals.NIMBUSLAF);
	2469	+ para2.setToolTipText("Reset parallax");
	2470	+ para2.addMouseListener(new MouseAdapter()
	2471	+ {
	2472	+ public void mouseClicked(MouseEvent e)
	2473	+ {
	2474	+ parallaxField.setFloat(0.14);
	2475	+
	2476	+ materialtouched = true;
	2477	+ applySelf();
	2478	+ }
	2479	+ });
	2480	+ presetpanel.add(para2);
	2481	+
	2482	+ cGridBag panel = new cGridBag().setVertical(true);
	2483	+
	2484	+ presetpanel.preferredWidth = 1;
	2485	+
	2486	+ materialpanel.add(presetpanel);
	2487	+ materialpanel.add(panel);
	2488	+
	2489	+ panel.preferredWidth = 8;
	2490	+
	2491	+ /*
1623	2492	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1624	2493	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1625		- */
	2494	+ */
1626	2495
1627	2496	cGridBag editBar = new cGridBag().setVertical(false);
1628	2497
1629		- editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2498	+ editBar.add(createMaterialButton = new cButton("Create", !Globals.NIMBUSLAF)); // , aConstraints);
1630	2499	createMaterialButton.setToolTipText("Create material");
1631	2500
1632	2501	/*
1633	2502	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1634	2503	*/
1635	2504
1636		- editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2505	+ editBar.add(clearMaterialButton = new cButton("Clear", !Globals.NIMBUSLAF)); // , aConstraints);
1637	2506	clearMaterialButton.setToolTipText("Clear material");
1638	2507
1639	2508	if (Globals.ADVANCED)
1640	2509	{
1641		- editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	2510	+ editBar.add(resetSlidersButton = new cButton("Reset", !Globals.NIMBUSLAF)); // , aConstraints);
1642	2511	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1643	2512	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1644	2513	}
..	..	@@ -1656,45 +2525,61 @@
1656	2525	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1657	2526
1658	2527	cGridBag colorSection = new cGridBag().setVertical(true);
	2528	+
	2529	+ cGridBag huepanel = new cGridBag();
	2530	+ cGridBag huelabel = new cGridBag();
	2531	+ cLabel hue = GetLabel("icons/hue.png", false);
	2532	+ hue.fit = true;
	2533	+
	2534	+ hue.addMouseListener(new MouseAdapter()
	2535	+ {
	2536	+ public void mousePressed(MouseEvent e)
	2537	+ {
	2538	+ int x = e.getX();
	2539	+
	2540	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2541	+ }
	2542	+ });
	2543	+
	2544	+ huelabel.add(hue);
	2545	+ huelabel.preferredWidth = 20;
	2546	+ huepanel.add(new cGridBag()); // Label
	2547	+ huepanel.add(huelabel); // Field/slider
	2548	+
	2549	+ huepanel.preferredHeight = 7;
	2550	+
	2551	+ colorSection.add(huepanel);
1659	2552
1660	2553	cGridBag color = new cGridBag();
1661		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1662		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1663		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2554	+
	2555	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2556	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2557	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2558	+
1664	2559	//colorField.preferredWidth = 200;
1665	2560	colorSection.add(color);
1666	2561
1667	2562	cGridBag modulation = new cGridBag();
1668	2563	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1669	2564	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1670		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2565	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1671	2566	colorSection.add(modulation);
1672	2567
	2568	+ cGridBag opacity = new cGridBag();
	2569	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2570	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2571	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2572	+ colorSection.add(opacity);
	2573	+
	2574	+ colorSection.add(GetSeparator());
	2575	+
1673	2576	cGridBag texture = new cGridBag();
1674	2577	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1675	2578	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1676	2579	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1677	2580	colorSection.add(texture);
1678	2581
1679		- cGridBag anisoU = new cGridBag();
1680		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1681		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1682		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1683		- colorSection.add(anisoU);
1684		-
1685		- cGridBag anisoV = new cGridBag();
1686		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1687		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1688		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1689		- colorSection.add(anisoV);
1690		-
1691		- cGridBag shadowbias = new cGridBag();
1692		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1693		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1694		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1695		- colorSection.add(shadowbias);
1696		-
1697		- panel.add(new JSeparator());
	2582	+ panel.add(GetSeparator());
1698	2583
1699	2584	panel.add(colorSection);
1700	2585
..	..	@@ -1744,7 +2629,13 @@
1744	2629	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1745	2630	diffuseSection.add(fakedepth);
1746	2631
1747		- panel.add(new JSeparator());
	2632	+ cGridBag shadowbias = new cGridBag();
	2633	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2634	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2635	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2636	+ diffuseSection.add(shadowbias);
	2637	+
	2638	+ panel.add(GetSeparator());
1748	2639
1749	2640	panel.add(diffuseSection);
1750	2641
..	..	@@ -1794,42 +2685,54 @@
1794	2685	// aConstraints.gridy += 1;
1795	2686	// aConstraints.gridwidth = 1;
1796	2687
	2688	+ cGridBag anisoU = new cGridBag();
	2689	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2690	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2691	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2692	+ specularSection.add(anisoU);
1797	2693
1798		- panel.add(new JSeparator());
	2694	+ cGridBag anisoV = new cGridBag();
	2695	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2696	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2697	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2698	+ specularSection.add(anisoV);
	2699	+
	2700	+
	2701	+ panel.add(GetSeparator());
1799	2702
1800	2703	panel.add(specularSection);
1801	2704
1802	2705	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1803	2706
1804		- cGridBag globalSection = new cGridBag().setVertical(true);
	2707	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1805	2708
1806	2709	cGridBag camera = new cGridBag();
1807	2710	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1808	2711	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1809	2712	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1810		- globalSection.add(camera);
	2713	+ colorSection.add(camera);
1811	2714
1812	2715	cGridBag ambient = new cGridBag();
1813	2716	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1814	2717	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1815	2718	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1816		- globalSection.add(ambient);
	2719	+ colorSection.add(ambient);
1817	2720
1818	2721	cGridBag backlit = new cGridBag();
1819	2722	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1820	2723	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1821	2724	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1822		- globalSection.add(backlit);
	2725	+ colorSection.add(backlit);
1823	2726
1824		- cGridBag opacity = new cGridBag();
1825		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1826		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1827		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1828		- globalSection.add(opacity);
1829		-
1830		- panel.add(new JSeparator());
	2727	+ cGridBag parallax = new cGridBag();
	2728	+ parallax.add(parallaxLabel = new JLabel("Parallax")); // , aConstraints);
	2729	+ parallaxLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2730	+ parallax.add(parallaxField = new cNumberSlider(this, 0.001, 0.25, -0.125)); // , aConstraints);
	2731	+ colorSection.add(parallax);
1831	2732
1832		- panel.add(globalSection);
	2733	+ //panel.add(new JSeparator());
	2734	+
	2735	+ //panel.add(globalSection);
1833	2736
1834	2737	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1835	2738
..	..	@@ -1871,7 +2774,7 @@
1871	2774	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1872	2775	textureSection.add(opacityPower);
1873	2776
1874		- panel.add(new JSeparator());
	2777	+ panel.add(GetSeparator());
1875	2778
1876	2779	panel.add(textureSection);
1877	2780
..	..	@@ -1936,8 +2839,9 @@
1936	2839	// 3D models
1937	2840	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1938	2841	{
1939		- lastConverter = new com.jmex.model.converters.MaxToJme();
1940		- LoadFile(filename, lastConverter);
	2842	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2843	+ //LoadFile(filename, lastConverter);
	2844	+ LoadObjFile(filename); // New 3ds loader
1941	2845	continue;
1942	2846	}
1943	2847	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2663,6 +3567,7 @@
2663	3567	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2664	3568	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2665	3569	}
	3570	+
2666	3571	//cJME.count++;
2667	3572	//cJME.count %= 12;
2668	3573	if (gc)
..	..	@@ -2846,6 +3751,7 @@
2846	3751	}
2847	3752	}
2848	3753	}
	3754	+
2849	3755	cFileSystemPane FSPane;
2850	3756
2851	3757	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2855,7 +3761,7 @@
2855	3761
2856	3762	freezematerial = true;
2857	3763	colorField.setFloat(mat.color);
2858		- modulationField.setFloat(mat.modulation);
	3764	+ saturationField.setFloat(mat.modulation);
2859	3765	metalnessField.setFloat(mat.metalness);
2860	3766	diffuseField.setFloat(mat.diffuse);
2861	3767	specularField.setFloat(mat.specular);
..	..	@@ -2875,6 +3781,7 @@
2875	3781	shadowField.setFloat(mat.shadow);
2876	3782	textureField.setFloat(mat.texture);
2877	3783	opacityField.setFloat(mat.opacity);
	3784	+ parallaxField.setFloat(mat.parallax + 0.125f);
2878	3785	fakedepthField.setFloat(mat.fakedepth);
2879	3786	shadowbiasField.setFloat(mat.shadowbias);
2880	3787	bumpField.setInteger(1); // dec 2013
..	..	@@ -2899,6 +3806,7 @@
2899	3806	}
2900	3807	}
2901	3808	}
	3809	+
2902	3810	freezematerial = false;
2903	3811	}
2904	3812
..	..	@@ -2916,32 +3824,8 @@
2916	3824
2917	3825	if (multiplyToggle != null)
2918	3826	multiplyToggle.setSelected(mat.multiply);
2919		-
2920		- assert (object.projectedVertices != null);
2921		-
2922		- if (object.projectedVertices.length <= 2)
2923		- {
2924		- // Side effect...
2925		- Object3D.cVector2[] keep = object.projectedVertices;
2926		- object.projectedVertices = new Object3D.cVector2[3];
2927		- for (int i = 0; i < 3; i++)
2928		- {
2929		- if (i < keep.length)
2930		- {
2931		- object.projectedVertices[i] = keep[i];
2932		- } else
2933		- {
2934		- object.projectedVertices[i] = new Object3D.cVector2();
2935		- }
2936		- /*
2937		- if(keep.length == 0)
2938		- object.projectedVertices[0] = new Object3D.cVector2();
2939		- else
2940		- object.projectedVertices[0] = keep[0];
2941		- object.projectedVertices[1] = new Object3D.cVector2();
2942		- */
2943		- }
2944		- }
	3827	+
	3828	+ AllocProjectedVertices(object);
2945	3829
2946	3830	SetMaterial(mat, object.projectedVertices);
2947	3831	}
..	..	@@ -3017,12 +3901,17 @@
3017	3901	// }
3018	3902
3019	3903	/**/
3020		- if (deselect)
	3904	+ if (deselect \|\| child == null)
3021	3905	{
3022	3906	//group.deselectAll();
3023	3907	//freeze = true;
3024	3908	GetTree().clearSelection();
3025	3909	//freeze = false;
	3910	+
	3911	+ if (child == null)
	3912	+ {
	3913	+ return;
	3914	+ }
3026	3915	}
3027	3916
3028	3917	//group.addSelectee(child);
..	..	@@ -3056,6 +3945,17 @@
3056	3945	public void itemStateChanged(ItemEvent event)
3057	3946	{
3058	3947	// System.out.println("Propagate = " + propagate);
	3948	+ if (event.getSource() == pinButton)
	3949	+ {
	3950	+ copy.pinned ^= true;
	3951	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3952	+ {
	3953	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3954	+ copy.CloseUI();
	3955	+ //copy.editWindow.refreshContents();
	3956	+ }
	3957	+ }
	3958	+ else
3059	3959	if (event.getSource() == propagateToggle)
3060	3960	{
3061	3961	propagate ^= true;
..	..	@@ -3160,8 +4060,9 @@
3160	4060	} else if (event.getSource() == liveCB)
3161	4061	{
3162	4062	copy.live ^= true;
	4063	+ objEditor.refreshContents(true); // To show item colors
3163	4064	return;
3164		- } else if (event.getSource() == selectCB)
	4065	+ } else if (event.getSource() == selectableCB)
3165	4066	{
3166	4067	copy.dontselect ^= true;
3167	4068	return;
..	..	@@ -3169,11 +4070,12 @@
3169	4070	{
3170	4071	copy.hide ^= true;
3171	4072	copy.Touch(); // display list issue
3172		- objEditor.refreshContents();
	4073	+ objEditor.refreshContents(true); // To show item colors
3173	4074	return;
3174	4075	} else if (event.getSource() == link2masterCB)
3175	4076	{
3176	4077	copy.link2master ^= true;
	4078	+ objEditor.refreshContents();
3177	4079	return;
3178	4080	}
3179	4081	if (event.getSource() == randomCB)
..	..	@@ -3234,7 +4136,7 @@
3234	4136	//System.out.println("ObjEditor " + event);
3235	4137	applySelf0(true);
3236	4138	//parent.applySelf();
3237		- objEditor.refreshContents();
	4139	+ // conflicts with requestFocus objEditor.refreshContents();
3238	4140	} else if (source == resetButton)
3239	4141	{
3240	4142	CameraPane.fullreset = true;
..	..	@@ -3346,9 +4248,9 @@
3346	4248	{
3347	4249	Close();
3348	4250	//return true;
3349		- } else if (source == loadItem)
	4251	+ } else if (source == openItem)
3350	4252	{
3351		- load();
	4253	+ Open();
3352	4254	//return true;
3353	4255	} else if (source == newItem)
3354	4256	{
..	..	@@ -3373,6 +4275,10 @@
3373	4275	{
3374	4276	generatePOV();
3375	4277	//return true;
	4278	+ } else if (event.getSource() == archiveItem)
	4279	+ {
	4280	+ cTools.Archive(frame);
	4281	+ return;
3376	4282	} else if (source == zBufferItem)
3377	4283	{
3378	4284	try
..	..	@@ -3410,22 +4316,30 @@
3410	4316
3411	4317	void New()
3412	4318	{
3413		- while (copy.Size() > 1)
	4319	+ while (copy.Size() > 0)
3414	4320	{
3415		- copy.remove(1);
	4321	+ copy.remove(0);
3416	4322	}
3417	4323
	4324	+ copy.selection.clear();
	4325	+
	4326	+ if (copy == Grafreed.grafreed.universe)
	4327	+ {
	4328	+ CreateCameras();
	4329	+ cameraView.SetCamera(GetCamera(copy, 0));
	4330	+ }
3418	4331	ResetModel();
3419	4332	objEditor.refreshContents();
3420	4333	}
3421	4334
3422	4335	static public byte[] Compress(Object3D o)
3423	4336	{
	4337	+ // Slower to actually compress.
3424	4338	try
3425	4339	{
3426	4340	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3427		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3428		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	4341	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4342	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3429	4343
3430	4344	Object3D parent = o.parent;
3431	4345	o.parent = null;
..	..	@@ -3436,10 +4350,14 @@
3436	4350
3437	4351	out.flush();
3438	4352
3439		- zstream.close();
	4353	+ baos //zstream
	4354	+ .close();
3440	4355	out.close();
3441	4356
3442		- return baos.toByteArray();
	4357	+ byte[] bytes = baos.toByteArray();
	4358	+
	4359	+ System.out.println("save #bytes = " + bytes.length);
	4360	+ return bytes;
3443	4361	} catch (Exception e)
3444	4362	{
3445	4363	System.err.println(e);
..	..	@@ -3449,13 +4367,16 @@
3449	4367
3450	4368	static public Object Uncompress(byte[] bytes)
3451	4369	{
3452		- System.out.println("#bytes = " + bytes.length);
	4370	+ System.out.println("restore #bytes = " + bytes.length);
3453	4371	try
3454	4372	{
3455	4373	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3456		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3457		- ObjectInputStream in = new ObjectInputStream(istream);
	4374	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4375	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3458	4376	Object obj = in.readObject();
	4377	+
	4378	+ bais //istream
	4379	+ .close();
3459	4380	in.close();
3460	4381
3461	4382	return obj;
..	..	@@ -3510,41 +4431,101 @@
3510	4431	return null;
3511	4432	}
3512	4433
3513		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3514	4434
3515	4435	public void Save()
3516	4436	{
	4437	+ //Save(true);
	4438	+ Replace();
	4439	+ SetVersionStates();
	4440	+ }
	4441	+
	4442	+ private boolean Equal(byte[] compress, byte[] name)
	4443	+ {
	4444	+ if (compress.length != name.length)
	4445	+ {
	4446	+ return false;
	4447	+ }
	4448	+
	4449	+ for (int i=compress.length; --i>=0;)
	4450	+ {
	4451	+ if (compress[i] != name[i])
	4452	+ return false;
	4453	+ }
	4454	+
	4455	+ return true;
	4456	+ }
	4457	+
	4458	+ void DeleteVersion()
	4459	+ {
	4460	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4461	+ {
	4462	+ copy.versionlist[i] = copy.versionlist[i+1];
	4463	+ }
	4464	+
	4465	+ if (copy.versionlist[copy.versionindex] == null)
	4466	+ copy.versionindex -= 1;
	4467	+
	4468	+ if (copy.versionindex != -1)
	4469	+ CopyChanged(copy);
	4470	+
	4471	+ SetVersionStates();
	4472	+ }
	4473	+
	4474	+ public boolean Save(boolean user)
	4475	+ {
3517	4476	System.err.println("Save");
	4477	+ Replace();
3518	4478
3519		- cRadio tab = GetCurrentTab();
	4479	+ if (copy.versionlist == null)
	4480	+ {
	4481	+ copy.versionlist = new Object3D[100];
	4482	+ copy.versionindex = -1;
	4483	+ }
3520	4484
3521		- boolean temp = CameraPane.SWITCH;
3522		- CameraPane.SWITCH = false;
	4485	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3523	4486
3524		- copy.ExtractBigData(hashtable);
	4487	+ boolean thesame = false;
	4488	+
	4489	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4490	+// {
	4491	+// thesame = true;
	4492	+// }
3525	4493
3526	4494	//EditorFrame.m_MainFrame.requestFocusInWindow();
3527		- tab.graphs[tab.undoindex++] = Compress(copy);
3528		-
3529		- copy.RestoreBigData(hashtable);
3530		-
3531		- CameraPane.SWITCH = temp;
3532		-
3533		- //assert(hashtable.isEmpty());
3534		-
3535		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	4495	+ if (!thesame)
3536	4496	{
3537		- tab.graphs[i] = null;
	4497	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4498	+ {
	4499	+ copy.versionlist[i] = copy.versionlist[i-1];
	4500	+ }
	4501	+
	4502	+ //tab.user[tab.versionindex] = user;
	4503	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4504	+
	4505	+ copy.versionlist[++copy.versionindex] = compress;
	4506	+
	4507	+ // if (increment)
	4508	+ // tab.versionindex++;
3538	4509	}
3539	4510
3540		- SetUndoStates();
	4511	+ //copy.RestoreBigData(versiontable);
	4512	+
	4513	+ //assert(hashtable.isEmpty());
	4514	+
	4515	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4516	+// {
	4517	+// //tab.user[i] = false;
	4518	+// copy.versionlist[i] = null;
	4519	+// }
	4520	+
	4521	+ SetVersionStates();
3541	4522
3542	4523	// test save
3543	4524	if (false)
3544	4525	{
3545	4526	try
3546	4527	{
3547		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	4528	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3548	4529	ObjectOutputStream p = new ObjectOutputStream(ostream);
3549	4530
3550	4531	p.writeObject(copy);
..	..	@@ -3557,40 +4538,79 @@
3557	4538	e.printStackTrace();
3558	4539	}
3559	4540	}
	4541	+
	4542	+ return !thesame;
	4543	+ }
	4544	+
	4545	+ boolean flashIt = true;
	4546	+
	4547	+ void RefreshSelection()
	4548	+ {
	4549	+ Object3D selection = new Object3D();
	4550	+
	4551	+ for (int i = 0; i < objEditor.copy.selection.size(); i++)
	4552	+ {
	4553	+ Object3D elem = objEditor.copy.selection.elementAt(i);
	4554	+
	4555	+ Object3D obj = objEditor.copy.GetObject(elem.GetUUID());
	4556	+
	4557	+ if (obj == null)
	4558	+ {
	4559	+ objEditor.copy.selection.remove(i--);
	4560	+ }
	4561	+ else
	4562	+ {
	4563	+ selection.add(obj);
	4564	+ objEditor.copy.selection.setElementAt(obj, i);
	4565	+ }
	4566	+ }
	4567	+
	4568	+ flashIt = false;
	4569	+ GetTree().clearSelection();
	4570	+ for (int i = 0; i < selection.size(); i++)
	4571	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4572	+ flashIt = true;
	4573	+
	4574	+ //refreshContents(false);
3560	4575	}
3561	4576
3562		- void CopyChanged(Object3D obj)
	4577	+ void CopyChanged(Object3D changed)
3563	4578	{
3564		- SetUndoStates();
	4579	+ Object3D obj = (Object3D)Grafreed.clone(changed.versionlist[copy.versionindex]);
3565	4580
3566	4581	boolean temp = CameraPane.SWITCH;
3567	4582	CameraPane.SWITCH = false;
3568	4583
3569		- copy.ExtractBigData(hashtable);
	4584	+ changed.ExtractBigData(Grafreed.grafreed.universe.versiontable);
3570	4585
3571		- copy.clear();
	4586	+ changed.clear();
3572	4587
	4588	+ changed.skyboxname = obj.skyboxname;
	4589	+ changed.skyboxext = obj.skyboxext;
	4590	+
3573	4591	for (int i=0; i<obj.Size(); i++)
3574	4592	{
3575		- copy.add(obj.get(i));
	4593	+ changed.add(obj.get(i));
3576	4594	}
3577	4595
3578		- copy.RestoreBigData(hashtable);
	4596	+ changed.RestoreBigData(Grafreed.grafreed.universe.versiontable);
3579	4597
3580	4598	CameraPane.SWITCH = temp;
3581	4599
	4600	+ if (objEditor == this)
	4601	+ RefreshSelection();
3582	4602	//assert(hashtable.isEmpty());
3583	4603
3584		- copy.Touch();
	4604	+ objEditor.copy.Touch();
3585	4605
3586	4606	ResetModel();
3587		- copy.HardTouch(); // recompile?
	4607	+ objEditor.copy.HardTouch(); // recompile?
3588	4608
3589	4609	cRadio ab;
3590		- for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4610	+ for (java.util.Enumeration e = objEditor.buttonGroup.getElements(); e.hasMoreElements();)
3591	4611	{
3592	4612	ab = (cRadio)e.nextElement();
3593		- Object3D test = copy.GetObject(ab.object.GetUUID());
	4613	+ Object3D test = objEditor.copy.GetObject(ab.object.GetUUID());
3594	4614	//ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
3595	4615	if (test != null)
3596	4616	{
..	..	@@ -3599,56 +4619,159 @@
3599	4619	}
3600	4620	}
3601	4621
3602		- refreshContents();
	4622	+ objEditor.refreshContents(true);
3603	4623	}
3604	4624
3605		- cButton undoButton;
3606		- cButton redoButton;
	4625	+ cButton previousVersionButton;
	4626	+ cButton restoreButton;
	4627	+ cButton replaceButton;
	4628	+ cButton nextVersionButton;
	4629	+ cButton saveVersionButton;
	4630	+ cButton deleteVersionButton;
3607	4631
3608		- void SetUndoStates()
	4632	+ boolean muteSlider;
	4633	+
	4634	+ int VersionCount()
3609	4635	{
3610		- cRadio tab = GetCurrentTab();
3611		-
3612		- undoButton.setEnabled(tab.undoindex > 0);
3613		- redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	4636	+ return copy.VersionCount();
3614	4637	}
3615	4638
3616		- public void Undo()
	4639	+ public cGridBag versionSliderPane;
	4640	+
	4641	+ void SetVersionStates()
3617	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	+
3618	4685	System.err.println("Undo");
3619	4686
3620		- cRadio tab = GetCurrentTab();
	4687	+ //cRadio tab = GetCurrentTab();
3621	4688
3622		- if (tab.undoindex == 0)
	4689	+ if (copy.versionindex == 0)
3623	4690	{
3624	4691	java.awt.Toolkit.getDefaultToolkit().beep();
3625		- return;
	4692	+ return false;
3626	4693	}
3627	4694
3628		- if (tab.graphs[tab.undoindex] == null)
3629		- {
3630		- Save();
3631		- tab.undoindex -= 1;
3632		- }
	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	+// }
3633	4707
3634		- tab.undoindex -= 1;
	4708	+ copy.versionindex -= 1;
3635	4709
3636		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4710	+ CopyChanged(copy);
	4711	+
	4712	+ SetVersionStates();
	4713	+
	4714	+ return true;
3637	4715	}
3638	4716
3639		- public void Redo()
	4717	+ public boolean Restore()
3640	4718	{
3641		- cRadio tab = GetCurrentTab();
	4719	+ System.err.println("Restore");
3642	4720
3643		- if (tab.graphs[tab.undoindex + 1] == null)
	4721	+ //cRadio tab = GetCurrentTab();
	4722	+
	4723	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4724	+ {
	4725	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4726	+ return false;
	4727	+ }
	4728	+
	4729	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4730	+ CopyChanged(copy);
	4731	+
	4732	+ SetVersionStates();
	4733	+
	4734	+ return true;
	4735	+ }
	4736	+
	4737	+ public boolean Replace()
	4738	+ {
	4739	+ //System.err.println("Replace");
	4740	+
	4741	+ //cRadio tab = GetCurrentTab();
	4742	+
	4743	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4744	+ {
	4745	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4746	+ return false;
	4747	+ }
	4748	+
	4749	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4750	+
	4751	+ return true;
	4752	+ }
	4753	+
	4754	+ public void NextVersion()
	4755	+ {
	4756	+ // Option?
	4757	+ Replace();
	4758	+
	4759	+ //cRadio tab = GetCurrentTab();
	4760	+
	4761	+ if (copy.versionlist[copy.versionindex + 1] == null)
3644	4762	{
3645	4763	java.awt.Toolkit.getDefaultToolkit().beep();
3646	4764	return;
3647	4765	}
3648	4766
3649		- tab.undoindex += 1;
	4767	+ copy.versionindex += 1;
3650	4768
3651		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4769	+ CopyChanged(copy);
	4770	+
	4771	+ //if (!tab.user[tab.versionindex])
	4772	+ // tab.graphs[tab.versionindex] = null;
	4773	+
	4774	+ SetVersionStates();
3652	4775	}
3653	4776
3654	4777	void ImportGFD()
..	..	@@ -3842,6 +4965,12 @@
3842	4965	// else
3843	4966	// applySelf(true);
3844	4967	// }
	4968	+
	4969	+ boolean Equal(double a, double b)
	4970	+ {
	4971	+ return Math.abs(a - b) < 0.001;
	4972	+ }
	4973	+
3845	4974	void applySelf0(boolean name)
3846	4975	{
3847	4976	if (name)
..	..	@@ -3859,7 +4988,7 @@
3859	4988	//copy.material = new cMaterial(copy.GetMaterial());
3860	4989
3861	4990	current.color = (float) colorField.getFloat();
3862		- current.modulation = (float) modulationField.getFloat();
	4991	+ current.modulation = (float) saturationField.getFloat();
3863	4992	current.metalness = (float) metalnessField.getFloat();
3864	4993	current.diffuse = (float) diffuseField.getFloat();
3865	4994	current.specular = (float) specularField.getFloat();
..	..	@@ -3879,6 +5008,7 @@
3879	5008	current.shadow = (float) shadowField.getFloat();
3880	5009	current.texture = (float) textureField.getFloat();
3881	5010	current.opacity = (float) opacityField.getFloat();
	5011	+ current.parallax = (float) parallaxField.getFloat() - 0.125f;
3882	5012	current.fakedepth = (float) fakedepthField.getFloat();
3883	5013	current.shadowbias = (float) shadowbiasField.getFloat();
3884	5014
..	..	@@ -3891,29 +5021,54 @@
3891	5021	{
3892	5022	cMaterial mat = copy.material;
3893	5023
3894		- colorField.SetToolTipValue((mat.color));
3895		- modulationField.SetToolTipValue((mat.modulation));
3896		- metalnessField.SetToolTipValue((mat.metalness));
3897		- diffuseField.SetToolTipValue((mat.diffuse));
3898		- specularField.SetToolTipValue((mat.specular));
3899		- shininessField.SetToolTipValue((mat.shininess));
3900		- shiftField.SetToolTipValue((mat.shift));
3901		- ambientField.SetToolTipValue((mat.ambient));
3902		- lightareaField.SetToolTipValue((mat.lightarea));
3903		- diffusenessField.SetToolTipValue((mat.factor));
3904		- velvetField.SetToolTipValue((mat.velvet));
3905		- sheenField.SetToolTipValue((mat.sheen));
3906		- subsurfaceField.SetToolTipValue((mat.subsurface));
3907		- backlitField.SetToolTipValue((mat.bump));
3908		- anisoField.SetToolTipValue((mat.aniso));
3909		- anisoVField.SetToolTipValue((mat.anisoV));
3910		- cameraField.SetToolTipValue((mat.cameralight));
3911		- selfshadowField.SetToolTipValue((mat.diffuseness));
3912		- shadowField.SetToolTipValue((mat.shadow));
3913		- textureField.SetToolTipValue((mat.texture));
3914		- opacityField.SetToolTipValue((mat.opacity));
3915		- fakedepthField.SetToolTipValue((mat.fakedepth));
3916		- shadowbiasField.SetToolTipValue((mat.shadowbias));
	5024	+ if (!Equal(colorField.getFloat(), mat.color))
	5025	+ colorField.SetToolTipValue((mat.color));
	5026	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	5027	+ saturationField.SetToolTipValue((mat.modulation));
	5028	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	5029	+ metalnessField.SetToolTipValue((mat.metalness));
	5030	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	5031	+ diffuseField.SetToolTipValue((mat.diffuse));
	5032	+ if (!Equal(specularField.getFloat(), mat.specular))
	5033	+ specularField.SetToolTipValue((mat.specular));
	5034	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	5035	+ shininessField.SetToolTipValue((mat.shininess));
	5036	+ if (!Equal(shiftField.getFloat(), mat.shift))
	5037	+ shiftField.SetToolTipValue((mat.shift));
	5038	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	5039	+ ambientField.SetToolTipValue((mat.ambient));
	5040	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	5041	+ lightareaField.SetToolTipValue((mat.lightarea));
	5042	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	5043	+ diffusenessField.SetToolTipValue((mat.factor));
	5044	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	5045	+ velvetField.SetToolTipValue((mat.velvet));
	5046	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	5047	+ sheenField.SetToolTipValue((mat.sheen));
	5048	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	5049	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	5050	+ if (!Equal(backlitField.getFloat(), mat.bump))
	5051	+ backlitField.SetToolTipValue((mat.bump));
	5052	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	5053	+ anisoField.SetToolTipValue((mat.aniso));
	5054	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	5055	+ anisoVField.SetToolTipValue((mat.anisoV));
	5056	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	5057	+ cameraField.SetToolTipValue((mat.cameralight));
	5058	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	5059	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	5060	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	5061	+ shadowField.SetToolTipValue((mat.shadow));
	5062	+ if (!Equal(textureField.getFloat(), mat.texture))
	5063	+ textureField.SetToolTipValue((mat.texture));
	5064	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	5065	+ opacityField.SetToolTipValue((mat.opacity));
	5066	+ //if (!Equal(parallaxField.getFloat(), mat.parallax))
	5067	+ parallaxField.SetToolTipValue((mat.parallax));
	5068	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	5069	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	5070	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	5071	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
3917	5072	}
3918	5073
3919	5074	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -3944,10 +5099,44 @@
3944	5099	//copy.Touch();
3945	5100	}
3946	5101
	5102	+ cNumberSlider versionSlider;
	5103	+ cNumberSlider versionField;
	5104	+
3947	5105	public void stateChanged(ChangeEvent e)
3948	5106	{
3949		- // assert(false);
	5107	+ // assert(false);
	5108	+ if (e.getSource() == versionSlider)
	5109	+ {
	5110	+ if (muteSlider)
	5111	+ return;
	5112	+
	5113	+ Replace();
	5114	+
	5115	+ int version = versionSlider.getInteger();
	5116	+
	5117	+ if (version != -1 && copy.versionlist[version] != null)
	5118	+ {
	5119	+ copy.versionindex = version;
	5120	+ CopyChanged(copy);
	5121	+ SetVersionStates();
	5122	+ }
	5123	+
	5124	+ return;
	5125	+ }
3950	5126
	5127	+ if (e.getSource() == versionField)
	5128	+ {
	5129	+ int version = versionField.getInteger();
	5130	+
	5131	+ if (version != -1 && copy.versionindex != version && copy.versionlist[version] != null)
	5132	+ {
	5133	+ copy.versionindex = version;
	5134	+ CopyChanged(copy);
	5135	+ }
	5136	+
	5137	+ return;
	5138	+ }
	5139	+
3951	5140	if (freezematerial)
3952	5141	{
3953	5142	return;
..	..	@@ -3982,6 +5171,12 @@
3982	5171	{
3983	5172	//System.out.println("stateChanged = " + this);
3984	5173	materialtouched = true;
	5174	+
	5175	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	5176	+ {
	5177	+ saturationField.setFloat(1);
	5178	+ }
	5179	+
3985	5180	applySelf();
3986	5181	//System.out.println("this = " + this);
3987	5182	//System.out.println("PARENT = " + parent);
..	..	@@ -4031,7 +5226,7 @@
4031	5226	}
4032	5227
4033	5228	if (normalpushField != null)
4034		- copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
	5229	+ copy.NORMALPUSH = (float)normalpushField.getFloat() / 100;
4035	5230	}
4036	5231
4037	5232	void SnapObject()
..	..	@@ -4281,6 +5476,7 @@
4281	5476	{
4282	5477	if (GetTree() != null)
4283	5478	{
	5479	+ GetTree().revalidate();
4284	5480	GetTree().repaint();
4285	5481	}
4286	5482
..	..	@@ -4289,13 +5485,18 @@
4289	5485	ctrlPanel.validate(); // ? new
4290	5486	ctrlPanel.repaint();
4291	5487	}
	5488	+
	5489	+ if (previousVersionButton != null && copy.versionlist != null)
	5490	+ SetVersionStates();
	5491	+
	5492	+ cameraView.requestFocusInWindow();
4292	5493	}
4293	5494
4294	5495	static TweenManager tweenManager = new TweenManager();
4295	5496
4296	5497	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4297	5498	{
4298		- if (Globals.SAVEONMAKE) // && resetmodel)
	5499	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4299	5500	Save();
4300	5501	//Tween.set(thing, 0).target(1).start(tweenManager);
4301	5502	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4320,7 +5521,7 @@
4320	5521	// group = (Composite) group.get(0);
4321	5522	// }
4322	5523
4323		- System.out.println("makeSomething of " + thing);
	5524	+ //System.out.println("makeSomething of " + thing);
4324	5525
4325	5526	/*
4326	5527	if (deselect && jList != null)
..	..	@@ -4399,7 +5600,7 @@
4399	5600	void ResetModel()
4400	5601	{
4401	5602	//assert(copy instanceof Composite);
4402		- Object3D /Composite/ group = (Object3D /Composite/) copy;
	5603	+ Object3D /Composite/ group = (Object3D /Composite/) objEditor.copy;
4403	5604
4404	5605	// necessary? group.selection = new Object3D(); // java.util.Vector();
4405	5606
..	..	@@ -4410,14 +5611,14 @@
4410	5611	//group.refreshEditWindow();
4411	5612	//refreshContents();
4412	5613
4413		- if (copy.selection == null)
	5614	+ if (objEditor.copy.selection == null)
4414	5615	{
4415		- copy.selection = new Object3D();
	5616	+ objEditor.copy.selection = new Object3D();
4416	5617	}
4417	5618
4418		- for (int j = 0; j < copy.selection.size(); j++)
	5619	+ for (int j = 0; j < objEditor.copy.selection.size(); j++)
4419	5620	{
4420		- Object3D item = copy.selection.get(j);
	5621	+ Object3D item = objEditor.copy.selection.get(j);
4421	5622
4422	5623	if (item instanceof cGroup && ((cGroup) item).transientlink)
4423	5624	{
..	..	@@ -4426,15 +5627,15 @@
4426	5627
4427	5628	if (item.count <= 1) // ??? == 0)
4428	5629	{
4429		- copy.selection.remove(item);
	5630	+ objEditor.copy.selection.remove(item);
4430	5631	}
4431	5632	}
4432	5633
4433	5634	boolean first = true;
4434	5635
4435		- for (int i = copy.selection.size(); --i >= 0;)
	5636	+ for (int i = objEditor.copy.selection.size(); --i >= 0;)
4436	5637	{
4437		- Object3D item = copy.selection.get(i);
	5638	+ Object3D item = objEditor.copy.selection.get(i);
4438	5639
4439	5640	if (item instanceof cGroup && ((cGroup) item).transientlink)
4440	5641	{
..	..	@@ -4537,7 +5738,9 @@
4537	5738	readobj.ResetDisplayList();
4538	5739	} catch (Exception e)
4539	5740	{
4540		- //e.printStackTrace();
	5741	+ if (!e.toString().contains("GZIP"))
	5742	+ e.printStackTrace();
	5743	+
4541	5744	try
4542	5745	{
4543	5746	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4611,12 +5814,14 @@
4611	5814
4612	5815	if (readobj != null)
4613	5816	{
4614		- if (Globals.SAVEONMAKE)
4615		- Save();
	5817	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5818	+ // Save();
4616	5819	try
4617	5820	{
4618	5821	//readobj.deepCopySelf(copy);
4619	5822	copy.clear(); // june 2014
	5823	+ copy.skyboxname = readobj.skyboxname;
	5824	+ copy.skyboxext = readobj.skyboxext;
4620	5825	for (int i = 0; i < readobj.size(); i++)
4621	5826	{
4622	5827	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4657,6 +5862,7 @@
4657	5862	}
4658	5863	} catch (ClassCastException e)
4659	5864	{
	5865	+ e.printStackTrace();
4660	5866	assert (false);
4661	5867	Composite c = (Composite) copy;
4662	5868	c.children.clear();
..	..	@@ -4667,17 +5873,32 @@
4667	5873	c.addChild(csg);
4668	5874	}
4669	5875
	5876	+ copy.versionlist = readobj.versionlist;
	5877	+ copy.versionindex = readobj.versionindex;
	5878	+ copy.versiontable = readobj.versiontable;
	5879	+
	5880	+ if (copy.versionlist == null)
	5881	+ {
	5882	+ // Backward compatibility
	5883	+ copy.versionlist = new Object3D[100];
	5884	+ copy.versionindex = -1;
	5885	+
	5886	+ //Save(true);
	5887	+ }
	5888	+
	5889	+ //? SetUndoStates();
	5890	+
4670	5891	ResetModel();
4671	5892	copy.HardTouch(); // recompile?
4672	5893	refreshContents();
4673	5894	}
4674	5895	}
4675	5896
4676		- void load() // throws ClassNotFoundException
	5897	+ void Open() // throws ClassNotFoundException
4677	5898	{
4678	5899	if (Grafreed.standAlone)
4679	5900	{
4680		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5901	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4681	5902	browser.show();
4682	5903	String filename = browser.getFile();
4683	5904	if (filename != null && filename.length() > 0)
..	..	@@ -4754,6 +5975,8 @@
4754	5975
4755	5976	void save()
4756	5977	{
	5978	+ Replace();
	5979	+
4757	5980	if (lastname == null)
4758	5981	{
4759	5982	return;
..	..	@@ -4776,6 +5999,7 @@
4776	5999	//ps.print(buffer.toString());
4777	6000	} catch (IOException e)
4778	6001	{
	6002	+ e.printStackTrace();
4779	6003	}
4780	6004	}
4781	6005
..	..	@@ -4958,7 +6182,7 @@
4958	6182	MenuBar menuBar;
4959	6183	Menu fileMenu;
4960	6184	MenuItem newItem;
4961		- MenuItem loadItem;
	6185	+ MenuItem openItem;
4962	6186	MenuItem saveItem;
4963	6187	MenuItem saveAsItem;
4964	6188	MenuItem exportAsItem;
..	..	@@ -4981,6 +6205,7 @@
4981	6205	CheckboxMenuItem toggleSwitchItem;
4982	6206	CheckboxMenuItem toggleRootItem;
4983	6207	CheckboxMenuItem animationItem;
	6208	+ MenuItem archiveItem;
4984	6209	CheckboxMenuItem toggleHandleItem;
4985	6210	CheckboxMenuItem togglePaintItem;
4986	6211	JSplitPane mainPanel;
..	..	@@ -4994,6 +6219,7 @@
4994	6219	ButtonGroup buttonGroup;
4995	6220
4996	6221	cGridBag toolboxPanel;
	6222	+ cGridBag skyboxPanel;
4997	6223	cGridBag materialPanel;
4998	6224	cGridBag ctrlPanel;
4999	6225
..	..	@@ -5005,6 +6231,7 @@
5005	6231	boolean materialFlushed;
5006	6232	Object3D latestObject;
5007	6233
	6234	+ cGridBag transformPanel;
5008	6235	cGridBag XYZPanel;
5009	6236
5010	6237	JSplitPane gridPanel;
..	..	@@ -5067,7 +6294,7 @@
5067	6294	JLabel colorLabel;
5068	6295	cNumberSlider colorField;
5069	6296	JLabel modulationLabel;
5070		- cNumberSlider modulationField;
	6297	+ cNumberSlider saturationField;
5071	6298	JLabel metalnessLabel;
5072	6299	cNumberSlider metalnessField;
5073	6300	JLabel diffuseLabel;
..	..	@@ -5098,6 +6325,7 @@
5098	6325	cNumberSlider anisoField;
5099	6326	JLabel anisoVLabel;
5100	6327	cNumberSlider anisoVField;
	6328	+
5101	6329	JLabel cameraLabel;
5102	6330	cNumberSlider cameraField;
5103	6331	JLabel selfshadowLabel;
..	..	@@ -5108,10 +6336,13 @@
5108	6336	cNumberSlider textureField;
5109	6337	JLabel opacityLabel;
5110	6338	cNumberSlider opacityField;
	6339	+ JLabel parallaxLabel;
	6340	+ cNumberSlider parallaxField;
5111	6341	JLabel fakedepthLabel;
5112	6342	cNumberSlider fakedepthField;
5113	6343	JLabel shadowbiasLabel;
5114	6344	cNumberSlider shadowbiasField;
	6345	+
5115	6346	JLabel bumpLabel;
5116	6347	cNumberSlider bumpField;
5117	6348	JLabel noiseLabel;