~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -143,6 +143,8 @@
143	143	//nameField.removeActionListener(this);
144	144	// objEditor.ctrlPanel.remove(nameField);
145	145
	146	+ objEditor.ctrlPanel.remove(namePanel);
	147	+
146	148	if (!GroupEditor.allparams)
147	149	return;
148	150
..	..	@@ -165,7 +167,6 @@
165	167	// objEditor.ctrlPanel.remove(fasterButton);
166	168	// objEditor.ctrlPanel.remove(remarkButton);
167	169
168		- objEditor.ctrlPanel.remove(namePanel);
169	170	objEditor.ctrlPanel.remove(setupPanel);
170	171	objEditor.ctrlPanel.remove(commandsPanel);
171	172	objEditor.ctrlPanel.remove(pushPanel);
..	..	@@ -275,24 +276,40 @@
275	276	void SetupMenu()
276	277	{
277	278	frame.setMenuBar(menuBar = new MenuBar());
278		- menuBar.add(windowMenu = new Menu("File"));
279		- windowMenu.add(loadItem = new MenuItem("Load..."));
280		- windowMenu.add("-");
281		- windowMenu.add(saveItem = new MenuItem("Save"));
282		- 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..."));
283	299	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
284		- windowMenu.add("-");
285		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
286		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
287		- windowMenu.add("-");
	300	+ fileMenu.add("-");
	301	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	302	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	303	+ fileMenu.add("-");
288	304	if (client.parent != null)
289	305	{
290		- windowMenu.add(closeItem = new MenuItem("Close"));
	306	+ fileMenu.add(closeItem = new MenuItem("Close"));
291	307	} else
292	308	{
293		- windowMenu.add(closeItem = new MenuItem("Exit"));
	309	+ fileMenu.add(closeItem = new MenuItem("Exit"));
294	310	}
295	311
	312	+ newItem.addActionListener(this);
296	313	loadItem.addActionListener(this);
297	314	saveItem.addActionListener(this);
298	315	saveAsItem.addActionListener(this);
..	..	@@ -300,61 +317,6 @@
300	317	reexportItem.addActionListener(this);
301	318	//povItem.addActionListener(this);
302	319	closeItem.addActionListener(this);
303		-
304		- menuBar.add(cameraMenu = new Menu("View"));
305		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
306		- //zBufferItem.addActionListener(this);
307		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
308		- //normalLensItem.addActionListener(this);
309		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
310		- revertCameraItem.addActionListener(this);
311		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
312		- toggleTimelineItem.addItemListener(this);
313		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
314		- toggleFullScreenItem.addItemListener(this);
315		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
316		- cameraMenu.add("-");
317		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
318		- toggleTextureItem.addItemListener(this);
319		- toggleTextureItem.setState(CameraPane.textureon);
320		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
321		- toggleLiveItem.addItemListener(this);
322		- toggleLiveItem.setState(Globals.isLIVE());
323		- cameraMenu.add(stepItem = new MenuItem("Step"));
324		- stepItem.addActionListener(this);
325		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
326		-// toggleDLItem.addItemListener(this);
327		-// toggleDLItem.setState(false);
328		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
329		- toggleRenderItem.addItemListener(this);
330		- toggleRenderItem.setState(!CameraPane.frozen);
331		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
332		- toggleDebugItem.addItemListener(this);
333		- toggleDebugItem.setState(CameraPane.DEBUG);
334		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
335		- toggleFrustumItem.addItemListener(this);
336		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
337		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
338		- toggleFootContactItem.addItemListener(this);
339		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
340		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
341		- toggleRandomItem.addItemListener(this);
342		- toggleRandomItem.setState(CameraPane.RANDOM);
343		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
344		- toggleHandleItem.addItemListener(this);
345		- toggleHandleItem.setState(CameraPane.HANDLES);
346		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
347		- togglePaintItem.addItemListener(this);
348		- togglePaintItem.setState(CameraPane.PAINTMODE);
349		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
350		-// toggleRootItem.addItemListener(this);
351		-// toggleRootItem.setState(false);
352		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
353		-// animationItem.addItemListener(this);
354		-// animationItem.setState(CameraPane.ANIMATION);
355		- cameraMenu.add("-");
356		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
357		- editCameraItem.addActionListener(this);
358	320
359	321	objectPanel = new JTabbedPane();
360	322	toolbarPanel = new JPanel();
..	..	@@ -483,13 +445,13 @@
483	445	//SendInfo("Name:", "bold");
484	446	if (sel.GetTextures() != null \|\| debug)
485	447	{
486		- si.SendInfo(sel.toString(), "bold");
	448	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
487	449	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
488	450	if (sel.Size() > 0)
489	451	{
490	452	si.SendInfo("#children = " + sel.Size(), "regular");
491	453	}
492		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	454	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
493	455	if (debug)
494	456	{
495	457	try
..	..	@@ -531,7 +493,7 @@
531	493	}
532	494	if (sel.support != null)
533	495	{
534		- si.SendInfo(" support: " + sel.support, "regular");
	496	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
535	497	}
536	498	if (sel.scriptnode != null)
537	499	{
..	..	@@ -734,7 +696,7 @@
734	696	protected static ImageIcon createImageIcon(String path,
735	697	String description)
736	698	{
737		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	699	+ java.net.URL imgURL = Grafreed.class.getResource(path);
738	700	if (imgURL != null)
739	701	{
740	702	return new ImageIcon(imgURL, description);
..	..	@@ -766,6 +728,7 @@
766	728	// NumberSlider vDivsField;
767	729	// JCheckBox endcaps;
768	730	JCheckBox liveCB;
	731	+ JCheckBox selectCB;
769	732	JCheckBox hideCB;
770	733	JCheckBox link2masterCB;
771	734	JCheckBox markCB;
..	..	@@ -967,33 +930,52 @@
967	930	setupPanel = new cGridBag().setVertical(false);
968	931
969	932	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
970		- if (Globals.ADVANCED)
971		- link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
972		- hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	933	+ liveCB.setToolTipText("Animate object");
	934	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	935	+ selectCB.setToolTipText("Make object selectable");
973	936	// Return();
	937	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	938	+ hideCB.setToolTipText("Hide object");
974	939	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
975		- rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind);
976		- randomCB = AddCheckBox(setupPanel, "Rand", copy.random);
	940	+ markCB.setToolTipText("Set the animation target transform");
	941	+
	942	+ rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	943	+ rewindCB.setToolTipText("Rewind animation");
	944	+
	945	+ randomCB = AddCheckBox(setupPanel, "Random", copy.random);
	946	+ randomCB.setToolTipText("Option for switch node");
977	947
	948	+ if (Globals.ADVANCED)
	949	+ {
	950	+ link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
	951	+ link2masterCB.setToolTipText("Attach to support");
	952	+ speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	953	+ speedupCB.setToolTipText("Option motion capture");
	954	+ }
	955	+
978	956	oe.ctrlPanel.add(setupPanel);
979	957	oe.ctrlPanel.Return();
980	958
981	959	commandsPanel = new cGridBag().setVertical(false);
982	960
983	961	resetButton = AddButton(commandsPanel, "Reset");
	962	+ resetButton.setToolTipText("Jump to frame zero");
984	963	stepButton = AddButton(commandsPanel, "Step");
	964	+ stepButton.setToolTipText("Step one frame");
985	965	// resetAllButton = AddButton(oe, "Reset All");
986	966	// stepAllButton = AddButton(oe, "Step All");
987		- speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
988	967	// Return();
989	968	slowerButton = AddButton(commandsPanel, "Slow");
	969	+ slowerButton.setToolTipText("Decrease animation speed");
990	970	fasterButton = AddButton(commandsPanel, "Fast");
	971	+ fasterButton.setToolTipText("Increase animation speed");
991	972	remarkButton = AddButton(commandsPanel, "Remark");
	973	+ remarkButton.setToolTipText("Set the current transform as the target");
992	974
993	975	oe.ctrlPanel.add(commandsPanel);
994	976	oe.ctrlPanel.Return();
995	977
996		- 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
997	979	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
998	980	//Return();
999	981
..	..	@@ -1295,7 +1277,7 @@
1295	1277	scrollpane.addMouseWheelListener(this); // Default not fast enough
1296	1278
1297	1279	/JTabbedPane/ scenePanel = new cGridBag();
1298		- scenePanel.preferredWidth = 7;
	1280	+ scenePanel.preferredWidth = 6;
1299	1281
1300	1282	JTabbedPane tabbedPane = new JTabbedPane();
1301	1283	tabbedPane.add(scrollpane);
..	..	@@ -1401,8 +1383,8 @@
1401	1383
1402	1384	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1403	1385
1404		- frame.setSize(1024, 768);
1405		- frame.show();
	1386	+ frame.setSize(1280, 860);
	1387	+ frame.setVisible(true);
1406	1388
1407	1389	gridPanel.setDividerLocation(1.0);
1408	1390
..	..	@@ -1441,19 +1423,22 @@
1441	1423
1442	1424	cGridBag editBar = new cGridBag().setVertical(false);
1443	1425
1444		- editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1426	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1445	1427	createMaterialButton.setToolTipText("Create material");
1446	1428
1447	1429	/*
1448	1430	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1449	1431	*/
1450	1432
1451		- editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1433	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1452	1434	clearMaterialButton.setToolTipText("Clear material");
1453	1435
1454		- editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
1455		- editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1456		- 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	+ }
1457	1442
1458	1443	editBar.preferredHeight = 15;
1459	1444
..	..	@@ -1722,12 +1707,15 @@
1722	1707	opacityPowerField.addChangeListener(this);
1723	1708	/**/
1724	1709
1725		- resetSlidersButton.addActionListener(this);
1726	1710	clearMaterialButton.addActionListener(this);
1727	1711	createMaterialButton.addActionListener(this);
1728		-
1729		- propagateToggle.addItemListener(this);
1730		- multiplyToggle.addItemListener(this);
	1712	+
	1713	+ if (Globals.ADVANCED)
	1714	+ {
	1715	+ resetSlidersButton.addActionListener(this);
	1716	+ propagateToggle.addItemListener(this);
	1717	+ multiplyToggle.addItemListener(this);
	1718	+ }
1731	1719	}
1732	1720
1733	1721	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1898,7 +1886,7 @@
1898	1886
1899	1887	//? flashIt = false;
1900	1888	CameraPane pane = (CameraPane) cameraView;
1901		- pane.clickStart(location.x, location.y, 0);
	1889	+ pane.clickStart(location.x, location.y, 0, 0);
1902	1890	pane.clickEnd(location.x, location.y, 0, true);
1903	1891
1904	1892	if (group.selection.size() == 1)
..	..	@@ -2355,11 +2343,11 @@
2355	2343
2356	2344	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2357	2345	{
2358		- if (GrafreeD.standAlone)
	2346	+ if (Grafreed.standAlone)
2359	2347	{
2360	2348	/**/
2361	2349	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2362		- browser.show();
	2350	+ browser.setVisible(true);
2363	2351	String filename = browser.getFile();
2364	2352	if (filename != null && filename.length() > 0)
2365	2353	{
..	..	@@ -2719,7 +2707,8 @@
2719	2707	return;
2720	2708	}
2721	2709
2722		- multiplyToggle.setSelected(mat.multiply);
	2710	+ if (multiplyToggle != null)
	2711	+ multiplyToggle.setSelected(mat.multiply);
2723	2712
2724	2713	assert (object.projectedVertices != null);
2725	2714
..	..	@@ -2934,7 +2923,7 @@
2934	2923	frame.validate();
2935	2924
2936	2925	return;
2937		- } else if (event.getSource() == toggleRandomItem)
	2926	+ } else if (event.getSource() == toggleSwitchItem)
2938	2927	{
2939	2928	cameraView.ToggleRandom();
2940	2929	cameraView.repaint();
..	..	@@ -2965,6 +2954,10 @@
2965	2954	{
2966	2955	copy.live ^= true;
2967	2956	return;
	2957	+ } else if (event.getSource() == selectCB)
	2958	+ {
	2959	+ copy.dontselect ^= true;
	2960	+ return;
2968	2961	} else if (event.getSource() == hideCB)
2969	2962	{
2970	2963	copy.hide ^= true;
..	..	@@ -2979,6 +2972,7 @@
2979	2972	if (event.getSource() == randomCB)
2980	2973	{
2981	2974	copy.random ^= true;
	2975	+ objEditor.refreshContents();
2982	2976	return;
2983	2977	}
2984	2978	if (event.getSource() == speedupCB)
..	..	@@ -3002,8 +2996,9 @@
3002	2996
3003	2997	public void actionPerformed(ActionEvent event)
3004	2998	{
	2999	+ Object source = event.getSource();
3005	3000	// SCRIPT DIALOG
3006		- if (event.getSource() == okbutton)
	3001	+ if (source == okbutton)
3007	3002	{
3008	3003	textpanel.setVisible(false);
3009	3004	textpanel.remove(textarea);
..	..	@@ -3015,7 +3010,7 @@
3015	3010	textarea = null;
3016	3011	textpanel = null;
3017	3012	}
3018		- if (event.getSource() == cancelbutton)
	3013	+ if (source == cancelbutton)
3019	3014	{
3020	3015	textpanel.setVisible(false);
3021	3016	textpanel.remove(textarea);
..	..	@@ -3027,50 +3022,50 @@
3027	3022	//applySelf();
3028	3023	//client.refreshEditWindow();
3029	3024	//refreshContents();
3030		- if (event.getSource() == nameField)
	3025	+ if (source == nameField)
3031	3026	{
3032	3027	//System.out.println("ObjEditor " + event);
3033	3028	applySelf0(true);
3034	3029	//parent.applySelf();
3035	3030	objEditor.refreshContents();
3036		- } else if (event.getSource() == resetButton)
	3031	+ } else if (source == resetButton)
3037	3032	{
3038	3033	CameraPane.fullreset = true;
3039	3034	copy.Reset(); // ResetMeshes();
3040	3035	copy.Touch();
3041	3036	objEditor.refreshContents();
3042		- } else if (event.getSource() == stepItem)
	3037	+ } else if (source == stepItem)
3043	3038	{
3044	3039	//cameraView.ONESTEP = true;
3045	3040	Globals.ONESTEP = true;
3046	3041	cameraView.repaint();
3047	3042	return;
3048		- } else if (event.getSource() == stepButton)
	3043	+ } else if (source == stepButton)
3049	3044	{
3050	3045	copy.Step();
3051	3046	copy.Touch();
3052	3047	objEditor.refreshContents();
3053		- } else if (event.getSource() == slowerButton)
	3048	+ } else if (source == slowerButton)
3054	3049	{
3055	3050	copy.Slower();
3056	3051	copy.Touch();
3057	3052	objEditor.refreshContents();
3058		- } else if (event.getSource() == fasterButton)
	3053	+ } else if (source == fasterButton)
3059	3054	{
3060	3055	copy.Faster();
3061	3056	copy.Touch();
3062	3057	objEditor.refreshContents();
3063		- } else if (event.getSource() == remarkButton)
	3058	+ } else if (source == remarkButton)
3064	3059	{
3065	3060	copy.Remark();
3066	3061	copy.Touch();
3067	3062	objEditor.refreshContents();
3068		- } else if (event.getSource() == stepAllButton)
	3063	+ } else if (source == stepAllButton)
3069	3064	{
3070	3065	copy.StepAll();
3071	3066	copy.Touch();
3072	3067	objEditor.refreshContents();
3073		- } else if (event.getSource() == resetAllButton)
	3068	+ } else if (source == resetAllButton)
3074	3069	{
3075	3070	//CameraPane.fullreset = true;
3076	3071	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3103,53 +3098,75 @@
3103	3098	// Close();
3104	3099	// }
3105	3100	// else
3106		- if (event.getSource() == resetSlidersButton)
	3101	+ if (source == resetSlidersButton)
3107	3102	{
3108	3103	ResetSliders();
3109		- } else if (event.getSource() == clearMaterialButton)
	3104	+ } else if (source == clearMaterialButton)
3110	3105	{
3111	3106	ClearMaterial();
3112		- } else if (event.getSource() == createMaterialButton)
	3107	+ } else if (source == createMaterialButton)
3113	3108	{
3114	3109	CreateMaterial();
3115		- } else if (event.getSource() == clearPanelButton)
	3110	+ } else if (source == clearPanelButton)
3116	3111	{
3117	3112	copy.ClearUI();
3118	3113	refreshContents(true);
3119		- } /*
3120		- }
3121		-
3122		- public boolean action(Event event, Object arg)
3123		- {
3124		- */ 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)
3125	3139	{
3126	3140	Close();
3127	3141	//return true;
3128		- } else if (event.getSource() == loadItem)
	3142	+ } else if (source == loadItem)
3129	3143	{
3130	3144	load();
3131	3145	//return true;
3132		- } else if (event.getSource() == saveItem)
	3146	+ } else if (source == newItem)
	3147	+ {
	3148	+ New();
	3149	+ } else if (source == saveItem)
3133	3150	{
3134	3151	save();
3135	3152	//return true;
3136		- } else if (event.getSource() == saveAsItem)
	3153	+ } else if (source == saveAsItem)
3137	3154	{
3138	3155	saveAs();
3139	3156	//return true;
3140		- } else if (event.getSource() == reexportItem)
	3157	+ } else if (source == reexportItem)
3141	3158	{
3142	3159	reexport();
3143	3160	//return true;
3144		- } else if (event.getSource() == exportAsItem)
	3161	+ } else if (source == exportAsItem)
3145	3162	{
3146	3163	export();
3147	3164	//return true;
3148		- } else if (event.getSource() == povItem)
	3165	+ } else if (source == povItem)
3149	3166	{
3150	3167	generatePOV();
3151	3168	//return true;
3152		- } else if (event.getSource() == zBufferItem)
	3169	+ } else if (source == zBufferItem)
3153	3170	{
3154	3171	try
3155	3172	{
..	..	@@ -3171,21 +3188,8 @@
3171	3188	cameraView.repaint();
3172	3189	//return true;
3173	3190	}
3174		- */ else if (event.getSource() == editCameraItem)
3175		- {
3176		- cameraView.ProtectCamera();
3177		- cameraView.repaint();
3178		- return;
3179		- } else if (event.getSource() == revertCameraItem)
3180		- {
3181		- cameraView.RevertCamera();
3182		- cameraView.repaint();
3183		- return;
3184		-// } else if (event.getSource() == textureButton)
3185		-// {
3186		-// return; // true;
3187		- } else // combos...
3188		- if (event.getSource() == texresMenu)
	3191	+ */ else // combos...
	3192	+ if (source == texresMenu)
3189	3193	{
3190	3194	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3191	3195	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3197,6 +3201,48 @@
3197	3201	}
3198	3202	}
3199	3203
	3204	+ void New()
	3205	+ {
	3206	+ while (copy.Size() > 1)
	3207	+ {
	3208	+ copy.remove(1);
	3209	+ }
	3210	+ ResetModel();
	3211	+ objEditor.refreshContents();
	3212	+ }
	3213	+
	3214	+ void ImportGFD()
	3215	+ {
	3216	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3217	+ browser.show();
	3218	+ String filename = browser.getFile();
	3219	+ if (filename != null && filename.length() > 0)
	3220	+ {
	3221	+ String fullname = browser.getDirectory() + filename;
	3222	+
	3223	+ //Object3D readobj =
	3224	+ objEditor.ReadGFD(fullname, objEditor);
	3225	+ //makeSomething(readobj);
	3226	+ }
	3227	+ }
	3228	+
	3229	+ void ImportVRMLX3D()
	3230	+ {
	3231	+ if (Grafreed.standAlone)
	3232	+ {
	3233	+ /**/
	3234	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3235	+ browser.show();
	3236	+ String filename = browser.getFile();
	3237	+ if (filename != null && filename.length() > 0)
	3238	+ {
	3239	+ String fullname = browser.getDirectory() + filename;
	3240	+ LoadVRMLX3D(fullname);
	3241	+ }
	3242	+ /**/
	3243	+ }
	3244	+ }
	3245	+
3200	3246	void ToggleAnimation()
3201	3247	{
3202	3248	if (!Globals.ANIMATION)
..	..	@@ -3212,8 +3258,8 @@
3212	3258
3213	3259	Globals.ANIMATION ^= true;
3214	3260
3215		- GrafreeD.wav.cursor = 0;
3216		- GrafreeD.wav.loop = 0;
	3261	+ Grafreed.wav.cursor = 0;
	3262	+ Grafreed.wav.loop = 0;
3217	3263	}
3218	3264	} else
3219	3265	{
..	..	@@ -3234,7 +3280,6 @@
3234	3280	callee.refreshContents();
3235	3281	} else
3236	3282	{
3237		- new Exception().printStackTrace();
3238	3283	System.exit(0);
3239	3284	}
3240	3285	}
..	..	@@ -3264,7 +3309,7 @@
3264	3309	void CreateMaterial()
3265	3310	{
3266	3311	//copy.ClearMaterial(); // PATCH
3267		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3312	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3268	3313	if (copy.selection.size() > 0)
3269	3314	//SetMaterial(copy);
3270	3315	{
..	..	@@ -3323,11 +3368,11 @@
3323	3368	{
3324	3369	copy.ResetBlockLoop(); // temporary problem
3325	3370
3326		- boolean random = CameraPane.RANDOM;
3327		- CameraPane.RANDOM = false; // parse everything
	3371	+ boolean random = CameraPane.SWITCH;
	3372	+ CameraPane.SWITCH = false; // parse everything
3328	3373	copy.ResetDisplayList();
3329	3374	copy.HardTouch();
3330		- CameraPane.RANDOM = random;
	3375	+ CameraPane.SWITCH = random;
3331	3376	}
3332	3377
3333	3378	// public void applySelf()
..	..	@@ -3401,6 +3446,36 @@
3401	3446	{
3402	3447	//System.out.println("Propagate = " + propagate);
3403	3448	copy.UpdateMaterial(anchor, current, propagate);
	3449	+
	3450	+ if (copy.material != null)
	3451	+ {
	3452	+ cMaterial mat = copy.material;
	3453	+
	3454	+ colorField.SetToolTipValue((mat.color));
	3455	+ modulationField.SetToolTipValue((mat.modulation));
	3456	+ metalnessField.SetToolTipValue((mat.metalness));
	3457	+ diffuseField.SetToolTipValue((mat.diffuse));
	3458	+ specularField.SetToolTipValue((mat.specular));
	3459	+ shininessField.SetToolTipValue((mat.shininess));
	3460	+ shiftField.SetToolTipValue((mat.shift));
	3461	+ ambientField.SetToolTipValue((mat.ambient));
	3462	+ lightareaField.SetToolTipValue((mat.lightarea));
	3463	+ diffusenessField.SetToolTipValue((mat.factor));
	3464	+ velvetField.SetToolTipValue((mat.velvet));
	3465	+ sheenField.SetToolTipValue((mat.sheen));
	3466	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3467	+ backlitField.SetToolTipValue((mat.bump));
	3468	+ anisoField.SetToolTipValue((mat.aniso));
	3469	+ anisoVField.SetToolTipValue((mat.anisoV));
	3470	+ cameraField.SetToolTipValue((mat.cameralight));
	3471	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3472	+ shadowField.SetToolTipValue((mat.shadow));
	3473	+ textureField.SetToolTipValue((mat.texture));
	3474	+ opacityField.SetToolTipValue((mat.opacity));
	3475	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3476	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3477	+ }
	3478	+
3404	3479	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3405	3480	{
3406	3481	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3516,7 +3591,7 @@
3516	3591	}
3517	3592
3518	3593	if (normalpushField != null)
3519		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	3594	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3520	3595	}
3521	3596
3522	3597	void SnapObject()
..	..	@@ -3983,6 +4058,7 @@
3983	4058	}
3984	4059	}
3985	4060	}
	4061	+
3986	4062	LoadGFDThread loadGFDThread;
3987	4063
3988	4064	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4003,7 +4079,8 @@
4003	4079	try
4004	4080	{
4005	4081	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4006		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4082	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4083	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4007	4084
4008	4085	readobj = (Object3D) p.readObject();
4009	4086	istream.close();
..	..	@@ -4011,7 +4088,20 @@
4011	4088	readobj.ResetDisplayList();
4012	4089	} catch (Exception e)
4013	4090	{
4014		- e.printStackTrace();
	4091	+ //e.printStackTrace();
	4092	+ try
	4093	+ {
	4094	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4095	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4096	+
	4097	+ readobj = (Object3D) p.readObject();
	4098	+ istream.close();
	4099	+
	4100	+ readobj.ResetDisplayList();
	4101	+ } catch (Exception e2)
	4102	+ {
	4103	+ e2.printStackTrace();
	4104	+ }
4015	4105	}
4016	4106	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4017	4107	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4128,7 +4218,7 @@
4128	4218
4129	4219	void load() // throws ClassNotFoundException
4130	4220	{
4131		- if (GrafreeD.standAlone)
	4221	+ if (Grafreed.standAlone)
4132	4222	{
4133	4223	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4134	4224	browser.show();
..	..	@@ -4215,11 +4305,13 @@
4215	4305	try
4216	4306	{
4217	4307	FileOutputStream ostream = new FileOutputStream(lastname);
4218		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4308	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4309	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4219	4310
4220	4311	p.writeObject(copy);
4221	4312	p.flush();
4222	4313
	4314	+ zstream.close();
4223	4315	ostream.close();
4224	4316
4225	4317	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4229,11 +4321,12 @@
4229	4321	{
4230	4322	}
4231	4323	}
	4324	+
4232	4325	String lastname;
4233	4326
4234	4327	void saveAs()
4235	4328	{
4236		- if (GrafreeD.standAlone)
	4329	+ if (Grafreed.standAlone)
4237	4330	{
4238	4331	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4239	4332	browser.setVisible(true);
..	..	@@ -4338,13 +4431,13 @@
4338	4431	try
4339	4432	{
4340	4433	FileOutputStream ostream = new FileOutputStream(filename);
4341		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4342		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4434	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4435	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4343	4436
4344	4437	Object3D objectparent = obj.parent;
4345	4438	obj.parent = null;
4346	4439
4347		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4440	+ Object3D object = (Object3D) Grafreed.clone(obj);
4348	4441
4349	4442	obj.parent = objectparent;
4350	4443
..	..	@@ -4356,8 +4449,8 @@
4356	4449	p.writeObject(object);
4357	4450	p.flush();
4358	4451
	4452	+ zstream.close();
4359	4453	ostream.close();
4360		- // zstream.close();
4361	4454
4362	4455	// group.selection.get(0).parent = parent;
4363	4456	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4378,7 +4471,7 @@
4378	4471	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4379	4472	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4380	4473	copy.generatePOV(buffer);
4381		- if (GrafreeD.standAlone)
	4474	+ if (Grafreed.standAlone)
4382	4475	{
4383	4476	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4384	4477	browser.show();
..	..	@@ -4404,7 +4497,8 @@
4404	4497	Object3D client;
4405	4498	Object3D copy;
4406	4499	MenuBar menuBar;
4407		- Menu windowMenu;
	4500	+ Menu fileMenu;
	4501	+ MenuItem newItem;
4408	4502	MenuItem loadItem;
4409	4503	MenuItem saveItem;
4410	4504	MenuItem saveAsItem;
..	..	@@ -4412,11 +4506,9 @@
4412	4506	MenuItem reexportItem;
4413	4507	MenuItem povItem;
4414	4508	MenuItem closeItem;
4415		- Menu cameraMenu;
	4509	+
4416	4510	CheckboxMenuItem zBufferItem;
4417	4511	//MenuItem normalLensItem;
4418		- MenuItem editCameraItem;
4419		- MenuItem revertCameraItem;
4420	4512	MenuItem stepItem;
4421	4513	CheckboxMenuItem toggleLiveItem;
4422	4514	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4427,7 +4519,7 @@
4427	4519	CheckboxMenuItem toggleFootContactItem;
4428	4520	CheckboxMenuItem toggleDLItem;
4429	4521	CheckboxMenuItem toggleTextureItem;
4430		- CheckboxMenuItem toggleRandomItem;
	4522	+ CheckboxMenuItem toggleSwitchItem;
4431	4523	CheckboxMenuItem toggleRootItem;
4432	4524	CheckboxMenuItem animationItem;
4433	4525	CheckboxMenuItem toggleHandleItem;
..	..	@@ -4564,4 +4656,9 @@
4564	4656	//ObjectUI parent;
4565	4657
4566	4658	cNumberSlider normalpushField;
	4659	+
	4660	+ private MenuItem importGFDItem;
	4661	+ private MenuItem importVRMLX3DItem;
	4662	+ private MenuItem import3DSItem;
	4663	+ private MenuItem importOBJItem;
4567	4664	}