~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -34,6 +34,7 @@
34	34	iSendInfo
35	35	//KeyListener
36	36	{
	37	+ public cToggleButton pinButton;
37	38	boolean timeline;
38	39	boolean wasFullScreen;
39	40
..	..	@@ -41,64 +42,78 @@
41	42	JFrame frame;
42	43
43	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	+ }
44	53
45	54	cButton GetButton(String name, boolean border)
46	55	{
47		- try
48		- {
49		- ImageIcon icon = GetIcon(name);
50		- return new cButton(icon, border);
51		- }
52		- catch (Exception e)
53		- {
54		- return new cButton(name, border);
55		- }
	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);
56	64	}
57	65
58	66	cToggleButton GetToggleButton(String name, boolean border)
59	67	{
60		- try
61		- {
62		- ImageIcon icon = GetIcon(name);
63		- return new cToggleButton(icon, border);
64		- }
65		- catch (Exception e)
66		- {
67		- return new cToggleButton(name, border);
68		- }
	68	+ ImageIcon icon = GetIcon(name);
	69	+ return new cToggleButton(icon, border);
69	70	}
70	71
71	72	cCheckBox GetCheckBox(String name, boolean border)
72	73	{
	74	+ ImageIcon icon = GetIcon(name);
	75	+ return new cCheckBox(icon, border);
	76	+ }
	77	+
	78	+ ImageIcon GetIcon(String name)
	79	+ {
73	80	try
74	81	{
75		- ImageIcon icon = GetIcon(name);
76		- 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;
77	98	}
78	99	catch (Exception e)
79	100	{
80		- return new cCheckBox(name, border);
	101	+ return null;
81	102	}
82	103	}
83		-
84		- private ImageIcon GetIcon(String name) throws IOException
	104	+
	105	+ BufferedImage GetImage(String name)
85	106	{
86		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
87		-
88		- if (image.getWidth() != 24 && image.getHeight() != 24)
	107	+ try
89	108	{
90		- BufferedImage resized = new BufferedImage(24, 24, image.getType());
91		- Graphics2D g = resized.createGraphics();
92		- g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
93		- //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
94		- g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
95		- g.dispose();
96		-
97		- image = resized;
	109	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	110	+
	111	+ return image;
98	112	}
99		-
100		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
101		- return icon;
	113	+ catch (Exception e)
	114	+ {
	115	+ return null;
	116	+ }
102	117	}
103	118
104	119	// SCRIPT
..	..	@@ -282,6 +297,14 @@
282	297	client = inClient;
283	298	copy = client;
284	299
	300	+// if (copy.versionlist == null)
	301	+// {
	302	+// copy.versionlist = new Object3D[100];
	303	+// copy.versionindex = -1;
	304	+//
	305	+// callee.Save(true);
	306	+// }
	307	+
285	308	// "this" is not called: SetupUI2(objEditor);
286	309	}
287	310
..	..	@@ -295,6 +318,14 @@
295	318	client = inClient;
296	319	copy = client;
297	320
	321	+ if (copy.versionlist == null)
	322	+ {
	323	+ copy.versionlist = new Object3D[100];
	324	+ copy.versionindex = -1;
	325	+
	326	+// Save(true);
	327	+ }
	328	+
298	329	SetupUI2(callee.GetEditor());
299	330	}
300	331
..	..	@@ -309,7 +340,7 @@
309	340	//localCopy.parent = null;
310	341
311	342	frame = new JFrame();
312		- frame.setUndecorated(true);
	343	+ frame.setUndecorated(false);
313	344	objEditor = this;
314	345	this.callee = callee;
315	346
..	..	@@ -327,6 +358,14 @@
327	358	copy = localCopy;
328	359	copy.editWindow = this;
329	360
	361	+// if (copy.versionlist == null)
	362	+// {
	363	+// copy.versionlist = new Object3D[100];
	364	+// copy.versionindex = -1;
	365	+//
	366	+// Save(true);
	367	+// }
	368	+
330	369	SetupMenu();
331	370
332	371	//SetupName(objEditor); // new
..	..	@@ -350,7 +389,7 @@
350	389	frame.setMenuBar(menuBar = new MenuBar());
351	390	menuBar.add(fileMenu = new Menu("File"));
352	391	fileMenu.add(newItem = new MenuItem("New"));
353		- fileMenu.add(loadItem = new MenuItem("Open..."));
	392	+ fileMenu.add(openItem = new MenuItem("Open..."));
354	393
355	394	//oe.menuBar.add(menu = new Menu("Include"));
356	395	Menu menu = new Menu("Import");
..	..	@@ -382,7 +421,7 @@
382	421	}
383	422
384	423	newItem.addActionListener(this);
385		- loadItem.addActionListener(this);
	424	+ openItem.addActionListener(this);
386	425	saveItem.addActionListener(this);
387	426	saveAsItem.addActionListener(this);
388	427	exportAsItem.addActionListener(this);
..	..	@@ -394,6 +433,8 @@
394	433
395	434	ChangeListener changeListener = new ChangeListener()
396	435	{
	436	+ String name;
	437	+
397	438	public void stateChanged(ChangeEvent changeEvent)
398	439	{
399	440	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -412,18 +453,48 @@
412	453	// EditSelection(false);
413	454	// }
414	455
415		- refreshContents(false); // To refresh Info tab
	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();
416	486	}
417	487	};
418	488	objectPanel.addChangeListener(changeListener);
419	489
420	490	toolbarPanel = new JPanel();
421	491	toolbarPanel.setName("Toolbar");
	492	+
422	493	treePanel = new cGridBag();
423	494	treePanel.setName("Tree");
424	495
425	496	editPanel = new cGridBag().setVertical(true);
426		- editPanel.setName("Edit");
	497	+ //editPanel.setName("Edit");
427	498
428	499	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
429	500
..	..	@@ -431,11 +502,13 @@
431	502	editPanel.add(editCommandsPanel);
432	503	editPanel.add(ctrlPanel);
433	504
434		- toolboxPanel = new cGridBag().setVertical(false);
435		- toolboxPanel.setName("Toolbox");
	505	+ toolboxPanel = new cGridBag().setVertical(true);
	506	+ //toolboxPanel.setName("Toolbox");
436	507
437		- materialPanel = new cGridBag().setVertical(true);
438		- materialPanel.setName("Material");
	508	+ skyboxPanel = new cGridBag().setVertical(true);
	509	+
	510	+ materialPanel = new cGridBag().setVertical(false);
	511	+ //materialPanel.setName("Material");
439	512
440	513	/JTextPane/
441	514	infoarea = createTextPane();
..	..	@@ -443,14 +516,15 @@
443	516
444	517	infoarea.setEditable(true);
445	518	SetText();
	519	+
446	520	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
447	521	// infoarea.setOpaque(false);
448	522	// //infoarea.setForeground(textcolor);
449	523	// TEXTAREA infoarea.setLineWrap(true);
450	524	// TEXTAREA infoarea.setWrapStyleWord(true);
451	525	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
452		- infoPanel.setPreferredSize(new Dimension(50, 200));
453		- infoPanel.setName("Info");
	526	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	527	+ //infoPanel.setName("Info");
454	528	//infoPanel.setLayout(new BorderLayout());
455	529	//infoPanel.add(createTextPane());
456	530
..	..	@@ -463,10 +537,11 @@
463	537	mainPanel.setResizeWeight(0.5);
464	538
465	539	//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
466		-// BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
467		-// divider.setDividerSize(15);
468		-// divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	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!"));
469	543
	544	+ mainPanel.setUI(new BasicSplitPaneUI());
470	545
471	546	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
472	547	//mainPanel.setLayout(new GridBagLayout());
..	..	@@ -698,8 +773,8 @@
698	773	}
699	774	}
700	775
701		-static GraphicsDevice device = GraphicsEnvironment
702		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	776	+//static GraphicsDevice device = GraphicsEnvironment
	777	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
703	778
704	779	Rectangle keeprect;
705	780	cRadio radio;
..	..	@@ -716,14 +791,24 @@
716	791	boolean maximized;
717	792
718	793	cButton fullscreenLayout;
	794	+ cButton expandedLayout;
719	795
720	796	void Minimize()
721	797	{
722	798	frame.setState(Frame.ICONIFIED);
	799	+ frame.validate();
723	800	}
724	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={}
725	805	void Maximize()
726	806	{
	807	+ if (CameraPane.FULLSCREEN)
	808	+ {
	809	+ ToggleFullScreen();
	810	+ }
	811	+
727	812	if (maximized)
728	813	{
729	814	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -731,22 +816,38 @@
731	816	else
732	817	{
733	818	keeprect = frame.getBounds();
734		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
735		- Dimension rect2 = frame.getToolkit().getScreenSize();
736		- 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);
737	822	// frame.setState(Frame.MAXIMIZED_BOTH);
	823	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
738	824	}
739	825
740	826	maximized ^= true;
	827	+
	828	+ frame.validate();
741	829	}
	830	+
	831	+ cButton minButton;
	832	+ cButton maxButton;
	833	+ cButton fullButton;
	834	+ cButton collapseButton;
	835	+ cButton maximize3DButton;
742	836
743	837	void ToggleFullScreen()
744	838	{
	839	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	840	+
745	841	cameraView.ToggleFullScreen();
746	842
747	843	if (!CameraPane.FULLSCREEN)
748	844	{
749	845	device.setFullScreenWindow(null);
	846	+ frame.dispose();
	847	+ frame.setUndecorated(false);
	848	+ frame.validate();
	849	+ frame.setVisible(true);
	850	+
750	851	//frame.setVisible(false);
751	852	// frame.removeNotify();
752	853	// frame.setUndecorated(false);
..	..	@@ -756,13 +857,13 @@
756	857	// X frame.getContentPane().remove(/"Center",/bigThree);
757	858	// X framePanel.add(bigThree);
758	859	// X frame.getContentPane().add(/"Center",/framePanel);
759		- framePanel.setDividerLocation(1);
	860	+// framePanel.setDividerLocation(46); // icons are 24x24
760	861
761	862	//frame.setVisible(true);
762		- radio.layout = keepButton;
	863	+// radio.layout = keepButton;
763	864	//theFrame = null;
764	865	keepButton = null;
765		- radio.layout.doClick();
	866	+// radio.layout.doClick();
766	867
767	868	} else
768	869	{
..	..	@@ -771,20 +872,59 @@
771	872	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
772	873	// frame.getToolkit().getScreenSize().height);
773	874	//frame.setVisible(false);
	875	+
	876	+ frame.dispose();
	877	+ frame.setUndecorated(true);
774	878	device.setFullScreenWindow(frame);
	879	+ frame.validate();
	880	+ frame.setVisible(true);
775	881	// frame.removeNotify();
776	882	// frame.setUndecorated(true);
777	883	// frame.addNotify();
778	884	// X frame.getContentPane().remove(/"Center",/framePanel);
779	885	// X framePanel.remove(bigThree);
780	886	// X frame.getContentPane().add(/"Center",/bigThree);
781		- framePanel.setDividerLocation(0);
	887	+// framePanel.setDividerLocation(0);
782	888
783		- radio.layout = fullscreenLayout;
784		- radio.layout.doClick();
	889	+// radio.layout = fullscreenLayout;
	890	+// radio.layout.doClick();
785	891	//frame.setVisible(true);
786	892	}
	893	+ frame.validate();
	894	+
	895	+ cameraView.requestFocusInWindow();
787	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	+ }
788	928
789	929	private JTextPane createTextPane()
790	930	{
..	..	@@ -907,6 +1047,7 @@
907	1047	{
908	1048	SetupMaterial(materialPanel);
909	1049	}
	1050	+
910	1051	//SetupName();
911	1052	//SetupViews();
912	1053	}
..	..	@@ -916,7 +1057,7 @@
916	1057	// NumberSlider vDivsField;
917	1058	// JCheckBox endcaps;
918	1059	JCheckBox liveCB;
919		- JCheckBox selectCB;
	1060	+ JCheckBox selectableCB;
920	1061	JCheckBox hideCB;
921	1062	JCheckBox link2masterCB;
922	1063	JCheckBox markCB;
..	..	@@ -1115,8 +1256,20 @@
1115	1256
1116	1257	namePanel = new cGridBag();
1117	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	+
1118	1271	nameField = AddText(namePanel, copy.GetName());
1119		- namePanel.add(nameField);
	1272	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1120	1273	oe.ctrlPanel.add(namePanel);
1121	1274
1122	1275	oe.ctrlPanel.Return();
..	..	@@ -1128,26 +1281,30 @@
1128	1281
1129	1282	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1130	1283	liveCB.setToolTipText("Animate object");
1131		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1132		- selectCB.setToolTipText("Make object selectable");
	1284	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1285	+ selectableCB.setToolTipText("Make object selectable");
1133	1286	// Return();
	1287	+
1134	1288	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1135	1289	hideCB.setToolTipText("Hide object");
1136	1290	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1137	1291	markCB.setToolTipText("As animation target transform");
	1292	+
	1293	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1138	1294
1139	1295	setupPanel2 = new cGridBag().setVertical(false);
1140	1296
1141	1297	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1142	1298	rewindCB.setToolTipText("Rewind animation");
1143	1299
1144		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1300	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
1145	1301	randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1146	1302
	1303	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1304	+ link2masterCB.setToolTipText("Attach to support");
	1305	+
1147	1306	if (Globals.ADVANCED)
1148	1307	{
1149		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1150		- link2masterCB.setToolTipText("Attach to support");
1151	1308	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1152	1309	speedupCB.setToolTipText("Option motion capture");
1153	1310	}
..	..	@@ -1421,6 +1578,7 @@
1421	1578	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1422	1579	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1423	1580	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1581	+ //XYZPanel.setName("XYZ");
1424	1582
1425	1583	/*
1426	1584	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1458,14 +1616,29 @@
1458	1616	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1459	1617	//tmp.setName("Edit");
1460	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	+
1461	1630	// JPanel north = new JPanel(new BorderLayout());
1462	1631	// north.setName("Edit");
1463	1632	// north.add(ctrlPanel, BorderLayout.NORTH);
1464	1633	// objectPanel.add(north);
1465	1634	objectPanel.add(editPanel);
1466		- objectPanel.add(infoPanel);
1467		- objectPanel.add(toolboxPanel);
1468		-
	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	+
1469	1642	/*
1470	1643	aConstraints.gridx = 0;
1471	1644	aConstraints.gridwidth = 1;
..	..	@@ -1485,7 +1658,7 @@
1485	1658	scrollpane.addMouseWheelListener(this); // Default not fast enough
1486	1659
1487	1660	/JTabbedPane/ scenePanel = new cGridBag();
1488		- scenePanel.preferredWidth = 6;
	1661	+ scenePanel.preferredWidth = 5;
1489	1662
1490	1663	JTabbedPane tabbedPane = new JTabbedPane();
1491	1664	tabbedPane.add(scrollpane);
..	..	@@ -1502,6 +1675,11 @@
1502	1675
1503	1676	scenePanel.add(tabbedPane);
1504	1677
	1678	+ //if (Globals.ADVANCED)
	1679	+ tabbedPane.add(infoPanel);
	1680	+ tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1681	+ tabbedPane.setToolTipTextAt(3, "Information");
	1682	+
1505	1683	/*
1506	1684	cTree jTree = new cTree(null);
1507	1685	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1563,7 +1741,7 @@
1563	1741	bigThree = new cGridBag();
1564	1742	bigThree.addComponent(scenePanel);
1565	1743	bigThree.addComponent(centralPanel);
1566		- bigThree.addComponent(XYZPanel);
	1744	+ //bigThree.addComponent(XYZPanel);
1567	1745
1568	1746	// // SIDE EFFECT!!!
1569	1747	// aConstraints.gridx = 0;
..	..	@@ -1572,9 +1750,26 @@
1572	1750	// aConstraints.gridheight = 1;
1573	1751
1574	1752	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1575		- framePanel.setContinuousLayout(true);
1576		- framePanel.setOneTouchExpandable(true);
1577		- 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);
1578	1773	//framePanel.setDividerSize(15);
1579	1774	//framePanel.setResizeWeight(0.15);
1580	1775	framePanel.setName("Frame");
..	..	@@ -1593,17 +1788,17 @@
1593	1788
1594	1789	frame.setSize(1280, 860);
1595	1790
1596		- frame.validate();
1597		- frame.setVisible(true);
1598		-
1599	1791	cameraView.requestFocusInWindow();
1600	1792
1601	1793	gridPanel.setDividerLocation(1.0);
	1794	+
	1795	+ frame.validate();
	1796	+
	1797	+ frame.setVisible(true);
1602	1798
1603	1799	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1604	1800	frame.addWindowListener(new WindowAdapter()
1605	1801	{
1606		-
1607	1802	public void windowClosing(WindowEvent e)
1608	1803	{
1609	1804	Close();
..	..	@@ -1626,12 +1821,403 @@
1626	1821	ctrlPanel.removeAll();
1627	1822	}
1628	1823
1629		- void SetupMaterial(cGridBag panel)
	1824	+ void SetupMaterial(cGridBag materialpanel)
1630	1825	{
1631		- /*
	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	+ /*
1632	2218	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1633	2219	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1634		- */
	2220	+ */
1635	2221
1636	2222	cGridBag editBar = new cGridBag().setVertical(false);
1637	2223
..	..	@@ -1665,45 +2251,50 @@
1665	2251	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1666	2252
1667	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);
1668	2267
1669	2268	cGridBag color = new cGridBag();
1670		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1671		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1672		- 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	+
1673	2274	//colorField.preferredWidth = 200;
1674	2275	colorSection.add(color);
1675	2276
1676	2277	cGridBag modulation = new cGridBag();
1677	2278	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1678	2279	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1679		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2280	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1680	2281	colorSection.add(modulation);
1681	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	+
1682	2291	cGridBag texture = new cGridBag();
1683	2292	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1684	2293	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1685	2294	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1686	2295	colorSection.add(texture);
1687	2296
1688		- cGridBag anisoU = new cGridBag();
1689		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1690		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1691		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1692		- colorSection.add(anisoU);
1693		-
1694		- cGridBag anisoV = new cGridBag();
1695		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1696		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1697		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1698		- colorSection.add(anisoV);
1699		-
1700		- cGridBag shadowbias = new cGridBag();
1701		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1702		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1703		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1704		- colorSection.add(shadowbias);
1705		-
1706		- panel.add(new JSeparator());
	2297	+ panel.add(GetSeparator());
1707	2298
1708	2299	panel.add(colorSection);
1709	2300
..	..	@@ -1753,7 +2344,13 @@
1753	2344	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1754	2345	diffuseSection.add(fakedepth);
1755	2346
1756		- 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());
1757	2354
1758	2355	panel.add(diffuseSection);
1759	2356
..	..	@@ -1803,42 +2400,48 @@
1803	2400	// aConstraints.gridy += 1;
1804	2401	// aConstraints.gridwidth = 1;
1805	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);
1806	2408
1807		- 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());
1808	2417
1809	2418	panel.add(specularSection);
1810	2419
1811	2420	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1812	2421
1813		- cGridBag globalSection = new cGridBag().setVertical(true);
	2422	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1814	2423
1815	2424	cGridBag camera = new cGridBag();
1816	2425	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1817	2426	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1818	2427	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1819		- globalSection.add(camera);
	2428	+ colorSection.add(camera);
1820	2429
1821	2430	cGridBag ambient = new cGridBag();
1822	2431	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1823	2432	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1824	2433	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1825		- globalSection.add(ambient);
	2434	+ colorSection.add(ambient);
1826	2435
1827	2436	cGridBag backlit = new cGridBag();
1828	2437	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1829	2438	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1830	2439	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1831		- globalSection.add(backlit);
	2440	+ colorSection.add(backlit);
1832	2441
1833		- cGridBag opacity = new cGridBag();
1834		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1835		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1836		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1837		- globalSection.add(opacity);
1838		-
1839		- panel.add(new JSeparator());
	2442	+ //panel.add(new JSeparator());
1840	2443
1841		- panel.add(globalSection);
	2444	+ //panel.add(globalSection);
1842	2445
1843	2446	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1844	2447
..	..	@@ -1880,7 +2483,7 @@
1880	2483	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1881	2484	textureSection.add(opacityPower);
1882	2485
1883		- panel.add(new JSeparator());
	2486	+ panel.add(GetSeparator());
1884	2487
1885	2488	panel.add(textureSection);
1886	2489
..	..	@@ -1945,8 +2548,9 @@
1945	2548	// 3D models
1946	2549	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1947	2550	{
1948		- lastConverter = new com.jmex.model.converters.MaxToJme();
1949		- LoadFile(filename, lastConverter);
	2551	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2552	+ //LoadFile(filename, lastConverter);
	2553	+ LoadObjFile(filename); // New 3ds loader
1950	2554	continue;
1951	2555	}
1952	2556	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2672,6 +3276,7 @@
2672	3276	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2673	3277	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2674	3278	}
	3279	+
2675	3280	//cJME.count++;
2676	3281	//cJME.count %= 12;
2677	3282	if (gc)
..	..	@@ -2855,6 +3460,7 @@
2855	3460	}
2856	3461	}
2857	3462	}
	3463	+
2858	3464	cFileSystemPane FSPane;
2859	3465
2860	3466	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2864,7 +3470,7 @@
2864	3470
2865	3471	freezematerial = true;
2866	3472	colorField.setFloat(mat.color);
2867		- modulationField.setFloat(mat.modulation);
	3473	+ saturationField.setFloat(mat.modulation);
2868	3474	metalnessField.setFloat(mat.metalness);
2869	3475	diffuseField.setFloat(mat.diffuse);
2870	3476	specularField.setFloat(mat.specular);
..	..	@@ -2908,6 +3514,7 @@
2908	3514	}
2909	3515	}
2910	3516	}
	3517	+
2911	3518	freezematerial = false;
2912	3519	}
2913	3520
..	..	@@ -3070,6 +3677,17 @@
3070	3677	public void itemStateChanged(ItemEvent event)
3071	3678	{
3072	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
3073	3691	if (event.getSource() == propagateToggle)
3074	3692	{
3075	3693	propagate ^= true;
..	..	@@ -3174,8 +3792,9 @@
3174	3792	} else if (event.getSource() == liveCB)
3175	3793	{
3176	3794	copy.live ^= true;
	3795	+ objEditor.refreshContents(true); // To show item colors
3177	3796	return;
3178		- } else if (event.getSource() == selectCB)
	3797	+ } else if (event.getSource() == selectableCB)
3179	3798	{
3180	3799	copy.dontselect ^= true;
3181	3800	return;
..	..	@@ -3183,7 +3802,7 @@
3183	3802	{
3184	3803	copy.hide ^= true;
3185	3804	copy.Touch(); // display list issue
3186		- objEditor.refreshContents();
	3805	+ objEditor.refreshContents(true); // To show item colors
3187	3806	return;
3188	3807	} else if (event.getSource() == link2masterCB)
3189	3808	{
..	..	@@ -3360,9 +3979,9 @@
3360	3979	{
3361	3980	Close();
3362	3981	//return true;
3363		- } else if (source == loadItem)
	3982	+ } else if (source == openItem)
3364	3983	{
3365		- load();
	3984	+ Open();
3366	3985	//return true;
3367	3986	} else if (source == newItem)
3368	3987	{
..	..	@@ -3387,6 +4006,10 @@
3387	4006	{
3388	4007	generatePOV();
3389	4008	//return true;
	4009	+ } else if (event.getSource() == archiveItem)
	4010	+ {
	4011	+ cTools.Archive(frame);
	4012	+ return;
3390	4013	} else if (source == zBufferItem)
3391	4014	{
3392	4015	try
..	..	@@ -3435,11 +4058,12 @@
3435	4058
3436	4059	static public byte[] Compress(Object3D o)
3437	4060	{
	4061	+ // Slower to actually compress.
3438	4062	try
3439	4063	{
3440	4064	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3441		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3442		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	4065	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4066	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3443	4067
3444	4068	Object3D parent = o.parent;
3445	4069	o.parent = null;
..	..	@@ -3450,10 +4074,14 @@
3450	4074
3451	4075	out.flush();
3452	4076
3453		- zstream.close();
	4077	+ baos //zstream
	4078	+ .close();
3454	4079	out.close();
3455	4080
3456		- return baos.toByteArray();
	4081	+ byte[] bytes = baos.toByteArray();
	4082	+
	4083	+ System.out.println("save #bytes = " + bytes.length);
	4084	+ return bytes;
3457	4085	} catch (Exception e)
3458	4086	{
3459	4087	System.err.println(e);
..	..	@@ -3463,13 +4091,16 @@
3463	4091
3464	4092	static public Object Uncompress(byte[] bytes)
3465	4093	{
3466		- System.out.println("#bytes = " + bytes.length);
	4094	+ System.out.println("restore #bytes = " + bytes.length);
3467	4095	try
3468	4096	{
3469	4097	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3470		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3471		- ObjectInputStream in = new ObjectInputStream(istream);
	4098	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4099	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3472	4100	Object obj = in.readObject();
	4101	+
	4102	+ bais //istream
	4103	+ .close();
3473	4104	in.close();
3474	4105
3475	4106	return obj;
..	..	@@ -3524,41 +4155,95 @@
3524	4155	return null;
3525	4156	}
3526	4157
3527		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3528	4158
3529	4159	public void Save()
3530	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	+ {
3531	4198	System.err.println("Save");
	4199	+ Replace();
3532	4200
3533		- cRadio tab = GetCurrentTab();
	4201	+ //cRadio tab = GetCurrentTab();
3534	4202
3535		- boolean temp = CameraPane.SWITCH;
3536		- CameraPane.SWITCH = false;
	4203	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3537	4204
3538		- 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	+// }
3539	4211
3540	4212	//EditorFrame.m_MainFrame.requestFocusInWindow();
3541		- tab.graphs[tab.undoindex++] = Compress(copy);
3542		-
3543		- copy.RestoreBigData(hashtable);
3544		-
3545		- CameraPane.SWITCH = temp;
3546		-
3547		- //assert(hashtable.isEmpty());
3548		-
3549		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	4213	+ if (!thesame)
3550	4214	{
3551		- 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++;
3552	4227	}
3553	4228
3554		- SetUndoStates();
	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();
3555	4240
3556	4241	// test save
3557	4242	if (false)
3558	4243	{
3559	4244	try
3560	4245	{
3561		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	4246	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3562	4247	ObjectOutputStream p = new ObjectOutputStream(ostream);
3563	4248
3564	4249	p.writeObject(copy);
..	..	@@ -3571,28 +4256,68 @@
3571	4256	e.printStackTrace();
3572	4257	}
3573	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);
3574	4293	}
3575	4294
3576		- void CopyChanged(Object3D obj)
	4295	+ void CopyChanged()
3577	4296	{
3578		- SetUndoStates();
	4297	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4298	+
	4299	+ SetVersionStates();
3579	4300
3580	4301	boolean temp = CameraPane.SWITCH;
3581	4302	CameraPane.SWITCH = false;
3582	4303
3583		- copy.ExtractBigData(hashtable);
	4304	+ copy.ExtractBigData(versiontable);
3584	4305
3585	4306	copy.clear();
3586	4307
	4308	+ copy.skyboxname = obj.skyboxname;
	4309	+ copy.skyboxext = obj.skyboxext;
	4310	+
3587	4311	for (int i=0; i<obj.Size(); i++)
3588	4312	{
3589	4313	copy.add(obj.get(i));
3590	4314	}
3591	4315
3592		- copy.RestoreBigData(hashtable);
	4316	+ copy.RestoreBigData(versiontable);
3593	4317
3594	4318	CameraPane.SWITCH = temp;
3595	4319
	4320	+ RefreshSelection();
3596	4321	//assert(hashtable.isEmpty());
3597	4322
3598	4323	copy.Touch();
..	..	@@ -3613,56 +4338,144 @@
3613	4338	}
3614	4339	}
3615	4340
3616		- refreshContents();
	4341	+ refreshContents(true);
3617	4342	}
3618	4343
3619		- cButton undoButton;
3620		- cButton redoButton;
	4344	+ cButton previousVersionButton;
	4345	+ cButton restoreButton;
	4346	+ cButton replaceButton;
	4347	+ cButton nextVersionButton;
	4348	+ cButton saveVersionButton;
	4349	+ cButton deleteVersionButton;
3621	4350
3622		- void SetUndoStates()
	4351	+ boolean muteSlider;
	4352	+
	4353	+ int VersionCount()
3623	4354	{
3624		- cRadio tab = GetCurrentTab();
	4355	+ int count = 0;
3625	4356
3626		- undoButton.setEnabled(tab.undoindex > 0);
3627		- redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	4357	+ for (int i = copy.versionlist.length; --i >= 0;)
	4358	+ {
	4359	+ if (copy.versionlist[i] != null)
	4360	+ count++;
	4361	+ }
	4362	+
	4363	+ return count;
3628	4364	}
3629	4365
3630		- public void Undo()
	4366	+ void SetVersionStates()
3631	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	+
3632	4395	System.err.println("Undo");
3633	4396
3634		- cRadio tab = GetCurrentTab();
	4397	+ //cRadio tab = GetCurrentTab();
3635	4398
3636		- if (tab.undoindex == 0)
	4399	+ if (copy.versionindex == 0)
3637	4400	{
3638	4401	java.awt.Toolkit.getDefaultToolkit().beep();
3639		- return;
	4402	+ return false;
3640	4403	}
3641	4404
3642		- if (tab.graphs[tab.undoindex] == null)
3643		- {
3644		- Save();
3645		- tab.undoindex -= 1;
3646		- }
	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	+// }
3647	4417
3648		- tab.undoindex -= 1;
	4418	+ copy.versionindex -= 1;
3649	4419
3650		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4420	+ CopyChanged();
	4421	+
	4422	+ return true;
3651	4423	}
3652	4424
3653		- public void Redo()
	4425	+ public boolean Restore()
3654	4426	{
3655		- cRadio tab = GetCurrentTab();
	4427	+ System.err.println("Restore");
3656	4428
3657		- 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)
3658	4468	{
3659	4469	java.awt.Toolkit.getDefaultToolkit().beep();
3660	4470	return;
3661	4471	}
3662	4472
3663		- tab.undoindex += 1;
	4473	+ copy.versionindex += 1;
3664	4474
3665		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4475	+ CopyChanged();
	4476	+
	4477	+ //if (!tab.user[tab.versionindex])
	4478	+ // tab.graphs[tab.versionindex] = null;
3666	4479	}
3667	4480
3668	4481	void ImportGFD()
..	..	@@ -3873,7 +4686,7 @@
3873	4686	//copy.material = new cMaterial(copy.GetMaterial());
3874	4687
3875	4688	current.color = (float) colorField.getFloat();
3876		- current.modulation = (float) modulationField.getFloat();
	4689	+ current.modulation = (float) saturationField.getFloat();
3877	4690	current.metalness = (float) metalnessField.getFloat();
3878	4691	current.diffuse = (float) diffuseField.getFloat();
3879	4692	current.specular = (float) specularField.getFloat();
..	..	@@ -3906,7 +4719,7 @@
3906	4719	cMaterial mat = copy.material;
3907	4720
3908	4721	colorField.SetToolTipValue((mat.color));
3909		- modulationField.SetToolTipValue((mat.modulation));
	4722	+ saturationField.SetToolTipValue((mat.modulation));
3910	4723	metalnessField.SetToolTipValue((mat.metalness));
3911	4724	diffuseField.SetToolTipValue((mat.diffuse));
3912	4725	specularField.SetToolTipValue((mat.specular));
..	..	@@ -3958,9 +4771,26 @@
3958	4771	//copy.Touch();
3959	4772	}
3960	4773
	4774	+ cNumberSlider versionSlider;
	4775	+
3961	4776	public void stateChanged(ChangeEvent e)
3962	4777	{
3963	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	+ }
3964	4794
3965	4795	if (freezematerial)
3966	4796	{
..	..	@@ -3996,6 +4826,12 @@
3996	4826	{
3997	4827	//System.out.println("stateChanged = " + this);
3998	4828	materialtouched = true;
	4829	+
	4830	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4831	+ {
	4832	+ saturationField.setFloat(1);
	4833	+ }
	4834	+
3999	4835	applySelf();
4000	4836	//System.out.println("this = " + this);
4001	4837	//System.out.println("PARENT = " + parent);
..	..	@@ -4295,6 +5131,7 @@
4295	5131	{
4296	5132	if (GetTree() != null)
4297	5133	{
	5134	+ GetTree().revalidate();
4298	5135	GetTree().repaint();
4299	5136	}
4300	5137
..	..	@@ -4303,13 +5140,16 @@
4303	5140	ctrlPanel.validate(); // ? new
4304	5141	ctrlPanel.repaint();
4305	5142	}
	5143	+
	5144	+ if (previousVersionButton != null && copy.versionlist != null)
	5145	+ SetVersionStates();
4306	5146	}
4307	5147
4308	5148	static TweenManager tweenManager = new TweenManager();
4309	5149
4310	5150	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4311	5151	{
4312		- if (Globals.SAVEONMAKE) // && resetmodel)
	5152	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4313	5153	Save();
4314	5154	//Tween.set(thing, 0).target(1).start(tweenManager);
4315	5155	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4551,7 +5391,9 @@
4551	5391	readobj.ResetDisplayList();
4552	5392	} catch (Exception e)
4553	5393	{
4554		- //e.printStackTrace();
	5394	+ if (!e.toString().contains("GZIP"))
	5395	+ e.printStackTrace();
	5396	+
4555	5397	try
4556	5398	{
4557	5399	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4625,12 +5467,14 @@
4625	5467
4626	5468	if (readobj != null)
4627	5469	{
4628		- if (Globals.SAVEONMAKE)
4629		- Save();
	5470	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5471	+ // Save();
4630	5472	try
4631	5473	{
4632	5474	//readobj.deepCopySelf(copy);
4633	5475	copy.clear(); // june 2014
	5476	+ copy.skyboxname = readobj.skyboxname;
	5477	+ copy.skyboxext = readobj.skyboxext;
4634	5478	for (int i = 0; i < readobj.size(); i++)
4635	5479	{
4636	5480	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4671,6 +5515,7 @@
4671	5515	}
4672	5516	} catch (ClassCastException e)
4673	5517	{
	5518	+ e.printStackTrace();
4674	5519	assert (false);
4675	5520	Composite c = (Composite) copy;
4676	5521	c.children.clear();
..	..	@@ -4681,17 +5526,31 @@
4681	5526	c.addChild(csg);
4682	5527	}
4683	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	+
4684	5543	ResetModel();
4685	5544	copy.HardTouch(); // recompile?
4686	5545	refreshContents();
4687	5546	}
4688	5547	}
4689	5548
4690		- void load() // throws ClassNotFoundException
	5549	+ void Open() // throws ClassNotFoundException
4691	5550	{
4692	5551	if (Grafreed.standAlone)
4693	5552	{
4694		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5553	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4695	5554	browser.show();
4696	5555	String filename = browser.getFile();
4697	5556	if (filename != null && filename.length() > 0)
..	..	@@ -4768,6 +5627,8 @@
4768	5627
4769	5628	void save()
4770	5629	{
	5630	+ Replace();
	5631	+
4771	5632	if (lastname == null)
4772	5633	{
4773	5634	return;
..	..	@@ -4790,6 +5651,7 @@
4790	5651	//ps.print(buffer.toString());
4791	5652	} catch (IOException e)
4792	5653	{
	5654	+ e.printStackTrace();
4793	5655	}
4794	5656	}
4795	5657
..	..	@@ -4972,7 +5834,7 @@
4972	5834	MenuBar menuBar;
4973	5835	Menu fileMenu;
4974	5836	MenuItem newItem;
4975		- MenuItem loadItem;
	5837	+ MenuItem openItem;
4976	5838	MenuItem saveItem;
4977	5839	MenuItem saveAsItem;
4978	5840	MenuItem exportAsItem;
..	..	@@ -4995,6 +5857,7 @@
4995	5857	CheckboxMenuItem toggleSwitchItem;
4996	5858	CheckboxMenuItem toggleRootItem;
4997	5859	CheckboxMenuItem animationItem;
	5860	+ MenuItem archiveItem;
4998	5861	CheckboxMenuItem toggleHandleItem;
4999	5862	CheckboxMenuItem togglePaintItem;
5000	5863	JSplitPane mainPanel;
..	..	@@ -5008,6 +5871,7 @@
5008	5871	ButtonGroup buttonGroup;
5009	5872
5010	5873	cGridBag toolboxPanel;
	5874	+ cGridBag skyboxPanel;
5011	5875	cGridBag materialPanel;
5012	5876	cGridBag ctrlPanel;
5013	5877
..	..	@@ -5081,7 +5945,7 @@
5081	5945	JLabel colorLabel;
5082	5946	cNumberSlider colorField;
5083	5947	JLabel modulationLabel;
5084		- cNumberSlider modulationField;
	5948	+ cNumberSlider saturationField;
5085	5949	JLabel metalnessLabel;
5086	5950	cNumberSlider metalnessField;
5087	5951	JLabel diffuseLabel;
..	..	@@ -5112,6 +5976,7 @@
5112	5976	cNumberSlider anisoField;
5113	5977	JLabel anisoVLabel;
5114	5978	cNumberSlider anisoVField;
	5979	+
5115	5980	JLabel cameraLabel;
5116	5981	cNumberSlider cameraField;
5117	5982	JLabel selfshadowLabel;
..	..	@@ -5126,6 +5991,7 @@
5126	5991	cNumberSlider fakedepthField;
5127	5992	JLabel shadowbiasLabel;
5128	5993	cNumberSlider shadowbiasField;
	5994	+
5129	5995	JLabel bumpLabel;
5130	5996	cNumberSlider bumpField;
5131	5997	JLabel noiseLabel;