~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,53 @@
35	39
36	40	GroupEditor callee;
37	41	JFrame frame;
	42	+
	43	+ static ObjEditor theFrame;
	44	+
	45	+ cButton GetButton(String name, boolean border)
	46	+ {
	47	+ ImageIcon icon = GetIcon(name);
	48	+ return new cButton(icon, border);
	49	+ }
	50	+
	51	+ cToggleButton GetToggleButton(String name, boolean border)
	52	+ {
	53	+ ImageIcon icon = GetIcon(name);
	54	+ return new cToggleButton(icon, border);
	55	+ }
	56	+
	57	+ cCheckBox GetCheckBox(String name, boolean border)
	58	+ {
	59	+ ImageIcon icon = GetIcon(name);
	60	+ return new cCheckBox(icon, border);
	61	+ }
	62	+
	63	+ ImageIcon GetIcon(String name)
	64	+ {
	65	+ try
	66	+ {
	67	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	68	+
	69	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	70	+// {
	71	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	72	+// Graphics2D g = resized.createGraphics();
	73	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	74	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	75	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	76	+// g.dispose();
	77	+//
	78	+// image = resized;
	79	+// }
	80	+
	81	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	82	+ return icon;
	83	+ }
	84	+ catch (Exception e)
	85	+ {
	86	+ return null;
	87	+ }
	88	+ }
38	89
39	90	// SCRIPT
40	91
..	..	@@ -145,7 +196,7 @@
145	196
146	197	objEditor.ctrlPanel.remove(namePanel);
147	198
148		- if (!GroupEditor.allparams)
	199	+ if (!allparams)
149	200	return;
150	201
151	202	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -168,7 +219,8 @@
168	219	// objEditor.ctrlPanel.remove(remarkButton);
169	220
170	221	objEditor.ctrlPanel.remove(setupPanel);
171		- objEditor.ctrlPanel.remove(commandsPanel);
	222	+ objEditor.ctrlPanel.remove(setupPanel2);
	223	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
172	224	objEditor.ctrlPanel.remove(pushPanel);
173	225	//objEditor.ctrlPanel.remove(fillPanel);
174	226
..	..	@@ -216,6 +268,12 @@
216	268	client = inClient;
217	269	copy = client;
218	270
	271	+ if (copy.versions == null)
	272	+ {
	273	+ copy.versions = new byte[100][];
	274	+ copy.versionindex = -1;
	275	+ }
	276	+
219	277	// "this" is not called: SetupUI2(objEditor);
220	278	}
221	279
..	..	@@ -229,6 +287,12 @@
229	287	client = inClient;
230	288	copy = client;
231	289
	290	+ if (copy.versions == null)
	291	+ {
	292	+ copy.versions = new byte[100][];
	293	+ copy.versionindex = -1;
	294	+ }
	295	+
232	296	SetupUI2(callee.GetEditor());
233	297	}
234	298
..	..	@@ -243,6 +307,7 @@
243	307	//localCopy.parent = null;
244	308
245	309	frame = new JFrame();
	310	+ frame.setUndecorated(false);
246	311	objEditor = this;
247	312	this.callee = callee;
248	313
..	..	@@ -260,6 +325,12 @@
260	325	copy = localCopy;
261	326	copy.editWindow = this;
262	327
	328	+ if (copy.versions == null)
	329	+ {
	330	+// copy.versions = new byte[100][];
	331	+// copy.versionindex = -1;
	332	+ }
	333	+
263	334	SetupMenu();
264	335
265	336	//SetupName(objEditor); // new
..	..	@@ -273,12 +344,17 @@
273	344	return frame.action(event, obj);
274	345	}
275	346
	347	+ // Cannot work without static
	348	+ static boolean allparams = true;
	349	+
	350	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	351	+
276	352	void SetupMenu()
277	353	{
278	354	frame.setMenuBar(menuBar = new MenuBar());
279	355	menuBar.add(fileMenu = new Menu("File"));
280	356	fileMenu.add(newItem = new MenuItem("New"));
281		- fileMenu.add(loadItem = new MenuItem("Load..."));
	357	+ fileMenu.add(openItem = new MenuItem("Open..."));
282	358
283	359	//oe.menuBar.add(menu = new Menu("Include"));
284	360	Menu menu = new Menu("Import");
..	..	@@ -310,7 +386,7 @@
310	386	}
311	387
312	388	newItem.addActionListener(this);
313		- loadItem.addActionListener(this);
	389	+ openItem.addActionListener(this);
314	390	saveItem.addActionListener(this);
315	391	saveAsItem.addActionListener(this);
316	392	exportAsItem.addActionListener(this);
..	..	@@ -319,28 +395,68 @@
319	395	closeItem.addActionListener(this);
320	396
321	397	objectPanel = new JTabbedPane();
	398	+
	399	+ ChangeListener changeListener = new ChangeListener()
	400	+ {
	401	+ public void stateChanged(ChangeEvent changeEvent)
	402	+ {
	403	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	404	+// {
	405	+// if (latestObject != null)
	406	+// {
	407	+// refreshContents(true);
	408	+// SetMaterial(latestObject);
	409	+// }
	410	+//
	411	+// materialFlushed = true;
	412	+// }
	413	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	414	+// {
	415	+// if (listUI.size() == 0)
	416	+// EditSelection(false);
	417	+// }
	418	+
	419	+ refreshContents(false); // To refresh Info tab
	420	+ }
	421	+ };
	422	+ objectPanel.addChangeListener(changeListener);
	423	+
322	424	toolbarPanel = new JPanel();
323	425	toolbarPanel.setName("Toolbar");
	426	+
324	427	treePanel = new cGridBag();
325	428	treePanel.setName("Tree");
	429	+
	430	+ editPanel = new cGridBag().setVertical(true);
	431	+ //editPanel.setName("Edit");
	432	+
326	433	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
327		- ctrlPanel.setName("Edit");
	434	+
	435	+ editCommandsPanel = new cGridBag();
	436	+ editPanel.add(editCommandsPanel);
	437	+ editPanel.add(ctrlPanel);
	438	+
	439	+ toolboxPanel = new cGridBag().setVertical(true);
	440	+ //toolboxPanel.setName("Toolbox");
	441	+
328	442	materialPanel = new cGridBag().setVertical(true);
329		- materialPanel.setName("Material");
	443	+ //materialPanel.setName("Material");
	444	+
330	445	/JTextPane/
331	446	infoarea = createTextPane();
332	447	doc = infoarea.getStyledDocument();
333	448
334	449	infoarea.setEditable(true);
335	450	SetText();
	451	+
336	452	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
337	453	// infoarea.setOpaque(false);
338	454	// //infoarea.setForeground(textcolor);
339	455	// TEXTAREA infoarea.setLineWrap(true);
340	456	// TEXTAREA infoarea.setWrapStyleWord(true);
341	457	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
342		- infoPanel.setPreferredSize(new Dimension(50, 200));
343		- infoPanel.setName("Info");
	458	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	459	+ //infoPanel.setName("Info");
344	460	//infoPanel.setLayout(new BorderLayout());
345	461	//infoPanel.add(createTextPane());
346	462
..	..	@@ -351,7 +467,14 @@
351	467	mainPanel.setDividerSize(9);
352	468	mainPanel.setDividerLocation(0.5); //1.0);
353	469	mainPanel.setResizeWeight(0.5);
354		-
	470	+
	471	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	472	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	473	+ divider.setDividerSize(15);
	474	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	475	+
	476	+ mainPanel.setUI(new BasicSplitPaneUI());
	477	+
355	478	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
356	479	//mainPanel.setLayout(new GridBagLayout());
357	480	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -419,10 +542,10 @@
419	542	e.printStackTrace();
420	543	}
421	544
422		- String selection = infoarea.getText();
423		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
424		- java.awt.datatransfer.Clipboard clipboard =
425		- Toolkit.getDefaultToolkit().getSystemClipboard();
	545	+// String selection = infoarea.getText();
	546	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	547	+// java.awt.datatransfer.Clipboard clipboard =
	548	+// Toolkit.getDefaultToolkit().getSystemClipboard();
426	549	//clipboard.setContents(data, data);
427	550	}
428	551
..	..	@@ -582,21 +705,144 @@
582	705	}
583	706	}
584	707
	708	+//static GraphicsDevice device = GraphicsEnvironment
	709	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	710	+
	711	+ Rectangle keeprect;
	712	+ cRadio radio;
	713	+
	714	+cButton keepButton;
	715	+ cButton twoButton; // Full 3D
	716	+ cButton sixButton;
	717	+ cButton threeButton;
	718	+ cButton sevenButton;
	719	+ cButton fourButton; // full panel
	720	+ cButton oneButton; // full XYZ
	721	+ //cButton currentLayout;
	722	+
	723	+ boolean maximized;
	724	+
	725	+ cButton fullscreenLayout;
	726	+
	727	+ void Minimize()
	728	+ {
	729	+ frame.setState(Frame.ICONIFIED);
	730	+ frame.validate();
	731	+ }
	732	+
	733	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	734	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	735	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	736	+ void Maximize()
	737	+ {
	738	+ if (CameraPane.FULLSCREEN)
	739	+ {
	740	+ ToggleFullScreen();
	741	+ }
	742	+
	743	+ if (maximized)
	744	+ {
	745	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	746	+ }
	747	+ else
	748	+ {
	749	+ keeprect = frame.getBounds();
	750	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	751	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	752	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	753	+// frame.setState(Frame.MAXIMIZED_BOTH);
	754	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	755	+ }
	756	+
	757	+ maximized ^= true;
	758	+
	759	+ frame.validate();
	760	+ }
	761	+
	762	+ cButton minButton;
	763	+ cButton maxButton;
	764	+ cButton fullButton;
	765	+
585	766	void ToggleFullScreen()
586	767	{
587		- if (CameraPane.FULLSCREEN)
	768	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	769	+
	770	+ cameraView.ToggleFullScreen();
	771	+
	772	+ if (!CameraPane.FULLSCREEN)
588	773	{
589		- frame.getContentPane().remove(/"Center",/bigThree);
590		- framePanel.add(bigThree);
591		- frame.getContentPane().add(/"Center",/framePanel);
	774	+ device.setFullScreenWindow(null);
	775	+ frame.dispose();
	776	+ frame.setUndecorated(false);
	777	+ frame.validate();
	778	+ frame.setVisible(true);
	779	+
	780	+ //frame.setVisible(false);
	781	+// frame.removeNotify();
	782	+// frame.setUndecorated(false);
	783	+// frame.addNotify();
	784	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	785	+
	786	+// X frame.getContentPane().remove(/"Center",/bigThree);
	787	+// X framePanel.add(bigThree);
	788	+// X frame.getContentPane().add(/"Center",/framePanel);
	789	+ framePanel.setDividerLocation(46);
	790	+
	791	+ //frame.setVisible(true);
	792	+ radio.layout = keepButton;
	793	+ //theFrame = null;
	794	+ keepButton = null;
	795	+ radio.layout.doClick();
	796	+
592	797	} else
593	798	{
594		- frame.getContentPane().remove(/"Center",/framePanel);
595		- framePanel.remove(bigThree);
596		- frame.getContentPane().add(/"Center",/bigThree);
	799	+ keepButton = radio.layout;
	800	+ //keeprect = frame.getBounds();
	801	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	802	+// frame.getToolkit().getScreenSize().height);
	803	+ //frame.setVisible(false);
	804	+
	805	+ frame.dispose();
	806	+ frame.setUndecorated(true);
	807	+ device.setFullScreenWindow(frame);
	808	+ frame.validate();
	809	+ frame.setVisible(true);
	810	+// frame.removeNotify();
	811	+// frame.setUndecorated(true);
	812	+// frame.addNotify();
	813	+// X frame.getContentPane().remove(/"Center",/framePanel);
	814	+// X framePanel.remove(bigThree);
	815	+// X frame.getContentPane().add(/"Center",/bigThree);
	816	+ framePanel.setDividerLocation(0);
	817	+
	818	+ radio.layout = fullscreenLayout;
	819	+ radio.layout.doClick();
	820	+ //frame.setVisible(true);
597	821	}
598		- cameraView.ToggleFullScreen();
	822	+ frame.validate();
599	823	}
	824	+
	825	+ private byte[] CompressCopy()
	826	+ {
	827	+ boolean temp = CameraPane.SWITCH;
	828	+ CameraPane.SWITCH = false;
	829	+
	830	+ copy.ExtractBigData(versiontable);
	831	+ // if (copy == client)
	832	+
	833	+ byte[] versions[] = copy.versions;
	834	+ copy.versions = null;
	835	+
	836	+ byte[] compress = Compress(copy);
	837	+
	838	+ copy.versions = versions;
	839	+
	840	+ copy.RestoreBigData(versiontable);
	841	+
	842	+ CameraPane.SWITCH = temp;
	843	+
	844	+ return compress;
	845	+ }
600	846
601	847	private JTextPane createTextPane()
602	848	{
..	..	@@ -728,7 +974,7 @@
728	974	// NumberSlider vDivsField;
729	975	// JCheckBox endcaps;
730	976	JCheckBox liveCB;
731		- JCheckBox selectCB;
	977	+ JCheckBox selectableCB;
732	978	JCheckBox hideCB;
733	979	JCheckBox link2masterCB;
734	980	JCheckBox markCB;
..	..	@@ -736,7 +982,12 @@
736	982	JCheckBox speedupCB;
737	983	JCheckBox rewindCB;
738	984	JCheckBox flipVCB;
	985	+
	986	+ cCheckBox toggleTextureCB;
	987	+ cCheckBox toggleSwitchCB;
	988	+
739	989	JComboBox texresMenu;
	990	+
740	991	JButton resetButton;
741	992	JButton stepButton;
742	993	JButton stepAllButton;
..	..	@@ -745,9 +996,13 @@
745	996	JButton fasterButton;
746	997	JButton remarkButton;
747	998
	999	+ cGridBag editPanel;
	1000	+ cGridBag editCommandsPanel;
	1001	+
748	1002	cGridBag namePanel;
749	1003	cGridBag setupPanel;
750		- cGridBag commandsPanel;
	1004	+ cGridBag setupPanel2;
	1005	+ cGridBag objectCommandsPanel;
751	1006	cGridBag pushPanel;
752	1007	cGridBag fillPanel;
753	1008
..	..	@@ -919,60 +1174,68 @@
919	1174	namePanel = new cGridBag();
920	1175
921	1176	nameField = AddText(namePanel, copy.GetName());
922		- namePanel.add(nameField);
	1177	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
923	1178	oe.ctrlPanel.add(namePanel);
924	1179
925	1180	oe.ctrlPanel.Return();
926	1181
927		- if (!GroupEditor.allparams)
	1182	+ if (!allparams)
928	1183	return;
929	1184
930	1185	setupPanel = new cGridBag().setVertical(false);
931	1186
932	1187	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
933	1188	liveCB.setToolTipText("Animate object");
934		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
935		- selectCB.setToolTipText("Make object selectable");
	1189	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1190	+ selectableCB.setToolTipText("Make object selectable");
936	1191	// Return();
	1192	+
937	1193	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
938	1194	hideCB.setToolTipText("Hide object");
939	1195	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
940		- markCB.setToolTipText("Set the animation target transform");
	1196	+ markCB.setToolTipText("As animation target transform");
941	1197
942		- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	1198	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1199	+
	1200	+ setupPanel2 = new cGridBag().setVertical(false);
	1201	+
	1202	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
943	1203	rewindCB.setToolTipText("Rewind animation");
944	1204
945		- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
946		- randomCB.setToolTipText("Option for switch node");
	1205	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1206	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
947	1207
	1208	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1209	+ link2masterCB.setToolTipText("Attach to support");
	1210	+
948	1211	if (Globals.ADVANCED)
949	1212	{
950		- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
951		- link2masterCB.setToolTipText("Attach to support");
952		- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1213	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
953	1214	speedupCB.setToolTipText("Option motion capture");
954	1215	}
955	1216
956	1217	oe.ctrlPanel.add(setupPanel);
957	1218	oe.ctrlPanel.Return();
	1219	+ oe.ctrlPanel.add(setupPanel2);
	1220	+ oe.ctrlPanel.Return();
958	1221
959		- commandsPanel = new cGridBag().setVertical(false);
	1222	+ objectCommandsPanel = new cGridBag().setVertical(false);
960	1223
961		- resetButton = AddButton(commandsPanel, "Reset");
	1224	+ resetButton = AddButton(objectCommandsPanel, "Reset");
962	1225	resetButton.setToolTipText("Jump to frame zero");
963		- stepButton = AddButton(commandsPanel, "Step");
	1226	+ stepButton = AddButton(objectCommandsPanel, "Step");
964	1227	stepButton.setToolTipText("Step one frame");
965	1228	// resetAllButton = AddButton(oe, "Reset All");
966	1229	// stepAllButton = AddButton(oe, "Step All");
967	1230	// Return();
968		- slowerButton = AddButton(commandsPanel, "Slow");
	1231	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
969	1232	slowerButton.setToolTipText("Decrease animation speed");
970		- fasterButton = AddButton(commandsPanel, "Fast");
	1233	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
971	1234	fasterButton.setToolTipText("Increase animation speed");
972		- remarkButton = AddButton(commandsPanel, "Remark");
	1235	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
973	1236	remarkButton.setToolTipText("Set the current transform as the target");
974	1237
975		- oe.ctrlPanel.add(commandsPanel);
	1238	+ oe.ctrlPanel.add(objectCommandsPanel);
976	1239	oe.ctrlPanel.Return();
977	1240
978	1241	pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
..	..	@@ -1178,8 +1441,11 @@
1178	1441	//worldPanel.setName("World");
1179	1442	centralPanel = new cGridBag();
1180	1443	centralPanel.preferredWidth = 20;
1181		- timelinePanel = new JPanel(new BorderLayout());
1182		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1444	+
	1445	+ if (Globals.ADVANCED)
	1446	+ {
	1447	+ timelinePanel = new JPanel(new BorderLayout());
	1448	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1183	1449
1184	1450	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1185	1451	cameraPanel.setContinuousLayout(true);
..	..	@@ -1188,7 +1454,10 @@
1188	1454	// cameraPanel.setDividerSize(9);
1189	1455	cameraPanel.setResizeWeight(1.0);
1190	1456
	1457	+ }
	1458	+
1191	1459	centralPanel.add(cameraView);
	1460	+ centralPanel.setFocusable(true);
1192	1461	//frame.setJMenuBar(timelineMenubar);
1193	1462	//centralPanel.add(timelinePanel);
1194	1463
..	..	@@ -1214,6 +1483,7 @@
1214	1483	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1215	1484	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1216	1485	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1486	+ //XYZPanel.setName("XYZ");
1217	1487
1218	1488	/*
1219	1489	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1251,12 +1521,23 @@
1251	1521	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1252	1522	//tmp.setName("Edit");
1253	1523	objectPanel.add(materialPanel);
	1524	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1254	1525	// JPanel north = new JPanel(new BorderLayout());
1255	1526	// north.setName("Edit");
1256	1527	// north.add(ctrlPanel, BorderLayout.NORTH);
1257	1528	// objectPanel.add(north);
1258		- objectPanel.add(ctrlPanel);
1259		- objectPanel.add(infoPanel);
	1529	+ objectPanel.add(editPanel);
	1530	+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1531	+
	1532	+ //if (Globals.ADVANCED)
	1533	+ objectPanel.add(infoPanel);
	1534	+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1535	+
	1536	+ objectPanel.add(XYZPanel);
	1537	+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
	1538	+
	1539	+ objectPanel.add(toolboxPanel);
	1540	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1260	1541
1261	1542	/*
1262	1543	aConstraints.gridx = 0;
..	..	@@ -1265,7 +1546,7 @@
1265	1546	aConstraints.gridy += 1;
1266	1547	aConstraints.gridwidth = 1;
1267	1548	mainPanel.add(objectPanel, aConstraints);
1268		- */
	1549	+ */
1269	1550
1270	1551	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1271	1552	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1277,14 +1558,12 @@
1277	1558	scrollpane.addMouseWheelListener(this); // Default not fast enough
1278	1559
1279	1560	/JTabbedPane/ scenePanel = new cGridBag();
1280		- scenePanel.preferredWidth = 6;
	1561	+ scenePanel.preferredWidth = 5;
1281	1562
1282	1563	JTabbedPane tabbedPane = new JTabbedPane();
1283	1564	tabbedPane.add(scrollpane);
1284	1565
1285		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1286		-
1287		- optionsPanel = new cGridBag().setVertical(true);
	1566	+ optionsPanel = new cGridBag().setVertical(false);
1288	1567
1289	1568	optionsPanel.setName("Options");
1290	1569
..	..	@@ -1292,6 +1571,8 @@
1292	1571
1293	1572	tabbedPane.add(optionsPanel);
1294	1573
	1574	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1575	+
1295	1576	scenePanel.add(tabbedPane);
1296	1577
1297	1578	/*
..	..	@@ -1353,9 +1634,9 @@
1353	1634	/**/
1354	1635
1355	1636	bigThree = new cGridBag();
1356		- bigThree.addComponent(scenePanel);
1357	1637	bigThree.addComponent(centralPanel);
1358		- bigThree.addComponent(XYZPanel);
	1638	+ bigThree.addComponent(scenePanel);
	1639	+ //bigThree.addComponent(XYZPanel);
1359	1640
1360	1641	// // SIDE EFFECT!!!
1361	1642	// aConstraints.gridx = 0;
..	..	@@ -1364,9 +1645,9 @@
1364	1645	// aConstraints.gridheight = 1;
1365	1646
1366	1647	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1367		- framePanel.setContinuousLayout(true);
1368		- framePanel.setOneTouchExpandable(true);
1369		- framePanel.setDividerLocation(0.8);
	1648	+ framePanel.setContinuousLayout(false);
	1649	+ framePanel.setOneTouchExpandable(false);
	1650	+ //.setDividerLocation(0.8);
1370	1651	//framePanel.setDividerSize(15);
1371	1652	//framePanel.setResizeWeight(0.15);
1372	1653	framePanel.setName("Frame");
..	..	@@ -1384,9 +1665,14 @@
1384	1665	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1385	1666
1386	1667	frame.setSize(1280, 860);
1387		- frame.setVisible(true);
1388		-
	1668	+
	1669	+ cameraView.requestFocusInWindow();
	1670	+
1389	1671	gridPanel.setDividerLocation(1.0);
	1672	+
	1673	+ frame.validate();
	1674	+
	1675	+ frame.setVisible(true);
1390	1676
1391	1677	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1392	1678	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1473,24 +1759,6 @@
1473	1759	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1474	1760	colorSection.add(texture);
1475	1761
1476		- cGridBag anisoU = new cGridBag();
1477		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1478		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1479		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1480		- colorSection.add(anisoU);
1481		-
1482		- cGridBag anisoV = new cGridBag();
1483		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1484		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1485		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1486		- colorSection.add(anisoV);
1487		-
1488		- cGridBag shadowbias = new cGridBag();
1489		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1490		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1491		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1492		- colorSection.add(shadowbias);
1493		-
1494	1762	panel.add(new JSeparator());
1495	1763
1496	1764	panel.add(colorSection);
..	..	@@ -1540,6 +1808,12 @@
1540	1808	fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1541	1809	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1542	1810	diffuseSection.add(fakedepth);
	1811	+
	1812	+ cGridBag shadowbias = new cGridBag();
	1813	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1814	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1815	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1816	+ diffuseSection.add(shadowbias);
1543	1817
1544	1818	panel.add(new JSeparator());
1545	1819
..	..	@@ -1591,6 +1865,18 @@
1591	1865	// aConstraints.gridy += 1;
1592	1866	// aConstraints.gridwidth = 1;
1593	1867
	1868	+ cGridBag anisoU = new cGridBag();
	1869	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1870	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1871	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1872	+ specularSection.add(anisoU);
	1873	+
	1874	+ cGridBag anisoV = new cGridBag();
	1875	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1876	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1877	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1878	+ specularSection.add(anisoV);
	1879	+
1594	1880
1595	1881	panel.add(new JSeparator());
1596	1882
..	..	@@ -1598,35 +1884,35 @@
1598	1884
1599	1885	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1600	1886
1601		- cGridBag globalSection = new cGridBag().setVertical(true);
	1887	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1602	1888
1603	1889	cGridBag camera = new cGridBag();
1604	1890	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1605	1891	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1606	1892	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1607		- globalSection.add(camera);
	1893	+ colorSection.add(camera);
1608	1894
1609	1895	cGridBag ambient = new cGridBag();
1610	1896	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1611	1897	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1612	1898	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1613		- globalSection.add(ambient);
	1899	+ colorSection.add(ambient);
1614	1900
1615	1901	cGridBag backlit = new cGridBag();
1616	1902	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1617	1903	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1618	1904	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1619		- globalSection.add(backlit);
	1905	+ colorSection.add(backlit);
1620	1906
1621	1907	cGridBag opacity = new cGridBag();
1622	1908	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1623	1909	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1624	1910	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1625		- globalSection.add(opacity);
	1911	+ colorSection.add(opacity);
1626	1912
1627		- panel.add(new JSeparator());
	1913	+ //panel.add(new JSeparator());
1628	1914
1629		- panel.add(globalSection);
	1915	+ //panel.add(globalSection);
1630	1916
1631	1917	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1632	1918
..	..	@@ -1733,8 +2019,9 @@
1733	2019	// 3D models
1734	2020	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1735	2021	{
1736		- lastConverter = new com.jmex.model.converters.MaxToJme();
1737		- LoadFile(filename, lastConverter);
	2022	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2023	+ //LoadFile(filename, lastConverter);
	2024	+ LoadObjFile(filename); // New 3ds loader
1738	2025	continue;
1739	2026	}
1740	2027	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1935,6 +2222,7 @@
1935	2222	e2.printStackTrace();
1936	2223	}
1937	2224	}
	2225	+
1938	2226	LoadJMEThread loadThread;
1939	2227
1940	2228	class LoadJMEThread extends Thread
..	..	@@ -1992,6 +2280,7 @@
1992	2280	//LoadFile0(filename, converter);
1993	2281	}
1994	2282	}
	2283	+
1995	2284	LoadOBJThread loadObjThread;
1996	2285
1997	2286	class LoadOBJThread extends Thread
..	..	@@ -2070,19 +2359,19 @@
2070	2359
2071	2360	void LoadObjFile(String fullname)
2072	2361	{
2073		- /*
	2362	+ System.out.println("Loading " + fullname);
	2363	+ /**/
2074	2364	//lastFilename = fullname;
2075	2365	if(loadObjThread == null)
2076	2366	{
2077		- loadObjThread = new LoadOBJThread();
2078		- loadObjThread.start();
	2367	+ loadObjThread = new LoadOBJThread();
	2368	+ loadObjThread.start();
2079	2369	}
2080	2370
2081	2371	loadObjThread.add(fullname);
2082		- */
	2372	+ /**/
2083	2373
2084		- System.out.println("Loading " + fullname);
2085		- makeSomething(new FileObject(fullname, true), true);
	2374	+ //makeSomething(new FileObject(fullname, true), true);
2086	2375	}
2087	2376
2088	2377	void LoadGFDFile(String fullname)
..	..	@@ -2458,6 +2747,7 @@
2458	2747	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2459	2748	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2460	2749	}
	2750	+
2461	2751	//cJME.count++;
2462	2752	//cJME.count %= 12;
2463	2753	if (gc)
..	..	@@ -2641,6 +2931,7 @@
2641	2931	}
2642	2932	}
2643	2933	}
	2934	+
2644	2935	cFileSystemPane FSPane;
2645	2936
2646	2937	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2694,11 +2985,14 @@
2694	2985	}
2695	2986	}
2696	2987	}
	2988	+
2697	2989	freezematerial = false;
2698	2990	}
2699	2991
2700	2992	void SetMaterial(Object3D object)
2701	2993	{
	2994	+ latestObject = object;
	2995	+
2702	2996	cMaterial mat = object.material;
2703	2997
2704	2998	if (mat == null)
..	..	@@ -2810,12 +3104,17 @@
2810	3104	// }
2811	3105
2812	3106	/**/
2813		- if (deselect)
	3107	+ if (deselect \|\| child == null)
2814	3108	{
2815	3109	//group.deselectAll();
2816	3110	//freeze = true;
2817	3111	GetTree().clearSelection();
2818	3112	//freeze = false;
	3113	+
	3114	+ if (child == null)
	3115	+ {
	3116	+ return;
	3117	+ }
2819	3118	}
2820	3119
2821	3120	//group.addSelectee(child);
..	..	@@ -2884,7 +3183,7 @@
2884	3183	cameraView.ToggleDL();
2885	3184	cameraView.repaint();
2886	3185	return;
2887		- } else if (event.getSource() == toggleTextureItem)
	3186	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2888	3187	{
2889	3188	cameraView.ToggleTexture();
2890	3189	// june 2013 copy.HardTouch();
..	..	@@ -2923,9 +3222,9 @@
2923	3222	frame.validate();
2924	3223
2925	3224	return;
2926		- } else if (event.getSource() == toggleSwitchItem)
	3225	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2927	3226	{
2928		- cameraView.ToggleRandom();
	3227	+ cameraView.ToggleSwitch();
2929	3228	cameraView.repaint();
2930	3229	return;
2931	3230	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2954,7 +3253,7 @@
2954	3253	{
2955	3254	copy.live ^= true;
2956	3255	return;
2957		- } else if (event.getSource() == selectCB)
	3256	+ } else if (event.getSource() == selectableCB)
2958	3257	{
2959	3258	copy.dontselect ^= true;
2960	3259	return;
..	..	@@ -3139,9 +3438,9 @@
3139	3438	{
3140	3439	Close();
3141	3440	//return true;
3142		- } else if (source == loadItem)
	3441	+ } else if (source == openItem)
3143	3442	{
3144		- load();
	3443	+ Open();
3145	3444	//return true;
3146	3445	} else if (source == newItem)
3147	3446	{
..	..	@@ -3166,6 +3465,10 @@
3166	3465	{
3167	3466	generatePOV();
3168	3467	//return true;
	3468	+ } else if (event.getSource() == archiveItem)
	3469	+ {
	3470	+ cTools.Archive(frame);
	3471	+ return;
3169	3472	} else if (source == zBufferItem)
3170	3473	{
3171	3474	try
..	..	@@ -3212,23 +3515,52 @@
3212	3515	objEditor.refreshContents();
3213	3516	}
3214	3517
3215		- Object3D graphs[] = new Object3D[10000];
3216		- int undoindex = 0;
3217		-
3218		- static public Object clone(Object o)
	3518	+ static public byte[] Compress(Object3D o)
3219	3519	{
3220	3520	try
3221	3521	{
3222	3522	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3223		- ObjectOutputStream out = new ObjectOutputStream(baos);
	3523	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3524	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
3224	3525
	3526	+ Object3D parent = o.parent;
	3527	+ o.parent = null;
	3528	+
3225	3529	out.writeObject(o);
	3530	+
	3531	+ o.parent = parent;
	3532	+
	3533	+ out.flush();
3226	3534
3227		- ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
3228		- ObjectInputStream in = new ObjectInputStream(bais);
3229		- Object obj = in.readObject();
3230		- in.close();
	3535	+ baos //zstream
	3536	+ .close();
3231	3537	out.close();
	3538	+
	3539	+ byte[] bytes = baos.toByteArray();
	3540	+
	3541	+ System.out.println("save #bytes = " + bytes.length);
	3542	+ return bytes;
	3543	+ } catch (Exception e)
	3544	+ {
	3545	+ System.err.println(e);
	3546	+ return null;
	3547	+ }
	3548	+ }
	3549	+
	3550	+ static public Object Uncompress(byte[] bytes)
	3551	+ {
	3552	+ System.out.println("restore #bytes = " + bytes.length);
	3553	+ try
	3554	+ {
	3555	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3556	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3557	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	3558	+ Object obj = in.readObject();
	3559	+
	3560	+ bais //istream
	3561	+ .close();
	3562	+ in.close();
	3563	+
3232	3564	return obj;
3233	3565	} catch (Exception e)
3234	3566	{
..	..	@@ -3237,24 +3569,121 @@
3237	3569	}
3238	3570	}
3239	3571
	3572	+ static public Object clone(Object o)
	3573	+ {
	3574	+ try
	3575	+ {
	3576	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3577	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3578	+
	3579	+ out.writeObject(o);
	3580	+
	3581	+ out.flush();
	3582	+ out.close();
	3583	+
	3584	+ byte[] bytes = baos.toByteArray();
	3585	+
	3586	+ System.out.println("clone = " + bytes.length);
	3587	+
	3588	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3589	+ ObjectInputStream in = new ObjectInputStream(bais);
	3590	+ Object obj = in.readObject();
	3591	+ in.close();
	3592	+
	3593	+ return obj;
	3594	+ } catch (Exception e)
	3595	+ {
	3596	+ System.err.println(e);
	3597	+ return null;
	3598	+ }
	3599	+ }
	3600	+
	3601	+ cRadio GetCurrentTab()
	3602	+ {
	3603	+ cRadio ab;
	3604	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3605	+ {
	3606	+ ab = (cRadio)e.nextElement();
	3607	+ if(ab.GetObject() == copy)
	3608	+ {
	3609	+ return ab;
	3610	+ }
	3611	+ }
	3612	+
	3613	+ return null;
	3614	+ }
	3615	+
	3616	+
3240	3617	public void Save()
3241	3618	{
3242		- if (true) return;
	3619	+ //Save(true);
	3620	+ Replace();
	3621	+ }
	3622	+
	3623	+ private boolean Equal(byte[] compress, byte[] name)
	3624	+ {
	3625	+ if (compress.length != name.length)
	3626	+ {
	3627	+ return false;
	3628	+ }
	3629	+
	3630	+ for (int i=compress.length; --i>=0;)
	3631	+ {
	3632	+ if (compress[i] != name[i])
	3633	+ return false;
	3634	+ }
	3635	+
	3636	+ return true;
	3637	+ }
	3638	+
	3639	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3640	+
	3641	+ public boolean Save(boolean user)
	3642	+ {
	3643	+ System.err.println("Save");
	3644	+
	3645	+ cRadio tab = GetCurrentTab();
	3646	+
	3647	+ byte[] compress = CompressCopy();
	3648	+
	3649	+ boolean thesame = false;
	3650	+
	3651	+ // Quick heuristic using length. Works only when stream is compressed.
	3652	+ if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3653	+ {
	3654	+ thesame = true;
	3655	+ }
3243	3656
3244	3657	//EditorFrame.m_MainFrame.requestFocusInWindow();
3245		- graphs[undoindex++] = (Object3D)clone(copy);
3246		-
3247		- for (int i = undoindex; i < graphs.length; i++)
	3658	+ if (!thesame)
3248	3659	{
3249		- graphs[i] = null;
	3660	+ //tab.user[tab.versionindex] = user;
	3661	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3662	+
	3663	+ copy.versions[++copy.versionindex] = compress;
	3664	+
	3665	+ // if (increment)
	3666	+ // tab.versionindex++;
3250	3667	}
3251	3668
	3669	+ //copy.RestoreBigData(versiontable);
	3670	+
	3671	+ //assert(hashtable.isEmpty());
	3672	+
	3673	+ for (int i = copy.versionindex+1; i < copy.versions.length; i++)
	3674	+ {
	3675	+ //tab.user[i] = false;
	3676	+ copy.versions[i] = null;
	3677	+ }
	3678	+
	3679	+ SetUndoStates();
	3680	+
3252	3681	// test save
3253	3682	if (false)
3254	3683	{
3255	3684	try
3256	3685	{
3257		- FileOutputStream ostream = new FileOutputStream("save" + undoindex);
	3686	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3258	3687	ObjectOutputStream p = new ObjectOutputStream(ostream);
3259	3688
3260	3689	p.writeObject(copy);
..	..	@@ -3267,50 +3696,177 @@
3267	3696	e.printStackTrace();
3268	3697	}
3269	3698	}
	3699	+
	3700	+ return !thesame;
3270	3701	}
3271	3702
3272		- public void Undo()
	3703	+ void CopyChanged(Object3D obj)
3273	3704	{
3274		- if (undoindex == 0)
3275		- {
3276		- java.awt.Toolkit.getDefaultToolkit().beep();
3277		- return;
3278		- }
3279		-
3280		- if (graphs[undoindex] == null)
3281		- {
3282		- Save();
3283		- undoindex -= 1;
3284		- }
3285		-
3286		- undoindex -= 1;
3287		-
3288		- copy = graphs[undoindex];
	3705	+ SetUndoStates();
3289	3706
3290		- cameraView.object = copy;
	3707	+ boolean temp = CameraPane.SWITCH;
	3708	+ CameraPane.SWITCH = false;
	3709	+
	3710	+ copy.ExtractBigData(versiontable);
	3711	+
	3712	+ copy.clear();
	3713	+
	3714	+ for (int i=0; i<obj.Size(); i++)
	3715	+ {
	3716	+ copy.add(obj.get(i));
	3717	+ }
	3718	+
	3719	+ copy.RestoreBigData(versiontable);
	3720	+
	3721	+ CameraPane.SWITCH = temp;
	3722	+
	3723	+ //assert(hashtable.isEmpty());
	3724	+
3291	3725	copy.Touch();
3292	3726
3293	3727	ResetModel();
	3728	+ copy.HardTouch(); // recompile?
	3729	+
	3730	+ cRadio ab;
	3731	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3732	+ {
	3733	+ ab = (cRadio)e.nextElement();
	3734	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3735	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3736	+ if (test != null)
	3737	+ {
	3738	+ test.editWindow = ab.object.editWindow;
	3739	+ ab.object = test;
	3740	+ }
	3741	+ }
	3742	+
3294	3743	refreshContents();
	3744	+ }
	3745	+
	3746	+ cButton undoButton;
	3747	+ cButton restoreButton;
	3748	+ cButton replaceButton;
	3749	+ cButton redoButton;
	3750	+
	3751	+ boolean muteSlider;
	3752	+
	3753	+ int VersionCount()
	3754	+ {
	3755	+ int count = 0;
	3756	+
	3757	+ for (int i = copy.versions.length; --i >= 0;)
	3758	+ {
	3759	+ if (copy.versions[i] != null)
	3760	+ count++;
	3761	+ }
	3762	+
	3763	+ return count;
	3764	+ }
	3765	+
	3766	+ void SetUndoStates()
	3767	+ {
	3768	+ cRadio tab = GetCurrentTab();
	3769	+
	3770	+ restoreButton.setEnabled(copy.versionindex != -1);
	3771	+ replaceButton.setEnabled(copy.versionindex != -1);
	3772	+
	3773	+ undoButton.setEnabled(copy.versionindex > 0);
	3774	+ redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
	3775	+
	3776	+ muteSlider = true;
	3777	+ versionSlider.setMaximum(VersionCount() - 1);
	3778	+ versionSlider.setInteger(copy.versionindex);
	3779	+ muteSlider = false;
	3780	+ }
	3781	+
	3782	+ public boolean Undo()
	3783	+ {
	3784	+ // Option?
	3785	+ Replace();
	3786	+
	3787	+ System.err.println("Undo");
	3788	+
	3789	+ cRadio tab = GetCurrentTab();
	3790	+
	3791	+ if (copy.versionindex == 0)
	3792	+ {
	3793	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3794	+ return false;
	3795	+ }
	3796	+
	3797	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3798	+// {
	3799	+// if (Save(false))
	3800	+// tab.versionindex -= 1;
	3801	+// else
	3802	+// {
	3803	+// if (tab.versionindex <= 0)
	3804	+// return false;
	3805	+// else
	3806	+// tab.versionindex -= 1;
	3807	+// }
	3808	+// }
	3809	+
	3810	+ copy.versionindex -= 1;
	3811	+
	3812	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3813	+
	3814	+ return true;
	3815	+ }
	3816	+
	3817	+ public boolean Restore()
	3818	+ {
	3819	+ System.err.println("Restore");
	3820	+
	3821	+ cRadio tab = GetCurrentTab();
	3822	+
	3823	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3824	+ {
	3825	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3826	+ return false;
	3827	+ }
	3828	+
	3829	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3830	+
	3831	+ return true;
	3832	+ }
	3833	+
	3834	+ public boolean Replace()
	3835	+ {
	3836	+ System.err.println("Replace");
	3837	+
	3838	+ cRadio tab = GetCurrentTab();
	3839	+
	3840	+ if (copy.versionindex == -1 \|\| copy.versions[copy.versionindex] == null)
	3841	+ {
	3842	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3843	+ return false;
	3844	+ }
	3845	+
	3846	+ copy.versions[copy.versionindex] = CompressCopy();
	3847	+
	3848	+ return true;
3295	3849	}
3296	3850
3297	3851	public void Redo()
3298	3852	{
3299		- if (graphs[undoindex + 1] == null)
	3853	+ // Option?
	3854	+ Replace();
	3855	+
	3856	+ cRadio tab = GetCurrentTab();
	3857	+
	3858	+ if (copy.versions[copy.versionindex + 1] == null)
3300	3859	{
3301	3860	java.awt.Toolkit.getDefaultToolkit().beep();
3302	3861	return;
3303	3862	}
3304	3863
3305		- undoindex += 1;
	3864	+ copy.versionindex += 1;
3306	3865
3307		- copy = graphs[undoindex];
3308		-
3309		- cameraView.object = copy;
3310		- copy.Touch();
	3866	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3311	3867
3312		- ResetModel();
3313		- refreshContents();
	3868	+ //if (!tab.user[tab.versionindex])
	3869	+ // tab.graphs[tab.versionindex] = null;
3314	3870	}
3315	3871
3316	3872	void ImportGFD()
..	..	@@ -3462,7 +4018,7 @@
3462	4018	assert false;
3463	4019	}
3464	4020
3465		- void EditSelection()
	4021	+ void EditSelection(boolean newWindow)
3466	4022	{
3467	4023	}
3468	4024
..	..	@@ -3606,9 +4162,25 @@
3606	4162	//copy.Touch();
3607	4163	}
3608	4164
	4165	+ cNumberSlider versionSlider;
	4166	+
3609	4167	public void stateChanged(ChangeEvent e)
3610	4168	{
3611	4169	// assert(false);
	4170	+ if (e.getSource() == versionSlider)
	4171	+ {
	4172	+ if (muteSlider)
	4173	+ return;
	4174	+
	4175	+ int version = versionSlider.getInteger();
	4176	+
	4177	+ if (copy.versions[version] != null)
	4178	+ {
	4179	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
	4180	+ }
	4181	+
	4182	+ return;
	4183	+ }
3612	4184
3613	4185	if (freezematerial)
3614	4186	{
..	..	@@ -3957,7 +4529,8 @@
3957	4529
3958	4530	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3959	4531	{
3960		- Save();
	4532	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	4533	+ Save();
3961	4534	//Tween.set(thing, 0).target(1).start(tweenManager);
3962	4535	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3963	4536	// if (thing instanceof GenericJointDemo)
..	..	@@ -4044,6 +4617,12 @@
4044	4617	{
4045	4618	ResetModel();
4046	4619	Select(thing.GetTreePath(), true, false); // unselect... false);
	4620	+
	4621	+ if (thing.Size() == 0)
	4622	+ {
	4623	+ //EditSelection(false);
	4624	+ }
	4625	+
4047	4626	refreshContents();
4048	4627	}
4049	4628
..	..	@@ -4181,6 +4760,7 @@
4181	4760
4182	4761	try
4183	4762	{
	4763	+ // Try compressed version first.
4184	4764	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4185	4765	java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
4186	4766	java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
..	..	@@ -4191,7 +4771,9 @@
4191	4771	readobj.ResetDisplayList();
4192	4772	} catch (Exception e)
4193	4773	{
4194		- //e.printStackTrace();
	4774	+ if (!e.toString().contains("GZIP"))
	4775	+ e.printStackTrace();
	4776	+
4195	4777	try
4196	4778	{
4197	4779	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4250,6 +4832,12 @@
4250	4832
4251	4833	void LoadIt(Object obj)
4252	4834	{
	4835	+ if (obj == null)
	4836	+ {
	4837	+ // Invalid file
	4838	+ return;
	4839	+ }
	4840	+
4253	4841	System.out.println("Loaded " + obj);
4254	4842	//new Exception().printStackTrace();
4255	4843	Object3D readobj = (Object3D) obj;
..	..	@@ -4259,10 +4847,14 @@
4259	4847
4260	4848	if (readobj != null)
4261	4849	{
	4850	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4851	+ // Save();
4262	4852	try
4263	4853	{
4264	4854	//readobj.deepCopySelf(copy);
4265	4855	copy.clear(); // june 2014
	4856	+ copy.skyboxname = readobj.skyboxname;
	4857	+ copy.skyboxext = readobj.skyboxext;
4266	4858	for (int i = 0; i < readobj.size(); i++)
4267	4859	{
4268	4860	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4303,6 +4895,7 @@
4303	4895	}
4304	4896	} catch (ClassCastException e)
4305	4897	{
	4898	+ e.printStackTrace();
4306	4899	assert (false);
4307	4900	Composite c = (Composite) copy;
4308	4901	c.children.clear();
..	..	@@ -4313,13 +4906,24 @@
4313	4906	c.addChild(csg);
4314	4907	}
4315	4908
	4909	+ copy.versions = readobj.versions;
	4910	+ copy.versionindex = readobj.versionindex;
	4911	+
	4912	+ if (copy.versions == null)
	4913	+ {
	4914	+ copy.versions = new byte[100][];
	4915	+ copy.versionindex = -1;
	4916	+ }
	4917	+
	4918	+ //? SetUndoStates();
	4919	+
4316	4920	ResetModel();
4317	4921	copy.HardTouch(); // recompile?
4318	4922	refreshContents();
4319	4923	}
4320	4924	}
4321	4925
4322		- void load() // throws ClassNotFoundException
	4926	+ void Open() // throws ClassNotFoundException
4323	4927	{
4324	4928	if (Grafreed.standAlone)
4325	4929	{
..	..	@@ -4422,6 +5026,7 @@
4422	5026	//ps.print(buffer.toString());
4423	5027	} catch (IOException e)
4424	5028	{
	5029	+ e.printStackTrace();
4425	5030	}
4426	5031	}
4427	5032
..	..	@@ -4436,6 +5041,8 @@
4436	5041	String filename = browser.getFile();
4437	5042	if (filename != null && filename.length() > 0)
4438	5043	{
	5044	+ if (!filename.endsWith(".gfd"))
	5045	+ filename += ".gfd";
4439	5046	lastname = browser.getDirectory() + filename;
4440	5047	save();
4441	5048	}
..	..	@@ -4602,7 +5209,7 @@
4602	5209	MenuBar menuBar;
4603	5210	Menu fileMenu;
4604	5211	MenuItem newItem;
4605		- MenuItem loadItem;
	5212	+ MenuItem openItem;
4606	5213	MenuItem saveItem;
4607	5214	MenuItem saveAsItem;
4608	5215	MenuItem exportAsItem;
..	..	@@ -4625,22 +5232,36 @@
4625	5232	CheckboxMenuItem toggleSwitchItem;
4626	5233	CheckboxMenuItem toggleRootItem;
4627	5234	CheckboxMenuItem animationItem;
	5235	+ MenuItem archiveItem;
4628	5236	CheckboxMenuItem toggleHandleItem;
4629	5237	CheckboxMenuItem togglePaintItem;
4630	5238	JSplitPane mainPanel;
4631	5239	JScrollPane scrollpane;
	5240	+
4632	5241	JPanel toolbarPanel;
	5242	+
4633	5243	cGridBag treePanel;
	5244	+
4634	5245	JPanel radioPanel;
4635	5246	ButtonGroup buttonGroup;
4636		- cGridBag ctrlPanel;
	5247	+
	5248	+ cGridBag toolboxPanel;
4637	5249	cGridBag materialPanel;
	5250	+ cGridBag ctrlPanel;
	5251	+
4638	5252	JScrollPane infoPanel;
	5253	+
4639	5254	cGridBag optionsPanel;
	5255	+
4640	5256	JTabbedPane objectPanel;
	5257	+ boolean materialFlushed;
	5258	+ Object3D latestObject;
	5259	+
4641	5260	cGridBag XYZPanel;
	5261	+
4642	5262	JSplitPane gridPanel;
4643	5263	JSplitPane bigPanel;
	5264	+
4644	5265	cGridBag bigThree;
4645	5266	cGridBag scenePanel;
4646	5267	cGridBag centralPanel;
..	..	@@ -4755,7 +5376,7 @@
4755	5376	cNumberSlider fogField;
4756	5377	JLabel opacityPowerLabel;
4757	5378	cNumberSlider opacityPowerField;
4758		- JTree jTree;
	5379	+ cTree jTree;
4759	5380	//ObjectUI parent;
4760	5381
4761	5382	cNumberSlider normalpushField;