~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();
..	..	@@ -501,13 +445,13 @@
501	445	//SendInfo("Name:", "bold");
502	446	if (sel.GetTextures() != null \|\| debug)
503	447	{
504		- si.SendInfo(sel.toString(), "bold");
	448	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
505	449	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
506	450	if (sel.Size() > 0)
507	451	{
508	452	si.SendInfo("#children = " + sel.Size(), "regular");
509	453	}
510		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	454	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
511	455	if (debug)
512	456	{
513	457	try
..	..	@@ -549,7 +493,7 @@
549	493	}
550	494	if (sel.support != null)
551	495	{
552		- si.SendInfo(" support: " + sel.support, "regular");
	496	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
553	497	}
554	498	if (sel.scriptnode != null)
555	499	{
..	..	@@ -752,7 +696,7 @@
752	696	protected static ImageIcon createImageIcon(String path,
753	697	String description)
754	698	{
755		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	699	+ java.net.URL imgURL = Grafreed.class.getResource(path);
756	700	if (imgURL != null)
757	701	{
758	702	return new ImageIcon(imgURL, description);
..	..	@@ -784,6 +728,7 @@
784	728	// NumberSlider vDivsField;
785	729	// JCheckBox endcaps;
786	730	JCheckBox liveCB;
	731	+ JCheckBox selectCB;
787	732	JCheckBox hideCB;
788	733	JCheckBox link2masterCB;
789	734	JCheckBox markCB;
..	..	@@ -986,9 +931,11 @@
986	931
987	932	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
988	933	liveCB.setToolTipText("Animate object");
	934	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	935	+ selectCB.setToolTipText("Make object selectable");
	936	+// Return();
989	937	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
990	938	hideCB.setToolTipText("Hide object");
991		-// Return();
992	939	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
993	940	markCB.setToolTipText("Set the animation target transform");
994	941
..	..	@@ -1028,7 +975,7 @@
1028	975	oe.ctrlPanel.add(commandsPanel);
1029	976	oe.ctrlPanel.Return();
1030	977
1031		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	978	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
1032	979	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1033	980	//Return();
1034	981
..	..	@@ -1476,19 +1423,19 @@
1476	1423
1477	1424	cGridBag editBar = new cGridBag().setVertical(false);
1478	1425
1479		- editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1426	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1480	1427	createMaterialButton.setToolTipText("Create material");
1481	1428
1482	1429	/*
1483	1430	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1484	1431	*/
1485	1432
1486		- editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1433	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1487	1434	clearMaterialButton.setToolTipText("Clear material");
1488	1435
1489	1436	if (Globals.ADVANCED)
1490	1437	{
1491		- editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1438	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
1492	1439	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1493	1440	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1494	1441	}
..	..	@@ -1939,7 +1886,7 @@
1939	1886
1940	1887	//? flashIt = false;
1941	1888	CameraPane pane = (CameraPane) cameraView;
1942		- pane.clickStart(location.x, location.y, 0);
	1889	+ pane.clickStart(location.x, location.y, 0, 0);
1943	1890	pane.clickEnd(location.x, location.y, 0, true);
1944	1891
1945	1892	if (group.selection.size() == 1)
..	..	@@ -2396,11 +2343,11 @@
2396	2343
2397	2344	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2398	2345	{
2399		- if (GrafreeD.standAlone)
	2346	+ if (Grafreed.standAlone)
2400	2347	{
2401	2348	/**/
2402	2349	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2403		- browser.show();
	2350	+ browser.setVisible(true);
2404	2351	String filename = browser.getFile();
2405	2352	if (filename != null && filename.length() > 0)
2406	2353	{
..	..	@@ -3007,6 +2954,10 @@
3007	2954	{
3008	2955	copy.live ^= true;
3009	2956	return;
	2957	+ } else if (event.getSource() == selectCB)
	2958	+ {
	2959	+ copy.dontselect ^= true;
	2960	+ return;
3010	2961	} else if (event.getSource() == hideCB)
3011	2962	{
3012	2963	copy.hide ^= true;
..	..	@@ -3045,8 +2996,9 @@
3045	2996
3046	2997	public void actionPerformed(ActionEvent event)
3047	2998	{
	2999	+ Object source = event.getSource();
3048	3000	// SCRIPT DIALOG
3049		- if (event.getSource() == okbutton)
	3001	+ if (source == okbutton)
3050	3002	{
3051	3003	textpanel.setVisible(false);
3052	3004	textpanel.remove(textarea);
..	..	@@ -3058,7 +3010,7 @@
3058	3010	textarea = null;
3059	3011	textpanel = null;
3060	3012	}
3061		- if (event.getSource() == cancelbutton)
	3013	+ if (source == cancelbutton)
3062	3014	{
3063	3015	textpanel.setVisible(false);
3064	3016	textpanel.remove(textarea);
..	..	@@ -3070,50 +3022,50 @@
3070	3022	//applySelf();
3071	3023	//client.refreshEditWindow();
3072	3024	//refreshContents();
3073		- if (event.getSource() == nameField)
	3025	+ if (source == nameField)
3074	3026	{
3075	3027	//System.out.println("ObjEditor " + event);
3076	3028	applySelf0(true);
3077	3029	//parent.applySelf();
3078	3030	objEditor.refreshContents();
3079		- } else if (event.getSource() == resetButton)
	3031	+ } else if (source == resetButton)
3080	3032	{
3081	3033	CameraPane.fullreset = true;
3082	3034	copy.Reset(); // ResetMeshes();
3083	3035	copy.Touch();
3084	3036	objEditor.refreshContents();
3085		- } else if (event.getSource() == stepItem)
	3037	+ } else if (source == stepItem)
3086	3038	{
3087	3039	//cameraView.ONESTEP = true;
3088	3040	Globals.ONESTEP = true;
3089	3041	cameraView.repaint();
3090	3042	return;
3091		- } else if (event.getSource() == stepButton)
	3043	+ } else if (source == stepButton)
3092	3044	{
3093	3045	copy.Step();
3094	3046	copy.Touch();
3095	3047	objEditor.refreshContents();
3096		- } else if (event.getSource() == slowerButton)
	3048	+ } else if (source == slowerButton)
3097	3049	{
3098	3050	copy.Slower();
3099	3051	copy.Touch();
3100	3052	objEditor.refreshContents();
3101		- } else if (event.getSource() == fasterButton)
	3053	+ } else if (source == fasterButton)
3102	3054	{
3103	3055	copy.Faster();
3104	3056	copy.Touch();
3105	3057	objEditor.refreshContents();
3106		- } else if (event.getSource() == remarkButton)
	3058	+ } else if (source == remarkButton)
3107	3059	{
3108	3060	copy.Remark();
3109	3061	copy.Touch();
3110	3062	objEditor.refreshContents();
3111		- } else if (event.getSource() == stepAllButton)
	3063	+ } else if (source == stepAllButton)
3112	3064	{
3113	3065	copy.StepAll();
3114	3066	copy.Touch();
3115	3067	objEditor.refreshContents();
3116		- } else if (event.getSource() == resetAllButton)
	3068	+ } else if (source == resetAllButton)
3117	3069	{
3118	3070	//CameraPane.fullreset = true;
3119	3071	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3146,53 +3098,75 @@
3146	3098	// Close();
3147	3099	// }
3148	3100	// else
3149		- if (event.getSource() == resetSlidersButton)
	3101	+ if (source == resetSlidersButton)
3150	3102	{
3151	3103	ResetSliders();
3152		- } else if (event.getSource() == clearMaterialButton)
	3104	+ } else if (source == clearMaterialButton)
3153	3105	{
3154	3106	ClearMaterial();
3155		- } else if (event.getSource() == createMaterialButton)
	3107	+ } else if (source == createMaterialButton)
3156	3108	{
3157	3109	CreateMaterial();
3158		- } else if (event.getSource() == clearPanelButton)
	3110	+ } else if (source == clearPanelButton)
3159	3111	{
3160	3112	copy.ClearUI();
3161	3113	refreshContents(true);
3162		- } /*
3163		- }
3164		-
3165		- public boolean action(Event event, Object arg)
3166		- {
3167		- */ else if (event.getSource() == closeItem)
	3114	+ } else if (source == importGFDItem)
	3115	+ {
	3116	+ ImportGFD();
	3117	+ } else
	3118	+ if (source == importVRMLX3DItem)
	3119	+ {
	3120	+ ImportVRMLX3D();
	3121	+ } else
	3122	+ if (source == import3DSItem)
	3123	+ {
	3124	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3125	+ } else
	3126	+ if (source == importOBJItem)
	3127	+ {
	3128	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3129	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3130	+ browser.setVisible(true);
	3131	+ String filename = browser.getFile();
	3132	+ if (filename != null && filename.length() > 0)
	3133	+ {
	3134	+ String fullname = browser.getDirectory() + filename;
	3135	+ makeSomething(ReadOBJ(fullname), true);
	3136	+ }
	3137	+ } else
	3138	+ if (source == closeItem)
3168	3139	{
3169	3140	Close();
3170	3141	//return true;
3171		- } else if (event.getSource() == loadItem)
	3142	+ } else if (source == loadItem)
3172	3143	{
3173	3144	load();
3174	3145	//return true;
3175		- } else if (event.getSource() == saveItem)
	3146	+ } else if (source == newItem)
	3147	+ {
	3148	+ New();
	3149	+ } else if (source == saveItem)
3176	3150	{
3177	3151	save();
3178	3152	//return true;
3179		- } else if (event.getSource() == saveAsItem)
	3153	+ } else if (source == saveAsItem)
3180	3154	{
3181	3155	saveAs();
3182	3156	//return true;
3183		- } else if (event.getSource() == reexportItem)
	3157	+ } else if (source == reexportItem)
3184	3158	{
3185	3159	reexport();
3186	3160	//return true;
3187		- } else if (event.getSource() == exportAsItem)
	3161	+ } else if (source == exportAsItem)
3188	3162	{
3189	3163	export();
3190	3164	//return true;
3191		- } else if (event.getSource() == povItem)
	3165	+ } else if (source == povItem)
3192	3166	{
3193	3167	generatePOV();
3194	3168	//return true;
3195		- } else if (event.getSource() == zBufferItem)
	3169	+ } else if (source == zBufferItem)
3196	3170	{
3197	3171	try
3198	3172	{
..	..	@@ -3214,21 +3188,8 @@
3214	3188	cameraView.repaint();
3215	3189	//return true;
3216	3190	}
3217		- */ else if (event.getSource() == editCameraItem)
3218		- {
3219		- cameraView.ProtectCamera();
3220		- cameraView.repaint();
3221		- return;
3222		- } else if (event.getSource() == revertCameraItem)
3223		- {
3224		- cameraView.RevertCamera();
3225		- cameraView.repaint();
3226		- return;
3227		-// } else if (event.getSource() == textureButton)
3228		-// {
3229		-// return; // true;
3230		- } else // combos...
3231		- if (event.getSource() == texresMenu)
	3191	+ */ else // combos...
	3192	+ if (source == texresMenu)
3232	3193	{
3233	3194	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3234	3195	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3240,6 +3201,150 @@
3240	3201	}
3241	3202	}
3242	3203
	3204	+ void New()
	3205	+ {
	3206	+ while (copy.Size() > 1)
	3207	+ {
	3208	+ copy.remove(1);
	3209	+ }
	3210	+
	3211	+ ResetModel();
	3212	+ objEditor.refreshContents();
	3213	+ }
	3214	+
	3215	+ Object3D graphs[] = new Object3D[10000];
	3216	+ int undoindex = 0;
	3217	+
	3218	+ static public Object clone(Object o)
	3219	+ {
	3220	+ try
	3221	+ {
	3222	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3223	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3224	+
	3225	+ out.writeObject(o);
	3226	+
	3227	+ ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
	3228	+ ObjectInputStream in = new ObjectInputStream(bais);
	3229	+ Object obj = in.readObject();
	3230	+ in.close();
	3231	+ out.close();
	3232	+ return obj;
	3233	+ } catch (Exception e)
	3234	+ {
	3235	+ System.err.println(e);
	3236	+ return null;
	3237	+ }
	3238	+ }
	3239	+
	3240	+ public void Save()
	3241	+ {
	3242	+ if (true) return;
	3243	+
	3244	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3245	+ graphs[undoindex++] = (Object3D)clone(copy);
	3246	+
	3247	+ for (int i = undoindex; i < graphs.length; i++)
	3248	+ {
	3249	+ graphs[i] = null;
	3250	+ }
	3251	+
	3252	+ // test save
	3253	+ if (false)
	3254	+ {
	3255	+ try
	3256	+ {
	3257	+ FileOutputStream ostream = new FileOutputStream("save" + undoindex);
	3258	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3259	+
	3260	+ p.writeObject(copy);
	3261	+
	3262	+ p.flush();
	3263	+
	3264	+ ostream.close();
	3265	+ } catch (Exception e)
	3266	+ {
	3267	+ e.printStackTrace();
	3268	+ }
	3269	+ }
	3270	+ }
	3271	+
	3272	+ public void Undo()
	3273	+ {
	3274	+ if (undoindex == 0)
	3275	+ {
	3276	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3277	+ return;
	3278	+ }
	3279	+
	3280	+ if (graphs[undoindex] == null)
	3281	+ {
	3282	+ Save();
	3283	+ undoindex -= 1;
	3284	+ }
	3285	+
	3286	+ undoindex -= 1;
	3287	+
	3288	+ copy = graphs[undoindex];
	3289	+
	3290	+ cameraView.object = copy;
	3291	+ copy.Touch();
	3292	+
	3293	+ ResetModel();
	3294	+ refreshContents();
	3295	+ }
	3296	+
	3297	+ public void Redo()
	3298	+ {
	3299	+ if (graphs[undoindex + 1] == null)
	3300	+ {
	3301	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3302	+ return;
	3303	+ }
	3304	+
	3305	+ undoindex += 1;
	3306	+
	3307	+ copy = graphs[undoindex];
	3308	+
	3309	+ cameraView.object = copy;
	3310	+ copy.Touch();
	3311	+
	3312	+ ResetModel();
	3313	+ refreshContents();
	3314	+ }
	3315	+
	3316	+ void ImportGFD()
	3317	+ {
	3318	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3319	+ browser.show();
	3320	+ String filename = browser.getFile();
	3321	+ if (filename != null && filename.length() > 0)
	3322	+ {
	3323	+ String fullname = browser.getDirectory() + filename;
	3324	+
	3325	+ //Object3D readobj =
	3326	+ objEditor.ReadGFD(fullname, objEditor);
	3327	+ //makeSomething(readobj);
	3328	+ }
	3329	+ }
	3330	+
	3331	+ void ImportVRMLX3D()
	3332	+ {
	3333	+ if (Grafreed.standAlone)
	3334	+ {
	3335	+ /**/
	3336	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3337	+ browser.show();
	3338	+ String filename = browser.getFile();
	3339	+ if (filename != null && filename.length() > 0)
	3340	+ {
	3341	+ String fullname = browser.getDirectory() + filename;
	3342	+ LoadVRMLX3D(fullname);
	3343	+ }
	3344	+ /**/
	3345	+ }
	3346	+ }
	3347	+
3243	3348	void ToggleAnimation()
3244	3349	{
3245	3350	if (!Globals.ANIMATION)
..	..	@@ -3255,8 +3360,8 @@
3255	3360
3256	3361	Globals.ANIMATION ^= true;
3257	3362
3258		- GrafreeD.wav.cursor = 0;
3259		- GrafreeD.wav.loop = 0;
	3363	+ Grafreed.wav.cursor = 0;
	3364	+ Grafreed.wav.loop = 0;
3260	3365	}
3261	3366	} else
3262	3367	{
..	..	@@ -3443,6 +3548,36 @@
3443	3548	{
3444	3549	//System.out.println("Propagate = " + propagate);
3445	3550	copy.UpdateMaterial(anchor, current, propagate);
	3551	+
	3552	+ if (copy.material != null)
	3553	+ {
	3554	+ cMaterial mat = copy.material;
	3555	+
	3556	+ colorField.SetToolTipValue((mat.color));
	3557	+ modulationField.SetToolTipValue((mat.modulation));
	3558	+ metalnessField.SetToolTipValue((mat.metalness));
	3559	+ diffuseField.SetToolTipValue((mat.diffuse));
	3560	+ specularField.SetToolTipValue((mat.specular));
	3561	+ shininessField.SetToolTipValue((mat.shininess));
	3562	+ shiftField.SetToolTipValue((mat.shift));
	3563	+ ambientField.SetToolTipValue((mat.ambient));
	3564	+ lightareaField.SetToolTipValue((mat.lightarea));
	3565	+ diffusenessField.SetToolTipValue((mat.factor));
	3566	+ velvetField.SetToolTipValue((mat.velvet));
	3567	+ sheenField.SetToolTipValue((mat.sheen));
	3568	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3569	+ backlitField.SetToolTipValue((mat.bump));
	3570	+ anisoField.SetToolTipValue((mat.aniso));
	3571	+ anisoVField.SetToolTipValue((mat.anisoV));
	3572	+ cameraField.SetToolTipValue((mat.cameralight));
	3573	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3574	+ shadowField.SetToolTipValue((mat.shadow));
	3575	+ textureField.SetToolTipValue((mat.texture));
	3576	+ opacityField.SetToolTipValue((mat.opacity));
	3577	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3578	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3579	+ }
	3580	+
3446	3581	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3447	3582	{
3448	3583	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3558,7 +3693,7 @@
3558	3693	}
3559	3694
3560	3695	if (normalpushField != null)
3561		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	3696	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3562	3697	}
3563	3698
3564	3699	void SnapObject()
..	..	@@ -3822,6 +3957,7 @@
3822	3957
3823	3958	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3824	3959	{
	3960	+ Save();
3825	3961	//Tween.set(thing, 0).target(1).start(tweenManager);
3826	3962	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3827	3963	// if (thing instanceof GenericJointDemo)
..	..	@@ -4025,6 +4161,7 @@
4025	4161	}
4026	4162	}
4027	4163	}
	4164	+
4028	4165	LoadGFDThread loadGFDThread;
4029	4166
4030	4167	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4045,7 +4182,8 @@
4045	4182	try
4046	4183	{
4047	4184	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4048		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4185	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4186	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4049	4187
4050	4188	readobj = (Object3D) p.readObject();
4051	4189	istream.close();
..	..	@@ -4053,7 +4191,20 @@
4053	4191	readobj.ResetDisplayList();
4054	4192	} catch (Exception e)
4055	4193	{
4056		- e.printStackTrace();
	4194	+ //e.printStackTrace();
	4195	+ try
	4196	+ {
	4197	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4198	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4199	+
	4200	+ readobj = (Object3D) p.readObject();
	4201	+ istream.close();
	4202	+
	4203	+ readobj.ResetDisplayList();
	4204	+ } catch (Exception e2)
	4205	+ {
	4206	+ e2.printStackTrace();
	4207	+ }
4057	4208	}
4058	4209	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4059	4210	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4170,7 +4321,7 @@
4170	4321
4171	4322	void load() // throws ClassNotFoundException
4172	4323	{
4173		- if (GrafreeD.standAlone)
	4324	+ if (Grafreed.standAlone)
4174	4325	{
4175	4326	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4176	4327	browser.show();
..	..	@@ -4257,11 +4408,13 @@
4257	4408	try
4258	4409	{
4259	4410	FileOutputStream ostream = new FileOutputStream(lastname);
4260		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4411	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4412	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4261	4413
4262	4414	p.writeObject(copy);
4263	4415	p.flush();
4264	4416
	4417	+ zstream.close();
4265	4418	ostream.close();
4266	4419
4267	4420	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4271,11 +4424,12 @@
4271	4424	{
4272	4425	}
4273	4426	}
	4427	+
4274	4428	String lastname;
4275	4429
4276	4430	void saveAs()
4277	4431	{
4278		- if (GrafreeD.standAlone)
	4432	+ if (Grafreed.standAlone)
4279	4433	{
4280	4434	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4281	4435	browser.setVisible(true);
..	..	@@ -4380,13 +4534,13 @@
4380	4534	try
4381	4535	{
4382	4536	FileOutputStream ostream = new FileOutputStream(filename);
4383		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4384		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4537	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4538	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4385	4539
4386	4540	Object3D objectparent = obj.parent;
4387	4541	obj.parent = null;
4388	4542
4389		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4543	+ Object3D object = (Object3D) Grafreed.clone(obj);
4390	4544
4391	4545	obj.parent = objectparent;
4392	4546
..	..	@@ -4398,8 +4552,8 @@
4398	4552	p.writeObject(object);
4399	4553	p.flush();
4400	4554
	4555	+ zstream.close();
4401	4556	ostream.close();
4402		- // zstream.close();
4403	4557
4404	4558	// group.selection.get(0).parent = parent;
4405	4559	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4420,7 +4574,7 @@
4420	4574	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4421	4575	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4422	4576	copy.generatePOV(buffer);
4423		- if (GrafreeD.standAlone)
	4577	+ if (Grafreed.standAlone)
4424	4578	{
4425	4579	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4426	4580	browser.show();
..	..	@@ -4446,7 +4600,8 @@
4446	4600	Object3D client;
4447	4601	Object3D copy;
4448	4602	MenuBar menuBar;
4449		- Menu windowMenu;
	4603	+ Menu fileMenu;
	4604	+ MenuItem newItem;
4450	4605	MenuItem loadItem;
4451	4606	MenuItem saveItem;
4452	4607	MenuItem saveAsItem;
..	..	@@ -4454,11 +4609,9 @@
4454	4609	MenuItem reexportItem;
4455	4610	MenuItem povItem;
4456	4611	MenuItem closeItem;
4457		- Menu cameraMenu;
	4612	+
4458	4613	CheckboxMenuItem zBufferItem;
4459	4614	//MenuItem normalLensItem;
4460		- MenuItem editCameraItem;
4461		- MenuItem revertCameraItem;
4462	4615	MenuItem stepItem;
4463	4616	CheckboxMenuItem toggleLiveItem;
4464	4617	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4606,4 +4759,9 @@
4606	4759	//ObjectUI parent;
4607	4760
4608	4761	cNumberSlider normalpushField;
	4762	+
	4763	+ private MenuItem importGFDItem;
	4764	+ private MenuItem importVRMLX3DItem;
	4765	+ private MenuItem import3DSItem;
	4766	+ private MenuItem importOBJItem;
4609	4767	}