~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -168,6 +168,7 @@
168	168	// objEditor.ctrlPanel.remove(remarkButton);
169	169
170	170	objEditor.ctrlPanel.remove(setupPanel);
	171	+ objEditor.ctrlPanel.remove(setupPanel2);
171	172	objEditor.ctrlPanel.remove(commandsPanel);
172	173	objEditor.ctrlPanel.remove(pushPanel);
173	174	//objEditor.ctrlPanel.remove(fillPanel);
..	..	@@ -276,24 +277,40 @@
276	277	void SetupMenu()
277	278	{
278	279	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..."));
	280	+ menuBar.add(fileMenu = new Menu("File"));
	281	+ fileMenu.add(newItem = new MenuItem("New"));
	282	+ fileMenu.add(loadItem = new MenuItem("Open..."));
	283	+
	284	+ //oe.menuBar.add(menu = new Menu("Include"));
	285	+ Menu menu = new Menu("Import");
	286	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	287	+ importOBJItem.addActionListener(this);
	288	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	289	+ import3DSItem.addActionListener(this);
	290	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	291	+ importVRMLX3DItem.addActionListener(this);
	292	+ menu.add("-");
	293	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	294	+ importGFDItem.addActionListener(this);
	295	+ fileMenu.add(menu);
	296	+ fileMenu.add("-");
	297	+
	298	+ fileMenu.add(saveItem = new MenuItem("Save"));
	299	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
284	300	//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("-");
	301	+ fileMenu.add("-");
	302	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	303	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	304	+ fileMenu.add("-");
289	305	if (client.parent != null)
290	306	{
291		- windowMenu.add(closeItem = new MenuItem("Close"));
	307	+ fileMenu.add(closeItem = new MenuItem("Close"));
292	308	} else
293	309	{
294		- windowMenu.add(closeItem = new MenuItem("Exit"));
	310	+ fileMenu.add(closeItem = new MenuItem("Exit"));
295	311	}
296	312
	313	+ newItem.addActionListener(this);
297	314	loadItem.addActionListener(this);
298	315	saveItem.addActionListener(this);
299	316	saveAsItem.addActionListener(this);
..	..	@@ -301,78 +318,6 @@
301	318	reexportItem.addActionListener(this);
302	319	//povItem.addActionListener(this);
303	320	closeItem.addActionListener(this);
304		-
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	321
377	322	objectPanel = new JTabbedPane();
378	323	toolbarPanel = new JPanel();
..	..	@@ -475,10 +420,10 @@
475	420	e.printStackTrace();
476	421	}
477	422
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();
	423	+// String selection = infoarea.getText();
	424	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	425	+// java.awt.datatransfer.Clipboard clipboard =
	426	+// Toolkit.getDefaultToolkit().getSystemClipboard();
482	427	//clipboard.setContents(data, data);
483	428	}
484	429
..	..	@@ -803,6 +748,7 @@
803	748
804	749	cGridBag namePanel;
805	750	cGridBag setupPanel;
	751	+ cGridBag setupPanel2;
806	752	cGridBag commandsPanel;
807	753	cGridBag pushPanel;
808	754	cGridBag fillPanel;
..	..	@@ -995,21 +941,25 @@
995	941	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
996	942	markCB.setToolTipText("Set the animation target transform");
997	943
998		- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	944	+ setupPanel2 = new cGridBag().setVertical(false);
	945	+
	946	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
999	947	rewindCB.setToolTipText("Rewind animation");
1000	948
1001		- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
1002		- randomCB.setToolTipText("Option for switch node");
	949	+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	950	+ randomCB.setToolTipText("Rewind or Go back and forth randomly");
1003	951
1004	952	if (Globals.ADVANCED)
1005	953	{
1006		- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
	954	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1007	955	link2masterCB.setToolTipText("Attach to support");
1008		- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	956	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1009	957	speedupCB.setToolTipText("Option motion capture");
1010	958	}
1011	959
1012	960	oe.ctrlPanel.add(setupPanel);
	961	+ oe.ctrlPanel.Return();
	962	+ oe.ctrlPanel.add(setupPanel2);
1013	963	oe.ctrlPanel.Return();
1014	964
1015	965	commandsPanel = new cGridBag().setVertical(false);
..	..	@@ -1991,6 +1941,7 @@
1991	1941	e2.printStackTrace();
1992	1942	}
1993	1943	}
	1944	+
1994	1945	LoadJMEThread loadThread;
1995	1946
1996	1947	class LoadJMEThread extends Thread
..	..	@@ -2048,6 +1999,7 @@
2048	1999	//LoadFile0(filename, converter);
2049	2000	}
2050	2001	}
	2002	+
2051	2003	LoadOBJThread loadObjThread;
2052	2004
2053	2005	class LoadOBJThread extends Thread
..	..	@@ -2126,19 +2078,19 @@
2126	2078
2127	2079	void LoadObjFile(String fullname)
2128	2080	{
2129		- /*
	2081	+ System.out.println("Loading " + fullname);
	2082	+ /**/
2130	2083	//lastFilename = fullname;
2131	2084	if(loadObjThread == null)
2132	2085	{
2133		- loadObjThread = new LoadOBJThread();
2134		- loadObjThread.start();
	2086	+ loadObjThread = new LoadOBJThread();
	2087	+ loadObjThread.start();
2135	2088	}
2136	2089
2137	2090	loadObjThread.add(fullname);
2138		- */
	2091	+ /**/
2139	2092
2140		- System.out.println("Loading " + fullname);
2141		- makeSomething(new FileObject(fullname, true), true);
	2093	+ //makeSomething(new FileObject(fullname, true), true);
2142	2094	}
2143	2095
2144	2096	void LoadGFDFile(String fullname)
..	..	@@ -2981,7 +2933,7 @@
2981	2933	return;
2982	2934	} else if (event.getSource() == toggleSwitchItem)
2983	2935	{
2984		- cameraView.ToggleRandom();
	2936	+ cameraView.ToggleSwitch();
2985	2937	cameraView.repaint();
2986	2938	return;
2987	2939	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3052,8 +3004,9 @@
3052	3004
3053	3005	public void actionPerformed(ActionEvent event)
3054	3006	{
	3007	+ Object source = event.getSource();
3055	3008	// SCRIPT DIALOG
3056		- if (event.getSource() == okbutton)
	3009	+ if (source == okbutton)
3057	3010	{
3058	3011	textpanel.setVisible(false);
3059	3012	textpanel.remove(textarea);
..	..	@@ -3065,7 +3018,7 @@
3065	3018	textarea = null;
3066	3019	textpanel = null;
3067	3020	}
3068		- if (event.getSource() == cancelbutton)
	3021	+ if (source == cancelbutton)
3069	3022	{
3070	3023	textpanel.setVisible(false);
3071	3024	textpanel.remove(textarea);
..	..	@@ -3077,50 +3030,50 @@
3077	3030	//applySelf();
3078	3031	//client.refreshEditWindow();
3079	3032	//refreshContents();
3080		- if (event.getSource() == nameField)
	3033	+ if (source == nameField)
3081	3034	{
3082	3035	//System.out.println("ObjEditor " + event);
3083	3036	applySelf0(true);
3084	3037	//parent.applySelf();
3085	3038	objEditor.refreshContents();
3086		- } else if (event.getSource() == resetButton)
	3039	+ } else if (source == resetButton)
3087	3040	{
3088	3041	CameraPane.fullreset = true;
3089	3042	copy.Reset(); // ResetMeshes();
3090	3043	copy.Touch();
3091	3044	objEditor.refreshContents();
3092		- } else if (event.getSource() == stepItem)
	3045	+ } else if (source == stepItem)
3093	3046	{
3094	3047	//cameraView.ONESTEP = true;
3095	3048	Globals.ONESTEP = true;
3096	3049	cameraView.repaint();
3097	3050	return;
3098		- } else if (event.getSource() == stepButton)
	3051	+ } else if (source == stepButton)
3099	3052	{
3100	3053	copy.Step();
3101	3054	copy.Touch();
3102	3055	objEditor.refreshContents();
3103		- } else if (event.getSource() == slowerButton)
	3056	+ } else if (source == slowerButton)
3104	3057	{
3105	3058	copy.Slower();
3106	3059	copy.Touch();
3107	3060	objEditor.refreshContents();
3108		- } else if (event.getSource() == fasterButton)
	3061	+ } else if (source == fasterButton)
3109	3062	{
3110	3063	copy.Faster();
3111	3064	copy.Touch();
3112	3065	objEditor.refreshContents();
3113		- } else if (event.getSource() == remarkButton)
	3066	+ } else if (source == remarkButton)
3114	3067	{
3115	3068	copy.Remark();
3116	3069	copy.Touch();
3117	3070	objEditor.refreshContents();
3118		- } else if (event.getSource() == stepAllButton)
	3071	+ } else if (source == stepAllButton)
3119	3072	{
3120	3073	copy.StepAll();
3121	3074	copy.Touch();
3122	3075	objEditor.refreshContents();
3123		- } else if (event.getSource() == resetAllButton)
	3076	+ } else if (source == resetAllButton)
3124	3077	{
3125	3078	//CameraPane.fullreset = true;
3126	3079	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3153,53 +3106,75 @@
3153	3106	// Close();
3154	3107	// }
3155	3108	// else
3156		- if (event.getSource() == resetSlidersButton)
	3109	+ if (source == resetSlidersButton)
3157	3110	{
3158	3111	ResetSliders();
3159		- } else if (event.getSource() == clearMaterialButton)
	3112	+ } else if (source == clearMaterialButton)
3160	3113	{
3161	3114	ClearMaterial();
3162		- } else if (event.getSource() == createMaterialButton)
	3115	+ } else if (source == createMaterialButton)
3163	3116	{
3164	3117	CreateMaterial();
3165		- } else if (event.getSource() == clearPanelButton)
	3118	+ } else if (source == clearPanelButton)
3166	3119	{
3167	3120	copy.ClearUI();
3168	3121	refreshContents(true);
3169		- } /*
3170		- }
3171		-
3172		- public boolean action(Event event, Object arg)
3173		- {
3174		- */ else if (event.getSource() == closeItem)
	3122	+ } else if (source == importGFDItem)
	3123	+ {
	3124	+ ImportGFD();
	3125	+ } else
	3126	+ if (source == importVRMLX3DItem)
	3127	+ {
	3128	+ ImportVRMLX3D();
	3129	+ } else
	3130	+ if (source == import3DSItem)
	3131	+ {
	3132	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3133	+ } else
	3134	+ if (source == importOBJItem)
	3135	+ {
	3136	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3137	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3138	+ browser.setVisible(true);
	3139	+ String filename = browser.getFile();
	3140	+ if (filename != null && filename.length() > 0)
	3141	+ {
	3142	+ String fullname = browser.getDirectory() + filename;
	3143	+ makeSomething(ReadOBJ(fullname), true);
	3144	+ }
	3145	+ } else
	3146	+ if (source == closeItem)
3175	3147	{
3176	3148	Close();
3177	3149	//return true;
3178		- } else if (event.getSource() == loadItem)
	3150	+ } else if (source == loadItem)
3179	3151	{
3180	3152	load();
3181	3153	//return true;
3182		- } else if (event.getSource() == saveItem)
	3154	+ } else if (source == newItem)
	3155	+ {
	3156	+ New();
	3157	+ } else if (source == saveItem)
3183	3158	{
3184	3159	save();
3185	3160	//return true;
3186		- } else if (event.getSource() == saveAsItem)
	3161	+ } else if (source == saveAsItem)
3187	3162	{
3188	3163	saveAs();
3189	3164	//return true;
3190		- } else if (event.getSource() == reexportItem)
	3165	+ } else if (source == reexportItem)
3191	3166	{
3192	3167	reexport();
3193	3168	//return true;
3194		- } else if (event.getSource() == exportAsItem)
	3169	+ } else if (source == exportAsItem)
3195	3170	{
3196	3171	export();
3197	3172	//return true;
3198		- } else if (event.getSource() == povItem)
	3173	+ } else if (source == povItem)
3199	3174	{
3200	3175	generatePOV();
3201	3176	//return true;
3202		- } else if (event.getSource() == zBufferItem)
	3177	+ } else if (source == zBufferItem)
3203	3178	{
3204	3179	try
3205	3180	{
..	..	@@ -3221,21 +3196,8 @@
3221	3196	cameraView.repaint();
3222	3197	//return true;
3223	3198	}
3224		- */ else if (event.getSource() == editCameraItem)
3225		- {
3226		- cameraView.ProtectCamera();
3227		- cameraView.repaint();
3228		- return;
3229		- } else if (event.getSource() == revertCameraItem)
3230		- {
3231		- cameraView.RevertCamera();
3232		- cameraView.repaint();
3233		- return;
3234		-// } else if (event.getSource() == textureButton)
3235		-// {
3236		-// return; // true;
3237		- } else // combos...
3238		- if (event.getSource() == texresMenu)
	3199	+ */ else // combos...
	3200	+ if (source == texresMenu)
3239	3201	{
3240	3202	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3241	3203	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3247,6 +3209,262 @@
3247	3209	}
3248	3210	}
3249	3211
	3212	+ void New()
	3213	+ {
	3214	+ while (copy.Size() > 1)
	3215	+ {
	3216	+ copy.remove(1);
	3217	+ }
	3218	+
	3219	+ ResetModel();
	3220	+ objEditor.refreshContents();
	3221	+ }
	3222	+
	3223	+ static public byte[] Compress(Object3D o)
	3224	+ {
	3225	+ try
	3226	+ {
	3227	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3228	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3229	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3230	+
	3231	+ Object3D parent = o.parent;
	3232	+ o.parent = null;
	3233	+
	3234	+ out.writeObject(o);
	3235	+
	3236	+ o.parent = parent;
	3237	+
	3238	+ out.flush();
	3239	+
	3240	+ zstream.close();
	3241	+ out.close();
	3242	+
	3243	+ return baos.toByteArray();
	3244	+ } catch (Exception e)
	3245	+ {
	3246	+ System.err.println(e);
	3247	+ return null;
	3248	+ }
	3249	+ }
	3250	+
	3251	+ static public Object Uncompress(byte[] bytes)
	3252	+ {
	3253	+ System.out.println("#bytes = " + bytes.length);
	3254	+ try
	3255	+ {
	3256	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3257	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3258	+ ObjectInputStream in = new ObjectInputStream(istream);
	3259	+ Object obj = in.readObject();
	3260	+ in.close();
	3261	+
	3262	+ return obj;
	3263	+ } catch (Exception e)
	3264	+ {
	3265	+ System.err.println(e);
	3266	+ return null;
	3267	+ }
	3268	+ }
	3269	+
	3270	+ static public Object clone(Object o)
	3271	+ {
	3272	+ try
	3273	+ {
	3274	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3275	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3276	+
	3277	+ out.writeObject(o);
	3278	+
	3279	+ out.flush();
	3280	+ out.close();
	3281	+
	3282	+ byte[] bytes = baos.toByteArray();
	3283	+
	3284	+ System.out.println("clone = " + bytes.length);
	3285	+
	3286	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3287	+ ObjectInputStream in = new ObjectInputStream(bais);
	3288	+ Object obj = in.readObject();
	3289	+ in.close();
	3290	+
	3291	+ return obj;
	3292	+ } catch (Exception e)
	3293	+ {
	3294	+ System.err.println(e);
	3295	+ return null;
	3296	+ }
	3297	+ }
	3298	+
	3299	+ cRadio GetCurrentTab()
	3300	+ {
	3301	+ cRadio ab;
	3302	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3303	+ {
	3304	+ ab = (cRadio)e.nextElement();
	3305	+ if(ab.GetObject() == copy)
	3306	+ {
	3307	+ return ab;
	3308	+ }
	3309	+ }
	3310	+
	3311	+ return null;
	3312	+ }
	3313	+
	3314	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3315	+
	3316	+ public void Save()
	3317	+ {
	3318	+ cRadio tab = GetCurrentTab();
	3319	+
	3320	+ boolean temp = CameraPane.SWITCH;
	3321	+ CameraPane.SWITCH = false;
	3322	+
	3323	+ copy.ExtractBigData(hashtable);
	3324	+
	3325	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3326	+ tab.graphs[tab.undoindex++] = Compress(copy);
	3327	+
	3328	+ copy.RestoreBigData(hashtable);
	3329	+
	3330	+ CameraPane.SWITCH = temp;
	3331	+
	3332	+ //assert(hashtable.isEmpty());
	3333	+
	3334	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3335	+ {
	3336	+ tab.graphs[i] = null;
	3337	+ }
	3338	+
	3339	+ // test save
	3340	+ if (false)
	3341	+ {
	3342	+ try
	3343	+ {
	3344	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3345	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3346	+
	3347	+ p.writeObject(copy);
	3348	+
	3349	+ p.flush();
	3350	+
	3351	+ ostream.close();
	3352	+ } catch (Exception e)
	3353	+ {
	3354	+ e.printStackTrace();
	3355	+ }
	3356	+ }
	3357	+ }
	3358	+
	3359	+ void CopyChanged(Object3D obj)
	3360	+ {
	3361	+ boolean temp = CameraPane.SWITCH;
	3362	+ CameraPane.SWITCH = false;
	3363	+
	3364	+ copy.ExtractBigData(hashtable);
	3365	+
	3366	+ copy.clear();
	3367	+
	3368	+ for (int i=0; i<obj.Size(); i++)
	3369	+ {
	3370	+ copy.add(obj.get(i));
	3371	+ }
	3372	+
	3373	+ copy.RestoreBigData(hashtable);
	3374	+
	3375	+ CameraPane.SWITCH = temp;
	3376	+
	3377	+ //assert(hashtable.isEmpty());
	3378	+
	3379	+ copy.Touch();
	3380	+
	3381	+ ResetModel();
	3382	+ copy.HardTouch(); // recompile?
	3383	+
	3384	+ cRadio ab;
	3385	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3386	+ {
	3387	+ ab = (cRadio)e.nextElement();
	3388	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3389	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3390	+ if (test != null)
	3391	+ {
	3392	+ test.editWindow = ab.object.editWindow;
	3393	+ ab.object = test;
	3394	+ }
	3395	+ }
	3396	+
	3397	+ refreshContents();
	3398	+ }
	3399	+
	3400	+ public void Undo()
	3401	+ {
	3402	+ cRadio tab = GetCurrentTab();
	3403	+
	3404	+ if (tab.undoindex == 0)
	3405	+ {
	3406	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3407	+ return;
	3408	+ }
	3409	+
	3410	+ if (tab.graphs[tab.undoindex] == null)
	3411	+ {
	3412	+ Save();
	3413	+ tab.undoindex -= 1;
	3414	+ }
	3415	+
	3416	+ tab.undoindex -= 1;
	3417	+
	3418	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3419	+ }
	3420	+
	3421	+ public void Redo()
	3422	+ {
	3423	+ cRadio tab = GetCurrentTab();
	3424	+
	3425	+ if (tab.graphs[tab.undoindex + 1] == null)
	3426	+ {
	3427	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3428	+ return;
	3429	+ }
	3430	+
	3431	+ tab.undoindex += 1;
	3432	+
	3433	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3434	+ }
	3435	+
	3436	+ void ImportGFD()
	3437	+ {
	3438	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3439	+ browser.show();
	3440	+ String filename = browser.getFile();
	3441	+ if (filename != null && filename.length() > 0)
	3442	+ {
	3443	+ String fullname = browser.getDirectory() + filename;
	3444	+
	3445	+ //Object3D readobj =
	3446	+ objEditor.ReadGFD(fullname, objEditor);
	3447	+ //makeSomething(readobj);
	3448	+ }
	3449	+ }
	3450	+
	3451	+ void ImportVRMLX3D()
	3452	+ {
	3453	+ if (Grafreed.standAlone)
	3454	+ {
	3455	+ /**/
	3456	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3457	+ browser.show();
	3458	+ String filename = browser.getFile();
	3459	+ if (filename != null && filename.length() > 0)
	3460	+ {
	3461	+ String fullname = browser.getDirectory() + filename;
	3462	+ LoadVRMLX3D(fullname);
	3463	+ }
	3464	+ /**/
	3465	+ }
	3466	+ }
	3467	+
3250	3468	void ToggleAnimation()
3251	3469	{
3252	3470	if (!Globals.ANIMATION)
..	..	@@ -3859,6 +4077,7 @@
3859	4077
3860	4078	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3861	4079	{
	4080	+ Save();
3862	4081	//Tween.set(thing, 0).target(1).start(tweenManager);
3863	4082	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3864	4083	// if (thing instanceof GenericJointDemo)
..	..	@@ -4062,6 +4281,7 @@
4062	4281	}
4063	4282	}
4064	4283	}
	4284	+
4065	4285	LoadGFDThread loadGFDThread;
4066	4286
4067	4287	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4081,8 +4301,10 @@
4081	4301
4082	4302	try
4083	4303	{
	4304	+ // Try compressed version first.
4084	4305	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4085		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4306	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4307	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4086	4308
4087	4309	readobj = (Object3D) p.readObject();
4088	4310	istream.close();
..	..	@@ -4090,7 +4312,20 @@
4090	4312	readobj.ResetDisplayList();
4091	4313	} catch (Exception e)
4092	4314	{
4093		- e.printStackTrace();
	4315	+ //e.printStackTrace();
	4316	+ try
	4317	+ {
	4318	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4319	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4320	+
	4321	+ readobj = (Object3D) p.readObject();
	4322	+ istream.close();
	4323	+
	4324	+ readobj.ResetDisplayList();
	4325	+ } catch (Exception e2)
	4326	+ {
	4327	+ e2.printStackTrace();
	4328	+ }
4094	4329	}
4095	4330	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4096	4331	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4136,6 +4371,12 @@
4136	4371
4137	4372	void LoadIt(Object obj)
4138	4373	{
	4374	+ if (obj == null)
	4375	+ {
	4376	+ // Invalid file
	4377	+ return;
	4378	+ }
	4379	+
4139	4380	System.out.println("Loaded " + obj);
4140	4381	//new Exception().printStackTrace();
4141	4382	Object3D readobj = (Object3D) obj;
..	..	@@ -4145,6 +4386,7 @@
4145	4386
4146	4387	if (readobj != null)
4147	4388	{
	4389	+ Save();
4148	4390	try
4149	4391	{
4150	4392	//readobj.deepCopySelf(copy);
..	..	@@ -4294,11 +4536,13 @@
4294	4536	try
4295	4537	{
4296	4538	FileOutputStream ostream = new FileOutputStream(lastname);
4297		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4539	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4540	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4298	4541
4299	4542	p.writeObject(copy);
4300	4543	p.flush();
4301	4544
	4545	+ zstream.close();
4302	4546	ostream.close();
4303	4547
4304	4548	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4308,6 +4552,7 @@
4308	4552	{
4309	4553	}
4310	4554	}
	4555	+
4311	4556	String lastname;
4312	4557
4313	4558	void saveAs()
..	..	@@ -4417,8 +4662,8 @@
4417	4662	try
4418	4663	{
4419	4664	FileOutputStream ostream = new FileOutputStream(filename);
4420		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4421		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4665	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4666	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4422	4667
4423	4668	Object3D objectparent = obj.parent;
4424	4669	obj.parent = null;
..	..	@@ -4435,8 +4680,8 @@
4435	4680	p.writeObject(object);
4436	4681	p.flush();
4437	4682
	4683	+ zstream.close();
4438	4684	ostream.close();
4439		- // zstream.close();
4440	4685
4441	4686	// group.selection.get(0).parent = parent;
4442	4687	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4483,7 +4728,8 @@
4483	4728	Object3D client;
4484	4729	Object3D copy;
4485	4730	MenuBar menuBar;
4486		- Menu windowMenu;
	4731	+ Menu fileMenu;
	4732	+ MenuItem newItem;
4487	4733	MenuItem loadItem;
4488	4734	MenuItem saveItem;
4489	4735	MenuItem saveAsItem;
..	..	@@ -4491,11 +4737,9 @@
4491	4737	MenuItem reexportItem;
4492	4738	MenuItem povItem;
4493	4739	MenuItem closeItem;
4494		- Menu cameraMenu;
	4740	+
4495	4741	CheckboxMenuItem zBufferItem;
4496	4742	//MenuItem normalLensItem;
4497		- MenuItem editCameraItem;
4498		- MenuItem revertCameraItem;
4499	4743	MenuItem stepItem;
4500	4744	CheckboxMenuItem toggleLiveItem;
4501	4745	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4643,4 +4887,9 @@
4643	4887	//ObjectUI parent;
4644	4888
4645	4889	cNumberSlider normalpushField;
	4890	+
	4891	+ private MenuItem importGFDItem;
	4892	+ private MenuItem importVRMLX3DItem;
	4893	+ private MenuItem import3DSItem;
	4894	+ private MenuItem importOBJItem;
4646	4895	}