~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,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();
..	..	@@ -474,10 +419,10 @@
474	419	e.printStackTrace();
475	420	}
476	421
477		- String selection = infoarea.getText();
478		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
479		- java.awt.datatransfer.Clipboard clipboard =
480		- Toolkit.getDefaultToolkit().getSystemClipboard();
	422	+// String selection = infoarea.getText();
	423	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	424	+// java.awt.datatransfer.Clipboard clipboard =
	425	+// Toolkit.getDefaultToolkit().getSystemClipboard();
481	426	//clipboard.setContents(data, data);
482	427	}
483	428
..	..	@@ -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)
..	..	@@ -1987,6 +1935,7 @@
1987	1935	e2.printStackTrace();
1988	1936	}
1989	1937	}
	1938	+
1990	1939	LoadJMEThread loadThread;
1991	1940
1992	1941	class LoadJMEThread extends Thread
..	..	@@ -2044,6 +1993,7 @@
2044	1993	//LoadFile0(filename, converter);
2045	1994	}
2046	1995	}
	1996	+
2047	1997	LoadOBJThread loadObjThread;
2048	1998
2049	1999	class LoadOBJThread extends Thread
..	..	@@ -2122,19 +2072,19 @@
2122	2072
2123	2073	void LoadObjFile(String fullname)
2124	2074	{
2125		- /*
	2075	+ System.out.println("Loading " + fullname);
	2076	+ /**/
2126	2077	//lastFilename = fullname;
2127	2078	if(loadObjThread == null)
2128	2079	{
2129		- loadObjThread = new LoadOBJThread();
2130		- loadObjThread.start();
	2080	+ loadObjThread = new LoadOBJThread();
	2081	+ loadObjThread.start();
2131	2082	}
2132	2083
2133	2084	loadObjThread.add(fullname);
2134		- */
	2085	+ /**/
2135	2086
2136		- System.out.println("Loading " + fullname);
2137		- makeSomething(new FileObject(fullname, true), true);
	2087	+ //makeSomething(new FileObject(fullname, true), true);
2138	2088	}
2139	2089
2140	2090	void LoadGFDFile(String fullname)
..	..	@@ -2395,11 +2345,11 @@
2395	2345
2396	2346	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2397	2347	{
2398		- if (GrafreeD.standAlone)
	2348	+ if (Grafreed.standAlone)
2399	2349	{
2400	2350	/**/
2401	2351	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2402		- browser.show();
	2352	+ browser.setVisible(true);
2403	2353	String filename = browser.getFile();
2404	2354	if (filename != null && filename.length() > 0)
2405	2355	{
..	..	@@ -2977,7 +2927,7 @@
2977	2927	return;
2978	2928	} else if (event.getSource() == toggleSwitchItem)
2979	2929	{
2980		- cameraView.ToggleRandom();
	2930	+ cameraView.ToggleSwitch();
2981	2931	cameraView.repaint();
2982	2932	return;
2983	2933	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3005,6 +2955,10 @@
3005	2955	} else if (event.getSource() == liveCB)
3006	2956	{
3007	2957	copy.live ^= true;
	2958	+ return;
	2959	+ } else if (event.getSource() == selectCB)
	2960	+ {
	2961	+ copy.dontselect ^= true;
3008	2962	return;
3009	2963	} else if (event.getSource() == hideCB)
3010	2964	{
..	..	@@ -3044,8 +2998,9 @@
3044	2998
3045	2999	public void actionPerformed(ActionEvent event)
3046	3000	{
	3001	+ Object source = event.getSource();
3047	3002	// SCRIPT DIALOG
3048		- if (event.getSource() == okbutton)
	3003	+ if (source == okbutton)
3049	3004	{
3050	3005	textpanel.setVisible(false);
3051	3006	textpanel.remove(textarea);
..	..	@@ -3057,7 +3012,7 @@
3057	3012	textarea = null;
3058	3013	textpanel = null;
3059	3014	}
3060		- if (event.getSource() == cancelbutton)
	3015	+ if (source == cancelbutton)
3061	3016	{
3062	3017	textpanel.setVisible(false);
3063	3018	textpanel.remove(textarea);
..	..	@@ -3069,50 +3024,50 @@
3069	3024	//applySelf();
3070	3025	//client.refreshEditWindow();
3071	3026	//refreshContents();
3072		- if (event.getSource() == nameField)
	3027	+ if (source == nameField)
3073	3028	{
3074	3029	//System.out.println("ObjEditor " + event);
3075	3030	applySelf0(true);
3076	3031	//parent.applySelf();
3077	3032	objEditor.refreshContents();
3078		- } else if (event.getSource() == resetButton)
	3033	+ } else if (source == resetButton)
3079	3034	{
3080	3035	CameraPane.fullreset = true;
3081	3036	copy.Reset(); // ResetMeshes();
3082	3037	copy.Touch();
3083	3038	objEditor.refreshContents();
3084		- } else if (event.getSource() == stepItem)
	3039	+ } else if (source == stepItem)
3085	3040	{
3086	3041	//cameraView.ONESTEP = true;
3087	3042	Globals.ONESTEP = true;
3088	3043	cameraView.repaint();
3089	3044	return;
3090		- } else if (event.getSource() == stepButton)
	3045	+ } else if (source == stepButton)
3091	3046	{
3092	3047	copy.Step();
3093	3048	copy.Touch();
3094	3049	objEditor.refreshContents();
3095		- } else if (event.getSource() == slowerButton)
	3050	+ } else if (source == slowerButton)
3096	3051	{
3097	3052	copy.Slower();
3098	3053	copy.Touch();
3099	3054	objEditor.refreshContents();
3100		- } else if (event.getSource() == fasterButton)
	3055	+ } else if (source == fasterButton)
3101	3056	{
3102	3057	copy.Faster();
3103	3058	copy.Touch();
3104	3059	objEditor.refreshContents();
3105		- } else if (event.getSource() == remarkButton)
	3060	+ } else if (source == remarkButton)
3106	3061	{
3107	3062	copy.Remark();
3108	3063	copy.Touch();
3109	3064	objEditor.refreshContents();
3110		- } else if (event.getSource() == stepAllButton)
	3065	+ } else if (source == stepAllButton)
3111	3066	{
3112	3067	copy.StepAll();
3113	3068	copy.Touch();
3114	3069	objEditor.refreshContents();
3115		- } else if (event.getSource() == resetAllButton)
	3070	+ } else if (source == resetAllButton)
3116	3071	{
3117	3072	//CameraPane.fullreset = true;
3118	3073	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3145,53 +3100,75 @@
3145	3100	// Close();
3146	3101	// }
3147	3102	// else
3148		- if (event.getSource() == resetSlidersButton)
	3103	+ if (source == resetSlidersButton)
3149	3104	{
3150	3105	ResetSliders();
3151		- } else if (event.getSource() == clearMaterialButton)
	3106	+ } else if (source == clearMaterialButton)
3152	3107	{
3153	3108	ClearMaterial();
3154		- } else if (event.getSource() == createMaterialButton)
	3109	+ } else if (source == createMaterialButton)
3155	3110	{
3156	3111	CreateMaterial();
3157		- } else if (event.getSource() == clearPanelButton)
	3112	+ } else if (source == clearPanelButton)
3158	3113	{
3159	3114	copy.ClearUI();
3160	3115	refreshContents(true);
3161		- } /*
3162		- }
3163		-
3164		- public boolean action(Event event, Object arg)
3165		- {
3166		- */ 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)
3167	3141	{
3168	3142	Close();
3169	3143	//return true;
3170		- } else if (event.getSource() == loadItem)
	3144	+ } else if (source == loadItem)
3171	3145	{
3172	3146	load();
3173	3147	//return true;
3174		- } else if (event.getSource() == saveItem)
	3148	+ } else if (source == newItem)
	3149	+ {
	3150	+ New();
	3151	+ } else if (source == saveItem)
3175	3152	{
3176	3153	save();
3177	3154	//return true;
3178		- } else if (event.getSource() == saveAsItem)
	3155	+ } else if (source == saveAsItem)
3179	3156	{
3180	3157	saveAs();
3181	3158	//return true;
3182		- } else if (event.getSource() == reexportItem)
	3159	+ } else if (source == reexportItem)
3183	3160	{
3184	3161	reexport();
3185	3162	//return true;
3186		- } else if (event.getSource() == exportAsItem)
	3163	+ } else if (source == exportAsItem)
3187	3164	{
3188	3165	export();
3189	3166	//return true;
3190		- } else if (event.getSource() == povItem)
	3167	+ } else if (source == povItem)
3191	3168	{
3192	3169	generatePOV();
3193	3170	//return true;
3194		- } else if (event.getSource() == zBufferItem)
	3171	+ } else if (source == zBufferItem)
3195	3172	{
3196	3173	try
3197	3174	{
..	..	@@ -3213,21 +3190,8 @@
3213	3190	cameraView.repaint();
3214	3191	//return true;
3215	3192	}
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)
	3193	+ */ else // combos...
	3194	+ if (source == texresMenu)
3231	3195	{
3232	3196	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3233	3197	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3239,6 +3203,262 @@
3239	3203	}
3240	3204	}
3241	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	+
3242	3462	void ToggleAnimation()
3243	3463	{
3244	3464	if (!Globals.ANIMATION)
..	..	@@ -3254,8 +3474,8 @@
3254	3474
3255	3475	Globals.ANIMATION ^= true;
3256	3476
3257		- GrafreeD.wav.cursor = 0;
3258		- GrafreeD.wav.loop = 0;
	3477	+ Grafreed.wav.cursor = 0;
	3478	+ Grafreed.wav.loop = 0;
3259	3479	}
3260	3480	} else
3261	3481	{
..	..	@@ -3276,7 +3496,6 @@
3276	3496	callee.refreshContents();
3277	3497	} else
3278	3498	{
3279		- new Exception().printStackTrace();
3280	3499	System.exit(0);
3281	3500	}
3282	3501	}
..	..	@@ -3443,6 +3662,36 @@
3443	3662	{
3444	3663	//System.out.println("Propagate = " + propagate);
3445	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	+
3446	3695	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3447	3696	{
3448	3697	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3558,7 +3807,7 @@
3558	3807	}
3559	3808
3560	3809	if (normalpushField != null)
3561		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	3810	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3562	3811	}
3563	3812
3564	3813	void SnapObject()
..	..	@@ -3822,6 +4071,7 @@
3822	4071
3823	4072	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3824	4073	{
	4074	+ Save();
3825	4075	//Tween.set(thing, 0).target(1).start(tweenManager);
3826	4076	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3827	4077	// if (thing instanceof GenericJointDemo)
..	..	@@ -4025,6 +4275,7 @@
4025	4275	}
4026	4276	}
4027	4277	}
	4278	+
4028	4279	LoadGFDThread loadGFDThread;
4029	4280
4030	4281	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4044,8 +4295,10 @@
4044	4295
4045	4296	try
4046	4297	{
	4298	+ // Try compressed version first.
4047	4299	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4048		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4300	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4301	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4049	4302
4050	4303	readobj = (Object3D) p.readObject();
4051	4304	istream.close();
..	..	@@ -4053,7 +4306,20 @@
4053	4306	readobj.ResetDisplayList();
4054	4307	} catch (Exception e)
4055	4308	{
4056		- e.printStackTrace();
	4309	+ //e.printStackTrace();
	4310	+ try
	4311	+ {
	4312	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4313	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4314	+
	4315	+ readobj = (Object3D) p.readObject();
	4316	+ istream.close();
	4317	+
	4318	+ readobj.ResetDisplayList();
	4319	+ } catch (Exception e2)
	4320	+ {
	4321	+ e2.printStackTrace();
	4322	+ }
4057	4323	}
4058	4324	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4059	4325	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4099,6 +4365,12 @@
4099	4365
4100	4366	void LoadIt(Object obj)
4101	4367	{
	4368	+ if (obj == null)
	4369	+ {
	4370	+ // Invalid file
	4371	+ return;
	4372	+ }
	4373	+
4102	4374	System.out.println("Loaded " + obj);
4103	4375	//new Exception().printStackTrace();
4104	4376	Object3D readobj = (Object3D) obj;
..	..	@@ -4108,6 +4380,7 @@
4108	4380
4109	4381	if (readobj != null)
4110	4382	{
	4383	+ Save();
4111	4384	try
4112	4385	{
4113	4386	//readobj.deepCopySelf(copy);
..	..	@@ -4170,7 +4443,7 @@
4170	4443
4171	4444	void load() // throws ClassNotFoundException
4172	4445	{
4173		- if (GrafreeD.standAlone)
	4446	+ if (Grafreed.standAlone)
4174	4447	{
4175	4448	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4176	4449	browser.show();
..	..	@@ -4257,11 +4530,13 @@
4257	4530	try
4258	4531	{
4259	4532	FileOutputStream ostream = new FileOutputStream(lastname);
4260		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4533	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4534	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4261	4535
4262	4536	p.writeObject(copy);
4263	4537	p.flush();
4264	4538
	4539	+ zstream.close();
4265	4540	ostream.close();
4266	4541
4267	4542	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4271,11 +4546,12 @@
4271	4546	{
4272	4547	}
4273	4548	}
	4549	+
4274	4550	String lastname;
4275	4551
4276	4552	void saveAs()
4277	4553	{
4278		- if (GrafreeD.standAlone)
	4554	+ if (Grafreed.standAlone)
4279	4555	{
4280	4556	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4281	4557	browser.setVisible(true);
..	..	@@ -4380,13 +4656,13 @@
4380	4656	try
4381	4657	{
4382	4658	FileOutputStream ostream = new FileOutputStream(filename);
4383		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4384		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4659	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4660	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4385	4661
4386	4662	Object3D objectparent = obj.parent;
4387	4663	obj.parent = null;
4388	4664
4389		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4665	+ Object3D object = (Object3D) Grafreed.clone(obj);
4390	4666
4391	4667	obj.parent = objectparent;
4392	4668
..	..	@@ -4398,8 +4674,8 @@
4398	4674	p.writeObject(object);
4399	4675	p.flush();
4400	4676
	4677	+ zstream.close();
4401	4678	ostream.close();
4402		- // zstream.close();
4403	4679
4404	4680	// group.selection.get(0).parent = parent;
4405	4681	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4420,7 +4696,7 @@
4420	4696	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4421	4697	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4422	4698	copy.generatePOV(buffer);
4423		- if (GrafreeD.standAlone)
	4699	+ if (Grafreed.standAlone)
4424	4700	{
4425	4701	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4426	4702	browser.show();
..	..	@@ -4446,7 +4722,8 @@
4446	4722	Object3D client;
4447	4723	Object3D copy;
4448	4724	MenuBar menuBar;
4449		- Menu windowMenu;
	4725	+ Menu fileMenu;
	4726	+ MenuItem newItem;
4450	4727	MenuItem loadItem;
4451	4728	MenuItem saveItem;
4452	4729	MenuItem saveAsItem;
..	..	@@ -4454,11 +4731,9 @@
4454	4731	MenuItem reexportItem;
4455	4732	MenuItem povItem;
4456	4733	MenuItem closeItem;
4457		- Menu cameraMenu;
	4734	+
4458	4735	CheckboxMenuItem zBufferItem;
4459	4736	//MenuItem normalLensItem;
4460		- MenuItem editCameraItem;
4461		- MenuItem revertCameraItem;
4462	4737	MenuItem stepItem;
4463	4738	CheckboxMenuItem toggleLiveItem;
4464	4739	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4606,4 +4881,9 @@
4606	4881	//ObjectUI parent;
4607	4882
4608	4883	cNumberSlider normalpushField;
	4884	+
	4885	+ private MenuItem importGFDItem;
	4886	+ private MenuItem importVRMLX3DItem;
	4887	+ private MenuItem import3DSItem;
	4888	+ private MenuItem importOBJItem;
4609	4889	}