~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()
..	..	@@ -309,7 +320,7 @@
309	320	toggleTextureItem.setState(CameraPane.textureon);
310	321	cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
311	322	toggleLiveItem.addItemListener(this);
312		- toggleLiveItem.setState(CameraPane.isLIVE());
	323	+ toggleLiveItem.setState(Globals.isLIVE());
313	324	cameraMenu.add(stepItem = new MenuItem("Step"));
314	325	stepItem.addActionListener(this);
315	326	// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
..	..	@@ -349,21 +360,23 @@
349	360	objectPanel = new JTabbedPane();
350	361	toolbarPanel = new JPanel();
351	362	toolbarPanel.setName("Toolbar");
352		- treePanel = new JPanel();
	363	+ treePanel = new cGridBag();
353	364	treePanel.setName("Tree");
354		- ctrlPanel = new JPanel(); // new GridBagLayout());
	365	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
355	366	ctrlPanel.setName("Edit");
356		- materialPanel = new JPanel();
	367	+ materialPanel = new cGridBag().setVertical(true);
357	368	materialPanel.setName("Material");
358	369	/JTextPane/
359	370	infoarea = createTextPane();
	371	+ doc = infoarea.getStyledDocument();
	372	+
360	373	infoarea.setEditable(true);
361	374	SetText();
362	375	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
363	376	// infoarea.setOpaque(false);
364	377	// //infoarea.setForeground(textcolor);
365		- infoarea.setLineWrap(true);
366		- infoarea.setWrapStyleWord(true);
	378	+// TEXTAREA infoarea.setLineWrap(true);
	379	+// TEXTAREA infoarea.setWrapStyleWord(true);
367	380	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
368	381	infoPanel.setPreferredSize(new Dimension(50, 200));
369	382	infoPanel.setName("Info");
..	..	@@ -374,16 +387,16 @@
374	387	mainPanel.setName("Main");
375	388	mainPanel.setContinuousLayout(true);
376	389	mainPanel.setOneTouchExpandable(true);
377		- mainPanel.setDividerLocation(1.0);
378	390	mainPanel.setDividerSize(9);
379		- mainPanel.setResizeWeight(0);
	391	+ mainPanel.setDividerLocation(0.5); //1.0);
	392	+ mainPanel.setResizeWeight(0.5);
380	393
381	394	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
382	395	//mainPanel.setLayout(new GridBagLayout());
383	396	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
384		- treePanel.setLayout(new GridBagLayout());
385		- ctrlPanel.setLayout(new GridBagLayout());
386		- materialPanel.setLayout(new GridBagLayout());
	397	+// treePanel.setLayout(new GridBagLayout());
	398	+ //ctrlPanel.setLayout(new GridBagLayout());
	399	+ //materialPanel.setLayout(new GridBagLayout());
387	400
388	401	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
389	402	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -422,7 +435,7 @@
422	435	static String newline = "\n";
423	436	protected static final String buttonString = "JButton";
424	437	StyledDocument doc;
425		- JTextArea infoarea;
	438	+ JTextPane infoarea;
426	439
427	440	void ClearInfo()
428	441	{
..	..	@@ -489,7 +502,10 @@
489	502	}
490	503
491	504	if (full)
492		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	505	+ {
	506	+ si.SendInfo(" BBox min: " + minima, "regular");
	507	+ si.SendInfo(" BBox max: " + maxima, "regular");
	508	+ }
493	509
494	510	if (sel.bRep != null)
495	511	{
..	..	@@ -587,6 +603,9 @@
587	603	{
588	604	CameraPane.pointflow = (PointFlow) sel;
589	605	}
	606	+
	607	+ si.SendInfo("_____________________", "regular");
	608	+ si.SendInfo("", "regular");
590	609	}
591	610	}
592	611
..	..	@@ -618,52 +637,52 @@
618	637	cameraView.ToggleFullScreen();
619	638	}
620	639
621		- private JTextArea createTextPane()
	640	+ private JTextPane createTextPane()
622	641	{
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		- };
	642	+// TEXTAREA String[] initString =
	643	+// {
	644	+// "This is an editable JTextPane, ", //regular
	645	+// "another ", //italic
	646	+// "styled ", //bold
	647	+// "text ", //small
	648	+// "component, ", //large
	649	+// "which supports embedded components..." + newline,//regular
	650	+// " " + newline, //button
	651	+// "...and embedded icons..." + newline, //regular
	652	+// " ", //icon
	653	+// newline + "JTextPane is a subclass of JEditorPane that "
	654	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	655	+// + "cover methods for interacting with those objects."
	656	+// };
	657	+//
	658	+// String[] initStyles =
	659	+// {
	660	+// "regular", "italic", "bold", "small", "large",
	661	+// "regular", "button", "regular", "icon",
	662	+// "regular"
	663	+// };
	664	+//
	665	+// JTextPane textPane = new JTextPane();
	666	+// textPane.setEditable(true);
	667	+// /StyledDocument/ doc = textPane.getStyledDocument();
	668	+// addStylesToDocument(doc);
	669	+//
	670	+// try
	671	+// {
	672	+// for (int j = 0; j < 2; j++)
	673	+// {
	674	+// for (int i = 0; i < initString.length; i++)
	675	+// {
	676	+// doc.insertString(doc.getLength(), initString[i],
	677	+// doc.getStyle(initStyles[i]));
	678	+// }
	679	+// }
	680	+// } catch (BadLocationException ble)
	681	+// {
	682	+// System.err.println("Couldn't insert initial text into text pane.");
	683	+// }
638	684
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;
	685	+ return new JTextPane(); // textPane;
667	686	}
668	687
669	688	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -763,115 +782,83 @@
763	782	JButton slowerButton;
764	783	JButton fasterButton;
765	784	JButton remarkButton;
	785	+
	786	+ cGridBag namePanel;
	787	+ cGridBag setupPanel;
	788	+ cGridBag commandsPanel;
	789	+ cGridBag pushPanel;
	790	+ cGridBag fillPanel;
766	791
767		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	792	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
768	793	{
769	794	JCheckBox cb;
770	795
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);
	796	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
776	797	cb.addItemListener(this);
777		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
778		- oe.aConstraints.gridwidth = 1;
779		- oe.aConstraints.gridx += 1;
780	798
781	799	return cb;
782	800	}
783	801
784		- cButton AddButton(ObjEditor oe, String label)
	802	+ cButton AddButton(cGridBag panel, String label)
785	803	{
786	804	cButton cb;
787	805
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);
	806	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
793	807	cb.addActionListener(this);
794		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
795		- oe.aConstraints.gridwidth = 1;
796		- oe.aConstraints.gridx += 1;
797	808
798	809	return cb;
799	810	}
800	811
801		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	812	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
802	813	{
803	814	JComboBox combo;
804	815
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;
	816	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
808	817	combo.addActionListener(this);
809	818
810	819	return combo;
811	820	}
812	821
813		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	822	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
814	823	{
815		- NumberSlider combo;
	824	+ cGridBag control = new cGridBag();
	825	+
	826	+ cNumberSlider combo;
816	827
817	828	JLabel jlabel = new JLabel(label);
818		-
819		- aConstraints.fill = GridBagConstraints.VERTICAL;
820	829	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		-
	830	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	831	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
830	832	combo.setFloat(current);
831		-
832		- combo.label = jlabel;
833		-
834		- combo.addChangeListener(this);
835		-
836		- return combo;
	833	+
	834	+ panel.add(control);
	835	+
	836	+ return control;
837	837	}
838	838
839		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	839	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
840	840	{
841		- NumberSlider combo;
	841	+ cGridBag control = new cGridBag();
	842	+
	843	+ cNumberSlider combo;
842	844
843	845	JLabel jlabel = new JLabel(label);
844		-
845		- aConstraints.fill = GridBagConstraints.VERTICAL;
846	846	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		-
	847	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	848	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
856	849	combo.setInteger(current);
857	850
858		- combo.label = jlabel;
859		-
860		- combo.addChangeListener(this);
861		-
862		- return combo;
	851	+ panel.add(control);
	852	+
	853	+ return control;
863	854	}
864	855
865		- JTextArea AddText(JPanel ctrlPanel, String name)
	856	+ JTextArea AddText(cGridBag ctrlPanel, String name)
866	857	{
867	858	JTextArea text;
868	859
869		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
870		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
871		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	860	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
872	861	text.addCaretListener(this);
873		- aConstraints.gridx += 1;
874		- aConstraints.gridwidth = 1;
875	862
876	863	return text;
877	864	}
..	..	@@ -901,9 +888,16 @@
901	888	objEditor.ctrlPanel.remove(j);
902	889	}
903	890
	891	+ void Remove(cNumberSlider j)
	892	+ {
	893	+ j.removeChangeListener(this);
	894	+ //objEditor.ctrlPanel.remove(j.label);
	895	+ objEditor.ctrlPanel.remove(j);
	896	+ }
	897	+
904	898	/*
905	899	*/
906		- void Return() // ObjEditor oe)
	900	+ void Return0() // ObjEditor oe)
907	901	{
908	902	aConstraints.gridy += 1;
909	903	aConstraints.gridx = 0;
..	..	@@ -958,37 +952,70 @@
958	952
959	953	void SetupUI2(ObjEditor oe)
960	954	{
961		-// oe.aConstraints.weightx = 0;
962		-// oe.aConstraints.weighty = 0;
963		-// oe.aConstraints.gridx = 0;
964		-// oe.aConstraints.gridy = 0;
965		- SetupName(oe);
	955	+ //SetupName(oe);
	956	+
	957	+ namePanel = new cGridBag();
	958	+
	959	+ nameField = AddText(namePanel, copy.GetName());
	960	+ namePanel.add(nameField);
	961	+ oe.ctrlPanel.add(namePanel);
	962	+
	963	+ oe.ctrlPanel.Return();
966	964
967	965	if (!GroupEditor.allparams)
968	966	return;
969	967
970		- liveCB = AddCheckBox(oe, "Live", copy.live);
971		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
972		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	968	+ setupPanel = new cGridBag().setVertical(false);
	969	+
	970	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	971	+ liveCB.setToolTipText("Animate object");
	972	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	973	+ hideCB.setToolTipText("Hide object");
973	974	// 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");
	975	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	976	+ markCB.setToolTipText("Set the animation target transform");
	977	+
	978	+ rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	979	+ rewindCB.setToolTipText("Rewind animation");
	980	+
	981	+ randomCB = AddCheckBox(setupPanel, "Random", copy.random);
	982	+ randomCB.setToolTipText("Option for switch node");
	983	+
	984	+ if (Globals.ADVANCED)
	985	+ {
	986	+ link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
	987	+ link2masterCB.setToolTipText("Attach to support");
	988	+ speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	989	+ speedupCB.setToolTipText("Option motion capture");
	990	+ }
	991	+
	992	+ oe.ctrlPanel.add(setupPanel);
	993	+ oe.ctrlPanel.Return();
	994	+
	995	+ commandsPanel = new cGridBag().setVertical(false);
	996	+
	997	+ resetButton = AddButton(commandsPanel, "Reset");
	998	+ resetButton.setToolTipText("Jump to frame zero");
	999	+ stepButton = AddButton(commandsPanel, "Step");
	1000	+ stepButton.setToolTipText("Step one frame");
980	1001	// resetAllButton = AddButton(oe, "Reset All");
981	1002	// stepAllButton = AddButton(oe, "Step All");
982		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
983	1003	// Return();
984		- slowerButton = AddButton(oe, "Slow");
985		- fasterButton = AddButton(oe, "Fast");
986		- remarkButton = AddButton(oe, "Rem");
	1004	+ slowerButton = AddButton(commandsPanel, "Slow");
	1005	+ slowerButton.setToolTipText("Decrease animation speed");
	1006	+ fasterButton = AddButton(commandsPanel, "Fast");
	1007	+ fasterButton.setToolTipText("Increase animation speed");
	1008	+ remarkButton = AddButton(commandsPanel, "Remark");
	1009	+ remarkButton.setToolTipText("Set the current transform as the target");
987	1010
988		- Return();
	1011	+ oe.ctrlPanel.add(commandsPanel);
	1012	+ oe.ctrlPanel.Return();
989	1013
990		- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
991		- Return();
	1014	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1015	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1016	+ //Return();
	1017	+
	1018	+ oe.ctrlPanel.Return();
992	1019
993	1020	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
994	1021	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1083,7 +1110,7 @@
1083	1110	oe.aConstraints.gridwidth = 1;
1084	1111	/**/
1085	1112	nameField = AddText(oe.ctrlPanel, copy.GetName());
1086		- Return();
	1113	+ oe.ctrlPanel.Return();
1087	1114
1088	1115	//ctrlPanel.add(textureButton = new Button("Texture..."));
1089	1116	//textureButton.setEnabled(false);
..	..	@@ -1185,7 +1212,8 @@
1185	1212	//JPanel worldPanel =
1186	1213	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1187	1214	//worldPanel.setName("World");
1188		- centralPanel = new JPanel(new BorderLayout());
	1215	+ centralPanel = new cGridBag();
	1216	+ centralPanel.preferredWidth = 20;
1189	1217	timelinePanel = new JPanel(new BorderLayout());
1190	1218	timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1191	1219
..	..	@@ -1215,12 +1243,13 @@
1215	1243	//frontView.object = copy;
1216	1244	//sideView.object = copy;
1217	1245
1218		- XYZPanel = new JPanel();
1219		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1246	+ XYZPanel = new cGridBag().setVertical(true);
	1247	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1220	1248
1221		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1222		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1223		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1249	+ XYZPanel.preferredWidth = 5;
	1250	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1251	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1252	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1224	1253
1225	1254	/*
1226	1255	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1258,10 +1287,11 @@
1258	1287	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1259	1288	//tmp.setName("Edit");
1260	1289	objectPanel.add(materialPanel);
1261		- JPanel north = new JPanel(new BorderLayout());
1262		- north.setName("Edit");
1263		- north.add(ctrlPanel, BorderLayout.NORTH);
1264		- objectPanel.add(north);
	1290	+// JPanel north = new JPanel(new BorderLayout());
	1291	+// north.setName("Edit");
	1292	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1293	+// objectPanel.add(north);
	1294	+ objectPanel.add(ctrlPanel);
1265	1295	objectPanel.add(infoPanel);
1266	1296
1267	1297	/*
..	..	@@ -1282,16 +1312,23 @@
1282	1312	scrollpane.setWheelScrollingEnabled(true);
1283	1313	scrollpane.addMouseWheelListener(this); // Default not fast enough
1284	1314
1285		- /JTabbedPane/ scenePanel = new JTabbedPane();
1286		- scenePanel.add(scrollpane);
	1315	+ /JTabbedPane/ scenePanel = new cGridBag();
	1316	+ scenePanel.preferredWidth = 7;
	1317	+
	1318	+ JTabbedPane tabbedPane = new JTabbedPane();
	1319	+ tabbedPane.add(scrollpane);
1287	1320
1288		- scenePanel.add(FSPane = new cFileSystemPane(this));
	1321	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1289	1322
1290		- optionsPanel = new JPanel(new GridBagLayout());
	1323	+ optionsPanel = new cGridBag().setVertical(true);
1291	1324
1292	1325	optionsPanel.setName("Options");
1293		- scenePanel.add(optionsPanel);
1294		-
	1326	+
	1327	+ AddOptions(optionsPanel); //, aConstraints);
	1328	+
	1329	+ tabbedPane.add(optionsPanel);
	1330	+
	1331	+ scenePanel.add(tabbedPane);
1295	1332
1296	1333	/*
1297	1334	cTree jTree = new cTree(null);
..	..	@@ -1325,6 +1362,7 @@
1325	1362	//bigPanel.setSize(new Dimension(10,10));
1326	1363	//bigPanel.add(ctrlPanel);
1327	1364	//bigPanel.add(gridPanel);
	1365	+ /**
1328	1366	bigThree = new JPanel();
1329	1367	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1330	1368	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1348,7 +1386,13 @@
1348	1386	// aConstraints.gridheight = 3;
1349	1387	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1350	1388	bigThree.add(XYZPanel, aWindowConstraints);
	1389	+ /**/
1351	1390
	1391	+ bigThree = new cGridBag();
	1392	+ bigThree.addComponent(scenePanel);
	1393	+ bigThree.addComponent(centralPanel);
	1394	+ bigThree.addComponent(XYZPanel);
	1395	+
1352	1396	// // SIDE EFFECT!!!
1353	1397	// aConstraints.gridx = 0;
1354	1398	// aConstraints.gridy = 0;
..	..	@@ -1369,7 +1413,8 @@
1369	1413	//worldPane.add(bigPanel);
1370	1414	//worldPane.add(worldPanel);
1371	1415	/**/
1372		- frame.getContentPane().add(/"Center",/framePanel);
	1416	+ //frame.getContentPane().add(/"Center",/framePanel);
	1417	+ frame.add(/"Center",/framePanel);
1373	1418	//frame.getContentPane().add(/"Center",/ worldPane);
1374	1419
1375	1420	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
..	..	@@ -1390,6 +1435,10 @@
1390	1435	});
1391	1436	}
1392	1437
	1438	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1439	+ {
	1440	+ }
	1441	+
1393	1442	JTree GetTree()
1394	1443	{
1395	1444	return objEditor.jTree;
..	..	@@ -1401,260 +1450,170 @@
1401	1450	ctrlPanel.removeAll();
1402	1451	}
1403	1452
1404		- void SetupMaterial(JPanel ctrlPanel)
	1453	+ void SetupMaterial(cGridBag panel)
1405	1454	{
1406		- aConstraints.weighty = 0;
1407		- //aConstraints.weightx = 1;
1408		- /*
	1455	+ /*
1409	1456	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1410	1457	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1411		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1412		- aConstraints.gridx += 1;
1413	1458	*/
1414	1459
1415		- aConstraints.gridwidth = 1;
1416		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1417		- aConstraints.gridx += 1;
1418		- aConstraints.weighty = 0;
1419		- aConstraints.gridwidth = 1;
	1460	+ cGridBag editBar = new cGridBag().setVertical(false);
	1461	+
	1462	+ editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1463	+ createMaterialButton.setToolTipText("Create material");
1420	1464
1421	1465	/*
1422	1466	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1423		- aConstraints.gridx += 1;
1424		- aConstraints.weighty = 0;
1425		- aConstraints.gridwidth = 1;
1426	1467	*/
1427	1468
1428		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1429		- aConstraints.gridx += 1;
	1469	+ editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1470	+ clearMaterialButton.setToolTipText("Clear material");
	1471	+
	1472	+ editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1473	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1474	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1430	1475
1431		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1432		-
1433		- aConstraints.gridx += 1;
1434		-
1435		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1436		-
1437		- aConstraints.gridx += 1;
1438		-
1439		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1440		-
1441		- aConstraints.gridx = 0;
1442		- aConstraints.gridy += 1;
1443		- aConstraints.weighty = 0;
1444		- aConstraints.gridwidth = 1;
	1476	+ editBar.preferredHeight = 15;
	1477	+
	1478	+ panel.add(editBar);
	1479	+
1445	1480	/**/
1446	1481	//aConstraints.weighty = 0;
1447	1482	////aConstraints.weightx = 1;
1448	1483	//aConstraints.weighty = 1;
1449	1484	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1450	1485	//aConstraints.gridx += 1;
1451		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1452		- aConstraints.weighty = 0;
1453		- aConstraints.gridx = 0;
1454		- aConstraints.gridy += 1;
1455		- aConstraints.gridwidth = 1;
	1486	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1456	1487
1457		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1458		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1459		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1460		- aConstraints.gridx += 1;
1461		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1462		- //aConstraints.weightx = 0;
1463		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1464		- aConstraints.gridx = 0;
1465		- aConstraints.gridy += 1;
1466		- aConstraints.gridwidth = 1;
	1488	+ cGridBag colorSection = new cGridBag().setVertical(true);
	1489	+
	1490	+ cGridBag color = new cGridBag();
	1491	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1492	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1493	+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1494	+ //colorField.preferredWidth = 200;
	1495	+ colorSection.add(color);
1467	1496
1468		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1469		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1470		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1471		- aConstraints.gridx += 1;
1472		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1473		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1474		- aConstraints.gridx = 0;
1475		- aConstraints.gridy += 1;
1476		- aConstraints.gridwidth = 1;
	1497	+ cGridBag modulation = new cGridBag();
	1498	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1499	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1500	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1501	+ colorSection.add(modulation);
1477	1502
1478		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1479		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1480		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1481		- aConstraints.gridx += 1;
1482		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1483		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1484		- aConstraints.gridx = 0;
1485		- aConstraints.gridy += 1;
1486		- aConstraints.gridwidth = 1;
	1503	+ cGridBag texture = new cGridBag();
	1504	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1505	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1506	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1507	+ colorSection.add(texture);
1487	1508
1488		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1489		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1490		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1491		- aConstraints.gridx += 1;
1492		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1493		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1494		- aConstraints.gridx = 0;
1495		- aConstraints.gridy += 1;
1496		- aConstraints.gridwidth = 1;
	1509	+ cGridBag anisoU = new cGridBag();
	1510	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1511	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1512	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1513	+ colorSection.add(anisoU);
1497	1514
1498		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1499		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1500		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1501		- aConstraints.gridx += 1;
1502		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1503		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1504		- aConstraints.gridx = 0;
1505		- aConstraints.gridy += 1;
1506		- aConstraints.gridwidth = 1;
	1515	+ cGridBag anisoV = new cGridBag();
	1516	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1517	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1518	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1519	+ colorSection.add(anisoV);
1507	1520
1508		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1509		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1510		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1511		- aConstraints.gridx += 1;
1512		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1513		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1514		- aConstraints.gridx = 0;
1515		- aConstraints.gridy += 1;
1516		- aConstraints.gridwidth = 1;
	1521	+ cGridBag shadowbias = new cGridBag();
	1522	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1523	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1524	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1525	+ colorSection.add(shadowbias);
1517	1526
1518		- //aConstraints.weighty = 1;
1519		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1520		- //aConstraints.gridx += 1;
1521		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1522		- aConstraints.weighty = 0;
1523		- aConstraints.gridx = 0;
1524		- aConstraints.gridy += 1;
1525		- aConstraints.gridwidth = 1;
	1527	+ panel.add(new JSeparator());
	1528	+
	1529	+ panel.add(colorSection);
	1530	+
	1531	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1532	+
	1533	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1534	+
	1535	+ cGridBag diffuse = new cGridBag();
	1536	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1537	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1538	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1539	+ diffuseSection.add(diffuse);
1526	1540
1527		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1528		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1529		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1530		- aConstraints.gridx += 1;
1531		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1532		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1533		- aConstraints.gridx = 0;
1534		- aConstraints.gridy += 1;
1535		- aConstraints.gridwidth = 1;
	1541	+ cGridBag diffuseness = new cGridBag();
	1542	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1543	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1544	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1545	+ diffuseSection.add(diffuseness);
1536	1546
1537		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1538		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1539		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1540		- aConstraints.gridx += 1;
1541		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1542		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1543		- aConstraints.gridx = 0;
1544		- aConstraints.gridy += 1;
1545		- aConstraints.gridwidth = 1;
	1547	+ cGridBag selfshadow = new cGridBag();
	1548	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1549	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1550	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1551	+ diffuseSection.add(selfshadow);
1546	1552
1547		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1548		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1549		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1550		- aConstraints.gridx += 1;
1551		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1552		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1553		- aConstraints.gridx = 0;
1554		- aConstraints.gridy += 1;
1555		- aConstraints.gridwidth = 1;
	1553	+ cGridBag sheen = new cGridBag();
	1554	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1555	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1556	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1557	+ diffuseSection.add(sheen);
1556	1558
1557		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1558		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1559		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1560		- aConstraints.gridx += 1;
1561		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1562		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1563		- aConstraints.gridx = 0;
1564		- aConstraints.gridy += 1;
1565		- aConstraints.gridwidth = 1;
	1559	+ cGridBag subsurface = new cGridBag();
	1560	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1561	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1562	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1563	+ diffuseSection.add(subsurface);
1566	1564
1567		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1568		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1569		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1570		- aConstraints.gridx += 1;
1571		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1572		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1573		- aConstraints.gridx = 0;
1574		- aConstraints.gridy += 1;
1575		- aConstraints.gridwidth = 1;
	1565	+ cGridBag shadow = new cGridBag();
	1566	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1567	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1568	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1569	+ diffuseSection.add(shadow);
1576	1570
1577		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1578		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1579		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1580		- aConstraints.gridx += 1;
1581		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1582		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1583		- aConstraints.gridx = 0;
1584		- aConstraints.gridy += 1;
1585		- aConstraints.gridwidth = 1;
	1571	+ cGridBag fakedepth = new cGridBag();
	1572	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1573	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1574	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1575	+ diffuseSection.add(fakedepth);
1586	1576
1587		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1588		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1589		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1590		- aConstraints.gridx += 1;
1591		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1592		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1593		- aConstraints.gridx = 0;
1594		- aConstraints.gridy += 1;
1595		- aConstraints.gridwidth = 1;
	1577	+ panel.add(new JSeparator());
	1578	+
	1579	+ panel.add(diffuseSection);
	1580	+
	1581	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1582	+
	1583	+ cGridBag specularSection = new cGridBag().setVertical(true);
1596	1584
1597		- //aConstraints.weighty = 1;
1598		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1599		- //aConstraints.gridx += 1;
1600		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1601		- aConstraints.weighty = 0;
1602		- aConstraints.gridx = 0;
1603		- aConstraints.gridy += 1;
1604		- aConstraints.gridwidth = 1;
	1585	+ cGridBag specular = new cGridBag();
	1586	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1587	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1588	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1589	+ specularSection.add(specular);
1605	1590
1606		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1607		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1608		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1609		- aConstraints.gridx += 1;
1610		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1611		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1612		- aConstraints.gridx = 0;
1613		- aConstraints.gridy += 1;
1614		- aConstraints.gridwidth = 1;
	1591	+ cGridBag lightarea = new cGridBag();
	1592	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1593	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1594	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1595	+ specularSection.add(lightarea);
1615	1596
1616		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1617		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1618		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1619		- aConstraints.gridx += 1;
1620		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1621		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1622		- aConstraints.gridx = 0;
1623		- aConstraints.gridy += 1;
1624		- aConstraints.gridwidth = 1;
	1597	+ cGridBag shininess = new cGridBag();
	1598	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1599	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1600	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1601	+ specularSection.add(shininess);
1625	1602
1626		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1627		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1628		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1629		- aConstraints.gridx += 1;
1630		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1631		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1632		- aConstraints.gridx = 0;
1633		- aConstraints.gridy += 1;
1634		- aConstraints.gridwidth = 1;
	1603	+ cGridBag metalness = new cGridBag();
	1604	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1605	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1606	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1607	+ specularSection.add(metalness);
1635	1608
1636		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1637		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1638		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1639		- aConstraints.gridx += 1;
1640		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1641		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1642		- aConstraints.gridx = 0;
1643		- aConstraints.gridy += 1;
1644		- aConstraints.gridwidth = 1;
	1609	+ cGridBag velvet = new cGridBag();
	1610	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1611	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1612	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1613	+ specularSection.add(velvet);
1645	1614
1646		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1647		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1648		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1649		- aConstraints.gridx += 1;
1650		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1651		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1652		- aConstraints.gridx = 0;
1653		- aConstraints.gridy += 1;
1654		- aConstraints.gridwidth = 1;
1655		-
1656		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1657		- Return();
	1615	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1616	+ //Return();
1658	1617	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1659	1618	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1660	1619	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1665,130 +1624,93 @@
1665	1624	// aConstraints.gridy += 1;
1666	1625	// aConstraints.gridwidth = 1;
1667	1626
1668		- //aConstraints.weighty = 1;
1669		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1670		- //aConstraints.gridx += 1;
1671		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1672		- aConstraints.weighty = 0;
1673		- aConstraints.gridx = 0;
1674		- aConstraints.gridy += 1;
1675		- aConstraints.gridwidth = 1;
1676	1627
1677		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1678		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1679		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1680		- aConstraints.gridx += 1;
1681		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1682		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1683		- aConstraints.gridx = 0;
1684		- aConstraints.gridy += 1;
1685		- aConstraints.gridwidth = 1;
	1628	+ panel.add(new JSeparator());
	1629	+
	1630	+ panel.add(specularSection);
	1631	+
	1632	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1633	+
	1634	+ cGridBag globalSection = new cGridBag().setVertical(true);
1686	1635
1687		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1688		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1689		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1690		- aConstraints.gridx += 1;
1691		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1692		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1693		- aConstraints.gridx = 0;
1694		- aConstraints.gridy += 1;
1695		- aConstraints.gridwidth = 1;
	1636	+ cGridBag camera = new cGridBag();
	1637	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1638	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1639	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1640	+ globalSection.add(camera);
1696	1641
1697		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1698		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1699		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1700		- aConstraints.gridx += 1;
1701		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1702		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1703		- aConstraints.gridx = 0;
1704		- aConstraints.gridy += 1;
1705		- aConstraints.gridwidth = 1;
	1642	+ cGridBag ambient = new cGridBag();
	1643	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1644	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1645	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1646	+ globalSection.add(ambient);
1706	1647
1707		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1708		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1709		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1710		- aConstraints.gridx += 1;
1711		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1712		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1713		- aConstraints.gridx = 0;
1714		- aConstraints.gridy += 1;
1715		- aConstraints.gridwidth = 1;
1716		- aConstraints.weighty = 0;
	1648	+ cGridBag backlit = new cGridBag();
	1649	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1650	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1651	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1652	+ globalSection.add(backlit);
1717	1653
1718		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1719		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1720		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1721		- aConstraints.gridx += 1;
1722		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1723		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1724		- aConstraints.gridx = 0;
1725		- aConstraints.gridy += 1;
1726		- aConstraints.gridwidth = 1;
	1654	+ cGridBag opacity = new cGridBag();
	1655	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1656	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1657	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1658	+ globalSection.add(opacity);
1727	1659
1728		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1729		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1730		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1731		- aConstraints.gridx += 1;
1732		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1733		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1734		- aConstraints.gridx = 0;
1735		- aConstraints.gridy += 1;
1736		- aConstraints.gridwidth = 1;
	1660	+ panel.add(new JSeparator());
	1661	+
	1662	+ panel.add(globalSection);
	1663	+
	1664	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1665	+
	1666	+ cGridBag textureSection = new cGridBag().setVertical(true);
1737	1667
1738		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1739		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1740		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1741		- aConstraints.gridx += 1;
1742		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1743		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1744		- aConstraints.gridx = 0;
1745		- aConstraints.gridy += 1;
1746		- aConstraints.gridwidth = 1;
	1668	+ cGridBag bump = new cGridBag();
	1669	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1670	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1671	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1672	+ textureSection.add(bump);
1747	1673
1748		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1749		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1750		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1751		- aConstraints.gridx += 1;
1752		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1753		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1754		- aConstraints.gridx = 0;
1755		- aConstraints.gridy += 1;
1756		- aConstraints.gridwidth = 1;
	1674	+ cGridBag noise = new cGridBag();
	1675	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1676	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1677	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1678	+ textureSection.add(noise);
1757	1679
1758		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1759		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1760		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1761		- aConstraints.gridx += 1;
1762		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1763		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1764		- aConstraints.gridx = 0;
1765		- aConstraints.gridy += 1;
1766		- aConstraints.gridwidth = 1;
	1680	+ cGridBag power = new cGridBag();
	1681	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1682	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1683	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1684	+ textureSection.add(power);
1767	1685
1768		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1769		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1770		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1771		- aConstraints.gridx += 1;
1772		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1773		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1774		- aConstraints.gridx = 0;
1775		- aConstraints.gridy += 1;
1776		- aConstraints.gridwidth = 1;
	1686	+ cGridBag borderfade = new cGridBag();
	1687	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1688	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1689	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1690	+ textureSection.add(borderfade);
1777	1691
1778		- //aConstraints.weighty = 1;
1779		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1780		- //aConstraints.gridx += 1;
1781		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1782		- aConstraints.weighty = 0;
	1692	+ cGridBag fog = new cGridBag();
	1693	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1694	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1695	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1696	+ textureSection.add(fog);
1783	1697
1784		- aConstraints.gridx = 0;
1785		- aConstraints.gridy = 0;
1786		- aConstraints.gridwidth = 1;
	1698	+ cGridBag opacityPower = new cGridBag();
	1699	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	1700	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1701	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	1702	+ textureSection.add(opacityPower);
	1703	+
	1704	+ panel.add(new JSeparator());
	1705	+
	1706	+ panel.add(textureSection);
	1707	+
	1708	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1787	1709
1788	1710	SetMaterial(copy); // .GetMaterial());
1789	1711
1790		- colorField.addChangeListener(this);
1791		- modulationField.addChangeListener(this);
	1712	+ //colorField.addChangeListener(this);
	1713	+// modulationField.addChangeListener(this);
1792	1714	metalnessField.addChangeListener(this);
1793	1715	diffuseField.addChangeListener(this);
1794	1716	specularField.addChangeListener(this);
..	..	@@ -2600,6 +2522,7 @@
2600	2522	}
2601	2523	if (input == null)
2602	2524	{
	2525	+ new Exception().printStackTrace();
2603	2526	System.exit(0);
2604	2527	}
2605	2528
..	..	@@ -3074,6 +2997,7 @@
3074	2997	if (event.getSource() == randomCB)
3075	2998	{
3076	2999	copy.random ^= true;
	3000	+ objEditor.refreshContents();
3077	3001	return;
3078	3002	}
3079	3003	if (event.getSource() == speedupCB)
..	..	@@ -3136,7 +3060,8 @@
3136	3060	objEditor.refreshContents();
3137	3061	} else if (event.getSource() == stepItem)
3138	3062	{
3139		- cameraView.ONESTEP = true;
	3063	+ //cameraView.ONESTEP = true;
	3064	+ Globals.ONESTEP = true;
3140	3065	cameraView.repaint();
3141	3066	return;
3142	3067	} else if (event.getSource() == stepButton)
..	..	@@ -3293,25 +3218,25 @@
3293	3218
3294	3219	void ToggleAnimation()
3295	3220	{
3296		- if (!CameraPane.ANIMATION)
	3221	+ if (!Globals.ANIMATION)
3297	3222	{
3298	3223	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3299		- browser.show();
	3224	+ browser.setVisible(true);
3300	3225	String filename = browser.getFile();
3301	3226	if (filename != null && filename.length() > 0)
3302	3227	{
3303		- CameraPane.filename = browser.getDirectory() + filename;
	3228	+ Globals.filename = browser.getDirectory() + filename;
3304	3229	//CameraPane.framecount = 0;
3305		- CameraPane.imagecount = 0;
	3230	+ Globals.imagecount = 0;
3306	3231
3307		- CameraPane.ANIMATION ^= true;
	3232	+ Globals.ANIMATION ^= true;
3308	3233
3309	3234	GrafreeD.wav.cursor = 0;
3310	3235	GrafreeD.wav.loop = 0;
3311	3236	}
3312	3237	} else
3313	3238	{
3314		- CameraPane.ANIMATION ^= true;
	3239	+ Globals.ANIMATION ^= true;
3315	3240	}
3316	3241	}
3317	3242
..	..	@@ -3328,6 +3253,7 @@
3328	3253	callee.refreshContents();
3329	3254	} else
3330	3255	{
	3256	+ new Exception().printStackTrace();
3331	3257	System.exit(0);
3332	3258	}
3333	3259	}
..	..	@@ -3490,7 +3416,7 @@
3490	3416	current.fakedepth = (float) fakedepthField.getFloat();
3491	3417	current.shadowbias = (float) shadowbiasField.getFloat();
3492	3418
3493		- if (!NumberSlider.frozen)
	3419	+ if (!cNumberSlider.frozen)
3494	3420	{
3495	3421	//System.out.println("Propagate = " + propagate);
3496	3422	copy.UpdateMaterial(anchor, current, propagate);
..	..	@@ -3538,6 +3464,7 @@
3538	3464	\|\| e.getSource() == apertureField
3539	3465	\|\| e.getSource() == shadowblurField)
3540	3466	{
	3467	+ new Exception().printStackTrace();
3541	3468	System.exit(0);
3542	3469	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3543	3470	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3863,7 +3790,7 @@
3863	3790
3864	3791	radioPanel.revalidate();
3865	3792	radioPanel.repaint();
3866		- ctrlPanel.revalidate(); // ? new
	3793	+ ctrlPanel.validate(); // ? new
3867	3794	ctrlPanel.repaint();
3868	3795	}
3869	3796	}
..	..	@@ -4509,8 +4436,8 @@
4509	4436	//MenuItem normalLensItem;
4510	4437	MenuItem editCameraItem;
4511	4438	MenuItem revertCameraItem;
4512		- CheckboxMenuItem toggleLiveItem;
4513	4439	MenuItem stepItem;
	4440	+ CheckboxMenuItem toggleLiveItem;
4514	4441	CheckboxMenuItem toggleFullScreenItem;
4515	4442	CheckboxMenuItem toggleTimelineItem;
4516	4443	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4527,20 +4454,20 @@
4527	4454	JSplitPane mainPanel;
4528	4455	JScrollPane scrollpane;
4529	4456	JPanel toolbarPanel;
4530		- JPanel treePanel;
	4457	+ cGridBag treePanel;
4531	4458	JPanel radioPanel;
4532	4459	ButtonGroup buttonGroup;
4533		- JPanel ctrlPanel;
4534		- JPanel materialPanel;
	4460	+ cGridBag ctrlPanel;
	4461	+ cGridBag materialPanel;
4535	4462	JScrollPane infoPanel;
4536		- JPanel optionsPanel;
	4463	+ cGridBag optionsPanel;
4537	4464	JTabbedPane objectPanel;
4538		- JPanel XYZPanel;
	4465	+ cGridBag XYZPanel;
4539	4466	JSplitPane gridPanel;
4540	4467	JSplitPane bigPanel;
4541		- JPanel bigThree;
4542		- JTabbedPane scenePanel;
4543		- JPanel centralPanel;
	4468	+ cGridBag bigThree;
	4469	+ cGridBag scenePanel;
	4470	+ cGridBag centralPanel;
4544	4471	JSplitPane cameraPanel;
4545	4472	JPanel timelinePanel;
4546	4473	JMenuBar timelineMenubar;
..	..	@@ -4593,67 +4520,67 @@
4593	4520	// MATERIAL
4594	4521	JLabel materialLabel;
4595	4522	JLabel colorLabel;
4596		- NumberSlider colorField;
	4523	+ cNumberSlider colorField;
4597	4524	JLabel modulationLabel;
4598		- NumberSlider modulationField;
	4525	+ cNumberSlider modulationField;
4599	4526	JLabel metalnessLabel;
4600		- NumberSlider metalnessField;
	4527	+ cNumberSlider metalnessField;
4601	4528	JLabel diffuseLabel;
4602		- NumberSlider diffuseField;
	4529	+ cNumberSlider diffuseField;
4603	4530	JLabel specularLabel;
4604		- NumberSlider specularField;
	4531	+ cNumberSlider specularField;
4605	4532	JLabel shininessLabel;
4606		- NumberSlider shininessField;
	4533	+ cNumberSlider shininessField;
4607	4534	JLabel shiftLabel;
4608		- NumberSlider shiftField;
	4535	+ cNumberSlider shiftField;
4609	4536	JLabel ambientLabel;
4610		- NumberSlider ambientField;
	4537	+ cNumberSlider ambientField;
4611	4538	JLabel lightareaLabel;
4612		- NumberSlider lightareaField;
	4539	+ cNumberSlider lightareaField;
4613	4540	JLabel diffusenessLabel;
4614		- NumberSlider diffusenessField;
	4541	+ cNumberSlider diffusenessField;
4615	4542	JLabel velvetLabel;
4616		- NumberSlider velvetField;
	4543	+ cNumberSlider velvetField;
4617	4544	JLabel sheenLabel;
4618		- NumberSlider sheenField;
	4545	+ cNumberSlider sheenField;
4619	4546	JLabel subsurfaceLabel;
4620		- NumberSlider subsurfaceField;
	4547	+ cNumberSlider subsurfaceField;
4621	4548	//JLabel bumpLabel;
4622	4549	//NumberSlider bumpField;
4623	4550	JLabel backlitLabel;
4624		- NumberSlider backlitField;
	4551	+ cNumberSlider backlitField;
4625	4552	JLabel anisoLabel;
4626		- NumberSlider anisoField;
	4553	+ cNumberSlider anisoField;
4627	4554	JLabel anisoVLabel;
4628		- NumberSlider anisoVField;
	4555	+ cNumberSlider anisoVField;
4629	4556	JLabel cameraLabel;
4630		- NumberSlider cameraField;
	4557	+ cNumberSlider cameraField;
4631	4558	JLabel selfshadowLabel;
4632		- NumberSlider selfshadowField;
	4559	+ cNumberSlider selfshadowField;
4633	4560	JLabel shadowLabel;
4634		- NumberSlider shadowField;
	4561	+ cNumberSlider shadowField;
4635	4562	JLabel textureLabel;
4636		- NumberSlider textureField;
	4563	+ cNumberSlider textureField;
4637	4564	JLabel opacityLabel;
4638		- NumberSlider opacityField;
	4565	+ cNumberSlider opacityField;
4639	4566	JLabel fakedepthLabel;
4640		- NumberSlider fakedepthField;
	4567	+ cNumberSlider fakedepthField;
4641	4568	JLabel shadowbiasLabel;
4642		- NumberSlider shadowbiasField;
	4569	+ cNumberSlider shadowbiasField;
4643	4570	JLabel bumpLabel;
4644		- NumberSlider bumpField;
	4571	+ cNumberSlider bumpField;
4645	4572	JLabel noiseLabel;
4646		- NumberSlider noiseField;
	4573	+ cNumberSlider noiseField;
4647	4574	JLabel powerLabel;
4648		- NumberSlider powerField;
	4575	+ cNumberSlider powerField;
4649	4576	JLabel borderfadeLabel;
4650		- NumberSlider borderfadeField;
	4577	+ cNumberSlider borderfadeField;
4651	4578	JLabel fogLabel;
4652		- NumberSlider fogField;
	4579	+ cNumberSlider fogField;
4653	4580	JLabel opacityPowerLabel;
4654		- NumberSlider opacityPowerField;
	4581	+ cNumberSlider opacityPowerField;
4655	4582	JTree jTree;
4656	4583	//ObjectUI parent;
4657	4584
4658		- NumberSlider normalpushField;
	4585	+ cNumberSlider normalpushField;
4659	4586	}