~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,78 @@
38	42	JFrame frame;
39	43
40	44	static ObjEditor theFrame;
	45	+
	46	+ public cGridBag GetSeparator()
	47	+ {
	48	+ cGridBag separator = new cGridBag();
	49	+ separator.add(new JSeparator());
	50	+ separator.preferredHeight = 5;
	51	+ return separator;
	52	+ }
41	53
42	54	cButton GetButton(String name, boolean border)
43	55	{
44		- try
45		- {
46		- ImageIcon icon = GetIcon(name);
47		- return new cButton(icon, border);
48		- }
49		- catch (Exception e)
50		- {
51		- return new cButton(name, border);
52		- }
	56	+ ImageIcon icon = GetIcon(name);
	57	+ return new cButton(icon, border);
	58	+ }
	59	+
	60	+ cLabel GetLabel(String name, boolean border)
	61	+ {
	62	+ //ImageIcon icon = GetIcon(name);
	63	+ return new cLabel(GetImage(name), border);
53	64	}
54	65
55	66	cToggleButton GetToggleButton(String name, boolean border)
56	67	{
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		- }
	68	+ ImageIcon icon = GetIcon(name);
	69	+ return new cToggleButton(icon, border);
66	70	}
67	71
68	72	cCheckBox GetCheckBox(String name, boolean border)
69	73	{
	74	+ ImageIcon icon = GetIcon(name);
	75	+ return new cCheckBox(icon, border);
	76	+ }
	77	+
	78	+ ImageIcon GetIcon(String name)
	79	+ {
70	80	try
71	81	{
72		- ImageIcon icon = GetIcon(name);
73		- return new cCheckBox(icon, border);
	82	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	83	+
	84	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	85	+// {
	86	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	87	+// Graphics2D g = resized.createGraphics();
	88	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	89	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	90	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	91	+// g.dispose();
	92	+//
	93	+// image = resized;
	94	+// }
	95	+
	96	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	97	+ return icon;
74	98	}
75	99	catch (Exception e)
76	100	{
77		- return new cCheckBox(name, border);
	101	+ return null;
78	102	}
79	103	}
80		-
81		- private ImageIcon GetIcon(String name) throws IOException
	104	+
	105	+ BufferedImage GetImage(String name)
82	106	{
83		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
84		-
85		- if (image.getWidth() != 24 && image.getHeight() != 24)
	107	+ try
86	108	{
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;
	109	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	110	+
	111	+ return image;
95	112	}
96		-
97		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
98		- return icon;
	113	+ catch (Exception e)
	114	+ {
	115	+ return null;
	116	+ }
99	117	}
100	118
101	119	// SCRIPT
..	..	@@ -207,7 +225,7 @@
207	225
208	226	objEditor.ctrlPanel.remove(namePanel);
209	227
210		- if (!GroupEditor.allparams)
	228	+ if (!allparams)
211	229	return;
212	230
213	231	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -279,6 +297,14 @@
279	297	client = inClient;
280	298	copy = client;
281	299
	300	+// if (copy.versionlist == null)
	301	+// {
	302	+// copy.versionlist = new Object3D[100];
	303	+// copy.versionindex = -1;
	304	+//
	305	+// callee.Save(true);
	306	+// }
	307	+
282	308	// "this" is not called: SetupUI2(objEditor);
283	309	}
284	310
..	..	@@ -292,6 +318,14 @@
292	318	client = inClient;
293	319	copy = client;
294	320
	321	+ if (copy.versionlist == null)
	322	+ {
	323	+ copy.versionlist = new Object3D[100];
	324	+ copy.versionindex = -1;
	325	+
	326	+// Save(true);
	327	+ }
	328	+
295	329	SetupUI2(callee.GetEditor());
296	330	}
297	331
..	..	@@ -306,7 +340,7 @@
306	340	//localCopy.parent = null;
307	341
308	342	frame = new JFrame();
309		- frame.setUndecorated(true);
	343	+ frame.setUndecorated(false);
310	344	objEditor = this;
311	345	this.callee = callee;
312	346
..	..	@@ -324,6 +358,14 @@
324	358	copy = localCopy;
325	359	copy.editWindow = this;
326	360
	361	+// if (copy.versionlist == null)
	362	+// {
	363	+// copy.versionlist = new Object3D[100];
	364	+// copy.versionindex = -1;
	365	+//
	366	+// Save(true);
	367	+// }
	368	+
327	369	SetupMenu();
328	370
329	371	//SetupName(objEditor); // new
..	..	@@ -337,12 +379,17 @@
337	379	return frame.action(event, obj);
338	380	}
339	381
	382	+ // Cannot work without static
	383	+ static boolean allparams = true;
	384	+
	385	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	386	+
340	387	void SetupMenu()
341	388	{
342	389	frame.setMenuBar(menuBar = new MenuBar());
343	390	menuBar.add(fileMenu = new Menu("File"));
344	391	fileMenu.add(newItem = new MenuItem("New"));
345		- fileMenu.add(loadItem = new MenuItem("Open..."));
	392	+ fileMenu.add(openItem = new MenuItem("Open..."));
346	393
347	394	//oe.menuBar.add(menu = new Menu("Include"));
348	395	Menu menu = new Menu("Import");
..	..	@@ -374,7 +421,7 @@
374	421	}
375	422
376	423	newItem.addActionListener(this);
377		- loadItem.addActionListener(this);
	424	+ openItem.addActionListener(this);
378	425	saveItem.addActionListener(this);
379	426	saveAsItem.addActionListener(this);
380	427	exportAsItem.addActionListener(this);
..	..	@@ -383,13 +430,71 @@
383	430	closeItem.addActionListener(this);
384	431
385	432	objectPanel = new JTabbedPane();
	433	+
	434	+ ChangeListener changeListener = new ChangeListener()
	435	+ {
	436	+ String name;
	437	+
	438	+ public void stateChanged(ChangeEvent changeEvent)
	439	+ {
	440	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	441	+// {
	442	+// if (latestObject != null)
	443	+// {
	444	+// refreshContents(true);
	445	+// SetMaterial(latestObject);
	446	+// }
	447	+//
	448	+// materialFlushed = true;
	449	+// }
	450	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	451	+// {
	452	+// if (listUI.size() == 0)
	453	+// EditSelection(false);
	454	+// }
	455	+
	456	+ if (objectPanel.getSelectedIndex() == 4)
	457	+ {
	458	+ name = copy.skyboxname;
	459	+
	460	+ if (name == null)
	461	+ {
	462	+ name = "";
	463	+ }
	464	+
	465	+ copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	466	+ copy.skyboxext = "jpg";
	467	+ }
	468	+ else
	469	+ {
	470	+ if (name != null)
	471	+ {
	472	+ if (name.equals(""))
	473	+ {
	474	+ copy.skyboxname = null;
	475	+ copy.skyboxext = null;
	476	+ }
	477	+ else
	478	+ {
	479	+ copy.skyboxname = name;
	480	+ }
	481	+ }
	482	+ }
	483	+
	484	+// refreshContents(false); // To refresh Info tab
	485	+ cameraView.repaint();
	486	+ }
	487	+ };
	488	+ objectPanel.addChangeListener(changeListener);
	489	+
386	490	toolbarPanel = new JPanel();
387	491	toolbarPanel.setName("Toolbar");
	492	+
388	493	treePanel = new cGridBag();
389	494	treePanel.setName("Tree");
390	495
391	496	editPanel = new cGridBag().setVertical(true);
392		- editPanel.setName("Edit");
	497	+ //editPanel.setName("Edit");
393	498
394	499	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
395	500
..	..	@@ -397,11 +502,13 @@
397	502	editPanel.add(editCommandsPanel);
398	503	editPanel.add(ctrlPanel);
399	504
400		- toolboxPanel = new cGridBag().setVertical(false);
401		- toolboxPanel.setName("Toolbox");
	505	+ toolboxPanel = new cGridBag().setVertical(true);
	506	+ //toolboxPanel.setName("Toolbox");
402	507
403		- materialPanel = new cGridBag().setVertical(true);
404		- materialPanel.setName("Material");
	508	+ skyboxPanel = new cGridBag().setVertical(true);
	509	+
	510	+ materialPanel = new cGridBag().setVertical(false);
	511	+ //materialPanel.setName("Material");
405	512
406	513	/JTextPane/
407	514	infoarea = createTextPane();
..	..	@@ -409,14 +516,15 @@
409	516
410	517	infoarea.setEditable(true);
411	518	SetText();
	519	+
412	520	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
413	521	// infoarea.setOpaque(false);
414	522	// //infoarea.setForeground(textcolor);
415	523	// TEXTAREA infoarea.setLineWrap(true);
416	524	// TEXTAREA infoarea.setWrapStyleWord(true);
417	525	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");
	526	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	527	+ //infoPanel.setName("Info");
420	528	//infoPanel.setLayout(new BorderLayout());
421	529	//infoPanel.add(createTextPane());
422	530
..	..	@@ -427,7 +535,14 @@
427	535	mainPanel.setDividerSize(9);
428	536	mainPanel.setDividerLocation(0.5); //1.0);
429	537	mainPanel.setResizeWeight(0.5);
430		-
	538	+
	539	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	540	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	541	+ divider.setDividerSize(15);
	542	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	543	+
	544	+ mainPanel.setUI(new BasicSplitPaneUI());
	545	+
431	546	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
432	547	//mainPanel.setLayout(new GridBagLayout());
433	548	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -658,8 +773,8 @@
658	773	}
659	774	}
660	775
661		-static GraphicsDevice device = GraphicsEnvironment
662		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	776	+//static GraphicsDevice device = GraphicsEnvironment
	777	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
663	778
664	779	Rectangle keeprect;
665	780	cRadio radio;
..	..	@@ -676,14 +791,24 @@
676	791	boolean maximized;
677	792
678	793	cButton fullscreenLayout;
	794	+ cButton expandedLayout;
679	795
680	796	void Minimize()
681	797	{
682	798	frame.setState(Frame.ICONIFIED);
	799	+ frame.validate();
683	800	}
684	801
	802	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	803	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	804	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
685	805	void Maximize()
686	806	{
	807	+ if (CameraPane.FULLSCREEN)
	808	+ {
	809	+ ToggleFullScreen();
	810	+ }
	811	+
687	812	if (maximized)
688	813	{
689	814	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -691,20 +816,38 @@
691	816	else
692	817	{
693	818	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);
	819	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	820	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	821	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
697	822	// frame.setState(Frame.MAXIMIZED_BOTH);
	823	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
698	824	}
699	825
700	826	maximized ^= true;
	827	+
	828	+ frame.validate();
701	829	}
	830	+
	831	+ cButton minButton;
	832	+ cButton maxButton;
	833	+ cButton fullButton;
	834	+ cButton collapseButton;
	835	+ cButton maximize3DButton;
702	836
703	837	void ToggleFullScreen()
704	838	{
705		- if (CameraPane.FULLSCREEN)
	839	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	840	+
	841	+ cameraView.ToggleFullScreen();
	842	+
	843	+ if (!CameraPane.FULLSCREEN)
706	844	{
707	845	device.setFullScreenWindow(null);
	846	+ frame.dispose();
	847	+ frame.setUndecorated(false);
	848	+ frame.validate();
	849	+ frame.setVisible(true);
	850	+
708	851	//frame.setVisible(false);
709	852	// frame.removeNotify();
710	853	// frame.setUndecorated(false);
..	..	@@ -714,13 +857,13 @@
714	857	// X frame.getContentPane().remove(/"Center",/bigThree);
715	858	// X framePanel.add(bigThree);
716	859	// X frame.getContentPane().add(/"Center",/framePanel);
717		- framePanel.setDividerLocation(1);
	860	+// framePanel.setDividerLocation(46); // icons are 24x24
718	861
719	862	//frame.setVisible(true);
720		- radio.layout = keepButton;
	863	+// radio.layout = keepButton;
721	864	//theFrame = null;
722	865	keepButton = null;
723		- radio.layout.doClick();
	866	+// radio.layout.doClick();
724	867
725	868	} else
726	869	{
..	..	@@ -729,22 +872,59 @@
729	872	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
730	873	// frame.getToolkit().getScreenSize().height);
731	874	//frame.setVisible(false);
	875	+
	876	+ frame.dispose();
	877	+ frame.setUndecorated(true);
732	878	device.setFullScreenWindow(frame);
	879	+ frame.validate();
	880	+ frame.setVisible(true);
733	881	// frame.removeNotify();
734	882	// frame.setUndecorated(true);
735	883	// frame.addNotify();
736	884	// X frame.getContentPane().remove(/"Center",/framePanel);
737	885	// X framePanel.remove(bigThree);
738	886	// X frame.getContentPane().add(/"Center",/bigThree);
739		- framePanel.setDividerLocation(0);
	887	+// framePanel.setDividerLocation(0);
740	888
741		- radio.layout = fullscreenLayout;
742		- radio.layout.doClick();
	889	+// radio.layout = fullscreenLayout;
	890	+// radio.layout.doClick();
743	891	//frame.setVisible(true);
744	892	}
745		-
746		- cameraView.ToggleFullScreen();
	893	+ frame.validate();
	894	+
	895	+ cameraView.requestFocusInWindow();
747	896	}
	897	+
	898	+ void CollapseToolbar()
	899	+ {
	900	+ framePanel.setDividerLocation(0);
	901	+ //frame.validate();
	902	+
	903	+ cameraView.requestFocusInWindow();
	904	+ }
	905	+
	906	+ private Object3D Duplicate(Object3D object)
	907	+ {
	908	+ boolean temp = CameraPane.SWITCH;
	909	+ CameraPane.SWITCH = false;
	910	+
	911	+ object.ExtractBigData(versiontable);
	912	+ // if (copy == client)
	913	+
	914	+ Object3D versions[] = object.versionlist;
	915	+ object.versionlist = null;
	916	+
	917	+ //byte[] compress = Compress(copy);
	918	+ Object3D compress = (Object3D)Grafreed.clone(object);
	919	+
	920	+ object.versionlist = versions;
	921	+
	922	+ object.RestoreBigData(versiontable);
	923	+
	924	+ CameraPane.SWITCH = temp;
	925	+
	926	+ return compress;
	927	+ }
748	928
749	929	private JTextPane createTextPane()
750	930	{
..	..	@@ -867,6 +1047,7 @@
867	1047	{
868	1048	SetupMaterial(materialPanel);
869	1049	}
	1050	+
870	1051	//SetupName();
871	1052	//SetupViews();
872	1053	}
..	..	@@ -876,7 +1057,7 @@
876	1057	// NumberSlider vDivsField;
877	1058	// JCheckBox endcaps;
878	1059	JCheckBox liveCB;
879		- JCheckBox selectCB;
	1060	+ JCheckBox selectableCB;
880	1061	JCheckBox hideCB;
881	1062	JCheckBox link2masterCB;
882	1063	JCheckBox markCB;
..	..	@@ -884,7 +1065,12 @@
884	1065	JCheckBox speedupCB;
885	1066	JCheckBox rewindCB;
886	1067	JCheckBox flipVCB;
	1068	+
	1069	+ cCheckBox toggleTextureCB;
	1070	+ cCheckBox toggleSwitchCB;
	1071	+
887	1072	JComboBox texresMenu;
	1073	+
888	1074	JButton resetButton;
889	1075	JButton stepButton;
890	1076	JButton stepAllButton;
..	..	@@ -1070,39 +1256,55 @@
1070	1256
1071	1257	namePanel = new cGridBag();
1072	1258
	1259	+ //if (copy.pinned)
	1260	+ {
	1261	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1262	+ pinButton.setSelected(copy.pinned);
	1263	+ cGridBag t = new cGridBag();
	1264	+ t.preferredWidth = 2;
	1265	+ t.add(pinButton);
	1266	+ namePanel.add(t);
	1267	+
	1268	+ pinButton.addItemListener(this);
	1269	+ }
	1270	+
1073	1271	nameField = AddText(namePanel, copy.GetName());
1074		- namePanel.add(nameField);
	1272	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1075	1273	oe.ctrlPanel.add(namePanel);
1076	1274
1077	1275	oe.ctrlPanel.Return();
1078	1276
1079		- if (!GroupEditor.allparams)
	1277	+ if (!allparams)
1080	1278	return;
1081	1279
1082	1280	setupPanel = new cGridBag().setVertical(false);
1083	1281
1084	1282	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1085	1283	liveCB.setToolTipText("Animate object");
1086		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1087		- selectCB.setToolTipText("Make object selectable");
	1284	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1285	+ selectableCB.setToolTipText("Make object selectable");
1088	1286	// Return();
	1287	+
1089	1288	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1090	1289	hideCB.setToolTipText("Hide object");
1091	1290	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1092		- markCB.setToolTipText("Set the animation target transform");
	1291	+ markCB.setToolTipText("As animation target transform");
	1292	+
	1293	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1093	1294
1094	1295	setupPanel2 = new cGridBag().setVertical(false);
1095	1296
1096	1297	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1097	1298	rewindCB.setToolTipText("Rewind animation");
1098	1299
1099		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1100		- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1300	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1301	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1101	1302
	1303	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1304	+ link2masterCB.setToolTipText("Attach to support");
	1305	+
1102	1306	if (Globals.ADVANCED)
1103	1307	{
1104		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1105		- link2masterCB.setToolTipText("Attach to support");
1106	1308	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1107	1309	speedupCB.setToolTipText("Option motion capture");
1108	1310	}
..	..	@@ -1376,6 +1578,7 @@
1376	1578	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1377	1579	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1378	1580	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1581	+ //XYZPanel.setName("XYZ");
1379	1582
1380	1583	/*
1381	1584	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1412,15 +1615,30 @@
1412	1615
1413	1616	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1414	1617	//tmp.setName("Edit");
1415		- objectPanel.add(toolboxPanel);
1416	1618	objectPanel.add(materialPanel);
	1619	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1620	+ objectPanel.setToolTipTextAt(0, "Material");
	1621	+
	1622	+ objectPanel.add(toolboxPanel);
	1623	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1624	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1625	+
	1626	+ objectPanel.add(skyboxPanel);
	1627	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1628	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1629	+
1417	1630	// JPanel north = new JPanel(new BorderLayout());
1418	1631	// north.setName("Edit");
1419	1632	// north.add(ctrlPanel, BorderLayout.NORTH);
1420	1633	// objectPanel.add(north);
1421	1634	objectPanel.add(editPanel);
1422		- objectPanel.add(infoPanel);
1423		-
	1635	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1636	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1637	+
	1638	+ objectPanel.add(XYZPanel);
	1639	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1640	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1641	+
1424	1642	/*
1425	1643	aConstraints.gridx = 0;
1426	1644	aConstraints.gridwidth = 1;
..	..	@@ -1428,7 +1646,7 @@
1428	1646	aConstraints.gridy += 1;
1429	1647	aConstraints.gridwidth = 1;
1430	1648	mainPanel.add(objectPanel, aConstraints);
1431		- */
	1649	+ */
1432	1650
1433	1651	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1434	1652	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1440,14 +1658,12 @@
1440	1658	scrollpane.addMouseWheelListener(this); // Default not fast enough
1441	1659
1442	1660	/JTabbedPane/ scenePanel = new cGridBag();
1443		- scenePanel.preferredWidth = 6;
	1661	+ scenePanel.preferredWidth = 5;
1444	1662
1445	1663	JTabbedPane tabbedPane = new JTabbedPane();
1446	1664	tabbedPane.add(scrollpane);
1447	1665
1448		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1449		-
1450		- optionsPanel = new cGridBag().setVertical(true);
	1666	+ optionsPanel = new cGridBag().setVertical(false);
1451	1667
1452	1668	optionsPanel.setName("Options");
1453	1669
..	..	@@ -1455,8 +1671,15 @@
1455	1671
1456	1672	tabbedPane.add(optionsPanel);
1457	1673
	1674	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1675	+
1458	1676	scenePanel.add(tabbedPane);
1459	1677
	1678	+ //if (Globals.ADVANCED)
	1679	+ tabbedPane.add(infoPanel);
	1680	+ tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1681	+ tabbedPane.setToolTipTextAt(3, "Information");
	1682	+
1460	1683	/*
1461	1684	cTree jTree = new cTree(null);
1462	1685	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1518,7 +1741,7 @@
1518	1741	bigThree = new cGridBag();
1519	1742	bigThree.addComponent(scenePanel);
1520	1743	bigThree.addComponent(centralPanel);
1521		- bigThree.addComponent(XYZPanel);
	1744	+ //bigThree.addComponent(XYZPanel);
1522	1745
1523	1746	// // SIDE EFFECT!!!
1524	1747	// aConstraints.gridx = 0;
..	..	@@ -1527,9 +1750,26 @@
1527	1750	// aConstraints.gridheight = 1;
1528	1751
1529	1752	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1530		- framePanel.setContinuousLayout(true);
1531		- framePanel.setOneTouchExpandable(true);
1532		- framePanel.setDividerLocation(0.8);
	1753	+
	1754	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1755	+ new java.beans.PropertyChangeListener()
	1756	+ {
	1757	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1758	+ {
	1759	+ if ((Integer)pce.getOldValue() == 1)
	1760	+ {
	1761	+ if (radio.layout != expandedLayout)
	1762	+ {
	1763	+ radio.layout = expandedLayout;
	1764	+ radio.layout.doClick();
	1765	+ }
	1766	+ }
	1767	+ }
	1768	+ });
	1769	+
	1770	+ framePanel.setContinuousLayout(false);
	1771	+ framePanel.setOneTouchExpandable(false);
	1772	+ //.setDividerLocation(0.8);
1533	1773	//framePanel.setDividerSize(15);
1534	1774	//framePanel.setResizeWeight(0.15);
1535	1775	framePanel.setName("Frame");
..	..	@@ -1547,16 +1787,18 @@
1547	1787	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1548	1788
1549	1789	frame.setSize(1280, 860);
1550		- frame.setVisible(true);
1551		-
	1790	+
1552	1791	cameraView.requestFocusInWindow();
1553	1792
1554	1793	gridPanel.setDividerLocation(1.0);
	1794	+
	1795	+ frame.validate();
	1796	+
	1797	+ frame.setVisible(true);
1555	1798
1556	1799	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1557	1800	frame.addWindowListener(new WindowAdapter()
1558	1801	{
1559		-
1560	1802	public void windowClosing(WindowEvent e)
1561	1803	{
1562	1804	Close();
..	..	@@ -1579,12 +1821,403 @@
1579	1821	ctrlPanel.removeAll();
1580	1822	}
1581	1823
1582		- void SetupMaterial(cGridBag panel)
	1824	+ void SetupMaterial(cGridBag materialpanel)
1583	1825	{
1584		- /*
	1826	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1827	+
	1828	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1829	+ skin.setToolTipText("Skin");
	1830	+ skin.addMouseListener(new MouseAdapter()
	1831	+ {
	1832	+ public void mouseClicked(MouseEvent e)
	1833	+ {
	1834	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1835	+ cMaterial material = object.material;
	1836	+
	1837	+ // Skin
	1838	+ colorField.setFloat(material.color);
	1839	+ saturationField.setFloat(material.modulation);
	1840	+ subsurfaceField.setFloat(material.subsurface);
	1841	+ selfshadowField.setFloat(material.diffuseness);
	1842	+ diffusenessField.setFloat(material.factor);
	1843	+ shininessField.setFloat(material.shininess);
	1844	+ shadowbiasField.setFloat(material.shadowbias);
	1845	+ diffuseField.setFloat(material.diffuse);
	1846	+ specularField.setFloat(material.specular);
	1847	+
	1848	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1849	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1850	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1851	+
	1852	+ materialtouched = true;
	1853	+ applySelf();
	1854	+ }
	1855	+ });
	1856	+ presetpanel.add(skin);
	1857	+
	1858	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1859	+ lambert.setToolTipText("Diffuse");
	1860	+ lambert.addMouseListener(new MouseAdapter()
	1861	+ {
	1862	+ public void mouseClicked(MouseEvent e)
	1863	+ {
	1864	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1865	+ cMaterial material = object.material;
	1866	+
	1867	+ diffusenessField.setFloat(material.factor);
	1868	+ selfshadowField.setFloat(material.diffuseness);
	1869	+
	1870	+ materialtouched = true;
	1871	+ applySelf();
	1872	+ }
	1873	+ });
	1874	+ presetpanel.add(lambert);
	1875	+
	1876	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1877	+ diffuse2.setToolTipText("Diffuse2");
	1878	+ diffuse2.addMouseListener(new MouseAdapter()
	1879	+ {
	1880	+ public void mouseClicked(MouseEvent e)
	1881	+ {
	1882	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1883	+ cMaterial material = object.material;
	1884	+
	1885	+ diffusenessField.setFloat(material.factor);
	1886	+ selfshadowField.setFloat(material.diffuseness);
	1887	+
	1888	+ materialtouched = true;
	1889	+ applySelf();
	1890	+ }
	1891	+ });
	1892	+ presetpanel.add(diffuse2);
	1893	+
	1894	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1895	+ diffusemoon.setToolTipText("Moon");
	1896	+ diffusemoon.addMouseListener(new MouseAdapter()
	1897	+ {
	1898	+ public void mouseClicked(MouseEvent e)
	1899	+ {
	1900	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1901	+ cMaterial material = object.material;
	1902	+
	1903	+ diffusenessField.setFloat(material.factor);
	1904	+ selfshadowField.setFloat(material.diffuseness);
	1905	+
	1906	+ materialtouched = true;
	1907	+ applySelf();
	1908	+ }
	1909	+ });
	1910	+ presetpanel.add(diffusemoon);
	1911	+
	1912	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1913	+ diffusemoon2.setToolTipText("Moon2");
	1914	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1915	+ {
	1916	+ public void mouseClicked(MouseEvent e)
	1917	+ {
	1918	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1919	+ cMaterial material = object.material;
	1920	+
	1921	+ diffusenessField.setFloat(material.factor);
	1922	+ selfshadowField.setFloat(material.diffuseness);
	1923	+
	1924	+ materialtouched = true;
	1925	+ applySelf();
	1926	+ }
	1927	+ });
	1928	+ presetpanel.add(diffusemoon2);
	1929	+
	1930	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1931	+ diffusemoon3.setToolTipText("Moon3");
	1932	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1933	+ {
	1934	+ public void mouseClicked(MouseEvent e)
	1935	+ {
	1936	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1937	+ cMaterial material = object.material;
	1938	+
	1939	+ diffusenessField.setFloat(material.factor);
	1940	+ selfshadowField.setFloat(material.diffuseness);
	1941	+
	1942	+ materialtouched = true;
	1943	+ applySelf();
	1944	+ }
	1945	+ });
	1946	+ presetpanel.add(diffusemoon3);
	1947	+
	1948	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1949	+ diffusesheen.setToolTipText("Sheen");
	1950	+ diffusesheen.addMouseListener(new MouseAdapter()
	1951	+ {
	1952	+ public void mouseClicked(MouseEvent e)
	1953	+ {
	1954	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1955	+ cMaterial material = object.material;
	1956	+
	1957	+ sheenField.setFloat(material.sheen);
	1958	+
	1959	+ materialtouched = true;
	1960	+ applySelf();
	1961	+ }
	1962	+ });
	1963	+ presetpanel.add(diffusesheen);
	1964	+
	1965	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	1966	+ rough.setToolTipText("Rough metal");
	1967	+ rough.addMouseListener(new MouseAdapter()
	1968	+ {
	1969	+ public void mouseClicked(MouseEvent e)
	1970	+ {
	1971	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	1972	+ cMaterial material = object.material;
	1973	+
	1974	+ shininessField.setFloat(material.shininess);
	1975	+ velvetField.setFloat(material.velvet);
	1976	+
	1977	+ materialtouched = true;
	1978	+ applySelf();
	1979	+ }
	1980	+ });
	1981	+ presetpanel.add(rough);
	1982	+
	1983	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	1984	+ rough2.setToolTipText("Medium metal");
	1985	+ rough2.addMouseListener(new MouseAdapter()
	1986	+ {
	1987	+ public void mouseClicked(MouseEvent e)
	1988	+ {
	1989	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	1990	+ cMaterial material = object.material;
	1991	+
	1992	+ shininessField.setFloat(material.shininess);
	1993	+ lightareaField.setFloat(material.lightarea);
	1994	+
	1995	+ materialtouched = true;
	1996	+ applySelf();
	1997	+ }
	1998	+ });
	1999	+ presetpanel.add(rough2);
	2000	+
	2001	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2002	+ shini0.setToolTipText("Shiny");
	2003	+ shini0.addMouseListener(new MouseAdapter()
	2004	+ {
	2005	+ public void mouseClicked(MouseEvent e)
	2006	+ {
	2007	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2008	+ cMaterial material = object.material;
	2009	+
	2010	+ shininessField.setFloat(material.shininess);
	2011	+ lightareaField.setFloat(material.lightarea);
	2012	+
	2013	+ materialtouched = true;
	2014	+ applySelf();
	2015	+ }
	2016	+ });
	2017	+ presetpanel.add(shini0);
	2018	+
	2019	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2020	+ shini1.setToolTipText("Shiny2");
	2021	+ shini1.addMouseListener(new MouseAdapter()
	2022	+ {
	2023	+ public void mouseClicked(MouseEvent e)
	2024	+ {
	2025	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2026	+ cMaterial material = object.material;
	2027	+
	2028	+ shininessField.setFloat(material.shininess);
	2029	+ lightareaField.setFloat(material.lightarea);
	2030	+
	2031	+ materialtouched = true;
	2032	+ applySelf();
	2033	+ }
	2034	+ });
	2035	+ presetpanel.add(shini1);
	2036	+
	2037	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2038	+ shini2.setToolTipText("Shiny3");
	2039	+ shini2.addMouseListener(new MouseAdapter()
	2040	+ {
	2041	+ public void mouseClicked(MouseEvent e)
	2042	+ {
	2043	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2044	+ cMaterial material = object.material;
	2045	+
	2046	+ shininessField.setFloat(material.shininess);
	2047	+ lightareaField.setFloat(material.lightarea);
	2048	+
	2049	+ materialtouched = true;
	2050	+ applySelf();
	2051	+ }
	2052	+ });
	2053	+ presetpanel.add(shini2);
	2054	+
	2055	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2056	+ aniso.setToolTipText("AnisoU");
	2057	+ aniso.addMouseListener(new MouseAdapter()
	2058	+ {
	2059	+ public void mouseClicked(MouseEvent e)
	2060	+ {
	2061	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2062	+ cMaterial material = object.material;
	2063	+
	2064	+ anisoField.setFloat(material.aniso);
	2065	+ anisoVField.setFloat(material.anisoV);
	2066	+
	2067	+ materialtouched = true;
	2068	+ applySelf();
	2069	+ }
	2070	+ });
	2071	+ presetpanel.add(aniso);
	2072	+
	2073	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2074	+ aniso2.setToolTipText("AnisoV");
	2075	+ aniso2.addMouseListener(new MouseAdapter()
	2076	+ {
	2077	+ public void mouseClicked(MouseEvent e)
	2078	+ {
	2079	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2080	+ cMaterial material = object.material;
	2081	+
	2082	+ anisoField.setFloat(material.aniso);
	2083	+ anisoVField.setFloat(material.anisoV);
	2084	+
	2085	+ materialtouched = true;
	2086	+ applySelf();
	2087	+ }
	2088	+ });
	2089	+ presetpanel.add(aniso2);
	2090	+
	2091	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2092	+ aniso3.setToolTipText("AnisoUV");
	2093	+ aniso3.addMouseListener(new MouseAdapter()
	2094	+ {
	2095	+ public void mouseClicked(MouseEvent e)
	2096	+ {
	2097	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2098	+ cMaterial material = object.material;
	2099	+
	2100	+ anisoField.setFloat(material.aniso);
	2101	+ anisoVField.setFloat(material.anisoV);
	2102	+
	2103	+ materialtouched = true;
	2104	+ applySelf();
	2105	+ }
	2106	+ });
	2107	+ presetpanel.add(aniso3);
	2108	+
	2109	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2110	+ velvet0.setToolTipText("Velvet");
	2111	+ velvet0.addMouseListener(new MouseAdapter()
	2112	+ {
	2113	+ public void mouseClicked(MouseEvent e)
	2114	+ {
	2115	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2116	+ cMaterial material = object.material;
	2117	+
	2118	+ diffusenessField.setFloat(material.factor);
	2119	+ selfshadowField.setFloat(material.diffuseness);
	2120	+ sheenField.setFloat(material.sheen);
	2121	+ shininessField.setFloat(material.shininess);
	2122	+ velvetField.setFloat(material.velvet);
	2123	+ shiftField.setFloat(material.shift);
	2124	+
	2125	+ materialtouched = true;
	2126	+ applySelf();
	2127	+ }
	2128	+ });
	2129	+ presetpanel.add(velvet0);
	2130	+
	2131	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2132	+ bump0.setToolTipText("Bump texture");
	2133	+ bump0.addMouseListener(new MouseAdapter()
	2134	+ {
	2135	+ public void mouseClicked(MouseEvent e)
	2136	+ {
	2137	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2138	+ cMaterial material = object.material;
	2139	+
	2140	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2141	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2142	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2143	+
	2144	+ materialtouched = true;
	2145	+ applySelf();
	2146	+ }
	2147	+ });
	2148	+ presetpanel.add(bump0);
	2149	+
	2150	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2151	+ halo.setToolTipText("Halo");
	2152	+ halo.addMouseListener(new MouseAdapter()
	2153	+ {
	2154	+ public void mouseClicked(MouseEvent e)
	2155	+ {
	2156	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2157	+ cMaterial material = object.material;
	2158	+
	2159	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2160	+
	2161	+ materialtouched = true;
	2162	+ applySelf();
	2163	+ }
	2164	+ });
	2165	+ presetpanel.add(halo);
	2166	+
	2167	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2168	+ candle.setToolTipText("Candle");
	2169	+ candle.addMouseListener(new MouseAdapter()
	2170	+ {
	2171	+ public void mouseClicked(MouseEvent e)
	2172	+ {
	2173	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2174	+ cMaterial material = object.material;
	2175	+
	2176	+ subsurfaceField.setFloat(material.subsurface);
	2177	+ shadowbiasField.setFloat(material.shadowbias);
	2178	+ ambientField.setFloat(material.ambient);
	2179	+ specularField.setFloat(material.specular);
	2180	+ lightareaField.setFloat(material.lightarea);
	2181	+ shininessField.setFloat(material.shininess);
	2182	+
	2183	+ materialtouched = true;
	2184	+ applySelf();
	2185	+ }
	2186	+ });
	2187	+ presetpanel.add(candle);
	2188	+
	2189	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2190	+ shadowShader.setToolTipText("Shadow");
	2191	+ shadowShader.addMouseListener(new MouseAdapter()
	2192	+ {
	2193	+ public void mouseClicked(MouseEvent e)
	2194	+ {
	2195	+ diffuseField.setFloat(0.001);
	2196	+ ambientField.setFloat(0.001);
	2197	+ cameraField.setFloat(0.001);
	2198	+ specularField.setFloat(0.001);
	2199	+ fakedepthField.setFloat(0.001);
	2200	+ opacityField.setFloat(0.6);
	2201	+
	2202	+ materialtouched = true;
	2203	+ applySelf();
	2204	+ }
	2205	+ });
	2206	+ presetpanel.add(shadowShader);
	2207	+
	2208	+ cGridBag panel = new cGridBag().setVertical(true);
	2209	+
	2210	+ presetpanel.preferredWidth = 1;
	2211	+
	2212	+ materialpanel.add(presetpanel);
	2213	+ materialpanel.add(panel);
	2214	+
	2215	+ panel.preferredWidth = 8;
	2216	+
	2217	+ /*
1585	2218	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1586	2219	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1587		- */
	2220	+ */
1588	2221
1589	2222	cGridBag editBar = new cGridBag().setVertical(false);
1590	2223
..	..	@@ -1618,45 +2251,50 @@
1618	2251	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1619	2252
1620	2253	cGridBag colorSection = new cGridBag().setVertical(true);
	2254	+
	2255	+ cGridBag huepanel = new cGridBag();
	2256	+ cGridBag huelabel = new cGridBag();
	2257	+ skin = GetLabel("icons/hue.png", false);
	2258	+ skin.fit = true;
	2259	+ huelabel.add(skin);
	2260	+ huelabel.preferredWidth = 20;
	2261	+ huepanel.add(new cGridBag()); // Label
	2262	+ huepanel.add(huelabel); // Field/slider
	2263	+
	2264	+ huepanel.preferredHeight = 7;
	2265	+
	2266	+ colorSection.add(huepanel);
1621	2267
1622	2268	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);
	2269	+
	2270	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2271	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2272	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2273	+
1626	2274	//colorField.preferredWidth = 200;
1627	2275	colorSection.add(color);
1628	2276
1629	2277	cGridBag modulation = new cGridBag();
1630	2278	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1631	2279	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1632		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2280	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1633	2281	colorSection.add(modulation);
1634	2282
	2283	+ cGridBag opacity = new cGridBag();
	2284	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2285	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2286	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2287	+ colorSection.add(opacity);
	2288	+
	2289	+ colorSection.add(GetSeparator());
	2290	+
1635	2291	cGridBag texture = new cGridBag();
1636	2292	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1637	2293	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1638	2294	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1639	2295	colorSection.add(texture);
1640	2296
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());
	2297	+ panel.add(GetSeparator());
1660	2298
1661	2299	panel.add(colorSection);
1662	2300
..	..	@@ -1706,7 +2344,13 @@
1706	2344	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1707	2345	diffuseSection.add(fakedepth);
1708	2346
1709		- panel.add(new JSeparator());
	2347	+ cGridBag shadowbias = new cGridBag();
	2348	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2349	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2350	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2351	+ diffuseSection.add(shadowbias);
	2352	+
	2353	+ panel.add(GetSeparator());
1710	2354
1711	2355	panel.add(diffuseSection);
1712	2356
..	..	@@ -1756,42 +2400,48 @@
1756	2400	// aConstraints.gridy += 1;
1757	2401	// aConstraints.gridwidth = 1;
1758	2402
	2403	+ cGridBag anisoU = new cGridBag();
	2404	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2405	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2406	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2407	+ specularSection.add(anisoU);
1759	2408
1760		- panel.add(new JSeparator());
	2409	+ cGridBag anisoV = new cGridBag();
	2410	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2411	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2412	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2413	+ specularSection.add(anisoV);
	2414	+
	2415	+
	2416	+ panel.add(GetSeparator());
1761	2417
1762	2418	panel.add(specularSection);
1763	2419
1764	2420	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1765	2421
1766		- cGridBag globalSection = new cGridBag().setVertical(true);
	2422	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1767	2423
1768	2424	cGridBag camera = new cGridBag();
1769	2425	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1770	2426	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1771	2427	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1772		- globalSection.add(camera);
	2428	+ colorSection.add(camera);
1773	2429
1774	2430	cGridBag ambient = new cGridBag();
1775	2431	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1776	2432	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1777	2433	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1778		- globalSection.add(ambient);
	2434	+ colorSection.add(ambient);
1779	2435
1780	2436	cGridBag backlit = new cGridBag();
1781	2437	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1782	2438	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1783	2439	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1784		- globalSection.add(backlit);
	2440	+ colorSection.add(backlit);
1785	2441
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());
	2442	+ //panel.add(new JSeparator());
1793	2443
1794		- panel.add(globalSection);
	2444	+ //panel.add(globalSection);
1795	2445
1796	2446	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1797	2447
..	..	@@ -1833,7 +2483,7 @@
1833	2483	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1834	2484	textureSection.add(opacityPower);
1835	2485
1836		- panel.add(new JSeparator());
	2486	+ panel.add(GetSeparator());
1837	2487
1838	2488	panel.add(textureSection);
1839	2489
..	..	@@ -1898,8 +2548,9 @@
1898	2548	// 3D models
1899	2549	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1900	2550	{
1901		- lastConverter = new com.jmex.model.converters.MaxToJme();
1902		- LoadFile(filename, lastConverter);
	2551	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2552	+ //LoadFile(filename, lastConverter);
	2553	+ LoadObjFile(filename); // New 3ds loader
1903	2554	continue;
1904	2555	}
1905	2556	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2625,6 +3276,7 @@
2625	3276	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2626	3277	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2627	3278	}
	3279	+
2628	3280	//cJME.count++;
2629	3281	//cJME.count %= 12;
2630	3282	if (gc)
..	..	@@ -2808,6 +3460,7 @@
2808	3460	}
2809	3461	}
2810	3462	}
	3463	+
2811	3464	cFileSystemPane FSPane;
2812	3465
2813	3466	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2817,7 +3470,7 @@
2817	3470
2818	3471	freezematerial = true;
2819	3472	colorField.setFloat(mat.color);
2820		- modulationField.setFloat(mat.modulation);
	3473	+ saturationField.setFloat(mat.modulation);
2821	3474	metalnessField.setFloat(mat.metalness);
2822	3475	diffuseField.setFloat(mat.diffuse);
2823	3476	specularField.setFloat(mat.specular);
..	..	@@ -2861,11 +3514,14 @@
2861	3514	}
2862	3515	}
2863	3516	}
	3517	+
2864	3518	freezematerial = false;
2865	3519	}
2866	3520
2867	3521	void SetMaterial(Object3D object)
2868	3522	{
	3523	+ latestObject = object;
	3524	+
2869	3525	cMaterial mat = object.material;
2870	3526
2871	3527	if (mat == null)
..	..	@@ -2977,12 +3633,17 @@
2977	3633	// }
2978	3634
2979	3635	/**/
2980		- if (deselect)
	3636	+ if (deselect \|\| child == null)
2981	3637	{
2982	3638	//group.deselectAll();
2983	3639	//freeze = true;
2984	3640	GetTree().clearSelection();
2985	3641	//freeze = false;
	3642	+
	3643	+ if (child == null)
	3644	+ {
	3645	+ return;
	3646	+ }
2986	3647	}
2987	3648
2988	3649	//group.addSelectee(child);
..	..	@@ -3016,6 +3677,17 @@
3016	3677	public void itemStateChanged(ItemEvent event)
3017	3678	{
3018	3679	// System.out.println("Propagate = " + propagate);
	3680	+ if (event.getSource() == pinButton)
	3681	+ {
	3682	+ copy.pinned ^= true;
	3683	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3684	+ {
	3685	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3686	+ copy.CloseUI();
	3687	+ //copy.editWindow.refreshContents();
	3688	+ }
	3689	+ }
	3690	+ else
3019	3691	if (event.getSource() == propagateToggle)
3020	3692	{
3021	3693	propagate ^= true;
..	..	@@ -3051,7 +3723,7 @@
3051	3723	cameraView.ToggleDL();
3052	3724	cameraView.repaint();
3053	3725	return;
3054		- } else if (event.getSource() == toggleTextureItem)
	3726	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
3055	3727	{
3056	3728	cameraView.ToggleTexture();
3057	3729	// june 2013 copy.HardTouch();
..	..	@@ -3090,7 +3762,7 @@
3090	3762	frame.validate();
3091	3763
3092	3764	return;
3093		- } else if (event.getSource() == toggleSwitchItem)
	3765	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3094	3766	{
3095	3767	cameraView.ToggleSwitch();
3096	3768	cameraView.repaint();
..	..	@@ -3120,8 +3792,9 @@
3120	3792	} else if (event.getSource() == liveCB)
3121	3793	{
3122	3794	copy.live ^= true;
	3795	+ objEditor.refreshContents(true); // To show item colors
3123	3796	return;
3124		- } else if (event.getSource() == selectCB)
	3797	+ } else if (event.getSource() == selectableCB)
3125	3798	{
3126	3799	copy.dontselect ^= true;
3127	3800	return;
..	..	@@ -3129,7 +3802,7 @@
3129	3802	{
3130	3803	copy.hide ^= true;
3131	3804	copy.Touch(); // display list issue
3132		- objEditor.refreshContents();
	3805	+ objEditor.refreshContents(true); // To show item colors
3133	3806	return;
3134	3807	} else if (event.getSource() == link2masterCB)
3135	3808	{
..	..	@@ -3306,9 +3979,9 @@
3306	3979	{
3307	3980	Close();
3308	3981	//return true;
3309		- } else if (source == loadItem)
	3982	+ } else if (source == openItem)
3310	3983	{
3311		- load();
	3984	+ Open();
3312	3985	//return true;
3313	3986	} else if (source == newItem)
3314	3987	{
..	..	@@ -3333,6 +4006,10 @@
3333	4006	{
3334	4007	generatePOV();
3335	4008	//return true;
	4009	+ } else if (event.getSource() == archiveItem)
	4010	+ {
	4011	+ cTools.Archive(frame);
	4012	+ return;
3336	4013	} else if (source == zBufferItem)
3337	4014	{
3338	4015	try
..	..	@@ -3381,11 +4058,12 @@
3381	4058
3382	4059	static public byte[] Compress(Object3D o)
3383	4060	{
	4061	+ // Slower to actually compress.
3384	4062	try
3385	4063	{
3386	4064	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3387		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3388		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	4065	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4066	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3389	4067
3390	4068	Object3D parent = o.parent;
3391	4069	o.parent = null;
..	..	@@ -3396,10 +4074,14 @@
3396	4074
3397	4075	out.flush();
3398	4076
3399		- zstream.close();
	4077	+ baos //zstream
	4078	+ .close();
3400	4079	out.close();
3401	4080
3402		- return baos.toByteArray();
	4081	+ byte[] bytes = baos.toByteArray();
	4082	+
	4083	+ System.out.println("save #bytes = " + bytes.length);
	4084	+ return bytes;
3403	4085	} catch (Exception e)
3404	4086	{
3405	4087	System.err.println(e);
..	..	@@ -3409,13 +4091,16 @@
3409	4091
3410	4092	static public Object Uncompress(byte[] bytes)
3411	4093	{
3412		- System.out.println("#bytes = " + bytes.length);
	4094	+ System.out.println("restore #bytes = " + bytes.length);
3413	4095	try
3414	4096	{
3415	4097	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3416		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3417		- ObjectInputStream in = new ObjectInputStream(istream);
	4098	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4099	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3418	4100	Object obj = in.readObject();
	4101	+
	4102	+ bais //istream
	4103	+ .close();
3419	4104	in.close();
3420	4105
3421	4106	return obj;
..	..	@@ -3470,39 +4155,95 @@
3470	4155	return null;
3471	4156	}
3472	4157
3473		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3474	4158
3475	4159	public void Save()
3476	4160	{
	4161	+ //Save(true);
	4162	+ Replace();
	4163	+ SetVersionStates();
	4164	+ }
	4165	+
	4166	+ private boolean Equal(byte[] compress, byte[] name)
	4167	+ {
	4168	+ if (compress.length != name.length)
	4169	+ {
	4170	+ return false;
	4171	+ }
	4172	+
	4173	+ for (int i=compress.length; --i>=0;)
	4174	+ {
	4175	+ if (compress[i] != name[i])
	4176	+ return false;
	4177	+ }
	4178	+
	4179	+ return true;
	4180	+ }
	4181	+
	4182	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4183	+
	4184	+ void DeleteVersion()
	4185	+ {
	4186	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4187	+ {
	4188	+ copy.versionlist[i] = copy.versionlist[i+1];
	4189	+ }
	4190	+
	4191	+ CopyChanged();
	4192	+
	4193	+ SetVersionStates();
	4194	+ }
	4195	+
	4196	+ public boolean Save(boolean user)
	4197	+ {
3477	4198	System.err.println("Save");
	4199	+ Replace();
3478	4200
3479		- cRadio tab = GetCurrentTab();
	4201	+ //cRadio tab = GetCurrentTab();
3480	4202
3481		- boolean temp = CameraPane.SWITCH;
3482		- CameraPane.SWITCH = false;
	4203	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3483	4204
3484		- copy.ExtractBigData(hashtable);
	4205	+ boolean thesame = false;
	4206	+
	4207	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4208	+// {
	4209	+// thesame = true;
	4210	+// }
3485	4211
3486	4212	//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++)
	4213	+ if (!thesame)
3496	4214	{
3497		- tab.graphs[i] = null;
	4215	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4216	+ {
	4217	+ copy.versionlist[i] = copy.versionlist[i-1];
	4218	+ }
	4219	+
	4220	+ //tab.user[tab.versionindex] = user;
	4221	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4222	+
	4223	+ copy.versionlist[++copy.versionindex] = compress;
	4224	+
	4225	+ // if (increment)
	4226	+ // tab.versionindex++;
3498	4227	}
3499	4228
	4229	+ //copy.RestoreBigData(versiontable);
	4230	+
	4231	+ //assert(hashtable.isEmpty());
	4232	+
	4233	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4234	+// {
	4235	+// //tab.user[i] = false;
	4236	+// copy.versionlist[i] = null;
	4237	+// }
	4238	+
	4239	+ SetVersionStates();
	4240	+
3500	4241	// test save
3501	4242	if (false)
3502	4243	{
3503	4244	try
3504	4245	{
3505		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	4246	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3506	4247	ObjectOutputStream p = new ObjectOutputStream(ostream);
3507	4248
3508	4249	p.writeObject(copy);
..	..	@@ -3515,26 +4256,68 @@
3515	4256	e.printStackTrace();
3516	4257	}
3517	4258	}
	4259	+
	4260	+ return !thesame;
	4261	+ }
	4262	+
	4263	+ boolean flashIt = true;
	4264	+
	4265	+ void RefreshSelection()
	4266	+ {
	4267	+ Object3D selection = new Object3D();
	4268	+
	4269	+ for (int i = 0; i < copy.selection.size(); i++)
	4270	+ {
	4271	+ Object3D elem = copy.selection.elementAt(i);
	4272	+
	4273	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4274	+
	4275	+ if (obj == null)
	4276	+ {
	4277	+ copy.selection.remove(i--);
	4278	+ }
	4279	+ else
	4280	+ {
	4281	+ selection.add(obj);
	4282	+ copy.selection.setElementAt(obj, i);
	4283	+ }
	4284	+ }
	4285	+
	4286	+ flashIt = false;
	4287	+ GetTree().clearSelection();
	4288	+ for (int i = 0; i < selection.size(); i++)
	4289	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4290	+ flashIt = true;
	4291	+
	4292	+ //refreshContents(false);
3518	4293	}
3519	4294
3520		- void CopyChanged(Object3D obj)
	4295	+ void CopyChanged()
3521	4296	{
	4297	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4298	+
	4299	+ SetVersionStates();
	4300	+
3522	4301	boolean temp = CameraPane.SWITCH;
3523	4302	CameraPane.SWITCH = false;
3524	4303
3525		- copy.ExtractBigData(hashtable);
	4304	+ copy.ExtractBigData(versiontable);
3526	4305
3527	4306	copy.clear();
3528	4307
	4308	+ copy.skyboxname = obj.skyboxname;
	4309	+ copy.skyboxext = obj.skyboxext;
	4310	+
3529	4311	for (int i=0; i<obj.Size(); i++)
3530	4312	{
3531	4313	copy.add(obj.get(i));
3532	4314	}
3533	4315
3534		- copy.RestoreBigData(hashtable);
	4316	+ copy.RestoreBigData(versiontable);
3535	4317
3536	4318	CameraPane.SWITCH = temp;
3537	4319
	4320	+ RefreshSelection();
3538	4321	//assert(hashtable.isEmpty());
3539	4322
3540	4323	copy.Touch();
..	..	@@ -3555,45 +4338,144 @@
3555	4338	}
3556	4339	}
3557	4340
3558		- refreshContents();
	4341	+ refreshContents(true);
3559	4342	}
3560	4343
3561		- public void Undo()
	4344	+ cButton previousVersionButton;
	4345	+ cButton restoreButton;
	4346	+ cButton replaceButton;
	4347	+ cButton nextVersionButton;
	4348	+ cButton saveVersionButton;
	4349	+ cButton deleteVersionButton;
	4350	+
	4351	+ boolean muteSlider;
	4352	+
	4353	+ int VersionCount()
3562	4354	{
	4355	+ int count = 0;
	4356	+
	4357	+ for (int i = copy.versionlist.length; --i >= 0;)
	4358	+ {
	4359	+ if (copy.versionlist[i] != null)
	4360	+ count++;
	4361	+ }
	4362	+
	4363	+ return count;
	4364	+ }
	4365	+
	4366	+ void SetVersionStates()
	4367	+ {
	4368	+ //if (true)
	4369	+ // return;
	4370	+
	4371	+ //cRadio tab = GetCurrentTab();
	4372	+
	4373	+ restoreButton.setEnabled(copy.versionindex != -1);
	4374	+ replaceButton.setEnabled(copy.versionindex != -1);
	4375	+
	4376	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4377	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4378	+
	4379	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4380	+ copy.versionlist[copy.versionindex + 1] != null);
	4381	+
	4382	+ muteSlider = true;
	4383	+ versionSlider.setMinimum(0);
	4384	+ versionSlider.setMaximum(VersionCount() - 1);
	4385	+ versionSlider.setInteger(copy.versionindex);
	4386	+ versionSlider.setEnabled(copy.versionindex != -1);
	4387	+ muteSlider = false;
	4388	+ }
	4389	+
	4390	+ public boolean PreviousVersion()
	4391	+ {
	4392	+ // Option?
	4393	+ Replace();
	4394	+
3563	4395	System.err.println("Undo");
3564	4396
3565		- cRadio tab = GetCurrentTab();
	4397	+ //cRadio tab = GetCurrentTab();
3566	4398
3567		- if (tab.undoindex == 0)
	4399	+ if (copy.versionindex == 0)
3568	4400	{
3569	4401	java.awt.Toolkit.getDefaultToolkit().beep();
3570		- return;
	4402	+ return false;
3571	4403	}
3572	4404
3573		- if (tab.graphs[tab.undoindex] == null)
3574		- {
3575		- Save();
3576		- tab.undoindex -= 1;
3577		- }
	4405	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4406	+// {
	4407	+// if (Save(false))
	4408	+// tab.versionindex -= 1;
	4409	+// else
	4410	+// {
	4411	+// if (tab.versionindex <= 0)
	4412	+// return false;
	4413	+// else
	4414	+// tab.versionindex -= 1;
	4415	+// }
	4416	+// }
3578	4417
3579		- tab.undoindex -= 1;
	4418	+ copy.versionindex -= 1;
3580	4419
3581		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4420	+ CopyChanged();
	4421	+
	4422	+ return true;
3582	4423	}
3583	4424
3584		- public void Redo()
	4425	+ public boolean Restore()
3585	4426	{
3586		- cRadio tab = GetCurrentTab();
	4427	+ System.err.println("Restore");
3587	4428
3588		- if (tab.graphs[tab.undoindex + 1] == null)
	4429	+ //cRadio tab = GetCurrentTab();
	4430	+
	4431	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4432	+ {
	4433	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4434	+ return false;
	4435	+ }
	4436	+
	4437	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4438	+ CopyChanged();
	4439	+
	4440	+ return true;
	4441	+ }
	4442	+
	4443	+ public boolean Replace()
	4444	+ {
	4445	+ System.err.println("Replace");
	4446	+
	4447	+ //cRadio tab = GetCurrentTab();
	4448	+
	4449	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4450	+ {
	4451	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4452	+ return false;
	4453	+ }
	4454	+
	4455	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4456	+
	4457	+ return true;
	4458	+ }
	4459	+
	4460	+ public void NextVersion()
	4461	+ {
	4462	+ // Option?
	4463	+ Replace();
	4464	+
	4465	+ //cRadio tab = GetCurrentTab();
	4466	+
	4467	+ if (copy.versionlist[copy.versionindex + 1] == null)
3589	4468	{
3590	4469	java.awt.Toolkit.getDefaultToolkit().beep();
3591	4470	return;
3592	4471	}
3593	4472
3594		- tab.undoindex += 1;
	4473	+ copy.versionindex += 1;
3595	4474
3596		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4475	+ CopyChanged();
	4476	+
	4477	+ //if (!tab.user[tab.versionindex])
	4478	+ // tab.graphs[tab.versionindex] = null;
3597	4479	}
3598	4480
3599	4481	void ImportGFD()
..	..	@@ -3804,7 +4686,7 @@
3804	4686	//copy.material = new cMaterial(copy.GetMaterial());
3805	4687
3806	4688	current.color = (float) colorField.getFloat();
3807		- current.modulation = (float) modulationField.getFloat();
	4689	+ current.modulation = (float) saturationField.getFloat();
3808	4690	current.metalness = (float) metalnessField.getFloat();
3809	4691	current.diffuse = (float) diffuseField.getFloat();
3810	4692	current.specular = (float) specularField.getFloat();
..	..	@@ -3837,7 +4719,7 @@
3837	4719	cMaterial mat = copy.material;
3838	4720
3839	4721	colorField.SetToolTipValue((mat.color));
3840		- modulationField.SetToolTipValue((mat.modulation));
	4722	+ saturationField.SetToolTipValue((mat.modulation));
3841	4723	metalnessField.SetToolTipValue((mat.metalness));
3842	4724	diffuseField.SetToolTipValue((mat.diffuse));
3843	4725	specularField.SetToolTipValue((mat.specular));
..	..	@@ -3889,9 +4771,26 @@
3889	4771	//copy.Touch();
3890	4772	}
3891	4773
	4774	+ cNumberSlider versionSlider;
	4775	+
3892	4776	public void stateChanged(ChangeEvent e)
3893	4777	{
3894	4778	// assert(false);
	4779	+ if (e.getSource() == versionSlider)
	4780	+ {
	4781	+ if (muteSlider)
	4782	+ return;
	4783	+
	4784	+ int version = versionSlider.getInteger();
	4785	+
	4786	+ if (version != -1 && copy.versionlist[version] != null)
	4787	+ {
	4788	+ copy.versionindex = version;
	4789	+ CopyChanged();
	4790	+ }
	4791	+
	4792	+ return;
	4793	+ }
3895	4794
3896	4795	if (freezematerial)
3897	4796	{
..	..	@@ -3927,6 +4826,12 @@
3927	4826	{
3928	4827	//System.out.println("stateChanged = " + this);
3929	4828	materialtouched = true;
	4829	+
	4830	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4831	+ {
	4832	+ saturationField.setFloat(1);
	4833	+ }
	4834	+
3930	4835	applySelf();
3931	4836	//System.out.println("this = " + this);
3932	4837	//System.out.println("PARENT = " + parent);
..	..	@@ -4226,6 +5131,7 @@
4226	5131	{
4227	5132	if (GetTree() != null)
4228	5133	{
	5134	+ GetTree().revalidate();
4229	5135	GetTree().repaint();
4230	5136	}
4231	5137
..	..	@@ -4234,13 +5140,16 @@
4234	5140	ctrlPanel.validate(); // ? new
4235	5141	ctrlPanel.repaint();
4236	5142	}
	5143	+
	5144	+ if (previousVersionButton != null && copy.versionlist != null)
	5145	+ SetVersionStates();
4237	5146	}
4238	5147
4239	5148	static TweenManager tweenManager = new TweenManager();
4240	5149
4241	5150	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4242	5151	{
4243		- if (Globals.SAVEONMAKE) // && resetmodel)
	5152	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4244	5153	Save();
4245	5154	//Tween.set(thing, 0).target(1).start(tweenManager);
4246	5155	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4482,7 +5391,9 @@
4482	5391	readobj.ResetDisplayList();
4483	5392	} catch (Exception e)
4484	5393	{
4485		- //e.printStackTrace();
	5394	+ if (!e.toString().contains("GZIP"))
	5395	+ e.printStackTrace();
	5396	+
4486	5397	try
4487	5398	{
4488	5399	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4556,12 +5467,14 @@
4556	5467
4557	5468	if (readobj != null)
4558	5469	{
4559		- if (Globals.SAVEONMAKE)
4560		- Save();
	5470	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5471	+ // Save();
4561	5472	try
4562	5473	{
4563	5474	//readobj.deepCopySelf(copy);
4564	5475	copy.clear(); // june 2014
	5476	+ copy.skyboxname = readobj.skyboxname;
	5477	+ copy.skyboxext = readobj.skyboxext;
4565	5478	for (int i = 0; i < readobj.size(); i++)
4566	5479	{
4567	5480	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4602,6 +5515,7 @@
4602	5515	}
4603	5516	} catch (ClassCastException e)
4604	5517	{
	5518	+ e.printStackTrace();
4605	5519	assert (false);
4606	5520	Composite c = (Composite) copy;
4607	5521	c.children.clear();
..	..	@@ -4612,17 +5526,31 @@
4612	5526	c.addChild(csg);
4613	5527	}
4614	5528
	5529	+ copy.versionlist = readobj.versionlist;
	5530	+ copy.versionindex = readobj.versionindex;
	5531	+
	5532	+ if (copy.versionlist == null)
	5533	+ {
	5534	+ // Backward compatibility
	5535	+ copy.versionlist = new Object3D[100];
	5536	+ copy.versionindex = -1;
	5537	+
	5538	+ Save(true);
	5539	+ }
	5540	+
	5541	+ //? SetUndoStates();
	5542	+
4615	5543	ResetModel();
4616	5544	copy.HardTouch(); // recompile?
4617	5545	refreshContents();
4618	5546	}
4619	5547	}
4620	5548
4621		- void load() // throws ClassNotFoundException
	5549	+ void Open() // throws ClassNotFoundException
4622	5550	{
4623	5551	if (Grafreed.standAlone)
4624	5552	{
4625		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5553	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4626	5554	browser.show();
4627	5555	String filename = browser.getFile();
4628	5556	if (filename != null && filename.length() > 0)
..	..	@@ -4699,6 +5627,8 @@
4699	5627
4700	5628	void save()
4701	5629	{
	5630	+ Replace();
	5631	+
4702	5632	if (lastname == null)
4703	5633	{
4704	5634	return;
..	..	@@ -4721,6 +5651,7 @@
4721	5651	//ps.print(buffer.toString());
4722	5652	} catch (IOException e)
4723	5653	{
	5654	+ e.printStackTrace();
4724	5655	}
4725	5656	}
4726	5657
..	..	@@ -4735,6 +5666,8 @@
4735	5666	String filename = browser.getFile();
4736	5667	if (filename != null && filename.length() > 0)
4737	5668	{
	5669	+ if (!filename.endsWith(".gfd"))
	5670	+ filename += ".gfd";
4738	5671	lastname = browser.getDirectory() + filename;
4739	5672	save();
4740	5673	}
..	..	@@ -4901,7 +5834,7 @@
4901	5834	MenuBar menuBar;
4902	5835	Menu fileMenu;
4903	5836	MenuItem newItem;
4904		- MenuItem loadItem;
	5837	+ MenuItem openItem;
4905	5838	MenuItem saveItem;
4906	5839	MenuItem saveAsItem;
4907	5840	MenuItem exportAsItem;
..	..	@@ -4924,6 +5857,7 @@
4924	5857	CheckboxMenuItem toggleSwitchItem;
4925	5858	CheckboxMenuItem toggleRootItem;
4926	5859	CheckboxMenuItem animationItem;
	5860	+ MenuItem archiveItem;
4927	5861	CheckboxMenuItem toggleHandleItem;
4928	5862	CheckboxMenuItem togglePaintItem;
4929	5863	JSplitPane mainPanel;
..	..	@@ -4937,6 +5871,7 @@
4937	5871	ButtonGroup buttonGroup;
4938	5872
4939	5873	cGridBag toolboxPanel;
	5874	+ cGridBag skyboxPanel;
4940	5875	cGridBag materialPanel;
4941	5876	cGridBag ctrlPanel;
4942	5877
..	..	@@ -4945,6 +5880,8 @@
4945	5880	cGridBag optionsPanel;
4946	5881
4947	5882	JTabbedPane objectPanel;
	5883	+ boolean materialFlushed;
	5884	+ Object3D latestObject;
4948	5885
4949	5886	cGridBag XYZPanel;
4950	5887
..	..	@@ -5008,7 +5945,7 @@
5008	5945	JLabel colorLabel;
5009	5946	cNumberSlider colorField;
5010	5947	JLabel modulationLabel;
5011		- cNumberSlider modulationField;
	5948	+ cNumberSlider saturationField;
5012	5949	JLabel metalnessLabel;
5013	5950	cNumberSlider metalnessField;
5014	5951	JLabel diffuseLabel;
..	..	@@ -5039,6 +5976,7 @@
5039	5976	cNumberSlider anisoField;
5040	5977	JLabel anisoVLabel;
5041	5978	cNumberSlider anisoVField;
	5979	+
5042	5980	JLabel cameraLabel;
5043	5981	cNumberSlider cameraField;
5044	5982	JLabel selfshadowLabel;
..	..	@@ -5053,6 +5991,7 @@
5053	5991	cNumberSlider fakedepthField;
5054	5992	JLabel shadowbiasLabel;
5055	5993	cNumberSlider shadowbiasField;
	5994	+
5056	5995	JLabel bumpLabel;
5057	5996	cNumberSlider bumpField;
5058	5997	JLabel noiseLabel;