~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.*;
..	..	@@ -13,6 +14,9 @@
13	14	import javax.swing.plaf.metal.MetalLookAndFeel;
14	15	//import javax.swing.plaf.ColorUIResource;
15	16	//import javax.swing.plaf.metal.DefaultMetalTheme;
	17	+
	18	+import javax.swing.plaf.basic.BasicSplitPaneDivider;
	19	+import javax.swing.plaf.basic.BasicSplitPaneUI;
16	20
17	21	//import javax.media.opengl.GLCanvas;
18	22
..	..	@@ -35,6 +39,81 @@
35	39
36	40	GroupEditor callee;
37	41	JFrame frame;
	42	+
	43	+ static ObjEditor theFrame;
	44	+
	45	+ public cGridBag GetSeparator()
	46	+ {
	47	+ cGridBag separator = new cGridBag();
	48	+ separator.add(new JSeparator());
	49	+ separator.preferredHeight = 5;
	50	+ return separator;
	51	+ }
	52	+
	53	+ cButton GetButton(String name, boolean border)
	54	+ {
	55	+ ImageIcon icon = GetIcon(name);
	56	+ return new cButton(icon, border);
	57	+ }
	58	+
	59	+ cLabel GetLabel(String name, boolean border)
	60	+ {
	61	+ //ImageIcon icon = GetIcon(name);
	62	+ return new cLabel(GetImage(name), border);
	63	+ }
	64	+
	65	+ cToggleButton GetToggleButton(String name, boolean border)
	66	+ {
	67	+ ImageIcon icon = GetIcon(name);
	68	+ return new cToggleButton(icon, border);
	69	+ }
	70	+
	71	+ cCheckBox GetCheckBox(String name, boolean border)
	72	+ {
	73	+ ImageIcon icon = GetIcon(name);
	74	+ return new cCheckBox(icon, border);
	75	+ }
	76	+
	77	+ ImageIcon GetIcon(String name)
	78	+ {
	79	+ try
	80	+ {
	81	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	82	+
	83	+// if (image.getWidth() > 48 && image.getHeight() > 48)
	84	+// {
	85	+// BufferedImage resized = new BufferedImage(48, 48, image.getType());
	86	+// Graphics2D g = resized.createGraphics();
	87	+// g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
	88	+// //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
	89	+// g.drawImage(image, 0, 0, 48, 48, 0, 0, image.getWidth(), image.getHeight(), null);
	90	+// g.dispose();
	91	+//
	92	+// image = resized;
	93	+// }
	94	+
	95	+ javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
	96	+ return icon;
	97	+ }
	98	+ catch (Exception e)
	99	+ {
	100	+ return null;
	101	+ }
	102	+ }
	103	+
	104	+ BufferedImage GetImage(String name)
	105	+ {
	106	+ try
	107	+ {
	108	+ BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
	109	+
	110	+ return image;
	111	+ }
	112	+ catch (Exception e)
	113	+ {
	114	+ return null;
	115	+ }
	116	+ }
38	117
39	118	// SCRIPT
40	119
..	..	@@ -145,7 +224,7 @@
145	224
146	225	objEditor.ctrlPanel.remove(namePanel);
147	226
148		- if (!GroupEditor.allparams)
	227	+ if (!allparams)
149	228	return;
150	229
151	230	// objEditor.ctrlPanel.remove(liveCB);
..	..	@@ -168,7 +247,8 @@
168	247	// objEditor.ctrlPanel.remove(remarkButton);
169	248
170	249	objEditor.ctrlPanel.remove(setupPanel);
171		- objEditor.ctrlPanel.remove(commandsPanel);
	250	+ objEditor.ctrlPanel.remove(setupPanel2);
	251	+ objEditor.ctrlPanel.remove(objectCommandsPanel);
172	252	objEditor.ctrlPanel.remove(pushPanel);
173	253	//objEditor.ctrlPanel.remove(fillPanel);
174	254
..	..	@@ -216,6 +296,12 @@
216	296	client = inClient;
217	297	copy = client;
218	298
	299	+ if (copy.versionlist == null)
	300	+ {
	301	+ copy.versionlist = new Object3D[100];
	302	+ copy.versionindex = -1;
	303	+ }
	304	+
219	305	// "this" is not called: SetupUI2(objEditor);
220	306	}
221	307
..	..	@@ -229,6 +315,12 @@
229	315	client = inClient;
230	316	copy = client;
231	317
	318	+ if (copy.versionlist == null)
	319	+ {
	320	+ copy.versionlist = new Object3D[100];
	321	+ copy.versionindex = -1;
	322	+ }
	323	+
232	324	SetupUI2(callee.GetEditor());
233	325	}
234	326
..	..	@@ -243,6 +335,7 @@
243	335	//localCopy.parent = null;
244	336
245	337	frame = new JFrame();
	338	+ frame.setUndecorated(false);
246	339	objEditor = this;
247	340	this.callee = callee;
248	341
..	..	@@ -260,6 +353,12 @@
260	353	copy = localCopy;
261	354	copy.editWindow = this;
262	355
	356	+ if (copy.versionlist == null)
	357	+ {
	358	+// copy.versions = new byte[100][];
	359	+// copy.versionindex = -1;
	360	+ }
	361	+
263	362	SetupMenu();
264	363
265	364	//SetupName(objEditor); // new
..	..	@@ -273,28 +372,49 @@
273	372	return frame.action(event, obj);
274	373	}
275	374
	375	+ // Cannot work without static
	376	+ static boolean allparams = true;
	377	+
	378	+ static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
	379	+
276	380	void SetupMenu()
277	381	{
278	382	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..."));
	383	+ menuBar.add(fileMenu = new Menu("File"));
	384	+ fileMenu.add(newItem = new MenuItem("New"));
	385	+ fileMenu.add(openItem = new MenuItem("Open..."));
	386	+
	387	+ //oe.menuBar.add(menu = new Menu("Include"));
	388	+ Menu menu = new Menu("Import");
	389	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	390	+ importOBJItem.addActionListener(this);
	391	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	392	+ import3DSItem.addActionListener(this);
	393	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	394	+ importVRMLX3DItem.addActionListener(this);
	395	+ menu.add("-");
	396	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	397	+ importGFDItem.addActionListener(this);
	398	+ fileMenu.add(menu);
	399	+ fileMenu.add("-");
	400	+
	401	+ fileMenu.add(saveItem = new MenuItem("Save"));
	402	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
284	403	//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("-");
	404	+ fileMenu.add("-");
	405	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	406	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	407	+ fileMenu.add("-");
289	408	if (client.parent != null)
290	409	{
291		- windowMenu.add(closeItem = new MenuItem("Close"));
	410	+ fileMenu.add(closeItem = new MenuItem("Close"));
292	411	} else
293	412	{
294		- windowMenu.add(closeItem = new MenuItem("Exit"));
	413	+ fileMenu.add(closeItem = new MenuItem("Exit"));
295	414	}
296	415
297		- loadItem.addActionListener(this);
	416	+ newItem.addActionListener(this);
	417	+ openItem.addActionListener(this);
298	418	saveItem.addActionListener(this);
299	419	saveAsItem.addActionListener(this);
300	420	exportAsItem.addActionListener(this);
..	..	@@ -302,101 +422,69 @@
302	422	//povItem.addActionListener(this);
303	423	closeItem.addActionListener(this);
304	424
305		- menuBar.add(cameraMenu = new Menu("View"));
306		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
307		- //zBufferItem.addActionListener(this);
308		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
309		- //normalLensItem.addActionListener(this);
310		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
311		- revertCameraItem.addActionListener(this);
312		-
313		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
314		- toggleFullScreenItem.addItemListener(this);
315		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
316		- cameraMenu.add("-");
317		-
318		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
319		- toggleTextureItem.addItemListener(this);
320		- toggleTextureItem.setState(CameraPane.textureon);
321		-
322		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
323		- toggleSwitchItem.addItemListener(this);
324		- toggleSwitchItem.setState(CameraPane.SWITCH);
325		-
326		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
327		- toggleHandleItem.addItemListener(this);
328		- toggleHandleItem.setState(CameraPane.HANDLES);
329		-
330		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
331		- togglePaintItem.addItemListener(this);
332		- togglePaintItem.setState(CameraPane.PAINTMODE);
333		-
334		- if (Globals.ADVANCED)
335		- {
336		- cameraMenu.add("-");
337		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
338		- toggleLiveItem.addItemListener(this);
339		- toggleLiveItem.setState(Globals.isLIVE());
340		-
341		- cameraMenu.add(stepItem = new MenuItem("Step"));
342		- stepItem.addActionListener(this);
343		- // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
344		- // toggleDLItem.addItemListener(this);
345		- // toggleDLItem.setState(false);
346		-
347		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
348		- toggleRenderItem.addItemListener(this);
349		- toggleRenderItem.setState(!CameraPane.frozen);
350		-
351		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
352		- toggleDebugItem.addItemListener(this);
353		- toggleDebugItem.setState(CameraPane.DEBUG);
354		-
355		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
356		- toggleFrustumItem.addItemListener(this);
357		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
358		-
359		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
360		- toggleFootContactItem.addItemListener(this);
361		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
362		-
363		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
364		- toggleTimelineItem.addItemListener(this);
365		- }
366		-
367		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
368		-// toggleRootItem.addItemListener(this);
369		-// toggleRootItem.setState(false);
370		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
371		-// animationItem.addItemListener(this);
372		-// animationItem.setState(CameraPane.ANIMATION);
373		- cameraMenu.add("-");
374		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
375		- editCameraItem.addActionListener(this);
376		-
377	425	objectPanel = new JTabbedPane();
	426	+
	427	+ ChangeListener changeListener = new ChangeListener()
	428	+ {
	429	+ public void stateChanged(ChangeEvent changeEvent)
	430	+ {
	431	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
	432	+// {
	433	+// if (latestObject != null)
	434	+// {
	435	+// refreshContents(true);
	436	+// SetMaterial(latestObject);
	437	+// }
	438	+//
	439	+// materialFlushed = true;
	440	+// }
	441	+// if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
	442	+// {
	443	+// if (listUI.size() == 0)
	444	+// EditSelection(false);
	445	+// }
	446	+
	447	+ refreshContents(false); // To refresh Info tab
	448	+ }
	449	+ };
	450	+ objectPanel.addChangeListener(changeListener);
	451	+
378	452	toolbarPanel = new JPanel();
379	453	toolbarPanel.setName("Toolbar");
	454	+
380	455	treePanel = new cGridBag();
381	456	treePanel.setName("Tree");
	457	+
	458	+ editPanel = new cGridBag().setVertical(true);
	459	+ //editPanel.setName("Edit");
	460	+
382	461	ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
383		- ctrlPanel.setName("Edit");
384		- materialPanel = new cGridBag().setVertical(true);
385		- materialPanel.setName("Material");
	462	+
	463	+ editCommandsPanel = new cGridBag();
	464	+ editPanel.add(editCommandsPanel);
	465	+ editPanel.add(ctrlPanel);
	466	+
	467	+ toolboxPanel = new cGridBag().setVertical(true);
	468	+ //toolboxPanel.setName("Toolbox");
	469	+
	470	+ materialPanel = new cGridBag().setVertical(false);
	471	+ //materialPanel.setName("Material");
	472	+
386	473	/JTextPane/
387	474	infoarea = createTextPane();
388	475	doc = infoarea.getStyledDocument();
389	476
390	477	infoarea.setEditable(true);
391	478	SetText();
	479	+
392	480	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
393	481	// infoarea.setOpaque(false);
394	482	// //infoarea.setForeground(textcolor);
395	483	// TEXTAREA infoarea.setLineWrap(true);
396	484	// TEXTAREA infoarea.setWrapStyleWord(true);
397	485	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
398		- infoPanel.setPreferredSize(new Dimension(50, 200));
399		- infoPanel.setName("Info");
	486	+ infoPanel.setPreferredSize(new Dimension(1, 1));
	487	+ //infoPanel.setName("Info");
400	488	//infoPanel.setLayout(new BorderLayout());
401	489	//infoPanel.add(createTextPane());
402	490
..	..	@@ -407,7 +495,14 @@
407	495	mainPanel.setDividerSize(9);
408	496	mainPanel.setDividerLocation(0.5); //1.0);
409	497	mainPanel.setResizeWeight(0.5);
410		-
	498	+
	499	+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
	500	+ BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
	501	+ divider.setDividerSize(15);
	502	+ divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));
	503	+
	504	+ mainPanel.setUI(new BasicSplitPaneUI());
	505	+
411	506	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
412	507	//mainPanel.setLayout(new GridBagLayout());
413	508	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..	..	@@ -475,10 +570,10 @@
475	570	e.printStackTrace();
476	571	}
477	572
478		- String selection = infoarea.getText();
479		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
480		- java.awt.datatransfer.Clipboard clipboard =
481		- Toolkit.getDefaultToolkit().getSystemClipboard();
	573	+// String selection = infoarea.getText();
	574	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	575	+// java.awt.datatransfer.Clipboard clipboard =
	576	+// Toolkit.getDefaultToolkit().getSystemClipboard();
482	577	//clipboard.setContents(data, data);
483	578	}
484	579
..	..	@@ -638,21 +733,147 @@
638	733	}
639	734	}
640	735
	736	+//static GraphicsDevice device = GraphicsEnvironment
	737	+// .getLocalGraphicsEnvironment().getScreenDevices()[0];
	738	+
	739	+ Rectangle keeprect;
	740	+ cRadio radio;
	741	+
	742	+cButton keepButton;
	743	+ cButton twoButton; // Full 3D
	744	+ cButton sixButton;
	745	+ cButton threeButton;
	746	+ cButton sevenButton;
	747	+ cButton fourButton; // full panel
	748	+ cButton oneButton; // full XYZ
	749	+ //cButton currentLayout;
	750	+
	751	+ boolean maximized;
	752	+
	753	+ cButton fullscreenLayout;
	754	+
	755	+ void Minimize()
	756	+ {
	757	+ frame.setState(Frame.ICONIFIED);
	758	+ frame.validate();
	759	+ }
	760	+
	761	+// artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
	762	+// artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
	763	+// artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
	764	+ void Maximize()
	765	+ {
	766	+ if (CameraPane.FULLSCREEN)
	767	+ {
	768	+ ToggleFullScreen();
	769	+ }
	770	+
	771	+ if (maximized)
	772	+ {
	773	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	774	+ }
	775	+ else
	776	+ {
	777	+ keeprect = frame.getBounds();
	778	+// Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	779	+// Dimension rect2 = frame.getToolkit().getScreenSize();
	780	+// frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	781	+// frame.setState(Frame.MAXIMIZED_BOTH);
	782	+ frame.setBounds(frame.getGraphicsConfiguration().getBounds());
	783	+ }
	784	+
	785	+ maximized ^= true;
	786	+
	787	+ frame.validate();
	788	+ }
	789	+
	790	+ cButton minButton;
	791	+ cButton maxButton;
	792	+ cButton fullButton;
	793	+
641	794	void ToggleFullScreen()
642	795	{
643		- if (CameraPane.FULLSCREEN)
	796	+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
	797	+
	798	+ cameraView.ToggleFullScreen();
	799	+
	800	+ if (!CameraPane.FULLSCREEN)
644	801	{
645		- frame.getContentPane().remove(/"Center",/bigThree);
646		- framePanel.add(bigThree);
647		- frame.getContentPane().add(/"Center",/framePanel);
	802	+ device.setFullScreenWindow(null);
	803	+ frame.dispose();
	804	+ frame.setUndecorated(false);
	805	+ frame.validate();
	806	+ frame.setVisible(true);
	807	+
	808	+ //frame.setVisible(false);
	809	+// frame.removeNotify();
	810	+// frame.setUndecorated(false);
	811	+// frame.addNotify();
	812	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	813	+
	814	+// X frame.getContentPane().remove(/"Center",/bigThree);
	815	+// X framePanel.add(bigThree);
	816	+// X frame.getContentPane().add(/"Center",/framePanel);
	817	+ framePanel.setDividerLocation(46);
	818	+
	819	+ //frame.setVisible(true);
	820	+ radio.layout = keepButton;
	821	+ //theFrame = null;
	822	+ keepButton = null;
	823	+ radio.layout.doClick();
	824	+
648	825	} else
649	826	{
650		- frame.getContentPane().remove(/"Center",/framePanel);
651		- framePanel.remove(bigThree);
652		- frame.getContentPane().add(/"Center",/bigThree);
	827	+ keepButton = radio.layout;
	828	+ //keeprect = frame.getBounds();
	829	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	830	+// frame.getToolkit().getScreenSize().height);
	831	+ //frame.setVisible(false);
	832	+
	833	+ frame.dispose();
	834	+ frame.setUndecorated(true);
	835	+ device.setFullScreenWindow(frame);
	836	+ frame.validate();
	837	+ frame.setVisible(true);
	838	+// frame.removeNotify();
	839	+// frame.setUndecorated(true);
	840	+// frame.addNotify();
	841	+// X frame.getContentPane().remove(/"Center",/framePanel);
	842	+// X framePanel.remove(bigThree);
	843	+// X frame.getContentPane().add(/"Center",/bigThree);
	844	+ framePanel.setDividerLocation(0);
	845	+
	846	+ radio.layout = fullscreenLayout;
	847	+ radio.layout.doClick();
	848	+ //frame.setVisible(true);
653	849	}
654		- cameraView.ToggleFullScreen();
	850	+ frame.validate();
	851	+
	852	+ cameraView.requestFocusInWindow();
655	853	}
	854	+
	855	+ private Object3D CompressCopy()
	856	+ {
	857	+ boolean temp = CameraPane.SWITCH;
	858	+ CameraPane.SWITCH = false;
	859	+
	860	+ copy.ExtractBigData(versiontable);
	861	+ // if (copy == client)
	862	+
	863	+ Object3D versions[] = copy.versionlist;
	864	+ copy.versionlist = null;
	865	+
	866	+ //byte[] compress = Compress(copy);
	867	+ Object3D compress = (Object3D)Grafreed.clone(copy);
	868	+
	869	+ copy.versionlist = versions;
	870	+
	871	+ copy.RestoreBigData(versiontable);
	872	+
	873	+ CameraPane.SWITCH = temp;
	874	+
	875	+ return compress;
	876	+ }
656	877
657	878	private JTextPane createTextPane()
658	879	{
..	..	@@ -775,6 +996,7 @@
775	996	{
776	997	SetupMaterial(materialPanel);
777	998	}
	999	+
778	1000	//SetupName();
779	1001	//SetupViews();
780	1002	}
..	..	@@ -784,7 +1006,7 @@
784	1006	// NumberSlider vDivsField;
785	1007	// JCheckBox endcaps;
786	1008	JCheckBox liveCB;
787		- JCheckBox selectCB;
	1009	+ JCheckBox selectableCB;
788	1010	JCheckBox hideCB;
789	1011	JCheckBox link2masterCB;
790	1012	JCheckBox markCB;
..	..	@@ -792,7 +1014,12 @@
792	1014	JCheckBox speedupCB;
793	1015	JCheckBox rewindCB;
794	1016	JCheckBox flipVCB;
	1017	+
	1018	+ cCheckBox toggleTextureCB;
	1019	+ cCheckBox toggleSwitchCB;
	1020	+
795	1021	JComboBox texresMenu;
	1022	+
796	1023	JButton resetButton;
797	1024	JButton stepButton;
798	1025	JButton stepAllButton;
..	..	@@ -801,9 +1028,13 @@
801	1028	JButton fasterButton;
802	1029	JButton remarkButton;
803	1030
	1031	+ cGridBag editPanel;
	1032	+ cGridBag editCommandsPanel;
	1033	+
804	1034	cGridBag namePanel;
805	1035	cGridBag setupPanel;
806		- cGridBag commandsPanel;
	1036	+ cGridBag setupPanel2;
	1037	+ cGridBag objectCommandsPanel;
807	1038	cGridBag pushPanel;
808	1039	cGridBag fillPanel;
809	1040
..	..	@@ -975,60 +1206,68 @@
975	1206	namePanel = new cGridBag();
976	1207
977	1208	nameField = AddText(namePanel, copy.GetName());
978		- namePanel.add(nameField);
	1209	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
979	1210	oe.ctrlPanel.add(namePanel);
980	1211
981	1212	oe.ctrlPanel.Return();
982	1213
983		- if (!GroupEditor.allparams)
	1214	+ if (!allparams)
984	1215	return;
985	1216
986	1217	setupPanel = new cGridBag().setVertical(false);
987	1218
988	1219	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
989	1220	liveCB.setToolTipText("Animate object");
990		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
991		- selectCB.setToolTipText("Make object selectable");
	1221	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1222	+ selectableCB.setToolTipText("Make object selectable");
992	1223	// Return();
	1224	+
993	1225	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
994	1226	hideCB.setToolTipText("Hide object");
995	1227	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
996		- markCB.setToolTipText("Set the animation target transform");
	1228	+ markCB.setToolTipText("As animation target transform");
997	1229
998		- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	1230	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1231	+
	1232	+ setupPanel2 = new cGridBag().setVertical(false);
	1233	+
	1234	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
999	1235	rewindCB.setToolTipText("Rewind animation");
1000	1236
1001		- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
1002		- randomCB.setToolTipText("Option for switch node");
	1237	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1238	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1003	1239
	1240	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1241	+ link2masterCB.setToolTipText("Attach to support");
	1242	+
1004	1243	if (Globals.ADVANCED)
1005	1244	{
1006		- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
1007		- link2masterCB.setToolTipText("Attach to support");
1008		- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1245	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1009	1246	speedupCB.setToolTipText("Option motion capture");
1010	1247	}
1011	1248
1012	1249	oe.ctrlPanel.add(setupPanel);
1013	1250	oe.ctrlPanel.Return();
	1251	+ oe.ctrlPanel.add(setupPanel2);
	1252	+ oe.ctrlPanel.Return();
1014	1253
1015		- commandsPanel = new cGridBag().setVertical(false);
	1254	+ objectCommandsPanel = new cGridBag().setVertical(false);
1016	1255
1017		- resetButton = AddButton(commandsPanel, "Reset");
	1256	+ resetButton = AddButton(objectCommandsPanel, "Reset");
1018	1257	resetButton.setToolTipText("Jump to frame zero");
1019		- stepButton = AddButton(commandsPanel, "Step");
	1258	+ stepButton = AddButton(objectCommandsPanel, "Step");
1020	1259	stepButton.setToolTipText("Step one frame");
1021	1260	// resetAllButton = AddButton(oe, "Reset All");
1022	1261	// stepAllButton = AddButton(oe, "Step All");
1023	1262	// Return();
1024		- slowerButton = AddButton(commandsPanel, "Slow");
	1263	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1025	1264	slowerButton.setToolTipText("Decrease animation speed");
1026		- fasterButton = AddButton(commandsPanel, "Fast");
	1265	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1027	1266	fasterButton.setToolTipText("Increase animation speed");
1028		- remarkButton = AddButton(commandsPanel, "Remark");
	1267	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1029	1268	remarkButton.setToolTipText("Set the current transform as the target");
1030	1269
1031		- oe.ctrlPanel.add(commandsPanel);
	1270	+ oe.ctrlPanel.add(objectCommandsPanel);
1032	1271	oe.ctrlPanel.Return();
1033	1272
1034	1273	pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
..	..	@@ -1234,8 +1473,11 @@
1234	1473	//worldPanel.setName("World");
1235	1474	centralPanel = new cGridBag();
1236	1475	centralPanel.preferredWidth = 20;
1237		- timelinePanel = new JPanel(new BorderLayout());
1238		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1476	+
	1477	+ if (Globals.ADVANCED)
	1478	+ {
	1479	+ timelinePanel = new JPanel(new BorderLayout());
	1480	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1239	1481
1240	1482	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1241	1483	cameraPanel.setContinuousLayout(true);
..	..	@@ -1244,7 +1486,10 @@
1244	1486	// cameraPanel.setDividerSize(9);
1245	1487	cameraPanel.setResizeWeight(1.0);
1246	1488
	1489	+ }
	1490	+
1247	1491	centralPanel.add(cameraView);
	1492	+ centralPanel.setFocusable(true);
1248	1493	//frame.setJMenuBar(timelineMenubar);
1249	1494	//centralPanel.add(timelinePanel);
1250	1495
..	..	@@ -1270,6 +1515,7 @@
1270	1515	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1271	1516	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1272	1517	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1518	+ //XYZPanel.setName("XYZ");
1273	1519
1274	1520	/*
1275	1521	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1307,13 +1553,30 @@
1307	1553	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1308	1554	//tmp.setName("Edit");
1309	1555	objectPanel.add(materialPanel);
	1556	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1557	+ objectPanel.setToolTipTextAt(0, "Material");
	1558	+
	1559	+ objectPanel.add(toolboxPanel);
	1560	+ objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
	1561	+ objectPanel.setToolTipTextAt(1, "Objects & backgrounds");
	1562	+
1310	1563	// JPanel north = new JPanel(new BorderLayout());
1311	1564	// north.setName("Edit");
1312	1565	// north.add(ctrlPanel, BorderLayout.NORTH);
1313	1566	// objectPanel.add(north);
1314		- objectPanel.add(ctrlPanel);
1315		- objectPanel.add(infoPanel);
1316		-
	1567	+ objectPanel.add(editPanel);
	1568	+ objectPanel.setIconAt(2, GetIcon("icons/write.png"));
	1569	+ objectPanel.setToolTipTextAt(2, "Edit controls");
	1570	+
	1571	+ //if (Globals.ADVANCED)
	1572	+ objectPanel.add(infoPanel);
	1573	+ objectPanel.setIconAt(3, GetIcon("icons/info.png"));
	1574	+ objectPanel.setToolTipTextAt(3, "Information");
	1575	+
	1576	+ objectPanel.add(XYZPanel);
	1577	+ objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
	1578	+ objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
	1579	+
1317	1580	/*
1318	1581	aConstraints.gridx = 0;
1319	1582	aConstraints.gridwidth = 1;
..	..	@@ -1321,7 +1584,7 @@
1321	1584	aConstraints.gridy += 1;
1322	1585	aConstraints.gridwidth = 1;
1323	1586	mainPanel.add(objectPanel, aConstraints);
1324		- */
	1587	+ */
1325	1588
1326	1589	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1327	1590	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1333,14 +1596,12 @@
1333	1596	scrollpane.addMouseWheelListener(this); // Default not fast enough
1334	1597
1335	1598	/JTabbedPane/ scenePanel = new cGridBag();
1336		- scenePanel.preferredWidth = 6;
	1599	+ scenePanel.preferredWidth = 5;
1337	1600
1338	1601	JTabbedPane tabbedPane = new JTabbedPane();
1339	1602	tabbedPane.add(scrollpane);
1340	1603
1341		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1342		-
1343		- optionsPanel = new cGridBag().setVertical(true);
	1604	+ optionsPanel = new cGridBag().setVertical(false);
1344	1605
1345	1606	optionsPanel.setName("Options");
1346	1607
..	..	@@ -1348,6 +1609,8 @@
1348	1609
1349	1610	tabbedPane.add(optionsPanel);
1350	1611
	1612	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1613	+
1351	1614	scenePanel.add(tabbedPane);
1352	1615
1353	1616	/*
..	..	@@ -1411,7 +1674,7 @@
1411	1674	bigThree = new cGridBag();
1412	1675	bigThree.addComponent(scenePanel);
1413	1676	bigThree.addComponent(centralPanel);
1414		- bigThree.addComponent(XYZPanel);
	1677	+ //bigThree.addComponent(XYZPanel);
1415	1678
1416	1679	// // SIDE EFFECT!!!
1417	1680	// aConstraints.gridx = 0;
..	..	@@ -1420,9 +1683,9 @@
1420	1683	// aConstraints.gridheight = 1;
1421	1684
1422	1685	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1423		- framePanel.setContinuousLayout(true);
1424		- framePanel.setOneTouchExpandable(true);
1425		- framePanel.setDividerLocation(0.8);
	1686	+ framePanel.setContinuousLayout(false);
	1687	+ framePanel.setOneTouchExpandable(false);
	1688	+ //.setDividerLocation(0.8);
1426	1689	//framePanel.setDividerSize(15);
1427	1690	//framePanel.setResizeWeight(0.15);
1428	1691	framePanel.setName("Frame");
..	..	@@ -1440,14 +1703,18 @@
1440	1703	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1441	1704
1442	1705	frame.setSize(1280, 860);
1443		- frame.setVisible(true);
1444		-
	1706	+
	1707	+ cameraView.requestFocusInWindow();
	1708	+
1445	1709	gridPanel.setDividerLocation(1.0);
	1710	+
	1711	+ frame.validate();
	1712	+
	1713	+ frame.setVisible(true);
1446	1714
1447	1715	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1448	1716	frame.addWindowListener(new WindowAdapter()
1449	1717	{
1450		-
1451	1718	public void windowClosing(WindowEvent e)
1452	1719	{
1453	1720	Close();
..	..	@@ -1470,12 +1737,384 @@
1470	1737	ctrlPanel.removeAll();
1471	1738	}
1472	1739
1473		- void SetupMaterial(cGridBag panel)
	1740	+ void SetupMaterial(cGridBag materialpanel)
1474	1741	{
1475		- /*
	1742	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1743	+
	1744	+ cLabel skin = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1745	+ skin.setToolTipText("Skin");
	1746	+ skin.addMouseListener(new MouseAdapter()
	1747	+ {
	1748	+ public void mouseClicked(MouseEvent e)
	1749	+ {
	1750	+ Object3D object = Grafreed.materials.versionlist[0].get(0);
	1751	+ cMaterial material = object.material;
	1752	+
	1753	+ // Skin
	1754	+ colorField.setFloat(material.color);
	1755	+ saturationField.setFloat(material.modulation);
	1756	+ subsurfaceField.setFloat(material.subsurface);
	1757	+ selfshadowField.setFloat(material.diffuseness);
	1758	+ diffusenessField.setFloat(material.factor);
	1759	+ shininessField.setFloat(material.shininess);
	1760	+ shadowbiasField.setFloat(material.shadowbias);
	1761	+ diffuseField.setFloat(material.diffuse);
	1762	+ specularField.setFloat(material.specular);
	1763	+
	1764	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	1765	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	1766	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	1767	+
	1768	+ materialtouched = true;
	1769	+ applySelf();
	1770	+ }
	1771	+ });
	1772	+ presetpanel.add(skin);
	1773	+
	1774	+ cLabel lambert = GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF);
	1775	+ lambert.setToolTipText("Diffuse");
	1776	+ lambert.addMouseListener(new MouseAdapter()
	1777	+ {
	1778	+ public void mouseClicked(MouseEvent e)
	1779	+ {
	1780	+ Object3D object = Grafreed.materials.versionlist[2].get(0);
	1781	+ cMaterial material = object.material;
	1782	+
	1783	+ diffusenessField.setFloat(material.factor);
	1784	+ selfshadowField.setFloat(material.diffuseness);
	1785	+
	1786	+ materialtouched = true;
	1787	+ applySelf();
	1788	+ }
	1789	+ });
	1790	+ presetpanel.add(lambert);
	1791	+
	1792	+ cLabel diffuse2 = GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF);
	1793	+ diffuse2.setToolTipText("Diffuse2");
	1794	+ diffuse2.addMouseListener(new MouseAdapter()
	1795	+ {
	1796	+ public void mouseClicked(MouseEvent e)
	1797	+ {
	1798	+ Object3D object = Grafreed.materials.versionlist[3].get(0);
	1799	+ cMaterial material = object.material;
	1800	+
	1801	+ diffusenessField.setFloat(material.factor);
	1802	+ selfshadowField.setFloat(material.diffuseness);
	1803	+
	1804	+ materialtouched = true;
	1805	+ applySelf();
	1806	+ }
	1807	+ });
	1808	+ presetpanel.add(diffuse2);
	1809	+
	1810	+ cLabel diffusemoon = GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF);
	1811	+ diffusemoon.setToolTipText("Moon");
	1812	+ diffusemoon.addMouseListener(new MouseAdapter()
	1813	+ {
	1814	+ public void mouseClicked(MouseEvent e)
	1815	+ {
	1816	+ Object3D object = Grafreed.materials.versionlist[4].get(0);
	1817	+ cMaterial material = object.material;
	1818	+
	1819	+ diffusenessField.setFloat(material.factor);
	1820	+ selfshadowField.setFloat(material.diffuseness);
	1821	+
	1822	+ materialtouched = true;
	1823	+ applySelf();
	1824	+ }
	1825	+ });
	1826	+ presetpanel.add(diffusemoon);
	1827	+
	1828	+ cLabel diffusemoon2 = GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF);
	1829	+ diffusemoon2.setToolTipText("Moon2");
	1830	+ diffusemoon2.addMouseListener(new MouseAdapter()
	1831	+ {
	1832	+ public void mouseClicked(MouseEvent e)
	1833	+ {
	1834	+ Object3D object = Grafreed.materials.versionlist[5].get(0);
	1835	+ cMaterial material = object.material;
	1836	+
	1837	+ diffusenessField.setFloat(material.factor);
	1838	+ selfshadowField.setFloat(material.diffuseness);
	1839	+
	1840	+ materialtouched = true;
	1841	+ applySelf();
	1842	+ }
	1843	+ });
	1844	+ presetpanel.add(diffusemoon2);
	1845	+
	1846	+ cLabel diffusemoon3 = GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF);
	1847	+ diffusemoon3.setToolTipText("Moon3");
	1848	+ diffusemoon3.addMouseListener(new MouseAdapter()
	1849	+ {
	1850	+ public void mouseClicked(MouseEvent e)
	1851	+ {
	1852	+ Object3D object = Grafreed.materials.versionlist[6].get(0);
	1853	+ cMaterial material = object.material;
	1854	+
	1855	+ diffusenessField.setFloat(material.factor);
	1856	+ selfshadowField.setFloat(material.diffuseness);
	1857	+
	1858	+ materialtouched = true;
	1859	+ applySelf();
	1860	+ }
	1861	+ });
	1862	+ presetpanel.add(diffusemoon3);
	1863	+
	1864	+ cLabel diffusesheen = GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF);
	1865	+ diffusesheen.setToolTipText("Sheen");
	1866	+ diffusesheen.addMouseListener(new MouseAdapter()
	1867	+ {
	1868	+ public void mouseClicked(MouseEvent e)
	1869	+ {
	1870	+ Object3D object = Grafreed.materials.versionlist[7].get(0);
	1871	+ cMaterial material = object.material;
	1872	+
	1873	+ sheenField.setFloat(material.sheen);
	1874	+
	1875	+ materialtouched = true;
	1876	+ applySelf();
	1877	+ }
	1878	+ });
	1879	+ presetpanel.add(diffusesheen);
	1880	+
	1881	+ cLabel rough = GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF);
	1882	+ rough.setToolTipText("Rough metal");
	1883	+ rough.addMouseListener(new MouseAdapter()
	1884	+ {
	1885	+ public void mouseClicked(MouseEvent e)
	1886	+ {
	1887	+ Object3D object = Grafreed.materials.versionlist[1].get(0);
	1888	+ cMaterial material = object.material;
	1889	+
	1890	+ shininessField.setFloat(material.shininess);
	1891	+ velvetField.setFloat(material.velvet);
	1892	+
	1893	+ materialtouched = true;
	1894	+ applySelf();
	1895	+ }
	1896	+ });
	1897	+ presetpanel.add(rough);
	1898	+
	1899	+ cLabel rough2 = GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF);
	1900	+ rough2.setToolTipText("Medium metal");
	1901	+ rough2.addMouseListener(new MouseAdapter()
	1902	+ {
	1903	+ public void mouseClicked(MouseEvent e)
	1904	+ {
	1905	+ Object3D object = Grafreed.materials.versionlist[13].get(0);
	1906	+ cMaterial material = object.material;
	1907	+
	1908	+ shininessField.setFloat(material.shininess);
	1909	+ lightareaField.setFloat(material.lightarea);
	1910	+
	1911	+ materialtouched = true;
	1912	+ applySelf();
	1913	+ }
	1914	+ });
	1915	+ presetpanel.add(rough2);
	1916	+
	1917	+ cLabel shini0 = GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF);
	1918	+ shini0.setToolTipText("Shiny");
	1919	+ shini0.addMouseListener(new MouseAdapter()
	1920	+ {
	1921	+ public void mouseClicked(MouseEvent e)
	1922	+ {
	1923	+ Object3D object = Grafreed.materials.versionlist[14].get(0);
	1924	+ cMaterial material = object.material;
	1925	+
	1926	+ shininessField.setFloat(material.shininess);
	1927	+ lightareaField.setFloat(material.lightarea);
	1928	+
	1929	+ materialtouched = true;
	1930	+ applySelf();
	1931	+ }
	1932	+ });
	1933	+ presetpanel.add(shini0);
	1934	+
	1935	+ cLabel shini1 = GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF);
	1936	+ shini1.setToolTipText("Shiny2");
	1937	+ shini1.addMouseListener(new MouseAdapter()
	1938	+ {
	1939	+ public void mouseClicked(MouseEvent e)
	1940	+ {
	1941	+ Object3D object = Grafreed.materials.versionlist[11].get(0);
	1942	+ cMaterial material = object.material;
	1943	+
	1944	+ shininessField.setFloat(material.shininess);
	1945	+ lightareaField.setFloat(material.lightarea);
	1946	+
	1947	+ materialtouched = true;
	1948	+ applySelf();
	1949	+ }
	1950	+ });
	1951	+ presetpanel.add(shini1);
	1952	+
	1953	+ cLabel shini2 = GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF);
	1954	+ shini2.setToolTipText("Shiny3");
	1955	+ shini2.addMouseListener(new MouseAdapter()
	1956	+ {
	1957	+ public void mouseClicked(MouseEvent e)
	1958	+ {
	1959	+ Object3D object = Grafreed.materials.versionlist[12].get(0);
	1960	+ cMaterial material = object.material;
	1961	+
	1962	+ shininessField.setFloat(material.shininess);
	1963	+ lightareaField.setFloat(material.lightarea);
	1964	+
	1965	+ materialtouched = true;
	1966	+ applySelf();
	1967	+ }
	1968	+ });
	1969	+ presetpanel.add(shini2);
	1970	+
	1971	+ cLabel aniso = GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF);
	1972	+ aniso.setToolTipText("AnisoU");
	1973	+ aniso.addMouseListener(new MouseAdapter()
	1974	+ {
	1975	+ public void mouseClicked(MouseEvent e)
	1976	+ {
	1977	+ Object3D object = Grafreed.materials.versionlist[8].get(0);
	1978	+ cMaterial material = object.material;
	1979	+
	1980	+ anisoField.setFloat(material.aniso);
	1981	+ anisoVField.setFloat(material.anisoV);
	1982	+
	1983	+ materialtouched = true;
	1984	+ applySelf();
	1985	+ }
	1986	+ });
	1987	+ presetpanel.add(aniso);
	1988	+
	1989	+ cLabel aniso2 = GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF);
	1990	+ aniso2.setToolTipText("AnisoV");
	1991	+ aniso2.addMouseListener(new MouseAdapter()
	1992	+ {
	1993	+ public void mouseClicked(MouseEvent e)
	1994	+ {
	1995	+ Object3D object = Grafreed.materials.versionlist[9].get(0);
	1996	+ cMaterial material = object.material;
	1997	+
	1998	+ anisoField.setFloat(material.aniso);
	1999	+ anisoVField.setFloat(material.anisoV);
	2000	+
	2001	+ materialtouched = true;
	2002	+ applySelf();
	2003	+ }
	2004	+ });
	2005	+ presetpanel.add(aniso2);
	2006	+
	2007	+ cLabel aniso3 = GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF);
	2008	+ aniso3.setToolTipText("AnisoUV");
	2009	+ aniso3.addMouseListener(new MouseAdapter()
	2010	+ {
	2011	+ public void mouseClicked(MouseEvent e)
	2012	+ {
	2013	+ Object3D object = Grafreed.materials.versionlist[10].get(0);
	2014	+ cMaterial material = object.material;
	2015	+
	2016	+ anisoField.setFloat(material.aniso);
	2017	+ anisoVField.setFloat(material.anisoV);
	2018	+
	2019	+ materialtouched = true;
	2020	+ applySelf();
	2021	+ }
	2022	+ });
	2023	+ presetpanel.add(aniso3);
	2024	+
	2025	+ cLabel velvet0 = GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF);
	2026	+ velvet0.setToolTipText("Velvet");
	2027	+ velvet0.addMouseListener(new MouseAdapter()
	2028	+ {
	2029	+ public void mouseClicked(MouseEvent e)
	2030	+ {
	2031	+ Object3D object = Grafreed.materials.versionlist[15].get(0);
	2032	+ cMaterial material = object.material;
	2033	+
	2034	+ diffusenessField.setFloat(material.factor);
	2035	+ selfshadowField.setFloat(material.diffuseness);
	2036	+ sheenField.setFloat(material.sheen);
	2037	+ shininessField.setFloat(material.shininess);
	2038	+ velvetField.setFloat(material.velvet);
	2039	+ shiftField.setFloat(material.shift);
	2040	+
	2041	+ materialtouched = true;
	2042	+ applySelf();
	2043	+ }
	2044	+ });
	2045	+ presetpanel.add(velvet0);
	2046	+
	2047	+ cLabel bump0 = GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF);
	2048	+ bump0.setToolTipText("Bump texture");
	2049	+ bump0.addMouseListener(new MouseAdapter()
	2050	+ {
	2051	+ public void mouseClicked(MouseEvent e)
	2052	+ {
	2053	+ Object3D object = Grafreed.materials.versionlist[16].get(0);
	2054	+ cMaterial material = object.material;
	2055	+
	2056	+ bumpField.setFloat(object.projectedVertices[0].x / 1000.0);
	2057	+ noiseField.setFloat(object.projectedVertices[0].y / 1000.0);
	2058	+ powerField.setFloat(object.projectedVertices[2].x / 1000.0);
	2059	+
	2060	+ materialtouched = true;
	2061	+ applySelf();
	2062	+ }
	2063	+ });
	2064	+ presetpanel.add(bump0);
	2065	+
	2066	+ cLabel halo = GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF);
	2067	+ halo.setToolTipText("Halo");
	2068	+ halo.addMouseListener(new MouseAdapter()
	2069	+ {
	2070	+ public void mouseClicked(MouseEvent e)
	2071	+ {
	2072	+ Object3D object = Grafreed.materials.versionlist[17].get(0);
	2073	+ cMaterial material = object.material;
	2074	+
	2075	+ opacityPowerField.setFloat(object.projectedVertices[2].y / 1000.0);
	2076	+
	2077	+ materialtouched = true;
	2078	+ applySelf();
	2079	+ }
	2080	+ });
	2081	+ presetpanel.add(halo);
	2082	+
	2083	+ cLabel candle = GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF);
	2084	+ candle.setToolTipText("Candle");
	2085	+ candle.addMouseListener(new MouseAdapter()
	2086	+ {
	2087	+ public void mouseClicked(MouseEvent e)
	2088	+ {
	2089	+ Object3D object = Grafreed.materials.versionlist[18].get(0);
	2090	+ cMaterial material = object.material;
	2091	+
	2092	+ subsurfaceField.setFloat(material.subsurface);
	2093	+ shadowbiasField.setFloat(material.shadowbias);
	2094	+ ambientField.setFloat(material.ambient);
	2095	+ specularField.setFloat(material.specular);
	2096	+ lightareaField.setFloat(material.lightarea);
	2097	+ shininessField.setFloat(material.shininess);
	2098	+
	2099	+ materialtouched = true;
	2100	+ applySelf();
	2101	+ }
	2102	+ });
	2103	+ presetpanel.add(candle);
	2104	+
	2105	+ cGridBag panel = new cGridBag().setVertical(true);
	2106	+
	2107	+ presetpanel.preferredWidth = 1;
	2108	+
	2109	+ materialpanel.add(presetpanel);
	2110	+ materialpanel.add(panel);
	2111	+
	2112	+ panel.preferredWidth = 8;
	2113	+
	2114	+ /*
1476	2115	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1477	2116	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1478		- */
	2117	+ */
1479	2118
1480	2119	cGridBag editBar = new cGridBag().setVertical(false);
1481	2120
..	..	@@ -1509,45 +2148,50 @@
1509	2148	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1510	2149
1511	2150	cGridBag colorSection = new cGridBag().setVertical(true);
	2151	+
	2152	+ cGridBag huepanel = new cGridBag();
	2153	+ cGridBag huelabel = new cGridBag();
	2154	+ skin = GetLabel("icons/hue.png", false);
	2155	+ skin.fit = true;
	2156	+ huelabel.add(skin);
	2157	+ huelabel.preferredWidth = 20;
	2158	+ huepanel.add(new cGridBag()); // Label
	2159	+ huepanel.add(huelabel); // Field/slider
	2160	+
	2161	+ huepanel.preferredHeight = 7;
	2162	+
	2163	+ colorSection.add(huepanel);
1512	2164
1513	2165	cGridBag color = new cGridBag();
1514		- color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1515		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1516		- color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2166	+
	2167	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	2168	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2169	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2170	+
1517	2171	//colorField.preferredWidth = 200;
1518	2172	colorSection.add(color);
1519	2173
1520	2174	cGridBag modulation = new cGridBag();
1521	2175	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1522	2176	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1523		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2177	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1524	2178	colorSection.add(modulation);
1525	2179
	2180	+ cGridBag opacity = new cGridBag();
	2181	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	2182	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2183	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	2184	+ colorSection.add(opacity);
	2185	+
	2186	+ colorSection.add(GetSeparator());
	2187	+
1526	2188	cGridBag texture = new cGridBag();
1527	2189	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1528	2190	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1529	2191	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1530	2192	colorSection.add(texture);
1531	2193
1532		- cGridBag anisoU = new cGridBag();
1533		- anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1534		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1535		- anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1536		- colorSection.add(anisoU);
1537		-
1538		- cGridBag anisoV = new cGridBag();
1539		- anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1540		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1541		- anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1542		- colorSection.add(anisoV);
1543		-
1544		- cGridBag shadowbias = new cGridBag();
1545		- shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1546		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1547		- shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1548		- colorSection.add(shadowbias);
1549		-
1550		- panel.add(new JSeparator());
	2194	+ panel.add(GetSeparator());
1551	2195
1552	2196	panel.add(colorSection);
1553	2197
..	..	@@ -1597,7 +2241,13 @@
1597	2241	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1598	2242	diffuseSection.add(fakedepth);
1599	2243
1600		- panel.add(new JSeparator());
	2244	+ cGridBag shadowbias = new cGridBag();
	2245	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	2246	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2247	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	2248	+ diffuseSection.add(shadowbias);
	2249	+
	2250	+ panel.add(GetSeparator());
1601	2251
1602	2252	panel.add(diffuseSection);
1603	2253
..	..	@@ -1647,42 +2297,48 @@
1647	2297	// aConstraints.gridy += 1;
1648	2298	// aConstraints.gridwidth = 1;
1649	2299
	2300	+ cGridBag anisoU = new cGridBag();
	2301	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	2302	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2303	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2304	+ specularSection.add(anisoU);
1650	2305
1651		- panel.add(new JSeparator());
	2306	+ cGridBag anisoV = new cGridBag();
	2307	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	2308	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	2309	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	2310	+ specularSection.add(anisoV);
	2311	+
	2312	+
	2313	+ panel.add(GetSeparator());
1652	2314
1653	2315	panel.add(specularSection);
1654	2316
1655	2317	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1656	2318
1657		- cGridBag globalSection = new cGridBag().setVertical(true);
	2319	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1658	2320
1659	2321	cGridBag camera = new cGridBag();
1660	2322	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1661	2323	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1662	2324	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1663		- globalSection.add(camera);
	2325	+ colorSection.add(camera);
1664	2326
1665	2327	cGridBag ambient = new cGridBag();
1666	2328	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1667	2329	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1668	2330	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1669		- globalSection.add(ambient);
	2331	+ colorSection.add(ambient);
1670	2332
1671	2333	cGridBag backlit = new cGridBag();
1672	2334	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1673	2335	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1674	2336	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1675		- globalSection.add(backlit);
	2337	+ colorSection.add(backlit);
1676	2338
1677		- cGridBag opacity = new cGridBag();
1678		- opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1679		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1680		- opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1681		- globalSection.add(opacity);
1682		-
1683		- panel.add(new JSeparator());
	2339	+ //panel.add(new JSeparator());
1684	2340
1685		- panel.add(globalSection);
	2341	+ //panel.add(globalSection);
1686	2342
1687	2343	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1688	2344
..	..	@@ -1724,7 +2380,7 @@
1724	2380	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1725	2381	textureSection.add(opacityPower);
1726	2382
1727		- panel.add(new JSeparator());
	2383	+ panel.add(GetSeparator());
1728	2384
1729	2385	panel.add(textureSection);
1730	2386
..	..	@@ -1789,8 +2445,9 @@
1789	2445	// 3D models
1790	2446	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1791	2447	{
1792		- lastConverter = new com.jmex.model.converters.MaxToJme();
1793		- LoadFile(filename, lastConverter);
	2448	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2449	+ //LoadFile(filename, lastConverter);
	2450	+ LoadObjFile(filename); // New 3ds loader
1794	2451	continue;
1795	2452	}
1796	2453	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1991,6 +2648,7 @@
1991	2648	e2.printStackTrace();
1992	2649	}
1993	2650	}
	2651	+
1994	2652	LoadJMEThread loadThread;
1995	2653
1996	2654	class LoadJMEThread extends Thread
..	..	@@ -2048,6 +2706,7 @@
2048	2706	//LoadFile0(filename, converter);
2049	2707	}
2050	2708	}
	2709	+
2051	2710	LoadOBJThread loadObjThread;
2052	2711
2053	2712	class LoadOBJThread extends Thread
..	..	@@ -2126,19 +2785,19 @@
2126	2785
2127	2786	void LoadObjFile(String fullname)
2128	2787	{
2129		- /*
	2788	+ System.out.println("Loading " + fullname);
	2789	+ /**/
2130	2790	//lastFilename = fullname;
2131	2791	if(loadObjThread == null)
2132	2792	{
2133		- loadObjThread = new LoadOBJThread();
2134		- loadObjThread.start();
	2793	+ loadObjThread = new LoadOBJThread();
	2794	+ loadObjThread.start();
2135	2795	}
2136	2796
2137	2797	loadObjThread.add(fullname);
2138		- */
	2798	+ /**/
2139	2799
2140		- System.out.println("Loading " + fullname);
2141		- makeSomething(new FileObject(fullname, true), true);
	2800	+ //makeSomething(new FileObject(fullname, true), true);
2142	2801	}
2143	2802
2144	2803	void LoadGFDFile(String fullname)
..	..	@@ -2514,6 +3173,7 @@
2514	3173	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2515	3174	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2516	3175	}
	3176	+
2517	3177	//cJME.count++;
2518	3178	//cJME.count %= 12;
2519	3179	if (gc)
..	..	@@ -2697,6 +3357,7 @@
2697	3357	}
2698	3358	}
2699	3359	}
	3360	+
2700	3361	cFileSystemPane FSPane;
2701	3362
2702	3363	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2706,7 +3367,7 @@
2706	3367
2707	3368	freezematerial = true;
2708	3369	colorField.setFloat(mat.color);
2709		- modulationField.setFloat(mat.modulation);
	3370	+ saturationField.setFloat(mat.modulation);
2710	3371	metalnessField.setFloat(mat.metalness);
2711	3372	diffuseField.setFloat(mat.diffuse);
2712	3373	specularField.setFloat(mat.specular);
..	..	@@ -2750,11 +3411,14 @@
2750	3411	}
2751	3412	}
2752	3413	}
	3414	+
2753	3415	freezematerial = false;
2754	3416	}
2755	3417
2756	3418	void SetMaterial(Object3D object)
2757	3419	{
	3420	+ latestObject = object;
	3421	+
2758	3422	cMaterial mat = object.material;
2759	3423
2760	3424	if (mat == null)
..	..	@@ -2866,12 +3530,17 @@
2866	3530	// }
2867	3531
2868	3532	/**/
2869		- if (deselect)
	3533	+ if (deselect \|\| child == null)
2870	3534	{
2871	3535	//group.deselectAll();
2872	3536	//freeze = true;
2873	3537	GetTree().clearSelection();
2874	3538	//freeze = false;
	3539	+
	3540	+ if (child == null)
	3541	+ {
	3542	+ return;
	3543	+ }
2875	3544	}
2876	3545
2877	3546	//group.addSelectee(child);
..	..	@@ -2940,7 +3609,7 @@
2940	3609	cameraView.ToggleDL();
2941	3610	cameraView.repaint();
2942	3611	return;
2943		- } else if (event.getSource() == toggleTextureItem)
	3612	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2944	3613	{
2945	3614	cameraView.ToggleTexture();
2946	3615	// june 2013 copy.HardTouch();
..	..	@@ -2979,9 +3648,9 @@
2979	3648	frame.validate();
2980	3649
2981	3650	return;
2982		- } else if (event.getSource() == toggleSwitchItem)
	3651	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2983	3652	{
2984		- cameraView.ToggleRandom();
	3653	+ cameraView.ToggleSwitch();
2985	3654	cameraView.repaint();
2986	3655	return;
2987	3656	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3009,8 +3678,9 @@
3009	3678	} else if (event.getSource() == liveCB)
3010	3679	{
3011	3680	copy.live ^= true;
	3681	+ objEditor.refreshContents(true); // To show item colors
3012	3682	return;
3013		- } else if (event.getSource() == selectCB)
	3683	+ } else if (event.getSource() == selectableCB)
3014	3684	{
3015	3685	copy.dontselect ^= true;
3016	3686	return;
..	..	@@ -3018,7 +3688,7 @@
3018	3688	{
3019	3689	copy.hide ^= true;
3020	3690	copy.Touch(); // display list issue
3021		- objEditor.refreshContents();
	3691	+ objEditor.refreshContents(true); // To show item colors
3022	3692	return;
3023	3693	} else if (event.getSource() == link2masterCB)
3024	3694	{
..	..	@@ -3052,8 +3722,9 @@
3052	3722
3053	3723	public void actionPerformed(ActionEvent event)
3054	3724	{
	3725	+ Object source = event.getSource();
3055	3726	// SCRIPT DIALOG
3056		- if (event.getSource() == okbutton)
	3727	+ if (source == okbutton)
3057	3728	{
3058	3729	textpanel.setVisible(false);
3059	3730	textpanel.remove(textarea);
..	..	@@ -3065,7 +3736,7 @@
3065	3736	textarea = null;
3066	3737	textpanel = null;
3067	3738	}
3068		- if (event.getSource() == cancelbutton)
	3739	+ if (source == cancelbutton)
3069	3740	{
3070	3741	textpanel.setVisible(false);
3071	3742	textpanel.remove(textarea);
..	..	@@ -3077,50 +3748,50 @@
3077	3748	//applySelf();
3078	3749	//client.refreshEditWindow();
3079	3750	//refreshContents();
3080		- if (event.getSource() == nameField)
	3751	+ if (source == nameField)
3081	3752	{
3082	3753	//System.out.println("ObjEditor " + event);
3083	3754	applySelf0(true);
3084	3755	//parent.applySelf();
3085	3756	objEditor.refreshContents();
3086		- } else if (event.getSource() == resetButton)
	3757	+ } else if (source == resetButton)
3087	3758	{
3088	3759	CameraPane.fullreset = true;
3089	3760	copy.Reset(); // ResetMeshes();
3090	3761	copy.Touch();
3091	3762	objEditor.refreshContents();
3092		- } else if (event.getSource() == stepItem)
	3763	+ } else if (source == stepItem)
3093	3764	{
3094	3765	//cameraView.ONESTEP = true;
3095	3766	Globals.ONESTEP = true;
3096	3767	cameraView.repaint();
3097	3768	return;
3098		- } else if (event.getSource() == stepButton)
	3769	+ } else if (source == stepButton)
3099	3770	{
3100	3771	copy.Step();
3101	3772	copy.Touch();
3102	3773	objEditor.refreshContents();
3103		- } else if (event.getSource() == slowerButton)
	3774	+ } else if (source == slowerButton)
3104	3775	{
3105	3776	copy.Slower();
3106	3777	copy.Touch();
3107	3778	objEditor.refreshContents();
3108		- } else if (event.getSource() == fasterButton)
	3779	+ } else if (source == fasterButton)
3109	3780	{
3110	3781	copy.Faster();
3111	3782	copy.Touch();
3112	3783	objEditor.refreshContents();
3113		- } else if (event.getSource() == remarkButton)
	3784	+ } else if (source == remarkButton)
3114	3785	{
3115	3786	copy.Remark();
3116	3787	copy.Touch();
3117	3788	objEditor.refreshContents();
3118		- } else if (event.getSource() == stepAllButton)
	3789	+ } else if (source == stepAllButton)
3119	3790	{
3120	3791	copy.StepAll();
3121	3792	copy.Touch();
3122	3793	objEditor.refreshContents();
3123		- } else if (event.getSource() == resetAllButton)
	3794	+ } else if (source == resetAllButton)
3124	3795	{
3125	3796	//CameraPane.fullreset = true;
3126	3797	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3153,53 +3824,79 @@
3153	3824	// Close();
3154	3825	// }
3155	3826	// else
3156		- if (event.getSource() == resetSlidersButton)
	3827	+ if (source == resetSlidersButton)
3157	3828	{
3158	3829	ResetSliders();
3159		- } else if (event.getSource() == clearMaterialButton)
	3830	+ } else if (source == clearMaterialButton)
3160	3831	{
3161	3832	ClearMaterial();
3162		- } else if (event.getSource() == createMaterialButton)
	3833	+ } else if (source == createMaterialButton)
3163	3834	{
3164	3835	CreateMaterial();
3165		- } else if (event.getSource() == clearPanelButton)
	3836	+ } else if (source == clearPanelButton)
3166	3837	{
3167	3838	copy.ClearUI();
3168	3839	refreshContents(true);
3169		- } /*
3170		- }
3171		-
3172		- public boolean action(Event event, Object arg)
3173		- {
3174		- */ else if (event.getSource() == closeItem)
	3840	+ } else if (source == importGFDItem)
	3841	+ {
	3842	+ ImportGFD();
	3843	+ } else
	3844	+ if (source == importVRMLX3DItem)
	3845	+ {
	3846	+ ImportVRMLX3D();
	3847	+ } else
	3848	+ if (source == import3DSItem)
	3849	+ {
	3850	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3851	+ } else
	3852	+ if (source == importOBJItem)
	3853	+ {
	3854	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3855	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3856	+ browser.setVisible(true);
	3857	+ String filename = browser.getFile();
	3858	+ if (filename != null && filename.length() > 0)
	3859	+ {
	3860	+ String fullname = browser.getDirectory() + filename;
	3861	+ makeSomething(ReadOBJ(fullname), true);
	3862	+ }
	3863	+ } else
	3864	+ if (source == closeItem)
3175	3865	{
3176	3866	Close();
3177	3867	//return true;
3178		- } else if (event.getSource() == loadItem)
	3868	+ } else if (source == openItem)
3179	3869	{
3180		- load();
	3870	+ Open();
3181	3871	//return true;
3182		- } else if (event.getSource() == saveItem)
	3872	+ } else if (source == newItem)
	3873	+ {
	3874	+ New();
	3875	+ } else if (source == saveItem)
3183	3876	{
3184	3877	save();
3185	3878	//return true;
3186		- } else if (event.getSource() == saveAsItem)
	3879	+ } else if (source == saveAsItem)
3187	3880	{
3188	3881	saveAs();
3189	3882	//return true;
3190		- } else if (event.getSource() == reexportItem)
	3883	+ } else if (source == reexportItem)
3191	3884	{
3192	3885	reexport();
3193	3886	//return true;
3194		- } else if (event.getSource() == exportAsItem)
	3887	+ } else if (source == exportAsItem)
3195	3888	{
3196	3889	export();
3197	3890	//return true;
3198		- } else if (event.getSource() == povItem)
	3891	+ } else if (source == povItem)
3199	3892	{
3200	3893	generatePOV();
3201	3894	//return true;
3202		- } else if (event.getSource() == zBufferItem)
	3895	+ } else if (event.getSource() == archiveItem)
	3896	+ {
	3897	+ cTools.Archive(frame);
	3898	+ return;
	3899	+ } else if (source == zBufferItem)
3203	3900	{
3204	3901	try
3205	3902	{
..	..	@@ -3221,21 +3918,8 @@
3221	3918	cameraView.repaint();
3222	3919	//return true;
3223	3920	}
3224		- */ else if (event.getSource() == editCameraItem)
3225		- {
3226		- cameraView.ProtectCamera();
3227		- cameraView.repaint();
3228		- return;
3229		- } else if (event.getSource() == revertCameraItem)
3230		- {
3231		- cameraView.RevertCamera();
3232		- cameraView.repaint();
3233		- return;
3234		-// } else if (event.getSource() == textureButton)
3235		-// {
3236		-// return; // true;
3237		- } else // combos...
3238		- if (event.getSource() == texresMenu)
	3921	+ */ else // combos...
	3922	+ if (source == texresMenu)
3239	3923	{
3240	3924	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3241	3925	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3247,6 +3931,466 @@
3247	3931	}
3248	3932	}
3249	3933
	3934	+ void New()
	3935	+ {
	3936	+ while (copy.Size() > 1)
	3937	+ {
	3938	+ copy.remove(1);
	3939	+ }
	3940	+
	3941	+ ResetModel();
	3942	+ objEditor.refreshContents();
	3943	+ }
	3944	+
	3945	+ static public byte[] Compress(Object3D o)
	3946	+ {
	3947	+ // Slower to actually compress.
	3948	+ try
	3949	+ {
	3950	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3951	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3952	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	3953	+
	3954	+ Object3D parent = o.parent;
	3955	+ o.parent = null;
	3956	+
	3957	+ out.writeObject(o);
	3958	+
	3959	+ o.parent = parent;
	3960	+
	3961	+ out.flush();
	3962	+
	3963	+ baos //zstream
	3964	+ .close();
	3965	+ out.close();
	3966	+
	3967	+ byte[] bytes = baos.toByteArray();
	3968	+
	3969	+ System.out.println("save #bytes = " + bytes.length);
	3970	+ return bytes;
	3971	+ } catch (Exception e)
	3972	+ {
	3973	+ System.err.println(e);
	3974	+ return null;
	3975	+ }
	3976	+ }
	3977	+
	3978	+ static public Object Uncompress(byte[] bytes)
	3979	+ {
	3980	+ System.out.println("restore #bytes = " + bytes.length);
	3981	+ try
	3982	+ {
	3983	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3984	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3985	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	3986	+ Object obj = in.readObject();
	3987	+
	3988	+ bais //istream
	3989	+ .close();
	3990	+ in.close();
	3991	+
	3992	+ return obj;
	3993	+ } catch (Exception e)
	3994	+ {
	3995	+ System.err.println(e);
	3996	+ return null;
	3997	+ }
	3998	+ }
	3999	+
	4000	+ static public Object clone(Object o)
	4001	+ {
	4002	+ try
	4003	+ {
	4004	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	4005	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	4006	+
	4007	+ out.writeObject(o);
	4008	+
	4009	+ out.flush();
	4010	+ out.close();
	4011	+
	4012	+ byte[] bytes = baos.toByteArray();
	4013	+
	4014	+ System.out.println("clone = " + bytes.length);
	4015	+
	4016	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	4017	+ ObjectInputStream in = new ObjectInputStream(bais);
	4018	+ Object obj = in.readObject();
	4019	+ in.close();
	4020	+
	4021	+ return obj;
	4022	+ } catch (Exception e)
	4023	+ {
	4024	+ System.err.println(e);
	4025	+ return null;
	4026	+ }
	4027	+ }
	4028	+
	4029	+ cRadio GetCurrentTab()
	4030	+ {
	4031	+ cRadio ab;
	4032	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4033	+ {
	4034	+ ab = (cRadio)e.nextElement();
	4035	+ if(ab.GetObject() == copy)
	4036	+ {
	4037	+ return ab;
	4038	+ }
	4039	+ }
	4040	+
	4041	+ return null;
	4042	+ }
	4043	+
	4044	+
	4045	+ public void Save()
	4046	+ {
	4047	+ //Save(true);
	4048	+ Replace();
	4049	+ SetUndoStates();
	4050	+ }
	4051	+
	4052	+ private boolean Equal(byte[] compress, byte[] name)
	4053	+ {
	4054	+ if (compress.length != name.length)
	4055	+ {
	4056	+ return false;
	4057	+ }
	4058	+
	4059	+ for (int i=compress.length; --i>=0;)
	4060	+ {
	4061	+ if (compress[i] != name[i])
	4062	+ return false;
	4063	+ }
	4064	+
	4065	+ return true;
	4066	+ }
	4067	+
	4068	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	4069	+
	4070	+ void DeleteVersion()
	4071	+ {
	4072	+ for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
	4073	+ {
	4074	+ copy.versionlist[i] = copy.versionlist[i+1];
	4075	+ }
	4076	+
	4077	+ CopyChanged();
	4078	+
	4079	+ SetUndoStates();
	4080	+ }
	4081	+
	4082	+ public boolean Save(boolean user)
	4083	+ {
	4084	+ System.err.println("Save");
	4085	+ //Replace();
	4086	+
	4087	+ cRadio tab = GetCurrentTab();
	4088	+
	4089	+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace"?
	4090	+
	4091	+ boolean thesame = false;
	4092	+
	4093	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	4094	+// {
	4095	+// thesame = true;
	4096	+// }
	4097	+
	4098	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	4099	+ if (!thesame)
	4100	+ {
	4101	+ for (int i = copy.versionlist.length; --i > copy.versionindex+1;)
	4102	+ {
	4103	+ copy.versionlist[i] = copy.versionlist[i-1];
	4104	+ }
	4105	+
	4106	+ //tab.user[tab.versionindex] = user;
	4107	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	4108	+
	4109	+ copy.versionlist[++copy.versionindex] = compress;
	4110	+
	4111	+ // if (increment)
	4112	+ // tab.versionindex++;
	4113	+ }
	4114	+
	4115	+ //copy.RestoreBigData(versiontable);
	4116	+
	4117	+ //assert(hashtable.isEmpty());
	4118	+
	4119	+// for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	4120	+// {
	4121	+// //tab.user[i] = false;
	4122	+// copy.versionlist[i] = null;
	4123	+// }
	4124	+
	4125	+ SetUndoStates();
	4126	+
	4127	+ // test save
	4128	+ if (false)
	4129	+ {
	4130	+ try
	4131	+ {
	4132	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	4133	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	4134	+
	4135	+ p.writeObject(copy);
	4136	+
	4137	+ p.flush();
	4138	+
	4139	+ ostream.close();
	4140	+ } catch (Exception e)
	4141	+ {
	4142	+ e.printStackTrace();
	4143	+ }
	4144	+ }
	4145	+
	4146	+ return !thesame;
	4147	+ }
	4148	+
	4149	+ boolean flashIt = true;
	4150	+
	4151	+ void RefreshSelection()
	4152	+ {
	4153	+ Object3D selection = new Object3D();
	4154	+
	4155	+ for (int i = 0; i < copy.selection.size(); i++)
	4156	+ {
	4157	+ Object3D elem = copy.selection.elementAt(i);
	4158	+
	4159	+ Object3D obj = copy.GetObject(elem.GetUUID());
	4160	+
	4161	+ if (obj == null)
	4162	+ {
	4163	+ copy.selection.remove(i--);
	4164	+ }
	4165	+ else
	4166	+ {
	4167	+ selection.add(obj);
	4168	+ copy.selection.setElementAt(obj, i);
	4169	+ }
	4170	+ }
	4171	+
	4172	+ flashIt = false;
	4173	+ GetTree().clearSelection();
	4174	+ for (int i = 0; i < selection.size(); i++)
	4175	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	4176	+ flashIt = true;
	4177	+
	4178	+ //refreshContents(false);
	4179	+ }
	4180	+
	4181	+ void CopyChanged()
	4182	+ {
	4183	+ Object3D obj = copy.versionlist[copy.versionindex];
	4184	+
	4185	+ SetUndoStates();
	4186	+
	4187	+ boolean temp = CameraPane.SWITCH;
	4188	+ CameraPane.SWITCH = false;
	4189	+
	4190	+ copy.ExtractBigData(versiontable);
	4191	+
	4192	+ copy.clear();
	4193	+
	4194	+ copy.skyboxname = obj.skyboxname;
	4195	+ copy.skyboxext = obj.skyboxext;
	4196	+
	4197	+ for (int i=0; i<obj.Size(); i++)
	4198	+ {
	4199	+ copy.add(obj.get(i));
	4200	+ }
	4201	+
	4202	+ copy.RestoreBigData(versiontable);
	4203	+
	4204	+ CameraPane.SWITCH = temp;
	4205	+
	4206	+ RefreshSelection();
	4207	+ //assert(hashtable.isEmpty());
	4208	+
	4209	+ copy.Touch();
	4210	+
	4211	+ ResetModel();
	4212	+ copy.HardTouch(); // recompile?
	4213	+
	4214	+ cRadio ab;
	4215	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	4216	+ {
	4217	+ ab = (cRadio)e.nextElement();
	4218	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	4219	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	4220	+ if (test != null)
	4221	+ {
	4222	+ test.editWindow = ab.object.editWindow;
	4223	+ ab.object = test;
	4224	+ }
	4225	+ }
	4226	+
	4227	+ refreshContents(true);
	4228	+ }
	4229	+
	4230	+ cButton previousVersionButton;
	4231	+ cButton restoreButton;
	4232	+ cButton replaceButton;
	4233	+ cButton nextVersionButton;
	4234	+ cButton saveVersionButton;
	4235	+ cButton deleteVersionButton;
	4236	+
	4237	+ boolean muteSlider;
	4238	+
	4239	+ int VersionCount()
	4240	+ {
	4241	+ int count = 0;
	4242	+
	4243	+ for (int i = copy.versionlist.length; --i >= 0;)
	4244	+ {
	4245	+ if (copy.versionlist[i] != null)
	4246	+ count++;
	4247	+ }
	4248	+
	4249	+ return count;
	4250	+ }
	4251	+
	4252	+ void SetUndoStates()
	4253	+ {
	4254	+ cRadio tab = GetCurrentTab();
	4255	+
	4256	+ restoreButton.setEnabled(true); // copy.versionindex != -1);
	4257	+ replaceButton.setEnabled(true); // copy.versionindex != -1);
	4258	+
	4259	+ previousVersionButton.setEnabled(copy.versionindex > 0);
	4260	+ nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	4261	+
	4262	+ deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
	4263	+ copy.versionlist[copy.versionindex + 1] != null);
	4264	+
	4265	+ muteSlider = true;
	4266	+ versionSlider.setMaximum(VersionCount() - 1);
	4267	+ versionSlider.setInteger(copy.versionindex);
	4268	+ muteSlider = false;
	4269	+ }
	4270	+
	4271	+ public boolean PreviousVersion()
	4272	+ {
	4273	+ // Option?
	4274	+ Replace();
	4275	+
	4276	+ System.err.println("Undo");
	4277	+
	4278	+ cRadio tab = GetCurrentTab();
	4279	+
	4280	+ if (copy.versionindex == 0)
	4281	+ {
	4282	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4283	+ return false;
	4284	+ }
	4285	+
	4286	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	4287	+// {
	4288	+// if (Save(false))
	4289	+// tab.versionindex -= 1;
	4290	+// else
	4291	+// {
	4292	+// if (tab.versionindex <= 0)
	4293	+// return false;
	4294	+// else
	4295	+// tab.versionindex -= 1;
	4296	+// }
	4297	+// }
	4298	+
	4299	+ copy.versionindex -= 1;
	4300	+
	4301	+ CopyChanged();
	4302	+
	4303	+ return true;
	4304	+ }
	4305	+
	4306	+ public boolean Restore()
	4307	+ {
	4308	+ System.err.println("Restore");
	4309	+
	4310	+ cRadio tab = GetCurrentTab();
	4311	+
	4312	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4313	+ {
	4314	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4315	+ return false;
	4316	+ }
	4317	+
	4318	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	4319	+ CopyChanged();
	4320	+
	4321	+ return true;
	4322	+ }
	4323	+
	4324	+ public boolean Replace()
	4325	+ {
	4326	+ System.err.println("Replace");
	4327	+
	4328	+ cRadio tab = GetCurrentTab();
	4329	+
	4330	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	4331	+ {
	4332	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	4333	+ return false;
	4334	+ }
	4335	+
	4336	+ copy.versionlist[copy.versionindex] = CompressCopy();
	4337	+
	4338	+ return true;
	4339	+ }
	4340	+
	4341	+ public void NextVersion()
	4342	+ {
	4343	+ // Option?
	4344	+ Replace();
	4345	+
	4346	+ cRadio tab = GetCurrentTab();
	4347	+
	4348	+ if (copy.versionlist[copy.versionindex + 1] == null)
	4349	+ {
	4350	+ java.awt.Toolkit.getDefaultToolkit().beep();
	4351	+ return;
	4352	+ }
	4353	+
	4354	+ copy.versionindex += 1;
	4355	+
	4356	+ CopyChanged();
	4357	+
	4358	+ //if (!tab.user[tab.versionindex])
	4359	+ // tab.graphs[tab.versionindex] = null;
	4360	+ }
	4361	+
	4362	+ void ImportGFD()
	4363	+ {
	4364	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	4365	+ browser.show();
	4366	+ String filename = browser.getFile();
	4367	+ if (filename != null && filename.length() > 0)
	4368	+ {
	4369	+ String fullname = browser.getDirectory() + filename;
	4370	+
	4371	+ //Object3D readobj =
	4372	+ objEditor.ReadGFD(fullname, objEditor);
	4373	+ //makeSomething(readobj);
	4374	+ }
	4375	+ }
	4376	+
	4377	+ void ImportVRMLX3D()
	4378	+ {
	4379	+ if (Grafreed.standAlone)
	4380	+ {
	4381	+ /**/
	4382	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	4383	+ browser.show();
	4384	+ String filename = browser.getFile();
	4385	+ if (filename != null && filename.length() > 0)
	4386	+ {
	4387	+ String fullname = browser.getDirectory() + filename;
	4388	+ LoadVRMLX3D(fullname);
	4389	+ }
	4390	+ /**/
	4391	+ }
	4392	+ }
	4393	+
3250	4394	void ToggleAnimation()
3251	4395	{
3252	4396	if (!Globals.ANIMATION)
..	..	@@ -3364,7 +4508,7 @@
3364	4508	assert false;
3365	4509	}
3366	4510
3367		- void EditSelection()
	4511	+ void EditSelection(boolean newWindow)
3368	4512	{
3369	4513	}
3370	4514
..	..	@@ -3423,7 +4567,7 @@
3423	4567	//copy.material = new cMaterial(copy.GetMaterial());
3424	4568
3425	4569	current.color = (float) colorField.getFloat();
3426		- current.modulation = (float) modulationField.getFloat();
	4570	+ current.modulation = (float) saturationField.getFloat();
3427	4571	current.metalness = (float) metalnessField.getFloat();
3428	4572	current.diffuse = (float) diffuseField.getFloat();
3429	4573	current.specular = (float) specularField.getFloat();
..	..	@@ -3456,7 +4600,7 @@
3456	4600	cMaterial mat = copy.material;
3457	4601
3458	4602	colorField.SetToolTipValue((mat.color));
3459		- modulationField.SetToolTipValue((mat.modulation));
	4603	+ saturationField.SetToolTipValue((mat.modulation));
3460	4604	metalnessField.SetToolTipValue((mat.metalness));
3461	4605	diffuseField.SetToolTipValue((mat.diffuse));
3462	4606	specularField.SetToolTipValue((mat.specular));
..	..	@@ -3508,9 +4652,26 @@
3508	4652	//copy.Touch();
3509	4653	}
3510	4654
	4655	+ cNumberSlider versionSlider;
	4656	+
3511	4657	public void stateChanged(ChangeEvent e)
3512	4658	{
3513	4659	// assert(false);
	4660	+ if (e.getSource() == versionSlider)
	4661	+ {
	4662	+ if (muteSlider)
	4663	+ return;
	4664	+
	4665	+ int version = versionSlider.getInteger();
	4666	+
	4667	+ if (copy.versionlist[version] != null)
	4668	+ {
	4669	+ copy.versionindex = version;
	4670	+ CopyChanged();
	4671	+ }
	4672	+
	4673	+ return;
	4674	+ }
3514	4675
3515	4676	if (freezematerial)
3516	4677	{
..	..	@@ -3546,6 +4707,12 @@
3546	4707	{
3547	4708	//System.out.println("stateChanged = " + this);
3548	4709	materialtouched = true;
	4710	+
	4711	+ if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4712	+ {
	4713	+ saturationField.setFloat(1);
	4714	+ }
	4715	+
3549	4716	applySelf();
3550	4717	//System.out.println("this = " + this);
3551	4718	//System.out.println("PARENT = " + parent);
..	..	@@ -3845,6 +5012,7 @@
3845	5012	{
3846	5013	if (GetTree() != null)
3847	5014	{
	5015	+ GetTree().revalidate();
3848	5016	GetTree().repaint();
3849	5017	}
3850	5018
..	..	@@ -3853,12 +5021,17 @@
3853	5021	ctrlPanel.validate(); // ? new
3854	5022	ctrlPanel.repaint();
3855	5023	}
	5024	+
	5025	+ if (previousVersionButton != null && copy.versionlist != null)
	5026	+ SetUndoStates();
3856	5027	}
3857	5028
3858	5029	static TweenManager tweenManager = new TweenManager();
3859	5030
3860	5031	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3861	5032	{
	5033	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	5034	+ Save();
3862	5035	//Tween.set(thing, 0).target(1).start(tweenManager);
3863	5036	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3864	5037	// if (thing instanceof GenericJointDemo)
..	..	@@ -3945,6 +5118,12 @@
3945	5118	{
3946	5119	ResetModel();
3947	5120	Select(thing.GetTreePath(), true, false); // unselect... false);
	5121	+
	5122	+ if (thing.Size() == 0)
	5123	+ {
	5124	+ //EditSelection(false);
	5125	+ }
	5126	+
3948	5127	refreshContents();
3949	5128	}
3950	5129
..	..	@@ -4082,6 +5261,7 @@
4082	5261
4083	5262	try
4084	5263	{
	5264	+ // Try compressed version first.
4085	5265	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4086	5266	java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
4087	5267	java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
..	..	@@ -4092,7 +5272,9 @@
4092	5272	readobj.ResetDisplayList();
4093	5273	} catch (Exception e)
4094	5274	{
4095		- //e.printStackTrace();
	5275	+ if (!e.toString().contains("GZIP"))
	5276	+ e.printStackTrace();
	5277	+
4096	5278	try
4097	5279	{
4098	5280	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
..	..	@@ -4151,6 +5333,12 @@
4151	5333
4152	5334	void LoadIt(Object obj)
4153	5335	{
	5336	+ if (obj == null)
	5337	+ {
	5338	+ // Invalid file
	5339	+ return;
	5340	+ }
	5341	+
4154	5342	System.out.println("Loaded " + obj);
4155	5343	//new Exception().printStackTrace();
4156	5344	Object3D readobj = (Object3D) obj;
..	..	@@ -4160,10 +5348,14 @@
4160	5348
4161	5349	if (readobj != null)
4162	5350	{
	5351	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	5352	+ // Save();
4163	5353	try
4164	5354	{
4165	5355	//readobj.deepCopySelf(copy);
4166	5356	copy.clear(); // june 2014
	5357	+ copy.skyboxname = readobj.skyboxname;
	5358	+ copy.skyboxext = readobj.skyboxext;
4167	5359	for (int i = 0; i < readobj.size(); i++)
4168	5360	{
4169	5361	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4204,6 +5396,7 @@
4204	5396	}
4205	5397	} catch (ClassCastException e)
4206	5398	{
	5399	+ e.printStackTrace();
4207	5400	assert (false);
4208	5401	Composite c = (Composite) copy;
4209	5402	c.children.clear();
..	..	@@ -4214,17 +5407,28 @@
4214	5407	c.addChild(csg);
4215	5408	}
4216	5409
	5410	+ copy.versionlist = readobj.versionlist;
	5411	+ copy.versionindex = readobj.versionindex;
	5412	+
	5413	+ if (copy.versionlist == null)
	5414	+ {
	5415	+ copy.versionlist = new Object3D[100];
	5416	+ copy.versionindex = -1;
	5417	+ }
	5418	+
	5419	+ //? SetUndoStates();
	5420	+
4217	5421	ResetModel();
4218	5422	copy.HardTouch(); // recompile?
4219	5423	refreshContents();
4220	5424	}
4221	5425	}
4222	5426
4223		- void load() // throws ClassNotFoundException
	5427	+ void Open() // throws ClassNotFoundException
4224	5428	{
4225	5429	if (Grafreed.standAlone)
4226	5430	{
4227		- FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
	5431	+ FileDialog browser = new FileDialog(frame, "Open", FileDialog.LOAD);
4228	5432	browser.show();
4229	5433	String filename = browser.getFile();
4230	5434	if (filename != null && filename.length() > 0)
..	..	@@ -4323,6 +5527,7 @@
4323	5527	//ps.print(buffer.toString());
4324	5528	} catch (IOException e)
4325	5529	{
	5530	+ e.printStackTrace();
4326	5531	}
4327	5532	}
4328	5533
..	..	@@ -4337,6 +5542,8 @@
4337	5542	String filename = browser.getFile();
4338	5543	if (filename != null && filename.length() > 0)
4339	5544	{
	5545	+ if (!filename.endsWith(".gfd"))
	5546	+ filename += ".gfd";
4340	5547	lastname = browser.getDirectory() + filename;
4341	5548	save();
4342	5549	}
..	..	@@ -4501,19 +5708,18 @@
4501	5708	Object3D client;
4502	5709	Object3D copy;
4503	5710	MenuBar menuBar;
4504		- Menu windowMenu;
4505		- MenuItem loadItem;
	5711	+ Menu fileMenu;
	5712	+ MenuItem newItem;
	5713	+ MenuItem openItem;
4506	5714	MenuItem saveItem;
4507	5715	MenuItem saveAsItem;
4508	5716	MenuItem exportAsItem;
4509	5717	MenuItem reexportItem;
4510	5718	MenuItem povItem;
4511	5719	MenuItem closeItem;
4512		- Menu cameraMenu;
	5720	+
4513	5721	CheckboxMenuItem zBufferItem;
4514	5722	//MenuItem normalLensItem;
4515		- MenuItem editCameraItem;
4516		- MenuItem revertCameraItem;
4517	5723	MenuItem stepItem;
4518	5724	CheckboxMenuItem toggleLiveItem;
4519	5725	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4527,22 +5733,36 @@
4527	5733	CheckboxMenuItem toggleSwitchItem;
4528	5734	CheckboxMenuItem toggleRootItem;
4529	5735	CheckboxMenuItem animationItem;
	5736	+ MenuItem archiveItem;
4530	5737	CheckboxMenuItem toggleHandleItem;
4531	5738	CheckboxMenuItem togglePaintItem;
4532	5739	JSplitPane mainPanel;
4533	5740	JScrollPane scrollpane;
	5741	+
4534	5742	JPanel toolbarPanel;
	5743	+
4535	5744	cGridBag treePanel;
	5745	+
4536	5746	JPanel radioPanel;
4537	5747	ButtonGroup buttonGroup;
4538		- cGridBag ctrlPanel;
	5748	+
	5749	+ cGridBag toolboxPanel;
4539	5750	cGridBag materialPanel;
	5751	+ cGridBag ctrlPanel;
	5752	+
4540	5753	JScrollPane infoPanel;
	5754	+
4541	5755	cGridBag optionsPanel;
	5756	+
4542	5757	JTabbedPane objectPanel;
	5758	+ boolean materialFlushed;
	5759	+ Object3D latestObject;
	5760	+
4543	5761	cGridBag XYZPanel;
	5762	+
4544	5763	JSplitPane gridPanel;
4545	5764	JSplitPane bigPanel;
	5765	+
4546	5766	cGridBag bigThree;
4547	5767	cGridBag scenePanel;
4548	5768	cGridBag centralPanel;
..	..	@@ -4600,7 +5820,7 @@
4600	5820	JLabel colorLabel;
4601	5821	cNumberSlider colorField;
4602	5822	JLabel modulationLabel;
4603		- cNumberSlider modulationField;
	5823	+ cNumberSlider saturationField;
4604	5824	JLabel metalnessLabel;
4605	5825	cNumberSlider metalnessField;
4606	5826	JLabel diffuseLabel;
..	..	@@ -4657,8 +5877,13 @@
4657	5877	cNumberSlider fogField;
4658	5878	JLabel opacityPowerLabel;
4659	5879	cNumberSlider opacityPowerField;
4660		- JTree jTree;
	5880	+ cTree jTree;
4661	5881	//ObjectUI parent;
4662	5882
4663	5883	cNumberSlider normalpushField;
	5884	+
	5885	+ private MenuItem importGFDItem;
	5886	+ private MenuItem importVRMLX3DItem;
	5887	+ private MenuItem import3DSItem;
	5888	+ private MenuItem importOBJItem;
4664	5889	}