~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,18 +309,18 @@
292	309	//normalLensItem.addActionListener(this);
293	310	cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
294	311	revertCameraItem.addActionListener(this);
	312	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	313	+ toggleTimelineItem.addItemListener(this);
295	314	cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
296	315	toggleFullScreenItem.addItemListener(this);
297	316	toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
298		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
299		- toggleTimelineItem.addItemListener(this);
300	317	cameraMenu.add("-");
301	318	cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
302	319	toggleTextureItem.addItemListener(this);
303	320	toggleTextureItem.setState(CameraPane.textureon);
304	321	cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
305	322	toggleLiveItem.addItemListener(this);
306		- toggleLiveItem.setState(CameraPane.isLIVE());
	323	+ toggleLiveItem.setState(Globals.isLIVE());
307	324	cameraMenu.add(stepItem = new MenuItem("Step"));
308	325	stepItem.addActionListener(this);
309	326	// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
..	..	@@ -343,21 +360,23 @@
343	360	objectPanel = new JTabbedPane();
344	361	toolbarPanel = new JPanel();
345	362	toolbarPanel.setName("Toolbar");
346		- treePanel = new JPanel();
	363	+ treePanel = new cGridBag();
347	364	treePanel.setName("Tree");
348		- ctrlPanel = new JPanel(); // new GridBagLayout());
	365	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
349	366	ctrlPanel.setName("Edit");
350		- materialPanel = new JPanel();
	367	+ materialPanel = new cGridBag().setVertical(true);
351	368	materialPanel.setName("Material");
352	369	/JTextPane/
353	370	infoarea = createTextPane();
	371	+ doc = infoarea.getStyledDocument();
	372	+
354	373	infoarea.setEditable(true);
355	374	SetText();
356	375	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
357	376	// infoarea.setOpaque(false);
358	377	// //infoarea.setForeground(textcolor);
359		- infoarea.setLineWrap(true);
360		- infoarea.setWrapStyleWord(true);
	378	+// TEXTAREA infoarea.setLineWrap(true);
	379	+// TEXTAREA infoarea.setWrapStyleWord(true);
361	380	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
362	381	infoPanel.setPreferredSize(new Dimension(50, 200));
363	382	infoPanel.setName("Info");
..	..	@@ -368,16 +387,16 @@
368	387	mainPanel.setName("Main");
369	388	mainPanel.setContinuousLayout(true);
370	389	mainPanel.setOneTouchExpandable(true);
371		- mainPanel.setDividerLocation(1.0);
372	390	mainPanel.setDividerSize(9);
373		- mainPanel.setResizeWeight(0);
	391	+ mainPanel.setDividerLocation(0.5); //1.0);
	392	+ mainPanel.setResizeWeight(0.5);
374	393
375	394	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
376	395	//mainPanel.setLayout(new GridBagLayout());
377	396	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
378		- treePanel.setLayout(new GridBagLayout());
379		- ctrlPanel.setLayout(new GridBagLayout());
380		- materialPanel.setLayout(new GridBagLayout());
	397	+// treePanel.setLayout(new GridBagLayout());
	398	+ //ctrlPanel.setLayout(new GridBagLayout());
	399	+ //materialPanel.setLayout(new GridBagLayout());
381	400
382	401	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
383	402	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -416,7 +435,7 @@
416	435	static String newline = "\n";
417	436	protected static final String buttonString = "JButton";
418	437	StyledDocument doc;
419		- JTextArea infoarea;
	438	+ JTextPane infoarea;
420	439
421	440	void ClearInfo()
422	441	{
..	..	@@ -483,7 +502,10 @@
483	502	}
484	503
485	504	if (full)
486		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	505	+ {
	506	+ si.SendInfo(" BBox min: " + minima, "regular");
	507	+ si.SendInfo(" BBox max: " + maxima, "regular");
	508	+ }
487	509
488	510	if (sel.bRep != null)
489	511	{
..	..	@@ -581,6 +603,9 @@
581	603	{
582	604	CameraPane.pointflow = (PointFlow) sel;
583	605	}
	606	+
	607	+ si.SendInfo("_____________________", "regular");
	608	+ si.SendInfo("", "regular");
584	609	}
585	610	}
586	611
..	..	@@ -596,52 +621,68 @@
596	621	}
597	622	}
598	623
599		- private JTextArea createTextPane()
600		- {
601		- String[] initString =
	624	+ void ToggleFullScreen()
602	625	{
603		- "This is an editable JTextPane, ", //regular
604		- "another ", //italic
605		- "styled ", //bold
606		- "text ", //small
607		- "component, ", //large
608		- "which supports embedded components..." + newline,//regular
609		- " " + newline, //button
610		- "...and embedded icons..." + newline, //regular
611		- " ", //icon
612		- newline + "JTextPane is a subclass of JEditorPane that "
613		- + "uses a StyledEditorKit and StyledDocument, and provides "
614		- + "cover methods for interacting with those objects."
615		- };
616		-
617		- String[] initStyles =
618		- {
619		- "regular", "italic", "bold", "small", "large",
620		- "regular", "button", "regular", "icon",
621		- "regular"
622		- };
623		-
624		- JTextPane textPane = new JTextPane();
625		- textPane.setEditable(true);
626		- /StyledDocument/ doc = textPane.getStyledDocument();
627		- addStylesToDocument(doc);
628		-
629		- try
630		- {
631		- for (int j = 0; j < 2; j++)
632		- {
633		- for (int i = 0; i < initString.length; i++)
	626	+ if (CameraPane.FULLSCREEN)
634	627	{
635		- doc.insertString(doc.getLength(), initString[i],
636		- 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);
637	636	}
638		- }
639		- } catch (BadLocationException ble)
640		- {
641		- System.err.println("Couldn't insert initial text into text pane.");
	637	+ cameraView.ToggleFullScreen();
642	638	}
643	639
644		- 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;
645	686	}
646	687
647	688	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -741,115 +782,83 @@
741	782	JButton slowerButton;
742	783	JButton fasterButton;
743	784	JButton remarkButton;
	785	+
	786	+ cGridBag namePanel;
	787	+ cGridBag setupPanel;
	788	+ cGridBag commandsPanel;
	789	+ cGridBag pushPanel;
	790	+ cGridBag fillPanel;
744	791
745		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	792	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
746	793	{
747	794	JCheckBox cb;
748	795
749		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
750		- oe.aConstraints.gridwidth = 1; // 3;
751		-// oe.aConstraints.weightx = 1;
752		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
753		- 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);
754	797	cb.addItemListener(this);
755		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
756		- oe.aConstraints.gridwidth = 1;
757		- oe.aConstraints.gridx += 1;
758	798
759	799	return cb;
760	800	}
761	801
762		- cButton AddButton(ObjEditor oe, String label)
	802	+ cButton AddButton(cGridBag panel, String label)
763	803	{
764	804	cButton cb;
765	805
766		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
767		- oe.aConstraints.gridwidth = 1;
768		-// oe.aConstraints.weightx = 1;
769		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
770		- 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);
771	807	cb.addActionListener(this);
772		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
773		- oe.aConstraints.gridwidth = 1;
774		- oe.aConstraints.gridx += 1;
775	808
776	809	return cb;
777	810	}
778	811
779		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	812	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
780	813	{
781	814	JComboBox combo;
782	815
783		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
784		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
785		- oe.aConstraints.gridx += 1;
	816	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
786	817	combo.addActionListener(this);
787	818
788	819	return combo;
789	820	}
790	821
791		- 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)
792	823	{
793		- NumberSlider combo;
	824	+ cGridBag control = new cGridBag();
	825	+
	826	+ cNumberSlider combo;
794	827
795	828	JLabel jlabel = new JLabel(label);
796		-
797		- aConstraints.fill = GridBagConstraints.VERTICAL;
798	829	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
799		- aConstraints.gridwidth = 2;
800		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
801		- aConstraints.gridx += 1;
802		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
803		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
804		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
805		- aConstraints.gridx += 1;
806		- aConstraints.gridwidth = 1;
807		-
	830	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	831	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
808	832	combo.setFloat(current);
809		-
810		- combo.label = jlabel;
811		-
812		- combo.addChangeListener(this);
813		-
814		- return combo;
	833	+
	834	+ panel.add(control);
	835	+
	836	+ return control;
815	837	}
816	838
817		- 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)
818	840	{
819		- NumberSlider combo;
	841	+ cGridBag control = new cGridBag();
	842	+
	843	+ cNumberSlider combo;
820	844
821	845	JLabel jlabel = new JLabel(label);
822		-
823		- aConstraints.fill = GridBagConstraints.VERTICAL;
824	846	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
825		- aConstraints.gridwidth = 2;
826		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
827		- aConstraints.gridx += 1;
828		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
829		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
830		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
831		- aConstraints.gridx += 1;
832		- aConstraints.gridwidth = 1;
833		-
	847	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	848	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
834	849	combo.setInteger(current);
835	850
836		- combo.label = jlabel;
837		-
838		- combo.addChangeListener(this);
839		-
840		- return combo;
	851	+ panel.add(control);
	852	+
	853	+ return control;
841	854	}
842	855
843		- JTextArea AddText(JPanel ctrlPanel, String name)
	856	+ JTextArea AddText(cGridBag ctrlPanel, String name)
844	857	{
845	858	JTextArea text;
846	859
847		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
848		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
849		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	860	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
850	861	text.addCaretListener(this);
851		- aConstraints.gridx += 1;
852		- aConstraints.gridwidth = 1;
853	862
854	863	return text;
855	864	}
..	..	@@ -879,9 +888,16 @@
879	888	objEditor.ctrlPanel.remove(j);
880	889	}
881	890
	891	+ void Remove(cNumberSlider j)
	892	+ {
	893	+ j.removeChangeListener(this);
	894	+ //objEditor.ctrlPanel.remove(j.label);
	895	+ objEditor.ctrlPanel.remove(j);
	896	+ }
	897	+
882	898	/*
883	899	*/
884		- void Return() // ObjEditor oe)
	900	+ void Return0() // ObjEditor oe)
885	901	{
886	902	aConstraints.gridy += 1;
887	903	aConstraints.gridx = 0;
..	..	@@ -936,35 +952,71 @@
936	952
937	953	void SetupUI2(ObjEditor oe)
938	954	{
939		-// oe.aConstraints.weightx = 0;
940		-// oe.aConstraints.weighty = 0;
941		-// oe.aConstraints.gridx = 0;
942		-// oe.aConstraints.gridy = 0;
943		- 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();
944	964
945	965	if (!GroupEditor.allparams)
946	966	return;
947	967
948		- liveCB = AddCheckBox(oe, "Live", copy.live);
949		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
950		- 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");
951	974	// Return();
952		- markCB = AddCheckBox(oe, "Mark", copy.marked);
953		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
954		- randomCB = AddCheckBox(oe, "Rand", copy.random);
955		- Return();
956		- resetButton = AddButton(oe, "Reset");
957		- 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");
958	1001	// resetAllButton = AddButton(oe, "Reset All");
959	1002	// stepAllButton = AddButton(oe, "Step All");
960		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
961	1003	// Return();
962		- slowerButton = AddButton(oe, "Slow");
963		- fasterButton = AddButton(oe, "Fast");
964		- 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");
965	1010
966		- Return();
	1011	+ oe.ctrlPanel.add(commandsPanel);
	1012	+ oe.ctrlPanel.Return();
967	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	+
968	1020	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
969	1021	// ObjEditor.aConstraints.gridx += 1;
970	1022
..	..	@@ -1058,7 +1110,7 @@
1058	1110	oe.aConstraints.gridwidth = 1;
1059	1111	/**/
1060	1112	nameField = AddText(oe.ctrlPanel, copy.GetName());
1061		- Return();
	1113	+ oe.ctrlPanel.Return();
1062	1114
1063	1115	//ctrlPanel.add(textureButton = new Button("Texture..."));
1064	1116	//textureButton.setEnabled(false);
..	..	@@ -1160,10 +1212,18 @@
1160	1212	//JPanel worldPanel =
1161	1213	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1162	1214	//worldPanel.setName("World");
1163		- centralPanel = new JPanel(new BorderLayout());
	1215	+ centralPanel = new cGridBag();
	1216	+ centralPanel.preferredWidth = 20;
1164	1217	timelinePanel = new JPanel(new BorderLayout());
1165	1218	timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1166	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	+
1167	1227	centralPanel.add(cameraView);
1168	1228	//frame.setJMenuBar(timelineMenubar);
1169	1229	//centralPanel.add(timelinePanel);
..	..	@@ -1183,12 +1243,13 @@
1183	1243	//frontView.object = copy;
1184	1244	//sideView.object = copy;
1185	1245
1186		- XYZPanel = new JPanel();
1187		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1246	+ XYZPanel = new cGridBag().setVertical(true);
	1247	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1188	1248
1189		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1190		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1191		- 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);
1192	1253
1193	1254	/*
1194	1255	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1226,10 +1287,11 @@
1226	1287	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1227	1288	//tmp.setName("Edit");
1228	1289	objectPanel.add(materialPanel);
1229		- JPanel north = new JPanel(new BorderLayout());
1230		- north.setName("Edit");
1231		- north.add(ctrlPanel, BorderLayout.NORTH);
1232		- 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);
1233	1295	objectPanel.add(infoPanel);
1234	1296
1235	1297	/*
..	..	@@ -1250,16 +1312,23 @@
1250	1312	scrollpane.setWheelScrollingEnabled(true);
1251	1313	scrollpane.addMouseWheelListener(this); // Default not fast enough
1252	1314
1253		- /JTabbedPane/ scenePanel = new JTabbedPane();
1254		- scenePanel.add(scrollpane);
	1315	+ /JTabbedPane/ scenePanel = new cGridBag();
	1316	+ scenePanel.preferredWidth = 7;
	1317	+
	1318	+ JTabbedPane tabbedPane = new JTabbedPane();
	1319	+ tabbedPane.add(scrollpane);
1255	1320
1256		- scenePanel.add(FSPane = new cFileSystemPane(this));
	1321	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1257	1322
1258		- optionsPanel = new JPanel(new GridBagLayout());
	1323	+ optionsPanel = new cGridBag().setVertical(true);
1259	1324
1260	1325	optionsPanel.setName("Options");
1261		- scenePanel.add(optionsPanel);
1262		-
	1326	+
	1327	+ AddOptions(optionsPanel); //, aConstraints);
	1328	+
	1329	+ tabbedPane.add(optionsPanel);
	1330	+
	1331	+ scenePanel.add(tabbedPane);
1263	1332
1264	1333	/*
1265	1334	cTree jTree = new cTree(null);
..	..	@@ -1293,6 +1362,7 @@
1293	1362	//bigPanel.setSize(new Dimension(10,10));
1294	1363	//bigPanel.add(ctrlPanel);
1295	1364	//bigPanel.add(gridPanel);
	1365	+ /**
1296	1366	bigThree = new JPanel();
1297	1367	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1298	1368	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1316,7 +1386,13 @@
1316	1386	// aConstraints.gridheight = 3;
1317	1387	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1318	1388	bigThree.add(XYZPanel, aWindowConstraints);
	1389	+ /**/
1319	1390
	1391	+ bigThree = new cGridBag();
	1392	+ bigThree.addComponent(scenePanel);
	1393	+ bigThree.addComponent(centralPanel);
	1394	+ bigThree.addComponent(XYZPanel);
	1395	+
1320	1396	// // SIDE EFFECT!!!
1321	1397	// aConstraints.gridx = 0;
1322	1398	// aConstraints.gridy = 0;
..	..	@@ -1337,7 +1413,8 @@
1337	1413	//worldPane.add(bigPanel);
1338	1414	//worldPane.add(worldPanel);
1339	1415	/**/
1340		- frame.getContentPane().add(/"Center",/framePanel);
	1416	+ //frame.getContentPane().add(/"Center",/framePanel);
	1417	+ frame.add(/"Center",/framePanel);
1341	1418	//frame.getContentPane().add(/"Center",/ worldPane);
1342	1419
1343	1420	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
..	..	@@ -1358,6 +1435,10 @@
1358	1435	});
1359	1436	}
1360	1437
	1438	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1439	+ {
	1440	+ }
	1441	+
1361	1442	JTree GetTree()
1362	1443	{
1363	1444	return objEditor.jTree;
..	..	@@ -1369,260 +1450,170 @@
1369	1450	ctrlPanel.removeAll();
1370	1451	}
1371	1452
1372		- void SetupMaterial(JPanel ctrlPanel)
	1453	+ void SetupMaterial(cGridBag panel)
1373	1454	{
1374		- aConstraints.weighty = 0;
1375		- //aConstraints.weightx = 1;
1376		- /*
	1455	+ /*
1377	1456	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1378	1457	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1379		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1380		- aConstraints.gridx += 1;
1381	1458	*/
1382	1459
1383		- aConstraints.gridwidth = 1;
1384		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1385		- aConstraints.gridx += 1;
1386		- aConstraints.weighty = 0;
1387		- 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");
1388	1464
1389	1465	/*
1390	1466	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1391		- aConstraints.gridx += 1;
1392		- aConstraints.weighty = 0;
1393		- aConstraints.gridwidth = 1;
1394	1467	*/
1395	1468
1396		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1397		- 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);
1398	1475
1399		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1400		-
1401		- aConstraints.gridx += 1;
1402		-
1403		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1404		-
1405		- aConstraints.gridx += 1;
1406		-
1407		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1408		-
1409		- aConstraints.gridx = 0;
1410		- aConstraints.gridy += 1;
1411		- aConstraints.weighty = 0;
1412		- aConstraints.gridwidth = 1;
	1476	+ editBar.preferredHeight = 15;
	1477	+
	1478	+ panel.add(editBar);
	1479	+
1413	1480	/**/
1414	1481	//aConstraints.weighty = 0;
1415	1482	////aConstraints.weightx = 1;
1416	1483	//aConstraints.weighty = 1;
1417	1484	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1418	1485	//aConstraints.gridx += 1;
1419		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1420		- aConstraints.weighty = 0;
1421		- aConstraints.gridx = 0;
1422		- aConstraints.gridy += 1;
1423		- aConstraints.gridwidth = 1;
	1486	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1424	1487
1425		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1426		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1427		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1428		- aConstraints.gridx += 1;
1429		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1430		- //aConstraints.weightx = 0;
1431		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1432		- aConstraints.gridx = 0;
1433		- aConstraints.gridy += 1;
1434		- 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);
1435	1496
1436		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1437		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1438		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1439		- aConstraints.gridx += 1;
1440		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1441		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1442		- aConstraints.gridx = 0;
1443		- aConstraints.gridy += 1;
1444		- 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);
1445	1502
1446		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1447		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1448		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1449		- aConstraints.gridx += 1;
1450		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1451		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1452		- aConstraints.gridx = 0;
1453		- aConstraints.gridy += 1;
1454		- 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);
1455	1508
1456		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1457		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1458		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1459		- aConstraints.gridx += 1;
1460		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1461		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1462		- aConstraints.gridx = 0;
1463		- aConstraints.gridy += 1;
1464		- 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);
1465	1514
1466		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1467		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1468		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1469		- aConstraints.gridx += 1;
1470		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1471		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1472		- aConstraints.gridx = 0;
1473		- aConstraints.gridy += 1;
1474		- 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);
1475	1520
1476		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1477		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1478		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1479		- aConstraints.gridx += 1;
1480		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1481		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1482		- aConstraints.gridx = 0;
1483		- aConstraints.gridy += 1;
1484		- 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);
1485	1526
1486		- //aConstraints.weighty = 1;
1487		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1488		- //aConstraints.gridx += 1;
1489		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1490		- aConstraints.weighty = 0;
1491		- aConstraints.gridx = 0;
1492		- aConstraints.gridy += 1;
1493		- 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);
1494	1540
1495		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1496		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1497		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1498		- aConstraints.gridx += 1;
1499		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1500		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1501		- aConstraints.gridx = 0;
1502		- aConstraints.gridy += 1;
1503		- 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);
1504	1546
1505		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1506		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1507		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1508		- aConstraints.gridx += 1;
1509		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1510		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1511		- aConstraints.gridx = 0;
1512		- aConstraints.gridy += 1;
1513		- 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);
1514	1552
1515		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1516		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1517		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1518		- aConstraints.gridx += 1;
1519		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1520		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1521		- aConstraints.gridx = 0;
1522		- aConstraints.gridy += 1;
1523		- 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);
1524	1558
1525		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1526		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1527		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1528		- aConstraints.gridx += 1;
1529		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1530		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1531		- aConstraints.gridx = 0;
1532		- aConstraints.gridy += 1;
1533		- 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);
1534	1564
1535		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1536		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1537		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1538		- aConstraints.gridx += 1;
1539		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1540		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1541		- aConstraints.gridx = 0;
1542		- aConstraints.gridy += 1;
1543		- 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);
1544	1570
1545		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1546		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1547		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1548		- aConstraints.gridx += 1;
1549		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1550		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1551		- aConstraints.gridx = 0;
1552		- aConstraints.gridy += 1;
1553		- 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);
1554	1576
1555		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1556		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1557		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1558		- aConstraints.gridx += 1;
1559		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1560		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1561		- aConstraints.gridx = 0;
1562		- aConstraints.gridy += 1;
1563		- 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);
1564	1584
1565		- //aConstraints.weighty = 1;
1566		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1567		- //aConstraints.gridx += 1;
1568		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1569		- aConstraints.weighty = 0;
1570		- aConstraints.gridx = 0;
1571		- aConstraints.gridy += 1;
1572		- 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);
1573	1590
1574		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1575		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1576		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1577		- aConstraints.gridx += 1;
1578		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1579		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1580		- aConstraints.gridx = 0;
1581		- aConstraints.gridy += 1;
1582		- 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);
1583	1596
1584		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1585		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1586		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1587		- aConstraints.gridx += 1;
1588		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1589		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1590		- aConstraints.gridx = 0;
1591		- aConstraints.gridy += 1;
1592		- 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);
1593	1602
1594		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1595		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1596		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1597		- aConstraints.gridx += 1;
1598		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1599		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1600		- aConstraints.gridx = 0;
1601		- aConstraints.gridy += 1;
1602		- 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);
1603	1608
1604		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1605		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1606		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1607		- aConstraints.gridx += 1;
1608		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1609		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1610		- aConstraints.gridx = 0;
1611		- aConstraints.gridy += 1;
1612		- 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);
1613	1614
1614		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1615		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1616		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1617		- aConstraints.gridx += 1;
1618		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1619		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1620		- aConstraints.gridx = 0;
1621		- aConstraints.gridy += 1;
1622		- aConstraints.gridwidth = 1;
1623		-
1624		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1625		- Return();
	1615	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1616	+ //Return();
1626	1617	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1627	1618	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1628	1619	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1633,130 +1624,93 @@
1633	1624	// aConstraints.gridy += 1;
1634	1625	// aConstraints.gridwidth = 1;
1635	1626
1636		- //aConstraints.weighty = 1;
1637		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1638		- //aConstraints.gridx += 1;
1639		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1640		- aConstraints.weighty = 0;
1641		- aConstraints.gridx = 0;
1642		- aConstraints.gridy += 1;
1643		- aConstraints.gridwidth = 1;
1644	1627
1645		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1646		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1647		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1648		- aConstraints.gridx += 1;
1649		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1650		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1651		- aConstraints.gridx = 0;
1652		- aConstraints.gridy += 1;
1653		- 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);
1654	1635
1655		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1656		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1657		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1658		- aConstraints.gridx += 1;
1659		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1660		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1661		- aConstraints.gridx = 0;
1662		- aConstraints.gridy += 1;
1663		- 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);
1664	1641
1665		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1666		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1667		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1668		- aConstraints.gridx += 1;
1669		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1670		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1671		- aConstraints.gridx = 0;
1672		- aConstraints.gridy += 1;
1673		- 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);
1674	1647
1675		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1676		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1677		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1678		- aConstraints.gridx += 1;
1679		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1680		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1681		- aConstraints.gridx = 0;
1682		- aConstraints.gridy += 1;
1683		- aConstraints.gridwidth = 1;
1684		- 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);
1685	1653
1686		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1687		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1688		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1689		- aConstraints.gridx += 1;
1690		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1691		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1692		- aConstraints.gridx = 0;
1693		- aConstraints.gridy += 1;
1694		- 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);
1695	1659
1696		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1697		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1698		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1699		- aConstraints.gridx += 1;
1700		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1701		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1702		- aConstraints.gridx = 0;
1703		- aConstraints.gridy += 1;
1704		- 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);
1705	1667
1706		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1707		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1708		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1709		- aConstraints.gridx += 1;
1710		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1711		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1712		- aConstraints.gridx = 0;
1713		- aConstraints.gridy += 1;
1714		- 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);
1715	1673
1716		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1717		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1718		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1719		- aConstraints.gridx += 1;
1720		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1721		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1722		- aConstraints.gridx = 0;
1723		- aConstraints.gridy += 1;
1724		- 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);
1725	1679
1726		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1727		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1728		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1729		- aConstraints.gridx += 1;
1730		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1731		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1732		- aConstraints.gridx = 0;
1733		- aConstraints.gridy += 1;
1734		- 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);
1735	1685
1736		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1737		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1738		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1739		- aConstraints.gridx += 1;
1740		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1741		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1742		- aConstraints.gridx = 0;
1743		- aConstraints.gridy += 1;
1744		- 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);
1745	1691
1746		- //aConstraints.weighty = 1;
1747		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1748		- //aConstraints.gridx += 1;
1749		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1750		- 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);
1751	1697
1752		- aConstraints.gridx = 0;
1753		- aConstraints.gridy = 0;
1754		- 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);
1755	1709
1756	1710	SetMaterial(copy); // .GetMaterial());
1757	1711
1758		- colorField.addChangeListener(this);
1759		- modulationField.addChangeListener(this);
	1712	+ //colorField.addChangeListener(this);
	1713	+// modulationField.addChangeListener(this);
1760	1714	metalnessField.addChangeListener(this);
1761	1715	diffuseField.addChangeListener(this);
1762	1716	specularField.addChangeListener(this);
..	..	@@ -2568,6 +2522,7 @@
2568	2522	}
2569	2523	if (input == null)
2570	2524	{
	2525	+ new Exception().printStackTrace();
2571	2526	System.exit(0);
2572	2527	}
2573	2528
..	..	@@ -2966,37 +2921,35 @@
2966	2921	return;
2967	2922	} else if (event.getSource() == toggleTimelineItem)
2968	2923	{
2969		- copy.timeline ^= true;
	2924	+ timeline ^= true;
2970	2925
2971		- if (copy.timeline)
	2926	+ if (timeline)
2972	2927	{
2973	2928	centralPanel.remove(cameraView);
2974		- centralPanel.add(timelinePanel);
	2929	+ cameraPanel.add(cameraView);
	2930	+ centralPanel.add(cameraPanel);
2975	2931	frame.setJMenuBar(timelineMenubar);
	2932	+ wasFullScreen = CameraPane.FULLSCREEN;
	2933	+ if (!CameraPane.FULLSCREEN)
	2934	+ ToggleFullScreen();
	2935	+ toggleFullScreenItem.setEnabled(false);
2976	2936	}
2977	2937	else
2978	2938	{
2979		- centralPanel.remove(timelinePanel);
	2939	+ centralPanel.remove(cameraPanel);
2980	2940	centralPanel.add(cameraView);
2981	2941	frame.setJMenuBar(null);
	2942	+ if (!wasFullScreen)
	2943	+ ToggleFullScreen();
	2944	+ toggleFullScreenItem.setEnabled(true);
2982	2945	}
2983	2946
2984	2947	frame.validate();
2985	2948	return;
2986	2949	} else if (event.getSource() == toggleFullScreenItem)
2987	2950	{
2988		- if (CameraPane.FULLSCREEN)
2989		- {
2990		- frame.getContentPane().remove(/"Center",/bigThree);
2991		- framePanel.add(bigThree);
2992		- frame.getContentPane().add(/"Center",/framePanel);
2993		- } else
2994		- {
2995		- frame.getContentPane().remove(/"Center",/framePanel);
2996		- frame.getContentPane().add(/"Center",/bigThree);
2997		- }
	2951	+ ToggleFullScreen();
2998	2952	frame.validate();
2999		- cameraView.ToggleFullScreen();
3000	2953
3001	2954	return;
3002	2955	} else if (event.getSource() == toggleRandomItem)
..	..	@@ -3044,6 +2997,7 @@
3044	2997	if (event.getSource() == randomCB)
3045	2998	{
3046	2999	copy.random ^= true;
	3000	+ objEditor.refreshContents();
3047	3001	return;
3048	3002	}
3049	3003	if (event.getSource() == speedupCB)
..	..	@@ -3106,7 +3060,8 @@
3106	3060	objEditor.refreshContents();
3107	3061	} else if (event.getSource() == stepItem)
3108	3062	{
3109		- cameraView.ONESTEP = true;
	3063	+ //cameraView.ONESTEP = true;
	3064	+ Globals.ONESTEP = true;
3110	3065	cameraView.repaint();
3111	3066	return;
3112	3067	} else if (event.getSource() == stepButton)
..	..	@@ -3263,25 +3218,25 @@
3263	3218
3264	3219	void ToggleAnimation()
3265	3220	{
3266		- if (!CameraPane.ANIMATION)
	3221	+ if (!Globals.ANIMATION)
3267	3222	{
3268	3223	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3269		- browser.show();
	3224	+ browser.setVisible(true);
3270	3225	String filename = browser.getFile();
3271	3226	if (filename != null && filename.length() > 0)
3272	3227	{
3273		- CameraPane.filename = browser.getDirectory() + filename;
	3228	+ Globals.filename = browser.getDirectory() + filename;
3274	3229	//CameraPane.framecount = 0;
3275		- CameraPane.imagecount = 0;
	3230	+ Globals.imagecount = 0;
3276	3231
3277		- CameraPane.ANIMATION ^= true;
	3232	+ Globals.ANIMATION ^= true;
3278	3233
3279	3234	GrafreeD.wav.cursor = 0;
3280	3235	GrafreeD.wav.loop = 0;
3281	3236	}
3282	3237	} else
3283	3238	{
3284		- CameraPane.ANIMATION ^= true;
	3239	+ Globals.ANIMATION ^= true;
3285	3240	}
3286	3241	}
3287	3242
..	..	@@ -3298,6 +3253,7 @@
3298	3253	callee.refreshContents();
3299	3254	} else
3300	3255	{
	3256	+ new Exception().printStackTrace();
3301	3257	System.exit(0);
3302	3258	}
3303	3259	}
..	..	@@ -3460,7 +3416,7 @@
3460	3416	current.fakedepth = (float) fakedepthField.getFloat();
3461	3417	current.shadowbias = (float) shadowbiasField.getFloat();
3462	3418
3463		- if (!NumberSlider.frozen)
	3419	+ if (!cNumberSlider.frozen)
3464	3420	{
3465	3421	//System.out.println("Propagate = " + propagate);
3466	3422	copy.UpdateMaterial(anchor, current, propagate);
..	..	@@ -3508,6 +3464,7 @@
3508	3464	\|\| e.getSource() == apertureField
3509	3465	\|\| e.getSource() == shadowblurField)
3510	3466	{
	3467	+ new Exception().printStackTrace();
3511	3468	System.exit(0);
3512	3469	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3513	3470	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3534,7 +3491,13 @@
3534	3491	//System.out.println("PARENT = " + parent);
3535	3492	//if (parent != null)
3536	3493	// parent.applySelf();
3537		- refreshContents();
	3494	+ if (e.getSource() == normalpushField)
	3495	+ {
	3496	+ objEditor.refreshContents();
	3497	+ //Refresh();
	3498	+ }
	3499	+ else
	3500	+ refreshContents();
3538	3501	// ??? client.refreshEditWindow();
3539	3502	}
3540	3503	//else
..	..	@@ -3546,7 +3509,7 @@
3546	3509	//group.name = nameField.getText();
3547	3510	//objEditor.applySelf();
3548	3511
3549		- assert (objEditor == this);
	3512	+ // OCT2018: assert (objEditor == this);
3550	3513	if (copy.selection == null \|\| copy.selection.size() == 0)
3551	3514	//super.applySelf()
3552	3515	; else
..	..	@@ -3570,12 +3533,18 @@
3570	3533	objEditor.copy = keep;
3571	3534	}
3572	3535	}
	3536	+
	3537	+ if (normalpushField != null)
	3538	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
3573	3539	}
3574	3540
3575	3541	void SnapObject()
3576	3542	{
3577		- Object3D obj = (Object3D)copy.selection.elementAt(0);
3578		- SnapObject(obj);
	3543	+ if (copy.selection.size() > 0)
	3544	+ {
	3545	+ Object3D obj = (Object3D)copy.selection.elementAt(0);
	3546	+ SnapObject(obj);
	3547	+ }
3579	3548	}
3580	3549
3581	3550	void SnapObject(Object3D obj)
..	..	@@ -3821,7 +3790,7 @@
3821	3790
3822	3791	radioPanel.revalidate();
3823	3792	radioPanel.repaint();
3824		- ctrlPanel.revalidate(); // ? new
	3793	+ ctrlPanel.validate(); // ? new
3825	3794	ctrlPanel.repaint();
3826	3795	}
3827	3796	}
..	..	@@ -4467,8 +4436,8 @@
4467	4436	//MenuItem normalLensItem;
4468	4437	MenuItem editCameraItem;
4469	4438	MenuItem revertCameraItem;
4470		- CheckboxMenuItem toggleLiveItem;
4471	4439	MenuItem stepItem;
	4440	+ CheckboxMenuItem toggleLiveItem;
4472	4441	CheckboxMenuItem toggleFullScreenItem;
4473	4442	CheckboxMenuItem toggleTimelineItem;
4474	4443	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4485,20 +4454,21 @@
4485	4454	JSplitPane mainPanel;
4486	4455	JScrollPane scrollpane;
4487	4456	JPanel toolbarPanel;
4488		- JPanel treePanel;
	4457	+ cGridBag treePanel;
4489	4458	JPanel radioPanel;
4490	4459	ButtonGroup buttonGroup;
4491		- JPanel ctrlPanel;
4492		- JPanel materialPanel;
	4460	+ cGridBag ctrlPanel;
	4461	+ cGridBag materialPanel;
4493	4462	JScrollPane infoPanel;
4494		- JPanel optionsPanel;
	4463	+ cGridBag optionsPanel;
4495	4464	JTabbedPane objectPanel;
4496		- JPanel XYZPanel;
	4465	+ cGridBag XYZPanel;
4497	4466	JSplitPane gridPanel;
4498	4467	JSplitPane bigPanel;
4499		- JPanel bigThree;
4500		- JTabbedPane scenePanel;
4501		- JPanel centralPanel;
	4468	+ cGridBag bigThree;
	4469	+ cGridBag scenePanel;
	4470	+ cGridBag centralPanel;
	4471	+ JSplitPane cameraPanel;
4502	4472	JPanel timelinePanel;
4503	4473	JMenuBar timelineMenubar;
4504	4474	JSplitPane framePanel;
..	..	@@ -4550,65 +4520,67 @@
4550	4520	// MATERIAL
4551	4521	JLabel materialLabel;
4552	4522	JLabel colorLabel;
4553		- NumberSlider colorField;
	4523	+ cNumberSlider colorField;
4554	4524	JLabel modulationLabel;
4555		- NumberSlider modulationField;
	4525	+ cNumberSlider modulationField;
4556	4526	JLabel metalnessLabel;
4557		- NumberSlider metalnessField;
	4527	+ cNumberSlider metalnessField;
4558	4528	JLabel diffuseLabel;
4559		- NumberSlider diffuseField;
	4529	+ cNumberSlider diffuseField;
4560	4530	JLabel specularLabel;
4561		- NumberSlider specularField;
	4531	+ cNumberSlider specularField;
4562	4532	JLabel shininessLabel;
4563		- NumberSlider shininessField;
	4533	+ cNumberSlider shininessField;
4564	4534	JLabel shiftLabel;
4565		- NumberSlider shiftField;
	4535	+ cNumberSlider shiftField;
4566	4536	JLabel ambientLabel;
4567		- NumberSlider ambientField;
	4537	+ cNumberSlider ambientField;
4568	4538	JLabel lightareaLabel;
4569		- NumberSlider lightareaField;
	4539	+ cNumberSlider lightareaField;
4570	4540	JLabel diffusenessLabel;
4571		- NumberSlider diffusenessField;
	4541	+ cNumberSlider diffusenessField;
4572	4542	JLabel velvetLabel;
4573		- NumberSlider velvetField;
	4543	+ cNumberSlider velvetField;
4574	4544	JLabel sheenLabel;
4575		- NumberSlider sheenField;
	4545	+ cNumberSlider sheenField;
4576	4546	JLabel subsurfaceLabel;
4577		- NumberSlider subsurfaceField;
	4547	+ cNumberSlider subsurfaceField;
4578	4548	//JLabel bumpLabel;
4579	4549	//NumberSlider bumpField;
4580	4550	JLabel backlitLabel;
4581		- NumberSlider backlitField;
	4551	+ cNumberSlider backlitField;
4582	4552	JLabel anisoLabel;
4583		- NumberSlider anisoField;
	4553	+ cNumberSlider anisoField;
4584	4554	JLabel anisoVLabel;
4585		- NumberSlider anisoVField;
	4555	+ cNumberSlider anisoVField;
4586	4556	JLabel cameraLabel;
4587		- NumberSlider cameraField;
	4557	+ cNumberSlider cameraField;
4588	4558	JLabel selfshadowLabel;
4589		- NumberSlider selfshadowField;
	4559	+ cNumberSlider selfshadowField;
4590	4560	JLabel shadowLabel;
4591		- NumberSlider shadowField;
	4561	+ cNumberSlider shadowField;
4592	4562	JLabel textureLabel;
4593		- NumberSlider textureField;
	4563	+ cNumberSlider textureField;
4594	4564	JLabel opacityLabel;
4595		- NumberSlider opacityField;
	4565	+ cNumberSlider opacityField;
4596	4566	JLabel fakedepthLabel;
4597		- NumberSlider fakedepthField;
	4567	+ cNumberSlider fakedepthField;
4598	4568	JLabel shadowbiasLabel;
4599		- NumberSlider shadowbiasField;
	4569	+ cNumberSlider shadowbiasField;
4600	4570	JLabel bumpLabel;
4601		- NumberSlider bumpField;
	4571	+ cNumberSlider bumpField;
4602	4572	JLabel noiseLabel;
4603		- NumberSlider noiseField;
	4573	+ cNumberSlider noiseField;
4604	4574	JLabel powerLabel;
4605		- NumberSlider powerField;
	4575	+ cNumberSlider powerField;
4606	4576	JLabel borderfadeLabel;
4607		- NumberSlider borderfadeField;
	4577	+ cNumberSlider borderfadeField;
4608	4578	JLabel fogLabel;
4609		- NumberSlider fogField;
	4579	+ cNumberSlider fogField;
4610	4580	JLabel opacityPowerLabel;
4611		- NumberSlider opacityPowerField;
	4581	+ cNumberSlider opacityPowerField;
4612	4582	JTree jTree;
4613	4583	//ObjectUI parent;
	4584	+
	4585	+ cNumberSlider normalpushField;
4614	4586	}