~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,145 @@
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();
655	851	}
	852	+
	853	+ private Object3D CompressCopy()
	854	+ {
	855	+ boolean temp = CameraPane.SWITCH;
	856	+ CameraPane.SWITCH = false;
	857	+
	858	+ copy.ExtractBigData(versiontable);
	859	+ // if (copy == client)
	860	+
	861	+ Object3D versions[] = copy.versionlist;
	862	+ copy.versionlist = null;
	863	+
	864	+ //byte[] compress = Compress(copy);
	865	+ Object3D compress = (Object3D)Grafreed.clone(copy);
	866	+
	867	+ copy.versionlist = versions;
	868	+
	869	+ copy.RestoreBigData(versiontable);
	870	+
	871	+ CameraPane.SWITCH = temp;
	872	+
	873	+ return compress;
	874	+ }
656	875
657	876	private JTextPane createTextPane()
658	877	{
..	..	@@ -775,6 +994,7 @@
775	994	{
776	995	SetupMaterial(materialPanel);
777	996	}
	997	+
778	998	//SetupName();
779	999	//SetupViews();
780	1000	}
..	..	@@ -784,7 +1004,7 @@
784	1004	// NumberSlider vDivsField;
785	1005	// JCheckBox endcaps;
786	1006	JCheckBox liveCB;
787		- JCheckBox selectCB;
	1007	+ JCheckBox selectableCB;
788	1008	JCheckBox hideCB;
789	1009	JCheckBox link2masterCB;
790	1010	JCheckBox markCB;
..	..	@@ -792,7 +1012,12 @@
792	1012	JCheckBox speedupCB;
793	1013	JCheckBox rewindCB;
794	1014	JCheckBox flipVCB;
	1015	+
	1016	+ cCheckBox toggleTextureCB;
	1017	+ cCheckBox toggleSwitchCB;
	1018	+
795	1019	JComboBox texresMenu;
	1020	+
796	1021	JButton resetButton;
797	1022	JButton stepButton;
798	1023	JButton stepAllButton;
..	..	@@ -801,9 +1026,13 @@
801	1026	JButton fasterButton;
802	1027	JButton remarkButton;
803	1028
	1029	+ cGridBag editPanel;
	1030	+ cGridBag editCommandsPanel;
	1031	+
804	1032	cGridBag namePanel;
805	1033	cGridBag setupPanel;
806		- cGridBag commandsPanel;
	1034	+ cGridBag setupPanel2;
	1035	+ cGridBag objectCommandsPanel;
807	1036	cGridBag pushPanel;
808	1037	cGridBag fillPanel;
809	1038
..	..	@@ -975,60 +1204,68 @@
975	1204	namePanel = new cGridBag();
976	1205
977	1206	nameField = AddText(namePanel, copy.GetName());
978		- namePanel.add(nameField);
	1207	+ namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
979	1208	oe.ctrlPanel.add(namePanel);
980	1209
981	1210	oe.ctrlPanel.Return();
982	1211
983		- if (!GroupEditor.allparams)
	1212	+ if (!allparams)
984	1213	return;
985	1214
986	1215	setupPanel = new cGridBag().setVertical(false);
987	1216
988	1217	liveCB = AddCheckBox(setupPanel, "Live", copy.live);
989	1218	liveCB.setToolTipText("Animate object");
990		- selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
991		- selectCB.setToolTipText("Make object selectable");
	1219	+ selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1220	+ selectableCB.setToolTipText("Make object selectable");
992	1221	// Return();
	1222	+
993	1223	hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
994	1224	hideCB.setToolTipText("Hide object");
995	1225	markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
996		- markCB.setToolTipText("Set the animation target transform");
	1226	+ markCB.setToolTipText("As animation target transform");
997	1227
998		- rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	1228	+ ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
	1229	+
	1230	+ setupPanel2 = new cGridBag().setVertical(false);
	1231	+
	1232	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
999	1233	rewindCB.setToolTipText("Rewind animation");
1000	1234
1001		- randomCB = AddCheckBox(setupPanel, "Random", copy.random);
1002		- randomCB.setToolTipText("Option for switch node");
	1235	+ randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
	1236	+ randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1003	1237
	1238	+ link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
	1239	+ link2masterCB.setToolTipText("Attach to support");
	1240	+
1004	1241	if (Globals.ADVANCED)
1005	1242	{
1006		- link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
1007		- link2masterCB.setToolTipText("Attach to support");
1008		- speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1243	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
1009	1244	speedupCB.setToolTipText("Option motion capture");
1010	1245	}
1011	1246
1012	1247	oe.ctrlPanel.add(setupPanel);
1013	1248	oe.ctrlPanel.Return();
	1249	+ oe.ctrlPanel.add(setupPanel2);
	1250	+ oe.ctrlPanel.Return();
1014	1251
1015		- commandsPanel = new cGridBag().setVertical(false);
	1252	+ objectCommandsPanel = new cGridBag().setVertical(false);
1016	1253
1017		- resetButton = AddButton(commandsPanel, "Reset");
	1254	+ resetButton = AddButton(objectCommandsPanel, "Reset");
1018	1255	resetButton.setToolTipText("Jump to frame zero");
1019		- stepButton = AddButton(commandsPanel, "Step");
	1256	+ stepButton = AddButton(objectCommandsPanel, "Step");
1020	1257	stepButton.setToolTipText("Step one frame");
1021	1258	// resetAllButton = AddButton(oe, "Reset All");
1022	1259	// stepAllButton = AddButton(oe, "Step All");
1023	1260	// Return();
1024		- slowerButton = AddButton(commandsPanel, "Slow");
	1261	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
1025	1262	slowerButton.setToolTipText("Decrease animation speed");
1026		- fasterButton = AddButton(commandsPanel, "Fast");
	1263	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
1027	1264	fasterButton.setToolTipText("Increase animation speed");
1028		- remarkButton = AddButton(commandsPanel, "Remark");
	1265	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
1029	1266	remarkButton.setToolTipText("Set the current transform as the target");
1030	1267
1031		- oe.ctrlPanel.add(commandsPanel);
	1268	+ oe.ctrlPanel.add(objectCommandsPanel);
1032	1269	oe.ctrlPanel.Return();
1033	1270
1034	1271	pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
..	..	@@ -1234,8 +1471,11 @@
1234	1471	//worldPanel.setName("World");
1235	1472	centralPanel = new cGridBag();
1236	1473	centralPanel.preferredWidth = 20;
1237		- timelinePanel = new JPanel(new BorderLayout());
1238		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1474	+
	1475	+ if (Globals.ADVANCED)
	1476	+ {
	1477	+ timelinePanel = new JPanel(new BorderLayout());
	1478	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1239	1479
1240	1480	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1241	1481	cameraPanel.setContinuousLayout(true);
..	..	@@ -1244,7 +1484,10 @@
1244	1484	// cameraPanel.setDividerSize(9);
1245	1485	cameraPanel.setResizeWeight(1.0);
1246	1486
	1487	+ }
	1488	+
1247	1489	centralPanel.add(cameraView);
	1490	+ centralPanel.setFocusable(true);
1248	1491	//frame.setJMenuBar(timelineMenubar);
1249	1492	//centralPanel.add(timelinePanel);
1250	1493
..	..	@@ -1270,6 +1513,7 @@
1270	1513	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1271	1514	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1272	1515	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
	1516	+ //XYZPanel.setName("XYZ");
1273	1517
1274	1518	/*
1275	1519	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1307,12 +1551,29 @@
1307	1551	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1308	1552	//tmp.setName("Edit");
1309	1553	objectPanel.add(materialPanel);
	1554	+ objectPanel.setIconAt(0, GetIcon("icons/material.png"));
	1555	+ objectPanel.setToolTipTextAt(0, "Material");
	1556	+
1310	1557	// JPanel north = new JPanel(new BorderLayout());
1311	1558	// north.setName("Edit");
1312	1559	// north.add(ctrlPanel, BorderLayout.NORTH);
1313	1560	// objectPanel.add(north);
1314		- objectPanel.add(ctrlPanel);
1315		- objectPanel.add(infoPanel);
	1561	+ objectPanel.add(editPanel);
	1562	+ objectPanel.setIconAt(1, GetIcon("icons/write.png"));
	1563	+ objectPanel.setToolTipTextAt(1, "Edit controls");
	1564	+
	1565	+ //if (Globals.ADVANCED)
	1566	+ objectPanel.add(infoPanel);
	1567	+ objectPanel.setIconAt(2, GetIcon("icons/info.png"));
	1568	+ objectPanel.setToolTipTextAt(2, "Information");
	1569	+
	1570	+ objectPanel.add(XYZPanel);
	1571	+ objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
	1572	+ objectPanel.setToolTipTextAt(3, "XYZ/RGB transform");
	1573	+
	1574	+ objectPanel.add(toolboxPanel);
	1575	+ objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
	1576	+ objectPanel.setToolTipTextAt(4, "Objects & backgrounds");
1316	1577
1317	1578	/*
1318	1579	aConstraints.gridx = 0;
..	..	@@ -1321,7 +1582,7 @@
1321	1582	aConstraints.gridy += 1;
1322	1583	aConstraints.gridwidth = 1;
1323	1584	mainPanel.add(objectPanel, aConstraints);
1324		- */
	1585	+ */
1325	1586
1326	1587	scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
1327	1588	VERTICAL_SCROLLBAR_AS_NEEDED,
..	..	@@ -1333,14 +1594,12 @@
1333	1594	scrollpane.addMouseWheelListener(this); // Default not fast enough
1334	1595
1335	1596	/JTabbedPane/ scenePanel = new cGridBag();
1336		- scenePanel.preferredWidth = 6;
	1597	+ scenePanel.preferredWidth = 5;
1337	1598
1338	1599	JTabbedPane tabbedPane = new JTabbedPane();
1339	1600	tabbedPane.add(scrollpane);
1340	1601
1341		- tabbedPane.add(FSPane = new cFileSystemPane(this));
1342		-
1343		- optionsPanel = new cGridBag().setVertical(true);
	1602	+ optionsPanel = new cGridBag().setVertical(false);
1344	1603
1345	1604	optionsPanel.setName("Options");
1346	1605
..	..	@@ -1348,6 +1607,8 @@
1348	1607
1349	1608	tabbedPane.add(optionsPanel);
1350	1609
	1610	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
	1611	+
1351	1612	scenePanel.add(tabbedPane);
1352	1613
1353	1614	/*
..	..	@@ -1411,7 +1672,7 @@
1411	1672	bigThree = new cGridBag();
1412	1673	bigThree.addComponent(scenePanel);
1413	1674	bigThree.addComponent(centralPanel);
1414		- bigThree.addComponent(XYZPanel);
	1675	+ //bigThree.addComponent(XYZPanel);
1415	1676
1416	1677	// // SIDE EFFECT!!!
1417	1678	// aConstraints.gridx = 0;
..	..	@@ -1420,9 +1681,9 @@
1420	1681	// aConstraints.gridheight = 1;
1421	1682
1422	1683	framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1423		- framePanel.setContinuousLayout(true);
1424		- framePanel.setOneTouchExpandable(true);
1425		- framePanel.setDividerLocation(0.8);
	1684	+ framePanel.setContinuousLayout(false);
	1685	+ framePanel.setOneTouchExpandable(false);
	1686	+ //.setDividerLocation(0.8);
1426	1687	//framePanel.setDividerSize(15);
1427	1688	//framePanel.setResizeWeight(0.15);
1428	1689	framePanel.setName("Frame");
..	..	@@ -1440,14 +1701,18 @@
1440	1701	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1441	1702
1442	1703	frame.setSize(1280, 860);
1443		- frame.setVisible(true);
1444		-
	1704	+
	1705	+ cameraView.requestFocusInWindow();
	1706	+
1445	1707	gridPanel.setDividerLocation(1.0);
	1708	+
	1709	+ frame.validate();
	1710	+
	1711	+ frame.setVisible(true);
1446	1712
1447	1713	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1448	1714	frame.addWindowListener(new WindowAdapter()
1449	1715	{
1450		-
1451	1716	public void windowClosing(WindowEvent e)
1452	1717	{
1453	1718	Close();
..	..	@@ -1470,12 +1735,56 @@
1470	1735	ctrlPanel.removeAll();
1471	1736	}
1472	1737
1473		- void SetupMaterial(cGridBag panel)
	1738	+ void SetupMaterial(cGridBag materialpanel)
1474	1739	{
1475		- /*
	1740	+ cGridBag presetpanel = new cGridBag().setVertical(true);
	1741	+ cLabel label = GetLabel("icons/shadericons/shadericon00000.png", !Grafreed.NIMBUSLAF);
	1742	+ label.addMouseListener(new MouseAdapter()
	1743	+ {
	1744	+ public void mouseClicked(MouseEvent e)
	1745	+ {
	1746	+ colorField.setFloat(0);
	1747	+ saturationField.setFloat(1);
	1748	+ materialtouched = true;
	1749	+ applySelf();
	1750	+ }
	1751	+ });
	1752	+ presetpanel.add(label);
	1753	+
	1754	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00001.png", !Grafreed.NIMBUSLAF));
	1755	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00002.png", !Grafreed.NIMBUSLAF));
	1756	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00003.png", !Grafreed.NIMBUSLAF));
	1757	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00004.png", !Grafreed.NIMBUSLAF));
	1758	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00005.png", !Grafreed.NIMBUSLAF));
	1759	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00006.png", !Grafreed.NIMBUSLAF));
	1760	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00007.png", !Grafreed.NIMBUSLAF));
	1761	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00008.png", !Grafreed.NIMBUSLAF));
	1762	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00009.png", !Grafreed.NIMBUSLAF));
	1763	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00010.png", !Grafreed.NIMBUSLAF));
	1764	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00011.png", !Grafreed.NIMBUSLAF));
	1765	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00012.png", !Grafreed.NIMBUSLAF));
	1766	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00013.png", !Grafreed.NIMBUSLAF));
	1767	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00014.png", !Grafreed.NIMBUSLAF));
	1768	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00015.png", !Grafreed.NIMBUSLAF));
	1769	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00016.png", !Grafreed.NIMBUSLAF));
	1770	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00017.png", !Grafreed.NIMBUSLAF));
	1771	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00018.png", !Grafreed.NIMBUSLAF));
	1772	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00019.png", !Grafreed.NIMBUSLAF));
	1773	+ presetpanel.add(GetLabel("icons/shadericons/shadericon00020.png", !Grafreed.NIMBUSLAF));
	1774	+
	1775	+ cGridBag panel = new cGridBag().setVertical(true);
	1776	+
	1777	+ presetpanel.preferredWidth = 1;
	1778	+
	1779	+ materialpanel.add(panel);
	1780	+ materialpanel.add(presetpanel);
	1781	+
	1782	+ panel.preferredWidth = 8;
	1783	+
	1784	+ /*
1476	1785	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1477	1786	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1478		- */
	1787	+ */
1479	1788
1480	1789	cGridBag editBar = new cGridBag().setVertical(false);
1481	1790
..	..	@@ -1509,45 +1818,50 @@
1509	1818	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1510	1819
1511	1820	cGridBag colorSection = new cGridBag().setVertical(true);
	1821	+
	1822	+ cGridBag huepanel = new cGridBag();
	1823	+ cGridBag huelabel = new cGridBag();
	1824	+ label = GetLabel("icons/hue.png", false);
	1825	+ label.fit = true;
	1826	+ huelabel.add(label);
	1827	+ huelabel.preferredWidth = 20;
	1828	+ huepanel.add(new cGridBag()); // Label
	1829	+ huepanel.add(huelabel); // Field/slider
	1830	+
	1831	+ huepanel.preferredHeight = 7;
	1832	+
	1833	+ colorSection.add(huepanel);
1512	1834
1513	1835	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);
	1836	+
	1837	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1838	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1839	+ color.add(colorField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1840	+
1517	1841	//colorField.preferredWidth = 200;
1518	1842	colorSection.add(color);
1519	1843
1520	1844	cGridBag modulation = new cGridBag();
1521	1845	modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
1522	1846	modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1523		- modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1847	+ modulation.add(saturationField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
1524	1848	colorSection.add(modulation);
1525	1849
	1850	+ cGridBag opacity = new cGridBag();
	1851	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1852	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1853	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1)); // , aConstraints);
	1854	+ colorSection.add(opacity);
	1855	+
	1856	+ colorSection.add(GetSeparator());
	1857	+
1526	1858	cGridBag texture = new cGridBag();
1527	1859	texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
1528	1860	textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1529	1861	texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1530	1862	colorSection.add(texture);
1531	1863
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());
	1864	+ panel.add(GetSeparator());
1551	1865
1552	1866	panel.add(colorSection);
1553	1867
..	..	@@ -1597,7 +1911,13 @@
1597	1911	fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1598	1912	diffuseSection.add(fakedepth);
1599	1913
1600		- panel.add(new JSeparator());
	1914	+ cGridBag shadowbias = new cGridBag();
	1915	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1916	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1917	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1918	+ diffuseSection.add(shadowbias);
	1919	+
	1920	+ panel.add(GetSeparator());
1601	1921
1602	1922	panel.add(diffuseSection);
1603	1923
..	..	@@ -1647,42 +1967,48 @@
1647	1967	// aConstraints.gridy += 1;
1648	1968	// aConstraints.gridwidth = 1;
1649	1969
	1970	+ cGridBag anisoU = new cGridBag();
	1971	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1972	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1973	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1974	+ specularSection.add(anisoU);
1650	1975
1651		- panel.add(new JSeparator());
	1976	+ cGridBag anisoV = new cGridBag();
	1977	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1978	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1979	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1980	+ specularSection.add(anisoV);
	1981	+
	1982	+
	1983	+ panel.add(GetSeparator());
1652	1984
1653	1985	panel.add(specularSection);
1654	1986
1655	1987	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1656	1988
1657		- cGridBag globalSection = new cGridBag().setVertical(true);
	1989	+ //cGridBag globalSection = new cGridBag().setVertical(true);
1658	1990
1659	1991	cGridBag camera = new cGridBag();
1660	1992	camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1661	1993	cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1662	1994	camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1663		- globalSection.add(camera);
	1995	+ colorSection.add(camera);
1664	1996
1665	1997	cGridBag ambient = new cGridBag();
1666	1998	ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1667	1999	ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1668	2000	ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1669		- globalSection.add(ambient);
	2001	+ colorSection.add(ambient);
1670	2002
1671	2003	cGridBag backlit = new cGridBag();
1672	2004	backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1673	2005	backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1674	2006	backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1675		- globalSection.add(backlit);
	2007	+ colorSection.add(backlit);
1676	2008
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());
	2009	+ //panel.add(new JSeparator());
1684	2010
1685		- panel.add(globalSection);
	2011	+ //panel.add(globalSection);
1686	2012
1687	2013	//ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1688	2014
..	..	@@ -1724,7 +2050,7 @@
1724	2050	opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
1725	2051	textureSection.add(opacityPower);
1726	2052
1727		- panel.add(new JSeparator());
	2053	+ panel.add(GetSeparator());
1728	2054
1729	2055	panel.add(textureSection);
1730	2056
..	..	@@ -1789,8 +2115,9 @@
1789	2115	// 3D models
1790	2116	if (filename.endsWith(".3ds") \|\| filename.endsWith(".3DS"))
1791	2117	{
1792		- lastConverter = new com.jmex.model.converters.MaxToJme();
1793		- LoadFile(filename, lastConverter);
	2118	+ //lastConverter = new com.jmex.model.converters.MaxToJme();
	2119	+ //LoadFile(filename, lastConverter);
	2120	+ LoadObjFile(filename); // New 3ds loader
1794	2121	continue;
1795	2122	}
1796	2123	if (filename.endsWith(".dae") \|\| filename.endsWith(".DAE"))
..	..	@@ -1991,6 +2318,7 @@
1991	2318	e2.printStackTrace();
1992	2319	}
1993	2320	}
	2321	+
1994	2322	LoadJMEThread loadThread;
1995	2323
1996	2324	class LoadJMEThread extends Thread
..	..	@@ -2048,6 +2376,7 @@
2048	2376	//LoadFile0(filename, converter);
2049	2377	}
2050	2378	}
	2379	+
2051	2380	LoadOBJThread loadObjThread;
2052	2381
2053	2382	class LoadOBJThread extends Thread
..	..	@@ -2126,19 +2455,19 @@
2126	2455
2127	2456	void LoadObjFile(String fullname)
2128	2457	{
2129		- /*
	2458	+ System.out.println("Loading " + fullname);
	2459	+ /**/
2130	2460	//lastFilename = fullname;
2131	2461	if(loadObjThread == null)
2132	2462	{
2133		- loadObjThread = new LoadOBJThread();
2134		- loadObjThread.start();
	2463	+ loadObjThread = new LoadOBJThread();
	2464	+ loadObjThread.start();
2135	2465	}
2136	2466
2137	2467	loadObjThread.add(fullname);
2138		- */
	2468	+ /**/
2139	2469
2140		- System.out.println("Loading " + fullname);
2141		- makeSomething(new FileObject(fullname, true), true);
	2470	+ //makeSomething(new FileObject(fullname, true), true);
2142	2471	}
2143	2472
2144	2473	void LoadGFDFile(String fullname)
..	..	@@ -2514,6 +2843,7 @@
2514	2843	LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
2515	2844	LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
2516	2845	}
	2846	+
2517	2847	//cJME.count++;
2518	2848	//cJME.count %= 12;
2519	2849	if (gc)
..	..	@@ -2697,6 +3027,7 @@
2697	3027	}
2698	3028	}
2699	3029	}
	3030	+
2700	3031	cFileSystemPane FSPane;
2701	3032
2702	3033	void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
..	..	@@ -2706,7 +3037,7 @@
2706	3037
2707	3038	freezematerial = true;
2708	3039	colorField.setFloat(mat.color);
2709		- modulationField.setFloat(mat.modulation);
	3040	+ saturationField.setFloat(mat.modulation);
2710	3041	metalnessField.setFloat(mat.metalness);
2711	3042	diffuseField.setFloat(mat.diffuse);
2712	3043	specularField.setFloat(mat.specular);
..	..	@@ -2750,11 +3081,14 @@
2750	3081	}
2751	3082	}
2752	3083	}
	3084	+
2753	3085	freezematerial = false;
2754	3086	}
2755	3087
2756	3088	void SetMaterial(Object3D object)
2757	3089	{
	3090	+ latestObject = object;
	3091	+
2758	3092	cMaterial mat = object.material;
2759	3093
2760	3094	if (mat == null)
..	..	@@ -2866,12 +3200,17 @@
2866	3200	// }
2867	3201
2868	3202	/**/
2869		- if (deselect)
	3203	+ if (deselect \|\| child == null)
2870	3204	{
2871	3205	//group.deselectAll();
2872	3206	//freeze = true;
2873	3207	GetTree().clearSelection();
2874	3208	//freeze = false;
	3209	+
	3210	+ if (child == null)
	3211	+ {
	3212	+ return;
	3213	+ }
2875	3214	}
2876	3215
2877	3216	//group.addSelectee(child);
..	..	@@ -2940,7 +3279,7 @@
2940	3279	cameraView.ToggleDL();
2941	3280	cameraView.repaint();
2942	3281	return;
2943		- } else if (event.getSource() == toggleTextureItem)
	3282	+ } else if (event.getSource() == toggleTextureItem \|\| event.getSource() == toggleTextureCB)
2944	3283	{
2945	3284	cameraView.ToggleTexture();
2946	3285	// june 2013 copy.HardTouch();
..	..	@@ -2979,9 +3318,9 @@
2979	3318	frame.validate();
2980	3319
2981	3320	return;
2982		- } else if (event.getSource() == toggleSwitchItem)
	3321	+ } else if (event.getSource() == toggleSwitchItem \|\| event.getSource() == toggleSwitchCB)
2983	3322	{
2984		- cameraView.ToggleRandom();
	3323	+ cameraView.ToggleSwitch();
2985	3324	cameraView.repaint();
2986	3325	return;
2987	3326	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3009,8 +3348,9 @@
3009	3348	} else if (event.getSource() == liveCB)
3010	3349	{
3011	3350	copy.live ^= true;
	3351	+ objEditor.refreshContents(true); // To show item colors
3012	3352	return;
3013		- } else if (event.getSource() == selectCB)
	3353	+ } else if (event.getSource() == selectableCB)
3014	3354	{
3015	3355	copy.dontselect ^= true;
3016	3356	return;
..	..	@@ -3018,7 +3358,7 @@
3018	3358	{
3019	3359	copy.hide ^= true;
3020	3360	copy.Touch(); // display list issue
3021		- objEditor.refreshContents();
	3361	+ objEditor.refreshContents(true); // To show item colors
3022	3362	return;
3023	3363	} else if (event.getSource() == link2masterCB)
3024	3364	{
..	..	@@ -3052,8 +3392,9 @@
3052	3392
3053	3393	public void actionPerformed(ActionEvent event)
3054	3394	{
	3395	+ Object source = event.getSource();
3055	3396	// SCRIPT DIALOG
3056		- if (event.getSource() == okbutton)
	3397	+ if (source == okbutton)
3057	3398	{
3058	3399	textpanel.setVisible(false);
3059	3400	textpanel.remove(textarea);
..	..	@@ -3065,7 +3406,7 @@
3065	3406	textarea = null;
3066	3407	textpanel = null;
3067	3408	}
3068		- if (event.getSource() == cancelbutton)
	3409	+ if (source == cancelbutton)
3069	3410	{
3070	3411	textpanel.setVisible(false);
3071	3412	textpanel.remove(textarea);
..	..	@@ -3077,50 +3418,50 @@
3077	3418	//applySelf();
3078	3419	//client.refreshEditWindow();
3079	3420	//refreshContents();
3080		- if (event.getSource() == nameField)
	3421	+ if (source == nameField)
3081	3422	{
3082	3423	//System.out.println("ObjEditor " + event);
3083	3424	applySelf0(true);
3084	3425	//parent.applySelf();
3085	3426	objEditor.refreshContents();
3086		- } else if (event.getSource() == resetButton)
	3427	+ } else if (source == resetButton)
3087	3428	{
3088	3429	CameraPane.fullreset = true;
3089	3430	copy.Reset(); // ResetMeshes();
3090	3431	copy.Touch();
3091	3432	objEditor.refreshContents();
3092		- } else if (event.getSource() == stepItem)
	3433	+ } else if (source == stepItem)
3093	3434	{
3094	3435	//cameraView.ONESTEP = true;
3095	3436	Globals.ONESTEP = true;
3096	3437	cameraView.repaint();
3097	3438	return;
3098		- } else if (event.getSource() == stepButton)
	3439	+ } else if (source == stepButton)
3099	3440	{
3100	3441	copy.Step();
3101	3442	copy.Touch();
3102	3443	objEditor.refreshContents();
3103		- } else if (event.getSource() == slowerButton)
	3444	+ } else if (source == slowerButton)
3104	3445	{
3105	3446	copy.Slower();
3106	3447	copy.Touch();
3107	3448	objEditor.refreshContents();
3108		- } else if (event.getSource() == fasterButton)
	3449	+ } else if (source == fasterButton)
3109	3450	{
3110	3451	copy.Faster();
3111	3452	copy.Touch();
3112	3453	objEditor.refreshContents();
3113		- } else if (event.getSource() == remarkButton)
	3454	+ } else if (source == remarkButton)
3114	3455	{
3115	3456	copy.Remark();
3116	3457	copy.Touch();
3117	3458	objEditor.refreshContents();
3118		- } else if (event.getSource() == stepAllButton)
	3459	+ } else if (source == stepAllButton)
3119	3460	{
3120	3461	copy.StepAll();
3121	3462	copy.Touch();
3122	3463	objEditor.refreshContents();
3123		- } else if (event.getSource() == resetAllButton)
	3464	+ } else if (source == resetAllButton)
3124	3465	{
3125	3466	//CameraPane.fullreset = true;
3126	3467	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3153,53 +3494,79 @@
3153	3494	// Close();
3154	3495	// }
3155	3496	// else
3156		- if (event.getSource() == resetSlidersButton)
	3497	+ if (source == resetSlidersButton)
3157	3498	{
3158	3499	ResetSliders();
3159		- } else if (event.getSource() == clearMaterialButton)
	3500	+ } else if (source == clearMaterialButton)
3160	3501	{
3161	3502	ClearMaterial();
3162		- } else if (event.getSource() == createMaterialButton)
	3503	+ } else if (source == createMaterialButton)
3163	3504	{
3164	3505	CreateMaterial();
3165		- } else if (event.getSource() == clearPanelButton)
	3506	+ } else if (source == clearPanelButton)
3166	3507	{
3167	3508	copy.ClearUI();
3168	3509	refreshContents(true);
3169		- } /*
3170		- }
3171		-
3172		- public boolean action(Event event, Object arg)
3173		- {
3174		- */ else if (event.getSource() == closeItem)
	3510	+ } else if (source == importGFDItem)
	3511	+ {
	3512	+ ImportGFD();
	3513	+ } else
	3514	+ if (source == importVRMLX3DItem)
	3515	+ {
	3516	+ ImportVRMLX3D();
	3517	+ } else
	3518	+ if (source == import3DSItem)
	3519	+ {
	3520	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3521	+ } else
	3522	+ if (source == importOBJItem)
	3523	+ {
	3524	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3525	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3526	+ browser.setVisible(true);
	3527	+ String filename = browser.getFile();
	3528	+ if (filename != null && filename.length() > 0)
	3529	+ {
	3530	+ String fullname = browser.getDirectory() + filename;
	3531	+ makeSomething(ReadOBJ(fullname), true);
	3532	+ }
	3533	+ } else
	3534	+ if (source == closeItem)
3175	3535	{
3176	3536	Close();
3177	3537	//return true;
3178		- } else if (event.getSource() == loadItem)
	3538	+ } else if (source == openItem)
3179	3539	{
3180		- load();
	3540	+ Open();
3181	3541	//return true;
3182		- } else if (event.getSource() == saveItem)
	3542	+ } else if (source == newItem)
	3543	+ {
	3544	+ New();
	3545	+ } else if (source == saveItem)
3183	3546	{
3184	3547	save();
3185	3548	//return true;
3186		- } else if (event.getSource() == saveAsItem)
	3549	+ } else if (source == saveAsItem)
3187	3550	{
3188	3551	saveAs();
3189	3552	//return true;
3190		- } else if (event.getSource() == reexportItem)
	3553	+ } else if (source == reexportItem)
3191	3554	{
3192	3555	reexport();
3193	3556	//return true;
3194		- } else if (event.getSource() == exportAsItem)
	3557	+ } else if (source == exportAsItem)
3195	3558	{
3196	3559	export();
3197	3560	//return true;
3198		- } else if (event.getSource() == povItem)
	3561	+ } else if (source == povItem)
3199	3562	{
3200	3563	generatePOV();
3201	3564	//return true;
3202		- } else if (event.getSource() == zBufferItem)
	3565	+ } else if (event.getSource() == archiveItem)
	3566	+ {
	3567	+ cTools.Archive(frame);
	3568	+ return;
	3569	+ } else if (source == zBufferItem)
3203	3570	{
3204	3571	try
3205	3572	{
..	..	@@ -3221,21 +3588,8 @@
3221	3588	cameraView.repaint();
3222	3589	//return true;
3223	3590	}
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)
	3591	+ */ else // combos...
	3592	+ if (source == texresMenu)
3239	3593	{
3240	3594	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3241	3595	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3247,6 +3601,442 @@
3247	3601	}
3248	3602	}
3249	3603
	3604	+ void New()
	3605	+ {
	3606	+ while (copy.Size() > 1)
	3607	+ {
	3608	+ copy.remove(1);
	3609	+ }
	3610	+
	3611	+ ResetModel();
	3612	+ objEditor.refreshContents();
	3613	+ }
	3614	+
	3615	+ static public byte[] Compress(Object3D o)
	3616	+ {
	3617	+ // Slower to actually compress.
	3618	+ try
	3619	+ {
	3620	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3621	+// java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3622	+ ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
	3623	+
	3624	+ Object3D parent = o.parent;
	3625	+ o.parent = null;
	3626	+
	3627	+ out.writeObject(o);
	3628	+
	3629	+ o.parent = parent;
	3630	+
	3631	+ out.flush();
	3632	+
	3633	+ baos //zstream
	3634	+ .close();
	3635	+ out.close();
	3636	+
	3637	+ byte[] bytes = baos.toByteArray();
	3638	+
	3639	+ System.out.println("save #bytes = " + bytes.length);
	3640	+ return bytes;
	3641	+ } catch (Exception e)
	3642	+ {
	3643	+ System.err.println(e);
	3644	+ return null;
	3645	+ }
	3646	+ }
	3647	+
	3648	+ static public Object Uncompress(byte[] bytes)
	3649	+ {
	3650	+ System.out.println("restore #bytes = " + bytes.length);
	3651	+ try
	3652	+ {
	3653	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3654	+ //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3655	+ ObjectInputStream in = new ObjectInputStream(bais); // istream);
	3656	+ Object obj = in.readObject();
	3657	+
	3658	+ bais //istream
	3659	+ .close();
	3660	+ in.close();
	3661	+
	3662	+ return obj;
	3663	+ } catch (Exception e)
	3664	+ {
	3665	+ System.err.println(e);
	3666	+ return null;
	3667	+ }
	3668	+ }
	3669	+
	3670	+ static public Object clone(Object o)
	3671	+ {
	3672	+ try
	3673	+ {
	3674	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3675	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3676	+
	3677	+ out.writeObject(o);
	3678	+
	3679	+ out.flush();
	3680	+ out.close();
	3681	+
	3682	+ byte[] bytes = baos.toByteArray();
	3683	+
	3684	+ System.out.println("clone = " + bytes.length);
	3685	+
	3686	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3687	+ ObjectInputStream in = new ObjectInputStream(bais);
	3688	+ Object obj = in.readObject();
	3689	+ in.close();
	3690	+
	3691	+ return obj;
	3692	+ } catch (Exception e)
	3693	+ {
	3694	+ System.err.println(e);
	3695	+ return null;
	3696	+ }
	3697	+ }
	3698	+
	3699	+ cRadio GetCurrentTab()
	3700	+ {
	3701	+ cRadio ab;
	3702	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3703	+ {
	3704	+ ab = (cRadio)e.nextElement();
	3705	+ if(ab.GetObject() == copy)
	3706	+ {
	3707	+ return ab;
	3708	+ }
	3709	+ }
	3710	+
	3711	+ return null;
	3712	+ }
	3713	+
	3714	+
	3715	+ public void Save()
	3716	+ {
	3717	+ //Save(true);
	3718	+ Replace();
	3719	+ SetUndoStates();
	3720	+ }
	3721	+
	3722	+ private boolean Equal(byte[] compress, byte[] name)
	3723	+ {
	3724	+ if (compress.length != name.length)
	3725	+ {
	3726	+ return false;
	3727	+ }
	3728	+
	3729	+ for (int i=compress.length; --i>=0;)
	3730	+ {
	3731	+ if (compress[i] != name[i])
	3732	+ return false;
	3733	+ }
	3734	+
	3735	+ return true;
	3736	+ }
	3737	+
	3738	+ java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3739	+
	3740	+ public boolean Save(boolean user)
	3741	+ {
	3742	+ System.err.println("Save");
	3743	+ Replace();
	3744	+
	3745	+ cRadio tab = GetCurrentTab();
	3746	+
	3747	+ Object3D compress = CompressCopy(); // Saved version. No need for "Replace".
	3748	+
	3749	+ boolean thesame = false;
	3750	+
	3751	+// if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
	3752	+// {
	3753	+// thesame = true;
	3754	+// }
	3755	+
	3756	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3757	+ if (!thesame)
	3758	+ {
	3759	+ //tab.user[tab.versionindex] = user;
	3760	+ //boolean increment = true; // tab.graphs[tab.versionindex] == null;
	3761	+
	3762	+ copy.versionlist[++copy.versionindex] = compress;
	3763	+
	3764	+ // if (increment)
	3765	+ // tab.versionindex++;
	3766	+ }
	3767	+
	3768	+ //copy.RestoreBigData(versiontable);
	3769	+
	3770	+ //assert(hashtable.isEmpty());
	3771	+
	3772	+ for (int i = copy.versionindex+1; i < copy.versionlist.length; i++)
	3773	+ {
	3774	+ //tab.user[i] = false;
	3775	+ copy.versionlist[i] = null;
	3776	+ }
	3777	+
	3778	+ SetUndoStates();
	3779	+
	3780	+ // test save
	3781	+ if (false)
	3782	+ {
	3783	+ try
	3784	+ {
	3785	+ FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
	3786	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3787	+
	3788	+ p.writeObject(copy);
	3789	+
	3790	+ p.flush();
	3791	+
	3792	+ ostream.close();
	3793	+ } catch (Exception e)
	3794	+ {
	3795	+ e.printStackTrace();
	3796	+ }
	3797	+ }
	3798	+
	3799	+ return !thesame;
	3800	+ }
	3801	+
	3802	+ boolean flashIt = true;
	3803	+
	3804	+ void RefreshSelection()
	3805	+ {
	3806	+ Object3D selection = new Object3D();
	3807	+
	3808	+ for (int i = 0; i < copy.selection.size(); i++)
	3809	+ {
	3810	+ Object3D elem = copy.selection.elementAt(i);
	3811	+
	3812	+ Object3D obj = copy.GetObject(elem.GetUUID());
	3813	+
	3814	+ if (obj == null)
	3815	+ {
	3816	+ copy.selection.remove(i--);
	3817	+ }
	3818	+ else
	3819	+ {
	3820	+ selection.add(obj);
	3821	+ copy.selection.setElementAt(obj, i);
	3822	+ }
	3823	+ }
	3824	+
	3825	+ flashIt = false;
	3826	+ GetTree().clearSelection();
	3827	+ for (int i = 0; i < selection.size(); i++)
	3828	+ GetTree().addSelectionPath(selection.elementAt(i).GetTreePath().GetTreePath());
	3829	+ flashIt = true;
	3830	+
	3831	+ refreshContents(false);
	3832	+ }
	3833	+
	3834	+ void CopyChanged(Object3D obj)
	3835	+ {
	3836	+ SetUndoStates();
	3837	+
	3838	+ boolean temp = CameraPane.SWITCH;
	3839	+ CameraPane.SWITCH = false;
	3840	+
	3841	+ copy.ExtractBigData(versiontable);
	3842	+
	3843	+ copy.clear();
	3844	+
	3845	+ copy.skyboxname = obj.skyboxname;
	3846	+ copy.skyboxext = obj.skyboxext;
	3847	+
	3848	+ for (int i=0; i<obj.Size(); i++)
	3849	+ {
	3850	+ copy.add(obj.get(i));
	3851	+ }
	3852	+
	3853	+ copy.RestoreBigData(versiontable);
	3854	+
	3855	+ CameraPane.SWITCH = temp;
	3856	+
	3857	+ RefreshSelection();
	3858	+ //assert(hashtable.isEmpty());
	3859	+
	3860	+ copy.Touch();
	3861	+
	3862	+ ResetModel();
	3863	+ copy.HardTouch(); // recompile?
	3864	+
	3865	+ cRadio ab;
	3866	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3867	+ {
	3868	+ ab = (cRadio)e.nextElement();
	3869	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3870	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3871	+ if (test != null)
	3872	+ {
	3873	+ test.editWindow = ab.object.editWindow;
	3874	+ ab.object = test;
	3875	+ }
	3876	+ }
	3877	+
	3878	+ refreshContents();
	3879	+ }
	3880	+
	3881	+ cButton undoButton;
	3882	+ cButton restoreButton;
	3883	+ cButton replaceButton;
	3884	+ cButton redoButton;
	3885	+
	3886	+ boolean muteSlider;
	3887	+
	3888	+ int VersionCount()
	3889	+ {
	3890	+ int count = 0;
	3891	+
	3892	+ for (int i = copy.versionlist.length; --i >= 0;)
	3893	+ {
	3894	+ if (copy.versionlist[i] != null)
	3895	+ count++;
	3896	+ }
	3897	+
	3898	+ return count;
	3899	+ }
	3900	+
	3901	+ void SetUndoStates()
	3902	+ {
	3903	+ cRadio tab = GetCurrentTab();
	3904	+
	3905	+ restoreButton.setEnabled(copy.versionindex != -1);
	3906	+ replaceButton.setEnabled(copy.versionindex != -1);
	3907	+
	3908	+ undoButton.setEnabled(copy.versionindex > 0);
	3909	+ redoButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
	3910	+
	3911	+ muteSlider = true;
	3912	+ versionSlider.setMaximum(VersionCount() - 1);
	3913	+ versionSlider.setInteger(copy.versionindex);
	3914	+ muteSlider = false;
	3915	+ }
	3916	+
	3917	+ public boolean Undo()
	3918	+ {
	3919	+ // Option?
	3920	+ Replace();
	3921	+
	3922	+ System.err.println("Undo");
	3923	+
	3924	+ cRadio tab = GetCurrentTab();
	3925	+
	3926	+ if (copy.versionindex == 0)
	3927	+ {
	3928	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3929	+ return false;
	3930	+ }
	3931	+
	3932	+// if (tab.graphs[tab.versionindex] == null) // \|\| !tab.user[tab.versionindex])
	3933	+// {
	3934	+// if (Save(false))
	3935	+// tab.versionindex -= 1;
	3936	+// else
	3937	+// {
	3938	+// if (tab.versionindex <= 0)
	3939	+// return false;
	3940	+// else
	3941	+// tab.versionindex -= 1;
	3942	+// }
	3943	+// }
	3944	+
	3945	+ copy.versionindex -= 1;
	3946	+
	3947	+ CopyChanged((Object3D)copy.versionlist[copy.versionindex]);
	3948	+
	3949	+ return true;
	3950	+ }
	3951	+
	3952	+ public boolean Restore()
	3953	+ {
	3954	+ System.err.println("Restore");
	3955	+
	3956	+ cRadio tab = GetCurrentTab();
	3957	+
	3958	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	3959	+ {
	3960	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3961	+ return false;
	3962	+ }
	3963	+
	3964	+ //CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
	3965	+ CopyChanged(copy.versionlist[copy.versionindex]);
	3966	+
	3967	+ return true;
	3968	+ }
	3969	+
	3970	+ public boolean Replace()
	3971	+ {
	3972	+ System.err.println("Replace");
	3973	+
	3974	+ cRadio tab = GetCurrentTab();
	3975	+
	3976	+ if (copy.versionindex == -1 \|\| copy.versionlist[copy.versionindex] == null)
	3977	+ {
	3978	+ // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
	3979	+ return false;
	3980	+ }
	3981	+
	3982	+ copy.versionlist[copy.versionindex] = CompressCopy();
	3983	+
	3984	+ return true;
	3985	+ }
	3986	+
	3987	+ public void Redo()
	3988	+ {
	3989	+ // Option?
	3990	+ Replace();
	3991	+
	3992	+ cRadio tab = GetCurrentTab();
	3993	+
	3994	+ if (copy.versionlist[copy.versionindex + 1] == null)
	3995	+ {
	3996	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3997	+ return;
	3998	+ }
	3999	+
	4000	+ copy.versionindex += 1;
	4001	+
	4002	+ CopyChanged(copy.versionlist[copy.versionindex]);
	4003	+
	4004	+ //if (!tab.user[tab.versionindex])
	4005	+ // tab.graphs[tab.versionindex] = null;
	4006	+ }
	4007	+
	4008	+ void ImportGFD()
	4009	+ {
	4010	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	4011	+ browser.show();
	4012	+ String filename = browser.getFile();
	4013	+ if (filename != null && filename.length() > 0)
	4014	+ {
	4015	+ String fullname = browser.getDirectory() + filename;
	4016	+
	4017	+ //Object3D readobj =
	4018	+ objEditor.ReadGFD(fullname, objEditor);
	4019	+ //makeSomething(readobj);
	4020	+ }
	4021	+ }
	4022	+
	4023	+ void ImportVRMLX3D()
	4024	+ {
	4025	+ if (Grafreed.standAlone)
	4026	+ {
	4027	+ /**/
	4028	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	4029	+ browser.show();
	4030	+ String filename = browser.getFile();
	4031	+ if (filename != null && filename.length() > 0)
	4032	+ {
	4033	+ String fullname = browser.getDirectory() + filename;
	4034	+ LoadVRMLX3D(fullname);
	4035	+ }
	4036	+ /**/
	4037	+ }
	4038	+ }
	4039	+
3250	4040	void ToggleAnimation()
3251	4041	{
3252	4042	if (!Globals.ANIMATION)
..	..	@@ -3364,7 +4154,7 @@
3364	4154	assert false;
3365	4155	}
3366	4156
3367		- void EditSelection()
	4157	+ void EditSelection(boolean newWindow)
3368	4158	{
3369	4159	}
3370	4160
..	..	@@ -3423,7 +4213,7 @@
3423	4213	//copy.material = new cMaterial(copy.GetMaterial());
3424	4214
3425	4215	current.color = (float) colorField.getFloat();
3426		- current.modulation = (float) modulationField.getFloat();
	4216	+ current.modulation = (float) saturationField.getFloat();
3427	4217	current.metalness = (float) metalnessField.getFloat();
3428	4218	current.diffuse = (float) diffuseField.getFloat();
3429	4219	current.specular = (float) specularField.getFloat();
..	..	@@ -3456,7 +4246,7 @@
3456	4246	cMaterial mat = copy.material;
3457	4247
3458	4248	colorField.SetToolTipValue((mat.color));
3459		- modulationField.SetToolTipValue((mat.modulation));
	4249	+ saturationField.SetToolTipValue((mat.modulation));
3460	4250	metalnessField.SetToolTipValue((mat.metalness));
3461	4251	diffuseField.SetToolTipValue((mat.diffuse));
3462	4252	specularField.SetToolTipValue((mat.specular));
..	..	@@ -3508,9 +4298,25 @@
3508	4298	//copy.Touch();
3509	4299	}
3510	4300
	4301	+ cNumberSlider versionSlider;
	4302	+
3511	4303	public void stateChanged(ChangeEvent e)
3512	4304	{
3513	4305	// assert(false);
	4306	+ if (e.getSource() == versionSlider)
	4307	+ {
	4308	+ if (muteSlider)
	4309	+ return;
	4310	+
	4311	+ int version = versionSlider.getInteger();
	4312	+
	4313	+ if (copy.versionlist[version] != null)
	4314	+ {
	4315	+ CopyChanged(copy.versionlist[copy.versionindex = version]);
	4316	+ }
	4317	+
	4318	+ return;
	4319	+ }
3514	4320
3515	4321	if (freezematerial)
3516	4322	{
..	..	@@ -3546,6 +4352,12 @@
3546	4352	{
3547	4353	//System.out.println("stateChanged = " + this);
3548	4354	materialtouched = true;
	4355	+
	4356	+ if (e.getSource() == colorField && saturationField.getFloat() == 0.001)
	4357	+ {
	4358	+ saturationField.setFloat(1);
	4359	+ }
	4360	+
3549	4361	applySelf();
3550	4362	//System.out.println("this = " + this);
3551	4363	//System.out.println("PARENT = " + parent);
..	..	@@ -3845,6 +4657,7 @@
3845	4657	{
3846	4658	if (GetTree() != null)
3847	4659	{
	4660	+ GetTree().revalidate();
3848	4661	GetTree().repaint();
3849	4662	}
3850	4663
..	..	@@ -3859,6 +4672,8 @@
3859	4672
3860	4673	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3861	4674	{
	4675	+ if (Globals.REPLACEONMAKE) // && resetmodel)
	4676	+ Save();
3862	4677	//Tween.set(thing, 0).target(1).start(tweenManager);
3863	4678	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3864	4679	// if (thing instanceof GenericJointDemo)
..	..	@@ -3945,6 +4760,12 @@
3945	4760	{
3946	4761	ResetModel();
3947	4762	Select(thing.GetTreePath(), true, false); // unselect... false);
	4763	+
	4764	+ if (thing.Size() == 0)
	4765	+ {
	4766	+ //EditSelection(false);
	4767	+ }
	4768	+
3948	4769	refreshContents();
3949	4770	}
3950	4771
..	..	@@ -4062,6 +4883,7 @@
4062	4883	}
4063	4884	}
4064	4885	}
	4886	+
4065	4887	LoadGFDThread loadGFDThread;
4066	4888
4067	4889	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4081,8 +4903,10 @@
4081	4903
4082	4904	try
4083	4905	{
	4906	+ // Try compressed version first.
4084	4907	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4085		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4908	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4909	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4086	4910
4087	4911	readobj = (Object3D) p.readObject();
4088	4912	istream.close();
..	..	@@ -4090,7 +4914,22 @@
4090	4914	readobj.ResetDisplayList();
4091	4915	} catch (Exception e)
4092	4916	{
4093		- e.printStackTrace();
	4917	+ if (!e.toString().contains("GZIP"))
	4918	+ e.printStackTrace();
	4919	+
	4920	+ try
	4921	+ {
	4922	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4923	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4924	+
	4925	+ readobj = (Object3D) p.readObject();
	4926	+ istream.close();
	4927	+
	4928	+ readobj.ResetDisplayList();
	4929	+ } catch (Exception e2)
	4930	+ {
	4931	+ e2.printStackTrace();
	4932	+ }
4094	4933	}
4095	4934	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4096	4935	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4136,6 +4975,12 @@
4136	4975
4137	4976	void LoadIt(Object obj)
4138	4977	{
	4978	+ if (obj == null)
	4979	+ {
	4980	+ // Invalid file
	4981	+ return;
	4982	+ }
	4983	+
4139	4984	System.out.println("Loaded " + obj);
4140	4985	//new Exception().printStackTrace();
4141	4986	Object3D readobj = (Object3D) obj;
..	..	@@ -4145,10 +4990,14 @@
4145	4990
4146	4991	if (readobj != null)
4147	4992	{
	4993	+ //if (Globals.SAVEONMAKE) // A new object cannot share meshes
	4994	+ // Save();
4148	4995	try
4149	4996	{
4150	4997	//readobj.deepCopySelf(copy);
4151	4998	copy.clear(); // june 2014
	4999	+ copy.skyboxname = readobj.skyboxname;
	5000	+ copy.skyboxext = readobj.skyboxext;
4152	5001	for (int i = 0; i < readobj.size(); i++)
4153	5002	{
4154	5003	Object3D child = readobj.get(i); // reserve(i);
..	..	@@ -4189,6 +5038,7 @@
4189	5038	}
4190	5039	} catch (ClassCastException e)
4191	5040	{
	5041	+ e.printStackTrace();
4192	5042	assert (false);
4193	5043	Composite c = (Composite) copy;
4194	5044	c.children.clear();
..	..	@@ -4199,13 +5049,24 @@
4199	5049	c.addChild(csg);
4200	5050	}
4201	5051
	5052	+ copy.versionlist = readobj.versionlist;
	5053	+ copy.versionindex = readobj.versionindex;
	5054	+
	5055	+ if (copy.versionlist == null)
	5056	+ {
	5057	+ copy.versionlist = new Object3D[100];
	5058	+ copy.versionindex = -1;
	5059	+ }
	5060	+
	5061	+ //? SetUndoStates();
	5062	+
4202	5063	ResetModel();
4203	5064	copy.HardTouch(); // recompile?
4204	5065	refreshContents();
4205	5066	}
4206	5067	}
4207	5068
4208		- void load() // throws ClassNotFoundException
	5069	+ void Open() // throws ClassNotFoundException
4209	5070	{
4210	5071	if (Grafreed.standAlone)
4211	5072	{
..	..	@@ -4294,11 +5155,13 @@
4294	5155	try
4295	5156	{
4296	5157	FileOutputStream ostream = new FileOutputStream(lastname);
4297		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	5158	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5159	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4298	5160
4299	5161	p.writeObject(copy);
4300	5162	p.flush();
4301	5163
	5164	+ zstream.close();
4302	5165	ostream.close();
4303	5166
4304	5167	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4306,8 +5169,10 @@
4306	5169	//ps.print(buffer.toString());
4307	5170	} catch (IOException e)
4308	5171	{
	5172	+ e.printStackTrace();
4309	5173	}
4310	5174	}
	5175	+
4311	5176	String lastname;
4312	5177
4313	5178	void saveAs()
..	..	@@ -4319,6 +5184,8 @@
4319	5184	String filename = browser.getFile();
4320	5185	if (filename != null && filename.length() > 0)
4321	5186	{
	5187	+ if (!filename.endsWith(".gfd"))
	5188	+ filename += ".gfd";
4322	5189	lastname = browser.getDirectory() + filename;
4323	5190	save();
4324	5191	}
..	..	@@ -4417,8 +5284,8 @@
4417	5284	try
4418	5285	{
4419	5286	FileOutputStream ostream = new FileOutputStream(filename);
4420		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4421		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	5287	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	5288	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4422	5289
4423	5290	Object3D objectparent = obj.parent;
4424	5291	obj.parent = null;
..	..	@@ -4435,8 +5302,8 @@
4435	5302	p.writeObject(object);
4436	5303	p.flush();
4437	5304
	5305	+ zstream.close();
4438	5306	ostream.close();
4439		- // zstream.close();
4440	5307
4441	5308	// group.selection.get(0).parent = parent;
4442	5309	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4483,19 +5350,18 @@
4483	5350	Object3D client;
4484	5351	Object3D copy;
4485	5352	MenuBar menuBar;
4486		- Menu windowMenu;
4487		- MenuItem loadItem;
	5353	+ Menu fileMenu;
	5354	+ MenuItem newItem;
	5355	+ MenuItem openItem;
4488	5356	MenuItem saveItem;
4489	5357	MenuItem saveAsItem;
4490	5358	MenuItem exportAsItem;
4491	5359	MenuItem reexportItem;
4492	5360	MenuItem povItem;
4493	5361	MenuItem closeItem;
4494		- Menu cameraMenu;
	5362	+
4495	5363	CheckboxMenuItem zBufferItem;
4496	5364	//MenuItem normalLensItem;
4497		- MenuItem editCameraItem;
4498		- MenuItem revertCameraItem;
4499	5365	MenuItem stepItem;
4500	5366	CheckboxMenuItem toggleLiveItem;
4501	5367	CheckboxMenuItem toggleFullScreenItem;
..	..	@@ -4509,22 +5375,36 @@
4509	5375	CheckboxMenuItem toggleSwitchItem;
4510	5376	CheckboxMenuItem toggleRootItem;
4511	5377	CheckboxMenuItem animationItem;
	5378	+ MenuItem archiveItem;
4512	5379	CheckboxMenuItem toggleHandleItem;
4513	5380	CheckboxMenuItem togglePaintItem;
4514	5381	JSplitPane mainPanel;
4515	5382	JScrollPane scrollpane;
	5383	+
4516	5384	JPanel toolbarPanel;
	5385	+
4517	5386	cGridBag treePanel;
	5387	+
4518	5388	JPanel radioPanel;
4519	5389	ButtonGroup buttonGroup;
4520		- cGridBag ctrlPanel;
	5390	+
	5391	+ cGridBag toolboxPanel;
4521	5392	cGridBag materialPanel;
	5393	+ cGridBag ctrlPanel;
	5394	+
4522	5395	JScrollPane infoPanel;
	5396	+
4523	5397	cGridBag optionsPanel;
	5398	+
4524	5399	JTabbedPane objectPanel;
	5400	+ boolean materialFlushed;
	5401	+ Object3D latestObject;
	5402	+
4525	5403	cGridBag XYZPanel;
	5404	+
4526	5405	JSplitPane gridPanel;
4527	5406	JSplitPane bigPanel;
	5407	+
4528	5408	cGridBag bigThree;
4529	5409	cGridBag scenePanel;
4530	5410	cGridBag centralPanel;
..	..	@@ -4582,7 +5462,7 @@
4582	5462	JLabel colorLabel;
4583	5463	cNumberSlider colorField;
4584	5464	JLabel modulationLabel;
4585		- cNumberSlider modulationField;
	5465	+ cNumberSlider saturationField;
4586	5466	JLabel metalnessLabel;
4587	5467	cNumberSlider metalnessField;
4588	5468	JLabel diffuseLabel;
..	..	@@ -4639,8 +5519,13 @@
4639	5519	cNumberSlider fogField;
4640	5520	JLabel opacityPowerLabel;
4641	5521	cNumberSlider opacityPowerField;
4642		- JTree jTree;
	5522	+ cTree jTree;
4643	5523	//ObjectUI parent;
4644	5524
4645	5525	cNumberSlider normalpushField;
	5526	+
	5527	+ private MenuItem importGFDItem;
	5528	+ private MenuItem importVRMLX3DItem;
	5529	+ private MenuItem import3DSItem;
	5530	+ private MenuItem importOBJItem;
4646	5531	}