~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -36,6 +36,8 @@
36	36	GroupEditor callee;
37	37	JFrame frame;
38	38
	39	+ static ObjEditor theFrame;
	40	+
39	41	// SCRIPT
40	42
41	43	transient JFrame textpanel = null;
..	..	@@ -143,6 +145,8 @@
143	145	//nameField.removeActionListener(this);
144	146	// objEditor.ctrlPanel.remove(nameField);
145	147
	148	+ objEditor.ctrlPanel.remove(namePanel);
	149	+
146	150	if (!GroupEditor.allparams)
147	151	return;
148	152
..	..	@@ -165,9 +169,9 @@
165	169	// objEditor.ctrlPanel.remove(fasterButton);
166	170	// objEditor.ctrlPanel.remove(remarkButton);
167	171
168		- objEditor.ctrlPanel.remove(namePanel);
169	172	objEditor.ctrlPanel.remove(setupPanel);
170		- objEditor.ctrlPanel.remove(commandsPanel);
	173	+ objEditor.ctrlPanel.remove(setupPanel2);
	174	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
171	175	objEditor.ctrlPanel.remove(pushPanel);
172	176	//objEditor.ctrlPanel.remove(fillPanel);
173	177
..	..	@@ -242,6 +246,7 @@
242	246	//localCopy.parent = null;
243	247
244	248	frame = new JFrame();
	249	+ frame.setUndecorated(true);
245	250	objEditor = this;
246	251	this.callee = callee;
247	252
..	..	@@ -275,24 +280,40 @@
275	280	void SetupMenu()
276	281	{
277	282	frame.setMenuBar(menuBar = new MenuBar());
278		- menuBar.add(windowMenu = new Menu("File"));
279		- windowMenu.add(loadItem = new MenuItem("Load..."));
280		- windowMenu.add("-");
281		- windowMenu.add(saveItem = new MenuItem("Save"));
282		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	283	+ menuBar.add(fileMenu = new Menu("File"));
	284	+ fileMenu.add(newItem = new MenuItem("New"));
	285	+ fileMenu.add(loadItem = new MenuItem("Open..."));
	286	+
	287	+ //oe.menuBar.add(menu = new Menu("Include"));
	288	+ Menu menu = new Menu("Import");
	289	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	290	+ importOBJItem.addActionListener(this);
	291	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	292	+ import3DSItem.addActionListener(this);
	293	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	294	+ importVRMLX3DItem.addActionListener(this);
	295	+ menu.add("-");
	296	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	297	+ importGFDItem.addActionListener(this);
	298	+ fileMenu.add(menu);
	299	+ fileMenu.add("-");
	300	+
	301	+ fileMenu.add(saveItem = new MenuItem("Save"));
	302	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
283	303	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
284		- windowMenu.add("-");
285		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
286		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
287		- windowMenu.add("-");
	304	+ fileMenu.add("-");
	305	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	306	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	307	+ fileMenu.add("-");
288	308	if (client.parent != null)
289	309	{
290		- windowMenu.add(closeItem = new MenuItem("Close"));
	310	+ fileMenu.add(closeItem = new MenuItem("Close"));
291	311	} else
292	312	{
293		- windowMenu.add(closeItem = new MenuItem("Exit"));
	313	+ fileMenu.add(closeItem = new MenuItem("Exit"));
294	314	}
295	315
	316	+ newItem.addActionListener(this);
296	317	loadItem.addActionListener(this);
297	318	saveItem.addActionListener(this);
298	319	saveAsItem.addActionListener(this);
..	..	@@ -301,79 +322,35 @@
301	322	//povItem.addActionListener(this);
302	323	closeItem.addActionListener(this);
303	324
304		- menuBar.add(cameraMenu = new Menu("View"));
305		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
306		- //zBufferItem.addActionListener(this);
307		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
308		- //normalLensItem.addActionListener(this);
309		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
310		- revertCameraItem.addActionListener(this);
311		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
312		- toggleTimelineItem.addItemListener(this);
313		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
314		- toggleFullScreenItem.addItemListener(this);
315		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
316		- cameraMenu.add("-");
317		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
318		- toggleTextureItem.addItemListener(this);
319		- toggleTextureItem.setState(CameraPane.textureon);
320		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
321		- toggleLiveItem.addItemListener(this);
322		- toggleLiveItem.setState(Globals.isLIVE());
323		- cameraMenu.add(stepItem = new MenuItem("Step"));
324		- stepItem.addActionListener(this);
325		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
326		-// toggleDLItem.addItemListener(this);
327		-// toggleDLItem.setState(false);
328		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
329		- toggleRenderItem.addItemListener(this);
330		- toggleRenderItem.setState(!CameraPane.frozen);
331		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
332		- toggleDebugItem.addItemListener(this);
333		- toggleDebugItem.setState(CameraPane.DEBUG);
334		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
335		- toggleFrustumItem.addItemListener(this);
336		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
337		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
338		- toggleFootContactItem.addItemListener(this);
339		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
340		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
341		- toggleRandomItem.addItemListener(this);
342		- toggleRandomItem.setState(CameraPane.RANDOM);
343		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
344		- toggleHandleItem.addItemListener(this);
345		- toggleHandleItem.setState(CameraPane.HANDLES);
346		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
347		- togglePaintItem.addItemListener(this);
348		- togglePaintItem.setState(CameraPane.PAINTMODE);
349		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
350		-// toggleRootItem.addItemListener(this);
351		-// toggleRootItem.setState(false);
352		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
353		-// animationItem.addItemListener(this);
354		-// animationItem.setState(CameraPane.ANIMATION);
355		- cameraMenu.add("-");
356		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
357		- editCameraItem.addActionListener(this);
358		-
359	325	objectPanel = new JTabbedPane();
360	326	toolbarPanel = new JPanel();
361	327	toolbarPanel.setName("Toolbar");
362		- treePanel = new JPanel();
	328	+ treePanel = new cGridBag();
363	329	treePanel.setName("Tree");
	330	+
	331	+ editPanel = new cGridBag().setVertical(true);
	332	+ editPanel.setName("Edit");
	333	+
364	334	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
365		- ctrlPanel.setName("Edit");
	335	+
	336	+ editCommandsPanel = new cGridBag();
	337	+ editPanel.add(editCommandsPanel);
	338	+ editPanel.add(ctrlPanel);
	339	+
366	340	materialPanel = new cGridBag().setVertical(true);
	341	+
367	342	materialPanel.setName("Material");
368	343	/JTextPane/
369	344	infoarea = createTextPane();
	345	+ doc = infoarea.getStyledDocument();
	346	+
370	347	infoarea.setEditable(true);
371	348	SetText();
372	349	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
373	350	// infoarea.setOpaque(false);
374	351	// //infoarea.setForeground(textcolor);
375		- infoarea.setLineWrap(true);
376		- infoarea.setWrapStyleWord(true);
	352	+// TEXTAREA infoarea.setLineWrap(true);
	353	+// TEXTAREA infoarea.setWrapStyleWord(true);
377	354	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
378	355	infoPanel.setPreferredSize(new Dimension(50, 200));
379	356	infoPanel.setName("Info");
..	..	@@ -384,14 +361,14 @@
384	361	mainPanel.setName("Main");
385	362	mainPanel.setContinuousLayout(true);
386	363	mainPanel.setOneTouchExpandable(true);
387		- mainPanel.setDividerLocation(1.0);
388	364	mainPanel.setDividerSize(9);
389		- mainPanel.setResizeWeight(0);
	365	+ mainPanel.setDividerLocation(0.5); //1.0);
	366	+ mainPanel.setResizeWeight(0.5);
390	367
391	368	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
392	369	//mainPanel.setLayout(new GridBagLayout());
393	370	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
394		- treePanel.setLayout(new GridBagLayout());
	371	+// treePanel.setLayout(new GridBagLayout());
395	372	//ctrlPanel.setLayout(new GridBagLayout());
396	373	//materialPanel.setLayout(new GridBagLayout());
397	374
..	..	@@ -432,7 +409,7 @@
432	409	static String newline = "\n";
433	410	protected static final String buttonString = "JButton";
434	411	StyledDocument doc;
435		- JTextArea infoarea;
	412	+ JTextPane infoarea;
436	413
437	414	void ClearInfo()
438	415	{
..	..	@@ -455,10 +432,10 @@
455	432	e.printStackTrace();
456	433	}
457	434
458		- String selection = infoarea.getText();
459		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
460		- java.awt.datatransfer.Clipboard clipboard =
461		- Toolkit.getDefaultToolkit().getSystemClipboard();
	435	+// String selection = infoarea.getText();
	436	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	437	+// java.awt.datatransfer.Clipboard clipboard =
	438	+// Toolkit.getDefaultToolkit().getSystemClipboard();
462	439	//clipboard.setContents(data, data);
463	440	}
464	441
..	..	@@ -481,13 +458,13 @@
481	458	//SendInfo("Name:", "bold");
482	459	if (sel.GetTextures() != null \|\| debug)
483	460	{
484		- si.SendInfo(sel.toString(), "bold");
	461	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
485	462	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
486	463	if (sel.Size() > 0)
487	464	{
488	465	si.SendInfo("#children = " + sel.Size(), "regular");
489	466	}
490		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	467	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
491	468	if (debug)
492	469	{
493	470	try
..	..	@@ -499,7 +476,10 @@
499	476	}
500	477
501	478	if (full)
502		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	479	+ {
	480	+ si.SendInfo(" BBox min: " + minima, "regular");
	481	+ si.SendInfo(" BBox max: " + maxima, "regular");
	482	+ }
503	483
504	484	if (sel.bRep != null)
505	485	{
..	..	@@ -526,7 +506,7 @@
526	506	}
527	507	if (sel.support != null)
528	508	{
529		- si.SendInfo(" support: " + sel.support, "regular");
	509	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
530	510	}
531	511	if (sel.scriptnode != null)
532	512	{
..	..	@@ -597,6 +577,9 @@
597	577	{
598	578	CameraPane.pointflow = (PointFlow) sel;
599	579	}
	580	+
	581	+ si.SendInfo("_____________________", "regular");
	582	+ si.SendInfo("", "regular");
600	583	}
601	584	}
602	585
..	..	@@ -612,68 +595,138 @@
612	595	}
613	596	}
614	597
	598	+static GraphicsDevice device = GraphicsEnvironment
	599	+ .getLocalGraphicsEnvironment().getScreenDevices()[0];
	600	+
	601	+ Rectangle keeprect;
	602	+ cRadio radio;
	603	+
	604	+cButton keepButton;
	605	+ cButton twoButton; // Full 3D
	606	+ cButton sixButton;
	607	+ cButton threeButton;
	608	+ cButton sevenButton;
	609	+ cButton fourButton; // full panel
	610	+ cButton oneButton; // full XYZ
	611	+ //cButton currentLayout;
	612	+
	613	+ boolean maximized;
	614	+
	615	+ void Minimize()
	616	+ {
	617	+ frame.setState(Frame.ICONIFIED);
	618	+ }
	619	+
	620	+ void Maximize()
	621	+ {
	622	+ if (maximized)
	623	+ {
	624	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	625	+ }
	626	+ else
	627	+ {
	628	+ keeprect = frame.getBounds();
	629	+ Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	630	+ Dimension rect2 = frame.getToolkit().getScreenSize();
	631	+ frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	632	+// frame.setState(Frame.MAXIMIZED_BOTH);
	633	+ }
	634	+
	635	+ maximized ^= true;
	636	+ }
	637	+
615	638	void ToggleFullScreen()
616	639	{
617	640	if (CameraPane.FULLSCREEN)
618	641	{
619		- frame.getContentPane().remove(/"Center",/bigThree);
620		- framePanel.add(bigThree);
621		- frame.getContentPane().add(/"Center",/framePanel);
	642	+ device.setFullScreenWindow(null);
	643	+ //frame.setVisible(false);
	644	+// frame.removeNotify();
	645	+// frame.setUndecorated(false);
	646	+// frame.addNotify();
	647	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	648	+
	649	+// X frame.getContentPane().remove(/"Center",/bigThree);
	650	+// X framePanel.add(bigThree);
	651	+// X frame.getContentPane().add(/"Center",/framePanel);
	652	+ framePanel.setDividerLocation(1);
	653	+
	654	+ //frame.setVisible(true);
	655	+ radio.layout = keepButton;
	656	+ //theFrame = null;
	657	+ keepButton = null;
	658	+ radio.layout.doClick();
	659	+
622	660	} else
623	661	{
624		- frame.getContentPane().remove(/"Center",/framePanel);
625		- framePanel.remove(bigThree);
626		- frame.getContentPane().add(/"Center",/bigThree);
	662	+ keepButton = radio.layout;
	663	+ //keeprect = frame.getBounds();
	664	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	665	+// frame.getToolkit().getScreenSize().height);
	666	+ //frame.setVisible(false);
	667	+ device.setFullScreenWindow(frame);
	668	+// frame.removeNotify();
	669	+// frame.setUndecorated(true);
	670	+// frame.addNotify();
	671	+// X frame.getContentPane().remove(/"Center",/framePanel);
	672	+// X framePanel.remove(bigThree);
	673	+// X frame.getContentPane().add(/"Center",/bigThree);
	674	+ framePanel.setDividerLocation(0);
	675	+
	676	+ radio.layout = twoButton;
	677	+ radio.layout.doClick();
	678	+ //frame.setVisible(true);
627	679	}
	680	+
628	681	cameraView.ToggleFullScreen();
629	682	}
630	683
631		- private JTextArea createTextPane()
	684	+ private JTextPane createTextPane()
632	685	{
633		- String[] initString =
634		- {
635		- "This is an editable JTextPane, ", //regular
636		- "another ", //italic
637		- "styled ", //bold
638		- "text ", //small
639		- "component, ", //large
640		- "which supports embedded components..." + newline,//regular
641		- " " + newline, //button
642		- "...and embedded icons..." + newline, //regular
643		- " ", //icon
644		- newline + "JTextPane is a subclass of JEditorPane that "
645		- + "uses a StyledEditorKit and StyledDocument, and provides "
646		- + "cover methods for interacting with those objects."
647		- };
	686	+// TEXTAREA String[] initString =
	687	+// {
	688	+// "This is an editable JTextPane, ", //regular
	689	+// "another ", //italic
	690	+// "styled ", //bold
	691	+// "text ", //small
	692	+// "component, ", //large
	693	+// "which supports embedded components..." + newline,//regular
	694	+// " " + newline, //button
	695	+// "...and embedded icons..." + newline, //regular
	696	+// " ", //icon
	697	+// newline + "JTextPane is a subclass of JEditorPane that "
	698	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	699	+// + "cover methods for interacting with those objects."
	700	+// };
	701	+//
	702	+// String[] initStyles =
	703	+// {
	704	+// "regular", "italic", "bold", "small", "large",
	705	+// "regular", "button", "regular", "icon",
	706	+// "regular"
	707	+// };
	708	+//
	709	+// JTextPane textPane = new JTextPane();
	710	+// textPane.setEditable(true);
	711	+// /StyledDocument/ doc = textPane.getStyledDocument();
	712	+// addStylesToDocument(doc);
	713	+//
	714	+// try
	715	+// {
	716	+// for (int j = 0; j < 2; j++)
	717	+// {
	718	+// for (int i = 0; i < initString.length; i++)
	719	+// {
	720	+// doc.insertString(doc.getLength(), initString[i],
	721	+// doc.getStyle(initStyles[i]));
	722	+// }
	723	+// }
	724	+// } catch (BadLocationException ble)
	725	+// {
	726	+// System.err.println("Couldn't insert initial text into text pane.");
	727	+// }
648	728
649		- String[] initStyles =
650		- {
651		- "regular", "italic", "bold", "small", "large",
652		- "regular", "button", "regular", "icon",
653		- "regular"
654		- };
655		-
656		- JTextPane textPane = new JTextPane();
657		- textPane.setEditable(true);
658		- /StyledDocument/ doc = textPane.getStyledDocument();
659		- addStylesToDocument(doc);
660		-
661		- try
662		- {
663		- for (int j = 0; j < 2; j++)
664		- {
665		- for (int i = 0; i < initString.length; i++)
666		- {
667		- doc.insertString(doc.getLength(), initString[i],
668		- doc.getStyle(initStyles[i]));
669		- }
670		- }
671		- } catch (BadLocationException ble)
672		- {
673		- System.err.println("Couldn't insert initial text into text pane.");
674		- }
675		-
676		- return new JTextArea(); // textPane;
	729	+ return new JTextPane(); // textPane;
677	730	}
678	731
679	732	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -726,7 +779,7 @@
726	779	protected static ImageIcon createImageIcon(String path,
727	780	String description)
728	781	{
729		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	782	+ java.net.URL imgURL = Grafreed.class.getResource(path);
730	783	if (imgURL != null)
731	784	{
732	785	return new ImageIcon(imgURL, description);
..	..	@@ -758,6 +811,7 @@
758	811	// NumberSlider vDivsField;
759	812	// JCheckBox endcaps;
760	813	JCheckBox liveCB;
	814	+ JCheckBox selectCB;
761	815	JCheckBox hideCB;
762	816	JCheckBox link2masterCB;
763	817	JCheckBox markCB;
..	..	@@ -774,9 +828,13 @@
774	828	JButton fasterButton;
775	829	JButton remarkButton;
776	830
	831	+ cGridBag editPanel;
	832	+ cGridBag editCommandsPanel;
	833	+
777	834	cGridBag namePanel;
778	835	cGridBag setupPanel;
779		- cGridBag commandsPanel;
	836	+ cGridBag setupPanel2;
	837	+ cGridBag objectCommandsPanel;
780	838	cGridBag pushPanel;
781	839	cGridBag fillPanel;
782	840
..	..	@@ -943,10 +1001,6 @@
943	1001
944	1002	void SetupUI2(ObjEditor oe)
945	1003	{
946		-// oe.aConstraints.weightx = 0;
947		-// oe.aConstraints.weighty = 0;
948		-// oe.aConstraints.gridx = 0;
949		-// oe.aConstraints.gridy = 0;
950	1004	//SetupName(oe);
951	1005
952	1006	namePanel = new cGridBag();
..	..	@@ -963,32 +1017,56 @@
963	1017	setupPanel = new cGridBag().setVertical(false);
964	1018
965	1019	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
966		- link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
967		- hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1020	+ liveCB.setToolTipText("Animate object");
	1021	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1022	+ selectCB.setToolTipText("Make object selectable");
968	1023	// Return();
	1024	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1025	+ hideCB.setToolTipText("Hide object");
969	1026	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
970		- rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind);
971		- randomCB = AddCheckBox(setupPanel, "Rand", copy.random);
	1027	+ markCB.setToolTipText("Set the animation target transform");
	1028	+
	1029	+ setupPanel2 = new cGridBag().setVertical(false);
	1030	+
	1031	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1032	+ rewindCB.setToolTipText("Rewind animation");
	1033	+
	1034	+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1035	+ randomCB.setToolTipText("Randomly Rewind or Go back and forth");
972	1036
	1037	+ if (Globals.ADVANCED)
	1038	+ {
	1039	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
	1040	+ link2masterCB.setToolTipText("Attach to support");
	1041	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1042	+ speedupCB.setToolTipText("Option motion capture");
	1043	+ }
	1044	+
973	1045	oe.ctrlPanel.add(setupPanel);
974	1046	oe.ctrlPanel.Return();
	1047	+ oe.ctrlPanel.add(setupPanel2);
	1048	+ oe.ctrlPanel.Return();
975	1049
976		- commandsPanel = new cGridBag().setVertical(false);
	1050	+ objectCommandsPanel = new cGridBag().setVertical(false);
977	1051
978		- resetButton = AddButton(commandsPanel, "Reset");
979		- stepButton = AddButton(commandsPanel, "Step");
	1052	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1053	+ resetButton.setToolTipText("Jump to frame zero");
	1054	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1055	+ stepButton.setToolTipText("Step one frame");
980	1056	// resetAllButton = AddButton(oe, "Reset All");
981	1057	// stepAllButton = AddButton(oe, "Step All");
982		- speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
983	1058	// Return();
984		- slowerButton = AddButton(commandsPanel, "Slow");
985		- fasterButton = AddButton(commandsPanel, "Fast");
986		- remarkButton = AddButton(commandsPanel, "Remark");
	1059	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1060	+ slowerButton.setToolTipText("Decrease animation speed");
	1061	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1062	+ fasterButton.setToolTipText("Increase animation speed");
	1063	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1064	+ remarkButton.setToolTipText("Set the current transform as the target");
987	1065
988		- oe.ctrlPanel.add(commandsPanel);
	1066	+ oe.ctrlPanel.add(objectCommandsPanel);
989	1067	oe.ctrlPanel.Return();
990	1068
991		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1069	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
992	1070	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
993	1071	//Return();
994	1072
..	..	@@ -1191,8 +1269,11 @@
1191	1269	//worldPanel.setName("World");
1192	1270	centralPanel = new cGridBag();
1193	1271	centralPanel.preferredWidth = 20;
1194		- timelinePanel = new JPanel(new BorderLayout());
1195		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1272	+
	1273	+ if (Globals.ADVANCED)
	1274	+ {
	1275	+ timelinePanel = new JPanel(new BorderLayout());
	1276	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1196	1277
1197	1278	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1198	1279	cameraPanel.setContinuousLayout(true);
..	..	@@ -1201,7 +1282,10 @@
1201	1282	// cameraPanel.setDividerSize(9);
1202	1283	cameraPanel.setResizeWeight(1.0);
1203	1284
	1285	+ }
	1286	+
1204	1287	centralPanel.add(cameraView);
	1288	+ centralPanel.setFocusable(true);
1205	1289	//frame.setJMenuBar(timelineMenubar);
1206	1290	//centralPanel.add(timelinePanel);
1207	1291
..	..	@@ -1268,7 +1352,7 @@
1268	1352	// north.setName("Edit");
1269	1353	// north.add(ctrlPanel, BorderLayout.NORTH);
1270	1354	// objectPanel.add(north);
1271		- objectPanel.add(ctrlPanel);
	1355	+ objectPanel.add(editPanel);
1272	1356	objectPanel.add(infoPanel);
1273	1357
1274	1358	/*
..	..	@@ -1290,7 +1374,7 @@
1290	1374	scrollpane.addMouseWheelListener(this); // Default not fast enough
1291	1375
1292	1376	/JTabbedPane/ scenePanel = new cGridBag();
1293		- scenePanel.preferredWidth = 7;
	1377	+ scenePanel.preferredWidth = 6;
1294	1378
1295	1379	JTabbedPane tabbedPane = new JTabbedPane();
1296	1380	tabbedPane.add(scrollpane);
..	..	@@ -1396,9 +1480,11 @@
1396	1480
1397	1481	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1398	1482
1399		- frame.setSize(1024, 768);
1400		- frame.show();
	1483	+ frame.setSize(1280, 860);
	1484	+ frame.setVisible(true);
1401	1485
	1486	+ cameraView.requestFocusInWindow();
	1487	+
1402	1488	gridPanel.setDividerLocation(1.0);
1403	1489
1404	1490	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1436,17 +1522,25 @@
1436	1522
1437	1523	cGridBag editBar = new cGridBag().setVertical(false);
1438	1524
1439		- editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
	1525	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1526	+ createMaterialButton.setToolTipText("Create material");
1440	1527
1441	1528	/*
1442	1529	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1443	1530	*/
1444	1531
1445		- editBar.add(clearMaterialButton = new cButton("Clear")); // , aConstraints);
1446		- editBar.add(resetSlidersButton = new cButton("Reset")); // , aConstraints);
1447		- editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1448		- editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1532	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1533	+ clearMaterialButton.setToolTipText("Clear material");
	1534	+
	1535	+ if (Globals.ADVANCED)
	1536	+ {
	1537	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1538	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1539	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1540	+ }
1449	1541
	1542	+ editBar.preferredHeight = 15;
	1543	+
1450	1544	panel.add(editBar);
1451	1545
1452	1546	/**/
..	..	@@ -1712,12 +1806,15 @@
1712	1806	opacityPowerField.addChangeListener(this);
1713	1807	/**/
1714	1808
1715		- resetSlidersButton.addActionListener(this);
1716	1809	clearMaterialButton.addActionListener(this);
1717	1810	createMaterialButton.addActionListener(this);
1718		-
1719		- propagateToggle.addItemListener(this);
1720		- multiplyToggle.addItemListener(this);
	1811	+
	1812	+ if (Globals.ADVANCED)
	1813	+ {
	1814	+ resetSlidersButton.addActionListener(this);
	1815	+ propagateToggle.addItemListener(this);
	1816	+ multiplyToggle.addItemListener(this);
	1817	+ }
1721	1818	}
1722	1819
1723	1820	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1888,7 +1985,7 @@
1888	1985
1889	1986	//? flashIt = false;
1890	1987	CameraPane pane = (CameraPane) cameraView;
1891		- pane.clickStart(location.x, location.y, 0);
	1988	+ pane.clickStart(location.x, location.y, 0, 0);
1892	1989	pane.clickEnd(location.x, location.y, 0, true);
1893	1990
1894	1991	if (group.selection.size() == 1)
..	..	@@ -1937,6 +2034,7 @@
1937	2034	e2.printStackTrace();
1938	2035	}
1939	2036	}
	2037	+
1940	2038	LoadJMEThread loadThread;
1941	2039
1942	2040	class LoadJMEThread extends Thread
..	..	@@ -1994,6 +2092,7 @@
1994	2092	//LoadFile0(filename, converter);
1995	2093	}
1996	2094	}
	2095	+
1997	2096	LoadOBJThread loadObjThread;
1998	2097
1999	2098	class LoadOBJThread extends Thread
..	..	@@ -2072,19 +2171,19 @@
2072	2171
2073	2172	void LoadObjFile(String fullname)
2074	2173	{
2075		- /*
	2174	+ System.out.println("Loading " + fullname);
	2175	+ /**/
2076	2176	//lastFilename = fullname;
2077	2177	if(loadObjThread == null)
2078	2178	{
2079		- loadObjThread = new LoadOBJThread();
2080		- loadObjThread.start();
	2179	+ loadObjThread = new LoadOBJThread();
	2180	+ loadObjThread.start();
2081	2181	}
2082	2182
2083	2183	loadObjThread.add(fullname);
2084		- */
	2184	+ /**/
2085	2185
2086		- System.out.println("Loading " + fullname);
2087		- makeSomething(new FileObject(fullname, true), true);
	2186	+ //makeSomething(new FileObject(fullname, true), true);
2088	2187	}
2089	2188
2090	2189	void LoadGFDFile(String fullname)
..	..	@@ -2345,11 +2444,11 @@
2345	2444
2346	2445	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2347	2446	{
2348		- if (GrafreeD.standAlone)
	2447	+ if (Grafreed.standAlone)
2349	2448	{
2350	2449	/**/
2351	2450	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2352		- browser.show();
	2451	+ browser.setVisible(true);
2353	2452	String filename = browser.getFile();
2354	2453	if (filename != null && filename.length() > 0)
2355	2454	{
..	..	@@ -2709,7 +2808,8 @@
2709	2808	return;
2710	2809	}
2711	2810
2712		- multiplyToggle.setSelected(mat.multiply);
	2811	+ if (multiplyToggle != null)
	2812	+ multiplyToggle.setSelected(mat.multiply);
2713	2813
2714	2814	assert (object.projectedVertices != null);
2715	2815
..	..	@@ -2924,9 +3024,9 @@
2924	3024	frame.validate();
2925	3025
2926	3026	return;
2927		- } else if (event.getSource() == toggleRandomItem)
	3027	+ } else if (event.getSource() == toggleSwitchItem)
2928	3028	{
2929		- cameraView.ToggleRandom();
	3029	+ cameraView.ToggleSwitch();
2930	3030	cameraView.repaint();
2931	3031	return;
2932	3032	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2955,6 +3055,10 @@
2955	3055	{
2956	3056	copy.live ^= true;
2957	3057	return;
	3058	+ } else if (event.getSource() == selectCB)
	3059	+ {
	3060	+ copy.dontselect ^= true;
	3061	+ return;
2958	3062	} else if (event.getSource() == hideCB)
2959	3063	{
2960	3064	copy.hide ^= true;
..	..	@@ -2969,6 +3073,7 @@
2969	3073	if (event.getSource() == randomCB)
2970	3074	{
2971	3075	copy.random ^= true;
	3076	+ objEditor.refreshContents();
2972	3077	return;
2973	3078	}
2974	3079	if (event.getSource() == speedupCB)
..	..	@@ -2992,8 +3097,9 @@
2992	3097
2993	3098	public void actionPerformed(ActionEvent event)
2994	3099	{
	3100	+ Object source = event.getSource();
2995	3101	// SCRIPT DIALOG
2996		- if (event.getSource() == okbutton)
	3102	+ if (source == okbutton)
2997	3103	{
2998	3104	textpanel.setVisible(false);
2999	3105	textpanel.remove(textarea);
..	..	@@ -3005,7 +3111,7 @@
3005	3111	textarea = null;
3006	3112	textpanel = null;
3007	3113	}
3008		- if (event.getSource() == cancelbutton)
	3114	+ if (source == cancelbutton)
3009	3115	{
3010	3116	textpanel.setVisible(false);
3011	3117	textpanel.remove(textarea);
..	..	@@ -3017,50 +3123,50 @@
3017	3123	//applySelf();
3018	3124	//client.refreshEditWindow();
3019	3125	//refreshContents();
3020		- if (event.getSource() == nameField)
	3126	+ if (source == nameField)
3021	3127	{
3022	3128	//System.out.println("ObjEditor " + event);
3023	3129	applySelf0(true);
3024	3130	//parent.applySelf();
3025	3131	objEditor.refreshContents();
3026		- } else if (event.getSource() == resetButton)
	3132	+ } else if (source == resetButton)
3027	3133	{
3028	3134	CameraPane.fullreset = true;
3029	3135	copy.Reset(); // ResetMeshes();
3030	3136	copy.Touch();
3031	3137	objEditor.refreshContents();
3032		- } else if (event.getSource() == stepItem)
	3138	+ } else if (source == stepItem)
3033	3139	{
3034	3140	//cameraView.ONESTEP = true;
3035	3141	Globals.ONESTEP = true;
3036	3142	cameraView.repaint();
3037	3143	return;
3038		- } else if (event.getSource() == stepButton)
	3144	+ } else if (source == stepButton)
3039	3145	{
3040	3146	copy.Step();
3041	3147	copy.Touch();
3042	3148	objEditor.refreshContents();
3043		- } else if (event.getSource() == slowerButton)
	3149	+ } else if (source == slowerButton)
3044	3150	{
3045	3151	copy.Slower();
3046	3152	copy.Touch();
3047	3153	objEditor.refreshContents();
3048		- } else if (event.getSource() == fasterButton)
	3154	+ } else if (source == fasterButton)
3049	3155	{
3050	3156	copy.Faster();
3051	3157	copy.Touch();
3052	3158	objEditor.refreshContents();
3053		- } else if (event.getSource() == remarkButton)
	3159	+ } else if (source == remarkButton)
3054	3160	{
3055	3161	copy.Remark();
3056	3162	copy.Touch();
3057	3163	objEditor.refreshContents();
3058		- } else if (event.getSource() == stepAllButton)
	3164	+ } else if (source == stepAllButton)
3059	3165	{
3060	3166	copy.StepAll();
3061	3167	copy.Touch();
3062	3168	objEditor.refreshContents();
3063		- } else if (event.getSource() == resetAllButton)
	3169	+ } else if (source == resetAllButton)
3064	3170	{
3065	3171	//CameraPane.fullreset = true;
3066	3172	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3093,53 +3199,75 @@
3093	3199	// Close();
3094	3200	// }
3095	3201	// else
3096		- if (event.getSource() == resetSlidersButton)
	3202	+ if (source == resetSlidersButton)
3097	3203	{
3098	3204	ResetSliders();
3099		- } else if (event.getSource() == clearMaterialButton)
	3205	+ } else if (source == clearMaterialButton)
3100	3206	{
3101	3207	ClearMaterial();
3102		- } else if (event.getSource() == createMaterialButton)
	3208	+ } else if (source == createMaterialButton)
3103	3209	{
3104	3210	CreateMaterial();
3105		- } else if (event.getSource() == clearPanelButton)
	3211	+ } else if (source == clearPanelButton)
3106	3212	{
3107	3213	copy.ClearUI();
3108	3214	refreshContents(true);
3109		- } /*
3110		- }
3111		-
3112		- public boolean action(Event event, Object arg)
3113		- {
3114		- */ else if (event.getSource() == closeItem)
	3215	+ } else if (source == importGFDItem)
	3216	+ {
	3217	+ ImportGFD();
	3218	+ } else
	3219	+ if (source == importVRMLX3DItem)
	3220	+ {
	3221	+ ImportVRMLX3D();
	3222	+ } else
	3223	+ if (source == import3DSItem)
	3224	+ {
	3225	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3226	+ } else
	3227	+ if (source == importOBJItem)
	3228	+ {
	3229	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3230	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3231	+ browser.setVisible(true);
	3232	+ String filename = browser.getFile();
	3233	+ if (filename != null && filename.length() > 0)
	3234	+ {
	3235	+ String fullname = browser.getDirectory() + filename;
	3236	+ makeSomething(ReadOBJ(fullname), true);
	3237	+ }
	3238	+ } else
	3239	+ if (source == closeItem)
3115	3240	{
3116	3241	Close();
3117	3242	//return true;
3118		- } else if (event.getSource() == loadItem)
	3243	+ } else if (source == loadItem)
3119	3244	{
3120	3245	load();
3121	3246	//return true;
3122		- } else if (event.getSource() == saveItem)
	3247	+ } else if (source == newItem)
	3248	+ {
	3249	+ New();
	3250	+ } else if (source == saveItem)
3123	3251	{
3124	3252	save();
3125	3253	//return true;
3126		- } else if (event.getSource() == saveAsItem)
	3254	+ } else if (source == saveAsItem)
3127	3255	{
3128	3256	saveAs();
3129	3257	//return true;
3130		- } else if (event.getSource() == reexportItem)
	3258	+ } else if (source == reexportItem)
3131	3259	{
3132	3260	reexport();
3133	3261	//return true;
3134		- } else if (event.getSource() == exportAsItem)
	3262	+ } else if (source == exportAsItem)
3135	3263	{
3136	3264	export();
3137	3265	//return true;
3138		- } else if (event.getSource() == povItem)
	3266	+ } else if (source == povItem)
3139	3267	{
3140	3268	generatePOV();
3141	3269	//return true;
3142		- } else if (event.getSource() == zBufferItem)
	3270	+ } else if (source == zBufferItem)
3143	3271	{
3144	3272	try
3145	3273	{
..	..	@@ -3161,21 +3289,8 @@
3161	3289	cameraView.repaint();
3162	3290	//return true;
3163	3291	}
3164		- */ else if (event.getSource() == editCameraItem)
3165		- {
3166		- cameraView.ProtectCamera();
3167		- cameraView.repaint();
3168		- return;
3169		- } else if (event.getSource() == revertCameraItem)
3170		- {
3171		- cameraView.RevertCamera();
3172		- cameraView.repaint();
3173		- return;
3174		-// } else if (event.getSource() == textureButton)
3175		-// {
3176		-// return; // true;
3177		- } else // combos...
3178		- if (event.getSource() == texresMenu)
	3292	+ */ else // combos...
	3293	+ if (source == texresMenu)
3179	3294	{
3180	3295	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3181	3296	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3187,12 +3302,268 @@
3187	3302	}
3188	3303	}
3189	3304
	3305	+ void New()
	3306	+ {
	3307	+ while (copy.Size() > 1)
	3308	+ {
	3309	+ copy.remove(1);
	3310	+ }
	3311	+
	3312	+ ResetModel();
	3313	+ objEditor.refreshContents();
	3314	+ }
	3315	+
	3316	+ static public byte[] Compress(Object3D o)
	3317	+ {
	3318	+ try
	3319	+ {
	3320	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3321	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3322	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3323	+
	3324	+ Object3D parent = o.parent;
	3325	+ o.parent = null;
	3326	+
	3327	+ out.writeObject(o);
	3328	+
	3329	+ o.parent = parent;
	3330	+
	3331	+ out.flush();
	3332	+
	3333	+ zstream.close();
	3334	+ out.close();
	3335	+
	3336	+ return baos.toByteArray();
	3337	+ } catch (Exception e)
	3338	+ {
	3339	+ System.err.println(e);
	3340	+ return null;
	3341	+ }
	3342	+ }
	3343	+
	3344	+ static public Object Uncompress(byte[] bytes)
	3345	+ {
	3346	+ System.out.println("#bytes = " + bytes.length);
	3347	+ try
	3348	+ {
	3349	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3350	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3351	+ ObjectInputStream in = new ObjectInputStream(istream);
	3352	+ Object obj = in.readObject();
	3353	+ in.close();
	3354	+
	3355	+ return obj;
	3356	+ } catch (Exception e)
	3357	+ {
	3358	+ System.err.println(e);
	3359	+ return null;
	3360	+ }
	3361	+ }
	3362	+
	3363	+ static public Object clone(Object o)
	3364	+ {
	3365	+ try
	3366	+ {
	3367	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3368	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3369	+
	3370	+ out.writeObject(o);
	3371	+
	3372	+ out.flush();
	3373	+ out.close();
	3374	+
	3375	+ byte[] bytes = baos.toByteArray();
	3376	+
	3377	+ System.out.println("clone = " + bytes.length);
	3378	+
	3379	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3380	+ ObjectInputStream in = new ObjectInputStream(bais);
	3381	+ Object obj = in.readObject();
	3382	+ in.close();
	3383	+
	3384	+ return obj;
	3385	+ } catch (Exception e)
	3386	+ {
	3387	+ System.err.println(e);
	3388	+ return null;
	3389	+ }
	3390	+ }
	3391	+
	3392	+ cRadio GetCurrentTab()
	3393	+ {
	3394	+ cRadio ab;
	3395	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3396	+ {
	3397	+ ab = (cRadio)e.nextElement();
	3398	+ if(ab.GetObject() == copy)
	3399	+ {
	3400	+ return ab;
	3401	+ }
	3402	+ }
	3403	+
	3404	+ return null;
	3405	+ }
	3406	+
	3407	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3408	+
	3409	+ public void Save()
	3410	+ {
	3411	+ cRadio tab = GetCurrentTab();
	3412	+
	3413	+ boolean temp = CameraPane.SWITCH;
	3414	+ CameraPane.SWITCH = false;
	3415	+
	3416	+ copy.ExtractBigData(hashtable);
	3417	+
	3418	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3419	+ tab.graphs[tab.undoindex++] = Compress(copy);
	3420	+
	3421	+ copy.RestoreBigData(hashtable);
	3422	+
	3423	+ CameraPane.SWITCH = temp;
	3424	+
	3425	+ //assert(hashtable.isEmpty());
	3426	+
	3427	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3428	+ {
	3429	+ tab.graphs[i] = null;
	3430	+ }
	3431	+
	3432	+ // test save
	3433	+ if (false)
	3434	+ {
	3435	+ try
	3436	+ {
	3437	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3438	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3439	+
	3440	+ p.writeObject(copy);
	3441	+
	3442	+ p.flush();
	3443	+
	3444	+ ostream.close();
	3445	+ } catch (Exception e)
	3446	+ {
	3447	+ e.printStackTrace();
	3448	+ }
	3449	+ }
	3450	+ }
	3451	+
	3452	+ void CopyChanged(Object3D obj)
	3453	+ {
	3454	+ boolean temp = CameraPane.SWITCH;
	3455	+ CameraPane.SWITCH = false;
	3456	+
	3457	+ copy.ExtractBigData(hashtable);
	3458	+
	3459	+ copy.clear();
	3460	+
	3461	+ for (int i=0; i<obj.Size(); i++)
	3462	+ {
	3463	+ copy.add(obj.get(i));
	3464	+ }
	3465	+
	3466	+ copy.RestoreBigData(hashtable);
	3467	+
	3468	+ CameraPane.SWITCH = temp;
	3469	+
	3470	+ //assert(hashtable.isEmpty());
	3471	+
	3472	+ copy.Touch();
	3473	+
	3474	+ ResetModel();
	3475	+ copy.HardTouch(); // recompile?
	3476	+
	3477	+ cRadio ab;
	3478	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3479	+ {
	3480	+ ab = (cRadio)e.nextElement();
	3481	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3482	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3483	+ if (test != null)
	3484	+ {
	3485	+ test.editWindow = ab.object.editWindow;
	3486	+ ab.object = test;
	3487	+ }
	3488	+ }
	3489	+
	3490	+ refreshContents();
	3491	+ }
	3492	+
	3493	+ public void Undo()
	3494	+ {
	3495	+ cRadio tab = GetCurrentTab();
	3496	+
	3497	+ if (tab.undoindex == 0)
	3498	+ {
	3499	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3500	+ return;
	3501	+ }
	3502	+
	3503	+ if (tab.graphs[tab.undoindex] == null)
	3504	+ {
	3505	+ Save();
	3506	+ tab.undoindex -= 1;
	3507	+ }
	3508	+
	3509	+ tab.undoindex -= 1;
	3510	+
	3511	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3512	+ }
	3513	+
	3514	+ public void Redo()
	3515	+ {
	3516	+ cRadio tab = GetCurrentTab();
	3517	+
	3518	+ if (tab.graphs[tab.undoindex + 1] == null)
	3519	+ {
	3520	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3521	+ return;
	3522	+ }
	3523	+
	3524	+ tab.undoindex += 1;
	3525	+
	3526	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3527	+ }
	3528	+
	3529	+ void ImportGFD()
	3530	+ {
	3531	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3532	+ browser.show();
	3533	+ String filename = browser.getFile();
	3534	+ if (filename != null && filename.length() > 0)
	3535	+ {
	3536	+ String fullname = browser.getDirectory() + filename;
	3537	+
	3538	+ //Object3D readobj =
	3539	+ objEditor.ReadGFD(fullname, objEditor);
	3540	+ //makeSomething(readobj);
	3541	+ }
	3542	+ }
	3543	+
	3544	+ void ImportVRMLX3D()
	3545	+ {
	3546	+ if (Grafreed.standAlone)
	3547	+ {
	3548	+ /**/
	3549	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3550	+ browser.show();
	3551	+ String filename = browser.getFile();
	3552	+ if (filename != null && filename.length() > 0)
	3553	+ {
	3554	+ String fullname = browser.getDirectory() + filename;
	3555	+ LoadVRMLX3D(fullname);
	3556	+ }
	3557	+ /**/
	3558	+ }
	3559	+ }
	3560	+
3190	3561	void ToggleAnimation()
3191	3562	{
3192	3563	if (!Globals.ANIMATION)
3193	3564	{
3194	3565	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3195		- browser.show();
	3566	+ browser.setVisible(true);
3196	3567	String filename = browser.getFile();
3197	3568	if (filename != null && filename.length() > 0)
3198	3569	{
..	..	@@ -3202,8 +3573,8 @@
3202	3573
3203	3574	Globals.ANIMATION ^= true;
3204	3575
3205		- GrafreeD.wav.cursor = 0;
3206		- GrafreeD.wav.loop = 0;
	3576	+ Grafreed.wav.cursor = 0;
	3577	+ Grafreed.wav.loop = 0;
3207	3578	}
3208	3579	} else
3209	3580	{
..	..	@@ -3224,7 +3595,6 @@
3224	3595	callee.refreshContents();
3225	3596	} else
3226	3597	{
3227		- new Exception().printStackTrace();
3228	3598	System.exit(0);
3229	3599	}
3230	3600	}
..	..	@@ -3254,7 +3624,7 @@
3254	3624	void CreateMaterial()
3255	3625	{
3256	3626	//copy.ClearMaterial(); // PATCH
3257		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3627	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3258	3628	if (copy.selection.size() > 0)
3259	3629	//SetMaterial(copy);
3260	3630	{
..	..	@@ -3313,11 +3683,11 @@
3313	3683	{
3314	3684	copy.ResetBlockLoop(); // temporary problem
3315	3685
3316		- boolean random = CameraPane.RANDOM;
3317		- CameraPane.RANDOM = false; // parse everything
	3686	+ boolean random = CameraPane.SWITCH;
	3687	+ CameraPane.SWITCH = false; // parse everything
3318	3688	copy.ResetDisplayList();
3319	3689	copy.HardTouch();
3320		- CameraPane.RANDOM = random;
	3690	+ CameraPane.SWITCH = random;
3321	3691	}
3322	3692
3323	3693	// public void applySelf()
..	..	@@ -3391,6 +3761,36 @@
3391	3761	{
3392	3762	//System.out.println("Propagate = " + propagate);
3393	3763	copy.UpdateMaterial(anchor, current, propagate);
	3764	+
	3765	+ if (copy.material != null)
	3766	+ {
	3767	+ cMaterial mat = copy.material;
	3768	+
	3769	+ colorField.SetToolTipValue((mat.color));
	3770	+ modulationField.SetToolTipValue((mat.modulation));
	3771	+ metalnessField.SetToolTipValue((mat.metalness));
	3772	+ diffuseField.SetToolTipValue((mat.diffuse));
	3773	+ specularField.SetToolTipValue((mat.specular));
	3774	+ shininessField.SetToolTipValue((mat.shininess));
	3775	+ shiftField.SetToolTipValue((mat.shift));
	3776	+ ambientField.SetToolTipValue((mat.ambient));
	3777	+ lightareaField.SetToolTipValue((mat.lightarea));
	3778	+ diffusenessField.SetToolTipValue((mat.factor));
	3779	+ velvetField.SetToolTipValue((mat.velvet));
	3780	+ sheenField.SetToolTipValue((mat.sheen));
	3781	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3782	+ backlitField.SetToolTipValue((mat.bump));
	3783	+ anisoField.SetToolTipValue((mat.aniso));
	3784	+ anisoVField.SetToolTipValue((mat.anisoV));
	3785	+ cameraField.SetToolTipValue((mat.cameralight));
	3786	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3787	+ shadowField.SetToolTipValue((mat.shadow));
	3788	+ textureField.SetToolTipValue((mat.texture));
	3789	+ opacityField.SetToolTipValue((mat.opacity));
	3790	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3791	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3792	+ }
	3793	+
3394	3794	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3395	3795	{
3396	3796	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3506,7 +3906,7 @@
3506	3906	}
3507	3907
3508	3908	if (normalpushField != null)
3509		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	3909	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3510	3910	}
3511	3911
3512	3912	void SnapObject()
..	..	@@ -3770,6 +4170,7 @@
3770	4170
3771	4171	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3772	4172	{
	4173	+ Save();
3773	4174	//Tween.set(thing, 0).target(1).start(tweenManager);
3774	4175	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3775	4176	// if (thing instanceof GenericJointDemo)
..	..	@@ -3973,6 +4374,7 @@
3973	4374	}
3974	4375	}
3975	4376	}
	4377	+
3976	4378	LoadGFDThread loadGFDThread;
3977	4379
3978	4380	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -3992,8 +4394,10 @@
3992	4394
3993	4395	try
3994	4396	{
	4397	+ // Try compressed version first.
3995	4398	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
3996		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4399	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4400	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
3997	4401
3998	4402	readobj = (Object3D) p.readObject();
3999	4403	istream.close();
..	..	@@ -4001,7 +4405,20 @@
4001	4405	readobj.ResetDisplayList();
4002	4406	} catch (Exception e)
4003	4407	{
4004		- e.printStackTrace();
	4408	+ //e.printStackTrace();
	4409	+ try
	4410	+ {
	4411	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4412	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4413	+
	4414	+ readobj = (Object3D) p.readObject();
	4415	+ istream.close();
	4416	+
	4417	+ readobj.ResetDisplayList();
	4418	+ } catch (Exception e2)
	4419	+ {
	4420	+ e2.printStackTrace();
	4421	+ }
4005	4422	}
4006	4423	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4007	4424	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4047,6 +4464,12 @@
4047	4464
4048	4465	void LoadIt(Object obj)
4049	4466	{
	4467	+ if (obj == null)
	4468	+ {
	4469	+ // Invalid file
	4470	+ return;
	4471	+ }
	4472	+
4050	4473	System.out.println("Loaded " + obj);
4051	4474	//new Exception().printStackTrace();
4052	4475	Object3D readobj = (Object3D) obj;
..	..	@@ -4056,6 +4479,7 @@
4056	4479
4057	4480	if (readobj != null)
4058	4481	{
	4482	+ Save();
4059	4483	try
4060	4484	{
4061	4485	//readobj.deepCopySelf(copy);
..	..	@@ -4118,7 +4542,7 @@
4118	4542
4119	4543	void load() // throws ClassNotFoundException
4120	4544	{
4121		- if (GrafreeD.standAlone)
	4545	+ if (Grafreed.standAlone)
4122	4546	{
4123	4547	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4124	4548	browser.show();
..	..	@@ -4205,11 +4629,13 @@
4205	4629	try
4206	4630	{
4207	4631	FileOutputStream ostream = new FileOutputStream(lastname);
4208		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4632	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4633	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4209	4634
4210	4635	p.writeObject(copy);
4211	4636	p.flush();
4212	4637
	4638	+ zstream.close();
4213	4639	ostream.close();
4214	4640
4215	4641	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4219,11 +4645,12 @@
4219	4645	{
4220	4646	}
4221	4647	}
	4648	+
4222	4649	String lastname;
4223	4650
4224	4651	void saveAs()
4225	4652	{
4226		- if (GrafreeD.standAlone)
	4653	+ if (Grafreed.standAlone)
4227	4654	{
4228	4655	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4229	4656	browser.setVisible(true);
..	..	@@ -4328,13 +4755,13 @@
4328	4755	try
4329	4756	{
4330	4757	FileOutputStream ostream = new FileOutputStream(filename);
4331		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4332		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4758	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4759	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4333	4760
4334	4761	Object3D objectparent = obj.parent;
4335	4762	obj.parent = null;
4336	4763
4337		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4764	+ Object3D object = (Object3D) Grafreed.clone(obj);
4338	4765
4339	4766	obj.parent = objectparent;
4340	4767
..	..	@@ -4346,8 +4773,8 @@
4346	4773	p.writeObject(object);
4347	4774	p.flush();
4348	4775
	4776	+ zstream.close();
4349	4777	ostream.close();
4350		- // zstream.close();
4351	4778
4352	4779	// group.selection.get(0).parent = parent;
4353	4780	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4368,7 +4795,7 @@
4368	4795	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4369	4796	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4370	4797	copy.generatePOV(buffer);
4371		- if (GrafreeD.standAlone)
	4798	+ if (Grafreed.standAlone)
4372	4799	{
4373	4800	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4374	4801	browser.show();
..	..	@@ -4394,7 +4821,8 @@
4394	4821	Object3D client;
4395	4822	Object3D copy;
4396	4823	MenuBar menuBar;
4397		- Menu windowMenu;
	4824	+ Menu fileMenu;
	4825	+ MenuItem newItem;
4398	4826	MenuItem loadItem;
4399	4827	MenuItem saveItem;
4400	4828	MenuItem saveAsItem;
..	..	@@ -4402,11 +4830,9 @@
4402	4830	MenuItem reexportItem;
4403	4831	MenuItem povItem;
4404	4832	MenuItem closeItem;
4405		- Menu cameraMenu;
	4833	+
4406	4834	CheckboxMenuItem zBufferItem;
4407	4835	//MenuItem normalLensItem;
4408		- MenuItem editCameraItem;
4409		- MenuItem revertCameraItem;
4410	4836	MenuItem stepItem;
4411	4837	CheckboxMenuItem toggleLiveItem;
4412	4838	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4417,7 +4843,7 @@
4417	4843	CheckboxMenuItem toggleFootContactItem;
4418	4844	CheckboxMenuItem toggleDLItem;
4419	4845	CheckboxMenuItem toggleTextureItem;
4420		- CheckboxMenuItem toggleRandomItem;
	4846	+ CheckboxMenuItem toggleSwitchItem;
4421	4847	CheckboxMenuItem toggleRootItem;
4422	4848	CheckboxMenuItem animationItem;
4423	4849	CheckboxMenuItem toggleHandleItem;
..	..	@@ -4425,7 +4851,7 @@
4425	4851	JSplitPane mainPanel;
4426	4852	JScrollPane scrollpane;
4427	4853	JPanel toolbarPanel;
4428		- JPanel treePanel;
	4854	+ cGridBag treePanel;
4429	4855	JPanel radioPanel;
4430	4856	ButtonGroup buttonGroup;
4431	4857	cGridBag ctrlPanel;
..	..	@@ -4554,4 +4980,9 @@
4554	4980	//ObjectUI parent;
4555	4981
4556	4982	cNumberSlider normalpushField;
	4983	+
	4984	+ private MenuItem importGFDItem;
	4985	+ private MenuItem importVRMLX3DItem;
	4986	+ private MenuItem import3DSItem;
	4987	+ private MenuItem importOBJItem;
4557	4988	}