~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,122 @@
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 cGridBag GetSeparator()
	76	+ {
	77	+ cGridBag separator = new cGridBag();
	78	+ separator.add(new JSeparator());
	79	+ separator.preferredHeight = 5;
	80	+ return separator;
	81	+ }
41	82
42	83	cButton GetButton(String name, boolean border)
43	84	{
44		- try
45		- {
46		- ImageIcon icon = GetIcon(name);
	85	+ ImageIcon icon = GetIcon(name);
	86	+ if (icon != null)
47	87	return new cButton(icon, border);
48		- }
49		- catch (Exception e)
50		- {
	88	+ else
51	89	return new cButton(name, border);
52		- }
	90	+ }
	91	+
	92	+ cLabel GetLabel(String name, boolean border)
	93	+ {
	94	+ //ImageIcon icon = GetIcon(name);
	95	+ return new cLabel(GetImage(name), border);
53	96	}
54	97
55	98	cToggleButton GetToggleButton(String name, boolean border)
56	99	{
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		- }
	100	+ ImageIcon icon = GetIcon(name);
	101	+ return new cToggleButton(icon, border);
66	102	}
67	103
68	104	cCheckBox GetCheckBox(String name, boolean border)
69	105	{
	106	+ ImageIcon icon = GetIcon(name);
	107	+ return new cCheckBox(icon, border);
	108	+ }
	109	+
	110	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	111	+
	112	+ static ImageIcon GetIcon(String name)
	113	+ {
	114	+ javax.swing.ImageIcon iconCache = icons.get(name);
	115	+ if (iconCache != null)
	116	+ {
	117	+ return iconCache;
	118	+ }
	119	+
70	120	try
71	121	{
72		- ImageIcon icon = GetIcon(name);
73		- return new cCheckBox(icon, border);
	122	+ BufferedImage image = javax.imageio.ImageIO.read(ObjEditor.class.getClassLoader().getResourceAsStream(name));
	123	+
	124	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	125	+// {
	126	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	127	+// Graphics2D g = resized.createGraphics();
	128	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	129	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	130	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	131	+// g.dispose();
	132	+//
	133	+// image = resized;
	134	+// }
	135	+
	136	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	137	+
	138	+ icons.put(name, icon);
	139	+
	140	+ return icon;
74	141	}
75	142	catch (Exception e)
76	143	{
77		- return new cCheckBox(name, border);
	144	+ //icons.put(name, null);
	145	+ return null;
78	146	}
79	147	}
80		-
81		- private ImageIcon GetIcon(String name) throws IOException
	148	+
	149	+ BufferedImage GetImage(String name)
82	150	{
83		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
84		-
85		- if (image.getWidth() != 24 && image.getHeight() != 24)
	151	+ try
86	152	{
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;
	153	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	154	+
	155	+ return image;
95	156	}
96		-
97		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
98		- return icon;
	157	+ catch (Exception e)
	158	+ {
	159	+ return null;
	160	+ }
99	161	}
100	162
101	163	// SCRIPT
..	..	@@ -207,7 +269,7 @@
207	269
208	270	objEditor.ctrlPanel.remove(namePanel);
209	271
210		- if (!GroupEditor.allparams)
	272	+ if (!allparams)
211	273	return;
212	274
213	275	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -279,6 +341,14 @@
279	341	client = inClient;
280	342	copy = client;
281	343
	344	+// if (copy.versionlist == null)
	345	+// {
	346	+// copy.versionlist = new Object3D[100];
	347	+// copy.versionindex = -1;
	348	+//
	349	+// callee.Save(true);
	350	+// }
	351	+
282	352	// "this" is not called: SetupUI2(objEditor);
283	353	}
284	354
..	..	@@ -292,6 +362,14 @@
292	362	client = inClient;
293	363	copy = client;
294	364
	365	+ if (copy.versionlist == null)
	366	+ {
	367	+ copy.versionlist = new Object3D[100];
	368	+ copy.versionindex = -1;
	369	+
	370	+// Save(true);
	371	+ }
	372	+
295	373	SetupUI2(callee.GetEditor());
296	374	}
297	375
..	..	@@ -306,14 +384,15 @@
306	384	//localCopy.parent = null;
307	385
308	386	frame = new JFrame();
309		- frame.setUndecorated(true);
	387	+ frame.setUndecorated(false);
310	388	objEditor = this;
311	389	this.callee = callee;
312	390
313	391	//parent = p;
314	392
315	393	GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
316		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	394	+ if (Globals.DEBUG)
	395	+ System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
317	396	//gd.setFullScreenWindow(this);
318	397	//setResizable(false);
319	398	//if (!isDisplayable())
..	..	@@ -324,6 +403,14 @@
324	403	copy = localCopy;
325	404	copy.editWindow = this;
326	405
	406	+// if (copy.versionlist == null)
	407	+// {
	408	+// copy.versionlist = new Object3D[100];
	409	+// copy.versionindex = -1;
	410	+//
	411	+// Save(true);
	412	+// }
	413	+
327	414	SetupMenu();
328	415
329	416	//SetupName(objEditor); // new
..	..	@@ -337,12 +424,20 @@
337	424	return frame.action(event, obj);
338	425	}
339	426
	427	+ // Cannot work without static
	428	+ static boolean allparams = true;
	429	+
	430	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	431	+
	432	+ // This is to refresh the UI of the material panel.
	433	+ boolean patchMaterial;
	434	+
340	435	void SetupMenu()
341	436	{
342	437	frame.setMenuBar(menuBar = new MenuBar());
343	438	menuBar.add(fileMenu = new Menu("File"));
344	439	fileMenu.add(newItem = new MenuItem("New"));
345		- fileMenu.add(loadItem = new MenuItem("Open..."));
	440	+ fileMenu.add(openItem = new MenuItem("Open..."));
346	441
347	442	//oe.menuBar.add(menu = new Menu("Include"));
348	443	Menu menu = new Menu("Import");
..	..	@@ -374,7 +469,7 @@
374	469	}
375	470
376	471	newItem.addActionListener(this);
377		- loadItem.addActionListener(this);
	472	+ openItem.addActionListener(this);
378	473	saveItem.addActionListener(this);
379	474	saveAsItem.addActionListener(this);
380	475	exportAsItem.addActionListener(this);
..	..	@@ -383,13 +478,72 @@
383	478	closeItem.addActionListener(this);
384	479
385	480	objectPanel = new JTabbedPane();
	481	+
	482	+ ChangeListener changeListener = new ChangeListener()
	483	+ {
	484	+ //String name;
	485	+
	486	+ public void stateChanged(ChangeEvent changeEvent)
	487	+ {
	488	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	489	+// {
	490	+// if (latestObject != null)
	491	+// {
	492	+// refreshContents(true);
	493	+// SetMaterial(latestObject);
	494	+// }
	495	+//
	496	+// materialFlushed = true;
	497	+// }
	498	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	499	+// {
	500	+// if (listUI.size() == 0)
	501	+// EditSelection(false);
	502	+// }
	503	+
	504	+// if (objectPanel.getSelectedIndex() == 4)
	505	+// {
	506	+// name = copy.skyboxname;
	507	+//
	508	+// if (name == null)
	509	+// {
	510	+// name = "";
	511	+// }
	512	+//
	513	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	514	+// copy.skyboxext = "jpg";
	515	+// }
	516	+// else
	517	+// {
	518	+// if (name != null)
	519	+// {
	520	+// if (name.equals(""))
	521	+// {
	522	+// copy.skyboxname = null;
	523	+// copy.skyboxext = null;
	524	+// }
	525	+// else
	526	+// {
	527	+// copy.skyboxname = name;
	528	+// }
	529	+// }
	530	+// }
	531	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	532	+
	533	+// refreshContents(false); // To refresh Info tab
	534	+ cameraView.repaint();
	535	+ }
	536	+ };
	537	+ objectPanel.addChangeListener(changeListener);
	538	+
386	539	toolbarPanel = new JPanel();
387	540	toolbarPanel.setName("Toolbar");
	541	+
388	542	treePanel = new cGridBag();
389	543	treePanel.setName("Tree");
390	544
391	545	editPanel = new cGridBag().setVertical(true);
392		- editPanel.setName("Edit");
	546	+ //editPanel.setName("Edit");
393	547
394	548	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
395	549
..	..	@@ -397,11 +551,13 @@
397	551	editPanel.add(editCommandsPanel);
398	552	editPanel.add(ctrlPanel);
399	553
400		- toolboxPanel = new cGridBag().setVertical(false);
401		- toolboxPanel.setName("Toolbox");
	554	+ toolboxPanel = new cGridBag().setVertical(true);
	555	+ //toolboxPanel.setName("Toolbox");
402	556
403		- materialPanel = new cGridBag().setVertical(true);
404		- materialPanel.setName("Material");
	557	+ skyboxPanel = new cGridBag().setVertical(true);
	558	+
	559	+ materialPanel = new cGridBag().setVertical(false);
	560	+ //materialPanel.setName("Material");
405	561
406	562	/JTextPane/
407	563	infoarea = createTextPane();
..	..	@@ -409,14 +565,15 @@
409	565
410	566	infoarea.setEditable(true);
411	567	SetText();
	568	+
412	569	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
413	570	// infoarea.setOpaque(false);
414	571	// //infoarea.setForeground(textcolor);
415	572	// TEXTAREA infoarea.setLineWrap(true);
416	573	// TEXTAREA infoarea.setWrapStyleWord(true);
417	574	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
418		- infoPanel.setPreferredSize(new Dimension(50, 200));
419		- infoPanel.setName("Info");
	575	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	576	+ //infoPanel.setName("Info");
420	577	//infoPanel.setLayout(new BorderLayout());
421	578	//infoPanel.add(createTextPane());
422	579
..	..	@@ -427,7 +584,14 @@
427	584	mainPanel.setDividerSize(9);
428	585	mainPanel.setDividerLocation(0.5); //1.0);
429	586	mainPanel.setResizeWeight(0.5);
430		-
	587	+
	588	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	589	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	590	+ divider.setDividerSize(15);
	591	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	592	+
	593	+ mainPanel.setUI(new BasicSplitPaneUI());
	594	+
431	595	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
432	596	//mainPanel.setLayout(new GridBagLayout());
433	597	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -658,8 +822,8 @@
658	822	}
659	823	}
660	824
661		-static GraphicsDevice device = GraphicsEnvironment
662		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	825	+//static GraphicsDevice device = GraphicsEnvironment
	826	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
663	827
664	828	Rectangle keeprect;
665	829	cRadio radio;
..	..	@@ -676,14 +840,24 @@
676	840	boolean maximized;
677	841
678	842	cButton fullscreenLayout;
	843	+ cButton expandedLayout;
679	844
680	845	void Minimize()
681	846	{
682	847	frame.setState(Frame.ICONIFIED);
	848	+ frame.validate();
683	849	}
684	850
	851	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	852	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	853	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
685	854	void Maximize()
686	855	{
	856	+ if (CameraPane.FULLSCREEN)
	857	+ {
	858	+ ToggleFullScreen();
	859	+ }
	860	+
687	861	if (maximized)
688	862	{
689	863	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -691,20 +865,38 @@
691	865	else
692	866	{
693	867	keeprect = frame.getBounds();
694		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
695		- Dimension rect2 = frame.getToolkit().getScreenSize();
696		- frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	868	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	869	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	870	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
697	871	// frame.setState(Frame.MAXIMIZED_BOTH);
	872	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
698	873	}
699	874
700	875	maximized ^= true;
	876	+
	877	+ frame.validate();
701	878	}
	879	+
	880	+ cButton minButton;
	881	+ cButton maxButton;
	882	+ cButton fullButton;
	883	+ cButton collapseButton;
	884	+ cButton maximize3DButton;
702	885
703	886	void ToggleFullScreen()
704	887	{
705		- if (CameraPane.FULLSCREEN)
	888	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	889	+
	890	+ cameraView.ToggleFullScreen();
	891	+
	892	+ if (!CameraPane.FULLSCREEN)
706	893	{
707	894	device.setFullScreenWindow(null);
	895	+ frame.dispose();
	896	+ frame.setUndecorated(false);
	897	+ frame.validate();
	898	+ frame.setVisible(true);
	899	+
708	900	//frame.setVisible(false);
709	901	// frame.removeNotify();
710	902	// frame.setUndecorated(false);
..	..	@@ -714,13 +906,13 @@
714	906	// X frame.getContentPane().remove(/"Center",/bigThree);
715	907	// X framePanel.add(bigThree);
716	908	// X frame.getContentPane().add(/"Center",/framePanel);
717		- framePanel.setDividerLocation(1);
	909	+// framePanel.setDividerLocation(46); // icons are 24x24
718	910
719	911	//frame.setVisible(true);
720		- radio.layout = keepButton;
	912	+// radio.layout = keepButton;
721	913	//theFrame = null;
722	914	keepButton = null;
723		- radio.layout.doClick();
	915	+// radio.layout.doClick();
724	916
725	917	} else
726	918	{
..	..	@@ -729,22 +921,70 @@
729	921	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
730	922	// frame.getToolkit().getScreenSize().height);
731	923	//frame.setVisible(false);
	924	+
	925	+ frame.dispose();
	926	+ frame.setUndecorated(true);
732	927	device.setFullScreenWindow(frame);
	928	+ frame.validate();
	929	+ frame.setVisible(true);
733	930	// frame.removeNotify();
734	931	// frame.setUndecorated(true);
735	932	// frame.addNotify();
736	933	// X frame.getContentPane().remove(/"Center",/framePanel);
737	934	// X framePanel.remove(bigThree);
738	935	// X frame.getContentPane().add(/"Center",/bigThree);
739		- framePanel.setDividerLocation(0);
	936	+// framePanel.setDividerLocation(0);
740	937
741		- radio.layout = fullscreenLayout;
742		- radio.layout.doClick();
	938	+// radio.layout = fullscreenLayout;
	939	+// radio.layout.doClick();
743	940	//frame.setVisible(true);
744	941	}
745		-
746		- cameraView.ToggleFullScreen();
	942	+ frame.validate();
	943	+
	944	+ cameraView.requestFocusInWindow();
747	945	}
	946	+
	947	+ void CollapseToolbar()
	948	+ {
	949	+ framePanel.setDividerLocation(0);
	950	+ //frame.validate();
	951	+
	952	+ cameraView.requestFocusInWindow();
	953	+ }
	954	+
	955	+ private Object3D Duplicate(Object3D object)
	956	+ {
	957	+ boolean temp = CameraPane.SWITCH;
	958	+ CameraPane.SWITCH = false;
	959	+
	960	+ if (Grafreed.grafreed.universe.versiontable == null)
	961	+ Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	962	+
	963	+ object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
	964	+ // if (copy == client)
	965	+
	966	+ Object3D versions[] = object.versionlist;
	967	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
	968	+ object.versionlist = null;
	969	+ object.versiontable = null;
	970	+
	971	+ Object3D parent = object.parent;
	972	+ object.parent = null;
	973	+
	974	+ //byte[] compress = Compress(copy);
	975	+ Object3D compress = (Object3D)Grafreed.clone(object);
	976	+
	977	+ object.parent = parent;
	978	+
	979	+ object.versionlist = versions;
	980	+ object.versiontable = versiontable; // if Grafreed.grafreed.universe
	981	+
	982	+ object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
	983	+
	984	+ CameraPane.SWITCH = temp;
	985	+
	986	+ return compress;
	987	+ }
748	988
749	989	private JTextPane createTextPane()
750	990	{
..	..	@@ -867,6 +1107,7 @@
867	1107	{
868	1108	SetupMaterial(materialPanel);
869	1109	}
	1110	+
870	1111	//SetupName();
871	1112	//SetupViews();
872	1113	}
..	..	@@ -876,7 +1117,7 @@
876	1117	// NumberSlider vDivsField;
877	1118	// JCheckBox endcaps;
878	1119	JCheckBox liveCB;
879		- JCheckBox selectCB;
	1120	+ JCheckBox selectableCB;
880	1121	JCheckBox hideCB;
881	1122	JCheckBox link2masterCB;
882	1123	JCheckBox markCB;
..	..	@@ -884,7 +1125,12 @@
884	1125	JCheckBox speedupCB;
885	1126	JCheckBox rewindCB;
886	1127	JCheckBox flipVCB;
	1128	+
	1129	+ cCheckBox toggleTextureCB;
	1130	+ cCheckBox toggleSwitchCB;
	1131	+
887	1132	JComboBox texresMenu;
	1133	+
888	1134	JButton resetButton;
889	1135	JButton stepButton;
890	1136	JButton stepAllButton;
..	..	@@ -1070,39 +1316,55 @@
1070	1316
1071	1317	namePanel = new cGridBag();
1072	1318
	1319	+ //if (copy.pinned)
	1320	+ {
	1321	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1322	+ pinButton.setSelected(copy.pinned);
	1323	+ cGridBag t = new cGridBag();
	1324	+ t.preferredWidth = 2;
	1325	+ t.add(pinButton);
	1326	+ namePanel.add(t);
	1327	+
	1328	+ pinButton.addItemListener(this);
	1329	+ }
	1330	+
1073	1331	nameField = AddText(namePanel, copy.GetName());
1074		- namePanel.add(nameField);
	1332	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1075	1333	oe.ctrlPanel.add(namePanel);
1076	1334
1077	1335	oe.ctrlPanel.Return();
1078	1336
1079		- if (!GroupEditor.allparams)
	1337	+ if (!allparams)
1080	1338	return;
1081	1339
1082	1340	setupPanel = new cGridBag().setVertical(false);
1083	1341
1084	1342	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1085	1343	liveCB.setToolTipText("Animate object");
1086		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1087		- selectCB.setToolTipText("Make object selectable");
	1344	+ markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
	1345	+ markCB.setToolTipText("Set target transform");
	1346	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1347	+ selectableCB.setToolTipText("Make object selectable");
1088	1348	// Return();
	1349	+
1089	1350	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1090	1351	hideCB.setToolTipText("Hide object");
1091		- markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1092		- markCB.setToolTipText("Set the animation target transform");
	1352	+
	1353	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1093	1354
1094	1355	setupPanel2 = new cGridBag().setVertical(false);
1095	1356
1096	1357	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1097	1358	rewindCB.setToolTipText("Rewind animation");
1098	1359
1099		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1100		- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1360	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1361	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1101	1362
	1363	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1364	+ link2masterCB.setToolTipText("Attach to support");
	1365	+
1102	1366	if (Globals.ADVANCED)
1103	1367	{
1104		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1105		- link2masterCB.setToolTipText("Attach to support");
1106	1368	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1107	1369	speedupCB.setToolTipText("Option motion capture");
1108	1370	}
..	..	@@ -1288,6 +1550,7 @@
1288	1550
1289	1551	if (cam == null \|\| !(copy.get(0) instanceof cGroup))
1290	1552	{
	1553	+ if (Globals.DEBUG)
1291	1554	System.out.println("CREATE CAMERAS");
1292	1555	cams = new cTemplate();
1293	1556	cams.name = "Cameras";
..	..	@@ -1369,6 +1632,42 @@
1369	1632	//frontView.object = copy;
1370	1633	//sideView.object = copy;
1371	1634
	1635	+ transformPanel = new cGridBag().setVertical(true);
	1636	+
	1637	+ cGridBag resetTransformPanel = new cGridBag();
	1638	+
	1639	+ resetTransformPanel.preferredHeight = 2;
	1640	+
	1641	+ cButton resetTransform = GetButton("Reset all", !Grafreed.NIMBUSLAF);
	1642	+ resetTransform.addMouseListener(new MouseAdapter()
	1643	+ {
	1644	+ public void mouseClicked(MouseEvent e)
	1645	+ {
	1646	+ ResetTransform();
	1647	+ }
	1648	+ });
	1649	+ resetTransformPanel.add(resetTransform);
	1650	+
	1651	+ resetTransform = GetButton("T only", !Grafreed.NIMBUSLAF);
	1652	+ resetTransform.addMouseListener(new MouseAdapter()
	1653	+ {
	1654	+ public void mouseClicked(MouseEvent e)
	1655	+ {
	1656	+ ResetTransform(1);
	1657	+ }
	1658	+ });
	1659	+ resetTransformPanel.add(resetTransform);
	1660	+
	1661	+ resetTransform = GetButton("RS only", !Grafreed.NIMBUSLAF);
	1662	+ resetTransform.addMouseListener(new MouseAdapter()
	1663	+ {
	1664	+ public void mouseClicked(MouseEvent e)
	1665	+ {
	1666	+ ResetTransform(2);
	1667	+ }
	1668	+ });
	1669	+ resetTransformPanel.add(resetTransform);
	1670	+
1372	1671	XYZPanel = new cGridBag().setVertical(true);
1373	1672	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1374	1673
..	..	@@ -1376,7 +1675,11 @@
1376	1675	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1377	1676	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1378	1677	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1678	+ //XYZPanel.setName("XYZ");
1379	1679
	1680	+ transformPanel.add(resetTransformPanel);
	1681	+ transformPanel.add(XYZPanel);
	1682	+
1380	1683	/*
1381	1684	gridPanel = new JPanel(); //new BorderLayout());
1382	1685	gridPanel.setLayout(new GridLayout(1, 2));
..	..	@@ -1384,12 +1687,12 @@
1384	1687	gridPanel.add(cameraView);
1385	1688	gridPanel.add(XYZPanel);
1386	1689	*/
1387		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1388		- gridPanel.setContinuousLayout(true);
1389		- gridPanel.setOneTouchExpandable(true);
1390		- gridPanel.setDividerLocation(1.0);
1391		- gridPanel.setDividerSize(9);
1392		- gridPanel.setResizeWeight(0.85);
	1690	+// gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
	1691	+// gridPanel.setContinuousLayout(true);
	1692	+// gridPanel.setOneTouchExpandable(true);
	1693	+// gridPanel.setDividerLocation(1.0);
	1694	+// gridPanel.setDividerSize(9);
	1695	+// gridPanel.setResizeWeight(0.85);
1393	1696
1394	1697	// aConstraints.weighty = 0;
1395	1698	//System.out.println("THIS = " + this);
..	..	@@ -1413,14 +1716,33 @@
1413	1716	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1414	1717	//tmp.setName("Edit");
1415	1718	objectPanel.add(toolboxPanel);
	1719	+ objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
	1720	+ objectPanel.setToolTipTextAt(0, "Objects & textures");
	1721	+
1416	1722	objectPanel.add(materialPanel);
	1723	+ objectPanel.setIconAt(1, GetIcon("icons/material.png"));
	1724	+ objectPanel.setToolTipTextAt(1, "Material");
	1725	+
	1726	+ objectPanel.add(skyboxPanel);
	1727	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1728	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1729	+
1417	1730	// JPanel north = new JPanel(new BorderLayout());
1418	1731	// north.setName("Edit");
1419	1732	// north.add(ctrlPanel, BorderLayout.NORTH);
1420	1733	// objectPanel.add(north);
1421	1734	objectPanel.add(editPanel);
1422		- objectPanel.add(infoPanel);
1423		-
	1735	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1736	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1737	+
	1738	+ objectPanel.add(transformPanel);
	1739	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1740	+ objectPanel.setToolTipTextAt(4, "TRS transform");
	1741	+
	1742	+ patchMaterial = true;
	1743	+ cameraView.patchMaterial = this;
	1744	+ objectPanel.setSelectedIndex(1);
	1745	+
1424	1746	/*
1425	1747	aConstraints.gridx = 0;
1426	1748	aConstraints.gridwidth = 1;
..	..	@@ -1428,7 +1750,7 @@
1428	1750	aConstraints.gridy += 1;
1429	1751	aConstraints.gridwidth = 1;
1430	1752	mainPanel.add(objectPanel, aConstraints);
1431		- */
	1753	+ */
1432	1754
1433	1755	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1434	1756	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1445,9 +1767,7 @@
1445	1767	JTabbedPane tabbedPane = new JTabbedPane();
1446	1768	tabbedPane.add(scrollpane);
1447	1769
1448		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1449		-
1450		- optionsPanel = new cGridBag().setVertical(true);
	1770	+ optionsPanel = new cGridBag().setVertical(false);
1451	1771
1452	1772	optionsPanel.setName("Options");
1453	1773
..	..	@@ -1455,8 +1775,15 @@
1455	1775
1456	1776	tabbedPane.add(optionsPanel);
1457	1777
	1778	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1779	+
1458	1780	scenePanel.add(tabbedPane);
1459	1781
	1782	+ //if (Globals.ADVANCED)
	1783	+// tabbedPane.add(infoPanel);
	1784	+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1785	+// tabbedPane.setToolTipTextAt(3, "Information");
	1786	+
1460	1787	/*
1461	1788	cTree jTree = new cTree(null);
1462	1789	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1477,13 +1804,13 @@
1477	1804	jtp.add(tree);
1478	1805	*/
1479	1806
1480		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1481		- bigPanel.setContinuousLayout(true);
1482		- bigPanel.setOneTouchExpandable(true);
1483		- bigPanel.setDividerLocation(0.8);
1484		- bigPanel.setDividerSize(15);
1485		- bigPanel.setResizeWeight(0.15);
1486		- bigPanel.setName("Scene");
	1807	+// bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
	1808	+// bigPanel.setContinuousLayout(true);
	1809	+// bigPanel.setOneTouchExpandable(true);
	1810	+// bigPanel.setDividerLocation(0.8);
	1811	+// bigPanel.setDividerSize(15);
	1812	+// bigPanel.setResizeWeight(0.15);
	1813	+// bigPanel.setName("Scene");
1487	1814
1488	1815	//bigPanel.setLayout(new BorderLayout());
1489	1816	//bigPanel.setSize(new Dimension(10,10));
..	..	@@ -1518,7 +1845,7 @@
1518	1845	bigThree = new cGridBag();
1519	1846	bigThree.addComponent(scenePanel);
1520	1847	bigThree.addComponent(centralPanel);
1521		- bigThree.addComponent(XYZPanel);
	1848	+ //bigThree.addComponent(XYZPanel);
1522	1849
1523	1850	// // SIDE EFFECT!!!
1524	1851	// aConstraints.gridx = 0;
..	..	@@ -1527,16 +1854,33 @@
1527	1854	// aConstraints.gridheight = 1;
1528	1855
1529	1856	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1530		- framePanel.setContinuousLayout(true);
1531		- framePanel.setOneTouchExpandable(true);
1532		- framePanel.setDividerLocation(0.8);
	1857	+
	1858	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1859	+ new java.beans.PropertyChangeListener()
	1860	+ {
	1861	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1862	+ {
	1863	+ if ((Integer)pce.getOldValue() == 1)
	1864	+ {
	1865	+ if (radio.layout != expandedLayout)
	1866	+ {
	1867	+ radio.layout = expandedLayout;
	1868	+ radio.layout.doClick();
	1869	+ }
	1870	+ }
	1871	+ }
	1872	+ });
	1873	+
	1874	+ framePanel.setContinuousLayout(false);
	1875	+ framePanel.setOneTouchExpandable(false);
	1876	+ //.setDividerLocation(0.8);
1533	1877	//framePanel.setDividerSize(15);
1534	1878	//framePanel.setResizeWeight(0.15);
1535	1879	framePanel.setName("Frame");
1536	1880
1537	1881	frame.getContentPane().setLayout(new BorderLayout());
1538	1882	/**/
1539		- JTabbedPane worldPane = new JTabbedPane();
	1883	+ //JTabbedPane worldPane = new JTabbedPane();
1540	1884	//worldPane.add(bigPanel);
1541	1885	//worldPane.add(worldPanel);
1542	1886	/**/
..	..	@@ -1547,16 +1891,18 @@
1547	1891	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1548	1892
1549	1893	frame.setSize(1280, 860);
1550		- frame.setVisible(true);
1551		-
	1894	+
1552	1895	cameraView.requestFocusInWindow();
1553	1896
1554		- gridPanel.setDividerLocation(1.0);
	1897	+// gridPanel.setDividerLocation(1.0);
	1898	+
	1899	+ frame.validate();
	1900	+
	1901	+ frame.setVisible(true);
1555	1902
1556	1903	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1557	1904	frame.addWindowListener(new WindowAdapter()
1558	1905	{
1559		-
1560	1906	public void windowClosing(WindowEvent e)
1561	1907	{
1562	1908	Close();
..	..	@@ -1579,12 +1925,426 @@
1579	1925	ctrlPanel.removeAll();
1580	1926	}
1581	1927
1582		- void SetupMaterial(cGridBag panel)
	1928	+ void SetupMaterial(cGridBag materialpanel)
1583	1929	{
1584		- /*
	1930	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1931	+
	1932	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1933	+ skin.setToolTipText("Skin");
	1934	+ skin.addMouseListener(new MouseAdapter()
	1935	+ {
	1936	+ public void mouseClicked(MouseEvent e)
	1937	+ {
	1938	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1939	+ cMaterial material = object.material;
	1940	+
	1941	+ // Skin
	1942	+ colorField.setFloat(material.color);
	1943	+ float saturation = material.modulation;
	1944	+
	1945	+ if (!cameraView.Skinshader)
	1946	+ {
	1947	+ saturation /= 1.5;
	1948	+ }
	1949	+
	1950	+ saturationField.setFloat(saturation);
	1951	+
	1952	+ subsurfaceField.setFloat(material.subsurface);
	1953	+ selfshadowField.setFloat(material.diffuseness);
	1954	+ diffusenessField.setFloat(material.factor);
	1955	+ shininessField.setFloat(material.shininess);
	1956	+ shadowbiasField.setFloat(material.shadowbias);
	1957	+ diffuseField.setFloat(material.diffuse);
	1958	+ specularField.setFloat(material.specular);
	1959	+
	1960	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1961	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1962	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1963	+
	1964	+ materialtouched = true;
	1965	+ applySelf();
	1966	+ }
	1967	+ });
	1968	+ presetpanel.add(skin);
	1969	+
	1970	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1971	+ lambert.setToolTipText("Diffuse");
	1972	+ lambert.addMouseListener(new MouseAdapter()
	1973	+ {
	1974	+ public void mouseClicked(MouseEvent e)
	1975	+ {
	1976	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1977	+ cMaterial material = object.material;
	1978	+
	1979	+ diffusenessField.setFloat(material.factor);
	1980	+ selfshadowField.setFloat(material.diffuseness);
	1981	+
	1982	+ materialtouched = true;
	1983	+ applySelf();
	1984	+ }
	1985	+ });
	1986	+ presetpanel.add(lambert);
	1987	+
	1988	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1989	+ diffuse2.setToolTipText("Diffuse2");
	1990	+ diffuse2.addMouseListener(new MouseAdapter()
	1991	+ {
	1992	+ public void mouseClicked(MouseEvent e)
	1993	+ {
	1994	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1995	+ cMaterial material = object.material;
	1996	+
	1997	+ diffusenessField.setFloat(material.factor);
	1998	+ selfshadowField.setFloat(material.diffuseness);
	1999	+
	2000	+ materialtouched = true;
	2001	+ applySelf();
	2002	+ }
	2003	+ });
	2004	+ presetpanel.add(diffuse2);
	2005	+
	2006	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	2007	+ diffusemoon.setToolTipText("Moon");
	2008	+ diffusemoon.addMouseListener(new MouseAdapter()
	2009	+ {
	2010	+ public void mouseClicked(MouseEvent e)
	2011	+ {
	2012	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	2013	+ cMaterial material = object.material;
	2014	+
	2015	+ diffusenessField.setFloat(material.factor);
	2016	+ selfshadowField.setFloat(material.diffuseness);
	2017	+
	2018	+ materialtouched = true;
	2019	+ applySelf();
	2020	+ }
	2021	+ });
	2022	+ presetpanel.add(diffusemoon);
	2023	+
	2024	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	2025	+ diffusemoon2.setToolTipText("Moon2");
	2026	+ diffusemoon2.addMouseListener(new MouseAdapter()
	2027	+ {
	2028	+ public void mouseClicked(MouseEvent e)
	2029	+ {
	2030	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	2031	+ cMaterial material = object.material;
	2032	+
	2033	+ diffusenessField.setFloat(material.factor);
	2034	+ selfshadowField.setFloat(material.diffuseness);
	2035	+
	2036	+ materialtouched = true;
	2037	+ applySelf();
	2038	+ }
	2039	+ });
	2040	+ presetpanel.add(diffusemoon2);
	2041	+
	2042	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	2043	+ diffusemoon3.setToolTipText("Moon3");
	2044	+ diffusemoon3.addMouseListener(new MouseAdapter()
	2045	+ {
	2046	+ public void mouseClicked(MouseEvent e)
	2047	+ {
	2048	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	2049	+ cMaterial material = object.material;
	2050	+
	2051	+ diffusenessField.setFloat(material.factor);
	2052	+ selfshadowField.setFloat(material.diffuseness);
	2053	+
	2054	+ materialtouched = true;
	2055	+ applySelf();
	2056	+ }
	2057	+ });
	2058	+ presetpanel.add(diffusemoon3);
	2059	+
	2060	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	2061	+ diffusesheen.setToolTipText("Sheen");
	2062	+ diffusesheen.addMouseListener(new MouseAdapter()
	2063	+ {
	2064	+ public void mouseClicked(MouseEvent e)
	2065	+ {
	2066	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	2067	+ cMaterial material = object.material;
	2068	+
	2069	+ sheenField.setFloat(material.sheen);
	2070	+
	2071	+ materialtouched = true;
	2072	+ applySelf();
	2073	+ }
	2074	+ });
	2075	+ presetpanel.add(diffusesheen);
	2076	+
	2077	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2078	+ rough.setToolTipText("Rough metal");
	2079	+ rough.addMouseListener(new MouseAdapter()
	2080	+ {
	2081	+ public void mouseClicked(MouseEvent e)
	2082	+ {
	2083	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2084	+ cMaterial material = object.material;
	2085	+
	2086	+ shininessField.setFloat(material.shininess);
	2087	+ velvetField.setFloat(material.velvet);
	2088	+
	2089	+ materialtouched = true;
	2090	+ applySelf();
	2091	+ }
	2092	+ });
	2093	+ presetpanel.add(rough);
	2094	+
	2095	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2096	+ rough2.setToolTipText("Medium metal");
	2097	+ rough2.addMouseListener(new MouseAdapter()
	2098	+ {
	2099	+ public void mouseClicked(MouseEvent e)
	2100	+ {
	2101	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2102	+ cMaterial material = object.material;
	2103	+
	2104	+ shininessField.setFloat(material.shininess);
	2105	+ lightareaField.setFloat(material.lightarea);
	2106	+
	2107	+ materialtouched = true;
	2108	+ applySelf();
	2109	+ }
	2110	+ });
	2111	+ presetpanel.add(rough2);
	2112	+
	2113	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2114	+ shini0.setToolTipText("Shiny");
	2115	+ shini0.addMouseListener(new MouseAdapter()
	2116	+ {
	2117	+ public void mouseClicked(MouseEvent e)
	2118	+ {
	2119	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2120	+ cMaterial material = object.material;
	2121	+
	2122	+ shininessField.setFloat(material.shininess);
	2123	+ lightareaField.setFloat(material.lightarea);
	2124	+
	2125	+ materialtouched = true;
	2126	+ applySelf();
	2127	+ }
	2128	+ });
	2129	+ presetpanel.add(shini0);
	2130	+
	2131	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2132	+ shini1.setToolTipText("Shiny2");
	2133	+ shini1.addMouseListener(new MouseAdapter()
	2134	+ {
	2135	+ public void mouseClicked(MouseEvent e)
	2136	+ {
	2137	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2138	+ cMaterial material = object.material;
	2139	+
	2140	+ shininessField.setFloat(material.shininess);
	2141	+ lightareaField.setFloat(material.lightarea);
	2142	+
	2143	+ materialtouched = true;
	2144	+ applySelf();
	2145	+ }
	2146	+ });
	2147	+ presetpanel.add(shini1);
	2148	+
	2149	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2150	+ shini2.setToolTipText("Shiny3");
	2151	+ shini2.addMouseListener(new MouseAdapter()
	2152	+ {
	2153	+ public void mouseClicked(MouseEvent e)
	2154	+ {
	2155	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2156	+ cMaterial material = object.material;
	2157	+
	2158	+ shininessField.setFloat(material.shininess);
	2159	+ lightareaField.setFloat(material.lightarea);
	2160	+
	2161	+ materialtouched = true;
	2162	+ applySelf();
	2163	+ }
	2164	+ });
	2165	+ presetpanel.add(shini2);
	2166	+
	2167	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2168	+ aniso.setToolTipText("AnisoU");
	2169	+ aniso.addMouseListener(new MouseAdapter()
	2170	+ {
	2171	+ public void mouseClicked(MouseEvent e)
	2172	+ {
	2173	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2174	+ cMaterial material = object.material;
	2175	+
	2176	+ anisoField.setFloat(material.aniso);
	2177	+ anisoVField.setFloat(material.anisoV);
	2178	+
	2179	+ materialtouched = true;
	2180	+ applySelf();
	2181	+ }
	2182	+ });
	2183	+ presetpanel.add(aniso);
	2184	+
	2185	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2186	+ aniso2.setToolTipText("AnisoV");
	2187	+ aniso2.addMouseListener(new MouseAdapter()
	2188	+ {
	2189	+ public void mouseClicked(MouseEvent e)
	2190	+ {
	2191	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2192	+ cMaterial material = object.material;
	2193	+
	2194	+ anisoField.setFloat(material.aniso);
	2195	+ anisoVField.setFloat(material.anisoV);
	2196	+
	2197	+ materialtouched = true;
	2198	+ applySelf();
	2199	+ }
	2200	+ });
	2201	+ presetpanel.add(aniso2);
	2202	+
	2203	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2204	+ aniso3.setToolTipText("AnisoUV");
	2205	+ aniso3.addMouseListener(new MouseAdapter()
	2206	+ {
	2207	+ public void mouseClicked(MouseEvent e)
	2208	+ {
	2209	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2210	+ cMaterial material = object.material;
	2211	+
	2212	+ anisoField.setFloat(material.aniso);
	2213	+ anisoVField.setFloat(material.anisoV);
	2214	+
	2215	+ materialtouched = true;
	2216	+ applySelf();
	2217	+ }
	2218	+ });
	2219	+ presetpanel.add(aniso3);
	2220	+
	2221	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2222	+ velvet0.setToolTipText("Velvet");
	2223	+ velvet0.addMouseListener(new MouseAdapter()
	2224	+ {
	2225	+ public void mouseClicked(MouseEvent e)
	2226	+ {
	2227	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2228	+ cMaterial material = object.material;
	2229	+
	2230	+ diffusenessField.setFloat(material.factor);
	2231	+ selfshadowField.setFloat(material.diffuseness);
	2232	+ sheenField.setFloat(material.sheen);
	2233	+ shininessField.setFloat(material.shininess);
	2234	+ velvetField.setFloat(material.velvet);
	2235	+ shiftField.setFloat(material.shift);
	2236	+
	2237	+ materialtouched = true;
	2238	+ applySelf();
	2239	+ }
	2240	+ });
	2241	+ presetpanel.add(velvet0);
	2242	+
	2243	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2244	+ bump0.setToolTipText("Bump texture");
	2245	+ bump0.addMouseListener(new MouseAdapter()
	2246	+ {
	2247	+ public void mouseClicked(MouseEvent e)
	2248	+ {
	2249	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2250	+ cMaterial material = object.material;
	2251	+
	2252	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2253	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2254	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2255	+
	2256	+ materialtouched = true;
	2257	+ applySelf();
	2258	+ }
	2259	+ });
	2260	+ presetpanel.add(bump0);
	2261	+
	2262	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2263	+ borderShader.setToolTipText("Border fade");
	2264	+ borderShader.addMouseListener(new MouseAdapter()
	2265	+ {
	2266	+ public void mouseClicked(MouseEvent e)
	2267	+ {
	2268	+ borderfadeField.setFloat(0.5);
	2269	+ opacityField.setFloat(0.75);
	2270	+
	2271	+ materialtouched = true;
	2272	+ applySelf();
	2273	+ }
	2274	+ });
	2275	+ presetpanel.add(borderShader);
	2276	+
	2277	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2278	+ halo.setToolTipText("Halo");
	2279	+ halo.addMouseListener(new MouseAdapter()
	2280	+ {
	2281	+ public void mouseClicked(MouseEvent e)
	2282	+ {
	2283	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2284	+ cMaterial material = object.material;
	2285	+
	2286	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2287	+
	2288	+ materialtouched = true;
	2289	+ applySelf();
	2290	+ }
	2291	+ });
	2292	+ presetpanel.add(halo);
	2293	+
	2294	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2295	+ candle.setToolTipText("Candle");
	2296	+ candle.addMouseListener(new MouseAdapter()
	2297	+ {
	2298	+ public void mouseClicked(MouseEvent e)
	2299	+ {
	2300	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2301	+ cMaterial material = object.material;
	2302	+
	2303	+ subsurfaceField.setFloat(material.subsurface);
	2304	+ shadowbiasField.setFloat(material.shadowbias);
	2305	+ ambientField.setFloat(material.ambient);
	2306	+ specularField.setFloat(material.specular);
	2307	+ lightareaField.setFloat(material.lightarea);
	2308	+ shininessField.setFloat(material.shininess);
	2309	+
	2310	+ materialtouched = true;
	2311	+ applySelf();
	2312	+ }
	2313	+ });
	2314	+ presetpanel.add(candle);
	2315	+
	2316	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2317	+ shadowShader.setToolTipText("Shadow");
	2318	+ shadowShader.addMouseListener(new MouseAdapter()
	2319	+ {
	2320	+ public void mouseClicked(MouseEvent e)
	2321	+ {
	2322	+ diffuseField.setFloat(0.001);
	2323	+ ambientField.setFloat(0.001);
	2324	+ cameraField.setFloat(0.001);
	2325	+ specularField.setFloat(0.001);
	2326	+ fakedepthField.setFloat(0.001);
	2327	+ opacityField.setFloat(0.6);
	2328	+
	2329	+ materialtouched = true;
	2330	+ applySelf();
	2331	+ }
	2332	+ });
	2333	+ presetpanel.add(shadowShader);
	2334	+
	2335	+ cGridBag panel = new cGridBag().setVertical(true);
	2336	+
	2337	+ presetpanel.preferredWidth = 1;
	2338	+
	2339	+ materialpanel.add(presetpanel);
	2340	+ materialpanel.add(panel);
	2341	+
	2342	+ panel.preferredWidth = 8;
	2343	+
	2344	+ /*
1585	2345	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1586	2346	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1587		- */
	2347	+ */
1588	2348
1589	2349	cGridBag editBar = new cGridBag().setVertical(false);
1590	2350
..	..	@@ -1618,45 +2378,61 @@
1618	2378	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1619	2379
1620	2380	cGridBag colorSection = new cGridBag().setVertical(true);
	2381	+
	2382	+ cGridBag huepanel = new cGridBag();
	2383	+ cGridBag huelabel = new cGridBag();
	2384	+ cLabel hue = GetLabel("icons/hue.png", false);
	2385	+ hue.fit = true;
	2386	+
	2387	+ hue.addMouseListener(new MouseAdapter()
	2388	+ {
	2389	+ public void mousePressed(MouseEvent e)
	2390	+ {
	2391	+ int x = e.getX();
	2392	+
	2393	+ colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
	2394	+ }
	2395	+ });
	2396	+
	2397	+ huelabel.add(hue);
	2398	+ huelabel.preferredWidth = 20;
	2399	+ huepanel.add(new cGridBag()); // Label
	2400	+ huepanel.add(huelabel); // Field/slider
	2401	+
	2402	+ huepanel.preferredHeight = 7;
	2403	+
	2404	+ colorSection.add(huepanel);
1621	2405
1622	2406	cGridBag color = new cGridBag();
1623		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1624		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1625		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2407	+
	2408	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2409	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2410	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2411	+
1626	2412	//colorField.preferredWidth = 200;
1627	2413	colorSection.add(color);
1628	2414
1629	2415	cGridBag modulation = new cGridBag();
1630	2416	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1631	2417	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1632		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2418	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1633	2419	colorSection.add(modulation);
1634	2420
	2421	+ cGridBag opacity = new cGridBag();
	2422	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2423	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2424	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2425	+ colorSection.add(opacity);
	2426	+
	2427	+ colorSection.add(GetSeparator());
	2428	+
1635	2429	cGridBag texture = new cGridBag();
1636	2430	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1637	2431	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1638	2432	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1639	2433	colorSection.add(texture);
1640	2434
1641		- cGridBag anisoU = new cGridBag();
1642		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1643		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1644		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1645		- colorSection.add(anisoU);
1646		-
1647		- cGridBag anisoV = new cGridBag();
1648		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1649		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1650		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1651		- colorSection.add(anisoV);
1652		-
1653		- cGridBag shadowbias = new cGridBag();
1654		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1655		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1656		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1657		- colorSection.add(shadowbias);
1658		-
1659		- panel.add(new JSeparator());
	2435	+ panel.add(GetSeparator());
1660	2436
1661	2437	panel.add(colorSection);
1662	2438
..	..	@@ -1706,7 +2482,13 @@
1706	2482	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1707	2483	diffuseSection.add(fakedepth);
1708	2484
1709		- panel.add(new JSeparator());
	2485	+ cGridBag shadowbias = new cGridBag();
	2486	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2487	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2488	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2489	+ diffuseSection.add(shadowbias);
	2490	+
	2491	+ panel.add(GetSeparator());
1710	2492
1711	2493	panel.add(diffuseSection);
1712	2494
..	..	@@ -1756,42 +2538,48 @@
1756	2538	// aConstraints.gridy += 1;
1757	2539	// aConstraints.gridwidth = 1;
1758	2540
	2541	+ cGridBag anisoU = new cGridBag();
	2542	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2543	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2544	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2545	+ specularSection.add(anisoU);
1759	2546
1760		- panel.add(new JSeparator());
	2547	+ cGridBag anisoV = new cGridBag();
	2548	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2549	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2550	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2551	+ specularSection.add(anisoV);
	2552	+
	2553	+
	2554	+ panel.add(GetSeparator());
1761	2555
1762	2556	panel.add(specularSection);
1763	2557
1764	2558	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1765	2559
1766		- cGridBag globalSection = new cGridBag().setVertical(true);
	2560	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1767	2561
1768	2562	cGridBag camera = new cGridBag();
1769	2563	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1770	2564	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1771	2565	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1772		- globalSection.add(camera);
	2566	+ colorSection.add(camera);
1773	2567
1774	2568	cGridBag ambient = new cGridBag();
1775	2569	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1776	2570	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1777	2571	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1778		- globalSection.add(ambient);
	2572	+ colorSection.add(ambient);
1779	2573
1780	2574	cGridBag backlit = new cGridBag();
1781	2575	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1782	2576	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1783	2577	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1784		- globalSection.add(backlit);
	2578	+ colorSection.add(backlit);
1785	2579
1786		- cGridBag opacity = new cGridBag();
1787		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1788		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1789		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1790		- globalSection.add(opacity);
1791		-
1792		- panel.add(new JSeparator());
	2580	+ //panel.add(new JSeparator());
1793	2581
1794		- panel.add(globalSection);
	2582	+ //panel.add(globalSection);
1795	2583
1796	2584	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1797	2585
..	..	@@ -1833,7 +2621,7 @@
1833	2621	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1834	2622	textureSection.add(opacityPower);
1835	2623
1836		- panel.add(new JSeparator());
	2624	+ panel.add(GetSeparator());
1837	2625
1838	2626	panel.add(textureSection);
1839	2627
..	..	@@ -1898,8 +2686,9 @@
1898	2686	// 3D models
1899	2687	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1900	2688	{
1901		- lastConverter = new com.jmex.model.converters.MaxToJme();
1902		- LoadFile(filename, lastConverter);
	2689	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2690	+ //LoadFile(filename, lastConverter);
	2691	+ LoadObjFile(filename); // New 3ds loader
1903	2692	continue;
1904	2693	}
1905	2694	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2625,6 +3414,7 @@
2625	3414	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2626	3415	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2627	3416	}
	3417	+
2628	3418	//cJME.count++;
2629	3419	//cJME.count %= 12;
2630	3420	if (gc)
..	..	@@ -2808,6 +3598,7 @@
2808	3598	}
2809	3599	}
2810	3600	}
	3601	+
2811	3602	cFileSystemPane FSPane;
2812	3603
2813	3604	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2817,7 +3608,7 @@
2817	3608
2818	3609	freezematerial = true;
2819	3610	colorField.setFloat(mat.color);
2820		- modulationField.setFloat(mat.modulation);
	3611	+ saturationField.setFloat(mat.modulation);
2821	3612	metalnessField.setFloat(mat.metalness);
2822	3613	diffuseField.setFloat(mat.diffuse);
2823	3614	specularField.setFloat(mat.specular);
..	..	@@ -2861,11 +3652,14 @@
2861	3652	}
2862	3653	}
2863	3654	}
	3655	+
2864	3656	freezematerial = false;
2865	3657	}
2866	3658
2867	3659	void SetMaterial(Object3D object)
2868	3660	{
	3661	+ latestObject = object;
	3662	+
2869	3663	cMaterial mat = object.material;
2870	3664
2871	3665	if (mat == null)
..	..	@@ -2876,32 +3670,8 @@
2876	3670
2877	3671	if (multiplyToggle != null)
2878	3672	multiplyToggle.setSelected(mat.multiply);
2879		-
2880		- assert (object.projectedVertices != null);
2881		-
2882		- if (object.projectedVertices.length <= 2)
2883		- {
2884		- // Side effect...
2885		- Object3D.cVector2[] keep = object.projectedVertices;
2886		- object.projectedVertices = new Object3D.cVector2[3];
2887		- for (int i = 0; i < 3; i++)
2888		- {
2889		- if (i < keep.length)
2890		- {
2891		- object.projectedVertices[i] = keep[i];
2892		- } else
2893		- {
2894		- object.projectedVertices[i] = new Object3D.cVector2();
2895		- }
2896		- /*
2897		- if(keep.length == 0)
2898		- object.projectedVertices[0] = new Object3D.cVector2();
2899		- else
2900		- object.projectedVertices[0] = keep[0];
2901		- object.projectedVertices[1] = new Object3D.cVector2();
2902		- */
2903		- }
2904		- }
	3673	+
	3674	+ AllocProjectedVertices(object);
2905	3675
2906	3676	SetMaterial(mat, object.projectedVertices);
2907	3677	}
..	..	@@ -2977,12 +3747,17 @@
2977	3747	// }
2978	3748
2979	3749	/**/
2980		- if (deselect)
	3750	+ if (deselect \|\| child == null)
2981	3751	{
2982	3752	//group.deselectAll();
2983	3753	//freeze = true;
2984	3754	GetTree().clearSelection();
2985	3755	//freeze = false;
	3756	+
	3757	+ if (child == null)
	3758	+ {
	3759	+ return;
	3760	+ }
2986	3761	}
2987	3762
2988	3763	//group.addSelectee(child);
..	..	@@ -3016,6 +3791,17 @@
3016	3791	public void itemStateChanged(ItemEvent event)
3017	3792	{
3018	3793	// System.out.println("Propagate = " + propagate);
	3794	+ if (event.getSource() == pinButton)
	3795	+ {
	3796	+ copy.pinned ^= true;
	3797	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3798	+ {
	3799	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3800	+ copy.CloseUI();
	3801	+ //copy.editWindow.refreshContents();
	3802	+ }
	3803	+ }
	3804	+ else
3019	3805	if (event.getSource() == propagateToggle)
3020	3806	{
3021	3807	propagate ^= true;
..	..	@@ -3051,7 +3837,7 @@
3051	3837	cameraView.ToggleDL();
3052	3838	cameraView.repaint();
3053	3839	return;
3054		- } else if (event.getSource() == toggleTextureItem)
	3840	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
3055	3841	{
3056	3842	cameraView.ToggleTexture();
3057	3843	// june 2013 copy.HardTouch();
..	..	@@ -3090,7 +3876,7 @@
3090	3876	frame.validate();
3091	3877
3092	3878	return;
3093		- } else if (event.getSource() == toggleSwitchItem)
	3879	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3094	3880	{
3095	3881	cameraView.ToggleSwitch();
3096	3882	cameraView.repaint();
..	..	@@ -3120,8 +3906,9 @@
3120	3906	} else if (event.getSource() == liveCB)
3121	3907	{
3122	3908	copy.live ^= true;
	3909	+ objEditor.refreshContents(true); // To show item colors
3123	3910	return;
3124		- } else if (event.getSource() == selectCB)
	3911	+ } else if (event.getSource() == selectableCB)
3125	3912	{
3126	3913	copy.dontselect ^= true;
3127	3914	return;
..	..	@@ -3129,7 +3916,7 @@
3129	3916	{
3130	3917	copy.hide ^= true;
3131	3918	copy.Touch(); // display list issue
3132		- objEditor.refreshContents();
	3919	+ objEditor.refreshContents(true); // To show item colors
3133	3920	return;
3134	3921	} else if (event.getSource() == link2masterCB)
3135	3922	{
..	..	@@ -3194,7 +3981,7 @@
3194	3981	//System.out.println("ObjEditor " + event);
3195	3982	applySelf0(true);
3196	3983	//parent.applySelf();
3197		- objEditor.refreshContents();
	3984	+ // conflicts with requestFocus objEditor.refreshContents();
3198	3985	} else if (source == resetButton)
3199	3986	{
3200	3987	CameraPane.fullreset = true;
..	..	@@ -3306,9 +4093,9 @@
3306	4093	{
3307	4094	Close();
3308	4095	//return true;
3309		- } else if (source == loadItem)
	4096	+ } else if (source == openItem)
3310	4097	{
3311		- load();
	4098	+ Open();
3312	4099	//return true;
3313	4100	} else if (source == newItem)
3314	4101	{
..	..	@@ -3333,6 +4120,10 @@
3333	4120	{
3334	4121	generatePOV();
3335	4122	//return true;
	4123	+ } else if (event.getSource() == archiveItem)
	4124	+ {
	4125	+ cTools.Archive(frame);
	4126	+ return;
3336	4127	} else if (source == zBufferItem)
3337	4128	{
3338	4129	try
..	..	@@ -3381,11 +4172,12 @@
3381	4172
3382	4173	static public byte[] Compress(Object3D o)
3383	4174	{
	4175	+ // Slower to actually compress.
3384	4176	try
3385	4177	{
3386	4178	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3387		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3388		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	4179	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4180	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3389	4181
3390	4182	Object3D parent = o.parent;
3391	4183	o.parent = null;
..	..	@@ -3396,10 +4188,14 @@
3396	4188
3397	4189	out.flush();
3398	4190
3399		- zstream.close();
	4191	+ baos //zstream
	4192	+ .close();
3400	4193	out.close();
3401	4194
3402		- return baos.toByteArray();
	4195	+ byte[] bytes = baos.toByteArray();
	4196	+
	4197	+ System.out.println("save #bytes = " + bytes.length);
	4198	+ return bytes;
3403	4199	} catch (Exception e)
3404	4200	{
3405	4201	System.err.println(e);
..	..	@@ -3409,13 +4205,16 @@
3409	4205
3410	4206	static public Object Uncompress(byte[] bytes)
3411	4207	{
3412		- System.out.println("#bytes = " + bytes.length);
	4208	+ System.out.println("restore #bytes = " + bytes.length);
3413	4209	try
3414	4210	{
3415	4211	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3416		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3417		- ObjectInputStream in = new ObjectInputStream(istream);
	4212	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4213	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3418	4214	Object obj = in.readObject();
	4215	+
	4216	+ bais //istream
	4217	+ .close();
3419	4218	in.close();
3420	4219
3421	4220	return obj;
..	..	@@ -3470,39 +4269,97 @@
3470	4269	return null;
3471	4270	}
3472	4271
3473		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3474	4272
3475	4273	public void Save()
3476	4274	{
	4275	+ //Save(true);
	4276	+ Replace();
	4277	+ SetVersionStates();
	4278	+ }
	4279	+
	4280	+ private boolean Equal(byte[] compress, byte[] name)
	4281	+ {
	4282	+ if (compress.length != name.length)
	4283	+ {
	4284	+ return false;
	4285	+ }
	4286	+
	4287	+ for (int i=compress.length; --i>=0;)
	4288	+ {
	4289	+ if (compress[i] != name[i])
	4290	+ return false;
	4291	+ }
	4292	+
	4293	+ return true;
	4294	+ }
	4295	+
	4296	+ void DeleteVersion()
	4297	+ {
	4298	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4299	+ {
	4300	+ copy.versionlist[i] = copy.versionlist[i+1];
	4301	+ }
	4302	+
	4303	+ if (copy.versionlist[copy.versionindex] == null)
	4304	+ copy.versionindex -= 1;
	4305	+
	4306	+ if (copy.versionindex != -1)
	4307	+ CopyChanged();
	4308	+
	4309	+ SetVersionStates();
	4310	+ }
	4311	+
	4312	+ public boolean Save(boolean user)
	4313	+ {
3477	4314	System.err.println("Save");
	4315	+ Replace();
3478	4316
3479		- cRadio tab = GetCurrentTab();
	4317	+ //cRadio tab = GetCurrentTab();
3480	4318
3481		- boolean temp = CameraPane.SWITCH;
3482		- CameraPane.SWITCH = false;
	4319	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3483	4320
3484		- copy.ExtractBigData(hashtable);
	4321	+ boolean thesame = false;
	4322	+
	4323	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4324	+// {
	4325	+// thesame = true;
	4326	+// }
3485	4327
3486	4328	//EditorFrame.m_MainFrame.requestFocusInWindow();
3487		- tab.graphs[tab.undoindex++] = Compress(copy);
3488		-
3489		- copy.RestoreBigData(hashtable);
3490		-
3491		- CameraPane.SWITCH = temp;
3492		-
3493		- //assert(hashtable.isEmpty());
3494		-
3495		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	4329	+ if (!thesame)
3496	4330	{
3497		- tab.graphs[i] = null;
	4331	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4332	+ {
	4333	+ copy.versionlist[i] = copy.versionlist[i-1];
	4334	+ }
	4335	+
	4336	+ //tab.user[tab.versionindex] = user;
	4337	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4338	+
	4339	+ copy.versionlist[++copy.versionindex] = compress;
	4340	+
	4341	+ // if (increment)
	4342	+ // tab.versionindex++;
3498	4343	}
3499	4344
	4345	+ //copy.RestoreBigData(versiontable);
	4346	+
	4347	+ //assert(hashtable.isEmpty());
	4348	+
	4349	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4350	+// {
	4351	+// //tab.user[i] = false;
	4352	+// copy.versionlist[i] = null;
	4353	+// }
	4354	+
	4355	+ SetVersionStates();
	4356	+
3500	4357	// test save
3501	4358	if (false)
3502	4359	{
3503	4360	try
3504	4361	{
3505		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	4362	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3506	4363	ObjectOutputStream p = new ObjectOutputStream(ostream);
3507	4364
3508	4365	p.writeObject(copy);
..	..	@@ -3515,26 +4372,68 @@
3515	4372	e.printStackTrace();
3516	4373	}
3517	4374	}
	4375	+
	4376	+ return !thesame;
	4377	+ }
	4378	+
	4379	+ boolean flashIt = true;
	4380	+
	4381	+ void RefreshSelection()
	4382	+ {
	4383	+ Object3D selection = new Object3D();
	4384	+
	4385	+ for (int i = 0; i < copy.selection.size(); i++)
	4386	+ {
	4387	+ Object3D elem = copy.selection.elementAt(i);
	4388	+
	4389	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4390	+
	4391	+ if (obj == null)
	4392	+ {
	4393	+ copy.selection.remove(i--);
	4394	+ }
	4395	+ else
	4396	+ {
	4397	+ selection.add(obj);
	4398	+ copy.selection.setElementAt(obj, i);
	4399	+ }
	4400	+ }
	4401	+
	4402	+ flashIt = false;
	4403	+ GetTree().clearSelection();
	4404	+ for (int i = 0; i < selection.size(); i++)
	4405	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4406	+ flashIt = true;
	4407	+
	4408	+ //refreshContents(false);
3518	4409	}
3519	4410
3520		- void CopyChanged(Object3D obj)
	4411	+ void CopyChanged()
3521	4412	{
	4413	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4414	+
	4415	+ SetVersionStates();
	4416	+
3522	4417	boolean temp = CameraPane.SWITCH;
3523	4418	CameraPane.SWITCH = false;
3524	4419
3525		- copy.ExtractBigData(hashtable);
	4420	+ copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
3526	4421
3527	4422	copy.clear();
3528	4423
	4424	+ copy.skyboxname = obj.skyboxname;
	4425	+ copy.skyboxext = obj.skyboxext;
	4426	+
3529	4427	for (int i=0; i<obj.Size(); i++)
3530	4428	{
3531	4429	copy.add(obj.get(i));
3532	4430	}
3533	4431
3534		- copy.RestoreBigData(hashtable);
	4432	+ copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
3535	4433
3536	4434	CameraPane.SWITCH = temp;
3537	4435
	4436	+ RefreshSelection();
3538	4437	//assert(hashtable.isEmpty());
3539	4438
3540	4439	copy.Touch();
..	..	@@ -3555,45 +4454,161 @@
3555	4454	}
3556	4455	}
3557	4456
3558		- refreshContents();
	4457	+ refreshContents(true);
3559	4458	}
3560	4459
3561		- public void Undo()
	4460	+ cButton previousVersionButton;
	4461	+ cButton restoreButton;
	4462	+ cButton replaceButton;
	4463	+ cButton nextVersionButton;
	4464	+ cButton saveVersionButton;
	4465	+ cButton deleteVersionButton;
	4466	+
	4467	+ boolean muteSlider;
	4468	+
	4469	+ int VersionCount()
3562	4470	{
	4471	+ int count = 0;
	4472	+
	4473	+ for (int i = copy.versionlist.length; --i >= 0;)
	4474	+ {
	4475	+ if (copy.versionlist[i] != null)
	4476	+ count++;
	4477	+ }
	4478	+
	4479	+ return count;
	4480	+ }
	4481	+
	4482	+ public cGridBag versionSliderPane;
	4483	+
	4484	+ void SetVersionStates()
	4485	+ {
	4486	+ //if (true)
	4487	+ // return;
	4488	+
	4489	+ //cRadio tab = GetCurrentTab();
	4490	+
	4491	+ if (copy.versionlist == null)
	4492	+ {
	4493	+ saveVersionButton.setEnabled(false);
	4494	+ restoreButton.setEnabled(false);
	4495	+ replaceButton.setEnabled(false);
	4496	+ previousVersionButton.setEnabled(false);
	4497	+ nextVersionButton.setEnabled(false);
	4498	+ deleteVersionButton.setEnabled(false);
	4499	+ versionSliderPane.setVisible(false);
	4500	+ }
	4501	+ else
	4502	+ {
	4503	+ restoreButton.setEnabled(copy.versionindex != -1);
	4504	+ replaceButton.setEnabled(copy.versionindex != -1);
	4505	+
	4506	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4507	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4508	+
	4509	+ deleteVersionButton.setEnabled(copy.versionindex != -1);
	4510	+ //copy.versionlist[copy.versionindex + 1] != null);
	4511	+
	4512	+ muteSlider = true;
	4513	+ versionSlider.setMinimum(0);
	4514	+ versionSlider.setMaximum(VersionCount() - 1);
	4515	+ versionSlider.setInteger(copy.versionindex);
	4516	+ versionSlider.setEnabled(copy.versionindex != -1);
	4517	+ muteSlider = false;
	4518	+
	4519	+ versionSliderPane.setVisible(true);
	4520	+ }
	4521	+ }
	4522	+
	4523	+ public boolean PreviousVersion()
	4524	+ {
	4525	+ // Option?
	4526	+ Replace();
	4527	+
3563	4528	System.err.println("Undo");
3564	4529
3565		- cRadio tab = GetCurrentTab();
	4530	+ //cRadio tab = GetCurrentTab();
3566	4531
3567		- if (tab.undoindex == 0)
	4532	+ if (copy.versionindex == 0)
3568	4533	{
3569	4534	java.awt.Toolkit.getDefaultToolkit().beep();
3570		- return;
	4535	+ return false;
3571	4536	}
3572	4537
3573		- if (tab.graphs[tab.undoindex] == null)
3574		- {
3575		- Save();
3576		- tab.undoindex -= 1;
3577		- }
	4538	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4539	+// {
	4540	+// if (Save(false))
	4541	+// tab.versionindex -= 1;
	4542	+// else
	4543	+// {
	4544	+// if (tab.versionindex <= 0)
	4545	+// return false;
	4546	+// else
	4547	+// tab.versionindex -= 1;
	4548	+// }
	4549	+// }
3578	4550
3579		- tab.undoindex -= 1;
	4551	+ copy.versionindex -= 1;
3580	4552
3581		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4553	+ CopyChanged();
	4554	+
	4555	+ return true;
3582	4556	}
3583	4557
3584		- public void Redo()
	4558	+ public boolean Restore()
3585	4559	{
3586		- cRadio tab = GetCurrentTab();
	4560	+ System.err.println("Restore");
3587	4561
3588		- if (tab.graphs[tab.undoindex + 1] == null)
	4562	+ //cRadio tab = GetCurrentTab();
	4563	+
	4564	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4565	+ {
	4566	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4567	+ return false;
	4568	+ }
	4569	+
	4570	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4571	+ CopyChanged();
	4572	+
	4573	+ return true;
	4574	+ }
	4575	+
	4576	+ public boolean Replace()
	4577	+ {
	4578	+ //System.err.println("Replace");
	4579	+
	4580	+ //cRadio tab = GetCurrentTab();
	4581	+
	4582	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4583	+ {
	4584	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4585	+ return false;
	4586	+ }
	4587	+
	4588	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4589	+
	4590	+ return true;
	4591	+ }
	4592	+
	4593	+ public void NextVersion()
	4594	+ {
	4595	+ // Option?
	4596	+ Replace();
	4597	+
	4598	+ //cRadio tab = GetCurrentTab();
	4599	+
	4600	+ if (copy.versionlist[copy.versionindex + 1] == null)
3589	4601	{
3590	4602	java.awt.Toolkit.getDefaultToolkit().beep();
3591	4603	return;
3592	4604	}
3593	4605
3594		- tab.undoindex += 1;
	4606	+ copy.versionindex += 1;
3595	4607
3596		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4608	+ CopyChanged();
	4609	+
	4610	+ //if (!tab.user[tab.versionindex])
	4611	+ // tab.graphs[tab.versionindex] = null;
3597	4612	}
3598	4613
3599	4614	void ImportGFD()
..	..	@@ -3787,6 +4802,12 @@
3787	4802	// else
3788	4803	// applySelf(true);
3789	4804	// }
	4805	+
	4806	+ boolean Equal(double a, double b)
	4807	+ {
	4808	+ return Math.abs(a - b) < 0.001;
	4809	+ }
	4810	+
3790	4811	void applySelf0(boolean name)
3791	4812	{
3792	4813	if (name)
..	..	@@ -3804,7 +4825,7 @@
3804	4825	//copy.material = new cMaterial(copy.GetMaterial());
3805	4826
3806	4827	current.color = (float) colorField.getFloat();
3807		- current.modulation = (float) modulationField.getFloat();
	4828	+ current.modulation = (float) saturationField.getFloat();
3808	4829	current.metalness = (float) metalnessField.getFloat();
3809	4830	current.diffuse = (float) diffuseField.getFloat();
3810	4831	current.specular = (float) specularField.getFloat();
..	..	@@ -3836,29 +4857,52 @@
3836	4857	{
3837	4858	cMaterial mat = copy.material;
3838	4859
3839		- colorField.SetToolTipValue((mat.color));
3840		- modulationField.SetToolTipValue((mat.modulation));
3841		- metalnessField.SetToolTipValue((mat.metalness));
3842		- diffuseField.SetToolTipValue((mat.diffuse));
3843		- specularField.SetToolTipValue((mat.specular));
3844		- shininessField.SetToolTipValue((mat.shininess));
3845		- shiftField.SetToolTipValue((mat.shift));
3846		- ambientField.SetToolTipValue((mat.ambient));
3847		- lightareaField.SetToolTipValue((mat.lightarea));
3848		- diffusenessField.SetToolTipValue((mat.factor));
3849		- velvetField.SetToolTipValue((mat.velvet));
3850		- sheenField.SetToolTipValue((mat.sheen));
3851		- subsurfaceField.SetToolTipValue((mat.subsurface));
3852		- backlitField.SetToolTipValue((mat.bump));
3853		- anisoField.SetToolTipValue((mat.aniso));
3854		- anisoVField.SetToolTipValue((mat.anisoV));
3855		- cameraField.SetToolTipValue((mat.cameralight));
3856		- selfshadowField.SetToolTipValue((mat.diffuseness));
3857		- shadowField.SetToolTipValue((mat.shadow));
3858		- textureField.SetToolTipValue((mat.texture));
3859		- opacityField.SetToolTipValue((mat.opacity));
3860		- fakedepthField.SetToolTipValue((mat.fakedepth));
3861		- shadowbiasField.SetToolTipValue((mat.shadowbias));
	4860	+ if (!Equal(colorField.getFloat(), mat.color))
	4861	+ colorField.SetToolTipValue((mat.color));
	4862	+ if (!Equal(saturationField.getFloat(), mat.modulation))
	4863	+ saturationField.SetToolTipValue((mat.modulation));
	4864	+ if (!Equal(metalnessField.getFloat(), mat.metalness))
	4865	+ metalnessField.SetToolTipValue((mat.metalness));
	4866	+ if (!Equal(diffuseField.getFloat(), mat.diffuse))
	4867	+ diffuseField.SetToolTipValue((mat.diffuse));
	4868	+ if (!Equal(specularField.getFloat(), mat.specular))
	4869	+ specularField.SetToolTipValue((mat.specular));
	4870	+ if (!Equal(shininessField.getFloat(), mat.shininess))
	4871	+ shininessField.SetToolTipValue((mat.shininess));
	4872	+ if (!Equal(shiftField.getFloat(), mat.shift))
	4873	+ shiftField.SetToolTipValue((mat.shift));
	4874	+ if (!Equal(ambientField.getFloat(), mat.ambient))
	4875	+ ambientField.SetToolTipValue((mat.ambient));
	4876	+ if (!Equal(lightareaField.getFloat(), mat.lightarea))
	4877	+ lightareaField.SetToolTipValue((mat.lightarea));
	4878	+ if (!Equal(diffusenessField.getFloat(), mat.factor))
	4879	+ diffusenessField.SetToolTipValue((mat.factor));
	4880	+ if (!Equal(velvetField.getFloat(), mat.velvet))
	4881	+ velvetField.SetToolTipValue((mat.velvet));
	4882	+ if (!Equal(sheenField.getFloat(), mat.sheen))
	4883	+ sheenField.SetToolTipValue((mat.sheen));
	4884	+ if (!Equal(subsurfaceField.getFloat(), mat.subsurface))
	4885	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	4886	+ if (!Equal(backlitField.getFloat(), mat.bump))
	4887	+ backlitField.SetToolTipValue((mat.bump));
	4888	+ if (!Equal(anisoField.getFloat(), mat.aniso))
	4889	+ anisoField.SetToolTipValue((mat.aniso));
	4890	+ if (!Equal(anisoVField.getFloat(), mat.anisoV))
	4891	+ anisoVField.SetToolTipValue((mat.anisoV));
	4892	+ if (!Equal(cameraField.getFloat(), mat.cameralight))
	4893	+ cameraField.SetToolTipValue((mat.cameralight));
	4894	+ if (!Equal(selfshadowField.getFloat(), mat.diffuseness))
	4895	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	4896	+ if (!Equal(shadowField.getFloat(), mat.shadow))
	4897	+ shadowField.SetToolTipValue((mat.shadow));
	4898	+ if (!Equal(textureField.getFloat(), mat.texture))
	4899	+ textureField.SetToolTipValue((mat.texture));
	4900	+ if (!Equal(opacityField.getFloat(), mat.opacity))
	4901	+ opacityField.SetToolTipValue((mat.opacity));
	4902	+ if (!Equal(fakedepthField.getFloat(), mat.fakedepth))
	4903	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	4904	+ if (!Equal(shadowbiasField.getFloat(), mat.shadowbias))
	4905	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
3862	4906	}
3863	4907
3864	4908	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
..	..	@@ -3889,9 +4933,28 @@
3889	4933	//copy.Touch();
3890	4934	}
3891	4935
	4936	+ cNumberSlider versionSlider;
	4937	+
3892	4938	public void stateChanged(ChangeEvent e)
3893	4939	{
3894		- // assert(false);
	4940	+ // assert(false);
	4941	+ if (e.getSource() == versionSlider)
	4942	+ {
	4943	+ if (muteSlider)
	4944	+ return;
	4945	+
	4946	+ Replace();
	4947	+
	4948	+ int version = versionSlider.getInteger();
	4949	+
	4950	+ if (version != -1 && copy.versionlist[version] != null)
	4951	+ {
	4952	+ copy.versionindex = version;
	4953	+ CopyChanged();
	4954	+ }
	4955	+
	4956	+ return;
	4957	+ }
3895	4958
3896	4959	if (freezematerial)
3897	4960	{
..	..	@@ -3927,6 +4990,12 @@
3927	4990	{
3928	4991	//System.out.println("stateChanged = " + this);
3929	4992	materialtouched = true;
	4993	+
	4994	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4995	+ {
	4996	+ saturationField.setFloat(1);
	4997	+ }
	4998	+
3930	4999	applySelf();
3931	5000	//System.out.println("this = " + this);
3932	5001	//System.out.println("PARENT = " + parent);
..	..	@@ -4226,6 +5295,7 @@
4226	5295	{
4227	5296	if (GetTree() != null)
4228	5297	{
	5298	+ GetTree().revalidate();
4229	5299	GetTree().repaint();
4230	5300	}
4231	5301
..	..	@@ -4234,13 +5304,18 @@
4234	5304	ctrlPanel.validate(); // ? new
4235	5305	ctrlPanel.repaint();
4236	5306	}
	5307	+
	5308	+ if (previousVersionButton != null && copy.versionlist != null)
	5309	+ SetVersionStates();
	5310	+
	5311	+ cameraView.requestFocusInWindow();
4237	5312	}
4238	5313
4239	5314	static TweenManager tweenManager = new TweenManager();
4240	5315
4241	5316	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4242	5317	{
4243		- if (Globals.SAVEONMAKE) // && resetmodel)
	5318	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4244	5319	Save();
4245	5320	//Tween.set(thing, 0).target(1).start(tweenManager);
4246	5321	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4265,7 +5340,7 @@
4265	5340	// group = (Composite) group.get(0);
4266	5341	// }
4267	5342
4268		- System.out.println("makeSomething of " + thing);
	5343	+ //System.out.println("makeSomething of " + thing);
4269	5344
4270	5345	/*
4271	5346	if (deselect && jList != null)
..	..	@@ -4482,7 +5557,9 @@
4482	5557	readobj.ResetDisplayList();
4483	5558	} catch (Exception e)
4484	5559	{
4485		- //e.printStackTrace();
	5560	+ if (!e.toString().contains("GZIP"))
	5561	+ e.printStackTrace();
	5562	+
4486	5563	try
4487	5564	{
4488	5565	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4556,12 +5633,14 @@
4556	5633
4557	5634	if (readobj != null)
4558	5635	{
4559		- if (Globals.SAVEONMAKE)
4560		- Save();
	5636	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5637	+ // Save();
4561	5638	try
4562	5639	{
4563	5640	//readobj.deepCopySelf(copy);
4564	5641	copy.clear(); // june 2014
	5642	+ copy.skyboxname = readobj.skyboxname;
	5643	+ copy.skyboxext = readobj.skyboxext;
4565	5644	for (int i = 0; i < readobj.size(); i++)
4566	5645	{
4567	5646	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4602,6 +5681,7 @@
4602	5681	}
4603	5682	} catch (ClassCastException e)
4604	5683	{
	5684	+ e.printStackTrace();
4605	5685	assert (false);
4606	5686	Composite c = (Composite) copy;
4607	5687	c.children.clear();
..	..	@@ -4612,17 +5692,32 @@
4612	5692	c.addChild(csg);
4613	5693	}
4614	5694
	5695	+ copy.versionlist = readobj.versionlist;
	5696	+ copy.versionindex = readobj.versionindex;
	5697	+ copy.versiontable = readobj.versiontable;
	5698	+
	5699	+ if (copy.versionlist == null)
	5700	+ {
	5701	+ // Backward compatibility
	5702	+ copy.versionlist = new Object3D[100];
	5703	+ copy.versionindex = -1;
	5704	+
	5705	+ //Save(true);
	5706	+ }
	5707	+
	5708	+ //? SetUndoStates();
	5709	+
4615	5710	ResetModel();
4616	5711	copy.HardTouch(); // recompile?
4617	5712	refreshContents();
4618	5713	}
4619	5714	}
4620	5715
4621		- void load() // throws ClassNotFoundException
	5716	+ void Open() // throws ClassNotFoundException
4622	5717	{
4623	5718	if (Grafreed.standAlone)
4624	5719	{
4625		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5720	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4626	5721	browser.show();
4627	5722	String filename = browser.getFile();
4628	5723	if (filename != null && filename.length() > 0)
..	..	@@ -4699,6 +5794,8 @@
4699	5794
4700	5795	void save()
4701	5796	{
	5797	+ Replace();
	5798	+
4702	5799	if (lastname == null)
4703	5800	{
4704	5801	return;
..	..	@@ -4721,6 +5818,7 @@
4721	5818	//ps.print(buffer.toString());
4722	5819	} catch (IOException e)
4723	5820	{
	5821	+ e.printStackTrace();
4724	5822	}
4725	5823	}
4726	5824
..	..	@@ -4735,6 +5833,8 @@
4735	5833	String filename = browser.getFile();
4736	5834	if (filename != null && filename.length() > 0)
4737	5835	{
	5836	+ if (!filename.endsWith(".gfd"))
	5837	+ filename += ".gfd";
4738	5838	lastname = browser.getDirectory() + filename;
4739	5839	save();
4740	5840	}
..	..	@@ -4901,7 +6001,7 @@
4901	6001	MenuBar menuBar;
4902	6002	Menu fileMenu;
4903	6003	MenuItem newItem;
4904		- MenuItem loadItem;
	6004	+ MenuItem openItem;
4905	6005	MenuItem saveItem;
4906	6006	MenuItem saveAsItem;
4907	6007	MenuItem exportAsItem;
..	..	@@ -4924,6 +6024,7 @@
4924	6024	CheckboxMenuItem toggleSwitchItem;
4925	6025	CheckboxMenuItem toggleRootItem;
4926	6026	CheckboxMenuItem animationItem;
	6027	+ MenuItem archiveItem;
4927	6028	CheckboxMenuItem toggleHandleItem;
4928	6029	CheckboxMenuItem togglePaintItem;
4929	6030	JSplitPane mainPanel;
..	..	@@ -4937,6 +6038,7 @@
4937	6038	ButtonGroup buttonGroup;
4938	6039
4939	6040	cGridBag toolboxPanel;
	6041	+ cGridBag skyboxPanel;
4940	6042	cGridBag materialPanel;
4941	6043	cGridBag ctrlPanel;
4942	6044
..	..	@@ -4945,7 +6047,10 @@
4945	6047	cGridBag optionsPanel;
4946	6048
4947	6049	JTabbedPane objectPanel;
	6050	+ boolean materialFlushed;
	6051	+ Object3D latestObject;
4948	6052
	6053	+ cGridBag transformPanel;
4949	6054	cGridBag XYZPanel;
4950	6055
4951	6056	JSplitPane gridPanel;
..	..	@@ -5008,7 +6113,7 @@
5008	6113	JLabel colorLabel;
5009	6114	cNumberSlider colorField;
5010	6115	JLabel modulationLabel;
5011		- cNumberSlider modulationField;
	6116	+ cNumberSlider saturationField;
5012	6117	JLabel metalnessLabel;
5013	6118	cNumberSlider metalnessField;
5014	6119	JLabel diffuseLabel;
..	..	@@ -5039,6 +6144,7 @@
5039	6144	cNumberSlider anisoField;
5040	6145	JLabel anisoVLabel;
5041	6146	cNumberSlider anisoVField;
	6147	+
5042	6148	JLabel cameraLabel;
5043	6149	cNumberSlider cameraField;
5044	6150	JLabel selfshadowLabel;
..	..	@@ -5053,6 +6159,7 @@
5053	6159	cNumberSlider fakedepthField;
5054	6160	JLabel shadowbiasLabel;
5055	6161	cNumberSlider shadowbiasField;
	6162	+
5056	6163	JLabel bumpLabel;
5057	6164	cNumberSlider bumpField;
5058	6165	JLabel noiseLabel;