~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
..	..	@@ -143,6 +205,8 @@
143	205	//nameField.removeActionListener(this);
144	206	// objEditor.ctrlPanel.remove(nameField);
145	207
	208	+ objEditor.ctrlPanel.remove(namePanel);
	209	+
146	210	if (!GroupEditor.allparams)
147	211	return;
148	212
..	..	@@ -165,9 +229,9 @@
165	229	// objEditor.ctrlPanel.remove(fasterButton);
166	230	// objEditor.ctrlPanel.remove(remarkButton);
167	231
168		- objEditor.ctrlPanel.remove(namePanel);
169	232	objEditor.ctrlPanel.remove(setupPanel);
170		- objEditor.ctrlPanel.remove(commandsPanel);
	233	+ objEditor.ctrlPanel.remove(setupPanel2);
	234	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
171	235	objEditor.ctrlPanel.remove(pushPanel);
172	236	//objEditor.ctrlPanel.remove(fillPanel);
173	237
..	..	@@ -242,6 +306,7 @@
242	306	//localCopy.parent = null;
243	307
244	308	frame = new JFrame();
	309	+ frame.setUndecorated(true);
245	310	objEditor = this;
246	311	this.callee = callee;
247	312
..	..	@@ -275,24 +340,40 @@
275	340	void SetupMenu()
276	341	{
277	342	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..."));
	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..."));
283	363	//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("-");
	364	+ fileMenu.add("-");
	365	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	366	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	367	+ fileMenu.add("-");
288	368	if (client.parent != null)
289	369	{
290		- windowMenu.add(closeItem = new MenuItem("Close"));
	370	+ fileMenu.add(closeItem = new MenuItem("Close"));
291	371	} else
292	372	{
293		- windowMenu.add(closeItem = new MenuItem("Exit"));
	373	+ fileMenu.add(closeItem = new MenuItem("Exit"));
294	374	}
295	375
	376	+ newItem.addActionListener(this);
296	377	loadItem.addActionListener(this);
297	378	saveItem.addActionListener(this);
298	379	saveAsItem.addActionListener(this);
..	..	@@ -301,79 +382,59 @@
301	382	//povItem.addActionListener(this);
302	383	closeItem.addActionListener(this);
303	384
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		-
359	385	objectPanel = new JTabbedPane();
	386	+
	387	+ ChangeListener changeListener = new ChangeListener()
	388	+ {
	389	+ public void stateChanged(ChangeEvent changeEvent)
	390	+ {
	391	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	392	+// {
	393	+// if (latestObject != null)
	394	+// {
	395	+// refreshContents(true);
	396	+// SetMaterial(latestObject);
	397	+// }
	398	+//
	399	+// materialFlushed = true;
	400	+// }
	401	+
	402	+ refreshContents(false); // To refresh Info tab
	403	+ }
	404	+ };
	405	+ objectPanel.addChangeListener(changeListener);
	406	+
360	407	toolbarPanel = new JPanel();
361	408	toolbarPanel.setName("Toolbar");
362		- treePanel = new JPanel();
	409	+ treePanel = new cGridBag();
363	410	treePanel.setName("Tree");
	411	+
	412	+ editPanel = new cGridBag().setVertical(true);
	413	+ editPanel.setName("Edit");
	414	+
364	415	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
365		- ctrlPanel.setName("Edit");
	416	+
	417	+ editCommandsPanel = new cGridBag();
	418	+ editPanel.add(editCommandsPanel);
	419	+ editPanel.add(ctrlPanel);
	420	+
	421	+ toolboxPanel = new cGridBag().setVertical(false);
	422	+ toolboxPanel.setName("Toolbox");
	423	+
366	424	materialPanel = new cGridBag().setVertical(true);
367	425	materialPanel.setName("Material");
	426	+
368	427	/JTextPane/
369	428	infoarea = createTextPane();
	429	+ doc = infoarea.getStyledDocument();
	430	+
370	431	infoarea.setEditable(true);
371	432	SetText();
372	433	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
373	434	// infoarea.setOpaque(false);
374	435	// //infoarea.setForeground(textcolor);
375		- infoarea.setLineWrap(true);
376		- infoarea.setWrapStyleWord(true);
	436	+// TEXTAREA infoarea.setLineWrap(true);
	437	+// TEXTAREA infoarea.setWrapStyleWord(true);
377	438	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
378	439	infoPanel.setPreferredSize(new Dimension(50, 200));
379	440	infoPanel.setName("Info");
..	..	@@ -384,14 +445,14 @@
384	445	mainPanel.setName("Main");
385	446	mainPanel.setContinuousLayout(true);
386	447	mainPanel.setOneTouchExpandable(true);
387		- mainPanel.setDividerLocation(1.0);
388	448	mainPanel.setDividerSize(9);
389		- mainPanel.setResizeWeight(0);
	449	+ mainPanel.setDividerLocation(0.5); //1.0);
	450	+ mainPanel.setResizeWeight(0.5);
390	451
391	452	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
392	453	//mainPanel.setLayout(new GridBagLayout());
393	454	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
394		- treePanel.setLayout(new GridBagLayout());
	455	+// treePanel.setLayout(new GridBagLayout());
395	456	//ctrlPanel.setLayout(new GridBagLayout());
396	457	//materialPanel.setLayout(new GridBagLayout());
397	458
..	..	@@ -432,7 +493,7 @@
432	493	static String newline = "\n";
433	494	protected static final String buttonString = "JButton";
434	495	StyledDocument doc;
435		- JTextArea infoarea;
	496	+ JTextPane infoarea;
436	497
437	498	void ClearInfo()
438	499	{
..	..	@@ -455,10 +516,10 @@
455	516	e.printStackTrace();
456	517	}
457	518
458		- String selection = infoarea.getText();
459		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
460		- java.awt.datatransfer.Clipboard clipboard =
461		- Toolkit.getDefaultToolkit().getSystemClipboard();
	519	+// String selection = infoarea.getText();
	520	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	521	+// java.awt.datatransfer.Clipboard clipboard =
	522	+// Toolkit.getDefaultToolkit().getSystemClipboard();
462	523	//clipboard.setContents(data, data);
463	524	}
464	525
..	..	@@ -481,13 +542,13 @@
481	542	//SendInfo("Name:", "bold");
482	543	if (sel.GetTextures() != null \|\| debug)
483	544	{
484		- si.SendInfo(sel.toString(), "bold");
	545	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
485	546	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
486	547	if (sel.Size() > 0)
487	548	{
488	549	si.SendInfo("#children = " + sel.Size(), "regular");
489	550	}
490		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	551	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
491	552	if (debug)
492	553	{
493	554	try
..	..	@@ -499,7 +560,10 @@
499	560	}
500	561
501	562	if (full)
502		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	563	+ {
	564	+ si.SendInfo(" BBox min: " + minima, "regular");
	565	+ si.SendInfo(" BBox max: " + maxima, "regular");
	566	+ }
503	567
504	568	if (sel.bRep != null)
505	569	{
..	..	@@ -526,7 +590,7 @@
526	590	}
527	591	if (sel.support != null)
528	592	{
529		- si.SendInfo(" support: " + sel.support, "regular");
	593	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
530	594	}
531	595	if (sel.scriptnode != null)
532	596	{
..	..	@@ -597,6 +661,9 @@
597	661	{
598	662	CameraPane.pointflow = (PointFlow) sel;
599	663	}
	664	+
	665	+ si.SendInfo("_____________________", "regular");
	666	+ si.SendInfo("", "regular");
600	667	}
601	668	}
602	669
..	..	@@ -612,68 +679,140 @@
612	679	}
613	680	}
614	681
	682	+static GraphicsDevice device = GraphicsEnvironment
	683	+ .getLocalGraphicsEnvironment().getScreenDevices()[0];
	684	+
	685	+ Rectangle keeprect;
	686	+ cRadio radio;
	687	+
	688	+cButton keepButton;
	689	+ cButton twoButton; // Full 3D
	690	+ cButton sixButton;
	691	+ cButton threeButton;
	692	+ cButton sevenButton;
	693	+ cButton fourButton; // full panel
	694	+ cButton oneButton; // full XYZ
	695	+ //cButton currentLayout;
	696	+
	697	+ boolean maximized;
	698	+
	699	+ cButton fullscreenLayout;
	700	+
	701	+ void Minimize()
	702	+ {
	703	+ frame.setState(Frame.ICONIFIED);
	704	+ }
	705	+
	706	+ void Maximize()
	707	+ {
	708	+ if (maximized)
	709	+ {
	710	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	711	+ }
	712	+ else
	713	+ {
	714	+ keeprect = frame.getBounds();
	715	+ Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	716	+ Dimension rect2 = frame.getToolkit().getScreenSize();
	717	+ frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	718	+// frame.setState(Frame.MAXIMIZED_BOTH);
	719	+ }
	720	+
	721	+ maximized ^= true;
	722	+ }
	723	+
615	724	void ToggleFullScreen()
616	725	{
617	726	if (CameraPane.FULLSCREEN)
618	727	{
619		- frame.getContentPane().remove(/"Center",/bigThree);
620		- framePanel.add(bigThree);
621		- frame.getContentPane().add(/"Center",/framePanel);
	728	+ device.setFullScreenWindow(null);
	729	+ //frame.setVisible(false);
	730	+// frame.removeNotify();
	731	+// frame.setUndecorated(false);
	732	+// frame.addNotify();
	733	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	734	+
	735	+// X frame.getContentPane().remove(/"Center",/bigThree);
	736	+// X framePanel.add(bigThree);
	737	+// X frame.getContentPane().add(/"Center",/framePanel);
	738	+ framePanel.setDividerLocation(1);
	739	+
	740	+ //frame.setVisible(true);
	741	+ radio.layout = keepButton;
	742	+ //theFrame = null;
	743	+ keepButton = null;
	744	+ radio.layout.doClick();
	745	+
622	746	} else
623	747	{
624		- frame.getContentPane().remove(/"Center",/framePanel);
625		- framePanel.remove(bigThree);
626		- frame.getContentPane().add(/"Center",/bigThree);
	748	+ keepButton = radio.layout;
	749	+ //keeprect = frame.getBounds();
	750	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	751	+// frame.getToolkit().getScreenSize().height);
	752	+ //frame.setVisible(false);
	753	+ device.setFullScreenWindow(frame);
	754	+// frame.removeNotify();
	755	+// frame.setUndecorated(true);
	756	+// frame.addNotify();
	757	+// X frame.getContentPane().remove(/"Center",/framePanel);
	758	+// X framePanel.remove(bigThree);
	759	+// X frame.getContentPane().add(/"Center",/bigThree);
	760	+ framePanel.setDividerLocation(0);
	761	+
	762	+ radio.layout = fullscreenLayout;
	763	+ radio.layout.doClick();
	764	+ //frame.setVisible(true);
627	765	}
	766	+
628	767	cameraView.ToggleFullScreen();
629	768	}
630	769
631		- private JTextArea createTextPane()
	770	+ private JTextPane createTextPane()
632	771	{
633		- String[] initString =
634		- {
635		- "This is an editable JTextPane, ", //regular
636		- "another ", //italic
637		- "styled ", //bold
638		- "text ", //small
639		- "component, ", //large
640		- "which supports embedded components..." + newline,//regular
641		- " " + newline, //button
642		- "...and embedded icons..." + newline, //regular
643		- " ", //icon
644		- newline + "JTextPane is a subclass of JEditorPane that "
645		- + "uses a StyledEditorKit and StyledDocument, and provides "
646		- + "cover methods for interacting with those objects."
647		- };
	772	+// TEXTAREA String[] initString =
	773	+// {
	774	+// "This is an editable JTextPane, ", //regular
	775	+// "another ", //italic
	776	+// "styled ", //bold
	777	+// "text ", //small
	778	+// "component, ", //large
	779	+// "which supports embedded components..." + newline,//regular
	780	+// " " + newline, //button
	781	+// "...and embedded icons..." + newline, //regular
	782	+// " ", //icon
	783	+// newline + "JTextPane is a subclass of JEditorPane that "
	784	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	785	+// + "cover methods for interacting with those objects."
	786	+// };
	787	+//
	788	+// String[] initStyles =
	789	+// {
	790	+// "regular", "italic", "bold", "small", "large",
	791	+// "regular", "button", "regular", "icon",
	792	+// "regular"
	793	+// };
	794	+//
	795	+// JTextPane textPane = new JTextPane();
	796	+// textPane.setEditable(true);
	797	+// /StyledDocument/ doc = textPane.getStyledDocument();
	798	+// addStylesToDocument(doc);
	799	+//
	800	+// try
	801	+// {
	802	+// for (int j = 0; j < 2; j++)
	803	+// {
	804	+// for (int i = 0; i < initString.length; i++)
	805	+// {
	806	+// doc.insertString(doc.getLength(), initString[i],
	807	+// doc.getStyle(initStyles[i]));
	808	+// }
	809	+// }
	810	+// } catch (BadLocationException ble)
	811	+// {
	812	+// System.err.println("Couldn't insert initial text into text pane.");
	813	+// }
648	814
649		- String[] initStyles =
650		- {
651		- "regular", "italic", "bold", "small", "large",
652		- "regular", "button", "regular", "icon",
653		- "regular"
654		- };
655		-
656		- JTextPane textPane = new JTextPane();
657		- textPane.setEditable(true);
658		- /StyledDocument/ doc = textPane.getStyledDocument();
659		- addStylesToDocument(doc);
660		-
661		- try
662		- {
663		- for (int j = 0; j < 2; j++)
664		- {
665		- for (int i = 0; i < initString.length; i++)
666		- {
667		- doc.insertString(doc.getLength(), initString[i],
668		- doc.getStyle(initStyles[i]));
669		- }
670		- }
671		- } catch (BadLocationException ble)
672		- {
673		- System.err.println("Couldn't insert initial text into text pane.");
674		- }
675		-
676		- return new JTextArea(); // textPane;
	815	+ return new JTextPane(); // textPane;
677	816	}
678	817
679	818	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -726,7 +865,7 @@
726	865	protected static ImageIcon createImageIcon(String path,
727	866	String description)
728	867	{
729		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	868	+ java.net.URL imgURL = Grafreed.class.getResource(path);
730	869	if (imgURL != null)
731	870	{
732	871	return new ImageIcon(imgURL, description);
..	..	@@ -758,6 +897,7 @@
758	897	// NumberSlider vDivsField;
759	898	// JCheckBox endcaps;
760	899	JCheckBox liveCB;
	900	+ JCheckBox selectCB;
761	901	JCheckBox hideCB;
762	902	JCheckBox link2masterCB;
763	903	JCheckBox markCB;
..	..	@@ -765,7 +905,12 @@
765	905	JCheckBox speedupCB;
766	906	JCheckBox rewindCB;
767	907	JCheckBox flipVCB;
	908	+
	909	+ cCheckBox toggleTextureCB;
	910	+ cCheckBox toggleSwitchCB;
	911	+
768	912	JComboBox texresMenu;
	913	+
769	914	JButton resetButton;
770	915	JButton stepButton;
771	916	JButton stepAllButton;
..	..	@@ -774,9 +919,13 @@
774	919	JButton fasterButton;
775	920	JButton remarkButton;
776	921
	922	+ cGridBag editPanel;
	923	+ cGridBag editCommandsPanel;
	924	+
777	925	cGridBag namePanel;
778	926	cGridBag setupPanel;
779		- cGridBag commandsPanel;
	927	+ cGridBag setupPanel2;
	928	+ cGridBag objectCommandsPanel;
780	929	cGridBag pushPanel;
781	930	cGridBag fillPanel;
782	931
..	..	@@ -943,10 +1092,6 @@
943	1092
944	1093	void SetupUI2(ObjEditor oe)
945	1094	{
946		-// oe.aConstraints.weightx = 0;
947		-// oe.aConstraints.weighty = 0;
948		-// oe.aConstraints.gridx = 0;
949		-// oe.aConstraints.gridy = 0;
950	1095	//SetupName(oe);
951	1096
952	1097	namePanel = new cGridBag();
..	..	@@ -963,32 +1108,56 @@
963	1108	setupPanel = new cGridBag().setVertical(false);
964	1109
965	1110	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
966		- link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
967		- hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1111	+ liveCB.setToolTipText("Animate object");
	1112	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1113	+ selectCB.setToolTipText("Make object selectable");
968	1114	// Return();
	1115	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1116	+ hideCB.setToolTipText("Hide object");
969	1117	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
970		- rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind);
971		- randomCB = AddCheckBox(setupPanel, "Rand", copy.random);
	1118	+ markCB.setToolTipText("Set the animation target transform");
	1119	+
	1120	+ setupPanel2 = new cGridBag().setVertical(false);
	1121	+
	1122	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1123	+ rewindCB.setToolTipText("Rewind animation");
	1124	+
	1125	+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1126	+ randomCB.setToolTipText("Randomly Rewind or Go back and forth");
972	1127
	1128	+ if (Globals.ADVANCED)
	1129	+ {
	1130	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
	1131	+ link2masterCB.setToolTipText("Attach to support");
	1132	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1133	+ speedupCB.setToolTipText("Option motion capture");
	1134	+ }
	1135	+
973	1136	oe.ctrlPanel.add(setupPanel);
974	1137	oe.ctrlPanel.Return();
	1138	+ oe.ctrlPanel.add(setupPanel2);
	1139	+ oe.ctrlPanel.Return();
975	1140
976		- commandsPanel = new cGridBag().setVertical(false);
	1141	+ objectCommandsPanel = new cGridBag().setVertical(false);
977	1142
978		- resetButton = AddButton(commandsPanel, "Reset");
979		- stepButton = AddButton(commandsPanel, "Step");
	1143	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1144	+ resetButton.setToolTipText("Jump to frame zero");
	1145	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1146	+ stepButton.setToolTipText("Step one frame");
980	1147	// resetAllButton = AddButton(oe, "Reset All");
981	1148	// stepAllButton = AddButton(oe, "Step All");
982		- speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
983	1149	// Return();
984		- slowerButton = AddButton(commandsPanel, "Slow");
985		- fasterButton = AddButton(commandsPanel, "Fast");
986		- remarkButton = AddButton(commandsPanel, "Remark");
	1150	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1151	+ slowerButton.setToolTipText("Decrease animation speed");
	1152	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1153	+ fasterButton.setToolTipText("Increase animation speed");
	1154	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1155	+ remarkButton.setToolTipText("Set the current transform as the target");
987	1156
988		- oe.ctrlPanel.add(commandsPanel);
	1157	+ oe.ctrlPanel.add(objectCommandsPanel);
989	1158	oe.ctrlPanel.Return();
990	1159
991		- pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1160	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
992	1161	normalpushField = (cNumberSlider)pushPanel.getComponent(1);
993	1162	//Return();
994	1163
..	..	@@ -1191,8 +1360,11 @@
1191	1360	//worldPanel.setName("World");
1192	1361	centralPanel = new cGridBag();
1193	1362	centralPanel.preferredWidth = 20;
1194		- timelinePanel = new JPanel(new BorderLayout());
1195		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1363	+
	1364	+ if (Globals.ADVANCED)
	1365	+ {
	1366	+ timelinePanel = new JPanel(new BorderLayout());
	1367	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1196	1368
1197	1369	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1198	1370	cameraPanel.setContinuousLayout(true);
..	..	@@ -1201,7 +1373,10 @@
1201	1373	// cameraPanel.setDividerSize(9);
1202	1374	cameraPanel.setResizeWeight(1.0);
1203	1375
	1376	+ }
	1377	+
1204	1378	centralPanel.add(cameraView);
	1379	+ centralPanel.setFocusable(true);
1205	1380	//frame.setJMenuBar(timelineMenubar);
1206	1381	//centralPanel.add(timelinePanel);
1207	1382
..	..	@@ -1264,11 +1439,12 @@
1264	1439	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1265	1440	//tmp.setName("Edit");
1266	1441	objectPanel.add(materialPanel);
	1442	+ objectPanel.add(toolboxPanel);
1267	1443	// JPanel north = new JPanel(new BorderLayout());
1268	1444	// north.setName("Edit");
1269	1445	// north.add(ctrlPanel, BorderLayout.NORTH);
1270	1446	// objectPanel.add(north);
1271		- objectPanel.add(ctrlPanel);
	1447	+ objectPanel.add(editPanel);
1272	1448	objectPanel.add(infoPanel);
1273	1449
1274	1450	/*
..	..	@@ -1290,14 +1466,12 @@
1290	1466	scrollpane.addMouseWheelListener(this); // Default not fast enough
1291	1467
1292	1468	/JTabbedPane/ scenePanel = new cGridBag();
1293		- scenePanel.preferredWidth = 7;
	1469	+ scenePanel.preferredWidth = 6;
1294	1470
1295	1471	JTabbedPane tabbedPane = new JTabbedPane();
1296	1472	tabbedPane.add(scrollpane);
1297	1473
1298		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1299		-
1300		- optionsPanel = new cGridBag().setVertical(true);
	1474	+ optionsPanel = new cGridBag().setVertical(false);
1301	1475
1302	1476	optionsPanel.setName("Options");
1303	1477
..	..	@@ -1305,6 +1479,8 @@
1305	1479
1306	1480	tabbedPane.add(optionsPanel);
1307	1481
	1482	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1483	+
1308	1484	scenePanel.add(tabbedPane);
1309	1485
1310	1486	/*
..	..	@@ -1396,9 +1572,13 @@
1396	1572
1397	1573	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1398	1574
1399		- frame.setSize(1024, 768);
1400		- frame.show();
	1575	+ frame.setSize(1280, 860);
	1576	+
	1577	+ frame.validate();
	1578	+ frame.setVisible(true);
1401	1579
	1580	+ cameraView.requestFocusInWindow();
	1581	+
1402	1582	gridPanel.setDividerLocation(1.0);
1403	1583
1404	1584	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1436,17 +1616,25 @@
1436	1616
1437	1617	cGridBag editBar = new cGridBag().setVertical(false);
1438	1618
1439		- editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
	1619	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1620	+ createMaterialButton.setToolTipText("Create material");
1440	1621
1441	1622	/*
1442	1623	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1443	1624	*/
1444	1625
1445		- editBar.add(clearMaterialButton = new cButton("Clear")); // , aConstraints);
1446		- editBar.add(resetSlidersButton = new cButton("Reset")); // , aConstraints);
1447		- editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
1448		- editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1626	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1627	+ clearMaterialButton.setToolTipText("Clear material");
	1628	+
	1629	+ if (Globals.ADVANCED)
	1630	+ {
	1631	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1632	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1633	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1634	+ }
1449	1635
	1636	+ editBar.preferredHeight = 15;
	1637	+
1450	1638	panel.add(editBar);
1451	1639
1452	1640	/**/
..	..	@@ -1712,12 +1900,15 @@
1712	1900	opacityPowerField.addChangeListener(this);
1713	1901	/**/
1714	1902
1715		- resetSlidersButton.addActionListener(this);
1716	1903	clearMaterialButton.addActionListener(this);
1717	1904	createMaterialButton.addActionListener(this);
1718		-
1719		- propagateToggle.addItemListener(this);
1720		- multiplyToggle.addItemListener(this);
	1905	+
	1906	+ if (Globals.ADVANCED)
	1907	+ {
	1908	+ resetSlidersButton.addActionListener(this);
	1909	+ propagateToggle.addItemListener(this);
	1910	+ multiplyToggle.addItemListener(this);
	1911	+ }
1721	1912	}
1722	1913
1723	1914	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1888,7 +2079,7 @@
1888	2079
1889	2080	//? flashIt = false;
1890	2081	CameraPane pane = (CameraPane) cameraView;
1891		- pane.clickStart(location.x, location.y, 0);
	2082	+ pane.clickStart(location.x, location.y, 0, 0);
1892	2083	pane.clickEnd(location.x, location.y, 0, true);
1893	2084
1894	2085	if (group.selection.size() == 1)
..	..	@@ -1937,6 +2128,7 @@
1937	2128	e2.printStackTrace();
1938	2129	}
1939	2130	}
	2131	+
1940	2132	LoadJMEThread loadThread;
1941	2133
1942	2134	class LoadJMEThread extends Thread
..	..	@@ -1994,6 +2186,7 @@
1994	2186	//LoadFile0(filename, converter);
1995	2187	}
1996	2188	}
	2189	+
1997	2190	LoadOBJThread loadObjThread;
1998	2191
1999	2192	class LoadOBJThread extends Thread
..	..	@@ -2072,19 +2265,19 @@
2072	2265
2073	2266	void LoadObjFile(String fullname)
2074	2267	{
2075		- /*
	2268	+ System.out.println("Loading " + fullname);
	2269	+ /**/
2076	2270	//lastFilename = fullname;
2077	2271	if(loadObjThread == null)
2078	2272	{
2079		- loadObjThread = new LoadOBJThread();
2080		- loadObjThread.start();
	2273	+ loadObjThread = new LoadOBJThread();
	2274	+ loadObjThread.start();
2081	2275	}
2082	2276
2083	2277	loadObjThread.add(fullname);
2084		- */
	2278	+ /**/
2085	2279
2086		- System.out.println("Loading " + fullname);
2087		- makeSomething(new FileObject(fullname, true), true);
	2280	+ //makeSomething(new FileObject(fullname, true), true);
2088	2281	}
2089	2282
2090	2283	void LoadGFDFile(String fullname)
..	..	@@ -2345,11 +2538,11 @@
2345	2538
2346	2539	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2347	2540	{
2348		- if (GrafreeD.standAlone)
	2541	+ if (Grafreed.standAlone)
2349	2542	{
2350	2543	/**/
2351	2544	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2352		- browser.show();
	2545	+ browser.setVisible(true);
2353	2546	String filename = browser.getFile();
2354	2547	if (filename != null && filename.length() > 0)
2355	2548	{
..	..	@@ -2701,6 +2894,8 @@
2701	2894
2702	2895	void SetMaterial(Object3D object)
2703	2896	{
	2897	+ latestObject = object;
	2898	+
2704	2899	cMaterial mat = object.material;
2705	2900
2706	2901	if (mat == null)
..	..	@@ -2709,7 +2904,8 @@
2709	2904	return;
2710	2905	}
2711	2906
2712		- multiplyToggle.setSelected(mat.multiply);
	2907	+ if (multiplyToggle != null)
	2908	+ multiplyToggle.setSelected(mat.multiply);
2713	2909
2714	2910	assert (object.projectedVertices != null);
2715	2911
..	..	@@ -2885,7 +3081,7 @@
2885	3081	cameraView.ToggleDL();
2886	3082	cameraView.repaint();
2887	3083	return;
2888		- } else if (event.getSource() == toggleTextureItem)
	3084	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2889	3085	{
2890	3086	cameraView.ToggleTexture();
2891	3087	// june 2013 copy.HardTouch();
..	..	@@ -2924,9 +3120,9 @@
2924	3120	frame.validate();
2925	3121
2926	3122	return;
2927		- } else if (event.getSource() == toggleRandomItem)
	3123	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2928	3124	{
2929		- cameraView.ToggleRandom();
	3125	+ cameraView.ToggleSwitch();
2930	3126	cameraView.repaint();
2931	3127	return;
2932	3128	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -2955,6 +3151,10 @@
2955	3151	{
2956	3152	copy.live ^= true;
2957	3153	return;
	3154	+ } else if (event.getSource() == selectCB)
	3155	+ {
	3156	+ copy.dontselect ^= true;
	3157	+ return;
2958	3158	} else if (event.getSource() == hideCB)
2959	3159	{
2960	3160	copy.hide ^= true;
..	..	@@ -2969,6 +3169,7 @@
2969	3169	if (event.getSource() == randomCB)
2970	3170	{
2971	3171	copy.random ^= true;
	3172	+ objEditor.refreshContents();
2972	3173	return;
2973	3174	}
2974	3175	if (event.getSource() == speedupCB)
..	..	@@ -2992,8 +3193,9 @@
2992	3193
2993	3194	public void actionPerformed(ActionEvent event)
2994	3195	{
	3196	+ Object source = event.getSource();
2995	3197	// SCRIPT DIALOG
2996		- if (event.getSource() == okbutton)
	3198	+ if (source == okbutton)
2997	3199	{
2998	3200	textpanel.setVisible(false);
2999	3201	textpanel.remove(textarea);
..	..	@@ -3005,7 +3207,7 @@
3005	3207	textarea = null;
3006	3208	textpanel = null;
3007	3209	}
3008		- if (event.getSource() == cancelbutton)
	3210	+ if (source == cancelbutton)
3009	3211	{
3010	3212	textpanel.setVisible(false);
3011	3213	textpanel.remove(textarea);
..	..	@@ -3017,50 +3219,50 @@
3017	3219	//applySelf();
3018	3220	//client.refreshEditWindow();
3019	3221	//refreshContents();
3020		- if (event.getSource() == nameField)
	3222	+ if (source == nameField)
3021	3223	{
3022	3224	//System.out.println("ObjEditor " + event);
3023	3225	applySelf0(true);
3024	3226	//parent.applySelf();
3025	3227	objEditor.refreshContents();
3026		- } else if (event.getSource() == resetButton)
	3228	+ } else if (source == resetButton)
3027	3229	{
3028	3230	CameraPane.fullreset = true;
3029	3231	copy.Reset(); // ResetMeshes();
3030	3232	copy.Touch();
3031	3233	objEditor.refreshContents();
3032		- } else if (event.getSource() == stepItem)
	3234	+ } else if (source == stepItem)
3033	3235	{
3034	3236	//cameraView.ONESTEP = true;
3035	3237	Globals.ONESTEP = true;
3036	3238	cameraView.repaint();
3037	3239	return;
3038		- } else if (event.getSource() == stepButton)
	3240	+ } else if (source == stepButton)
3039	3241	{
3040	3242	copy.Step();
3041	3243	copy.Touch();
3042	3244	objEditor.refreshContents();
3043		- } else if (event.getSource() == slowerButton)
	3245	+ } else if (source == slowerButton)
3044	3246	{
3045	3247	copy.Slower();
3046	3248	copy.Touch();
3047	3249	objEditor.refreshContents();
3048		- } else if (event.getSource() == fasterButton)
	3250	+ } else if (source == fasterButton)
3049	3251	{
3050	3252	copy.Faster();
3051	3253	copy.Touch();
3052	3254	objEditor.refreshContents();
3053		- } else if (event.getSource() == remarkButton)
	3255	+ } else if (source == remarkButton)
3054	3256	{
3055	3257	copy.Remark();
3056	3258	copy.Touch();
3057	3259	objEditor.refreshContents();
3058		- } else if (event.getSource() == stepAllButton)
	3260	+ } else if (source == stepAllButton)
3059	3261	{
3060	3262	copy.StepAll();
3061	3263	copy.Touch();
3062	3264	objEditor.refreshContents();
3063		- } else if (event.getSource() == resetAllButton)
	3265	+ } else if (source == resetAllButton)
3064	3266	{
3065	3267	//CameraPane.fullreset = true;
3066	3268	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3093,53 +3295,75 @@
3093	3295	// Close();
3094	3296	// }
3095	3297	// else
3096		- if (event.getSource() == resetSlidersButton)
	3298	+ if (source == resetSlidersButton)
3097	3299	{
3098	3300	ResetSliders();
3099		- } else if (event.getSource() == clearMaterialButton)
	3301	+ } else if (source == clearMaterialButton)
3100	3302	{
3101	3303	ClearMaterial();
3102		- } else if (event.getSource() == createMaterialButton)
	3304	+ } else if (source == createMaterialButton)
3103	3305	{
3104	3306	CreateMaterial();
3105		- } else if (event.getSource() == clearPanelButton)
	3307	+ } else if (source == clearPanelButton)
3106	3308	{
3107	3309	copy.ClearUI();
3108	3310	refreshContents(true);
3109		- } /*
3110		- }
3111		-
3112		- public boolean action(Event event, Object arg)
3113		- {
3114		- */ else if (event.getSource() == closeItem)
	3311	+ } else if (source == importGFDItem)
	3312	+ {
	3313	+ ImportGFD();
	3314	+ } else
	3315	+ if (source == importVRMLX3DItem)
	3316	+ {
	3317	+ ImportVRMLX3D();
	3318	+ } else
	3319	+ if (source == import3DSItem)
	3320	+ {
	3321	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3322	+ } else
	3323	+ if (source == importOBJItem)
	3324	+ {
	3325	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3326	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3327	+ browser.setVisible(true);
	3328	+ String filename = browser.getFile();
	3329	+ if (filename != null && filename.length() > 0)
	3330	+ {
	3331	+ String fullname = browser.getDirectory() + filename;
	3332	+ makeSomething(ReadOBJ(fullname), true);
	3333	+ }
	3334	+ } else
	3335	+ if (source == closeItem)
3115	3336	{
3116	3337	Close();
3117	3338	//return true;
3118		- } else if (event.getSource() == loadItem)
	3339	+ } else if (source == loadItem)
3119	3340	{
3120	3341	load();
3121	3342	//return true;
3122		- } else if (event.getSource() == saveItem)
	3343	+ } else if (source == newItem)
	3344	+ {
	3345	+ New();
	3346	+ } else if (source == saveItem)
3123	3347	{
3124	3348	save();
3125	3349	//return true;
3126		- } else if (event.getSource() == saveAsItem)
	3350	+ } else if (source == saveAsItem)
3127	3351	{
3128	3352	saveAs();
3129	3353	//return true;
3130		- } else if (event.getSource() == reexportItem)
	3354	+ } else if (source == reexportItem)
3131	3355	{
3132	3356	reexport();
3133	3357	//return true;
3134		- } else if (event.getSource() == exportAsItem)
	3358	+ } else if (source == exportAsItem)
3135	3359	{
3136	3360	export();
3137	3361	//return true;
3138		- } else if (event.getSource() == povItem)
	3362	+ } else if (source == povItem)
3139	3363	{
3140	3364	generatePOV();
3141	3365	//return true;
3142		- } else if (event.getSource() == zBufferItem)
	3366	+ } else if (source == zBufferItem)
3143	3367	{
3144	3368	try
3145	3369	{
..	..	@@ -3161,21 +3385,8 @@
3161	3385	cameraView.repaint();
3162	3386	//return true;
3163	3387	}
3164		- */ else if (event.getSource() == editCameraItem)
3165		- {
3166		- cameraView.ProtectCamera();
3167		- cameraView.repaint();
3168		- return;
3169		- } else if (event.getSource() == revertCameraItem)
3170		- {
3171		- cameraView.RevertCamera();
3172		- cameraView.repaint();
3173		- return;
3174		-// } else if (event.getSource() == textureButton)
3175		-// {
3176		-// return; // true;
3177		- } else // combos...
3178		- if (event.getSource() == texresMenu)
	3388	+ */ else // combos...
	3389	+ if (source == texresMenu)
3179	3390	{
3180	3391	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3181	3392	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3187,12 +3398,272 @@
3187	3398	}
3188	3399	}
3189	3400
	3401	+ void New()
	3402	+ {
	3403	+ while (copy.Size() > 1)
	3404	+ {
	3405	+ copy.remove(1);
	3406	+ }
	3407	+
	3408	+ ResetModel();
	3409	+ objEditor.refreshContents();
	3410	+ }
	3411	+
	3412	+ static public byte[] Compress(Object3D o)
	3413	+ {
	3414	+ try
	3415	+ {
	3416	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3417	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3418	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3419	+
	3420	+ Object3D parent = o.parent;
	3421	+ o.parent = null;
	3422	+
	3423	+ out.writeObject(o);
	3424	+
	3425	+ o.parent = parent;
	3426	+
	3427	+ out.flush();
	3428	+
	3429	+ zstream.close();
	3430	+ out.close();
	3431	+
	3432	+ return baos.toByteArray();
	3433	+ } catch (Exception e)
	3434	+ {
	3435	+ System.err.println(e);
	3436	+ return null;
	3437	+ }
	3438	+ }
	3439	+
	3440	+ static public Object Uncompress(byte[] bytes)
	3441	+ {
	3442	+ System.out.println("#bytes = " + bytes.length);
	3443	+ try
	3444	+ {
	3445	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3446	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3447	+ ObjectInputStream in = new ObjectInputStream(istream);
	3448	+ Object obj = in.readObject();
	3449	+ in.close();
	3450	+
	3451	+ return obj;
	3452	+ } catch (Exception e)
	3453	+ {
	3454	+ System.err.println(e);
	3455	+ return null;
	3456	+ }
	3457	+ }
	3458	+
	3459	+ static public Object clone(Object o)
	3460	+ {
	3461	+ try
	3462	+ {
	3463	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3464	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3465	+
	3466	+ out.writeObject(o);
	3467	+
	3468	+ out.flush();
	3469	+ out.close();
	3470	+
	3471	+ byte[] bytes = baos.toByteArray();
	3472	+
	3473	+ System.out.println("clone = " + bytes.length);
	3474	+
	3475	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3476	+ ObjectInputStream in = new ObjectInputStream(bais);
	3477	+ Object obj = in.readObject();
	3478	+ in.close();
	3479	+
	3480	+ return obj;
	3481	+ } catch (Exception e)
	3482	+ {
	3483	+ System.err.println(e);
	3484	+ return null;
	3485	+ }
	3486	+ }
	3487	+
	3488	+ cRadio GetCurrentTab()
	3489	+ {
	3490	+ cRadio ab;
	3491	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3492	+ {
	3493	+ ab = (cRadio)e.nextElement();
	3494	+ if(ab.GetObject() == copy)
	3495	+ {
	3496	+ return ab;
	3497	+ }
	3498	+ }
	3499	+
	3500	+ return null;
	3501	+ }
	3502	+
	3503	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3504	+
	3505	+ public void Save()
	3506	+ {
	3507	+ System.err.println("Save");
	3508	+
	3509	+ cRadio tab = GetCurrentTab();
	3510	+
	3511	+ boolean temp = CameraPane.SWITCH;
	3512	+ CameraPane.SWITCH = false;
	3513	+
	3514	+ copy.ExtractBigData(hashtable);
	3515	+
	3516	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3517	+ tab.graphs[tab.undoindex++] = Compress(copy);
	3518	+
	3519	+ copy.RestoreBigData(hashtable);
	3520	+
	3521	+ CameraPane.SWITCH = temp;
	3522	+
	3523	+ //assert(hashtable.isEmpty());
	3524	+
	3525	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3526	+ {
	3527	+ tab.graphs[i] = null;
	3528	+ }
	3529	+
	3530	+ // test save
	3531	+ if (false)
	3532	+ {
	3533	+ try
	3534	+ {
	3535	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3536	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3537	+
	3538	+ p.writeObject(copy);
	3539	+
	3540	+ p.flush();
	3541	+
	3542	+ ostream.close();
	3543	+ } catch (Exception e)
	3544	+ {
	3545	+ e.printStackTrace();
	3546	+ }
	3547	+ }
	3548	+ }
	3549	+
	3550	+ void CopyChanged(Object3D obj)
	3551	+ {
	3552	+ boolean temp = CameraPane.SWITCH;
	3553	+ CameraPane.SWITCH = false;
	3554	+
	3555	+ copy.ExtractBigData(hashtable);
	3556	+
	3557	+ copy.clear();
	3558	+
	3559	+ for (int i=0; i<obj.Size(); i++)
	3560	+ {
	3561	+ copy.add(obj.get(i));
	3562	+ }
	3563	+
	3564	+ copy.RestoreBigData(hashtable);
	3565	+
	3566	+ CameraPane.SWITCH = temp;
	3567	+
	3568	+ //assert(hashtable.isEmpty());
	3569	+
	3570	+ copy.Touch();
	3571	+
	3572	+ ResetModel();
	3573	+ copy.HardTouch(); // recompile?
	3574	+
	3575	+ cRadio ab;
	3576	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3577	+ {
	3578	+ ab = (cRadio)e.nextElement();
	3579	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3580	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3581	+ if (test != null)
	3582	+ {
	3583	+ test.editWindow = ab.object.editWindow;
	3584	+ ab.object = test;
	3585	+ }
	3586	+ }
	3587	+
	3588	+ refreshContents();
	3589	+ }
	3590	+
	3591	+ public void Undo()
	3592	+ {
	3593	+ System.err.println("Undo");
	3594	+
	3595	+ cRadio tab = GetCurrentTab();
	3596	+
	3597	+ if (tab.undoindex == 0)
	3598	+ {
	3599	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3600	+ return;
	3601	+ }
	3602	+
	3603	+ if (tab.graphs[tab.undoindex] == null)
	3604	+ {
	3605	+ Save();
	3606	+ tab.undoindex -= 1;
	3607	+ }
	3608	+
	3609	+ tab.undoindex -= 1;
	3610	+
	3611	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3612	+ }
	3613	+
	3614	+ public void Redo()
	3615	+ {
	3616	+ cRadio tab = GetCurrentTab();
	3617	+
	3618	+ if (tab.graphs[tab.undoindex + 1] == null)
	3619	+ {
	3620	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3621	+ return;
	3622	+ }
	3623	+
	3624	+ tab.undoindex += 1;
	3625	+
	3626	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3627	+ }
	3628	+
	3629	+ void ImportGFD()
	3630	+ {
	3631	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3632	+ browser.show();
	3633	+ String filename = browser.getFile();
	3634	+ if (filename != null && filename.length() > 0)
	3635	+ {
	3636	+ String fullname = browser.getDirectory() + filename;
	3637	+
	3638	+ //Object3D readobj =
	3639	+ objEditor.ReadGFD(fullname, objEditor);
	3640	+ //makeSomething(readobj);
	3641	+ }
	3642	+ }
	3643	+
	3644	+ void ImportVRMLX3D()
	3645	+ {
	3646	+ if (Grafreed.standAlone)
	3647	+ {
	3648	+ /**/
	3649	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3650	+ browser.show();
	3651	+ String filename = browser.getFile();
	3652	+ if (filename != null && filename.length() > 0)
	3653	+ {
	3654	+ String fullname = browser.getDirectory() + filename;
	3655	+ LoadVRMLX3D(fullname);
	3656	+ }
	3657	+ /**/
	3658	+ }
	3659	+ }
	3660	+
3190	3661	void ToggleAnimation()
3191	3662	{
3192	3663	if (!Globals.ANIMATION)
3193	3664	{
3194	3665	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3195		- browser.show();
	3666	+ browser.setVisible(true);
3196	3667	String filename = browser.getFile();
3197	3668	if (filename != null && filename.length() > 0)
3198	3669	{
..	..	@@ -3202,8 +3673,8 @@
3202	3673
3203	3674	Globals.ANIMATION ^= true;
3204	3675
3205		- GrafreeD.wav.cursor = 0;
3206		- GrafreeD.wav.loop = 0;
	3676	+ Grafreed.wav.cursor = 0;
	3677	+ Grafreed.wav.loop = 0;
3207	3678	}
3208	3679	} else
3209	3680	{
..	..	@@ -3224,7 +3695,6 @@
3224	3695	callee.refreshContents();
3225	3696	} else
3226	3697	{
3227		- new Exception().printStackTrace();
3228	3698	System.exit(0);
3229	3699	}
3230	3700	}
..	..	@@ -3254,7 +3724,7 @@
3254	3724	void CreateMaterial()
3255	3725	{
3256	3726	//copy.ClearMaterial(); // PATCH
3257		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3727	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3258	3728	if (copy.selection.size() > 0)
3259	3729	//SetMaterial(copy);
3260	3730	{
..	..	@@ -3305,7 +3775,7 @@
3305	3775	assert false;
3306	3776	}
3307	3777
3308		- void EditSelection()
	3778	+ void EditSelection(boolean newWindow)
3309	3779	{
3310	3780	}
3311	3781
..	..	@@ -3313,11 +3783,11 @@
3313	3783	{
3314	3784	copy.ResetBlockLoop(); // temporary problem
3315	3785
3316		- boolean random = CameraPane.RANDOM;
3317		- CameraPane.RANDOM = false; // parse everything
	3786	+ boolean random = CameraPane.SWITCH;
	3787	+ CameraPane.SWITCH = false; // parse everything
3318	3788	copy.ResetDisplayList();
3319	3789	copy.HardTouch();
3320		- CameraPane.RANDOM = random;
	3790	+ CameraPane.SWITCH = random;
3321	3791	}
3322	3792
3323	3793	// public void applySelf()
..	..	@@ -3391,6 +3861,36 @@
3391	3861	{
3392	3862	//System.out.println("Propagate = " + propagate);
3393	3863	copy.UpdateMaterial(anchor, current, propagate);
	3864	+
	3865	+ if (copy.material != null)
	3866	+ {
	3867	+ cMaterial mat = copy.material;
	3868	+
	3869	+ colorField.SetToolTipValue((mat.color));
	3870	+ modulationField.SetToolTipValue((mat.modulation));
	3871	+ metalnessField.SetToolTipValue((mat.metalness));
	3872	+ diffuseField.SetToolTipValue((mat.diffuse));
	3873	+ specularField.SetToolTipValue((mat.specular));
	3874	+ shininessField.SetToolTipValue((mat.shininess));
	3875	+ shiftField.SetToolTipValue((mat.shift));
	3876	+ ambientField.SetToolTipValue((mat.ambient));
	3877	+ lightareaField.SetToolTipValue((mat.lightarea));
	3878	+ diffusenessField.SetToolTipValue((mat.factor));
	3879	+ velvetField.SetToolTipValue((mat.velvet));
	3880	+ sheenField.SetToolTipValue((mat.sheen));
	3881	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3882	+ backlitField.SetToolTipValue((mat.bump));
	3883	+ anisoField.SetToolTipValue((mat.aniso));
	3884	+ anisoVField.SetToolTipValue((mat.anisoV));
	3885	+ cameraField.SetToolTipValue((mat.cameralight));
	3886	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3887	+ shadowField.SetToolTipValue((mat.shadow));
	3888	+ textureField.SetToolTipValue((mat.texture));
	3889	+ opacityField.SetToolTipValue((mat.opacity));
	3890	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3891	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3892	+ }
	3893	+
3394	3894	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3395	3895	{
3396	3896	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3506,7 +4006,7 @@
3506	4006	}
3507	4007
3508	4008	if (normalpushField != null)
3509		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	4009	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3510	4010	}
3511	4011
3512	4012	void SnapObject()
..	..	@@ -3770,6 +4270,8 @@
3770	4270
3771	4271	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3772	4272	{
	4273	+ if (Globals.SAVEONMAKE) // && resetmodel)
	4274	+ Save();
3773	4275	//Tween.set(thing, 0).target(1).start(tweenManager);
3774	4276	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3775	4277	// if (thing instanceof GenericJointDemo)
..	..	@@ -3856,6 +4358,12 @@
3856	4358	{
3857	4359	ResetModel();
3858	4360	Select(thing.GetTreePath(), true, false); // unselect... false);
	4361	+
	4362	+ if (thing.Size() == 0)
	4363	+ {
	4364	+ //EditSelection(false);
	4365	+ }
	4366	+
3859	4367	refreshContents();
3860	4368	}
3861	4369
..	..	@@ -3973,6 +4481,7 @@
3973	4481	}
3974	4482	}
3975	4483	}
	4484	+
3976	4485	LoadGFDThread loadGFDThread;
3977	4486
3978	4487	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -3992,8 +4501,10 @@
3992	4501
3993	4502	try
3994	4503	{
	4504	+ // Try compressed version first.
3995	4505	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
3996		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4506	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4507	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
3997	4508
3998	4509	readobj = (Object3D) p.readObject();
3999	4510	istream.close();
..	..	@@ -4001,7 +4512,20 @@
4001	4512	readobj.ResetDisplayList();
4002	4513	} catch (Exception e)
4003	4514	{
4004		- e.printStackTrace();
	4515	+ //e.printStackTrace();
	4516	+ try
	4517	+ {
	4518	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4519	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4520	+
	4521	+ readobj = (Object3D) p.readObject();
	4522	+ istream.close();
	4523	+
	4524	+ readobj.ResetDisplayList();
	4525	+ } catch (Exception e2)
	4526	+ {
	4527	+ e2.printStackTrace();
	4528	+ }
4005	4529	}
4006	4530	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4007	4531	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4047,6 +4571,12 @@
4047	4571
4048	4572	void LoadIt(Object obj)
4049	4573	{
	4574	+ if (obj == null)
	4575	+ {
	4576	+ // Invalid file
	4577	+ return;
	4578	+ }
	4579	+
4050	4580	System.out.println("Loaded " + obj);
4051	4581	//new Exception().printStackTrace();
4052	4582	Object3D readobj = (Object3D) obj;
..	..	@@ -4056,6 +4586,8 @@
4056	4586
4057	4587	if (readobj != null)
4058	4588	{
	4589	+ if (Globals.SAVEONMAKE)
	4590	+ Save();
4059	4591	try
4060	4592	{
4061	4593	//readobj.deepCopySelf(copy);
..	..	@@ -4118,7 +4650,7 @@
4118	4650
4119	4651	void load() // throws ClassNotFoundException
4120	4652	{
4121		- if (GrafreeD.standAlone)
	4653	+ if (Grafreed.standAlone)
4122	4654	{
4123	4655	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4124	4656	browser.show();
..	..	@@ -4205,11 +4737,13 @@
4205	4737	try
4206	4738	{
4207	4739	FileOutputStream ostream = new FileOutputStream(lastname);
4208		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4740	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4741	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4209	4742
4210	4743	p.writeObject(copy);
4211	4744	p.flush();
4212	4745
	4746	+ zstream.close();
4213	4747	ostream.close();
4214	4748
4215	4749	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4219,11 +4753,12 @@
4219	4753	{
4220	4754	}
4221	4755	}
	4756	+
4222	4757	String lastname;
4223	4758
4224	4759	void saveAs()
4225	4760	{
4226		- if (GrafreeD.standAlone)
	4761	+ if (Grafreed.standAlone)
4227	4762	{
4228	4763	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4229	4764	browser.setVisible(true);
..	..	@@ -4328,13 +4863,13 @@
4328	4863	try
4329	4864	{
4330	4865	FileOutputStream ostream = new FileOutputStream(filename);
4331		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4332		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4866	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4867	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4333	4868
4334	4869	Object3D objectparent = obj.parent;
4335	4870	obj.parent = null;
4336	4871
4337		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4872	+ Object3D object = (Object3D) Grafreed.clone(obj);
4338	4873
4339	4874	obj.parent = objectparent;
4340	4875
..	..	@@ -4346,8 +4881,8 @@
4346	4881	p.writeObject(object);
4347	4882	p.flush();
4348	4883
	4884	+ zstream.close();
4349	4885	ostream.close();
4350		- // zstream.close();
4351	4886
4352	4887	// group.selection.get(0).parent = parent;
4353	4888	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4368,7 +4903,7 @@
4368	4903	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4369	4904	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4370	4905	copy.generatePOV(buffer);
4371		- if (GrafreeD.standAlone)
	4906	+ if (Grafreed.standAlone)
4372	4907	{
4373	4908	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4374	4909	browser.show();
..	..	@@ -4394,7 +4929,8 @@
4394	4929	Object3D client;
4395	4930	Object3D copy;
4396	4931	MenuBar menuBar;
4397		- Menu windowMenu;
	4932	+ Menu fileMenu;
	4933	+ MenuItem newItem;
4398	4934	MenuItem loadItem;
4399	4935	MenuItem saveItem;
4400	4936	MenuItem saveAsItem;
..	..	@@ -4402,11 +4938,9 @@
4402	4938	MenuItem reexportItem;
4403	4939	MenuItem povItem;
4404	4940	MenuItem closeItem;
4405		- Menu cameraMenu;
	4941	+
4406	4942	CheckboxMenuItem zBufferItem;
4407	4943	//MenuItem normalLensItem;
4408		- MenuItem editCameraItem;
4409		- MenuItem revertCameraItem;
4410	4944	MenuItem stepItem;
4411	4945	CheckboxMenuItem toggleLiveItem;
4412	4946	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4417,25 +4951,38 @@
4417	4951	CheckboxMenuItem toggleFootContactItem;
4418	4952	CheckboxMenuItem toggleDLItem;
4419	4953	CheckboxMenuItem toggleTextureItem;
4420		- CheckboxMenuItem toggleRandomItem;
	4954	+ CheckboxMenuItem toggleSwitchItem;
4421	4955	CheckboxMenuItem toggleRootItem;
4422	4956	CheckboxMenuItem animationItem;
4423	4957	CheckboxMenuItem toggleHandleItem;
4424	4958	CheckboxMenuItem togglePaintItem;
4425	4959	JSplitPane mainPanel;
4426	4960	JScrollPane scrollpane;
	4961	+
4427	4962	JPanel toolbarPanel;
4428		- JPanel treePanel;
	4963	+
	4964	+ cGridBag treePanel;
	4965	+
4429	4966	JPanel radioPanel;
4430	4967	ButtonGroup buttonGroup;
4431		- cGridBag ctrlPanel;
	4968	+
	4969	+ cGridBag toolboxPanel;
4432	4970	cGridBag materialPanel;
	4971	+ cGridBag ctrlPanel;
	4972	+
4433	4973	JScrollPane infoPanel;
	4974	+
4434	4975	cGridBag optionsPanel;
	4976	+
4435	4977	JTabbedPane objectPanel;
	4978	+ boolean materialFlushed;
	4979	+ Object3D latestObject;
	4980	+
4436	4981	cGridBag XYZPanel;
	4982	+
4437	4983	JSplitPane gridPanel;
4438	4984	JSplitPane bigPanel;
	4985	+
4439	4986	cGridBag bigThree;
4440	4987	cGridBag scenePanel;
4441	4988	cGridBag centralPanel;
..	..	@@ -4550,8 +5097,13 @@
4550	5097	cNumberSlider fogField;
4551	5098	JLabel opacityPowerLabel;
4552	5099	cNumberSlider opacityPowerField;
4553		- JTree jTree;
	5100	+ cTree jTree;
4554	5101	//ObjectUI parent;
4555	5102
4556	5103	cNumberSlider normalpushField;
	5104	+
	5105	+ private MenuItem importGFDItem;
	5106	+ private MenuItem importVRMLX3DItem;
	5107	+ private MenuItem import3DSItem;
	5108	+ private MenuItem importOBJItem;
4557	5109	}