~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,77 +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		- if (Globals.ADVANCED)
323		- {
324		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
325		- toggleLiveItem.addItemListener(this);
326		- toggleLiveItem.setState(Globals.isLIVE());
327		-
328		- cameraMenu.add(stepItem = new MenuItem("Step"));
329		- stepItem.addActionListener(this);
330		- // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
331		- // toggleDLItem.addItemListener(this);
332		- // toggleDLItem.setState(false);
333		-
334		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
335		- toggleRenderItem.addItemListener(this);
336		- toggleRenderItem.setState(!CameraPane.frozen);
337		-
338		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
339		- toggleDebugItem.addItemListener(this);
340		- toggleDebugItem.setState(CameraPane.DEBUG);
341		-
342		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
343		- toggleFrustumItem.addItemListener(this);
344		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
345		-
346		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
347		- toggleFootContactItem.addItemListener(this);
348		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
349		-
350		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
351		- toggleTimelineItem.addItemListener(this);
352		- }
353		-
354		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
355		- toggleSwitchItem.addItemListener(this);
356		- toggleSwitchItem.setState(CameraPane.SWITCH);
357		-
358		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
359		- toggleHandleItem.addItemListener(this);
360		- toggleHandleItem.setState(CameraPane.HANDLES);
361		-
362		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
363		- togglePaintItem.addItemListener(this);
364		- togglePaintItem.setState(CameraPane.PAINTMODE);
365		-
366		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
367		-// toggleRootItem.addItemListener(this);
368		-// toggleRootItem.setState(false);
369		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
370		-// animationItem.addItemListener(this);
371		-// animationItem.setState(CameraPane.ANIMATION);
372		- cameraMenu.add("-");
373		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
374		- editCameraItem.addActionListener(this);
375	320
376	321	objectPanel = new JTabbedPane();
377	322	toolbarPanel = new JPanel();
..	..	@@ -500,13 +445,13 @@
500	445	//SendInfo("Name:", "bold");
501	446	if (sel.GetTextures() != null \|\| debug)
502	447	{
503		- si.SendInfo(sel.toString(), "bold");
	448	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
504	449	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
505	450	if (sel.Size() > 0)
506	451	{
507	452	si.SendInfo("#children = " + sel.Size(), "regular");
508	453	}
509		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	454	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
510	455	if (debug)
511	456	{
512	457	try
..	..	@@ -548,7 +493,7 @@
548	493	}
549	494	if (sel.support != null)
550	495	{
551		- si.SendInfo(" support: " + sel.support, "regular");
	496	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
552	497	}
553	498	if (sel.scriptnode != null)
554	499	{
..	..	@@ -751,7 +696,7 @@
751	696	protected static ImageIcon createImageIcon(String path,
752	697	String description)
753	698	{
754		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	699	+ java.net.URL imgURL = Grafreed.class.getResource(path);
755	700	if (imgURL != null)
756	701	{
757	702	return new ImageIcon(imgURL, description);
..	..	@@ -783,6 +728,7 @@
783	728	// NumberSlider vDivsField;
784	729	// JCheckBox endcaps;
785	730	JCheckBox liveCB;
	731	+ JCheckBox selectCB;
786	732	JCheckBox hideCB;
787	733	JCheckBox link2masterCB;
788	734	JCheckBox markCB;
..	..	@@ -985,9 +931,11 @@
985	931
986	932	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
987	933	liveCB.setToolTipText("Animate object");
	934	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	935	+ selectCB.setToolTipText("Make object selectable");
	936	+// Return();
988	937	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
989	938	hideCB.setToolTipText("Hide object");
990		-// Return();
991	939	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
992	940	markCB.setToolTipText("Set the animation target transform");
993	941
..	..	@@ -1027,7 +975,7 @@
1027	975	oe.ctrlPanel.add(commandsPanel);
1028	976	oe.ctrlPanel.Return();
1029	977
1030		- 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
1031	979	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1032	980	//Return();
1033	981
..	..	@@ -1329,7 +1277,7 @@
1329	1277	scrollpane.addMouseWheelListener(this); // Default not fast enough
1330	1278
1331	1279	/JTabbedPane/ scenePanel = new cGridBag();
1332		- scenePanel.preferredWidth = 7;
	1280	+ scenePanel.preferredWidth = 6;
1333	1281
1334	1282	JTabbedPane tabbedPane = new JTabbedPane();
1335	1283	tabbedPane.add(scrollpane);
..	..	@@ -1435,8 +1383,8 @@
1435	1383
1436	1384	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1437	1385
1438		- frame.setSize(1024, 768);
1439		- frame.show();
	1386	+ frame.setSize(1280, 860);
	1387	+ frame.setVisible(true);
1440	1388
1441	1389	gridPanel.setDividerLocation(1.0);
1442	1390
..	..	@@ -1475,19 +1423,19 @@
1475	1423
1476	1424	cGridBag editBar = new cGridBag().setVertical(false);
1477	1425
1478		- editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1426	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1479	1427	createMaterialButton.setToolTipText("Create material");
1480	1428
1481	1429	/*
1482	1430	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1483	1431	*/
1484	1432
1485		- editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1433	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1486	1434	clearMaterialButton.setToolTipText("Clear material");
1487	1435
1488	1436	if (Globals.ADVANCED)
1489	1437	{
1490		- editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1438	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
1491	1439	editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1492	1440	editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1493	1441	}
..	..	@@ -1938,7 +1886,7 @@
1938	1886
1939	1887	//? flashIt = false;
1940	1888	CameraPane pane = (CameraPane) cameraView;
1941		- pane.clickStart(location.x, location.y, 0);
	1889	+ pane.clickStart(location.x, location.y, 0, 0);
1942	1890	pane.clickEnd(location.x, location.y, 0, true);
1943	1891
1944	1892	if (group.selection.size() == 1)
..	..	@@ -2395,11 +2343,11 @@
2395	2343
2396	2344	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2397	2345	{
2398		- if (GrafreeD.standAlone)
	2346	+ if (Grafreed.standAlone)
2399	2347	{
2400	2348	/**/
2401	2349	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2402		- browser.show();
	2350	+ browser.setVisible(true);
2403	2351	String filename = browser.getFile();
2404	2352	if (filename != null && filename.length() > 0)
2405	2353	{
..	..	@@ -3006,6 +2954,10 @@
3006	2954	{
3007	2955	copy.live ^= true;
3008	2956	return;
	2957	+ } else if (event.getSource() == selectCB)
	2958	+ {
	2959	+ copy.dontselect ^= true;
	2960	+ return;
3009	2961	} else if (event.getSource() == hideCB)
3010	2962	{
3011	2963	copy.hide ^= true;
..	..	@@ -3044,8 +2996,9 @@
3044	2996
3045	2997	public void actionPerformed(ActionEvent event)
3046	2998	{
	2999	+ Object source = event.getSource();
3047	3000	// SCRIPT DIALOG
3048		- if (event.getSource() == okbutton)
	3001	+ if (source == okbutton)
3049	3002	{
3050	3003	textpanel.setVisible(false);
3051	3004	textpanel.remove(textarea);
..	..	@@ -3057,7 +3010,7 @@
3057	3010	textarea = null;
3058	3011	textpanel = null;
3059	3012	}
3060		- if (event.getSource() == cancelbutton)
	3013	+ if (source == cancelbutton)
3061	3014	{
3062	3015	textpanel.setVisible(false);
3063	3016	textpanel.remove(textarea);
..	..	@@ -3069,50 +3022,50 @@
3069	3022	//applySelf();
3070	3023	//client.refreshEditWindow();
3071	3024	//refreshContents();
3072		- if (event.getSource() == nameField)
	3025	+ if (source == nameField)
3073	3026	{
3074	3027	//System.out.println("ObjEditor " + event);
3075	3028	applySelf0(true);
3076	3029	//parent.applySelf();
3077	3030	objEditor.refreshContents();
3078		- } else if (event.getSource() == resetButton)
	3031	+ } else if (source == resetButton)
3079	3032	{
3080	3033	CameraPane.fullreset = true;
3081	3034	copy.Reset(); // ResetMeshes();
3082	3035	copy.Touch();
3083	3036	objEditor.refreshContents();
3084		- } else if (event.getSource() == stepItem)
	3037	+ } else if (source == stepItem)
3085	3038	{
3086	3039	//cameraView.ONESTEP = true;
3087	3040	Globals.ONESTEP = true;
3088	3041	cameraView.repaint();
3089	3042	return;
3090		- } else if (event.getSource() == stepButton)
	3043	+ } else if (source == stepButton)
3091	3044	{
3092	3045	copy.Step();
3093	3046	copy.Touch();
3094	3047	objEditor.refreshContents();
3095		- } else if (event.getSource() == slowerButton)
	3048	+ } else if (source == slowerButton)
3096	3049	{
3097	3050	copy.Slower();
3098	3051	copy.Touch();
3099	3052	objEditor.refreshContents();
3100		- } else if (event.getSource() == fasterButton)
	3053	+ } else if (source == fasterButton)
3101	3054	{
3102	3055	copy.Faster();
3103	3056	copy.Touch();
3104	3057	objEditor.refreshContents();
3105		- } else if (event.getSource() == remarkButton)
	3058	+ } else if (source == remarkButton)
3106	3059	{
3107	3060	copy.Remark();
3108	3061	copy.Touch();
3109	3062	objEditor.refreshContents();
3110		- } else if (event.getSource() == stepAllButton)
	3063	+ } else if (source == stepAllButton)
3111	3064	{
3112	3065	copy.StepAll();
3113	3066	copy.Touch();
3114	3067	objEditor.refreshContents();
3115		- } else if (event.getSource() == resetAllButton)
	3068	+ } else if (source == resetAllButton)
3116	3069	{
3117	3070	//CameraPane.fullreset = true;
3118	3071	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3145,53 +3098,75 @@
3145	3098	// Close();
3146	3099	// }
3147	3100	// else
3148		- if (event.getSource() == resetSlidersButton)
	3101	+ if (source == resetSlidersButton)
3149	3102	{
3150	3103	ResetSliders();
3151		- } else if (event.getSource() == clearMaterialButton)
	3104	+ } else if (source == clearMaterialButton)
3152	3105	{
3153	3106	ClearMaterial();
3154		- } else if (event.getSource() == createMaterialButton)
	3107	+ } else if (source == createMaterialButton)
3155	3108	{
3156	3109	CreateMaterial();
3157		- } else if (event.getSource() == clearPanelButton)
	3110	+ } else if (source == clearPanelButton)
3158	3111	{
3159	3112	copy.ClearUI();
3160	3113	refreshContents(true);
3161		- } /*
3162		- }
3163		-
3164		- public boolean action(Event event, Object arg)
3165		- {
3166		- */ 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)
3167	3139	{
3168	3140	Close();
3169	3141	//return true;
3170		- } else if (event.getSource() == loadItem)
	3142	+ } else if (source == loadItem)
3171	3143	{
3172	3144	load();
3173	3145	//return true;
3174		- } else if (event.getSource() == saveItem)
	3146	+ } else if (source == newItem)
	3147	+ {
	3148	+ New();
	3149	+ } else if (source == saveItem)
3175	3150	{
3176	3151	save();
3177	3152	//return true;
3178		- } else if (event.getSource() == saveAsItem)
	3153	+ } else if (source == saveAsItem)
3179	3154	{
3180	3155	saveAs();
3181	3156	//return true;
3182		- } else if (event.getSource() == reexportItem)
	3157	+ } else if (source == reexportItem)
3183	3158	{
3184	3159	reexport();
3185	3160	//return true;
3186		- } else if (event.getSource() == exportAsItem)
	3161	+ } else if (source == exportAsItem)
3187	3162	{
3188	3163	export();
3189	3164	//return true;
3190		- } else if (event.getSource() == povItem)
	3165	+ } else if (source == povItem)
3191	3166	{
3192	3167	generatePOV();
3193	3168	//return true;
3194		- } else if (event.getSource() == zBufferItem)
	3169	+ } else if (source == zBufferItem)
3195	3170	{
3196	3171	try
3197	3172	{
..	..	@@ -3213,21 +3188,8 @@
3213	3188	cameraView.repaint();
3214	3189	//return true;
3215	3190	}
3216		- */ else if (event.getSource() == editCameraItem)
3217		- {
3218		- cameraView.ProtectCamera();
3219		- cameraView.repaint();
3220		- return;
3221		- } else if (event.getSource() == revertCameraItem)
3222		- {
3223		- cameraView.RevertCamera();
3224		- cameraView.repaint();
3225		- return;
3226		-// } else if (event.getSource() == textureButton)
3227		-// {
3228		-// return; // true;
3229		- } else // combos...
3230		- if (event.getSource() == texresMenu)
	3191	+ */ else // combos...
	3192	+ if (source == texresMenu)
3231	3193	{
3232	3194	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3233	3195	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3239,6 +3201,48 @@
3239	3201	}
3240	3202	}
3241	3203
	3204	+ void New()
	3205	+ {
	3206	+ while (copy.Size() > 1)
	3207	+ {
	3208	+ copy.remove(1);
	3209	+ }
	3210	+ ResetModel();
	3211	+ objEditor.refreshContents();
	3212	+ }
	3213	+
	3214	+ void ImportGFD()
	3215	+ {
	3216	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3217	+ browser.show();
	3218	+ String filename = browser.getFile();
	3219	+ if (filename != null && filename.length() > 0)
	3220	+ {
	3221	+ String fullname = browser.getDirectory() + filename;
	3222	+
	3223	+ //Object3D readobj =
	3224	+ objEditor.ReadGFD(fullname, objEditor);
	3225	+ //makeSomething(readobj);
	3226	+ }
	3227	+ }
	3228	+
	3229	+ void ImportVRMLX3D()
	3230	+ {
	3231	+ if (Grafreed.standAlone)
	3232	+ {
	3233	+ /**/
	3234	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3235	+ browser.show();
	3236	+ String filename = browser.getFile();
	3237	+ if (filename != null && filename.length() > 0)
	3238	+ {
	3239	+ String fullname = browser.getDirectory() + filename;
	3240	+ LoadVRMLX3D(fullname);
	3241	+ }
	3242	+ /**/
	3243	+ }
	3244	+ }
	3245	+
3242	3246	void ToggleAnimation()
3243	3247	{
3244	3248	if (!Globals.ANIMATION)
..	..	@@ -3254,8 +3258,8 @@
3254	3258
3255	3259	Globals.ANIMATION ^= true;
3256	3260
3257		- GrafreeD.wav.cursor = 0;
3258		- GrafreeD.wav.loop = 0;
	3261	+ Grafreed.wav.cursor = 0;
	3262	+ Grafreed.wav.loop = 0;
3259	3263	}
3260	3264	} else
3261	3265	{
..	..	@@ -3276,7 +3280,6 @@
3276	3280	callee.refreshContents();
3277	3281	} else
3278	3282	{
3279		- new Exception().printStackTrace();
3280	3283	System.exit(0);
3281	3284	}
3282	3285	}
..	..	@@ -3443,6 +3446,36 @@
3443	3446	{
3444	3447	//System.out.println("Propagate = " + propagate);
3445	3448	copy.UpdateMaterial(anchor, current, propagate);
	3449	+
	3450	+ if (copy.material != null)
	3451	+ {
	3452	+ cMaterial mat = copy.material;
	3453	+
	3454	+ colorField.SetToolTipValue((mat.color));
	3455	+ modulationField.SetToolTipValue((mat.modulation));
	3456	+ metalnessField.SetToolTipValue((mat.metalness));
	3457	+ diffuseField.SetToolTipValue((mat.diffuse));
	3458	+ specularField.SetToolTipValue((mat.specular));
	3459	+ shininessField.SetToolTipValue((mat.shininess));
	3460	+ shiftField.SetToolTipValue((mat.shift));
	3461	+ ambientField.SetToolTipValue((mat.ambient));
	3462	+ lightareaField.SetToolTipValue((mat.lightarea));
	3463	+ diffusenessField.SetToolTipValue((mat.factor));
	3464	+ velvetField.SetToolTipValue((mat.velvet));
	3465	+ sheenField.SetToolTipValue((mat.sheen));
	3466	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3467	+ backlitField.SetToolTipValue((mat.bump));
	3468	+ anisoField.SetToolTipValue((mat.aniso));
	3469	+ anisoVField.SetToolTipValue((mat.anisoV));
	3470	+ cameraField.SetToolTipValue((mat.cameralight));
	3471	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3472	+ shadowField.SetToolTipValue((mat.shadow));
	3473	+ textureField.SetToolTipValue((mat.texture));
	3474	+ opacityField.SetToolTipValue((mat.opacity));
	3475	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3476	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3477	+ }
	3478	+
3446	3479	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3447	3480	{
3448	3481	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3558,7 +3591,7 @@
3558	3591	}
3559	3592
3560	3593	if (normalpushField != null)
3561		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	3594	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3562	3595	}
3563	3596
3564	3597	void SnapObject()
..	..	@@ -4025,6 +4058,7 @@
4025	4058	}
4026	4059	}
4027	4060	}
	4061	+
4028	4062	LoadGFDThread loadGFDThread;
4029	4063
4030	4064	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4045,7 +4079,8 @@
4045	4079	try
4046	4080	{
4047	4081	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4048		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4082	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4083	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4049	4084
4050	4085	readobj = (Object3D) p.readObject();
4051	4086	istream.close();
..	..	@@ -4053,7 +4088,20 @@
4053	4088	readobj.ResetDisplayList();
4054	4089	} catch (Exception e)
4055	4090	{
4056		- e.printStackTrace();
	4091	+ //e.printStackTrace();
	4092	+ try
	4093	+ {
	4094	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4095	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4096	+
	4097	+ readobj = (Object3D) p.readObject();
	4098	+ istream.close();
	4099	+
	4100	+ readobj.ResetDisplayList();
	4101	+ } catch (Exception e2)
	4102	+ {
	4103	+ e2.printStackTrace();
	4104	+ }
4057	4105	}
4058	4106	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4059	4107	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4170,7 +4218,7 @@
4170	4218
4171	4219	void load() // throws ClassNotFoundException
4172	4220	{
4173		- if (GrafreeD.standAlone)
	4221	+ if (Grafreed.standAlone)
4174	4222	{
4175	4223	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4176	4224	browser.show();
..	..	@@ -4257,11 +4305,13 @@
4257	4305	try
4258	4306	{
4259	4307	FileOutputStream ostream = new FileOutputStream(lastname);
4260		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4308	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4309	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4261	4310
4262	4311	p.writeObject(copy);
4263	4312	p.flush();
4264	4313
	4314	+ zstream.close();
4265	4315	ostream.close();
4266	4316
4267	4317	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4271,11 +4321,12 @@
4271	4321	{
4272	4322	}
4273	4323	}
	4324	+
4274	4325	String lastname;
4275	4326
4276	4327	void saveAs()
4277	4328	{
4278		- if (GrafreeD.standAlone)
	4329	+ if (Grafreed.standAlone)
4279	4330	{
4280	4331	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4281	4332	browser.setVisible(true);
..	..	@@ -4380,13 +4431,13 @@
4380	4431	try
4381	4432	{
4382	4433	FileOutputStream ostream = new FileOutputStream(filename);
4383		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4384		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4434	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4435	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4385	4436
4386	4437	Object3D objectparent = obj.parent;
4387	4438	obj.parent = null;
4388	4439
4389		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4440	+ Object3D object = (Object3D) Grafreed.clone(obj);
4390	4441
4391	4442	obj.parent = objectparent;
4392	4443
..	..	@@ -4398,8 +4449,8 @@
4398	4449	p.writeObject(object);
4399	4450	p.flush();
4400	4451
	4452	+ zstream.close();
4401	4453	ostream.close();
4402		- // zstream.close();
4403	4454
4404	4455	// group.selection.get(0).parent = parent;
4405	4456	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4420,7 +4471,7 @@
4420	4471	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4421	4472	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4422	4473	copy.generatePOV(buffer);
4423		- if (GrafreeD.standAlone)
	4474	+ if (Grafreed.standAlone)
4424	4475	{
4425	4476	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4426	4477	browser.show();
..	..	@@ -4446,7 +4497,8 @@
4446	4497	Object3D client;
4447	4498	Object3D copy;
4448	4499	MenuBar menuBar;
4449		- Menu windowMenu;
	4500	+ Menu fileMenu;
	4501	+ MenuItem newItem;
4450	4502	MenuItem loadItem;
4451	4503	MenuItem saveItem;
4452	4504	MenuItem saveAsItem;
..	..	@@ -4454,11 +4506,9 @@
4454	4506	MenuItem reexportItem;
4455	4507	MenuItem povItem;
4456	4508	MenuItem closeItem;
4457		- Menu cameraMenu;
	4509	+
4458	4510	CheckboxMenuItem zBufferItem;
4459	4511	//MenuItem normalLensItem;
4460		- MenuItem editCameraItem;
4461		- MenuItem revertCameraItem;
4462	4512	MenuItem stepItem;
4463	4513	CheckboxMenuItem toggleLiveItem;
4464	4514	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4606,4 +4656,9 @@
4606	4656	//ObjectUI parent;
4607	4657
4608	4658	cNumberSlider normalpushField;
	4659	+
	4660	+ private MenuItem importGFDItem;
	4661	+ private MenuItem importVRMLX3DItem;
	4662	+ private MenuItem import3DSItem;
	4663	+ private MenuItem importOBJItem;
4609	4664	}