~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.
..	..	@@ -38,51 +41,78 @@
38	41	JFrame frame;
39	42
40	43	static ObjEditor theFrame;
	44	+
	45	+ public cGridBag GetSeparator()
	46	+ {
	47	+ cGridBag separator = new cGridBag();
	48	+ separator.add(new JSeparator());
	49	+ separator.preferredHeight = 5;
	50	+ return separator;
	51	+ }
41	52
42	53	cButton GetButton(String name, boolean border)
43	54	{
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		- }
	55	+ ImageIcon icon = GetIcon(name);
	56	+ return new cButton(icon, border);
	57	+ }
	58	+
	59	+ cLabel GetLabel(String name, boolean border)
	60	+ {
	61	+ //ImageIcon icon = GetIcon(name);
	62	+ return new cLabel(GetImage(name), border);
	63	+ }
	64	+
	65	+ cToggleButton GetToggleButton(String name, boolean border)
	66	+ {
	67	+ ImageIcon icon = GetIcon(name);
	68	+ return new cToggleButton(icon, border);
53	69	}
54	70
55	71	cCheckBox GetCheckBox(String name, boolean border)
56	72	{
	73	+ ImageIcon icon = GetIcon(name);
	74	+ return new cCheckBox(icon, border);
	75	+ }
	76	+
	77	+ ImageIcon GetIcon(String name)
	78	+ {
57	79	try
58	80	{
59		- ImageIcon icon = GetIcon(name);
60		- return new cCheckBox(icon, border);
	81	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	82	+
	83	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	84	+// {
	85	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	86	+// Graphics2D g = resized.createGraphics();
	87	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	88	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	89	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	90	+// g.dispose();
	91	+//
	92	+// image = resized;
	93	+// }
	94	+
	95	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	96	+ return icon;
61	97	}
62	98	catch (Exception e)
63	99	{
64		- return new cCheckBox(name, border);
	100	+ return null;
65	101	}
66	102	}
67		-
68		- private ImageIcon GetIcon(String name) throws IOException
	103	+
	104	+ BufferedImage GetImage(String name)
69	105	{
70		- BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
71		-
72		- if (image.getWidth() != 24 && image.getHeight() != 24)
	106	+ try
73	107	{
74		- BufferedImage resized = new BufferedImage(24, 24, image.getType());
75		- Graphics2D g = resized.createGraphics();
76		- g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
77		- //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
78		- g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
79		- g.dispose();
80		-
81		- image = resized;
	108	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	109	+
	110	+ return image;
82	111	}
83		-
84		- javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
85		- return icon;
	112	+ catch (Exception e)
	113	+ {
	114	+ return null;
	115	+ }
86	116	}
87	117
88	118	// SCRIPT
..	..	@@ -194,7 +224,7 @@
194	224
195	225	objEditor.ctrlPanel.remove(namePanel);
196	226
197		- if (!GroupEditor.allparams)
	227	+ if (!allparams)
198	228	return;
199	229
200	230	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -266,6 +296,12 @@
266	296	client = inClient;
267	297	copy = client;
268	298
	299	+ if (copy.versionlist == null)
	300	+ {
	301	+ copy.versionlist = new Object3D[100];
	302	+ copy.versionindex = -1;
	303	+ }
	304	+
269	305	// "this" is not called: SetupUI2(objEditor);
270	306	}
271	307
..	..	@@ -279,6 +315,12 @@
279	315	client = inClient;
280	316	copy = client;
281	317
	318	+ if (copy.versionlist == null)
	319	+ {
	320	+ copy.versionlist = new Object3D[100];
	321	+ copy.versionindex = -1;
	322	+ }
	323	+
282	324	SetupUI2(callee.GetEditor());
283	325	}
284	326
..	..	@@ -293,7 +335,7 @@
293	335	//localCopy.parent = null;
294	336
295	337	frame = new JFrame();
296		- frame.setUndecorated(true);
	338	+ frame.setUndecorated(false);
297	339	objEditor = this;
298	340	this.callee = callee;
299	341
..	..	@@ -311,6 +353,12 @@
311	353	copy = localCopy;
312	354	copy.editWindow = this;
313	355
	356	+ if (copy.versionlist == null)
	357	+ {
	358	+// copy.versions = new byte[100][];
	359	+// copy.versionindex = -1;
	360	+ }
	361	+
314	362	SetupMenu();
315	363
316	364	//SetupName(objEditor); // new
..	..	@@ -324,12 +372,17 @@
324	372	return frame.action(event, obj);
325	373	}
326	374
	375	+ // Cannot work without static
	376	+ static boolean allparams = true;
	377	+
	378	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	379	+
327	380	void SetupMenu()
328	381	{
329	382	frame.setMenuBar(menuBar = new MenuBar());
330	383	menuBar.add(fileMenu = new Menu("File"));
331	384	fileMenu.add(newItem = new MenuItem("New"));
332		- fileMenu.add(loadItem = new MenuItem("Open..."));
	385	+ fileMenu.add(openItem = new MenuItem("Open..."));
333	386
334	387	//oe.menuBar.add(menu = new Menu("Include"));
335	388	Menu menu = new Menu("Import");
..	..	@@ -361,7 +414,7 @@
361	414	}
362	415
363	416	newItem.addActionListener(this);
364		- loadItem.addActionListener(this);
	417	+ openItem.addActionListener(this);
365	418	saveItem.addActionListener(this);
366	419	saveAsItem.addActionListener(this);
367	420	exportAsItem.addActionListener(this);
..	..	@@ -370,13 +423,40 @@
370	423	closeItem.addActionListener(this);
371	424
372	425	objectPanel = new JTabbedPane();
	426	+
	427	+ ChangeListener changeListener = new ChangeListener()
	428	+ {
	429	+ public void stateChanged(ChangeEvent changeEvent)
	430	+ {
	431	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	432	+// {
	433	+// if (latestObject != null)
	434	+// {
	435	+// refreshContents(true);
	436	+// SetMaterial(latestObject);
	437	+// }
	438	+//
	439	+// materialFlushed = true;
	440	+// }
	441	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	442	+// {
	443	+// if (listUI.size() == 0)
	444	+// EditSelection(false);
	445	+// }
	446	+
	447	+ refreshContents(false); // To refresh Info tab
	448	+ }
	449	+ };
	450	+ objectPanel.addChangeListener(changeListener);
	451	+
373	452	toolbarPanel = new JPanel();
374	453	toolbarPanel.setName("Toolbar");
	454	+
375	455	treePanel = new cGridBag();
376	456	treePanel.setName("Tree");
377	457
378	458	editPanel = new cGridBag().setVertical(true);
379		- editPanel.setName("Edit");
	459	+ //editPanel.setName("Edit");
380	460
381	461	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
382	462
..	..	@@ -384,23 +464,27 @@
384	464	editPanel.add(editCommandsPanel);
385	465	editPanel.add(ctrlPanel);
386	466
387		- materialPanel = new cGridBag().setVertical(true);
	467	+ toolboxPanel = new cGridBag().setVertical(true);
	468	+ //toolboxPanel.setName("Toolbox");
388	469
389		- materialPanel.setName("Material");
	470	+ materialPanel = new cGridBag().setVertical(false);
	471	+ //materialPanel.setName("Material");
	472	+
390	473	/JTextPane/
391	474	infoarea = createTextPane();
392	475	doc = infoarea.getStyledDocument();
393	476
394	477	infoarea.setEditable(true);
395	478	SetText();
	479	+
396	480	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
397	481	// infoarea.setOpaque(false);
398	482	// //infoarea.setForeground(textcolor);
399	483	// TEXTAREA infoarea.setLineWrap(true);
400	484	// TEXTAREA infoarea.setWrapStyleWord(true);
401	485	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
402		- infoPanel.setPreferredSize(new Dimension(50, 200));
403		- infoPanel.setName("Info");
	486	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	487	+ //infoPanel.setName("Info");
404	488	//infoPanel.setLayout(new BorderLayout());
405	489	//infoPanel.add(createTextPane());
406	490
..	..	@@ -411,7 +495,14 @@
411	495	mainPanel.setDividerSize(9);
412	496	mainPanel.setDividerLocation(0.5); //1.0);
413	497	mainPanel.setResizeWeight(0.5);
414		-
	498	+
	499	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	500	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	501	+ divider.setDividerSize(15);
	502	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	503	+
	504	+ mainPanel.setUI(new BasicSplitPaneUI());
	505	+
415	506	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
416	507	//mainPanel.setLayout(new GridBagLayout());
417	508	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -642,8 +733,8 @@
642	733	}
643	734	}
644	735
645		-static GraphicsDevice device = GraphicsEnvironment
646		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	736	+//static GraphicsDevice device = GraphicsEnvironment
	737	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
647	738
648	739	Rectangle keeprect;
649	740	cRadio radio;
..	..	@@ -659,13 +750,24 @@
659	750
660	751	boolean maximized;
661	752
	753	+ cButton fullscreenLayout;
	754	+
662	755	void Minimize()
663	756	{
664	757	frame.setState(Frame.ICONIFIED);
	758	+ frame.validate();
665	759	}
666	760
	761	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	762	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	763	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
667	764	void Maximize()
668	765	{
	766	+ if (CameraPane.FULLSCREEN)
	767	+ {
	768	+ ToggleFullScreen();
	769	+ }
	770	+
669	771	if (maximized)
670	772	{
671	773	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -673,20 +775,36 @@
673	775	else
674	776	{
675	777	keeprect = frame.getBounds();
676		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
677		- Dimension rect2 = frame.getToolkit().getScreenSize();
678		- frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	778	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	779	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	780	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
679	781	// frame.setState(Frame.MAXIMIZED_BOTH);
	782	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
680	783	}
681	784
682	785	maximized ^= true;
	786	+
	787	+ frame.validate();
683	788	}
	789	+
	790	+ cButton minButton;
	791	+ cButton maxButton;
	792	+ cButton fullButton;
684	793
685	794	void ToggleFullScreen()
686	795	{
687		- if (CameraPane.FULLSCREEN)
	796	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	797	+
	798	+ cameraView.ToggleFullScreen();
	799	+
	800	+ if (!CameraPane.FULLSCREEN)
688	801	{
689	802	device.setFullScreenWindow(null);
	803	+ frame.dispose();
	804	+ frame.setUndecorated(false);
	805	+ frame.validate();
	806	+ frame.setVisible(true);
	807	+
690	808	//frame.setVisible(false);
691	809	// frame.removeNotify();
692	810	// frame.setUndecorated(false);
..	..	@@ -696,7 +814,7 @@
696	814	// X frame.getContentPane().remove(/"Center",/bigThree);
697	815	// X framePanel.add(bigThree);
698	816	// X frame.getContentPane().add(/"Center",/framePanel);
699		- framePanel.setDividerLocation(1);
	817	+ framePanel.setDividerLocation(46);
700	818
701	819	//frame.setVisible(true);
702	820	radio.layout = keepButton;
..	..	@@ -711,7 +829,12 @@
711	829	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
712	830	// frame.getToolkit().getScreenSize().height);
713	831	//frame.setVisible(false);
	832	+
	833	+ frame.dispose();
	834	+ frame.setUndecorated(true);
714	835	device.setFullScreenWindow(frame);
	836	+ frame.validate();
	837	+ frame.setVisible(true);
715	838	// frame.removeNotify();
716	839	// frame.setUndecorated(true);
717	840	// frame.addNotify();
..	..	@@ -720,13 +843,35 @@
720	843	// X frame.getContentPane().add(/"Center",/bigThree);
721	844	framePanel.setDividerLocation(0);
722	845
723		- radio.layout = twoButton;
	846	+ radio.layout = fullscreenLayout;
724	847	radio.layout.doClick();
725	848	//frame.setVisible(true);
726	849	}
727		-
728		- cameraView.ToggleFullScreen();
	850	+ frame.validate();
729	851	}
	852	+
	853	+ private Object3D CompressCopy()
	854	+ {
	855	+ boolean temp = CameraPane.SWITCH;
	856	+ CameraPane.SWITCH = false;
	857	+
	858	+ copy.ExtractBigData(versiontable);
	859	+ // if (copy == client)
	860	+
	861	+ Object3D versions[] = copy.versionlist;
	862	+ copy.versionlist = null;
	863	+
	864	+ //byte[] compress = Compress(copy);
	865	+ Object3D compress = (Object3D)Grafreed.clone(copy);
	866	+
	867	+ copy.versionlist = versions;
	868	+
	869	+ copy.RestoreBigData(versiontable);
	870	+
	871	+ CameraPane.SWITCH = temp;
	872	+
	873	+ return compress;
	874	+ }
730	875
731	876	private JTextPane createTextPane()
732	877	{
..	..	@@ -849,6 +994,7 @@
849	994	{
850	995	SetupMaterial(materialPanel);
851	996	}
	997	+
852	998	//SetupName();
853	999	//SetupViews();
854	1000	}
..	..	@@ -858,7 +1004,7 @@
858	1004	// NumberSlider vDivsField;
859	1005	// JCheckBox endcaps;
860	1006	JCheckBox liveCB;
861		- JCheckBox selectCB;
	1007	+ JCheckBox selectableCB;
862	1008	JCheckBox hideCB;
863	1009	JCheckBox link2masterCB;
864	1010	JCheckBox markCB;
..	..	@@ -866,7 +1012,12 @@
866	1012	JCheckBox speedupCB;
867	1013	JCheckBox rewindCB;
868	1014	JCheckBox flipVCB;
	1015	+
	1016	+ cCheckBox toggleTextureCB;
	1017	+ cCheckBox toggleSwitchCB;
	1018	+
869	1019	JComboBox texresMenu;
	1020	+
870	1021	JButton resetButton;
871	1022	JButton stepButton;
872	1023	JButton stepAllButton;
..	..	@@ -1053,38 +1204,42 @@
1053	1204	namePanel = new cGridBag();
1054	1205
1055	1206	nameField = AddText(namePanel, copy.GetName());
1056		- namePanel.add(nameField);
	1207	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1057	1208	oe.ctrlPanel.add(namePanel);
1058	1209
1059	1210	oe.ctrlPanel.Return();
1060	1211
1061		- if (!GroupEditor.allparams)
	1212	+ if (!allparams)
1062	1213	return;
1063	1214
1064	1215	setupPanel = new cGridBag().setVertical(false);
1065	1216
1066	1217	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1067	1218	liveCB.setToolTipText("Animate object");
1068		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1069		- selectCB.setToolTipText("Make object selectable");
	1219	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1220	+ selectableCB.setToolTipText("Make object selectable");
1070	1221	// Return();
	1222	+
1071	1223	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1072	1224	hideCB.setToolTipText("Hide object");
1073	1225	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1074		- markCB.setToolTipText("Set the animation target transform");
	1226	+ markCB.setToolTipText("As animation target transform");
	1227	+
	1228	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1075	1229
1076	1230	setupPanel2 = new cGridBag().setVertical(false);
1077	1231
1078	1232	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1079	1233	rewindCB.setToolTipText("Rewind animation");
1080	1234
1081		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1082		- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1235	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1236	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1083	1237
	1238	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1239	+ link2masterCB.setToolTipText("Attach to support");
	1240	+
1084	1241	if (Globals.ADVANCED)
1085	1242	{
1086		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1087		- link2masterCB.setToolTipText("Attach to support");
1088	1243	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1089	1244	speedupCB.setToolTipText("Option motion capture");
1090	1245	}
..	..	@@ -1358,6 +1513,7 @@
1358	1513	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1359	1514	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1360	1515	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1516	+ //XYZPanel.setName("XYZ");
1361	1517
1362	1518	/*
1363	1519	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1395,12 +1551,29 @@
1395	1551	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1396	1552	//tmp.setName("Edit");
1397	1553	objectPanel.add(materialPanel);
	1554	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1555	+ objectPanel.setToolTipTextAt(0, "Material");
	1556	+
1398	1557	// JPanel north = new JPanel(new BorderLayout());
1399	1558	// north.setName("Edit");
1400	1559	// north.add(ctrlPanel, BorderLayout.NORTH);
1401	1560	// objectPanel.add(north);
1402	1561	objectPanel.add(editPanel);
1403		- objectPanel.add(infoPanel);
	1562	+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1563	+ objectPanel.setToolTipTextAt(1, "Edit controls");
	1564	+
	1565	+ //if (Globals.ADVANCED)
	1566	+ objectPanel.add(infoPanel);
	1567	+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1568	+ objectPanel.setToolTipTextAt(2, "Information");
	1569	+
	1570	+ objectPanel.add(XYZPanel);
	1571	+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
	1572	+ objectPanel.setToolTipTextAt(3, "XYZ/RGB transform");
	1573	+
	1574	+ objectPanel.add(toolboxPanel);
	1575	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
	1576	+ objectPanel.setToolTipTextAt(4, "Objects & backgrounds");
1404	1577
1405	1578	/*
1406	1579	aConstraints.gridx = 0;
..	..	@@ -1409,7 +1582,7 @@
1409	1582	aConstraints.gridy += 1;
1410	1583	aConstraints.gridwidth = 1;
1411	1584	mainPanel.add(objectPanel, aConstraints);
1412		- */
	1585	+ */
1413	1586
1414	1587	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1415	1588	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1421,14 +1594,12 @@
1421	1594	scrollpane.addMouseWheelListener(this); // Default not fast enough
1422	1595
1423	1596	/JTabbedPane/ scenePanel = new cGridBag();
1424		- scenePanel.preferredWidth = 6;
	1597	+ scenePanel.preferredWidth = 5;
1425	1598
1426	1599	JTabbedPane tabbedPane = new JTabbedPane();
1427	1600	tabbedPane.add(scrollpane);
1428	1601
1429		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1430		-
1431		- optionsPanel = new cGridBag().setVertical(true);
	1602	+ optionsPanel = new cGridBag().setVertical(false);
1432	1603
1433	1604	optionsPanel.setName("Options");
1434	1605
..	..	@@ -1436,6 +1607,8 @@
1436	1607
1437	1608	tabbedPane.add(optionsPanel);
1438	1609
	1610	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1611	+
1439	1612	scenePanel.add(tabbedPane);
1440	1613
1441	1614	/*
..	..	@@ -1499,7 +1672,7 @@
1499	1672	bigThree = new cGridBag();
1500	1673	bigThree.addComponent(scenePanel);
1501	1674	bigThree.addComponent(centralPanel);
1502		- bigThree.addComponent(XYZPanel);
	1675	+ //bigThree.addComponent(XYZPanel);
1503	1676
1504	1677	// // SIDE EFFECT!!!
1505	1678	// aConstraints.gridx = 0;
..	..	@@ -1508,9 +1681,9 @@
1508	1681	// aConstraints.gridheight = 1;
1509	1682
1510	1683	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1511		- framePanel.setContinuousLayout(true);
1512		- framePanel.setOneTouchExpandable(true);
1513		- framePanel.setDividerLocation(0.8);
	1684	+ framePanel.setContinuousLayout(false);
	1685	+ framePanel.setOneTouchExpandable(false);
	1686	+ //.setDividerLocation(0.8);
1514	1687	//framePanel.setDividerSize(15);
1515	1688	//framePanel.setResizeWeight(0.15);
1516	1689	framePanel.setName("Frame");
..	..	@@ -1528,16 +1701,18 @@
1528	1701	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1529	1702
1530	1703	frame.setSize(1280, 860);
1531		- frame.setVisible(true);
1532		-
	1704	+
1533	1705	cameraView.requestFocusInWindow();
1534	1706
1535	1707	gridPanel.setDividerLocation(1.0);
	1708	+
	1709	+ frame.validate();
	1710	+
	1711	+ frame.setVisible(true);
1536	1712
1537	1713	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1538	1714	frame.addWindowListener(new WindowAdapter()
1539	1715	{
1540		-
1541	1716	public void windowClosing(WindowEvent e)
1542	1717	{
1543	1718	Close();
..	..	@@ -1560,12 +1735,56 @@
1560	1735	ctrlPanel.removeAll();
1561	1736	}
1562	1737
1563		- void SetupMaterial(cGridBag panel)
	1738	+ void SetupMaterial(cGridBag materialpanel)
1564	1739	{
1565		- /*
	1740	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1741	+ cLabel label = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1742	+ label.addMouseListener(new MouseAdapter()
	1743	+ {
	1744	+ public void mouseClicked(MouseEvent e)
	1745	+ {
	1746	+ colorField.setFloat(0);
	1747	+ saturationField.setFloat(1);
	1748	+ materialtouched = true;
	1749	+ applySelf();
	1750	+ }
	1751	+ });
	1752	+ presetpanel.add(label);
	1753	+
	1754	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF));
	1755	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF));
	1756	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF));
	1757	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF));
	1758	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF));
	1759	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF));
	1760	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF));
	1761	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF));
	1762	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF));
	1763	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF));
	1764	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF));
	1765	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF));
	1766	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF));
	1767	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF));
	1768	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF));
	1769	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF));
	1770	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF));
	1771	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF));
	1772	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00019.png", !Grafreed.NIMBUSLAF));
	1773	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00020.png", !Grafreed.NIMBUSLAF));
	1774	+
	1775	+ cGridBag panel = new cGridBag().setVertical(true);
	1776	+
	1777	+ presetpanel.preferredWidth = 1;
	1778	+
	1779	+ materialpanel.add(panel);
	1780	+ materialpanel.add(presetpanel);
	1781	+
	1782	+ panel.preferredWidth = 8;
	1783	+
	1784	+ /*
1566	1785	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1567	1786	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1568		- */
	1787	+ */
1569	1788
1570	1789	cGridBag editBar = new cGridBag().setVertical(false);
1571	1790
..	..	@@ -1599,45 +1818,50 @@
1599	1818	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1600	1819
1601	1820	cGridBag colorSection = new cGridBag().setVertical(true);
	1821	+
	1822	+ cGridBag huepanel = new cGridBag();
	1823	+ cGridBag huelabel = new cGridBag();
	1824	+ label = GetLabel("icons/hue.png", false);
	1825	+ label.fit = true;
	1826	+ huelabel.add(label);
	1827	+ huelabel.preferredWidth = 20;
	1828	+ huepanel.add(new cGridBag()); // Label
	1829	+ huepanel.add(huelabel); // Field/slider
	1830	+
	1831	+ huepanel.preferredHeight = 7;
	1832	+
	1833	+ colorSection.add(huepanel);
1602	1834
1603	1835	cGridBag color = new cGridBag();
1604		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1605		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1606		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1836	+
	1837	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1838	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1839	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1840	+
1607	1841	//colorField.preferredWidth = 200;
1608	1842	colorSection.add(color);
1609	1843
1610	1844	cGridBag modulation = new cGridBag();
1611	1845	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1612	1846	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1613		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1847	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1614	1848	colorSection.add(modulation);
1615	1849
	1850	+ cGridBag opacity = new cGridBag();
	1851	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1852	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1853	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1854	+ colorSection.add(opacity);
	1855	+
	1856	+ colorSection.add(GetSeparator());
	1857	+
1616	1858	cGridBag texture = new cGridBag();
1617	1859	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1618	1860	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1619	1861	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1620	1862	colorSection.add(texture);
1621	1863
1622		- cGridBag anisoU = new cGridBag();
1623		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1624		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1625		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1626		- colorSection.add(anisoU);
1627		-
1628		- cGridBag anisoV = new cGridBag();
1629		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1630		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1631		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1632		- colorSection.add(anisoV);
1633		-
1634		- cGridBag shadowbias = new cGridBag();
1635		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1636		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1637		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1638		- colorSection.add(shadowbias);
1639		-
1640		- panel.add(new JSeparator());
	1864	+ panel.add(GetSeparator());
1641	1865
1642	1866	panel.add(colorSection);
1643	1867
..	..	@@ -1687,7 +1911,13 @@
1687	1911	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1688	1912	diffuseSection.add(fakedepth);
1689	1913
1690		- panel.add(new JSeparator());
	1914	+ cGridBag shadowbias = new cGridBag();
	1915	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1916	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1917	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1918	+ diffuseSection.add(shadowbias);
	1919	+
	1920	+ panel.add(GetSeparator());
1691	1921
1692	1922	panel.add(diffuseSection);
1693	1923
..	..	@@ -1737,42 +1967,48 @@
1737	1967	// aConstraints.gridy += 1;
1738	1968	// aConstraints.gridwidth = 1;
1739	1969
	1970	+ cGridBag anisoU = new cGridBag();
	1971	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1972	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1973	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1974	+ specularSection.add(anisoU);
1740	1975
1741		- panel.add(new JSeparator());
	1976	+ cGridBag anisoV = new cGridBag();
	1977	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1978	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1979	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1980	+ specularSection.add(anisoV);
	1981	+
	1982	+
	1983	+ panel.add(GetSeparator());
1742	1984
1743	1985	panel.add(specularSection);
1744	1986
1745	1987	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1746	1988
1747		- cGridBag globalSection = new cGridBag().setVertical(true);
	1989	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1748	1990
1749	1991	cGridBag camera = new cGridBag();
1750	1992	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1751	1993	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1752	1994	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1753		- globalSection.add(camera);
	1995	+ colorSection.add(camera);
1754	1996
1755	1997	cGridBag ambient = new cGridBag();
1756	1998	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1757	1999	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1758	2000	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1759		- globalSection.add(ambient);
	2001	+ colorSection.add(ambient);
1760	2002
1761	2003	cGridBag backlit = new cGridBag();
1762	2004	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1763	2005	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1764	2006	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1765		- globalSection.add(backlit);
	2007	+ colorSection.add(backlit);
1766	2008
1767		- cGridBag opacity = new cGridBag();
1768		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1769		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1770		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1771		- globalSection.add(opacity);
1772		-
1773		- panel.add(new JSeparator());
	2009	+ //panel.add(new JSeparator());
1774	2010
1775		- panel.add(globalSection);
	2011	+ //panel.add(globalSection);
1776	2012
1777	2013	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1778	2014
..	..	@@ -1814,7 +2050,7 @@
1814	2050	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1815	2051	textureSection.add(opacityPower);
1816	2052
1817		- panel.add(new JSeparator());
	2053	+ panel.add(GetSeparator());
1818	2054
1819	2055	panel.add(textureSection);
1820	2056
..	..	@@ -1879,8 +2115,9 @@
1879	2115	// 3D models
1880	2116	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1881	2117	{
1882		- lastConverter = new com.jmex.model.converters.MaxToJme();
1883		- LoadFile(filename, lastConverter);
	2118	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2119	+ //LoadFile(filename, lastConverter);
	2120	+ LoadObjFile(filename); // New 3ds loader
1884	2121	continue;
1885	2122	}
1886	2123	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2606,6 +2843,7 @@
2606	2843	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2607	2844	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2608	2845	}
	2846	+
2609	2847	//cJME.count++;
2610	2848	//cJME.count %= 12;
2611	2849	if (gc)
..	..	@@ -2789,6 +3027,7 @@
2789	3027	}
2790	3028	}
2791	3029	}
	3030	+
2792	3031	cFileSystemPane FSPane;
2793	3032
2794	3033	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2798,7 +3037,7 @@
2798	3037
2799	3038	freezematerial = true;
2800	3039	colorField.setFloat(mat.color);
2801		- modulationField.setFloat(mat.modulation);
	3040	+ saturationField.setFloat(mat.modulation);
2802	3041	metalnessField.setFloat(mat.metalness);
2803	3042	diffuseField.setFloat(mat.diffuse);
2804	3043	specularField.setFloat(mat.specular);
..	..	@@ -2842,11 +3081,14 @@
2842	3081	}
2843	3082	}
2844	3083	}
	3084	+
2845	3085	freezematerial = false;
2846	3086	}
2847	3087
2848	3088	void SetMaterial(Object3D object)
2849	3089	{
	3090	+ latestObject = object;
	3091	+
2850	3092	cMaterial mat = object.material;
2851	3093
2852	3094	if (mat == null)
..	..	@@ -2958,12 +3200,17 @@
2958	3200	// }
2959	3201
2960	3202	/**/
2961		- if (deselect)
	3203	+ if (deselect \|\| child == null)
2962	3204	{
2963	3205	//group.deselectAll();
2964	3206	//freeze = true;
2965	3207	GetTree().clearSelection();
2966	3208	//freeze = false;
	3209	+
	3210	+ if (child == null)
	3211	+ {
	3212	+ return;
	3213	+ }
2967	3214	}
2968	3215
2969	3216	//group.addSelectee(child);
..	..	@@ -3032,7 +3279,7 @@
3032	3279	cameraView.ToggleDL();
3033	3280	cameraView.repaint();
3034	3281	return;
3035		- } else if (event.getSource() == toggleTextureItem)
	3282	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
3036	3283	{
3037	3284	cameraView.ToggleTexture();
3038	3285	// june 2013 copy.HardTouch();
..	..	@@ -3071,7 +3318,7 @@
3071	3318	frame.validate();
3072	3319
3073	3320	return;
3074		- } else if (event.getSource() == toggleSwitchItem)
	3321	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3075	3322	{
3076	3323	cameraView.ToggleSwitch();
3077	3324	cameraView.repaint();
..	..	@@ -3101,8 +3348,9 @@
3101	3348	} else if (event.getSource() == liveCB)
3102	3349	{
3103	3350	copy.live ^= true;
	3351	+ objEditor.refreshContents(true); // To show item colors
3104	3352	return;
3105		- } else if (event.getSource() == selectCB)
	3353	+ } else if (event.getSource() == selectableCB)
3106	3354	{
3107	3355	copy.dontselect ^= true;
3108	3356	return;
..	..	@@ -3110,7 +3358,7 @@
3110	3358	{
3111	3359	copy.hide ^= true;
3112	3360	copy.Touch(); // display list issue
3113		- objEditor.refreshContents();
	3361	+ objEditor.refreshContents(true); // To show item colors
3114	3362	return;
3115	3363	} else if (event.getSource() == link2masterCB)
3116	3364	{
..	..	@@ -3287,9 +3535,9 @@
3287	3535	{
3288	3536	Close();
3289	3537	//return true;
3290		- } else if (source == loadItem)
	3538	+ } else if (source == openItem)
3291	3539	{
3292		- load();
	3540	+ Open();
3293	3541	//return true;
3294	3542	} else if (source == newItem)
3295	3543	{
..	..	@@ -3314,6 +3562,10 @@
3314	3562	{
3315	3563	generatePOV();
3316	3564	//return true;
	3565	+ } else if (event.getSource() == archiveItem)
	3566	+ {
	3567	+ cTools.Archive(frame);
	3568	+ return;
3317	3569	} else if (source == zBufferItem)
3318	3570	{
3319	3571	try
..	..	@@ -3362,11 +3614,12 @@
3362	3614
3363	3615	static public byte[] Compress(Object3D o)
3364	3616	{
	3617	+ // Slower to actually compress.
3365	3618	try
3366	3619	{
3367	3620	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3368		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3369		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3621	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3622	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3370	3623
3371	3624	Object3D parent = o.parent;
3372	3625	o.parent = null;
..	..	@@ -3377,10 +3630,14 @@
3377	3630
3378	3631	out.flush();
3379	3632
3380		- zstream.close();
	3633	+ baos //zstream
	3634	+ .close();
3381	3635	out.close();
3382	3636
3383		- return baos.toByteArray();
	3637	+ byte[] bytes = baos.toByteArray();
	3638	+
	3639	+ System.out.println("save #bytes = " + bytes.length);
	3640	+ return bytes;
3384	3641	} catch (Exception e)
3385	3642	{
3386	3643	System.err.println(e);
..	..	@@ -3390,13 +3647,16 @@
3390	3647
3391	3648	static public Object Uncompress(byte[] bytes)
3392	3649	{
3393		- System.out.println("#bytes = " + bytes.length);
	3650	+ System.out.println("restore #bytes = " + bytes.length);
3394	3651	try
3395	3652	{
3396	3653	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3397		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3398		- ObjectInputStream in = new ObjectInputStream(istream);
	3654	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3655	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3399	3656	Object obj = in.readObject();
	3657	+
	3658	+ bais //istream
	3659	+ .close();
3400	3660	in.close();
3401	3661
3402	3662	return obj;
..	..	@@ -3451,39 +3711,78 @@
3451	3711	return null;
3452	3712	}
3453	3713
3454		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3455	3714
3456	3715	public void Save()
3457	3716	{
	3717	+ //Save(true);
	3718	+ Replace();
	3719	+ SetUndoStates();
	3720	+ }
	3721	+
	3722	+ private boolean Equal(byte[] compress, byte[] name)
	3723	+ {
	3724	+ if (compress.length != name.length)
	3725	+ {
	3726	+ return false;
	3727	+ }
	3728	+
	3729	+ for (int i=compress.length; --i>=0;)
	3730	+ {
	3731	+ if (compress[i] != name[i])
	3732	+ return false;
	3733	+ }
	3734	+
	3735	+ return true;
	3736	+ }
	3737	+
	3738	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3739	+
	3740	+ public boolean Save(boolean user)
	3741	+ {
3458	3742	System.err.println("Save");
	3743	+ Replace();
3459	3744
3460	3745	cRadio tab = GetCurrentTab();
3461	3746
3462		- boolean temp = CameraPane.SWITCH;
3463		- CameraPane.SWITCH = false;
	3747	+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace".
3464	3748
3465		- copy.ExtractBigData(hashtable);
	3749	+ boolean thesame = false;
	3750	+
	3751	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3752	+// {
	3753	+// thesame = true;
	3754	+// }
3466	3755
3467	3756	//EditorFrame.m_MainFrame.requestFocusInWindow();
3468		- tab.graphs[tab.undoindex++] = Compress(copy);
3469		-
3470		- copy.RestoreBigData(hashtable);
3471		-
3472		- CameraPane.SWITCH = temp;
3473		-
3474		- //assert(hashtable.isEmpty());
3475		-
3476		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3757	+ if (!thesame)
3477	3758	{
3478		- tab.graphs[i] = null;
	3759	+ //tab.user[tab.versionindex] = user;
	3760	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3761	+
	3762	+ copy.versionlist[++copy.versionindex] = compress;
	3763	+
	3764	+ // if (increment)
	3765	+ // tab.versionindex++;
3479	3766	}
3480	3767
	3768	+ //copy.RestoreBigData(versiontable);
	3769	+
	3770	+ //assert(hashtable.isEmpty());
	3771	+
	3772	+ for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	3773	+ {
	3774	+ //tab.user[i] = false;
	3775	+ copy.versionlist[i] = null;
	3776	+ }
	3777	+
	3778	+ SetUndoStates();
	3779	+
3481	3780	// test save
3482	3781	if (false)
3483	3782	{
3484	3783	try
3485	3784	{
3486		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3785	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3487	3786	ObjectOutputStream p = new ObjectOutputStream(ostream);
3488	3787
3489	3788	p.writeObject(copy);
..	..	@@ -3496,26 +3795,66 @@
3496	3795	e.printStackTrace();
3497	3796	}
3498	3797	}
	3798	+
	3799	+ return !thesame;
	3800	+ }
	3801	+
	3802	+ boolean flashIt = true;
	3803	+
	3804	+ void RefreshSelection()
	3805	+ {
	3806	+ Object3D selection = new Object3D();
	3807	+
	3808	+ for (int i = 0; i < copy.selection.size(); i++)
	3809	+ {
	3810	+ Object3D elem = copy.selection.elementAt(i);
	3811	+
	3812	+ Object3D obj = copy.GetObject(elem.GetUUID());
	3813	+
	3814	+ if (obj == null)
	3815	+ {
	3816	+ copy.selection.remove(i--);
	3817	+ }
	3818	+ else
	3819	+ {
	3820	+ selection.add(obj);
	3821	+ copy.selection.setElementAt(obj, i);
	3822	+ }
	3823	+ }
	3824	+
	3825	+ flashIt = false;
	3826	+ GetTree().clearSelection();
	3827	+ for (int i = 0; i < selection.size(); i++)
	3828	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	3829	+ flashIt = true;
	3830	+
	3831	+ refreshContents(false);
3499	3832	}
3500	3833
3501	3834	void CopyChanged(Object3D obj)
3502	3835	{
	3836	+ SetUndoStates();
	3837	+
3503	3838	boolean temp = CameraPane.SWITCH;
3504	3839	CameraPane.SWITCH = false;
3505	3840
3506		- copy.ExtractBigData(hashtable);
	3841	+ copy.ExtractBigData(versiontable);
3507	3842
3508	3843	copy.clear();
3509	3844
	3845	+ copy.skyboxname = obj.skyboxname;
	3846	+ copy.skyboxext = obj.skyboxext;
	3847	+
3510	3848	for (int i=0; i<obj.Size(); i++)
3511	3849	{
3512	3850	copy.add(obj.get(i));
3513	3851	}
3514	3852
3515		- copy.RestoreBigData(hashtable);
	3853	+ copy.RestoreBigData(versiontable);
3516	3854
3517	3855	CameraPane.SWITCH = temp;
3518	3856
	3857	+ RefreshSelection();
3519	3858	//assert(hashtable.isEmpty());
3520	3859
3521	3860	copy.Touch();
..	..	@@ -3539,42 +3878,131 @@
3539	3878	refreshContents();
3540	3879	}
3541	3880
3542		- public void Undo()
	3881	+ cButton undoButton;
	3882	+ cButton restoreButton;
	3883	+ cButton replaceButton;
	3884	+ cButton redoButton;
	3885	+
	3886	+ boolean muteSlider;
	3887	+
	3888	+ int VersionCount()
3543	3889	{
	3890	+ int count = 0;
	3891	+
	3892	+ for (int i = copy.versionlist.length; --i >= 0;)
	3893	+ {
	3894	+ if (copy.versionlist[i] != null)
	3895	+ count++;
	3896	+ }
	3897	+
	3898	+ return count;
	3899	+ }
	3900	+
	3901	+ void SetUndoStates()
	3902	+ {
	3903	+ cRadio tab = GetCurrentTab();
	3904	+
	3905	+ restoreButton.setEnabled(copy.versionindex != -1);
	3906	+ replaceButton.setEnabled(copy.versionindex != -1);
	3907	+
	3908	+ undoButton.setEnabled(copy.versionindex > 0);
	3909	+ redoButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	3910	+
	3911	+ muteSlider = true;
	3912	+ versionSlider.setMaximum(VersionCount() - 1);
	3913	+ versionSlider.setInteger(copy.versionindex);
	3914	+ muteSlider = false;
	3915	+ }
	3916	+
	3917	+ public boolean Undo()
	3918	+ {
	3919	+ // Option?
	3920	+ Replace();
	3921	+
3544	3922	System.err.println("Undo");
3545	3923
3546	3924	cRadio tab = GetCurrentTab();
3547	3925
3548		- if (tab.undoindex == 0)
	3926	+ if (copy.versionindex == 0)
3549	3927	{
3550	3928	java.awt.Toolkit.getDefaultToolkit().beep();
3551		- return;
	3929	+ return false;
3552	3930	}
3553	3931
3554		- if (tab.graphs[tab.undoindex] == null)
	3932	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3933	+// {
	3934	+// if (Save(false))
	3935	+// tab.versionindex -= 1;
	3936	+// else
	3937	+// {
	3938	+// if (tab.versionindex <= 0)
	3939	+// return false;
	3940	+// else
	3941	+// tab.versionindex -= 1;
	3942	+// }
	3943	+// }
	3944	+
	3945	+ copy.versionindex -= 1;
	3946	+
	3947	+ CopyChanged((Object3D)copy.versionlist[copy.versionindex]);
	3948	+
	3949	+ return true;
	3950	+ }
	3951	+
	3952	+ public boolean Restore()
	3953	+ {
	3954	+ System.err.println("Restore");
	3955	+
	3956	+ cRadio tab = GetCurrentTab();
	3957	+
	3958	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
3555	3959	{
3556		- Save();
3557		- tab.undoindex -= 1;
	3960	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3961	+ return false;
3558	3962	}
3559	3963
3560		- tab.undoindex -= 1;
	3964	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3965	+ CopyChanged(copy.versionlist[copy.versionindex]);
	3966	+
	3967	+ return true;
	3968	+ }
3561	3969
3562		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3970	+ public boolean Replace()
	3971	+ {
	3972	+ System.err.println("Replace");
	3973	+
	3974	+ cRadio tab = GetCurrentTab();
	3975	+
	3976	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	3977	+ {
	3978	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3979	+ return false;
	3980	+ }
	3981	+
	3982	+ copy.versionlist[copy.versionindex] = CompressCopy();
	3983	+
	3984	+ return true;
3563	3985	}
3564	3986
3565	3987	public void Redo()
3566	3988	{
	3989	+ // Option?
	3990	+ Replace();
	3991	+
3567	3992	cRadio tab = GetCurrentTab();
3568	3993
3569		- if (tab.graphs[tab.undoindex + 1] == null)
	3994	+ if (copy.versionlist[copy.versionindex + 1] == null)
3570	3995	{
3571	3996	java.awt.Toolkit.getDefaultToolkit().beep();
3572	3997	return;
3573	3998	}
3574	3999
3575		- tab.undoindex += 1;
	4000	+ copy.versionindex += 1;
3576	4001
3577		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	4002	+ CopyChanged(copy.versionlist[copy.versionindex]);
	4003	+
	4004	+ //if (!tab.user[tab.versionindex])
	4005	+ // tab.graphs[tab.versionindex] = null;
3578	4006	}
3579	4007
3580	4008	void ImportGFD()
..	..	@@ -3726,7 +4154,7 @@
3726	4154	assert false;
3727	4155	}
3728	4156
3729		- void EditSelection()
	4157	+ void EditSelection(boolean newWindow)
3730	4158	{
3731	4159	}
3732	4160
..	..	@@ -3785,7 +4213,7 @@
3785	4213	//copy.material = new cMaterial(copy.GetMaterial());
3786	4214
3787	4215	current.color = (float) colorField.getFloat();
3788		- current.modulation = (float) modulationField.getFloat();
	4216	+ current.modulation = (float) saturationField.getFloat();
3789	4217	current.metalness = (float) metalnessField.getFloat();
3790	4218	current.diffuse = (float) diffuseField.getFloat();
3791	4219	current.specular = (float) specularField.getFloat();
..	..	@@ -3818,7 +4246,7 @@
3818	4246	cMaterial mat = copy.material;
3819	4247
3820	4248	colorField.SetToolTipValue((mat.color));
3821		- modulationField.SetToolTipValue((mat.modulation));
	4249	+ saturationField.SetToolTipValue((mat.modulation));
3822	4250	metalnessField.SetToolTipValue((mat.metalness));
3823	4251	diffuseField.SetToolTipValue((mat.diffuse));
3824	4252	specularField.SetToolTipValue((mat.specular));
..	..	@@ -3870,9 +4298,25 @@
3870	4298	//copy.Touch();
3871	4299	}
3872	4300
	4301	+ cNumberSlider versionSlider;
	4302	+
3873	4303	public void stateChanged(ChangeEvent e)
3874	4304	{
3875	4305	// assert(false);
	4306	+ if (e.getSource() == versionSlider)
	4307	+ {
	4308	+ if (muteSlider)
	4309	+ return;
	4310	+
	4311	+ int version = versionSlider.getInteger();
	4312	+
	4313	+ if (copy.versionlist[version] != null)
	4314	+ {
	4315	+ CopyChanged(copy.versionlist[copy.versionindex = version]);
	4316	+ }
	4317	+
	4318	+ return;
	4319	+ }
3876	4320
3877	4321	if (freezematerial)
3878	4322	{
..	..	@@ -3908,6 +4352,12 @@
3908	4352	{
3909	4353	//System.out.println("stateChanged = " + this);
3910	4354	materialtouched = true;
	4355	+
	4356	+ if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4357	+ {
	4358	+ saturationField.setFloat(1);
	4359	+ }
	4360	+
3911	4361	applySelf();
3912	4362	//System.out.println("this = " + this);
3913	4363	//System.out.println("PARENT = " + parent);
..	..	@@ -4207,6 +4657,7 @@
4207	4657	{
4208	4658	if (GetTree() != null)
4209	4659	{
	4660	+ GetTree().revalidate();
4210	4661	GetTree().repaint();
4211	4662	}
4212	4663
..	..	@@ -4221,7 +4672,7 @@
4221	4672
4222	4673	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4223	4674	{
4224		- if (Globals.SAVEONMAKE)
	4675	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4225	4676	Save();
4226	4677	//Tween.set(thing, 0).target(1).start(tweenManager);
4227	4678	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4309,6 +4760,12 @@
4309	4760	{
4310	4761	ResetModel();
4311	4762	Select(thing.GetTreePath(), true, false); // unselect... false);
	4763	+
	4764	+ if (thing.Size() == 0)
	4765	+ {
	4766	+ //EditSelection(false);
	4767	+ }
	4768	+
4312	4769	refreshContents();
4313	4770	}
4314	4771
..	..	@@ -4457,7 +4914,9 @@
4457	4914	readobj.ResetDisplayList();
4458	4915	} catch (Exception e)
4459	4916	{
4460		- //e.printStackTrace();
	4917	+ if (!e.toString().contains("GZIP"))
	4918	+ e.printStackTrace();
	4919	+
4461	4920	try
4462	4921	{
4463	4922	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4531,12 +4990,14 @@
4531	4990
4532	4991	if (readobj != null)
4533	4992	{
4534		- if (Globals.SAVEONMAKE)
4535		- Save();
	4993	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4994	+ // Save();
4536	4995	try
4537	4996	{
4538	4997	//readobj.deepCopySelf(copy);
4539	4998	copy.clear(); // june 2014
	4999	+ copy.skyboxname = readobj.skyboxname;
	5000	+ copy.skyboxext = readobj.skyboxext;
4540	5001	for (int i = 0; i < readobj.size(); i++)
4541	5002	{
4542	5003	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4577,6 +5038,7 @@
4577	5038	}
4578	5039	} catch (ClassCastException e)
4579	5040	{
	5041	+ e.printStackTrace();
4580	5042	assert (false);
4581	5043	Composite c = (Composite) copy;
4582	5044	c.children.clear();
..	..	@@ -4587,13 +5049,24 @@
4587	5049	c.addChild(csg);
4588	5050	}
4589	5051
	5052	+ copy.versionlist = readobj.versionlist;
	5053	+ copy.versionindex = readobj.versionindex;
	5054	+
	5055	+ if (copy.versionlist == null)
	5056	+ {
	5057	+ copy.versionlist = new Object3D[100];
	5058	+ copy.versionindex = -1;
	5059	+ }
	5060	+
	5061	+ //? SetUndoStates();
	5062	+
4590	5063	ResetModel();
4591	5064	copy.HardTouch(); // recompile?
4592	5065	refreshContents();
4593	5066	}
4594	5067	}
4595	5068
4596		- void load() // throws ClassNotFoundException
	5069	+ void Open() // throws ClassNotFoundException
4597	5070	{
4598	5071	if (Grafreed.standAlone)
4599	5072	{
..	..	@@ -4696,6 +5169,7 @@
4696	5169	//ps.print(buffer.toString());
4697	5170	} catch (IOException e)
4698	5171	{
	5172	+ e.printStackTrace();
4699	5173	}
4700	5174	}
4701	5175
..	..	@@ -4710,6 +5184,8 @@
4710	5184	String filename = browser.getFile();
4711	5185	if (filename != null && filename.length() > 0)
4712	5186	{
	5187	+ if (!filename.endsWith(".gfd"))
	5188	+ filename += ".gfd";
4713	5189	lastname = browser.getDirectory() + filename;
4714	5190	save();
4715	5191	}
..	..	@@ -4876,7 +5352,7 @@
4876	5352	MenuBar menuBar;
4877	5353	Menu fileMenu;
4878	5354	MenuItem newItem;
4879		- MenuItem loadItem;
	5355	+ MenuItem openItem;
4880	5356	MenuItem saveItem;
4881	5357	MenuItem saveAsItem;
4882	5358	MenuItem exportAsItem;
..	..	@@ -4899,22 +5375,36 @@
4899	5375	CheckboxMenuItem toggleSwitchItem;
4900	5376	CheckboxMenuItem toggleRootItem;
4901	5377	CheckboxMenuItem animationItem;
	5378	+ MenuItem archiveItem;
4902	5379	CheckboxMenuItem toggleHandleItem;
4903	5380	CheckboxMenuItem togglePaintItem;
4904	5381	JSplitPane mainPanel;
4905	5382	JScrollPane scrollpane;
	5383	+
4906	5384	JPanel toolbarPanel;
	5385	+
4907	5386	cGridBag treePanel;
	5387	+
4908	5388	JPanel radioPanel;
4909	5389	ButtonGroup buttonGroup;
4910		- cGridBag ctrlPanel;
	5390	+
	5391	+ cGridBag toolboxPanel;
4911	5392	cGridBag materialPanel;
	5393	+ cGridBag ctrlPanel;
	5394	+
4912	5395	JScrollPane infoPanel;
	5396	+
4913	5397	cGridBag optionsPanel;
	5398	+
4914	5399	JTabbedPane objectPanel;
	5400	+ boolean materialFlushed;
	5401	+ Object3D latestObject;
	5402	+
4915	5403	cGridBag XYZPanel;
	5404	+
4916	5405	JSplitPane gridPanel;
4917	5406	JSplitPane bigPanel;
	5407	+
4918	5408	cGridBag bigThree;
4919	5409	cGridBag scenePanel;
4920	5410	cGridBag centralPanel;
..	..	@@ -4972,7 +5462,7 @@
4972	5462	JLabel colorLabel;
4973	5463	cNumberSlider colorField;
4974	5464	JLabel modulationLabel;
4975		- cNumberSlider modulationField;
	5465	+ cNumberSlider saturationField;
4976	5466	JLabel metalnessLabel;
4977	5467	cNumberSlider metalnessField;
4978	5468	JLabel diffuseLabel;
..	..	@@ -5029,7 +5519,7 @@
5029	5519	cNumberSlider fogField;
5030	5520	JLabel opacityPowerLabel;
5031	5521	cNumberSlider opacityPowerField;
5032		- JTree jTree;
	5522	+ cTree jTree;
5033	5523	//ObjectUI parent;
5034	5524
5035	5525	cNumberSlider normalpushField;