~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,51 +126,60 @@
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);
141	145
142	146	if (!GroupEditor.allparams)
143	147	return;
144	148
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);
	149	+// objEditor.ctrlPanel.remove(liveCB);
	150	+// objEditor.ctrlPanel.remove(hideCB);
	151	+// objEditor.ctrlPanel.remove(markCB);
	152	+//
	153	+// objEditor.ctrlPanel.remove(randomCB);
	154	+// objEditor.ctrlPanel.remove(speedupCB);
	155	+// objEditor.ctrlPanel.remove(rewindCB);
	156	+//
	157	+// objEditor.ctrlPanel.remove(resetButton);
	158	+// objEditor.ctrlPanel.remove(stepButton);
	159	+//// objEditor.ctrlPanel.remove(stepAllButton);
	160	+//// objEditor.ctrlPanel.remove(resetAllButton);
	161	+// objEditor.ctrlPanel.remove(link2masterCB);
	162	+// //objEditor.ctrlPanel.remove(flipVCB);
	163	+// //objEditor.ctrlPanel.remove(texresMenu);
	164	+// objEditor.ctrlPanel.remove(slowerButton);
	165	+// objEditor.ctrlPanel.remove(fasterButton);
	166	+// objEditor.ctrlPanel.remove(remarkButton);
	167	+
	168	+ objEditor.ctrlPanel.remove(namePanel);
	169	+ objEditor.ctrlPanel.remove(setupPanel);
	170	+ objEditor.ctrlPanel.remove(commandsPanel);
	171	+ objEditor.ctrlPanel.remove(pushPanel);
	172	+ //objEditor.ctrlPanel.remove(fillPanel);
	173	+
	174	+ //Remove(normalpushField);
163	175	}
164	176
165	177	public ObjEditor GetEditor()
166	178	{
167	179	return objEditor; //.GetEditor();
168	180	}
	181	+
	182	+ // Sometimes myself, sometimes my callee's.
169	183	ObjEditor objEditor;
170	184
171	185	/*
..	..	@@ -305,7 +319,7 @@
305	319	toggleTextureItem.setState(CameraPane.textureon);
306	320	cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
307	321	toggleLiveItem.addItemListener(this);
308		- toggleLiveItem.setState(CameraPane.isLIVE());
	322	+ toggleLiveItem.setState(Globals.isLIVE());
309	323	cameraMenu.add(stepItem = new MenuItem("Step"));
310	324	stepItem.addActionListener(this);
311	325	// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
..	..	@@ -345,21 +359,23 @@
345	359	objectPanel = new JTabbedPane();
346	360	toolbarPanel = new JPanel();
347	361	toolbarPanel.setName("Toolbar");
348		- treePanel = new JPanel();
	362	+ treePanel = new cGridBag();
349	363	treePanel.setName("Tree");
350		- ctrlPanel = new JPanel(); // new GridBagLayout());
	364	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
351	365	ctrlPanel.setName("Edit");
352		- materialPanel = new JPanel();
	366	+ materialPanel = new cGridBag().setVertical(true);
353	367	materialPanel.setName("Material");
354	368	/JTextPane/
355	369	infoarea = createTextPane();
	370	+ doc = infoarea.getStyledDocument();
	371	+
356	372	infoarea.setEditable(true);
357	373	SetText();
358	374	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
359	375	// infoarea.setOpaque(false);
360	376	// //infoarea.setForeground(textcolor);
361		- infoarea.setLineWrap(true);
362		- infoarea.setWrapStyleWord(true);
	377	+// TEXTAREA infoarea.setLineWrap(true);
	378	+// TEXTAREA infoarea.setWrapStyleWord(true);
363	379	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
364	380	infoPanel.setPreferredSize(new Dimension(50, 200));
365	381	infoPanel.setName("Info");
..	..	@@ -370,16 +386,16 @@
370	386	mainPanel.setName("Main");
371	387	mainPanel.setContinuousLayout(true);
372	388	mainPanel.setOneTouchExpandable(true);
373		- mainPanel.setDividerLocation(1.0);
374	389	mainPanel.setDividerSize(9);
375		- mainPanel.setResizeWeight(0);
	390	+ mainPanel.setDividerLocation(0.5); //1.0);
	391	+ mainPanel.setResizeWeight(0.5);
376	392
377	393	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
378	394	//mainPanel.setLayout(new GridBagLayout());
379	395	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
380		- treePanel.setLayout(new GridBagLayout());
381		- ctrlPanel.setLayout(new GridBagLayout());
382		- materialPanel.setLayout(new GridBagLayout());
	396	+// treePanel.setLayout(new GridBagLayout());
	397	+ //ctrlPanel.setLayout(new GridBagLayout());
	398	+ //materialPanel.setLayout(new GridBagLayout());
383	399
384	400	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
385	401	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -418,7 +434,7 @@
418	434	static String newline = "\n";
419	435	protected static final String buttonString = "JButton";
420	436	StyledDocument doc;
421		- JTextArea infoarea;
	437	+ JTextPane infoarea;
422	438
423	439	void ClearInfo()
424	440	{
..	..	@@ -485,7 +501,10 @@
485	501	}
486	502
487	503	if (full)
488		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	504	+ {
	505	+ si.SendInfo(" BBox min: " + minima, "regular");
	506	+ si.SendInfo(" BBox max: " + maxima, "regular");
	507	+ }
489	508
490	509	if (sel.bRep != null)
491	510	{
..	..	@@ -583,6 +602,9 @@
583	602	{
584	603	CameraPane.pointflow = (PointFlow) sel;
585	604	}
	605	+
	606	+ si.SendInfo("_____________________", "regular");
	607	+ si.SendInfo("", "regular");
586	608	}
587	609	}
588	610
..	..	@@ -614,52 +636,52 @@
614	636	cameraView.ToggleFullScreen();
615	637	}
616	638
617		- private JTextArea createTextPane()
	639	+ private JTextPane createTextPane()
618	640	{
619		- String[] initString =
620		- {
621		- "This is an editable JTextPane, ", //regular
622		- "another ", //italic
623		- "styled ", //bold
624		- "text ", //small
625		- "component, ", //large
626		- "which supports embedded components..." + newline,//regular
627		- " " + newline, //button
628		- "...and embedded icons..." + newline, //regular
629		- " ", //icon
630		- newline + "JTextPane is a subclass of JEditorPane that "
631		- + "uses a StyledEditorKit and StyledDocument, and provides "
632		- + "cover methods for interacting with those objects."
633		- };
	641	+// TEXTAREA String[] initString =
	642	+// {
	643	+// "This is an editable JTextPane, ", //regular
	644	+// "another ", //italic
	645	+// "styled ", //bold
	646	+// "text ", //small
	647	+// "component, ", //large
	648	+// "which supports embedded components..." + newline,//regular
	649	+// " " + newline, //button
	650	+// "...and embedded icons..." + newline, //regular
	651	+// " ", //icon
	652	+// newline + "JTextPane is a subclass of JEditorPane that "
	653	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	654	+// + "cover methods for interacting with those objects."
	655	+// };
	656	+//
	657	+// String[] initStyles =
	658	+// {
	659	+// "regular", "italic", "bold", "small", "large",
	660	+// "regular", "button", "regular", "icon",
	661	+// "regular"
	662	+// };
	663	+//
	664	+// JTextPane textPane = new JTextPane();
	665	+// textPane.setEditable(true);
	666	+// /StyledDocument/ doc = textPane.getStyledDocument();
	667	+// addStylesToDocument(doc);
	668	+//
	669	+// try
	670	+// {
	671	+// for (int j = 0; j < 2; j++)
	672	+// {
	673	+// for (int i = 0; i < initString.length; i++)
	674	+// {
	675	+// doc.insertString(doc.getLength(), initString[i],
	676	+// doc.getStyle(initStyles[i]));
	677	+// }
	678	+// }
	679	+// } catch (BadLocationException ble)
	680	+// {
	681	+// System.err.println("Couldn't insert initial text into text pane.");
	682	+// }
634	683
635		- String[] initStyles =
636		- {
637		- "regular", "italic", "bold", "small", "large",
638		- "regular", "button", "regular", "icon",
639		- "regular"
640		- };
641		-
642		- JTextPane textPane = new JTextPane();
643		- textPane.setEditable(true);
644		- /StyledDocument/ doc = textPane.getStyledDocument();
645		- addStylesToDocument(doc);
646		-
647		- try
648		- {
649		- for (int j = 0; j < 2; j++)
650		- {
651		- for (int i = 0; i < initString.length; i++)
652		- {
653		- doc.insertString(doc.getLength(), initString[i],
654		- doc.getStyle(initStyles[i]));
655		- }
656		- }
657		- } catch (BadLocationException ble)
658		- {
659		- System.err.println("Couldn't insert initial text into text pane.");
660		- }
661		-
662		- return new JTextArea(); // textPane;
	684	+ return new JTextPane(); // textPane;
663	685	}
664	686
665	687	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -759,115 +781,83 @@
759	781	JButton slowerButton;
760	782	JButton fasterButton;
761	783	JButton remarkButton;
	784	+
	785	+ cGridBag namePanel;
	786	+ cGridBag setupPanel;
	787	+ cGridBag commandsPanel;
	788	+ cGridBag pushPanel;
	789	+ cGridBag fillPanel;
762	790
763		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	791	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
764	792	{
765	793	JCheckBox cb;
766	794
767		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
768		- oe.aConstraints.gridwidth = 1; // 3;
769		-// oe.aConstraints.weightx = 1;
770		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
771		- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	795	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
772	796	cb.addItemListener(this);
773		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
774		- oe.aConstraints.gridwidth = 1;
775		- oe.aConstraints.gridx += 1;
776	797
777	798	return cb;
778	799	}
779	800
780		- cButton AddButton(ObjEditor oe, String label)
	801	+ cButton AddButton(cGridBag panel, String label)
781	802	{
782	803	cButton cb;
783	804
784		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
785		- oe.aConstraints.gridwidth = 1;
786		-// oe.aConstraints.weightx = 1;
787		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
788		- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
	805	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
789	806	cb.addActionListener(this);
790		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
791		- oe.aConstraints.gridwidth = 1;
792		- oe.aConstraints.gridx += 1;
793	807
794	808	return cb;
795	809	}
796	810
797		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	811	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
798	812	{
799	813	JComboBox combo;
800	814
801		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
802		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
803		- oe.aConstraints.gridx += 1;
	815	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
804	816	combo.addActionListener(this);
805	817
806	818	return combo;
807	819	}
808	820
809		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	821	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
810	822	{
811		- NumberSlider combo;
	823	+ cGridBag control = new cGridBag();
	824	+
	825	+ cNumberSlider combo;
812	826
813	827	JLabel jlabel = new JLabel(label);
814		-
815		- aConstraints.fill = GridBagConstraints.VERTICAL;
816	828	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
817		- aConstraints.gridwidth = 2;
818		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
819		- aConstraints.gridx += 1;
820		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
821		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
822		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
823		- aConstraints.gridx += 1;
824		- aConstraints.gridwidth = 1;
825		-
	829	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	830	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
826	831	combo.setFloat(current);
827		-
828		- combo.label = jlabel;
829		-
830		- combo.addChangeListener(this);
831		-
832		- return combo;
	832	+
	833	+ panel.add(control);
	834	+
	835	+ return control;
833	836	}
834	837
835		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	838	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
836	839	{
837		- NumberSlider combo;
	840	+ cGridBag control = new cGridBag();
	841	+
	842	+ cNumberSlider combo;
838	843
839	844	JLabel jlabel = new JLabel(label);
840		-
841		- aConstraints.fill = GridBagConstraints.VERTICAL;
842	845	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
843		- aConstraints.gridwidth = 2;
844		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
845		- aConstraints.gridx += 1;
846		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
847		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
848		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
849		- aConstraints.gridx += 1;
850		- aConstraints.gridwidth = 1;
851		-
	846	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	847	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
852	848	combo.setInteger(current);
853	849
854		- combo.label = jlabel;
855		-
856		- combo.addChangeListener(this);
857		-
858		- return combo;
	850	+ panel.add(control);
	851	+
	852	+ return control;
859	853	}
860	854
861		- JTextArea AddText(JPanel ctrlPanel, String name)
	855	+ JTextArea AddText(cGridBag ctrlPanel, String name)
862	856	{
863	857	JTextArea text;
864	858
865		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
866		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
867		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	859	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
868	860	text.addCaretListener(this);
869		- aConstraints.gridx += 1;
870		- aConstraints.gridwidth = 1;
871	861
872	862	return text;
873	863	}
..	..	@@ -897,9 +887,16 @@
897	887	objEditor.ctrlPanel.remove(j);
898	888	}
899	889
	890	+ void Remove(cNumberSlider j)
	891	+ {
	892	+ j.removeChangeListener(this);
	893	+ //objEditor.ctrlPanel.remove(j.label);
	894	+ objEditor.ctrlPanel.remove(j);
	895	+ }
	896	+
900	897	/*
901	898	*/
902		- void Return() // ObjEditor oe)
	899	+ void Return0() // ObjEditor oe)
903	900	{
904	901	aConstraints.gridy += 1;
905	902	aConstraints.gridx = 0;
..	..	@@ -958,31 +955,53 @@
958	955	// oe.aConstraints.weighty = 0;
959	956	// oe.aConstraints.gridx = 0;
960	957	// oe.aConstraints.gridy = 0;
961		- SetupName(oe);
	958	+ //SetupName(oe);
	959	+
	960	+ namePanel = new cGridBag();
	961	+
	962	+ nameField = AddText(namePanel, copy.GetName());
	963	+ namePanel.add(nameField);
	964	+ oe.ctrlPanel.add(namePanel);
	965	+
	966	+ oe.ctrlPanel.Return();
962	967
963	968	if (!GroupEditor.allparams)
964	969	return;
965	970
966		- liveCB = AddCheckBox(oe, "Live", copy.live);
967		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
968		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	971	+ setupPanel = new cGridBag().setVertical(false);
	972	+
	973	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	974	+ link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
	975	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
969	976	// Return();
970		- markCB = AddCheckBox(oe, "Mark", copy.marked);
971		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
972		- randomCB = AddCheckBox(oe, "Rand", copy.random);
973		- Return();
974		- resetButton = AddButton(oe, "Reset");
975		- stepButton = AddButton(oe, "Step");
	977	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	978	+ rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind);
	979	+ randomCB = AddCheckBox(setupPanel, "Rand", copy.random);
	980	+
	981	+ oe.ctrlPanel.add(setupPanel);
	982	+ oe.ctrlPanel.Return();
	983	+
	984	+ commandsPanel = new cGridBag().setVertical(false);
	985	+
	986	+ resetButton = AddButton(commandsPanel, "Reset");
	987	+ stepButton = AddButton(commandsPanel, "Step");
976	988	// resetAllButton = AddButton(oe, "Reset All");
977	989	// stepAllButton = AddButton(oe, "Step All");
978		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
	990	+ speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
979	991	// Return();
980		- slowerButton = AddButton(oe, "Slow");
981		- fasterButton = AddButton(oe, "Fast");
982		- remarkButton = AddButton(oe, "Rem");
	992	+ slowerButton = AddButton(commandsPanel, "Slow");
	993	+ fasterButton = AddButton(commandsPanel, "Fast");
	994	+ remarkButton = AddButton(commandsPanel, "Remark");
983	995
984		- Return();
	996	+ oe.ctrlPanel.add(commandsPanel);
	997	+ oe.ctrlPanel.Return();
985	998
	999	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1000	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1001	+ //Return();
	1002	+
	1003	+ oe.ctrlPanel.Return();
	1004	+
986	1005	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
987	1006	// ObjEditor.aConstraints.gridx += 1;
988	1007
..	..	@@ -1076,7 +1095,7 @@
1076	1095	oe.aConstraints.gridwidth = 1;
1077	1096	/**/
1078	1097	nameField = AddText(oe.ctrlPanel, copy.GetName());
1079		- Return();
	1098	+ oe.ctrlPanel.Return();
1080	1099
1081	1100	//ctrlPanel.add(textureButton = new Button("Texture..."));
1082	1101	//textureButton.setEnabled(false);
..	..	@@ -1178,10 +1197,18 @@
1178	1197	//JPanel worldPanel =
1179	1198	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1180	1199	//worldPanel.setName("World");
1181		- centralPanel = new JPanel(new BorderLayout());
	1200	+ centralPanel = new cGridBag();
	1201	+ centralPanel.preferredWidth = 20;
1182	1202	timelinePanel = new JPanel(new BorderLayout());
1183	1203	timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1184	1204
	1205	+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
	1206	+ cameraPanel.setContinuousLayout(true);
	1207	+ cameraPanel.setOneTouchExpandable(true);
	1208	+// cameraPanel.setDividerLocation(0.9);
	1209	+// cameraPanel.setDividerSize(9);
	1210	+ cameraPanel.setResizeWeight(1.0);
	1211	+
1185	1212	centralPanel.add(cameraView);
1186	1213	//frame.setJMenuBar(timelineMenubar);
1187	1214	//centralPanel.add(timelinePanel);
..	..	@@ -1201,12 +1228,13 @@
1201	1228	//frontView.object = copy;
1202	1229	//sideView.object = copy;
1203	1230
1204		- XYZPanel = new JPanel();
1205		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1231	+ XYZPanel = new cGridBag().setVertical(true);
	1232	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1206	1233
1207		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1208		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1209		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1234	+ XYZPanel.preferredWidth = 5;
	1235	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1236	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1237	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1210	1238
1211	1239	/*
1212	1240	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1244,10 +1272,11 @@
1244	1272	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1245	1273	//tmp.setName("Edit");
1246	1274	objectPanel.add(materialPanel);
1247		- JPanel north = new JPanel(new BorderLayout());
1248		- north.setName("Edit");
1249		- north.add(ctrlPanel, BorderLayout.NORTH);
1250		- objectPanel.add(north);
	1275	+// JPanel north = new JPanel(new BorderLayout());
	1276	+// north.setName("Edit");
	1277	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1278	+// objectPanel.add(north);
	1279	+ objectPanel.add(ctrlPanel);
1251	1280	objectPanel.add(infoPanel);
1252	1281
1253	1282	/*
..	..	@@ -1268,16 +1297,23 @@
1268	1297	scrollpane.setWheelScrollingEnabled(true);
1269	1298	scrollpane.addMouseWheelListener(this); // Default not fast enough
1270	1299
1271		- /JTabbedPane/ scenePanel = new JTabbedPane();
1272		- scenePanel.add(scrollpane);
	1300	+ /JTabbedPane/ scenePanel = new cGridBag();
	1301	+ scenePanel.preferredWidth = 7;
	1302	+
	1303	+ JTabbedPane tabbedPane = new JTabbedPane();
	1304	+ tabbedPane.add(scrollpane);
1273	1305
1274		- scenePanel.add(FSPane = new cFileSystemPane(this));
	1306	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1275	1307
1276		- optionsPanel = new JPanel(new GridBagLayout());
	1308	+ optionsPanel = new cGridBag().setVertical(true);
1277	1309
1278	1310	optionsPanel.setName("Options");
1279		- scenePanel.add(optionsPanel);
1280		-
	1311	+
	1312	+ AddOptions(optionsPanel); //, aConstraints);
	1313	+
	1314	+ tabbedPane.add(optionsPanel);
	1315	+
	1316	+ scenePanel.add(tabbedPane);
1281	1317
1282	1318	/*
1283	1319	cTree jTree = new cTree(null);
..	..	@@ -1311,6 +1347,7 @@
1311	1347	//bigPanel.setSize(new Dimension(10,10));
1312	1348	//bigPanel.add(ctrlPanel);
1313	1349	//bigPanel.add(gridPanel);
	1350	+ /**
1314	1351	bigThree = new JPanel();
1315	1352	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1316	1353	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1334,7 +1371,13 @@
1334	1371	// aConstraints.gridheight = 3;
1335	1372	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1336	1373	bigThree.add(XYZPanel, aWindowConstraints);
	1374	+ /**/
1337	1375
	1376	+ bigThree = new cGridBag();
	1377	+ bigThree.addComponent(scenePanel);
	1378	+ bigThree.addComponent(centralPanel);
	1379	+ bigThree.addComponent(XYZPanel);
	1380	+
1338	1381	// // SIDE EFFECT!!!
1339	1382	// aConstraints.gridx = 0;
1340	1383	// aConstraints.gridy = 0;
..	..	@@ -1355,7 +1398,8 @@
1355	1398	//worldPane.add(bigPanel);
1356	1399	//worldPane.add(worldPanel);
1357	1400	/**/
1358		- frame.getContentPane().add(/"Center",/framePanel);
	1401	+ //frame.getContentPane().add(/"Center",/framePanel);
	1402	+ frame.add(/"Center",/framePanel);
1359	1403	//frame.getContentPane().add(/"Center",/ worldPane);
1360	1404
1361	1405	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
..	..	@@ -1376,6 +1420,10 @@
1376	1420	});
1377	1421	}
1378	1422
	1423	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1424	+ {
	1425	+ }
	1426	+
1379	1427	JTree GetTree()
1380	1428	{
1381	1429	return objEditor.jTree;
..	..	@@ -1387,260 +1435,170 @@
1387	1435	ctrlPanel.removeAll();
1388	1436	}
1389	1437
1390		- void SetupMaterial(JPanel ctrlPanel)
	1438	+ void SetupMaterial(cGridBag panel)
1391	1439	{
1392		- aConstraints.weighty = 0;
1393		- //aConstraints.weightx = 1;
1394		- /*
	1440	+ /*
1395	1441	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1396	1442	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1397		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1398		- aConstraints.gridx += 1;
1399	1443	*/
1400	1444
1401		- aConstraints.gridwidth = 1;
1402		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1403		- aConstraints.gridx += 1;
1404		- aConstraints.weighty = 0;
1405		- aConstraints.gridwidth = 1;
	1445	+ cGridBag editBar = new cGridBag().setVertical(false);
	1446	+
	1447	+ editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1448	+ createMaterialButton.setToolTipText("Create material");
1406	1449
1407	1450	/*
1408	1451	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1409		- aConstraints.gridx += 1;
1410		- aConstraints.weighty = 0;
1411		- aConstraints.gridwidth = 1;
1412	1452	*/
1413	1453
1414		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1415		- aConstraints.gridx += 1;
	1454	+ editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1455	+ clearMaterialButton.setToolTipText("Clear material");
	1456	+
	1457	+ editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1458	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1459	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1416	1460
1417		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1418		-
1419		- aConstraints.gridx += 1;
1420		-
1421		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1422		-
1423		- aConstraints.gridx += 1;
1424		-
1425		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1426		-
1427		- aConstraints.gridx = 0;
1428		- aConstraints.gridy += 1;
1429		- aConstraints.weighty = 0;
1430		- aConstraints.gridwidth = 1;
	1461	+ editBar.preferredHeight = 15;
	1462	+
	1463	+ panel.add(editBar);
	1464	+
1431	1465	/**/
1432	1466	//aConstraints.weighty = 0;
1433	1467	////aConstraints.weightx = 1;
1434	1468	//aConstraints.weighty = 1;
1435	1469	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1436	1470	//aConstraints.gridx += 1;
1437		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1438		- aConstraints.weighty = 0;
1439		- aConstraints.gridx = 0;
1440		- aConstraints.gridy += 1;
1441		- aConstraints.gridwidth = 1;
	1471	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1442	1472
1443		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1444		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1445		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1446		- aConstraints.gridx += 1;
1447		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1448		- //aConstraints.weightx = 0;
1449		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1450		- aConstraints.gridx = 0;
1451		- aConstraints.gridy += 1;
1452		- aConstraints.gridwidth = 1;
	1473	+ cGridBag colorSection = new cGridBag().setVertical(true);
	1474	+
	1475	+ cGridBag color = new cGridBag();
	1476	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1477	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1478	+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1479	+ //colorField.preferredWidth = 200;
	1480	+ colorSection.add(color);
1453	1481
1454		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1455		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1456		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1457		- aConstraints.gridx += 1;
1458		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1459		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1460		- aConstraints.gridx = 0;
1461		- aConstraints.gridy += 1;
1462		- aConstraints.gridwidth = 1;
	1482	+ cGridBag modulation = new cGridBag();
	1483	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1484	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1485	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1486	+ colorSection.add(modulation);
1463	1487
1464		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1465		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1466		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1467		- aConstraints.gridx += 1;
1468		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1469		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1470		- aConstraints.gridx = 0;
1471		- aConstraints.gridy += 1;
1472		- aConstraints.gridwidth = 1;
	1488	+ cGridBag texture = new cGridBag();
	1489	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1490	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1491	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1492	+ colorSection.add(texture);
1473	1493
1474		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1475		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1476		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1477		- aConstraints.gridx += 1;
1478		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1479		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1480		- aConstraints.gridx = 0;
1481		- aConstraints.gridy += 1;
1482		- aConstraints.gridwidth = 1;
	1494	+ cGridBag anisoU = new cGridBag();
	1495	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1496	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1497	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1498	+ colorSection.add(anisoU);
1483	1499
1484		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1485		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1486		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1487		- aConstraints.gridx += 1;
1488		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1489		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1490		- aConstraints.gridx = 0;
1491		- aConstraints.gridy += 1;
1492		- aConstraints.gridwidth = 1;
	1500	+ cGridBag anisoV = new cGridBag();
	1501	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1502	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1503	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1504	+ colorSection.add(anisoV);
1493	1505
1494		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1495		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1496		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1497		- aConstraints.gridx += 1;
1498		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1499		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1500		- aConstraints.gridx = 0;
1501		- aConstraints.gridy += 1;
1502		- aConstraints.gridwidth = 1;
	1506	+ cGridBag shadowbias = new cGridBag();
	1507	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1508	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1509	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1510	+ colorSection.add(shadowbias);
1503	1511
1504		- //aConstraints.weighty = 1;
1505		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1506		- //aConstraints.gridx += 1;
1507		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1508		- aConstraints.weighty = 0;
1509		- aConstraints.gridx = 0;
1510		- aConstraints.gridy += 1;
1511		- aConstraints.gridwidth = 1;
	1512	+ panel.add(new JSeparator());
	1513	+
	1514	+ panel.add(colorSection);
	1515	+
	1516	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1517	+
	1518	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1519	+
	1520	+ cGridBag diffuse = new cGridBag();
	1521	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1522	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1523	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1524	+ diffuseSection.add(diffuse);
1512	1525
1513		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1514		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1515		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1516		- aConstraints.gridx += 1;
1517		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1518		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1519		- aConstraints.gridx = 0;
1520		- aConstraints.gridy += 1;
1521		- aConstraints.gridwidth = 1;
	1526	+ cGridBag diffuseness = new cGridBag();
	1527	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1528	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1529	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1530	+ diffuseSection.add(diffuseness);
1522	1531
1523		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1524		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1525		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1526		- aConstraints.gridx += 1;
1527		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1528		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1529		- aConstraints.gridx = 0;
1530		- aConstraints.gridy += 1;
1531		- aConstraints.gridwidth = 1;
	1532	+ cGridBag selfshadow = new cGridBag();
	1533	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1534	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1535	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1536	+ diffuseSection.add(selfshadow);
1532	1537
1533		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1534		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1535		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1536		- aConstraints.gridx += 1;
1537		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1538		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1539		- aConstraints.gridx = 0;
1540		- aConstraints.gridy += 1;
1541		- aConstraints.gridwidth = 1;
	1538	+ cGridBag sheen = new cGridBag();
	1539	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1540	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1541	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1542	+ diffuseSection.add(sheen);
1542	1543
1543		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1544		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1545		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1546		- aConstraints.gridx += 1;
1547		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1548		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1549		- aConstraints.gridx = 0;
1550		- aConstraints.gridy += 1;
1551		- aConstraints.gridwidth = 1;
	1544	+ cGridBag subsurface = new cGridBag();
	1545	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1546	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1547	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1548	+ diffuseSection.add(subsurface);
1552	1549
1553		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1554		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1555		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1556		- aConstraints.gridx += 1;
1557		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1558		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1559		- aConstraints.gridx = 0;
1560		- aConstraints.gridy += 1;
1561		- aConstraints.gridwidth = 1;
	1550	+ cGridBag shadow = new cGridBag();
	1551	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1552	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1553	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1554	+ diffuseSection.add(shadow);
1562	1555
1563		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1564		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1565		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1566		- aConstraints.gridx += 1;
1567		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1568		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1569		- aConstraints.gridx = 0;
1570		- aConstraints.gridy += 1;
1571		- aConstraints.gridwidth = 1;
	1556	+ cGridBag fakedepth = new cGridBag();
	1557	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1558	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1559	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1560	+ diffuseSection.add(fakedepth);
1572	1561
1573		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1574		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1575		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1576		- aConstraints.gridx += 1;
1577		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1578		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1579		- aConstraints.gridx = 0;
1580		- aConstraints.gridy += 1;
1581		- aConstraints.gridwidth = 1;
	1562	+ panel.add(new JSeparator());
	1563	+
	1564	+ panel.add(diffuseSection);
	1565	+
	1566	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1567	+
	1568	+ cGridBag specularSection = new cGridBag().setVertical(true);
1582	1569
1583		- //aConstraints.weighty = 1;
1584		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1585		- //aConstraints.gridx += 1;
1586		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1587		- aConstraints.weighty = 0;
1588		- aConstraints.gridx = 0;
1589		- aConstraints.gridy += 1;
1590		- aConstraints.gridwidth = 1;
	1570	+ cGridBag specular = new cGridBag();
	1571	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1572	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1573	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1574	+ specularSection.add(specular);
1591	1575
1592		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1593		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1594		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1595		- aConstraints.gridx += 1;
1596		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1597		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1598		- aConstraints.gridx = 0;
1599		- aConstraints.gridy += 1;
1600		- aConstraints.gridwidth = 1;
	1576	+ cGridBag lightarea = new cGridBag();
	1577	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1578	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1579	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1580	+ specularSection.add(lightarea);
1601	1581
1602		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1603		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1604		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1605		- aConstraints.gridx += 1;
1606		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1607		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1608		- aConstraints.gridx = 0;
1609		- aConstraints.gridy += 1;
1610		- aConstraints.gridwidth = 1;
	1582	+ cGridBag shininess = new cGridBag();
	1583	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1584	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1585	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1586	+ specularSection.add(shininess);
1611	1587
1612		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1613		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1614		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1615		- aConstraints.gridx += 1;
1616		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1617		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1618		- aConstraints.gridx = 0;
1619		- aConstraints.gridy += 1;
1620		- aConstraints.gridwidth = 1;
	1588	+ cGridBag metalness = new cGridBag();
	1589	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1590	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1591	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1592	+ specularSection.add(metalness);
1621	1593
1622		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1623		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1624		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1625		- aConstraints.gridx += 1;
1626		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1627		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1628		- aConstraints.gridx = 0;
1629		- aConstraints.gridy += 1;
1630		- aConstraints.gridwidth = 1;
	1594	+ cGridBag velvet = new cGridBag();
	1595	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1596	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1597	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1598	+ specularSection.add(velvet);
1631	1599
1632		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1633		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1634		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1635		- aConstraints.gridx += 1;
1636		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1637		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1638		- aConstraints.gridx = 0;
1639		- aConstraints.gridy += 1;
1640		- aConstraints.gridwidth = 1;
1641		-
1642		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1643		- Return();
	1600	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1601	+ //Return();
1644	1602	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1645	1603	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1646	1604	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1651,130 +1609,93 @@
1651	1609	// aConstraints.gridy += 1;
1652	1610	// aConstraints.gridwidth = 1;
1653	1611
1654		- //aConstraints.weighty = 1;
1655		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1656		- //aConstraints.gridx += 1;
1657		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1658		- aConstraints.weighty = 0;
1659		- aConstraints.gridx = 0;
1660		- aConstraints.gridy += 1;
1661		- aConstraints.gridwidth = 1;
1662	1612
1663		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1664		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1665		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1666		- aConstraints.gridx += 1;
1667		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1668		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1669		- aConstraints.gridx = 0;
1670		- aConstraints.gridy += 1;
1671		- aConstraints.gridwidth = 1;
	1613	+ panel.add(new JSeparator());
	1614	+
	1615	+ panel.add(specularSection);
	1616	+
	1617	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1618	+
	1619	+ cGridBag globalSection = new cGridBag().setVertical(true);
1672	1620
1673		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1674		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1675		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1676		- aConstraints.gridx += 1;
1677		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1678		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1679		- aConstraints.gridx = 0;
1680		- aConstraints.gridy += 1;
1681		- aConstraints.gridwidth = 1;
	1621	+ cGridBag camera = new cGridBag();
	1622	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1623	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1624	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1625	+ globalSection.add(camera);
1682	1626
1683		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1684		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1685		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1686		- aConstraints.gridx += 1;
1687		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1688		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1689		- aConstraints.gridx = 0;
1690		- aConstraints.gridy += 1;
1691		- aConstraints.gridwidth = 1;
	1627	+ cGridBag ambient = new cGridBag();
	1628	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1629	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1630	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1631	+ globalSection.add(ambient);
1692	1632
1693		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1694		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1695		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1696		- aConstraints.gridx += 1;
1697		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1698		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1699		- aConstraints.gridx = 0;
1700		- aConstraints.gridy += 1;
1701		- aConstraints.gridwidth = 1;
1702		- aConstraints.weighty = 0;
	1633	+ cGridBag backlit = new cGridBag();
	1634	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1635	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1636	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1637	+ globalSection.add(backlit);
1703	1638
1704		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1705		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1706		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1707		- aConstraints.gridx += 1;
1708		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1709		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1710		- aConstraints.gridx = 0;
1711		- aConstraints.gridy += 1;
1712		- aConstraints.gridwidth = 1;
	1639	+ cGridBag opacity = new cGridBag();
	1640	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1641	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1642	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1643	+ globalSection.add(opacity);
1713	1644
1714		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1715		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1716		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1717		- aConstraints.gridx += 1;
1718		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1719		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1720		- aConstraints.gridx = 0;
1721		- aConstraints.gridy += 1;
1722		- aConstraints.gridwidth = 1;
	1645	+ panel.add(new JSeparator());
	1646	+
	1647	+ panel.add(globalSection);
	1648	+
	1649	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1650	+
	1651	+ cGridBag textureSection = new cGridBag().setVertical(true);
1723	1652
1724		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1725		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1726		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1727		- aConstraints.gridx += 1;
1728		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1729		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1730		- aConstraints.gridx = 0;
1731		- aConstraints.gridy += 1;
1732		- aConstraints.gridwidth = 1;
	1653	+ cGridBag bump = new cGridBag();
	1654	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1655	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1656	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1657	+ textureSection.add(bump);
1733	1658
1734		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1735		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1736		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1737		- aConstraints.gridx += 1;
1738		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1739		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1740		- aConstraints.gridx = 0;
1741		- aConstraints.gridy += 1;
1742		- aConstraints.gridwidth = 1;
	1659	+ cGridBag noise = new cGridBag();
	1660	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1661	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1662	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1663	+ textureSection.add(noise);
1743	1664
1744		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1745		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1746		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1747		- aConstraints.gridx += 1;
1748		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1749		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1750		- aConstraints.gridx = 0;
1751		- aConstraints.gridy += 1;
1752		- aConstraints.gridwidth = 1;
	1665	+ cGridBag power = new cGridBag();
	1666	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1667	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1668	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1669	+ textureSection.add(power);
1753	1670
1754		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1755		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1756		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1757		- aConstraints.gridx += 1;
1758		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1759		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1760		- aConstraints.gridx = 0;
1761		- aConstraints.gridy += 1;
1762		- aConstraints.gridwidth = 1;
	1671	+ cGridBag borderfade = new cGridBag();
	1672	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1673	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1674	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1675	+ textureSection.add(borderfade);
1763	1676
1764		- //aConstraints.weighty = 1;
1765		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1766		- //aConstraints.gridx += 1;
1767		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1768		- aConstraints.weighty = 0;
	1677	+ cGridBag fog = new cGridBag();
	1678	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1679	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1680	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1681	+ textureSection.add(fog);
1769	1682
1770		- aConstraints.gridx = 0;
1771		- aConstraints.gridy = 0;
1772		- aConstraints.gridwidth = 1;
	1683	+ cGridBag opacityPower = new cGridBag();
	1684	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	1685	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1686	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	1687	+ textureSection.add(opacityPower);
	1688	+
	1689	+ panel.add(new JSeparator());
	1690	+
	1691	+ panel.add(textureSection);
	1692	+
	1693	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1773	1694
1774	1695	SetMaterial(copy); // .GetMaterial());
1775	1696
1776		- colorField.addChangeListener(this);
1777		- modulationField.addChangeListener(this);
	1697	+ //colorField.addChangeListener(this);
	1698	+// modulationField.addChangeListener(this);
1778	1699	metalnessField.addChangeListener(this);
1779	1700	diffuseField.addChangeListener(this);
1780	1701	specularField.addChangeListener(this);
..	..	@@ -2586,6 +2507,7 @@
2586	2507	}
2587	2508	if (input == null)
2588	2509	{
	2510	+ new Exception().printStackTrace();
2589	2511	System.exit(0);
2590	2512	}
2591	2513
..	..	@@ -2989,7 +2911,8 @@
2989	2911	if (timeline)
2990	2912	{
2991	2913	centralPanel.remove(cameraView);
2992		- centralPanel.add(timelinePanel);
	2914	+ cameraPanel.add(cameraView);
	2915	+ centralPanel.add(cameraPanel);
2993	2916	frame.setJMenuBar(timelineMenubar);
2994	2917	wasFullScreen = CameraPane.FULLSCREEN;
2995	2918	if (!CameraPane.FULLSCREEN)
..	..	@@ -2998,7 +2921,7 @@
2998	2921	}
2999	2922	else
3000	2923	{
3001		- centralPanel.remove(timelinePanel);
	2924	+ centralPanel.remove(cameraPanel);
3002	2925	centralPanel.add(cameraView);
3003	2926	frame.setJMenuBar(null);
3004	2927	if (!wasFullScreen)
..	..	@@ -3121,7 +3044,8 @@
3121	3044	objEditor.refreshContents();
3122	3045	} else if (event.getSource() == stepItem)
3123	3046	{
3124		- cameraView.ONESTEP = true;
	3047	+ //cameraView.ONESTEP = true;
	3048	+ Globals.ONESTEP = true;
3125	3049	cameraView.repaint();
3126	3050	return;
3127	3051	} else if (event.getSource() == stepButton)
..	..	@@ -3278,25 +3202,25 @@
3278	3202
3279	3203	void ToggleAnimation()
3280	3204	{
3281		- if (!CameraPane.ANIMATION)
	3205	+ if (!Globals.ANIMATION)
3282	3206	{
3283	3207	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3284	3208	browser.show();
3285	3209	String filename = browser.getFile();
3286	3210	if (filename != null && filename.length() > 0)
3287	3211	{
3288		- CameraPane.filename = browser.getDirectory() + filename;
	3212	+ Globals.filename = browser.getDirectory() + filename;
3289	3213	//CameraPane.framecount = 0;
3290		- CameraPane.imagecount = 0;
	3214	+ Globals.imagecount = 0;
3291	3215
3292		- CameraPane.ANIMATION ^= true;
	3216	+ Globals.ANIMATION ^= true;
3293	3217
3294	3218	GrafreeD.wav.cursor = 0;
3295	3219	GrafreeD.wav.loop = 0;
3296	3220	}
3297	3221	} else
3298	3222	{
3299		- CameraPane.ANIMATION ^= true;
	3223	+ Globals.ANIMATION ^= true;
3300	3224	}
3301	3225	}
3302	3226
..	..	@@ -3313,6 +3237,7 @@
3313	3237	callee.refreshContents();
3314	3238	} else
3315	3239	{
	3240	+ new Exception().printStackTrace();
3316	3241	System.exit(0);
3317	3242	}
3318	3243	}
..	..	@@ -3475,7 +3400,7 @@
3475	3400	current.fakedepth = (float) fakedepthField.getFloat();
3476	3401	current.shadowbias = (float) shadowbiasField.getFloat();
3477	3402
3478		- if (!NumberSlider.frozen)
	3403	+ if (!cNumberSlider.frozen)
3479	3404	{
3480	3405	//System.out.println("Propagate = " + propagate);
3481	3406	copy.UpdateMaterial(anchor, current, propagate);
..	..	@@ -3523,6 +3448,7 @@
3523	3448	\|\| e.getSource() == apertureField
3524	3449	\|\| e.getSource() == shadowblurField)
3525	3450	{
	3451	+ new Exception().printStackTrace();
3526	3452	System.exit(0);
3527	3453	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3528	3454	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3549,7 +3475,13 @@
3549	3475	//System.out.println("PARENT = " + parent);
3550	3476	//if (parent != null)
3551	3477	// parent.applySelf();
3552		- refreshContents();
	3478	+ if (e.getSource() == normalpushField)
	3479	+ {
	3480	+ objEditor.refreshContents();
	3481	+ //Refresh();
	3482	+ }
	3483	+ else
	3484	+ refreshContents();
3553	3485	// ??? client.refreshEditWindow();
3554	3486	}
3555	3487	//else
..	..	@@ -3561,7 +3493,7 @@
3561	3493	//group.name = nameField.getText();
3562	3494	//objEditor.applySelf();
3563	3495
3564		- assert (objEditor == this);
	3496	+ // OCT2018: assert (objEditor == this);
3565	3497	if (copy.selection == null \|\| copy.selection.size() == 0)
3566	3498	//super.applySelf()
3567	3499	; else
..	..	@@ -3585,6 +3517,9 @@
3585	3517	objEditor.copy = keep;
3586	3518	}
3587	3519	}
	3520	+
	3521	+ if (normalpushField != null)
	3522	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
3588	3523	}
3589	3524
3590	3525	void SnapObject()
..	..	@@ -3839,7 +3774,7 @@
3839	3774
3840	3775	radioPanel.revalidate();
3841	3776	radioPanel.repaint();
3842		- ctrlPanel.revalidate(); // ? new
	3777	+ ctrlPanel.validate(); // ? new
3843	3778	ctrlPanel.repaint();
3844	3779	}
3845	3780	}
..	..	@@ -4485,8 +4420,8 @@
4485	4420	//MenuItem normalLensItem;
4486	4421	MenuItem editCameraItem;
4487	4422	MenuItem revertCameraItem;
4488		- CheckboxMenuItem toggleLiveItem;
4489	4423	MenuItem stepItem;
	4424	+ CheckboxMenuItem toggleLiveItem;
4490	4425	CheckboxMenuItem toggleFullScreenItem;
4491	4426	CheckboxMenuItem toggleTimelineItem;
4492	4427	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4503,20 +4438,21 @@
4503	4438	JSplitPane mainPanel;
4504	4439	JScrollPane scrollpane;
4505	4440	JPanel toolbarPanel;
4506		- JPanel treePanel;
	4441	+ cGridBag treePanel;
4507	4442	JPanel radioPanel;
4508	4443	ButtonGroup buttonGroup;
4509		- JPanel ctrlPanel;
4510		- JPanel materialPanel;
	4444	+ cGridBag ctrlPanel;
	4445	+ cGridBag materialPanel;
4511	4446	JScrollPane infoPanel;
4512		- JPanel optionsPanel;
	4447	+ cGridBag optionsPanel;
4513	4448	JTabbedPane objectPanel;
4514		- JPanel XYZPanel;
	4449	+ cGridBag XYZPanel;
4515	4450	JSplitPane gridPanel;
4516	4451	JSplitPane bigPanel;
4517		- JPanel bigThree;
4518		- JTabbedPane scenePanel;
4519		- JPanel centralPanel;
	4452	+ cGridBag bigThree;
	4453	+ cGridBag scenePanel;
	4454	+ cGridBag centralPanel;
	4455	+ JSplitPane cameraPanel;
4520	4456	JPanel timelinePanel;
4521	4457	JMenuBar timelineMenubar;
4522	4458	JSplitPane framePanel;
..	..	@@ -4568,65 +4504,67 @@
4568	4504	// MATERIAL
4569	4505	JLabel materialLabel;
4570	4506	JLabel colorLabel;
4571		- NumberSlider colorField;
	4507	+ cNumberSlider colorField;
4572	4508	JLabel modulationLabel;
4573		- NumberSlider modulationField;
	4509	+ cNumberSlider modulationField;
4574	4510	JLabel metalnessLabel;
4575		- NumberSlider metalnessField;
	4511	+ cNumberSlider metalnessField;
4576	4512	JLabel diffuseLabel;
4577		- NumberSlider diffuseField;
	4513	+ cNumberSlider diffuseField;
4578	4514	JLabel specularLabel;
4579		- NumberSlider specularField;
	4515	+ cNumberSlider specularField;
4580	4516	JLabel shininessLabel;
4581		- NumberSlider shininessField;
	4517	+ cNumberSlider shininessField;
4582	4518	JLabel shiftLabel;
4583		- NumberSlider shiftField;
	4519	+ cNumberSlider shiftField;
4584	4520	JLabel ambientLabel;
4585		- NumberSlider ambientField;
	4521	+ cNumberSlider ambientField;
4586	4522	JLabel lightareaLabel;
4587		- NumberSlider lightareaField;
	4523	+ cNumberSlider lightareaField;
4588	4524	JLabel diffusenessLabel;
4589		- NumberSlider diffusenessField;
	4525	+ cNumberSlider diffusenessField;
4590	4526	JLabel velvetLabel;
4591		- NumberSlider velvetField;
	4527	+ cNumberSlider velvetField;
4592	4528	JLabel sheenLabel;
4593		- NumberSlider sheenField;
	4529	+ cNumberSlider sheenField;
4594	4530	JLabel subsurfaceLabel;
4595		- NumberSlider subsurfaceField;
	4531	+ cNumberSlider subsurfaceField;
4596	4532	//JLabel bumpLabel;
4597	4533	//NumberSlider bumpField;
4598	4534	JLabel backlitLabel;
4599		- NumberSlider backlitField;
	4535	+ cNumberSlider backlitField;
4600	4536	JLabel anisoLabel;
4601		- NumberSlider anisoField;
	4537	+ cNumberSlider anisoField;
4602	4538	JLabel anisoVLabel;
4603		- NumberSlider anisoVField;
	4539	+ cNumberSlider anisoVField;
4604	4540	JLabel cameraLabel;
4605		- NumberSlider cameraField;
	4541	+ cNumberSlider cameraField;
4606	4542	JLabel selfshadowLabel;
4607		- NumberSlider selfshadowField;
	4543	+ cNumberSlider selfshadowField;
4608	4544	JLabel shadowLabel;
4609		- NumberSlider shadowField;
	4545	+ cNumberSlider shadowField;
4610	4546	JLabel textureLabel;
4611		- NumberSlider textureField;
	4547	+ cNumberSlider textureField;
4612	4548	JLabel opacityLabel;
4613		- NumberSlider opacityField;
	4549	+ cNumberSlider opacityField;
4614	4550	JLabel fakedepthLabel;
4615		- NumberSlider fakedepthField;
	4551	+ cNumberSlider fakedepthField;
4616	4552	JLabel shadowbiasLabel;
4617		- NumberSlider shadowbiasField;
	4553	+ cNumberSlider shadowbiasField;
4618	4554	JLabel bumpLabel;
4619		- NumberSlider bumpField;
	4555	+ cNumberSlider bumpField;
4620	4556	JLabel noiseLabel;
4621		- NumberSlider noiseField;
	4557	+ cNumberSlider noiseField;
4622	4558	JLabel powerLabel;
4623		- NumberSlider powerField;
	4559	+ cNumberSlider powerField;
4624	4560	JLabel borderfadeLabel;
4625		- NumberSlider borderfadeField;
	4561	+ cNumberSlider borderfadeField;
4626	4562	JLabel fogLabel;
4627		- NumberSlider fogField;
	4563	+ cNumberSlider fogField;
4628	4564	JLabel opacityPowerLabel;
4629		- NumberSlider opacityPowerField;
	4565	+ cNumberSlider opacityPowerField;
4630	4566	JTree jTree;
4631	4567	//ObjectUI parent;
	4568	+
	4569	+ cNumberSlider normalpushField;
4632	4570	}