~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);
..	..	@@ -168,7 +247,8 @@
168	247	// objEditor.ctrlPanel.remove(remarkButton);
169	248
170	249	objEditor.ctrlPanel.remove(setupPanel);
171		- objEditor.ctrlPanel.remove(commandsPanel);
	250	+ objEditor.ctrlPanel.remove(setupPanel2);
	251	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
172	252	objEditor.ctrlPanel.remove(pushPanel);
173	253	//objEditor.ctrlPanel.remove(fillPanel);
174	254
..	..	@@ -216,6 +296,12 @@
216	296	client = inClient;
217	297	copy = client;
218	298
	299	+ if (copy.versions == null)
	300	+ {
	301	+ copy.versions = new Object3D[100];
	302	+ copy.versionindex = -1;
	303	+ }
	304	+
219	305	// "this" is not called: SetupUI2(objEditor);
220	306	}
221	307
..	..	@@ -229,6 +315,12 @@
229	315	client = inClient;
230	316	copy = client;
231	317
	318	+ if (copy.versions == null)
	319	+ {
	320	+ copy.versions = new Object3D[100];
	321	+ copy.versionindex = -1;
	322	+ }
	323	+
232	324	SetupUI2(callee.GetEditor());
233	325	}
234	326
..	..	@@ -243,6 +335,7 @@
243	335	//localCopy.parent = null;
244	336
245	337	frame = new JFrame();
	338	+ frame.setUndecorated(false);
246	339	objEditor = this;
247	340	this.callee = callee;
248	341
..	..	@@ -260,6 +353,12 @@
260	353	copy = localCopy;
261	354	copy.editWindow = this;
262	355
	356	+ if (copy.versions == null)
	357	+ {
	358	+// copy.versions = new byte[100][];
	359	+// copy.versionindex = -1;
	360	+ }
	361	+
263	362	SetupMenu();
264	363
265	364	//SetupName(objEditor); // new
..	..	@@ -273,12 +372,17 @@
273	372	return frame.action(event, obj);
274	373	}
275	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	+
276	380	void SetupMenu()
277	381	{
278	382	frame.setMenuBar(menuBar = new MenuBar());
279	383	menuBar.add(fileMenu = new Menu("File"));
280	384	fileMenu.add(newItem = new MenuItem("New"));
281		- fileMenu.add(loadItem = new MenuItem("Load..."));
	385	+ fileMenu.add(openItem = new MenuItem("Open..."));
282	386
283	387	//oe.menuBar.add(menu = new Menu("Include"));
284	388	Menu menu = new Menu("Import");
..	..	@@ -310,7 +414,7 @@
310	414	}
311	415
312	416	newItem.addActionListener(this);
313		- loadItem.addActionListener(this);
	417	+ openItem.addActionListener(this);
314	418	saveItem.addActionListener(this);
315	419	saveAsItem.addActionListener(this);
316	420	exportAsItem.addActionListener(this);
..	..	@@ -319,28 +423,68 @@
319	423	closeItem.addActionListener(this);
320	424
321	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	+
322	452	toolbarPanel = new JPanel();
323	453	toolbarPanel.setName("Toolbar");
	454	+
324	455	treePanel = new cGridBag();
325	456	treePanel.setName("Tree");
	457	+
	458	+ editPanel = new cGridBag().setVertical(true);
	459	+ //editPanel.setName("Edit");
	460	+
326	461	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
327		- 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	+
328	470	materialPanel = new cGridBag().setVertical(true);
329		- materialPanel.setName("Material");
	471	+ //materialPanel.setName("Material");
	472	+
330	473	/JTextPane/
331	474	infoarea = createTextPane();
332	475	doc = infoarea.getStyledDocument();
333	476
334	477	infoarea.setEditable(true);
335	478	SetText();
	479	+
336	480	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
337	481	// infoarea.setOpaque(false);
338	482	// //infoarea.setForeground(textcolor);
339	483	// TEXTAREA infoarea.setLineWrap(true);
340	484	// TEXTAREA infoarea.setWrapStyleWord(true);
341	485	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");
	486	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	487	+ //infoPanel.setName("Info");
344	488	//infoPanel.setLayout(new BorderLayout());
345	489	//infoPanel.add(createTextPane());
346	490
..	..	@@ -351,7 +495,14 @@
351	495	mainPanel.setDividerSize(9);
352	496	mainPanel.setDividerLocation(0.5); //1.0);
353	497	mainPanel.setResizeWeight(0.5);
354		-
	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	+
355	506	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
356	507	//mainPanel.setLayout(new GridBagLayout());
357	508	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -419,10 +570,10 @@
419	570	e.printStackTrace();
420	571	}
421	572
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();
	573	+// String selection = infoarea.getText();
	574	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	575	+// java.awt.datatransfer.Clipboard clipboard =
	576	+// Toolkit.getDefaultToolkit().getSystemClipboard();
426	577	//clipboard.setContents(data, data);
427	578	}
428	579
..	..	@@ -582,21 +733,145 @@
582	733	}
583	734	}
584	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	+
585	794	void ToggleFullScreen()
586	795	{
587		- if (CameraPane.FULLSCREEN)
	796	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	797	+
	798	+ cameraView.ToggleFullScreen();
	799	+
	800	+ if (!CameraPane.FULLSCREEN)
588	801	{
589		- frame.getContentPane().remove(/"Center",/bigThree);
590		- framePanel.add(bigThree);
591		- 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	+
592	825	} else
593	826	{
594		- frame.getContentPane().remove(/"Center",/framePanel);
595		- framePanel.remove(bigThree);
596		- 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);
597	849	}
598		- cameraView.ToggleFullScreen();
	850	+ frame.validate();
599	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	+ }
600	875
601	876	private JTextPane createTextPane()
602	877	{
..	..	@@ -728,7 +1003,7 @@
728	1003	// NumberSlider vDivsField;
729	1004	// JCheckBox endcaps;
730	1005	JCheckBox liveCB;
731		- JCheckBox selectCB;
	1006	+ JCheckBox selectableCB;
732	1007	JCheckBox hideCB;
733	1008	JCheckBox link2masterCB;
734	1009	JCheckBox markCB;
..	..	@@ -736,7 +1011,12 @@
736	1011	JCheckBox speedupCB;
737	1012	JCheckBox rewindCB;
738	1013	JCheckBox flipVCB;
	1014	+
	1015	+ cCheckBox toggleTextureCB;
	1016	+ cCheckBox toggleSwitchCB;
	1017	+
739	1018	JComboBox texresMenu;
	1019	+
740	1020	JButton resetButton;
741	1021	JButton stepButton;
742	1022	JButton stepAllButton;
..	..	@@ -745,9 +1025,13 @@
745	1025	JButton fasterButton;
746	1026	JButton remarkButton;
747	1027
	1028	+ cGridBag editPanel;
	1029	+ cGridBag editCommandsPanel;
	1030	+
748	1031	cGridBag namePanel;
749	1032	cGridBag setupPanel;
750		- cGridBag commandsPanel;
	1033	+ cGridBag setupPanel2;
	1034	+ cGridBag objectCommandsPanel;
751	1035	cGridBag pushPanel;
752	1036	cGridBag fillPanel;
753	1037
..	..	@@ -919,60 +1203,68 @@
919	1203	namePanel = new cGridBag();
920	1204
921	1205	nameField = AddText(namePanel, copy.GetName());
922		- namePanel.add(nameField);
	1206	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
923	1207	oe.ctrlPanel.add(namePanel);
924	1208
925	1209	oe.ctrlPanel.Return();
926	1210
927		- if (!GroupEditor.allparams)
	1211	+ if (!allparams)
928	1212	return;
929	1213
930	1214	setupPanel = new cGridBag().setVertical(false);
931	1215
932	1216	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
933	1217	liveCB.setToolTipText("Animate object");
934		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
935		- selectCB.setToolTipText("Make object selectable");
	1218	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1219	+ selectableCB.setToolTipText("Make object selectable");
936	1220	// Return();
	1221	+
937	1222	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
938	1223	hideCB.setToolTipText("Hide object");
939	1224	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
940		- markCB.setToolTipText("Set the animation target transform");
	1225	+ markCB.setToolTipText("As animation target transform");
941	1226
942		- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	1227	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1228	+
	1229	+ setupPanel2 = new cGridBag().setVertical(false);
	1230	+
	1231	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
943	1232	rewindCB.setToolTipText("Rewind animation");
944	1233
945		- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
946		- randomCB.setToolTipText("Option for switch node");
	1234	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1235	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
947	1236
	1237	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1238	+ link2masterCB.setToolTipText("Attach to support");
	1239	+
948	1240	if (Globals.ADVANCED)
949	1241	{
950		- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
951		- link2masterCB.setToolTipText("Attach to support");
952		- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1242	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
953	1243	speedupCB.setToolTipText("Option motion capture");
954	1244	}
955	1245
956	1246	oe.ctrlPanel.add(setupPanel);
957	1247	oe.ctrlPanel.Return();
	1248	+ oe.ctrlPanel.add(setupPanel2);
	1249	+ oe.ctrlPanel.Return();
958	1250
959		- commandsPanel = new cGridBag().setVertical(false);
	1251	+ objectCommandsPanel = new cGridBag().setVertical(false);
960	1252
961		- resetButton = AddButton(commandsPanel, "Reset");
	1253	+ resetButton = AddButton(objectCommandsPanel, "Reset");
962	1254	resetButton.setToolTipText("Jump to frame zero");
963		- stepButton = AddButton(commandsPanel, "Step");
	1255	+ stepButton = AddButton(objectCommandsPanel, "Step");
964	1256	stepButton.setToolTipText("Step one frame");
965	1257	// resetAllButton = AddButton(oe, "Reset All");
966	1258	// stepAllButton = AddButton(oe, "Step All");
967	1259	// Return();
968		- slowerButton = AddButton(commandsPanel, "Slow");
	1260	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
969	1261	slowerButton.setToolTipText("Decrease animation speed");
970		- fasterButton = AddButton(commandsPanel, "Fast");
	1262	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
971	1263	fasterButton.setToolTipText("Increase animation speed");
972		- remarkButton = AddButton(commandsPanel, "Remark");
	1264	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
973	1265	remarkButton.setToolTipText("Set the current transform as the target");
974	1266
975		- oe.ctrlPanel.add(commandsPanel);
	1267	+ oe.ctrlPanel.add(objectCommandsPanel);
976	1268	oe.ctrlPanel.Return();
977	1269
978	1270	pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
..	..	@@ -1178,8 +1470,11 @@
1178	1470	//worldPanel.setName("World");
1179	1471	centralPanel = new cGridBag();
1180	1472	centralPanel.preferredWidth = 20;
1181		- timelinePanel = new JPanel(new BorderLayout());
1182		- 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);
1183	1478
1184	1479	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1185	1480	cameraPanel.setContinuousLayout(true);
..	..	@@ -1188,7 +1483,10 @@
1188	1483	// cameraPanel.setDividerSize(9);
1189	1484	cameraPanel.setResizeWeight(1.0);
1190	1485
	1486	+ }
	1487	+
1191	1488	centralPanel.add(cameraView);
	1489	+ centralPanel.setFocusable(true);
1192	1490	//frame.setJMenuBar(timelineMenubar);
1193	1491	//centralPanel.add(timelinePanel);
1194	1492
..	..	@@ -1214,6 +1512,7 @@
1214	1512	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1215	1513	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1216	1514	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1515	+ //XYZPanel.setName("XYZ");
1217	1516
1218	1517	/*
1219	1518	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1251,12 +1550,29 @@
1251	1550	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1252	1551	//tmp.setName("Edit");
1253	1552	objectPanel.add(materialPanel);
	1553	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1554	+ objectPanel.setToolTipTextAt(0, "Material panel");
	1555	+
1254	1556	// JPanel north = new JPanel(new BorderLayout());
1255	1557	// north.setName("Edit");
1256	1558	// north.add(ctrlPanel, BorderLayout.NORTH);
1257	1559	// objectPanel.add(north);
1258		- objectPanel.add(ctrlPanel);
1259		- 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");
1260	1576
1261	1577	/*
1262	1578	aConstraints.gridx = 0;
..	..	@@ -1265,7 +1581,7 @@
1265	1581	aConstraints.gridy += 1;
1266	1582	aConstraints.gridwidth = 1;
1267	1583	mainPanel.add(objectPanel, aConstraints);
1268		- */
	1584	+ */
1269	1585
1270	1586	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1271	1587	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1277,14 +1593,12 @@
1277	1593	scrollpane.addMouseWheelListener(this); // Default not fast enough
1278	1594
1279	1595	/JTabbedPane/ scenePanel = new cGridBag();
1280		- scenePanel.preferredWidth = 6;
	1596	+ scenePanel.preferredWidth = 5;
1281	1597
1282	1598	JTabbedPane tabbedPane = new JTabbedPane();
1283	1599	tabbedPane.add(scrollpane);
1284	1600
1285		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1286		-
1287		- optionsPanel = new cGridBag().setVertical(true);
	1601	+ optionsPanel = new cGridBag().setVertical(false);
1288	1602
1289	1603	optionsPanel.setName("Options");
1290	1604
..	..	@@ -1292,6 +1606,8 @@
1292	1606
1293	1607	tabbedPane.add(optionsPanel);
1294	1608
	1609	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1610	+
1295	1611	scenePanel.add(tabbedPane);
1296	1612
1297	1613	/*
..	..	@@ -1355,7 +1671,7 @@
1355	1671	bigThree = new cGridBag();
1356	1672	bigThree.addComponent(scenePanel);
1357	1673	bigThree.addComponent(centralPanel);
1358		- bigThree.addComponent(XYZPanel);
	1674	+ //bigThree.addComponent(XYZPanel);
1359	1675
1360	1676	// // SIDE EFFECT!!!
1361	1677	// aConstraints.gridx = 0;
..	..	@@ -1364,9 +1680,9 @@
1364	1680	// aConstraints.gridheight = 1;
1365	1681
1366	1682	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1367		- framePanel.setContinuousLayout(true);
1368		- framePanel.setOneTouchExpandable(true);
1369		- framePanel.setDividerLocation(0.8);
	1683	+ framePanel.setContinuousLayout(false);
	1684	+ framePanel.setOneTouchExpandable(false);
	1685	+ //.setDividerLocation(0.8);
1370	1686	//framePanel.setDividerSize(15);
1371	1687	//framePanel.setResizeWeight(0.15);
1372	1688	framePanel.setName("Frame");
..	..	@@ -1384,14 +1700,18 @@
1384	1700	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1385	1701
1386	1702	frame.setSize(1280, 860);
1387		- frame.setVisible(true);
1388		-
	1703	+
	1704	+ cameraView.requestFocusInWindow();
	1705	+
1389	1706	gridPanel.setDividerLocation(1.0);
	1707	+
	1708	+ frame.validate();
	1709	+
	1710	+ frame.setVisible(true);
1390	1711
1391	1712	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1392	1713	frame.addWindowListener(new WindowAdapter()
1393	1714	{
1394		-
1395	1715	public void windowClosing(WindowEvent e)
1396	1716	{
1397	1717	Close();
..	..	@@ -1453,45 +1773,48 @@
1453	1773	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1454	1774
1455	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);
1456	1787
1457	1788	cGridBag color = new cGridBag();
1458		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1459		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1460		- 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	+
1461	1794	//colorField.preferredWidth = 200;
1462	1795	colorSection.add(color);
1463	1796
1464	1797	cGridBag modulation = new cGridBag();
1465	1798	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1466	1799	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1467		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1800	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1468	1801	colorSection.add(modulation);
1469	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	+
1470	1811	cGridBag texture = new cGridBag();
1471	1812	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1472	1813	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1473	1814	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1474	1815	colorSection.add(texture);
1475	1816
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		- panel.add(new JSeparator());
	1817	+ panel.add(GetSeparator());
1495	1818
1496	1819	panel.add(colorSection);
1497	1820
..	..	@@ -1541,7 +1864,13 @@
1541	1864	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1542	1865	diffuseSection.add(fakedepth);
1543	1866
1544		- 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());
1545	1874
1546	1875	panel.add(diffuseSection);
1547	1876
..	..	@@ -1591,42 +1920,48 @@
1591	1920	// aConstraints.gridy += 1;
1592	1921	// aConstraints.gridwidth = 1;
1593	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);
1594	1928
1595		- 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());
1596	1937
1597	1938	panel.add(specularSection);
1598	1939
1599	1940	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1600	1941
1601		- cGridBag globalSection = new cGridBag().setVertical(true);
	1942	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1602	1943
1603	1944	cGridBag camera = new cGridBag();
1604	1945	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1605	1946	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1606	1947	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1607		- globalSection.add(camera);
	1948	+ colorSection.add(camera);
1608	1949
1609	1950	cGridBag ambient = new cGridBag();
1610	1951	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1611	1952	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1612	1953	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1613		- globalSection.add(ambient);
	1954	+ colorSection.add(ambient);
1614	1955
1615	1956	cGridBag backlit = new cGridBag();
1616	1957	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1617	1958	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1618	1959	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1619		- globalSection.add(backlit);
	1960	+ colorSection.add(backlit);
1620	1961
1621		- cGridBag opacity = new cGridBag();
1622		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1623		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1624		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1625		- globalSection.add(opacity);
1626		-
1627		- panel.add(new JSeparator());
	1962	+ //panel.add(new JSeparator());
1628	1963
1629		- panel.add(globalSection);
	1964	+ //panel.add(globalSection);
1630	1965
1631	1966	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1632	1967
..	..	@@ -1668,7 +2003,7 @@
1668	2003	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1669	2004	textureSection.add(opacityPower);
1670	2005
1671		- panel.add(new JSeparator());
	2006	+ panel.add(GetSeparator());
1672	2007
1673	2008	panel.add(textureSection);
1674	2009
..	..	@@ -1733,8 +2068,9 @@
1733	2068	// 3D models
1734	2069	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1735	2070	{
1736		- lastConverter = new com.jmex.model.converters.MaxToJme();
1737		- LoadFile(filename, lastConverter);
	2071	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2072	+ //LoadFile(filename, lastConverter);
	2073	+ LoadObjFile(filename); // New 3ds loader
1738	2074	continue;
1739	2075	}
1740	2076	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -2072,19 +2408,19 @@
2072	2408
2073	2409	void LoadObjFile(String fullname)
2074	2410	{
2075		- /*
	2411	+ System.out.println("Loading " + fullname);
	2412	+ /**/
2076	2413	//lastFilename = fullname;
2077	2414	if(loadObjThread == null)
2078	2415	{
2079		- loadObjThread = new LoadOBJThread();
2080		- loadObjThread.start();
	2416	+ loadObjThread = new LoadOBJThread();
	2417	+ loadObjThread.start();
2081	2418	}
2082	2419
2083	2420	loadObjThread.add(fullname);
2084		- */
	2421	+ /**/
2085	2422
2086		- System.out.println("Loading " + fullname);
2087		- makeSomething(new FileObject(fullname, true), true);
	2423	+ //makeSomething(new FileObject(fullname, true), true);
2088	2424	}
2089	2425
2090	2426	void LoadGFDFile(String fullname)
..	..	@@ -2460,6 +2796,7 @@
2460	2796	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2461	2797	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2462	2798	}
	2799	+
2463	2800	//cJME.count++;
2464	2801	//cJME.count %= 12;
2465	2802	if (gc)
..	..	@@ -2643,6 +2980,7 @@
2643	2980	}
2644	2981	}
2645	2982	}
	2983	+
2646	2984	cFileSystemPane FSPane;
2647	2985
2648	2986	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2696,11 +3034,14 @@
2696	3034	}
2697	3035	}
2698	3036	}
	3037	+
2699	3038	freezematerial = false;
2700	3039	}
2701	3040
2702	3041	void SetMaterial(Object3D object)
2703	3042	{
	3043	+ latestObject = object;
	3044	+
2704	3045	cMaterial mat = object.material;
2705	3046
2706	3047	if (mat == null)
..	..	@@ -2812,12 +3153,17 @@
2812	3153	// }
2813	3154
2814	3155	/**/
2815		- if (deselect)
	3156	+ if (deselect \|\| child == null)
2816	3157	{
2817	3158	//group.deselectAll();
2818	3159	//freeze = true;
2819	3160	GetTree().clearSelection();
2820	3161	//freeze = false;
	3162	+
	3163	+ if (child == null)
	3164	+ {
	3165	+ return;
	3166	+ }
2821	3167	}
2822	3168
2823	3169	//group.addSelectee(child);
..	..	@@ -2886,7 +3232,7 @@
2886	3232	cameraView.ToggleDL();
2887	3233	cameraView.repaint();
2888	3234	return;
2889		- } else if (event.getSource() == toggleTextureItem)
	3235	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2890	3236	{
2891	3237	cameraView.ToggleTexture();
2892	3238	// june 2013 copy.HardTouch();
..	..	@@ -2925,9 +3271,9 @@
2925	3271	frame.validate();
2926	3272
2927	3273	return;
2928		- } else if (event.getSource() == toggleSwitchItem)
	3274	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2929	3275	{
2930		- cameraView.ToggleRandom();
	3276	+ cameraView.ToggleSwitch();
2931	3277	cameraView.repaint();
2932	3278	return;
2933	3279	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2956,7 +3302,7 @@
2956	3302	{
2957	3303	copy.live ^= true;
2958	3304	return;
2959		- } else if (event.getSource() == selectCB)
	3305	+ } else if (event.getSource() == selectableCB)
2960	3306	{
2961	3307	copy.dontselect ^= true;
2962	3308	return;
..	..	@@ -3141,9 +3487,9 @@
3141	3487	{
3142	3488	Close();
3143	3489	//return true;
3144		- } else if (source == loadItem)
	3490	+ } else if (source == openItem)
3145	3491	{
3146		- load();
	3492	+ Open();
3147	3493	//return true;
3148	3494	} else if (source == newItem)
3149	3495	{
..	..	@@ -3168,6 +3514,10 @@
3168	3514	{
3169	3515	generatePOV();
3170	3516	//return true;
	3517	+ } else if (event.getSource() == archiveItem)
	3518	+ {
	3519	+ cTools.Archive(frame);
	3520	+ return;
3171	3521	} else if (source == zBufferItem)
3172	3522	{
3173	3523	try
..	..	@@ -3214,6 +3564,61 @@
3214	3564	objEditor.refreshContents();
3215	3565	}
3216	3566
	3567	+ static public byte[] Compress(Object3D o)
	3568	+ {
	3569	+ // Slower to actually compress.
	3570	+ try
	3571	+ {
	3572	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3573	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3574	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	3575	+
	3576	+ Object3D parent = o.parent;
	3577	+ o.parent = null;
	3578	+
	3579	+ out.writeObject(o);
	3580	+
	3581	+ o.parent = parent;
	3582	+
	3583	+ out.flush();
	3584	+
	3585	+ baos //zstream
	3586	+ .close();
	3587	+ out.close();
	3588	+
	3589	+ byte[] bytes = baos.toByteArray();
	3590	+
	3591	+ System.out.println("save #bytes = " + bytes.length);
	3592	+ return bytes;
	3593	+ } catch (Exception e)
	3594	+ {
	3595	+ System.err.println(e);
	3596	+ return null;
	3597	+ }
	3598	+ }
	3599	+
	3600	+ static public Object Uncompress(byte[] bytes)
	3601	+ {
	3602	+ System.out.println("restore #bytes = " + bytes.length);
	3603	+ try
	3604	+ {
	3605	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3606	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3607	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	3608	+ Object obj = in.readObject();
	3609	+
	3610	+ bais //istream
	3611	+ .close();
	3612	+ in.close();
	3613	+
	3614	+ return obj;
	3615	+ } catch (Exception e)
	3616	+ {
	3617	+ System.err.println(e);
	3618	+ return null;
	3619	+ }
	3620	+ }
	3621	+
3217	3622	static public Object clone(Object o)
3218	3623	{
3219	3624	try
..	..	@@ -3222,12 +3627,19 @@
3222	3627	ObjectOutputStream out = new ObjectOutputStream(baos);
3223	3628
3224	3629	out.writeObject(o);
	3630	+
	3631	+ out.flush();
	3632	+ out.close();
	3633	+
	3634	+ byte[] bytes = baos.toByteArray();
	3635	+
	3636	+ System.out.println("clone = " + bytes.length);
3225	3637
3226		- ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
	3638	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3227	3639	ObjectInputStream in = new ObjectInputStream(bais);
3228	3640	Object obj = in.readObject();
3229	3641	in.close();
3230		- out.close();
	3642	+
3231	3643	return obj;
3232	3644	} catch (Exception e)
3233	3645	{
..	..	@@ -3251,24 +3663,76 @@
3251	3663	return null;
3252	3664	}
3253	3665
	3666	+
3254	3667	public void Save()
3255	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	+
3256	3695	cRadio tab = GetCurrentTab();
3257	3696
	3697	+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace".
	3698	+
	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	+// }
	3705	+
3258	3706	//EditorFrame.m_MainFrame.requestFocusInWindow();
3259		- tab.graphs[tab.undoindex++] = (Object3D)clone(copy);
3260		-
3261		- for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3707	+ if (!thesame)
3262	3708	{
3263		- 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++;
3264	3716	}
3265	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	+
3266	3730	// test save
3267	3731	if (false)
3268	3732	{
3269	3733	try
3270	3734	{
3271		- FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3735	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
3272	3736	ObjectOutputStream p = new ObjectOutputStream(ostream);
3273	3737
3274	3738	p.writeObject(copy);
..	..	@@ -3281,16 +3745,34 @@
3281	3745	e.printStackTrace();
3282	3746	}
3283	3747	}
	3748	+
	3749	+ return !thesame;
3284	3750	}
3285	3751
3286	3752	void CopyChanged(Object3D obj)
3287	3753	{
	3754	+ SetUndoStates();
	3755	+
	3756	+ boolean temp = CameraPane.SWITCH;
	3757	+ CameraPane.SWITCH = false;
	3758	+
	3759	+ copy.ExtractBigData(versiontable);
	3760	+
3288	3761	copy.clear();
3289	3762
	3763	+ copy.skyboxname = obj.skyboxname;
	3764	+ copy.skyboxext = obj.skyboxext;
	3765	+
3290	3766	for (int i=0; i<obj.Size(); i++)
3291	3767	{
3292	3768	copy.add(obj.get(i));
3293	3769	}
	3770	+
	3771	+ copy.RestoreBigData(versiontable);
	3772	+
	3773	+ CameraPane.SWITCH = temp;
	3774	+
	3775	+ //assert(hashtable.isEmpty());
3294	3776
3295	3777	copy.Touch();
3296	3778
..	..	@@ -3313,40 +3795,131 @@
3313	3795	refreshContents();
3314	3796	}
3315	3797
3316		- 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()
3317	3819	{
3318	3820	cRadio tab = GetCurrentTab();
3319	3821
3320		- 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)
3321	3844	{
3322	3845	java.awt.Toolkit.getDefaultToolkit().beep();
3323		- return;
	3846	+ return false;
3324	3847	}
3325	3848
3326		- 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)
3327	3876	{
3328		- Save();
3329		- tab.undoindex -= 1;
	3877	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3878	+ return false;
3330	3879	}
3331	3880
3332		- tab.undoindex -= 1;
	3881	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3882	+ CopyChanged(copy.versions[copy.versionindex]);
	3883	+
	3884	+ return true;
	3885	+ }
3333	3886
3334		- CopyChanged(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;
3335	3902	}
3336	3903
3337	3904	public void Redo()
3338	3905	{
	3906	+ // Option?
	3907	+ Replace();
	3908	+
3339	3909	cRadio tab = GetCurrentTab();
3340	3910
3341		- if (tab.graphs[tab.undoindex + 1] == null)
	3911	+ if (copy.versions[copy.versionindex + 1] == null)
3342	3912	{
3343	3913	java.awt.Toolkit.getDefaultToolkit().beep();
3344	3914	return;
3345	3915	}
3346	3916
3347		- tab.undoindex += 1;
	3917	+ copy.versionindex += 1;
3348	3918
3349		- CopyChanged(tab.graphs[tab.undoindex]);
	3919	+ CopyChanged(copy.versions[copy.versionindex]);
	3920	+
	3921	+ //if (!tab.user[tab.versionindex])
	3922	+ // tab.graphs[tab.versionindex] = null;
3350	3923	}
3351	3924
3352	3925	void ImportGFD()
..	..	@@ -3498,7 +4071,7 @@
3498	4071	assert false;
3499	4072	}
3500	4073
3501		- void EditSelection()
	4074	+ void EditSelection(boolean newWindow)
3502	4075	{
3503	4076	}
3504	4077
..	..	@@ -3642,9 +4215,25 @@
3642	4215	//copy.Touch();
3643	4216	}
3644	4217
	4218	+ cNumberSlider versionSlider;
	4219	+
3645	4220	public void stateChanged(ChangeEvent e)
3646	4221	{
3647	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	+ }
3648	4237
3649	4238	if (freezematerial)
3650	4239	{
..	..	@@ -3993,7 +4582,8 @@
3993	4582
3994	4583	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3995	4584	{
3996		- Save();
	4585	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	4586	+ Save();
3997	4587	//Tween.set(thing, 0).target(1).start(tweenManager);
3998	4588	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3999	4589	// if (thing instanceof GenericJointDemo)
..	..	@@ -4080,6 +4670,12 @@
4080	4670	{
4081	4671	ResetModel();
4082	4672	Select(thing.GetTreePath(), true, false); // unselect... false);
	4673	+
	4674	+ if (thing.Size() == 0)
	4675	+ {
	4676	+ //EditSelection(false);
	4677	+ }
	4678	+
4083	4679	refreshContents();
4084	4680	}
4085	4681
..	..	@@ -4217,6 +4813,7 @@
4217	4813
4218	4814	try
4219	4815	{
	4816	+ // Try compressed version first.
4220	4817	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4221	4818	java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
4222	4819	java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
..	..	@@ -4227,7 +4824,9 @@
4227	4824	readobj.ResetDisplayList();
4228	4825	} catch (Exception e)
4229	4826	{
4230		- //e.printStackTrace();
	4827	+ if (!e.toString().contains("GZIP"))
	4828	+ e.printStackTrace();
	4829	+
4231	4830	try
4232	4831	{
4233	4832	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4286,6 +4885,12 @@
4286	4885
4287	4886	void LoadIt(Object obj)
4288	4887	{
	4888	+ if (obj == null)
	4889	+ {
	4890	+ // Invalid file
	4891	+ return;
	4892	+ }
	4893	+
4289	4894	System.out.println("Loaded " + obj);
4290	4895	//new Exception().printStackTrace();
4291	4896	Object3D readobj = (Object3D) obj;
..	..	@@ -4295,10 +4900,14 @@
4295	4900
4296	4901	if (readobj != null)
4297	4902	{
	4903	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4904	+ // Save();
4298	4905	try
4299	4906	{
4300	4907	//readobj.deepCopySelf(copy);
4301	4908	copy.clear(); // june 2014
	4909	+ copy.skyboxname = readobj.skyboxname;
	4910	+ copy.skyboxext = readobj.skyboxext;
4302	4911	for (int i = 0; i < readobj.size(); i++)
4303	4912	{
4304	4913	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4339,6 +4948,7 @@
4339	4948	}
4340	4949	} catch (ClassCastException e)
4341	4950	{
	4951	+ e.printStackTrace();
4342	4952	assert (false);
4343	4953	Composite c = (Composite) copy;
4344	4954	c.children.clear();
..	..	@@ -4349,13 +4959,24 @@
4349	4959	c.addChild(csg);
4350	4960	}
4351	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	+
4352	4973	ResetModel();
4353	4974	copy.HardTouch(); // recompile?
4354	4975	refreshContents();
4355	4976	}
4356	4977	}
4357	4978
4358		- void load() // throws ClassNotFoundException
	4979	+ void Open() // throws ClassNotFoundException
4359	4980	{
4360	4981	if (Grafreed.standAlone)
4361	4982	{
..	..	@@ -4458,6 +5079,7 @@
4458	5079	//ps.print(buffer.toString());
4459	5080	} catch (IOException e)
4460	5081	{
	5082	+ e.printStackTrace();
4461	5083	}
4462	5084	}
4463	5085
..	..	@@ -4472,6 +5094,8 @@
4472	5094	String filename = browser.getFile();
4473	5095	if (filename != null && filename.length() > 0)
4474	5096	{
	5097	+ if (!filename.endsWith(".gfd"))
	5098	+ filename += ".gfd";
4475	5099	lastname = browser.getDirectory() + filename;
4476	5100	save();
4477	5101	}
..	..	@@ -4638,7 +5262,7 @@
4638	5262	MenuBar menuBar;
4639	5263	Menu fileMenu;
4640	5264	MenuItem newItem;
4641		- MenuItem loadItem;
	5265	+ MenuItem openItem;
4642	5266	MenuItem saveItem;
4643	5267	MenuItem saveAsItem;
4644	5268	MenuItem exportAsItem;
..	..	@@ -4661,22 +5285,36 @@
4661	5285	CheckboxMenuItem toggleSwitchItem;
4662	5286	CheckboxMenuItem toggleRootItem;
4663	5287	CheckboxMenuItem animationItem;
	5288	+ MenuItem archiveItem;
4664	5289	CheckboxMenuItem toggleHandleItem;
4665	5290	CheckboxMenuItem togglePaintItem;
4666	5291	JSplitPane mainPanel;
4667	5292	JScrollPane scrollpane;
	5293	+
4668	5294	JPanel toolbarPanel;
	5295	+
4669	5296	cGridBag treePanel;
	5297	+
4670	5298	JPanel radioPanel;
4671	5299	ButtonGroup buttonGroup;
4672		- cGridBag ctrlPanel;
	5300	+
	5301	+ cGridBag toolboxPanel;
4673	5302	cGridBag materialPanel;
	5303	+ cGridBag ctrlPanel;
	5304	+
4674	5305	JScrollPane infoPanel;
	5306	+
4675	5307	cGridBag optionsPanel;
	5308	+
4676	5309	JTabbedPane objectPanel;
	5310	+ boolean materialFlushed;
	5311	+ Object3D latestObject;
	5312	+
4677	5313	cGridBag XYZPanel;
	5314	+
4678	5315	JSplitPane gridPanel;
4679	5316	JSplitPane bigPanel;
	5317	+
4680	5318	cGridBag bigThree;
4681	5319	cGridBag scenePanel;
4682	5320	cGridBag centralPanel;
..	..	@@ -4791,7 +5429,7 @@
4791	5429	cNumberSlider fogField;
4792	5430	JLabel opacityPowerLabel;
4793	5431	cNumberSlider opacityPowerField;
4794		- JTree jTree;
	5432	+ cTree jTree;
4795	5433	//ObjectUI parent;
4796	5434
4797	5435	cNumberSlider normalpushField;