~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,90 @@
38	42	JFrame frame;
39	43
40	44	static ObjEditor theFrame;
	45	+
	46	+ public cGridBag GetSeparator()
	47	+ {
	48	+ cGridBag separator = new cGridBag();
	49	+ separator.add(new JSeparator());
	50	+ separator.preferredHeight = 5;
	51	+ return separator;
	52	+ }
41	53
42	54	cButton GetButton(String name, boolean border)
43	55	{
44		- try
45		- {
46		- ImageIcon icon = GetIcon(name);
47		- return new cButton(icon, border);
48		- }
49		- catch (Exception e)
50		- {
51		- return new cButton(name, border);
52		- }
	56	+ ImageIcon icon = GetIcon(name);
	57	+ return new cButton(icon, border);
	58	+ }
	59	+
	60	+ cLabel GetLabel(String name, boolean border)
	61	+ {
	62	+ //ImageIcon icon = GetIcon(name);
	63	+ return new cLabel(GetImage(name), border);
53	64	}
54	65
55	66	cToggleButton GetToggleButton(String name, boolean border)
56	67	{
57		- try
58		- {
59		- ImageIcon icon = GetIcon(name);
60		- return new cToggleButton(icon, border);
61		- }
62		- catch (Exception e)
63		- {
64		- return new cToggleButton(name, border);
65		- }
	68	+ ImageIcon icon = GetIcon(name);
	69	+ return new cToggleButton(icon, border);
66	70	}
67	71
68	72	cCheckBox GetCheckBox(String name, boolean border)
69	73	{
	74	+ ImageIcon icon = GetIcon(name);
	75	+ return new cCheckBox(icon, border);
	76	+ }
	77	+
	78	+ static java.util.Hashtable<String, javax.swing.ImageIcon> icons = new java.util.Hashtable<String, javax.swing.ImageIcon>();
	79	+
	80	+ ImageIcon GetIcon(String name)
	81	+ {
	82	+ javax.swing.ImageIcon iconCache = icons.get(name);
	83	+ if (iconCache != null)
	84	+ {
	85	+ return iconCache;
	86	+ }
	87	+
70	88	try
71	89	{
72		- ImageIcon icon = GetIcon(name);
73		- return new cCheckBox(icon, border);
	90	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	91	+
	92	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	93	+// {
	94	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	95	+// Graphics2D g = resized.createGraphics();
	96	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	97	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	98	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	99	+// g.dispose();
	100	+//
	101	+// image = resized;
	102	+// }
	103	+
	104	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	105	+
	106	+ icons.put(name, icon);
	107	+
	108	+ return icon;
74	109	}
75	110	catch (Exception e)
76	111	{
77		- return new cCheckBox(name, border);
	112	+ //icons.put(name, null);
	113	+ return null;
78	114	}
79	115	}
80		-
81		- private ImageIcon GetIcon(String name) throws IOException
	116	+
	117	+ BufferedImage GetImage(String name)
82	118	{
83		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
84		-
85		- if (image.getWidth() != 24 && image.getHeight() != 24)
	119	+ try
86	120	{
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;
	121	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	122	+
	123	+ return image;
95	124	}
96		-
97		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
98		- return icon;
	125	+ catch (Exception e)
	126	+ {
	127	+ return null;
	128	+ }
99	129	}
100	130
101	131	// SCRIPT
..	..	@@ -207,7 +237,7 @@
207	237
208	238	objEditor.ctrlPanel.remove(namePanel);
209	239
210		- if (!GroupEditor.allparams)
	240	+ if (!allparams)
211	241	return;
212	242
213	243	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -279,6 +309,14 @@
279	309	client = inClient;
280	310	copy = client;
281	311
	312	+// if (copy.versionlist == null)
	313	+// {
	314	+// copy.versionlist = new Object3D[100];
	315	+// copy.versionindex = -1;
	316	+//
	317	+// callee.Save(true);
	318	+// }
	319	+
282	320	// "this" is not called: SetupUI2(objEditor);
283	321	}
284	322
..	..	@@ -292,6 +330,14 @@
292	330	client = inClient;
293	331	copy = client;
294	332
	333	+ if (copy.versionlist == null)
	334	+ {
	335	+ copy.versionlist = new Object3D[100];
	336	+ copy.versionindex = -1;
	337	+
	338	+// Save(true);
	339	+ }
	340	+
295	341	SetupUI2(callee.GetEditor());
296	342	}
297	343
..	..	@@ -306,7 +352,7 @@
306	352	//localCopy.parent = null;
307	353
308	354	frame = new JFrame();
309		- frame.setUndecorated(true);
	355	+ frame.setUndecorated(false);
310	356	objEditor = this;
311	357	this.callee = callee;
312	358
..	..	@@ -324,6 +370,14 @@
324	370	copy = localCopy;
325	371	copy.editWindow = this;
326	372
	373	+// if (copy.versionlist == null)
	374	+// {
	375	+// copy.versionlist = new Object3D[100];
	376	+// copy.versionindex = -1;
	377	+//
	378	+// Save(true);
	379	+// }
	380	+
327	381	SetupMenu();
328	382
329	383	//SetupName(objEditor); // new
..	..	@@ -337,12 +391,17 @@
337	391	return frame.action(event, obj);
338	392	}
339	393
	394	+ // Cannot work without static
	395	+ static boolean allparams = true;
	396	+
	397	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	398	+
340	399	void SetupMenu()
341	400	{
342	401	frame.setMenuBar(menuBar = new MenuBar());
343	402	menuBar.add(fileMenu = new Menu("File"));
344	403	fileMenu.add(newItem = new MenuItem("New"));
345		- fileMenu.add(loadItem = new MenuItem("Open..."));
	404	+ fileMenu.add(openItem = new MenuItem("Open..."));
346	405
347	406	//oe.menuBar.add(menu = new Menu("Include"));
348	407	Menu menu = new Menu("Import");
..	..	@@ -374,7 +433,7 @@
374	433	}
375	434
376	435	newItem.addActionListener(this);
377		- loadItem.addActionListener(this);
	436	+ openItem.addActionListener(this);
378	437	saveItem.addActionListener(this);
379	438	saveAsItem.addActionListener(this);
380	439	exportAsItem.addActionListener(this);
..	..	@@ -386,6 +445,8 @@
386	445
387	446	ChangeListener changeListener = new ChangeListener()
388	447	{
	448	+ //String name;
	449	+
389	450	public void stateChanged(ChangeEvent changeEvent)
390	451	{
391	452	// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
..	..	@@ -398,19 +459,55 @@
398	459	//
399	460	// materialFlushed = true;
400	461	// }
	462	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	463	+// {
	464	+// if (listUI.size() == 0)
	465	+// EditSelection(false);
	466	+// }
401	467
402		- refreshContents(false); // To refresh Info tab
	468	+// if (objectPanel.getSelectedIndex() == 4)
	469	+// {
	470	+// name = copy.skyboxname;
	471	+//
	472	+// if (name == null)
	473	+// {
	474	+// name = "";
	475	+// }
	476	+//
	477	+// copy.skyboxname = "cubemaps/default-skyboxes/rgb";
	478	+// copy.skyboxext = "jpg";
	479	+// }
	480	+// else
	481	+// {
	482	+// if (name != null)
	483	+// {
	484	+// if (name.equals(""))
	485	+// {
	486	+// copy.skyboxname = null;
	487	+// copy.skyboxext = null;
	488	+// }
	489	+// else
	490	+// {
	491	+// copy.skyboxname = name;
	492	+// }
	493	+// }
	494	+// }
	495	+ cameraView.transformMode = objectPanel.getSelectedIndex() == 4;
	496	+
	497	+// refreshContents(false); // To refresh Info tab
	498	+ cameraView.repaint();
403	499	}
404	500	};
405	501	objectPanel.addChangeListener(changeListener);
406	502
407	503	toolbarPanel = new JPanel();
408	504	toolbarPanel.setName("Toolbar");
	505	+
409	506	treePanel = new cGridBag();
410	507	treePanel.setName("Tree");
411	508
412	509	editPanel = new cGridBag().setVertical(true);
413		- editPanel.setName("Edit");
	510	+ //editPanel.setName("Edit");
414	511
415	512	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
416	513
..	..	@@ -418,11 +515,13 @@
418	515	editPanel.add(editCommandsPanel);
419	516	editPanel.add(ctrlPanel);
420	517
421		- toolboxPanel = new cGridBag().setVertical(false);
422		- toolboxPanel.setName("Toolbox");
	518	+ toolboxPanel = new cGridBag().setVertical(true);
	519	+ //toolboxPanel.setName("Toolbox");
423	520
424		- materialPanel = new cGridBag().setVertical(true);
425		- materialPanel.setName("Material");
	521	+ skyboxPanel = new cGridBag().setVertical(true);
	522	+
	523	+ materialPanel = new cGridBag().setVertical(false);
	524	+ //materialPanel.setName("Material");
426	525
427	526	/JTextPane/
428	527	infoarea = createTextPane();
..	..	@@ -430,14 +529,15 @@
430	529
431	530	infoarea.setEditable(true);
432	531	SetText();
	532	+
433	533	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
434	534	// infoarea.setOpaque(false);
435	535	// //infoarea.setForeground(textcolor);
436	536	// TEXTAREA infoarea.setLineWrap(true);
437	537	// TEXTAREA infoarea.setWrapStyleWord(true);
438	538	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
439		- infoPanel.setPreferredSize(new Dimension(50, 200));
440		- infoPanel.setName("Info");
	539	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	540	+ //infoPanel.setName("Info");
441	541	//infoPanel.setLayout(new BorderLayout());
442	542	//infoPanel.add(createTextPane());
443	543
..	..	@@ -448,7 +548,14 @@
448	548	mainPanel.setDividerSize(9);
449	549	mainPanel.setDividerLocation(0.5); //1.0);
450	550	mainPanel.setResizeWeight(0.5);
451		-
	551	+
	552	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	553	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	554	+ divider.setDividerSize(15);
	555	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	556	+
	557	+ mainPanel.setUI(new BasicSplitPaneUI());
	558	+
452	559	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
453	560	//mainPanel.setLayout(new GridBagLayout());
454	561	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -679,8 +786,8 @@
679	786	}
680	787	}
681	788
682		-static GraphicsDevice device = GraphicsEnvironment
683		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	789	+//static GraphicsDevice device = GraphicsEnvironment
	790	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
684	791
685	792	Rectangle keeprect;
686	793	cRadio radio;
..	..	@@ -697,14 +804,24 @@
697	804	boolean maximized;
698	805
699	806	cButton fullscreenLayout;
	807	+ cButton expandedLayout;
700	808
701	809	void Minimize()
702	810	{
703	811	frame.setState(Frame.ICONIFIED);
	812	+ frame.validate();
704	813	}
705	814
	815	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	816	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	817	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
706	818	void Maximize()
707	819	{
	820	+ if (CameraPane.FULLSCREEN)
	821	+ {
	822	+ ToggleFullScreen();
	823	+ }
	824	+
708	825	if (maximized)
709	826	{
710	827	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -712,22 +829,38 @@
712	829	else
713	830	{
714	831	keeprect = frame.getBounds();
715		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
716		- Dimension rect2 = frame.getToolkit().getScreenSize();
717		- frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	832	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	833	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	834	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
718	835	// frame.setState(Frame.MAXIMIZED_BOTH);
	836	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
719	837	}
720	838
721	839	maximized ^= true;
	840	+
	841	+ frame.validate();
722	842	}
	843	+
	844	+ cButton minButton;
	845	+ cButton maxButton;
	846	+ cButton fullButton;
	847	+ cButton collapseButton;
	848	+ cButton maximize3DButton;
723	849
724	850	void ToggleFullScreen()
725	851	{
	852	+ GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	853	+
726	854	cameraView.ToggleFullScreen();
727	855
728	856	if (!CameraPane.FULLSCREEN)
729	857	{
730	858	device.setFullScreenWindow(null);
	859	+ frame.dispose();
	860	+ frame.setUndecorated(false);
	861	+ frame.validate();
	862	+ frame.setVisible(true);
	863	+
731	864	//frame.setVisible(false);
732	865	// frame.removeNotify();
733	866	// frame.setUndecorated(false);
..	..	@@ -737,13 +870,13 @@
737	870	// X frame.getContentPane().remove(/"Center",/bigThree);
738	871	// X framePanel.add(bigThree);
739	872	// X frame.getContentPane().add(/"Center",/framePanel);
740		- framePanel.setDividerLocation(1);
	873	+// framePanel.setDividerLocation(46); // icons are 24x24
741	874
742	875	//frame.setVisible(true);
743		- radio.layout = keepButton;
	876	+// radio.layout = keepButton;
744	877	//theFrame = null;
745	878	keepButton = null;
746		- radio.layout.doClick();
	879	+// radio.layout.doClick();
747	880
748	881	} else
749	882	{
..	..	@@ -752,20 +885,59 @@
752	885	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
753	886	// frame.getToolkit().getScreenSize().height);
754	887	//frame.setVisible(false);
	888	+
	889	+ frame.dispose();
	890	+ frame.setUndecorated(true);
755	891	device.setFullScreenWindow(frame);
	892	+ frame.validate();
	893	+ frame.setVisible(true);
756	894	// frame.removeNotify();
757	895	// frame.setUndecorated(true);
758	896	// frame.addNotify();
759	897	// X frame.getContentPane().remove(/"Center",/framePanel);
760	898	// X framePanel.remove(bigThree);
761	899	// X frame.getContentPane().add(/"Center",/bigThree);
762		- framePanel.setDividerLocation(0);
	900	+// framePanel.setDividerLocation(0);
763	901
764		- radio.layout = fullscreenLayout;
765		- radio.layout.doClick();
	902	+// radio.layout = fullscreenLayout;
	903	+// radio.layout.doClick();
766	904	//frame.setVisible(true);
767	905	}
	906	+ frame.validate();
	907	+
	908	+ cameraView.requestFocusInWindow();
768	909	}
	910	+
	911	+ void CollapseToolbar()
	912	+ {
	913	+ framePanel.setDividerLocation(0);
	914	+ //frame.validate();
	915	+
	916	+ cameraView.requestFocusInWindow();
	917	+ }
	918	+
	919	+ private Object3D Duplicate(Object3D object)
	920	+ {
	921	+ boolean temp = CameraPane.SWITCH;
	922	+ CameraPane.SWITCH = false;
	923	+
	924	+ object.ExtractBigData(versiontable);
	925	+ // if (copy == client)
	926	+
	927	+ Object3D versions[] = object.versionlist;
	928	+ object.versionlist = null;
	929	+
	930	+ //byte[] compress = Compress(copy);
	931	+ Object3D compress = (Object3D)Grafreed.clone(object);
	932	+
	933	+ object.versionlist = versions;
	934	+
	935	+ object.RestoreBigData(versiontable);
	936	+
	937	+ CameraPane.SWITCH = temp;
	938	+
	939	+ return compress;
	940	+ }
769	941
770	942	private JTextPane createTextPane()
771	943	{
..	..	@@ -888,6 +1060,7 @@
888	1060	{
889	1061	SetupMaterial(materialPanel);
890	1062	}
	1063	+
891	1064	//SetupName();
892	1065	//SetupViews();
893	1066	}
..	..	@@ -897,7 +1070,7 @@
897	1070	// NumberSlider vDivsField;
898	1071	// JCheckBox endcaps;
899	1072	JCheckBox liveCB;
900		- JCheckBox selectCB;
	1073	+ JCheckBox selectableCB;
901	1074	JCheckBox hideCB;
902	1075	JCheckBox link2masterCB;
903	1076	JCheckBox markCB;
..	..	@@ -1096,39 +1269,55 @@
1096	1269
1097	1270	namePanel = new cGridBag();
1098	1271
	1272	+ //if (copy.pinned)
	1273	+ {
	1274	+ pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
	1275	+ pinButton.setSelected(copy.pinned);
	1276	+ cGridBag t = new cGridBag();
	1277	+ t.preferredWidth = 2;
	1278	+ t.add(pinButton);
	1279	+ namePanel.add(t);
	1280	+
	1281	+ pinButton.addItemListener(this);
	1282	+ }
	1283	+
1099	1284	nameField = AddText(namePanel, copy.GetName());
1100		- namePanel.add(nameField);
	1285	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1101	1286	oe.ctrlPanel.add(namePanel);
1102	1287
1103	1288	oe.ctrlPanel.Return();
1104	1289
1105		- if (!GroupEditor.allparams)
	1290	+ if (!allparams)
1106	1291	return;
1107	1292
1108	1293	setupPanel = new cGridBag().setVertical(false);
1109	1294
1110	1295	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1111	1296	liveCB.setToolTipText("Animate object");
1112		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1113		- selectCB.setToolTipText("Make object selectable");
	1297	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1298	+ selectableCB.setToolTipText("Make object selectable");
1114	1299	// Return();
	1300	+
1115	1301	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1116	1302	hideCB.setToolTipText("Hide object");
1117	1303	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1118		- markCB.setToolTipText("Set the animation target transform");
	1304	+ markCB.setToolTipText("As animation target transform");
	1305	+
	1306	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1119	1307
1120	1308	setupPanel2 = new cGridBag().setVertical(false);
1121	1309
1122	1310	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1123	1311	rewindCB.setToolTipText("Rewind animation");
1124	1312
1125		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1126		- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1313	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1314	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1127	1315
	1316	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1317	+ link2masterCB.setToolTipText("Attach to support");
	1318	+
1128	1319	if (Globals.ADVANCED)
1129	1320	{
1130		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1131		- link2masterCB.setToolTipText("Attach to support");
1132	1321	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1133	1322	speedupCB.setToolTipText("Option motion capture");
1134	1323	}
..	..	@@ -1402,6 +1591,7 @@
1402	1591	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1403	1592	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1404	1593	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1594	+ //XYZPanel.setName("XYZ");
1405	1595
1406	1596	/*
1407	1597	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1439,14 +1629,29 @@
1439	1629	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1440	1630	//tmp.setName("Edit");
1441	1631	objectPanel.add(materialPanel);
	1632	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1633	+ objectPanel.setToolTipTextAt(0, "Material");
	1634	+
1442	1635	objectPanel.add(toolboxPanel);
	1636	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1637	+ objectPanel.setToolTipTextAt(1, "Objects & textures");
	1638	+
	1639	+ objectPanel.add(skyboxPanel);
	1640	+ objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
	1641	+ objectPanel.setToolTipTextAt(2, "Backgrounds");
	1642	+
1443	1643	// JPanel north = new JPanel(new BorderLayout());
1444	1644	// north.setName("Edit");
1445	1645	// north.add(ctrlPanel, BorderLayout.NORTH);
1446	1646	// objectPanel.add(north);
1447	1647	objectPanel.add(editPanel);
1448		- objectPanel.add(infoPanel);
1449		-
	1648	+ objectPanel.setIconAt(3, GetIcon("icons/write.png"));
	1649	+ objectPanel.setToolTipTextAt(3, "Edit controls");
	1650	+
	1651	+ objectPanel.add(XYZPanel);
	1652	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1653	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1654	+
1450	1655	/*
1451	1656	aConstraints.gridx = 0;
1452	1657	aConstraints.gridwidth = 1;
..	..	@@ -1454,7 +1659,7 @@
1454	1659	aConstraints.gridy += 1;
1455	1660	aConstraints.gridwidth = 1;
1456	1661	mainPanel.add(objectPanel, aConstraints);
1457		- */
	1662	+ */
1458	1663
1459	1664	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1460	1665	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1466,7 +1671,7 @@
1466	1671	scrollpane.addMouseWheelListener(this); // Default not fast enough
1467	1672
1468	1673	/JTabbedPane/ scenePanel = new cGridBag();
1469		- scenePanel.preferredWidth = 6;
	1674	+ scenePanel.preferredWidth = 5;
1470	1675
1471	1676	JTabbedPane tabbedPane = new JTabbedPane();
1472	1677	tabbedPane.add(scrollpane);
..	..	@@ -1483,6 +1688,11 @@
1483	1688
1484	1689	scenePanel.add(tabbedPane);
1485	1690
	1691	+ //if (Globals.ADVANCED)
	1692	+// tabbedPane.add(infoPanel);
	1693	+// tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
	1694	+// tabbedPane.setToolTipTextAt(3, "Information");
	1695	+
1486	1696	/*
1487	1697	cTree jTree = new cTree(null);
1488	1698	ToolTipManager.sharedInstance().registerComponent(jTree);
..	..	@@ -1544,7 +1754,7 @@
1544	1754	bigThree = new cGridBag();
1545	1755	bigThree.addComponent(scenePanel);
1546	1756	bigThree.addComponent(centralPanel);
1547		- bigThree.addComponent(XYZPanel);
	1757	+ //bigThree.addComponent(XYZPanel);
1548	1758
1549	1759	// // SIDE EFFECT!!!
1550	1760	// aConstraints.gridx = 0;
..	..	@@ -1553,9 +1763,26 @@
1553	1763	// aConstraints.gridheight = 1;
1554	1764
1555	1765	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1556		- framePanel.setContinuousLayout(true);
1557		- framePanel.setOneTouchExpandable(true);
1558		- framePanel.setDividerLocation(0.8);
	1766	+
	1767	+ framePanel.addPropertyChangeListener(JSplitPane.DIVIDER_LOCATION_PROPERTY,
	1768	+ new java.beans.PropertyChangeListener()
	1769	+ {
	1770	+ public void propertyChange(java.beans.PropertyChangeEvent pce)
	1771	+ {
	1772	+ if ((Integer)pce.getOldValue() == 1)
	1773	+ {
	1774	+ if (radio.layout != expandedLayout)
	1775	+ {
	1776	+ radio.layout = expandedLayout;
	1777	+ radio.layout.doClick();
	1778	+ }
	1779	+ }
	1780	+ }
	1781	+ });
	1782	+
	1783	+ framePanel.setContinuousLayout(false);
	1784	+ framePanel.setOneTouchExpandable(false);
	1785	+ //.setDividerLocation(0.8);
1559	1786	//framePanel.setDividerSize(15);
1560	1787	//framePanel.setResizeWeight(0.15);
1561	1788	framePanel.setName("Frame");
..	..	@@ -1574,17 +1801,17 @@
1574	1801
1575	1802	frame.setSize(1280, 860);
1576	1803
1577		- frame.validate();
1578		- frame.setVisible(true);
1579		-
1580	1804	cameraView.requestFocusInWindow();
1581	1805
1582	1806	gridPanel.setDividerLocation(1.0);
	1807	+
	1808	+ frame.validate();
	1809	+
	1810	+ frame.setVisible(true);
1583	1811
1584	1812	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1585	1813	frame.addWindowListener(new WindowAdapter()
1586	1814	{
1587		-
1588	1815	public void windowClosing(WindowEvent e)
1589	1816	{
1590	1817	Close();
..	..	@@ -1607,12 +1834,403 @@
1607	1834	ctrlPanel.removeAll();
1608	1835	}
1609	1836
1610		- void SetupMaterial(cGridBag panel)
	1837	+ void SetupMaterial(cGridBag materialpanel)
1611	1838	{
1612		- /*
	1839	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1840	+
	1841	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1842	+ skin.setToolTipText("Skin");
	1843	+ skin.addMouseListener(new MouseAdapter()
	1844	+ {
	1845	+ public void mouseClicked(MouseEvent e)
	1846	+ {
	1847	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1848	+ cMaterial material = object.material;
	1849	+
	1850	+ // Skin
	1851	+ colorField.setFloat(material.color);
	1852	+ saturationField.setFloat(material.modulation);
	1853	+ subsurfaceField.setFloat(material.subsurface);
	1854	+ selfshadowField.setFloat(material.diffuseness);
	1855	+ diffusenessField.setFloat(material.factor);
	1856	+ shininessField.setFloat(material.shininess);
	1857	+ shadowbiasField.setFloat(material.shadowbias);
	1858	+ diffuseField.setFloat(material.diffuse);
	1859	+ specularField.setFloat(material.specular);
	1860	+
	1861	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1862	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1863	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1864	+
	1865	+ materialtouched = true;
	1866	+ applySelf();
	1867	+ }
	1868	+ });
	1869	+ presetpanel.add(skin);
	1870	+
	1871	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1872	+ lambert.setToolTipText("Diffuse");
	1873	+ lambert.addMouseListener(new MouseAdapter()
	1874	+ {
	1875	+ public void mouseClicked(MouseEvent e)
	1876	+ {
	1877	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1878	+ cMaterial material = object.material;
	1879	+
	1880	+ diffusenessField.setFloat(material.factor);
	1881	+ selfshadowField.setFloat(material.diffuseness);
	1882	+
	1883	+ materialtouched = true;
	1884	+ applySelf();
	1885	+ }
	1886	+ });
	1887	+ presetpanel.add(lambert);
	1888	+
	1889	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1890	+ diffuse2.setToolTipText("Diffuse2");
	1891	+ diffuse2.addMouseListener(new MouseAdapter()
	1892	+ {
	1893	+ public void mouseClicked(MouseEvent e)
	1894	+ {
	1895	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1896	+ cMaterial material = object.material;
	1897	+
	1898	+ diffusenessField.setFloat(material.factor);
	1899	+ selfshadowField.setFloat(material.diffuseness);
	1900	+
	1901	+ materialtouched = true;
	1902	+ applySelf();
	1903	+ }
	1904	+ });
	1905	+ presetpanel.add(diffuse2);
	1906	+
	1907	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1908	+ diffusemoon.setToolTipText("Moon");
	1909	+ diffusemoon.addMouseListener(new MouseAdapter()
	1910	+ {
	1911	+ public void mouseClicked(MouseEvent e)
	1912	+ {
	1913	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1914	+ cMaterial material = object.material;
	1915	+
	1916	+ diffusenessField.setFloat(material.factor);
	1917	+ selfshadowField.setFloat(material.diffuseness);
	1918	+
	1919	+ materialtouched = true;
	1920	+ applySelf();
	1921	+ }
	1922	+ });
	1923	+ presetpanel.add(diffusemoon);
	1924	+
	1925	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1926	+ diffusemoon2.setToolTipText("Moon2");
	1927	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1928	+ {
	1929	+ public void mouseClicked(MouseEvent e)
	1930	+ {
	1931	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1932	+ cMaterial material = object.material;
	1933	+
	1934	+ diffusenessField.setFloat(material.factor);
	1935	+ selfshadowField.setFloat(material.diffuseness);
	1936	+
	1937	+ materialtouched = true;
	1938	+ applySelf();
	1939	+ }
	1940	+ });
	1941	+ presetpanel.add(diffusemoon2);
	1942	+
	1943	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1944	+ diffusemoon3.setToolTipText("Moon3");
	1945	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1946	+ {
	1947	+ public void mouseClicked(MouseEvent e)
	1948	+ {
	1949	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1950	+ cMaterial material = object.material;
	1951	+
	1952	+ diffusenessField.setFloat(material.factor);
	1953	+ selfshadowField.setFloat(material.diffuseness);
	1954	+
	1955	+ materialtouched = true;
	1956	+ applySelf();
	1957	+ }
	1958	+ });
	1959	+ presetpanel.add(diffusemoon3);
	1960	+
	1961	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1962	+ diffusesheen.setToolTipText("Sheen");
	1963	+ diffusesheen.addMouseListener(new MouseAdapter()
	1964	+ {
	1965	+ public void mouseClicked(MouseEvent e)
	1966	+ {
	1967	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1968	+ cMaterial material = object.material;
	1969	+
	1970	+ sheenField.setFloat(material.sheen);
	1971	+
	1972	+ materialtouched = true;
	1973	+ applySelf();
	1974	+ }
	1975	+ });
	1976	+ presetpanel.add(diffusesheen);
	1977	+
	1978	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	1979	+ rough.setToolTipText("Rough metal");
	1980	+ rough.addMouseListener(new MouseAdapter()
	1981	+ {
	1982	+ public void mouseClicked(MouseEvent e)
	1983	+ {
	1984	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	1985	+ cMaterial material = object.material;
	1986	+
	1987	+ shininessField.setFloat(material.shininess);
	1988	+ velvetField.setFloat(material.velvet);
	1989	+
	1990	+ materialtouched = true;
	1991	+ applySelf();
	1992	+ }
	1993	+ });
	1994	+ presetpanel.add(rough);
	1995	+
	1996	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	1997	+ rough2.setToolTipText("Medium metal");
	1998	+ rough2.addMouseListener(new MouseAdapter()
	1999	+ {
	2000	+ public void mouseClicked(MouseEvent e)
	2001	+ {
	2002	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	2003	+ cMaterial material = object.material;
	2004	+
	2005	+ shininessField.setFloat(material.shininess);
	2006	+ lightareaField.setFloat(material.lightarea);
	2007	+
	2008	+ materialtouched = true;
	2009	+ applySelf();
	2010	+ }
	2011	+ });
	2012	+ presetpanel.add(rough2);
	2013	+
	2014	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	2015	+ shini0.setToolTipText("Shiny");
	2016	+ shini0.addMouseListener(new MouseAdapter()
	2017	+ {
	2018	+ public void mouseClicked(MouseEvent e)
	2019	+ {
	2020	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	2021	+ cMaterial material = object.material;
	2022	+
	2023	+ shininessField.setFloat(material.shininess);
	2024	+ lightareaField.setFloat(material.lightarea);
	2025	+
	2026	+ materialtouched = true;
	2027	+ applySelf();
	2028	+ }
	2029	+ });
	2030	+ presetpanel.add(shini0);
	2031	+
	2032	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	2033	+ shini1.setToolTipText("Shiny2");
	2034	+ shini1.addMouseListener(new MouseAdapter()
	2035	+ {
	2036	+ public void mouseClicked(MouseEvent e)
	2037	+ {
	2038	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	2039	+ cMaterial material = object.material;
	2040	+
	2041	+ shininessField.setFloat(material.shininess);
	2042	+ lightareaField.setFloat(material.lightarea);
	2043	+
	2044	+ materialtouched = true;
	2045	+ applySelf();
	2046	+ }
	2047	+ });
	2048	+ presetpanel.add(shini1);
	2049	+
	2050	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	2051	+ shini2.setToolTipText("Shiny3");
	2052	+ shini2.addMouseListener(new MouseAdapter()
	2053	+ {
	2054	+ public void mouseClicked(MouseEvent e)
	2055	+ {
	2056	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	2057	+ cMaterial material = object.material;
	2058	+
	2059	+ shininessField.setFloat(material.shininess);
	2060	+ lightareaField.setFloat(material.lightarea);
	2061	+
	2062	+ materialtouched = true;
	2063	+ applySelf();
	2064	+ }
	2065	+ });
	2066	+ presetpanel.add(shini2);
	2067	+
	2068	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	2069	+ aniso.setToolTipText("AnisoU");
	2070	+ aniso.addMouseListener(new MouseAdapter()
	2071	+ {
	2072	+ public void mouseClicked(MouseEvent e)
	2073	+ {
	2074	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	2075	+ cMaterial material = object.material;
	2076	+
	2077	+ anisoField.setFloat(material.aniso);
	2078	+ anisoVField.setFloat(material.anisoV);
	2079	+
	2080	+ materialtouched = true;
	2081	+ applySelf();
	2082	+ }
	2083	+ });
	2084	+ presetpanel.add(aniso);
	2085	+
	2086	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	2087	+ aniso2.setToolTipText("AnisoV");
	2088	+ aniso2.addMouseListener(new MouseAdapter()
	2089	+ {
	2090	+ public void mouseClicked(MouseEvent e)
	2091	+ {
	2092	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	2093	+ cMaterial material = object.material;
	2094	+
	2095	+ anisoField.setFloat(material.aniso);
	2096	+ anisoVField.setFloat(material.anisoV);
	2097	+
	2098	+ materialtouched = true;
	2099	+ applySelf();
	2100	+ }
	2101	+ });
	2102	+ presetpanel.add(aniso2);
	2103	+
	2104	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2105	+ aniso3.setToolTipText("AnisoUV");
	2106	+ aniso3.addMouseListener(new MouseAdapter()
	2107	+ {
	2108	+ public void mouseClicked(MouseEvent e)
	2109	+ {
	2110	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2111	+ cMaterial material = object.material;
	2112	+
	2113	+ anisoField.setFloat(material.aniso);
	2114	+ anisoVField.setFloat(material.anisoV);
	2115	+
	2116	+ materialtouched = true;
	2117	+ applySelf();
	2118	+ }
	2119	+ });
	2120	+ presetpanel.add(aniso3);
	2121	+
	2122	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2123	+ velvet0.setToolTipText("Velvet");
	2124	+ velvet0.addMouseListener(new MouseAdapter()
	2125	+ {
	2126	+ public void mouseClicked(MouseEvent e)
	2127	+ {
	2128	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2129	+ cMaterial material = object.material;
	2130	+
	2131	+ diffusenessField.setFloat(material.factor);
	2132	+ selfshadowField.setFloat(material.diffuseness);
	2133	+ sheenField.setFloat(material.sheen);
	2134	+ shininessField.setFloat(material.shininess);
	2135	+ velvetField.setFloat(material.velvet);
	2136	+ shiftField.setFloat(material.shift);
	2137	+
	2138	+ materialtouched = true;
	2139	+ applySelf();
	2140	+ }
	2141	+ });
	2142	+ presetpanel.add(velvet0);
	2143	+
	2144	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2145	+ bump0.setToolTipText("Bump texture");
	2146	+ bump0.addMouseListener(new MouseAdapter()
	2147	+ {
	2148	+ public void mouseClicked(MouseEvent e)
	2149	+ {
	2150	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2151	+ cMaterial material = object.material;
	2152	+
	2153	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2154	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2155	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2156	+
	2157	+ materialtouched = true;
	2158	+ applySelf();
	2159	+ }
	2160	+ });
	2161	+ presetpanel.add(bump0);
	2162	+
	2163	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2164	+ halo.setToolTipText("Halo");
	2165	+ halo.addMouseListener(new MouseAdapter()
	2166	+ {
	2167	+ public void mouseClicked(MouseEvent e)
	2168	+ {
	2169	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2170	+ cMaterial material = object.material;
	2171	+
	2172	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2173	+
	2174	+ materialtouched = true;
	2175	+ applySelf();
	2176	+ }
	2177	+ });
	2178	+ presetpanel.add(halo);
	2179	+
	2180	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2181	+ candle.setToolTipText("Candle");
	2182	+ candle.addMouseListener(new MouseAdapter()
	2183	+ {
	2184	+ public void mouseClicked(MouseEvent e)
	2185	+ {
	2186	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2187	+ cMaterial material = object.material;
	2188	+
	2189	+ subsurfaceField.setFloat(material.subsurface);
	2190	+ shadowbiasField.setFloat(material.shadowbias);
	2191	+ ambientField.setFloat(material.ambient);
	2192	+ specularField.setFloat(material.specular);
	2193	+ lightareaField.setFloat(material.lightarea);
	2194	+ shininessField.setFloat(material.shininess);
	2195	+
	2196	+ materialtouched = true;
	2197	+ applySelf();
	2198	+ }
	2199	+ });
	2200	+ presetpanel.add(candle);
	2201	+
	2202	+ cLabel shadowShader = GetLabel("icons/shadericons/shadow.png", !Grafreed.NIMBUSLAF);
	2203	+ shadowShader.setToolTipText("Shadow");
	2204	+ shadowShader.addMouseListener(new MouseAdapter()
	2205	+ {
	2206	+ public void mouseClicked(MouseEvent e)
	2207	+ {
	2208	+ diffuseField.setFloat(0.001);
	2209	+ ambientField.setFloat(0.001);
	2210	+ cameraField.setFloat(0.001);
	2211	+ specularField.setFloat(0.001);
	2212	+ fakedepthField.setFloat(0.001);
	2213	+ opacityField.setFloat(0.6);
	2214	+
	2215	+ materialtouched = true;
	2216	+ applySelf();
	2217	+ }
	2218	+ });
	2219	+ presetpanel.add(shadowShader);
	2220	+
	2221	+ cGridBag panel = new cGridBag().setVertical(true);
	2222	+
	2223	+ presetpanel.preferredWidth = 1;
	2224	+
	2225	+ materialpanel.add(presetpanel);
	2226	+ materialpanel.add(panel);
	2227	+
	2228	+ panel.preferredWidth = 8;
	2229	+
	2230	+ /*
1613	2231	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1614	2232	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1615		- */
	2233	+ */
1616	2234
1617	2235	cGridBag editBar = new cGridBag().setVertical(false);
1618	2236
..	..	@@ -1646,45 +2264,50 @@
1646	2264	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1647	2265
1648	2266	cGridBag colorSection = new cGridBag().setVertical(true);
	2267	+
	2268	+ cGridBag huepanel = new cGridBag();
	2269	+ cGridBag huelabel = new cGridBag();
	2270	+ skin = GetLabel("icons/hue.png", false);
	2271	+ skin.fit = true;
	2272	+ huelabel.add(skin);
	2273	+ huelabel.preferredWidth = 20;
	2274	+ huepanel.add(new cGridBag()); // Label
	2275	+ huepanel.add(huelabel); // Field/slider
	2276	+
	2277	+ huepanel.preferredHeight = 7;
	2278	+
	2279	+ colorSection.add(huepanel);
1649	2280
1650	2281	cGridBag color = new cGridBag();
1651		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1652		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1653		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2282	+
	2283	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2284	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2285	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2286	+
1654	2287	//colorField.preferredWidth = 200;
1655	2288	colorSection.add(color);
1656	2289
1657	2290	cGridBag modulation = new cGridBag();
1658	2291	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1659	2292	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1660		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2293	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1661	2294	colorSection.add(modulation);
1662	2295
	2296	+ cGridBag opacity = new cGridBag();
	2297	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2298	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2299	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2300	+ colorSection.add(opacity);
	2301	+
	2302	+ colorSection.add(GetSeparator());
	2303	+
1663	2304	cGridBag texture = new cGridBag();
1664	2305	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1665	2306	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1666	2307	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1667	2308	colorSection.add(texture);
1668	2309
1669		- cGridBag anisoU = new cGridBag();
1670		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1671		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1672		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1673		- colorSection.add(anisoU);
1674		-
1675		- cGridBag anisoV = new cGridBag();
1676		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1677		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1678		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1679		- colorSection.add(anisoV);
1680		-
1681		- cGridBag shadowbias = new cGridBag();
1682		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1683		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1684		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1685		- colorSection.add(shadowbias);
1686		-
1687		- panel.add(new JSeparator());
	2310	+ panel.add(GetSeparator());
1688	2311
1689	2312	panel.add(colorSection);
1690	2313
..	..	@@ -1734,7 +2357,13 @@
1734	2357	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1735	2358	diffuseSection.add(fakedepth);
1736	2359
1737		- panel.add(new JSeparator());
	2360	+ cGridBag shadowbias = new cGridBag();
	2361	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2362	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2363	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2364	+ diffuseSection.add(shadowbias);
	2365	+
	2366	+ panel.add(GetSeparator());
1738	2367
1739	2368	panel.add(diffuseSection);
1740	2369
..	..	@@ -1784,42 +2413,48 @@
1784	2413	// aConstraints.gridy += 1;
1785	2414	// aConstraints.gridwidth = 1;
1786	2415
	2416	+ cGridBag anisoU = new cGridBag();
	2417	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2418	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2419	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2420	+ specularSection.add(anisoU);
1787	2421
1788		- panel.add(new JSeparator());
	2422	+ cGridBag anisoV = new cGridBag();
	2423	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2424	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2425	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2426	+ specularSection.add(anisoV);
	2427	+
	2428	+
	2429	+ panel.add(GetSeparator());
1789	2430
1790	2431	panel.add(specularSection);
1791	2432
1792	2433	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1793	2434
1794		- cGridBag globalSection = new cGridBag().setVertical(true);
	2435	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1795	2436
1796	2437	cGridBag camera = new cGridBag();
1797	2438	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1798	2439	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1799	2440	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1800		- globalSection.add(camera);
	2441	+ colorSection.add(camera);
1801	2442
1802	2443	cGridBag ambient = new cGridBag();
1803	2444	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1804	2445	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1805	2446	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1806		- globalSection.add(ambient);
	2447	+ colorSection.add(ambient);
1807	2448
1808	2449	cGridBag backlit = new cGridBag();
1809	2450	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1810	2451	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1811	2452	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1812		- globalSection.add(backlit);
	2453	+ colorSection.add(backlit);
1813	2454
1814		- cGridBag opacity = new cGridBag();
1815		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1816		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1817		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1818		- globalSection.add(opacity);
1819		-
1820		- panel.add(new JSeparator());
	2455	+ //panel.add(new JSeparator());
1821	2456
1822		- panel.add(globalSection);
	2457	+ //panel.add(globalSection);
1823	2458
1824	2459	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1825	2460
..	..	@@ -1861,7 +2496,7 @@
1861	2496	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1862	2497	textureSection.add(opacityPower);
1863	2498
1864		- panel.add(new JSeparator());
	2499	+ panel.add(GetSeparator());
1865	2500
1866	2501	panel.add(textureSection);
1867	2502
..	..	@@ -1926,8 +2561,9 @@
1926	2561	// 3D models
1927	2562	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1928	2563	{
1929		- lastConverter = new com.jmex.model.converters.MaxToJme();
1930		- LoadFile(filename, lastConverter);
	2564	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2565	+ //LoadFile(filename, lastConverter);
	2566	+ LoadObjFile(filename); // New 3ds loader
1931	2567	continue;
1932	2568	}
1933	2569	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2653,6 +3289,7 @@
2653	3289	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2654	3290	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2655	3291	}
	3292	+
2656	3293	//cJME.count++;
2657	3294	//cJME.count %= 12;
2658	3295	if (gc)
..	..	@@ -2836,6 +3473,7 @@
2836	3473	}
2837	3474	}
2838	3475	}
	3476	+
2839	3477	cFileSystemPane FSPane;
2840	3478
2841	3479	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2845,7 +3483,7 @@
2845	3483
2846	3484	freezematerial = true;
2847	3485	colorField.setFloat(mat.color);
2848		- modulationField.setFloat(mat.modulation);
	3486	+ saturationField.setFloat(mat.modulation);
2849	3487	metalnessField.setFloat(mat.metalness);
2850	3488	diffuseField.setFloat(mat.diffuse);
2851	3489	specularField.setFloat(mat.specular);
..	..	@@ -2889,6 +3527,7 @@
2889	3527	}
2890	3528	}
2891	3529	}
	3530	+
2892	3531	freezematerial = false;
2893	3532	}
2894	3533
..	..	@@ -3007,12 +3646,17 @@
3007	3646	// }
3008	3647
3009	3648	/**/
3010		- if (deselect)
	3649	+ if (deselect \|\| child == null)
3011	3650	{
3012	3651	//group.deselectAll();
3013	3652	//freeze = true;
3014	3653	GetTree().clearSelection();
3015	3654	//freeze = false;
	3655	+
	3656	+ if (child == null)
	3657	+ {
	3658	+ return;
	3659	+ }
3016	3660	}
3017	3661
3018	3662	//group.addSelectee(child);
..	..	@@ -3046,6 +3690,17 @@
3046	3690	public void itemStateChanged(ItemEvent event)
3047	3691	{
3048	3692	// System.out.println("Propagate = " + propagate);
	3693	+ if (event.getSource() == pinButton)
	3694	+ {
	3695	+ copy.pinned ^= true;
	3696	+ if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
	3697	+ {
	3698	+ ((GroupEditor)copy.editWindow).listUI.remove(copy);
	3699	+ copy.CloseUI();
	3700	+ //copy.editWindow.refreshContents();
	3701	+ }
	3702	+ }
	3703	+ else
3049	3704	if (event.getSource() == propagateToggle)
3050	3705	{
3051	3706	propagate ^= true;
..	..	@@ -3150,8 +3805,9 @@
3150	3805	} else if (event.getSource() == liveCB)
3151	3806	{
3152	3807	copy.live ^= true;
	3808	+ objEditor.refreshContents(true); // To show item colors
3153	3809	return;
3154		- } else if (event.getSource() == selectCB)
	3810	+ } else if (event.getSource() == selectableCB)
3155	3811	{
3156	3812	copy.dontselect ^= true;
3157	3813	return;
..	..	@@ -3159,7 +3815,7 @@
3159	3815	{
3160	3816	copy.hide ^= true;
3161	3817	copy.Touch(); // display list issue
3162		- objEditor.refreshContents();
	3818	+ objEditor.refreshContents(true); // To show item colors
3163	3819	return;
3164	3820	} else if (event.getSource() == link2masterCB)
3165	3821	{
..	..	@@ -3336,9 +3992,9 @@
3336	3992	{
3337	3993	Close();
3338	3994	//return true;
3339		- } else if (source == loadItem)
	3995	+ } else if (source == openItem)
3340	3996	{
3341		- load();
	3997	+ Open();
3342	3998	//return true;
3343	3999	} else if (source == newItem)
3344	4000	{
..	..	@@ -3363,6 +4019,10 @@
3363	4019	{
3364	4020	generatePOV();
3365	4021	//return true;
	4022	+ } else if (event.getSource() == archiveItem)
	4023	+ {
	4024	+ cTools.Archive(frame);
	4025	+ return;
3366	4026	} else if (source == zBufferItem)
3367	4027	{
3368	4028	try
..	..	@@ -3411,11 +4071,12 @@
3411	4071
3412	4072	static public byte[] Compress(Object3D o)
3413	4073	{
	4074	+ // Slower to actually compress.
3414	4075	try
3415	4076	{
3416	4077	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3417		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3418		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	4078	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	4079	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3419	4080
3420	4081	Object3D parent = o.parent;
3421	4082	o.parent = null;
..	..	@@ -3426,10 +4087,14 @@
3426	4087
3427	4088	out.flush();
3428	4089
3429		- zstream.close();
	4090	+ baos //zstream
	4091	+ .close();
3430	4092	out.close();
3431	4093
3432		- return baos.toByteArray();
	4094	+ byte[] bytes = baos.toByteArray();
	4095	+
	4096	+ System.out.println("save #bytes = " + bytes.length);
	4097	+ return bytes;
3433	4098	} catch (Exception e)
3434	4099	{
3435	4100	System.err.println(e);
..	..	@@ -3439,13 +4104,16 @@
3439	4104
3440	4105	static public Object Uncompress(byte[] bytes)
3441	4106	{
3442		- System.out.println("#bytes = " + bytes.length);
	4107	+ System.out.println("restore #bytes = " + bytes.length);
3443	4108	try
3444	4109	{
3445	4110	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3446		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3447		- ObjectInputStream in = new ObjectInputStream(istream);
	4111	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	4112	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3448	4113	Object obj = in.readObject();
	4114	+
	4115	+ bais //istream
	4116	+ .close();
3449	4117	in.close();
3450	4118
3451	4119	return obj;
..	..	@@ -3500,39 +4168,95 @@
3500	4168	return null;
3501	4169	}
3502	4170
3503		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3504	4171
3505	4172	public void Save()
3506	4173	{
	4174	+ //Save(true);
	4175	+ Replace();
	4176	+ SetVersionStates();
	4177	+ }
	4178	+
	4179	+ private boolean Equal(byte[] compress, byte[] name)
	4180	+ {
	4181	+ if (compress.length != name.length)
	4182	+ {
	4183	+ return false;
	4184	+ }
	4185	+
	4186	+ for (int i=compress.length; --i>=0;)
	4187	+ {
	4188	+ if (compress[i] != name[i])
	4189	+ return false;
	4190	+ }
	4191	+
	4192	+ return true;
	4193	+ }
	4194	+
	4195	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4196	+
	4197	+ void DeleteVersion()
	4198	+ {
	4199	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4200	+ {
	4201	+ copy.versionlist[i] = copy.versionlist[i+1];
	4202	+ }
	4203	+
	4204	+ CopyChanged();
	4205	+
	4206	+ SetVersionStates();
	4207	+ }
	4208	+
	4209	+ public boolean Save(boolean user)
	4210	+ {
3507	4211	System.err.println("Save");
	4212	+ Replace();
3508	4213
3509		- cRadio tab = GetCurrentTab();
	4214	+ //cRadio tab = GetCurrentTab();
3510	4215
3511		- boolean temp = CameraPane.SWITCH;
3512		- CameraPane.SWITCH = false;
	4216	+ Object3D compress = Duplicate(copy); // Saved version. No need for "Replace"?
3513	4217
3514		- copy.ExtractBigData(hashtable);
	4218	+ boolean thesame = false;
	4219	+
	4220	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4221	+// {
	4222	+// thesame = true;
	4223	+// }
3515	4224
3516	4225	//EditorFrame.m_MainFrame.requestFocusInWindow();
3517		- tab.graphs[tab.undoindex++] = Compress(copy);
3518		-
3519		- copy.RestoreBigData(hashtable);
3520		-
3521		- CameraPane.SWITCH = temp;
3522		-
3523		- //assert(hashtable.isEmpty());
3524		-
3525		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	4226	+ if (!thesame)
3526	4227	{
3527		- tab.graphs[i] = null;
	4228	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4229	+ {
	4230	+ copy.versionlist[i] = copy.versionlist[i-1];
	4231	+ }
	4232	+
	4233	+ //tab.user[tab.versionindex] = user;
	4234	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4235	+
	4236	+ copy.versionlist[++copy.versionindex] = compress;
	4237	+
	4238	+ // if (increment)
	4239	+ // tab.versionindex++;
3528	4240	}
3529	4241
	4242	+ //copy.RestoreBigData(versiontable);
	4243	+
	4244	+ //assert(hashtable.isEmpty());
	4245	+
	4246	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4247	+// {
	4248	+// //tab.user[i] = false;
	4249	+// copy.versionlist[i] = null;
	4250	+// }
	4251	+
	4252	+ SetVersionStates();
	4253	+
3530	4254	// test save
3531	4255	if (false)
3532	4256	{
3533	4257	try
3534	4258	{
3535		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	4259	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3536	4260	ObjectOutputStream p = new ObjectOutputStream(ostream);
3537	4261
3538	4262	p.writeObject(copy);
..	..	@@ -3545,26 +4269,68 @@
3545	4269	e.printStackTrace();
3546	4270	}
3547	4271	}
	4272	+
	4273	+ return !thesame;
	4274	+ }
	4275	+
	4276	+ boolean flashIt = true;
	4277	+
	4278	+ void RefreshSelection()
	4279	+ {
	4280	+ Object3D selection = new Object3D();
	4281	+
	4282	+ for (int i = 0; i < copy.selection.size(); i++)
	4283	+ {
	4284	+ Object3D elem = copy.selection.elementAt(i);
	4285	+
	4286	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4287	+
	4288	+ if (obj == null)
	4289	+ {
	4290	+ copy.selection.remove(i--);
	4291	+ }
	4292	+ else
	4293	+ {
	4294	+ selection.add(obj);
	4295	+ copy.selection.setElementAt(obj, i);
	4296	+ }
	4297	+ }
	4298	+
	4299	+ flashIt = false;
	4300	+ GetTree().clearSelection();
	4301	+ for (int i = 0; i < selection.size(); i++)
	4302	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4303	+ flashIt = true;
	4304	+
	4305	+ //refreshContents(false);
3548	4306	}
3549	4307
3550		- void CopyChanged(Object3D obj)
	4308	+ void CopyChanged()
3551	4309	{
	4310	+ Object3D obj = (Object3D)Grafreed.clone(copy.versionlist[copy.versionindex]);
	4311	+
	4312	+ SetVersionStates();
	4313	+
3552	4314	boolean temp = CameraPane.SWITCH;
3553	4315	CameraPane.SWITCH = false;
3554	4316
3555		- copy.ExtractBigData(hashtable);
	4317	+ copy.ExtractBigData(versiontable);
3556	4318
3557	4319	copy.clear();
3558	4320
	4321	+ copy.skyboxname = obj.skyboxname;
	4322	+ copy.skyboxext = obj.skyboxext;
	4323	+
3559	4324	for (int i=0; i<obj.Size(); i++)
3560	4325	{
3561	4326	copy.add(obj.get(i));
3562	4327	}
3563	4328
3564		- copy.RestoreBigData(hashtable);
	4329	+ copy.RestoreBigData(versiontable);
3565	4330
3566	4331	CameraPane.SWITCH = temp;
3567	4332
	4333	+ RefreshSelection();
3568	4334	//assert(hashtable.isEmpty());
3569	4335
3570	4336	copy.Touch();
..	..	@@ -3585,45 +4351,144 @@
3585	4351	}
3586	4352	}
3587	4353
3588		- refreshContents();
	4354	+ refreshContents(true);
3589	4355	}
3590	4356
3591		- public void Undo()
	4357	+ cButton previousVersionButton;
	4358	+ cButton restoreButton;
	4359	+ cButton replaceButton;
	4360	+ cButton nextVersionButton;
	4361	+ cButton saveVersionButton;
	4362	+ cButton deleteVersionButton;
	4363	+
	4364	+ boolean muteSlider;
	4365	+
	4366	+ int VersionCount()
3592	4367	{
	4368	+ int count = 0;
	4369	+
	4370	+ for (int i = copy.versionlist.length; --i >= 0;)
	4371	+ {
	4372	+ if (copy.versionlist[i] != null)
	4373	+ count++;
	4374	+ }
	4375	+
	4376	+ return count;
	4377	+ }
	4378	+
	4379	+ void SetVersionStates()
	4380	+ {
	4381	+ //if (true)
	4382	+ // return;
	4383	+
	4384	+ //cRadio tab = GetCurrentTab();
	4385	+
	4386	+ restoreButton.setEnabled(copy.versionindex != -1);
	4387	+ replaceButton.setEnabled(copy.versionindex != -1);
	4388	+
	4389	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4390	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4391	+
	4392	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4393	+ copy.versionlist[copy.versionindex + 1] != null);
	4394	+
	4395	+ muteSlider = true;
	4396	+ versionSlider.setMinimum(0);
	4397	+ versionSlider.setMaximum(VersionCount() - 1);
	4398	+ versionSlider.setInteger(copy.versionindex);
	4399	+ versionSlider.setEnabled(copy.versionindex != -1);
	4400	+ muteSlider = false;
	4401	+ }
	4402	+
	4403	+ public boolean PreviousVersion()
	4404	+ {
	4405	+ // Option?
	4406	+ Replace();
	4407	+
3593	4408	System.err.println("Undo");
3594	4409
3595		- cRadio tab = GetCurrentTab();
	4410	+ //cRadio tab = GetCurrentTab();
3596	4411
3597		- if (tab.undoindex == 0)
	4412	+ if (copy.versionindex == 0)
3598	4413	{
3599	4414	java.awt.Toolkit.getDefaultToolkit().beep();
3600		- return;
	4415	+ return false;
3601	4416	}
3602	4417
3603		- if (tab.graphs[tab.undoindex] == null)
3604		- {
3605		- Save();
3606		- tab.undoindex -= 1;
3607		- }
	4418	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4419	+// {
	4420	+// if (Save(false))
	4421	+// tab.versionindex -= 1;
	4422	+// else
	4423	+// {
	4424	+// if (tab.versionindex <= 0)
	4425	+// return false;
	4426	+// else
	4427	+// tab.versionindex -= 1;
	4428	+// }
	4429	+// }
3608	4430
3609		- tab.undoindex -= 1;
	4431	+ copy.versionindex -= 1;
3610	4432
3611		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4433	+ CopyChanged();
	4434	+
	4435	+ return true;
3612	4436	}
3613	4437
3614		- public void Redo()
	4438	+ public boolean Restore()
3615	4439	{
3616		- cRadio tab = GetCurrentTab();
	4440	+ System.err.println("Restore");
3617	4441
3618		- if (tab.graphs[tab.undoindex + 1] == null)
	4442	+ //cRadio tab = GetCurrentTab();
	4443	+
	4444	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4445	+ {
	4446	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4447	+ return false;
	4448	+ }
	4449	+
	4450	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4451	+ CopyChanged();
	4452	+
	4453	+ return true;
	4454	+ }
	4455	+
	4456	+ public boolean Replace()
	4457	+ {
	4458	+ System.err.println("Replace");
	4459	+
	4460	+ //cRadio tab = GetCurrentTab();
	4461	+
	4462	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4463	+ {
	4464	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4465	+ return false;
	4466	+ }
	4467	+
	4468	+ copy.versionlist[copy.versionindex] = Duplicate(copy);
	4469	+
	4470	+ return true;
	4471	+ }
	4472	+
	4473	+ public void NextVersion()
	4474	+ {
	4475	+ // Option?
	4476	+ Replace();
	4477	+
	4478	+ //cRadio tab = GetCurrentTab();
	4479	+
	4480	+ if (copy.versionlist[copy.versionindex + 1] == null)
3619	4481	{
3620	4482	java.awt.Toolkit.getDefaultToolkit().beep();
3621	4483	return;
3622	4484	}
3623	4485
3624		- tab.undoindex += 1;
	4486	+ copy.versionindex += 1;
3625	4487
3626		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4488	+ CopyChanged();
	4489	+
	4490	+ //if (!tab.user[tab.versionindex])
	4491	+ // tab.graphs[tab.versionindex] = null;
3627	4492	}
3628	4493
3629	4494	void ImportGFD()
..	..	@@ -3834,7 +4699,7 @@
3834	4699	//copy.material = new cMaterial(copy.GetMaterial());
3835	4700
3836	4701	current.color = (float) colorField.getFloat();
3837		- current.modulation = (float) modulationField.getFloat();
	4702	+ current.modulation = (float) saturationField.getFloat();
3838	4703	current.metalness = (float) metalnessField.getFloat();
3839	4704	current.diffuse = (float) diffuseField.getFloat();
3840	4705	current.specular = (float) specularField.getFloat();
..	..	@@ -3867,7 +4732,7 @@
3867	4732	cMaterial mat = copy.material;
3868	4733
3869	4734	colorField.SetToolTipValue((mat.color));
3870		- modulationField.SetToolTipValue((mat.modulation));
	4735	+ saturationField.SetToolTipValue((mat.modulation));
3871	4736	metalnessField.SetToolTipValue((mat.metalness));
3872	4737	diffuseField.SetToolTipValue((mat.diffuse));
3873	4738	specularField.SetToolTipValue((mat.specular));
..	..	@@ -3919,9 +4784,28 @@
3919	4784	//copy.Touch();
3920	4785	}
3921	4786
	4787	+ cNumberSlider versionSlider;
	4788	+
3922	4789	public void stateChanged(ChangeEvent e)
3923	4790	{
3924	4791	// assert(false);
	4792	+ if (e.getSource() == versionSlider)
	4793	+ {
	4794	+ if (muteSlider)
	4795	+ return;
	4796	+
	4797	+ Replace();
	4798	+
	4799	+ int version = versionSlider.getInteger();
	4800	+
	4801	+ if (version != -1 && copy.versionlist[version] != null)
	4802	+ {
	4803	+ copy.versionindex = version;
	4804	+ CopyChanged();
	4805	+ }
	4806	+
	4807	+ return;
	4808	+ }
3925	4809
3926	4810	if (freezematerial)
3927	4811	{
..	..	@@ -3957,6 +4841,12 @@
3957	4841	{
3958	4842	//System.out.println("stateChanged = " + this);
3959	4843	materialtouched = true;
	4844	+
	4845	+ if (Globals.AUTOSATURATE && e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4846	+ {
	4847	+ saturationField.setFloat(1);
	4848	+ }
	4849	+
3960	4850	applySelf();
3961	4851	//System.out.println("this = " + this);
3962	4852	//System.out.println("PARENT = " + parent);
..	..	@@ -4256,6 +5146,7 @@
4256	5146	{
4257	5147	if (GetTree() != null)
4258	5148	{
	5149	+ GetTree().revalidate();
4259	5150	GetTree().repaint();
4260	5151	}
4261	5152
..	..	@@ -4264,13 +5155,16 @@
4264	5155	ctrlPanel.validate(); // ? new
4265	5156	ctrlPanel.repaint();
4266	5157	}
	5158	+
	5159	+ if (previousVersionButton != null && copy.versionlist != null)
	5160	+ SetVersionStates();
4267	5161	}
4268	5162
4269	5163	static TweenManager tweenManager = new TweenManager();
4270	5164
4271	5165	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4272	5166	{
4273		- if (Globals.SAVEONMAKE) // && resetmodel)
	5167	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4274	5168	Save();
4275	5169	//Tween.set(thing, 0).target(1).start(tweenManager);
4276	5170	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4512,7 +5406,9 @@
4512	5406	readobj.ResetDisplayList();
4513	5407	} catch (Exception e)
4514	5408	{
4515		- //e.printStackTrace();
	5409	+ if (!e.toString().contains("GZIP"))
	5410	+ e.printStackTrace();
	5411	+
4516	5412	try
4517	5413	{
4518	5414	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4586,12 +5482,14 @@
4586	5482
4587	5483	if (readobj != null)
4588	5484	{
4589		- if (Globals.SAVEONMAKE)
4590		- Save();
	5485	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5486	+ // Save();
4591	5487	try
4592	5488	{
4593	5489	//readobj.deepCopySelf(copy);
4594	5490	copy.clear(); // june 2014
	5491	+ copy.skyboxname = readobj.skyboxname;
	5492	+ copy.skyboxext = readobj.skyboxext;
4595	5493	for (int i = 0; i < readobj.size(); i++)
4596	5494	{
4597	5495	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4632,6 +5530,7 @@
4632	5530	}
4633	5531	} catch (ClassCastException e)
4634	5532	{
	5533	+ e.printStackTrace();
4635	5534	assert (false);
4636	5535	Composite c = (Composite) copy;
4637	5536	c.children.clear();
..	..	@@ -4642,17 +5541,31 @@
4642	5541	c.addChild(csg);
4643	5542	}
4644	5543
	5544	+ copy.versionlist = readobj.versionlist;
	5545	+ copy.versionindex = readobj.versionindex;
	5546	+
	5547	+ if (copy.versionlist == null)
	5548	+ {
	5549	+ // Backward compatibility
	5550	+ copy.versionlist = new Object3D[100];
	5551	+ copy.versionindex = -1;
	5552	+
	5553	+ Save(true);
	5554	+ }
	5555	+
	5556	+ //? SetUndoStates();
	5557	+
4645	5558	ResetModel();
4646	5559	copy.HardTouch(); // recompile?
4647	5560	refreshContents();
4648	5561	}
4649	5562	}
4650	5563
4651		- void load() // throws ClassNotFoundException
	5564	+ void Open() // throws ClassNotFoundException
4652	5565	{
4653	5566	if (Grafreed.standAlone)
4654	5567	{
4655		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5568	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4656	5569	browser.show();
4657	5570	String filename = browser.getFile();
4658	5571	if (filename != null && filename.length() > 0)
..	..	@@ -4729,6 +5642,8 @@
4729	5642
4730	5643	void save()
4731	5644	{
	5645	+ Replace();
	5646	+
4732	5647	if (lastname == null)
4733	5648	{
4734	5649	return;
..	..	@@ -4751,6 +5666,7 @@
4751	5666	//ps.print(buffer.toString());
4752	5667	} catch (IOException e)
4753	5668	{
	5669	+ e.printStackTrace();
4754	5670	}
4755	5671	}
4756	5672
..	..	@@ -4765,6 +5681,8 @@
4765	5681	String filename = browser.getFile();
4766	5682	if (filename != null && filename.length() > 0)
4767	5683	{
	5684	+ if (!filename.endsWith(".gfd"))
	5685	+ filename += ".gfd";
4768	5686	lastname = browser.getDirectory() + filename;
4769	5687	save();
4770	5688	}
..	..	@@ -4931,7 +5849,7 @@
4931	5849	MenuBar menuBar;
4932	5850	Menu fileMenu;
4933	5851	MenuItem newItem;
4934		- MenuItem loadItem;
	5852	+ MenuItem openItem;
4935	5853	MenuItem saveItem;
4936	5854	MenuItem saveAsItem;
4937	5855	MenuItem exportAsItem;
..	..	@@ -4954,6 +5872,7 @@
4954	5872	CheckboxMenuItem toggleSwitchItem;
4955	5873	CheckboxMenuItem toggleRootItem;
4956	5874	CheckboxMenuItem animationItem;
	5875	+ MenuItem archiveItem;
4957	5876	CheckboxMenuItem toggleHandleItem;
4958	5877	CheckboxMenuItem togglePaintItem;
4959	5878	JSplitPane mainPanel;
..	..	@@ -4967,6 +5886,7 @@
4967	5886	ButtonGroup buttonGroup;
4968	5887
4969	5888	cGridBag toolboxPanel;
	5889	+ cGridBag skyboxPanel;
4970	5890	cGridBag materialPanel;
4971	5891	cGridBag ctrlPanel;
4972	5892
..	..	@@ -5040,7 +5960,7 @@
5040	5960	JLabel colorLabel;
5041	5961	cNumberSlider colorField;
5042	5962	JLabel modulationLabel;
5043		- cNumberSlider modulationField;
	5963	+ cNumberSlider saturationField;
5044	5964	JLabel metalnessLabel;
5045	5965	cNumberSlider metalnessField;
5046	5966	JLabel diffuseLabel;
..	..	@@ -5071,6 +5991,7 @@
5071	5991	cNumberSlider anisoField;
5072	5992	JLabel anisoVLabel;
5073	5993	cNumberSlider anisoVField;
	5994	+
5074	5995	JLabel cameraLabel;
5075	5996	cNumberSlider cameraField;
5076	5997	JLabel selfshadowLabel;
..	..	@@ -5085,6 +6006,7 @@
5085	6006	cNumberSlider fakedepthField;
5086	6007	JLabel shadowbiasLabel;
5087	6008	cNumberSlider shadowbiasField;
	6009	+
5088	6010	JLabel bumpLabel;
5089	6011	cNumberSlider bumpField;
5090	6012	JLabel noiseLabel;