~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -4,6 +4,7 @@
4	4
5	5	import java.awt.*;
6	6	import java.awt.event.*;
	7	+import java.awt.image.BufferedImage;
7	8	import javax.swing.*;
8	9	import javax.swing.event.*;
9	10	import javax.swing.text.*;
..	..	@@ -35,6 +36,67 @@
35	36
36	37	GroupEditor callee;
37	38	JFrame frame;
	39	+
	40	+ static ObjEditor theFrame;
	41	+
	42	+ cButton GetButton(String name, boolean border)
	43	+ {
	44	+ try
	45	+ {
	46	+ ImageIcon icon = GetIcon(name);
	47	+ return new cButton(icon, border);
	48	+ }
	49	+ catch (Exception e)
	50	+ {
	51	+ return new cButton(name, border);
	52	+ }
	53	+ }
	54	+
	55	+ cToggleButton GetToggleButton(String name, boolean border)
	56	+ {
	57	+ try
	58	+ {
	59	+ ImageIcon icon = GetIcon(name);
	60	+ return new cToggleButton(icon, border);
	61	+ }
	62	+ catch (Exception e)
	63	+ {
	64	+ return new cToggleButton(name, border);
	65	+ }
	66	+ }
	67	+
	68	+ cCheckBox GetCheckBox(String name, boolean border)
	69	+ {
	70	+ try
	71	+ {
	72	+ ImageIcon icon = GetIcon(name);
	73	+ return new cCheckBox(icon, border);
	74	+ }
	75	+ catch (Exception e)
	76	+ {
	77	+ return new cCheckBox(name, border);
	78	+ }
	79	+ }
	80	+
	81	+ private ImageIcon GetIcon(String name) throws IOException
	82	+ {
	83	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	84	+
	85	+ if (image.getWidth() != 24 && image.getHeight() != 24)
	86	+ {
	87	+ BufferedImage resized = new BufferedImage(24, 24, image.getType());
	88	+ Graphics2D g = resized.createGraphics();
	89	+ g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	90	+ //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	91	+ g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
	92	+ g.dispose();
	93	+
	94	+ image = resized;
	95	+ }
	96	+
	97	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	98	+ return icon;
	99	+ }
38	100
39	101	// SCRIPT
40	102
..	..	@@ -168,7 +230,8 @@
168	230	// objEditor.ctrlPanel.remove(remarkButton);
169	231
170	232	objEditor.ctrlPanel.remove(setupPanel);
171		- objEditor.ctrlPanel.remove(commandsPanel);
	233	+ objEditor.ctrlPanel.remove(setupPanel2);
	234	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
172	235	objEditor.ctrlPanel.remove(pushPanel);
173	236	//objEditor.ctrlPanel.remove(fillPanel);
174	237
..	..	@@ -243,6 +306,7 @@
243	306	//localCopy.parent = null;
244	307
245	308	frame = new JFrame();
	309	+ frame.setUndecorated(true);
246	310	objEditor = this;
247	311	this.callee = callee;
248	312
..	..	@@ -276,24 +340,40 @@
276	340	void SetupMenu()
277	341	{
278	342	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..."));
	343	+ menuBar.add(fileMenu = new Menu("File"));
	344	+ fileMenu.add(newItem = new MenuItem("New"));
	345	+ fileMenu.add(loadItem = new MenuItem("Open..."));
	346	+
	347	+ //oe.menuBar.add(menu = new Menu("Include"));
	348	+ Menu menu = new Menu("Import");
	349	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	350	+ importOBJItem.addActionListener(this);
	351	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	352	+ import3DSItem.addActionListener(this);
	353	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	354	+ importVRMLX3DItem.addActionListener(this);
	355	+ menu.add("-");
	356	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	357	+ importGFDItem.addActionListener(this);
	358	+ fileMenu.add(menu);
	359	+ fileMenu.add("-");
	360	+
	361	+ fileMenu.add(saveItem = new MenuItem("Save"));
	362	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
284	363	//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("-");
	364	+ fileMenu.add("-");
	365	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	366	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	367	+ fileMenu.add("-");
289	368	if (client.parent != null)
290	369	{
291		- windowMenu.add(closeItem = new MenuItem("Close"));
	370	+ fileMenu.add(closeItem = new MenuItem("Close"));
292	371	} else
293	372	{
294		- windowMenu.add(closeItem = new MenuItem("Exit"));
	373	+ fileMenu.add(closeItem = new MenuItem("Exit"));
295	374	}
296	375
	376	+ newItem.addActionListener(this);
297	377	loadItem.addActionListener(this);
298	378	saveItem.addActionListener(this);
299	379	saveAsItem.addActionListener(this);
..	..	@@ -302,70 +382,27 @@
302	382	//povItem.addActionListener(this);
303	383	closeItem.addActionListener(this);
304	384
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		-
360	385	objectPanel = new JTabbedPane();
361	386	toolbarPanel = new JPanel();
362	387	toolbarPanel.setName("Toolbar");
363	388	treePanel = new cGridBag();
364	389	treePanel.setName("Tree");
	390	+
	391	+ editPanel = new cGridBag().setVertical(true);
	392	+ editPanel.setName("Edit");
	393	+
365	394	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
366		- ctrlPanel.setName("Edit");
	395	+
	396	+ editCommandsPanel = new cGridBag();
	397	+ editPanel.add(editCommandsPanel);
	398	+ editPanel.add(ctrlPanel);
	399	+
	400	+ toolboxPanel = new cGridBag().setVertical(false);
	401	+ toolboxPanel.setName("Toolbox");
	402	+
367	403	materialPanel = new cGridBag().setVertical(true);
368	404	materialPanel.setName("Material");
	405	+
369	406	/JTextPane/
370	407	infoarea = createTextPane();
371	408	doc = infoarea.getStyledDocument();
..	..	@@ -458,10 +495,10 @@
458	495	e.printStackTrace();
459	496	}
460	497
461		- String selection = infoarea.getText();
462		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
463		- java.awt.datatransfer.Clipboard clipboard =
464		- Toolkit.getDefaultToolkit().getSystemClipboard();
	498	+// String selection = infoarea.getText();
	499	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	500	+// java.awt.datatransfer.Clipboard clipboard =
	501	+// Toolkit.getDefaultToolkit().getSystemClipboard();
465	502	//clipboard.setContents(data, data);
466	503	}
467	504
..	..	@@ -484,13 +521,13 @@
484	521	//SendInfo("Name:", "bold");
485	522	if (sel.GetTextures() != null \|\| debug)
486	523	{
487		- si.SendInfo(sel.toString(), "bold");
	524	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
488	525	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
489	526	if (sel.Size() > 0)
490	527	{
491	528	si.SendInfo("#children = " + sel.Size(), "regular");
492	529	}
493		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	530	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
494	531	if (debug)
495	532	{
496	533	try
..	..	@@ -532,7 +569,7 @@
532	569	}
533	570	if (sel.support != null)
534	571	{
535		- si.SendInfo(" support: " + sel.support, "regular");
	572	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
536	573	}
537	574	if (sel.scriptnode != null)
538	575	{
..	..	@@ -621,19 +658,91 @@
621	658	}
622	659	}
623	660
	661	+static GraphicsDevice device = GraphicsEnvironment
	662	+ .getLocalGraphicsEnvironment().getScreenDevices()[0];
	663	+
	664	+ Rectangle keeprect;
	665	+ cRadio radio;
	666	+
	667	+cButton keepButton;
	668	+ cButton twoButton; // Full 3D
	669	+ cButton sixButton;
	670	+ cButton threeButton;
	671	+ cButton sevenButton;
	672	+ cButton fourButton; // full panel
	673	+ cButton oneButton; // full XYZ
	674	+ //cButton currentLayout;
	675	+
	676	+ boolean maximized;
	677	+
	678	+ cButton fullscreenLayout;
	679	+
	680	+ void Minimize()
	681	+ {
	682	+ frame.setState(Frame.ICONIFIED);
	683	+ }
	684	+
	685	+ void Maximize()
	686	+ {
	687	+ if (maximized)
	688	+ {
	689	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	690	+ }
	691	+ else
	692	+ {
	693	+ keeprect = frame.getBounds();
	694	+ Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	695	+ Dimension rect2 = frame.getToolkit().getScreenSize();
	696	+ frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	697	+// frame.setState(Frame.MAXIMIZED_BOTH);
	698	+ }
	699	+
	700	+ maximized ^= true;
	701	+ }
	702	+
624	703	void ToggleFullScreen()
625	704	{
626	705	if (CameraPane.FULLSCREEN)
627	706	{
628		- frame.getContentPane().remove(/"Center",/bigThree);
629		- framePanel.add(bigThree);
630		- frame.getContentPane().add(/"Center",/framePanel);
	707	+ device.setFullScreenWindow(null);
	708	+ //frame.setVisible(false);
	709	+// frame.removeNotify();
	710	+// frame.setUndecorated(false);
	711	+// frame.addNotify();
	712	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	713	+
	714	+// X frame.getContentPane().remove(/"Center",/bigThree);
	715	+// X framePanel.add(bigThree);
	716	+// X frame.getContentPane().add(/"Center",/framePanel);
	717	+ framePanel.setDividerLocation(1);
	718	+
	719	+ //frame.setVisible(true);
	720	+ radio.layout = keepButton;
	721	+ //theFrame = null;
	722	+ keepButton = null;
	723	+ radio.layout.doClick();
	724	+
631	725	} else
632	726	{
633		- frame.getContentPane().remove(/"Center",/framePanel);
634		- framePanel.remove(bigThree);
635		- frame.getContentPane().add(/"Center",/bigThree);
	727	+ keepButton = radio.layout;
	728	+ //keeprect = frame.getBounds();
	729	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	730	+// frame.getToolkit().getScreenSize().height);
	731	+ //frame.setVisible(false);
	732	+ device.setFullScreenWindow(frame);
	733	+// frame.removeNotify();
	734	+// frame.setUndecorated(true);
	735	+// frame.addNotify();
	736	+// X frame.getContentPane().remove(/"Center",/framePanel);
	737	+// X framePanel.remove(bigThree);
	738	+// X frame.getContentPane().add(/"Center",/bigThree);
	739	+ framePanel.setDividerLocation(0);
	740	+
	741	+ radio.layout = fullscreenLayout;
	742	+ radio.layout.doClick();
	743	+ //frame.setVisible(true);
636	744	}
	745	+
637	746	cameraView.ToggleFullScreen();
638	747	}
639	748
..	..	@@ -735,7 +844,7 @@
735	844	protected static ImageIcon createImageIcon(String path,
736	845	String description)
737	846	{
738		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	847	+ java.net.URL imgURL = Grafreed.class.getResource(path);
739	848	if (imgURL != null)
740	849	{
741	850	return new ImageIcon(imgURL, description);
..	..	@@ -767,6 +876,7 @@
767	876	// NumberSlider vDivsField;
768	877	// JCheckBox endcaps;
769	878	JCheckBox liveCB;
	879	+ JCheckBox selectCB;
770	880	JCheckBox hideCB;
771	881	JCheckBox link2masterCB;
772	882	JCheckBox markCB;
..	..	@@ -783,9 +893,13 @@
783	893	JButton fasterButton;
784	894	JButton remarkButton;
785	895
	896	+ cGridBag editPanel;
	897	+ cGridBag editCommandsPanel;
	898	+
786	899	cGridBag namePanel;
787	900	cGridBag setupPanel;
788		- cGridBag commandsPanel;
	901	+ cGridBag setupPanel2;
	902	+ cGridBag objectCommandsPanel;
789	903	cGridBag pushPanel;
790	904	cGridBag fillPanel;
791	905
..	..	@@ -969,49 +1083,55 @@
969	1083
970	1084	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
971	1085	liveCB.setToolTipText("Animate object");
	1086	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1087	+ selectCB.setToolTipText("Make object selectable");
	1088	+// Return();
972	1089	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
973	1090	hideCB.setToolTipText("Hide object");
974		-// Return();
975	1091	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
976	1092	markCB.setToolTipText("Set the animation target transform");
977	1093
978		- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	1094	+ setupPanel2 = new cGridBag().setVertical(false);
	1095	+
	1096	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
979	1097	rewindCB.setToolTipText("Rewind animation");
980	1098
981		- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
982		- randomCB.setToolTipText("Option for switch node");
	1099	+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1100	+ randomCB.setToolTipText("Randomly Rewind or Go back and forth");
983	1101
984	1102	if (Globals.ADVANCED)
985	1103	{
986		- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
	1104	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
987	1105	link2masterCB.setToolTipText("Attach to support");
988		- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1106	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
989	1107	speedupCB.setToolTipText("Option motion capture");
990	1108	}
991	1109
992	1110	oe.ctrlPanel.add(setupPanel);
993	1111	oe.ctrlPanel.Return();
	1112	+ oe.ctrlPanel.add(setupPanel2);
	1113	+ oe.ctrlPanel.Return();
994	1114
995		- commandsPanel = new cGridBag().setVertical(false);
	1115	+ objectCommandsPanel = new cGridBag().setVertical(false);
996	1116
997		- resetButton = AddButton(commandsPanel, "Reset");
	1117	+ resetButton = AddButton(objectCommandsPanel, "Reset");
998	1118	resetButton.setToolTipText("Jump to frame zero");
999		- stepButton = AddButton(commandsPanel, "Step");
	1119	+ stepButton = AddButton(objectCommandsPanel, "Step");
1000	1120	stepButton.setToolTipText("Step one frame");
1001	1121	// resetAllButton = AddButton(oe, "Reset All");
1002	1122	// stepAllButton = AddButton(oe, "Step All");
1003	1123	// Return();
1004		- slowerButton = AddButton(commandsPanel, "Slow");
	1124	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1005	1125	slowerButton.setToolTipText("Decrease animation speed");
1006		- fasterButton = AddButton(commandsPanel, "Fast");
	1126	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1007	1127	fasterButton.setToolTipText("Increase animation speed");
1008		- remarkButton = AddButton(commandsPanel, "Remark");
	1128	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1009	1129	remarkButton.setToolTipText("Set the current transform as the target");
1010	1130
1011		- oe.ctrlPanel.add(commandsPanel);
	1131	+ oe.ctrlPanel.add(objectCommandsPanel);
1012	1132	oe.ctrlPanel.Return();
1013	1133
1014		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1134	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
1015	1135	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
1016	1136	//Return();
1017	1137
..	..	@@ -1214,8 +1334,11 @@
1214	1334	//worldPanel.setName("World");
1215	1335	centralPanel = new cGridBag();
1216	1336	centralPanel.preferredWidth = 20;
1217		- timelinePanel = new JPanel(new BorderLayout());
1218		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1337	+
	1338	+ if (Globals.ADVANCED)
	1339	+ {
	1340	+ timelinePanel = new JPanel(new BorderLayout());
	1341	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1219	1342
1220	1343	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1221	1344	cameraPanel.setContinuousLayout(true);
..	..	@@ -1224,7 +1347,10 @@
1224	1347	// cameraPanel.setDividerSize(9);
1225	1348	cameraPanel.setResizeWeight(1.0);
1226	1349
	1350	+ }
	1351	+
1227	1352	centralPanel.add(cameraView);
	1353	+ centralPanel.setFocusable(true);
1228	1354	//frame.setJMenuBar(timelineMenubar);
1229	1355	//centralPanel.add(timelinePanel);
1230	1356
..	..	@@ -1286,12 +1412,13 @@
1286	1412
1287	1413	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1288	1414	//tmp.setName("Edit");
	1415	+ objectPanel.add(toolboxPanel);
1289	1416	objectPanel.add(materialPanel);
1290	1417	// JPanel north = new JPanel(new BorderLayout());
1291	1418	// north.setName("Edit");
1292	1419	// north.add(ctrlPanel, BorderLayout.NORTH);
1293	1420	// objectPanel.add(north);
1294		- objectPanel.add(ctrlPanel);
	1421	+ objectPanel.add(editPanel);
1295	1422	objectPanel.add(infoPanel);
1296	1423
1297	1424	/*
..	..	@@ -1313,7 +1440,7 @@
1313	1440	scrollpane.addMouseWheelListener(this); // Default not fast enough
1314	1441
1315	1442	/JTabbedPane/ scenePanel = new cGridBag();
1316		- scenePanel.preferredWidth = 7;
	1443	+ scenePanel.preferredWidth = 6;
1317	1444
1318	1445	JTabbedPane tabbedPane = new JTabbedPane();
1319	1446	tabbedPane.add(scrollpane);
..	..	@@ -1419,9 +1546,11 @@
1419	1546
1420	1547	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1421	1548
1422		- frame.setSize(1024, 768);
1423		- frame.show();
	1549	+ frame.setSize(1280, 860);
	1550	+ frame.setVisible(true);
1424	1551
	1552	+ cameraView.requestFocusInWindow();
	1553	+
1425	1554	gridPanel.setDividerLocation(1.0);
1426	1555
1427	1556	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1459,19 +1588,22 @@
1459	1588
1460	1589	cGridBag editBar = new cGridBag().setVertical(false);
1461	1590
1462		- editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1591	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
1463	1592	createMaterialButton.setToolTipText("Create material");
1464	1593
1465	1594	/*
1466	1595	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1467	1596	*/
1468	1597
1469		- editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1598	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
1470	1599	clearMaterialButton.setToolTipText("Clear material");
1471	1600
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);
	1601	+ if (Globals.ADVANCED)
	1602	+ {
	1603	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1604	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1605	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1606	+ }
1475	1607
1476	1608	editBar.preferredHeight = 15;
1477	1609
..	..	@@ -1740,12 +1872,15 @@
1740	1872	opacityPowerField.addChangeListener(this);
1741	1873	/**/
1742	1874
1743		- resetSlidersButton.addActionListener(this);
1744	1875	clearMaterialButton.addActionListener(this);
1745	1876	createMaterialButton.addActionListener(this);
1746		-
1747		- propagateToggle.addItemListener(this);
1748		- multiplyToggle.addItemListener(this);
	1877	+
	1878	+ if (Globals.ADVANCED)
	1879	+ {
	1880	+ resetSlidersButton.addActionListener(this);
	1881	+ propagateToggle.addItemListener(this);
	1882	+ multiplyToggle.addItemListener(this);
	1883	+ }
1749	1884	}
1750	1885
1751	1886	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1916,7 +2051,7 @@
1916	2051
1917	2052	//? flashIt = false;
1918	2053	CameraPane pane = (CameraPane) cameraView;
1919		- pane.clickStart(location.x, location.y, 0);
	2054	+ pane.clickStart(location.x, location.y, 0, 0);
1920	2055	pane.clickEnd(location.x, location.y, 0, true);
1921	2056
1922	2057	if (group.selection.size() == 1)
..	..	@@ -1965,6 +2100,7 @@
1965	2100	e2.printStackTrace();
1966	2101	}
1967	2102	}
	2103	+
1968	2104	LoadJMEThread loadThread;
1969	2105
1970	2106	class LoadJMEThread extends Thread
..	..	@@ -2022,6 +2158,7 @@
2022	2158	//LoadFile0(filename, converter);
2023	2159	}
2024	2160	}
	2161	+
2025	2162	LoadOBJThread loadObjThread;
2026	2163
2027	2164	class LoadOBJThread extends Thread
..	..	@@ -2100,19 +2237,19 @@
2100	2237
2101	2238	void LoadObjFile(String fullname)
2102	2239	{
2103		- /*
	2240	+ System.out.println("Loading " + fullname);
	2241	+ /**/
2104	2242	//lastFilename = fullname;
2105	2243	if(loadObjThread == null)
2106	2244	{
2107		- loadObjThread = new LoadOBJThread();
2108		- loadObjThread.start();
	2245	+ loadObjThread = new LoadOBJThread();
	2246	+ loadObjThread.start();
2109	2247	}
2110	2248
2111	2249	loadObjThread.add(fullname);
2112		- */
	2250	+ /**/
2113	2251
2114		- System.out.println("Loading " + fullname);
2115		- makeSomething(new FileObject(fullname, true), true);
	2252	+ //makeSomething(new FileObject(fullname, true), true);
2116	2253	}
2117	2254
2118	2255	void LoadGFDFile(String fullname)
..	..	@@ -2373,11 +2510,11 @@
2373	2510
2374	2511	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2375	2512	{
2376		- if (GrafreeD.standAlone)
	2513	+ if (Grafreed.standAlone)
2377	2514	{
2378	2515	/**/
2379	2516	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2380		- browser.show();
	2517	+ browser.setVisible(true);
2381	2518	String filename = browser.getFile();
2382	2519	if (filename != null && filename.length() > 0)
2383	2520	{
..	..	@@ -2737,7 +2874,8 @@
2737	2874	return;
2738	2875	}
2739	2876
2740		- multiplyToggle.setSelected(mat.multiply);
	2877	+ if (multiplyToggle != null)
	2878	+ multiplyToggle.setSelected(mat.multiply);
2741	2879
2742	2880	assert (object.projectedVertices != null);
2743	2881
..	..	@@ -2952,9 +3090,9 @@
2952	3090	frame.validate();
2953	3091
2954	3092	return;
2955		- } else if (event.getSource() == toggleRandomItem)
	3093	+ } else if (event.getSource() == toggleSwitchItem)
2956	3094	{
2957		- cameraView.ToggleRandom();
	3095	+ cameraView.ToggleSwitch();
2958	3096	cameraView.repaint();
2959	3097	return;
2960	3098	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2982,6 +3120,10 @@
2982	3120	} else if (event.getSource() == liveCB)
2983	3121	{
2984	3122	copy.live ^= true;
	3123	+ return;
	3124	+ } else if (event.getSource() == selectCB)
	3125	+ {
	3126	+ copy.dontselect ^= true;
2985	3127	return;
2986	3128	} else if (event.getSource() == hideCB)
2987	3129	{
..	..	@@ -3021,8 +3163,9 @@
3021	3163
3022	3164	public void actionPerformed(ActionEvent event)
3023	3165	{
	3166	+ Object source = event.getSource();
3024	3167	// SCRIPT DIALOG
3025		- if (event.getSource() == okbutton)
	3168	+ if (source == okbutton)
3026	3169	{
3027	3170	textpanel.setVisible(false);
3028	3171	textpanel.remove(textarea);
..	..	@@ -3034,7 +3177,7 @@
3034	3177	textarea = null;
3035	3178	textpanel = null;
3036	3179	}
3037		- if (event.getSource() == cancelbutton)
	3180	+ if (source == cancelbutton)
3038	3181	{
3039	3182	textpanel.setVisible(false);
3040	3183	textpanel.remove(textarea);
..	..	@@ -3046,50 +3189,50 @@
3046	3189	//applySelf();
3047	3190	//client.refreshEditWindow();
3048	3191	//refreshContents();
3049		- if (event.getSource() == nameField)
	3192	+ if (source == nameField)
3050	3193	{
3051	3194	//System.out.println("ObjEditor " + event);
3052	3195	applySelf0(true);
3053	3196	//parent.applySelf();
3054	3197	objEditor.refreshContents();
3055		- } else if (event.getSource() == resetButton)
	3198	+ } else if (source == resetButton)
3056	3199	{
3057	3200	CameraPane.fullreset = true;
3058	3201	copy.Reset(); // ResetMeshes();
3059	3202	copy.Touch();
3060	3203	objEditor.refreshContents();
3061		- } else if (event.getSource() == stepItem)
	3204	+ } else if (source == stepItem)
3062	3205	{
3063	3206	//cameraView.ONESTEP = true;
3064	3207	Globals.ONESTEP = true;
3065	3208	cameraView.repaint();
3066	3209	return;
3067		- } else if (event.getSource() == stepButton)
	3210	+ } else if (source == stepButton)
3068	3211	{
3069	3212	copy.Step();
3070	3213	copy.Touch();
3071	3214	objEditor.refreshContents();
3072		- } else if (event.getSource() == slowerButton)
	3215	+ } else if (source == slowerButton)
3073	3216	{
3074	3217	copy.Slower();
3075	3218	copy.Touch();
3076	3219	objEditor.refreshContents();
3077		- } else if (event.getSource() == fasterButton)
	3220	+ } else if (source == fasterButton)
3078	3221	{
3079	3222	copy.Faster();
3080	3223	copy.Touch();
3081	3224	objEditor.refreshContents();
3082		- } else if (event.getSource() == remarkButton)
	3225	+ } else if (source == remarkButton)
3083	3226	{
3084	3227	copy.Remark();
3085	3228	copy.Touch();
3086	3229	objEditor.refreshContents();
3087		- } else if (event.getSource() == stepAllButton)
	3230	+ } else if (source == stepAllButton)
3088	3231	{
3089	3232	copy.StepAll();
3090	3233	copy.Touch();
3091	3234	objEditor.refreshContents();
3092		- } else if (event.getSource() == resetAllButton)
	3235	+ } else if (source == resetAllButton)
3093	3236	{
3094	3237	//CameraPane.fullreset = true;
3095	3238	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3122,53 +3265,75 @@
3122	3265	// Close();
3123	3266	// }
3124	3267	// else
3125		- if (event.getSource() == resetSlidersButton)
	3268	+ if (source == resetSlidersButton)
3126	3269	{
3127	3270	ResetSliders();
3128		- } else if (event.getSource() == clearMaterialButton)
	3271	+ } else if (source == clearMaterialButton)
3129	3272	{
3130	3273	ClearMaterial();
3131		- } else if (event.getSource() == createMaterialButton)
	3274	+ } else if (source == createMaterialButton)
3132	3275	{
3133	3276	CreateMaterial();
3134		- } else if (event.getSource() == clearPanelButton)
	3277	+ } else if (source == clearPanelButton)
3135	3278	{
3136	3279	copy.ClearUI();
3137	3280	refreshContents(true);
3138		- } /*
3139		- }
3140		-
3141		- public boolean action(Event event, Object arg)
3142		- {
3143		- */ else if (event.getSource() == closeItem)
	3281	+ } else if (source == importGFDItem)
	3282	+ {
	3283	+ ImportGFD();
	3284	+ } else
	3285	+ if (source == importVRMLX3DItem)
	3286	+ {
	3287	+ ImportVRMLX3D();
	3288	+ } else
	3289	+ if (source == import3DSItem)
	3290	+ {
	3291	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3292	+ } else
	3293	+ if (source == importOBJItem)
	3294	+ {
	3295	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3296	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3297	+ browser.setVisible(true);
	3298	+ String filename = browser.getFile();
	3299	+ if (filename != null && filename.length() > 0)
	3300	+ {
	3301	+ String fullname = browser.getDirectory() + filename;
	3302	+ makeSomething(ReadOBJ(fullname), true);
	3303	+ }
	3304	+ } else
	3305	+ if (source == closeItem)
3144	3306	{
3145	3307	Close();
3146	3308	//return true;
3147		- } else if (event.getSource() == loadItem)
	3309	+ } else if (source == loadItem)
3148	3310	{
3149	3311	load();
3150	3312	//return true;
3151		- } else if (event.getSource() == saveItem)
	3313	+ } else if (source == newItem)
	3314	+ {
	3315	+ New();
	3316	+ } else if (source == saveItem)
3152	3317	{
3153	3318	save();
3154	3319	//return true;
3155		- } else if (event.getSource() == saveAsItem)
	3320	+ } else if (source == saveAsItem)
3156	3321	{
3157	3322	saveAs();
3158	3323	//return true;
3159		- } else if (event.getSource() == reexportItem)
	3324	+ } else if (source == reexportItem)
3160	3325	{
3161	3326	reexport();
3162	3327	//return true;
3163		- } else if (event.getSource() == exportAsItem)
	3328	+ } else if (source == exportAsItem)
3164	3329	{
3165	3330	export();
3166	3331	//return true;
3167		- } else if (event.getSource() == povItem)
	3332	+ } else if (source == povItem)
3168	3333	{
3169	3334	generatePOV();
3170	3335	//return true;
3171		- } else if (event.getSource() == zBufferItem)
	3336	+ } else if (source == zBufferItem)
3172	3337	{
3173	3338	try
3174	3339	{
..	..	@@ -3190,21 +3355,8 @@
3190	3355	cameraView.repaint();
3191	3356	//return true;
3192	3357	}
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)
	3358	+ */ else // combos...
	3359	+ if (source == texresMenu)
3208	3360	{
3209	3361	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3210	3362	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3216,6 +3368,266 @@
3216	3368	}
3217	3369	}
3218	3370
	3371	+ void New()
	3372	+ {
	3373	+ while (copy.Size() > 1)
	3374	+ {
	3375	+ copy.remove(1);
	3376	+ }
	3377	+
	3378	+ ResetModel();
	3379	+ objEditor.refreshContents();
	3380	+ }
	3381	+
	3382	+ static public byte[] Compress(Object3D o)
	3383	+ {
	3384	+ try
	3385	+ {
	3386	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3387	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3388	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3389	+
	3390	+ Object3D parent = o.parent;
	3391	+ o.parent = null;
	3392	+
	3393	+ out.writeObject(o);
	3394	+
	3395	+ o.parent = parent;
	3396	+
	3397	+ out.flush();
	3398	+
	3399	+ zstream.close();
	3400	+ out.close();
	3401	+
	3402	+ return baos.toByteArray();
	3403	+ } catch (Exception e)
	3404	+ {
	3405	+ System.err.println(e);
	3406	+ return null;
	3407	+ }
	3408	+ }
	3409	+
	3410	+ static public Object Uncompress(byte[] bytes)
	3411	+ {
	3412	+ System.out.println("#bytes = " + bytes.length);
	3413	+ try
	3414	+ {
	3415	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3416	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3417	+ ObjectInputStream in = new ObjectInputStream(istream);
	3418	+ Object obj = in.readObject();
	3419	+ in.close();
	3420	+
	3421	+ return obj;
	3422	+ } catch (Exception e)
	3423	+ {
	3424	+ System.err.println(e);
	3425	+ return null;
	3426	+ }
	3427	+ }
	3428	+
	3429	+ static public Object clone(Object o)
	3430	+ {
	3431	+ try
	3432	+ {
	3433	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3434	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3435	+
	3436	+ out.writeObject(o);
	3437	+
	3438	+ out.flush();
	3439	+ out.close();
	3440	+
	3441	+ byte[] bytes = baos.toByteArray();
	3442	+
	3443	+ System.out.println("clone = " + bytes.length);
	3444	+
	3445	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3446	+ ObjectInputStream in = new ObjectInputStream(bais);
	3447	+ Object obj = in.readObject();
	3448	+ in.close();
	3449	+
	3450	+ return obj;
	3451	+ } catch (Exception e)
	3452	+ {
	3453	+ System.err.println(e);
	3454	+ return null;
	3455	+ }
	3456	+ }
	3457	+
	3458	+ cRadio GetCurrentTab()
	3459	+ {
	3460	+ cRadio ab;
	3461	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3462	+ {
	3463	+ ab = (cRadio)e.nextElement();
	3464	+ if(ab.GetObject() == copy)
	3465	+ {
	3466	+ return ab;
	3467	+ }
	3468	+ }
	3469	+
	3470	+ return null;
	3471	+ }
	3472	+
	3473	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3474	+
	3475	+ public void Save()
	3476	+ {
	3477	+ System.err.println("Save");
	3478	+
	3479	+ cRadio tab = GetCurrentTab();
	3480	+
	3481	+ boolean temp = CameraPane.SWITCH;
	3482	+ CameraPane.SWITCH = false;
	3483	+
	3484	+ copy.ExtractBigData(hashtable);
	3485	+
	3486	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3487	+ tab.graphs[tab.undoindex++] = Compress(copy);
	3488	+
	3489	+ copy.RestoreBigData(hashtable);
	3490	+
	3491	+ CameraPane.SWITCH = temp;
	3492	+
	3493	+ //assert(hashtable.isEmpty());
	3494	+
	3495	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3496	+ {
	3497	+ tab.graphs[i] = null;
	3498	+ }
	3499	+
	3500	+ // test save
	3501	+ if (false)
	3502	+ {
	3503	+ try
	3504	+ {
	3505	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3506	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3507	+
	3508	+ p.writeObject(copy);
	3509	+
	3510	+ p.flush();
	3511	+
	3512	+ ostream.close();
	3513	+ } catch (Exception e)
	3514	+ {
	3515	+ e.printStackTrace();
	3516	+ }
	3517	+ }
	3518	+ }
	3519	+
	3520	+ void CopyChanged(Object3D obj)
	3521	+ {
	3522	+ boolean temp = CameraPane.SWITCH;
	3523	+ CameraPane.SWITCH = false;
	3524	+
	3525	+ copy.ExtractBigData(hashtable);
	3526	+
	3527	+ copy.clear();
	3528	+
	3529	+ for (int i=0; i<obj.Size(); i++)
	3530	+ {
	3531	+ copy.add(obj.get(i));
	3532	+ }
	3533	+
	3534	+ copy.RestoreBigData(hashtable);
	3535	+
	3536	+ CameraPane.SWITCH = temp;
	3537	+
	3538	+ //assert(hashtable.isEmpty());
	3539	+
	3540	+ copy.Touch();
	3541	+
	3542	+ ResetModel();
	3543	+ copy.HardTouch(); // recompile?
	3544	+
	3545	+ cRadio ab;
	3546	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3547	+ {
	3548	+ ab = (cRadio)e.nextElement();
	3549	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3550	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3551	+ if (test != null)
	3552	+ {
	3553	+ test.editWindow = ab.object.editWindow;
	3554	+ ab.object = test;
	3555	+ }
	3556	+ }
	3557	+
	3558	+ refreshContents();
	3559	+ }
	3560	+
	3561	+ public void Undo()
	3562	+ {
	3563	+ System.err.println("Undo");
	3564	+
	3565	+ cRadio tab = GetCurrentTab();
	3566	+
	3567	+ if (tab.undoindex == 0)
	3568	+ {
	3569	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3570	+ return;
	3571	+ }
	3572	+
	3573	+ if (tab.graphs[tab.undoindex] == null)
	3574	+ {
	3575	+ Save();
	3576	+ tab.undoindex -= 1;
	3577	+ }
	3578	+
	3579	+ tab.undoindex -= 1;
	3580	+
	3581	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3582	+ }
	3583	+
	3584	+ public void Redo()
	3585	+ {
	3586	+ cRadio tab = GetCurrentTab();
	3587	+
	3588	+ if (tab.graphs[tab.undoindex + 1] == null)
	3589	+ {
	3590	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3591	+ return;
	3592	+ }
	3593	+
	3594	+ tab.undoindex += 1;
	3595	+
	3596	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3597	+ }
	3598	+
	3599	+ void ImportGFD()
	3600	+ {
	3601	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3602	+ browser.show();
	3603	+ String filename = browser.getFile();
	3604	+ if (filename != null && filename.length() > 0)
	3605	+ {
	3606	+ String fullname = browser.getDirectory() + filename;
	3607	+
	3608	+ //Object3D readobj =
	3609	+ objEditor.ReadGFD(fullname, objEditor);
	3610	+ //makeSomething(readobj);
	3611	+ }
	3612	+ }
	3613	+
	3614	+ void ImportVRMLX3D()
	3615	+ {
	3616	+ if (Grafreed.standAlone)
	3617	+ {
	3618	+ /**/
	3619	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3620	+ browser.show();
	3621	+ String filename = browser.getFile();
	3622	+ if (filename != null && filename.length() > 0)
	3623	+ {
	3624	+ String fullname = browser.getDirectory() + filename;
	3625	+ LoadVRMLX3D(fullname);
	3626	+ }
	3627	+ /**/
	3628	+ }
	3629	+ }
	3630	+
3219	3631	void ToggleAnimation()
3220	3632	{
3221	3633	if (!Globals.ANIMATION)
..	..	@@ -3231,8 +3643,8 @@
3231	3643
3232	3644	Globals.ANIMATION ^= true;
3233	3645
3234		- GrafreeD.wav.cursor = 0;
3235		- GrafreeD.wav.loop = 0;
	3646	+ Grafreed.wav.cursor = 0;
	3647	+ Grafreed.wav.loop = 0;
3236	3648	}
3237	3649	} else
3238	3650	{
..	..	@@ -3253,7 +3665,6 @@
3253	3665	callee.refreshContents();
3254	3666	} else
3255	3667	{
3256		- new Exception().printStackTrace();
3257	3668	System.exit(0);
3258	3669	}
3259	3670	}
..	..	@@ -3283,7 +3694,7 @@
3283	3694	void CreateMaterial()
3284	3695	{
3285	3696	//copy.ClearMaterial(); // PATCH
3286		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3697	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3287	3698	if (copy.selection.size() > 0)
3288	3699	//SetMaterial(copy);
3289	3700	{
..	..	@@ -3334,7 +3745,7 @@
3334	3745	assert false;
3335	3746	}
3336	3747
3337		- void EditSelection()
	3748	+ void EditSelection(boolean newWindow)
3338	3749	{
3339	3750	}
3340	3751
..	..	@@ -3342,11 +3753,11 @@
3342	3753	{
3343	3754	copy.ResetBlockLoop(); // temporary problem
3344	3755
3345		- boolean random = CameraPane.RANDOM;
3346		- CameraPane.RANDOM = false; // parse everything
	3756	+ boolean random = CameraPane.SWITCH;
	3757	+ CameraPane.SWITCH = false; // parse everything
3347	3758	copy.ResetDisplayList();
3348	3759	copy.HardTouch();
3349		- CameraPane.RANDOM = random;
	3760	+ CameraPane.SWITCH = random;
3350	3761	}
3351	3762
3352	3763	// public void applySelf()
..	..	@@ -3420,6 +3831,36 @@
3420	3831	{
3421	3832	//System.out.println("Propagate = " + propagate);
3422	3833	copy.UpdateMaterial(anchor, current, propagate);
	3834	+
	3835	+ if (copy.material != null)
	3836	+ {
	3837	+ cMaterial mat = copy.material;
	3838	+
	3839	+ colorField.SetToolTipValue((mat.color));
	3840	+ modulationField.SetToolTipValue((mat.modulation));
	3841	+ metalnessField.SetToolTipValue((mat.metalness));
	3842	+ diffuseField.SetToolTipValue((mat.diffuse));
	3843	+ specularField.SetToolTipValue((mat.specular));
	3844	+ shininessField.SetToolTipValue((mat.shininess));
	3845	+ shiftField.SetToolTipValue((mat.shift));
	3846	+ ambientField.SetToolTipValue((mat.ambient));
	3847	+ lightareaField.SetToolTipValue((mat.lightarea));
	3848	+ diffusenessField.SetToolTipValue((mat.factor));
	3849	+ velvetField.SetToolTipValue((mat.velvet));
	3850	+ sheenField.SetToolTipValue((mat.sheen));
	3851	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3852	+ backlitField.SetToolTipValue((mat.bump));
	3853	+ anisoField.SetToolTipValue((mat.aniso));
	3854	+ anisoVField.SetToolTipValue((mat.anisoV));
	3855	+ cameraField.SetToolTipValue((mat.cameralight));
	3856	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3857	+ shadowField.SetToolTipValue((mat.shadow));
	3858	+ textureField.SetToolTipValue((mat.texture));
	3859	+ opacityField.SetToolTipValue((mat.opacity));
	3860	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3861	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3862	+ }
	3863	+
3423	3864	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3424	3865	{
3425	3866	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3535,7 +3976,7 @@
3535	3976	}
3536	3977
3537	3978	if (normalpushField != null)
3538		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	3979	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3539	3980	}
3540	3981
3541	3982	void SnapObject()
..	..	@@ -3799,6 +4240,8 @@
3799	4240
3800	4241	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3801	4242	{
	4243	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4244	+ Save();
3802	4245	//Tween.set(thing, 0).target(1).start(tweenManager);
3803	4246	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3804	4247	// if (thing instanceof GenericJointDemo)
..	..	@@ -3885,6 +4328,12 @@
3885	4328	{
3886	4329	ResetModel();
3887	4330	Select(thing.GetTreePath(), true, false); // unselect... false);
	4331	+
	4332	+ if (thing.Size() == 0)
	4333	+ {
	4334	+ //EditSelection(false);
	4335	+ }
	4336	+
3888	4337	refreshContents();
3889	4338	}
3890	4339
..	..	@@ -4002,6 +4451,7 @@
4002	4451	}
4003	4452	}
4004	4453	}
	4454	+
4005	4455	LoadGFDThread loadGFDThread;
4006	4456
4007	4457	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4021,8 +4471,10 @@
4021	4471
4022	4472	try
4023	4473	{
	4474	+ // Try compressed version first.
4024	4475	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4025		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4476	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4477	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4026	4478
4027	4479	readobj = (Object3D) p.readObject();
4028	4480	istream.close();
..	..	@@ -4030,7 +4482,20 @@
4030	4482	readobj.ResetDisplayList();
4031	4483	} catch (Exception e)
4032	4484	{
4033		- e.printStackTrace();
	4485	+ //e.printStackTrace();
	4486	+ try
	4487	+ {
	4488	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4489	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4490	+
	4491	+ readobj = (Object3D) p.readObject();
	4492	+ istream.close();
	4493	+
	4494	+ readobj.ResetDisplayList();
	4495	+ } catch (Exception e2)
	4496	+ {
	4497	+ e2.printStackTrace();
	4498	+ }
4034	4499	}
4035	4500	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4036	4501	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4076,6 +4541,12 @@
4076	4541
4077	4542	void LoadIt(Object obj)
4078	4543	{
	4544	+ if (obj == null)
	4545	+ {
	4546	+ // Invalid file
	4547	+ return;
	4548	+ }
	4549	+
4079	4550	System.out.println("Loaded " + obj);
4080	4551	//new Exception().printStackTrace();
4081	4552	Object3D readobj = (Object3D) obj;
..	..	@@ -4085,6 +4556,8 @@
4085	4556
4086	4557	if (readobj != null)
4087	4558	{
	4559	+ if (Globals.SAVEONMAKE)
	4560	+ Save();
4088	4561	try
4089	4562	{
4090	4563	//readobj.deepCopySelf(copy);
..	..	@@ -4147,7 +4620,7 @@
4147	4620
4148	4621	void load() // throws ClassNotFoundException
4149	4622	{
4150		- if (GrafreeD.standAlone)
	4623	+ if (Grafreed.standAlone)
4151	4624	{
4152	4625	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4153	4626	browser.show();
..	..	@@ -4234,11 +4707,13 @@
4234	4707	try
4235	4708	{
4236	4709	FileOutputStream ostream = new FileOutputStream(lastname);
4237		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4710	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4711	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4238	4712
4239	4713	p.writeObject(copy);
4240	4714	p.flush();
4241	4715
	4716	+ zstream.close();
4242	4717	ostream.close();
4243	4718
4244	4719	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4248,11 +4723,12 @@
4248	4723	{
4249	4724	}
4250	4725	}
	4726	+
4251	4727	String lastname;
4252	4728
4253	4729	void saveAs()
4254	4730	{
4255		- if (GrafreeD.standAlone)
	4731	+ if (Grafreed.standAlone)
4256	4732	{
4257	4733	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4258	4734	browser.setVisible(true);
..	..	@@ -4357,13 +4833,13 @@
4357	4833	try
4358	4834	{
4359	4835	FileOutputStream ostream = new FileOutputStream(filename);
4360		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4361		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4836	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4837	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4362	4838
4363	4839	Object3D objectparent = obj.parent;
4364	4840	obj.parent = null;
4365	4841
4366		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4842	+ Object3D object = (Object3D) Grafreed.clone(obj);
4367	4843
4368	4844	obj.parent = objectparent;
4369	4845
..	..	@@ -4375,8 +4851,8 @@
4375	4851	p.writeObject(object);
4376	4852	p.flush();
4377	4853
	4854	+ zstream.close();
4378	4855	ostream.close();
4379		- // zstream.close();
4380	4856
4381	4857	// group.selection.get(0).parent = parent;
4382	4858	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4397,7 +4873,7 @@
4397	4873	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4398	4874	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4399	4875	copy.generatePOV(buffer);
4400		- if (GrafreeD.standAlone)
	4876	+ if (Grafreed.standAlone)
4401	4877	{
4402	4878	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4403	4879	browser.show();
..	..	@@ -4423,7 +4899,8 @@
4423	4899	Object3D client;
4424	4900	Object3D copy;
4425	4901	MenuBar menuBar;
4426		- Menu windowMenu;
	4902	+ Menu fileMenu;
	4903	+ MenuItem newItem;
4427	4904	MenuItem loadItem;
4428	4905	MenuItem saveItem;
4429	4906	MenuItem saveAsItem;
..	..	@@ -4431,11 +4908,9 @@
4431	4908	MenuItem reexportItem;
4432	4909	MenuItem povItem;
4433	4910	MenuItem closeItem;
4434		- Menu cameraMenu;
	4911	+
4435	4912	CheckboxMenuItem zBufferItem;
4436	4913	//MenuItem normalLensItem;
4437		- MenuItem editCameraItem;
4438		- MenuItem revertCameraItem;
4439	4914	MenuItem stepItem;
4440	4915	CheckboxMenuItem toggleLiveItem;
4441	4916	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4446,25 +4921,36 @@
4446	4921	CheckboxMenuItem toggleFootContactItem;
4447	4922	CheckboxMenuItem toggleDLItem;
4448	4923	CheckboxMenuItem toggleTextureItem;
4449		- CheckboxMenuItem toggleRandomItem;
	4924	+ CheckboxMenuItem toggleSwitchItem;
4450	4925	CheckboxMenuItem toggleRootItem;
4451	4926	CheckboxMenuItem animationItem;
4452	4927	CheckboxMenuItem toggleHandleItem;
4453	4928	CheckboxMenuItem togglePaintItem;
4454	4929	JSplitPane mainPanel;
4455	4930	JScrollPane scrollpane;
	4931	+
4456	4932	JPanel toolbarPanel;
	4933	+
4457	4934	cGridBag treePanel;
	4935	+
4458	4936	JPanel radioPanel;
4459	4937	ButtonGroup buttonGroup;
4460		- cGridBag ctrlPanel;
	4938	+
	4939	+ cGridBag toolboxPanel;
4461	4940	cGridBag materialPanel;
	4941	+ cGridBag ctrlPanel;
	4942	+
4462	4943	JScrollPane infoPanel;
	4944	+
4463	4945	cGridBag optionsPanel;
	4946	+
4464	4947	JTabbedPane objectPanel;
	4948	+
4465	4949	cGridBag XYZPanel;
	4950	+
4466	4951	JSplitPane gridPanel;
4467	4952	JSplitPane bigPanel;
	4953	+
4468	4954	cGridBag bigThree;
4469	4955	cGridBag scenePanel;
4470	4956	cGridBag centralPanel;
..	..	@@ -4579,8 +5065,13 @@
4579	5065	cNumberSlider fogField;
4580	5066	JLabel opacityPowerLabel;
4581	5067	cNumberSlider opacityPowerField;
4582		- JTree jTree;
	5068	+ cTree jTree;
4583	5069	//ObjectUI parent;
4584	5070
4585	5071	cNumberSlider normalpushField;
	5072	+
	5073	+ private MenuItem importGFDItem;
	5074	+ private MenuItem importVRMLX3DItem;
	5075	+ private MenuItem import3DSItem;
	5076	+ private MenuItem importOBJItem;
4586	5077	}