~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -276,24 +276,40 @@
276	276	void SetupMenu()
277	277	{
278	278	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..."));
	279	+ menuBar.add(fileMenu = new Menu("File"));
	280	+ fileMenu.add(newItem = new MenuItem("New"));
	281	+ fileMenu.add(loadItem = new MenuItem("Load..."));
	282	+
	283	+ //oe.menuBar.add(menu = new Menu("Include"));
	284	+ Menu menu = new Menu("Import");
	285	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	286	+ importOBJItem.addActionListener(this);
	287	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	288	+ import3DSItem.addActionListener(this);
	289	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	290	+ importVRMLX3DItem.addActionListener(this);
	291	+ menu.add("-");
	292	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	293	+ importGFDItem.addActionListener(this);
	294	+ fileMenu.add(menu);
	295	+ fileMenu.add("-");
	296	+
	297	+ fileMenu.add(saveItem = new MenuItem("Save"));
	298	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
284	299	//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("-");
	300	+ fileMenu.add("-");
	301	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	302	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	303	+ fileMenu.add("-");
289	304	if (client.parent != null)
290	305	{
291		- windowMenu.add(closeItem = new MenuItem("Close"));
	306	+ fileMenu.add(closeItem = new MenuItem("Close"));
292	307	} else
293	308	{
294		- windowMenu.add(closeItem = new MenuItem("Exit"));
	309	+ fileMenu.add(closeItem = new MenuItem("Exit"));
295	310	}
296	311
	312	+ newItem.addActionListener(this);
297	313	loadItem.addActionListener(this);
298	314	saveItem.addActionListener(this);
299	315	saveAsItem.addActionListener(this);
..	..	@@ -301,78 +317,6 @@
301	317	reexportItem.addActionListener(this);
302	318	//povItem.addActionListener(this);
303	319	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	320
377	321	objectPanel = new JTabbedPane();
378	322	toolbarPanel = new JPanel();
..	..	@@ -1991,6 +1935,7 @@
1991	1935	e2.printStackTrace();
1992	1936	}
1993	1937	}
	1938	+
1994	1939	LoadJMEThread loadThread;
1995	1940
1996	1941	class LoadJMEThread extends Thread
..	..	@@ -2048,6 +1993,7 @@
2048	1993	//LoadFile0(filename, converter);
2049	1994	}
2050	1995	}
	1996	+
2051	1997	LoadOBJThread loadObjThread;
2052	1998
2053	1999	class LoadOBJThread extends Thread
..	..	@@ -3052,8 +2998,9 @@
3052	2998
3053	2999	public void actionPerformed(ActionEvent event)
3054	3000	{
	3001	+ Object source = event.getSource();
3055	3002	// SCRIPT DIALOG
3056		- if (event.getSource() == okbutton)
	3003	+ if (source == okbutton)
3057	3004	{
3058	3005	textpanel.setVisible(false);
3059	3006	textpanel.remove(textarea);
..	..	@@ -3065,7 +3012,7 @@
3065	3012	textarea = null;
3066	3013	textpanel = null;
3067	3014	}
3068		- if (event.getSource() == cancelbutton)
	3015	+ if (source == cancelbutton)
3069	3016	{
3070	3017	textpanel.setVisible(false);
3071	3018	textpanel.remove(textarea);
..	..	@@ -3077,50 +3024,50 @@
3077	3024	//applySelf();
3078	3025	//client.refreshEditWindow();
3079	3026	//refreshContents();
3080		- if (event.getSource() == nameField)
	3027	+ if (source == nameField)
3081	3028	{
3082	3029	//System.out.println("ObjEditor " + event);
3083	3030	applySelf0(true);
3084	3031	//parent.applySelf();
3085	3032	objEditor.refreshContents();
3086		- } else if (event.getSource() == resetButton)
	3033	+ } else if (source == resetButton)
3087	3034	{
3088	3035	CameraPane.fullreset = true;
3089	3036	copy.Reset(); // ResetMeshes();
3090	3037	copy.Touch();
3091	3038	objEditor.refreshContents();
3092		- } else if (event.getSource() == stepItem)
	3039	+ } else if (source == stepItem)
3093	3040	{
3094	3041	//cameraView.ONESTEP = true;
3095	3042	Globals.ONESTEP = true;
3096	3043	cameraView.repaint();
3097	3044	return;
3098		- } else if (event.getSource() == stepButton)
	3045	+ } else if (source == stepButton)
3099	3046	{
3100	3047	copy.Step();
3101	3048	copy.Touch();
3102	3049	objEditor.refreshContents();
3103		- } else if (event.getSource() == slowerButton)
	3050	+ } else if (source == slowerButton)
3104	3051	{
3105	3052	copy.Slower();
3106	3053	copy.Touch();
3107	3054	objEditor.refreshContents();
3108		- } else if (event.getSource() == fasterButton)
	3055	+ } else if (source == fasterButton)
3109	3056	{
3110	3057	copy.Faster();
3111	3058	copy.Touch();
3112	3059	objEditor.refreshContents();
3113		- } else if (event.getSource() == remarkButton)
	3060	+ } else if (source == remarkButton)
3114	3061	{
3115	3062	copy.Remark();
3116	3063	copy.Touch();
3117	3064	objEditor.refreshContents();
3118		- } else if (event.getSource() == stepAllButton)
	3065	+ } else if (source == stepAllButton)
3119	3066	{
3120	3067	copy.StepAll();
3121	3068	copy.Touch();
3122	3069	objEditor.refreshContents();
3123		- } else if (event.getSource() == resetAllButton)
	3070	+ } else if (source == resetAllButton)
3124	3071	{
3125	3072	//CameraPane.fullreset = true;
3126	3073	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3153,53 +3100,75 @@
3153	3100	// Close();
3154	3101	// }
3155	3102	// else
3156		- if (event.getSource() == resetSlidersButton)
	3103	+ if (source == resetSlidersButton)
3157	3104	{
3158	3105	ResetSliders();
3159		- } else if (event.getSource() == clearMaterialButton)
	3106	+ } else if (source == clearMaterialButton)
3160	3107	{
3161	3108	ClearMaterial();
3162		- } else if (event.getSource() == createMaterialButton)
	3109	+ } else if (source == createMaterialButton)
3163	3110	{
3164	3111	CreateMaterial();
3165		- } else if (event.getSource() == clearPanelButton)
	3112	+ } else if (source == clearPanelButton)
3166	3113	{
3167	3114	copy.ClearUI();
3168	3115	refreshContents(true);
3169		- } /*
3170		- }
3171		-
3172		- public boolean action(Event event, Object arg)
3173		- {
3174		- */ else if (event.getSource() == closeItem)
	3116	+ } else if (source == importGFDItem)
	3117	+ {
	3118	+ ImportGFD();
	3119	+ } else
	3120	+ if (source == importVRMLX3DItem)
	3121	+ {
	3122	+ ImportVRMLX3D();
	3123	+ } else
	3124	+ if (source == import3DSItem)
	3125	+ {
	3126	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3127	+ } else
	3128	+ if (source == importOBJItem)
	3129	+ {
	3130	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3131	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3132	+ browser.setVisible(true);
	3133	+ String filename = browser.getFile();
	3134	+ if (filename != null && filename.length() > 0)
	3135	+ {
	3136	+ String fullname = browser.getDirectory() + filename;
	3137	+ makeSomething(ReadOBJ(fullname), true);
	3138	+ }
	3139	+ } else
	3140	+ if (source == closeItem)
3175	3141	{
3176	3142	Close();
3177	3143	//return true;
3178		- } else if (event.getSource() == loadItem)
	3144	+ } else if (source == loadItem)
3179	3145	{
3180	3146	load();
3181	3147	//return true;
3182		- } else if (event.getSource() == saveItem)
	3148	+ } else if (source == newItem)
	3149	+ {
	3150	+ New();
	3151	+ } else if (source == saveItem)
3183	3152	{
3184	3153	save();
3185	3154	//return true;
3186		- } else if (event.getSource() == saveAsItem)
	3155	+ } else if (source == saveAsItem)
3187	3156	{
3188	3157	saveAs();
3189	3158	//return true;
3190		- } else if (event.getSource() == reexportItem)
	3159	+ } else if (source == reexportItem)
3191	3160	{
3192	3161	reexport();
3193	3162	//return true;
3194		- } else if (event.getSource() == exportAsItem)
	3163	+ } else if (source == exportAsItem)
3195	3164	{
3196	3165	export();
3197	3166	//return true;
3198		- } else if (event.getSource() == povItem)
	3167	+ } else if (source == povItem)
3199	3168	{
3200	3169	generatePOV();
3201	3170	//return true;
3202		- } else if (event.getSource() == zBufferItem)
	3171	+ } else if (source == zBufferItem)
3203	3172	{
3204	3173	try
3205	3174	{
..	..	@@ -3221,21 +3190,8 @@
3221	3190	cameraView.repaint();
3222	3191	//return true;
3223	3192	}
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)
	3193	+ */ else // combos...
	3194	+ if (source == texresMenu)
3239	3195	{
3240	3196	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3241	3197	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3247,6 +3203,246 @@
3247	3203	}
3248	3204	}
3249	3205
	3206	+ void New()
	3207	+ {
	3208	+ while (copy.Size() > 1)
	3209	+ {
	3210	+ copy.remove(1);
	3211	+ }
	3212	+
	3213	+ ResetModel();
	3214	+ objEditor.refreshContents();
	3215	+ }
	3216	+
	3217	+ static public byte[] Compress(Object o)
	3218	+ {
	3219	+ try
	3220	+ {
	3221	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3222	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3223	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3224	+
	3225	+ out.writeObject(o);
	3226	+
	3227	+ out.flush();
	3228	+
	3229	+ zstream.close();
	3230	+ out.close();
	3231	+
	3232	+ return baos.toByteArray();
	3233	+ } catch (Exception e)
	3234	+ {
	3235	+ System.err.println(e);
	3236	+ return null;
	3237	+ }
	3238	+ }
	3239	+
	3240	+ static public Object Uncompress(byte[] bytes)
	3241	+ {
	3242	+ try
	3243	+ {
	3244	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3245	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3246	+ ObjectInputStream in = new ObjectInputStream(istream);
	3247	+ Object obj = in.readObject();
	3248	+ in.close();
	3249	+
	3250	+ return obj;
	3251	+ } catch (Exception e)
	3252	+ {
	3253	+ System.err.println(e);
	3254	+ return null;
	3255	+ }
	3256	+ }
	3257	+
	3258	+ static public Object clone(Object o)
	3259	+ {
	3260	+ try
	3261	+ {
	3262	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3263	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3264	+
	3265	+ out.writeObject(o);
	3266	+
	3267	+ out.flush();
	3268	+ out.close();
	3269	+
	3270	+ byte[] bytes = baos.toByteArray();
	3271	+
	3272	+ System.out.println("clone = " + bytes.length);
	3273	+
	3274	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3275	+ ObjectInputStream in = new ObjectInputStream(bais);
	3276	+ Object obj = in.readObject();
	3277	+ in.close();
	3278	+
	3279	+ return obj;
	3280	+ } catch (Exception e)
	3281	+ {
	3282	+ System.err.println(e);
	3283	+ return null;
	3284	+ }
	3285	+ }
	3286	+
	3287	+ cRadio GetCurrentTab()
	3288	+ {
	3289	+ cRadio ab;
	3290	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3291	+ {
	3292	+ ab = (cRadio)e.nextElement();
	3293	+ if(ab.GetObject() == copy)
	3294	+ {
	3295	+ return ab;
	3296	+ }
	3297	+ }
	3298	+
	3299	+ return null;
	3300	+ }
	3301	+
	3302	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3303	+
	3304	+ public void Save()
	3305	+ {
	3306	+ cRadio tab = GetCurrentTab();
	3307	+
	3308	+ copy.ExtractBigData(hashtable);
	3309	+
	3310	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3311	+ tab.graphs[tab.undoindex++] = (Object3D)clone(copy);
	3312	+
	3313	+ copy.RestoreBigData(hashtable);
	3314	+
	3315	+ //assert(hashtable.isEmpty());
	3316	+
	3317	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3318	+ {
	3319	+ tab.graphs[i] = null;
	3320	+ }
	3321	+
	3322	+ // test save
	3323	+ if (false)
	3324	+ {
	3325	+ try
	3326	+ {
	3327	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3328	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3329	+
	3330	+ p.writeObject(copy);
	3331	+
	3332	+ p.flush();
	3333	+
	3334	+ ostream.close();
	3335	+ } catch (Exception e)
	3336	+ {
	3337	+ e.printStackTrace();
	3338	+ }
	3339	+ }
	3340	+ }
	3341	+
	3342	+ void CopyChanged(Object3D obj)
	3343	+ {
	3344	+ copy.ExtractBigData(hashtable);
	3345	+
	3346	+ copy.clear();
	3347	+
	3348	+ for (int i=0; i<obj.Size(); i++)
	3349	+ {
	3350	+ copy.add(obj.get(i));
	3351	+ }
	3352	+
	3353	+ copy.RestoreBigData(hashtable);
	3354	+
	3355	+ //assert(hashtable.isEmpty());
	3356	+
	3357	+ copy.Touch();
	3358	+
	3359	+ ResetModel();
	3360	+ copy.HardTouch(); // recompile?
	3361	+
	3362	+ cRadio ab;
	3363	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3364	+ {
	3365	+ ab = (cRadio)e.nextElement();
	3366	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3367	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3368	+ if (test != null)
	3369	+ {
	3370	+ test.editWindow = ab.object.editWindow;
	3371	+ ab.object = test;
	3372	+ }
	3373	+ }
	3374	+
	3375	+ refreshContents();
	3376	+ }
	3377	+
	3378	+ public void Undo()
	3379	+ {
	3380	+ cRadio tab = GetCurrentTab();
	3381	+
	3382	+ if (tab.undoindex == 0)
	3383	+ {
	3384	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3385	+ return;
	3386	+ }
	3387	+
	3388	+ if (tab.graphs[tab.undoindex] == null)
	3389	+ {
	3390	+ Save();
	3391	+ tab.undoindex -= 1;
	3392	+ }
	3393	+
	3394	+ tab.undoindex -= 1;
	3395	+
	3396	+ CopyChanged(tab.graphs[tab.undoindex]);
	3397	+ }
	3398	+
	3399	+ public void Redo()
	3400	+ {
	3401	+ cRadio tab = GetCurrentTab();
	3402	+
	3403	+ if (tab.graphs[tab.undoindex + 1] == null)
	3404	+ {
	3405	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3406	+ return;
	3407	+ }
	3408	+
	3409	+ tab.undoindex += 1;
	3410	+
	3411	+ CopyChanged(tab.graphs[tab.undoindex]);
	3412	+ }
	3413	+
	3414	+ void ImportGFD()
	3415	+ {
	3416	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3417	+ browser.show();
	3418	+ String filename = browser.getFile();
	3419	+ if (filename != null && filename.length() > 0)
	3420	+ {
	3421	+ String fullname = browser.getDirectory() + filename;
	3422	+
	3423	+ //Object3D readobj =
	3424	+ objEditor.ReadGFD(fullname, objEditor);
	3425	+ //makeSomething(readobj);
	3426	+ }
	3427	+ }
	3428	+
	3429	+ void ImportVRMLX3D()
	3430	+ {
	3431	+ if (Grafreed.standAlone)
	3432	+ {
	3433	+ /**/
	3434	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3435	+ browser.show();
	3436	+ String filename = browser.getFile();
	3437	+ if (filename != null && filename.length() > 0)
	3438	+ {
	3439	+ String fullname = browser.getDirectory() + filename;
	3440	+ LoadVRMLX3D(fullname);
	3441	+ }
	3442	+ /**/
	3443	+ }
	3444	+ }
	3445	+
3250	3446	void ToggleAnimation()
3251	3447	{
3252	3448	if (!Globals.ANIMATION)
..	..	@@ -3859,6 +4055,7 @@
3859	4055
3860	4056	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3861	4057	{
	4058	+ Save();
3862	4059	//Tween.set(thing, 0).target(1).start(tweenManager);
3863	4060	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3864	4061	// if (thing instanceof GenericJointDemo)
..	..	@@ -4062,6 +4259,7 @@
4062	4259	}
4063	4260	}
4064	4261	}
	4262	+
4065	4263	LoadGFDThread loadGFDThread;
4066	4264
4067	4265	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4082,7 +4280,8 @@
4082	4280	try
4083	4281	{
4084	4282	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4085		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4283	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4284	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4086	4285
4087	4286	readobj = (Object3D) p.readObject();
4088	4287	istream.close();
..	..	@@ -4090,7 +4289,20 @@
4090	4289	readobj.ResetDisplayList();
4091	4290	} catch (Exception e)
4092	4291	{
4093		- e.printStackTrace();
	4292	+ //e.printStackTrace();
	4293	+ try
	4294	+ {
	4295	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4296	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4297	+
	4298	+ readobj = (Object3D) p.readObject();
	4299	+ istream.close();
	4300	+
	4301	+ readobj.ResetDisplayList();
	4302	+ } catch (Exception e2)
	4303	+ {
	4304	+ e2.printStackTrace();
	4305	+ }
4094	4306	}
4095	4307	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4096	4308	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4145,6 +4357,7 @@
4145	4357
4146	4358	if (readobj != null)
4147	4359	{
	4360	+ Save();
4148	4361	try
4149	4362	{
4150	4363	//readobj.deepCopySelf(copy);
..	..	@@ -4294,11 +4507,13 @@
4294	4507	try
4295	4508	{
4296	4509	FileOutputStream ostream = new FileOutputStream(lastname);
4297		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4510	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4511	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4298	4512
4299	4513	p.writeObject(copy);
4300	4514	p.flush();
4301	4515
	4516	+ zstream.close();
4302	4517	ostream.close();
4303	4518
4304	4519	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4308,6 +4523,7 @@
4308	4523	{
4309	4524	}
4310	4525	}
	4526	+
4311	4527	String lastname;
4312	4528
4313	4529	void saveAs()
..	..	@@ -4417,8 +4633,8 @@
4417	4633	try
4418	4634	{
4419	4635	FileOutputStream ostream = new FileOutputStream(filename);
4420		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4421		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4636	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4637	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4422	4638
4423	4639	Object3D objectparent = obj.parent;
4424	4640	obj.parent = null;
..	..	@@ -4435,8 +4651,8 @@
4435	4651	p.writeObject(object);
4436	4652	p.flush();
4437	4653
	4654	+ zstream.close();
4438	4655	ostream.close();
4439		- // zstream.close();
4440	4656
4441	4657	// group.selection.get(0).parent = parent;
4442	4658	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4483,7 +4699,8 @@
4483	4699	Object3D client;
4484	4700	Object3D copy;
4485	4701	MenuBar menuBar;
4486		- Menu windowMenu;
	4702	+ Menu fileMenu;
	4703	+ MenuItem newItem;
4487	4704	MenuItem loadItem;
4488	4705	MenuItem saveItem;
4489	4706	MenuItem saveAsItem;
..	..	@@ -4491,11 +4708,9 @@
4491	4708	MenuItem reexportItem;
4492	4709	MenuItem povItem;
4493	4710	MenuItem closeItem;
4494		- Menu cameraMenu;
	4711	+
4495	4712	CheckboxMenuItem zBufferItem;
4496	4713	//MenuItem normalLensItem;
4497		- MenuItem editCameraItem;
4498		- MenuItem revertCameraItem;
4499	4714	MenuItem stepItem;
4500	4715	CheckboxMenuItem toggleLiveItem;
4501	4716	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4643,4 +4858,9 @@
4643	4858	//ObjectUI parent;
4644	4859
4645	4860	cNumberSlider normalpushField;
	4861	+
	4862	+ private MenuItem importGFDItem;
	4863	+ private MenuItem importVRMLX3DItem;
	4864	+ private MenuItem import3DSItem;
	4865	+ private MenuItem importOBJItem;
4646	4866	}