~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -36,6 +36,8 @@
36	36	GroupEditor callee;
37	37	JFrame frame;
38	38
	39	+ static ObjEditor theFrame;
	40	+
39	41	// SCRIPT
40	42
41	43	transient JFrame textpanel = null;
..	..	@@ -138,34 +140,42 @@
138	140	public void closeUI()
139	141	{
140	142	//new Exception().printStackTrace();
141		- System.out.println("this = " + this);
142		- System.out.println("objEditor = " + objEditor);
	143	+// System.out.println("this = " + this);
	144	+// System.out.println("objEditor = " + objEditor);
143	145	//nameField.removeActionListener(this);
144		- objEditor.ctrlPanel.remove(nameField);
	146	+// objEditor.ctrlPanel.remove(nameField);
	147	+
	148	+ objEditor.ctrlPanel.remove(namePanel);
145	149
146	150	if (!GroupEditor.allparams)
147	151	return;
148	152
149		- objEditor.ctrlPanel.remove(liveCB);
150		- objEditor.ctrlPanel.remove(hideCB);
151		- objEditor.ctrlPanel.remove(markCB);
152		-
153		- objEditor.ctrlPanel.remove(randomCB);
154		- objEditor.ctrlPanel.remove(speedupCB);
155		- objEditor.ctrlPanel.remove(rewindCB);
156		-
157		- objEditor.ctrlPanel.remove(resetButton);
158		- objEditor.ctrlPanel.remove(stepButton);
159		-// objEditor.ctrlPanel.remove(stepAllButton);
160		-// objEditor.ctrlPanel.remove(resetAllButton);
161		- objEditor.ctrlPanel.remove(link2masterCB);
162		- //objEditor.ctrlPanel.remove(flipVCB);
163		- //objEditor.ctrlPanel.remove(texresMenu);
164		- objEditor.ctrlPanel.remove(slowerButton);
165		- objEditor.ctrlPanel.remove(fasterButton);
166		- objEditor.ctrlPanel.remove(remarkButton);
	153	+// objEditor.ctrlPanel.remove(liveCB);
	154	+// objEditor.ctrlPanel.remove(hideCB);
	155	+// objEditor.ctrlPanel.remove(markCB);
	156	+//
	157	+// objEditor.ctrlPanel.remove(randomCB);
	158	+// objEditor.ctrlPanel.remove(speedupCB);
	159	+// objEditor.ctrlPanel.remove(rewindCB);
	160	+//
	161	+// objEditor.ctrlPanel.remove(resetButton);
	162	+// objEditor.ctrlPanel.remove(stepButton);
	163	+//// objEditor.ctrlPanel.remove(stepAllButton);
	164	+//// objEditor.ctrlPanel.remove(resetAllButton);
	165	+// objEditor.ctrlPanel.remove(link2masterCB);
	166	+// //objEditor.ctrlPanel.remove(flipVCB);
	167	+// //objEditor.ctrlPanel.remove(texresMenu);
	168	+// objEditor.ctrlPanel.remove(slowerButton);
	169	+// objEditor.ctrlPanel.remove(fasterButton);
	170	+// objEditor.ctrlPanel.remove(remarkButton);
167	171
168		- Remove(normalpushField);
	172	+ objEditor.ctrlPanel.remove(setupPanel);
	173	+ objEditor.ctrlPanel.remove(setupPanel2);
	174	+ objEditor.ctrlPanel.remove(commandsPanel);
	175	+ objEditor.ctrlPanel.remove(pushPanel);
	176	+ //objEditor.ctrlPanel.remove(fillPanel);
	177	+
	178	+ //Remove(normalpushField);
169	179	}
170	180
171	181	public ObjEditor GetEditor()
..	..	@@ -236,6 +246,7 @@
236	246	//localCopy.parent = null;
237	247
238	248	frame = new JFrame();
	249	+ frame.setUndecorated(true);
239	250	objEditor = this;
240	251	this.callee = callee;
241	252
..	..	@@ -269,24 +280,40 @@
269	280	void SetupMenu()
270	281	{
271	282	frame.setMenuBar(menuBar = new MenuBar());
272		- menuBar.add(windowMenu = new Menu("File"));
273		- windowMenu.add(loadItem = new MenuItem("Load..."));
274		- windowMenu.add("-");
275		- windowMenu.add(saveItem = new MenuItem("Save"));
276		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	283	+ menuBar.add(fileMenu = new Menu("File"));
	284	+ fileMenu.add(newItem = new MenuItem("New"));
	285	+ fileMenu.add(loadItem = new MenuItem("Open..."));
	286	+
	287	+ //oe.menuBar.add(menu = new Menu("Include"));
	288	+ Menu menu = new Menu("Import");
	289	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	290	+ importOBJItem.addActionListener(this);
	291	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	292	+ import3DSItem.addActionListener(this);
	293	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	294	+ importVRMLX3DItem.addActionListener(this);
	295	+ menu.add("-");
	296	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	297	+ importGFDItem.addActionListener(this);
	298	+ fileMenu.add(menu);
	299	+ fileMenu.add("-");
	300	+
	301	+ fileMenu.add(saveItem = new MenuItem("Save"));
	302	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
277	303	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
278		- windowMenu.add("-");
279		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
280		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
281		- windowMenu.add("-");
	304	+ fileMenu.add("-");
	305	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	306	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	307	+ fileMenu.add("-");
282	308	if (client.parent != null)
283	309	{
284		- windowMenu.add(closeItem = new MenuItem("Close"));
	310	+ fileMenu.add(closeItem = new MenuItem("Close"));
285	311	} else
286	312	{
287		- windowMenu.add(closeItem = new MenuItem("Exit"));
	313	+ fileMenu.add(closeItem = new MenuItem("Exit"));
288	314	}
289	315
	316	+ newItem.addActionListener(this);
290	317	loadItem.addActionListener(this);
291	318	saveItem.addActionListener(this);
292	319	saveAsItem.addActionListener(this);
..	..	@@ -295,79 +322,26 @@
295	322	//povItem.addActionListener(this);
296	323	closeItem.addActionListener(this);
297	324
298		- menuBar.add(cameraMenu = new Menu("View"));
299		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
300		- //zBufferItem.addActionListener(this);
301		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
302		- //normalLensItem.addActionListener(this);
303		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
304		- revertCameraItem.addActionListener(this);
305		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
306		- toggleTimelineItem.addItemListener(this);
307		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
308		- toggleFullScreenItem.addItemListener(this);
309		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
310		- cameraMenu.add("-");
311		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
312		- toggleTextureItem.addItemListener(this);
313		- toggleTextureItem.setState(CameraPane.textureon);
314		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
315		- toggleLiveItem.addItemListener(this);
316		- toggleLiveItem.setState(Globals.isLIVE());
317		- cameraMenu.add(stepItem = new MenuItem("Step"));
318		- stepItem.addActionListener(this);
319		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
320		-// toggleDLItem.addItemListener(this);
321		-// toggleDLItem.setState(false);
322		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
323		- toggleRenderItem.addItemListener(this);
324		- toggleRenderItem.setState(!CameraPane.frozen);
325		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
326		- toggleDebugItem.addItemListener(this);
327		- toggleDebugItem.setState(CameraPane.DEBUG);
328		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
329		- toggleFrustumItem.addItemListener(this);
330		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
331		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
332		- toggleFootContactItem.addItemListener(this);
333		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
334		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
335		- toggleRandomItem.addItemListener(this);
336		- toggleRandomItem.setState(CameraPane.RANDOM);
337		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
338		- toggleHandleItem.addItemListener(this);
339		- toggleHandleItem.setState(CameraPane.HANDLES);
340		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
341		- togglePaintItem.addItemListener(this);
342		- togglePaintItem.setState(CameraPane.PAINTMODE);
343		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
344		-// toggleRootItem.addItemListener(this);
345		-// toggleRootItem.setState(false);
346		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
347		-// animationItem.addItemListener(this);
348		-// animationItem.setState(CameraPane.ANIMATION);
349		- cameraMenu.add("-");
350		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
351		- editCameraItem.addActionListener(this);
352		-
353	325	objectPanel = new JTabbedPane();
354	326	toolbarPanel = new JPanel();
355	327	toolbarPanel.setName("Toolbar");
356		- treePanel = new JPanel();
	328	+ treePanel = new cGridBag();
357	329	treePanel.setName("Tree");
358		- ctrlPanel = new JPanel(); // new GridBagLayout());
	330	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
359	331	ctrlPanel.setName("Edit");
360		- materialPanel = new JPanel();
	332	+ materialPanel = new cGridBag().setVertical(true);
361	333	materialPanel.setName("Material");
362	334	/JTextPane/
363	335	infoarea = createTextPane();
	336	+ doc = infoarea.getStyledDocument();
	337	+
364	338	infoarea.setEditable(true);
365	339	SetText();
366	340	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
367	341	// infoarea.setOpaque(false);
368	342	// //infoarea.setForeground(textcolor);
369		- infoarea.setLineWrap(true);
370		- infoarea.setWrapStyleWord(true);
	343	+// TEXTAREA infoarea.setLineWrap(true);
	344	+// TEXTAREA infoarea.setWrapStyleWord(true);
371	345	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
372	346	infoPanel.setPreferredSize(new Dimension(50, 200));
373	347	infoPanel.setName("Info");
..	..	@@ -378,16 +352,16 @@
378	352	mainPanel.setName("Main");
379	353	mainPanel.setContinuousLayout(true);
380	354	mainPanel.setOneTouchExpandable(true);
381		- mainPanel.setDividerLocation(1.0);
382	355	mainPanel.setDividerSize(9);
383		- mainPanel.setResizeWeight(0);
	356	+ mainPanel.setDividerLocation(0.5); //1.0);
	357	+ mainPanel.setResizeWeight(0.5);
384	358
385	359	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
386	360	//mainPanel.setLayout(new GridBagLayout());
387	361	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
388		- treePanel.setLayout(new GridBagLayout());
389		- ctrlPanel.setLayout(new GridBagLayout());
390		- materialPanel.setLayout(new GridBagLayout());
	362	+// treePanel.setLayout(new GridBagLayout());
	363	+ //ctrlPanel.setLayout(new GridBagLayout());
	364	+ //materialPanel.setLayout(new GridBagLayout());
391	365
392	366	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
393	367	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -426,7 +400,7 @@
426	400	static String newline = "\n";
427	401	protected static final String buttonString = "JButton";
428	402	StyledDocument doc;
429		- JTextArea infoarea;
	403	+ JTextPane infoarea;
430	404
431	405	void ClearInfo()
432	406	{
..	..	@@ -449,10 +423,10 @@
449	423	e.printStackTrace();
450	424	}
451	425
452		- String selection = infoarea.getText();
453		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
454		- java.awt.datatransfer.Clipboard clipboard =
455		- Toolkit.getDefaultToolkit().getSystemClipboard();
	426	+// String selection = infoarea.getText();
	427	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	428	+// java.awt.datatransfer.Clipboard clipboard =
	429	+// Toolkit.getDefaultToolkit().getSystemClipboard();
456	430	//clipboard.setContents(data, data);
457	431	}
458	432
..	..	@@ -475,13 +449,13 @@
475	449	//SendInfo("Name:", "bold");
476	450	if (sel.GetTextures() != null \|\| debug)
477	451	{
478		- si.SendInfo(sel.toString(), "bold");
	452	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
479	453	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
480	454	if (sel.Size() > 0)
481	455	{
482	456	si.SendInfo("#children = " + sel.Size(), "regular");
483	457	}
484		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	458	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
485	459	if (debug)
486	460	{
487	461	try
..	..	@@ -493,7 +467,10 @@
493	467	}
494	468
495	469	if (full)
496		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	470	+ {
	471	+ si.SendInfo(" BBox min: " + minima, "regular");
	472	+ si.SendInfo(" BBox max: " + maxima, "regular");
	473	+ }
497	474
498	475	if (sel.bRep != null)
499	476	{
..	..	@@ -520,7 +497,7 @@
520	497	}
521	498	if (sel.support != null)
522	499	{
523		- si.SendInfo(" support: " + sel.support, "regular");
	500	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
524	501	}
525	502	if (sel.scriptnode != null)
526	503	{
..	..	@@ -591,6 +568,9 @@
591	568	{
592	569	CameraPane.pointflow = (PointFlow) sel;
593	570	}
	571	+
	572	+ si.SendInfo("_____________________", "regular");
	573	+ si.SendInfo("", "regular");
594	574	}
595	575	}
596	576
..	..	@@ -606,68 +586,138 @@
606	586	}
607	587	}
608	588
	589	+static GraphicsDevice device = GraphicsEnvironment
	590	+ .getLocalGraphicsEnvironment().getScreenDevices()[0];
	591	+
	592	+ Rectangle keeprect;
	593	+ cRadio radio;
	594	+
	595	+cButton keepButton;
	596	+ cButton twoButton; // Full 3D
	597	+ cButton sixButton;
	598	+ cButton threeButton;
	599	+ cButton sevenButton;
	600	+ cButton fourButton; // full panel
	601	+ cButton oneButton; // full XYZ
	602	+ //cButton currentLayout;
	603	+
	604	+ boolean maximized;
	605	+
	606	+ void Minimize()
	607	+ {
	608	+ frame.setState(Frame.ICONIFIED);
	609	+ }
	610	+
	611	+ void Maximize()
	612	+ {
	613	+ if (maximized)
	614	+ {
	615	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	616	+ }
	617	+ else
	618	+ {
	619	+ keeprect = frame.getBounds();
	620	+ Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	621	+ Dimension rect2 = frame.getToolkit().getScreenSize();
	622	+ frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	623	+// frame.setState(Frame.MAXIMIZED_BOTH);
	624	+ }
	625	+
	626	+ maximized ^= true;
	627	+ }
	628	+
609	629	void ToggleFullScreen()
610	630	{
611	631	if (CameraPane.FULLSCREEN)
612	632	{
613		- frame.getContentPane().remove(/"Center",/bigThree);
614		- framePanel.add(bigThree);
615		- frame.getContentPane().add(/"Center",/framePanel);
	633	+ device.setFullScreenWindow(null);
	634	+ //frame.setVisible(false);
	635	+// frame.removeNotify();
	636	+// frame.setUndecorated(false);
	637	+// frame.addNotify();
	638	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	639	+
	640	+// X frame.getContentPane().remove(/"Center",/bigThree);
	641	+// X framePanel.add(bigThree);
	642	+// X frame.getContentPane().add(/"Center",/framePanel);
	643	+ framePanel.setDividerLocation(1);
	644	+
	645	+ //frame.setVisible(true);
	646	+ radio.layout = keepButton;
	647	+ //theFrame = null;
	648	+ keepButton = null;
	649	+ radio.layout.doClick();
	650	+
616	651	} else
617	652	{
618		- frame.getContentPane().remove(/"Center",/framePanel);
619		- framePanel.remove(bigThree);
620		- frame.getContentPane().add(/"Center",/bigThree);
	653	+ keepButton = radio.layout;
	654	+ //keeprect = frame.getBounds();
	655	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	656	+// frame.getToolkit().getScreenSize().height);
	657	+ //frame.setVisible(false);
	658	+ device.setFullScreenWindow(frame);
	659	+// frame.removeNotify();
	660	+// frame.setUndecorated(true);
	661	+// frame.addNotify();
	662	+// X frame.getContentPane().remove(/"Center",/framePanel);
	663	+// X framePanel.remove(bigThree);
	664	+// X frame.getContentPane().add(/"Center",/bigThree);
	665	+ framePanel.setDividerLocation(0);
	666	+
	667	+ radio.layout = twoButton;
	668	+ radio.layout.doClick();
	669	+ //frame.setVisible(true);
621	670	}
	671	+
622	672	cameraView.ToggleFullScreen();
623	673	}
624	674
625		- private JTextArea createTextPane()
	675	+ private JTextPane createTextPane()
626	676	{
627		- String[] initString =
628		- {
629		- "This is an editable JTextPane, ", //regular
630		- "another ", //italic
631		- "styled ", //bold
632		- "text ", //small
633		- "component, ", //large
634		- "which supports embedded components..." + newline,//regular
635		- " " + newline, //button
636		- "...and embedded icons..." + newline, //regular
637		- " ", //icon
638		- newline + "JTextPane is a subclass of JEditorPane that "
639		- + "uses a StyledEditorKit and StyledDocument, and provides "
640		- + "cover methods for interacting with those objects."
641		- };
	677	+// TEXTAREA String[] initString =
	678	+// {
	679	+// "This is an editable JTextPane, ", //regular
	680	+// "another ", //italic
	681	+// "styled ", //bold
	682	+// "text ", //small
	683	+// "component, ", //large
	684	+// "which supports embedded components..." + newline,//regular
	685	+// " " + newline, //button
	686	+// "...and embedded icons..." + newline, //regular
	687	+// " ", //icon
	688	+// newline + "JTextPane is a subclass of JEditorPane that "
	689	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	690	+// + "cover methods for interacting with those objects."
	691	+// };
	692	+//
	693	+// String[] initStyles =
	694	+// {
	695	+// "regular", "italic", "bold", "small", "large",
	696	+// "regular", "button", "regular", "icon",
	697	+// "regular"
	698	+// };
	699	+//
	700	+// JTextPane textPane = new JTextPane();
	701	+// textPane.setEditable(true);
	702	+// /StyledDocument/ doc = textPane.getStyledDocument();
	703	+// addStylesToDocument(doc);
	704	+//
	705	+// try
	706	+// {
	707	+// for (int j = 0; j < 2; j++)
	708	+// {
	709	+// for (int i = 0; i < initString.length; i++)
	710	+// {
	711	+// doc.insertString(doc.getLength(), initString[i],
	712	+// doc.getStyle(initStyles[i]));
	713	+// }
	714	+// }
	715	+// } catch (BadLocationException ble)
	716	+// {
	717	+// System.err.println("Couldn't insert initial text into text pane.");
	718	+// }
642	719
643		- String[] initStyles =
644		- {
645		- "regular", "italic", "bold", "small", "large",
646		- "regular", "button", "regular", "icon",
647		- "regular"
648		- };
649		-
650		- JTextPane textPane = new JTextPane();
651		- textPane.setEditable(true);
652		- /StyledDocument/ doc = textPane.getStyledDocument();
653		- addStylesToDocument(doc);
654		-
655		- try
656		- {
657		- for (int j = 0; j < 2; j++)
658		- {
659		- for (int i = 0; i < initString.length; i++)
660		- {
661		- doc.insertString(doc.getLength(), initString[i],
662		- doc.getStyle(initStyles[i]));
663		- }
664		- }
665		- } catch (BadLocationException ble)
666		- {
667		- System.err.println("Couldn't insert initial text into text pane.");
668		- }
669		-
670		- return new JTextArea(); // textPane;
	720	+ return new JTextPane(); // textPane;
671	721	}
672	722
673	723	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -720,7 +770,7 @@
720	770	protected static ImageIcon createImageIcon(String path,
721	771	String description)
722	772	{
723		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	773	+ java.net.URL imgURL = Grafreed.class.getResource(path);
724	774	if (imgURL != null)
725	775	{
726	776	return new ImageIcon(imgURL, description);
..	..	@@ -752,6 +802,7 @@
752	802	// NumberSlider vDivsField;
753	803	// JCheckBox endcaps;
754	804	JCheckBox liveCB;
	805	+ JCheckBox selectCB;
755	806	JCheckBox hideCB;
756	807	JCheckBox link2masterCB;
757	808	JCheckBox markCB;
..	..	@@ -767,115 +818,84 @@
767	818	JButton slowerButton;
768	819	JButton fasterButton;
769	820	JButton remarkButton;
	821	+
	822	+ cGridBag namePanel;
	823	+ cGridBag setupPanel;
	824	+ cGridBag setupPanel2;
	825	+ cGridBag commandsPanel;
	826	+ cGridBag pushPanel;
	827	+ cGridBag fillPanel;
770	828
771		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	829	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
772	830	{
773	831	JCheckBox cb;
774	832
775		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
776		- oe.aConstraints.gridwidth = 1; // 3;
777		-// oe.aConstraints.weightx = 1;
778		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
779		- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	833	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
780	834	cb.addItemListener(this);
781		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
782		- oe.aConstraints.gridwidth = 1;
783		- oe.aConstraints.gridx += 1;
784	835
785	836	return cb;
786	837	}
787	838
788		- cButton AddButton(ObjEditor oe, String label)
	839	+ cButton AddButton(cGridBag panel, String label)
789	840	{
790	841	cButton cb;
791	842
792		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
793		- oe.aConstraints.gridwidth = 1;
794		-// oe.aConstraints.weightx = 1;
795		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
796		- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
	843	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
797	844	cb.addActionListener(this);
798		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
799		- oe.aConstraints.gridwidth = 1;
800		- oe.aConstraints.gridx += 1;
801	845
802	846	return cb;
803	847	}
804	848
805		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	849	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
806	850	{
807	851	JComboBox combo;
808	852
809		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
810		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
811		- oe.aConstraints.gridx += 1;
	853	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
812	854	combo.addActionListener(this);
813	855
814	856	return combo;
815	857	}
816	858
817		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	859	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
818	860	{
819		- NumberSlider combo;
	861	+ cGridBag control = new cGridBag();
	862	+
	863	+ cNumberSlider combo;
820	864
821	865	JLabel jlabel = new JLabel(label);
822		-
823		- aConstraints.fill = GridBagConstraints.VERTICAL;
824	866	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
825		- aConstraints.gridwidth = 1;
826		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
827		- aConstraints.gridx += 1;
828		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
829		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
830		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
831		- aConstraints.gridx += 1;
832		- aConstraints.gridwidth = 1;
833		-
	867	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	868	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
834	869	combo.setFloat(current);
835		-
836		- combo.label = jlabel;
837		-
838		- combo.addChangeListener(this);
839		-
840		- return combo;
	870	+
	871	+ panel.add(control);
	872	+
	873	+ return control;
841	874	}
842	875
843		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	876	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
844	877	{
845		- NumberSlider combo;
	878	+ cGridBag control = new cGridBag();
	879	+
	880	+ cNumberSlider combo;
846	881
847	882	JLabel jlabel = new JLabel(label);
848		-
849		- aConstraints.fill = GridBagConstraints.VERTICAL;
850	883	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
851		- aConstraints.gridwidth = 2;
852		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
853		- aConstraints.gridx += 1;
854		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
855		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
856		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
857		- aConstraints.gridx += 1;
858		- aConstraints.gridwidth = 1;
859		-
	884	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	885	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
860	886	combo.setInteger(current);
861	887
862		- combo.label = jlabel;
863		-
864		- combo.addChangeListener(this);
865		-
866		- return combo;
	888	+ panel.add(control);
	889	+
	890	+ return control;
867	891	}
868	892
869		- JTextArea AddText(JPanel ctrlPanel, String name)
	893	+ JTextArea AddText(cGridBag ctrlPanel, String name)
870	894	{
871	895	JTextArea text;
872	896
873		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
874		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
875		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	897	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
876	898	text.addCaretListener(this);
877		- aConstraints.gridx += 1;
878		- aConstraints.gridwidth = 1;
879	899
880	900	return text;
881	901	}
..	..	@@ -905,9 +925,16 @@
905	925	objEditor.ctrlPanel.remove(j);
906	926	}
907	927
	928	+ void Remove(cNumberSlider j)
	929	+ {
	930	+ j.removeChangeListener(this);
	931	+ //objEditor.ctrlPanel.remove(j.label);
	932	+ objEditor.ctrlPanel.remove(j);
	933	+ }
	934	+
908	935	/*
909	936	*/
910		- void Return() // ObjEditor oe)
	937	+ void Return0() // ObjEditor oe)
911	938	{
912	939	aConstraints.gridy += 1;
913	940	aConstraints.gridx = 0;
..	..	@@ -962,37 +989,76 @@
962	989
963	990	void SetupUI2(ObjEditor oe)
964	991	{
965		-// oe.aConstraints.weightx = 0;
966		-// oe.aConstraints.weighty = 0;
967		-// oe.aConstraints.gridx = 0;
968		-// oe.aConstraints.gridy = 0;
969		- SetupName(oe);
	992	+ //SetupName(oe);
	993	+
	994	+ namePanel = new cGridBag();
	995	+
	996	+ nameField = AddText(namePanel, copy.GetName());
	997	+ namePanel.add(nameField);
	998	+ oe.ctrlPanel.add(namePanel);
	999	+
	1000	+ oe.ctrlPanel.Return();
970	1001
971	1002	if (!GroupEditor.allparams)
972	1003	return;
973	1004
974		- liveCB = AddCheckBox(oe, "Live", copy.live);
975		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
976		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1005	+ setupPanel = new cGridBag().setVertical(false);
	1006	+
	1007	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1008	+ liveCB.setToolTipText("Animate object");
	1009	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1010	+ selectCB.setToolTipText("Make object selectable");
977	1011	// Return();
978		- markCB = AddCheckBox(oe, "Mark", copy.marked);
979		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
980		- randomCB = AddCheckBox(oe, "Rand", copy.random);
981		- Return();
982		- resetButton = AddButton(oe, "Reset");
983		- stepButton = AddButton(oe, "Step");
	1012	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1013	+ hideCB.setToolTipText("Hide object");
	1014	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	1015	+ markCB.setToolTipText("Set the animation target transform");
	1016	+
	1017	+ setupPanel2 = new cGridBag().setVertical(false);
	1018	+
	1019	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1020	+ rewindCB.setToolTipText("Rewind animation");
	1021	+
	1022	+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1023	+ randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1024	+
	1025	+ if (Globals.ADVANCED)
	1026	+ {
	1027	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
	1028	+ link2masterCB.setToolTipText("Attach to support");
	1029	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1030	+ speedupCB.setToolTipText("Option motion capture");
	1031	+ }
	1032	+
	1033	+ oe.ctrlPanel.add(setupPanel);
	1034	+ oe.ctrlPanel.Return();
	1035	+ oe.ctrlPanel.add(setupPanel2);
	1036	+ oe.ctrlPanel.Return();
	1037	+
	1038	+ commandsPanel = new cGridBag().setVertical(false);
	1039	+
	1040	+ resetButton = AddButton(commandsPanel, "Reset");
	1041	+ resetButton.setToolTipText("Jump to frame zero");
	1042	+ stepButton = AddButton(commandsPanel, "Step");
	1043	+ stepButton.setToolTipText("Step one frame");
984	1044	// resetAllButton = AddButton(oe, "Reset All");
985	1045	// stepAllButton = AddButton(oe, "Step All");
986		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
987	1046	// Return();
988		- slowerButton = AddButton(oe, "Slow");
989		- fasterButton = AddButton(oe, "Fast");
990		- remarkButton = AddButton(oe, "Rem");
	1047	+ slowerButton = AddButton(commandsPanel, "Slow");
	1048	+ slowerButton.setToolTipText("Decrease animation speed");
	1049	+ fasterButton = AddButton(commandsPanel, "Fast");
	1050	+ fasterButton.setToolTipText("Increase animation speed");
	1051	+ remarkButton = AddButton(commandsPanel, "Remark");
	1052	+ remarkButton.setToolTipText("Set the current transform as the target");
991	1053
992		- Return();
	1054	+ oe.ctrlPanel.add(commandsPanel);
	1055	+ oe.ctrlPanel.Return();
993	1056
994		- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
995		- Return();
	1057	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1058	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1059	+ //Return();
	1060	+
	1061	+ oe.ctrlPanel.Return();
996	1062
997	1063	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
998	1064	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1087,7 +1153,7 @@
1087	1153	oe.aConstraints.gridwidth = 1;
1088	1154	/**/
1089	1155	nameField = AddText(oe.ctrlPanel, copy.GetName());
1090		- Return();
	1156	+ oe.ctrlPanel.Return();
1091	1157
1092	1158	//ctrlPanel.add(textureButton = new Button("Texture..."));
1093	1159	//textureButton.setEnabled(false);
..	..	@@ -1189,9 +1255,13 @@
1189	1255	//JPanel worldPanel =
1190	1256	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1191	1257	//worldPanel.setName("World");
1192		- centralPanel = new JPanel(new BorderLayout());
1193		- timelinePanel = new JPanel(new BorderLayout());
1194		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1258	+ centralPanel = new cGridBag();
	1259	+ centralPanel.preferredWidth = 20;
	1260	+
	1261	+ if (Globals.ADVANCED)
	1262	+ {
	1263	+ timelinePanel = new JPanel(new BorderLayout());
	1264	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1195	1265
1196	1266	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1197	1267	cameraPanel.setContinuousLayout(true);
..	..	@@ -1200,7 +1270,10 @@
1200	1270	// cameraPanel.setDividerSize(9);
1201	1271	cameraPanel.setResizeWeight(1.0);
1202	1272
	1273	+ }
	1274	+
1203	1275	centralPanel.add(cameraView);
	1276	+ centralPanel.setFocusable(true);
1204	1277	//frame.setJMenuBar(timelineMenubar);
1205	1278	//centralPanel.add(timelinePanel);
1206	1279
..	..	@@ -1222,6 +1295,7 @@
1222	1295	XYZPanel = new cGridBag().setVertical(true);
1223	1296	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1224	1297
	1298	+ XYZPanel.preferredWidth = 5;
1225	1299	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1226	1300	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1227	1301	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
..	..	@@ -1262,10 +1336,11 @@
1262	1336	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1263	1337	//tmp.setName("Edit");
1264	1338	objectPanel.add(materialPanel);
1265		- JPanel north = new JPanel(new BorderLayout());
1266		- north.setName("Edit");
1267		- north.add(ctrlPanel, BorderLayout.NORTH);
1268		- objectPanel.add(north);
	1339	+// JPanel north = new JPanel(new BorderLayout());
	1340	+// north.setName("Edit");
	1341	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1342	+// objectPanel.add(north);
	1343	+ objectPanel.add(ctrlPanel);
1269	1344	objectPanel.add(infoPanel);
1270	1345
1271	1346	/*
..	..	@@ -1286,19 +1361,23 @@
1286	1361	scrollpane.setWheelScrollingEnabled(true);
1287	1362	scrollpane.addMouseWheelListener(this); // Default not fast enough
1288	1363
1289		- /JTabbedPane/ scenePanel = new JTabbedPane();
1290		- scenePanel.add(scrollpane);
	1364	+ /JTabbedPane/ scenePanel = new cGridBag();
	1365	+ scenePanel.preferredWidth = 6;
	1366	+
	1367	+ JTabbedPane tabbedPane = new JTabbedPane();
	1368	+ tabbedPane.add(scrollpane);
1291	1369
1292		- scenePanel.add(FSPane = new cFileSystemPane(this));
	1370	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1293	1371
1294		- optionsPanel = new JPanel(new GridBagLayout());
	1372	+ optionsPanel = new cGridBag().setVertical(true);
1295	1373
1296	1374	optionsPanel.setName("Options");
1297	1375
1298		- AddOptions(optionsPanel, aConstraints);
	1376	+ AddOptions(optionsPanel); //, aConstraints);
1299	1377
1300		- scenePanel.add(optionsPanel);
1301		-
	1378	+ tabbedPane.add(optionsPanel);
	1379	+
	1380	+ scenePanel.add(tabbedPane);
1302	1381
1303	1382	/*
1304	1383	cTree jTree = new cTree(null);
..	..	@@ -1389,9 +1468,11 @@
1389	1468
1390	1469	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1391	1470
1392		- frame.setSize(1024, 768);
1393		- frame.show();
	1471	+ frame.setSize(1280, 860);
	1472	+ frame.setVisible(true);
1394	1473
	1474	+ cameraView.requestFocusInWindow();
	1475	+
1395	1476	gridPanel.setDividerLocation(1.0);
1396	1477
1397	1478	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1405,7 +1486,7 @@
1405	1486	});
1406	1487	}
1407	1488
1408		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	1489	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
1409	1490	{
1410	1491	}
1411	1492
..	..	@@ -1420,260 +1501,173 @@
1420	1501	ctrlPanel.removeAll();
1421	1502	}
1422	1503
1423		- void SetupMaterial(JPanel ctrlPanel)
	1504	+ void SetupMaterial(cGridBag panel)
1424	1505	{
1425		- aConstraints.weighty = 0;
1426		- //aConstraints.weightx = 1;
1427		- /*
	1506	+ /*
1428	1507	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1429	1508	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1430		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1431		- aConstraints.gridx += 1;
1432	1509	*/
1433	1510
1434		- aConstraints.gridwidth = 1;
1435		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1436		- aConstraints.gridx += 1;
1437		- aConstraints.weighty = 0;
1438		- aConstraints.gridwidth = 1;
	1511	+ cGridBag editBar = new cGridBag().setVertical(false);
	1512	+
	1513	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1514	+ createMaterialButton.setToolTipText("Create material");
1439	1515
1440	1516	/*
1441	1517	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1442		- aConstraints.gridx += 1;
1443		- aConstraints.weighty = 0;
1444		- aConstraints.gridwidth = 1;
1445	1518	*/
1446	1519
1447		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1448		- aConstraints.gridx += 1;
	1520	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1521	+ clearMaterialButton.setToolTipText("Clear material");
	1522	+
	1523	+ if (Globals.ADVANCED)
	1524	+ {
	1525	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1526	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1527	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1528	+ }
1449	1529
1450		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1451		-
1452		- aConstraints.gridx += 1;
1453		-
1454		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1455		-
1456		- aConstraints.gridx += 1;
1457		-
1458		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1459		-
1460		- aConstraints.gridx = 0;
1461		- aConstraints.gridy += 1;
1462		- aConstraints.weighty = 0;
1463		- aConstraints.gridwidth = 1;
	1530	+ editBar.preferredHeight = 15;
	1531	+
	1532	+ panel.add(editBar);
	1533	+
1464	1534	/**/
1465	1535	//aConstraints.weighty = 0;
1466	1536	////aConstraints.weightx = 1;
1467	1537	//aConstraints.weighty = 1;
1468	1538	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1469	1539	//aConstraints.gridx += 1;
1470		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1471		- aConstraints.weighty = 0;
1472		- aConstraints.gridx = 0;
1473		- aConstraints.gridy += 1;
1474		- aConstraints.gridwidth = 1;
	1540	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1475	1541
1476		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1477		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1478		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1479		- aConstraints.gridx += 1;
1480		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1481		- //aConstraints.weightx = 0;
1482		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1483		- aConstraints.gridx = 0;
1484		- aConstraints.gridy += 1;
1485		- aConstraints.gridwidth = 1;
	1542	+ cGridBag colorSection = new cGridBag().setVertical(true);
	1543	+
	1544	+ cGridBag color = new cGridBag();
	1545	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1546	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1547	+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1548	+ //colorField.preferredWidth = 200;
	1549	+ colorSection.add(color);
1486	1550
1487		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1488		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1489		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1490		- aConstraints.gridx += 1;
1491		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1492		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1493		- aConstraints.gridx = 0;
1494		- aConstraints.gridy += 1;
1495		- aConstraints.gridwidth = 1;
	1551	+ cGridBag modulation = new cGridBag();
	1552	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1553	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1554	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1555	+ colorSection.add(modulation);
1496	1556
1497		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1498		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1499		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1500		- aConstraints.gridx += 1;
1501		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1502		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1503		- aConstraints.gridx = 0;
1504		- aConstraints.gridy += 1;
1505		- aConstraints.gridwidth = 1;
	1557	+ cGridBag texture = new cGridBag();
	1558	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1559	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1560	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1561	+ colorSection.add(texture);
1506	1562
1507		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1508		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1509		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1510		- aConstraints.gridx += 1;
1511		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1512		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1513		- aConstraints.gridx = 0;
1514		- aConstraints.gridy += 1;
1515		- aConstraints.gridwidth = 1;
	1563	+ cGridBag anisoU = new cGridBag();
	1564	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1565	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1566	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1567	+ colorSection.add(anisoU);
1516	1568
1517		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1518		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1519		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1520		- aConstraints.gridx += 1;
1521		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1522		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1523		- aConstraints.gridx = 0;
1524		- aConstraints.gridy += 1;
1525		- aConstraints.gridwidth = 1;
	1569	+ cGridBag anisoV = new cGridBag();
	1570	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1571	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1572	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1573	+ colorSection.add(anisoV);
1526	1574
1527		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1528		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1529		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1530		- aConstraints.gridx += 1;
1531		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1532		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1533		- aConstraints.gridx = 0;
1534		- aConstraints.gridy += 1;
1535		- aConstraints.gridwidth = 1;
	1575	+ cGridBag shadowbias = new cGridBag();
	1576	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1577	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1578	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1579	+ colorSection.add(shadowbias);
1536	1580
1537		- //aConstraints.weighty = 1;
1538		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1539		- //aConstraints.gridx += 1;
1540		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1541		- aConstraints.weighty = 0;
1542		- aConstraints.gridx = 0;
1543		- aConstraints.gridy += 1;
1544		- aConstraints.gridwidth = 1;
	1581	+ panel.add(new JSeparator());
	1582	+
	1583	+ panel.add(colorSection);
	1584	+
	1585	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1586	+
	1587	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1588	+
	1589	+ cGridBag diffuse = new cGridBag();
	1590	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1591	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1592	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1593	+ diffuseSection.add(diffuse);
1545	1594
1546		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1547		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1548		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1549		- aConstraints.gridx += 1;
1550		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1551		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1552		- aConstraints.gridx = 0;
1553		- aConstraints.gridy += 1;
1554		- aConstraints.gridwidth = 1;
	1595	+ cGridBag diffuseness = new cGridBag();
	1596	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1597	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1598	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1599	+ diffuseSection.add(diffuseness);
1555	1600
1556		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1557		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1558		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1559		- aConstraints.gridx += 1;
1560		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1561		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1562		- aConstraints.gridx = 0;
1563		- aConstraints.gridy += 1;
1564		- aConstraints.gridwidth = 1;
	1601	+ cGridBag selfshadow = new cGridBag();
	1602	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1603	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1604	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1605	+ diffuseSection.add(selfshadow);
1565	1606
1566		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1567		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1568		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1569		- aConstraints.gridx += 1;
1570		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1571		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1572		- aConstraints.gridx = 0;
1573		- aConstraints.gridy += 1;
1574		- aConstraints.gridwidth = 1;
	1607	+ cGridBag sheen = new cGridBag();
	1608	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1609	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1610	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1611	+ diffuseSection.add(sheen);
1575	1612
1576		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1577		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1578		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1579		- aConstraints.gridx += 1;
1580		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1581		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1582		- aConstraints.gridx = 0;
1583		- aConstraints.gridy += 1;
1584		- aConstraints.gridwidth = 1;
	1613	+ cGridBag subsurface = new cGridBag();
	1614	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1615	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1616	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1617	+ diffuseSection.add(subsurface);
1585	1618
1586		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1587		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1588		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1589		- aConstraints.gridx += 1;
1590		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1591		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1592		- aConstraints.gridx = 0;
1593		- aConstraints.gridy += 1;
1594		- aConstraints.gridwidth = 1;
	1619	+ cGridBag shadow = new cGridBag();
	1620	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1621	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1622	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1623	+ diffuseSection.add(shadow);
1595	1624
1596		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1597		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1598		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1599		- aConstraints.gridx += 1;
1600		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1601		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1602		- aConstraints.gridx = 0;
1603		- aConstraints.gridy += 1;
1604		- aConstraints.gridwidth = 1;
	1625	+ cGridBag fakedepth = new cGridBag();
	1626	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1627	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1628	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1629	+ diffuseSection.add(fakedepth);
1605	1630
1606		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1607		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1608		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1609		- aConstraints.gridx += 1;
1610		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1611		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1612		- aConstraints.gridx = 0;
1613		- aConstraints.gridy += 1;
1614		- aConstraints.gridwidth = 1;
	1631	+ panel.add(new JSeparator());
	1632	+
	1633	+ panel.add(diffuseSection);
	1634	+
	1635	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1636	+
	1637	+ cGridBag specularSection = new cGridBag().setVertical(true);
1615	1638
1616		- //aConstraints.weighty = 1;
1617		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1618		- //aConstraints.gridx += 1;
1619		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1620		- aConstraints.weighty = 0;
1621		- aConstraints.gridx = 0;
1622		- aConstraints.gridy += 1;
1623		- aConstraints.gridwidth = 1;
	1639	+ cGridBag specular = new cGridBag();
	1640	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1641	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1642	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1643	+ specularSection.add(specular);
1624	1644
1625		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1626		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1627		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1628		- aConstraints.gridx += 1;
1629		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1630		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1631		- aConstraints.gridx = 0;
1632		- aConstraints.gridy += 1;
1633		- aConstraints.gridwidth = 1;
	1645	+ cGridBag lightarea = new cGridBag();
	1646	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1647	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1648	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1649	+ specularSection.add(lightarea);
1634	1650
1635		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1636		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1637		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1638		- aConstraints.gridx += 1;
1639		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1640		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1641		- aConstraints.gridx = 0;
1642		- aConstraints.gridy += 1;
1643		- aConstraints.gridwidth = 1;
	1651	+ cGridBag shininess = new cGridBag();
	1652	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1653	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1654	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1655	+ specularSection.add(shininess);
1644	1656
1645		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1646		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1647		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1648		- aConstraints.gridx += 1;
1649		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1650		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1651		- aConstraints.gridx = 0;
1652		- aConstraints.gridy += 1;
1653		- aConstraints.gridwidth = 1;
	1657	+ cGridBag metalness = new cGridBag();
	1658	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1659	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1660	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1661	+ specularSection.add(metalness);
1654	1662
1655		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1656		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1657		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1658		- aConstraints.gridx += 1;
1659		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1660		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1661		- aConstraints.gridx = 0;
1662		- aConstraints.gridy += 1;
1663		- aConstraints.gridwidth = 1;
	1663	+ cGridBag velvet = new cGridBag();
	1664	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1665	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1666	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1667	+ specularSection.add(velvet);
1664	1668
1665		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1666		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1667		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1668		- aConstraints.gridx += 1;
1669		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1670		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1671		- aConstraints.gridx = 0;
1672		- aConstraints.gridy += 1;
1673		- aConstraints.gridwidth = 1;
1674		-
1675		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1676		- Return();
	1669	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1670	+ //Return();
1677	1671	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1678	1672	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1679	1673	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1684,130 +1678,93 @@
1684	1678	// aConstraints.gridy += 1;
1685	1679	// aConstraints.gridwidth = 1;
1686	1680
1687		- //aConstraints.weighty = 1;
1688		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1689		- //aConstraints.gridx += 1;
1690		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1691		- aConstraints.weighty = 0;
1692		- aConstraints.gridx = 0;
1693		- aConstraints.gridy += 1;
1694		- aConstraints.gridwidth = 1;
1695	1681
1696		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1697		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1698		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1699		- aConstraints.gridx += 1;
1700		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1701		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1702		- aConstraints.gridx = 0;
1703		- aConstraints.gridy += 1;
1704		- aConstraints.gridwidth = 1;
	1682	+ panel.add(new JSeparator());
	1683	+
	1684	+ panel.add(specularSection);
	1685	+
	1686	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1687	+
	1688	+ cGridBag globalSection = new cGridBag().setVertical(true);
1705	1689
1706		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1707		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1708		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1709		- aConstraints.gridx += 1;
1710		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1711		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1712		- aConstraints.gridx = 0;
1713		- aConstraints.gridy += 1;
1714		- aConstraints.gridwidth = 1;
	1690	+ cGridBag camera = new cGridBag();
	1691	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1692	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1693	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1694	+ globalSection.add(camera);
1715	1695
1716		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1717		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1718		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1719		- aConstraints.gridx += 1;
1720		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1721		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1722		- aConstraints.gridx = 0;
1723		- aConstraints.gridy += 1;
1724		- aConstraints.gridwidth = 1;
	1696	+ cGridBag ambient = new cGridBag();
	1697	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1698	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1699	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1700	+ globalSection.add(ambient);
1725	1701
1726		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1727		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1728		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1729		- aConstraints.gridx += 1;
1730		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1731		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1732		- aConstraints.gridx = 0;
1733		- aConstraints.gridy += 1;
1734		- aConstraints.gridwidth = 1;
1735		- aConstraints.weighty = 0;
	1702	+ cGridBag backlit = new cGridBag();
	1703	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1704	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1705	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1706	+ globalSection.add(backlit);
1736	1707
1737		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1738		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1739		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1740		- aConstraints.gridx += 1;
1741		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1742		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1743		- aConstraints.gridx = 0;
1744		- aConstraints.gridy += 1;
1745		- aConstraints.gridwidth = 1;
	1708	+ cGridBag opacity = new cGridBag();
	1709	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1710	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1711	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1712	+ globalSection.add(opacity);
1746	1713
1747		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1748		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1749		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1750		- aConstraints.gridx += 1;
1751		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1752		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1753		- aConstraints.gridx = 0;
1754		- aConstraints.gridy += 1;
1755		- aConstraints.gridwidth = 1;
	1714	+ panel.add(new JSeparator());
	1715	+
	1716	+ panel.add(globalSection);
	1717	+
	1718	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1719	+
	1720	+ cGridBag textureSection = new cGridBag().setVertical(true);
1756	1721
1757		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1758		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1759		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1760		- aConstraints.gridx += 1;
1761		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1762		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1763		- aConstraints.gridx = 0;
1764		- aConstraints.gridy += 1;
1765		- aConstraints.gridwidth = 1;
	1722	+ cGridBag bump = new cGridBag();
	1723	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1724	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1725	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1726	+ textureSection.add(bump);
1766	1727
1767		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1768		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1769		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1770		- aConstraints.gridx += 1;
1771		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1772		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1773		- aConstraints.gridx = 0;
1774		- aConstraints.gridy += 1;
1775		- aConstraints.gridwidth = 1;
	1728	+ cGridBag noise = new cGridBag();
	1729	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1730	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1731	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1732	+ textureSection.add(noise);
1776	1733
1777		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1778		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1779		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1780		- aConstraints.gridx += 1;
1781		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1782		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1783		- aConstraints.gridx = 0;
1784		- aConstraints.gridy += 1;
1785		- aConstraints.gridwidth = 1;
	1734	+ cGridBag power = new cGridBag();
	1735	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1736	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1737	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1738	+ textureSection.add(power);
1786	1739
1787		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1788		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1789		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1790		- aConstraints.gridx += 1;
1791		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1792		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1793		- aConstraints.gridx = 0;
1794		- aConstraints.gridy += 1;
1795		- aConstraints.gridwidth = 1;
	1740	+ cGridBag borderfade = new cGridBag();
	1741	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1742	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1743	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1744	+ textureSection.add(borderfade);
1796	1745
1797		- //aConstraints.weighty = 1;
1798		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1799		- //aConstraints.gridx += 1;
1800		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1801		- aConstraints.weighty = 0;
	1746	+ cGridBag fog = new cGridBag();
	1747	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1748	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1749	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1750	+ textureSection.add(fog);
1802	1751
1803		- aConstraints.gridx = 0;
1804		- aConstraints.gridy = 0;
1805		- aConstraints.gridwidth = 1;
	1752	+ cGridBag opacityPower = new cGridBag();
	1753	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	1754	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1755	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	1756	+ textureSection.add(opacityPower);
	1757	+
	1758	+ panel.add(new JSeparator());
	1759	+
	1760	+ panel.add(textureSection);
	1761	+
	1762	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1806	1763
1807	1764	SetMaterial(copy); // .GetMaterial());
1808	1765
1809		- colorField.addChangeListener(this);
1810		- modulationField.addChangeListener(this);
	1766	+ //colorField.addChangeListener(this);
	1767	+// modulationField.addChangeListener(this);
1811	1768	metalnessField.addChangeListener(this);
1812	1769	diffuseField.addChangeListener(this);
1813	1770	specularField.addChangeListener(this);
..	..	@@ -1837,12 +1794,15 @@
1837	1794	opacityPowerField.addChangeListener(this);
1838	1795	/**/
1839	1796
1840		- resetSlidersButton.addActionListener(this);
1841	1797	clearMaterialButton.addActionListener(this);
1842	1798	createMaterialButton.addActionListener(this);
1843		-
1844		- propagateToggle.addItemListener(this);
1845		- multiplyToggle.addItemListener(this);
	1799	+
	1800	+ if (Globals.ADVANCED)
	1801	+ {
	1802	+ resetSlidersButton.addActionListener(this);
	1803	+ propagateToggle.addItemListener(this);
	1804	+ multiplyToggle.addItemListener(this);
	1805	+ }
1846	1806	}
1847	1807
1848	1808	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -2013,7 +1973,7 @@
2013	1973
2014	1974	//? flashIt = false;
2015	1975	CameraPane pane = (CameraPane) cameraView;
2016		- pane.clickStart(location.x, location.y, 0);
	1976	+ pane.clickStart(location.x, location.y, 0, 0);
2017	1977	pane.clickEnd(location.x, location.y, 0, true);
2018	1978
2019	1979	if (group.selection.size() == 1)
..	..	@@ -2062,6 +2022,7 @@
2062	2022	e2.printStackTrace();
2063	2023	}
2064	2024	}
	2025	+
2065	2026	LoadJMEThread loadThread;
2066	2027
2067	2028	class LoadJMEThread extends Thread
..	..	@@ -2119,6 +2080,7 @@
2119	2080	//LoadFile0(filename, converter);
2120	2081	}
2121	2082	}
	2083	+
2122	2084	LoadOBJThread loadObjThread;
2123	2085
2124	2086	class LoadOBJThread extends Thread
..	..	@@ -2197,19 +2159,19 @@
2197	2159
2198	2160	void LoadObjFile(String fullname)
2199	2161	{
2200		- /*
	2162	+ System.out.println("Loading " + fullname);
	2163	+ /**/
2201	2164	//lastFilename = fullname;
2202	2165	if(loadObjThread == null)
2203	2166	{
2204		- loadObjThread = new LoadOBJThread();
2205		- loadObjThread.start();
	2167	+ loadObjThread = new LoadOBJThread();
	2168	+ loadObjThread.start();
2206	2169	}
2207	2170
2208	2171	loadObjThread.add(fullname);
2209		- */
	2172	+ /**/
2210	2173
2211		- System.out.println("Loading " + fullname);
2212		- makeSomething(new FileObject(fullname, true), true);
	2174	+ //makeSomething(new FileObject(fullname, true), true);
2213	2175	}
2214	2176
2215	2177	void LoadGFDFile(String fullname)
..	..	@@ -2470,11 +2432,11 @@
2470	2432
2471	2433	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2472	2434	{
2473		- if (GrafreeD.standAlone)
	2435	+ if (Grafreed.standAlone)
2474	2436	{
2475	2437	/**/
2476	2438	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2477		- browser.show();
	2439	+ browser.setVisible(true);
2478	2440	String filename = browser.getFile();
2479	2441	if (filename != null && filename.length() > 0)
2480	2442	{
..	..	@@ -2619,6 +2581,7 @@
2619	2581	}
2620	2582	if (input == null)
2621	2583	{
	2584	+ new Exception().printStackTrace();
2622	2585	System.exit(0);
2623	2586	}
2624	2587
..	..	@@ -2833,7 +2796,8 @@
2833	2796	return;
2834	2797	}
2835	2798
2836		- multiplyToggle.setSelected(mat.multiply);
	2799	+ if (multiplyToggle != null)
	2800	+ multiplyToggle.setSelected(mat.multiply);
2837	2801
2838	2802	assert (object.projectedVertices != null);
2839	2803
..	..	@@ -3048,9 +3012,9 @@
3048	3012	frame.validate();
3049	3013
3050	3014	return;
3051		- } else if (event.getSource() == toggleRandomItem)
	3015	+ } else if (event.getSource() == toggleSwitchItem)
3052	3016	{
3053		- cameraView.ToggleRandom();
	3017	+ cameraView.ToggleSwitch();
3054	3018	cameraView.repaint();
3055	3019	return;
3056	3020	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3079,6 +3043,10 @@
3079	3043	{
3080	3044	copy.live ^= true;
3081	3045	return;
	3046	+ } else if (event.getSource() == selectCB)
	3047	+ {
	3048	+ copy.dontselect ^= true;
	3049	+ return;
3082	3050	} else if (event.getSource() == hideCB)
3083	3051	{
3084	3052	copy.hide ^= true;
..	..	@@ -3093,6 +3061,7 @@
3093	3061	if (event.getSource() == randomCB)
3094	3062	{
3095	3063	copy.random ^= true;
	3064	+ objEditor.refreshContents();
3096	3065	return;
3097	3066	}
3098	3067	if (event.getSource() == speedupCB)
..	..	@@ -3116,8 +3085,9 @@
3116	3085
3117	3086	public void actionPerformed(ActionEvent event)
3118	3087	{
	3088	+ Object source = event.getSource();
3119	3089	// SCRIPT DIALOG
3120		- if (event.getSource() == okbutton)
	3090	+ if (source == okbutton)
3121	3091	{
3122	3092	textpanel.setVisible(false);
3123	3093	textpanel.remove(textarea);
..	..	@@ -3129,7 +3099,7 @@
3129	3099	textarea = null;
3130	3100	textpanel = null;
3131	3101	}
3132		- if (event.getSource() == cancelbutton)
	3102	+ if (source == cancelbutton)
3133	3103	{
3134	3104	textpanel.setVisible(false);
3135	3105	textpanel.remove(textarea);
..	..	@@ -3141,50 +3111,50 @@
3141	3111	//applySelf();
3142	3112	//client.refreshEditWindow();
3143	3113	//refreshContents();
3144		- if (event.getSource() == nameField)
	3114	+ if (source == nameField)
3145	3115	{
3146	3116	//System.out.println("ObjEditor " + event);
3147	3117	applySelf0(true);
3148	3118	//parent.applySelf();
3149	3119	objEditor.refreshContents();
3150		- } else if (event.getSource() == resetButton)
	3120	+ } else if (source == resetButton)
3151	3121	{
3152	3122	CameraPane.fullreset = true;
3153	3123	copy.Reset(); // ResetMeshes();
3154	3124	copy.Touch();
3155	3125	objEditor.refreshContents();
3156		- } else if (event.getSource() == stepItem)
	3126	+ } else if (source == stepItem)
3157	3127	{
3158	3128	//cameraView.ONESTEP = true;
3159	3129	Globals.ONESTEP = true;
3160	3130	cameraView.repaint();
3161	3131	return;
3162		- } else if (event.getSource() == stepButton)
	3132	+ } else if (source == stepButton)
3163	3133	{
3164	3134	copy.Step();
3165	3135	copy.Touch();
3166	3136	objEditor.refreshContents();
3167		- } else if (event.getSource() == slowerButton)
	3137	+ } else if (source == slowerButton)
3168	3138	{
3169	3139	copy.Slower();
3170	3140	copy.Touch();
3171	3141	objEditor.refreshContents();
3172		- } else if (event.getSource() == fasterButton)
	3142	+ } else if (source == fasterButton)
3173	3143	{
3174	3144	copy.Faster();
3175	3145	copy.Touch();
3176	3146	objEditor.refreshContents();
3177		- } else if (event.getSource() == remarkButton)
	3147	+ } else if (source == remarkButton)
3178	3148	{
3179	3149	copy.Remark();
3180	3150	copy.Touch();
3181	3151	objEditor.refreshContents();
3182		- } else if (event.getSource() == stepAllButton)
	3152	+ } else if (source == stepAllButton)
3183	3153	{
3184	3154	copy.StepAll();
3185	3155	copy.Touch();
3186	3156	objEditor.refreshContents();
3187		- } else if (event.getSource() == resetAllButton)
	3157	+ } else if (source == resetAllButton)
3188	3158	{
3189	3159	//CameraPane.fullreset = true;
3190	3160	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3217,53 +3187,75 @@
3217	3187	// Close();
3218	3188	// }
3219	3189	// else
3220		- if (event.getSource() == resetSlidersButton)
	3190	+ if (source == resetSlidersButton)
3221	3191	{
3222	3192	ResetSliders();
3223		- } else if (event.getSource() == clearMaterialButton)
	3193	+ } else if (source == clearMaterialButton)
3224	3194	{
3225	3195	ClearMaterial();
3226		- } else if (event.getSource() == createMaterialButton)
	3196	+ } else if (source == createMaterialButton)
3227	3197	{
3228	3198	CreateMaterial();
3229		- } else if (event.getSource() == clearPanelButton)
	3199	+ } else if (source == clearPanelButton)
3230	3200	{
3231	3201	copy.ClearUI();
3232	3202	refreshContents(true);
3233		- } /*
3234		- }
3235		-
3236		- public boolean action(Event event, Object arg)
3237		- {
3238		- */ else if (event.getSource() == closeItem)
	3203	+ } else if (source == importGFDItem)
	3204	+ {
	3205	+ ImportGFD();
	3206	+ } else
	3207	+ if (source == importVRMLX3DItem)
	3208	+ {
	3209	+ ImportVRMLX3D();
	3210	+ } else
	3211	+ if (source == import3DSItem)
	3212	+ {
	3213	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3214	+ } else
	3215	+ if (source == importOBJItem)
	3216	+ {
	3217	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3218	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3219	+ browser.setVisible(true);
	3220	+ String filename = browser.getFile();
	3221	+ if (filename != null && filename.length() > 0)
	3222	+ {
	3223	+ String fullname = browser.getDirectory() + filename;
	3224	+ makeSomething(ReadOBJ(fullname), true);
	3225	+ }
	3226	+ } else
	3227	+ if (source == closeItem)
3239	3228	{
3240	3229	Close();
3241	3230	//return true;
3242		- } else if (event.getSource() == loadItem)
	3231	+ } else if (source == loadItem)
3243	3232	{
3244	3233	load();
3245	3234	//return true;
3246		- } else if (event.getSource() == saveItem)
	3235	+ } else if (source == newItem)
	3236	+ {
	3237	+ New();
	3238	+ } else if (source == saveItem)
3247	3239	{
3248	3240	save();
3249	3241	//return true;
3250		- } else if (event.getSource() == saveAsItem)
	3242	+ } else if (source == saveAsItem)
3251	3243	{
3252	3244	saveAs();
3253	3245	//return true;
3254		- } else if (event.getSource() == reexportItem)
	3246	+ } else if (source == reexportItem)
3255	3247	{
3256	3248	reexport();
3257	3249	//return true;
3258		- } else if (event.getSource() == exportAsItem)
	3250	+ } else if (source == exportAsItem)
3259	3251	{
3260	3252	export();
3261	3253	//return true;
3262		- } else if (event.getSource() == povItem)
	3254	+ } else if (source == povItem)
3263	3255	{
3264	3256	generatePOV();
3265	3257	//return true;
3266		- } else if (event.getSource() == zBufferItem)
	3258	+ } else if (source == zBufferItem)
3267	3259	{
3268	3260	try
3269	3261	{
..	..	@@ -3285,21 +3277,8 @@
3285	3277	cameraView.repaint();
3286	3278	//return true;
3287	3279	}
3288		- */ else if (event.getSource() == editCameraItem)
3289		- {
3290		- cameraView.ProtectCamera();
3291		- cameraView.repaint();
3292		- return;
3293		- } else if (event.getSource() == revertCameraItem)
3294		- {
3295		- cameraView.RevertCamera();
3296		- cameraView.repaint();
3297		- return;
3298		-// } else if (event.getSource() == textureButton)
3299		-// {
3300		-// return; // true;
3301		- } else // combos...
3302		- if (event.getSource() == texresMenu)
	3280	+ */ else // combos...
	3281	+ if (source == texresMenu)
3303	3282	{
3304	3283	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3305	3284	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3311,12 +3290,268 @@
3311	3290	}
3312	3291	}
3313	3292
	3293	+ void New()
	3294	+ {
	3295	+ while (copy.Size() > 1)
	3296	+ {
	3297	+ copy.remove(1);
	3298	+ }
	3299	+
	3300	+ ResetModel();
	3301	+ objEditor.refreshContents();
	3302	+ }
	3303	+
	3304	+ static public byte[] Compress(Object3D o)
	3305	+ {
	3306	+ try
	3307	+ {
	3308	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3309	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3310	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3311	+
	3312	+ Object3D parent = o.parent;
	3313	+ o.parent = null;
	3314	+
	3315	+ out.writeObject(o);
	3316	+
	3317	+ o.parent = parent;
	3318	+
	3319	+ out.flush();
	3320	+
	3321	+ zstream.close();
	3322	+ out.close();
	3323	+
	3324	+ return baos.toByteArray();
	3325	+ } catch (Exception e)
	3326	+ {
	3327	+ System.err.println(e);
	3328	+ return null;
	3329	+ }
	3330	+ }
	3331	+
	3332	+ static public Object Uncompress(byte[] bytes)
	3333	+ {
	3334	+ System.out.println("#bytes = " + bytes.length);
	3335	+ try
	3336	+ {
	3337	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3338	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3339	+ ObjectInputStream in = new ObjectInputStream(istream);
	3340	+ Object obj = in.readObject();
	3341	+ in.close();
	3342	+
	3343	+ return obj;
	3344	+ } catch (Exception e)
	3345	+ {
	3346	+ System.err.println(e);
	3347	+ return null;
	3348	+ }
	3349	+ }
	3350	+
	3351	+ static public Object clone(Object o)
	3352	+ {
	3353	+ try
	3354	+ {
	3355	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3356	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3357	+
	3358	+ out.writeObject(o);
	3359	+
	3360	+ out.flush();
	3361	+ out.close();
	3362	+
	3363	+ byte[] bytes = baos.toByteArray();
	3364	+
	3365	+ System.out.println("clone = " + bytes.length);
	3366	+
	3367	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3368	+ ObjectInputStream in = new ObjectInputStream(bais);
	3369	+ Object obj = in.readObject();
	3370	+ in.close();
	3371	+
	3372	+ return obj;
	3373	+ } catch (Exception e)
	3374	+ {
	3375	+ System.err.println(e);
	3376	+ return null;
	3377	+ }
	3378	+ }
	3379	+
	3380	+ cRadio GetCurrentTab()
	3381	+ {
	3382	+ cRadio ab;
	3383	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3384	+ {
	3385	+ ab = (cRadio)e.nextElement();
	3386	+ if(ab.GetObject() == copy)
	3387	+ {
	3388	+ return ab;
	3389	+ }
	3390	+ }
	3391	+
	3392	+ return null;
	3393	+ }
	3394	+
	3395	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3396	+
	3397	+ public void Save()
	3398	+ {
	3399	+ cRadio tab = GetCurrentTab();
	3400	+
	3401	+ boolean temp = CameraPane.SWITCH;
	3402	+ CameraPane.SWITCH = false;
	3403	+
	3404	+ copy.ExtractBigData(hashtable);
	3405	+
	3406	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3407	+ tab.graphs[tab.undoindex++] = Compress(copy);
	3408	+
	3409	+ copy.RestoreBigData(hashtable);
	3410	+
	3411	+ CameraPane.SWITCH = temp;
	3412	+
	3413	+ //assert(hashtable.isEmpty());
	3414	+
	3415	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3416	+ {
	3417	+ tab.graphs[i] = null;
	3418	+ }
	3419	+
	3420	+ // test save
	3421	+ if (false)
	3422	+ {
	3423	+ try
	3424	+ {
	3425	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3426	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3427	+
	3428	+ p.writeObject(copy);
	3429	+
	3430	+ p.flush();
	3431	+
	3432	+ ostream.close();
	3433	+ } catch (Exception e)
	3434	+ {
	3435	+ e.printStackTrace();
	3436	+ }
	3437	+ }
	3438	+ }
	3439	+
	3440	+ void CopyChanged(Object3D obj)
	3441	+ {
	3442	+ boolean temp = CameraPane.SWITCH;
	3443	+ CameraPane.SWITCH = false;
	3444	+
	3445	+ copy.ExtractBigData(hashtable);
	3446	+
	3447	+ copy.clear();
	3448	+
	3449	+ for (int i=0; i<obj.Size(); i++)
	3450	+ {
	3451	+ copy.add(obj.get(i));
	3452	+ }
	3453	+
	3454	+ copy.RestoreBigData(hashtable);
	3455	+
	3456	+ CameraPane.SWITCH = temp;
	3457	+
	3458	+ //assert(hashtable.isEmpty());
	3459	+
	3460	+ copy.Touch();
	3461	+
	3462	+ ResetModel();
	3463	+ copy.HardTouch(); // recompile?
	3464	+
	3465	+ cRadio ab;
	3466	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3467	+ {
	3468	+ ab = (cRadio)e.nextElement();
	3469	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3470	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3471	+ if (test != null)
	3472	+ {
	3473	+ test.editWindow = ab.object.editWindow;
	3474	+ ab.object = test;
	3475	+ }
	3476	+ }
	3477	+
	3478	+ refreshContents();
	3479	+ }
	3480	+
	3481	+ public void Undo()
	3482	+ {
	3483	+ cRadio tab = GetCurrentTab();
	3484	+
	3485	+ if (tab.undoindex == 0)
	3486	+ {
	3487	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3488	+ return;
	3489	+ }
	3490	+
	3491	+ if (tab.graphs[tab.undoindex] == null)
	3492	+ {
	3493	+ Save();
	3494	+ tab.undoindex -= 1;
	3495	+ }
	3496	+
	3497	+ tab.undoindex -= 1;
	3498	+
	3499	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3500	+ }
	3501	+
	3502	+ public void Redo()
	3503	+ {
	3504	+ cRadio tab = GetCurrentTab();
	3505	+
	3506	+ if (tab.graphs[tab.undoindex + 1] == null)
	3507	+ {
	3508	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3509	+ return;
	3510	+ }
	3511	+
	3512	+ tab.undoindex += 1;
	3513	+
	3514	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3515	+ }
	3516	+
	3517	+ void ImportGFD()
	3518	+ {
	3519	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3520	+ browser.show();
	3521	+ String filename = browser.getFile();
	3522	+ if (filename != null && filename.length() > 0)
	3523	+ {
	3524	+ String fullname = browser.getDirectory() + filename;
	3525	+
	3526	+ //Object3D readobj =
	3527	+ objEditor.ReadGFD(fullname, objEditor);
	3528	+ //makeSomething(readobj);
	3529	+ }
	3530	+ }
	3531	+
	3532	+ void ImportVRMLX3D()
	3533	+ {
	3534	+ if (Grafreed.standAlone)
	3535	+ {
	3536	+ /**/
	3537	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3538	+ browser.show();
	3539	+ String filename = browser.getFile();
	3540	+ if (filename != null && filename.length() > 0)
	3541	+ {
	3542	+ String fullname = browser.getDirectory() + filename;
	3543	+ LoadVRMLX3D(fullname);
	3544	+ }
	3545	+ /**/
	3546	+ }
	3547	+ }
	3548	+
3314	3549	void ToggleAnimation()
3315	3550	{
3316	3551	if (!Globals.ANIMATION)
3317	3552	{
3318	3553	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3319		- browser.show();
	3554	+ browser.setVisible(true);
3320	3555	String filename = browser.getFile();
3321	3556	if (filename != null && filename.length() > 0)
3322	3557	{
..	..	@@ -3326,8 +3561,8 @@
3326	3561
3327	3562	Globals.ANIMATION ^= true;
3328	3563
3329		- GrafreeD.wav.cursor = 0;
3330		- GrafreeD.wav.loop = 0;
	3564	+ Grafreed.wav.cursor = 0;
	3565	+ Grafreed.wav.loop = 0;
3331	3566	}
3332	3567	} else
3333	3568	{
..	..	@@ -3377,7 +3612,7 @@
3377	3612	void CreateMaterial()
3378	3613	{
3379	3614	//copy.ClearMaterial(); // PATCH
3380		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3615	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3381	3616	if (copy.selection.size() > 0)
3382	3617	//SetMaterial(copy);
3383	3618	{
..	..	@@ -3436,11 +3671,11 @@
3436	3671	{
3437	3672	copy.ResetBlockLoop(); // temporary problem
3438	3673
3439		- boolean random = CameraPane.RANDOM;
3440		- CameraPane.RANDOM = false; // parse everything
	3674	+ boolean random = CameraPane.SWITCH;
	3675	+ CameraPane.SWITCH = false; // parse everything
3441	3676	copy.ResetDisplayList();
3442	3677	copy.HardTouch();
3443		- CameraPane.RANDOM = random;
	3678	+ CameraPane.SWITCH = random;
3444	3679	}
3445	3680
3446	3681	// public void applySelf()
..	..	@@ -3510,10 +3745,40 @@
3510	3745	current.fakedepth = (float) fakedepthField.getFloat();
3511	3746	current.shadowbias = (float) shadowbiasField.getFloat();
3512	3747
3513		- if (!NumberSlider.frozen)
	3748	+ if (!cNumberSlider.frozen)
3514	3749	{
3515	3750	//System.out.println("Propagate = " + propagate);
3516	3751	copy.UpdateMaterial(anchor, current, propagate);
	3752	+
	3753	+ if (copy.material != null)
	3754	+ {
	3755	+ cMaterial mat = copy.material;
	3756	+
	3757	+ colorField.SetToolTipValue((mat.color));
	3758	+ modulationField.SetToolTipValue((mat.modulation));
	3759	+ metalnessField.SetToolTipValue((mat.metalness));
	3760	+ diffuseField.SetToolTipValue((mat.diffuse));
	3761	+ specularField.SetToolTipValue((mat.specular));
	3762	+ shininessField.SetToolTipValue((mat.shininess));
	3763	+ shiftField.SetToolTipValue((mat.shift));
	3764	+ ambientField.SetToolTipValue((mat.ambient));
	3765	+ lightareaField.SetToolTipValue((mat.lightarea));
	3766	+ diffusenessField.SetToolTipValue((mat.factor));
	3767	+ velvetField.SetToolTipValue((mat.velvet));
	3768	+ sheenField.SetToolTipValue((mat.sheen));
	3769	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3770	+ backlitField.SetToolTipValue((mat.bump));
	3771	+ anisoField.SetToolTipValue((mat.aniso));
	3772	+ anisoVField.SetToolTipValue((mat.anisoV));
	3773	+ cameraField.SetToolTipValue((mat.cameralight));
	3774	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3775	+ shadowField.SetToolTipValue((mat.shadow));
	3776	+ textureField.SetToolTipValue((mat.texture));
	3777	+ opacityField.SetToolTipValue((mat.opacity));
	3778	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3779	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3780	+ }
	3781	+
3517	3782	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3518	3783	{
3519	3784	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3558,6 +3823,7 @@
3558	3823	\|\| e.getSource() == apertureField
3559	3824	\|\| e.getSource() == shadowblurField)
3560	3825	{
	3826	+ new Exception().printStackTrace();
3561	3827	System.exit(0);
3562	3828	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3563	3829	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3628,7 +3894,7 @@
3628	3894	}
3629	3895
3630	3896	if (normalpushField != null)
3631		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	3897	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3632	3898	}
3633	3899
3634	3900	void SnapObject()
..	..	@@ -3883,7 +4149,7 @@
3883	4149
3884	4150	radioPanel.revalidate();
3885	4151	radioPanel.repaint();
3886		- ctrlPanel.revalidate(); // ? new
	4152	+ ctrlPanel.validate(); // ? new
3887	4153	ctrlPanel.repaint();
3888	4154	}
3889	4155	}
..	..	@@ -3892,6 +4158,7 @@
3892	4158
3893	4159	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3894	4160	{
	4161	+ Save();
3895	4162	//Tween.set(thing, 0).target(1).start(tweenManager);
3896	4163	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3897	4164	// if (thing instanceof GenericJointDemo)
..	..	@@ -4095,6 +4362,7 @@
4095	4362	}
4096	4363	}
4097	4364	}
	4365	+
4098	4366	LoadGFDThread loadGFDThread;
4099	4367
4100	4368	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4114,8 +4382,10 @@
4114	4382
4115	4383	try
4116	4384	{
	4385	+ // Try compressed version first.
4117	4386	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4118		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4387	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4388	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4119	4389
4120	4390	readobj = (Object3D) p.readObject();
4121	4391	istream.close();
..	..	@@ -4123,7 +4393,20 @@
4123	4393	readobj.ResetDisplayList();
4124	4394	} catch (Exception e)
4125	4395	{
4126		- e.printStackTrace();
	4396	+ //e.printStackTrace();
	4397	+ try
	4398	+ {
	4399	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4400	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4401	+
	4402	+ readobj = (Object3D) p.readObject();
	4403	+ istream.close();
	4404	+
	4405	+ readobj.ResetDisplayList();
	4406	+ } catch (Exception e2)
	4407	+ {
	4408	+ e2.printStackTrace();
	4409	+ }
4127	4410	}
4128	4411	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4129	4412	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4169,6 +4452,12 @@
4169	4452
4170	4453	void LoadIt(Object obj)
4171	4454	{
	4455	+ if (obj == null)
	4456	+ {
	4457	+ // Invalid file
	4458	+ return;
	4459	+ }
	4460	+
4172	4461	System.out.println("Loaded " + obj);
4173	4462	//new Exception().printStackTrace();
4174	4463	Object3D readobj = (Object3D) obj;
..	..	@@ -4178,6 +4467,7 @@
4178	4467
4179	4468	if (readobj != null)
4180	4469	{
	4470	+ Save();
4181	4471	try
4182	4472	{
4183	4473	//readobj.deepCopySelf(copy);
..	..	@@ -4240,7 +4530,7 @@
4240	4530
4241	4531	void load() // throws ClassNotFoundException
4242	4532	{
4243		- if (GrafreeD.standAlone)
	4533	+ if (Grafreed.standAlone)
4244	4534	{
4245	4535	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4246	4536	browser.show();
..	..	@@ -4327,11 +4617,13 @@
4327	4617	try
4328	4618	{
4329	4619	FileOutputStream ostream = new FileOutputStream(lastname);
4330		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4620	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4621	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4331	4622
4332	4623	p.writeObject(copy);
4333	4624	p.flush();
4334	4625
	4626	+ zstream.close();
4335	4627	ostream.close();
4336	4628
4337	4629	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4341,11 +4633,12 @@
4341	4633	{
4342	4634	}
4343	4635	}
	4636	+
4344	4637	String lastname;
4345	4638
4346	4639	void saveAs()
4347	4640	{
4348		- if (GrafreeD.standAlone)
	4641	+ if (Grafreed.standAlone)
4349	4642	{
4350	4643	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4351	4644	browser.setVisible(true);
..	..	@@ -4450,13 +4743,13 @@
4450	4743	try
4451	4744	{
4452	4745	FileOutputStream ostream = new FileOutputStream(filename);
4453		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4454		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4746	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4747	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4455	4748
4456	4749	Object3D objectparent = obj.parent;
4457	4750	obj.parent = null;
4458	4751
4459		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4752	+ Object3D object = (Object3D) Grafreed.clone(obj);
4460	4753
4461	4754	obj.parent = objectparent;
4462	4755
..	..	@@ -4468,8 +4761,8 @@
4468	4761	p.writeObject(object);
4469	4762	p.flush();
4470	4763
	4764	+ zstream.close();
4471	4765	ostream.close();
4472		- // zstream.close();
4473	4766
4474	4767	// group.selection.get(0).parent = parent;
4475	4768	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4490,7 +4783,7 @@
4490	4783	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4491	4784	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4492	4785	copy.generatePOV(buffer);
4493		- if (GrafreeD.standAlone)
	4786	+ if (Grafreed.standAlone)
4494	4787	{
4495	4788	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4496	4789	browser.show();
..	..	@@ -4516,7 +4809,8 @@
4516	4809	Object3D client;
4517	4810	Object3D copy;
4518	4811	MenuBar menuBar;
4519		- Menu windowMenu;
	4812	+ Menu fileMenu;
	4813	+ MenuItem newItem;
4520	4814	MenuItem loadItem;
4521	4815	MenuItem saveItem;
4522	4816	MenuItem saveAsItem;
..	..	@@ -4524,13 +4818,11 @@
4524	4818	MenuItem reexportItem;
4525	4819	MenuItem povItem;
4526	4820	MenuItem closeItem;
4527		- Menu cameraMenu;
	4821	+
4528	4822	CheckboxMenuItem zBufferItem;
4529	4823	//MenuItem normalLensItem;
4530		- MenuItem editCameraItem;
4531		- MenuItem revertCameraItem;
4532		- CheckboxMenuItem toggleLiveItem;
4533	4824	MenuItem stepItem;
	4825	+ CheckboxMenuItem toggleLiveItem;
4534	4826	CheckboxMenuItem toggleFullScreenItem;
4535	4827	CheckboxMenuItem toggleTimelineItem;
4536	4828	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4539,7 +4831,7 @@
4539	4831	CheckboxMenuItem toggleFootContactItem;
4540	4832	CheckboxMenuItem toggleDLItem;
4541	4833	CheckboxMenuItem toggleTextureItem;
4542		- CheckboxMenuItem toggleRandomItem;
	4834	+ CheckboxMenuItem toggleSwitchItem;
4543	4835	CheckboxMenuItem toggleRootItem;
4544	4836	CheckboxMenuItem animationItem;
4545	4837	CheckboxMenuItem toggleHandleItem;
..	..	@@ -4547,20 +4839,20 @@
4547	4839	JSplitPane mainPanel;
4548	4840	JScrollPane scrollpane;
4549	4841	JPanel toolbarPanel;
4550		- JPanel treePanel;
	4842	+ cGridBag treePanel;
4551	4843	JPanel radioPanel;
4552	4844	ButtonGroup buttonGroup;
4553		- JPanel ctrlPanel;
4554		- JPanel materialPanel;
	4845	+ cGridBag ctrlPanel;
	4846	+ cGridBag materialPanel;
4555	4847	JScrollPane infoPanel;
4556		- JPanel optionsPanel;
	4848	+ cGridBag optionsPanel;
4557	4849	JTabbedPane objectPanel;
4558	4850	cGridBag XYZPanel;
4559	4851	JSplitPane gridPanel;
4560	4852	JSplitPane bigPanel;
4561	4853	cGridBag bigThree;
4562		- JTabbedPane scenePanel;
4563		- JPanel centralPanel;
	4854	+ cGridBag scenePanel;
	4855	+ cGridBag centralPanel;
4564	4856	JSplitPane cameraPanel;
4565	4857	JPanel timelinePanel;
4566	4858	JMenuBar timelineMenubar;
..	..	@@ -4613,67 +4905,72 @@
4613	4905	// MATERIAL
4614	4906	JLabel materialLabel;
4615	4907	JLabel colorLabel;
4616		- NumberSlider colorField;
	4908	+ cNumberSlider colorField;
4617	4909	JLabel modulationLabel;
4618		- NumberSlider modulationField;
	4910	+ cNumberSlider modulationField;
4619	4911	JLabel metalnessLabel;
4620		- NumberSlider metalnessField;
	4912	+ cNumberSlider metalnessField;
4621	4913	JLabel diffuseLabel;
4622		- NumberSlider diffuseField;
	4914	+ cNumberSlider diffuseField;
4623	4915	JLabel specularLabel;
4624		- NumberSlider specularField;
	4916	+ cNumberSlider specularField;
4625	4917	JLabel shininessLabel;
4626		- NumberSlider shininessField;
	4918	+ cNumberSlider shininessField;
4627	4919	JLabel shiftLabel;
4628		- NumberSlider shiftField;
	4920	+ cNumberSlider shiftField;
4629	4921	JLabel ambientLabel;
4630		- NumberSlider ambientField;
	4922	+ cNumberSlider ambientField;
4631	4923	JLabel lightareaLabel;
4632		- NumberSlider lightareaField;
	4924	+ cNumberSlider lightareaField;
4633	4925	JLabel diffusenessLabel;
4634		- NumberSlider diffusenessField;
	4926	+ cNumberSlider diffusenessField;
4635	4927	JLabel velvetLabel;
4636		- NumberSlider velvetField;
	4928	+ cNumberSlider velvetField;
4637	4929	JLabel sheenLabel;
4638		- NumberSlider sheenField;
	4930	+ cNumberSlider sheenField;
4639	4931	JLabel subsurfaceLabel;
4640		- NumberSlider subsurfaceField;
	4932	+ cNumberSlider subsurfaceField;
4641	4933	//JLabel bumpLabel;
4642	4934	//NumberSlider bumpField;
4643	4935	JLabel backlitLabel;
4644		- NumberSlider backlitField;
	4936	+ cNumberSlider backlitField;
4645	4937	JLabel anisoLabel;
4646		- NumberSlider anisoField;
	4938	+ cNumberSlider anisoField;
4647	4939	JLabel anisoVLabel;
4648		- NumberSlider anisoVField;
	4940	+ cNumberSlider anisoVField;
4649	4941	JLabel cameraLabel;
4650		- NumberSlider cameraField;
	4942	+ cNumberSlider cameraField;
4651	4943	JLabel selfshadowLabel;
4652		- NumberSlider selfshadowField;
	4944	+ cNumberSlider selfshadowField;
4653	4945	JLabel shadowLabel;
4654		- NumberSlider shadowField;
	4946	+ cNumberSlider shadowField;
4655	4947	JLabel textureLabel;
4656		- NumberSlider textureField;
	4948	+ cNumberSlider textureField;
4657	4949	JLabel opacityLabel;
4658		- NumberSlider opacityField;
	4950	+ cNumberSlider opacityField;
4659	4951	JLabel fakedepthLabel;
4660		- NumberSlider fakedepthField;
	4952	+ cNumberSlider fakedepthField;
4661	4953	JLabel shadowbiasLabel;
4662		- NumberSlider shadowbiasField;
	4954	+ cNumberSlider shadowbiasField;
4663	4955	JLabel bumpLabel;
4664		- NumberSlider bumpField;
	4956	+ cNumberSlider bumpField;
4665	4957	JLabel noiseLabel;
4666		- NumberSlider noiseField;
	4958	+ cNumberSlider noiseField;
4667	4959	JLabel powerLabel;
4668		- NumberSlider powerField;
	4960	+ cNumberSlider powerField;
4669	4961	JLabel borderfadeLabel;
4670		- NumberSlider borderfadeField;
	4962	+ cNumberSlider borderfadeField;
4671	4963	JLabel fogLabel;
4672		- NumberSlider fogField;
	4964	+ cNumberSlider fogField;
4673	4965	JLabel opacityPowerLabel;
4674		- NumberSlider opacityPowerField;
	4966	+ cNumberSlider opacityPowerField;
4675	4967	JTree jTree;
4676	4968	//ObjectUI parent;
4677	4969
4678		- NumberSlider normalpushField;
	4970	+ cNumberSlider normalpushField;
	4971	+
	4972	+ private MenuItem importGFDItem;
	4973	+ private MenuItem importVRMLX3DItem;
	4974	+ private MenuItem import3DSItem;
	4975	+ private MenuItem importOBJItem;
4679	4976	}