~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,119 @@
38	42	JFrame frame;
39	43
40	44	static ObjEditor theFrame;
	45	+
	46	+ public void AllocProjectedVertices(Object3D object)
	47	+ {
	48	+ assert (object.projectedVertices != null);
	49	+
	50	+ if (object.projectedVertices.length <= 2)
	51	+ {
	52	+ // Side effect...
	53	+ Object3D.cVector2[] keep = object.projectedVertices;
	54	+ object.projectedVertices = new Object3D.cVector2[3];
	55	+ for (int i = 0; i < 3; i++)
	56	+ {
	57	+ if (i < keep.length)
	58	+ {
	59	+ object.projectedVertices[i] = keep[i];
	60	+ } else
	61	+ {
	62	+ object.projectedVertices[i] = new Object3D.cVector2();
	63	+ }
	64	+ /*
	65	+ if(keep.length == 0)
	66	+ object.projectedVertices[0] = new Object3D.cVector2();
	67	+ else
	68	+ object.projectedVertices[0] = keep[0];
	69	+ object.projectedVertices[1] = new Object3D.cVector2();
	70	+ */
	71	+ }
	72	+ }
	73	+ }
	74	+
	75	+ public cGridBag GetSeparator()
	76	+ {
	77	+ cGridBag separator = new cGridBag();
	78	+ separator.add(new JSeparator());
	79	+ separator.preferredHeight = 5;
	80	+ return separator;
	81	+ }
41	82
42	83	cButton GetButton(String name, boolean border)
43	84	{
44		- try
45		- {
46		- ImageIcon icon = GetIcon(name);
47		- return new cButton(icon, border);
48		- }
49		- catch (Exception e)
50		- {
51		- return new cButton(name, border);
52		- }
	85	+ ImageIcon icon = GetIcon(name);
	86	+ return new cButton(icon, border);
	87	+ }
	88	+
	89	+ cLabel GetLabel(String name, boolean border)
	90	+ {
	91	+ //ImageIcon icon = GetIcon(name);
	92	+ return new cLabel(GetImage(name), border);
53	93	}
54	94
55	95	cToggleButton GetToggleButton(String name, boolean border)
56	96	{
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		- }
	97	+ ImageIcon icon = GetIcon(name);
	98	+ return new cToggleButton(icon, border);
66	99	}
67	100
68	101	cCheckBox GetCheckBox(String name, boolean border)
69	102	{
	103	+ ImageIcon icon = GetIcon(name);
	104	+ return new cCheckBox(icon, border);
	105	+ }
	106	+
	107	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	108	+
	109	+ ImageIcon GetIcon(String name)
	110	+ {
	111	+ javax.swing.ImageIcon iconCache = icons.get(name);
	112	+ if (iconCache != null)
	113	+ {
	114	+ return iconCache;
	115	+ }
	116	+
70	117	try
71	118	{
72		- ImageIcon icon = GetIcon(name);
73		- return new cCheckBox(icon, border);
	119	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	120	+
	121	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	122	+// {
	123	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	124	+// Graphics2D g = resized.createGraphics();
	125	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	126	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	127	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	128	+// g.dispose();
	129	+//
	130	+// image = resized;
	131	+// }
	132	+
	133	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	134	+
	135	+ icons.put(name, icon);
	136	+
	137	+ return icon;
74	138	}
75	139	catch (Exception e)
76	140	{
77		- return new cCheckBox(name, border);
	141	+ //icons.put(name, null);
	142	+ return null;
78	143	}
79	144	}
80		-
81		- private ImageIcon GetIcon(String name) throws IOException
	145	+
	146	+ BufferedImage GetImage(String name)
82	147	{
83		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
84		-
85		- if (image.getWidth() != 24 && image.getHeight() != 24)
	148	+ try
86	149	{
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;
	150	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	151	+
	152	+ return image;
95	153	}
96		-
97		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
98		- return icon;
	154	+ catch (Exception e)
	155	+ {
	156	+ return null;
	157	+ }
99	158	}
100	159
101	160	// SCRIPT
..	..	@@ -279,6 +338,14 @@
279	338	client = inClient;
280	339	copy = client;
281	340
	341	+// if (copy.versionlist == null)
	342	+// {
	343	+// copy.versionlist = new Object3D[100];
	344	+// copy.versionindex = -1;
	345	+//
	346	+// callee.Save(true);
	347	+// }
	348	+
282	349	// "this" is not called: SetupUI2(objEditor);
283	350	}
284	351
..	..	@@ -292,6 +359,14 @@
292	359	client = inClient;
293	360	copy = client;
294	361
	362	+ if (copy.versionlist == null)
	363	+ {
	364	+ copy.versionlist = new Object3D[100];
	365	+ copy.versionindex = -1;
	366	+
	367	+// Save(true);
	368	+ }
	369	+
295	370	SetupUI2(callee.GetEditor());
296	371	}
297	372
..	..	@@ -306,7 +381,7 @@
306	381	//localCopy.parent = null;
307	382
308	383	frame = new JFrame();
309		- frame.setUndecorated(true);
	384	+ frame.setUndecorated(false);
310	385	objEditor = this;
311	386	this.callee = callee;
312	387
..	..	@@ -324,6 +399,14 @@
324	399	copy = localCopy;
325	400	copy.editWindow = this;
326	401
	402	+// if (copy.versionlist == null)
	403	+// {
	404	+// copy.versionlist = new Object3D[100];
	405	+// copy.versionindex = -1;
	406	+//
	407	+// Save(true);
	408	+// }
	409	+
327	410	SetupMenu();
328	411
329	412	//SetupName(objEditor); // new
..	..	@@ -347,7 +430,7 @@
347	430	frame.setMenuBar(menuBar = new MenuBar());
348	431	menuBar.add(fileMenu = new Menu("File"));
349	432	fileMenu.add(newItem = new MenuItem("New"));
350		- fileMenu.add(loadItem = new MenuItem("Open..."));
	433	+ fileMenu.add(openItem = new MenuItem("Open..."));
351	434
352	435	//oe.menuBar.add(menu = new Menu("Include"));
353	436	Menu menu = new Menu("Import");
..	..	@@ -379,7 +462,7 @@
379	462	}
380	463
381	464	newItem.addActionListener(this);
382		- loadItem.addActionListener(this);
	465	+ openItem.addActionListener(this);
383	466	saveItem.addActionListener(this);
384	467	saveAsItem.addActionListener(this);
385	468	exportAsItem.addActionListener(this);
..	..	@@ -391,6 +474,8 @@
391	474
392	475	ChangeListener changeListener = new ChangeListener()
393	476	{
	477	+ //String name;
	478	+
394	479	public void stateChanged(ChangeEvent changeEvent)
395	480	{
396	481	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -409,18 +494,49 @@
409	494	// EditSelection(false);
410	495	// }
411	496
412		- refreshContents(false); // To refresh Info tab
	497	+// if (objectPanel.getSelectedIndex() == 4)
	498	+// {
	499	+// name = copy.skyboxname;
	500	+//
	501	+// if (name == null)
	502	+// {
	503	+// name = "";
	504	+// }
	505	+//
	506	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	507	+// copy.skyboxext = "jpg";
	508	+// }
	509	+// else
	510	+// {
	511	+// if (name != null)
	512	+// {
	513	+// if (name.equals(""))
	514	+// {
	515	+// copy.skyboxname = null;
	516	+// copy.skyboxext = null;
	517	+// }
	518	+// else
	519	+// {
	520	+// copy.skyboxname = name;
	521	+// }
	522	+// }
	523	+// }
	524	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	525	+
	526	+// refreshContents(false); // To refresh Info tab
	527	+ cameraView.repaint();
413	528	}
414	529	};
415	530	objectPanel.addChangeListener(changeListener);
416	531
417	532	toolbarPanel = new JPanel();
418	533	toolbarPanel.setName("Toolbar");
	534	+
419	535	treePanel = new cGridBag();
420	536	treePanel.setName("Tree");
421	537
422	538	editPanel = new cGridBag().setVertical(true);
423		- editPanel.setName("Edit");
	539	+ //editPanel.setName("Edit");
424	540
425	541	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
426	542
..	..	@@ -428,11 +544,13 @@
428	544	editPanel.add(editCommandsPanel);
429	545	editPanel.add(ctrlPanel);
430	546
431		- toolboxPanel = new cGridBag().setVertical(false);
432		- toolboxPanel.setName("Toolbox");
	547	+ toolboxPanel = new cGridBag().setVertical(true);
	548	+ //toolboxPanel.setName("Toolbox");
433	549
434		- materialPanel = new cGridBag().setVertical(true);
435		- materialPanel.setName("Material");
	550	+ skyboxPanel = new cGridBag().setVertical(true);
	551	+
	552	+ materialPanel = new cGridBag().setVertical(false);
	553	+ //materialPanel.setName("Material");
436	554
437	555	/JTextPane/
438	556	infoarea = createTextPane();
..	..	@@ -440,14 +558,15 @@
440	558
441	559	infoarea.setEditable(true);
442	560	SetText();
	561	+
443	562	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
444	563	// infoarea.setOpaque(false);
445	564	// //infoarea.setForeground(textcolor);
446	565	// TEXTAREA infoarea.setLineWrap(true);
447	566	// TEXTAREA infoarea.setWrapStyleWord(true);
448	567	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
449		- infoPanel.setPreferredSize(new Dimension(50, 200));
450		- infoPanel.setName("Info");
	568	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	569	+ //infoPanel.setName("Info");
451	570	//infoPanel.setLayout(new BorderLayout());
452	571	//infoPanel.add(createTextPane());
453	572
..	..	@@ -458,7 +577,14 @@
458	577	mainPanel.setDividerSize(9);
459	578	mainPanel.setDividerLocation(0.5); //1.0);
460	579	mainPanel.setResizeWeight(0.5);
461		-
	580	+
	581	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	582	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	583	+ divider.setDividerSize(15);
	584	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	585	+
	586	+ mainPanel.setUI(new BasicSplitPaneUI());
	587	+
462	588	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
463	589	//mainPanel.setLayout(new GridBagLayout());
464	590	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -689,8 +815,8 @@
689	815	}
690	816	}
691	817
692		-static GraphicsDevice device = GraphicsEnvironment
693		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	818	+//static GraphicsDevice device = GraphicsEnvironment
	819	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
694	820
695	821	Rectangle keeprect;
696	822	cRadio radio;
..	..	@@ -707,14 +833,24 @@
707	833	boolean maximized;
708	834
709	835	cButton fullscreenLayout;
	836	+ cButton expandedLayout;
710	837
711	838	void Minimize()
712	839	{
713	840	frame.setState(Frame.ICONIFIED);
	841	+ frame.validate();
714	842	}
715	843
	844	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	845	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	846	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
716	847	void Maximize()
717	848	{
	849	+ if (CameraPane.FULLSCREEN)
	850	+ {
	851	+ ToggleFullScreen();
	852	+ }
	853	+
718	854	if (maximized)
719	855	{
720	856	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -722,22 +858,38 @@
722	858	else
723	859	{
724	860	keeprect = frame.getBounds();
725		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
726		- Dimension rect2 = frame.getToolkit().getScreenSize();
727		- frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	861	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	862	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	863	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
728	864	// frame.setState(Frame.MAXIMIZED_BOTH);
	865	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
729	866	}
730	867
731	868	maximized ^= true;
	869	+
	870	+ frame.validate();
732	871	}
	872	+
	873	+ cButton minButton;
	874	+ cButton maxButton;
	875	+ cButton fullButton;
	876	+ cButton collapseButton;
	877	+ cButton maximize3DButton;
733	878
734	879	void ToggleFullScreen()
735	880	{
	881	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	882	+
736	883	cameraView.ToggleFullScreen();
737	884
738	885	if (!CameraPane.FULLSCREEN)
739	886	{
740	887	device.setFullScreenWindow(null);
	888	+ frame.dispose();
	889	+ frame.setUndecorated(false);
	890	+ frame.validate();
	891	+ frame.setVisible(true);
	892	+
741	893	//frame.setVisible(false);
742	894	// frame.removeNotify();
743	895	// frame.setUndecorated(false);
..	..	@@ -747,13 +899,13 @@
747	899	// X frame.getContentPane().remove(/"Center",/bigThree);
748	900	// X framePanel.add(bigThree);
749	901	// X frame.getContentPane().add(/"Center",/framePanel);
750		- framePanel.setDividerLocation(1);
	902	+// framePanel.setDividerLocation(46); // icons are 24x24
751	903
752	904	//frame.setVisible(true);
753		- radio.layout = keepButton;
	905	+// radio.layout = keepButton;
754	906	//theFrame = null;
755	907	keepButton = null;
756		- radio.layout.doClick();
	908	+// radio.layout.doClick();
757	909
758	910	} else
759	911	{
..	..	@@ -762,20 +914,59 @@
762	914	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
763	915	// frame.getToolkit().getScreenSize().height);
764	916	//frame.setVisible(false);
	917	+
	918	+ frame.dispose();
	919	+ frame.setUndecorated(true);
765	920	device.setFullScreenWindow(frame);
	921	+ frame.validate();
	922	+ frame.setVisible(true);
766	923	// frame.removeNotify();
767	924	// frame.setUndecorated(true);
768	925	// frame.addNotify();
769	926	// X frame.getContentPane().remove(/"Center",/framePanel);
770	927	// X framePanel.remove(bigThree);
771	928	// X frame.getContentPane().add(/"Center",/bigThree);
772		- framePanel.setDividerLocation(0);
	929	+// framePanel.setDividerLocation(0);
773	930
774		- radio.layout = fullscreenLayout;
775		- radio.layout.doClick();
	931	+// radio.layout = fullscreenLayout;
	932	+// radio.layout.doClick();
776	933	//frame.setVisible(true);
777	934	}
	935	+ frame.validate();
	936	+
	937	+ cameraView.requestFocusInWindow();
778	938	}
	939	+
	940	+ void CollapseToolbar()
	941	+ {
	942	+ framePanel.setDividerLocation(0);
	943	+ //frame.validate();
	944	+
	945	+ cameraView.requestFocusInWindow();
	946	+ }
	947	+
	948	+ private Object3D Duplicate(Object3D object)
	949	+ {
	950	+ boolean temp = CameraPane.SWITCH;
	951	+ CameraPane.SWITCH = false;
	952	+
	953	+ object.ExtractBigData(versiontable);
	954	+ // if (copy == client)
	955	+
	956	+ Object3D versions[] = object.versionlist;
	957	+ object.versionlist = null;
	958	+
	959	+ //byte[] compress = Compress(copy);
	960	+ Object3D compress = (Object3D)Grafreed.clone(object);
	961	+
	962	+ object.versionlist = versions;
	963	+
	964	+ object.RestoreBigData(versiontable);
	965	+
	966	+ CameraPane.SWITCH = temp;
	967	+
	968	+ return compress;
	969	+ }
779	970
780	971	private JTextPane createTextPane()
781	972	{
..	..	@@ -898,6 +1089,7 @@
898	1089	{
899	1090	SetupMaterial(materialPanel);
900	1091	}
	1092	+
901	1093	//SetupName();
902	1094	//SetupViews();
903	1095	}
..	..	@@ -907,7 +1099,7 @@
907	1099	// NumberSlider vDivsField;
908	1100	// JCheckBox endcaps;
909	1101	JCheckBox liveCB;
910		- JCheckBox selectCB;
	1102	+ JCheckBox selectableCB;
911	1103	JCheckBox hideCB;
912	1104	JCheckBox link2masterCB;
913	1105	JCheckBox markCB;
..	..	@@ -1106,8 +1298,20 @@
1106	1298
1107	1299	namePanel = new cGridBag();
1108	1300
	1301	+ //if (copy.pinned)
	1302	+ {
	1303	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1304	+ pinButton.setSelected(copy.pinned);
	1305	+ cGridBag t = new cGridBag();
	1306	+ t.preferredWidth = 2;
	1307	+ t.add(pinButton);
	1308	+ namePanel.add(t);
	1309	+
	1310	+ pinButton.addItemListener(this);
	1311	+ }
	1312	+
1109	1313	nameField = AddText(namePanel, copy.GetName());
1110		- namePanel.add(nameField);
	1314	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1111	1315	oe.ctrlPanel.add(namePanel);
1112	1316
1113	1317	oe.ctrlPanel.Return();
..	..	@@ -1119,26 +1323,30 @@
1119	1323
1120	1324	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1121	1325	liveCB.setToolTipText("Animate object");
1122		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1123		- selectCB.setToolTipText("Make object selectable");
	1326	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1327	+ selectableCB.setToolTipText("Make object selectable");
1124	1328	// Return();
	1329	+
1125	1330	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1126	1331	hideCB.setToolTipText("Hide object");
1127	1332	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1128		- markCB.setToolTipText("Set the animation target transform");
	1333	+ markCB.setToolTipText("As animation target transform");
	1334	+
	1335	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1129	1336
1130	1337	setupPanel2 = new cGridBag().setVertical(false);
1131	1338
1132	1339	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1133	1340	rewindCB.setToolTipText("Rewind animation");
1134	1341
1135		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1136		- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1342	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1343	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1137	1344
	1345	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1346	+ link2masterCB.setToolTipText("Attach to support");
	1347	+
1138	1348	if (Globals.ADVANCED)
1139	1349	{
1140		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1141		- link2masterCB.setToolTipText("Attach to support");
1142	1350	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1143	1351	speedupCB.setToolTipText("Option motion capture");
1144	1352	}
..	..	@@ -1412,6 +1620,7 @@
1412	1620	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1413	1621	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1414	1622	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1623	+ //XYZPanel.setName("XYZ");
1415	1624
1416	1625	/*
1417	1626	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1449,14 +1658,29 @@
1449	1658	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1450	1659	//tmp.setName("Edit");
1451	1660	objectPanel.add(materialPanel);
	1661	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1662	+ objectPanel.setToolTipTextAt(0, "Material");
	1663	+
	1664	+ objectPanel.add(toolboxPanel);
	1665	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1666	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1667	+
	1668	+ objectPanel.add(skyboxPanel);
	1669	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1670	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1671	+
1452	1672	// JPanel north = new JPanel(new BorderLayout());
1453	1673	// north.setName("Edit");
1454	1674	// north.add(ctrlPanel, BorderLayout.NORTH);
1455	1675	// objectPanel.add(north);
1456	1676	objectPanel.add(editPanel);
1457		- objectPanel.add(infoPanel);
1458		- objectPanel.add(toolboxPanel);
1459		-
	1677	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1678	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1679	+
	1680	+ objectPanel.add(XYZPanel);
	1681	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1682	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1683	+
1460	1684	/*
1461	1685	aConstraints.gridx = 0;
1462	1686	aConstraints.gridwidth = 1;
..	..	@@ -1476,7 +1700,7 @@
1476	1700	scrollpane.addMouseWheelListener(this); // Default not fast enough
1477	1701
1478	1702	/JTabbedPane/ scenePanel = new cGridBag();
1479		- scenePanel.preferredWidth = 6;
	1703	+ scenePanel.preferredWidth = 5;
1480	1704
1481	1705	JTabbedPane tabbedPane = new JTabbedPane();
1482	1706	tabbedPane.add(scrollpane);
..	..	@@ -1493,6 +1717,11 @@
1493	1717
1494	1718	scenePanel.add(tabbedPane);
1495	1719
	1720	+ //if (Globals.ADVANCED)
	1721	+// tabbedPane.add(infoPanel);
	1722	+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1723	+// tabbedPane.setToolTipTextAt(3, "Information");
	1724	+
1496	1725	/*
1497	1726	cTree jTree = new cTree(null);
1498	1727	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1554,7 +1783,7 @@
1554	1783	bigThree = new cGridBag();
1555	1784	bigThree.addComponent(scenePanel);
1556	1785	bigThree.addComponent(centralPanel);
1557		- bigThree.addComponent(XYZPanel);
	1786	+ //bigThree.addComponent(XYZPanel);
1558	1787
1559	1788	// // SIDE EFFECT!!!
1560	1789	// aConstraints.gridx = 0;
..	..	@@ -1563,16 +1792,33 @@
1563	1792	// aConstraints.gridheight = 1;
1564	1793
1565	1794	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1566		- framePanel.setContinuousLayout(true);
1567		- framePanel.setOneTouchExpandable(true);
1568		- framePanel.setDividerLocation(0.8);
	1795	+
	1796	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1797	+ new java.beans.PropertyChangeListener()
	1798	+ {
	1799	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1800	+ {
	1801	+ if ((Integer)pce.getOldValue() == 1)
	1802	+ {
	1803	+ if (radio.layout != expandedLayout)
	1804	+ {
	1805	+ radio.layout = expandedLayout;
	1806	+ radio.layout.doClick();
	1807	+ }
	1808	+ }
	1809	+ }
	1810	+ });
	1811	+
	1812	+ framePanel.setContinuousLayout(false);
	1813	+ framePanel.setOneTouchExpandable(false);
	1814	+ //.setDividerLocation(0.8);
1569	1815	//framePanel.setDividerSize(15);
1570	1816	//framePanel.setResizeWeight(0.15);
1571	1817	framePanel.setName("Frame");
1572	1818
1573	1819	frame.getContentPane().setLayout(new BorderLayout());
1574	1820	/**/
1575		- JTabbedPane worldPane = new JTabbedPane();
	1821	+ //JTabbedPane worldPane = new JTabbedPane();
1576	1822	//worldPane.add(bigPanel);
1577	1823	//worldPane.add(worldPanel);
1578	1824	/**/
..	..	@@ -1584,17 +1830,17 @@
1584	1830
1585	1831	frame.setSize(1280, 860);
1586	1832
1587		- frame.validate();
1588		- frame.setVisible(true);
1589		-
1590	1833	cameraView.requestFocusInWindow();
1591	1834
1592	1835	gridPanel.setDividerLocation(1.0);
	1836	+
	1837	+ frame.validate();
	1838	+
	1839	+ frame.setVisible(true);
1593	1840
1594	1841	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1595	1842	frame.addWindowListener(new WindowAdapter()
1596	1843	{
1597		-
1598	1844	public void windowClosing(WindowEvent e)
1599	1845	{
1600	1846	Close();
..	..	@@ -1617,12 +1863,418 @@
1617	1863	ctrlPanel.removeAll();
1618	1864	}
1619	1865
1620		- void SetupMaterial(cGridBag panel)
	1866	+ void SetupMaterial(cGridBag materialpanel)
1621	1867	{
1622		- /*
	1868	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1869	+
	1870	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1871	+ skin.setToolTipText("Skin");
	1872	+ skin.addMouseListener(new MouseAdapter()
	1873	+ {
	1874	+ public void mouseClicked(MouseEvent e)
	1875	+ {
	1876	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1877	+ cMaterial material = object.material;
	1878	+
	1879	+ // Skin
	1880	+ colorField.setFloat(material.color);
	1881	+ saturationField.setFloat(material.modulation);
	1882	+ subsurfaceField.setFloat(material.subsurface);
	1883	+ selfshadowField.setFloat(material.diffuseness);
	1884	+ diffusenessField.setFloat(material.factor);
	1885	+ shininessField.setFloat(material.shininess);
	1886	+ shadowbiasField.setFloat(material.shadowbias);
	1887	+ diffuseField.setFloat(material.diffuse);
	1888	+ specularField.setFloat(material.specular);
	1889	+
	1890	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1891	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1892	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1893	+
	1894	+ materialtouched = true;
	1895	+ applySelf();
	1896	+ }
	1897	+ });
	1898	+ presetpanel.add(skin);
	1899	+
	1900	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1901	+ lambert.setToolTipText("Diffuse");
	1902	+ lambert.addMouseListener(new MouseAdapter()
	1903	+ {
	1904	+ public void mouseClicked(MouseEvent e)
	1905	+ {
	1906	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1907	+ cMaterial material = object.material;
	1908	+
	1909	+ diffusenessField.setFloat(material.factor);
	1910	+ selfshadowField.setFloat(material.diffuseness);
	1911	+
	1912	+ materialtouched = true;
	1913	+ applySelf();
	1914	+ }
	1915	+ });
	1916	+ presetpanel.add(lambert);
	1917	+
	1918	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1919	+ diffuse2.setToolTipText("Diffuse2");
	1920	+ diffuse2.addMouseListener(new MouseAdapter()
	1921	+ {
	1922	+ public void mouseClicked(MouseEvent e)
	1923	+ {
	1924	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1925	+ cMaterial material = object.material;
	1926	+
	1927	+ diffusenessField.setFloat(material.factor);
	1928	+ selfshadowField.setFloat(material.diffuseness);
	1929	+
	1930	+ materialtouched = true;
	1931	+ applySelf();
	1932	+ }
	1933	+ });
	1934	+ presetpanel.add(diffuse2);
	1935	+
	1936	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1937	+ diffusemoon.setToolTipText("Moon");
	1938	+ diffusemoon.addMouseListener(new MouseAdapter()
	1939	+ {
	1940	+ public void mouseClicked(MouseEvent e)
	1941	+ {
	1942	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1943	+ cMaterial material = object.material;
	1944	+
	1945	+ diffusenessField.setFloat(material.factor);
	1946	+ selfshadowField.setFloat(material.diffuseness);
	1947	+
	1948	+ materialtouched = true;
	1949	+ applySelf();
	1950	+ }
	1951	+ });
	1952	+ presetpanel.add(diffusemoon);
	1953	+
	1954	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1955	+ diffusemoon2.setToolTipText("Moon2");
	1956	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1957	+ {
	1958	+ public void mouseClicked(MouseEvent e)
	1959	+ {
	1960	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1961	+ cMaterial material = object.material;
	1962	+
	1963	+ diffusenessField.setFloat(material.factor);
	1964	+ selfshadowField.setFloat(material.diffuseness);
	1965	+
	1966	+ materialtouched = true;
	1967	+ applySelf();
	1968	+ }
	1969	+ });
	1970	+ presetpanel.add(diffusemoon2);
	1971	+
	1972	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1973	+ diffusemoon3.setToolTipText("Moon3");
	1974	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1975	+ {
	1976	+ public void mouseClicked(MouseEvent e)
	1977	+ {
	1978	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1979	+ cMaterial material = object.material;
	1980	+
	1981	+ diffusenessField.setFloat(material.factor);
	1982	+ selfshadowField.setFloat(material.diffuseness);
	1983	+
	1984	+ materialtouched = true;
	1985	+ applySelf();
	1986	+ }
	1987	+ });
	1988	+ presetpanel.add(diffusemoon3);
	1989	+
	1990	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1991	+ diffusesheen.setToolTipText("Sheen");
	1992	+ diffusesheen.addMouseListener(new MouseAdapter()
	1993	+ {
	1994	+ public void mouseClicked(MouseEvent e)
	1995	+ {
	1996	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1997	+ cMaterial material = object.material;
	1998	+
	1999	+ sheenField.setFloat(material.sheen);
	2000	+
	2001	+ materialtouched = true;
	2002	+ applySelf();
	2003	+ }
	2004	+ });
	2005	+ presetpanel.add(diffusesheen);
	2006	+
	2007	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	2008	+ rough.setToolTipText("Rough metal");
	2009	+ rough.addMouseListener(new MouseAdapter()
	2010	+ {
	2011	+ public void mouseClicked(MouseEvent e)
	2012	+ {
	2013	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	2014	+ cMaterial material = object.material;
	2015	+
	2016	+ shininessField.setFloat(material.shininess);
	2017	+ velvetField.setFloat(material.velvet);
	2018	+
	2019	+ materialtouched = true;
	2020	+ applySelf();
	2021	+ }
	2022	+ });
	2023	+ presetpanel.add(rough);
	2024	+
	2025	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	2026	+ rough2.setToolTipText("Medium metal");
	2027	+ rough2.addMouseListener(new MouseAdapter()
	2028	+ {
	2029	+ public void mouseClicked(MouseEvent e)
	2030	+ {
	2031	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2032	+ cMaterial material = object.material;
	2033	+
	2034	+ shininessField.setFloat(material.shininess);
	2035	+ lightareaField.setFloat(material.lightarea);
	2036	+
	2037	+ materialtouched = true;
	2038	+ applySelf();
	2039	+ }
	2040	+ });
	2041	+ presetpanel.add(rough2);
	2042	+
	2043	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2044	+ shini0.setToolTipText("Shiny");
	2045	+ shini0.addMouseListener(new MouseAdapter()
	2046	+ {
	2047	+ public void mouseClicked(MouseEvent e)
	2048	+ {
	2049	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2050	+ cMaterial material = object.material;
	2051	+
	2052	+ shininessField.setFloat(material.shininess);
	2053	+ lightareaField.setFloat(material.lightarea);
	2054	+
	2055	+ materialtouched = true;
	2056	+ applySelf();
	2057	+ }
	2058	+ });
	2059	+ presetpanel.add(shini0);
	2060	+
	2061	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2062	+ shini1.setToolTipText("Shiny2");
	2063	+ shini1.addMouseListener(new MouseAdapter()
	2064	+ {
	2065	+ public void mouseClicked(MouseEvent e)
	2066	+ {
	2067	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2068	+ cMaterial material = object.material;
	2069	+
	2070	+ shininessField.setFloat(material.shininess);
	2071	+ lightareaField.setFloat(material.lightarea);
	2072	+
	2073	+ materialtouched = true;
	2074	+ applySelf();
	2075	+ }
	2076	+ });
	2077	+ presetpanel.add(shini1);
	2078	+
	2079	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2080	+ shini2.setToolTipText("Shiny3");
	2081	+ shini2.addMouseListener(new MouseAdapter()
	2082	+ {
	2083	+ public void mouseClicked(MouseEvent e)
	2084	+ {
	2085	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2086	+ cMaterial material = object.material;
	2087	+
	2088	+ shininessField.setFloat(material.shininess);
	2089	+ lightareaField.setFloat(material.lightarea);
	2090	+
	2091	+ materialtouched = true;
	2092	+ applySelf();
	2093	+ }
	2094	+ });
	2095	+ presetpanel.add(shini2);
	2096	+
	2097	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2098	+ aniso.setToolTipText("AnisoU");
	2099	+ aniso.addMouseListener(new MouseAdapter()
	2100	+ {
	2101	+ public void mouseClicked(MouseEvent e)
	2102	+ {
	2103	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2104	+ cMaterial material = object.material;
	2105	+
	2106	+ anisoField.setFloat(material.aniso);
	2107	+ anisoVField.setFloat(material.anisoV);
	2108	+
	2109	+ materialtouched = true;
	2110	+ applySelf();
	2111	+ }
	2112	+ });
	2113	+ presetpanel.add(aniso);
	2114	+
	2115	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2116	+ aniso2.setToolTipText("AnisoV");
	2117	+ aniso2.addMouseListener(new MouseAdapter()
	2118	+ {
	2119	+ public void mouseClicked(MouseEvent e)
	2120	+ {
	2121	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2122	+ cMaterial material = object.material;
	2123	+
	2124	+ anisoField.setFloat(material.aniso);
	2125	+ anisoVField.setFloat(material.anisoV);
	2126	+
	2127	+ materialtouched = true;
	2128	+ applySelf();
	2129	+ }
	2130	+ });
	2131	+ presetpanel.add(aniso2);
	2132	+
	2133	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2134	+ aniso3.setToolTipText("AnisoUV");
	2135	+ aniso3.addMouseListener(new MouseAdapter()
	2136	+ {
	2137	+ public void mouseClicked(MouseEvent e)
	2138	+ {
	2139	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2140	+ cMaterial material = object.material;
	2141	+
	2142	+ anisoField.setFloat(material.aniso);
	2143	+ anisoVField.setFloat(material.anisoV);
	2144	+
	2145	+ materialtouched = true;
	2146	+ applySelf();
	2147	+ }
	2148	+ });
	2149	+ presetpanel.add(aniso3);
	2150	+
	2151	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2152	+ velvet0.setToolTipText("Velvet");
	2153	+ velvet0.addMouseListener(new MouseAdapter()
	2154	+ {
	2155	+ public void mouseClicked(MouseEvent e)
	2156	+ {
	2157	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2158	+ cMaterial material = object.material;
	2159	+
	2160	+ diffusenessField.setFloat(material.factor);
	2161	+ selfshadowField.setFloat(material.diffuseness);
	2162	+ sheenField.setFloat(material.sheen);
	2163	+ shininessField.setFloat(material.shininess);
	2164	+ velvetField.setFloat(material.velvet);
	2165	+ shiftField.setFloat(material.shift);
	2166	+
	2167	+ materialtouched = true;
	2168	+ applySelf();
	2169	+ }
	2170	+ });
	2171	+ presetpanel.add(velvet0);
	2172	+
	2173	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2174	+ bump0.setToolTipText("Bump texture");
	2175	+ bump0.addMouseListener(new MouseAdapter()
	2176	+ {
	2177	+ public void mouseClicked(MouseEvent e)
	2178	+ {
	2179	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2180	+ cMaterial material = object.material;
	2181	+
	2182	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2183	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2184	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2185	+
	2186	+ materialtouched = true;
	2187	+ applySelf();
	2188	+ }
	2189	+ });
	2190	+ presetpanel.add(bump0);
	2191	+
	2192	+ cLabel borderShader = GetLabel("icons/shadericons/borderfade.jpg", !Grafreed.NIMBUSLAF);
	2193	+ borderShader.setToolTipText("Border fade");
	2194	+ borderShader.addMouseListener(new MouseAdapter()
	2195	+ {
	2196	+ public void mouseClicked(MouseEvent e)
	2197	+ {
	2198	+ borderfadeField.setFloat(0.5);
	2199	+ opacityField.setFloat(0.6);
	2200	+
	2201	+ materialtouched = true;
	2202	+ applySelf();
	2203	+ }
	2204	+ });
	2205	+ presetpanel.add(borderShader);
	2206	+
	2207	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2208	+ halo.setToolTipText("Halo");
	2209	+ halo.addMouseListener(new MouseAdapter()
	2210	+ {
	2211	+ public void mouseClicked(MouseEvent e)
	2212	+ {
	2213	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2214	+ cMaterial material = object.material;
	2215	+
	2216	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2217	+
	2218	+ materialtouched = true;
	2219	+ applySelf();
	2220	+ }
	2221	+ });
	2222	+ presetpanel.add(halo);
	2223	+
	2224	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2225	+ candle.setToolTipText("Candle");
	2226	+ candle.addMouseListener(new MouseAdapter()
	2227	+ {
	2228	+ public void mouseClicked(MouseEvent e)
	2229	+ {
	2230	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2231	+ cMaterial material = object.material;
	2232	+
	2233	+ subsurfaceField.setFloat(material.subsurface);
	2234	+ shadowbiasField.setFloat(material.shadowbias);
	2235	+ ambientField.setFloat(material.ambient);
	2236	+ specularField.setFloat(material.specular);
	2237	+ lightareaField.setFloat(material.lightarea);
	2238	+ shininessField.setFloat(material.shininess);
	2239	+
	2240	+ materialtouched = true;
	2241	+ applySelf();
	2242	+ }
	2243	+ });
	2244	+ presetpanel.add(candle);
	2245	+
	2246	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2247	+ shadowShader.setToolTipText("Shadow");
	2248	+ shadowShader.addMouseListener(new MouseAdapter()
	2249	+ {
	2250	+ public void mouseClicked(MouseEvent e)
	2251	+ {
	2252	+ diffuseField.setFloat(0.001);
	2253	+ ambientField.setFloat(0.001);
	2254	+ cameraField.setFloat(0.001);
	2255	+ specularField.setFloat(0.001);
	2256	+ fakedepthField.setFloat(0.001);
	2257	+ opacityField.setFloat(0.6);
	2258	+
	2259	+ materialtouched = true;
	2260	+ applySelf();
	2261	+ }
	2262	+ });
	2263	+ presetpanel.add(shadowShader);
	2264	+
	2265	+ cGridBag panel = new cGridBag().setVertical(true);
	2266	+
	2267	+ presetpanel.preferredWidth = 1;
	2268	+
	2269	+ materialpanel.add(presetpanel);
	2270	+ materialpanel.add(panel);
	2271	+
	2272	+ panel.preferredWidth = 8;
	2273	+
	2274	+ /*
1623	2275	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1624	2276	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1625		- */
	2277	+ */
1626	2278
1627	2279	cGridBag editBar = new cGridBag().setVertical(false);
1628	2280
..	..	@@ -1656,45 +2308,50 @@
1656	2308	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1657	2309
1658	2310	cGridBag colorSection = new cGridBag().setVertical(true);
	2311	+
	2312	+ cGridBag huepanel = new cGridBag();
	2313	+ cGridBag huelabel = new cGridBag();
	2314	+ skin = GetLabel("icons/hue.png", false);
	2315	+ skin.fit = true;
	2316	+ huelabel.add(skin);
	2317	+ huelabel.preferredWidth = 20;
	2318	+ huepanel.add(new cGridBag()); // Label
	2319	+ huepanel.add(huelabel); // Field/slider
	2320	+
	2321	+ huepanel.preferredHeight = 7;
	2322	+
	2323	+ colorSection.add(huepanel);
1659	2324
1660	2325	cGridBag color = new cGridBag();
1661		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1662		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1663		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2326	+
	2327	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2328	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2329	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2330	+
1664	2331	//colorField.preferredWidth = 200;
1665	2332	colorSection.add(color);
1666	2333
1667	2334	cGridBag modulation = new cGridBag();
1668	2335	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1669	2336	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1670		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2337	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1671	2338	colorSection.add(modulation);
1672	2339
	2340	+ cGridBag opacity = new cGridBag();
	2341	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2342	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2343	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2344	+ colorSection.add(opacity);
	2345	+
	2346	+ colorSection.add(GetSeparator());
	2347	+
1673	2348	cGridBag texture = new cGridBag();
1674	2349	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1675	2350	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1676	2351	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1677	2352	colorSection.add(texture);
1678	2353
1679		- cGridBag anisoU = new cGridBag();
1680		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1681		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1682		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1683		- colorSection.add(anisoU);
1684		-
1685		- cGridBag anisoV = new cGridBag();
1686		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1687		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1688		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1689		- colorSection.add(anisoV);
1690		-
1691		- cGridBag shadowbias = new cGridBag();
1692		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1693		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1694		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1695		- colorSection.add(shadowbias);
1696		-
1697		- panel.add(new JSeparator());
	2354	+ panel.add(GetSeparator());
1698	2355
1699	2356	panel.add(colorSection);
1700	2357
..	..	@@ -1744,7 +2401,13 @@
1744	2401	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1745	2402	diffuseSection.add(fakedepth);
1746	2403
1747		- panel.add(new JSeparator());
	2404	+ cGridBag shadowbias = new cGridBag();
	2405	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2406	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2407	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2408	+ diffuseSection.add(shadowbias);
	2409	+
	2410	+ panel.add(GetSeparator());
1748	2411
1749	2412	panel.add(diffuseSection);
1750	2413
..	..	@@ -1794,42 +2457,48 @@
1794	2457	// aConstraints.gridy += 1;
1795	2458	// aConstraints.gridwidth = 1;
1796	2459
	2460	+ cGridBag anisoU = new cGridBag();
	2461	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2462	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2463	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2464	+ specularSection.add(anisoU);
1797	2465
1798		- panel.add(new JSeparator());
	2466	+ cGridBag anisoV = new cGridBag();
	2467	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2468	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2469	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2470	+ specularSection.add(anisoV);
	2471	+
	2472	+
	2473	+ panel.add(GetSeparator());
1799	2474
1800	2475	panel.add(specularSection);
1801	2476
1802	2477	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1803	2478
1804		- cGridBag globalSection = new cGridBag().setVertical(true);
	2479	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1805	2480
1806	2481	cGridBag camera = new cGridBag();
1807	2482	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1808	2483	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1809	2484	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1810		- globalSection.add(camera);
	2485	+ colorSection.add(camera);
1811	2486
1812	2487	cGridBag ambient = new cGridBag();
1813	2488	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1814	2489	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1815	2490	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1816		- globalSection.add(ambient);
	2491	+ colorSection.add(ambient);
1817	2492
1818	2493	cGridBag backlit = new cGridBag();
1819	2494	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1820	2495	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1821	2496	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1822		- globalSection.add(backlit);
	2497	+ colorSection.add(backlit);
1823	2498
1824		- cGridBag opacity = new cGridBag();
1825		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1826		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1827		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1828		- globalSection.add(opacity);
1829		-
1830		- panel.add(new JSeparator());
	2499	+ //panel.add(new JSeparator());
1831	2500
1832		- panel.add(globalSection);
	2501	+ //panel.add(globalSection);
1833	2502
1834	2503	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1835	2504
..	..	@@ -1871,7 +2540,7 @@
1871	2540	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1872	2541	textureSection.add(opacityPower);
1873	2542
1874		- panel.add(new JSeparator());
	2543	+ panel.add(GetSeparator());
1875	2544
1876	2545	panel.add(textureSection);
1877	2546
..	..	@@ -1936,8 +2605,9 @@
1936	2605	// 3D models
1937	2606	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1938	2607	{
1939		- lastConverter = new com.jmex.model.converters.MaxToJme();
1940		- LoadFile(filename, lastConverter);
	2608	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2609	+ //LoadFile(filename, lastConverter);
	2610	+ LoadObjFile(filename); // New 3ds loader
1941	2611	continue;
1942	2612	}
1943	2613	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2663,6 +3333,7 @@
2663	3333	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2664	3334	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2665	3335	}
	3336	+
2666	3337	//cJME.count++;
2667	3338	//cJME.count %= 12;
2668	3339	if (gc)
..	..	@@ -2846,6 +3517,7 @@
2846	3517	}
2847	3518	}
2848	3519	}
	3520	+
2849	3521	cFileSystemPane FSPane;
2850	3522
2851	3523	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2855,7 +3527,7 @@
2855	3527
2856	3528	freezematerial = true;
2857	3529	colorField.setFloat(mat.color);
2858		- modulationField.setFloat(mat.modulation);
	3530	+ saturationField.setFloat(mat.modulation);
2859	3531	metalnessField.setFloat(mat.metalness);
2860	3532	diffuseField.setFloat(mat.diffuse);
2861	3533	specularField.setFloat(mat.specular);
..	..	@@ -2899,6 +3571,7 @@
2899	3571	}
2900	3572	}
2901	3573	}
	3574	+
2902	3575	freezematerial = false;
2903	3576	}
2904	3577
..	..	@@ -2916,32 +3589,8 @@
2916	3589
2917	3590	if (multiplyToggle != null)
2918	3591	multiplyToggle.setSelected(mat.multiply);
2919		-
2920		- assert (object.projectedVertices != null);
2921		-
2922		- if (object.projectedVertices.length <= 2)
2923		- {
2924		- // Side effect...
2925		- Object3D.cVector2[] keep = object.projectedVertices;
2926		- object.projectedVertices = new Object3D.cVector2[3];
2927		- for (int i = 0; i < 3; i++)
2928		- {
2929		- if (i < keep.length)
2930		- {
2931		- object.projectedVertices[i] = keep[i];
2932		- } else
2933		- {
2934		- object.projectedVertices[i] = new Object3D.cVector2();
2935		- }
2936		- /*
2937		- if(keep.length == 0)
2938		- object.projectedVertices[0] = new Object3D.cVector2();
2939		- else
2940		- object.projectedVertices[0] = keep[0];
2941		- object.projectedVertices[1] = new Object3D.cVector2();
2942		- */
2943		- }
2944		- }
	3592	+
	3593	+ AllocProjectedVertices(object);
2945	3594
2946	3595	SetMaterial(mat, object.projectedVertices);
2947	3596	}
..	..	@@ -3017,12 +3666,17 @@
3017	3666	// }
3018	3667
3019	3668	/**/
3020		- if (deselect)
	3669	+ if (deselect \|\| child == null)
3021	3670	{
3022	3671	//group.deselectAll();
3023	3672	//freeze = true;
3024	3673	GetTree().clearSelection();
3025	3674	//freeze = false;
	3675	+
	3676	+ if (child == null)
	3677	+ {
	3678	+ return;
	3679	+ }
3026	3680	}
3027	3681
3028	3682	//group.addSelectee(child);
..	..	@@ -3056,6 +3710,17 @@
3056	3710	public void itemStateChanged(ItemEvent event)
3057	3711	{
3058	3712	// System.out.println("Propagate = " + propagate);
	3713	+ if (event.getSource() == pinButton)
	3714	+ {
	3715	+ copy.pinned ^= true;
	3716	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3717	+ {
	3718	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3719	+ copy.CloseUI();
	3720	+ //copy.editWindow.refreshContents();
	3721	+ }
	3722	+ }
	3723	+ else
3059	3724	if (event.getSource() == propagateToggle)
3060	3725	{
3061	3726	propagate ^= true;
..	..	@@ -3160,8 +3825,9 @@
3160	3825	} else if (event.getSource() == liveCB)
3161	3826	{
3162	3827	copy.live ^= true;
	3828	+ objEditor.refreshContents(true); // To show item colors
3163	3829	return;
3164		- } else if (event.getSource() == selectCB)
	3830	+ } else if (event.getSource() == selectableCB)
3165	3831	{
3166	3832	copy.dontselect ^= true;
3167	3833	return;
..	..	@@ -3169,7 +3835,7 @@
3169	3835	{
3170	3836	copy.hide ^= true;
3171	3837	copy.Touch(); // display list issue
3172		- objEditor.refreshContents();
	3838	+ objEditor.refreshContents(true); // To show item colors
3173	3839	return;
3174	3840	} else if (event.getSource() == link2masterCB)
3175	3841	{
..	..	@@ -3346,9 +4012,9 @@
3346	4012	{
3347	4013	Close();
3348	4014	//return true;
3349		- } else if (source == loadItem)
	4015	+ } else if (source == openItem)
3350	4016	{
3351		- load();
	4017	+ Open();
3352	4018	//return true;
3353	4019	} else if (source == newItem)
3354	4020	{
..	..	@@ -3373,6 +4039,10 @@
3373	4039	{
3374	4040	generatePOV();
3375	4041	//return true;
	4042	+ } else if (event.getSource() == archiveItem)
	4043	+ {
	4044	+ cTools.Archive(frame);
	4045	+ return;
3376	4046	} else if (source == zBufferItem)
3377	4047	{
3378	4048	try
..	..	@@ -3421,11 +4091,12 @@
3421	4091
3422	4092	static public byte[] Compress(Object3D o)
3423	4093	{
	4094	+ // Slower to actually compress.
3424	4095	try
3425	4096	{
3426	4097	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3427		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3428		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	4098	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4099	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3429	4100
3430	4101	Object3D parent = o.parent;
3431	4102	o.parent = null;
..	..	@@ -3436,10 +4107,14 @@
3436	4107
3437	4108	out.flush();
3438	4109
3439		- zstream.close();
	4110	+ baos //zstream
	4111	+ .close();
3440	4112	out.close();
3441	4113
3442		- return baos.toByteArray();
	4114	+ byte[] bytes = baos.toByteArray();
	4115	+
	4116	+ System.out.println("save #bytes = " + bytes.length);
	4117	+ return bytes;
3443	4118	} catch (Exception e)
3444	4119	{
3445	4120	System.err.println(e);
..	..	@@ -3449,13 +4124,16 @@
3449	4124
3450	4125	static public Object Uncompress(byte[] bytes)
3451	4126	{
3452		- System.out.println("#bytes = " + bytes.length);
	4127	+ System.out.println("restore #bytes = " + bytes.length);
3453	4128	try
3454	4129	{
3455	4130	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3456		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3457		- ObjectInputStream in = new ObjectInputStream(istream);
	4131	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4132	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3458	4133	Object obj = in.readObject();
	4134	+
	4135	+ bais //istream
	4136	+ .close();
3459	4137	in.close();
3460	4138
3461	4139	return obj;
..	..	@@ -3510,41 +4188,95 @@
3510	4188	return null;
3511	4189	}
3512	4190
3513		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3514	4191
3515	4192	public void Save()
3516	4193	{
	4194	+ //Save(true);
	4195	+ Replace();
	4196	+ SetVersionStates();
	4197	+ }
	4198	+
	4199	+ private boolean Equal(byte[] compress, byte[] name)
	4200	+ {
	4201	+ if (compress.length != name.length)
	4202	+ {
	4203	+ return false;
	4204	+ }
	4205	+
	4206	+ for (int i=compress.length; --i>=0;)
	4207	+ {
	4208	+ if (compress[i] != name[i])
	4209	+ return false;
	4210	+ }
	4211	+
	4212	+ return true;
	4213	+ }
	4214	+
	4215	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4216	+
	4217	+ void DeleteVersion()
	4218	+ {
	4219	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4220	+ {
	4221	+ copy.versionlist[i] = copy.versionlist[i+1];
	4222	+ }
	4223	+
	4224	+ CopyChanged();
	4225	+
	4226	+ SetVersionStates();
	4227	+ }
	4228	+
	4229	+ public boolean Save(boolean user)
	4230	+ {
3517	4231	System.err.println("Save");
	4232	+ Replace();
3518	4233
3519		- cRadio tab = GetCurrentTab();
	4234	+ //cRadio tab = GetCurrentTab();
3520	4235
3521		- boolean temp = CameraPane.SWITCH;
3522		- CameraPane.SWITCH = false;
	4236	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3523	4237
3524		- copy.ExtractBigData(hashtable);
	4238	+ boolean thesame = false;
	4239	+
	4240	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4241	+// {
	4242	+// thesame = true;
	4243	+// }
3525	4244
3526	4245	//EditorFrame.m_MainFrame.requestFocusInWindow();
3527		- tab.graphs[tab.undoindex++] = Compress(copy);
3528		-
3529		- copy.RestoreBigData(hashtable);
3530		-
3531		- CameraPane.SWITCH = temp;
3532		-
3533		- //assert(hashtable.isEmpty());
3534		-
3535		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	4246	+ if (!thesame)
3536	4247	{
3537		- tab.graphs[i] = null;
	4248	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4249	+ {
	4250	+ copy.versionlist[i] = copy.versionlist[i-1];
	4251	+ }
	4252	+
	4253	+ //tab.user[tab.versionindex] = user;
	4254	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4255	+
	4256	+ copy.versionlist[++copy.versionindex] = compress;
	4257	+
	4258	+ // if (increment)
	4259	+ // tab.versionindex++;
3538	4260	}
3539	4261
3540		- SetUndoStates();
	4262	+ //copy.RestoreBigData(versiontable);
	4263	+
	4264	+ //assert(hashtable.isEmpty());
	4265	+
	4266	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4267	+// {
	4268	+// //tab.user[i] = false;
	4269	+// copy.versionlist[i] = null;
	4270	+// }
	4271	+
	4272	+ SetVersionStates();
3541	4273
3542	4274	// test save
3543	4275	if (false)
3544	4276	{
3545	4277	try
3546	4278	{
3547		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	4279	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3548	4280	ObjectOutputStream p = new ObjectOutputStream(ostream);
3549	4281
3550	4282	p.writeObject(copy);
..	..	@@ -3557,28 +4289,68 @@
3557	4289	e.printStackTrace();
3558	4290	}
3559	4291	}
	4292	+
	4293	+ return !thesame;
	4294	+ }
	4295	+
	4296	+ boolean flashIt = true;
	4297	+
	4298	+ void RefreshSelection()
	4299	+ {
	4300	+ Object3D selection = new Object3D();
	4301	+
	4302	+ for (int i = 0; i < copy.selection.size(); i++)
	4303	+ {
	4304	+ Object3D elem = copy.selection.elementAt(i);
	4305	+
	4306	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4307	+
	4308	+ if (obj == null)
	4309	+ {
	4310	+ copy.selection.remove(i--);
	4311	+ }
	4312	+ else
	4313	+ {
	4314	+ selection.add(obj);
	4315	+ copy.selection.setElementAt(obj, i);
	4316	+ }
	4317	+ }
	4318	+
	4319	+ flashIt = false;
	4320	+ GetTree().clearSelection();
	4321	+ for (int i = 0; i < selection.size(); i++)
	4322	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4323	+ flashIt = true;
	4324	+
	4325	+ //refreshContents(false);
3560	4326	}
3561	4327
3562		- void CopyChanged(Object3D obj)
	4328	+ void CopyChanged()
3563	4329	{
3564		- SetUndoStates();
	4330	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4331	+
	4332	+ SetVersionStates();
3565	4333
3566	4334	boolean temp = CameraPane.SWITCH;
3567	4335	CameraPane.SWITCH = false;
3568	4336
3569		- copy.ExtractBigData(hashtable);
	4337	+ copy.ExtractBigData(versiontable);
3570	4338
3571	4339	copy.clear();
3572	4340
	4341	+ copy.skyboxname = obj.skyboxname;
	4342	+ copy.skyboxext = obj.skyboxext;
	4343	+
3573	4344	for (int i=0; i<obj.Size(); i++)
3574	4345	{
3575	4346	copy.add(obj.get(i));
3576	4347	}
3577	4348
3578		- copy.RestoreBigData(hashtable);
	4349	+ copy.RestoreBigData(versiontable);
3579	4350
3580	4351	CameraPane.SWITCH = temp;
3581	4352
	4353	+ RefreshSelection();
3582	4354	//assert(hashtable.isEmpty());
3583	4355
3584	4356	copy.Touch();
..	..	@@ -3599,56 +4371,144 @@
3599	4371	}
3600	4372	}
3601	4373
3602		- refreshContents();
	4374	+ refreshContents(true);
3603	4375	}
3604	4376
3605		- cButton undoButton;
3606		- cButton redoButton;
	4377	+ cButton previousVersionButton;
	4378	+ cButton restoreButton;
	4379	+ cButton replaceButton;
	4380	+ cButton nextVersionButton;
	4381	+ cButton saveVersionButton;
	4382	+ cButton deleteVersionButton;
3607	4383
3608		- void SetUndoStates()
	4384	+ boolean muteSlider;
	4385	+
	4386	+ int VersionCount()
3609	4387	{
3610		- cRadio tab = GetCurrentTab();
	4388	+ int count = 0;
3611	4389
3612		- undoButton.setEnabled(tab.undoindex > 0);
3613		- redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	4390	+ for (int i = copy.versionlist.length; --i >= 0;)
	4391	+ {
	4392	+ if (copy.versionlist[i] != null)
	4393	+ count++;
	4394	+ }
	4395	+
	4396	+ return count;
3614	4397	}
3615	4398
3616		- public void Undo()
	4399	+ void SetVersionStates()
3617	4400	{
	4401	+ //if (true)
	4402	+ // return;
	4403	+
	4404	+ //cRadio tab = GetCurrentTab();
	4405	+
	4406	+ restoreButton.setEnabled(copy.versionindex != -1);
	4407	+ replaceButton.setEnabled(copy.versionindex != -1);
	4408	+
	4409	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4410	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4411	+
	4412	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4413	+ copy.versionlist[copy.versionindex + 1] != null);
	4414	+
	4415	+ muteSlider = true;
	4416	+ versionSlider.setMinimum(0);
	4417	+ versionSlider.setMaximum(VersionCount() - 1);
	4418	+ versionSlider.setInteger(copy.versionindex);
	4419	+ versionSlider.setEnabled(copy.versionindex != -1);
	4420	+ muteSlider = false;
	4421	+ }
	4422	+
	4423	+ public boolean PreviousVersion()
	4424	+ {
	4425	+ // Option?
	4426	+ Replace();
	4427	+
3618	4428	System.err.println("Undo");
3619	4429
3620		- cRadio tab = GetCurrentTab();
	4430	+ //cRadio tab = GetCurrentTab();
3621	4431
3622		- if (tab.undoindex == 0)
	4432	+ if (copy.versionindex == 0)
3623	4433	{
3624	4434	java.awt.Toolkit.getDefaultToolkit().beep();
3625		- return;
	4435	+ return false;
3626	4436	}
3627	4437
3628		- if (tab.graphs[tab.undoindex] == null)
3629		- {
3630		- Save();
3631		- tab.undoindex -= 1;
3632		- }
	4438	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4439	+// {
	4440	+// if (Save(false))
	4441	+// tab.versionindex -= 1;
	4442	+// else
	4443	+// {
	4444	+// if (tab.versionindex <= 0)
	4445	+// return false;
	4446	+// else
	4447	+// tab.versionindex -= 1;
	4448	+// }
	4449	+// }
3633	4450
3634		- tab.undoindex -= 1;
	4451	+ copy.versionindex -= 1;
3635	4452
3636		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4453	+ CopyChanged();
	4454	+
	4455	+ return true;
3637	4456	}
3638	4457
3639		- public void Redo()
	4458	+ public boolean Restore()
3640	4459	{
3641		- cRadio tab = GetCurrentTab();
	4460	+ System.err.println("Restore");
3642	4461
3643		- if (tab.graphs[tab.undoindex + 1] == null)
	4462	+ //cRadio tab = GetCurrentTab();
	4463	+
	4464	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4465	+ {
	4466	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4467	+ return false;
	4468	+ }
	4469	+
	4470	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4471	+ CopyChanged();
	4472	+
	4473	+ return true;
	4474	+ }
	4475	+
	4476	+ public boolean Replace()
	4477	+ {
	4478	+ System.err.println("Replace");
	4479	+
	4480	+ //cRadio tab = GetCurrentTab();
	4481	+
	4482	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4483	+ {
	4484	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4485	+ return false;
	4486	+ }
	4487	+
	4488	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4489	+
	4490	+ return true;
	4491	+ }
	4492	+
	4493	+ public void NextVersion()
	4494	+ {
	4495	+ // Option?
	4496	+ Replace();
	4497	+
	4498	+ //cRadio tab = GetCurrentTab();
	4499	+
	4500	+ if (copy.versionlist[copy.versionindex + 1] == null)
3644	4501	{
3645	4502	java.awt.Toolkit.getDefaultToolkit().beep();
3646	4503	return;
3647	4504	}
3648	4505
3649		- tab.undoindex += 1;
	4506	+ copy.versionindex += 1;
3650	4507
3651		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4508	+ CopyChanged();
	4509	+
	4510	+ //if (!tab.user[tab.versionindex])
	4511	+ // tab.graphs[tab.versionindex] = null;
3652	4512	}
3653	4513
3654	4514	void ImportGFD()
..	..	@@ -3859,7 +4719,7 @@
3859	4719	//copy.material = new cMaterial(copy.GetMaterial());
3860	4720
3861	4721	current.color = (float) colorField.getFloat();
3862		- current.modulation = (float) modulationField.getFloat();
	4722	+ current.modulation = (float) saturationField.getFloat();
3863	4723	current.metalness = (float) metalnessField.getFloat();
3864	4724	current.diffuse = (float) diffuseField.getFloat();
3865	4725	current.specular = (float) specularField.getFloat();
..	..	@@ -3892,7 +4752,7 @@
3892	4752	cMaterial mat = copy.material;
3893	4753
3894	4754	colorField.SetToolTipValue((mat.color));
3895		- modulationField.SetToolTipValue((mat.modulation));
	4755	+ saturationField.SetToolTipValue((mat.modulation));
3896	4756	metalnessField.SetToolTipValue((mat.metalness));
3897	4757	diffuseField.SetToolTipValue((mat.diffuse));
3898	4758	specularField.SetToolTipValue((mat.specular));
..	..	@@ -3944,9 +4804,28 @@
3944	4804	//copy.Touch();
3945	4805	}
3946	4806
	4807	+ cNumberSlider versionSlider;
	4808	+
3947	4809	public void stateChanged(ChangeEvent e)
3948	4810	{
3949	4811	// assert(false);
	4812	+ if (e.getSource() == versionSlider)
	4813	+ {
	4814	+ if (muteSlider)
	4815	+ return;
	4816	+
	4817	+ Replace();
	4818	+
	4819	+ int version = versionSlider.getInteger();
	4820	+
	4821	+ if (version != -1 && copy.versionlist[version] != null)
	4822	+ {
	4823	+ copy.versionindex = version;
	4824	+ CopyChanged();
	4825	+ }
	4826	+
	4827	+ return;
	4828	+ }
3950	4829
3951	4830	if (freezematerial)
3952	4831	{
..	..	@@ -3982,6 +4861,12 @@
3982	4861	{
3983	4862	//System.out.println("stateChanged = " + this);
3984	4863	materialtouched = true;
	4864	+
	4865	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4866	+ {
	4867	+ saturationField.setFloat(1);
	4868	+ }
	4869	+
3985	4870	applySelf();
3986	4871	//System.out.println("this = " + this);
3987	4872	//System.out.println("PARENT = " + parent);
..	..	@@ -4281,6 +5166,7 @@
4281	5166	{
4282	5167	if (GetTree() != null)
4283	5168	{
	5169	+ GetTree().revalidate();
4284	5170	GetTree().repaint();
4285	5171	}
4286	5172
..	..	@@ -4289,13 +5175,16 @@
4289	5175	ctrlPanel.validate(); // ? new
4290	5176	ctrlPanel.repaint();
4291	5177	}
	5178	+
	5179	+ if (previousVersionButton != null && copy.versionlist != null)
	5180	+ SetVersionStates();
4292	5181	}
4293	5182
4294	5183	static TweenManager tweenManager = new TweenManager();
4295	5184
4296	5185	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4297	5186	{
4298		- if (Globals.SAVEONMAKE) // && resetmodel)
	5187	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4299	5188	Save();
4300	5189	//Tween.set(thing, 0).target(1).start(tweenManager);
4301	5190	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4537,7 +5426,9 @@
4537	5426	readobj.ResetDisplayList();
4538	5427	} catch (Exception e)
4539	5428	{
4540		- //e.printStackTrace();
	5429	+ if (!e.toString().contains("GZIP"))
	5430	+ e.printStackTrace();
	5431	+
4541	5432	try
4542	5433	{
4543	5434	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4611,12 +5502,14 @@
4611	5502
4612	5503	if (readobj != null)
4613	5504	{
4614		- if (Globals.SAVEONMAKE)
4615		- Save();
	5505	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5506	+ // Save();
4616	5507	try
4617	5508	{
4618	5509	//readobj.deepCopySelf(copy);
4619	5510	copy.clear(); // june 2014
	5511	+ copy.skyboxname = readobj.skyboxname;
	5512	+ copy.skyboxext = readobj.skyboxext;
4620	5513	for (int i = 0; i < readobj.size(); i++)
4621	5514	{
4622	5515	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4657,6 +5550,7 @@
4657	5550	}
4658	5551	} catch (ClassCastException e)
4659	5552	{
	5553	+ e.printStackTrace();
4660	5554	assert (false);
4661	5555	Composite c = (Composite) copy;
4662	5556	c.children.clear();
..	..	@@ -4667,17 +5561,31 @@
4667	5561	c.addChild(csg);
4668	5562	}
4669	5563
	5564	+ copy.versionlist = readobj.versionlist;
	5565	+ copy.versionindex = readobj.versionindex;
	5566	+
	5567	+ if (copy.versionlist == null)
	5568	+ {
	5569	+ // Backward compatibility
	5570	+ copy.versionlist = new Object3D[100];
	5571	+ copy.versionindex = -1;
	5572	+
	5573	+ //Save(true);
	5574	+ }
	5575	+
	5576	+ //? SetUndoStates();
	5577	+
4670	5578	ResetModel();
4671	5579	copy.HardTouch(); // recompile?
4672	5580	refreshContents();
4673	5581	}
4674	5582	}
4675	5583
4676		- void load() // throws ClassNotFoundException
	5584	+ void Open() // throws ClassNotFoundException
4677	5585	{
4678	5586	if (Grafreed.standAlone)
4679	5587	{
4680		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5588	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4681	5589	browser.show();
4682	5590	String filename = browser.getFile();
4683	5591	if (filename != null && filename.length() > 0)
..	..	@@ -4754,6 +5662,8 @@
4754	5662
4755	5663	void save()
4756	5664	{
	5665	+ Replace();
	5666	+
4757	5667	if (lastname == null)
4758	5668	{
4759	5669	return;
..	..	@@ -4776,6 +5686,7 @@
4776	5686	//ps.print(buffer.toString());
4777	5687	} catch (IOException e)
4778	5688	{
	5689	+ e.printStackTrace();
4779	5690	}
4780	5691	}
4781	5692
..	..	@@ -4958,7 +5869,7 @@
4958	5869	MenuBar menuBar;
4959	5870	Menu fileMenu;
4960	5871	MenuItem newItem;
4961		- MenuItem loadItem;
	5872	+ MenuItem openItem;
4962	5873	MenuItem saveItem;
4963	5874	MenuItem saveAsItem;
4964	5875	MenuItem exportAsItem;
..	..	@@ -4981,6 +5892,7 @@
4981	5892	CheckboxMenuItem toggleSwitchItem;
4982	5893	CheckboxMenuItem toggleRootItem;
4983	5894	CheckboxMenuItem animationItem;
	5895	+ MenuItem archiveItem;
4984	5896	CheckboxMenuItem toggleHandleItem;
4985	5897	CheckboxMenuItem togglePaintItem;
4986	5898	JSplitPane mainPanel;
..	..	@@ -4994,6 +5906,7 @@
4994	5906	ButtonGroup buttonGroup;
4995	5907
4996	5908	cGridBag toolboxPanel;
	5909	+ cGridBag skyboxPanel;
4997	5910	cGridBag materialPanel;
4998	5911	cGridBag ctrlPanel;
4999	5912
..	..	@@ -5067,7 +5980,7 @@
5067	5980	JLabel colorLabel;
5068	5981	cNumberSlider colorField;
5069	5982	JLabel modulationLabel;
5070		- cNumberSlider modulationField;
	5983	+ cNumberSlider saturationField;
5071	5984	JLabel metalnessLabel;
5072	5985	cNumberSlider metalnessField;
5073	5986	JLabel diffuseLabel;
..	..	@@ -5098,6 +6011,7 @@
5098	6011	cNumberSlider anisoField;
5099	6012	JLabel anisoVLabel;
5100	6013	cNumberSlider anisoVField;
	6014	+
5101	6015	JLabel cameraLabel;
5102	6016	cNumberSlider cameraField;
5103	6017	JLabel selfshadowLabel;
..	..	@@ -5112,6 +6026,7 @@
5112	6026	cNumberSlider fakedepthField;
5113	6027	JLabel shadowbiasLabel;
5114	6028	cNumberSlider shadowbiasField;
	6029	+
5115	6030	JLabel bumpLabel;
5116	6031	cNumberSlider bumpField;
5117	6032	JLabel noiseLabel;