~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("Open..."));
	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)
..	..	@@ -1965,6 +1935,7 @@
1965	1935	e2.printStackTrace();
1966	1936	}
1967	1937	}
	1938	+
1968	1939	LoadJMEThread loadThread;
1969	1940
1970	1941	class LoadJMEThread extends Thread
..	..	@@ -2022,6 +1993,7 @@
2022	1993	//LoadFile0(filename, converter);
2023	1994	}
2024	1995	}
	1996	+
2025	1997	LoadOBJThread loadObjThread;
2026	1998
2027	1999	class LoadOBJThread extends Thread
..	..	@@ -2100,19 +2072,19 @@
2100	2072
2101	2073	void LoadObjFile(String fullname)
2102	2074	{
2103		- /*
	2075	+ System.out.println("Loading " + fullname);
	2076	+ /**/
2104	2077	//lastFilename = fullname;
2105	2078	if(loadObjThread == null)
2106	2079	{
2107		- loadObjThread = new LoadOBJThread();
2108		- loadObjThread.start();
	2080	+ loadObjThread = new LoadOBJThread();
	2081	+ loadObjThread.start();
2109	2082	}
2110	2083
2111	2084	loadObjThread.add(fullname);
2112		- */
	2085	+ /**/
2113	2086
2114		- System.out.println("Loading " + fullname);
2115		- makeSomething(new FileObject(fullname, true), true);
	2087	+ //makeSomething(new FileObject(fullname, true), true);
2116	2088	}
2117	2089
2118	2090	void LoadGFDFile(String fullname)
..	..	@@ -2373,11 +2345,11 @@
2373	2345
2374	2346	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2375	2347	{
2376		- if (GrafreeD.standAlone)
	2348	+ if (Grafreed.standAlone)
2377	2349	{
2378	2350	/**/
2379	2351	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2380		- browser.show();
	2352	+ browser.setVisible(true);
2381	2353	String filename = browser.getFile();
2382	2354	if (filename != null && filename.length() > 0)
2383	2355	{
..	..	@@ -2737,7 +2709,8 @@
2737	2709	return;
2738	2710	}
2739	2711
2740		- multiplyToggle.setSelected(mat.multiply);
	2712	+ if (multiplyToggle != null)
	2713	+ multiplyToggle.setSelected(mat.multiply);
2741	2714
2742	2715	assert (object.projectedVertices != null);
2743	2716
..	..	@@ -2952,9 +2925,9 @@
2952	2925	frame.validate();
2953	2926
2954	2927	return;
2955		- } else if (event.getSource() == toggleRandomItem)
	2928	+ } else if (event.getSource() == toggleSwitchItem)
2956	2929	{
2957		- cameraView.ToggleRandom();
	2930	+ cameraView.ToggleSwitch();
2958	2931	cameraView.repaint();
2959	2932	return;
2960	2933	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2982,6 +2955,10 @@
2982	2955	} else if (event.getSource() == liveCB)
2983	2956	{
2984	2957	copy.live ^= true;
	2958	+ return;
	2959	+ } else if (event.getSource() == selectCB)
	2960	+ {
	2961	+ copy.dontselect ^= true;
2985	2962	return;
2986	2963	} else if (event.getSource() == hideCB)
2987	2964	{
..	..	@@ -3021,8 +2998,9 @@
3021	2998
3022	2999	public void actionPerformed(ActionEvent event)
3023	3000	{
	3001	+ Object source = event.getSource();
3024	3002	// SCRIPT DIALOG
3025		- if (event.getSource() == okbutton)
	3003	+ if (source == okbutton)
3026	3004	{
3027	3005	textpanel.setVisible(false);
3028	3006	textpanel.remove(textarea);
..	..	@@ -3034,7 +3012,7 @@
3034	3012	textarea = null;
3035	3013	textpanel = null;
3036	3014	}
3037		- if (event.getSource() == cancelbutton)
	3015	+ if (source == cancelbutton)
3038	3016	{
3039	3017	textpanel.setVisible(false);
3040	3018	textpanel.remove(textarea);
..	..	@@ -3046,50 +3024,50 @@
3046	3024	//applySelf();
3047	3025	//client.refreshEditWindow();
3048	3026	//refreshContents();
3049		- if (event.getSource() == nameField)
	3027	+ if (source == nameField)
3050	3028	{
3051	3029	//System.out.println("ObjEditor " + event);
3052	3030	applySelf0(true);
3053	3031	//parent.applySelf();
3054	3032	objEditor.refreshContents();
3055		- } else if (event.getSource() == resetButton)
	3033	+ } else if (source == resetButton)
3056	3034	{
3057	3035	CameraPane.fullreset = true;
3058	3036	copy.Reset(); // ResetMeshes();
3059	3037	copy.Touch();
3060	3038	objEditor.refreshContents();
3061		- } else if (event.getSource() == stepItem)
	3039	+ } else if (source == stepItem)
3062	3040	{
3063	3041	//cameraView.ONESTEP = true;
3064	3042	Globals.ONESTEP = true;
3065	3043	cameraView.repaint();
3066	3044	return;
3067		- } else if (event.getSource() == stepButton)
	3045	+ } else if (source == stepButton)
3068	3046	{
3069	3047	copy.Step();
3070	3048	copy.Touch();
3071	3049	objEditor.refreshContents();
3072		- } else if (event.getSource() == slowerButton)
	3050	+ } else if (source == slowerButton)
3073	3051	{
3074	3052	copy.Slower();
3075	3053	copy.Touch();
3076	3054	objEditor.refreshContents();
3077		- } else if (event.getSource() == fasterButton)
	3055	+ } else if (source == fasterButton)
3078	3056	{
3079	3057	copy.Faster();
3080	3058	copy.Touch();
3081	3059	objEditor.refreshContents();
3082		- } else if (event.getSource() == remarkButton)
	3060	+ } else if (source == remarkButton)
3083	3061	{
3084	3062	copy.Remark();
3085	3063	copy.Touch();
3086	3064	objEditor.refreshContents();
3087		- } else if (event.getSource() == stepAllButton)
	3065	+ } else if (source == stepAllButton)
3088	3066	{
3089	3067	copy.StepAll();
3090	3068	copy.Touch();
3091	3069	objEditor.refreshContents();
3092		- } else if (event.getSource() == resetAllButton)
	3070	+ } else if (source == resetAllButton)
3093	3071	{
3094	3072	//CameraPane.fullreset = true;
3095	3073	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3122,53 +3100,75 @@
3122	3100	// Close();
3123	3101	// }
3124	3102	// else
3125		- if (event.getSource() == resetSlidersButton)
	3103	+ if (source == resetSlidersButton)
3126	3104	{
3127	3105	ResetSliders();
3128		- } else if (event.getSource() == clearMaterialButton)
	3106	+ } else if (source == clearMaterialButton)
3129	3107	{
3130	3108	ClearMaterial();
3131		- } else if (event.getSource() == createMaterialButton)
	3109	+ } else if (source == createMaterialButton)
3132	3110	{
3133	3111	CreateMaterial();
3134		- } else if (event.getSource() == clearPanelButton)
	3112	+ } else if (source == clearPanelButton)
3135	3113	{
3136	3114	copy.ClearUI();
3137	3115	refreshContents(true);
3138		- } /*
3139		- }
3140		-
3141		- public boolean action(Event event, Object arg)
3142		- {
3143		- */ 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)
3144	3141	{
3145	3142	Close();
3146	3143	//return true;
3147		- } else if (event.getSource() == loadItem)
	3144	+ } else if (source == loadItem)
3148	3145	{
3149	3146	load();
3150	3147	//return true;
3151		- } else if (event.getSource() == saveItem)
	3148	+ } else if (source == newItem)
	3149	+ {
	3150	+ New();
	3151	+ } else if (source == saveItem)
3152	3152	{
3153	3153	save();
3154	3154	//return true;
3155		- } else if (event.getSource() == saveAsItem)
	3155	+ } else if (source == saveAsItem)
3156	3156	{
3157	3157	saveAs();
3158	3158	//return true;
3159		- } else if (event.getSource() == reexportItem)
	3159	+ } else if (source == reexportItem)
3160	3160	{
3161	3161	reexport();
3162	3162	//return true;
3163		- } else if (event.getSource() == exportAsItem)
	3163	+ } else if (source == exportAsItem)
3164	3164	{
3165	3165	export();
3166	3166	//return true;
3167		- } else if (event.getSource() == povItem)
	3167	+ } else if (source == povItem)
3168	3168	{
3169	3169	generatePOV();
3170	3170	//return true;
3171		- } else if (event.getSource() == zBufferItem)
	3171	+ } else if (source == zBufferItem)
3172	3172	{
3173	3173	try
3174	3174	{
..	..	@@ -3190,21 +3190,8 @@
3190	3190	cameraView.repaint();
3191	3191	//return true;
3192	3192	}
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)
	3193	+ */ else // combos...
	3194	+ if (source == texresMenu)
3208	3195	{
3209	3196	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3210	3197	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3216,6 +3203,262 @@
3216	3203	}
3217	3204	}
3218	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(Object3D 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	+ Object3D parent = o.parent;
	3226	+ o.parent = null;
	3227	+
	3228	+ out.writeObject(o);
	3229	+
	3230	+ o.parent = parent;
	3231	+
	3232	+ out.flush();
	3233	+
	3234	+ zstream.close();
	3235	+ out.close();
	3236	+
	3237	+ return baos.toByteArray();
	3238	+ } catch (Exception e)
	3239	+ {
	3240	+ System.err.println(e);
	3241	+ return null;
	3242	+ }
	3243	+ }
	3244	+
	3245	+ static public Object Uncompress(byte[] bytes)
	3246	+ {
	3247	+ System.out.println("#bytes = " + bytes.length);
	3248	+ try
	3249	+ {
	3250	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3251	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3252	+ ObjectInputStream in = new ObjectInputStream(istream);
	3253	+ Object obj = in.readObject();
	3254	+ in.close();
	3255	+
	3256	+ return obj;
	3257	+ } catch (Exception e)
	3258	+ {
	3259	+ System.err.println(e);
	3260	+ return null;
	3261	+ }
	3262	+ }
	3263	+
	3264	+ static public Object clone(Object o)
	3265	+ {
	3266	+ try
	3267	+ {
	3268	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3269	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3270	+
	3271	+ out.writeObject(o);
	3272	+
	3273	+ out.flush();
	3274	+ out.close();
	3275	+
	3276	+ byte[] bytes = baos.toByteArray();
	3277	+
	3278	+ System.out.println("clone = " + bytes.length);
	3279	+
	3280	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3281	+ ObjectInputStream in = new ObjectInputStream(bais);
	3282	+ Object obj = in.readObject();
	3283	+ in.close();
	3284	+
	3285	+ return obj;
	3286	+ } catch (Exception e)
	3287	+ {
	3288	+ System.err.println(e);
	3289	+ return null;
	3290	+ }
	3291	+ }
	3292	+
	3293	+ cRadio GetCurrentTab()
	3294	+ {
	3295	+ cRadio ab;
	3296	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3297	+ {
	3298	+ ab = (cRadio)e.nextElement();
	3299	+ if(ab.GetObject() == copy)
	3300	+ {
	3301	+ return ab;
	3302	+ }
	3303	+ }
	3304	+
	3305	+ return null;
	3306	+ }
	3307	+
	3308	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3309	+
	3310	+ public void Save()
	3311	+ {
	3312	+ cRadio tab = GetCurrentTab();
	3313	+
	3314	+ boolean temp = CameraPane.SWITCH;
	3315	+ CameraPane.SWITCH = false;
	3316	+
	3317	+ copy.ExtractBigData(hashtable);
	3318	+
	3319	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3320	+ tab.graphs[tab.undoindex++] = Compress(copy);
	3321	+
	3322	+ copy.RestoreBigData(hashtable);
	3323	+
	3324	+ CameraPane.SWITCH = temp;
	3325	+
	3326	+ //assert(hashtable.isEmpty());
	3327	+
	3328	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3329	+ {
	3330	+ tab.graphs[i] = null;
	3331	+ }
	3332	+
	3333	+ // test save
	3334	+ if (false)
	3335	+ {
	3336	+ try
	3337	+ {
	3338	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3339	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3340	+
	3341	+ p.writeObject(copy);
	3342	+
	3343	+ p.flush();
	3344	+
	3345	+ ostream.close();
	3346	+ } catch (Exception e)
	3347	+ {
	3348	+ e.printStackTrace();
	3349	+ }
	3350	+ }
	3351	+ }
	3352	+
	3353	+ void CopyChanged(Object3D obj)
	3354	+ {
	3355	+ boolean temp = CameraPane.SWITCH;
	3356	+ CameraPane.SWITCH = false;
	3357	+
	3358	+ copy.ExtractBigData(hashtable);
	3359	+
	3360	+ copy.clear();
	3361	+
	3362	+ for (int i=0; i<obj.Size(); i++)
	3363	+ {
	3364	+ copy.add(obj.get(i));
	3365	+ }
	3366	+
	3367	+ copy.RestoreBigData(hashtable);
	3368	+
	3369	+ CameraPane.SWITCH = temp;
	3370	+
	3371	+ //assert(hashtable.isEmpty());
	3372	+
	3373	+ copy.Touch();
	3374	+
	3375	+ ResetModel();
	3376	+ copy.HardTouch(); // recompile?
	3377	+
	3378	+ cRadio ab;
	3379	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3380	+ {
	3381	+ ab = (cRadio)e.nextElement();
	3382	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3383	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3384	+ if (test != null)
	3385	+ {
	3386	+ test.editWindow = ab.object.editWindow;
	3387	+ ab.object = test;
	3388	+ }
	3389	+ }
	3390	+
	3391	+ refreshContents();
	3392	+ }
	3393	+
	3394	+ public void Undo()
	3395	+ {
	3396	+ cRadio tab = GetCurrentTab();
	3397	+
	3398	+ if (tab.undoindex == 0)
	3399	+ {
	3400	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3401	+ return;
	3402	+ }
	3403	+
	3404	+ if (tab.graphs[tab.undoindex] == null)
	3405	+ {
	3406	+ Save();
	3407	+ tab.undoindex -= 1;
	3408	+ }
	3409	+
	3410	+ tab.undoindex -= 1;
	3411	+
	3412	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3413	+ }
	3414	+
	3415	+ public void Redo()
	3416	+ {
	3417	+ cRadio tab = GetCurrentTab();
	3418	+
	3419	+ if (tab.graphs[tab.undoindex + 1] == null)
	3420	+ {
	3421	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3422	+ return;
	3423	+ }
	3424	+
	3425	+ tab.undoindex += 1;
	3426	+
	3427	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3428	+ }
	3429	+
	3430	+ void ImportGFD()
	3431	+ {
	3432	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3433	+ browser.show();
	3434	+ String filename = browser.getFile();
	3435	+ if (filename != null && filename.length() > 0)
	3436	+ {
	3437	+ String fullname = browser.getDirectory() + filename;
	3438	+
	3439	+ //Object3D readobj =
	3440	+ objEditor.ReadGFD(fullname, objEditor);
	3441	+ //makeSomething(readobj);
	3442	+ }
	3443	+ }
	3444	+
	3445	+ void ImportVRMLX3D()
	3446	+ {
	3447	+ if (Grafreed.standAlone)
	3448	+ {
	3449	+ /**/
	3450	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3451	+ browser.show();
	3452	+ String filename = browser.getFile();
	3453	+ if (filename != null && filename.length() > 0)
	3454	+ {
	3455	+ String fullname = browser.getDirectory() + filename;
	3456	+ LoadVRMLX3D(fullname);
	3457	+ }
	3458	+ /**/
	3459	+ }
	3460	+ }
	3461	+
3219	3462	void ToggleAnimation()
3220	3463	{
3221	3464	if (!Globals.ANIMATION)
..	..	@@ -3231,8 +3474,8 @@
3231	3474
3232	3475	Globals.ANIMATION ^= true;
3233	3476
3234		- GrafreeD.wav.cursor = 0;
3235		- GrafreeD.wav.loop = 0;
	3477	+ Grafreed.wav.cursor = 0;
	3478	+ Grafreed.wav.loop = 0;
3236	3479	}
3237	3480	} else
3238	3481	{
..	..	@@ -3253,7 +3496,6 @@
3253	3496	callee.refreshContents();
3254	3497	} else
3255	3498	{
3256		- new Exception().printStackTrace();
3257	3499	System.exit(0);
3258	3500	}
3259	3501	}
..	..	@@ -3283,7 +3525,7 @@
3283	3525	void CreateMaterial()
3284	3526	{
3285	3527	//copy.ClearMaterial(); // PATCH
3286		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3528	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3287	3529	if (copy.selection.size() > 0)
3288	3530	//SetMaterial(copy);
3289	3531	{
..	..	@@ -3342,11 +3584,11 @@
3342	3584	{
3343	3585	copy.ResetBlockLoop(); // temporary problem
3344	3586
3345		- boolean random = CameraPane.RANDOM;
3346		- CameraPane.RANDOM = false; // parse everything
	3587	+ boolean random = CameraPane.SWITCH;
	3588	+ CameraPane.SWITCH = false; // parse everything
3347	3589	copy.ResetDisplayList();
3348	3590	copy.HardTouch();
3349		- CameraPane.RANDOM = random;
	3591	+ CameraPane.SWITCH = random;
3350	3592	}
3351	3593
3352	3594	// public void applySelf()
..	..	@@ -3420,6 +3662,36 @@
3420	3662	{
3421	3663	//System.out.println("Propagate = " + propagate);
3422	3664	copy.UpdateMaterial(anchor, current, propagate);
	3665	+
	3666	+ if (copy.material != null)
	3667	+ {
	3668	+ cMaterial mat = copy.material;
	3669	+
	3670	+ colorField.SetToolTipValue((mat.color));
	3671	+ modulationField.SetToolTipValue((mat.modulation));
	3672	+ metalnessField.SetToolTipValue((mat.metalness));
	3673	+ diffuseField.SetToolTipValue((mat.diffuse));
	3674	+ specularField.SetToolTipValue((mat.specular));
	3675	+ shininessField.SetToolTipValue((mat.shininess));
	3676	+ shiftField.SetToolTipValue((mat.shift));
	3677	+ ambientField.SetToolTipValue((mat.ambient));
	3678	+ lightareaField.SetToolTipValue((mat.lightarea));
	3679	+ diffusenessField.SetToolTipValue((mat.factor));
	3680	+ velvetField.SetToolTipValue((mat.velvet));
	3681	+ sheenField.SetToolTipValue((mat.sheen));
	3682	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3683	+ backlitField.SetToolTipValue((mat.bump));
	3684	+ anisoField.SetToolTipValue((mat.aniso));
	3685	+ anisoVField.SetToolTipValue((mat.anisoV));
	3686	+ cameraField.SetToolTipValue((mat.cameralight));
	3687	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3688	+ shadowField.SetToolTipValue((mat.shadow));
	3689	+ textureField.SetToolTipValue((mat.texture));
	3690	+ opacityField.SetToolTipValue((mat.opacity));
	3691	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3692	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3693	+ }
	3694	+
3423	3695	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3424	3696	{
3425	3697	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3535,7 +3807,7 @@
3535	3807	}
3536	3808
3537	3809	if (normalpushField != null)
3538		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	3810	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3539	3811	}
3540	3812
3541	3813	void SnapObject()
..	..	@@ -3799,6 +4071,7 @@
3799	4071
3800	4072	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3801	4073	{
	4074	+ Save();
3802	4075	//Tween.set(thing, 0).target(1).start(tweenManager);
3803	4076	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3804	4077	// if (thing instanceof GenericJointDemo)
..	..	@@ -4002,6 +4275,7 @@
4002	4275	}
4003	4276	}
4004	4277	}
	4278	+
4005	4279	LoadGFDThread loadGFDThread;
4006	4280
4007	4281	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4022,7 +4296,8 @@
4022	4296	try
4023	4297	{
4024	4298	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4025		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4299	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4300	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4026	4301
4027	4302	readobj = (Object3D) p.readObject();
4028	4303	istream.close();
..	..	@@ -4030,7 +4305,20 @@
4030	4305	readobj.ResetDisplayList();
4031	4306	} catch (Exception e)
4032	4307	{
4033		- e.printStackTrace();
	4308	+ //e.printStackTrace();
	4309	+ try
	4310	+ {
	4311	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4312	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4313	+
	4314	+ readobj = (Object3D) p.readObject();
	4315	+ istream.close();
	4316	+
	4317	+ readobj.ResetDisplayList();
	4318	+ } catch (Exception e2)
	4319	+ {
	4320	+ e2.printStackTrace();
	4321	+ }
4034	4322	}
4035	4323	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4036	4324	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4085,6 +4373,7 @@
4085	4373
4086	4374	if (readobj != null)
4087	4375	{
	4376	+ Save();
4088	4377	try
4089	4378	{
4090	4379	//readobj.deepCopySelf(copy);
..	..	@@ -4147,7 +4436,7 @@
4147	4436
4148	4437	void load() // throws ClassNotFoundException
4149	4438	{
4150		- if (GrafreeD.standAlone)
	4439	+ if (Grafreed.standAlone)
4151	4440	{
4152	4441	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4153	4442	browser.show();
..	..	@@ -4234,11 +4523,13 @@
4234	4523	try
4235	4524	{
4236	4525	FileOutputStream ostream = new FileOutputStream(lastname);
4237		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4526	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4527	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4238	4528
4239	4529	p.writeObject(copy);
4240	4530	p.flush();
4241	4531
	4532	+ zstream.close();
4242	4533	ostream.close();
4243	4534
4244	4535	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4248,11 +4539,12 @@
4248	4539	{
4249	4540	}
4250	4541	}
	4542	+
4251	4543	String lastname;
4252	4544
4253	4545	void saveAs()
4254	4546	{
4255		- if (GrafreeD.standAlone)
	4547	+ if (Grafreed.standAlone)
4256	4548	{
4257	4549	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4258	4550	browser.setVisible(true);
..	..	@@ -4357,13 +4649,13 @@
4357	4649	try
4358	4650	{
4359	4651	FileOutputStream ostream = new FileOutputStream(filename);
4360		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4361		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4652	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4653	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4362	4654
4363	4655	Object3D objectparent = obj.parent;
4364	4656	obj.parent = null;
4365	4657
4366		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4658	+ Object3D object = (Object3D) Grafreed.clone(obj);
4367	4659
4368	4660	obj.parent = objectparent;
4369	4661
..	..	@@ -4375,8 +4667,8 @@
4375	4667	p.writeObject(object);
4376	4668	p.flush();
4377	4669
	4670	+ zstream.close();
4378	4671	ostream.close();
4379		- // zstream.close();
4380	4672
4381	4673	// group.selection.get(0).parent = parent;
4382	4674	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4397,7 +4689,7 @@
4397	4689	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4398	4690	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4399	4691	copy.generatePOV(buffer);
4400		- if (GrafreeD.standAlone)
	4692	+ if (Grafreed.standAlone)
4401	4693	{
4402	4694	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4403	4695	browser.show();
..	..	@@ -4423,7 +4715,8 @@
4423	4715	Object3D client;
4424	4716	Object3D copy;
4425	4717	MenuBar menuBar;
4426		- Menu windowMenu;
	4718	+ Menu fileMenu;
	4719	+ MenuItem newItem;
4427	4720	MenuItem loadItem;
4428	4721	MenuItem saveItem;
4429	4722	MenuItem saveAsItem;
..	..	@@ -4431,11 +4724,9 @@
4431	4724	MenuItem reexportItem;
4432	4725	MenuItem povItem;
4433	4726	MenuItem closeItem;
4434		- Menu cameraMenu;
	4727	+
4435	4728	CheckboxMenuItem zBufferItem;
4436	4729	//MenuItem normalLensItem;
4437		- MenuItem editCameraItem;
4438		- MenuItem revertCameraItem;
4439	4730	MenuItem stepItem;
4440	4731	CheckboxMenuItem toggleLiveItem;
4441	4732	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4446,7 +4737,7 @@
4446	4737	CheckboxMenuItem toggleFootContactItem;
4447	4738	CheckboxMenuItem toggleDLItem;
4448	4739	CheckboxMenuItem toggleTextureItem;
4449		- CheckboxMenuItem toggleRandomItem;
	4740	+ CheckboxMenuItem toggleSwitchItem;
4450	4741	CheckboxMenuItem toggleRootItem;
4451	4742	CheckboxMenuItem animationItem;
4452	4743	CheckboxMenuItem toggleHandleItem;
..	..	@@ -4583,4 +4874,9 @@
4583	4874	//ObjectUI parent;
4584	4875
4585	4876	cNumberSlider normalpushField;
	4877	+
	4878	+ private MenuItem importGFDItem;
	4879	+ private MenuItem importVRMLX3DItem;
	4880	+ private MenuItem import3DSItem;
	4881	+ private MenuItem importOBJItem;
4586	4882	}