~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(objectCommandsPanel);
	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,35 @@
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());
359		- ctrlPanel.setName("Edit");
360		- materialPanel = new JPanel();
	330	+
	331	+ editPanel = new cGridBag().setVertical(true);
	332	+ editPanel.setName("Edit");
	333	+
	334	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
	335	+
	336	+ editCommandsPanel = new cGridBag();
	337	+ editPanel.add(editCommandsPanel);
	338	+ editPanel.add(ctrlPanel);
	339	+
	340	+ materialPanel = new cGridBag().setVertical(true);
	341	+
361	342	materialPanel.setName("Material");
362	343	/JTextPane/
363	344	infoarea = createTextPane();
	345	+ doc = infoarea.getStyledDocument();
	346	+
364	347	infoarea.setEditable(true);
365	348	SetText();
366	349	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
367	350	// infoarea.setOpaque(false);
368	351	// //infoarea.setForeground(textcolor);
369		- infoarea.setLineWrap(true);
370		- infoarea.setWrapStyleWord(true);
	352	+// TEXTAREA infoarea.setLineWrap(true);
	353	+// TEXTAREA infoarea.setWrapStyleWord(true);
371	354	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
372	355	infoPanel.setPreferredSize(new Dimension(50, 200));
373	356	infoPanel.setName("Info");
..	..	@@ -378,16 +361,16 @@
378	361	mainPanel.setName("Main");
379	362	mainPanel.setContinuousLayout(true);
380	363	mainPanel.setOneTouchExpandable(true);
381		- mainPanel.setDividerLocation(1.0);
382	364	mainPanel.setDividerSize(9);
383		- mainPanel.setResizeWeight(0);
	365	+ mainPanel.setDividerLocation(0.5); //1.0);
	366	+ mainPanel.setResizeWeight(0.5);
384	367
385	368	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
386	369	//mainPanel.setLayout(new GridBagLayout());
387	370	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
388		- treePanel.setLayout(new GridBagLayout());
389		- ctrlPanel.setLayout(new GridBagLayout());
390		- materialPanel.setLayout(new GridBagLayout());
	371	+// treePanel.setLayout(new GridBagLayout());
	372	+ //ctrlPanel.setLayout(new GridBagLayout());
	373	+ //materialPanel.setLayout(new GridBagLayout());
391	374
392	375	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
393	376	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -426,7 +409,7 @@
426	409	static String newline = "\n";
427	410	protected static final String buttonString = "JButton";
428	411	StyledDocument doc;
429		- JTextArea infoarea;
	412	+ JTextPane infoarea;
430	413
431	414	void ClearInfo()
432	415	{
..	..	@@ -449,10 +432,10 @@
449	432	e.printStackTrace();
450	433	}
451	434
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();
	435	+// String selection = infoarea.getText();
	436	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	437	+// java.awt.datatransfer.Clipboard clipboard =
	438	+// Toolkit.getDefaultToolkit().getSystemClipboard();
456	439	//clipboard.setContents(data, data);
457	440	}
458	441
..	..	@@ -475,13 +458,13 @@
475	458	//SendInfo("Name:", "bold");
476	459	if (sel.GetTextures() != null \|\| debug)
477	460	{
478		- si.SendInfo(sel.toString(), "bold");
	461	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
479	462	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
480	463	if (sel.Size() > 0)
481	464	{
482	465	si.SendInfo("#children = " + sel.Size(), "regular");
483	466	}
484		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	467	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
485	468	if (debug)
486	469	{
487	470	try
..	..	@@ -493,7 +476,10 @@
493	476	}
494	477
495	478	if (full)
496		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	479	+ {
	480	+ si.SendInfo(" BBox min: " + minima, "regular");
	481	+ si.SendInfo(" BBox max: " + maxima, "regular");
	482	+ }
497	483
498	484	if (sel.bRep != null)
499	485	{
..	..	@@ -520,7 +506,7 @@
520	506	}
521	507	if (sel.support != null)
522	508	{
523		- si.SendInfo(" support: " + sel.support, "regular");
	509	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
524	510	}
525	511	if (sel.scriptnode != null)
526	512	{
..	..	@@ -591,6 +577,9 @@
591	577	{
592	578	CameraPane.pointflow = (PointFlow) sel;
593	579	}
	580	+
	581	+ si.SendInfo("_____________________", "regular");
	582	+ si.SendInfo("", "regular");
594	583	}
595	584	}
596	585
..	..	@@ -606,68 +595,138 @@
606	595	}
607	596	}
608	597
	598	+static GraphicsDevice device = GraphicsEnvironment
	599	+ .getLocalGraphicsEnvironment().getScreenDevices()[0];
	600	+
	601	+ Rectangle keeprect;
	602	+ cRadio radio;
	603	+
	604	+cButton keepButton;
	605	+ cButton twoButton; // Full 3D
	606	+ cButton sixButton;
	607	+ cButton threeButton;
	608	+ cButton sevenButton;
	609	+ cButton fourButton; // full panel
	610	+ cButton oneButton; // full XYZ
	611	+ //cButton currentLayout;
	612	+
	613	+ boolean maximized;
	614	+
	615	+ void Minimize()
	616	+ {
	617	+ frame.setState(Frame.ICONIFIED);
	618	+ }
	619	+
	620	+ void Maximize()
	621	+ {
	622	+ if (maximized)
	623	+ {
	624	+ frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	625	+ }
	626	+ else
	627	+ {
	628	+ keeprect = frame.getBounds();
	629	+ Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
	630	+ Dimension rect2 = frame.getToolkit().getScreenSize();
	631	+ frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
	632	+// frame.setState(Frame.MAXIMIZED_BOTH);
	633	+ }
	634	+
	635	+ maximized ^= true;
	636	+ }
	637	+
609	638	void ToggleFullScreen()
610	639	{
611	640	if (CameraPane.FULLSCREEN)
612	641	{
613		- frame.getContentPane().remove(/"Center",/bigThree);
614		- framePanel.add(bigThree);
615		- frame.getContentPane().add(/"Center",/framePanel);
	642	+ device.setFullScreenWindow(null);
	643	+ //frame.setVisible(false);
	644	+// frame.removeNotify();
	645	+// frame.setUndecorated(false);
	646	+// frame.addNotify();
	647	+ //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
	648	+
	649	+// X frame.getContentPane().remove(/"Center",/bigThree);
	650	+// X framePanel.add(bigThree);
	651	+// X frame.getContentPane().add(/"Center",/framePanel);
	652	+ framePanel.setDividerLocation(1);
	653	+
	654	+ //frame.setVisible(true);
	655	+ radio.layout = keepButton;
	656	+ //theFrame = null;
	657	+ keepButton = null;
	658	+ radio.layout.doClick();
	659	+
616	660	} else
617	661	{
618		- frame.getContentPane().remove(/"Center",/framePanel);
619		- framePanel.remove(bigThree);
620		- frame.getContentPane().add(/"Center",/bigThree);
	662	+ keepButton = radio.layout;
	663	+ //keeprect = frame.getBounds();
	664	+// frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
	665	+// frame.getToolkit().getScreenSize().height);
	666	+ //frame.setVisible(false);
	667	+ device.setFullScreenWindow(frame);
	668	+// frame.removeNotify();
	669	+// frame.setUndecorated(true);
	670	+// frame.addNotify();
	671	+// X frame.getContentPane().remove(/"Center",/framePanel);
	672	+// X framePanel.remove(bigThree);
	673	+// X frame.getContentPane().add(/"Center",/bigThree);
	674	+ framePanel.setDividerLocation(0);
	675	+
	676	+ radio.layout = twoButton;
	677	+ radio.layout.doClick();
	678	+ //frame.setVisible(true);
621	679	}
	680	+
622	681	cameraView.ToggleFullScreen();
623	682	}
624	683
625		- private JTextArea createTextPane()
	684	+ private JTextPane createTextPane()
626	685	{
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		- };
	686	+// TEXTAREA String[] initString =
	687	+// {
	688	+// "This is an editable JTextPane, ", //regular
	689	+// "another ", //italic
	690	+// "styled ", //bold
	691	+// "text ", //small
	692	+// "component, ", //large
	693	+// "which supports embedded components..." + newline,//regular
	694	+// " " + newline, //button
	695	+// "...and embedded icons..." + newline, //regular
	696	+// " ", //icon
	697	+// newline + "JTextPane is a subclass of JEditorPane that "
	698	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	699	+// + "cover methods for interacting with those objects."
	700	+// };
	701	+//
	702	+// String[] initStyles =
	703	+// {
	704	+// "regular", "italic", "bold", "small", "large",
	705	+// "regular", "button", "regular", "icon",
	706	+// "regular"
	707	+// };
	708	+//
	709	+// JTextPane textPane = new JTextPane();
	710	+// textPane.setEditable(true);
	711	+// /StyledDocument/ doc = textPane.getStyledDocument();
	712	+// addStylesToDocument(doc);
	713	+//
	714	+// try
	715	+// {
	716	+// for (int j = 0; j < 2; j++)
	717	+// {
	718	+// for (int i = 0; i < initString.length; i++)
	719	+// {
	720	+// doc.insertString(doc.getLength(), initString[i],
	721	+// doc.getStyle(initStyles[i]));
	722	+// }
	723	+// }
	724	+// } catch (BadLocationException ble)
	725	+// {
	726	+// System.err.println("Couldn't insert initial text into text pane.");
	727	+// }
642	728
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;
	729	+ return new JTextPane(); // textPane;
671	730	}
672	731
673	732	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -720,7 +779,7 @@
720	779	protected static ImageIcon createImageIcon(String path,
721	780	String description)
722	781	{
723		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	782	+ java.net.URL imgURL = Grafreed.class.getResource(path);
724	783	if (imgURL != null)
725	784	{
726	785	return new ImageIcon(imgURL, description);
..	..	@@ -752,6 +811,7 @@
752	811	// NumberSlider vDivsField;
753	812	// JCheckBox endcaps;
754	813	JCheckBox liveCB;
	814	+ JCheckBox selectCB;
755	815	JCheckBox hideCB;
756	816	JCheckBox link2masterCB;
757	817	JCheckBox markCB;
..	..	@@ -767,115 +827,87 @@
767	827	JButton slowerButton;
768	828	JButton fasterButton;
769	829	JButton remarkButton;
	830	+
	831	+ cGridBag editPanel;
	832	+ cGridBag editCommandsPanel;
	833	+
	834	+ cGridBag namePanel;
	835	+ cGridBag setupPanel;
	836	+ cGridBag setupPanel2;
	837	+ cGridBag objectCommandsPanel;
	838	+ cGridBag pushPanel;
	839	+ cGridBag fillPanel;
770	840
771		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	841	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
772	842	{
773	843	JCheckBox cb;
774	844
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);
	845	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
780	846	cb.addItemListener(this);
781		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
782		- oe.aConstraints.gridwidth = 1;
783		- oe.aConstraints.gridx += 1;
784	847
785	848	return cb;
786	849	}
787	850
788		- cButton AddButton(ObjEditor oe, String label)
	851	+ cButton AddButton(cGridBag panel, String label)
789	852	{
790	853	cButton cb;
791	854
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);
	855	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
797	856	cb.addActionListener(this);
798		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
799		- oe.aConstraints.gridwidth = 1;
800		- oe.aConstraints.gridx += 1;
801	857
802	858	return cb;
803	859	}
804	860
805		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	861	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
806	862	{
807	863	JComboBox combo;
808	864
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;
	865	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
812	866	combo.addActionListener(this);
813	867
814	868	return combo;
815	869	}
816	870
817		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	871	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
818	872	{
819		- NumberSlider combo;
	873	+ cGridBag control = new cGridBag();
	874	+
	875	+ cNumberSlider combo;
820	876
821	877	JLabel jlabel = new JLabel(label);
822		-
823		- aConstraints.fill = GridBagConstraints.VERTICAL;
824	878	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		-
	879	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	880	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
834	881	combo.setFloat(current);
835		-
836		- combo.label = jlabel;
837		-
838		- combo.addChangeListener(this);
839		-
840		- return combo;
	882	+
	883	+ panel.add(control);
	884	+
	885	+ return control;
841	886	}
842	887
843		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	888	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
844	889	{
845		- NumberSlider combo;
	890	+ cGridBag control = new cGridBag();
	891	+
	892	+ cNumberSlider combo;
846	893
847	894	JLabel jlabel = new JLabel(label);
848		-
849		- aConstraints.fill = GridBagConstraints.VERTICAL;
850	895	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		-
	896	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	897	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
860	898	combo.setInteger(current);
861	899
862		- combo.label = jlabel;
863		-
864		- combo.addChangeListener(this);
865		-
866		- return combo;
	900	+ panel.add(control);
	901	+
	902	+ return control;
867	903	}
868	904
869		- JTextArea AddText(JPanel ctrlPanel, String name)
	905	+ JTextArea AddText(cGridBag ctrlPanel, String name)
870	906	{
871	907	JTextArea text;
872	908
873		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
874		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
875		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	909	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
876	910	text.addCaretListener(this);
877		- aConstraints.gridx += 1;
878		- aConstraints.gridwidth = 1;
879	911
880	912	return text;
881	913	}
..	..	@@ -905,9 +937,16 @@
905	937	objEditor.ctrlPanel.remove(j);
906	938	}
907	939
	940	+ void Remove(cNumberSlider j)
	941	+ {
	942	+ j.removeChangeListener(this);
	943	+ //objEditor.ctrlPanel.remove(j.label);
	944	+ objEditor.ctrlPanel.remove(j);
	945	+ }
	946	+
908	947	/*
909	948	*/
910		- void Return() // ObjEditor oe)
	949	+ void Return0() // ObjEditor oe)
911	950	{
912	951	aConstraints.gridy += 1;
913	952	aConstraints.gridx = 0;
..	..	@@ -962,37 +1001,76 @@
962	1001
963	1002	void SetupUI2(ObjEditor oe)
964	1003	{
965		-// oe.aConstraints.weightx = 0;
966		-// oe.aConstraints.weighty = 0;
967		-// oe.aConstraints.gridx = 0;
968		-// oe.aConstraints.gridy = 0;
969		- SetupName(oe);
	1004	+ //SetupName(oe);
	1005	+
	1006	+ namePanel = new cGridBag();
	1007	+
	1008	+ nameField = AddText(namePanel, copy.GetName());
	1009	+ namePanel.add(nameField);
	1010	+ oe.ctrlPanel.add(namePanel);
	1011	+
	1012	+ oe.ctrlPanel.Return();
970	1013
971	1014	if (!GroupEditor.allparams)
972	1015	return;
973	1016
974		- liveCB = AddCheckBox(oe, "Live", copy.live);
975		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
976		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	1017	+ setupPanel = new cGridBag().setVertical(false);
	1018	+
	1019	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	1020	+ liveCB.setToolTipText("Animate object");
	1021	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	1022	+ selectCB.setToolTipText("Make object selectable");
977	1023	// 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");
	1024	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	1025	+ hideCB.setToolTipText("Hide object");
	1026	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	1027	+ markCB.setToolTipText("Set the animation target transform");
	1028	+
	1029	+ setupPanel2 = new cGridBag().setVertical(false);
	1030	+
	1031	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	1032	+ rewindCB.setToolTipText("Rewind animation");
	1033	+
	1034	+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	1035	+ randomCB.setToolTipText("Randomly Rewind or Go back and forth");
	1036	+
	1037	+ if (Globals.ADVANCED)
	1038	+ {
	1039	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
	1040	+ link2masterCB.setToolTipText("Attach to support");
	1041	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	1042	+ speedupCB.setToolTipText("Option motion capture");
	1043	+ }
	1044	+
	1045	+ oe.ctrlPanel.add(setupPanel);
	1046	+ oe.ctrlPanel.Return();
	1047	+ oe.ctrlPanel.add(setupPanel2);
	1048	+ oe.ctrlPanel.Return();
	1049	+
	1050	+ objectCommandsPanel = new cGridBag().setVertical(false);
	1051	+
	1052	+ resetButton = AddButton(objectCommandsPanel, "Reset");
	1053	+ resetButton.setToolTipText("Jump to frame zero");
	1054	+ stepButton = AddButton(objectCommandsPanel, "Step");
	1055	+ stepButton.setToolTipText("Step one frame");
984	1056	// resetAllButton = AddButton(oe, "Reset All");
985	1057	// stepAllButton = AddButton(oe, "Step All");
986		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
987	1058	// Return();
988		- slowerButton = AddButton(oe, "Slow");
989		- fasterButton = AddButton(oe, "Fast");
990		- remarkButton = AddButton(oe, "Rem");
	1059	+ slowerButton = AddButton(objectCommandsPanel, "Slow");
	1060	+ slowerButton.setToolTipText("Decrease animation speed");
	1061	+ fasterButton = AddButton(objectCommandsPanel, "Fast");
	1062	+ fasterButton.setToolTipText("Increase animation speed");
	1063	+ remarkButton = AddButton(objectCommandsPanel, "Remark");
	1064	+ remarkButton.setToolTipText("Set the current transform as the target");
991	1065
992		- Return();
	1066	+ oe.ctrlPanel.add(objectCommandsPanel);
	1067	+ oe.ctrlPanel.Return();
993	1068
994		- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
995		- Return();
	1069	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1070	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1071	+ //Return();
	1072	+
	1073	+ oe.ctrlPanel.Return();
996	1074
997	1075	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
998	1076	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1087,7 +1165,7 @@
1087	1165	oe.aConstraints.gridwidth = 1;
1088	1166	/**/
1089	1167	nameField = AddText(oe.ctrlPanel, copy.GetName());
1090		- Return();
	1168	+ oe.ctrlPanel.Return();
1091	1169
1092	1170	//ctrlPanel.add(textureButton = new Button("Texture..."));
1093	1171	//textureButton.setEnabled(false);
..	..	@@ -1189,9 +1267,13 @@
1189	1267	//JPanel worldPanel =
1190	1268	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1191	1269	//worldPanel.setName("World");
1192		- centralPanel = new JPanel(new BorderLayout());
1193		- timelinePanel = new JPanel(new BorderLayout());
1194		- timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
	1270	+ centralPanel = new cGridBag();
	1271	+ centralPanel.preferredWidth = 20;
	1272	+
	1273	+ if (Globals.ADVANCED)
	1274	+ {
	1275	+ timelinePanel = new JPanel(new BorderLayout());
	1276	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1195	1277
1196	1278	cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1197	1279	cameraPanel.setContinuousLayout(true);
..	..	@@ -1200,7 +1282,10 @@
1200	1282	// cameraPanel.setDividerSize(9);
1201	1283	cameraPanel.setResizeWeight(1.0);
1202	1284
	1285	+ }
	1286	+
1203	1287	centralPanel.add(cameraView);
	1288	+ centralPanel.setFocusable(true);
1204	1289	//frame.setJMenuBar(timelineMenubar);
1205	1290	//centralPanel.add(timelinePanel);
1206	1291
..	..	@@ -1222,6 +1307,7 @@
1222	1307	XYZPanel = new cGridBag().setVertical(true);
1223	1308	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1224	1309
	1310	+ XYZPanel.preferredWidth = 5;
1225	1311	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1226	1312	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1227	1313	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
..	..	@@ -1262,10 +1348,11 @@
1262	1348	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1263	1349	//tmp.setName("Edit");
1264	1350	objectPanel.add(materialPanel);
1265		- JPanel north = new JPanel(new BorderLayout());
1266		- north.setName("Edit");
1267		- north.add(ctrlPanel, BorderLayout.NORTH);
1268		- objectPanel.add(north);
	1351	+// JPanel north = new JPanel(new BorderLayout());
	1352	+// north.setName("Edit");
	1353	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1354	+// objectPanel.add(north);
	1355	+ objectPanel.add(editPanel);
1269	1356	objectPanel.add(infoPanel);
1270	1357
1271	1358	/*
..	..	@@ -1286,19 +1373,23 @@
1286	1373	scrollpane.setWheelScrollingEnabled(true);
1287	1374	scrollpane.addMouseWheelListener(this); // Default not fast enough
1288	1375
1289		- /JTabbedPane/ scenePanel = new JTabbedPane();
1290		- scenePanel.add(scrollpane);
	1376	+ /JTabbedPane/ scenePanel = new cGridBag();
	1377	+ scenePanel.preferredWidth = 6;
	1378	+
	1379	+ JTabbedPane tabbedPane = new JTabbedPane();
	1380	+ tabbedPane.add(scrollpane);
1291	1381
1292		- scenePanel.add(FSPane = new cFileSystemPane(this));
	1382	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1293	1383
1294		- optionsPanel = new JPanel(new GridBagLayout());
	1384	+ optionsPanel = new cGridBag().setVertical(true);
1295	1385
1296	1386	optionsPanel.setName("Options");
1297	1387
1298		- AddOptions(optionsPanel, aConstraints);
	1388	+ AddOptions(optionsPanel); //, aConstraints);
1299	1389
1300		- scenePanel.add(optionsPanel);
1301		-
	1390	+ tabbedPane.add(optionsPanel);
	1391	+
	1392	+ scenePanel.add(tabbedPane);
1302	1393
1303	1394	/*
1304	1395	cTree jTree = new cTree(null);
..	..	@@ -1389,9 +1480,11 @@
1389	1480
1390	1481	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1391	1482
1392		- frame.setSize(1024, 768);
1393		- frame.show();
	1483	+ frame.setSize(1280, 860);
	1484	+ frame.setVisible(true);
1394	1485
	1486	+ cameraView.requestFocusInWindow();
	1487	+
1395	1488	gridPanel.setDividerLocation(1.0);
1396	1489
1397	1490	frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
..	..	@@ -1405,7 +1498,7 @@
1405	1498	});
1406	1499	}
1407	1500
1408		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	1501	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
1409	1502	{
1410	1503	}
1411	1504
..	..	@@ -1420,260 +1513,173 @@
1420	1513	ctrlPanel.removeAll();
1421	1514	}
1422	1515
1423		- void SetupMaterial(JPanel ctrlPanel)
	1516	+ void SetupMaterial(cGridBag panel)
1424	1517	{
1425		- aConstraints.weighty = 0;
1426		- //aConstraints.weightx = 1;
1427		- /*
	1518	+ /*
1428	1519	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1429	1520	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1430		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1431		- aConstraints.gridx += 1;
1432	1521	*/
1433	1522
1434		- aConstraints.gridwidth = 1;
1435		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1436		- aConstraints.gridx += 1;
1437		- aConstraints.weighty = 0;
1438		- aConstraints.gridwidth = 1;
	1523	+ cGridBag editBar = new cGridBag().setVertical(false);
	1524	+
	1525	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1526	+ createMaterialButton.setToolTipText("Create material");
1439	1527
1440	1528	/*
1441	1529	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1442		- aConstraints.gridx += 1;
1443		- aConstraints.weighty = 0;
1444		- aConstraints.gridwidth = 1;
1445	1530	*/
1446	1531
1447		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1448		- aConstraints.gridx += 1;
	1532	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1533	+ clearMaterialButton.setToolTipText("Clear material");
	1534	+
	1535	+ if (Globals.ADVANCED)
	1536	+ {
	1537	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1538	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1539	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1540	+ }
1449	1541
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;
	1542	+ editBar.preferredHeight = 15;
	1543	+
	1544	+ panel.add(editBar);
	1545	+
1464	1546	/**/
1465	1547	//aConstraints.weighty = 0;
1466	1548	////aConstraints.weightx = 1;
1467	1549	//aConstraints.weighty = 1;
1468	1550	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1469	1551	//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;
	1552	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1475	1553
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;
	1554	+ cGridBag colorSection = new cGridBag().setVertical(true);
	1555	+
	1556	+ cGridBag color = new cGridBag();
	1557	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1558	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1559	+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1560	+ //colorField.preferredWidth = 200;
	1561	+ colorSection.add(color);
1486	1562
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;
	1563	+ cGridBag modulation = new cGridBag();
	1564	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1565	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1566	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1567	+ colorSection.add(modulation);
1496	1568
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;
	1569	+ cGridBag texture = new cGridBag();
	1570	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1571	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1572	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1573	+ colorSection.add(texture);
1506	1574
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;
	1575	+ cGridBag anisoU = new cGridBag();
	1576	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1577	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1578	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1579	+ colorSection.add(anisoU);
1516	1580
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;
	1581	+ cGridBag anisoV = new cGridBag();
	1582	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1583	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1584	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1585	+ colorSection.add(anisoV);
1526	1586
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;
	1587	+ cGridBag shadowbias = new cGridBag();
	1588	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1589	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1590	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1591	+ colorSection.add(shadowbias);
1536	1592
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;
	1593	+ panel.add(new JSeparator());
	1594	+
	1595	+ panel.add(colorSection);
	1596	+
	1597	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1598	+
	1599	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1600	+
	1601	+ cGridBag diffuse = new cGridBag();
	1602	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1603	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1604	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1605	+ diffuseSection.add(diffuse);
1545	1606
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;
	1607	+ cGridBag diffuseness = new cGridBag();
	1608	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1609	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1610	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1611	+ diffuseSection.add(diffuseness);
1555	1612
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;
	1613	+ cGridBag selfshadow = new cGridBag();
	1614	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1615	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1616	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1617	+ diffuseSection.add(selfshadow);
1565	1618
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;
	1619	+ cGridBag sheen = new cGridBag();
	1620	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1621	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1622	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1623	+ diffuseSection.add(sheen);
1575	1624
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;
	1625	+ cGridBag subsurface = new cGridBag();
	1626	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1627	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1628	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1629	+ diffuseSection.add(subsurface);
1585	1630
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;
	1631	+ cGridBag shadow = new cGridBag();
	1632	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1633	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1634	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1635	+ diffuseSection.add(shadow);
1595	1636
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;
	1637	+ cGridBag fakedepth = new cGridBag();
	1638	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1639	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1640	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1641	+ diffuseSection.add(fakedepth);
1605	1642
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;
	1643	+ panel.add(new JSeparator());
	1644	+
	1645	+ panel.add(diffuseSection);
	1646	+
	1647	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1648	+
	1649	+ cGridBag specularSection = new cGridBag().setVertical(true);
1615	1650
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;
	1651	+ cGridBag specular = new cGridBag();
	1652	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1653	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1654	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1655	+ specularSection.add(specular);
1624	1656
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;
	1657	+ cGridBag lightarea = new cGridBag();
	1658	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1659	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1660	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1661	+ specularSection.add(lightarea);
1634	1662
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;
	1663	+ cGridBag shininess = new cGridBag();
	1664	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1665	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1666	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1667	+ specularSection.add(shininess);
1644	1668
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;
	1669	+ cGridBag metalness = new cGridBag();
	1670	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1671	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1672	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1673	+ specularSection.add(metalness);
1654	1674
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;
	1675	+ cGridBag velvet = new cGridBag();
	1676	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1677	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1678	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1679	+ specularSection.add(velvet);
1664	1680
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();
	1681	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1682	+ //Return();
1677	1683	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1678	1684	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1679	1685	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1684,130 +1690,93 @@
1684	1690	// aConstraints.gridy += 1;
1685	1691	// aConstraints.gridwidth = 1;
1686	1692
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	1693
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;
	1694	+ panel.add(new JSeparator());
	1695	+
	1696	+ panel.add(specularSection);
	1697	+
	1698	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1699	+
	1700	+ cGridBag globalSection = new cGridBag().setVertical(true);
1705	1701
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;
	1702	+ cGridBag camera = new cGridBag();
	1703	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1704	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1705	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1706	+ globalSection.add(camera);
1715	1707
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;
	1708	+ cGridBag ambient = new cGridBag();
	1709	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1710	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1711	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1712	+ globalSection.add(ambient);
1725	1713
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;
	1714	+ cGridBag backlit = new cGridBag();
	1715	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1716	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1717	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1718	+ globalSection.add(backlit);
1736	1719
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;
	1720	+ cGridBag opacity = new cGridBag();
	1721	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1722	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1723	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1724	+ globalSection.add(opacity);
1746	1725
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;
	1726	+ panel.add(new JSeparator());
	1727	+
	1728	+ panel.add(globalSection);
	1729	+
	1730	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1731	+
	1732	+ cGridBag textureSection = new cGridBag().setVertical(true);
1756	1733
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;
	1734	+ cGridBag bump = new cGridBag();
	1735	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1736	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1737	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1738	+ textureSection.add(bump);
1766	1739
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;
	1740	+ cGridBag noise = new cGridBag();
	1741	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1742	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1743	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1744	+ textureSection.add(noise);
1776	1745
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;
	1746	+ cGridBag power = new cGridBag();
	1747	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1748	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1749	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1750	+ textureSection.add(power);
1786	1751
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;
	1752	+ cGridBag borderfade = new cGridBag();
	1753	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1754	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1755	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1756	+ textureSection.add(borderfade);
1796	1757
1797		- //aConstraints.weighty = 1;
1798		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1799		- //aConstraints.gridx += 1;
1800		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1801		- aConstraints.weighty = 0;
	1758	+ cGridBag fog = new cGridBag();
	1759	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1760	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1761	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1762	+ textureSection.add(fog);
1802	1763
1803		- aConstraints.gridx = 0;
1804		- aConstraints.gridy = 0;
1805		- aConstraints.gridwidth = 1;
	1764	+ cGridBag opacityPower = new cGridBag();
	1765	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	1766	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1767	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	1768	+ textureSection.add(opacityPower);
	1769	+
	1770	+ panel.add(new JSeparator());
	1771	+
	1772	+ panel.add(textureSection);
	1773	+
	1774	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1806	1775
1807	1776	SetMaterial(copy); // .GetMaterial());
1808	1777
1809		- colorField.addChangeListener(this);
1810		- modulationField.addChangeListener(this);
	1778	+ //colorField.addChangeListener(this);
	1779	+// modulationField.addChangeListener(this);
1811	1780	metalnessField.addChangeListener(this);
1812	1781	diffuseField.addChangeListener(this);
1813	1782	specularField.addChangeListener(this);
..	..	@@ -1837,12 +1806,15 @@
1837	1806	opacityPowerField.addChangeListener(this);
1838	1807	/**/
1839	1808
1840		- resetSlidersButton.addActionListener(this);
1841	1809	clearMaterialButton.addActionListener(this);
1842	1810	createMaterialButton.addActionListener(this);
1843		-
1844		- propagateToggle.addItemListener(this);
1845		- multiplyToggle.addItemListener(this);
	1811	+
	1812	+ if (Globals.ADVANCED)
	1813	+ {
	1814	+ resetSlidersButton.addActionListener(this);
	1815	+ propagateToggle.addItemListener(this);
	1816	+ multiplyToggle.addItemListener(this);
	1817	+ }
1846	1818	}
1847	1819
1848	1820	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -2013,7 +1985,7 @@
2013	1985
2014	1986	//? flashIt = false;
2015	1987	CameraPane pane = (CameraPane) cameraView;
2016		- pane.clickStart(location.x, location.y, 0);
	1988	+ pane.clickStart(location.x, location.y, 0, 0);
2017	1989	pane.clickEnd(location.x, location.y, 0, true);
2018	1990
2019	1991	if (group.selection.size() == 1)
..	..	@@ -2062,6 +2034,7 @@
2062	2034	e2.printStackTrace();
2063	2035	}
2064	2036	}
	2037	+
2065	2038	LoadJMEThread loadThread;
2066	2039
2067	2040	class LoadJMEThread extends Thread
..	..	@@ -2119,6 +2092,7 @@
2119	2092	//LoadFile0(filename, converter);
2120	2093	}
2121	2094	}
	2095	+
2122	2096	LoadOBJThread loadObjThread;
2123	2097
2124	2098	class LoadOBJThread extends Thread
..	..	@@ -2197,19 +2171,19 @@
2197	2171
2198	2172	void LoadObjFile(String fullname)
2199	2173	{
2200		- /*
	2174	+ System.out.println("Loading " + fullname);
	2175	+ /**/
2201	2176	//lastFilename = fullname;
2202	2177	if(loadObjThread == null)
2203	2178	{
2204		- loadObjThread = new LoadOBJThread();
2205		- loadObjThread.start();
	2179	+ loadObjThread = new LoadOBJThread();
	2180	+ loadObjThread.start();
2206	2181	}
2207	2182
2208	2183	loadObjThread.add(fullname);
2209		- */
	2184	+ /**/
2210	2185
2211		- System.out.println("Loading " + fullname);
2212		- makeSomething(new FileObject(fullname, true), true);
	2186	+ //makeSomething(new FileObject(fullname, true), true);
2213	2187	}
2214	2188
2215	2189	void LoadGFDFile(String fullname)
..	..	@@ -2470,11 +2444,11 @@
2470	2444
2471	2445	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2472	2446	{
2473		- if (GrafreeD.standAlone)
	2447	+ if (Grafreed.standAlone)
2474	2448	{
2475	2449	/**/
2476	2450	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2477		- browser.show();
	2451	+ browser.setVisible(true);
2478	2452	String filename = browser.getFile();
2479	2453	if (filename != null && filename.length() > 0)
2480	2454	{
..	..	@@ -2619,6 +2593,7 @@
2619	2593	}
2620	2594	if (input == null)
2621	2595	{
	2596	+ new Exception().printStackTrace();
2622	2597	System.exit(0);
2623	2598	}
2624	2599
..	..	@@ -2833,7 +2808,8 @@
2833	2808	return;
2834	2809	}
2835	2810
2836		- multiplyToggle.setSelected(mat.multiply);
	2811	+ if (multiplyToggle != null)
	2812	+ multiplyToggle.setSelected(mat.multiply);
2837	2813
2838	2814	assert (object.projectedVertices != null);
2839	2815
..	..	@@ -3048,9 +3024,9 @@
3048	3024	frame.validate();
3049	3025
3050	3026	return;
3051		- } else if (event.getSource() == toggleRandomItem)
	3027	+ } else if (event.getSource() == toggleSwitchItem)
3052	3028	{
3053		- cameraView.ToggleRandom();
	3029	+ cameraView.ToggleSwitch();
3054	3030	cameraView.repaint();
3055	3031	return;
3056	3032	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3079,6 +3055,10 @@
3079	3055	{
3080	3056	copy.live ^= true;
3081	3057	return;
	3058	+ } else if (event.getSource() == selectCB)
	3059	+ {
	3060	+ copy.dontselect ^= true;
	3061	+ return;
3082	3062	} else if (event.getSource() == hideCB)
3083	3063	{
3084	3064	copy.hide ^= true;
..	..	@@ -3093,6 +3073,7 @@
3093	3073	if (event.getSource() == randomCB)
3094	3074	{
3095	3075	copy.random ^= true;
	3076	+ objEditor.refreshContents();
3096	3077	return;
3097	3078	}
3098	3079	if (event.getSource() == speedupCB)
..	..	@@ -3116,8 +3097,9 @@
3116	3097
3117	3098	public void actionPerformed(ActionEvent event)
3118	3099	{
	3100	+ Object source = event.getSource();
3119	3101	// SCRIPT DIALOG
3120		- if (event.getSource() == okbutton)
	3102	+ if (source == okbutton)
3121	3103	{
3122	3104	textpanel.setVisible(false);
3123	3105	textpanel.remove(textarea);
..	..	@@ -3129,7 +3111,7 @@
3129	3111	textarea = null;
3130	3112	textpanel = null;
3131	3113	}
3132		- if (event.getSource() == cancelbutton)
	3114	+ if (source == cancelbutton)
3133	3115	{
3134	3116	textpanel.setVisible(false);
3135	3117	textpanel.remove(textarea);
..	..	@@ -3141,50 +3123,50 @@
3141	3123	//applySelf();
3142	3124	//client.refreshEditWindow();
3143	3125	//refreshContents();
3144		- if (event.getSource() == nameField)
	3126	+ if (source == nameField)
3145	3127	{
3146	3128	//System.out.println("ObjEditor " + event);
3147	3129	applySelf0(true);
3148	3130	//parent.applySelf();
3149	3131	objEditor.refreshContents();
3150		- } else if (event.getSource() == resetButton)
	3132	+ } else if (source == resetButton)
3151	3133	{
3152	3134	CameraPane.fullreset = true;
3153	3135	copy.Reset(); // ResetMeshes();
3154	3136	copy.Touch();
3155	3137	objEditor.refreshContents();
3156		- } else if (event.getSource() == stepItem)
	3138	+ } else if (source == stepItem)
3157	3139	{
3158	3140	//cameraView.ONESTEP = true;
3159	3141	Globals.ONESTEP = true;
3160	3142	cameraView.repaint();
3161	3143	return;
3162		- } else if (event.getSource() == stepButton)
	3144	+ } else if (source == stepButton)
3163	3145	{
3164	3146	copy.Step();
3165	3147	copy.Touch();
3166	3148	objEditor.refreshContents();
3167		- } else if (event.getSource() == slowerButton)
	3149	+ } else if (source == slowerButton)
3168	3150	{
3169	3151	copy.Slower();
3170	3152	copy.Touch();
3171	3153	objEditor.refreshContents();
3172		- } else if (event.getSource() == fasterButton)
	3154	+ } else if (source == fasterButton)
3173	3155	{
3174	3156	copy.Faster();
3175	3157	copy.Touch();
3176	3158	objEditor.refreshContents();
3177		- } else if (event.getSource() == remarkButton)
	3159	+ } else if (source == remarkButton)
3178	3160	{
3179	3161	copy.Remark();
3180	3162	copy.Touch();
3181	3163	objEditor.refreshContents();
3182		- } else if (event.getSource() == stepAllButton)
	3164	+ } else if (source == stepAllButton)
3183	3165	{
3184	3166	copy.StepAll();
3185	3167	copy.Touch();
3186	3168	objEditor.refreshContents();
3187		- } else if (event.getSource() == resetAllButton)
	3169	+ } else if (source == resetAllButton)
3188	3170	{
3189	3171	//CameraPane.fullreset = true;
3190	3172	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3217,53 +3199,75 @@
3217	3199	// Close();
3218	3200	// }
3219	3201	// else
3220		- if (event.getSource() == resetSlidersButton)
	3202	+ if (source == resetSlidersButton)
3221	3203	{
3222	3204	ResetSliders();
3223		- } else if (event.getSource() == clearMaterialButton)
	3205	+ } else if (source == clearMaterialButton)
3224	3206	{
3225	3207	ClearMaterial();
3226		- } else if (event.getSource() == createMaterialButton)
	3208	+ } else if (source == createMaterialButton)
3227	3209	{
3228	3210	CreateMaterial();
3229		- } else if (event.getSource() == clearPanelButton)
	3211	+ } else if (source == clearPanelButton)
3230	3212	{
3231	3213	copy.ClearUI();
3232	3214	refreshContents(true);
3233		- } /*
3234		- }
3235		-
3236		- public boolean action(Event event, Object arg)
3237		- {
3238		- */ else if (event.getSource() == closeItem)
	3215	+ } else if (source == importGFDItem)
	3216	+ {
	3217	+ ImportGFD();
	3218	+ } else
	3219	+ if (source == importVRMLX3DItem)
	3220	+ {
	3221	+ ImportVRMLX3D();
	3222	+ } else
	3223	+ if (source == import3DSItem)
	3224	+ {
	3225	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3226	+ } else
	3227	+ if (source == importOBJItem)
	3228	+ {
	3229	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3230	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3231	+ browser.setVisible(true);
	3232	+ String filename = browser.getFile();
	3233	+ if (filename != null && filename.length() > 0)
	3234	+ {
	3235	+ String fullname = browser.getDirectory() + filename;
	3236	+ makeSomething(ReadOBJ(fullname), true);
	3237	+ }
	3238	+ } else
	3239	+ if (source == closeItem)
3239	3240	{
3240	3241	Close();
3241	3242	//return true;
3242		- } else if (event.getSource() == loadItem)
	3243	+ } else if (source == loadItem)
3243	3244	{
3244	3245	load();
3245	3246	//return true;
3246		- } else if (event.getSource() == saveItem)
	3247	+ } else if (source == newItem)
	3248	+ {
	3249	+ New();
	3250	+ } else if (source == saveItem)
3247	3251	{
3248	3252	save();
3249	3253	//return true;
3250		- } else if (event.getSource() == saveAsItem)
	3254	+ } else if (source == saveAsItem)
3251	3255	{
3252	3256	saveAs();
3253	3257	//return true;
3254		- } else if (event.getSource() == reexportItem)
	3258	+ } else if (source == reexportItem)
3255	3259	{
3256	3260	reexport();
3257	3261	//return true;
3258		- } else if (event.getSource() == exportAsItem)
	3262	+ } else if (source == exportAsItem)
3259	3263	{
3260	3264	export();
3261	3265	//return true;
3262		- } else if (event.getSource() == povItem)
	3266	+ } else if (source == povItem)
3263	3267	{
3264	3268	generatePOV();
3265	3269	//return true;
3266		- } else if (event.getSource() == zBufferItem)
	3270	+ } else if (source == zBufferItem)
3267	3271	{
3268	3272	try
3269	3273	{
..	..	@@ -3285,21 +3289,8 @@
3285	3289	cameraView.repaint();
3286	3290	//return true;
3287	3291	}
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)
	3292	+ */ else // combos...
	3293	+ if (source == texresMenu)
3303	3294	{
3304	3295	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3305	3296	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3311,12 +3302,268 @@
3311	3302	}
3312	3303	}
3313	3304
	3305	+ void New()
	3306	+ {
	3307	+ while (copy.Size() > 1)
	3308	+ {
	3309	+ copy.remove(1);
	3310	+ }
	3311	+
	3312	+ ResetModel();
	3313	+ objEditor.refreshContents();
	3314	+ }
	3315	+
	3316	+ static public byte[] Compress(Object3D o)
	3317	+ {
	3318	+ try
	3319	+ {
	3320	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3321	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3322	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3323	+
	3324	+ Object3D parent = o.parent;
	3325	+ o.parent = null;
	3326	+
	3327	+ out.writeObject(o);
	3328	+
	3329	+ o.parent = parent;
	3330	+
	3331	+ out.flush();
	3332	+
	3333	+ zstream.close();
	3334	+ out.close();
	3335	+
	3336	+ return baos.toByteArray();
	3337	+ } catch (Exception e)
	3338	+ {
	3339	+ System.err.println(e);
	3340	+ return null;
	3341	+ }
	3342	+ }
	3343	+
	3344	+ static public Object Uncompress(byte[] bytes)
	3345	+ {
	3346	+ System.out.println("#bytes = " + bytes.length);
	3347	+ try
	3348	+ {
	3349	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3350	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3351	+ ObjectInputStream in = new ObjectInputStream(istream);
	3352	+ Object obj = in.readObject();
	3353	+ in.close();
	3354	+
	3355	+ return obj;
	3356	+ } catch (Exception e)
	3357	+ {
	3358	+ System.err.println(e);
	3359	+ return null;
	3360	+ }
	3361	+ }
	3362	+
	3363	+ static public Object clone(Object o)
	3364	+ {
	3365	+ try
	3366	+ {
	3367	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3368	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3369	+
	3370	+ out.writeObject(o);
	3371	+
	3372	+ out.flush();
	3373	+ out.close();
	3374	+
	3375	+ byte[] bytes = baos.toByteArray();
	3376	+
	3377	+ System.out.println("clone = " + bytes.length);
	3378	+
	3379	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3380	+ ObjectInputStream in = new ObjectInputStream(bais);
	3381	+ Object obj = in.readObject();
	3382	+ in.close();
	3383	+
	3384	+ return obj;
	3385	+ } catch (Exception e)
	3386	+ {
	3387	+ System.err.println(e);
	3388	+ return null;
	3389	+ }
	3390	+ }
	3391	+
	3392	+ cRadio GetCurrentTab()
	3393	+ {
	3394	+ cRadio ab;
	3395	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3396	+ {
	3397	+ ab = (cRadio)e.nextElement();
	3398	+ if(ab.GetObject() == copy)
	3399	+ {
	3400	+ return ab;
	3401	+ }
	3402	+ }
	3403	+
	3404	+ return null;
	3405	+ }
	3406	+
	3407	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3408	+
	3409	+ public void Save()
	3410	+ {
	3411	+ cRadio tab = GetCurrentTab();
	3412	+
	3413	+ boolean temp = CameraPane.SWITCH;
	3414	+ CameraPane.SWITCH = false;
	3415	+
	3416	+ copy.ExtractBigData(hashtable);
	3417	+
	3418	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3419	+ tab.graphs[tab.undoindex++] = Compress(copy);
	3420	+
	3421	+ copy.RestoreBigData(hashtable);
	3422	+
	3423	+ CameraPane.SWITCH = temp;
	3424	+
	3425	+ //assert(hashtable.isEmpty());
	3426	+
	3427	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3428	+ {
	3429	+ tab.graphs[i] = null;
	3430	+ }
	3431	+
	3432	+ // test save
	3433	+ if (false)
	3434	+ {
	3435	+ try
	3436	+ {
	3437	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3438	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3439	+
	3440	+ p.writeObject(copy);
	3441	+
	3442	+ p.flush();
	3443	+
	3444	+ ostream.close();
	3445	+ } catch (Exception e)
	3446	+ {
	3447	+ e.printStackTrace();
	3448	+ }
	3449	+ }
	3450	+ }
	3451	+
	3452	+ void CopyChanged(Object3D obj)
	3453	+ {
	3454	+ boolean temp = CameraPane.SWITCH;
	3455	+ CameraPane.SWITCH = false;
	3456	+
	3457	+ copy.ExtractBigData(hashtable);
	3458	+
	3459	+ copy.clear();
	3460	+
	3461	+ for (int i=0; i<obj.Size(); i++)
	3462	+ {
	3463	+ copy.add(obj.get(i));
	3464	+ }
	3465	+
	3466	+ copy.RestoreBigData(hashtable);
	3467	+
	3468	+ CameraPane.SWITCH = temp;
	3469	+
	3470	+ //assert(hashtable.isEmpty());
	3471	+
	3472	+ copy.Touch();
	3473	+
	3474	+ ResetModel();
	3475	+ copy.HardTouch(); // recompile?
	3476	+
	3477	+ cRadio ab;
	3478	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3479	+ {
	3480	+ ab = (cRadio)e.nextElement();
	3481	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3482	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3483	+ if (test != null)
	3484	+ {
	3485	+ test.editWindow = ab.object.editWindow;
	3486	+ ab.object = test;
	3487	+ }
	3488	+ }
	3489	+
	3490	+ refreshContents();
	3491	+ }
	3492	+
	3493	+ public void Undo()
	3494	+ {
	3495	+ cRadio tab = GetCurrentTab();
	3496	+
	3497	+ if (tab.undoindex == 0)
	3498	+ {
	3499	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3500	+ return;
	3501	+ }
	3502	+
	3503	+ if (tab.graphs[tab.undoindex] == null)
	3504	+ {
	3505	+ Save();
	3506	+ tab.undoindex -= 1;
	3507	+ }
	3508	+
	3509	+ tab.undoindex -= 1;
	3510	+
	3511	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3512	+ }
	3513	+
	3514	+ public void Redo()
	3515	+ {
	3516	+ cRadio tab = GetCurrentTab();
	3517	+
	3518	+ if (tab.graphs[tab.undoindex + 1] == null)
	3519	+ {
	3520	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3521	+ return;
	3522	+ }
	3523	+
	3524	+ tab.undoindex += 1;
	3525	+
	3526	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3527	+ }
	3528	+
	3529	+ void ImportGFD()
	3530	+ {
	3531	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3532	+ browser.show();
	3533	+ String filename = browser.getFile();
	3534	+ if (filename != null && filename.length() > 0)
	3535	+ {
	3536	+ String fullname = browser.getDirectory() + filename;
	3537	+
	3538	+ //Object3D readobj =
	3539	+ objEditor.ReadGFD(fullname, objEditor);
	3540	+ //makeSomething(readobj);
	3541	+ }
	3542	+ }
	3543	+
	3544	+ void ImportVRMLX3D()
	3545	+ {
	3546	+ if (Grafreed.standAlone)
	3547	+ {
	3548	+ /**/
	3549	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3550	+ browser.show();
	3551	+ String filename = browser.getFile();
	3552	+ if (filename != null && filename.length() > 0)
	3553	+ {
	3554	+ String fullname = browser.getDirectory() + filename;
	3555	+ LoadVRMLX3D(fullname);
	3556	+ }
	3557	+ /**/
	3558	+ }
	3559	+ }
	3560	+
3314	3561	void ToggleAnimation()
3315	3562	{
3316	3563	if (!Globals.ANIMATION)
3317	3564	{
3318	3565	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3319		- browser.show();
	3566	+ browser.setVisible(true);
3320	3567	String filename = browser.getFile();
3321	3568	if (filename != null && filename.length() > 0)
3322	3569	{
..	..	@@ -3326,8 +3573,8 @@
3326	3573
3327	3574	Globals.ANIMATION ^= true;
3328	3575
3329		- GrafreeD.wav.cursor = 0;
3330		- GrafreeD.wav.loop = 0;
	3576	+ Grafreed.wav.cursor = 0;
	3577	+ Grafreed.wav.loop = 0;
3331	3578	}
3332	3579	} else
3333	3580	{
..	..	@@ -3377,7 +3624,7 @@
3377	3624	void CreateMaterial()
3378	3625	{
3379	3626	//copy.ClearMaterial(); // PATCH
3380		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3627	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3381	3628	if (copy.selection.size() > 0)
3382	3629	//SetMaterial(copy);
3383	3630	{
..	..	@@ -3436,11 +3683,11 @@
3436	3683	{
3437	3684	copy.ResetBlockLoop(); // temporary problem
3438	3685
3439		- boolean random = CameraPane.RANDOM;
3440		- CameraPane.RANDOM = false; // parse everything
	3686	+ boolean random = CameraPane.SWITCH;
	3687	+ CameraPane.SWITCH = false; // parse everything
3441	3688	copy.ResetDisplayList();
3442	3689	copy.HardTouch();
3443		- CameraPane.RANDOM = random;
	3690	+ CameraPane.SWITCH = random;
3444	3691	}
3445	3692
3446	3693	// public void applySelf()
..	..	@@ -3510,10 +3757,40 @@
3510	3757	current.fakedepth = (float) fakedepthField.getFloat();
3511	3758	current.shadowbias = (float) shadowbiasField.getFloat();
3512	3759
3513		- if (!NumberSlider.frozen)
	3760	+ if (!cNumberSlider.frozen)
3514	3761	{
3515	3762	//System.out.println("Propagate = " + propagate);
3516	3763	copy.UpdateMaterial(anchor, current, propagate);
	3764	+
	3765	+ if (copy.material != null)
	3766	+ {
	3767	+ cMaterial mat = copy.material;
	3768	+
	3769	+ colorField.SetToolTipValue((mat.color));
	3770	+ modulationField.SetToolTipValue((mat.modulation));
	3771	+ metalnessField.SetToolTipValue((mat.metalness));
	3772	+ diffuseField.SetToolTipValue((mat.diffuse));
	3773	+ specularField.SetToolTipValue((mat.specular));
	3774	+ shininessField.SetToolTipValue((mat.shininess));
	3775	+ shiftField.SetToolTipValue((mat.shift));
	3776	+ ambientField.SetToolTipValue((mat.ambient));
	3777	+ lightareaField.SetToolTipValue((mat.lightarea));
	3778	+ diffusenessField.SetToolTipValue((mat.factor));
	3779	+ velvetField.SetToolTipValue((mat.velvet));
	3780	+ sheenField.SetToolTipValue((mat.sheen));
	3781	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3782	+ backlitField.SetToolTipValue((mat.bump));
	3783	+ anisoField.SetToolTipValue((mat.aniso));
	3784	+ anisoVField.SetToolTipValue((mat.anisoV));
	3785	+ cameraField.SetToolTipValue((mat.cameralight));
	3786	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3787	+ shadowField.SetToolTipValue((mat.shadow));
	3788	+ textureField.SetToolTipValue((mat.texture));
	3789	+ opacityField.SetToolTipValue((mat.opacity));
	3790	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3791	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3792	+ }
	3793	+
3517	3794	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3518	3795	{
3519	3796	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3558,6 +3835,7 @@
3558	3835	\|\| e.getSource() == apertureField
3559	3836	\|\| e.getSource() == shadowblurField)
3560	3837	{
	3838	+ new Exception().printStackTrace();
3561	3839	System.exit(0);
3562	3840	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3563	3841	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3628,7 +3906,7 @@
3628	3906	}
3629	3907
3630	3908	if (normalpushField != null)
3631		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	3909	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3632	3910	}
3633	3911
3634	3912	void SnapObject()
..	..	@@ -3883,7 +4161,7 @@
3883	4161
3884	4162	radioPanel.revalidate();
3885	4163	radioPanel.repaint();
3886		- ctrlPanel.revalidate(); // ? new
	4164	+ ctrlPanel.validate(); // ? new
3887	4165	ctrlPanel.repaint();
3888	4166	}
3889	4167	}
..	..	@@ -3892,6 +4170,7 @@
3892	4170
3893	4171	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3894	4172	{
	4173	+ Save();
3895	4174	//Tween.set(thing, 0).target(1).start(tweenManager);
3896	4175	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3897	4176	// if (thing instanceof GenericJointDemo)
..	..	@@ -4095,6 +4374,7 @@
4095	4374	}
4096	4375	}
4097	4376	}
	4377	+
4098	4378	LoadGFDThread loadGFDThread;
4099	4379
4100	4380	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4114,8 +4394,10 @@
4114	4394
4115	4395	try
4116	4396	{
	4397	+ // Try compressed version first.
4117	4398	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4118		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4399	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4400	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4119	4401
4120	4402	readobj = (Object3D) p.readObject();
4121	4403	istream.close();
..	..	@@ -4123,7 +4405,20 @@
4123	4405	readobj.ResetDisplayList();
4124	4406	} catch (Exception e)
4125	4407	{
4126		- e.printStackTrace();
	4408	+ //e.printStackTrace();
	4409	+ try
	4410	+ {
	4411	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4412	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4413	+
	4414	+ readobj = (Object3D) p.readObject();
	4415	+ istream.close();
	4416	+
	4417	+ readobj.ResetDisplayList();
	4418	+ } catch (Exception e2)
	4419	+ {
	4420	+ e2.printStackTrace();
	4421	+ }
4127	4422	}
4128	4423	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4129	4424	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4169,6 +4464,12 @@
4169	4464
4170	4465	void LoadIt(Object obj)
4171	4466	{
	4467	+ if (obj == null)
	4468	+ {
	4469	+ // Invalid file
	4470	+ return;
	4471	+ }
	4472	+
4172	4473	System.out.println("Loaded " + obj);
4173	4474	//new Exception().printStackTrace();
4174	4475	Object3D readobj = (Object3D) obj;
..	..	@@ -4178,6 +4479,7 @@
4178	4479
4179	4480	if (readobj != null)
4180	4481	{
	4482	+ Save();
4181	4483	try
4182	4484	{
4183	4485	//readobj.deepCopySelf(copy);
..	..	@@ -4240,7 +4542,7 @@
4240	4542
4241	4543	void load() // throws ClassNotFoundException
4242	4544	{
4243		- if (GrafreeD.standAlone)
	4545	+ if (Grafreed.standAlone)
4244	4546	{
4245	4547	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4246	4548	browser.show();
..	..	@@ -4327,11 +4629,13 @@
4327	4629	try
4328	4630	{
4329	4631	FileOutputStream ostream = new FileOutputStream(lastname);
4330		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4632	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4633	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4331	4634
4332	4635	p.writeObject(copy);
4333	4636	p.flush();
4334	4637
	4638	+ zstream.close();
4335	4639	ostream.close();
4336	4640
4337	4641	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4341,11 +4645,12 @@
4341	4645	{
4342	4646	}
4343	4647	}
	4648	+
4344	4649	String lastname;
4345	4650
4346	4651	void saveAs()
4347	4652	{
4348		- if (GrafreeD.standAlone)
	4653	+ if (Grafreed.standAlone)
4349	4654	{
4350	4655	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4351	4656	browser.setVisible(true);
..	..	@@ -4450,13 +4755,13 @@
4450	4755	try
4451	4756	{
4452	4757	FileOutputStream ostream = new FileOutputStream(filename);
4453		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4454		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4758	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4759	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4455	4760
4456	4761	Object3D objectparent = obj.parent;
4457	4762	obj.parent = null;
4458	4763
4459		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4764	+ Object3D object = (Object3D) Grafreed.clone(obj);
4460	4765
4461	4766	obj.parent = objectparent;
4462	4767
..	..	@@ -4468,8 +4773,8 @@
4468	4773	p.writeObject(object);
4469	4774	p.flush();
4470	4775
	4776	+ zstream.close();
4471	4777	ostream.close();
4472		- // zstream.close();
4473	4778
4474	4779	// group.selection.get(0).parent = parent;
4475	4780	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4490,7 +4795,7 @@
4490	4795	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4491	4796	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4492	4797	copy.generatePOV(buffer);
4493		- if (GrafreeD.standAlone)
	4798	+ if (Grafreed.standAlone)
4494	4799	{
4495	4800	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4496	4801	browser.show();
..	..	@@ -4516,7 +4821,8 @@
4516	4821	Object3D client;
4517	4822	Object3D copy;
4518	4823	MenuBar menuBar;
4519		- Menu windowMenu;
	4824	+ Menu fileMenu;
	4825	+ MenuItem newItem;
4520	4826	MenuItem loadItem;
4521	4827	MenuItem saveItem;
4522	4828	MenuItem saveAsItem;
..	..	@@ -4524,13 +4830,11 @@
4524	4830	MenuItem reexportItem;
4525	4831	MenuItem povItem;
4526	4832	MenuItem closeItem;
4527		- Menu cameraMenu;
	4833	+
4528	4834	CheckboxMenuItem zBufferItem;
4529	4835	//MenuItem normalLensItem;
4530		- MenuItem editCameraItem;
4531		- MenuItem revertCameraItem;
4532		- CheckboxMenuItem toggleLiveItem;
4533	4836	MenuItem stepItem;
	4837	+ CheckboxMenuItem toggleLiveItem;
4534	4838	CheckboxMenuItem toggleFullScreenItem;
4535	4839	CheckboxMenuItem toggleTimelineItem;
4536	4840	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4539,7 +4843,7 @@
4539	4843	CheckboxMenuItem toggleFootContactItem;
4540	4844	CheckboxMenuItem toggleDLItem;
4541	4845	CheckboxMenuItem toggleTextureItem;
4542		- CheckboxMenuItem toggleRandomItem;
	4846	+ CheckboxMenuItem toggleSwitchItem;
4543	4847	CheckboxMenuItem toggleRootItem;
4544	4848	CheckboxMenuItem animationItem;
4545	4849	CheckboxMenuItem toggleHandleItem;
..	..	@@ -4547,20 +4851,20 @@
4547	4851	JSplitPane mainPanel;
4548	4852	JScrollPane scrollpane;
4549	4853	JPanel toolbarPanel;
4550		- JPanel treePanel;
	4854	+ cGridBag treePanel;
4551	4855	JPanel radioPanel;
4552	4856	ButtonGroup buttonGroup;
4553		- JPanel ctrlPanel;
4554		- JPanel materialPanel;
	4857	+ cGridBag ctrlPanel;
	4858	+ cGridBag materialPanel;
4555	4859	JScrollPane infoPanel;
4556		- JPanel optionsPanel;
	4860	+ cGridBag optionsPanel;
4557	4861	JTabbedPane objectPanel;
4558	4862	cGridBag XYZPanel;
4559	4863	JSplitPane gridPanel;
4560	4864	JSplitPane bigPanel;
4561	4865	cGridBag bigThree;
4562		- JTabbedPane scenePanel;
4563		- JPanel centralPanel;
	4866	+ cGridBag scenePanel;
	4867	+ cGridBag centralPanel;
4564	4868	JSplitPane cameraPanel;
4565	4869	JPanel timelinePanel;
4566	4870	JMenuBar timelineMenubar;
..	..	@@ -4613,67 +4917,72 @@
4613	4917	// MATERIAL
4614	4918	JLabel materialLabel;
4615	4919	JLabel colorLabel;
4616		- NumberSlider colorField;
	4920	+ cNumberSlider colorField;
4617	4921	JLabel modulationLabel;
4618		- NumberSlider modulationField;
	4922	+ cNumberSlider modulationField;
4619	4923	JLabel metalnessLabel;
4620		- NumberSlider metalnessField;
	4924	+ cNumberSlider metalnessField;
4621	4925	JLabel diffuseLabel;
4622		- NumberSlider diffuseField;
	4926	+ cNumberSlider diffuseField;
4623	4927	JLabel specularLabel;
4624		- NumberSlider specularField;
	4928	+ cNumberSlider specularField;
4625	4929	JLabel shininessLabel;
4626		- NumberSlider shininessField;
	4930	+ cNumberSlider shininessField;
4627	4931	JLabel shiftLabel;
4628		- NumberSlider shiftField;
	4932	+ cNumberSlider shiftField;
4629	4933	JLabel ambientLabel;
4630		- NumberSlider ambientField;
	4934	+ cNumberSlider ambientField;
4631	4935	JLabel lightareaLabel;
4632		- NumberSlider lightareaField;
	4936	+ cNumberSlider lightareaField;
4633	4937	JLabel diffusenessLabel;
4634		- NumberSlider diffusenessField;
	4938	+ cNumberSlider diffusenessField;
4635	4939	JLabel velvetLabel;
4636		- NumberSlider velvetField;
	4940	+ cNumberSlider velvetField;
4637	4941	JLabel sheenLabel;
4638		- NumberSlider sheenField;
	4942	+ cNumberSlider sheenField;
4639	4943	JLabel subsurfaceLabel;
4640		- NumberSlider subsurfaceField;
	4944	+ cNumberSlider subsurfaceField;
4641	4945	//JLabel bumpLabel;
4642	4946	//NumberSlider bumpField;
4643	4947	JLabel backlitLabel;
4644		- NumberSlider backlitField;
	4948	+ cNumberSlider backlitField;
4645	4949	JLabel anisoLabel;
4646		- NumberSlider anisoField;
	4950	+ cNumberSlider anisoField;
4647	4951	JLabel anisoVLabel;
4648		- NumberSlider anisoVField;
	4952	+ cNumberSlider anisoVField;
4649	4953	JLabel cameraLabel;
4650		- NumberSlider cameraField;
	4954	+ cNumberSlider cameraField;
4651	4955	JLabel selfshadowLabel;
4652		- NumberSlider selfshadowField;
	4956	+ cNumberSlider selfshadowField;
4653	4957	JLabel shadowLabel;
4654		- NumberSlider shadowField;
	4958	+ cNumberSlider shadowField;
4655	4959	JLabel textureLabel;
4656		- NumberSlider textureField;
	4960	+ cNumberSlider textureField;
4657	4961	JLabel opacityLabel;
4658		- NumberSlider opacityField;
	4962	+ cNumberSlider opacityField;
4659	4963	JLabel fakedepthLabel;
4660		- NumberSlider fakedepthField;
	4964	+ cNumberSlider fakedepthField;
4661	4965	JLabel shadowbiasLabel;
4662		- NumberSlider shadowbiasField;
	4966	+ cNumberSlider shadowbiasField;
4663	4967	JLabel bumpLabel;
4664		- NumberSlider bumpField;
	4968	+ cNumberSlider bumpField;
4665	4969	JLabel noiseLabel;
4666		- NumberSlider noiseField;
	4970	+ cNumberSlider noiseField;
4667	4971	JLabel powerLabel;
4668		- NumberSlider powerField;
	4972	+ cNumberSlider powerField;
4669	4973	JLabel borderfadeLabel;
4670		- NumberSlider borderfadeField;
	4974	+ cNumberSlider borderfadeField;
4671	4975	JLabel fogLabel;
4672		- NumberSlider fogField;
	4976	+ cNumberSlider fogField;
4673	4977	JLabel opacityPowerLabel;
4674		- NumberSlider opacityPowerField;
	4978	+ cNumberSlider opacityPowerField;
4675	4979	JTree jTree;
4676	4980	//ObjectUI parent;
4677	4981
4678		- NumberSlider normalpushField;
	4982	+ cNumberSlider normalpushField;
	4983	+
	4984	+ private MenuItem importGFDItem;
	4985	+ private MenuItem importVRMLX3DItem;
	4986	+ private MenuItem import3DSItem;
	4987	+ private MenuItem importOBJItem;
4679	4988	}