~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -4,6 +4,7 @@
4	4
5	5	import java.awt.*;
6	6	import java.awt.event.*;
	7	+import java.awt.image.BufferedImage;
7	8	import javax.swing.*;
8	9	import javax.swing.event.*;
9	10	import javax.swing.text.*;
..	..	@@ -13,6 +14,9 @@
13	14	import javax.swing.plaf.metal.MetalLookAndFeel;
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
	17	+
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
16	20
17	21	//import javax.media.opengl.GLCanvas;
18	22
..	..	@@ -37,6 +41,79 @@
37	41	JFrame frame;
38	42
39	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	+ }
	52	+
	53	+ cButton GetButton(String name, boolean border)
	54	+ {
	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);
	69	+ }
	70	+
	71	+ cCheckBox GetCheckBox(String name, boolean border)
	72	+ {
	73	+ ImageIcon icon = GetIcon(name);
	74	+ return new cCheckBox(icon, border);
	75	+ }
	76	+
	77	+ ImageIcon GetIcon(String name)
	78	+ {
	79	+ try
	80	+ {
	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;
	97	+ }
	98	+ catch (Exception e)
	99	+ {
	100	+ return null;
	101	+ }
	102	+ }
	103	+
	104	+ BufferedImage GetImage(String name)
	105	+ {
	106	+ try
	107	+ {
	108	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	109	+
	110	+ return image;
	111	+ }
	112	+ catch (Exception e)
	113	+ {
	114	+ return null;
	115	+ }
	116	+ }
40	117
41	118	// SCRIPT
42	119
..	..	@@ -147,7 +224,7 @@
147	224
148	225	objEditor.ctrlPanel.remove(namePanel);
149	226
150		- if (!GroupEditor.allparams)
	227	+ if (!allparams)
151	228	return;
152	229
153	230	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -171,7 +248,7 @@
171	248
172	249	objEditor.ctrlPanel.remove(setupPanel);
173	250	objEditor.ctrlPanel.remove(setupPanel2);
174		- objEditor.ctrlPanel.remove(commandsPanel);
	251	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
175	252	objEditor.ctrlPanel.remove(pushPanel);
176	253	//objEditor.ctrlPanel.remove(fillPanel);
177	254
..	..	@@ -219,6 +296,12 @@
219	296	client = inClient;
220	297	copy = client;
221	298
	299	+ if (copy.versions == null)
	300	+ {
	301	+ copy.versions = new Object3D[100];
	302	+ copy.versionindex = -1;
	303	+ }
	304	+
222	305	// "this" is not called: SetupUI2(objEditor);
223	306	}
224	307
..	..	@@ -232,6 +315,12 @@
232	315	client = inClient;
233	316	copy = client;
234	317
	318	+ if (copy.versions == null)
	319	+ {
	320	+ copy.versions = new Object3D[100];
	321	+ copy.versionindex = -1;
	322	+ }
	323	+
235	324	SetupUI2(callee.GetEditor());
236	325	}
237	326
..	..	@@ -246,7 +335,7 @@
246	335	//localCopy.parent = null;
247	336
248	337	frame = new JFrame();
249		- frame.setUndecorated(true);
	338	+ frame.setUndecorated(false);
250	339	objEditor = this;
251	340	this.callee = callee;
252	341
..	..	@@ -264,6 +353,12 @@
264	353	copy = localCopy;
265	354	copy.editWindow = this;
266	355
	356	+ if (copy.versions == null)
	357	+ {
	358	+// copy.versions = new byte[100][];
	359	+// copy.versionindex = -1;
	360	+ }
	361	+
267	362	SetupMenu();
268	363
269	364	//SetupName(objEditor); // new
..	..	@@ -277,12 +372,17 @@
277	372	return frame.action(event, obj);
278	373	}
279	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	+
280	380	void SetupMenu()
281	381	{
282	382	frame.setMenuBar(menuBar = new MenuBar());
283	383	menuBar.add(fileMenu = new Menu("File"));
284	384	fileMenu.add(newItem = new MenuItem("New"));
285		- fileMenu.add(loadItem = new MenuItem("Open..."));
	385	+ fileMenu.add(openItem = new MenuItem("Open..."));
286	386
287	387	//oe.menuBar.add(menu = new Menu("Include"));
288	388	Menu menu = new Menu("Import");
..	..	@@ -314,7 +414,7 @@
314	414	}
315	415
316	416	newItem.addActionListener(this);
317		- loadItem.addActionListener(this);
	417	+ openItem.addActionListener(this);
318	418	saveItem.addActionListener(this);
319	419	saveAsItem.addActionListener(this);
320	420	exportAsItem.addActionListener(this);
..	..	@@ -323,28 +423,68 @@
323	423	closeItem.addActionListener(this);
324	424
325	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	+
326	452	toolbarPanel = new JPanel();
327	453	toolbarPanel.setName("Toolbar");
	454	+
328	455	treePanel = new cGridBag();
329	456	treePanel.setName("Tree");
	457	+
	458	+ editPanel = new cGridBag().setVertical(true);
	459	+ //editPanel.setName("Edit");
	460	+
330	461	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
331		- ctrlPanel.setName("Edit");
	462	+
	463	+ editCommandsPanel = new cGridBag();
	464	+ editPanel.add(editCommandsPanel);
	465	+ editPanel.add(ctrlPanel);
	466	+
	467	+ toolboxPanel = new cGridBag().setVertical(true);
	468	+ //toolboxPanel.setName("Toolbox");
	469	+
332	470	materialPanel = new cGridBag().setVertical(true);
333		- materialPanel.setName("Material");
	471	+ //materialPanel.setName("Material");
	472	+
334	473	/JTextPane/
335	474	infoarea = createTextPane();
336	475	doc = infoarea.getStyledDocument();
337	476
338	477	infoarea.setEditable(true);
339	478	SetText();
	479	+
340	480	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
341	481	// infoarea.setOpaque(false);
342	482	// //infoarea.setForeground(textcolor);
343	483	// TEXTAREA infoarea.setLineWrap(true);
344	484	// TEXTAREA infoarea.setWrapStyleWord(true);
345	485	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
346		- infoPanel.setPreferredSize(new Dimension(50, 200));
347		- infoPanel.setName("Info");
	486	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	487	+ //infoPanel.setName("Info");
348	488	//infoPanel.setLayout(new BorderLayout());
349	489	//infoPanel.add(createTextPane());
350	490
..	..	@@ -355,7 +495,14 @@
355	495	mainPanel.setDividerSize(9);
356	496	mainPanel.setDividerLocation(0.5); //1.0);
357	497	mainPanel.setResizeWeight(0.5);
358		-
	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	+
359	506	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
360	507	//mainPanel.setLayout(new GridBagLayout());
361	508	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -586,8 +733,8 @@
586	733	}
587	734	}
588	735
589		-static GraphicsDevice device = GraphicsEnvironment
590		- .getLocalGraphicsEnvironment().getScreenDevices()[0];
	736	+//static GraphicsDevice device = GraphicsEnvironment
	737	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
591	738
592	739	Rectangle keeprect;
593	740	cRadio radio;
..	..	@@ -603,13 +750,24 @@
603	750
604	751	boolean maximized;
605	752
	753	+ cButton fullscreenLayout;
	754	+
606	755	void Minimize()
607	756	{
608	757	frame.setState(Frame.ICONIFIED);
	758	+ frame.validate();
609	759	}
610	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={}
611	764	void Maximize()
612	765	{
	766	+ if (CameraPane.FULLSCREEN)
	767	+ {
	768	+ ToggleFullScreen();
	769	+ }
	770	+
613	771	if (maximized)
614	772	{
615	773	frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..	..	@@ -617,20 +775,36 @@
617	775	else
618	776	{
619	777	keeprect = frame.getBounds();
620		- Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
621		- Dimension rect2 = frame.getToolkit().getScreenSize();
622		- 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);
623	781	// frame.setState(Frame.MAXIMIZED_BOTH);
	782	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
624	783	}
625	784
626	785	maximized ^= true;
	786	+
	787	+ frame.validate();
627	788	}
	789	+
	790	+ cButton minButton;
	791	+ cButton maxButton;
	792	+ cButton fullButton;
628	793
629	794	void ToggleFullScreen()
630	795	{
631		- if (CameraPane.FULLSCREEN)
	796	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	797	+
	798	+ cameraView.ToggleFullScreen();
	799	+
	800	+ if (!CameraPane.FULLSCREEN)
632	801	{
633	802	device.setFullScreenWindow(null);
	803	+ frame.dispose();
	804	+ frame.setUndecorated(false);
	805	+ frame.validate();
	806	+ frame.setVisible(true);
	807	+
634	808	//frame.setVisible(false);
635	809	// frame.removeNotify();
636	810	// frame.setUndecorated(false);
..	..	@@ -640,7 +814,7 @@
640	814	// X frame.getContentPane().remove(/"Center",/bigThree);
641	815	// X framePanel.add(bigThree);
642	816	// X frame.getContentPane().add(/"Center",/framePanel);
643		- framePanel.setDividerLocation(1);
	817	+ framePanel.setDividerLocation(46);
644	818
645	819	//frame.setVisible(true);
646	820	radio.layout = keepButton;
..	..	@@ -655,7 +829,12 @@
655	829	// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
656	830	// frame.getToolkit().getScreenSize().height);
657	831	//frame.setVisible(false);
	832	+
	833	+ frame.dispose();
	834	+ frame.setUndecorated(true);
658	835	device.setFullScreenWindow(frame);
	836	+ frame.validate();
	837	+ frame.setVisible(true);
659	838	// frame.removeNotify();
660	839	// frame.setUndecorated(true);
661	840	// frame.addNotify();
..	..	@@ -664,13 +843,35 @@
664	843	// X frame.getContentPane().add(/"Center",/bigThree);
665	844	framePanel.setDividerLocation(0);
666	845
667		- radio.layout = twoButton;
	846	+ radio.layout = fullscreenLayout;
668	847	radio.layout.doClick();
669	848	//frame.setVisible(true);
670	849	}
671		-
672		- cameraView.ToggleFullScreen();
	850	+ frame.validate();
673	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.versions;
	862	+ copy.versions = null;
	863	+
	864	+ //byte[] compress = Compress(copy);
	865	+ Object3D compress = (Object3D)Grafreed.clone(copy);
	866	+
	867	+ copy.versions = versions;
	868	+
	869	+ copy.RestoreBigData(versiontable);
	870	+
	871	+ CameraPane.SWITCH = temp;
	872	+
	873	+ return compress;
	874	+ }
674	875
675	876	private JTextPane createTextPane()
676	877	{
..	..	@@ -802,7 +1003,7 @@
802	1003	// NumberSlider vDivsField;
803	1004	// JCheckBox endcaps;
804	1005	JCheckBox liveCB;
805		- JCheckBox selectCB;
	1006	+ JCheckBox selectableCB;
806	1007	JCheckBox hideCB;
807	1008	JCheckBox link2masterCB;
808	1009	JCheckBox markCB;
..	..	@@ -810,7 +1011,12 @@
810	1011	JCheckBox speedupCB;
811	1012	JCheckBox rewindCB;
812	1013	JCheckBox flipVCB;
	1014	+
	1015	+ cCheckBox toggleTextureCB;
	1016	+ cCheckBox toggleSwitchCB;
	1017	+
813	1018	JComboBox texresMenu;
	1019	+
814	1020	JButton resetButton;
815	1021	JButton stepButton;
816	1022	JButton stepAllButton;
..	..	@@ -819,10 +1025,13 @@
819	1025	JButton fasterButton;
820	1026	JButton remarkButton;
821	1027
	1028	+ cGridBag editPanel;
	1029	+ cGridBag editCommandsPanel;
	1030	+
822	1031	cGridBag namePanel;
823	1032	cGridBag setupPanel;
824	1033	cGridBag setupPanel2;
825		- cGridBag commandsPanel;
	1034	+ cGridBag objectCommandsPanel;
826	1035	cGridBag pushPanel;
827	1036	cGridBag fillPanel;
828	1037
..	..	@@ -994,38 +1203,42 @@
994	1203	namePanel = new cGridBag();
995	1204
996	1205	nameField = AddText(namePanel, copy.GetName());
997		- namePanel.add(nameField);
	1206	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
998	1207	oe.ctrlPanel.add(namePanel);
999	1208
1000	1209	oe.ctrlPanel.Return();
1001	1210
1002		- if (!GroupEditor.allparams)
	1211	+ if (!allparams)
1003	1212	return;
1004	1213
1005	1214	setupPanel = new cGridBag().setVertical(false);
1006	1215
1007	1216	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1008	1217	liveCB.setToolTipText("Animate object");
1009		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1010		- selectCB.setToolTipText("Make object selectable");
	1218	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1219	+ selectableCB.setToolTipText("Make object selectable");
1011	1220	// Return();
	1221	+
1012	1222	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1013	1223	hideCB.setToolTipText("Hide object");
1014	1224	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1015		- markCB.setToolTipText("Set the animation target transform");
	1225	+ markCB.setToolTipText("As animation target transform");
	1226	+
	1227	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1016	1228
1017	1229	setupPanel2 = new cGridBag().setVertical(false);
1018	1230
1019	1231	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1020	1232	rewindCB.setToolTipText("Rewind animation");
1021	1233
1022		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1023		- randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1234	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1235	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1024	1236
	1237	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1238	+ link2masterCB.setToolTipText("Attach to support");
	1239	+
1025	1240	if (Globals.ADVANCED)
1026	1241	{
1027		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1028		- link2masterCB.setToolTipText("Attach to support");
1029	1242	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1030	1243	speedupCB.setToolTipText("Option motion capture");
1031	1244	}
..	..	@@ -1035,23 +1248,23 @@
1035	1248	oe.ctrlPanel.add(setupPanel2);
1036	1249	oe.ctrlPanel.Return();
1037	1250
1038		- commandsPanel = new cGridBag().setVertical(false);
	1251	+ objectCommandsPanel = new cGridBag().setVertical(false);
1039	1252
1040		- resetButton = AddButton(commandsPanel, "Reset");
	1253	+ resetButton = AddButton(objectCommandsPanel, "Reset");
1041	1254	resetButton.setToolTipText("Jump to frame zero");
1042		- stepButton = AddButton(commandsPanel, "Step");
	1255	+ stepButton = AddButton(objectCommandsPanel, "Step");
1043	1256	stepButton.setToolTipText("Step one frame");
1044	1257	// resetAllButton = AddButton(oe, "Reset All");
1045	1258	// stepAllButton = AddButton(oe, "Step All");
1046	1259	// Return();
1047		- slowerButton = AddButton(commandsPanel, "Slow");
	1260	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1048	1261	slowerButton.setToolTipText("Decrease animation speed");
1049		- fasterButton = AddButton(commandsPanel, "Fast");
	1262	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1050	1263	fasterButton.setToolTipText("Increase animation speed");
1051		- remarkButton = AddButton(commandsPanel, "Remark");
	1264	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1052	1265	remarkButton.setToolTipText("Set the current transform as the target");
1053	1266
1054		- oe.ctrlPanel.add(commandsPanel);
	1267	+ oe.ctrlPanel.add(objectCommandsPanel);
1055	1268	oe.ctrlPanel.Return();
1056	1269
1057	1270	pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
..	..	@@ -1299,6 +1512,7 @@
1299	1512	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1300	1513	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1301	1514	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1515	+ //XYZPanel.setName("XYZ");
1302	1516
1303	1517	/*
1304	1518	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1336,12 +1550,29 @@
1336	1550	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1337	1551	//tmp.setName("Edit");
1338	1552	objectPanel.add(materialPanel);
	1553	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1554	+ objectPanel.setToolTipTextAt(0, "Material panel");
	1555	+
1339	1556	// JPanel north = new JPanel(new BorderLayout());
1340	1557	// north.setName("Edit");
1341	1558	// north.add(ctrlPanel, BorderLayout.NORTH);
1342	1559	// objectPanel.add(north);
1343		- objectPanel.add(ctrlPanel);
1344		- objectPanel.add(infoPanel);
	1560	+ objectPanel.add(editPanel);
	1561	+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1562	+ objectPanel.setToolTipTextAt(1, "Edit panel");
	1563	+
	1564	+ //if (Globals.ADVANCED)
	1565	+ objectPanel.add(infoPanel);
	1566	+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1567	+ objectPanel.setToolTipTextAt(2, "Info panel");
	1568	+
	1569	+ objectPanel.add(XYZPanel);
	1570	+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
	1571	+ objectPanel.setToolTipTextAt(3, "XYZ/RGB panel");
	1572	+
	1573	+ objectPanel.add(toolboxPanel);
	1574	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
	1575	+ objectPanel.setToolTipTextAt(4, "Objects/backgrounds panel");
1345	1576
1346	1577	/*
1347	1578	aConstraints.gridx = 0;
..	..	@@ -1350,7 +1581,7 @@
1350	1581	aConstraints.gridy += 1;
1351	1582	aConstraints.gridwidth = 1;
1352	1583	mainPanel.add(objectPanel, aConstraints);
1353		- */
	1584	+ */
1354	1585
1355	1586	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1356	1587	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1362,14 +1593,12 @@
1362	1593	scrollpane.addMouseWheelListener(this); // Default not fast enough
1363	1594
1364	1595	/JTabbedPane/ scenePanel = new cGridBag();
1365		- scenePanel.preferredWidth = 6;
	1596	+ scenePanel.preferredWidth = 5;
1366	1597
1367	1598	JTabbedPane tabbedPane = new JTabbedPane();
1368	1599	tabbedPane.add(scrollpane);
1369	1600
1370		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1371		-
1372		- optionsPanel = new cGridBag().setVertical(true);
	1601	+ optionsPanel = new cGridBag().setVertical(false);
1373	1602
1374	1603	optionsPanel.setName("Options");
1375	1604
..	..	@@ -1377,6 +1606,8 @@
1377	1606
1378	1607	tabbedPane.add(optionsPanel);
1379	1608
	1609	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1610	+
1380	1611	scenePanel.add(tabbedPane);
1381	1612
1382	1613	/*
..	..	@@ -1440,7 +1671,7 @@
1440	1671	bigThree = new cGridBag();
1441	1672	bigThree.addComponent(scenePanel);
1442	1673	bigThree.addComponent(centralPanel);
1443		- bigThree.addComponent(XYZPanel);
	1674	+ //bigThree.addComponent(XYZPanel);
1444	1675
1445	1676	// // SIDE EFFECT!!!
1446	1677	// aConstraints.gridx = 0;
..	..	@@ -1449,9 +1680,9 @@
1449	1680	// aConstraints.gridheight = 1;
1450	1681
1451	1682	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1452		- framePanel.setContinuousLayout(true);
1453		- framePanel.setOneTouchExpandable(true);
1454		- framePanel.setDividerLocation(0.8);
	1683	+ framePanel.setContinuousLayout(false);
	1684	+ framePanel.setOneTouchExpandable(false);
	1685	+ //.setDividerLocation(0.8);
1455	1686	//framePanel.setDividerSize(15);
1456	1687	//framePanel.setResizeWeight(0.15);
1457	1688	framePanel.setName("Frame");
..	..	@@ -1469,16 +1700,18 @@
1469	1700	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1470	1701
1471	1702	frame.setSize(1280, 860);
1472		- frame.setVisible(true);
1473		-
	1703	+
1474	1704	cameraView.requestFocusInWindow();
1475	1705
1476	1706	gridPanel.setDividerLocation(1.0);
	1707	+
	1708	+ frame.validate();
	1709	+
	1710	+ frame.setVisible(true);
1477	1711
1478	1712	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1479	1713	frame.addWindowListener(new WindowAdapter()
1480	1714	{
1481		-
1482	1715	public void windowClosing(WindowEvent e)
1483	1716	{
1484	1717	Close();
..	..	@@ -1540,45 +1773,48 @@
1540	1773	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1541	1774
1542	1775	cGridBag colorSection = new cGridBag().setVertical(true);
	1776	+
	1777	+ cGridBag huepanel = new cGridBag();
	1778	+ cGridBag huelabel = new cGridBag();
	1779	+ huelabel.add(GetLabel("icons/hue.png", false));
	1780	+ huelabel.preferredWidth = 20;
	1781	+ huepanel.add(new cGridBag()); // Label
	1782	+ huepanel.add(huelabel); // Field/slider
	1783	+
	1784	+ huepanel.preferredHeight = 7;
	1785	+
	1786	+ colorSection.add(huepanel);
1543	1787
1544	1788	cGridBag color = new cGridBag();
1545		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1546		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1547		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1789	+
	1790	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1791	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1792	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1793	+
1548	1794	//colorField.preferredWidth = 200;
1549	1795	colorSection.add(color);
1550	1796
1551	1797	cGridBag modulation = new cGridBag();
1552	1798	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1553	1799	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1554		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1800	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1555	1801	colorSection.add(modulation);
1556	1802
	1803	+ cGridBag opacity = new cGridBag();
	1804	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1805	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1806	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1807	+ colorSection.add(opacity);
	1808	+
	1809	+ colorSection.add(GetSeparator());
	1810	+
1557	1811	cGridBag texture = new cGridBag();
1558	1812	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1559	1813	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1560	1814	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1561	1815	colorSection.add(texture);
1562	1816
1563		- cGridBag anisoU = new cGridBag();
1564		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1565		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1566		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1567		- colorSection.add(anisoU);
1568		-
1569		- cGridBag anisoV = new cGridBag();
1570		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1571		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1572		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1573		- colorSection.add(anisoV);
1574		-
1575		- cGridBag shadowbias = new cGridBag();
1576		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1577		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1578		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1579		- colorSection.add(shadowbias);
1580		-
1581		- panel.add(new JSeparator());
	1817	+ panel.add(GetSeparator());
1582	1818
1583	1819	panel.add(colorSection);
1584	1820
..	..	@@ -1628,7 +1864,13 @@
1628	1864	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1629	1865	diffuseSection.add(fakedepth);
1630	1866
1631		- panel.add(new JSeparator());
	1867	+ cGridBag shadowbias = new cGridBag();
	1868	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1869	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1870	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1871	+ diffuseSection.add(shadowbias);
	1872	+
	1873	+ panel.add(GetSeparator());
1632	1874
1633	1875	panel.add(diffuseSection);
1634	1876
..	..	@@ -1678,42 +1920,48 @@
1678	1920	// aConstraints.gridy += 1;
1679	1921	// aConstraints.gridwidth = 1;
1680	1922
	1923	+ cGridBag anisoU = new cGridBag();
	1924	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1925	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1926	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1927	+ specularSection.add(anisoU);
1681	1928
1682		- panel.add(new JSeparator());
	1929	+ cGridBag anisoV = new cGridBag();
	1930	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1931	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1932	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1933	+ specularSection.add(anisoV);
	1934	+
	1935	+
	1936	+ panel.add(GetSeparator());
1683	1937
1684	1938	panel.add(specularSection);
1685	1939
1686	1940	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1687	1941
1688		- cGridBag globalSection = new cGridBag().setVertical(true);
	1942	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1689	1943
1690	1944	cGridBag camera = new cGridBag();
1691	1945	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1692	1946	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1693	1947	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1694		- globalSection.add(camera);
	1948	+ colorSection.add(camera);
1695	1949
1696	1950	cGridBag ambient = new cGridBag();
1697	1951	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1698	1952	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1699	1953	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1700		- globalSection.add(ambient);
	1954	+ colorSection.add(ambient);
1701	1955
1702	1956	cGridBag backlit = new cGridBag();
1703	1957	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1704	1958	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1705	1959	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1706		- globalSection.add(backlit);
	1960	+ colorSection.add(backlit);
1707	1961
1708		- cGridBag opacity = new cGridBag();
1709		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1710		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1711		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1712		- globalSection.add(opacity);
1713		-
1714		- panel.add(new JSeparator());
	1962	+ //panel.add(new JSeparator());
1715	1963
1716		- panel.add(globalSection);
	1964	+ //panel.add(globalSection);
1717	1965
1718	1966	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1719	1967
..	..	@@ -1755,7 +2003,7 @@
1755	2003	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1756	2004	textureSection.add(opacityPower);
1757	2005
1758		- panel.add(new JSeparator());
	2006	+ panel.add(GetSeparator());
1759	2007
1760	2008	panel.add(textureSection);
1761	2009
..	..	@@ -1820,8 +2068,9 @@
1820	2068	// 3D models
1821	2069	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1822	2070	{
1823		- lastConverter = new com.jmex.model.converters.MaxToJme();
1824		- LoadFile(filename, lastConverter);
	2071	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2072	+ //LoadFile(filename, lastConverter);
	2073	+ LoadObjFile(filename); // New 3ds loader
1825	2074	continue;
1826	2075	}
1827	2076	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2547,6 +2796,7 @@
2547	2796	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2548	2797	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2549	2798	}
	2799	+
2550	2800	//cJME.count++;
2551	2801	//cJME.count %= 12;
2552	2802	if (gc)
..	..	@@ -2730,6 +2980,7 @@
2730	2980	}
2731	2981	}
2732	2982	}
	2983	+
2733	2984	cFileSystemPane FSPane;
2734	2985
2735	2986	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2783,11 +3034,14 @@
2783	3034	}
2784	3035	}
2785	3036	}
	3037	+
2786	3038	freezematerial = false;
2787	3039	}
2788	3040
2789	3041	void SetMaterial(Object3D object)
2790	3042	{
	3043	+ latestObject = object;
	3044	+
2791	3045	cMaterial mat = object.material;
2792	3046
2793	3047	if (mat == null)
..	..	@@ -2899,12 +3153,17 @@
2899	3153	// }
2900	3154
2901	3155	/**/
2902		- if (deselect)
	3156	+ if (deselect \|\| child == null)
2903	3157	{
2904	3158	//group.deselectAll();
2905	3159	//freeze = true;
2906	3160	GetTree().clearSelection();
2907	3161	//freeze = false;
	3162	+
	3163	+ if (child == null)
	3164	+ {
	3165	+ return;
	3166	+ }
2908	3167	}
2909	3168
2910	3169	//group.addSelectee(child);
..	..	@@ -2973,7 +3232,7 @@
2973	3232	cameraView.ToggleDL();
2974	3233	cameraView.repaint();
2975	3234	return;
2976		- } else if (event.getSource() == toggleTextureItem)
	3235	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2977	3236	{
2978	3237	cameraView.ToggleTexture();
2979	3238	// june 2013 copy.HardTouch();
..	..	@@ -3012,7 +3271,7 @@
3012	3271	frame.validate();
3013	3272
3014	3273	return;
3015		- } else if (event.getSource() == toggleSwitchItem)
	3274	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
3016	3275	{
3017	3276	cameraView.ToggleSwitch();
3018	3277	cameraView.repaint();
..	..	@@ -3043,7 +3302,7 @@
3043	3302	{
3044	3303	copy.live ^= true;
3045	3304	return;
3046		- } else if (event.getSource() == selectCB)
	3305	+ } else if (event.getSource() == selectableCB)
3047	3306	{
3048	3307	copy.dontselect ^= true;
3049	3308	return;
..	..	@@ -3228,9 +3487,9 @@
3228	3487	{
3229	3488	Close();
3230	3489	//return true;
3231		- } else if (source == loadItem)
	3490	+ } else if (source == openItem)
3232	3491	{
3233		- load();
	3492	+ Open();
3234	3493	//return true;
3235	3494	} else if (source == newItem)
3236	3495	{
..	..	@@ -3255,6 +3514,10 @@
3255	3514	{
3256	3515	generatePOV();
3257	3516	//return true;
	3517	+ } else if (event.getSource() == archiveItem)
	3518	+ {
	3519	+ cTools.Archive(frame);
	3520	+ return;
3258	3521	} else if (source == zBufferItem)
3259	3522	{
3260	3523	try
..	..	@@ -3303,11 +3566,12 @@
3303	3566
3304	3567	static public byte[] Compress(Object3D o)
3305	3568	{
	3569	+ // Slower to actually compress.
3306	3570	try
3307	3571	{
3308	3572	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3309		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3310		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3573	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3574	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3311	3575
3312	3576	Object3D parent = o.parent;
3313	3577	o.parent = null;
..	..	@@ -3318,10 +3582,14 @@
3318	3582
3319	3583	out.flush();
3320	3584
3321		- zstream.close();
	3585	+ baos //zstream
	3586	+ .close();
3322	3587	out.close();
3323	3588
3324		- return baos.toByteArray();
	3589	+ byte[] bytes = baos.toByteArray();
	3590	+
	3591	+ System.out.println("save #bytes = " + bytes.length);
	3592	+ return bytes;
3325	3593	} catch (Exception e)
3326	3594	{
3327	3595	System.err.println(e);
..	..	@@ -3331,13 +3599,16 @@
3331	3599
3332	3600	static public Object Uncompress(byte[] bytes)
3333	3601	{
3334		- System.out.println("#bytes = " + bytes.length);
	3602	+ System.out.println("restore #bytes = " + bytes.length);
3335	3603	try
3336	3604	{
3337	3605	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3338		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3339		- ObjectInputStream in = new ObjectInputStream(istream);
	3606	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3607	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3340	3608	Object obj = in.readObject();
	3609	+
	3610	+ bais //istream
	3611	+ .close();
3341	3612	in.close();
3342	3613
3343	3614	return obj;
..	..	@@ -3392,37 +3663,76 @@
3392	3663	return null;
3393	3664	}
3394	3665
3395		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3396	3666
3397	3667	public void Save()
3398	3668	{
	3669	+ //Save(true);
	3670	+ Replace();
	3671	+ }
	3672	+
	3673	+ private boolean Equal(byte[] compress, byte[] name)
	3674	+ {
	3675	+ if (compress.length != name.length)
	3676	+ {
	3677	+ return false;
	3678	+ }
	3679	+
	3680	+ for (int i=compress.length; --i>=0;)
	3681	+ {
	3682	+ if (compress[i] != name[i])
	3683	+ return false;
	3684	+ }
	3685	+
	3686	+ return true;
	3687	+ }
	3688	+
	3689	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3690	+
	3691	+ public boolean Save(boolean user)
	3692	+ {
	3693	+ System.err.println("Save");
	3694	+
3399	3695	cRadio tab = GetCurrentTab();
3400	3696
3401		- boolean temp = CameraPane.SWITCH;
3402		- CameraPane.SWITCH = false;
	3697	+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace".
3403	3698
3404		- copy.ExtractBigData(hashtable);
	3699	+ boolean thesame = false;
	3700	+
	3701	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3702	+// {
	3703	+// thesame = true;
	3704	+// }
3405	3705
3406	3706	//EditorFrame.m_MainFrame.requestFocusInWindow();
3407		- tab.graphs[tab.undoindex++] = Compress(copy);
3408		-
3409		- copy.RestoreBigData(hashtable);
3410		-
3411		- CameraPane.SWITCH = temp;
3412		-
3413		- //assert(hashtable.isEmpty());
3414		-
3415		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3707	+ if (!thesame)
3416	3708	{
3417		- tab.graphs[i] = null;
	3709	+ //tab.user[tab.versionindex] = user;
	3710	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3711	+
	3712	+ copy.versions[++copy.versionindex] = compress;
	3713	+
	3714	+ // if (increment)
	3715	+ // tab.versionindex++;
3418	3716	}
3419	3717
	3718	+ //copy.RestoreBigData(versiontable);
	3719	+
	3720	+ //assert(hashtable.isEmpty());
	3721	+
	3722	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
	3723	+ {
	3724	+ //tab.user[i] = false;
	3725	+ copy.versions[i] = null;
	3726	+ }
	3727	+
	3728	+ SetUndoStates();
	3729	+
3420	3730	// test save
3421	3731	if (false)
3422	3732	{
3423	3733	try
3424	3734	{
3425		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3735	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3426	3736	ObjectOutputStream p = new ObjectOutputStream(ostream);
3427	3737
3428	3738	p.writeObject(copy);
..	..	@@ -3435,23 +3745,30 @@
3435	3745	e.printStackTrace();
3436	3746	}
3437	3747	}
	3748	+
	3749	+ return !thesame;
3438	3750	}
3439	3751
3440	3752	void CopyChanged(Object3D obj)
3441	3753	{
	3754	+ SetUndoStates();
	3755	+
3442	3756	boolean temp = CameraPane.SWITCH;
3443	3757	CameraPane.SWITCH = false;
3444	3758
3445		- copy.ExtractBigData(hashtable);
	3759	+ copy.ExtractBigData(versiontable);
3446	3760
3447	3761	copy.clear();
3448	3762
	3763	+ copy.skyboxname = obj.skyboxname;
	3764	+ copy.skyboxext = obj.skyboxext;
	3765	+
3449	3766	for (int i=0; i<obj.Size(); i++)
3450	3767	{
3451	3768	copy.add(obj.get(i));
3452	3769	}
3453	3770
3454		- copy.RestoreBigData(hashtable);
	3771	+ copy.RestoreBigData(versiontable);
3455	3772
3456	3773	CameraPane.SWITCH = temp;
3457	3774
..	..	@@ -3478,40 +3795,131 @@
3478	3795	refreshContents();
3479	3796	}
3480	3797
3481		- public void Undo()
	3798	+ cButton undoButton;
	3799	+ cButton restoreButton;
	3800	+ cButton replaceButton;
	3801	+ cButton redoButton;
	3802	+
	3803	+ boolean muteSlider;
	3804	+
	3805	+ int VersionCount()
	3806	+ {
	3807	+ int count = 0;
	3808	+
	3809	+ for (int i = copy.versions.length; --i >= 0;)
	3810	+ {
	3811	+ if (copy.versions[i] != null)
	3812	+ count++;
	3813	+ }
	3814	+
	3815	+ return count;
	3816	+ }
	3817	+
	3818	+ void SetUndoStates()
3482	3819	{
3483	3820	cRadio tab = GetCurrentTab();
3484	3821
3485		- if (tab.undoindex == 0)
	3822	+ restoreButton.setEnabled(copy.versionindex != -1);
	3823	+ replaceButton.setEnabled(copy.versionindex != -1);
	3824	+
	3825	+ undoButton.setEnabled(copy.versionindex > 0);
	3826	+ redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	3827	+
	3828	+ muteSlider = true;
	3829	+ versionSlider.setMaximum(VersionCount() - 1);
	3830	+ versionSlider.setInteger(copy.versionindex);
	3831	+ muteSlider = false;
	3832	+ }
	3833	+
	3834	+ public boolean Undo()
	3835	+ {
	3836	+ // Option?
	3837	+ Replace();
	3838	+
	3839	+ System.err.println("Undo");
	3840	+
	3841	+ cRadio tab = GetCurrentTab();
	3842	+
	3843	+ if (copy.versionindex == 0)
3486	3844	{
3487	3845	java.awt.Toolkit.getDefaultToolkit().beep();
3488		- return;
	3846	+ return false;
3489	3847	}
3490	3848
3491		- if (tab.graphs[tab.undoindex] == null)
	3849	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3850	+// {
	3851	+// if (Save(false))
	3852	+// tab.versionindex -= 1;
	3853	+// else
	3854	+// {
	3855	+// if (tab.versionindex <= 0)
	3856	+// return false;
	3857	+// else
	3858	+// tab.versionindex -= 1;
	3859	+// }
	3860	+// }
	3861	+
	3862	+ copy.versionindex -= 1;
	3863	+
	3864	+ CopyChanged((Object3D)copy.versions[copy.versionindex]);
	3865	+
	3866	+ return true;
	3867	+ }
	3868	+
	3869	+ public boolean Restore()
	3870	+ {
	3871	+ System.err.println("Restore");
	3872	+
	3873	+ cRadio tab = GetCurrentTab();
	3874	+
	3875	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
3492	3876	{
3493		- Save();
3494		- tab.undoindex -= 1;
	3877	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3878	+ return false;
3495	3879	}
3496	3880
3497		- tab.undoindex -= 1;
	3881	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3882	+ CopyChanged(copy.versions[copy.versionindex]);
	3883	+
	3884	+ return true;
	3885	+ }
3498	3886
3499		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3887	+ public boolean Replace()
	3888	+ {
	3889	+ System.err.println("Replace");
	3890	+
	3891	+ cRadio tab = GetCurrentTab();
	3892	+
	3893	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3894	+ {
	3895	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3896	+ return false;
	3897	+ }
	3898	+
	3899	+ copy.versions[copy.versionindex] = CompressCopy();
	3900	+
	3901	+ return true;
3500	3902	}
3501	3903
3502	3904	public void Redo()
3503	3905	{
	3906	+ // Option?
	3907	+ Replace();
	3908	+
3504	3909	cRadio tab = GetCurrentTab();
3505	3910
3506		- if (tab.graphs[tab.undoindex + 1] == null)
	3911	+ if (copy.versions[copy.versionindex + 1] == null)
3507	3912	{
3508	3913	java.awt.Toolkit.getDefaultToolkit().beep();
3509	3914	return;
3510	3915	}
3511	3916
3512		- tab.undoindex += 1;
	3917	+ copy.versionindex += 1;
3513	3918
3514		- CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3919	+ CopyChanged(copy.versions[copy.versionindex]);
	3920	+
	3921	+ //if (!tab.user[tab.versionindex])
	3922	+ // tab.graphs[tab.versionindex] = null;
3515	3923	}
3516	3924
3517	3925	void ImportGFD()
..	..	@@ -3663,7 +4071,7 @@
3663	4071	assert false;
3664	4072	}
3665	4073
3666		- void EditSelection()
	4074	+ void EditSelection(boolean newWindow)
3667	4075	{
3668	4076	}
3669	4077
..	..	@@ -3807,9 +4215,25 @@
3807	4215	//copy.Touch();
3808	4216	}
3809	4217
	4218	+ cNumberSlider versionSlider;
	4219	+
3810	4220	public void stateChanged(ChangeEvent e)
3811	4221	{
3812	4222	// assert(false);
	4223	+ if (e.getSource() == versionSlider)
	4224	+ {
	4225	+ if (muteSlider)
	4226	+ return;
	4227	+
	4228	+ int version = versionSlider.getInteger();
	4229	+
	4230	+ if (copy.versions[version] != null)
	4231	+ {
	4232	+ CopyChanged(copy.versions[copy.versionindex = version]);
	4233	+ }
	4234	+
	4235	+ return;
	4236	+ }
3813	4237
3814	4238	if (freezematerial)
3815	4239	{
..	..	@@ -4158,7 +4582,8 @@
4158	4582
4159	4583	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4160	4584	{
4161		- Save();
	4585	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	4586	+ Save();
4162	4587	//Tween.set(thing, 0).target(1).start(tweenManager);
4163	4588	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
4164	4589	// if (thing instanceof GenericJointDemo)
..	..	@@ -4245,6 +4670,12 @@
4245	4670	{
4246	4671	ResetModel();
4247	4672	Select(thing.GetTreePath(), true, false); // unselect... false);
	4673	+
	4674	+ if (thing.Size() == 0)
	4675	+ {
	4676	+ //EditSelection(false);
	4677	+ }
	4678	+
4248	4679	refreshContents();
4249	4680	}
4250	4681
..	..	@@ -4393,7 +4824,9 @@
4393	4824	readobj.ResetDisplayList();
4394	4825	} catch (Exception e)
4395	4826	{
4396		- //e.printStackTrace();
	4827	+ if (!e.toString().contains("GZIP"))
	4828	+ e.printStackTrace();
	4829	+
4397	4830	try
4398	4831	{
4399	4832	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4467,11 +4900,14 @@
4467	4900
4468	4901	if (readobj != null)
4469	4902	{
4470		- Save();
	4903	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4904	+ // Save();
4471	4905	try
4472	4906	{
4473	4907	//readobj.deepCopySelf(copy);
4474	4908	copy.clear(); // june 2014
	4909	+ copy.skyboxname = readobj.skyboxname;
	4910	+ copy.skyboxext = readobj.skyboxext;
4475	4911	for (int i = 0; i < readobj.size(); i++)
4476	4912	{
4477	4913	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4512,6 +4948,7 @@
4512	4948	}
4513	4949	} catch (ClassCastException e)
4514	4950	{
	4951	+ e.printStackTrace();
4515	4952	assert (false);
4516	4953	Composite c = (Composite) copy;
4517	4954	c.children.clear();
..	..	@@ -4522,13 +4959,24 @@
4522	4959	c.addChild(csg);
4523	4960	}
4524	4961
	4962	+ copy.versions = readobj.versions;
	4963	+ copy.versionindex = readobj.versionindex;
	4964	+
	4965	+ if (copy.versions == null)
	4966	+ {
	4967	+ copy.versions = new Object3D[100];
	4968	+ copy.versionindex = -1;
	4969	+ }
	4970	+
	4971	+ //? SetUndoStates();
	4972	+
4525	4973	ResetModel();
4526	4974	copy.HardTouch(); // recompile?
4527	4975	refreshContents();
4528	4976	}
4529	4977	}
4530	4978
4531		- void load() // throws ClassNotFoundException
	4979	+ void Open() // throws ClassNotFoundException
4532	4980	{
4533	4981	if (Grafreed.standAlone)
4534	4982	{
..	..	@@ -4631,6 +5079,7 @@
4631	5079	//ps.print(buffer.toString());
4632	5080	} catch (IOException e)
4633	5081	{
	5082	+ e.printStackTrace();
4634	5083	}
4635	5084	}
4636	5085
..	..	@@ -4645,6 +5094,8 @@
4645	5094	String filename = browser.getFile();
4646	5095	if (filename != null && filename.length() > 0)
4647	5096	{
	5097	+ if (!filename.endsWith(".gfd"))
	5098	+ filename += ".gfd";
4648	5099	lastname = browser.getDirectory() + filename;
4649	5100	save();
4650	5101	}
..	..	@@ -4811,7 +5262,7 @@
4811	5262	MenuBar menuBar;
4812	5263	Menu fileMenu;
4813	5264	MenuItem newItem;
4814		- MenuItem loadItem;
	5265	+ MenuItem openItem;
4815	5266	MenuItem saveItem;
4816	5267	MenuItem saveAsItem;
4817	5268	MenuItem exportAsItem;
..	..	@@ -4834,22 +5285,36 @@
4834	5285	CheckboxMenuItem toggleSwitchItem;
4835	5286	CheckboxMenuItem toggleRootItem;
4836	5287	CheckboxMenuItem animationItem;
	5288	+ MenuItem archiveItem;
4837	5289	CheckboxMenuItem toggleHandleItem;
4838	5290	CheckboxMenuItem togglePaintItem;
4839	5291	JSplitPane mainPanel;
4840	5292	JScrollPane scrollpane;
	5293	+
4841	5294	JPanel toolbarPanel;
	5295	+
4842	5296	cGridBag treePanel;
	5297	+
4843	5298	JPanel radioPanel;
4844	5299	ButtonGroup buttonGroup;
4845		- cGridBag ctrlPanel;
	5300	+
	5301	+ cGridBag toolboxPanel;
4846	5302	cGridBag materialPanel;
	5303	+ cGridBag ctrlPanel;
	5304	+
4847	5305	JScrollPane infoPanel;
	5306	+
4848	5307	cGridBag optionsPanel;
	5308	+
4849	5309	JTabbedPane objectPanel;
	5310	+ boolean materialFlushed;
	5311	+ Object3D latestObject;
	5312	+
4850	5313	cGridBag XYZPanel;
	5314	+
4851	5315	JSplitPane gridPanel;
4852	5316	JSplitPane bigPanel;
	5317	+
4853	5318	cGridBag bigThree;
4854	5319	cGridBag scenePanel;
4855	5320	cGridBag centralPanel;
..	..	@@ -4964,7 +5429,7 @@
4964	5429	cNumberSlider fogField;
4965	5430	JLabel opacityPowerLabel;
4966	5431	cNumberSlider opacityPowerField;
4967		- JTree jTree;
	5432	+ cTree jTree;
4968	5433	//ObjectUI parent;
4969	5434
4970	5435	cNumberSlider normalpushField;