~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,28 +344,49 @@
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		- menuBar.add(windowMenu = new Menu("File"));
280		- windowMenu.add(loadItem = new MenuItem("Load..."));
281		- windowMenu.add("-");
282		- windowMenu.add(saveItem = new MenuItem("Save"));
283		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	355	+ menuBar.add(fileMenu = new Menu("File"));
	356	+ fileMenu.add(newItem = new MenuItem("New"));
	357	+ fileMenu.add(openItem = new MenuItem("Open..."));
	358	+
	359	+ //oe.menuBar.add(menu = new Menu("Include"));
	360	+ Menu menu = new Menu("Import");
	361	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	362	+ importOBJItem.addActionListener(this);
	363	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	364	+ import3DSItem.addActionListener(this);
	365	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	366	+ importVRMLX3DItem.addActionListener(this);
	367	+ menu.add("-");
	368	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	369	+ importGFDItem.addActionListener(this);
	370	+ fileMenu.add(menu);
	371	+ fileMenu.add("-");
	372	+
	373	+ fileMenu.add(saveItem = new MenuItem("Save"));
	374	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
284	375	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
285		- windowMenu.add("-");
286		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
287		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
288		- windowMenu.add("-");
	376	+ fileMenu.add("-");
	377	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	378	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	379	+ fileMenu.add("-");
289	380	if (client.parent != null)
290	381	{
291		- windowMenu.add(closeItem = new MenuItem("Close"));
	382	+ fileMenu.add(closeItem = new MenuItem("Close"));
292	383	} else
293	384	{
294		- windowMenu.add(closeItem = new MenuItem("Exit"));
	385	+ fileMenu.add(closeItem = new MenuItem("Exit"));
295	386	}
296	387
297		- loadItem.addActionListener(this);
	388	+ newItem.addActionListener(this);
	389	+ openItem.addActionListener(this);
298	390	saveItem.addActionListener(this);
299	391	saveAsItem.addActionListener(this);
300	392	exportAsItem.addActionListener(this);
..	..	@@ -302,101 +394,69 @@
302	394	//povItem.addActionListener(this);
303	395	closeItem.addActionListener(this);
304	396
305		- menuBar.add(cameraMenu = new Menu("View"));
306		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
307		- //zBufferItem.addActionListener(this);
308		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
309		- //normalLensItem.addActionListener(this);
310		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
311		- revertCameraItem.addActionListener(this);
312		-
313		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
314		- toggleFullScreenItem.addItemListener(this);
315		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
316		- cameraMenu.add("-");
317		-
318		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
319		- toggleTextureItem.addItemListener(this);
320		- toggleTextureItem.setState(CameraPane.textureon);
321		-
322		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
323		- toggleSwitchItem.addItemListener(this);
324		- toggleSwitchItem.setState(CameraPane.SWITCH);
325		-
326		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
327		- toggleHandleItem.addItemListener(this);
328		- toggleHandleItem.setState(CameraPane.HANDLES);
329		-
330		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
331		- togglePaintItem.addItemListener(this);
332		- togglePaintItem.setState(CameraPane.PAINTMODE);
333		-
334		- if (Globals.ADVANCED)
335		- {
336		- cameraMenu.add("-");
337		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
338		- toggleLiveItem.addItemListener(this);
339		- toggleLiveItem.setState(Globals.isLIVE());
340		-
341		- cameraMenu.add(stepItem = new MenuItem("Step"));
342		- stepItem.addActionListener(this);
343		- // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
344		- // toggleDLItem.addItemListener(this);
345		- // toggleDLItem.setState(false);
346		-
347		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
348		- toggleRenderItem.addItemListener(this);
349		- toggleRenderItem.setState(!CameraPane.frozen);
350		-
351		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
352		- toggleDebugItem.addItemListener(this);
353		- toggleDebugItem.setState(CameraPane.DEBUG);
354		-
355		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
356		- toggleFrustumItem.addItemListener(this);
357		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
358		-
359		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
360		- toggleFootContactItem.addItemListener(this);
361		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
362		-
363		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
364		- toggleTimelineItem.addItemListener(this);
365		- }
366		-
367		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
368		-// toggleRootItem.addItemListener(this);
369		-// toggleRootItem.setState(false);
370		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
371		-// animationItem.addItemListener(this);
372		-// animationItem.setState(CameraPane.ANIMATION);
373		- cameraMenu.add("-");
374		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
375		- editCameraItem.addActionListener(this);
376		-
377	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	+
378	424	toolbarPanel = new JPanel();
379	425	toolbarPanel.setName("Toolbar");
	426	+
380	427	treePanel = new cGridBag();
381	428	treePanel.setName("Tree");
	429	+
	430	+ editPanel = new cGridBag().setVertical(true);
	431	+ //editPanel.setName("Edit");
	432	+
382	433	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
383		- 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	+
384	442	materialPanel = new cGridBag().setVertical(true);
385		- materialPanel.setName("Material");
	443	+ //materialPanel.setName("Material");
	444	+
386	445	/JTextPane/
387	446	infoarea = createTextPane();
388	447	doc = infoarea.getStyledDocument();
389	448
390	449	infoarea.setEditable(true);
391	450	SetText();
	451	+
392	452	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
393	453	// infoarea.setOpaque(false);
394	454	// //infoarea.setForeground(textcolor);
395	455	// TEXTAREA infoarea.setLineWrap(true);
396	456	// TEXTAREA infoarea.setWrapStyleWord(true);
397	457	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
398		- infoPanel.setPreferredSize(new Dimension(50, 200));
399		- infoPanel.setName("Info");
	458	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	459	+ //infoPanel.setName("Info");
400	460	//infoPanel.setLayout(new BorderLayout());
401	461	//infoPanel.add(createTextPane());
402	462
..	..	@@ -407,7 +467,14 @@
407	467	mainPanel.setDividerSize(9);
408	468	mainPanel.setDividerLocation(0.5); //1.0);
409	469	mainPanel.setResizeWeight(0.5);
410		-
	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	+
411	478	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
412	479	//mainPanel.setLayout(new GridBagLayout());
413	480	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -475,10 +542,10 @@
475	542	e.printStackTrace();
476	543	}
477	544
478		- String selection = infoarea.getText();
479		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
480		- java.awt.datatransfer.Clipboard clipboard =
481		- 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();
482	549	//clipboard.setContents(data, data);
483	550	}
484	551
..	..	@@ -501,13 +568,13 @@
501	568	//SendInfo("Name:", "bold");
502	569	if (sel.GetTextures() != null \|\| debug)
503	570	{
504		- si.SendInfo(sel.toString(), "bold");
	571	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
505	572	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
506	573	if (sel.Size() > 0)
507	574	{
508	575	si.SendInfo("#children = " + sel.Size(), "regular");
509	576	}
510		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	577	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
511	578	if (debug)
512	579	{
513	580	try
..	..	@@ -549,7 +616,7 @@
549	616	}
550	617	if (sel.support != null)
551	618	{
552		- si.SendInfo(" support: " + sel.support, "regular");
	619	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
553	620	}
554	621	if (sel.scriptnode != null)
555	622	{
..	..	@@ -638,21 +705,144 @@
638	705	}
639	706	}
640	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	+
641	766	void ToggleFullScreen()
642	767	{
643		- if (CameraPane.FULLSCREEN)
	768	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	769	+
	770	+ cameraView.ToggleFullScreen();
	771	+
	772	+ if (!CameraPane.FULLSCREEN)
644	773	{
645		- frame.getContentPane().remove(/"Center",/bigThree);
646		- framePanel.add(bigThree);
647		- 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	+
648	797	} else
649	798	{
650		- frame.getContentPane().remove(/"Center",/framePanel);
651		- framePanel.remove(bigThree);
652		- 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);
653	821	}
654		- cameraView.ToggleFullScreen();
	822	+ frame.validate();
655	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	+ }
656	846
657	847	private JTextPane createTextPane()
658	848	{
..	..	@@ -784,6 +974,7 @@
784	974	// NumberSlider vDivsField;
785	975	// JCheckBox endcaps;
786	976	JCheckBox liveCB;
	977	+ JCheckBox selectableCB;
787	978	JCheckBox hideCB;
788	979	JCheckBox link2masterCB;
789	980	JCheckBox markCB;
..	..	@@ -791,7 +982,12 @@
791	982	JCheckBox speedupCB;
792	983	JCheckBox rewindCB;
793	984	JCheckBox flipVCB;
	985	+
	986	+ cCheckBox toggleTextureCB;
	987	+ cCheckBox toggleSwitchCB;
	988	+
794	989	JComboBox texresMenu;
	990	+
795	991	JButton resetButton;
796	992	JButton stepButton;
797	993	JButton stepAllButton;
..	..	@@ -800,9 +996,13 @@
800	996	JButton fasterButton;
801	997	JButton remarkButton;
802	998
	999	+ cGridBag editPanel;
	1000	+ cGridBag editCommandsPanel;
	1001	+
803	1002	cGridBag namePanel;
804	1003	cGridBag setupPanel;
805		- cGridBag commandsPanel;
	1004	+ cGridBag setupPanel2;
	1005	+ cGridBag objectCommandsPanel;
806	1006	cGridBag pushPanel;
807	1007	cGridBag fillPanel;
808	1008
..	..	@@ -974,61 +1174,71 @@
974	1174	namePanel = new cGridBag();
975	1175
976	1176	nameField = AddText(namePanel, copy.GetName());
977		- namePanel.add(nameField);
	1177	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
978	1178	oe.ctrlPanel.add(namePanel);
979	1179
980	1180	oe.ctrlPanel.Return();
981	1181
982		- if (!GroupEditor.allparams)
	1182	+ if (!allparams)
983	1183	return;
984	1184
985	1185	setupPanel = new cGridBag().setVertical(false);
986	1186
987	1187	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
988	1188	liveCB.setToolTipText("Animate object");
	1189	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1190	+ selectableCB.setToolTipText("Make object selectable");
	1191	+// Return();
	1192	+
989	1193	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
990	1194	hideCB.setToolTipText("Hide object");
991		-// Return();
992	1195	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
993		- markCB.setToolTipText("Set the animation target transform");
	1196	+ markCB.setToolTipText("As animation target transform");
994	1197
995		- 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);
996	1203	rewindCB.setToolTipText("Rewind animation");
997	1204
998		- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
999		- randomCB.setToolTipText("Option for switch node");
	1205	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1206	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1000	1207
	1208	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1209	+ link2masterCB.setToolTipText("Attach to support");
	1210	+
1001	1211	if (Globals.ADVANCED)
1002	1212	{
1003		- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
1004		- link2masterCB.setToolTipText("Attach to support");
1005		- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1213	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1006	1214	speedupCB.setToolTipText("Option motion capture");
1007	1215	}
1008	1216
1009	1217	oe.ctrlPanel.add(setupPanel);
1010	1218	oe.ctrlPanel.Return();
	1219	+ oe.ctrlPanel.add(setupPanel2);
	1220	+ oe.ctrlPanel.Return();
1011	1221
1012		- commandsPanel = new cGridBag().setVertical(false);
	1222	+ objectCommandsPanel = new cGridBag().setVertical(false);
1013	1223
1014		- resetButton = AddButton(commandsPanel, "Reset");
	1224	+ resetButton = AddButton(objectCommandsPanel, "Reset");
1015	1225	resetButton.setToolTipText("Jump to frame zero");
1016		- stepButton = AddButton(commandsPanel, "Step");
	1226	+ stepButton = AddButton(objectCommandsPanel, "Step");
1017	1227	stepButton.setToolTipText("Step one frame");
1018	1228	// resetAllButton = AddButton(oe, "Reset All");
1019	1229	// stepAllButton = AddButton(oe, "Step All");
1020	1230	// Return();
1021		- slowerButton = AddButton(commandsPanel, "Slow");
	1231	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1022	1232	slowerButton.setToolTipText("Decrease animation speed");
1023		- fasterButton = AddButton(commandsPanel, "Fast");
	1233	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1024	1234	fasterButton.setToolTipText("Increase animation speed");
1025		- remarkButton = AddButton(commandsPanel, "Remark");
	1235	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1026	1236	remarkButton.setToolTipText("Set the current transform as the target");
1027	1237
1028		- oe.ctrlPanel.add(commandsPanel);
	1238	+ oe.ctrlPanel.add(objectCommandsPanel);
1029	1239	oe.ctrlPanel.Return();
1030	1240
1031		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1241	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
1032	1242	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1033	1243	//Return();
1034	1244
..	..	@@ -1231,8 +1441,11 @@
1231	1441	//worldPanel.setName("World");
1232	1442	centralPanel = new cGridBag();
1233	1443	centralPanel.preferredWidth = 20;
1234		- timelinePanel = new JPanel(new BorderLayout());
1235		- 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);
1236	1449
1237	1450	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1238	1451	cameraPanel.setContinuousLayout(true);
..	..	@@ -1241,7 +1454,10 @@
1241	1454	// cameraPanel.setDividerSize(9);
1242	1455	cameraPanel.setResizeWeight(1.0);
1243	1456
	1457	+ }
	1458	+
1244	1459	centralPanel.add(cameraView);
	1460	+ centralPanel.setFocusable(true);
1245	1461	//frame.setJMenuBar(timelineMenubar);
1246	1462	//centralPanel.add(timelinePanel);
1247	1463
..	..	@@ -1267,6 +1483,7 @@
1267	1483	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1268	1484	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1269	1485	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1486	+ //XYZPanel.setName("XYZ");
1270	1487
1271	1488	/*
1272	1489	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1304,12 +1521,23 @@
1304	1521	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1305	1522	//tmp.setName("Edit");
1306	1523	objectPanel.add(materialPanel);
	1524	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1307	1525	// JPanel north = new JPanel(new BorderLayout());
1308	1526	// north.setName("Edit");
1309	1527	// north.add(ctrlPanel, BorderLayout.NORTH);
1310	1528	// objectPanel.add(north);
1311		- objectPanel.add(ctrlPanel);
1312		- 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"));
1313	1541
1314	1542	/*
1315	1543	aConstraints.gridx = 0;
..	..	@@ -1318,7 +1546,7 @@
1318	1546	aConstraints.gridy += 1;
1319	1547	aConstraints.gridwidth = 1;
1320	1548	mainPanel.add(objectPanel, aConstraints);
1321		- */
	1549	+ */
1322	1550
1323	1551	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1324	1552	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1330,14 +1558,12 @@
1330	1558	scrollpane.addMouseWheelListener(this); // Default not fast enough
1331	1559
1332	1560	/JTabbedPane/ scenePanel = new cGridBag();
1333		- scenePanel.preferredWidth = 6;
	1561	+ scenePanel.preferredWidth = 5;
1334	1562
1335	1563	JTabbedPane tabbedPane = new JTabbedPane();
1336	1564	tabbedPane.add(scrollpane);
1337	1565
1338		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1339		-
1340		- optionsPanel = new cGridBag().setVertical(true);
	1566	+ optionsPanel = new cGridBag().setVertical(false);
1341	1567
1342	1568	optionsPanel.setName("Options");
1343	1569
..	..	@@ -1345,6 +1571,8 @@
1345	1571
1346	1572	tabbedPane.add(optionsPanel);
1347	1573
	1574	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1575	+
1348	1576	scenePanel.add(tabbedPane);
1349	1577
1350	1578	/*
..	..	@@ -1406,9 +1634,9 @@
1406	1634	/**/
1407	1635
1408	1636	bigThree = new cGridBag();
1409		- bigThree.addComponent(scenePanel);
1410	1637	bigThree.addComponent(centralPanel);
1411		- bigThree.addComponent(XYZPanel);
	1638	+ bigThree.addComponent(scenePanel);
	1639	+ //bigThree.addComponent(XYZPanel);
1412	1640
1413	1641	// // SIDE EFFECT!!!
1414	1642	// aConstraints.gridx = 0;
..	..	@@ -1417,9 +1645,9 @@
1417	1645	// aConstraints.gridheight = 1;
1418	1646
1419	1647	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1420		- framePanel.setContinuousLayout(true);
1421		- framePanel.setOneTouchExpandable(true);
1422		- framePanel.setDividerLocation(0.8);
	1648	+ framePanel.setContinuousLayout(false);
	1649	+ framePanel.setOneTouchExpandable(false);
	1650	+ //.setDividerLocation(0.8);
1423	1651	//framePanel.setDividerSize(15);
1424	1652	//framePanel.setResizeWeight(0.15);
1425	1653	framePanel.setName("Frame");
..	..	@@ -1437,9 +1665,14 @@
1437	1665	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1438	1666
1439	1667	frame.setSize(1280, 860);
1440		- frame.setVisible(true);
1441		-
	1668	+
	1669	+ cameraView.requestFocusInWindow();
	1670	+
1442	1671	gridPanel.setDividerLocation(1.0);
	1672	+
	1673	+ frame.validate();
	1674	+
	1675	+ frame.setVisible(true);
1443	1676
1444	1677	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1445	1678	frame.addWindowListener(new WindowAdapter()
..	..	@@ -1526,24 +1759,6 @@
1526	1759	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1527	1760	colorSection.add(texture);
1528	1761
1529		- cGridBag anisoU = new cGridBag();
1530		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1531		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1532		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1533		- colorSection.add(anisoU);
1534		-
1535		- cGridBag anisoV = new cGridBag();
1536		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1537		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1538		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1539		- colorSection.add(anisoV);
1540		-
1541		- cGridBag shadowbias = new cGridBag();
1542		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1543		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1544		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1545		- colorSection.add(shadowbias);
1546		-
1547	1762	panel.add(new JSeparator());
1548	1763
1549	1764	panel.add(colorSection);
..	..	@@ -1593,6 +1808,12 @@
1593	1808	fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1594	1809	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1595	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);
1596	1817
1597	1818	panel.add(new JSeparator());
1598	1819
..	..	@@ -1644,6 +1865,18 @@
1644	1865	// aConstraints.gridy += 1;
1645	1866	// aConstraints.gridwidth = 1;
1646	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	+
1647	1880
1648	1881	panel.add(new JSeparator());
1649	1882
..	..	@@ -1651,35 +1884,35 @@
1651	1884
1652	1885	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1653	1886
1654		- cGridBag globalSection = new cGridBag().setVertical(true);
	1887	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1655	1888
1656	1889	cGridBag camera = new cGridBag();
1657	1890	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1658	1891	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1659	1892	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1660		- globalSection.add(camera);
	1893	+ colorSection.add(camera);
1661	1894
1662	1895	cGridBag ambient = new cGridBag();
1663	1896	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1664	1897	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1665	1898	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1666		- globalSection.add(ambient);
	1899	+ colorSection.add(ambient);
1667	1900
1668	1901	cGridBag backlit = new cGridBag();
1669	1902	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1670	1903	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1671	1904	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1672		- globalSection.add(backlit);
	1905	+ colorSection.add(backlit);
1673	1906
1674	1907	cGridBag opacity = new cGridBag();
1675	1908	opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1676	1909	opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1677	1910	opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1678		- globalSection.add(opacity);
	1911	+ colorSection.add(opacity);
1679	1912
1680		- panel.add(new JSeparator());
	1913	+ //panel.add(new JSeparator());
1681	1914
1682		- panel.add(globalSection);
	1915	+ //panel.add(globalSection);
1683	1916
1684	1917	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1685	1918
..	..	@@ -1786,8 +2019,9 @@
1786	2019	// 3D models
1787	2020	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1788	2021	{
1789		- lastConverter = new com.jmex.model.converters.MaxToJme();
1790		- LoadFile(filename, lastConverter);
	2022	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2023	+ //LoadFile(filename, lastConverter);
	2024	+ LoadObjFile(filename); // New 3ds loader
1791	2025	continue;
1792	2026	}
1793	2027	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1988,6 +2222,7 @@
1988	2222	e2.printStackTrace();
1989	2223	}
1990	2224	}
	2225	+
1991	2226	LoadJMEThread loadThread;
1992	2227
1993	2228	class LoadJMEThread extends Thread
..	..	@@ -2045,6 +2280,7 @@
2045	2280	//LoadFile0(filename, converter);
2046	2281	}
2047	2282	}
	2283	+
2048	2284	LoadOBJThread loadObjThread;
2049	2285
2050	2286	class LoadOBJThread extends Thread
..	..	@@ -2123,19 +2359,19 @@
2123	2359
2124	2360	void LoadObjFile(String fullname)
2125	2361	{
2126		- /*
	2362	+ System.out.println("Loading " + fullname);
	2363	+ /**/
2127	2364	//lastFilename = fullname;
2128	2365	if(loadObjThread == null)
2129	2366	{
2130		- loadObjThread = new LoadOBJThread();
2131		- loadObjThread.start();
	2367	+ loadObjThread = new LoadOBJThread();
	2368	+ loadObjThread.start();
2132	2369	}
2133	2370
2134	2371	loadObjThread.add(fullname);
2135		- */
	2372	+ /**/
2136	2373
2137		- System.out.println("Loading " + fullname);
2138		- makeSomething(new FileObject(fullname, true), true);
	2374	+ //makeSomething(new FileObject(fullname, true), true);
2139	2375	}
2140	2376
2141	2377	void LoadGFDFile(String fullname)
..	..	@@ -2511,6 +2747,7 @@
2511	2747	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2512	2748	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2513	2749	}
	2750	+
2514	2751	//cJME.count++;
2515	2752	//cJME.count %= 12;
2516	2753	if (gc)
..	..	@@ -2694,6 +2931,7 @@
2694	2931	}
2695	2932	}
2696	2933	}
	2934	+
2697	2935	cFileSystemPane FSPane;
2698	2936
2699	2937	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2747,11 +2985,14 @@
2747	2985	}
2748	2986	}
2749	2987	}
	2988	+
2750	2989	freezematerial = false;
2751	2990	}
2752	2991
2753	2992	void SetMaterial(Object3D object)
2754	2993	{
	2994	+ latestObject = object;
	2995	+
2755	2996	cMaterial mat = object.material;
2756	2997
2757	2998	if (mat == null)
..	..	@@ -2863,12 +3104,17 @@
2863	3104	// }
2864	3105
2865	3106	/**/
2866		- if (deselect)
	3107	+ if (deselect \|\| child == null)
2867	3108	{
2868	3109	//group.deselectAll();
2869	3110	//freeze = true;
2870	3111	GetTree().clearSelection();
2871	3112	//freeze = false;
	3113	+
	3114	+ if (child == null)
	3115	+ {
	3116	+ return;
	3117	+ }
2872	3118	}
2873	3119
2874	3120	//group.addSelectee(child);
..	..	@@ -2937,7 +3183,7 @@
2937	3183	cameraView.ToggleDL();
2938	3184	cameraView.repaint();
2939	3185	return;
2940		- } else if (event.getSource() == toggleTextureItem)
	3186	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2941	3187	{
2942	3188	cameraView.ToggleTexture();
2943	3189	// june 2013 copy.HardTouch();
..	..	@@ -2976,9 +3222,9 @@
2976	3222	frame.validate();
2977	3223
2978	3224	return;
2979		- } else if (event.getSource() == toggleSwitchItem)
	3225	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2980	3226	{
2981		- cameraView.ToggleRandom();
	3227	+ cameraView.ToggleSwitch();
2982	3228	cameraView.repaint();
2983	3229	return;
2984	3230	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3006,6 +3252,10 @@
3006	3252	} else if (event.getSource() == liveCB)
3007	3253	{
3008	3254	copy.live ^= true;
	3255	+ return;
	3256	+ } else if (event.getSource() == selectableCB)
	3257	+ {
	3258	+ copy.dontselect ^= true;
3009	3259	return;
3010	3260	} else if (event.getSource() == hideCB)
3011	3261	{
..	..	@@ -3045,8 +3295,9 @@
3045	3295
3046	3296	public void actionPerformed(ActionEvent event)
3047	3297	{
	3298	+ Object source = event.getSource();
3048	3299	// SCRIPT DIALOG
3049		- if (event.getSource() == okbutton)
	3300	+ if (source == okbutton)
3050	3301	{
3051	3302	textpanel.setVisible(false);
3052	3303	textpanel.remove(textarea);
..	..	@@ -3058,7 +3309,7 @@
3058	3309	textarea = null;
3059	3310	textpanel = null;
3060	3311	}
3061		- if (event.getSource() == cancelbutton)
	3312	+ if (source == cancelbutton)
3062	3313	{
3063	3314	textpanel.setVisible(false);
3064	3315	textpanel.remove(textarea);
..	..	@@ -3070,50 +3321,50 @@
3070	3321	//applySelf();
3071	3322	//client.refreshEditWindow();
3072	3323	//refreshContents();
3073		- if (event.getSource() == nameField)
	3324	+ if (source == nameField)
3074	3325	{
3075	3326	//System.out.println("ObjEditor " + event);
3076	3327	applySelf0(true);
3077	3328	//parent.applySelf();
3078	3329	objEditor.refreshContents();
3079		- } else if (event.getSource() == resetButton)
	3330	+ } else if (source == resetButton)
3080	3331	{
3081	3332	CameraPane.fullreset = true;
3082	3333	copy.Reset(); // ResetMeshes();
3083	3334	copy.Touch();
3084	3335	objEditor.refreshContents();
3085		- } else if (event.getSource() == stepItem)
	3336	+ } else if (source == stepItem)
3086	3337	{
3087	3338	//cameraView.ONESTEP = true;
3088	3339	Globals.ONESTEP = true;
3089	3340	cameraView.repaint();
3090	3341	return;
3091		- } else if (event.getSource() == stepButton)
	3342	+ } else if (source == stepButton)
3092	3343	{
3093	3344	copy.Step();
3094	3345	copy.Touch();
3095	3346	objEditor.refreshContents();
3096		- } else if (event.getSource() == slowerButton)
	3347	+ } else if (source == slowerButton)
3097	3348	{
3098	3349	copy.Slower();
3099	3350	copy.Touch();
3100	3351	objEditor.refreshContents();
3101		- } else if (event.getSource() == fasterButton)
	3352	+ } else if (source == fasterButton)
3102	3353	{
3103	3354	copy.Faster();
3104	3355	copy.Touch();
3105	3356	objEditor.refreshContents();
3106		- } else if (event.getSource() == remarkButton)
	3357	+ } else if (source == remarkButton)
3107	3358	{
3108	3359	copy.Remark();
3109	3360	copy.Touch();
3110	3361	objEditor.refreshContents();
3111		- } else if (event.getSource() == stepAllButton)
	3362	+ } else if (source == stepAllButton)
3112	3363	{
3113	3364	copy.StepAll();
3114	3365	copy.Touch();
3115	3366	objEditor.refreshContents();
3116		- } else if (event.getSource() == resetAllButton)
	3367	+ } else if (source == resetAllButton)
3117	3368	{
3118	3369	//CameraPane.fullreset = true;
3119	3370	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3146,53 +3397,79 @@
3146	3397	// Close();
3147	3398	// }
3148	3399	// else
3149		- if (event.getSource() == resetSlidersButton)
	3400	+ if (source == resetSlidersButton)
3150	3401	{
3151	3402	ResetSliders();
3152		- } else if (event.getSource() == clearMaterialButton)
	3403	+ } else if (source == clearMaterialButton)
3153	3404	{
3154	3405	ClearMaterial();
3155		- } else if (event.getSource() == createMaterialButton)
	3406	+ } else if (source == createMaterialButton)
3156	3407	{
3157	3408	CreateMaterial();
3158		- } else if (event.getSource() == clearPanelButton)
	3409	+ } else if (source == clearPanelButton)
3159	3410	{
3160	3411	copy.ClearUI();
3161	3412	refreshContents(true);
3162		- } /*
3163		- }
3164		-
3165		- public boolean action(Event event, Object arg)
3166		- {
3167		- */ else if (event.getSource() == closeItem)
	3413	+ } else if (source == importGFDItem)
	3414	+ {
	3415	+ ImportGFD();
	3416	+ } else
	3417	+ if (source == importVRMLX3DItem)
	3418	+ {
	3419	+ ImportVRMLX3D();
	3420	+ } else
	3421	+ if (source == import3DSItem)
	3422	+ {
	3423	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3424	+ } else
	3425	+ if (source == importOBJItem)
	3426	+ {
	3427	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3428	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3429	+ browser.setVisible(true);
	3430	+ String filename = browser.getFile();
	3431	+ if (filename != null && filename.length() > 0)
	3432	+ {
	3433	+ String fullname = browser.getDirectory() + filename;
	3434	+ makeSomething(ReadOBJ(fullname), true);
	3435	+ }
	3436	+ } else
	3437	+ if (source == closeItem)
3168	3438	{
3169	3439	Close();
3170	3440	//return true;
3171		- } else if (event.getSource() == loadItem)
	3441	+ } else if (source == openItem)
3172	3442	{
3173		- load();
	3443	+ Open();
3174	3444	//return true;
3175		- } else if (event.getSource() == saveItem)
	3445	+ } else if (source == newItem)
	3446	+ {
	3447	+ New();
	3448	+ } else if (source == saveItem)
3176	3449	{
3177	3450	save();
3178	3451	//return true;
3179		- } else if (event.getSource() == saveAsItem)
	3452	+ } else if (source == saveAsItem)
3180	3453	{
3181	3454	saveAs();
3182	3455	//return true;
3183		- } else if (event.getSource() == reexportItem)
	3456	+ } else if (source == reexportItem)
3184	3457	{
3185	3458	reexport();
3186	3459	//return true;
3187		- } else if (event.getSource() == exportAsItem)
	3460	+ } else if (source == exportAsItem)
3188	3461	{
3189	3462	export();
3190	3463	//return true;
3191		- } else if (event.getSource() == povItem)
	3464	+ } else if (source == povItem)
3192	3465	{
3193	3466	generatePOV();
3194	3467	//return true;
3195		- } else if (event.getSource() == zBufferItem)
	3468	+ } else if (event.getSource() == archiveItem)
	3469	+ {
	3470	+ cTools.Archive(frame);
	3471	+ return;
	3472	+ } else if (source == zBufferItem)
3196	3473	{
3197	3474	try
3198	3475	{
..	..	@@ -3214,21 +3491,8 @@
3214	3491	cameraView.repaint();
3215	3492	//return true;
3216	3493	}
3217		- */ else if (event.getSource() == editCameraItem)
3218		- {
3219		- cameraView.ProtectCamera();
3220		- cameraView.repaint();
3221		- return;
3222		- } else if (event.getSource() == revertCameraItem)
3223		- {
3224		- cameraView.RevertCamera();
3225		- cameraView.repaint();
3226		- return;
3227		-// } else if (event.getSource() == textureButton)
3228		-// {
3229		-// return; // true;
3230		- } else // combos...
3231		- if (event.getSource() == texresMenu)
	3494	+ */ else // combos...
	3495	+ if (source == texresMenu)
3232	3496	{
3233	3497	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3234	3498	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3240,6 +3504,403 @@
3240	3504	}
3241	3505	}
3242	3506
	3507	+ void New()
	3508	+ {
	3509	+ while (copy.Size() > 1)
	3510	+ {
	3511	+ copy.remove(1);
	3512	+ }
	3513	+
	3514	+ ResetModel();
	3515	+ objEditor.refreshContents();
	3516	+ }
	3517	+
	3518	+ static public byte[] Compress(Object3D o)
	3519	+ {
	3520	+ try
	3521	+ {
	3522	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3523	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3524	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	3525	+
	3526	+ Object3D parent = o.parent;
	3527	+ o.parent = null;
	3528	+
	3529	+ out.writeObject(o);
	3530	+
	3531	+ o.parent = parent;
	3532	+
	3533	+ out.flush();
	3534	+
	3535	+ baos //zstream
	3536	+ .close();
	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	+
	3564	+ return obj;
	3565	+ } catch (Exception e)
	3566	+ {
	3567	+ System.err.println(e);
	3568	+ return null;
	3569	+ }
	3570	+ }
	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	+
	3617	+ public void Save()
	3618	+ {
	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	+ }
	3656	+
	3657	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3658	+ if (!thesame)
	3659	+ {
	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++;
	3667	+ }
	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	+
	3681	+ // test save
	3682	+ if (false)
	3683	+ {
	3684	+ try
	3685	+ {
	3686	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	3687	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3688	+
	3689	+ p.writeObject(copy);
	3690	+
	3691	+ p.flush();
	3692	+
	3693	+ ostream.close();
	3694	+ } catch (Exception e)
	3695	+ {
	3696	+ e.printStackTrace();
	3697	+ }
	3698	+ }
	3699	+
	3700	+ return !thesame;
	3701	+ }
	3702	+
	3703	+ void CopyChanged(Object3D obj)
	3704	+ {
	3705	+ SetUndoStates();
	3706	+
	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	+
	3725	+ copy.Touch();
	3726	+
	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	+
	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;
	3849	+ }
	3850	+
	3851	+ public void Redo()
	3852	+ {
	3853	+ // Option?
	3854	+ Replace();
	3855	+
	3856	+ cRadio tab = GetCurrentTab();
	3857	+
	3858	+ if (copy.versions[copy.versionindex + 1] == null)
	3859	+ {
	3860	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3861	+ return;
	3862	+ }
	3863	+
	3864	+ copy.versionindex += 1;
	3865	+
	3866	+ CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3867	+
	3868	+ //if (!tab.user[tab.versionindex])
	3869	+ // tab.graphs[tab.versionindex] = null;
	3870	+ }
	3871	+
	3872	+ void ImportGFD()
	3873	+ {
	3874	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3875	+ browser.show();
	3876	+ String filename = browser.getFile();
	3877	+ if (filename != null && filename.length() > 0)
	3878	+ {
	3879	+ String fullname = browser.getDirectory() + filename;
	3880	+
	3881	+ //Object3D readobj =
	3882	+ objEditor.ReadGFD(fullname, objEditor);
	3883	+ //makeSomething(readobj);
	3884	+ }
	3885	+ }
	3886	+
	3887	+ void ImportVRMLX3D()
	3888	+ {
	3889	+ if (Grafreed.standAlone)
	3890	+ {
	3891	+ /**/
	3892	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3893	+ browser.show();
	3894	+ String filename = browser.getFile();
	3895	+ if (filename != null && filename.length() > 0)
	3896	+ {
	3897	+ String fullname = browser.getDirectory() + filename;
	3898	+ LoadVRMLX3D(fullname);
	3899	+ }
	3900	+ /**/
	3901	+ }
	3902	+ }
	3903	+
3243	3904	void ToggleAnimation()
3244	3905	{
3245	3906	if (!Globals.ANIMATION)
..	..	@@ -3357,7 +4018,7 @@
3357	4018	assert false;
3358	4019	}
3359	4020
3360		- void EditSelection()
	4021	+ void EditSelection(boolean newWindow)
3361	4022	{
3362	4023	}
3363	4024
..	..	@@ -3501,9 +4162,25 @@
3501	4162	//copy.Touch();
3502	4163	}
3503	4164
	4165	+ cNumberSlider versionSlider;
	4166	+
3504	4167	public void stateChanged(ChangeEvent e)
3505	4168	{
3506	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	+ }
3507	4184
3508	4185	if (freezematerial)
3509	4186	{
..	..	@@ -3588,7 +4265,7 @@
3588	4265	}
3589	4266
3590	4267	if (normalpushField != null)
3591		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4268	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3592	4269	}
3593	4270
3594	4271	void SnapObject()
..	..	@@ -3852,6 +4529,8 @@
3852	4529
3853	4530	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3854	4531	{
	4532	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	4533	+ Save();
3855	4534	//Tween.set(thing, 0).target(1).start(tweenManager);
3856	4535	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3857	4536	// if (thing instanceof GenericJointDemo)
..	..	@@ -3938,6 +4617,12 @@
3938	4617	{
3939	4618	ResetModel();
3940	4619	Select(thing.GetTreePath(), true, false); // unselect... false);
	4620	+
	4621	+ if (thing.Size() == 0)
	4622	+ {
	4623	+ //EditSelection(false);
	4624	+ }
	4625	+
3941	4626	refreshContents();
3942	4627	}
3943	4628
..	..	@@ -4055,6 +4740,7 @@
4055	4740	}
4056	4741	}
4057	4742	}
	4743	+
4058	4744	LoadGFDThread loadGFDThread;
4059	4745
4060	4746	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4074,8 +4760,10 @@
4074	4760
4075	4761	try
4076	4762	{
	4763	+ // Try compressed version first.
4077	4764	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4078		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4765	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4766	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4079	4767
4080	4768	readobj = (Object3D) p.readObject();
4081	4769	istream.close();
..	..	@@ -4083,7 +4771,22 @@
4083	4771	readobj.ResetDisplayList();
4084	4772	} catch (Exception e)
4085	4773	{
4086		- e.printStackTrace();
	4774	+ if (!e.toString().contains("GZIP"))
	4775	+ e.printStackTrace();
	4776	+
	4777	+ try
	4778	+ {
	4779	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4780	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4781	+
	4782	+ readobj = (Object3D) p.readObject();
	4783	+ istream.close();
	4784	+
	4785	+ readobj.ResetDisplayList();
	4786	+ } catch (Exception e2)
	4787	+ {
	4788	+ e2.printStackTrace();
	4789	+ }
4087	4790	}
4088	4791	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4089	4792	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4129,6 +4832,12 @@
4129	4832
4130	4833	void LoadIt(Object obj)
4131	4834	{
	4835	+ if (obj == null)
	4836	+ {
	4837	+ // Invalid file
	4838	+ return;
	4839	+ }
	4840	+
4132	4841	System.out.println("Loaded " + obj);
4133	4842	//new Exception().printStackTrace();
4134	4843	Object3D readobj = (Object3D) obj;
..	..	@@ -4138,10 +4847,14 @@
4138	4847
4139	4848	if (readobj != null)
4140	4849	{
	4850	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4851	+ // Save();
4141	4852	try
4142	4853	{
4143	4854	//readobj.deepCopySelf(copy);
4144	4855	copy.clear(); // june 2014
	4856	+ copy.skyboxname = readobj.skyboxname;
	4857	+ copy.skyboxext = readobj.skyboxext;
4145	4858	for (int i = 0; i < readobj.size(); i++)
4146	4859	{
4147	4860	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4182,6 +4895,7 @@
4182	4895	}
4183	4896	} catch (ClassCastException e)
4184	4897	{
	4898	+ e.printStackTrace();
4185	4899	assert (false);
4186	4900	Composite c = (Composite) copy;
4187	4901	c.children.clear();
..	..	@@ -4192,13 +4906,24 @@
4192	4906	c.addChild(csg);
4193	4907	}
4194	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	+
4195	4920	ResetModel();
4196	4921	copy.HardTouch(); // recompile?
4197	4922	refreshContents();
4198	4923	}
4199	4924	}
4200	4925
4201		- void load() // throws ClassNotFoundException
	4926	+ void Open() // throws ClassNotFoundException
4202	4927	{
4203	4928	if (Grafreed.standAlone)
4204	4929	{
..	..	@@ -4287,11 +5012,13 @@
4287	5012	try
4288	5013	{
4289	5014	FileOutputStream ostream = new FileOutputStream(lastname);
4290		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5015	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5016	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4291	5017
4292	5018	p.writeObject(copy);
4293	5019	p.flush();
4294	5020
	5021	+ zstream.close();
4295	5022	ostream.close();
4296	5023
4297	5024	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4299,8 +5026,10 @@
4299	5026	//ps.print(buffer.toString());
4300	5027	} catch (IOException e)
4301	5028	{
	5029	+ e.printStackTrace();
4302	5030	}
4303	5031	}
	5032	+
4304	5033	String lastname;
4305	5034
4306	5035	void saveAs()
..	..	@@ -4312,6 +5041,8 @@
4312	5041	String filename = browser.getFile();
4313	5042	if (filename != null && filename.length() > 0)
4314	5043	{
	5044	+ if (!filename.endsWith(".gfd"))
	5045	+ filename += ".gfd";
4315	5046	lastname = browser.getDirectory() + filename;
4316	5047	save();
4317	5048	}
..	..	@@ -4410,8 +5141,8 @@
4410	5141	try
4411	5142	{
4412	5143	FileOutputStream ostream = new FileOutputStream(filename);
4413		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4414		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5144	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5145	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4415	5146
4416	5147	Object3D objectparent = obj.parent;
4417	5148	obj.parent = null;
..	..	@@ -4428,8 +5159,8 @@
4428	5159	p.writeObject(object);
4429	5160	p.flush();
4430	5161
	5162	+ zstream.close();
4431	5163	ostream.close();
4432		- // zstream.close();
4433	5164
4434	5165	// group.selection.get(0).parent = parent;
4435	5166	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4476,19 +5207,18 @@
4476	5207	Object3D client;
4477	5208	Object3D copy;
4478	5209	MenuBar menuBar;
4479		- Menu windowMenu;
4480		- MenuItem loadItem;
	5210	+ Menu fileMenu;
	5211	+ MenuItem newItem;
	5212	+ MenuItem openItem;
4481	5213	MenuItem saveItem;
4482	5214	MenuItem saveAsItem;
4483	5215	MenuItem exportAsItem;
4484	5216	MenuItem reexportItem;
4485	5217	MenuItem povItem;
4486	5218	MenuItem closeItem;
4487		- Menu cameraMenu;
	5219	+
4488	5220	CheckboxMenuItem zBufferItem;
4489	5221	//MenuItem normalLensItem;
4490		- MenuItem editCameraItem;
4491		- MenuItem revertCameraItem;
4492	5222	MenuItem stepItem;
4493	5223	CheckboxMenuItem toggleLiveItem;
4494	5224	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4502,22 +5232,36 @@
4502	5232	CheckboxMenuItem toggleSwitchItem;
4503	5233	CheckboxMenuItem toggleRootItem;
4504	5234	CheckboxMenuItem animationItem;
	5235	+ MenuItem archiveItem;
4505	5236	CheckboxMenuItem toggleHandleItem;
4506	5237	CheckboxMenuItem togglePaintItem;
4507	5238	JSplitPane mainPanel;
4508	5239	JScrollPane scrollpane;
	5240	+
4509	5241	JPanel toolbarPanel;
	5242	+
4510	5243	cGridBag treePanel;
	5244	+
4511	5245	JPanel radioPanel;
4512	5246	ButtonGroup buttonGroup;
4513		- cGridBag ctrlPanel;
	5247	+
	5248	+ cGridBag toolboxPanel;
4514	5249	cGridBag materialPanel;
	5250	+ cGridBag ctrlPanel;
	5251	+
4515	5252	JScrollPane infoPanel;
	5253	+
4516	5254	cGridBag optionsPanel;
	5255	+
4517	5256	JTabbedPane objectPanel;
	5257	+ boolean materialFlushed;
	5258	+ Object3D latestObject;
	5259	+
4518	5260	cGridBag XYZPanel;
	5261	+
4519	5262	JSplitPane gridPanel;
4520	5263	JSplitPane bigPanel;
	5264	+
4521	5265	cGridBag bigThree;
4522	5266	cGridBag scenePanel;
4523	5267	cGridBag centralPanel;
..	..	@@ -4632,8 +5376,13 @@
4632	5376	cNumberSlider fogField;
4633	5377	JLabel opacityPowerLabel;
4634	5378	cNumberSlider opacityPowerField;
4635		- JTree jTree;
	5379	+ cTree jTree;
4636	5380	//ObjectUI parent;
4637	5381
4638	5382	cNumberSlider normalpushField;
	5383	+
	5384	+ private MenuItem importGFDItem;
	5385	+ private MenuItem importVRMLX3DItem;
	5386	+ private MenuItem import3DSItem;
	5387	+ private MenuItem importOBJItem;
4639	5388	}