~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,67 @@
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	+ try
	48	+ {
	49	+ ImageIcon icon = GetIcon(name);
	50	+ return new cButton(icon, border);
	51	+ }
	52	+ catch (Exception e)
	53	+ {
	54	+ return new cButton(name, border);
	55	+ }
	56	+ }
	57	+
	58	+ cToggleButton GetToggleButton(String name, boolean border)
	59	+ {
	60	+ try
	61	+ {
	62	+ ImageIcon icon = GetIcon(name);
	63	+ return new cToggleButton(icon, border);
	64	+ }
	65	+ catch (Exception e)
	66	+ {
	67	+ return new cToggleButton(name, border);
	68	+ }
	69	+ }
	70	+
	71	+ cCheckBox GetCheckBox(String name, boolean border)
	72	+ {
	73	+ try
	74	+ {
	75	+ ImageIcon icon = GetIcon(name);
	76	+ return new cCheckBox(icon, border);
	77	+ }
	78	+ catch (Exception e)
	79	+ {
	80	+ return new cCheckBox(name, border);
	81	+ }
	82	+ }
	83	+
	84	+ private ImageIcon GetIcon(String name) throws IOException
	85	+ {
	86	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	87	+
	88	+ if (image.getWidth() != 24 && image.getHeight() != 24)
	89	+ {
	90	+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
	91	+ Graphics2D g = resized.createGraphics();
	92	+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	93	+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	94	+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
	95	+ g.dispose();
	96	+
	97	+ image = resized;
	98	+ }
	99	+
	100	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	101	+ return icon;
	102	+ }
38	103
39	104	// SCRIPT
40	105
..	..	@@ -145,7 +210,7 @@
145	210
146	211	objEditor.ctrlPanel.remove(namePanel);
147	212
148		- if (!GroupEditor.allparams)
	213	+ if (!allparams)
149	214	return;
150	215
151	216	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -168,7 +233,8 @@
168	233	// objEditor.ctrlPanel.remove(remarkButton);
169	234
170	235	objEditor.ctrlPanel.remove(setupPanel);
171		- objEditor.ctrlPanel.remove(commandsPanel);
	236	+ objEditor.ctrlPanel.remove(setupPanel2);
	237	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
172	238	objEditor.ctrlPanel.remove(pushPanel);
173	239	//objEditor.ctrlPanel.remove(fillPanel);
174	240
..	..	@@ -243,6 +309,7 @@
243	309	//localCopy.parent = null;
244	310
245	311	frame = new JFrame();
	312	+ frame.setUndecorated(true);
246	313	objEditor = this;
247	314	this.callee = callee;
248	315
..	..	@@ -273,12 +340,17 @@
273	340	return frame.action(event, obj);
274	341	}
275	342
	343	+ // Cannot work without static
	344	+ static boolean allparams = true;
	345	+
	346	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	347	+
276	348	void SetupMenu()
277	349	{
278	350	frame.setMenuBar(menuBar = new MenuBar());
279	351	menuBar.add(fileMenu = new Menu("File"));
280	352	fileMenu.add(newItem = new MenuItem("New"));
281		- fileMenu.add(loadItem = new MenuItem("Load..."));
	353	+ fileMenu.add(loadItem = new MenuItem("Open..."));
282	354
283	355	//oe.menuBar.add(menu = new Menu("Include"));
284	356	Menu menu = new Menu("Import");
..	..	@@ -319,14 +391,52 @@
319	391	closeItem.addActionListener(this);
320	392
321	393	objectPanel = new JTabbedPane();
	394	+
	395	+ ChangeListener changeListener = new ChangeListener()
	396	+ {
	397	+ public void stateChanged(ChangeEvent changeEvent)
	398	+ {
	399	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	400	+// {
	401	+// if (latestObject != null)
	402	+// {
	403	+// refreshContents(true);
	404	+// SetMaterial(latestObject);
	405	+// }
	406	+//
	407	+// materialFlushed = true;
	408	+// }
	409	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	410	+// {
	411	+// if (listUI.size() == 0)
	412	+// EditSelection(false);
	413	+// }
	414	+
	415	+ refreshContents(false); // To refresh Info tab
	416	+ }
	417	+ };
	418	+ objectPanel.addChangeListener(changeListener);
	419	+
322	420	toolbarPanel = new JPanel();
323	421	toolbarPanel.setName("Toolbar");
324	422	treePanel = new cGridBag();
325	423	treePanel.setName("Tree");
	424	+
	425	+ editPanel = new cGridBag().setVertical(true);
	426	+ editPanel.setName("Edit");
	427	+
326	428	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
327		- ctrlPanel.setName("Edit");
	429	+
	430	+ editCommandsPanel = new cGridBag();
	431	+ editPanel.add(editCommandsPanel);
	432	+ editPanel.add(ctrlPanel);
	433	+
	434	+ toolboxPanel = new cGridBag().setVertical(false);
	435	+ toolboxPanel.setName("Toolbox");
	436	+
328	437	materialPanel = new cGridBag().setVertical(true);
329	438	materialPanel.setName("Material");
	439	+
330	440	/JTextPane/
331	441	infoarea = createTextPane();
332	442	doc = infoarea.getStyledDocument();
..	..	@@ -351,7 +461,13 @@
351	461	mainPanel.setDividerSize(9);
352	462	mainPanel.setDividerLocation(0.5); //1.0);
353	463	mainPanel.setResizeWeight(0.5);
354		-
	464	+
	465	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	466	+// BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	467	+// divider.setDividerSize(15);
	468	+// divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	469	+
	470	+
355	471	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
356	472	//mainPanel.setLayout(new GridBagLayout());
357	473	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -419,10 +535,10 @@
419	535	e.printStackTrace();
420	536	}
421	537
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();
	538	+// String selection = infoarea.getText();
	539	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	540	+// java.awt.datatransfer.Clipboard clipboard =
	541	+// Toolkit.getDefaultToolkit().getSystemClipboard();
426	542	//clipboard.setContents(data, data);
427	543	}
428	544
..	..	@@ -582,20 +698,92 @@
582	698	}
583	699	}
584	700
	701	+static GraphicsDevice device = GraphicsEnvironment
	702	+ .getLocalGraphicsEnvironment().getScreenDevices()[0];
	703	+
	704	+ Rectangle keeprect;
	705	+ cRadio radio;
	706	+
	707	+cButton keepButton;
	708	+ cButton twoButton; // Full 3D
	709	+ cButton sixButton;
	710	+ cButton threeButton;
	711	+ cButton sevenButton;
	712	+ cButton fourButton; // full panel
	713	+ cButton oneButton; // full XYZ
	714	+ //cButton currentLayout;
	715	+
	716	+ boolean maximized;
	717	+
	718	+ cButton fullscreenLayout;
	719	+
	720	+ void Minimize()
	721	+ {
	722	+ frame.setState(Frame.ICONIFIED);
	723	+ }
	724	+
	725	+ void Maximize()
	726	+ {
	727	+ if (maximized)
	728	+ {
	729	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	730	+ }
	731	+ else
	732	+ {
	733	+ keeprect = frame.getBounds();
	734	+ Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	735	+ Dimension rect2 = frame.getToolkit().getScreenSize();
	736	+ frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	737	+// frame.setState(Frame.MAXIMIZED_BOTH);
	738	+ }
	739	+
	740	+ maximized ^= true;
	741	+ }
	742	+
585	743	void ToggleFullScreen()
586	744	{
587		- if (CameraPane.FULLSCREEN)
	745	+ cameraView.ToggleFullScreen();
	746	+
	747	+ if (!CameraPane.FULLSCREEN)
588	748	{
589		- frame.getContentPane().remove(/"Center",/bigThree);
590		- framePanel.add(bigThree);
591		- frame.getContentPane().add(/"Center",/framePanel);
	749	+ device.setFullScreenWindow(null);
	750	+ //frame.setVisible(false);
	751	+// frame.removeNotify();
	752	+// frame.setUndecorated(false);
	753	+// frame.addNotify();
	754	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	755	+
	756	+// X frame.getContentPane().remove(/"Center",/bigThree);
	757	+// X framePanel.add(bigThree);
	758	+// X frame.getContentPane().add(/"Center",/framePanel);
	759	+ framePanel.setDividerLocation(1);
	760	+
	761	+ //frame.setVisible(true);
	762	+ radio.layout = keepButton;
	763	+ //theFrame = null;
	764	+ keepButton = null;
	765	+ radio.layout.doClick();
	766	+
592	767	} else
593	768	{
594		- frame.getContentPane().remove(/"Center",/framePanel);
595		- framePanel.remove(bigThree);
596		- frame.getContentPane().add(/"Center",/bigThree);
	769	+ keepButton = radio.layout;
	770	+ //keeprect = frame.getBounds();
	771	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	772	+// frame.getToolkit().getScreenSize().height);
	773	+ //frame.setVisible(false);
	774	+ device.setFullScreenWindow(frame);
	775	+// frame.removeNotify();
	776	+// frame.setUndecorated(true);
	777	+// frame.addNotify();
	778	+// X frame.getContentPane().remove(/"Center",/framePanel);
	779	+// X framePanel.remove(bigThree);
	780	+// X frame.getContentPane().add(/"Center",/bigThree);
	781	+ framePanel.setDividerLocation(0);
	782	+
	783	+ radio.layout = fullscreenLayout;
	784	+ radio.layout.doClick();
	785	+ //frame.setVisible(true);
597	786	}
598		- cameraView.ToggleFullScreen();
599	787	}
600	788
601	789	private JTextPane createTextPane()
..	..	@@ -736,7 +924,12 @@
736	924	JCheckBox speedupCB;
737	925	JCheckBox rewindCB;
738	926	JCheckBox flipVCB;
	927	+
	928	+ cCheckBox toggleTextureCB;
	929	+ cCheckBox toggleSwitchCB;
	930	+
739	931	JComboBox texresMenu;
	932	+
740	933	JButton resetButton;
741	934	JButton stepButton;
742	935	JButton stepAllButton;
..	..	@@ -745,9 +938,13 @@
745	938	JButton fasterButton;
746	939	JButton remarkButton;
747	940
	941	+ cGridBag editPanel;
	942	+ cGridBag editCommandsPanel;
	943	+
748	944	cGridBag namePanel;
749	945	cGridBag setupPanel;
750		- cGridBag commandsPanel;
	946	+ cGridBag setupPanel2;
	947	+ cGridBag objectCommandsPanel;
751	948	cGridBag pushPanel;
752	949	cGridBag fillPanel;
753	950
..	..	@@ -924,7 +1121,7 @@
924	1121
925	1122	oe.ctrlPanel.Return();
926	1123
927		- if (!GroupEditor.allparams)
	1124	+ if (!allparams)
928	1125	return;
929	1126
930	1127	setupPanel = new cGridBag().setVertical(false);
..	..	@@ -937,42 +1134,46 @@
937	1134	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
938	1135	hideCB.setToolTipText("Hide object");
939	1136	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
940		- markCB.setToolTipText("Set the animation target transform");
	1137	+ markCB.setToolTipText("As animation target transform");
941	1138
942		- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	1139	+ setupPanel2 = new cGridBag().setVertical(false);
	1140	+
	1141	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
943	1142	rewindCB.setToolTipText("Rewind animation");
944	1143
945		- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
946		- randomCB.setToolTipText("Option for switch node");
	1144	+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1145	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
947	1146
948	1147	if (Globals.ADVANCED)
949	1148	{
950		- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
	1149	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
951	1150	link2masterCB.setToolTipText("Attach to support");
952		- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1151	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
953	1152	speedupCB.setToolTipText("Option motion capture");
954	1153	}
955	1154
956	1155	oe.ctrlPanel.add(setupPanel);
957	1156	oe.ctrlPanel.Return();
	1157	+ oe.ctrlPanel.add(setupPanel2);
	1158	+ oe.ctrlPanel.Return();
958	1159
959		- commandsPanel = new cGridBag().setVertical(false);
	1160	+ objectCommandsPanel = new cGridBag().setVertical(false);
960	1161
961		- resetButton = AddButton(commandsPanel, "Reset");
	1162	+ resetButton = AddButton(objectCommandsPanel, "Reset");
962	1163	resetButton.setToolTipText("Jump to frame zero");
963		- stepButton = AddButton(commandsPanel, "Step");
	1164	+ stepButton = AddButton(objectCommandsPanel, "Step");
964	1165	stepButton.setToolTipText("Step one frame");
965	1166	// resetAllButton = AddButton(oe, "Reset All");
966	1167	// stepAllButton = AddButton(oe, "Step All");
967	1168	// Return();
968		- slowerButton = AddButton(commandsPanel, "Slow");
	1169	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
969	1170	slowerButton.setToolTipText("Decrease animation speed");
970		- fasterButton = AddButton(commandsPanel, "Fast");
	1171	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
971	1172	fasterButton.setToolTipText("Increase animation speed");
972		- remarkButton = AddButton(commandsPanel, "Remark");
	1173	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
973	1174	remarkButton.setToolTipText("Set the current transform as the target");
974	1175
975		- oe.ctrlPanel.add(commandsPanel);
	1176	+ oe.ctrlPanel.add(objectCommandsPanel);
976	1177	oe.ctrlPanel.Return();
977	1178
978	1179	pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
..	..	@@ -1178,8 +1379,11 @@
1178	1379	//worldPanel.setName("World");
1179	1380	centralPanel = new cGridBag();
1180	1381	centralPanel.preferredWidth = 20;
1181		- timelinePanel = new JPanel(new BorderLayout());
1182		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1382	+
	1383	+ if (Globals.ADVANCED)
	1384	+ {
	1385	+ timelinePanel = new JPanel(new BorderLayout());
	1386	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1183	1387
1184	1388	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1185	1389	cameraPanel.setContinuousLayout(true);
..	..	@@ -1188,7 +1392,10 @@
1188	1392	// cameraPanel.setDividerSize(9);
1189	1393	cameraPanel.setResizeWeight(1.0);
1190	1394
	1395	+ }
	1396	+
1191	1397	centralPanel.add(cameraView);
	1398	+ centralPanel.setFocusable(true);
1192	1399	//frame.setJMenuBar(timelineMenubar);
1193	1400	//centralPanel.add(timelinePanel);
1194	1401
..	..	@@ -1255,8 +1462,9 @@
1255	1462	// north.setName("Edit");
1256	1463	// north.add(ctrlPanel, BorderLayout.NORTH);
1257	1464	// objectPanel.add(north);
1258		- objectPanel.add(ctrlPanel);
	1465	+ objectPanel.add(editPanel);
1259	1466	objectPanel.add(infoPanel);
	1467	+ objectPanel.add(toolboxPanel);
1260	1468
1261	1469	/*
1262	1470	aConstraints.gridx = 0;
..	..	@@ -1265,7 +1473,7 @@
1265	1473	aConstraints.gridy += 1;
1266	1474	aConstraints.gridwidth = 1;
1267	1475	mainPanel.add(objectPanel, aConstraints);
1268		- */
	1476	+ */
1269	1477
1270	1478	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1271	1479	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1282,9 +1490,7 @@
1282	1490	JTabbedPane tabbedPane = new JTabbedPane();
1283	1491	tabbedPane.add(scrollpane);
1284	1492
1285		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1286		-
1287		- optionsPanel = new cGridBag().setVertical(true);
	1493	+ optionsPanel = new cGridBag().setVertical(false);
1288	1494
1289	1495	optionsPanel.setName("Options");
1290	1496
..	..	@@ -1292,6 +1498,8 @@
1292	1498
1293	1499	tabbedPane.add(optionsPanel);
1294	1500
	1501	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1502	+
1295	1503	scenePanel.add(tabbedPane);
1296	1504
1297	1505	/*
..	..	@@ -1384,8 +1592,12 @@
1384	1592	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1385	1593
1386	1594	frame.setSize(1280, 860);
	1595	+
	1596	+ frame.validate();
1387	1597	frame.setVisible(true);
1388	1598
	1599	+ cameraView.requestFocusInWindow();
	1600	+
1389	1601	gridPanel.setDividerLocation(1.0);
1390	1602
1391	1603	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1935,6 +2147,7 @@
1935	2147	e2.printStackTrace();
1936	2148	}
1937	2149	}
	2150	+
1938	2151	LoadJMEThread loadThread;
1939	2152
1940	2153	class LoadJMEThread extends Thread
..	..	@@ -1992,6 +2205,7 @@
1992	2205	//LoadFile0(filename, converter);
1993	2206	}
1994	2207	}
	2208	+
1995	2209	LoadOBJThread loadObjThread;
1996	2210
1997	2211	class LoadOBJThread extends Thread
..	..	@@ -2070,19 +2284,19 @@
2070	2284
2071	2285	void LoadObjFile(String fullname)
2072	2286	{
2073		- /*
	2287	+ System.out.println("Loading " + fullname);
	2288	+ /**/
2074	2289	//lastFilename = fullname;
2075	2290	if(loadObjThread == null)
2076	2291	{
2077		- loadObjThread = new LoadOBJThread();
2078		- loadObjThread.start();
	2292	+ loadObjThread = new LoadOBJThread();
	2293	+ loadObjThread.start();
2079	2294	}
2080	2295
2081	2296	loadObjThread.add(fullname);
2082		- */
	2297	+ /**/
2083	2298
2084		- System.out.println("Loading " + fullname);
2085		- makeSomething(new FileObject(fullname, true), true);
	2299	+ //makeSomething(new FileObject(fullname, true), true);
2086	2300	}
2087	2301
2088	2302	void LoadGFDFile(String fullname)
..	..	@@ -2699,6 +2913,8 @@
2699	2913
2700	2914	void SetMaterial(Object3D object)
2701	2915	{
	2916	+ latestObject = object;
	2917	+
2702	2918	cMaterial mat = object.material;
2703	2919
2704	2920	if (mat == null)
..	..	@@ -2810,12 +3026,17 @@
2810	3026	// }
2811	3027
2812	3028	/**/
2813		- if (deselect)
	3029	+ if (deselect \|\| child == null)
2814	3030	{
2815	3031	//group.deselectAll();
2816	3032	//freeze = true;
2817	3033	GetTree().clearSelection();
2818	3034	//freeze = false;
	3035	+
	3036	+ if (child == null)
	3037	+ {
	3038	+ return;
	3039	+ }
2819	3040	}
2820	3041
2821	3042	//group.addSelectee(child);
..	..	@@ -2884,7 +3105,7 @@
2884	3105	cameraView.ToggleDL();
2885	3106	cameraView.repaint();
2886	3107	return;
2887		- } else if (event.getSource() == toggleTextureItem)
	3108	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2888	3109	{
2889	3110	cameraView.ToggleTexture();
2890	3111	// june 2013 copy.HardTouch();
..	..	@@ -2923,9 +3144,9 @@
2923	3144	frame.validate();
2924	3145
2925	3146	return;
2926		- } else if (event.getSource() == toggleSwitchItem)
	3147	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2927	3148	{
2928		- cameraView.ToggleRandom();
	3149	+ cameraView.ToggleSwitch();
2929	3150	cameraView.repaint();
2930	3151	return;
2931	3152	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3212,23 +3433,45 @@
3212	3433	objEditor.refreshContents();
3213	3434	}
3214	3435
3215		- Object3D graphs[] = new Object3D[10000];
3216		- int undoindex = 0;
3217		-
3218		- static public Object clone(Object o)
	3436	+ static public byte[] Compress(Object3D o)
3219	3437	{
3220	3438	try
3221	3439	{
3222	3440	ByteArrayOutputStream baos = new ByteArrayOutputStream();
3223		- ObjectOutputStream out = new ObjectOutputStream(baos);
	3441	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3442	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
3224	3443
	3444	+ Object3D parent = o.parent;
	3445	+ o.parent = null;
	3446	+
3225	3447	out.writeObject(o);
	3448	+
	3449	+ o.parent = parent;
	3450	+
	3451	+ out.flush();
3226	3452
3227		- ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
3228		- ObjectInputStream in = new ObjectInputStream(bais);
	3453	+ zstream.close();
	3454	+ out.close();
	3455	+
	3456	+ return baos.toByteArray();
	3457	+ } catch (Exception e)
	3458	+ {
	3459	+ System.err.println(e);
	3460	+ return null;
	3461	+ }
	3462	+ }
	3463	+
	3464	+ static public Object Uncompress(byte[] bytes)
	3465	+ {
	3466	+ System.out.println("#bytes = " + bytes.length);
	3467	+ try
	3468	+ {
	3469	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3470	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3471	+ ObjectInputStream in = new ObjectInputStream(istream);
3229	3472	Object obj = in.readObject();
3230	3473	in.close();
3231		- out.close();
	3474	+
3232	3475	return obj;
3233	3476	} catch (Exception e)
3234	3477	{
..	..	@@ -3237,24 +3480,85 @@
3237	3480	}
3238	3481	}
3239	3482
	3483	+ static public Object clone(Object o)
	3484	+ {
	3485	+ try
	3486	+ {
	3487	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3488	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3489	+
	3490	+ out.writeObject(o);
	3491	+
	3492	+ out.flush();
	3493	+ out.close();
	3494	+
	3495	+ byte[] bytes = baos.toByteArray();
	3496	+
	3497	+ System.out.println("clone = " + bytes.length);
	3498	+
	3499	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3500	+ ObjectInputStream in = new ObjectInputStream(bais);
	3501	+ Object obj = in.readObject();
	3502	+ in.close();
	3503	+
	3504	+ return obj;
	3505	+ } catch (Exception e)
	3506	+ {
	3507	+ System.err.println(e);
	3508	+ return null;
	3509	+ }
	3510	+ }
	3511	+
	3512	+ cRadio GetCurrentTab()
	3513	+ {
	3514	+ cRadio ab;
	3515	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3516	+ {
	3517	+ ab = (cRadio)e.nextElement();
	3518	+ if(ab.GetObject() == copy)
	3519	+ {
	3520	+ return ab;
	3521	+ }
	3522	+ }
	3523	+
	3524	+ return null;
	3525	+ }
	3526	+
	3527	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3528	+
3240	3529	public void Save()
3241	3530	{
3242		- if (true) return;
	3531	+ System.err.println("Save");
	3532	+
	3533	+ cRadio tab = GetCurrentTab();
	3534	+
	3535	+ boolean temp = CameraPane.SWITCH;
	3536	+ CameraPane.SWITCH = false;
	3537	+
	3538	+ copy.ExtractBigData(hashtable);
3243	3539
3244	3540	//EditorFrame.m_MainFrame.requestFocusInWindow();
3245		- graphs[undoindex++] = (Object3D)clone(copy);
	3541	+ tab.graphs[tab.undoindex++] = Compress(copy);
3246	3542
3247		- for (int i = undoindex; i < graphs.length; i++)
	3543	+ copy.RestoreBigData(hashtable);
	3544	+
	3545	+ CameraPane.SWITCH = temp;
	3546	+
	3547	+ //assert(hashtable.isEmpty());
	3548	+
	3549	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
3248	3550	{
3249		- graphs[i] = null;
	3551	+ tab.graphs[i] = null;
3250	3552	}
3251	3553
	3554	+ SetUndoStates();
	3555	+
3252	3556	// test save
3253	3557	if (false)
3254	3558	{
3255	3559	try
3256	3560	{
3257		- FileOutputStream ostream = new FileOutputStream("save" + undoindex);
	3561	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
3258	3562	ObjectOutputStream p = new ObjectOutputStream(ostream);
3259	3563
3260	3564	p.writeObject(copy);
..	..	@@ -3269,48 +3573,96 @@
3269	3573	}
3270	3574	}
3271	3575
	3576	+ void CopyChanged(Object3D obj)
	3577	+ {
	3578	+ SetUndoStates();
	3579	+
	3580	+ boolean temp = CameraPane.SWITCH;
	3581	+ CameraPane.SWITCH = false;
	3582	+
	3583	+ copy.ExtractBigData(hashtable);
	3584	+
	3585	+ copy.clear();
	3586	+
	3587	+ for (int i=0; i<obj.Size(); i++)
	3588	+ {
	3589	+ copy.add(obj.get(i));
	3590	+ }
	3591	+
	3592	+ copy.RestoreBigData(hashtable);
	3593	+
	3594	+ CameraPane.SWITCH = temp;
	3595	+
	3596	+ //assert(hashtable.isEmpty());
	3597	+
	3598	+ copy.Touch();
	3599	+
	3600	+ ResetModel();
	3601	+ copy.HardTouch(); // recompile?
	3602	+
	3603	+ cRadio ab;
	3604	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3605	+ {
	3606	+ ab = (cRadio)e.nextElement();
	3607	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3608	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3609	+ if (test != null)
	3610	+ {
	3611	+ test.editWindow = ab.object.editWindow;
	3612	+ ab.object = test;
	3613	+ }
	3614	+ }
	3615	+
	3616	+ refreshContents();
	3617	+ }
	3618	+
	3619	+ cButton undoButton;
	3620	+ cButton redoButton;
	3621	+
	3622	+ void SetUndoStates()
	3623	+ {
	3624	+ cRadio tab = GetCurrentTab();
	3625	+
	3626	+ undoButton.setEnabled(tab.undoindex > 0);
	3627	+ redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
	3628	+ }
	3629	+
3272	3630	public void Undo()
3273	3631	{
3274		- if (undoindex == 0)
	3632	+ System.err.println("Undo");
	3633	+
	3634	+ cRadio tab = GetCurrentTab();
	3635	+
	3636	+ if (tab.undoindex == 0)
3275	3637	{
3276	3638	java.awt.Toolkit.getDefaultToolkit().beep();
3277	3639	return;
3278	3640	}
3279	3641
3280		- if (graphs[undoindex] == null)
	3642	+ if (tab.graphs[tab.undoindex] == null)
3281	3643	{
3282	3644	Save();
3283		- undoindex -= 1;
	3645	+ tab.undoindex -= 1;
3284	3646	}
3285	3647
3286		- undoindex -= 1;
	3648	+ tab.undoindex -= 1;
3287	3649
3288		- copy = graphs[undoindex];
3289		-
3290		- cameraView.object = copy;
3291		- copy.Touch();
3292		-
3293		- ResetModel();
3294		- refreshContents();
	3650	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3295	3651	}
3296	3652
3297	3653	public void Redo()
3298	3654	{
3299		- if (graphs[undoindex + 1] == null)
	3655	+ cRadio tab = GetCurrentTab();
	3656	+
	3657	+ if (tab.graphs[tab.undoindex + 1] == null)
3300	3658	{
3301	3659	java.awt.Toolkit.getDefaultToolkit().beep();
3302	3660	return;
3303	3661	}
3304	3662
3305		- undoindex += 1;
	3663	+ tab.undoindex += 1;
3306	3664
3307		- copy = graphs[undoindex];
3308		-
3309		- cameraView.object = copy;
3310		- copy.Touch();
3311		-
3312		- ResetModel();
3313		- refreshContents();
	3665	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3314	3666	}
3315	3667
3316	3668	void ImportGFD()
..	..	@@ -3462,7 +3814,7 @@
3462	3814	assert false;
3463	3815	}
3464	3816
3465		- void EditSelection()
	3817	+ void EditSelection(boolean newWindow)
3466	3818	{
3467	3819	}
3468	3820
..	..	@@ -3957,7 +4309,8 @@
3957	4309
3958	4310	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3959	4311	{
3960		- Save();
	4312	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4313	+ Save();
3961	4314	//Tween.set(thing, 0).target(1).start(tweenManager);
3962	4315	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3963	4316	// if (thing instanceof GenericJointDemo)
..	..	@@ -4044,6 +4397,12 @@
4044	4397	{
4045	4398	ResetModel();
4046	4399	Select(thing.GetTreePath(), true, false); // unselect... false);
	4400	+
	4401	+ if (thing.Size() == 0)
	4402	+ {
	4403	+ //EditSelection(false);
	4404	+ }
	4405	+
4047	4406	refreshContents();
4048	4407	}
4049	4408
..	..	@@ -4181,6 +4540,7 @@
4181	4540
4182	4541	try
4183	4542	{
	4543	+ // Try compressed version first.
4184	4544	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4185	4545	java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
4186	4546	java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
..	..	@@ -4250,6 +4610,12 @@
4250	4610
4251	4611	void LoadIt(Object obj)
4252	4612	{
	4613	+ if (obj == null)
	4614	+ {
	4615	+ // Invalid file
	4616	+ return;
	4617	+ }
	4618	+
4253	4619	System.out.println("Loaded " + obj);
4254	4620	//new Exception().printStackTrace();
4255	4621	Object3D readobj = (Object3D) obj;
..	..	@@ -4259,6 +4625,8 @@
4259	4625
4260	4626	if (readobj != null)
4261	4627	{
	4628	+ if (Globals.SAVEONMAKE)
	4629	+ Save();
4262	4630	try
4263	4631	{
4264	4632	//readobj.deepCopySelf(copy);
..	..	@@ -4436,6 +4804,8 @@
4436	4804	String filename = browser.getFile();
4437	4805	if (filename != null && filename.length() > 0)
4438	4806	{
	4807	+ if (!filename.endsWith(".gfd"))
	4808	+ filename += ".gfd";
4439	4809	lastname = browser.getDirectory() + filename;
4440	4810	save();
4441	4811	}
..	..	@@ -4629,18 +4999,31 @@
4629	4999	CheckboxMenuItem togglePaintItem;
4630	5000	JSplitPane mainPanel;
4631	5001	JScrollPane scrollpane;
	5002	+
4632	5003	JPanel toolbarPanel;
	5004	+
4633	5005	cGridBag treePanel;
	5006	+
4634	5007	JPanel radioPanel;
4635	5008	ButtonGroup buttonGroup;
4636		- cGridBag ctrlPanel;
	5009	+
	5010	+ cGridBag toolboxPanel;
4637	5011	cGridBag materialPanel;
	5012	+ cGridBag ctrlPanel;
	5013	+
4638	5014	JScrollPane infoPanel;
	5015	+
4639	5016	cGridBag optionsPanel;
	5017	+
4640	5018	JTabbedPane objectPanel;
	5019	+ boolean materialFlushed;
	5020	+ Object3D latestObject;
	5021	+
4641	5022	cGridBag XYZPanel;
	5023	+
4642	5024	JSplitPane gridPanel;
4643	5025	JSplitPane bigPanel;
	5026	+
4644	5027	cGridBag bigThree;
4645	5028	cGridBag scenePanel;
4646	5029	cGridBag centralPanel;
..	..	@@ -4755,7 +5138,7 @@
4755	5138	cNumberSlider fogField;
4756	5139	JLabel opacityPowerLabel;
4757	5140	cNumberSlider opacityPowerField;
4758		- JTree jTree;
	5141	+ cTree jTree;
4759	5142	//ObjectUI parent;
4760	5143
4761	5144	cNumberSlider normalpushField;