~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,61 +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		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
313		- toggleTimelineItem.addItemListener(this);
314		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
315		- toggleFullScreenItem.addItemListener(this);
316		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
317		- cameraMenu.add("-");
318		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
319		- toggleTextureItem.addItemListener(this);
320		- toggleTextureItem.setState(CameraPane.textureon);
321		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
322		- toggleLiveItem.addItemListener(this);
323		- toggleLiveItem.setState(Globals.isLIVE());
324		- cameraMenu.add(stepItem = new MenuItem("Step"));
325		- stepItem.addActionListener(this);
326		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
327		-// toggleDLItem.addItemListener(this);
328		-// toggleDLItem.setState(false);
329		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
330		- toggleRenderItem.addItemListener(this);
331		- toggleRenderItem.setState(!CameraPane.frozen);
332		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
333		- toggleDebugItem.addItemListener(this);
334		- toggleDebugItem.setState(CameraPane.DEBUG);
335		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
336		- toggleFrustumItem.addItemListener(this);
337		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
338		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
339		- toggleFootContactItem.addItemListener(this);
340		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
341		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
342		- toggleRandomItem.addItemListener(this);
343		- toggleRandomItem.setState(CameraPane.RANDOM);
344		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
345		- toggleHandleItem.addItemListener(this);
346		- toggleHandleItem.setState(CameraPane.HANDLES);
347		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
348		- togglePaintItem.addItemListener(this);
349		- togglePaintItem.setState(CameraPane.PAINTMODE);
350		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
351		-// toggleRootItem.addItemListener(this);
352		-// toggleRootItem.setState(false);
353		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
354		-// animationItem.addItemListener(this);
355		-// animationItem.setState(CameraPane.ANIMATION);
356		- cameraMenu.add("-");
357		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
358		- editCameraItem.addActionListener(this);
359	320
360	321	objectPanel = new JTabbedPane();
361	322	toolbarPanel = new JPanel();
..	..	@@ -484,13 +445,13 @@
484	445	//SendInfo("Name:", "bold");
485	446	if (sel.GetTextures() != null \|\| debug)
486	447	{
487		- si.SendInfo(sel.toString(), "bold");
	448	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
488	449	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
489	450	if (sel.Size() > 0)
490	451	{
491	452	si.SendInfo("#children = " + sel.Size(), "regular");
492	453	}
493		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	454	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
494	455	if (debug)
495	456	{
496	457	try
..	..	@@ -532,7 +493,7 @@
532	493	}
533	494	if (sel.support != null)
534	495	{
535		- si.SendInfo(" support: " + sel.support, "regular");
	496	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
536	497	}
537	498	if (sel.scriptnode != null)
538	499	{
..	..	@@ -735,7 +696,7 @@
735	696	protected static ImageIcon createImageIcon(String path,
736	697	String description)
737	698	{
738		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	699	+ java.net.URL imgURL = Grafreed.class.getResource(path);
739	700	if (imgURL != null)
740	701	{
741	702	return new ImageIcon(imgURL, description);
..	..	@@ -767,6 +728,7 @@
767	728	// NumberSlider vDivsField;
768	729	// JCheckBox endcaps;
769	730	JCheckBox liveCB;
	731	+ JCheckBox selectCB;
770	732	JCheckBox hideCB;
771	733	JCheckBox link2masterCB;
772	734	JCheckBox markCB;
..	..	@@ -969,9 +931,11 @@
969	931
970	932	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
971	933	liveCB.setToolTipText("Animate object");
	934	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	935	+ selectCB.setToolTipText("Make object selectable");
	936	+// Return();
972	937	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
973	938	hideCB.setToolTipText("Hide object");
974		-// Return();
975	939	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
976	940	markCB.setToolTipText("Set the animation target transform");
977	941
..	..	@@ -1011,7 +975,7 @@
1011	975	oe.ctrlPanel.add(commandsPanel);
1012	976	oe.ctrlPanel.Return();
1013	977
1014		- 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
1015	979	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1016	980	//Return();
1017	981
..	..	@@ -1313,7 +1277,7 @@
1313	1277	scrollpane.addMouseWheelListener(this); // Default not fast enough
1314	1278
1315	1279	/JTabbedPane/ scenePanel = new cGridBag();
1316		- scenePanel.preferredWidth = 7;
	1280	+ scenePanel.preferredWidth = 6;
1317	1281
1318	1282	JTabbedPane tabbedPane = new JTabbedPane();
1319	1283	tabbedPane.add(scrollpane);
..	..	@@ -1419,8 +1383,8 @@
1419	1383
1420	1384	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1421	1385
1422		- frame.setSize(1024, 768);
1423		- frame.show();
	1386	+ frame.setSize(1280, 860);
	1387	+ frame.setVisible(true);
1424	1388
1425	1389	gridPanel.setDividerLocation(1.0);
1426	1390
..	..	@@ -1459,19 +1423,22 @@
1459	1423
1460	1424	cGridBag editBar = new cGridBag().setVertical(false);
1461	1425
1462		- editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1426	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1463	1427	createMaterialButton.setToolTipText("Create material");
1464	1428
1465	1429	/*
1466	1430	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1467	1431	*/
1468	1432
1469		- editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1433	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1470	1434	clearMaterialButton.setToolTipText("Clear material");
1471	1435
1472		- editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1473		- editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1474		- editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1436	+ if (Globals.ADVANCED)
	1437	+ {
	1438	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1439	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1440	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1441	+ }
1475	1442
1476	1443	editBar.preferredHeight = 15;
1477	1444
..	..	@@ -1740,12 +1707,15 @@
1740	1707	opacityPowerField.addChangeListener(this);
1741	1708	/**/
1742	1709
1743		- resetSlidersButton.addActionListener(this);
1744	1710	clearMaterialButton.addActionListener(this);
1745	1711	createMaterialButton.addActionListener(this);
1746		-
1747		- propagateToggle.addItemListener(this);
1748		- multiplyToggle.addItemListener(this);
	1712	+
	1713	+ if (Globals.ADVANCED)
	1714	+ {
	1715	+ resetSlidersButton.addActionListener(this);
	1716	+ propagateToggle.addItemListener(this);
	1717	+ multiplyToggle.addItemListener(this);
	1718	+ }
1749	1719	}
1750	1720
1751	1721	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1916,7 +1886,7 @@
1916	1886
1917	1887	//? flashIt = false;
1918	1888	CameraPane pane = (CameraPane) cameraView;
1919		- pane.clickStart(location.x, location.y, 0);
	1889	+ pane.clickStart(location.x, location.y, 0, 0);
1920	1890	pane.clickEnd(location.x, location.y, 0, true);
1921	1891
1922	1892	if (group.selection.size() == 1)
..	..	@@ -2373,11 +2343,11 @@
2373	2343
2374	2344	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2375	2345	{
2376		- if (GrafreeD.standAlone)
	2346	+ if (Grafreed.standAlone)
2377	2347	{
2378	2348	/**/
2379	2349	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2380		- browser.show();
	2350	+ browser.setVisible(true);
2381	2351	String filename = browser.getFile();
2382	2352	if (filename != null && filename.length() > 0)
2383	2353	{
..	..	@@ -2737,7 +2707,8 @@
2737	2707	return;
2738	2708	}
2739	2709
2740		- multiplyToggle.setSelected(mat.multiply);
	2710	+ if (multiplyToggle != null)
	2711	+ multiplyToggle.setSelected(mat.multiply);
2741	2712
2742	2713	assert (object.projectedVertices != null);
2743	2714
..	..	@@ -2952,7 +2923,7 @@
2952	2923	frame.validate();
2953	2924
2954	2925	return;
2955		- } else if (event.getSource() == toggleRandomItem)
	2926	+ } else if (event.getSource() == toggleSwitchItem)
2956	2927	{
2957	2928	cameraView.ToggleRandom();
2958	2929	cameraView.repaint();
..	..	@@ -2982,6 +2953,10 @@
2982	2953	} else if (event.getSource() == liveCB)
2983	2954	{
2984	2955	copy.live ^= true;
	2956	+ return;
	2957	+ } else if (event.getSource() == selectCB)
	2958	+ {
	2959	+ copy.dontselect ^= true;
2985	2960	return;
2986	2961	} else if (event.getSource() == hideCB)
2987	2962	{
..	..	@@ -3021,8 +2996,9 @@
3021	2996
3022	2997	public void actionPerformed(ActionEvent event)
3023	2998	{
	2999	+ Object source = event.getSource();
3024	3000	// SCRIPT DIALOG
3025		- if (event.getSource() == okbutton)
	3001	+ if (source == okbutton)
3026	3002	{
3027	3003	textpanel.setVisible(false);
3028	3004	textpanel.remove(textarea);
..	..	@@ -3034,7 +3010,7 @@
3034	3010	textarea = null;
3035	3011	textpanel = null;
3036	3012	}
3037		- if (event.getSource() == cancelbutton)
	3013	+ if (source == cancelbutton)
3038	3014	{
3039	3015	textpanel.setVisible(false);
3040	3016	textpanel.remove(textarea);
..	..	@@ -3046,50 +3022,50 @@
3046	3022	//applySelf();
3047	3023	//client.refreshEditWindow();
3048	3024	//refreshContents();
3049		- if (event.getSource() == nameField)
	3025	+ if (source == nameField)
3050	3026	{
3051	3027	//System.out.println("ObjEditor " + event);
3052	3028	applySelf0(true);
3053	3029	//parent.applySelf();
3054	3030	objEditor.refreshContents();
3055		- } else if (event.getSource() == resetButton)
	3031	+ } else if (source == resetButton)
3056	3032	{
3057	3033	CameraPane.fullreset = true;
3058	3034	copy.Reset(); // ResetMeshes();
3059	3035	copy.Touch();
3060	3036	objEditor.refreshContents();
3061		- } else if (event.getSource() == stepItem)
	3037	+ } else if (source == stepItem)
3062	3038	{
3063	3039	//cameraView.ONESTEP = true;
3064	3040	Globals.ONESTEP = true;
3065	3041	cameraView.repaint();
3066	3042	return;
3067		- } else if (event.getSource() == stepButton)
	3043	+ } else if (source == stepButton)
3068	3044	{
3069	3045	copy.Step();
3070	3046	copy.Touch();
3071	3047	objEditor.refreshContents();
3072		- } else if (event.getSource() == slowerButton)
	3048	+ } else if (source == slowerButton)
3073	3049	{
3074	3050	copy.Slower();
3075	3051	copy.Touch();
3076	3052	objEditor.refreshContents();
3077		- } else if (event.getSource() == fasterButton)
	3053	+ } else if (source == fasterButton)
3078	3054	{
3079	3055	copy.Faster();
3080	3056	copy.Touch();
3081	3057	objEditor.refreshContents();
3082		- } else if (event.getSource() == remarkButton)
	3058	+ } else if (source == remarkButton)
3083	3059	{
3084	3060	copy.Remark();
3085	3061	copy.Touch();
3086	3062	objEditor.refreshContents();
3087		- } else if (event.getSource() == stepAllButton)
	3063	+ } else if (source == stepAllButton)
3088	3064	{
3089	3065	copy.StepAll();
3090	3066	copy.Touch();
3091	3067	objEditor.refreshContents();
3092		- } else if (event.getSource() == resetAllButton)
	3068	+ } else if (source == resetAllButton)
3093	3069	{
3094	3070	//CameraPane.fullreset = true;
3095	3071	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3122,53 +3098,75 @@
3122	3098	// Close();
3123	3099	// }
3124	3100	// else
3125		- if (event.getSource() == resetSlidersButton)
	3101	+ if (source == resetSlidersButton)
3126	3102	{
3127	3103	ResetSliders();
3128		- } else if (event.getSource() == clearMaterialButton)
	3104	+ } else if (source == clearMaterialButton)
3129	3105	{
3130	3106	ClearMaterial();
3131		- } else if (event.getSource() == createMaterialButton)
	3107	+ } else if (source == createMaterialButton)
3132	3108	{
3133	3109	CreateMaterial();
3134		- } else if (event.getSource() == clearPanelButton)
	3110	+ } else if (source == clearPanelButton)
3135	3111	{
3136	3112	copy.ClearUI();
3137	3113	refreshContents(true);
3138		- } /*
3139		- }
3140		-
3141		- public boolean action(Event event, Object arg)
3142		- {
3143		- */ 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)
3144	3139	{
3145	3140	Close();
3146	3141	//return true;
3147		- } else if (event.getSource() == loadItem)
	3142	+ } else if (source == loadItem)
3148	3143	{
3149	3144	load();
3150	3145	//return true;
3151		- } else if (event.getSource() == saveItem)
	3146	+ } else if (source == newItem)
	3147	+ {
	3148	+ New();
	3149	+ } else if (source == saveItem)
3152	3150	{
3153	3151	save();
3154	3152	//return true;
3155		- } else if (event.getSource() == saveAsItem)
	3153	+ } else if (source == saveAsItem)
3156	3154	{
3157	3155	saveAs();
3158	3156	//return true;
3159		- } else if (event.getSource() == reexportItem)
	3157	+ } else if (source == reexportItem)
3160	3158	{
3161	3159	reexport();
3162	3160	//return true;
3163		- } else if (event.getSource() == exportAsItem)
	3161	+ } else if (source == exportAsItem)
3164	3162	{
3165	3163	export();
3166	3164	//return true;
3167		- } else if (event.getSource() == povItem)
	3165	+ } else if (source == povItem)
3168	3166	{
3169	3167	generatePOV();
3170	3168	//return true;
3171		- } else if (event.getSource() == zBufferItem)
	3169	+ } else if (source == zBufferItem)
3172	3170	{
3173	3171	try
3174	3172	{
..	..	@@ -3190,21 +3188,8 @@
3190	3188	cameraView.repaint();
3191	3189	//return true;
3192	3190	}
3193		- */ else if (event.getSource() == editCameraItem)
3194		- {
3195		- cameraView.ProtectCamera();
3196		- cameraView.repaint();
3197		- return;
3198		- } else if (event.getSource() == revertCameraItem)
3199		- {
3200		- cameraView.RevertCamera();
3201		- cameraView.repaint();
3202		- return;
3203		-// } else if (event.getSource() == textureButton)
3204		-// {
3205		-// return; // true;
3206		- } else // combos...
3207		- if (event.getSource() == texresMenu)
	3191	+ */ else // combos...
	3192	+ if (source == texresMenu)
3208	3193	{
3209	3194	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3210	3195	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3216,6 +3201,150 @@
3216	3201	}
3217	3202	}
3218	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	+
3219	3348	void ToggleAnimation()
3220	3349	{
3221	3350	if (!Globals.ANIMATION)
..	..	@@ -3231,8 +3360,8 @@
3231	3360
3232	3361	Globals.ANIMATION ^= true;
3233	3362
3234		- GrafreeD.wav.cursor = 0;
3235		- GrafreeD.wav.loop = 0;
	3363	+ Grafreed.wav.cursor = 0;
	3364	+ Grafreed.wav.loop = 0;
3236	3365	}
3237	3366	} else
3238	3367	{
..	..	@@ -3253,7 +3382,6 @@
3253	3382	callee.refreshContents();
3254	3383	} else
3255	3384	{
3256		- new Exception().printStackTrace();
3257	3385	System.exit(0);
3258	3386	}
3259	3387	}
..	..	@@ -3283,7 +3411,7 @@
3283	3411	void CreateMaterial()
3284	3412	{
3285	3413	//copy.ClearMaterial(); // PATCH
3286		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3414	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3287	3415	if (copy.selection.size() > 0)
3288	3416	//SetMaterial(copy);
3289	3417	{
..	..	@@ -3342,11 +3470,11 @@
3342	3470	{
3343	3471	copy.ResetBlockLoop(); // temporary problem
3344	3472
3345		- boolean random = CameraPane.RANDOM;
3346		- CameraPane.RANDOM = false; // parse everything
	3473	+ boolean random = CameraPane.SWITCH;
	3474	+ CameraPane.SWITCH = false; // parse everything
3347	3475	copy.ResetDisplayList();
3348	3476	copy.HardTouch();
3349		- CameraPane.RANDOM = random;
	3477	+ CameraPane.SWITCH = random;
3350	3478	}
3351	3479
3352	3480	// public void applySelf()
..	..	@@ -3420,6 +3548,36 @@
3420	3548	{
3421	3549	//System.out.println("Propagate = " + propagate);
3422	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	+
3423	3581	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3424	3582	{
3425	3583	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3535,7 +3693,7 @@
3535	3693	}
3536	3694
3537	3695	if (normalpushField != null)
3538		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	3696	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3539	3697	}
3540	3698
3541	3699	void SnapObject()
..	..	@@ -3799,6 +3957,7 @@
3799	3957
3800	3958	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3801	3959	{
	3960	+ Save();
3802	3961	//Tween.set(thing, 0).target(1).start(tweenManager);
3803	3962	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3804	3963	// if (thing instanceof GenericJointDemo)
..	..	@@ -4002,6 +4161,7 @@
4002	4161	}
4003	4162	}
4004	4163	}
	4164	+
4005	4165	LoadGFDThread loadGFDThread;
4006	4166
4007	4167	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4022,7 +4182,8 @@
4022	4182	try
4023	4183	{
4024	4184	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4025		- 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);
4026	4187
4027	4188	readobj = (Object3D) p.readObject();
4028	4189	istream.close();
..	..	@@ -4030,7 +4191,20 @@
4030	4191	readobj.ResetDisplayList();
4031	4192	} catch (Exception e)
4032	4193	{
4033		- 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	+ }
4034	4208	}
4035	4209	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4036	4210	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4147,7 +4321,7 @@
4147	4321
4148	4322	void load() // throws ClassNotFoundException
4149	4323	{
4150		- if (GrafreeD.standAlone)
	4324	+ if (Grafreed.standAlone)
4151	4325	{
4152	4326	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4153	4327	browser.show();
..	..	@@ -4234,11 +4408,13 @@
4234	4408	try
4235	4409	{
4236	4410	FileOutputStream ostream = new FileOutputStream(lastname);
4237		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4411	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4412	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4238	4413
4239	4414	p.writeObject(copy);
4240	4415	p.flush();
4241	4416
	4417	+ zstream.close();
4242	4418	ostream.close();
4243	4419
4244	4420	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4248,11 +4424,12 @@
4248	4424	{
4249	4425	}
4250	4426	}
	4427	+
4251	4428	String lastname;
4252	4429
4253	4430	void saveAs()
4254	4431	{
4255		- if (GrafreeD.standAlone)
	4432	+ if (Grafreed.standAlone)
4256	4433	{
4257	4434	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4258	4435	browser.setVisible(true);
..	..	@@ -4357,13 +4534,13 @@
4357	4534	try
4358	4535	{
4359	4536	FileOutputStream ostream = new FileOutputStream(filename);
4360		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4361		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4537	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4538	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4362	4539
4363	4540	Object3D objectparent = obj.parent;
4364	4541	obj.parent = null;
4365	4542
4366		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4543	+ Object3D object = (Object3D) Grafreed.clone(obj);
4367	4544
4368	4545	obj.parent = objectparent;
4369	4546
..	..	@@ -4375,8 +4552,8 @@
4375	4552	p.writeObject(object);
4376	4553	p.flush();
4377	4554
	4555	+ zstream.close();
4378	4556	ostream.close();
4379		- // zstream.close();
4380	4557
4381	4558	// group.selection.get(0).parent = parent;
4382	4559	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4397,7 +4574,7 @@
4397	4574	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4398	4575	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4399	4576	copy.generatePOV(buffer);
4400		- if (GrafreeD.standAlone)
	4577	+ if (Grafreed.standAlone)
4401	4578	{
4402	4579	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4403	4580	browser.show();
..	..	@@ -4423,7 +4600,8 @@
4423	4600	Object3D client;
4424	4601	Object3D copy;
4425	4602	MenuBar menuBar;
4426		- Menu windowMenu;
	4603	+ Menu fileMenu;
	4604	+ MenuItem newItem;
4427	4605	MenuItem loadItem;
4428	4606	MenuItem saveItem;
4429	4607	MenuItem saveAsItem;
..	..	@@ -4431,11 +4609,9 @@
4431	4609	MenuItem reexportItem;
4432	4610	MenuItem povItem;
4433	4611	MenuItem closeItem;
4434		- Menu cameraMenu;
	4612	+
4435	4613	CheckboxMenuItem zBufferItem;
4436	4614	//MenuItem normalLensItem;
4437		- MenuItem editCameraItem;
4438		- MenuItem revertCameraItem;
4439	4615	MenuItem stepItem;
4440	4616	CheckboxMenuItem toggleLiveItem;
4441	4617	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4446,7 +4622,7 @@
4446	4622	CheckboxMenuItem toggleFootContactItem;
4447	4623	CheckboxMenuItem toggleDLItem;
4448	4624	CheckboxMenuItem toggleTextureItem;
4449		- CheckboxMenuItem toggleRandomItem;
	4625	+ CheckboxMenuItem toggleSwitchItem;
4450	4626	CheckboxMenuItem toggleRootItem;
4451	4627	CheckboxMenuItem animationItem;
4452	4628	CheckboxMenuItem toggleHandleItem;
..	..	@@ -4583,4 +4759,9 @@
4583	4759	//ObjectUI parent;
4584	4760
4585	4761	cNumberSlider normalpushField;
	4762	+
	4763	+ private MenuItem importGFDItem;
	4764	+ private MenuItem importVRMLX3DItem;
	4765	+ private MenuItem import3DSItem;
	4766	+ private MenuItem importOBJItem;
4586	4767	}