~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.versions == null)
	300	+ {
	301	+ copy.versions = new byte[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.versions == null)
	319	+ {
	320	+ copy.versions = new byte[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.versions == 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(true);
	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,34 @@
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 byte[] CompressCopy()
	854	+ {
	855	+ boolean temp = CameraPane.SWITCH;
	856	+ CameraPane.SWITCH = false;
	857	+
	858	+ copy.ExtractBigData(versiontable);
	859	+ // if (copy == client)
	860	+
	861	+ byte[] versions[] = copy.versions;
	862	+ copy.versions = null;
	863	+
	864	+ byte[] compress = Compress(copy);
	865	+
	866	+ copy.versions = versions;
	867	+
	868	+ copy.RestoreBigData(versiontable);
	869	+
	870	+ CameraPane.SWITCH = temp;
	871	+
	872	+ return compress;
	873	+ }
730	874
731	875	private JTextPane createTextPane()
732	876	{
..	..	@@ -858,7 +1002,7 @@
858	1002	// NumberSlider vDivsField;
859	1003	// JCheckBox endcaps;
860	1004	JCheckBox liveCB;
861		- JCheckBox selectCB;
	1005	+ JCheckBox selectableCB;
862	1006	JCheckBox hideCB;
863	1007	JCheckBox link2masterCB;
864	1008	JCheckBox markCB;
..	..	@@ -866,7 +1010,12 @@
866	1010	JCheckBox speedupCB;
867	1011	JCheckBox rewindCB;
868	1012	JCheckBox flipVCB;
	1013	+
	1014	+ cCheckBox toggleTextureCB;
	1015	+ cCheckBox toggleSwitchCB;
	1016	+
869	1017	JComboBox texresMenu;
	1018	+
870	1019	JButton resetButton;
871	1020	JButton stepButton;
872	1021	JButton stepAllButton;
..	..	@@ -1053,38 +1202,42 @@
1053	1202	namePanel = new cGridBag();
1054	1203
1055	1204	nameField = AddText(namePanel, copy.GetName());
1056		- namePanel.add(nameField);
	1205	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1057	1206	oe.ctrlPanel.add(namePanel);
1058	1207
1059	1208	oe.ctrlPanel.Return();
1060	1209
1061		- if (!GroupEditor.allparams)
	1210	+ if (!allparams)
1062	1211	return;
1063	1212
1064	1213	setupPanel = new cGridBag().setVertical(false);
1065	1214
1066	1215	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1067	1216	liveCB.setToolTipText("Animate object");
1068		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1069		- selectCB.setToolTipText("Make object selectable");
	1217	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1218	+ selectableCB.setToolTipText("Make object selectable");
1070	1219	// Return();
	1220	+
1071	1221	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1072	1222	hideCB.setToolTipText("Hide object");
1073	1223	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1074		- markCB.setToolTipText("Set the animation target transform");
	1224	+ markCB.setToolTipText("As animation target transform");
	1225	+
	1226	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1075	1227
1076	1228	setupPanel2 = new cGridBag().setVertical(false);
1077	1229
1078	1230	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1079	1231	rewindCB.setToolTipText("Rewind animation");
1080	1232
1081		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1082		- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1233	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1234	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1083	1235
	1236	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1237	+ link2masterCB.setToolTipText("Attach to support");
	1238	+
1084	1239	if (Globals.ADVANCED)
1085	1240	{
1086		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1087		- link2masterCB.setToolTipText("Attach to support");
1088	1241	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1089	1242	speedupCB.setToolTipText("Option motion capture");
1090	1243	}
..	..	@@ -1358,6 +1511,7 @@
1358	1511	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1359	1512	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1360	1513	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1514	+ //XYZPanel.setName("XYZ");
1361	1515
1362	1516	/*
1363	1517	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1395,12 +1549,29 @@
1395	1549	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1396	1550	//tmp.setName("Edit");
1397	1551	objectPanel.add(materialPanel);
	1552	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1553	+ objectPanel.setToolTipTextAt(0, "Material panel");
	1554	+
1398	1555	// JPanel north = new JPanel(new BorderLayout());
1399	1556	// north.setName("Edit");
1400	1557	// north.add(ctrlPanel, BorderLayout.NORTH);
1401	1558	// objectPanel.add(north);
1402	1559	objectPanel.add(editPanel);
1403		- objectPanel.add(infoPanel);
	1560	+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1561	+ objectPanel.setToolTipTextAt(1, "Edit panel");
	1562	+
	1563	+ //if (Globals.ADVANCED)
	1564	+ objectPanel.add(infoPanel);
	1565	+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1566	+ objectPanel.setToolTipTextAt(2, "Info panel");
	1567	+
	1568	+ objectPanel.add(XYZPanel);
	1569	+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
	1570	+ objectPanel.setToolTipTextAt(3, "XYZ/RGB panel");
	1571	+
	1572	+ objectPanel.add(toolboxPanel);
	1573	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
	1574	+ objectPanel.setToolTipTextAt(4, "Objects/backgrounds panel");
1404	1575
1405	1576	/*
1406	1577	aConstraints.gridx = 0;
..	..	@@ -1409,7 +1580,7 @@
1409	1580	aConstraints.gridy += 1;
1410	1581	aConstraints.gridwidth = 1;
1411	1582	mainPanel.add(objectPanel, aConstraints);
1412		- */
	1583	+ */
1413	1584
1414	1585	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1415	1586	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1421,14 +1592,12 @@
1421	1592	scrollpane.addMouseWheelListener(this); // Default not fast enough
1422	1593
1423	1594	/JTabbedPane/ scenePanel = new cGridBag();
1424		- scenePanel.preferredWidth = 6;
	1595	+ scenePanel.preferredWidth = 5;
1425	1596
1426	1597	JTabbedPane tabbedPane = new JTabbedPane();
1427	1598	tabbedPane.add(scrollpane);
1428	1599
1429		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1430		-
1431		- optionsPanel = new cGridBag().setVertical(true);
	1600	+ optionsPanel = new cGridBag().setVertical(false);
1432	1601
1433	1602	optionsPanel.setName("Options");
1434	1603
..	..	@@ -1436,6 +1605,8 @@
1436	1605
1437	1606	tabbedPane.add(optionsPanel);
1438	1607
	1608	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1609	+
1439	1610	scenePanel.add(tabbedPane);
1440	1611
1441	1612	/*
..	..	@@ -1499,7 +1670,7 @@
1499	1670	bigThree = new cGridBag();
1500	1671	bigThree.addComponent(scenePanel);
1501	1672	bigThree.addComponent(centralPanel);
1502		- bigThree.addComponent(XYZPanel);
	1673	+ //bigThree.addComponent(XYZPanel);
1503	1674
1504	1675	// // SIDE EFFECT!!!
1505	1676	// aConstraints.gridx = 0;
..	..	@@ -1508,9 +1679,9 @@
1508	1679	// aConstraints.gridheight = 1;
1509	1680
1510	1681	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1511		- framePanel.setContinuousLayout(true);
1512		- framePanel.setOneTouchExpandable(true);
1513		- framePanel.setDividerLocation(0.8);
	1682	+ framePanel.setContinuousLayout(false);
	1683	+ framePanel.setOneTouchExpandable(false);
	1684	+ //.setDividerLocation(0.8);
1514	1685	//framePanel.setDividerSize(15);
1515	1686	//framePanel.setResizeWeight(0.15);
1516	1687	framePanel.setName("Frame");
..	..	@@ -1528,16 +1699,18 @@
1528	1699	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1529	1700
1530	1701	frame.setSize(1280, 860);
1531		- frame.setVisible(true);
1532		-
	1702	+
1533	1703	cameraView.requestFocusInWindow();
1534	1704
1535	1705	gridPanel.setDividerLocation(1.0);
	1706	+
	1707	+ frame.validate();
	1708	+
	1709	+ frame.setVisible(true);
1536	1710
1537	1711	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1538	1712	frame.addWindowListener(new WindowAdapter()
1539	1713	{
1540		-
1541	1714	public void windowClosing(WindowEvent e)
1542	1715	{
1543	1716	Close();
..	..	@@ -1599,45 +1772,48 @@
1599	1772	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1600	1773
1601	1774	cGridBag colorSection = new cGridBag().setVertical(true);
	1775	+
	1776	+ cGridBag huepanel = new cGridBag();
	1777	+ cGridBag huelabel = new cGridBag();
	1778	+ huelabel.add(GetLabel("icons/hue.png", false));
	1779	+ huelabel.preferredWidth = 20;
	1780	+ huepanel.add(new cGridBag()); // Label
	1781	+ huepanel.add(huelabel); // Field/slider
	1782	+
	1783	+ huepanel.preferredHeight = 7;
	1784	+
	1785	+ colorSection.add(huepanel);
1602	1786
1603	1787	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);
	1788	+
	1789	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1790	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1791	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1792	+
1607	1793	//colorField.preferredWidth = 200;
1608	1794	colorSection.add(color);
1609	1795
1610	1796	cGridBag modulation = new cGridBag();
1611	1797	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1612	1798	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1613		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1799	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1614	1800	colorSection.add(modulation);
1615	1801
	1802	+ cGridBag opacity = new cGridBag();
	1803	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1804	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1805	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1806	+ colorSection.add(opacity);
	1807	+
	1808	+ colorSection.add(GetSeparator());
	1809	+
1616	1810	cGridBag texture = new cGridBag();
1617	1811	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1618	1812	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1619	1813	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1620	1814	colorSection.add(texture);
1621	1815
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());
	1816	+ panel.add(GetSeparator());
1641	1817
1642	1818	panel.add(colorSection);
1643	1819
..	..	@@ -1687,7 +1863,13 @@
1687	1863	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1688	1864	diffuseSection.add(fakedepth);
1689	1865
1690		- panel.add(new JSeparator());
	1866	+ cGridBag shadowbias = new cGridBag();
	1867	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1868	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1869	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1870	+ diffuseSection.add(shadowbias);
	1871	+
	1872	+ panel.add(GetSeparator());
1691	1873
1692	1874	panel.add(diffuseSection);
1693	1875
..	..	@@ -1737,42 +1919,48 @@
1737	1919	// aConstraints.gridy += 1;
1738	1920	// aConstraints.gridwidth = 1;
1739	1921
	1922	+ cGridBag anisoU = new cGridBag();
	1923	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1924	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1925	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1926	+ specularSection.add(anisoU);
1740	1927
1741		- panel.add(new JSeparator());
	1928	+ cGridBag anisoV = new cGridBag();
	1929	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1930	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1931	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1932	+ specularSection.add(anisoV);
	1933	+
	1934	+
	1935	+ panel.add(GetSeparator());
1742	1936
1743	1937	panel.add(specularSection);
1744	1938
1745	1939	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1746	1940
1747		- cGridBag globalSection = new cGridBag().setVertical(true);
	1941	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1748	1942
1749	1943	cGridBag camera = new cGridBag();
1750	1944	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1751	1945	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1752	1946	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1753		- globalSection.add(camera);
	1947	+ colorSection.add(camera);
1754	1948
1755	1949	cGridBag ambient = new cGridBag();
1756	1950	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1757	1951	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1758	1952	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1759		- globalSection.add(ambient);
	1953	+ colorSection.add(ambient);
1760	1954
1761	1955	cGridBag backlit = new cGridBag();
1762	1956	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1763	1957	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1764	1958	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1765		- globalSection.add(backlit);
	1959	+ colorSection.add(backlit);
1766	1960
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());
	1961	+ //panel.add(new JSeparator());
1774	1962
1775		- panel.add(globalSection);
	1963	+ //panel.add(globalSection);
1776	1964
1777	1965	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1778	1966
..	..	@@ -1814,7 +2002,7 @@
1814	2002	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1815	2003	textureSection.add(opacityPower);
1816	2004
1817		- panel.add(new JSeparator());
	2005	+ panel.add(GetSeparator());
1818	2006
1819	2007	panel.add(textureSection);
1820	2008
..	..	@@ -1879,8 +2067,9 @@
1879	2067	// 3D models
1880	2068	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1881	2069	{
1882		- lastConverter = new com.jmex.model.converters.MaxToJme();
1883		- LoadFile(filename, lastConverter);
	2070	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2071	+ //LoadFile(filename, lastConverter);
	2072	+ LoadObjFile(filename); // New 3ds loader
1884	2073	continue;
1885	2074	}
1886	2075	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2606,6 +2795,7 @@
2606	2795	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2607	2796	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2608	2797	}
	2798	+
2609	2799	//cJME.count++;
2610	2800	//cJME.count %= 12;
2611	2801	if (gc)
..	..	@@ -2789,6 +2979,7 @@
2789	2979	}
2790	2980	}
2791	2981	}
	2982	+
2792	2983	cFileSystemPane FSPane;
2793	2984
2794	2985	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2842,11 +3033,14 @@
2842	3033	}
2843	3034	}
2844	3035	}
	3036	+
2845	3037	freezematerial = false;
2846	3038	}
2847	3039
2848	3040	void SetMaterial(Object3D object)
2849	3041	{
	3042	+ latestObject = object;
	3043	+
2850	3044	cMaterial mat = object.material;
2851	3045
2852	3046	if (mat == null)
..	..	@@ -2958,12 +3152,17 @@
2958	3152	// }
2959	3153
2960	3154	/**/
2961		- if (deselect)
	3155	+ if (deselect \|\| child == null)
2962	3156	{
2963	3157	//group.deselectAll();
2964	3158	//freeze = true;
2965	3159	GetTree().clearSelection();
2966	3160	//freeze = false;
	3161	+
	3162	+ if (child == null)
	3163	+ {
	3164	+ return;
	3165	+ }
2967	3166	}
2968	3167
2969	3168	//group.addSelectee(child);
..	..	@@ -3032,7 +3231,7 @@
3032	3231	cameraView.ToggleDL();
3033	3232	cameraView.repaint();
3034	3233	return;
3035		- } else if (event.getSource() == toggleTextureItem)
	3234	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
3036	3235	{
3037	3236	cameraView.ToggleTexture();
3038	3237	// june 2013 copy.HardTouch();
..	..	@@ -3071,7 +3270,7 @@
3071	3270	frame.validate();
3072	3271
3073	3272	return;
3074		- } else if (event.getSource() == toggleSwitchItem)
	3273	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3075	3274	{
3076	3275	cameraView.ToggleSwitch();
3077	3276	cameraView.repaint();
..	..	@@ -3102,7 +3301,7 @@
3102	3301	{
3103	3302	copy.live ^= true;
3104	3303	return;
3105		- } else if (event.getSource() == selectCB)
	3304	+ } else if (event.getSource() == selectableCB)
3106	3305	{
3107	3306	copy.dontselect ^= true;
3108	3307	return;
..	..	@@ -3287,9 +3486,9 @@
3287	3486	{
3288	3487	Close();
3289	3488	//return true;
3290		- } else if (source == loadItem)
	3489	+ } else if (source == openItem)
3291	3490	{
3292		- load();
	3491	+ Open();
3293	3492	//return true;
3294	3493	} else if (source == newItem)
3295	3494	{
..	..	@@ -3314,6 +3513,10 @@
3314	3513	{
3315	3514	generatePOV();
3316	3515	//return true;
	3516	+ } else if (event.getSource() == archiveItem)
	3517	+ {
	3518	+ cTools.Archive(frame);
	3519	+ return;
3317	3520	} else if (source == zBufferItem)
3318	3521	{
3319	3522	try
..	..	@@ -3365,8 +3568,8 @@
3365	3568	try
3366	3569	{
3367	3570	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3368		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3369		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3571	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3572	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3370	3573
3371	3574	Object3D parent = o.parent;
3372	3575	o.parent = null;
..	..	@@ -3377,10 +3580,14 @@
3377	3580
3378	3581	out.flush();
3379	3582
3380		- zstream.close();
	3583	+ baos //zstream
	3584	+ .close();
3381	3585	out.close();
3382	3586
3383		- return baos.toByteArray();
	3587	+ byte[] bytes = baos.toByteArray();
	3588	+
	3589	+ System.out.println("save #bytes = " + bytes.length);
	3590	+ return bytes;
3384	3591	} catch (Exception e)
3385	3592	{
3386	3593	System.err.println(e);
..	..	@@ -3390,13 +3597,16 @@
3390	3597
3391	3598	static public Object Uncompress(byte[] bytes)
3392	3599	{
3393		- System.out.println("#bytes = " + bytes.length);
	3600	+ System.out.println("restore #bytes = " + bytes.length);
3394	3601	try
3395	3602	{
3396	3603	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3397		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3398		- ObjectInputStream in = new ObjectInputStream(istream);
	3604	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3605	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3399	3606	Object obj = in.readObject();
	3607	+
	3608	+ bais //istream
	3609	+ .close();
3400	3610	in.close();
3401	3611
3402	3612	return obj;
..	..	@@ -3451,39 +3661,77 @@
3451	3661	return null;
3452	3662	}
3453	3663
3454		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3455	3664
3456	3665	public void Save()
	3666	+ {
	3667	+ //Save(true);
	3668	+ Replace();
	3669	+ }
	3670	+
	3671	+ private boolean Equal(byte[] compress, byte[] name)
	3672	+ {
	3673	+ if (compress.length != name.length)
	3674	+ {
	3675	+ return false;
	3676	+ }
	3677	+
	3678	+ for (int i=compress.length; --i>=0;)
	3679	+ {
	3680	+ if (compress[i] != name[i])
	3681	+ return false;
	3682	+ }
	3683	+
	3684	+ return true;
	3685	+ }
	3686	+
	3687	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3688	+
	3689	+ public boolean Save(boolean user)
3457	3690	{
3458	3691	System.err.println("Save");
3459	3692
3460	3693	cRadio tab = GetCurrentTab();
3461	3694
3462		- boolean temp = CameraPane.SWITCH;
3463		- CameraPane.SWITCH = false;
	3695	+ byte[] compress = CompressCopy(); // Saved version. No need for "Replace".
3464	3696
3465		- copy.ExtractBigData(hashtable);
	3697	+ boolean thesame = false;
	3698	+
	3699	+ // Quick heuristic using length. Works only when stream is compressed.
	3700	+ if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3701	+ {
	3702	+ thesame = true;
	3703	+ }
3466	3704
3467	3705	//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++)
	3706	+ if (!thesame)
3477	3707	{
3478		- tab.graphs[i] = null;
	3708	+ //tab.user[tab.versionindex] = user;
	3709	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3710	+
	3711	+ copy.versions[++copy.versionindex] = compress;
	3712	+
	3713	+ // if (increment)
	3714	+ // tab.versionindex++;
3479	3715	}
3480	3716
	3717	+ //copy.RestoreBigData(versiontable);
	3718	+
	3719	+ //assert(hashtable.isEmpty());
	3720	+
	3721	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
	3722	+ {
	3723	+ //tab.user[i] = false;
	3724	+ copy.versions[i] = null;
	3725	+ }
	3726	+
	3727	+ SetUndoStates();
	3728	+
3481	3729	// test save
3482	3730	if (false)
3483	3731	{
3484	3732	try
3485	3733	{
3486		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3734	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3487	3735	ObjectOutputStream p = new ObjectOutputStream(ostream);
3488	3736
3489	3737	p.writeObject(copy);
..	..	@@ -3496,23 +3744,30 @@
3496	3744	e.printStackTrace();
3497	3745	}
3498	3746	}
	3747	+
	3748	+ return !thesame;
3499	3749	}
3500	3750
3501	3751	void CopyChanged(Object3D obj)
3502	3752	{
	3753	+ SetUndoStates();
	3754	+
3503	3755	boolean temp = CameraPane.SWITCH;
3504	3756	CameraPane.SWITCH = false;
3505	3757
3506		- copy.ExtractBigData(hashtable);
	3758	+ copy.ExtractBigData(versiontable);
3507	3759
3508	3760	copy.clear();
3509	3761
	3762	+ copy.skyboxname = obj.skyboxname;
	3763	+ copy.skyboxext = obj.skyboxext;
	3764	+
3510	3765	for (int i=0; i<obj.Size(); i++)
3511	3766	{
3512	3767	copy.add(obj.get(i));
3513	3768	}
3514	3769
3515		- copy.RestoreBigData(hashtable);
	3770	+ copy.RestoreBigData(versiontable);
3516	3771
3517	3772	CameraPane.SWITCH = temp;
3518	3773
..	..	@@ -3539,42 +3794,130 @@
3539	3794	refreshContents();
3540	3795	}
3541	3796
3542		- public void Undo()
	3797	+ cButton undoButton;
	3798	+ cButton restoreButton;
	3799	+ cButton replaceButton;
	3800	+ cButton redoButton;
	3801	+
	3802	+ boolean muteSlider;
	3803	+
	3804	+ int VersionCount()
3543	3805	{
	3806	+ int count = 0;
	3807	+
	3808	+ for (int i = copy.versions.length; --i >= 0;)
	3809	+ {
	3810	+ if (copy.versions[i] != null)
	3811	+ count++;
	3812	+ }
	3813	+
	3814	+ return count;
	3815	+ }
	3816	+
	3817	+ void SetUndoStates()
	3818	+ {
	3819	+ cRadio tab = GetCurrentTab();
	3820	+
	3821	+ restoreButton.setEnabled(copy.versionindex != -1);
	3822	+ replaceButton.setEnabled(copy.versionindex != -1);
	3823	+
	3824	+ undoButton.setEnabled(copy.versionindex > 0);
	3825	+ redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	3826	+
	3827	+ muteSlider = true;
	3828	+ versionSlider.setMaximum(VersionCount() - 1);
	3829	+ versionSlider.setInteger(copy.versionindex);
	3830	+ muteSlider = false;
	3831	+ }
	3832	+
	3833	+ public boolean Undo()
	3834	+ {
	3835	+ // Option?
	3836	+ Replace();
	3837	+
3544	3838	System.err.println("Undo");
3545	3839
3546	3840	cRadio tab = GetCurrentTab();
3547	3841
3548		- if (tab.undoindex == 0)
	3842	+ if (copy.versionindex == 0)
3549	3843	{
3550	3844	java.awt.Toolkit.getDefaultToolkit().beep();
3551		- return;
	3845	+ return false;
3552	3846	}
3553	3847
3554		- if (tab.graphs[tab.undoindex] == null)
	3848	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3849	+// {
	3850	+// if (Save(false))
	3851	+// tab.versionindex -= 1;
	3852	+// else
	3853	+// {
	3854	+// if (tab.versionindex <= 0)
	3855	+// return false;
	3856	+// else
	3857	+// tab.versionindex -= 1;
	3858	+// }
	3859	+// }
	3860	+
	3861	+ copy.versionindex -= 1;
	3862	+
	3863	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3864	+
	3865	+ return true;
	3866	+ }
	3867	+
	3868	+ public boolean Restore()
	3869	+ {
	3870	+ System.err.println("Restore");
	3871	+
	3872	+ cRadio tab = GetCurrentTab();
	3873	+
	3874	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
3555	3875	{
3556		- Save();
3557		- tab.undoindex -= 1;
	3876	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3877	+ return false;
3558	3878	}
3559	3879
3560		- tab.undoindex -= 1;
	3880	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3881	+
	3882	+ return true;
	3883	+ }
3561	3884
3562		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3885	+ public boolean Replace()
	3886	+ {
	3887	+ System.err.println("Replace");
	3888	+
	3889	+ cRadio tab = GetCurrentTab();
	3890	+
	3891	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3892	+ {
	3893	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3894	+ return false;
	3895	+ }
	3896	+
	3897	+ copy.versions[copy.versionindex] = CompressCopy();
	3898	+
	3899	+ return true;
3563	3900	}
3564	3901
3565	3902	public void Redo()
3566	3903	{
	3904	+ // Option?
	3905	+ Replace();
	3906	+
3567	3907	cRadio tab = GetCurrentTab();
3568	3908
3569		- if (tab.graphs[tab.undoindex + 1] == null)
	3909	+ if (copy.versions[copy.versionindex + 1] == null)
3570	3910	{
3571	3911	java.awt.Toolkit.getDefaultToolkit().beep();
3572	3912	return;
3573	3913	}
3574	3914
3575		- tab.undoindex += 1;
	3915	+ copy.versionindex += 1;
3576	3916
3577		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3917	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3918	+
	3919	+ //if (!tab.user[tab.versionindex])
	3920	+ // tab.graphs[tab.versionindex] = null;
3578	3921	}
3579	3922
3580	3923	void ImportGFD()
..	..	@@ -3726,7 +4069,7 @@
3726	4069	assert false;
3727	4070	}
3728	4071
3729		- void EditSelection()
	4072	+ void EditSelection(boolean newWindow)
3730	4073	{
3731	4074	}
3732	4075
..	..	@@ -3870,9 +4213,25 @@
3870	4213	//copy.Touch();
3871	4214	}
3872	4215
	4216	+ cNumberSlider versionSlider;
	4217	+
3873	4218	public void stateChanged(ChangeEvent e)
3874	4219	{
3875	4220	// assert(false);
	4221	+ if (e.getSource() == versionSlider)
	4222	+ {
	4223	+ if (muteSlider)
	4224	+ return;
	4225	+
	4226	+ int version = versionSlider.getInteger();
	4227	+
	4228	+ if (copy.versions[version] != null)
	4229	+ {
	4230	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4231	+ }
	4232	+
	4233	+ return;
	4234	+ }
3876	4235
3877	4236	if (freezematerial)
3878	4237	{
..	..	@@ -4221,7 +4580,7 @@
4221	4580
4222	4581	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4223	4582	{
4224		- if (Globals.SAVEONMAKE)
	4583	+ if (Globals.REPLACEONMAKE) // && resetmodel)
4225	4584	Save();
4226	4585	//Tween.set(thing, 0).target(1).start(tweenManager);
4227	4586	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..	..	@@ -4309,6 +4668,12 @@
4309	4668	{
4310	4669	ResetModel();
4311	4670	Select(thing.GetTreePath(), true, false); // unselect... false);
	4671	+
	4672	+ if (thing.Size() == 0)
	4673	+ {
	4674	+ //EditSelection(false);
	4675	+ }
	4676	+
4312	4677	refreshContents();
4313	4678	}
4314	4679
..	..	@@ -4457,7 +4822,9 @@
4457	4822	readobj.ResetDisplayList();
4458	4823	} catch (Exception e)
4459	4824	{
4460		- //e.printStackTrace();
	4825	+ if (!e.toString().contains("GZIP"))
	4826	+ e.printStackTrace();
	4827	+
4461	4828	try
4462	4829	{
4463	4830	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4531,12 +4898,14 @@
4531	4898
4532	4899	if (readobj != null)
4533	4900	{
4534		- if (Globals.SAVEONMAKE)
4535		- Save();
	4901	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4902	+ // Save();
4536	4903	try
4537	4904	{
4538	4905	//readobj.deepCopySelf(copy);
4539	4906	copy.clear(); // june 2014
	4907	+ copy.skyboxname = readobj.skyboxname;
	4908	+ copy.skyboxext = readobj.skyboxext;
4540	4909	for (int i = 0; i < readobj.size(); i++)
4541	4910	{
4542	4911	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4577,6 +4946,7 @@
4577	4946	}
4578	4947	} catch (ClassCastException e)
4579	4948	{
	4949	+ e.printStackTrace();
4580	4950	assert (false);
4581	4951	Composite c = (Composite) copy;
4582	4952	c.children.clear();
..	..	@@ -4587,13 +4957,24 @@
4587	4957	c.addChild(csg);
4588	4958	}
4589	4959
	4960	+ copy.versions = readobj.versions;
	4961	+ copy.versionindex = readobj.versionindex;
	4962	+
	4963	+ if (copy.versions == null)
	4964	+ {
	4965	+ copy.versions = new byte[100][];
	4966	+ copy.versionindex = -1;
	4967	+ }
	4968	+
	4969	+ //? SetUndoStates();
	4970	+
4590	4971	ResetModel();
4591	4972	copy.HardTouch(); // recompile?
4592	4973	refreshContents();
4593	4974	}
4594	4975	}
4595	4976
4596		- void load() // throws ClassNotFoundException
	4977	+ void Open() // throws ClassNotFoundException
4597	4978	{
4598	4979	if (Grafreed.standAlone)
4599	4980	{
..	..	@@ -4696,6 +5077,7 @@
4696	5077	//ps.print(buffer.toString());
4697	5078	} catch (IOException e)
4698	5079	{
	5080	+ e.printStackTrace();
4699	5081	}
4700	5082	}
4701	5083
..	..	@@ -4710,6 +5092,8 @@
4710	5092	String filename = browser.getFile();
4711	5093	if (filename != null && filename.length() > 0)
4712	5094	{
	5095	+ if (!filename.endsWith(".gfd"))
	5096	+ filename += ".gfd";
4713	5097	lastname = browser.getDirectory() + filename;
4714	5098	save();
4715	5099	}
..	..	@@ -4876,7 +5260,7 @@
4876	5260	MenuBar menuBar;
4877	5261	Menu fileMenu;
4878	5262	MenuItem newItem;
4879		- MenuItem loadItem;
	5263	+ MenuItem openItem;
4880	5264	MenuItem saveItem;
4881	5265	MenuItem saveAsItem;
4882	5266	MenuItem exportAsItem;
..	..	@@ -4899,22 +5283,36 @@
4899	5283	CheckboxMenuItem toggleSwitchItem;
4900	5284	CheckboxMenuItem toggleRootItem;
4901	5285	CheckboxMenuItem animationItem;
	5286	+ MenuItem archiveItem;
4902	5287	CheckboxMenuItem toggleHandleItem;
4903	5288	CheckboxMenuItem togglePaintItem;
4904	5289	JSplitPane mainPanel;
4905	5290	JScrollPane scrollpane;
	5291	+
4906	5292	JPanel toolbarPanel;
	5293	+
4907	5294	cGridBag treePanel;
	5295	+
4908	5296	JPanel radioPanel;
4909	5297	ButtonGroup buttonGroup;
4910		- cGridBag ctrlPanel;
	5298	+
	5299	+ cGridBag toolboxPanel;
4911	5300	cGridBag materialPanel;
	5301	+ cGridBag ctrlPanel;
	5302	+
4912	5303	JScrollPane infoPanel;
	5304	+
4913	5305	cGridBag optionsPanel;
	5306	+
4914	5307	JTabbedPane objectPanel;
	5308	+ boolean materialFlushed;
	5309	+ Object3D latestObject;
	5310	+
4915	5311	cGridBag XYZPanel;
	5312	+
4916	5313	JSplitPane gridPanel;
4917	5314	JSplitPane bigPanel;
	5315	+
4918	5316	cGridBag bigThree;
4919	5317	cGridBag scenePanel;
4920	5318	cGridBag centralPanel;
..	..	@@ -5029,7 +5427,7 @@
5029	5427	cNumberSlider fogField;
5030	5428	JLabel opacityPowerLabel;
5031	5429	cNumberSlider opacityPowerField;
5032		- JTree jTree;
	5430	+ cTree jTree;
5033	5431	//ObjectUI parent;
5034	5432
5035	5433	cNumberSlider normalpushField;