~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -19,6 +19,8 @@
19	19	import //weka.core.
20	20	matrix.Matrix;
21	21
	22	+import grafeme.ui.*;
	23	+
22	24	class ObjEditor /extends JFrame/ implements iCallBack, ObjectUI,
23	25	ActionListener, ChangeListener,
24	26	InputMethodListener,
..	..	@@ -31,6 +33,9 @@
31	33	boolean timeline;
32	34	boolean wasFullScreen;
33	35
	36	+ GroupEditor callee;
	37	+ JFrame frame;
	38	+
34	39	// SCRIPT
35	40
36	41	transient JFrame textpanel = null;
..	..	@@ -121,47 +126,53 @@
121	126	void keyPressed(int key, int modifiers)
122	127	{
123	128	System.out.println("KEY PRESSED");
124		- CameraPane.theRenderer.keyPressed(key, modifiers);
	129	+ Globals.theRenderer.keyPressed(key, modifiers);
125	130	}
126	131	*/
127	132
128	133	static GridBagConstraints aConstraints;
129	134	static GridBagConstraints aWindowConstraints;
130		- GroupEditor callee;
131		- JFrame frame;
	135	+
132	136	static int GRIDWIDTH = 100; // 4;
133	137
134	138	public void closeUI()
135	139	{
136	140	//new Exception().printStackTrace();
137		- System.out.println("this = " + this);
138		- System.out.println("objEditor = " + objEditor);
	141	+// System.out.println("this = " + this);
	142	+// System.out.println("objEditor = " + objEditor);
139	143	//nameField.removeActionListener(this);
140		- objEditor.ctrlPanel.remove(nameField);
	144	+// objEditor.ctrlPanel.remove(nameField);
	145	+
	146	+ objEditor.ctrlPanel.remove(namePanel);
141	147
142	148	if (!GroupEditor.allparams)
143	149	return;
144	150
145		- objEditor.ctrlPanel.remove(liveCB);
146		- objEditor.ctrlPanel.remove(hideCB);
147		- objEditor.ctrlPanel.remove(markCB);
148		-
149		- objEditor.ctrlPanel.remove(randomCB);
150		- objEditor.ctrlPanel.remove(speedupCB);
151		- objEditor.ctrlPanel.remove(rewindCB);
152		-
153		- objEditor.ctrlPanel.remove(resetButton);
154		- objEditor.ctrlPanel.remove(stepButton);
155		-// objEditor.ctrlPanel.remove(stepAllButton);
156		-// objEditor.ctrlPanel.remove(resetAllButton);
157		- objEditor.ctrlPanel.remove(link2masterCB);
158		- //objEditor.ctrlPanel.remove(flipVCB);
159		- //objEditor.ctrlPanel.remove(texresMenu);
160		- objEditor.ctrlPanel.remove(slowerButton);
161		- objEditor.ctrlPanel.remove(fasterButton);
162		- objEditor.ctrlPanel.remove(remarkButton);
	151	+// objEditor.ctrlPanel.remove(liveCB);
	152	+// objEditor.ctrlPanel.remove(hideCB);
	153	+// objEditor.ctrlPanel.remove(markCB);
	154	+//
	155	+// objEditor.ctrlPanel.remove(randomCB);
	156	+// objEditor.ctrlPanel.remove(speedupCB);
	157	+// objEditor.ctrlPanel.remove(rewindCB);
	158	+//
	159	+// objEditor.ctrlPanel.remove(resetButton);
	160	+// objEditor.ctrlPanel.remove(stepButton);
	161	+//// objEditor.ctrlPanel.remove(stepAllButton);
	162	+//// objEditor.ctrlPanel.remove(resetAllButton);
	163	+// objEditor.ctrlPanel.remove(link2masterCB);
	164	+// //objEditor.ctrlPanel.remove(flipVCB);
	165	+// //objEditor.ctrlPanel.remove(texresMenu);
	166	+// objEditor.ctrlPanel.remove(slowerButton);
	167	+// objEditor.ctrlPanel.remove(fasterButton);
	168	+// objEditor.ctrlPanel.remove(remarkButton);
163	169
164		- Remove(normalpushField);
	170	+ objEditor.ctrlPanel.remove(setupPanel);
	171	+ objEditor.ctrlPanel.remove(commandsPanel);
	172	+ objEditor.ctrlPanel.remove(pushPanel);
	173	+ //objEditor.ctrlPanel.remove(fillPanel);
	174	+
	175	+ //Remove(normalpushField);
165	176	}
166	177
167	178	public ObjEditor GetEditor()
..	..	@@ -298,44 +309,60 @@
298	309	//normalLensItem.addActionListener(this);
299	310	cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
300	311	revertCameraItem.addActionListener(this);
301		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
302		- toggleTimelineItem.addItemListener(this);
	312	+
303	313	cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
304	314	toggleFullScreenItem.addItemListener(this);
305	315	toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
306	316	cameraMenu.add("-");
	317	+
307	318	cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
308	319	toggleTextureItem.addItemListener(this);
309	320	toggleTextureItem.setState(CameraPane.textureon);
310		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
311		- toggleLiveItem.addItemListener(this);
312		- toggleLiveItem.setState(CameraPane.isLIVE());
313		- cameraMenu.add(stepItem = new MenuItem("Step"));
314		- stepItem.addActionListener(this);
315		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
316		-// toggleDLItem.addItemListener(this);
317		-// toggleDLItem.setState(false);
318		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
319		- toggleRenderItem.addItemListener(this);
320		- toggleRenderItem.setState(!CameraPane.frozen);
321		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
322		- toggleDebugItem.addItemListener(this);
323		- toggleDebugItem.setState(CameraPane.DEBUG);
324		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
325		- toggleFrustumItem.addItemListener(this);
326		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
327		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
328		- toggleFootContactItem.addItemListener(this);
329		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
330		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
331		- toggleRandomItem.addItemListener(this);
332		- toggleRandomItem.setState(CameraPane.RANDOM);
	321	+
	322	+ if (Globals.ADVANCED)
	323	+ {
	324	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	325	+ toggleLiveItem.addItemListener(this);
	326	+ toggleLiveItem.setState(Globals.isLIVE());
	327	+
	328	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	329	+ stepItem.addActionListener(this);
	330	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	331	+ // toggleDLItem.addItemListener(this);
	332	+ // toggleDLItem.setState(false);
	333	+
	334	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	335	+ toggleRenderItem.addItemListener(this);
	336	+ toggleRenderItem.setState(!CameraPane.frozen);
	337	+
	338	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	339	+ toggleDebugItem.addItemListener(this);
	340	+ toggleDebugItem.setState(CameraPane.DEBUG);
	341	+
	342	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	343	+ toggleFrustumItem.addItemListener(this);
	344	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	345	+
	346	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	347	+ toggleFootContactItem.addItemListener(this);
	348	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	349	+
	350	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	351	+ toggleTimelineItem.addItemListener(this);
	352	+ }
	353	+
	354	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	355	+ toggleSwitchItem.addItemListener(this);
	356	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	357	+
333	358	cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
334	359	toggleHandleItem.addItemListener(this);
335	360	toggleHandleItem.setState(CameraPane.HANDLES);
	361	+
336	362	cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
337	363	togglePaintItem.addItemListener(this);
338	364	togglePaintItem.setState(CameraPane.PAINTMODE);
	365	+
339	366	// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
340	367	// toggleRootItem.addItemListener(this);
341	368	// toggleRootItem.setState(false);
..	..	@@ -349,21 +376,23 @@
349	376	objectPanel = new JTabbedPane();
350	377	toolbarPanel = new JPanel();
351	378	toolbarPanel.setName("Toolbar");
352		- treePanel = new JPanel();
	379	+ treePanel = new cGridBag();
353	380	treePanel.setName("Tree");
354		- ctrlPanel = new JPanel(); // new GridBagLayout());
	381	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
355	382	ctrlPanel.setName("Edit");
356		- materialPanel = new JPanel();
	383	+ materialPanel = new cGridBag().setVertical(true);
357	384	materialPanel.setName("Material");
358	385	/JTextPane/
359	386	infoarea = createTextPane();
	387	+ doc = infoarea.getStyledDocument();
	388	+
360	389	infoarea.setEditable(true);
361	390	SetText();
362	391	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
363	392	// infoarea.setOpaque(false);
364	393	// //infoarea.setForeground(textcolor);
365		- infoarea.setLineWrap(true);
366		- infoarea.setWrapStyleWord(true);
	394	+// TEXTAREA infoarea.setLineWrap(true);
	395	+// TEXTAREA infoarea.setWrapStyleWord(true);
367	396	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
368	397	infoPanel.setPreferredSize(new Dimension(50, 200));
369	398	infoPanel.setName("Info");
..	..	@@ -374,16 +403,16 @@
374	403	mainPanel.setName("Main");
375	404	mainPanel.setContinuousLayout(true);
376	405	mainPanel.setOneTouchExpandable(true);
377		- mainPanel.setDividerLocation(1.0);
378	406	mainPanel.setDividerSize(9);
379		- mainPanel.setResizeWeight(0);
	407	+ mainPanel.setDividerLocation(0.5); //1.0);
	408	+ mainPanel.setResizeWeight(0.5);
380	409
381	410	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
382	411	//mainPanel.setLayout(new GridBagLayout());
383	412	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
384		- treePanel.setLayout(new GridBagLayout());
385		- ctrlPanel.setLayout(new GridBagLayout());
386		- materialPanel.setLayout(new GridBagLayout());
	413	+// treePanel.setLayout(new GridBagLayout());
	414	+ //ctrlPanel.setLayout(new GridBagLayout());
	415	+ //materialPanel.setLayout(new GridBagLayout());
387	416
388	417	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
389	418	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -422,7 +451,7 @@
422	451	static String newline = "\n";
423	452	protected static final String buttonString = "JButton";
424	453	StyledDocument doc;
425		- JTextArea infoarea;
	454	+ JTextPane infoarea;
426	455
427	456	void ClearInfo()
428	457	{
..	..	@@ -489,7 +518,10 @@
489	518	}
490	519
491	520	if (full)
492		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	521	+ {
	522	+ si.SendInfo(" BBox min: " + minima, "regular");
	523	+ si.SendInfo(" BBox max: " + maxima, "regular");
	524	+ }
493	525
494	526	if (sel.bRep != null)
495	527	{
..	..	@@ -587,6 +619,9 @@
587	619	{
588	620	CameraPane.pointflow = (PointFlow) sel;
589	621	}
	622	+
	623	+ si.SendInfo("_____________________", "regular");
	624	+ si.SendInfo("", "regular");
590	625	}
591	626	}
592	627
..	..	@@ -618,52 +653,52 @@
618	653	cameraView.ToggleFullScreen();
619	654	}
620	655
621		- private JTextArea createTextPane()
	656	+ private JTextPane createTextPane()
622	657	{
623		- String[] initString =
624		- {
625		- "This is an editable JTextPane, ", //regular
626		- "another ", //italic
627		- "styled ", //bold
628		- "text ", //small
629		- "component, ", //large
630		- "which supports embedded components..." + newline,//regular
631		- " " + newline, //button
632		- "...and embedded icons..." + newline, //regular
633		- " ", //icon
634		- newline + "JTextPane is a subclass of JEditorPane that "
635		- + "uses a StyledEditorKit and StyledDocument, and provides "
636		- + "cover methods for interacting with those objects."
637		- };
	658	+// TEXTAREA String[] initString =
	659	+// {
	660	+// "This is an editable JTextPane, ", //regular
	661	+// "another ", //italic
	662	+// "styled ", //bold
	663	+// "text ", //small
	664	+// "component, ", //large
	665	+// "which supports embedded components..." + newline,//regular
	666	+// " " + newline, //button
	667	+// "...and embedded icons..." + newline, //regular
	668	+// " ", //icon
	669	+// newline + "JTextPane is a subclass of JEditorPane that "
	670	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	671	+// + "cover methods for interacting with those objects."
	672	+// };
	673	+//
	674	+// String[] initStyles =
	675	+// {
	676	+// "regular", "italic", "bold", "small", "large",
	677	+// "regular", "button", "regular", "icon",
	678	+// "regular"
	679	+// };
	680	+//
	681	+// JTextPane textPane = new JTextPane();
	682	+// textPane.setEditable(true);
	683	+// /StyledDocument/ doc = textPane.getStyledDocument();
	684	+// addStylesToDocument(doc);
	685	+//
	686	+// try
	687	+// {
	688	+// for (int j = 0; j < 2; j++)
	689	+// {
	690	+// for (int i = 0; i < initString.length; i++)
	691	+// {
	692	+// doc.insertString(doc.getLength(), initString[i],
	693	+// doc.getStyle(initStyles[i]));
	694	+// }
	695	+// }
	696	+// } catch (BadLocationException ble)
	697	+// {
	698	+// System.err.println("Couldn't insert initial text into text pane.");
	699	+// }
638	700
639		- String[] initStyles =
640		- {
641		- "regular", "italic", "bold", "small", "large",
642		- "regular", "button", "regular", "icon",
643		- "regular"
644		- };
645		-
646		- JTextPane textPane = new JTextPane();
647		- textPane.setEditable(true);
648		- /StyledDocument/ doc = textPane.getStyledDocument();
649		- addStylesToDocument(doc);
650		-
651		- try
652		- {
653		- for (int j = 0; j < 2; j++)
654		- {
655		- for (int i = 0; i < initString.length; i++)
656		- {
657		- doc.insertString(doc.getLength(), initString[i],
658		- doc.getStyle(initStyles[i]));
659		- }
660		- }
661		- } catch (BadLocationException ble)
662		- {
663		- System.err.println("Couldn't insert initial text into text pane.");
664		- }
665		-
666		- return new JTextArea(); // textPane;
	701	+ return new JTextPane(); // textPane;
667	702	}
668	703
669	704	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -763,115 +798,83 @@
763	798	JButton slowerButton;
764	799	JButton fasterButton;
765	800	JButton remarkButton;
	801	+
	802	+ cGridBag namePanel;
	803	+ cGridBag setupPanel;
	804	+ cGridBag commandsPanel;
	805	+ cGridBag pushPanel;
	806	+ cGridBag fillPanel;
766	807
767		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	808	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
768	809	{
769	810	JCheckBox cb;
770	811
771		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
772		- oe.aConstraints.gridwidth = 1; // 3;
773		-// oe.aConstraints.weightx = 1;
774		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
775		- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	812	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
776	813	cb.addItemListener(this);
777		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
778		- oe.aConstraints.gridwidth = 1;
779		- oe.aConstraints.gridx += 1;
780	814
781	815	return cb;
782	816	}
783	817
784		- cButton AddButton(ObjEditor oe, String label)
	818	+ cButton AddButton(cGridBag panel, String label)
785	819	{
786	820	cButton cb;
787	821
788		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
789		- oe.aConstraints.gridwidth = 1;
790		-// oe.aConstraints.weightx = 1;
791		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
792		- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
	822	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
793	823	cb.addActionListener(this);
794		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
795		- oe.aConstraints.gridwidth = 1;
796		- oe.aConstraints.gridx += 1;
797	824
798	825	return cb;
799	826	}
800	827
801		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	828	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
802	829	{
803	830	JComboBox combo;
804	831
805		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
806		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
807		- oe.aConstraints.gridx += 1;
	832	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
808	833	combo.addActionListener(this);
809	834
810	835	return combo;
811	836	}
812	837
813		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	838	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
814	839	{
815		- NumberSlider combo;
	840	+ cGridBag control = new cGridBag();
	841	+
	842	+ cNumberSlider combo;
816	843
817	844	JLabel jlabel = new JLabel(label);
818		-
819		- aConstraints.fill = GridBagConstraints.VERTICAL;
820	845	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
821		- aConstraints.gridwidth = 1;
822		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
823		- aConstraints.gridx += 1;
824		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
825		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
826		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
827		- aConstraints.gridx += 1;
828		- aConstraints.gridwidth = 1;
829		-
	846	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	847	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
830	848	combo.setFloat(current);
831		-
832		- combo.label = jlabel;
833		-
834		- combo.addChangeListener(this);
835		-
836		- return combo;
	849	+
	850	+ panel.add(control);
	851	+
	852	+ return control;
837	853	}
838	854
839		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	855	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
840	856	{
841		- NumberSlider combo;
	857	+ cGridBag control = new cGridBag();
	858	+
	859	+ cNumberSlider combo;
842	860
843	861	JLabel jlabel = new JLabel(label);
844		-
845		- aConstraints.fill = GridBagConstraints.VERTICAL;
846	862	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
847		- aConstraints.gridwidth = 2;
848		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
849		- aConstraints.gridx += 1;
850		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
851		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
852		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
853		- aConstraints.gridx += 1;
854		- aConstraints.gridwidth = 1;
855		-
	863	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	864	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
856	865	combo.setInteger(current);
857	866
858		- combo.label = jlabel;
859		-
860		- combo.addChangeListener(this);
861		-
862		- return combo;
	867	+ panel.add(control);
	868	+
	869	+ return control;
863	870	}
864	871
865		- JTextArea AddText(JPanel ctrlPanel, String name)
	872	+ JTextArea AddText(cGridBag ctrlPanel, String name)
866	873	{
867	874	JTextArea text;
868	875
869		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
870		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
871		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	876	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
872	877	text.addCaretListener(this);
873		- aConstraints.gridx += 1;
874		- aConstraints.gridwidth = 1;
875	878
876	879	return text;
877	880	}
..	..	@@ -901,9 +904,16 @@
901	904	objEditor.ctrlPanel.remove(j);
902	905	}
903	906
	907	+ void Remove(cNumberSlider j)
	908	+ {
	909	+ j.removeChangeListener(this);
	910	+ //objEditor.ctrlPanel.remove(j.label);
	911	+ objEditor.ctrlPanel.remove(j);
	912	+ }
	913	+
904	914	/*
905	915	*/
906		- void Return() // ObjEditor oe)
	916	+ void Return0() // ObjEditor oe)
907	917	{
908	918	aConstraints.gridy += 1;
909	919	aConstraints.gridx = 0;
..	..	@@ -958,37 +968,70 @@
958	968
959	969	void SetupUI2(ObjEditor oe)
960	970	{
961		-// oe.aConstraints.weightx = 0;
962		-// oe.aConstraints.weighty = 0;
963		-// oe.aConstraints.gridx = 0;
964		-// oe.aConstraints.gridy = 0;
965		- SetupName(oe);
	971	+ //SetupName(oe);
	972	+
	973	+ namePanel = new cGridBag();
	974	+
	975	+ nameField = AddText(namePanel, copy.GetName());
	976	+ namePanel.add(nameField);
	977	+ oe.ctrlPanel.add(namePanel);
	978	+
	979	+ oe.ctrlPanel.Return();
966	980
967	981	if (!GroupEditor.allparams)
968	982	return;
969	983
970		- liveCB = AddCheckBox(oe, "Live", copy.live);
971		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
972		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	984	+ setupPanel = new cGridBag().setVertical(false);
	985	+
	986	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	987	+ liveCB.setToolTipText("Animate object");
	988	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	989	+ hideCB.setToolTipText("Hide object");
973	990	// Return();
974		- markCB = AddCheckBox(oe, "Mark", copy.marked);
975		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
976		- randomCB = AddCheckBox(oe, "Rand", copy.random);
977		- Return();
978		- resetButton = AddButton(oe, "Reset");
979		- stepButton = AddButton(oe, "Step");
	991	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	992	+ markCB.setToolTipText("Set the animation target transform");
	993	+
	994	+ rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	995	+ rewindCB.setToolTipText("Rewind animation");
	996	+
	997	+ randomCB = AddCheckBox(setupPanel, "Random", copy.random);
	998	+ randomCB.setToolTipText("Option for switch node");
	999	+
	1000	+ if (Globals.ADVANCED)
	1001	+ {
	1002	+ link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
	1003	+ link2masterCB.setToolTipText("Attach to support");
	1004	+ speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1005	+ speedupCB.setToolTipText("Option motion capture");
	1006	+ }
	1007	+
	1008	+ oe.ctrlPanel.add(setupPanel);
	1009	+ oe.ctrlPanel.Return();
	1010	+
	1011	+ commandsPanel = new cGridBag().setVertical(false);
	1012	+
	1013	+ resetButton = AddButton(commandsPanel, "Reset");
	1014	+ resetButton.setToolTipText("Jump to frame zero");
	1015	+ stepButton = AddButton(commandsPanel, "Step");
	1016	+ stepButton.setToolTipText("Step one frame");
980	1017	// resetAllButton = AddButton(oe, "Reset All");
981	1018	// stepAllButton = AddButton(oe, "Step All");
982		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
983	1019	// Return();
984		- slowerButton = AddButton(oe, "Slow");
985		- fasterButton = AddButton(oe, "Fast");
986		- remarkButton = AddButton(oe, "Rem");
	1020	+ slowerButton = AddButton(commandsPanel, "Slow");
	1021	+ slowerButton.setToolTipText("Decrease animation speed");
	1022	+ fasterButton = AddButton(commandsPanel, "Fast");
	1023	+ fasterButton.setToolTipText("Increase animation speed");
	1024	+ remarkButton = AddButton(commandsPanel, "Remark");
	1025	+ remarkButton.setToolTipText("Set the current transform as the target");
987	1026
988		- Return();
	1027	+ oe.ctrlPanel.add(commandsPanel);
	1028	+ oe.ctrlPanel.Return();
989	1029
990		- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
991		- Return();
	1030	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1031	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1032	+ //Return();
	1033	+
	1034	+ oe.ctrlPanel.Return();
992	1035
993	1036	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
994	1037	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1083,7 +1126,7 @@
1083	1126	oe.aConstraints.gridwidth = 1;
1084	1127	/**/
1085	1128	nameField = AddText(oe.ctrlPanel, copy.GetName());
1086		- Return();
	1129	+ oe.ctrlPanel.Return();
1087	1130
1088	1131	//ctrlPanel.add(textureButton = new Button("Texture..."));
1089	1132	//textureButton.setEnabled(false);
..	..	@@ -1185,10 +1228,18 @@
1185	1228	//JPanel worldPanel =
1186	1229	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1187	1230	//worldPanel.setName("World");
1188		- centralPanel = new JPanel(new BorderLayout());
	1231	+ centralPanel = new cGridBag();
	1232	+ centralPanel.preferredWidth = 20;
1189	1233	timelinePanel = new JPanel(new BorderLayout());
1190	1234	timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1191	1235
	1236	+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
	1237	+ cameraPanel.setContinuousLayout(true);
	1238	+ cameraPanel.setOneTouchExpandable(true);
	1239	+// cameraPanel.setDividerLocation(0.9);
	1240	+// cameraPanel.setDividerSize(9);
	1241	+ cameraPanel.setResizeWeight(1.0);
	1242	+
1192	1243	centralPanel.add(cameraView);
1193	1244	//frame.setJMenuBar(timelineMenubar);
1194	1245	//centralPanel.add(timelinePanel);
..	..	@@ -1208,12 +1259,13 @@
1208	1259	//frontView.object = copy;
1209	1260	//sideView.object = copy;
1210	1261
1211		- XYZPanel = new JPanel();
1212		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1262	+ XYZPanel = new cGridBag().setVertical(true);
	1263	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1213	1264
1214		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1215		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1216		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1265	+ XYZPanel.preferredWidth = 5;
	1266	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1267	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1268	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1217	1269
1218	1270	/*
1219	1271	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1251,10 +1303,11 @@
1251	1303	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1252	1304	//tmp.setName("Edit");
1253	1305	objectPanel.add(materialPanel);
1254		- JPanel north = new JPanel(new BorderLayout());
1255		- north.setName("Edit");
1256		- north.add(ctrlPanel, BorderLayout.NORTH);
1257		- objectPanel.add(north);
	1306	+// JPanel north = new JPanel(new BorderLayout());
	1307	+// north.setName("Edit");
	1308	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1309	+// objectPanel.add(north);
	1310	+ objectPanel.add(ctrlPanel);
1258	1311	objectPanel.add(infoPanel);
1259	1312
1260	1313	/*
..	..	@@ -1275,16 +1328,23 @@
1275	1328	scrollpane.setWheelScrollingEnabled(true);
1276	1329	scrollpane.addMouseWheelListener(this); // Default not fast enough
1277	1330
1278		- /JTabbedPane/ scenePanel = new JTabbedPane();
1279		- scenePanel.add(scrollpane);
	1331	+ /JTabbedPane/ scenePanel = new cGridBag();
	1332	+ scenePanel.preferredWidth = 7;
	1333	+
	1334	+ JTabbedPane tabbedPane = new JTabbedPane();
	1335	+ tabbedPane.add(scrollpane);
1280	1336
1281		- scenePanel.add(FSPane = new cFileSystemPane(this));
	1337	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1282	1338
1283		- optionsPanel = new JPanel(new GridBagLayout());
	1339	+ optionsPanel = new cGridBag().setVertical(true);
1284	1340
1285	1341	optionsPanel.setName("Options");
1286		- scenePanel.add(optionsPanel);
1287		-
	1342	+
	1343	+ AddOptions(optionsPanel); //, aConstraints);
	1344	+
	1345	+ tabbedPane.add(optionsPanel);
	1346	+
	1347	+ scenePanel.add(tabbedPane);
1288	1348
1289	1349	/*
1290	1350	cTree jTree = new cTree(null);
..	..	@@ -1318,6 +1378,7 @@
1318	1378	//bigPanel.setSize(new Dimension(10,10));
1319	1379	//bigPanel.add(ctrlPanel);
1320	1380	//bigPanel.add(gridPanel);
	1381	+ /**
1321	1382	bigThree = new JPanel();
1322	1383	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1323	1384	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1341,7 +1402,13 @@
1341	1402	// aConstraints.gridheight = 3;
1342	1403	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1343	1404	bigThree.add(XYZPanel, aWindowConstraints);
	1405	+ /**/
1344	1406
	1407	+ bigThree = new cGridBag();
	1408	+ bigThree.addComponent(scenePanel);
	1409	+ bigThree.addComponent(centralPanel);
	1410	+ bigThree.addComponent(XYZPanel);
	1411	+
1345	1412	// // SIDE EFFECT!!!
1346	1413	// aConstraints.gridx = 0;
1347	1414	// aConstraints.gridy = 0;
..	..	@@ -1362,7 +1429,8 @@
1362	1429	//worldPane.add(bigPanel);
1363	1430	//worldPane.add(worldPanel);
1364	1431	/**/
1365		- frame.getContentPane().add(/"Center",/framePanel);
	1432	+ //frame.getContentPane().add(/"Center",/framePanel);
	1433	+ frame.add(/"Center",/framePanel);
1366	1434	//frame.getContentPane().add(/"Center",/ worldPane);
1367	1435
1368	1436	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
..	..	@@ -1383,6 +1451,10 @@
1383	1451	});
1384	1452	}
1385	1453
	1454	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1455	+ {
	1456	+ }
	1457	+
1386	1458	JTree GetTree()
1387	1459	{
1388	1460	return objEditor.jTree;
..	..	@@ -1394,260 +1466,173 @@
1394	1466	ctrlPanel.removeAll();
1395	1467	}
1396	1468
1397		- void SetupMaterial(JPanel ctrlPanel)
	1469	+ void SetupMaterial(cGridBag panel)
1398	1470	{
1399		- aConstraints.weighty = 0;
1400		- //aConstraints.weightx = 1;
1401		- /*
	1471	+ /*
1402	1472	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1403	1473	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1404		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1405		- aConstraints.gridx += 1;
1406	1474	*/
1407	1475
1408		- aConstraints.gridwidth = 1;
1409		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1410		- aConstraints.gridx += 1;
1411		- aConstraints.weighty = 0;
1412		- aConstraints.gridwidth = 1;
	1476	+ cGridBag editBar = new cGridBag().setVertical(false);
	1477	+
	1478	+ editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1479	+ createMaterialButton.setToolTipText("Create material");
1413	1480
1414	1481	/*
1415	1482	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1416		- aConstraints.gridx += 1;
1417		- aConstraints.weighty = 0;
1418		- aConstraints.gridwidth = 1;
1419	1483	*/
1420	1484
1421		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1422		- aConstraints.gridx += 1;
	1485	+ editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1486	+ clearMaterialButton.setToolTipText("Clear material");
	1487	+
	1488	+ if (Globals.ADVANCED)
	1489	+ {
	1490	+ editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1491	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1492	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1493	+ }
1423	1494
1424		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1425		-
1426		- aConstraints.gridx += 1;
1427		-
1428		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1429		-
1430		- aConstraints.gridx += 1;
1431		-
1432		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1433		-
1434		- aConstraints.gridx = 0;
1435		- aConstraints.gridy += 1;
1436		- aConstraints.weighty = 0;
1437		- aConstraints.gridwidth = 1;
	1495	+ editBar.preferredHeight = 15;
	1496	+
	1497	+ panel.add(editBar);
	1498	+
1438	1499	/**/
1439	1500	//aConstraints.weighty = 0;
1440	1501	////aConstraints.weightx = 1;
1441	1502	//aConstraints.weighty = 1;
1442	1503	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1443	1504	//aConstraints.gridx += 1;
1444		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1445		- aConstraints.weighty = 0;
1446		- aConstraints.gridx = 0;
1447		- aConstraints.gridy += 1;
1448		- aConstraints.gridwidth = 1;
	1505	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1449	1506
1450		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1451		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1452		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1453		- aConstraints.gridx += 1;
1454		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1455		- //aConstraints.weightx = 0;
1456		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1457		- aConstraints.gridx = 0;
1458		- aConstraints.gridy += 1;
1459		- aConstraints.gridwidth = 1;
	1507	+ cGridBag colorSection = new cGridBag().setVertical(true);
	1508	+
	1509	+ cGridBag color = new cGridBag();
	1510	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1511	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1512	+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1513	+ //colorField.preferredWidth = 200;
	1514	+ colorSection.add(color);
1460	1515
1461		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1462		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1463		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1464		- aConstraints.gridx += 1;
1465		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1466		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1467		- aConstraints.gridx = 0;
1468		- aConstraints.gridy += 1;
1469		- aConstraints.gridwidth = 1;
	1516	+ cGridBag modulation = new cGridBag();
	1517	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1518	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1519	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1520	+ colorSection.add(modulation);
1470	1521
1471		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1472		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1473		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1474		- aConstraints.gridx += 1;
1475		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1476		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1477		- aConstraints.gridx = 0;
1478		- aConstraints.gridy += 1;
1479		- aConstraints.gridwidth = 1;
	1522	+ cGridBag texture = new cGridBag();
	1523	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1524	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1525	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1526	+ colorSection.add(texture);
1480	1527
1481		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1482		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1483		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1484		- aConstraints.gridx += 1;
1485		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1486		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1487		- aConstraints.gridx = 0;
1488		- aConstraints.gridy += 1;
1489		- aConstraints.gridwidth = 1;
	1528	+ cGridBag anisoU = new cGridBag();
	1529	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1530	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1531	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1532	+ colorSection.add(anisoU);
1490	1533
1491		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1492		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1493		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1494		- aConstraints.gridx += 1;
1495		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1496		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1497		- aConstraints.gridx = 0;
1498		- aConstraints.gridy += 1;
1499		- aConstraints.gridwidth = 1;
	1534	+ cGridBag anisoV = new cGridBag();
	1535	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1536	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1537	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1538	+ colorSection.add(anisoV);
1500	1539
1501		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1502		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1503		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1504		- aConstraints.gridx += 1;
1505		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1506		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1507		- aConstraints.gridx = 0;
1508		- aConstraints.gridy += 1;
1509		- aConstraints.gridwidth = 1;
	1540	+ cGridBag shadowbias = new cGridBag();
	1541	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1542	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1543	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1544	+ colorSection.add(shadowbias);
1510	1545
1511		- //aConstraints.weighty = 1;
1512		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1513		- //aConstraints.gridx += 1;
1514		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1515		- aConstraints.weighty = 0;
1516		- aConstraints.gridx = 0;
1517		- aConstraints.gridy += 1;
1518		- aConstraints.gridwidth = 1;
	1546	+ panel.add(new JSeparator());
	1547	+
	1548	+ panel.add(colorSection);
	1549	+
	1550	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1551	+
	1552	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1553	+
	1554	+ cGridBag diffuse = new cGridBag();
	1555	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1556	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1557	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1558	+ diffuseSection.add(diffuse);
1519	1559
1520		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1521		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1522		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1523		- aConstraints.gridx += 1;
1524		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1525		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1526		- aConstraints.gridx = 0;
1527		- aConstraints.gridy += 1;
1528		- aConstraints.gridwidth = 1;
	1560	+ cGridBag diffuseness = new cGridBag();
	1561	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1562	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1563	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1564	+ diffuseSection.add(diffuseness);
1529	1565
1530		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1531		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1532		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1533		- aConstraints.gridx += 1;
1534		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1535		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1536		- aConstraints.gridx = 0;
1537		- aConstraints.gridy += 1;
1538		- aConstraints.gridwidth = 1;
	1566	+ cGridBag selfshadow = new cGridBag();
	1567	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1568	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1569	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1570	+ diffuseSection.add(selfshadow);
1539	1571
1540		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1541		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1542		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1543		- aConstraints.gridx += 1;
1544		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1545		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1546		- aConstraints.gridx = 0;
1547		- aConstraints.gridy += 1;
1548		- aConstraints.gridwidth = 1;
	1572	+ cGridBag sheen = new cGridBag();
	1573	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1574	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1575	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1576	+ diffuseSection.add(sheen);
1549	1577
1550		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1551		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1552		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1553		- aConstraints.gridx += 1;
1554		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1555		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1556		- aConstraints.gridx = 0;
1557		- aConstraints.gridy += 1;
1558		- aConstraints.gridwidth = 1;
	1578	+ cGridBag subsurface = new cGridBag();
	1579	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1580	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1581	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1582	+ diffuseSection.add(subsurface);
1559	1583
1560		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1561		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1562		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1563		- aConstraints.gridx += 1;
1564		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1565		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1566		- aConstraints.gridx = 0;
1567		- aConstraints.gridy += 1;
1568		- aConstraints.gridwidth = 1;
	1584	+ cGridBag shadow = new cGridBag();
	1585	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1586	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1587	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1588	+ diffuseSection.add(shadow);
1569	1589
1570		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1571		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1572		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1573		- aConstraints.gridx += 1;
1574		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1575		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1576		- aConstraints.gridx = 0;
1577		- aConstraints.gridy += 1;
1578		- aConstraints.gridwidth = 1;
	1590	+ cGridBag fakedepth = new cGridBag();
	1591	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1592	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1593	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1594	+ diffuseSection.add(fakedepth);
1579	1595
1580		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1581		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1582		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1583		- aConstraints.gridx += 1;
1584		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1585		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1586		- aConstraints.gridx = 0;
1587		- aConstraints.gridy += 1;
1588		- aConstraints.gridwidth = 1;
	1596	+ panel.add(new JSeparator());
	1597	+
	1598	+ panel.add(diffuseSection);
	1599	+
	1600	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1601	+
	1602	+ cGridBag specularSection = new cGridBag().setVertical(true);
1589	1603
1590		- //aConstraints.weighty = 1;
1591		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1592		- //aConstraints.gridx += 1;
1593		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1594		- aConstraints.weighty = 0;
1595		- aConstraints.gridx = 0;
1596		- aConstraints.gridy += 1;
1597		- aConstraints.gridwidth = 1;
	1604	+ cGridBag specular = new cGridBag();
	1605	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1606	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1607	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1608	+ specularSection.add(specular);
1598	1609
1599		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1600		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1601		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1602		- aConstraints.gridx += 1;
1603		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1604		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1605		- aConstraints.gridx = 0;
1606		- aConstraints.gridy += 1;
1607		- aConstraints.gridwidth = 1;
	1610	+ cGridBag lightarea = new cGridBag();
	1611	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1612	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1613	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1614	+ specularSection.add(lightarea);
1608	1615
1609		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1610		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1611		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1612		- aConstraints.gridx += 1;
1613		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1614		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1615		- aConstraints.gridx = 0;
1616		- aConstraints.gridy += 1;
1617		- aConstraints.gridwidth = 1;
	1616	+ cGridBag shininess = new cGridBag();
	1617	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1618	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1619	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1620	+ specularSection.add(shininess);
1618	1621
1619		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1620		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1621		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1622		- aConstraints.gridx += 1;
1623		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1624		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1625		- aConstraints.gridx = 0;
1626		- aConstraints.gridy += 1;
1627		- aConstraints.gridwidth = 1;
	1622	+ cGridBag metalness = new cGridBag();
	1623	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1624	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1625	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1626	+ specularSection.add(metalness);
1628	1627
1629		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1630		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1631		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1632		- aConstraints.gridx += 1;
1633		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1634		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1635		- aConstraints.gridx = 0;
1636		- aConstraints.gridy += 1;
1637		- aConstraints.gridwidth = 1;
	1628	+ cGridBag velvet = new cGridBag();
	1629	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1630	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1631	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1632	+ specularSection.add(velvet);
1638	1633
1639		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1640		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1641		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1642		- aConstraints.gridx += 1;
1643		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1644		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1645		- aConstraints.gridx = 0;
1646		- aConstraints.gridy += 1;
1647		- aConstraints.gridwidth = 1;
1648		-
1649		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1650		- Return();
	1634	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1635	+ //Return();
1651	1636	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1652	1637	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1653	1638	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1658,130 +1643,93 @@
1658	1643	// aConstraints.gridy += 1;
1659	1644	// aConstraints.gridwidth = 1;
1660	1645
1661		- //aConstraints.weighty = 1;
1662		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1663		- //aConstraints.gridx += 1;
1664		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1665		- aConstraints.weighty = 0;
1666		- aConstraints.gridx = 0;
1667		- aConstraints.gridy += 1;
1668		- aConstraints.gridwidth = 1;
1669	1646
1670		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1671		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1672		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1673		- aConstraints.gridx += 1;
1674		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1675		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1676		- aConstraints.gridx = 0;
1677		- aConstraints.gridy += 1;
1678		- aConstraints.gridwidth = 1;
	1647	+ panel.add(new JSeparator());
	1648	+
	1649	+ panel.add(specularSection);
	1650	+
	1651	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1652	+
	1653	+ cGridBag globalSection = new cGridBag().setVertical(true);
1679	1654
1680		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1681		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1682		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1683		- aConstraints.gridx += 1;
1684		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1685		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1686		- aConstraints.gridx = 0;
1687		- aConstraints.gridy += 1;
1688		- aConstraints.gridwidth = 1;
	1655	+ cGridBag camera = new cGridBag();
	1656	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1657	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1658	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1659	+ globalSection.add(camera);
1689	1660
1690		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1691		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1692		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1693		- aConstraints.gridx += 1;
1694		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1695		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1696		- aConstraints.gridx = 0;
1697		- aConstraints.gridy += 1;
1698		- aConstraints.gridwidth = 1;
	1661	+ cGridBag ambient = new cGridBag();
	1662	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1663	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1664	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1665	+ globalSection.add(ambient);
1699	1666
1700		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1701		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1702		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1703		- aConstraints.gridx += 1;
1704		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1705		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1706		- aConstraints.gridx = 0;
1707		- aConstraints.gridy += 1;
1708		- aConstraints.gridwidth = 1;
1709		- aConstraints.weighty = 0;
	1667	+ cGridBag backlit = new cGridBag();
	1668	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1669	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1670	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1671	+ globalSection.add(backlit);
1710	1672
1711		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1712		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1713		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1714		- aConstraints.gridx += 1;
1715		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1716		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1717		- aConstraints.gridx = 0;
1718		- aConstraints.gridy += 1;
1719		- aConstraints.gridwidth = 1;
	1673	+ cGridBag opacity = new cGridBag();
	1674	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1675	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1676	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1677	+ globalSection.add(opacity);
1720	1678
1721		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1722		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1723		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1724		- aConstraints.gridx += 1;
1725		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1726		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1727		- aConstraints.gridx = 0;
1728		- aConstraints.gridy += 1;
1729		- aConstraints.gridwidth = 1;
	1679	+ panel.add(new JSeparator());
	1680	+
	1681	+ panel.add(globalSection);
	1682	+
	1683	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1684	+
	1685	+ cGridBag textureSection = new cGridBag().setVertical(true);
1730	1686
1731		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1732		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1733		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1734		- aConstraints.gridx += 1;
1735		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1736		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1737		- aConstraints.gridx = 0;
1738		- aConstraints.gridy += 1;
1739		- aConstraints.gridwidth = 1;
	1687	+ cGridBag bump = new cGridBag();
	1688	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1689	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1690	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1691	+ textureSection.add(bump);
1740	1692
1741		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1742		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1743		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1744		- aConstraints.gridx += 1;
1745		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1746		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1747		- aConstraints.gridx = 0;
1748		- aConstraints.gridy += 1;
1749		- aConstraints.gridwidth = 1;
	1693	+ cGridBag noise = new cGridBag();
	1694	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1695	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1696	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1697	+ textureSection.add(noise);
1750	1698
1751		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1752		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1753		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1754		- aConstraints.gridx += 1;
1755		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1756		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1757		- aConstraints.gridx = 0;
1758		- aConstraints.gridy += 1;
1759		- aConstraints.gridwidth = 1;
	1699	+ cGridBag power = new cGridBag();
	1700	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1701	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1702	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1703	+ textureSection.add(power);
1760	1704
1761		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1762		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1763		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1764		- aConstraints.gridx += 1;
1765		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1766		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1767		- aConstraints.gridx = 0;
1768		- aConstraints.gridy += 1;
1769		- aConstraints.gridwidth = 1;
	1705	+ cGridBag borderfade = new cGridBag();
	1706	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1707	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1708	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1709	+ textureSection.add(borderfade);
1770	1710
1771		- //aConstraints.weighty = 1;
1772		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1773		- //aConstraints.gridx += 1;
1774		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1775		- aConstraints.weighty = 0;
	1711	+ cGridBag fog = new cGridBag();
	1712	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1713	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1714	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1715	+ textureSection.add(fog);
1776	1716
1777		- aConstraints.gridx = 0;
1778		- aConstraints.gridy = 0;
1779		- aConstraints.gridwidth = 1;
	1717	+ cGridBag opacityPower = new cGridBag();
	1718	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	1719	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1720	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	1721	+ textureSection.add(opacityPower);
	1722	+
	1723	+ panel.add(new JSeparator());
	1724	+
	1725	+ panel.add(textureSection);
	1726	+
	1727	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1780	1728
1781	1729	SetMaterial(copy); // .GetMaterial());
1782	1730
1783		- colorField.addChangeListener(this);
1784		- modulationField.addChangeListener(this);
	1731	+ //colorField.addChangeListener(this);
	1732	+// modulationField.addChangeListener(this);
1785	1733	metalnessField.addChangeListener(this);
1786	1734	diffuseField.addChangeListener(this);
1787	1735	specularField.addChangeListener(this);
..	..	@@ -1811,12 +1759,15 @@
1811	1759	opacityPowerField.addChangeListener(this);
1812	1760	/**/
1813	1761
1814		- resetSlidersButton.addActionListener(this);
1815	1762	clearMaterialButton.addActionListener(this);
1816	1763	createMaterialButton.addActionListener(this);
1817		-
1818		- propagateToggle.addItemListener(this);
1819		- multiplyToggle.addItemListener(this);
	1764	+
	1765	+ if (Globals.ADVANCED)
	1766	+ {
	1767	+ resetSlidersButton.addActionListener(this);
	1768	+ propagateToggle.addItemListener(this);
	1769	+ multiplyToggle.addItemListener(this);
	1770	+ }
1820	1771	}
1821	1772
1822	1773	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -2593,6 +2544,7 @@
2593	2544	}
2594	2545	if (input == null)
2595	2546	{
	2547	+ new Exception().printStackTrace();
2596	2548	System.exit(0);
2597	2549	}
2598	2550
..	..	@@ -2807,7 +2759,8 @@
2807	2759	return;
2808	2760	}
2809	2761
2810		- multiplyToggle.setSelected(mat.multiply);
	2762	+ if (multiplyToggle != null)
	2763	+ multiplyToggle.setSelected(mat.multiply);
2811	2764
2812	2765	assert (object.projectedVertices != null);
2813	2766
..	..	@@ -2996,7 +2949,8 @@
2996	2949	if (timeline)
2997	2950	{
2998	2951	centralPanel.remove(cameraView);
2999		- centralPanel.add(timelinePanel);
	2952	+ cameraPanel.add(cameraView);
	2953	+ centralPanel.add(cameraPanel);
3000	2954	frame.setJMenuBar(timelineMenubar);
3001	2955	wasFullScreen = CameraPane.FULLSCREEN;
3002	2956	if (!CameraPane.FULLSCREEN)
..	..	@@ -3005,7 +2959,7 @@
3005	2959	}
3006	2960	else
3007	2961	{
3008		- centralPanel.remove(timelinePanel);
	2962	+ centralPanel.remove(cameraPanel);
3009	2963	centralPanel.add(cameraView);
3010	2964	frame.setJMenuBar(null);
3011	2965	if (!wasFullScreen)
..	..	@@ -3021,7 +2975,7 @@
3021	2975	frame.validate();
3022	2976
3023	2977	return;
3024		- } else if (event.getSource() == toggleRandomItem)
	2978	+ } else if (event.getSource() == toggleSwitchItem)
3025	2979	{
3026	2980	cameraView.ToggleRandom();
3027	2981	cameraView.repaint();
..	..	@@ -3066,6 +3020,7 @@
3066	3020	if (event.getSource() == randomCB)
3067	3021	{
3068	3022	copy.random ^= true;
	3023	+ objEditor.refreshContents();
3069	3024	return;
3070	3025	}
3071	3026	if (event.getSource() == speedupCB)
..	..	@@ -3128,7 +3083,8 @@
3128	3083	objEditor.refreshContents();
3129	3084	} else if (event.getSource() == stepItem)
3130	3085	{
3131		- cameraView.ONESTEP = true;
	3086	+ //cameraView.ONESTEP = true;
	3087	+ Globals.ONESTEP = true;
3132	3088	cameraView.repaint();
3133	3089	return;
3134	3090	} else if (event.getSource() == stepButton)
..	..	@@ -3285,25 +3241,25 @@
3285	3241
3286	3242	void ToggleAnimation()
3287	3243	{
3288		- if (!CameraPane.ANIMATION)
	3244	+ if (!Globals.ANIMATION)
3289	3245	{
3290	3246	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3291		- browser.show();
	3247	+ browser.setVisible(true);
3292	3248	String filename = browser.getFile();
3293	3249	if (filename != null && filename.length() > 0)
3294	3250	{
3295		- CameraPane.filename = browser.getDirectory() + filename;
	3251	+ Globals.filename = browser.getDirectory() + filename;
3296	3252	//CameraPane.framecount = 0;
3297		- CameraPane.imagecount = 0;
	3253	+ Globals.imagecount = 0;
3298	3254
3299		- CameraPane.ANIMATION ^= true;
	3255	+ Globals.ANIMATION ^= true;
3300	3256
3301	3257	GrafreeD.wav.cursor = 0;
3302	3258	GrafreeD.wav.loop = 0;
3303	3259	}
3304	3260	} else
3305	3261	{
3306		- CameraPane.ANIMATION ^= true;
	3262	+ Globals.ANIMATION ^= true;
3307	3263	}
3308	3264	}
3309	3265
..	..	@@ -3320,6 +3276,7 @@
3320	3276	callee.refreshContents();
3321	3277	} else
3322	3278	{
	3279	+ new Exception().printStackTrace();
3323	3280	System.exit(0);
3324	3281	}
3325	3282	}
..	..	@@ -3349,7 +3306,7 @@
3349	3306	void CreateMaterial()
3350	3307	{
3351	3308	//copy.ClearMaterial(); // PATCH
3352		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3309	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3353	3310	if (copy.selection.size() > 0)
3354	3311	//SetMaterial(copy);
3355	3312	{
..	..	@@ -3408,11 +3365,11 @@
3408	3365	{
3409	3366	copy.ResetBlockLoop(); // temporary problem
3410	3367
3411		- boolean random = CameraPane.RANDOM;
3412		- CameraPane.RANDOM = false; // parse everything
	3368	+ boolean random = CameraPane.SWITCH;
	3369	+ CameraPane.SWITCH = false; // parse everything
3413	3370	copy.ResetDisplayList();
3414	3371	copy.HardTouch();
3415		- CameraPane.RANDOM = random;
	3372	+ CameraPane.SWITCH = random;
3416	3373	}
3417	3374
3418	3375	// public void applySelf()
..	..	@@ -3482,7 +3439,7 @@
3482	3439	current.fakedepth = (float) fakedepthField.getFloat();
3483	3440	current.shadowbias = (float) shadowbiasField.getFloat();
3484	3441
3485		- if (!NumberSlider.frozen)
	3442	+ if (!cNumberSlider.frozen)
3486	3443	{
3487	3444	//System.out.println("Propagate = " + propagate);
3488	3445	copy.UpdateMaterial(anchor, current, propagate);
..	..	@@ -3530,6 +3487,7 @@
3530	3487	\|\| e.getSource() == apertureField
3531	3488	\|\| e.getSource() == shadowblurField)
3532	3489	{
	3490	+ new Exception().printStackTrace();
3533	3491	System.exit(0);
3534	3492	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3535	3493	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3855,7 +3813,7 @@
3855	3813
3856	3814	radioPanel.revalidate();
3857	3815	radioPanel.repaint();
3858		- ctrlPanel.revalidate(); // ? new
	3816	+ ctrlPanel.validate(); // ? new
3859	3817	ctrlPanel.repaint();
3860	3818	}
3861	3819	}
..	..	@@ -4501,8 +4459,8 @@
4501	4459	//MenuItem normalLensItem;
4502	4460	MenuItem editCameraItem;
4503	4461	MenuItem revertCameraItem;
4504		- CheckboxMenuItem toggleLiveItem;
4505	4462	MenuItem stepItem;
	4463	+ CheckboxMenuItem toggleLiveItem;
4506	4464	CheckboxMenuItem toggleFullScreenItem;
4507	4465	CheckboxMenuItem toggleTimelineItem;
4508	4466	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4511,7 +4469,7 @@
4511	4469	CheckboxMenuItem toggleFootContactItem;
4512	4470	CheckboxMenuItem toggleDLItem;
4513	4471	CheckboxMenuItem toggleTextureItem;
4514		- CheckboxMenuItem toggleRandomItem;
	4472	+ CheckboxMenuItem toggleSwitchItem;
4515	4473	CheckboxMenuItem toggleRootItem;
4516	4474	CheckboxMenuItem animationItem;
4517	4475	CheckboxMenuItem toggleHandleItem;
..	..	@@ -4519,20 +4477,21 @@
4519	4477	JSplitPane mainPanel;
4520	4478	JScrollPane scrollpane;
4521	4479	JPanel toolbarPanel;
4522		- JPanel treePanel;
	4480	+ cGridBag treePanel;
4523	4481	JPanel radioPanel;
4524	4482	ButtonGroup buttonGroup;
4525		- JPanel ctrlPanel;
4526		- JPanel materialPanel;
	4483	+ cGridBag ctrlPanel;
	4484	+ cGridBag materialPanel;
4527	4485	JScrollPane infoPanel;
4528		- JPanel optionsPanel;
	4486	+ cGridBag optionsPanel;
4529	4487	JTabbedPane objectPanel;
4530		- JPanel XYZPanel;
	4488	+ cGridBag XYZPanel;
4531	4489	JSplitPane gridPanel;
4532	4490	JSplitPane bigPanel;
4533		- JPanel bigThree;
4534		- JTabbedPane scenePanel;
4535		- JPanel centralPanel;
	4491	+ cGridBag bigThree;
	4492	+ cGridBag scenePanel;
	4493	+ cGridBag centralPanel;
	4494	+ JSplitPane cameraPanel;
4536	4495	JPanel timelinePanel;
4537	4496	JMenuBar timelineMenubar;
4538	4497	JSplitPane framePanel;
..	..	@@ -4584,67 +4543,67 @@
4584	4543	// MATERIAL
4585	4544	JLabel materialLabel;
4586	4545	JLabel colorLabel;
4587		- NumberSlider colorField;
	4546	+ cNumberSlider colorField;
4588	4547	JLabel modulationLabel;
4589		- NumberSlider modulationField;
	4548	+ cNumberSlider modulationField;
4590	4549	JLabel metalnessLabel;
4591		- NumberSlider metalnessField;
	4550	+ cNumberSlider metalnessField;
4592	4551	JLabel diffuseLabel;
4593		- NumberSlider diffuseField;
	4552	+ cNumberSlider diffuseField;
4594	4553	JLabel specularLabel;
4595		- NumberSlider specularField;
	4554	+ cNumberSlider specularField;
4596	4555	JLabel shininessLabel;
4597		- NumberSlider shininessField;
	4556	+ cNumberSlider shininessField;
4598	4557	JLabel shiftLabel;
4599		- NumberSlider shiftField;
	4558	+ cNumberSlider shiftField;
4600	4559	JLabel ambientLabel;
4601		- NumberSlider ambientField;
	4560	+ cNumberSlider ambientField;
4602	4561	JLabel lightareaLabel;
4603		- NumberSlider lightareaField;
	4562	+ cNumberSlider lightareaField;
4604	4563	JLabel diffusenessLabel;
4605		- NumberSlider diffusenessField;
	4564	+ cNumberSlider diffusenessField;
4606	4565	JLabel velvetLabel;
4607		- NumberSlider velvetField;
	4566	+ cNumberSlider velvetField;
4608	4567	JLabel sheenLabel;
4609		- NumberSlider sheenField;
	4568	+ cNumberSlider sheenField;
4610	4569	JLabel subsurfaceLabel;
4611		- NumberSlider subsurfaceField;
	4570	+ cNumberSlider subsurfaceField;
4612	4571	//JLabel bumpLabel;
4613	4572	//NumberSlider bumpField;
4614	4573	JLabel backlitLabel;
4615		- NumberSlider backlitField;
	4574	+ cNumberSlider backlitField;
4616	4575	JLabel anisoLabel;
4617		- NumberSlider anisoField;
	4576	+ cNumberSlider anisoField;
4618	4577	JLabel anisoVLabel;
4619		- NumberSlider anisoVField;
	4578	+ cNumberSlider anisoVField;
4620	4579	JLabel cameraLabel;
4621		- NumberSlider cameraField;
	4580	+ cNumberSlider cameraField;
4622	4581	JLabel selfshadowLabel;
4623		- NumberSlider selfshadowField;
	4582	+ cNumberSlider selfshadowField;
4624	4583	JLabel shadowLabel;
4625		- NumberSlider shadowField;
	4584	+ cNumberSlider shadowField;
4626	4585	JLabel textureLabel;
4627		- NumberSlider textureField;
	4586	+ cNumberSlider textureField;
4628	4587	JLabel opacityLabel;
4629		- NumberSlider opacityField;
	4588	+ cNumberSlider opacityField;
4630	4589	JLabel fakedepthLabel;
4631		- NumberSlider fakedepthField;
	4590	+ cNumberSlider fakedepthField;
4632	4591	JLabel shadowbiasLabel;
4633		- NumberSlider shadowbiasField;
	4592	+ cNumberSlider shadowbiasField;
4634	4593	JLabel bumpLabel;
4635		- NumberSlider bumpField;
	4594	+ cNumberSlider bumpField;
4636	4595	JLabel noiseLabel;
4637		- NumberSlider noiseField;
	4596	+ cNumberSlider noiseField;
4638	4597	JLabel powerLabel;
4639		- NumberSlider powerField;
	4598	+ cNumberSlider powerField;
4640	4599	JLabel borderfadeLabel;
4641		- NumberSlider borderfadeField;
	4600	+ cNumberSlider borderfadeField;
4642	4601	JLabel fogLabel;
4643		- NumberSlider fogField;
	4602	+ cNumberSlider fogField;
4644	4603	JLabel opacityPowerLabel;
4645		- NumberSlider opacityPowerField;
	4604	+ cNumberSlider opacityPowerField;
4646	4605	JTree jTree;
4647	4606	//ObjectUI parent;
4648	4607
4649		- NumberSlider normalpushField;
	4608	+ cNumberSlider normalpushField;
4650	4609	}