~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,
..	..	@@ -28,7 +30,12 @@
28	30	iSendInfo
29	31	//KeyListener
30	32	{
	33	+ boolean timeline;
	34	+ boolean wasFullScreen;
31	35
	36	+ GroupEditor callee;
	37	+ JFrame frame;
	38	+
32	39	// SCRIPT
33	40
34	41	transient JFrame textpanel = null;
..	..	@@ -119,51 +126,60 @@
119	126	void keyPressed(int key, int modifiers)
120	127	{
121	128	System.out.println("KEY PRESSED");
122		- CameraPane.theRenderer.keyPressed(key, modifiers);
	129	+ Globals.theRenderer.keyPressed(key, modifiers);
123	130	}
124	131	*/
125	132
126	133	static GridBagConstraints aConstraints;
127	134	static GridBagConstraints aWindowConstraints;
128		- GroupEditor callee;
129		- JFrame frame;
	135	+
130	136	static int GRIDWIDTH = 100; // 4;
131	137
132	138	public void closeUI()
133	139	{
134	140	//new Exception().printStackTrace();
135		- System.out.println("this = " + this);
136		- System.out.println("objEditor = " + objEditor);
	141	+// System.out.println("this = " + this);
	142	+// System.out.println("objEditor = " + objEditor);
137	143	//nameField.removeActionListener(this);
138		- objEditor.ctrlPanel.remove(nameField);
	144	+// objEditor.ctrlPanel.remove(nameField);
139	145
140	146	if (!GroupEditor.allparams)
141	147	return;
142	148
143		- objEditor.ctrlPanel.remove(liveCB);
144		- objEditor.ctrlPanel.remove(hideCB);
145		- objEditor.ctrlPanel.remove(markCB);
146		-
147		- objEditor.ctrlPanel.remove(randomCB);
148		- objEditor.ctrlPanel.remove(speedupCB);
149		- objEditor.ctrlPanel.remove(rewindCB);
150		-
151		- objEditor.ctrlPanel.remove(resetButton);
152		- objEditor.ctrlPanel.remove(stepButton);
153		-// objEditor.ctrlPanel.remove(stepAllButton);
154		-// objEditor.ctrlPanel.remove(resetAllButton);
155		- objEditor.ctrlPanel.remove(link2masterCB);
156		- //objEditor.ctrlPanel.remove(flipVCB);
157		- //objEditor.ctrlPanel.remove(texresMenu);
158		- objEditor.ctrlPanel.remove(slowerButton);
159		- objEditor.ctrlPanel.remove(fasterButton);
160		- 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);
161	175	}
162	176
163	177	public ObjEditor GetEditor()
164	178	{
165	179	return objEditor; //.GetEditor();
166	180	}
	181	+
	182	+ // Sometimes myself, sometimes my callee's.
167	183	ObjEditor objEditor;
168	184
169	185	/*
..	..	@@ -238,7 +254,7 @@
238	254	//if (!isDisplayable())
239	255	//setUndecorated(true);
240	256
241		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	257	+ //System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
242	258	client = inClient;
243	259	copy = localCopy;
244	260	copy.editWindow = this;
..	..	@@ -292,16 +308,18 @@
292	308	//normalLensItem.addActionListener(this);
293	309	cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
294	310	revertCameraItem.addActionListener(this);
295		- cameraMenu.add(toggleFullItem = new CheckboxMenuItem("Full Screen"));
296		- toggleFullItem.addItemListener(this);
297		- toggleFullItem.setState(CameraPane.FULLSCREEN);
	311	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	312	+ toggleTimelineItem.addItemListener(this);
	313	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	314	+ toggleFullScreenItem.addItemListener(this);
	315	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
298	316	cameraMenu.add("-");
299	317	cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
300	318	toggleTextureItem.addItemListener(this);
301	319	toggleTextureItem.setState(CameraPane.textureon);
302	320	cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
303	321	toggleLiveItem.addItemListener(this);
304		- toggleLiveItem.setState(CameraPane.isLIVE());
	322	+ toggleLiveItem.setState(Globals.isLIVE());
305	323	cameraMenu.add(stepItem = new MenuItem("Step"));
306	324	stepItem.addActionListener(this);
307	325	// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
..	..	@@ -341,21 +359,23 @@
341	359	objectPanel = new JTabbedPane();
342	360	toolbarPanel = new JPanel();
343	361	toolbarPanel.setName("Toolbar");
344		- treePanel = new JPanel();
	362	+ treePanel = new cGridBag();
345	363	treePanel.setName("Tree");
346		- ctrlPanel = new JPanel(); // new GridBagLayout());
	364	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
347	365	ctrlPanel.setName("Edit");
348		- materialPanel = new JPanel();
	366	+ materialPanel = new cGridBag().setVertical(true);
349	367	materialPanel.setName("Material");
350	368	/JTextPane/
351	369	infoarea = createTextPane();
	370	+ doc = infoarea.getStyledDocument();
	371	+
352	372	infoarea.setEditable(true);
353	373	SetText();
354	374	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
355	375	// infoarea.setOpaque(false);
356	376	// //infoarea.setForeground(textcolor);
357		- infoarea.setLineWrap(true);
358		- infoarea.setWrapStyleWord(true);
	377	+// TEXTAREA infoarea.setLineWrap(true);
	378	+// TEXTAREA infoarea.setWrapStyleWord(true);
359	379	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
360	380	infoPanel.setPreferredSize(new Dimension(50, 200));
361	381	infoPanel.setName("Info");
..	..	@@ -366,16 +386,16 @@
366	386	mainPanel.setName("Main");
367	387	mainPanel.setContinuousLayout(true);
368	388	mainPanel.setOneTouchExpandable(true);
369		- mainPanel.setDividerLocation(1.0);
370	389	mainPanel.setDividerSize(9);
371		- mainPanel.setResizeWeight(0);
	390	+ mainPanel.setDividerLocation(0.5); //1.0);
	391	+ mainPanel.setResizeWeight(0.5);
372	392
373	393	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
374	394	//mainPanel.setLayout(new GridBagLayout());
375	395	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
376		- treePanel.setLayout(new GridBagLayout());
377		- ctrlPanel.setLayout(new GridBagLayout());
378		- materialPanel.setLayout(new GridBagLayout());
	396	+// treePanel.setLayout(new GridBagLayout());
	397	+ //ctrlPanel.setLayout(new GridBagLayout());
	398	+ //materialPanel.setLayout(new GridBagLayout());
379	399
380	400	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
381	401	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -414,7 +434,7 @@
414	434	static String newline = "\n";
415	435	protected static final String buttonString = "JButton";
416	436	StyledDocument doc;
417		- JTextArea infoarea;
	437	+ JTextPane infoarea;
418	438
419	439	void ClearInfo()
420	440	{
..	..	@@ -481,7 +501,10 @@
481	501	}
482	502
483	503	if (full)
484		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	504	+ {
	505	+ si.SendInfo(" BBox min: " + minima, "regular");
	506	+ si.SendInfo(" BBox max: " + maxima, "regular");
	507	+ }
485	508
486	509	if (sel.bRep != null)
487	510	{
..	..	@@ -579,6 +602,9 @@
579	602	{
580	603	CameraPane.pointflow = (PointFlow) sel;
581	604	}
	605	+
	606	+ si.SendInfo("_____________________", "regular");
	607	+ si.SendInfo("", "regular");
582	608	}
583	609	}
584	610
..	..	@@ -594,52 +620,68 @@
594	620	}
595	621	}
596	622
597		- private JTextArea createTextPane()
598		- {
599		- String[] initString =
	623	+ void ToggleFullScreen()
600	624	{
601		- "This is an editable JTextPane, ", //regular
602		- "another ", //italic
603		- "styled ", //bold
604		- "text ", //small
605		- "component, ", //large
606		- "which supports embedded components..." + newline,//regular
607		- " " + newline, //button
608		- "...and embedded icons..." + newline, //regular
609		- " ", //icon
610		- newline + "JTextPane is a subclass of JEditorPane that "
611		- + "uses a StyledEditorKit and StyledDocument, and provides "
612		- + "cover methods for interacting with those objects."
613		- };
614		-
615		- String[] initStyles =
616		- {
617		- "regular", "italic", "bold", "small", "large",
618		- "regular", "button", "regular", "icon",
619		- "regular"
620		- };
621		-
622		- JTextPane textPane = new JTextPane();
623		- textPane.setEditable(true);
624		- /StyledDocument/ doc = textPane.getStyledDocument();
625		- addStylesToDocument(doc);
626		-
627		- try
628		- {
629		- for (int j = 0; j < 2; j++)
630		- {
631		- for (int i = 0; i < initString.length; i++)
	625	+ if (CameraPane.FULLSCREEN)
632	626	{
633		- doc.insertString(doc.getLength(), initString[i],
634		- doc.getStyle(initStyles[i]));
	627	+ frame.getContentPane().remove(/"Center",/bigThree);
	628	+ framePanel.add(bigThree);
	629	+ frame.getContentPane().add(/"Center",/framePanel);
	630	+ } else
	631	+ {
	632	+ frame.getContentPane().remove(/"Center",/framePanel);
	633	+ framePanel.remove(bigThree);
	634	+ frame.getContentPane().add(/"Center",/bigThree);
635	635	}
636		- }
637		- } catch (BadLocationException ble)
638		- {
639		- System.err.println("Couldn't insert initial text into text pane.");
	636	+ cameraView.ToggleFullScreen();
640	637	}
641	638
642		- return new JTextArea(); // textPane;
	639	+ private JTextPane createTextPane()
	640	+ {
	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	+// }
	683	+
	684	+ return new JTextPane(); // textPane;
643	685	}
644	686
645	687	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -739,115 +781,83 @@
739	781	JButton slowerButton;
740	782	JButton fasterButton;
741	783	JButton remarkButton;
	784	+
	785	+ cGridBag namePanel;
	786	+ cGridBag setupPanel;
	787	+ cGridBag commandsPanel;
	788	+ cGridBag pushPanel;
	789	+ cGridBag fillPanel;
742	790
743		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	791	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
744	792	{
745	793	JCheckBox cb;
746	794
747		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
748		- oe.aConstraints.gridwidth = 1; // 3;
749		-// oe.aConstraints.weightx = 1;
750		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
751		- 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);
752	796	cb.addItemListener(this);
753		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
754		- oe.aConstraints.gridwidth = 1;
755		- oe.aConstraints.gridx += 1;
756	797
757	798	return cb;
758	799	}
759	800
760		- cButton AddButton(ObjEditor oe, String label)
	801	+ cButton AddButton(cGridBag panel, String label)
761	802	{
762	803	cButton cb;
763	804
764		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
765		- oe.aConstraints.gridwidth = 1;
766		-// oe.aConstraints.weightx = 1;
767		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
768		- 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);
769	806	cb.addActionListener(this);
770		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
771		- oe.aConstraints.gridwidth = 1;
772		- oe.aConstraints.gridx += 1;
773	807
774	808	return cb;
775	809	}
776	810
777		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	811	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
778	812	{
779	813	JComboBox combo;
780	814
781		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
782		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
783		- oe.aConstraints.gridx += 1;
	815	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
784	816	combo.addActionListener(this);
785	817
786	818	return combo;
787	819	}
788	820
789		- 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)
790	822	{
791		- NumberSlider combo;
	823	+ cGridBag control = new cGridBag();
	824	+
	825	+ cNumberSlider combo;
792	826
793	827	JLabel jlabel = new JLabel(label);
794		-
795		- aConstraints.fill = GridBagConstraints.VERTICAL;
796	828	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
797		- aConstraints.gridwidth = 2;
798		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
799		- aConstraints.gridx += 1;
800		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
801		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
802		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
803		- aConstraints.gridx += 1;
804		- aConstraints.gridwidth = 1;
805		-
	829	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	830	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
806	831	combo.setFloat(current);
807		-
808		- combo.label = jlabel;
809		-
810		- combo.addChangeListener(this);
811		-
812		- return combo;
	832	+
	833	+ panel.add(control);
	834	+
	835	+ return control;
813	836	}
814	837
815		- 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)
816	839	{
817		- NumberSlider combo;
	840	+ cGridBag control = new cGridBag();
	841	+
	842	+ cNumberSlider combo;
818	843
819	844	JLabel jlabel = new JLabel(label);
820		-
821		- aConstraints.fill = GridBagConstraints.VERTICAL;
822	845	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
823		- aConstraints.gridwidth = 2;
824		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
825		- aConstraints.gridx += 1;
826		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
827		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
828		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
829		- aConstraints.gridx += 1;
830		- aConstraints.gridwidth = 1;
831		-
	846	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	847	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
832	848	combo.setInteger(current);
833	849
834		- combo.label = jlabel;
835		-
836		- combo.addChangeListener(this);
837		-
838		- return combo;
	850	+ panel.add(control);
	851	+
	852	+ return control;
839	853	}
840	854
841		- JTextArea AddText(JPanel ctrlPanel, String name)
	855	+ JTextArea AddText(cGridBag ctrlPanel, String name)
842	856	{
843	857	JTextArea text;
844	858
845		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
846		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
847		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	859	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
848	860	text.addCaretListener(this);
849		- aConstraints.gridx += 1;
850		- aConstraints.gridwidth = 1;
851	861
852	862	return text;
853	863	}
..	..	@@ -877,9 +887,16 @@
877	887	objEditor.ctrlPanel.remove(j);
878	888	}
879	889
	890	+ void Remove(cNumberSlider j)
	891	+ {
	892	+ j.removeChangeListener(this);
	893	+ //objEditor.ctrlPanel.remove(j.label);
	894	+ objEditor.ctrlPanel.remove(j);
	895	+ }
	896	+
880	897	/*
881	898	*/
882		- void Return() // ObjEditor oe)
	899	+ void Return0() // ObjEditor oe)
883	900	{
884	901	aConstraints.gridy += 1;
885	902	aConstraints.gridx = 0;
..	..	@@ -938,31 +955,53 @@
938	955	// oe.aConstraints.weighty = 0;
939	956	// oe.aConstraints.gridx = 0;
940	957	// oe.aConstraints.gridy = 0;
941		- 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();
942	967
943	968	if (!GroupEditor.allparams)
944	969	return;
945	970
946		- liveCB = AddCheckBox(oe, "Live", copy.live);
947		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
948		- 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);
949	976	// Return();
950		- markCB = AddCheckBox(oe, "Mark", copy.marked);
951		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
952		- randomCB = AddCheckBox(oe, "Rand", copy.random);
953		- Return();
954		- resetButton = AddButton(oe, "Reset");
955		- 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");
956	988	// resetAllButton = AddButton(oe, "Reset All");
957	989	// stepAllButton = AddButton(oe, "Step All");
958		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
	990	+ speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
959	991	// Return();
960		- slowerButton = AddButton(oe, "Slow");
961		- fasterButton = AddButton(oe, "Fast");
962		- remarkButton = AddButton(oe, "Rem");
	992	+ slowerButton = AddButton(commandsPanel, "Slow");
	993	+ fasterButton = AddButton(commandsPanel, "Fast");
	994	+ remarkButton = AddButton(commandsPanel, "Remark");
963	995
964		- Return();
	996	+ oe.ctrlPanel.add(commandsPanel);
	997	+ oe.ctrlPanel.Return();
965	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	+
966	1005	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
967	1006	// ObjEditor.aConstraints.gridx += 1;
968	1007
..	..	@@ -1056,7 +1095,7 @@
1056	1095	oe.aConstraints.gridwidth = 1;
1057	1096	/**/
1058	1097	nameField = AddText(oe.ctrlPanel, copy.GetName());
1059		- Return();
	1098	+ oe.ctrlPanel.Return();
1060	1099
1061	1100	//ctrlPanel.add(textureButton = new Button("Texture..."));
1062	1101	//textureButton.setEnabled(false);
..	..	@@ -1158,10 +1197,22 @@
1158	1197	//JPanel worldPanel =
1159	1198	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1160	1199	//worldPanel.setName("World");
1161		- /JPanel/ cameraPanel =
1162		- new JPanel(new BorderLayout());
1163		- cameraPanel.add(cameraView);
	1200	+ centralPanel = new cGridBag();
	1201	+ centralPanel.preferredWidth = 20;
	1202	+ timelinePanel = new JPanel(new BorderLayout());
	1203	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1164	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	+
	1212	+ centralPanel.add(cameraView);
	1213	+ //frame.setJMenuBar(timelineMenubar);
	1214	+ //centralPanel.add(timelinePanel);
	1215	+
1165	1216	//topView.camera = ;
1166	1217	//frontView.camera = new Camera(2);
1167	1218	//sideView.camera = new Camera(3);
..	..	@@ -1177,12 +1228,13 @@
1177	1228	//frontView.object = copy;
1178	1229	//sideView.object = copy;
1179	1230
1180		- XYZPanel = new JPanel();
1181		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1231	+ XYZPanel = new cGridBag().setVertical(true);
	1232	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1182	1233
1183		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1184		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1185		- 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);
1186	1238
1187	1239	/*
1188	1240	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1191,7 +1243,7 @@
1191	1243	gridPanel.add(cameraView);
1192	1244	gridPanel.add(XYZPanel);
1193	1245	*/
1194		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, cameraPanel, XYZPanel); //new BorderLayout());
	1246	+ gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1195	1247	gridPanel.setContinuousLayout(true);
1196	1248	gridPanel.setOneTouchExpandable(true);
1197	1249	gridPanel.setDividerLocation(1.0);
..	..	@@ -1220,10 +1272,11 @@
1220	1272	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1221	1273	//tmp.setName("Edit");
1222	1274	objectPanel.add(materialPanel);
1223		- JPanel north = new JPanel(new BorderLayout());
1224		- north.setName("Edit");
1225		- north.add(ctrlPanel, BorderLayout.NORTH);
1226		- 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);
1227	1280	objectPanel.add(infoPanel);
1228	1281
1229	1282	/*
..	..	@@ -1244,16 +1297,23 @@
1244	1297	scrollpane.setWheelScrollingEnabled(true);
1245	1298	scrollpane.addMouseWheelListener(this); // Default not fast enough
1246	1299
1247		- /JTabbedPane/ jtp = new JTabbedPane();
1248		- jtp.add(scrollpane);
	1300	+ /JTabbedPane/ scenePanel = new cGridBag();
	1301	+ scenePanel.preferredWidth = 7;
	1302	+
	1303	+ JTabbedPane tabbedPane = new JTabbedPane();
	1304	+ tabbedPane.add(scrollpane);
1249	1305
1250		- jtp.add(FSPane = new cFileSystemPane(this));
	1306	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1251	1307
1252		- optionsPanel = new JPanel(new GridBagLayout());
	1308	+ optionsPanel = new cGridBag().setVertical(true);
1253	1309
1254	1310	optionsPanel.setName("Options");
1255		- jtp.add(optionsPanel);
1256		-
	1311	+
	1312	+ AddOptions(optionsPanel); //, aConstraints);
	1313	+
	1314	+ tabbedPane.add(optionsPanel);
	1315	+
	1316	+ scenePanel.add(tabbedPane);
1257	1317
1258	1318	/*
1259	1319	cTree jTree = new cTree(null);
..	..	@@ -1275,7 +1335,7 @@
1275	1335	jtp.add(tree);
1276	1336	*/
1277	1337
1278		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, jtp, gridPanel);
	1338	+ bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1279	1339	bigPanel.setContinuousLayout(true);
1280	1340	bigPanel.setOneTouchExpandable(true);
1281	1341	bigPanel.setDividerLocation(0.8);
..	..	@@ -1287,6 +1347,7 @@
1287	1347	//bigPanel.setSize(new Dimension(10,10));
1288	1348	//bigPanel.add(ctrlPanel);
1289	1349	//bigPanel.add(gridPanel);
	1350	+ /**
1290	1351	bigThree = new JPanel();
1291	1352	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1292	1353	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1297,20 +1358,26 @@
1297	1358	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1298	1359	aWindowConstraints.weightx = 0;
1299	1360	aWindowConstraints.weighty = 1;
1300		- bigThree.add(jtp, aWindowConstraints);
	1361	+ bigThree.add(scenePanel, aWindowConstraints);
1301	1362	aWindowConstraints.weightx = 1;
1302	1363	aWindowConstraints.gridwidth = 3;
1303	1364	// aConstraints.gridheight = 3;
1304	1365	aWindowConstraints.gridx = 1;
1305	1366	aWindowConstraints.fill = GridBagConstraints.BOTH;
1306		- bigThree.add(cameraPanel, aWindowConstraints);
	1367	+ bigThree.add(centralPanel, aWindowConstraints);
1307	1368	aWindowConstraints.weightx = 0;
1308	1369	aWindowConstraints.gridx = 4;
1309	1370	aWindowConstraints.gridwidth = 1;
1310	1371	// aConstraints.gridheight = 3;
1311	1372	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1312	1373	bigThree.add(XYZPanel, aWindowConstraints);
	1374	+ /**/
1313	1375
	1376	+ bigThree = new cGridBag();
	1377	+ bigThree.addComponent(scenePanel);
	1378	+ bigThree.addComponent(centralPanel);
	1379	+ bigThree.addComponent(XYZPanel);
	1380	+
1314	1381	// // SIDE EFFECT!!!
1315	1382	// aConstraints.gridx = 0;
1316	1383	// aConstraints.gridy = 0;
..	..	@@ -1331,7 +1398,8 @@
1331	1398	//worldPane.add(bigPanel);
1332	1399	//worldPane.add(worldPanel);
1333	1400	/**/
1334		- frame.getContentPane().add(/"Center",/framePanel);
	1401	+ //frame.getContentPane().add(/"Center",/framePanel);
	1402	+ frame.add(/"Center",/framePanel);
1335	1403	//frame.getContentPane().add(/"Center",/ worldPane);
1336	1404
1337	1405	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
..	..	@@ -1352,6 +1420,10 @@
1352	1420	});
1353	1421	}
1354	1422
	1423	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1424	+ {
	1425	+ }
	1426	+
1355	1427	JTree GetTree()
1356	1428	{
1357	1429	return objEditor.jTree;
..	..	@@ -1363,260 +1435,170 @@
1363	1435	ctrlPanel.removeAll();
1364	1436	}
1365	1437
1366		- void SetupMaterial(JPanel ctrlPanel)
	1438	+ void SetupMaterial(cGridBag panel)
1367	1439	{
1368		- aConstraints.weighty = 0;
1369		- //aConstraints.weightx = 1;
1370		- /*
	1440	+ /*
1371	1441	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1372	1442	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1373		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1374		- aConstraints.gridx += 1;
1375	1443	*/
1376	1444
1377		- aConstraints.gridwidth = 1;
1378		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1379		- aConstraints.gridx += 1;
1380		- aConstraints.weighty = 0;
1381		- 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");
1382	1449
1383	1450	/*
1384	1451	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1385		- aConstraints.gridx += 1;
1386		- aConstraints.weighty = 0;
1387		- aConstraints.gridwidth = 1;
1388	1452	*/
1389	1453
1390		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1391		- 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);
1392	1460
1393		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1394		-
1395		- aConstraints.gridx += 1;
1396		-
1397		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1398		-
1399		- aConstraints.gridx += 1;
1400		-
1401		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1402		-
1403		- aConstraints.gridx = 0;
1404		- aConstraints.gridy += 1;
1405		- aConstraints.weighty = 0;
1406		- aConstraints.gridwidth = 1;
	1461	+ editBar.preferredHeight = 15;
	1462	+
	1463	+ panel.add(editBar);
	1464	+
1407	1465	/**/
1408	1466	//aConstraints.weighty = 0;
1409	1467	////aConstraints.weightx = 1;
1410	1468	//aConstraints.weighty = 1;
1411	1469	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1412	1470	//aConstraints.gridx += 1;
1413		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1414		- aConstraints.weighty = 0;
1415		- aConstraints.gridx = 0;
1416		- aConstraints.gridy += 1;
1417		- aConstraints.gridwidth = 1;
	1471	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1418	1472
1419		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1420		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1421		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1422		- aConstraints.gridx += 1;
1423		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1424		- //aConstraints.weightx = 0;
1425		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1426		- aConstraints.gridx = 0;
1427		- aConstraints.gridy += 1;
1428		- 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);
1429	1481
1430		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1431		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1432		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1433		- aConstraints.gridx += 1;
1434		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1435		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1436		- aConstraints.gridx = 0;
1437		- aConstraints.gridy += 1;
1438		- 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);
1439	1487
1440		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1441		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1442		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1443		- aConstraints.gridx += 1;
1444		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1445		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1446		- aConstraints.gridx = 0;
1447		- aConstraints.gridy += 1;
1448		- 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);
1449	1493
1450		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1451		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1452		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1453		- aConstraints.gridx += 1;
1454		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1455		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1456		- aConstraints.gridx = 0;
1457		- aConstraints.gridy += 1;
1458		- 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);
1459	1499
1460		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1461		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1462		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1463		- aConstraints.gridx += 1;
1464		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1465		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1466		- aConstraints.gridx = 0;
1467		- aConstraints.gridy += 1;
1468		- 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);
1469	1505
1470		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1471		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1472		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1473		- aConstraints.gridx += 1;
1474		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1475		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1476		- aConstraints.gridx = 0;
1477		- aConstraints.gridy += 1;
1478		- 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);
1479	1511
1480		- //aConstraints.weighty = 1;
1481		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1482		- //aConstraints.gridx += 1;
1483		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1484		- aConstraints.weighty = 0;
1485		- aConstraints.gridx = 0;
1486		- aConstraints.gridy += 1;
1487		- 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);
1488	1525
1489		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1490		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1491		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1492		- aConstraints.gridx += 1;
1493		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1494		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1495		- aConstraints.gridx = 0;
1496		- aConstraints.gridy += 1;
1497		- 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);
1498	1531
1499		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1500		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1501		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1502		- aConstraints.gridx += 1;
1503		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1504		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1505		- aConstraints.gridx = 0;
1506		- aConstraints.gridy += 1;
1507		- 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);
1508	1537
1509		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1510		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1511		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1512		- aConstraints.gridx += 1;
1513		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1514		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1515		- aConstraints.gridx = 0;
1516		- aConstraints.gridy += 1;
1517		- 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);
1518	1543
1519		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1520		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1521		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1522		- aConstraints.gridx += 1;
1523		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1524		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1525		- aConstraints.gridx = 0;
1526		- aConstraints.gridy += 1;
1527		- 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);
1528	1549
1529		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1530		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1531		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1532		- aConstraints.gridx += 1;
1533		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1534		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1535		- aConstraints.gridx = 0;
1536		- aConstraints.gridy += 1;
1537		- 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);
1538	1555
1539		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1540		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1541		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1542		- aConstraints.gridx += 1;
1543		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1544		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1545		- aConstraints.gridx = 0;
1546		- aConstraints.gridy += 1;
1547		- 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);
1548	1561
1549		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1550		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1551		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1552		- aConstraints.gridx += 1;
1553		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1554		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1555		- aConstraints.gridx = 0;
1556		- aConstraints.gridy += 1;
1557		- 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);
1558	1569
1559		- //aConstraints.weighty = 1;
1560		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1561		- //aConstraints.gridx += 1;
1562		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1563		- aConstraints.weighty = 0;
1564		- aConstraints.gridx = 0;
1565		- aConstraints.gridy += 1;
1566		- 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);
1567	1575
1568		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1569		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1570		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1571		- aConstraints.gridx += 1;
1572		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1573		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1574		- aConstraints.gridx = 0;
1575		- aConstraints.gridy += 1;
1576		- 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);
1577	1581
1578		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1579		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1580		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1581		- aConstraints.gridx += 1;
1582		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1583		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1584		- aConstraints.gridx = 0;
1585		- aConstraints.gridy += 1;
1586		- 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);
1587	1587
1588		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1589		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1590		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1591		- aConstraints.gridx += 1;
1592		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1593		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1594		- aConstraints.gridx = 0;
1595		- aConstraints.gridy += 1;
1596		- 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);
1597	1593
1598		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1599		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1600		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1601		- aConstraints.gridx += 1;
1602		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1603		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1604		- aConstraints.gridx = 0;
1605		- aConstraints.gridy += 1;
1606		- 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);
1607	1599
1608		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1609		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1610		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1611		- aConstraints.gridx += 1;
1612		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1613		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1614		- aConstraints.gridx = 0;
1615		- aConstraints.gridy += 1;
1616		- aConstraints.gridwidth = 1;
1617		-
1618		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1619		- Return();
	1600	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1601	+ //Return();
1620	1602	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1621	1603	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1622	1604	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1627,130 +1609,93 @@
1627	1609	// aConstraints.gridy += 1;
1628	1610	// aConstraints.gridwidth = 1;
1629	1611
1630		- //aConstraints.weighty = 1;
1631		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1632		- //aConstraints.gridx += 1;
1633		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1634		- aConstraints.weighty = 0;
1635		- aConstraints.gridx = 0;
1636		- aConstraints.gridy += 1;
1637		- aConstraints.gridwidth = 1;
1638	1612
1639		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1640		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1641		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1642		- aConstraints.gridx += 1;
1643		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1644		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1645		- aConstraints.gridx = 0;
1646		- aConstraints.gridy += 1;
1647		- 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);
1648	1620
1649		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1650		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1651		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1652		- aConstraints.gridx += 1;
1653		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1654		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1655		- aConstraints.gridx = 0;
1656		- aConstraints.gridy += 1;
1657		- 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);
1658	1626
1659		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1660		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1661		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1662		- aConstraints.gridx += 1;
1663		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1664		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1665		- aConstraints.gridx = 0;
1666		- aConstraints.gridy += 1;
1667		- 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);
1668	1632
1669		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1670		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1671		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1672		- aConstraints.gridx += 1;
1673		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1674		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1675		- aConstraints.gridx = 0;
1676		- aConstraints.gridy += 1;
1677		- aConstraints.gridwidth = 1;
1678		- 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);
1679	1638
1680		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1681		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1682		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1683		- aConstraints.gridx += 1;
1684		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1685		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1686		- aConstraints.gridx = 0;
1687		- aConstraints.gridy += 1;
1688		- 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);
1689	1644
1690		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1691		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1692		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1693		- aConstraints.gridx += 1;
1694		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1695		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1696		- aConstraints.gridx = 0;
1697		- aConstraints.gridy += 1;
1698		- 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);
1699	1652
1700		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1701		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1702		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1703		- aConstraints.gridx += 1;
1704		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1705		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1706		- aConstraints.gridx = 0;
1707		- aConstraints.gridy += 1;
1708		- 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);
1709	1658
1710		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1711		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1712		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1713		- aConstraints.gridx += 1;
1714		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1715		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1716		- aConstraints.gridx = 0;
1717		- aConstraints.gridy += 1;
1718		- 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);
1719	1664
1720		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1721		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1722		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1723		- aConstraints.gridx += 1;
1724		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1725		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1726		- aConstraints.gridx = 0;
1727		- aConstraints.gridy += 1;
1728		- 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);
1729	1670
1730		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1731		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1732		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1733		- aConstraints.gridx += 1;
1734		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1735		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1736		- aConstraints.gridx = 0;
1737		- aConstraints.gridy += 1;
1738		- 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);
1739	1676
1740		- //aConstraints.weighty = 1;
1741		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1742		- //aConstraints.gridx += 1;
1743		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1744		- 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);
1745	1682
1746		- aConstraints.gridx = 0;
1747		- aConstraints.gridy = 0;
1748		- 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);
1749	1694
1750	1695	SetMaterial(copy); // .GetMaterial());
1751	1696
1752		- colorField.addChangeListener(this);
1753		- modulationField.addChangeListener(this);
	1697	+ //colorField.addChangeListener(this);
	1698	+// modulationField.addChangeListener(this);
1754	1699	metalnessField.addChangeListener(this);
1755	1700	diffuseField.addChangeListener(this);
1756	1701	specularField.addChangeListener(this);
..	..	@@ -2562,6 +2507,7 @@
2562	2507	}
2563	2508	if (input == null)
2564	2509	{
	2510	+ new Exception().printStackTrace();
2565	2511	System.exit(0);
2566	2512	}
2567	2513
..	..	@@ -2958,20 +2904,37 @@
2958	2904	// june 2013 copy.HardTouch();
2959	2905	cameraView.repaint();
2960	2906	return;
2961		- } else if (event.getSource() == toggleFullItem)
	2907	+ } else if (event.getSource() == toggleTimelineItem)
2962	2908	{
2963		- if (CameraPane.FULLSCREEN)
	2909	+ timeline ^= true;
	2910	+
	2911	+ if (timeline)
2964	2912	{
2965		- frame.getContentPane().remove(/"Center",/bigThree);
2966		- framePanel.add(bigThree);
2967		- frame.getContentPane().add(/"Center",/framePanel);
2968		- } else
2969		- {
2970		- frame.getContentPane().remove(/"Center",/framePanel);
2971		- frame.getContentPane().add(/"Center",/bigThree);
	2913	+ centralPanel.remove(cameraView);
	2914	+ cameraPanel.add(cameraView);
	2915	+ centralPanel.add(cameraPanel);
	2916	+ frame.setJMenuBar(timelineMenubar);
	2917	+ wasFullScreen = CameraPane.FULLSCREEN;
	2918	+ if (!CameraPane.FULLSCREEN)
	2919	+ ToggleFullScreen();
	2920	+ toggleFullScreenItem.setEnabled(false);
2972	2921	}
	2922	+ else
	2923	+ {
	2924	+ centralPanel.remove(cameraPanel);
	2925	+ centralPanel.add(cameraView);
	2926	+ frame.setJMenuBar(null);
	2927	+ if (!wasFullScreen)
	2928	+ ToggleFullScreen();
	2929	+ toggleFullScreenItem.setEnabled(true);
	2930	+ }
	2931	+
2973	2932	frame.validate();
2974		- cameraView.ToggleFullScreen();
	2933	+ return;
	2934	+ } else if (event.getSource() == toggleFullScreenItem)
	2935	+ {
	2936	+ ToggleFullScreen();
	2937	+ frame.validate();
2975	2938
2976	2939	return;
2977	2940	} else if (event.getSource() == toggleRandomItem)
..	..	@@ -3081,7 +3044,8 @@
3081	3044	objEditor.refreshContents();
3082	3045	} else if (event.getSource() == stepItem)
3083	3046	{
3084		- cameraView.ONESTEP = true;
	3047	+ //cameraView.ONESTEP = true;
	3048	+ Globals.ONESTEP = true;
3085	3049	cameraView.repaint();
3086	3050	return;
3087	3051	} else if (event.getSource() == stepButton)
..	..	@@ -3220,9 +3184,9 @@
3220	3184	cameraView.RevertCamera();
3221	3185	cameraView.repaint();
3222	3186	return;
3223		- } else if (event.getSource() == textureButton)
3224		- {
3225		- return; // true;
	3187	+// } else if (event.getSource() == textureButton)
	3188	+// {
	3189	+// return; // true;
3226	3190	} else // combos...
3227	3191	if (event.getSource() == texresMenu)
3228	3192	{
..	..	@@ -3238,25 +3202,25 @@
3238	3202
3239	3203	void ToggleAnimation()
3240	3204	{
3241		- if (!CameraPane.ANIMATION)
	3205	+ if (!Globals.ANIMATION)
3242	3206	{
3243	3207	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3244		- browser.show();
	3208	+ browser.setVisible(true);
3245	3209	String filename = browser.getFile();
3246	3210	if (filename != null && filename.length() > 0)
3247	3211	{
3248		- CameraPane.filename = browser.getDirectory() + filename;
	3212	+ Globals.filename = browser.getDirectory() + filename;
3249	3213	//CameraPane.framecount = 0;
3250		- CameraPane.imagecount = 0;
	3214	+ Globals.imagecount = 0;
3251	3215
3252		- CameraPane.ANIMATION ^= true;
	3216	+ Globals.ANIMATION ^= true;
3253	3217
3254	3218	GrafreeD.wav.cursor = 0;
3255	3219	GrafreeD.wav.loop = 0;
3256	3220	}
3257	3221	} else
3258	3222	{
3259		- CameraPane.ANIMATION ^= true;
	3223	+ Globals.ANIMATION ^= true;
3260	3224	}
3261	3225	}
3262	3226
..	..	@@ -3273,6 +3237,7 @@
3273	3237	callee.refreshContents();
3274	3238	} else
3275	3239	{
	3240	+ new Exception().printStackTrace();
3276	3241	System.exit(0);
3277	3242	}
3278	3243	}
..	..	@@ -3435,7 +3400,7 @@
3435	3400	current.fakedepth = (float) fakedepthField.getFloat();
3436	3401	current.shadowbias = (float) shadowbiasField.getFloat();
3437	3402
3438		- if (!NumberSlider.frozen)
	3403	+ if (!cNumberSlider.frozen)
3439	3404	{
3440	3405	//System.out.println("Propagate = " + propagate);
3441	3406	copy.UpdateMaterial(anchor, current, propagate);
..	..	@@ -3483,6 +3448,7 @@
3483	3448	\|\| e.getSource() == apertureField
3484	3449	\|\| e.getSource() == shadowblurField)
3485	3450	{
	3451	+ new Exception().printStackTrace();
3486	3452	System.exit(0);
3487	3453	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3488	3454	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3509,7 +3475,13 @@
3509	3475	//System.out.println("PARENT = " + parent);
3510	3476	//if (parent != null)
3511	3477	// parent.applySelf();
3512		- refreshContents();
	3478	+ if (e.getSource() == normalpushField)
	3479	+ {
	3480	+ objEditor.refreshContents();
	3481	+ //Refresh();
	3482	+ }
	3483	+ else
	3484	+ refreshContents();
3513	3485	// ??? client.refreshEditWindow();
3514	3486	}
3515	3487	//else
..	..	@@ -3521,7 +3493,7 @@
3521	3493	//group.name = nameField.getText();
3522	3494	//objEditor.applySelf();
3523	3495
3524		- assert (objEditor == this);
	3496	+ // OCT2018: assert (objEditor == this);
3525	3497	if (copy.selection == null \|\| copy.selection.size() == 0)
3526	3498	//super.applySelf()
3527	3499	; else
..	..	@@ -3545,12 +3517,18 @@
3545	3517	objEditor.copy = keep;
3546	3518	}
3547	3519	}
	3520	+
	3521	+ if (normalpushField != null)
	3522	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
3548	3523	}
3549	3524
3550	3525	void SnapObject()
3551	3526	{
3552		- Object3D obj = (Object3D)copy.selection.elementAt(0);
3553		- SnapObject(obj);
	3527	+ if (copy.selection.size() > 0)
	3528	+ {
	3529	+ Object3D obj = (Object3D)copy.selection.elementAt(0);
	3530	+ SnapObject(obj);
	3531	+ }
3554	3532	}
3555	3533
3556	3534	void SnapObject(Object3D obj)
..	..	@@ -3664,7 +3642,7 @@
3664	3642
3665	3643	if (obj.parent != null)
3666	3644	{
3667		- obj.parent.TransformToWorld(interest);
	3645	+// obj.parent.TransformToWorld(interest);
3668	3646	}
3669	3647
3670	3648	if (!CameraPane.TRACK)
..	..	@@ -3796,7 +3774,7 @@
3796	3774
3797	3775	radioPanel.revalidate();
3798	3776	radioPanel.repaint();
3799		- ctrlPanel.revalidate(); // ? new
	3777	+ ctrlPanel.validate(); // ? new
3800	3778	ctrlPanel.repaint();
3801	3779	}
3802	3780	}
..	..	@@ -4442,9 +4420,10 @@
4442	4420	//MenuItem normalLensItem;
4443	4421	MenuItem editCameraItem;
4444	4422	MenuItem revertCameraItem;
4445		- CheckboxMenuItem toggleLiveItem;
4446	4423	MenuItem stepItem;
4447		- CheckboxMenuItem toggleFullItem;
	4424	+ CheckboxMenuItem toggleLiveItem;
	4425	+ CheckboxMenuItem toggleFullScreenItem;
	4426	+ CheckboxMenuItem toggleTimelineItem;
4448	4427	CheckboxMenuItem toggleRenderItem;
4449	4428	CheckboxMenuItem toggleDebugItem;
4450	4429	CheckboxMenuItem toggleFrustumItem;
..	..	@@ -4459,23 +4438,26 @@
4459	4438	JSplitPane mainPanel;
4460	4439	JScrollPane scrollpane;
4461	4440	JPanel toolbarPanel;
4462		- JPanel treePanel;
	4441	+ cGridBag treePanel;
4463	4442	JPanel radioPanel;
4464	4443	ButtonGroup buttonGroup;
4465		- JPanel ctrlPanel;
4466		- JPanel materialPanel;
	4444	+ cGridBag ctrlPanel;
	4445	+ cGridBag materialPanel;
4467	4446	JScrollPane infoPanel;
4468		- JPanel optionsPanel;
	4447	+ cGridBag optionsPanel;
4469	4448	JTabbedPane objectPanel;
4470		- JPanel XYZPanel;
	4449	+ cGridBag XYZPanel;
4471	4450	JSplitPane gridPanel;
4472	4451	JSplitPane bigPanel;
4473		- JPanel bigThree;
4474		- JTabbedPane jtp;
4475		- JPanel cameraPanel;
	4452	+ cGridBag bigThree;
	4453	+ cGridBag scenePanel;
	4454	+ cGridBag centralPanel;
	4455	+ JSplitPane cameraPanel;
	4456	+ JPanel timelinePanel;
	4457	+ JMenuBar timelineMenubar;
4476	4458	JSplitPane framePanel;
4477	4459	JTextArea/Field/ nameField;
4478		- cButton textureButton;
	4460	+ //cButton textureButton;
4479	4461	cButton okButton;
4480	4462	cButton applyButton;
4481	4463	cButton cancelButton;
..	..	@@ -4522,65 +4504,67 @@
4522	4504	// MATERIAL
4523	4505	JLabel materialLabel;
4524	4506	JLabel colorLabel;
4525		- NumberSlider colorField;
	4507	+ cNumberSlider colorField;
4526	4508	JLabel modulationLabel;
4527		- NumberSlider modulationField;
	4509	+ cNumberSlider modulationField;
4528	4510	JLabel metalnessLabel;
4529		- NumberSlider metalnessField;
	4511	+ cNumberSlider metalnessField;
4530	4512	JLabel diffuseLabel;
4531		- NumberSlider diffuseField;
	4513	+ cNumberSlider diffuseField;
4532	4514	JLabel specularLabel;
4533		- NumberSlider specularField;
	4515	+ cNumberSlider specularField;
4534	4516	JLabel shininessLabel;
4535		- NumberSlider shininessField;
	4517	+ cNumberSlider shininessField;
4536	4518	JLabel shiftLabel;
4537		- NumberSlider shiftField;
	4519	+ cNumberSlider shiftField;
4538	4520	JLabel ambientLabel;
4539		- NumberSlider ambientField;
	4521	+ cNumberSlider ambientField;
4540	4522	JLabel lightareaLabel;
4541		- NumberSlider lightareaField;
	4523	+ cNumberSlider lightareaField;
4542	4524	JLabel diffusenessLabel;
4543		- NumberSlider diffusenessField;
	4525	+ cNumberSlider diffusenessField;
4544	4526	JLabel velvetLabel;
4545		- NumberSlider velvetField;
	4527	+ cNumberSlider velvetField;
4546	4528	JLabel sheenLabel;
4547		- NumberSlider sheenField;
	4529	+ cNumberSlider sheenField;
4548	4530	JLabel subsurfaceLabel;
4549		- NumberSlider subsurfaceField;
	4531	+ cNumberSlider subsurfaceField;
4550	4532	//JLabel bumpLabel;
4551	4533	//NumberSlider bumpField;
4552	4534	JLabel backlitLabel;
4553		- NumberSlider backlitField;
	4535	+ cNumberSlider backlitField;
4554	4536	JLabel anisoLabel;
4555		- NumberSlider anisoField;
	4537	+ cNumberSlider anisoField;
4556	4538	JLabel anisoVLabel;
4557		- NumberSlider anisoVField;
	4539	+ cNumberSlider anisoVField;
4558	4540	JLabel cameraLabel;
4559		- NumberSlider cameraField;
	4541	+ cNumberSlider cameraField;
4560	4542	JLabel selfshadowLabel;
4561		- NumberSlider selfshadowField;
	4543	+ cNumberSlider selfshadowField;
4562	4544	JLabel shadowLabel;
4563		- NumberSlider shadowField;
	4545	+ cNumberSlider shadowField;
4564	4546	JLabel textureLabel;
4565		- NumberSlider textureField;
	4547	+ cNumberSlider textureField;
4566	4548	JLabel opacityLabel;
4567		- NumberSlider opacityField;
	4549	+ cNumberSlider opacityField;
4568	4550	JLabel fakedepthLabel;
4569		- NumberSlider fakedepthField;
	4551	+ cNumberSlider fakedepthField;
4570	4552	JLabel shadowbiasLabel;
4571		- NumberSlider shadowbiasField;
	4553	+ cNumberSlider shadowbiasField;
4572	4554	JLabel bumpLabel;
4573		- NumberSlider bumpField;
	4555	+ cNumberSlider bumpField;
4574	4556	JLabel noiseLabel;
4575		- NumberSlider noiseField;
	4557	+ cNumberSlider noiseField;
4576	4558	JLabel powerLabel;
4577		- NumberSlider powerField;
	4559	+ cNumberSlider powerField;
4578	4560	JLabel borderfadeLabel;
4579		- NumberSlider borderfadeField;
	4561	+ cNumberSlider borderfadeField;
4580	4562	JLabel fogLabel;
4581		- NumberSlider fogField;
	4563	+ cNumberSlider fogField;
4582	4564	JLabel opacityPowerLabel;
4583		- NumberSlider opacityPowerField;
	4565	+ cNumberSlider opacityPowerField;
4584	4566	JTree jTree;
4585	4567	//ObjectUI parent;
	4568	+
	4569	+ cNumberSlider normalpushField;
4586	4570	}