~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,61 @@
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);
	145	+
	146	+ objEditor.ctrlPanel.remove(namePanel);
139	147
140	148	if (!GroupEditor.allparams)
141	149	return;
142	150
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);
	151	+// objEditor.ctrlPanel.remove(liveCB);
	152	+// objEditor.ctrlPanel.remove(hideCB);
	153	+// objEditor.ctrlPanel.remove(markCB);
	154	+//
	155	+// objEditor.ctrlPanel.remove(randomCB);
	156	+// objEditor.ctrlPanel.remove(speedupCB);
	157	+// objEditor.ctrlPanel.remove(rewindCB);
	158	+//
	159	+// objEditor.ctrlPanel.remove(resetButton);
	160	+// objEditor.ctrlPanel.remove(stepButton);
	161	+//// objEditor.ctrlPanel.remove(stepAllButton);
	162	+//// objEditor.ctrlPanel.remove(resetAllButton);
	163	+// objEditor.ctrlPanel.remove(link2masterCB);
	164	+// //objEditor.ctrlPanel.remove(flipVCB);
	165	+// //objEditor.ctrlPanel.remove(texresMenu);
	166	+// objEditor.ctrlPanel.remove(slowerButton);
	167	+// objEditor.ctrlPanel.remove(fasterButton);
	168	+// objEditor.ctrlPanel.remove(remarkButton);
	169	+
	170	+ objEditor.ctrlPanel.remove(setupPanel);
	171	+ objEditor.ctrlPanel.remove(commandsPanel);
	172	+ objEditor.ctrlPanel.remove(pushPanel);
	173	+ //objEditor.ctrlPanel.remove(fillPanel);
	174	+
	175	+ //Remove(normalpushField);
161	176	}
162	177
163	178	public ObjEditor GetEditor()
164	179	{
165	180	return objEditor; //.GetEditor();
166	181	}
	182	+
	183	+ // Sometimes myself, sometimes my callee's.
167	184	ObjEditor objEditor;
168	185
169	186	/*
..	..	@@ -238,7 +255,7 @@
238	255	//if (!isDisplayable())
239	256	//setUndecorated(true);
240	257
241		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	258	+ //System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
242	259	client = inClient;
243	260	copy = localCopy;
244	261	copy.editWindow = this;
..	..	@@ -292,16 +309,18 @@
292	309	//normalLensItem.addActionListener(this);
293	310	cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
294	311	revertCameraItem.addActionListener(this);
295		- cameraMenu.add(toggleFullItem = new CheckboxMenuItem("Full Screen"));
296		- toggleFullItem.addItemListener(this);
297		- toggleFullItem.setState(CameraPane.FULLSCREEN);
	312	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	313	+ toggleTimelineItem.addItemListener(this);
	314	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	315	+ toggleFullScreenItem.addItemListener(this);
	316	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
298	317	cameraMenu.add("-");
299	318	cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
300	319	toggleTextureItem.addItemListener(this);
301	320	toggleTextureItem.setState(CameraPane.textureon);
302	321	cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
303	322	toggleLiveItem.addItemListener(this);
304		- toggleLiveItem.setState(CameraPane.isLIVE());
	323	+ toggleLiveItem.setState(Globals.isLIVE());
305	324	cameraMenu.add(stepItem = new MenuItem("Step"));
306	325	stepItem.addActionListener(this);
307	326	// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
..	..	@@ -341,21 +360,23 @@
341	360	objectPanel = new JTabbedPane();
342	361	toolbarPanel = new JPanel();
343	362	toolbarPanel.setName("Toolbar");
344		- treePanel = new JPanel();
	363	+ treePanel = new cGridBag();
345	364	treePanel.setName("Tree");
346		- ctrlPanel = new JPanel(); // new GridBagLayout());
	365	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
347	366	ctrlPanel.setName("Edit");
348		- materialPanel = new JPanel();
	367	+ materialPanel = new cGridBag().setVertical(true);
349	368	materialPanel.setName("Material");
350	369	/JTextPane/
351	370	infoarea = createTextPane();
	371	+ doc = infoarea.getStyledDocument();
	372	+
352	373	infoarea.setEditable(true);
353	374	SetText();
354	375	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
355	376	// infoarea.setOpaque(false);
356	377	// //infoarea.setForeground(textcolor);
357		- infoarea.setLineWrap(true);
358		- infoarea.setWrapStyleWord(true);
	378	+// TEXTAREA infoarea.setLineWrap(true);
	379	+// TEXTAREA infoarea.setWrapStyleWord(true);
359	380	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
360	381	infoPanel.setPreferredSize(new Dimension(50, 200));
361	382	infoPanel.setName("Info");
..	..	@@ -366,16 +387,16 @@
366	387	mainPanel.setName("Main");
367	388	mainPanel.setContinuousLayout(true);
368	389	mainPanel.setOneTouchExpandable(true);
369		- mainPanel.setDividerLocation(1.0);
370	390	mainPanel.setDividerSize(9);
371		- mainPanel.setResizeWeight(0);
	391	+ mainPanel.setDividerLocation(0.5); //1.0);
	392	+ mainPanel.setResizeWeight(0.5);
372	393
373	394	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
374	395	//mainPanel.setLayout(new GridBagLayout());
375	396	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
376		- treePanel.setLayout(new GridBagLayout());
377		- ctrlPanel.setLayout(new GridBagLayout());
378		- materialPanel.setLayout(new GridBagLayout());
	397	+// treePanel.setLayout(new GridBagLayout());
	398	+ //ctrlPanel.setLayout(new GridBagLayout());
	399	+ //materialPanel.setLayout(new GridBagLayout());
379	400
380	401	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
381	402	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -414,7 +435,7 @@
414	435	static String newline = "\n";
415	436	protected static final String buttonString = "JButton";
416	437	StyledDocument doc;
417		- JTextArea infoarea;
	438	+ JTextPane infoarea;
418	439
419	440	void ClearInfo()
420	441	{
..	..	@@ -481,7 +502,10 @@
481	502	}
482	503
483	504	if (full)
484		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	505	+ {
	506	+ si.SendInfo(" BBox min: " + minima, "regular");
	507	+ si.SendInfo(" BBox max: " + maxima, "regular");
	508	+ }
485	509
486	510	if (sel.bRep != null)
487	511	{
..	..	@@ -579,6 +603,9 @@
579	603	{
580	604	CameraPane.pointflow = (PointFlow) sel;
581	605	}
	606	+
	607	+ si.SendInfo("_____________________", "regular");
	608	+ si.SendInfo("", "regular");
582	609	}
583	610	}
584	611
..	..	@@ -594,52 +621,68 @@
594	621	}
595	622	}
596	623
597		- private JTextArea createTextPane()
598		- {
599		- String[] initString =
	624	+ void ToggleFullScreen()
600	625	{
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++)
	626	+ if (CameraPane.FULLSCREEN)
632	627	{
633		- doc.insertString(doc.getLength(), initString[i],
634		- doc.getStyle(initStyles[i]));
	628	+ frame.getContentPane().remove(/"Center",/bigThree);
	629	+ framePanel.add(bigThree);
	630	+ frame.getContentPane().add(/"Center",/framePanel);
	631	+ } else
	632	+ {
	633	+ frame.getContentPane().remove(/"Center",/framePanel);
	634	+ framePanel.remove(bigThree);
	635	+ frame.getContentPane().add(/"Center",/bigThree);
635	636	}
636		- }
637		- } catch (BadLocationException ble)
638		- {
639		- System.err.println("Couldn't insert initial text into text pane.");
	637	+ cameraView.ToggleFullScreen();
640	638	}
641	639
642		- return new JTextArea(); // textPane;
	640	+ private JTextPane createTextPane()
	641	+ {
	642	+// TEXTAREA String[] initString =
	643	+// {
	644	+// "This is an editable JTextPane, ", //regular
	645	+// "another ", //italic
	646	+// "styled ", //bold
	647	+// "text ", //small
	648	+// "component, ", //large
	649	+// "which supports embedded components..." + newline,//regular
	650	+// " " + newline, //button
	651	+// "...and embedded icons..." + newline, //regular
	652	+// " ", //icon
	653	+// newline + "JTextPane is a subclass of JEditorPane that "
	654	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	655	+// + "cover methods for interacting with those objects."
	656	+// };
	657	+//
	658	+// String[] initStyles =
	659	+// {
	660	+// "regular", "italic", "bold", "small", "large",
	661	+// "regular", "button", "regular", "icon",
	662	+// "regular"
	663	+// };
	664	+//
	665	+// JTextPane textPane = new JTextPane();
	666	+// textPane.setEditable(true);
	667	+// /StyledDocument/ doc = textPane.getStyledDocument();
	668	+// addStylesToDocument(doc);
	669	+//
	670	+// try
	671	+// {
	672	+// for (int j = 0; j < 2; j++)
	673	+// {
	674	+// for (int i = 0; i < initString.length; i++)
	675	+// {
	676	+// doc.insertString(doc.getLength(), initString[i],
	677	+// doc.getStyle(initStyles[i]));
	678	+// }
	679	+// }
	680	+// } catch (BadLocationException ble)
	681	+// {
	682	+// System.err.println("Couldn't insert initial text into text pane.");
	683	+// }
	684	+
	685	+ return new JTextPane(); // textPane;
643	686	}
644	687
645	688	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -739,115 +782,83 @@
739	782	JButton slowerButton;
740	783	JButton fasterButton;
741	784	JButton remarkButton;
	785	+
	786	+ cGridBag namePanel;
	787	+ cGridBag setupPanel;
	788	+ cGridBag commandsPanel;
	789	+ cGridBag pushPanel;
	790	+ cGridBag fillPanel;
742	791
743		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	792	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
744	793	{
745	794	JCheckBox cb;
746	795
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);
	796	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
752	797	cb.addItemListener(this);
753		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
754		- oe.aConstraints.gridwidth = 1;
755		- oe.aConstraints.gridx += 1;
756	798
757	799	return cb;
758	800	}
759	801
760		- cButton AddButton(ObjEditor oe, String label)
	802	+ cButton AddButton(cGridBag panel, String label)
761	803	{
762	804	cButton cb;
763	805
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);
	806	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
769	807	cb.addActionListener(this);
770		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
771		- oe.aConstraints.gridwidth = 1;
772		- oe.aConstraints.gridx += 1;
773	808
774	809	return cb;
775	810	}
776	811
777		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	812	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
778	813	{
779	814	JComboBox combo;
780	815
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;
	816	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
784	817	combo.addActionListener(this);
785	818
786	819	return combo;
787	820	}
788	821
789		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	822	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
790	823	{
791		- NumberSlider combo;
	824	+ cGridBag control = new cGridBag();
	825	+
	826	+ cNumberSlider combo;
792	827
793	828	JLabel jlabel = new JLabel(label);
794		-
795		- aConstraints.fill = GridBagConstraints.VERTICAL;
796	829	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		-
	830	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	831	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
806	832	combo.setFloat(current);
807		-
808		- combo.label = jlabel;
809		-
810		- combo.addChangeListener(this);
811		-
812		- return combo;
	833	+
	834	+ panel.add(control);
	835	+
	836	+ return control;
813	837	}
814	838
815		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	839	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
816	840	{
817		- NumberSlider combo;
	841	+ cGridBag control = new cGridBag();
	842	+
	843	+ cNumberSlider combo;
818	844
819	845	JLabel jlabel = new JLabel(label);
820		-
821		- aConstraints.fill = GridBagConstraints.VERTICAL;
822	846	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		-
	847	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	848	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
832	849	combo.setInteger(current);
833	850
834		- combo.label = jlabel;
835		-
836		- combo.addChangeListener(this);
837		-
838		- return combo;
	851	+ panel.add(control);
	852	+
	853	+ return control;
839	854	}
840	855
841		- JTextArea AddText(JPanel ctrlPanel, String name)
	856	+ JTextArea AddText(cGridBag ctrlPanel, String name)
842	857	{
843	858	JTextArea text;
844	859
845		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
846		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
847		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	860	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
848	861	text.addCaretListener(this);
849		- aConstraints.gridx += 1;
850		- aConstraints.gridwidth = 1;
851	862
852	863	return text;
853	864	}
..	..	@@ -877,9 +888,16 @@
877	888	objEditor.ctrlPanel.remove(j);
878	889	}
879	890
	891	+ void Remove(cNumberSlider j)
	892	+ {
	893	+ j.removeChangeListener(this);
	894	+ //objEditor.ctrlPanel.remove(j.label);
	895	+ objEditor.ctrlPanel.remove(j);
	896	+ }
	897	+
880	898	/*
881	899	*/
882		- void Return() // ObjEditor oe)
	900	+ void Return0() // ObjEditor oe)
883	901	{
884	902	aConstraints.gridy += 1;
885	903	aConstraints.gridx = 0;
..	..	@@ -934,35 +952,71 @@
934	952
935	953	void SetupUI2(ObjEditor oe)
936	954	{
937		-// oe.aConstraints.weightx = 0;
938		-// oe.aConstraints.weighty = 0;
939		-// oe.aConstraints.gridx = 0;
940		-// oe.aConstraints.gridy = 0;
941		- SetupName(oe);
	955	+ //SetupName(oe);
	956	+
	957	+ namePanel = new cGridBag();
	958	+
	959	+ nameField = AddText(namePanel, copy.GetName());
	960	+ namePanel.add(nameField);
	961	+ oe.ctrlPanel.add(namePanel);
	962	+
	963	+ oe.ctrlPanel.Return();
942	964
943	965	if (!GroupEditor.allparams)
944	966	return;
945	967
946		- liveCB = AddCheckBox(oe, "Live", copy.live);
947		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
948		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	968	+ setupPanel = new cGridBag().setVertical(false);
	969	+
	970	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	971	+ liveCB.setToolTipText("Animate object");
	972	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	973	+ hideCB.setToolTipText("Hide object");
949	974	// 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");
	975	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	976	+ markCB.setToolTipText("Set the animation target transform");
	977	+
	978	+ rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	979	+ rewindCB.setToolTipText("Rewind animation");
	980	+
	981	+ randomCB = AddCheckBox(setupPanel, "Random", copy.random);
	982	+ randomCB.setToolTipText("Option for switch node");
	983	+
	984	+ if (Globals.ADVANCED)
	985	+ {
	986	+ link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
	987	+ link2masterCB.setToolTipText("Attach to support");
	988	+ speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	989	+ speedupCB.setToolTipText("Option motion capture");
	990	+ }
	991	+
	992	+ oe.ctrlPanel.add(setupPanel);
	993	+ oe.ctrlPanel.Return();
	994	+
	995	+ commandsPanel = new cGridBag().setVertical(false);
	996	+
	997	+ resetButton = AddButton(commandsPanel, "Reset");
	998	+ resetButton.setToolTipText("Jump to frame zero");
	999	+ stepButton = AddButton(commandsPanel, "Step");
	1000	+ stepButton.setToolTipText("Step one frame");
956	1001	// resetAllButton = AddButton(oe, "Reset All");
957	1002	// stepAllButton = AddButton(oe, "Step All");
958		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
959	1003	// Return();
960		- slowerButton = AddButton(oe, "Slow");
961		- fasterButton = AddButton(oe, "Fast");
962		- remarkButton = AddButton(oe, "Rem");
	1004	+ slowerButton = AddButton(commandsPanel, "Slow");
	1005	+ slowerButton.setToolTipText("Decrease animation speed");
	1006	+ fasterButton = AddButton(commandsPanel, "Fast");
	1007	+ fasterButton.setToolTipText("Increase animation speed");
	1008	+ remarkButton = AddButton(commandsPanel, "Remark");
	1009	+ remarkButton.setToolTipText("Set the current transform as the target");
963	1010
964		- Return();
	1011	+ oe.ctrlPanel.add(commandsPanel);
	1012	+ oe.ctrlPanel.Return();
965	1013
	1014	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1015	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1016	+ //Return();
	1017	+
	1018	+ oe.ctrlPanel.Return();
	1019	+
966	1020	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
967	1021	// ObjEditor.aConstraints.gridx += 1;
968	1022
..	..	@@ -1056,7 +1110,7 @@
1056	1110	oe.aConstraints.gridwidth = 1;
1057	1111	/**/
1058	1112	nameField = AddText(oe.ctrlPanel, copy.GetName());
1059		- Return();
	1113	+ oe.ctrlPanel.Return();
1060	1114
1061	1115	//ctrlPanel.add(textureButton = new Button("Texture..."));
1062	1116	//textureButton.setEnabled(false);
..	..	@@ -1158,11 +1212,22 @@
1158	1212	//JPanel worldPanel =
1159	1213	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1160	1214	//worldPanel.setName("World");
1161		- /JPanel/ cameraPanel =
1162		- new JPanel(new BorderLayout());
1163		- cameraPanel.add(cameraView);
1164		- //new timeflow.app.TimeflowApp().TimeFlowWindow(cameraPanel, frame);
	1215	+ centralPanel = new cGridBag();
	1216	+ centralPanel.preferredWidth = 20;
	1217	+ timelinePanel = new JPanel(new BorderLayout());
	1218	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1165	1219
	1220	+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
	1221	+ cameraPanel.setContinuousLayout(true);
	1222	+ cameraPanel.setOneTouchExpandable(true);
	1223	+// cameraPanel.setDividerLocation(0.9);
	1224	+// cameraPanel.setDividerSize(9);
	1225	+ cameraPanel.setResizeWeight(1.0);
	1226	+
	1227	+ centralPanel.add(cameraView);
	1228	+ //frame.setJMenuBar(timelineMenubar);
	1229	+ //centralPanel.add(timelinePanel);
	1230	+
1166	1231	//topView.camera = ;
1167	1232	//frontView.camera = new Camera(2);
1168	1233	//sideView.camera = new Camera(3);
..	..	@@ -1178,12 +1243,13 @@
1178	1243	//frontView.object = copy;
1179	1244	//sideView.object = copy;
1180	1245
1181		- XYZPanel = new JPanel();
1182		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1246	+ XYZPanel = new cGridBag().setVertical(true);
	1247	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1183	1248
1184		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1185		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1186		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1249	+ XYZPanel.preferredWidth = 5;
	1250	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1251	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1252	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1187	1253
1188	1254	/*
1189	1255	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1192,7 +1258,7 @@
1192	1258	gridPanel.add(cameraView);
1193	1259	gridPanel.add(XYZPanel);
1194	1260	*/
1195		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, cameraPanel, XYZPanel); //new BorderLayout());
	1261	+ gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1196	1262	gridPanel.setContinuousLayout(true);
1197	1263	gridPanel.setOneTouchExpandable(true);
1198	1264	gridPanel.setDividerLocation(1.0);
..	..	@@ -1221,10 +1287,11 @@
1221	1287	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1222	1288	//tmp.setName("Edit");
1223	1289	objectPanel.add(materialPanel);
1224		- JPanel north = new JPanel(new BorderLayout());
1225		- north.setName("Edit");
1226		- north.add(ctrlPanel, BorderLayout.NORTH);
1227		- objectPanel.add(north);
	1290	+// JPanel north = new JPanel(new BorderLayout());
	1291	+// north.setName("Edit");
	1292	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1293	+// objectPanel.add(north);
	1294	+ objectPanel.add(ctrlPanel);
1228	1295	objectPanel.add(infoPanel);
1229	1296
1230	1297	/*
..	..	@@ -1245,16 +1312,23 @@
1245	1312	scrollpane.setWheelScrollingEnabled(true);
1246	1313	scrollpane.addMouseWheelListener(this); // Default not fast enough
1247	1314
1248		- /JTabbedPane/ scenePanel = new JTabbedPane();
1249		- scenePanel.add(scrollpane);
	1315	+ /JTabbedPane/ scenePanel = new cGridBag();
	1316	+ scenePanel.preferredWidth = 7;
	1317	+
	1318	+ JTabbedPane tabbedPane = new JTabbedPane();
	1319	+ tabbedPane.add(scrollpane);
1250	1320
1251		- scenePanel.add(FSPane = new cFileSystemPane(this));
	1321	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1252	1322
1253		- optionsPanel = new JPanel(new GridBagLayout());
	1323	+ optionsPanel = new cGridBag().setVertical(true);
1254	1324
1255	1325	optionsPanel.setName("Options");
1256		- scenePanel.add(optionsPanel);
1257		-
	1326	+
	1327	+ AddOptions(optionsPanel); //, aConstraints);
	1328	+
	1329	+ tabbedPane.add(optionsPanel);
	1330	+
	1331	+ scenePanel.add(tabbedPane);
1258	1332
1259	1333	/*
1260	1334	cTree jTree = new cTree(null);
..	..	@@ -1288,6 +1362,7 @@
1288	1362	//bigPanel.setSize(new Dimension(10,10));
1289	1363	//bigPanel.add(ctrlPanel);
1290	1364	//bigPanel.add(gridPanel);
	1365	+ /**
1291	1366	bigThree = new JPanel();
1292	1367	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1293	1368	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1304,14 +1379,20 @@
1304	1379	// aConstraints.gridheight = 3;
1305	1380	aWindowConstraints.gridx = 1;
1306	1381	aWindowConstraints.fill = GridBagConstraints.BOTH;
1307		- bigThree.add(cameraPanel, aWindowConstraints);
	1382	+ bigThree.add(centralPanel, aWindowConstraints);
1308	1383	aWindowConstraints.weightx = 0;
1309	1384	aWindowConstraints.gridx = 4;
1310	1385	aWindowConstraints.gridwidth = 1;
1311	1386	// aConstraints.gridheight = 3;
1312	1387	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1313	1388	bigThree.add(XYZPanel, aWindowConstraints);
	1389	+ /**/
1314	1390
	1391	+ bigThree = new cGridBag();
	1392	+ bigThree.addComponent(scenePanel);
	1393	+ bigThree.addComponent(centralPanel);
	1394	+ bigThree.addComponent(XYZPanel);
	1395	+
1315	1396	// // SIDE EFFECT!!!
1316	1397	// aConstraints.gridx = 0;
1317	1398	// aConstraints.gridy = 0;
..	..	@@ -1332,7 +1413,8 @@
1332	1413	//worldPane.add(bigPanel);
1333	1414	//worldPane.add(worldPanel);
1334	1415	/**/
1335		- frame.getContentPane().add(/"Center",/framePanel);
	1416	+ //frame.getContentPane().add(/"Center",/framePanel);
	1417	+ frame.add(/"Center",/framePanel);
1336	1418	//frame.getContentPane().add(/"Center",/ worldPane);
1337	1419
1338	1420	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
..	..	@@ -1353,6 +1435,10 @@
1353	1435	});
1354	1436	}
1355	1437
	1438	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1439	+ {
	1440	+ }
	1441	+
1356	1442	JTree GetTree()
1357	1443	{
1358	1444	return objEditor.jTree;
..	..	@@ -1364,260 +1450,170 @@
1364	1450	ctrlPanel.removeAll();
1365	1451	}
1366	1452
1367		- void SetupMaterial(JPanel ctrlPanel)
	1453	+ void SetupMaterial(cGridBag panel)
1368	1454	{
1369		- aConstraints.weighty = 0;
1370		- //aConstraints.weightx = 1;
1371		- /*
	1455	+ /*
1372	1456	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1373	1457	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1374		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1375		- aConstraints.gridx += 1;
1376	1458	*/
1377	1459
1378		- aConstraints.gridwidth = 1;
1379		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1380		- aConstraints.gridx += 1;
1381		- aConstraints.weighty = 0;
1382		- aConstraints.gridwidth = 1;
	1460	+ cGridBag editBar = new cGridBag().setVertical(false);
	1461	+
	1462	+ editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1463	+ createMaterialButton.setToolTipText("Create material");
1383	1464
1384	1465	/*
1385	1466	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1386		- aConstraints.gridx += 1;
1387		- aConstraints.weighty = 0;
1388		- aConstraints.gridwidth = 1;
1389	1467	*/
1390	1468
1391		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1392		- aConstraints.gridx += 1;
	1469	+ editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1470	+ clearMaterialButton.setToolTipText("Clear material");
	1471	+
	1472	+ editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1473	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1474	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1393	1475
1394		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1395		-
1396		- aConstraints.gridx += 1;
1397		-
1398		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1399		-
1400		- aConstraints.gridx += 1;
1401		-
1402		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1403		-
1404		- aConstraints.gridx = 0;
1405		- aConstraints.gridy += 1;
1406		- aConstraints.weighty = 0;
1407		- aConstraints.gridwidth = 1;
	1476	+ editBar.preferredHeight = 15;
	1477	+
	1478	+ panel.add(editBar);
	1479	+
1408	1480	/**/
1409	1481	//aConstraints.weighty = 0;
1410	1482	////aConstraints.weightx = 1;
1411	1483	//aConstraints.weighty = 1;
1412	1484	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1413	1485	//aConstraints.gridx += 1;
1414		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1415		- aConstraints.weighty = 0;
1416		- aConstraints.gridx = 0;
1417		- aConstraints.gridy += 1;
1418		- aConstraints.gridwidth = 1;
	1486	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1419	1487
1420		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1421		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1422		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1423		- aConstraints.gridx += 1;
1424		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1425		- //aConstraints.weightx = 0;
1426		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1427		- aConstraints.gridx = 0;
1428		- aConstraints.gridy += 1;
1429		- aConstraints.gridwidth = 1;
	1488	+ cGridBag colorSection = new cGridBag().setVertical(true);
	1489	+
	1490	+ cGridBag color = new cGridBag();
	1491	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1492	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1493	+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1494	+ //colorField.preferredWidth = 200;
	1495	+ colorSection.add(color);
1430	1496
1431		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1432		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1433		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1434		- aConstraints.gridx += 1;
1435		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1436		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1437		- aConstraints.gridx = 0;
1438		- aConstraints.gridy += 1;
1439		- aConstraints.gridwidth = 1;
	1497	+ cGridBag modulation = new cGridBag();
	1498	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1499	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1500	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1501	+ colorSection.add(modulation);
1440	1502
1441		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1442		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1443		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1444		- aConstraints.gridx += 1;
1445		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1446		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1447		- aConstraints.gridx = 0;
1448		- aConstraints.gridy += 1;
1449		- aConstraints.gridwidth = 1;
	1503	+ cGridBag texture = new cGridBag();
	1504	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1505	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1506	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1507	+ colorSection.add(texture);
1450	1508
1451		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1452		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1453		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1454		- aConstraints.gridx += 1;
1455		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1456		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1457		- aConstraints.gridx = 0;
1458		- aConstraints.gridy += 1;
1459		- aConstraints.gridwidth = 1;
	1509	+ cGridBag anisoU = new cGridBag();
	1510	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1511	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1512	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1513	+ colorSection.add(anisoU);
1460	1514
1461		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1462		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1463		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1464		- aConstraints.gridx += 1;
1465		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1466		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1467		- aConstraints.gridx = 0;
1468		- aConstraints.gridy += 1;
1469		- aConstraints.gridwidth = 1;
	1515	+ cGridBag anisoV = new cGridBag();
	1516	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1517	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1518	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1519	+ colorSection.add(anisoV);
1470	1520
1471		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1472		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1473		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1474		- aConstraints.gridx += 1;
1475		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1476		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1477		- aConstraints.gridx = 0;
1478		- aConstraints.gridy += 1;
1479		- aConstraints.gridwidth = 1;
	1521	+ cGridBag shadowbias = new cGridBag();
	1522	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1523	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1524	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1525	+ colorSection.add(shadowbias);
1480	1526
1481		- //aConstraints.weighty = 1;
1482		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1483		- //aConstraints.gridx += 1;
1484		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1485		- aConstraints.weighty = 0;
1486		- aConstraints.gridx = 0;
1487		- aConstraints.gridy += 1;
1488		- aConstraints.gridwidth = 1;
	1527	+ panel.add(new JSeparator());
	1528	+
	1529	+ panel.add(colorSection);
	1530	+
	1531	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1532	+
	1533	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1534	+
	1535	+ cGridBag diffuse = new cGridBag();
	1536	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1537	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1538	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1539	+ diffuseSection.add(diffuse);
1489	1540
1490		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1491		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1492		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1493		- aConstraints.gridx += 1;
1494		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1495		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1496		- aConstraints.gridx = 0;
1497		- aConstraints.gridy += 1;
1498		- aConstraints.gridwidth = 1;
	1541	+ cGridBag diffuseness = new cGridBag();
	1542	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1543	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1544	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1545	+ diffuseSection.add(diffuseness);
1499	1546
1500		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1501		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1502		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1503		- aConstraints.gridx += 1;
1504		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1505		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1506		- aConstraints.gridx = 0;
1507		- aConstraints.gridy += 1;
1508		- aConstraints.gridwidth = 1;
	1547	+ cGridBag selfshadow = new cGridBag();
	1548	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1549	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1550	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1551	+ diffuseSection.add(selfshadow);
1509	1552
1510		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1511		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1512		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1513		- aConstraints.gridx += 1;
1514		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1515		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1516		- aConstraints.gridx = 0;
1517		- aConstraints.gridy += 1;
1518		- aConstraints.gridwidth = 1;
	1553	+ cGridBag sheen = new cGridBag();
	1554	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1555	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1556	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1557	+ diffuseSection.add(sheen);
1519	1558
1520		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1521		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1522		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1523		- aConstraints.gridx += 1;
1524		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1525		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1526		- aConstraints.gridx = 0;
1527		- aConstraints.gridy += 1;
1528		- aConstraints.gridwidth = 1;
	1559	+ cGridBag subsurface = new cGridBag();
	1560	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1561	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1562	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1563	+ diffuseSection.add(subsurface);
1529	1564
1530		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1531		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1532		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1533		- aConstraints.gridx += 1;
1534		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1535		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1536		- aConstraints.gridx = 0;
1537		- aConstraints.gridy += 1;
1538		- aConstraints.gridwidth = 1;
	1565	+ cGridBag shadow = new cGridBag();
	1566	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1567	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1568	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1569	+ diffuseSection.add(shadow);
1539	1570
1540		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1541		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1542		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1543		- aConstraints.gridx += 1;
1544		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1545		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1546		- aConstraints.gridx = 0;
1547		- aConstraints.gridy += 1;
1548		- aConstraints.gridwidth = 1;
	1571	+ cGridBag fakedepth = new cGridBag();
	1572	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1573	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1574	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1575	+ diffuseSection.add(fakedepth);
1549	1576
1550		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1551		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1552		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1553		- aConstraints.gridx += 1;
1554		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1555		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1556		- aConstraints.gridx = 0;
1557		- aConstraints.gridy += 1;
1558		- aConstraints.gridwidth = 1;
	1577	+ panel.add(new JSeparator());
	1578	+
	1579	+ panel.add(diffuseSection);
	1580	+
	1581	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1582	+
	1583	+ cGridBag specularSection = new cGridBag().setVertical(true);
1559	1584
1560		- //aConstraints.weighty = 1;
1561		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1562		- //aConstraints.gridx += 1;
1563		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1564		- aConstraints.weighty = 0;
1565		- aConstraints.gridx = 0;
1566		- aConstraints.gridy += 1;
1567		- aConstraints.gridwidth = 1;
	1585	+ cGridBag specular = new cGridBag();
	1586	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1587	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1588	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1589	+ specularSection.add(specular);
1568	1590
1569		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1570		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1571		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1572		- aConstraints.gridx += 1;
1573		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1574		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1575		- aConstraints.gridx = 0;
1576		- aConstraints.gridy += 1;
1577		- aConstraints.gridwidth = 1;
	1591	+ cGridBag lightarea = new cGridBag();
	1592	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1593	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1594	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1595	+ specularSection.add(lightarea);
1578	1596
1579		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1580		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1581		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1582		- aConstraints.gridx += 1;
1583		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1584		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1585		- aConstraints.gridx = 0;
1586		- aConstraints.gridy += 1;
1587		- aConstraints.gridwidth = 1;
	1597	+ cGridBag shininess = new cGridBag();
	1598	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1599	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1600	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1601	+ specularSection.add(shininess);
1588	1602
1589		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1590		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1591		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1592		- aConstraints.gridx += 1;
1593		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1594		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1595		- aConstraints.gridx = 0;
1596		- aConstraints.gridy += 1;
1597		- aConstraints.gridwidth = 1;
	1603	+ cGridBag metalness = new cGridBag();
	1604	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1605	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1606	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1607	+ specularSection.add(metalness);
1598	1608
1599		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1600		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1601		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1602		- aConstraints.gridx += 1;
1603		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1604		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1605		- aConstraints.gridx = 0;
1606		- aConstraints.gridy += 1;
1607		- aConstraints.gridwidth = 1;
	1609	+ cGridBag velvet = new cGridBag();
	1610	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1611	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1612	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1613	+ specularSection.add(velvet);
1608	1614
1609		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1610		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1611		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1612		- aConstraints.gridx += 1;
1613		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1614		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1615		- aConstraints.gridx = 0;
1616		- aConstraints.gridy += 1;
1617		- aConstraints.gridwidth = 1;
1618		-
1619		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1620		- Return();
	1615	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1616	+ //Return();
1621	1617	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1622	1618	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1623	1619	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1628,130 +1624,93 @@
1628	1624	// aConstraints.gridy += 1;
1629	1625	// aConstraints.gridwidth = 1;
1630	1626
1631		- //aConstraints.weighty = 1;
1632		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1633		- //aConstraints.gridx += 1;
1634		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1635		- aConstraints.weighty = 0;
1636		- aConstraints.gridx = 0;
1637		- aConstraints.gridy += 1;
1638		- aConstraints.gridwidth = 1;
1639	1627
1640		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1641		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1642		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1643		- aConstraints.gridx += 1;
1644		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1645		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1646		- aConstraints.gridx = 0;
1647		- aConstraints.gridy += 1;
1648		- aConstraints.gridwidth = 1;
	1628	+ panel.add(new JSeparator());
	1629	+
	1630	+ panel.add(specularSection);
	1631	+
	1632	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1633	+
	1634	+ cGridBag globalSection = new cGridBag().setVertical(true);
1649	1635
1650		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1651		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1652		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1653		- aConstraints.gridx += 1;
1654		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1655		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1656		- aConstraints.gridx = 0;
1657		- aConstraints.gridy += 1;
1658		- aConstraints.gridwidth = 1;
	1636	+ cGridBag camera = new cGridBag();
	1637	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1638	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1639	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1640	+ globalSection.add(camera);
1659	1641
1660		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1661		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1662		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1663		- aConstraints.gridx += 1;
1664		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1665		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1666		- aConstraints.gridx = 0;
1667		- aConstraints.gridy += 1;
1668		- aConstraints.gridwidth = 1;
	1642	+ cGridBag ambient = new cGridBag();
	1643	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1644	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1645	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1646	+ globalSection.add(ambient);
1669	1647
1670		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1671		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1672		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1673		- aConstraints.gridx += 1;
1674		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1675		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1676		- aConstraints.gridx = 0;
1677		- aConstraints.gridy += 1;
1678		- aConstraints.gridwidth = 1;
1679		- aConstraints.weighty = 0;
	1648	+ cGridBag backlit = new cGridBag();
	1649	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1650	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1651	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1652	+ globalSection.add(backlit);
1680	1653
1681		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1682		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1683		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1684		- aConstraints.gridx += 1;
1685		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1686		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1687		- aConstraints.gridx = 0;
1688		- aConstraints.gridy += 1;
1689		- aConstraints.gridwidth = 1;
	1654	+ cGridBag opacity = new cGridBag();
	1655	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1656	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1657	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1658	+ globalSection.add(opacity);
1690	1659
1691		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1692		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1693		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1694		- aConstraints.gridx += 1;
1695		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1696		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1697		- aConstraints.gridx = 0;
1698		- aConstraints.gridy += 1;
1699		- aConstraints.gridwidth = 1;
	1660	+ panel.add(new JSeparator());
	1661	+
	1662	+ panel.add(globalSection);
	1663	+
	1664	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1665	+
	1666	+ cGridBag textureSection = new cGridBag().setVertical(true);
1700	1667
1701		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1702		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1703		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1704		- aConstraints.gridx += 1;
1705		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1706		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1707		- aConstraints.gridx = 0;
1708		- aConstraints.gridy += 1;
1709		- aConstraints.gridwidth = 1;
	1668	+ cGridBag bump = new cGridBag();
	1669	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1670	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1671	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1672	+ textureSection.add(bump);
1710	1673
1711		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1712		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1713		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1714		- aConstraints.gridx += 1;
1715		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1716		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1717		- aConstraints.gridx = 0;
1718		- aConstraints.gridy += 1;
1719		- aConstraints.gridwidth = 1;
	1674	+ cGridBag noise = new cGridBag();
	1675	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1676	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1677	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1678	+ textureSection.add(noise);
1720	1679
1721		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1722		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1723		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1724		- aConstraints.gridx += 1;
1725		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1726		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1727		- aConstraints.gridx = 0;
1728		- aConstraints.gridy += 1;
1729		- aConstraints.gridwidth = 1;
	1680	+ cGridBag power = new cGridBag();
	1681	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1682	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1683	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1684	+ textureSection.add(power);
1730	1685
1731		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1732		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1733		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1734		- aConstraints.gridx += 1;
1735		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1736		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1737		- aConstraints.gridx = 0;
1738		- aConstraints.gridy += 1;
1739		- aConstraints.gridwidth = 1;
	1686	+ cGridBag borderfade = new cGridBag();
	1687	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1688	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1689	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1690	+ textureSection.add(borderfade);
1740	1691
1741		- //aConstraints.weighty = 1;
1742		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1743		- //aConstraints.gridx += 1;
1744		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1745		- aConstraints.weighty = 0;
	1692	+ cGridBag fog = new cGridBag();
	1693	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1694	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1695	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1696	+ textureSection.add(fog);
1746	1697
1747		- aConstraints.gridx = 0;
1748		- aConstraints.gridy = 0;
1749		- aConstraints.gridwidth = 1;
	1698	+ cGridBag opacityPower = new cGridBag();
	1699	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	1700	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1701	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	1702	+ textureSection.add(opacityPower);
	1703	+
	1704	+ panel.add(new JSeparator());
	1705	+
	1706	+ panel.add(textureSection);
	1707	+
	1708	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1750	1709
1751	1710	SetMaterial(copy); // .GetMaterial());
1752	1711
1753		- colorField.addChangeListener(this);
1754		- modulationField.addChangeListener(this);
	1712	+ //colorField.addChangeListener(this);
	1713	+// modulationField.addChangeListener(this);
1755	1714	metalnessField.addChangeListener(this);
1756	1715	diffuseField.addChangeListener(this);
1757	1716	specularField.addChangeListener(this);
..	..	@@ -2563,6 +2522,7 @@
2563	2522	}
2564	2523	if (input == null)
2565	2524	{
	2525	+ new Exception().printStackTrace();
2566	2526	System.exit(0);
2567	2527	}
2568	2528
..	..	@@ -2959,20 +2919,37 @@
2959	2919	// june 2013 copy.HardTouch();
2960	2920	cameraView.repaint();
2961	2921	return;
2962		- } else if (event.getSource() == toggleFullItem)
	2922	+ } else if (event.getSource() == toggleTimelineItem)
2963	2923	{
2964		- if (CameraPane.FULLSCREEN)
	2924	+ timeline ^= true;
	2925	+
	2926	+ if (timeline)
2965	2927	{
2966		- frame.getContentPane().remove(/"Center",/bigThree);
2967		- framePanel.add(bigThree);
2968		- frame.getContentPane().add(/"Center",/framePanel);
2969		- } else
2970		- {
2971		- frame.getContentPane().remove(/"Center",/framePanel);
2972		- frame.getContentPane().add(/"Center",/bigThree);
	2928	+ centralPanel.remove(cameraView);
	2929	+ cameraPanel.add(cameraView);
	2930	+ centralPanel.add(cameraPanel);
	2931	+ frame.setJMenuBar(timelineMenubar);
	2932	+ wasFullScreen = CameraPane.FULLSCREEN;
	2933	+ if (!CameraPane.FULLSCREEN)
	2934	+ ToggleFullScreen();
	2935	+ toggleFullScreenItem.setEnabled(false);
2973	2936	}
	2937	+ else
	2938	+ {
	2939	+ centralPanel.remove(cameraPanel);
	2940	+ centralPanel.add(cameraView);
	2941	+ frame.setJMenuBar(null);
	2942	+ if (!wasFullScreen)
	2943	+ ToggleFullScreen();
	2944	+ toggleFullScreenItem.setEnabled(true);
	2945	+ }
	2946	+
2974	2947	frame.validate();
2975		- cameraView.ToggleFullScreen();
	2948	+ return;
	2949	+ } else if (event.getSource() == toggleFullScreenItem)
	2950	+ {
	2951	+ ToggleFullScreen();
	2952	+ frame.validate();
2976	2953
2977	2954	return;
2978	2955	} else if (event.getSource() == toggleRandomItem)
..	..	@@ -3020,6 +2997,7 @@
3020	2997	if (event.getSource() == randomCB)
3021	2998	{
3022	2999	copy.random ^= true;
	3000	+ objEditor.refreshContents();
3023	3001	return;
3024	3002	}
3025	3003	if (event.getSource() == speedupCB)
..	..	@@ -3082,7 +3060,8 @@
3082	3060	objEditor.refreshContents();
3083	3061	} else if (event.getSource() == stepItem)
3084	3062	{
3085		- cameraView.ONESTEP = true;
	3063	+ //cameraView.ONESTEP = true;
	3064	+ Globals.ONESTEP = true;
3086	3065	cameraView.repaint();
3087	3066	return;
3088	3067	} else if (event.getSource() == stepButton)
..	..	@@ -3221,9 +3200,9 @@
3221	3200	cameraView.RevertCamera();
3222	3201	cameraView.repaint();
3223	3202	return;
3224		- } else if (event.getSource() == textureButton)
3225		- {
3226		- return; // true;
	3203	+// } else if (event.getSource() == textureButton)
	3204	+// {
	3205	+// return; // true;
3227	3206	} else // combos...
3228	3207	if (event.getSource() == texresMenu)
3229	3208	{
..	..	@@ -3239,25 +3218,25 @@
3239	3218
3240	3219	void ToggleAnimation()
3241	3220	{
3242		- if (!CameraPane.ANIMATION)
	3221	+ if (!Globals.ANIMATION)
3243	3222	{
3244	3223	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3245		- browser.show();
	3224	+ browser.setVisible(true);
3246	3225	String filename = browser.getFile();
3247	3226	if (filename != null && filename.length() > 0)
3248	3227	{
3249		- CameraPane.filename = browser.getDirectory() + filename;
	3228	+ Globals.filename = browser.getDirectory() + filename;
3250	3229	//CameraPane.framecount = 0;
3251		- CameraPane.imagecount = 0;
	3230	+ Globals.imagecount = 0;
3252	3231
3253		- CameraPane.ANIMATION ^= true;
	3232	+ Globals.ANIMATION ^= true;
3254	3233
3255	3234	GrafreeD.wav.cursor = 0;
3256	3235	GrafreeD.wav.loop = 0;
3257	3236	}
3258	3237	} else
3259	3238	{
3260		- CameraPane.ANIMATION ^= true;
	3239	+ Globals.ANIMATION ^= true;
3261	3240	}
3262	3241	}
3263	3242
..	..	@@ -3274,6 +3253,7 @@
3274	3253	callee.refreshContents();
3275	3254	} else
3276	3255	{
	3256	+ new Exception().printStackTrace();
3277	3257	System.exit(0);
3278	3258	}
3279	3259	}
..	..	@@ -3436,7 +3416,7 @@
3436	3416	current.fakedepth = (float) fakedepthField.getFloat();
3437	3417	current.shadowbias = (float) shadowbiasField.getFloat();
3438	3418
3439		- if (!NumberSlider.frozen)
	3419	+ if (!cNumberSlider.frozen)
3440	3420	{
3441	3421	//System.out.println("Propagate = " + propagate);
3442	3422	copy.UpdateMaterial(anchor, current, propagate);
..	..	@@ -3484,6 +3464,7 @@
3484	3464	\|\| e.getSource() == apertureField
3485	3465	\|\| e.getSource() == shadowblurField)
3486	3466	{
	3467	+ new Exception().printStackTrace();
3487	3468	System.exit(0);
3488	3469	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3489	3470	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3510,7 +3491,13 @@
3510	3491	//System.out.println("PARENT = " + parent);
3511	3492	//if (parent != null)
3512	3493	// parent.applySelf();
3513		- refreshContents();
	3494	+ if (e.getSource() == normalpushField)
	3495	+ {
	3496	+ objEditor.refreshContents();
	3497	+ //Refresh();
	3498	+ }
	3499	+ else
	3500	+ refreshContents();
3514	3501	// ??? client.refreshEditWindow();
3515	3502	}
3516	3503	//else
..	..	@@ -3522,7 +3509,7 @@
3522	3509	//group.name = nameField.getText();
3523	3510	//objEditor.applySelf();
3524	3511
3525		- assert (objEditor == this);
	3512	+ // OCT2018: assert (objEditor == this);
3526	3513	if (copy.selection == null \|\| copy.selection.size() == 0)
3527	3514	//super.applySelf()
3528	3515	; else
..	..	@@ -3546,12 +3533,18 @@
3546	3533	objEditor.copy = keep;
3547	3534	}
3548	3535	}
	3536	+
	3537	+ if (normalpushField != null)
	3538	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
3549	3539	}
3550	3540
3551	3541	void SnapObject()
3552	3542	{
3553		- Object3D obj = (Object3D)copy.selection.elementAt(0);
3554		- SnapObject(obj);
	3543	+ if (copy.selection.size() > 0)
	3544	+ {
	3545	+ Object3D obj = (Object3D)copy.selection.elementAt(0);
	3546	+ SnapObject(obj);
	3547	+ }
3555	3548	}
3556	3549
3557	3550	void SnapObject(Object3D obj)
..	..	@@ -3797,7 +3790,7 @@
3797	3790
3798	3791	radioPanel.revalidate();
3799	3792	radioPanel.repaint();
3800		- ctrlPanel.revalidate(); // ? new
	3793	+ ctrlPanel.validate(); // ? new
3801	3794	ctrlPanel.repaint();
3802	3795	}
3803	3796	}
..	..	@@ -4443,9 +4436,10 @@
4443	4436	//MenuItem normalLensItem;
4444	4437	MenuItem editCameraItem;
4445	4438	MenuItem revertCameraItem;
4446		- CheckboxMenuItem toggleLiveItem;
4447	4439	MenuItem stepItem;
4448		- CheckboxMenuItem toggleFullItem;
	4440	+ CheckboxMenuItem toggleLiveItem;
	4441	+ CheckboxMenuItem toggleFullScreenItem;
	4442	+ CheckboxMenuItem toggleTimelineItem;
4449	4443	CheckboxMenuItem toggleRenderItem;
4450	4444	CheckboxMenuItem toggleDebugItem;
4451	4445	CheckboxMenuItem toggleFrustumItem;
..	..	@@ -4460,23 +4454,26 @@
4460	4454	JSplitPane mainPanel;
4461	4455	JScrollPane scrollpane;
4462	4456	JPanel toolbarPanel;
4463		- JPanel treePanel;
	4457	+ cGridBag treePanel;
4464	4458	JPanel radioPanel;
4465	4459	ButtonGroup buttonGroup;
4466		- JPanel ctrlPanel;
4467		- JPanel materialPanel;
	4460	+ cGridBag ctrlPanel;
	4461	+ cGridBag materialPanel;
4468	4462	JScrollPane infoPanel;
4469		- JPanel optionsPanel;
	4463	+ cGridBag optionsPanel;
4470	4464	JTabbedPane objectPanel;
4471		- JPanel XYZPanel;
	4465	+ cGridBag XYZPanel;
4472	4466	JSplitPane gridPanel;
4473	4467	JSplitPane bigPanel;
4474		- JPanel bigThree;
4475		- JTabbedPane scenePanel;
4476		- JPanel cameraPanel;
	4468	+ cGridBag bigThree;
	4469	+ cGridBag scenePanel;
	4470	+ cGridBag centralPanel;
	4471	+ JSplitPane cameraPanel;
	4472	+ JPanel timelinePanel;
	4473	+ JMenuBar timelineMenubar;
4477	4474	JSplitPane framePanel;
4478	4475	JTextArea/Field/ nameField;
4479		- cButton textureButton;
	4476	+ //cButton textureButton;
4480	4477	cButton okButton;
4481	4478	cButton applyButton;
4482	4479	cButton cancelButton;
..	..	@@ -4523,65 +4520,67 @@
4523	4520	// MATERIAL
4524	4521	JLabel materialLabel;
4525	4522	JLabel colorLabel;
4526		- NumberSlider colorField;
	4523	+ cNumberSlider colorField;
4527	4524	JLabel modulationLabel;
4528		- NumberSlider modulationField;
	4525	+ cNumberSlider modulationField;
4529	4526	JLabel metalnessLabel;
4530		- NumberSlider metalnessField;
	4527	+ cNumberSlider metalnessField;
4531	4528	JLabel diffuseLabel;
4532		- NumberSlider diffuseField;
	4529	+ cNumberSlider diffuseField;
4533	4530	JLabel specularLabel;
4534		- NumberSlider specularField;
	4531	+ cNumberSlider specularField;
4535	4532	JLabel shininessLabel;
4536		- NumberSlider shininessField;
	4533	+ cNumberSlider shininessField;
4537	4534	JLabel shiftLabel;
4538		- NumberSlider shiftField;
	4535	+ cNumberSlider shiftField;
4539	4536	JLabel ambientLabel;
4540		- NumberSlider ambientField;
	4537	+ cNumberSlider ambientField;
4541	4538	JLabel lightareaLabel;
4542		- NumberSlider lightareaField;
	4539	+ cNumberSlider lightareaField;
4543	4540	JLabel diffusenessLabel;
4544		- NumberSlider diffusenessField;
	4541	+ cNumberSlider diffusenessField;
4545	4542	JLabel velvetLabel;
4546		- NumberSlider velvetField;
	4543	+ cNumberSlider velvetField;
4547	4544	JLabel sheenLabel;
4548		- NumberSlider sheenField;
	4545	+ cNumberSlider sheenField;
4549	4546	JLabel subsurfaceLabel;
4550		- NumberSlider subsurfaceField;
	4547	+ cNumberSlider subsurfaceField;
4551	4548	//JLabel bumpLabel;
4552	4549	//NumberSlider bumpField;
4553	4550	JLabel backlitLabel;
4554		- NumberSlider backlitField;
	4551	+ cNumberSlider backlitField;
4555	4552	JLabel anisoLabel;
4556		- NumberSlider anisoField;
	4553	+ cNumberSlider anisoField;
4557	4554	JLabel anisoVLabel;
4558		- NumberSlider anisoVField;
	4555	+ cNumberSlider anisoVField;
4559	4556	JLabel cameraLabel;
4560		- NumberSlider cameraField;
	4557	+ cNumberSlider cameraField;
4561	4558	JLabel selfshadowLabel;
4562		- NumberSlider selfshadowField;
	4559	+ cNumberSlider selfshadowField;
4563	4560	JLabel shadowLabel;
4564		- NumberSlider shadowField;
	4561	+ cNumberSlider shadowField;
4565	4562	JLabel textureLabel;
4566		- NumberSlider textureField;
	4563	+ cNumberSlider textureField;
4567	4564	JLabel opacityLabel;
4568		- NumberSlider opacityField;
	4565	+ cNumberSlider opacityField;
4569	4566	JLabel fakedepthLabel;
4570		- NumberSlider fakedepthField;
	4567	+ cNumberSlider fakedepthField;
4571	4568	JLabel shadowbiasLabel;
4572		- NumberSlider shadowbiasField;
	4569	+ cNumberSlider shadowbiasField;
4573	4570	JLabel bumpLabel;
4574		- NumberSlider bumpField;
	4571	+ cNumberSlider bumpField;
4575	4572	JLabel noiseLabel;
4576		- NumberSlider noiseField;
	4573	+ cNumberSlider noiseField;
4577	4574	JLabel powerLabel;
4578		- NumberSlider powerField;
	4575	+ cNumberSlider powerField;
4579	4576	JLabel borderfadeLabel;
4580		- NumberSlider borderfadeField;
	4577	+ cNumberSlider borderfadeField;
4581	4578	JLabel fogLabel;
4582		- NumberSlider fogField;
	4579	+ cNumberSlider fogField;
4583	4580	JLabel opacityPowerLabel;
4584		- NumberSlider opacityPowerField;
	4581	+ cNumberSlider opacityPowerField;
4585	4582	JTree jTree;
4586	4583	//ObjectUI parent;
	4584	+
	4585	+ cNumberSlider normalpushField;
4587	4586	}