~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
..	..	@@ -35,6 +39,81 @@
35	39
36	40	GroupEditor callee;
37	41	JFrame frame;
	42	+
	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	+ }
38	117
39	118	// SCRIPT
40	119
..	..	@@ -145,7 +224,7 @@
145	224
146	225	objEditor.ctrlPanel.remove(namePanel);
147	226
148		- if (!GroupEditor.allparams)
	227	+ if (!allparams)
149	228	return;
150	229
151	230	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -169,7 +248,7 @@
169	248
170	249	objEditor.ctrlPanel.remove(setupPanel);
171	250	objEditor.ctrlPanel.remove(setupPanel2);
172		- objEditor.ctrlPanel.remove(commandsPanel);
	251	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
173	252	objEditor.ctrlPanel.remove(pushPanel);
174	253	//objEditor.ctrlPanel.remove(fillPanel);
175	254
..	..	@@ -217,6 +296,12 @@
217	296	client = inClient;
218	297	copy = client;
219	298
	299	+ if (copy.versions == null)
	300	+ {
	301	+ copy.versions = new Object3D[100];
	302	+ copy.versionindex = -1;
	303	+ }
	304	+
220	305	// "this" is not called: SetupUI2(objEditor);
221	306	}
222	307
..	..	@@ -230,6 +315,12 @@
230	315	client = inClient;
231	316	copy = client;
232	317
	318	+ if (copy.versions == null)
	319	+ {
	320	+ copy.versions = new Object3D[100];
	321	+ copy.versionindex = -1;
	322	+ }
	323	+
233	324	SetupUI2(callee.GetEditor());
234	325	}
235	326
..	..	@@ -244,6 +335,7 @@
244	335	//localCopy.parent = null;
245	336
246	337	frame = new JFrame();
	338	+ frame.setUndecorated(false);
247	339	objEditor = this;
248	340	this.callee = callee;
249	341
..	..	@@ -261,6 +353,12 @@
261	353	copy = localCopy;
262	354	copy.editWindow = this;
263	355
	356	+ if (copy.versions == null)
	357	+ {
	358	+// copy.versions = new byte[100][];
	359	+// copy.versionindex = -1;
	360	+ }
	361	+
264	362	SetupMenu();
265	363
266	364	//SetupName(objEditor); // new
..	..	@@ -274,12 +372,17 @@
274	372	return frame.action(event, obj);
275	373	}
276	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	+
277	380	void SetupMenu()
278	381	{
279	382	frame.setMenuBar(menuBar = new MenuBar());
280	383	menuBar.add(fileMenu = new Menu("File"));
281	384	fileMenu.add(newItem = new MenuItem("New"));
282		- fileMenu.add(loadItem = new MenuItem("Open..."));
	385	+ fileMenu.add(openItem = new MenuItem("Open..."));
283	386
284	387	//oe.menuBar.add(menu = new Menu("Include"));
285	388	Menu menu = new Menu("Import");
..	..	@@ -311,7 +414,7 @@
311	414	}
312	415
313	416	newItem.addActionListener(this);
314		- loadItem.addActionListener(this);
	417	+ openItem.addActionListener(this);
315	418	saveItem.addActionListener(this);
316	419	saveAsItem.addActionListener(this);
317	420	exportAsItem.addActionListener(this);
..	..	@@ -320,28 +423,68 @@
320	423	closeItem.addActionListener(this);
321	424
322	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	+
323	452	toolbarPanel = new JPanel();
324	453	toolbarPanel.setName("Toolbar");
	454	+
325	455	treePanel = new cGridBag();
326	456	treePanel.setName("Tree");
	457	+
	458	+ editPanel = new cGridBag().setVertical(true);
	459	+ //editPanel.setName("Edit");
	460	+
327	461	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
328		- 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	+
329	470	materialPanel = new cGridBag().setVertical(true);
330		- materialPanel.setName("Material");
	471	+ //materialPanel.setName("Material");
	472	+
331	473	/JTextPane/
332	474	infoarea = createTextPane();
333	475	doc = infoarea.getStyledDocument();
334	476
335	477	infoarea.setEditable(true);
336	478	SetText();
	479	+
337	480	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
338	481	// infoarea.setOpaque(false);
339	482	// //infoarea.setForeground(textcolor);
340	483	// TEXTAREA infoarea.setLineWrap(true);
341	484	// TEXTAREA infoarea.setWrapStyleWord(true);
342	485	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
343		- infoPanel.setPreferredSize(new Dimension(50, 200));
344		- infoPanel.setName("Info");
	486	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	487	+ //infoPanel.setName("Info");
345	488	//infoPanel.setLayout(new BorderLayout());
346	489	//infoPanel.add(createTextPane());
347	490
..	..	@@ -352,7 +495,14 @@
352	495	mainPanel.setDividerSize(9);
353	496	mainPanel.setDividerLocation(0.5); //1.0);
354	497	mainPanel.setResizeWeight(0.5);
355		-
	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	+
356	506	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
357	507	//mainPanel.setLayout(new GridBagLayout());
358	508	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -583,21 +733,145 @@
583	733	}
584	734	}
585	735
	736	+//static GraphicsDevice device = GraphicsEnvironment
	737	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	738	+
	739	+ Rectangle keeprect;
	740	+ cRadio radio;
	741	+
	742	+cButton keepButton;
	743	+ cButton twoButton; // Full 3D
	744	+ cButton sixButton;
	745	+ cButton threeButton;
	746	+ cButton sevenButton;
	747	+ cButton fourButton; // full panel
	748	+ cButton oneButton; // full XYZ
	749	+ //cButton currentLayout;
	750	+
	751	+ boolean maximized;
	752	+
	753	+ cButton fullscreenLayout;
	754	+
	755	+ void Minimize()
	756	+ {
	757	+ frame.setState(Frame.ICONIFIED);
	758	+ frame.validate();
	759	+ }
	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={}
	764	+ void Maximize()
	765	+ {
	766	+ if (CameraPane.FULLSCREEN)
	767	+ {
	768	+ ToggleFullScreen();
	769	+ }
	770	+
	771	+ if (maximized)
	772	+ {
	773	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	774	+ }
	775	+ else
	776	+ {
	777	+ keeprect = frame.getBounds();
	778	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	779	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	780	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	781	+// frame.setState(Frame.MAXIMIZED_BOTH);
	782	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	783	+ }
	784	+
	785	+ maximized ^= true;
	786	+
	787	+ frame.validate();
	788	+ }
	789	+
	790	+ cButton minButton;
	791	+ cButton maxButton;
	792	+ cButton fullButton;
	793	+
586	794	void ToggleFullScreen()
587	795	{
588		- if (CameraPane.FULLSCREEN)
	796	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	797	+
	798	+ cameraView.ToggleFullScreen();
	799	+
	800	+ if (!CameraPane.FULLSCREEN)
589	801	{
590		- frame.getContentPane().remove(/"Center",/bigThree);
591		- framePanel.add(bigThree);
592		- frame.getContentPane().add(/"Center",/framePanel);
	802	+ device.setFullScreenWindow(null);
	803	+ frame.dispose();
	804	+ frame.setUndecorated(false);
	805	+ frame.validate();
	806	+ frame.setVisible(true);
	807	+
	808	+ //frame.setVisible(false);
	809	+// frame.removeNotify();
	810	+// frame.setUndecorated(false);
	811	+// frame.addNotify();
	812	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	813	+
	814	+// X frame.getContentPane().remove(/"Center",/bigThree);
	815	+// X framePanel.add(bigThree);
	816	+// X frame.getContentPane().add(/"Center",/framePanel);
	817	+ framePanel.setDividerLocation(46);
	818	+
	819	+ //frame.setVisible(true);
	820	+ radio.layout = keepButton;
	821	+ //theFrame = null;
	822	+ keepButton = null;
	823	+ radio.layout.doClick();
	824	+
593	825	} else
594	826	{
595		- frame.getContentPane().remove(/"Center",/framePanel);
596		- framePanel.remove(bigThree);
597		- frame.getContentPane().add(/"Center",/bigThree);
	827	+ keepButton = radio.layout;
	828	+ //keeprect = frame.getBounds();
	829	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	830	+// frame.getToolkit().getScreenSize().height);
	831	+ //frame.setVisible(false);
	832	+
	833	+ frame.dispose();
	834	+ frame.setUndecorated(true);
	835	+ device.setFullScreenWindow(frame);
	836	+ frame.validate();
	837	+ frame.setVisible(true);
	838	+// frame.removeNotify();
	839	+// frame.setUndecorated(true);
	840	+// frame.addNotify();
	841	+// X frame.getContentPane().remove(/"Center",/framePanel);
	842	+// X framePanel.remove(bigThree);
	843	+// X frame.getContentPane().add(/"Center",/bigThree);
	844	+ framePanel.setDividerLocation(0);
	845	+
	846	+ radio.layout = fullscreenLayout;
	847	+ radio.layout.doClick();
	848	+ //frame.setVisible(true);
598	849	}
599		- cameraView.ToggleFullScreen();
	850	+ frame.validate();
600	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	+ }
601	875
602	876	private JTextPane createTextPane()
603	877	{
..	..	@@ -729,7 +1003,7 @@
729	1003	// NumberSlider vDivsField;
730	1004	// JCheckBox endcaps;
731	1005	JCheckBox liveCB;
732		- JCheckBox selectCB;
	1006	+ JCheckBox selectableCB;
733	1007	JCheckBox hideCB;
734	1008	JCheckBox link2masterCB;
735	1009	JCheckBox markCB;
..	..	@@ -737,7 +1011,12 @@
737	1011	JCheckBox speedupCB;
738	1012	JCheckBox rewindCB;
739	1013	JCheckBox flipVCB;
	1014	+
	1015	+ cCheckBox toggleTextureCB;
	1016	+ cCheckBox toggleSwitchCB;
	1017	+
740	1018	JComboBox texresMenu;
	1019	+
741	1020	JButton resetButton;
742	1021	JButton stepButton;
743	1022	JButton stepAllButton;
..	..	@@ -746,10 +1025,13 @@
746	1025	JButton fasterButton;
747	1026	JButton remarkButton;
748	1027
	1028	+ cGridBag editPanel;
	1029	+ cGridBag editCommandsPanel;
	1030	+
749	1031	cGridBag namePanel;
750	1032	cGridBag setupPanel;
751	1033	cGridBag setupPanel2;
752		- cGridBag commandsPanel;
	1034	+ cGridBag objectCommandsPanel;
753	1035	cGridBag pushPanel;
754	1036	cGridBag fillPanel;
755	1037
..	..	@@ -921,38 +1203,42 @@
921	1203	namePanel = new cGridBag();
922	1204
923	1205	nameField = AddText(namePanel, copy.GetName());
924		- namePanel.add(nameField);
	1206	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
925	1207	oe.ctrlPanel.add(namePanel);
926	1208
927	1209	oe.ctrlPanel.Return();
928	1210
929		- if (!GroupEditor.allparams)
	1211	+ if (!allparams)
930	1212	return;
931	1213
932	1214	setupPanel = new cGridBag().setVertical(false);
933	1215
934	1216	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
935	1217	liveCB.setToolTipText("Animate object");
936		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
937		- selectCB.setToolTipText("Make object selectable");
	1218	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1219	+ selectableCB.setToolTipText("Make object selectable");
938	1220	// Return();
	1221	+
939	1222	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
940	1223	hideCB.setToolTipText("Hide object");
941	1224	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
942		- markCB.setToolTipText("Set the animation target transform");
	1225	+ markCB.setToolTipText("As animation target transform");
	1226	+
	1227	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
943	1228
944	1229	setupPanel2 = new cGridBag().setVertical(false);
945	1230
946	1231	rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
947	1232	rewindCB.setToolTipText("Rewind animation");
948	1233
949		- randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
950		- randomCB.setToolTipText("Rewind or Go back and forth randomly");
	1234	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1235	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
951	1236
	1237	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1238	+ link2masterCB.setToolTipText("Attach to support");
	1239	+
952	1240	if (Globals.ADVANCED)
953	1241	{
954		- link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
955		- link2masterCB.setToolTipText("Attach to support");
956	1242	speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
957	1243	speedupCB.setToolTipText("Option motion capture");
958	1244	}
..	..	@@ -962,23 +1248,23 @@
962	1248	oe.ctrlPanel.add(setupPanel2);
963	1249	oe.ctrlPanel.Return();
964	1250
965		- commandsPanel = new cGridBag().setVertical(false);
	1251	+ objectCommandsPanel = new cGridBag().setVertical(false);
966	1252
967		- resetButton = AddButton(commandsPanel, "Reset");
	1253	+ resetButton = AddButton(objectCommandsPanel, "Reset");
968	1254	resetButton.setToolTipText("Jump to frame zero");
969		- stepButton = AddButton(commandsPanel, "Step");
	1255	+ stepButton = AddButton(objectCommandsPanel, "Step");
970	1256	stepButton.setToolTipText("Step one frame");
971	1257	// resetAllButton = AddButton(oe, "Reset All");
972	1258	// stepAllButton = AddButton(oe, "Step All");
973	1259	// Return();
974		- slowerButton = AddButton(commandsPanel, "Slow");
	1260	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
975	1261	slowerButton.setToolTipText("Decrease animation speed");
976		- fasterButton = AddButton(commandsPanel, "Fast");
	1262	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
977	1263	fasterButton.setToolTipText("Increase animation speed");
978		- remarkButton = AddButton(commandsPanel, "Remark");
	1264	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
979	1265	remarkButton.setToolTipText("Set the current transform as the target");
980	1266
981		- oe.ctrlPanel.add(commandsPanel);
	1267	+ oe.ctrlPanel.add(objectCommandsPanel);
982	1268	oe.ctrlPanel.Return();
983	1269
984	1270	pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
..	..	@@ -1184,8 +1470,11 @@
1184	1470	//worldPanel.setName("World");
1185	1471	centralPanel = new cGridBag();
1186	1472	centralPanel.preferredWidth = 20;
1187		- timelinePanel = new JPanel(new BorderLayout());
1188		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1473	+
	1474	+ if (Globals.ADVANCED)
	1475	+ {
	1476	+ timelinePanel = new JPanel(new BorderLayout());
	1477	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1189	1478
1190	1479	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1191	1480	cameraPanel.setContinuousLayout(true);
..	..	@@ -1194,7 +1483,10 @@
1194	1483	// cameraPanel.setDividerSize(9);
1195	1484	cameraPanel.setResizeWeight(1.0);
1196	1485
	1486	+ }
	1487	+
1197	1488	centralPanel.add(cameraView);
	1489	+ centralPanel.setFocusable(true);
1198	1490	//frame.setJMenuBar(timelineMenubar);
1199	1491	//centralPanel.add(timelinePanel);
1200	1492
..	..	@@ -1220,6 +1512,7 @@
1220	1512	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1221	1513	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1222	1514	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1515	+ //XYZPanel.setName("XYZ");
1223	1516
1224	1517	/*
1225	1518	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1257,12 +1550,29 @@
1257	1550	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1258	1551	//tmp.setName("Edit");
1259	1552	objectPanel.add(materialPanel);
	1553	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1554	+ objectPanel.setToolTipTextAt(0, "Material panel");
	1555	+
1260	1556	// JPanel north = new JPanel(new BorderLayout());
1261	1557	// north.setName("Edit");
1262	1558	// north.add(ctrlPanel, BorderLayout.NORTH);
1263	1559	// objectPanel.add(north);
1264		- objectPanel.add(ctrlPanel);
1265		- 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");
1266	1576
1267	1577	/*
1268	1578	aConstraints.gridx = 0;
..	..	@@ -1271,7 +1581,7 @@
1271	1581	aConstraints.gridy += 1;
1272	1582	aConstraints.gridwidth = 1;
1273	1583	mainPanel.add(objectPanel, aConstraints);
1274		- */
	1584	+ */
1275	1585
1276	1586	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1277	1587	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1283,14 +1593,12 @@
1283	1593	scrollpane.addMouseWheelListener(this); // Default not fast enough
1284	1594
1285	1595	/JTabbedPane/ scenePanel = new cGridBag();
1286		- scenePanel.preferredWidth = 6;
	1596	+ scenePanel.preferredWidth = 5;
1287	1597
1288	1598	JTabbedPane tabbedPane = new JTabbedPane();
1289	1599	tabbedPane.add(scrollpane);
1290	1600
1291		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1292		-
1293		- optionsPanel = new cGridBag().setVertical(true);
	1601	+ optionsPanel = new cGridBag().setVertical(false);
1294	1602
1295	1603	optionsPanel.setName("Options");
1296	1604
..	..	@@ -1298,6 +1606,8 @@
1298	1606
1299	1607	tabbedPane.add(optionsPanel);
1300	1608
	1609	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1610	+
1301	1611	scenePanel.add(tabbedPane);
1302	1612
1303	1613	/*
..	..	@@ -1361,7 +1671,7 @@
1361	1671	bigThree = new cGridBag();
1362	1672	bigThree.addComponent(scenePanel);
1363	1673	bigThree.addComponent(centralPanel);
1364		- bigThree.addComponent(XYZPanel);
	1674	+ //bigThree.addComponent(XYZPanel);
1365	1675
1366	1676	// // SIDE EFFECT!!!
1367	1677	// aConstraints.gridx = 0;
..	..	@@ -1370,9 +1680,9 @@
1370	1680	// aConstraints.gridheight = 1;
1371	1681
1372	1682	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1373		- framePanel.setContinuousLayout(true);
1374		- framePanel.setOneTouchExpandable(true);
1375		- framePanel.setDividerLocation(0.8);
	1683	+ framePanel.setContinuousLayout(false);
	1684	+ framePanel.setOneTouchExpandable(false);
	1685	+ //.setDividerLocation(0.8);
1376	1686	//framePanel.setDividerSize(15);
1377	1687	//framePanel.setResizeWeight(0.15);
1378	1688	framePanel.setName("Frame");
..	..	@@ -1390,14 +1700,18 @@
1390	1700	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1391	1701
1392	1702	frame.setSize(1280, 860);
1393		- frame.setVisible(true);
1394		-
	1703	+
	1704	+ cameraView.requestFocusInWindow();
	1705	+
1395	1706	gridPanel.setDividerLocation(1.0);
	1707	+
	1708	+ frame.validate();
	1709	+
	1710	+ frame.setVisible(true);
1396	1711
1397	1712	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1398	1713	frame.addWindowListener(new WindowAdapter()
1399	1714	{
1400		-
1401	1715	public void windowClosing(WindowEvent e)
1402	1716	{
1403	1717	Close();
..	..	@@ -1459,45 +1773,48 @@
1459	1773	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1460	1774
1461	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);
1462	1787
1463	1788	cGridBag color = new cGridBag();
1464		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1465		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1466		- 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	+
1467	1794	//colorField.preferredWidth = 200;
1468	1795	colorSection.add(color);
1469	1796
1470	1797	cGridBag modulation = new cGridBag();
1471	1798	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1472	1799	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1473		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1800	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1474	1801	colorSection.add(modulation);
1475	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	+
1476	1811	cGridBag texture = new cGridBag();
1477	1812	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1478	1813	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1479	1814	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1480	1815	colorSection.add(texture);
1481	1816
1482		- cGridBag anisoU = new cGridBag();
1483		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1484		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1485		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1486		- colorSection.add(anisoU);
1487		-
1488		- cGridBag anisoV = new cGridBag();
1489		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1490		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1491		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1492		- colorSection.add(anisoV);
1493		-
1494		- cGridBag shadowbias = new cGridBag();
1495		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1496		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1497		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1498		- colorSection.add(shadowbias);
1499		-
1500		- panel.add(new JSeparator());
	1817	+ panel.add(GetSeparator());
1501	1818
1502	1819	panel.add(colorSection);
1503	1820
..	..	@@ -1547,7 +1864,13 @@
1547	1864	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1548	1865	diffuseSection.add(fakedepth);
1549	1866
1550		- 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());
1551	1874
1552	1875	panel.add(diffuseSection);
1553	1876
..	..	@@ -1597,42 +1920,48 @@
1597	1920	// aConstraints.gridy += 1;
1598	1921	// aConstraints.gridwidth = 1;
1599	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);
1600	1928
1601		- 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());
1602	1937
1603	1938	panel.add(specularSection);
1604	1939
1605	1940	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1606	1941
1607		- cGridBag globalSection = new cGridBag().setVertical(true);
	1942	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1608	1943
1609	1944	cGridBag camera = new cGridBag();
1610	1945	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1611	1946	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1612	1947	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1613		- globalSection.add(camera);
	1948	+ colorSection.add(camera);
1614	1949
1615	1950	cGridBag ambient = new cGridBag();
1616	1951	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1617	1952	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1618	1953	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1619		- globalSection.add(ambient);
	1954	+ colorSection.add(ambient);
1620	1955
1621	1956	cGridBag backlit = new cGridBag();
1622	1957	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1623	1958	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1624	1959	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1625		- globalSection.add(backlit);
	1960	+ colorSection.add(backlit);
1626	1961
1627		- cGridBag opacity = new cGridBag();
1628		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1629		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1630		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1631		- globalSection.add(opacity);
1632		-
1633		- panel.add(new JSeparator());
	1962	+ //panel.add(new JSeparator());
1634	1963
1635		- panel.add(globalSection);
	1964	+ //panel.add(globalSection);
1636	1965
1637	1966	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1638	1967
..	..	@@ -1674,7 +2003,7 @@
1674	2003	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1675	2004	textureSection.add(opacityPower);
1676	2005
1677		- panel.add(new JSeparator());
	2006	+ panel.add(GetSeparator());
1678	2007
1679	2008	panel.add(textureSection);
1680	2009
..	..	@@ -1739,8 +2068,9 @@
1739	2068	// 3D models
1740	2069	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1741	2070	{
1742		- lastConverter = new com.jmex.model.converters.MaxToJme();
1743		- LoadFile(filename, lastConverter);
	2071	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2072	+ //LoadFile(filename, lastConverter);
	2073	+ LoadObjFile(filename); // New 3ds loader
1744	2074	continue;
1745	2075	}
1746	2076	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2466,6 +2796,7 @@
2466	2796	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2467	2797	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2468	2798	}
	2799	+
2469	2800	//cJME.count++;
2470	2801	//cJME.count %= 12;
2471	2802	if (gc)
..	..	@@ -2649,6 +2980,7 @@
2649	2980	}
2650	2981	}
2651	2982	}
	2983	+
2652	2984	cFileSystemPane FSPane;
2653	2985
2654	2986	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2702,11 +3034,14 @@
2702	3034	}
2703	3035	}
2704	3036	}
	3037	+
2705	3038	freezematerial = false;
2706	3039	}
2707	3040
2708	3041	void SetMaterial(Object3D object)
2709	3042	{
	3043	+ latestObject = object;
	3044	+
2710	3045	cMaterial mat = object.material;
2711	3046
2712	3047	if (mat == null)
..	..	@@ -2818,12 +3153,17 @@
2818	3153	// }
2819	3154
2820	3155	/**/
2821		- if (deselect)
	3156	+ if (deselect \|\| child == null)
2822	3157	{
2823	3158	//group.deselectAll();
2824	3159	//freeze = true;
2825	3160	GetTree().clearSelection();
2826	3161	//freeze = false;
	3162	+
	3163	+ if (child == null)
	3164	+ {
	3165	+ return;
	3166	+ }
2827	3167	}
2828	3168
2829	3169	//group.addSelectee(child);
..	..	@@ -2892,7 +3232,7 @@
2892	3232	cameraView.ToggleDL();
2893	3233	cameraView.repaint();
2894	3234	return;
2895		- } else if (event.getSource() == toggleTextureItem)
	3235	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2896	3236	{
2897	3237	cameraView.ToggleTexture();
2898	3238	// june 2013 copy.HardTouch();
..	..	@@ -2931,7 +3271,7 @@
2931	3271	frame.validate();
2932	3272
2933	3273	return;
2934		- } else if (event.getSource() == toggleSwitchItem)
	3274	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2935	3275	{
2936	3276	cameraView.ToggleSwitch();
2937	3277	cameraView.repaint();
..	..	@@ -2962,7 +3302,7 @@
2962	3302	{
2963	3303	copy.live ^= true;
2964	3304	return;
2965		- } else if (event.getSource() == selectCB)
	3305	+ } else if (event.getSource() == selectableCB)
2966	3306	{
2967	3307	copy.dontselect ^= true;
2968	3308	return;
..	..	@@ -3147,9 +3487,9 @@
3147	3487	{
3148	3488	Close();
3149	3489	//return true;
3150		- } else if (source == loadItem)
	3490	+ } else if (source == openItem)
3151	3491	{
3152		- load();
	3492	+ Open();
3153	3493	//return true;
3154	3494	} else if (source == newItem)
3155	3495	{
..	..	@@ -3174,6 +3514,10 @@
3174	3514	{
3175	3515	generatePOV();
3176	3516	//return true;
	3517	+ } else if (event.getSource() == archiveItem)
	3518	+ {
	3519	+ cTools.Archive(frame);
	3520	+ return;
3177	3521	} else if (source == zBufferItem)
3178	3522	{
3179	3523	try
..	..	@@ -3222,11 +3566,12 @@
3222	3566
3223	3567	static public byte[] Compress(Object3D o)
3224	3568	{
	3569	+ // Slower to actually compress.
3225	3570	try
3226	3571	{
3227	3572	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3228		- java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3229		- ObjectOutputStream out = new ObjectOutputStream(zstream);
	3573	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3574	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3230	3575
3231	3576	Object3D parent = o.parent;
3232	3577	o.parent = null;
..	..	@@ -3237,10 +3582,14 @@
3237	3582
3238	3583	out.flush();
3239	3584
3240		- zstream.close();
	3585	+ baos //zstream
	3586	+ .close();
3241	3587	out.close();
3242	3588
3243		- return baos.toByteArray();
	3589	+ byte[] bytes = baos.toByteArray();
	3590	+
	3591	+ System.out.println("save #bytes = " + bytes.length);
	3592	+ return bytes;
3244	3593	} catch (Exception e)
3245	3594	{
3246	3595	System.err.println(e);
..	..	@@ -3250,13 +3599,16 @@
3250	3599
3251	3600	static public Object Uncompress(byte[] bytes)
3252	3601	{
3253		- System.out.println("#bytes = " + bytes.length);
	3602	+ System.out.println("restore #bytes = " + bytes.length);
3254	3603	try
3255	3604	{
3256	3605	ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3257		- java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3258		- ObjectInputStream in = new ObjectInputStream(istream);
	3606	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3607	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
3259	3608	Object obj = in.readObject();
	3609	+
	3610	+ bais //istream
	3611	+ .close();
3260	3612	in.close();
3261	3613
3262	3614	return obj;
..	..	@@ -3311,37 +3663,76 @@
3311	3663	return null;
3312	3664	}
3313	3665
3314		- java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
3315	3666
3316	3667	public void Save()
3317	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	+
3318	3695	cRadio tab = GetCurrentTab();
3319	3696
3320		- boolean temp = CameraPane.SWITCH;
3321		- CameraPane.SWITCH = false;
	3697	+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace".
3322	3698
3323		- 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	+// }
3324	3705
3325	3706	//EditorFrame.m_MainFrame.requestFocusInWindow();
3326		- tab.graphs[tab.undoindex++] = Compress(copy);
3327		-
3328		- copy.RestoreBigData(hashtable);
3329		-
3330		- CameraPane.SWITCH = temp;
3331		-
3332		- //assert(hashtable.isEmpty());
3333		-
3334		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3707	+ if (!thesame)
3335	3708	{
3336		- 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++;
3337	3716	}
3338	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	+
3339	3730	// test save
3340	3731	if (false)
3341	3732	{
3342	3733	try
3343	3734	{
3344		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3735	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3345	3736	ObjectOutputStream p = new ObjectOutputStream(ostream);
3346	3737
3347	3738	p.writeObject(copy);
..	..	@@ -3354,23 +3745,30 @@
3354	3745	e.printStackTrace();
3355	3746	}
3356	3747	}
	3748	+
	3749	+ return !thesame;
3357	3750	}
3358	3751
3359	3752	void CopyChanged(Object3D obj)
3360	3753	{
	3754	+ SetUndoStates();
	3755	+
3361	3756	boolean temp = CameraPane.SWITCH;
3362	3757	CameraPane.SWITCH = false;
3363	3758
3364		- copy.ExtractBigData(hashtable);
	3759	+ copy.ExtractBigData(versiontable);
3365	3760
3366	3761	copy.clear();
3367	3762
	3763	+ copy.skyboxname = obj.skyboxname;
	3764	+ copy.skyboxext = obj.skyboxext;
	3765	+
3368	3766	for (int i=0; i<obj.Size(); i++)
3369	3767	{
3370	3768	copy.add(obj.get(i));
3371	3769	}
3372	3770
3373		- copy.RestoreBigData(hashtable);
	3771	+ copy.RestoreBigData(versiontable);
3374	3772
3375	3773	CameraPane.SWITCH = temp;
3376	3774
..	..	@@ -3397,40 +3795,131 @@
3397	3795	refreshContents();
3398	3796	}
3399	3797
3400		- 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()
3401	3819	{
3402	3820	cRadio tab = GetCurrentTab();
3403	3821
3404		- 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)
3405	3844	{
3406	3845	java.awt.Toolkit.getDefaultToolkit().beep();
3407		- return;
	3846	+ return false;
3408	3847	}
3409	3848
3410		- 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)
3411	3876	{
3412		- Save();
3413		- tab.undoindex -= 1;
	3877	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3878	+ return false;
3414	3879	}
3415	3880
3416		- tab.undoindex -= 1;
	3881	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3882	+ CopyChanged(copy.versions[copy.versionindex]);
	3883	+
	3884	+ return true;
	3885	+ }
3417	3886
3418		- 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;
3419	3902	}
3420	3903
3421	3904	public void Redo()
3422	3905	{
	3906	+ // Option?
	3907	+ Replace();
	3908	+
3423	3909	cRadio tab = GetCurrentTab();
3424	3910
3425		- if (tab.graphs[tab.undoindex + 1] == null)
	3911	+ if (copy.versions[copy.versionindex + 1] == null)
3426	3912	{
3427	3913	java.awt.Toolkit.getDefaultToolkit().beep();
3428	3914	return;
3429	3915	}
3430	3916
3431		- tab.undoindex += 1;
	3917	+ copy.versionindex += 1;
3432	3918
3433		- 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;
3434	3923	}
3435	3924
3436	3925	void ImportGFD()
..	..	@@ -3582,7 +4071,7 @@
3582	4071	assert false;
3583	4072	}
3584	4073
3585		- void EditSelection()
	4074	+ void EditSelection(boolean newWindow)
3586	4075	{
3587	4076	}
3588	4077
..	..	@@ -3726,9 +4215,25 @@
3726	4215	//copy.Touch();
3727	4216	}
3728	4217
	4218	+ cNumberSlider versionSlider;
	4219	+
3729	4220	public void stateChanged(ChangeEvent e)
3730	4221	{
3731	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	+ }
3732	4237
3733	4238	if (freezematerial)
3734	4239	{
..	..	@@ -4077,7 +4582,8 @@
4077	4582
4078	4583	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4079	4584	{
4080		- Save();
	4585	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	4586	+ Save();
4081	4587	//Tween.set(thing, 0).target(1).start(tweenManager);
4082	4588	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
4083	4589	// if (thing instanceof GenericJointDemo)
..	..	@@ -4164,6 +4670,12 @@
4164	4670	{
4165	4671	ResetModel();
4166	4672	Select(thing.GetTreePath(), true, false); // unselect... false);
	4673	+
	4674	+ if (thing.Size() == 0)
	4675	+ {
	4676	+ //EditSelection(false);
	4677	+ }
	4678	+
4167	4679	refreshContents();
4168	4680	}
4169	4681
..	..	@@ -4312,7 +4824,9 @@
4312	4824	readobj.ResetDisplayList();
4313	4825	} catch (Exception e)
4314	4826	{
4315		- //e.printStackTrace();
	4827	+ if (!e.toString().contains("GZIP"))
	4828	+ e.printStackTrace();
	4829	+
4316	4830	try
4317	4831	{
4318	4832	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4386,11 +4900,14 @@
4386	4900
4387	4901	if (readobj != null)
4388	4902	{
4389		- Save();
	4903	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4904	+ // Save();
4390	4905	try
4391	4906	{
4392	4907	//readobj.deepCopySelf(copy);
4393	4908	copy.clear(); // june 2014
	4909	+ copy.skyboxname = readobj.skyboxname;
	4910	+ copy.skyboxext = readobj.skyboxext;
4394	4911	for (int i = 0; i < readobj.size(); i++)
4395	4912	{
4396	4913	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4431,6 +4948,7 @@
4431	4948	}
4432	4949	} catch (ClassCastException e)
4433	4950	{
	4951	+ e.printStackTrace();
4434	4952	assert (false);
4435	4953	Composite c = (Composite) copy;
4436	4954	c.children.clear();
..	..	@@ -4441,13 +4959,24 @@
4441	4959	c.addChild(csg);
4442	4960	}
4443	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	+
4444	4973	ResetModel();
4445	4974	copy.HardTouch(); // recompile?
4446	4975	refreshContents();
4447	4976	}
4448	4977	}
4449	4978
4450		- void load() // throws ClassNotFoundException
	4979	+ void Open() // throws ClassNotFoundException
4451	4980	{
4452	4981	if (Grafreed.standAlone)
4453	4982	{
..	..	@@ -4550,6 +5079,7 @@
4550	5079	//ps.print(buffer.toString());
4551	5080	} catch (IOException e)
4552	5081	{
	5082	+ e.printStackTrace();
4553	5083	}
4554	5084	}
4555	5085
..	..	@@ -4564,6 +5094,8 @@
4564	5094	String filename = browser.getFile();
4565	5095	if (filename != null && filename.length() > 0)
4566	5096	{
	5097	+ if (!filename.endsWith(".gfd"))
	5098	+ filename += ".gfd";
4567	5099	lastname = browser.getDirectory() + filename;
4568	5100	save();
4569	5101	}
..	..	@@ -4730,7 +5262,7 @@
4730	5262	MenuBar menuBar;
4731	5263	Menu fileMenu;
4732	5264	MenuItem newItem;
4733		- MenuItem loadItem;
	5265	+ MenuItem openItem;
4734	5266	MenuItem saveItem;
4735	5267	MenuItem saveAsItem;
4736	5268	MenuItem exportAsItem;
..	..	@@ -4753,22 +5285,36 @@
4753	5285	CheckboxMenuItem toggleSwitchItem;
4754	5286	CheckboxMenuItem toggleRootItem;
4755	5287	CheckboxMenuItem animationItem;
	5288	+ MenuItem archiveItem;
4756	5289	CheckboxMenuItem toggleHandleItem;
4757	5290	CheckboxMenuItem togglePaintItem;
4758	5291	JSplitPane mainPanel;
4759	5292	JScrollPane scrollpane;
	5293	+
4760	5294	JPanel toolbarPanel;
	5295	+
4761	5296	cGridBag treePanel;
	5297	+
4762	5298	JPanel radioPanel;
4763	5299	ButtonGroup buttonGroup;
4764		- cGridBag ctrlPanel;
	5300	+
	5301	+ cGridBag toolboxPanel;
4765	5302	cGridBag materialPanel;
	5303	+ cGridBag ctrlPanel;
	5304	+
4766	5305	JScrollPane infoPanel;
	5306	+
4767	5307	cGridBag optionsPanel;
	5308	+
4768	5309	JTabbedPane objectPanel;
	5310	+ boolean materialFlushed;
	5311	+ Object3D latestObject;
	5312	+
4769	5313	cGridBag XYZPanel;
	5314	+
4770	5315	JSplitPane gridPanel;
4771	5316	JSplitPane bigPanel;
	5317	+
4772	5318	cGridBag bigThree;
4773	5319	cGridBag scenePanel;
4774	5320	cGridBag centralPanel;
..	..	@@ -4883,7 +5429,7 @@
4883	5429	cNumberSlider fogField;
4884	5430	JLabel opacityPowerLabel;
4885	5431	cNumberSlider opacityPowerField;
4886		- JTree jTree;
	5432	+ cTree jTree;
4887	5433	//ObjectUI parent;
4888	5434
4889	5435	cNumberSlider normalpushField;