~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -138,34 +138,41 @@
138	138	public void closeUI()
139	139	{
140	140	//new Exception().printStackTrace();
141		- System.out.println("this = " + this);
142		- System.out.println("objEditor = " + objEditor);
	141	+// System.out.println("this = " + this);
	142	+// System.out.println("objEditor = " + objEditor);
143	143	//nameField.removeActionListener(this);
144		- objEditor.ctrlPanel.remove(nameField);
	144	+// objEditor.ctrlPanel.remove(nameField);
	145	+
	146	+ objEditor.ctrlPanel.remove(namePanel);
145	147
146	148	if (!GroupEditor.allparams)
147	149	return;
148	150
149		- objEditor.ctrlPanel.remove(liveCB);
150		- objEditor.ctrlPanel.remove(hideCB);
151		- objEditor.ctrlPanel.remove(markCB);
152		-
153		- objEditor.ctrlPanel.remove(randomCB);
154		- objEditor.ctrlPanel.remove(speedupCB);
155		- objEditor.ctrlPanel.remove(rewindCB);
156		-
157		- objEditor.ctrlPanel.remove(resetButton);
158		- objEditor.ctrlPanel.remove(stepButton);
159		-// objEditor.ctrlPanel.remove(stepAllButton);
160		-// objEditor.ctrlPanel.remove(resetAllButton);
161		- objEditor.ctrlPanel.remove(link2masterCB);
162		- //objEditor.ctrlPanel.remove(flipVCB);
163		- //objEditor.ctrlPanel.remove(texresMenu);
164		- objEditor.ctrlPanel.remove(slowerButton);
165		- objEditor.ctrlPanel.remove(fasterButton);
166		- objEditor.ctrlPanel.remove(remarkButton);
	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);
167	169
168		- Remove(normalpushField);
	170	+ objEditor.ctrlPanel.remove(setupPanel);
	171	+ objEditor.ctrlPanel.remove(commandsPanel);
	172	+ objEditor.ctrlPanel.remove(pushPanel);
	173	+ //objEditor.ctrlPanel.remove(fillPanel);
	174	+
	175	+ //Remove(normalpushField);
169	176	}
170	177
171	178	public ObjEditor GetEditor()
..	..	@@ -302,44 +309,60 @@
302	309	//normalLensItem.addActionListener(this);
303	310	cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
304	311	revertCameraItem.addActionListener(this);
305		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
306		- toggleTimelineItem.addItemListener(this);
	312	+
307	313	cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
308	314	toggleFullScreenItem.addItemListener(this);
309	315	toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
310	316	cameraMenu.add("-");
	317	+
311	318	cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
312	319	toggleTextureItem.addItemListener(this);
313	320	toggleTextureItem.setState(CameraPane.textureon);
314		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
315		- toggleLiveItem.addItemListener(this);
316		- toggleLiveItem.setState(Globals.isLIVE());
317		- cameraMenu.add(stepItem = new MenuItem("Step"));
318		- stepItem.addActionListener(this);
319		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
320		-// toggleDLItem.addItemListener(this);
321		-// toggleDLItem.setState(false);
322		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
323		- toggleRenderItem.addItemListener(this);
324		- toggleRenderItem.setState(!CameraPane.frozen);
325		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
326		- toggleDebugItem.addItemListener(this);
327		- toggleDebugItem.setState(CameraPane.DEBUG);
328		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
329		- toggleFrustumItem.addItemListener(this);
330		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
331		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
332		- toggleFootContactItem.addItemListener(this);
333		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
334		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
335		- toggleRandomItem.addItemListener(this);
336		- toggleRandomItem.setState(CameraPane.RANDOM);
	321	+
	322	+ if (Globals.ADVANCED)
	323	+ {
	324	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	325	+ toggleLiveItem.addItemListener(this);
	326	+ toggleLiveItem.setState(Globals.isLIVE());
	327	+
	328	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	329	+ stepItem.addActionListener(this);
	330	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	331	+ // toggleDLItem.addItemListener(this);
	332	+ // toggleDLItem.setState(false);
	333	+
	334	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	335	+ toggleRenderItem.addItemListener(this);
	336	+ toggleRenderItem.setState(!CameraPane.frozen);
	337	+
	338	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	339	+ toggleDebugItem.addItemListener(this);
	340	+ toggleDebugItem.setState(CameraPane.DEBUG);
	341	+
	342	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	343	+ toggleFrustumItem.addItemListener(this);
	344	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	345	+
	346	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	347	+ toggleFootContactItem.addItemListener(this);
	348	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	349	+
	350	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	351	+ toggleTimelineItem.addItemListener(this);
	352	+ }
	353	+
	354	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	355	+ toggleSwitchItem.addItemListener(this);
	356	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	357	+
337	358	cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
338	359	toggleHandleItem.addItemListener(this);
339	360	toggleHandleItem.setState(CameraPane.HANDLES);
	361	+
340	362	cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
341	363	togglePaintItem.addItemListener(this);
342	364	togglePaintItem.setState(CameraPane.PAINTMODE);
	365	+
343	366	// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
344	367	// toggleRootItem.addItemListener(this);
345	368	// toggleRootItem.setState(false);
..	..	@@ -353,21 +376,23 @@
353	376	objectPanel = new JTabbedPane();
354	377	toolbarPanel = new JPanel();
355	378	toolbarPanel.setName("Toolbar");
356		- treePanel = new JPanel();
	379	+ treePanel = new cGridBag();
357	380	treePanel.setName("Tree");
358		- ctrlPanel = new JPanel(); // new GridBagLayout());
	381	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
359	382	ctrlPanel.setName("Edit");
360		- materialPanel = new JPanel();
	383	+ materialPanel = new cGridBag().setVertical(true);
361	384	materialPanel.setName("Material");
362	385	/JTextPane/
363	386	infoarea = createTextPane();
	387	+ doc = infoarea.getStyledDocument();
	388	+
364	389	infoarea.setEditable(true);
365	390	SetText();
366	391	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
367	392	// infoarea.setOpaque(false);
368	393	// //infoarea.setForeground(textcolor);
369		- infoarea.setLineWrap(true);
370		- infoarea.setWrapStyleWord(true);
	394	+// TEXTAREA infoarea.setLineWrap(true);
	395	+// TEXTAREA infoarea.setWrapStyleWord(true);
371	396	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
372	397	infoPanel.setPreferredSize(new Dimension(50, 200));
373	398	infoPanel.setName("Info");
..	..	@@ -378,16 +403,16 @@
378	403	mainPanel.setName("Main");
379	404	mainPanel.setContinuousLayout(true);
380	405	mainPanel.setOneTouchExpandable(true);
381		- mainPanel.setDividerLocation(1.0);
382	406	mainPanel.setDividerSize(9);
383		- mainPanel.setResizeWeight(0);
	407	+ mainPanel.setDividerLocation(0.5); //1.0);
	408	+ mainPanel.setResizeWeight(0.5);
384	409
385	410	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
386	411	//mainPanel.setLayout(new GridBagLayout());
387	412	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
388		- treePanel.setLayout(new GridBagLayout());
389		- ctrlPanel.setLayout(new GridBagLayout());
390		- materialPanel.setLayout(new GridBagLayout());
	413	+// treePanel.setLayout(new GridBagLayout());
	414	+ //ctrlPanel.setLayout(new GridBagLayout());
	415	+ //materialPanel.setLayout(new GridBagLayout());
391	416
392	417	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
393	418	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -426,7 +451,7 @@
426	451	static String newline = "\n";
427	452	protected static final String buttonString = "JButton";
428	453	StyledDocument doc;
429		- JTextArea infoarea;
	454	+ JTextPane infoarea;
430	455
431	456	void ClearInfo()
432	457	{
..	..	@@ -493,7 +518,10 @@
493	518	}
494	519
495	520	if (full)
496		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	521	+ {
	522	+ si.SendInfo(" BBox min: " + minima, "regular");
	523	+ si.SendInfo(" BBox max: " + maxima, "regular");
	524	+ }
497	525
498	526	if (sel.bRep != null)
499	527	{
..	..	@@ -591,6 +619,9 @@
591	619	{
592	620	CameraPane.pointflow = (PointFlow) sel;
593	621	}
	622	+
	623	+ si.SendInfo("_____________________", "regular");
	624	+ si.SendInfo("", "regular");
594	625	}
595	626	}
596	627
..	..	@@ -622,52 +653,52 @@
622	653	cameraView.ToggleFullScreen();
623	654	}
624	655
625		- private JTextArea createTextPane()
	656	+ private JTextPane createTextPane()
626	657	{
627		- String[] initString =
628		- {
629		- "This is an editable JTextPane, ", //regular
630		- "another ", //italic
631		- "styled ", //bold
632		- "text ", //small
633		- "component, ", //large
634		- "which supports embedded components..." + newline,//regular
635		- " " + newline, //button
636		- "...and embedded icons..." + newline, //regular
637		- " ", //icon
638		- newline + "JTextPane is a subclass of JEditorPane that "
639		- + "uses a StyledEditorKit and StyledDocument, and provides "
640		- + "cover methods for interacting with those objects."
641		- };
	658	+// TEXTAREA String[] initString =
	659	+// {
	660	+// "This is an editable JTextPane, ", //regular
	661	+// "another ", //italic
	662	+// "styled ", //bold
	663	+// "text ", //small
	664	+// "component, ", //large
	665	+// "which supports embedded components..." + newline,//regular
	666	+// " " + newline, //button
	667	+// "...and embedded icons..." + newline, //regular
	668	+// " ", //icon
	669	+// newline + "JTextPane is a subclass of JEditorPane that "
	670	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	671	+// + "cover methods for interacting with those objects."
	672	+// };
	673	+//
	674	+// String[] initStyles =
	675	+// {
	676	+// "regular", "italic", "bold", "small", "large",
	677	+// "regular", "button", "regular", "icon",
	678	+// "regular"
	679	+// };
	680	+//
	681	+// JTextPane textPane = new JTextPane();
	682	+// textPane.setEditable(true);
	683	+// /StyledDocument/ doc = textPane.getStyledDocument();
	684	+// addStylesToDocument(doc);
	685	+//
	686	+// try
	687	+// {
	688	+// for (int j = 0; j < 2; j++)
	689	+// {
	690	+// for (int i = 0; i < initString.length; i++)
	691	+// {
	692	+// doc.insertString(doc.getLength(), initString[i],
	693	+// doc.getStyle(initStyles[i]));
	694	+// }
	695	+// }
	696	+// } catch (BadLocationException ble)
	697	+// {
	698	+// System.err.println("Couldn't insert initial text into text pane.");
	699	+// }
642	700
643		- String[] initStyles =
644		- {
645		- "regular", "italic", "bold", "small", "large",
646		- "regular", "button", "regular", "icon",
647		- "regular"
648		- };
649		-
650		- JTextPane textPane = new JTextPane();
651		- textPane.setEditable(true);
652		- /StyledDocument/ doc = textPane.getStyledDocument();
653		- addStylesToDocument(doc);
654		-
655		- try
656		- {
657		- for (int j = 0; j < 2; j++)
658		- {
659		- for (int i = 0; i < initString.length; i++)
660		- {
661		- doc.insertString(doc.getLength(), initString[i],
662		- doc.getStyle(initStyles[i]));
663		- }
664		- }
665		- } catch (BadLocationException ble)
666		- {
667		- System.err.println("Couldn't insert initial text into text pane.");
668		- }
669		-
670		- return new JTextArea(); // textPane;
	701	+ return new JTextPane(); // textPane;
671	702	}
672	703
673	704	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -767,115 +798,83 @@
767	798	JButton slowerButton;
768	799	JButton fasterButton;
769	800	JButton remarkButton;
	801	+
	802	+ cGridBag namePanel;
	803	+ cGridBag setupPanel;
	804	+ cGridBag commandsPanel;
	805	+ cGridBag pushPanel;
	806	+ cGridBag fillPanel;
770	807
771		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	808	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
772	809	{
773	810	JCheckBox cb;
774	811
775		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
776		- oe.aConstraints.gridwidth = 1; // 3;
777		-// oe.aConstraints.weightx = 1;
778		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
779		- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	812	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
780	813	cb.addItemListener(this);
781		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
782		- oe.aConstraints.gridwidth = 1;
783		- oe.aConstraints.gridx += 1;
784	814
785	815	return cb;
786	816	}
787	817
788		- cButton AddButton(ObjEditor oe, String label)
	818	+ cButton AddButton(cGridBag panel, String label)
789	819	{
790	820	cButton cb;
791	821
792		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
793		- oe.aConstraints.gridwidth = 1;
794		-// oe.aConstraints.weightx = 1;
795		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
796		- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
	822	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
797	823	cb.addActionListener(this);
798		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
799		- oe.aConstraints.gridwidth = 1;
800		- oe.aConstraints.gridx += 1;
801	824
802	825	return cb;
803	826	}
804	827
805		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	828	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
806	829	{
807	830	JComboBox combo;
808	831
809		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
810		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
811		- oe.aConstraints.gridx += 1;
	832	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
812	833	combo.addActionListener(this);
813	834
814	835	return combo;
815	836	}
816	837
817		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	838	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
818	839	{
819		- NumberSlider combo;
	840	+ cGridBag control = new cGridBag();
	841	+
	842	+ cNumberSlider combo;
820	843
821	844	JLabel jlabel = new JLabel(label);
822		-
823		- aConstraints.fill = GridBagConstraints.VERTICAL;
824	845	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
825		- aConstraints.gridwidth = 1;
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, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
831		- aConstraints.gridx += 1;
832		- aConstraints.gridwidth = 1;
833		-
	846	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	847	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
834	848	combo.setFloat(current);
835		-
836		- combo.label = jlabel;
837		-
838		- combo.addChangeListener(this);
839		-
840		- return combo;
	849	+
	850	+ panel.add(control);
	851	+
	852	+ return control;
841	853	}
842	854
843		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	855	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
844	856	{
845		- NumberSlider combo;
	857	+ cGridBag control = new cGridBag();
	858	+
	859	+ cNumberSlider combo;
846	860
847	861	JLabel jlabel = new JLabel(label);
848		-
849		- aConstraints.fill = GridBagConstraints.VERTICAL;
850	862	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
851		- aConstraints.gridwidth = 2;
852		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
853		- aConstraints.gridx += 1;
854		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
855		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
856		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
857		- aConstraints.gridx += 1;
858		- aConstraints.gridwidth = 1;
859		-
	863	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	864	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
860	865	combo.setInteger(current);
861	866
862		- combo.label = jlabel;
863		-
864		- combo.addChangeListener(this);
865		-
866		- return combo;
	867	+ panel.add(control);
	868	+
	869	+ return control;
867	870	}
868	871
869		- JTextArea AddText(JPanel ctrlPanel, String name)
	872	+ JTextArea AddText(cGridBag ctrlPanel, String name)
870	873	{
871	874	JTextArea text;
872	875
873		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
874		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
875		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	876	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
876	877	text.addCaretListener(this);
877		- aConstraints.gridx += 1;
878		- aConstraints.gridwidth = 1;
879	878
880	879	return text;
881	880	}
..	..	@@ -905,9 +904,16 @@
905	904	objEditor.ctrlPanel.remove(j);
906	905	}
907	906
	907	+ void Remove(cNumberSlider j)
	908	+ {
	909	+ j.removeChangeListener(this);
	910	+ //objEditor.ctrlPanel.remove(j.label);
	911	+ objEditor.ctrlPanel.remove(j);
	912	+ }
	913	+
908	914	/*
909	915	*/
910		- void Return() // ObjEditor oe)
	916	+ void Return0() // ObjEditor oe)
911	917	{
912	918	aConstraints.gridy += 1;
913	919	aConstraints.gridx = 0;
..	..	@@ -962,37 +968,70 @@
962	968
963	969	void SetupUI2(ObjEditor oe)
964	970	{
965		-// oe.aConstraints.weightx = 0;
966		-// oe.aConstraints.weighty = 0;
967		-// oe.aConstraints.gridx = 0;
968		-// oe.aConstraints.gridy = 0;
969		- SetupName(oe);
	971	+ //SetupName(oe);
	972	+
	973	+ namePanel = new cGridBag();
	974	+
	975	+ nameField = AddText(namePanel, copy.GetName());
	976	+ namePanel.add(nameField);
	977	+ oe.ctrlPanel.add(namePanel);
	978	+
	979	+ oe.ctrlPanel.Return();
970	980
971	981	if (!GroupEditor.allparams)
972	982	return;
973	983
974		- liveCB = AddCheckBox(oe, "Live", copy.live);
975		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
976		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	984	+ setupPanel = new cGridBag().setVertical(false);
	985	+
	986	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	987	+ liveCB.setToolTipText("Animate object");
	988	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	989	+ hideCB.setToolTipText("Hide object");
977	990	// Return();
978		- markCB = AddCheckBox(oe, "Mark", copy.marked);
979		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
980		- randomCB = AddCheckBox(oe, "Rand", copy.random);
981		- Return();
982		- resetButton = AddButton(oe, "Reset");
983		- stepButton = AddButton(oe, "Step");
	991	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	992	+ markCB.setToolTipText("Set the animation target transform");
	993	+
	994	+ rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	995	+ rewindCB.setToolTipText("Rewind animation");
	996	+
	997	+ randomCB = AddCheckBox(setupPanel, "Random", copy.random);
	998	+ randomCB.setToolTipText("Option for switch node");
	999	+
	1000	+ if (Globals.ADVANCED)
	1001	+ {
	1002	+ link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
	1003	+ link2masterCB.setToolTipText("Attach to support");
	1004	+ speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1005	+ speedupCB.setToolTipText("Option motion capture");
	1006	+ }
	1007	+
	1008	+ oe.ctrlPanel.add(setupPanel);
	1009	+ oe.ctrlPanel.Return();
	1010	+
	1011	+ commandsPanel = new cGridBag().setVertical(false);
	1012	+
	1013	+ resetButton = AddButton(commandsPanel, "Reset");
	1014	+ resetButton.setToolTipText("Jump to frame zero");
	1015	+ stepButton = AddButton(commandsPanel, "Step");
	1016	+ stepButton.setToolTipText("Step one frame");
984	1017	// resetAllButton = AddButton(oe, "Reset All");
985	1018	// stepAllButton = AddButton(oe, "Step All");
986		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
987	1019	// Return();
988		- slowerButton = AddButton(oe, "Slow");
989		- fasterButton = AddButton(oe, "Fast");
990		- remarkButton = AddButton(oe, "Rem");
	1020	+ slowerButton = AddButton(commandsPanel, "Slow");
	1021	+ slowerButton.setToolTipText("Decrease animation speed");
	1022	+ fasterButton = AddButton(commandsPanel, "Fast");
	1023	+ fasterButton.setToolTipText("Increase animation speed");
	1024	+ remarkButton = AddButton(commandsPanel, "Remark");
	1025	+ remarkButton.setToolTipText("Set the current transform as the target");
991	1026
992		- Return();
	1027	+ oe.ctrlPanel.add(commandsPanel);
	1028	+ oe.ctrlPanel.Return();
993	1029
994		- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
995		- Return();
	1030	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1031	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1032	+ //Return();
	1033	+
	1034	+ oe.ctrlPanel.Return();
996	1035
997	1036	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
998	1037	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1087,7 +1126,7 @@
1087	1126	oe.aConstraints.gridwidth = 1;
1088	1127	/**/
1089	1128	nameField = AddText(oe.ctrlPanel, copy.GetName());
1090		- Return();
	1129	+ oe.ctrlPanel.Return();
1091	1130
1092	1131	//ctrlPanel.add(textureButton = new Button("Texture..."));
1093	1132	//textureButton.setEnabled(false);
..	..	@@ -1189,7 +1228,8 @@
1189	1228	//JPanel worldPanel =
1190	1229	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1191	1230	//worldPanel.setName("World");
1192		- centralPanel = new JPanel(new BorderLayout());
	1231	+ centralPanel = new cGridBag();
	1232	+ centralPanel.preferredWidth = 20;
1193	1233	timelinePanel = new JPanel(new BorderLayout());
1194	1234	timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1195	1235
..	..	@@ -1222,6 +1262,7 @@
1222	1262	XYZPanel = new cGridBag().setVertical(true);
1223	1263	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1224	1264
	1265	+ XYZPanel.preferredWidth = 5;
1225	1266	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1226	1267	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1227	1268	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
..	..	@@ -1262,10 +1303,11 @@
1262	1303	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1263	1304	//tmp.setName("Edit");
1264	1305	objectPanel.add(materialPanel);
1265		- JPanel north = new JPanel(new BorderLayout());
1266		- north.setName("Edit");
1267		- north.add(ctrlPanel, BorderLayout.NORTH);
1268		- objectPanel.add(north);
	1306	+// JPanel north = new JPanel(new BorderLayout());
	1307	+// north.setName("Edit");
	1308	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1309	+// objectPanel.add(north);
	1310	+ objectPanel.add(ctrlPanel);
1269	1311	objectPanel.add(infoPanel);
1270	1312
1271	1313	/*
..	..	@@ -1286,19 +1328,23 @@
1286	1328	scrollpane.setWheelScrollingEnabled(true);
1287	1329	scrollpane.addMouseWheelListener(this); // Default not fast enough
1288	1330
1289		- /JTabbedPane/ scenePanel = new JTabbedPane();
1290		- scenePanel.add(scrollpane);
	1331	+ /JTabbedPane/ scenePanel = new cGridBag();
	1332	+ scenePanel.preferredWidth = 7;
	1333	+
	1334	+ JTabbedPane tabbedPane = new JTabbedPane();
	1335	+ tabbedPane.add(scrollpane);
1291	1336
1292		- scenePanel.add(FSPane = new cFileSystemPane(this));
	1337	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1293	1338
1294		- optionsPanel = new JPanel(new GridBagLayout());
	1339	+ optionsPanel = new cGridBag().setVertical(true);
1295	1340
1296	1341	optionsPanel.setName("Options");
1297	1342
1298		- AddOptions(optionsPanel, aConstraints);
	1343	+ AddOptions(optionsPanel); //, aConstraints);
1299	1344
1300		- scenePanel.add(optionsPanel);
1301		-
	1345	+ tabbedPane.add(optionsPanel);
	1346	+
	1347	+ scenePanel.add(tabbedPane);
1302	1348
1303	1349	/*
1304	1350	cTree jTree = new cTree(null);
..	..	@@ -1405,7 +1451,7 @@
1405	1451	});
1406	1452	}
1407	1453
1408		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	1454	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
1409	1455	{
1410	1456	}
1411	1457
..	..	@@ -1420,260 +1466,173 @@
1420	1466	ctrlPanel.removeAll();
1421	1467	}
1422	1468
1423		- void SetupMaterial(JPanel ctrlPanel)
	1469	+ void SetupMaterial(cGridBag panel)
1424	1470	{
1425		- aConstraints.weighty = 0;
1426		- //aConstraints.weightx = 1;
1427		- /*
	1471	+ /*
1428	1472	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1429	1473	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1430		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1431		- aConstraints.gridx += 1;
1432	1474	*/
1433	1475
1434		- aConstraints.gridwidth = 1;
1435		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1436		- aConstraints.gridx += 1;
1437		- aConstraints.weighty = 0;
1438		- aConstraints.gridwidth = 1;
	1476	+ cGridBag editBar = new cGridBag().setVertical(false);
	1477	+
	1478	+ editBar.add(createMaterialButton = new cButton("Create", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1479	+ createMaterialButton.setToolTipText("Create material");
1439	1480
1440	1481	/*
1441	1482	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1442		- aConstraints.gridx += 1;
1443		- aConstraints.weighty = 0;
1444		- aConstraints.gridwidth = 1;
1445	1483	*/
1446	1484
1447		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1448		- aConstraints.gridx += 1;
	1485	+ editBar.add(clearMaterialButton = new cButton("Clear", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1486	+ clearMaterialButton.setToolTipText("Clear material");
	1487	+
	1488	+ if (Globals.ADVANCED)
	1489	+ {
	1490	+ editBar.add(resetSlidersButton = new cButton("Reset", !GrafreeD.NIMBUSLAF)); // , aConstraints);
	1491	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1492	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1493	+ }
1449	1494
1450		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1451		-
1452		- aConstraints.gridx += 1;
1453		-
1454		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1455		-
1456		- aConstraints.gridx += 1;
1457		-
1458		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1459		-
1460		- aConstraints.gridx = 0;
1461		- aConstraints.gridy += 1;
1462		- aConstraints.weighty = 0;
1463		- aConstraints.gridwidth = 1;
	1495	+ editBar.preferredHeight = 15;
	1496	+
	1497	+ panel.add(editBar);
	1498	+
1464	1499	/**/
1465	1500	//aConstraints.weighty = 0;
1466	1501	////aConstraints.weightx = 1;
1467	1502	//aConstraints.weighty = 1;
1468	1503	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1469	1504	//aConstraints.gridx += 1;
1470		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1471		- aConstraints.weighty = 0;
1472		- aConstraints.gridx = 0;
1473		- aConstraints.gridy += 1;
1474		- aConstraints.gridwidth = 1;
	1505	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1475	1506
1476		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1477		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1478		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1479		- aConstraints.gridx += 1;
1480		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1481		- //aConstraints.weightx = 0;
1482		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1483		- aConstraints.gridx = 0;
1484		- aConstraints.gridy += 1;
1485		- aConstraints.gridwidth = 1;
	1507	+ cGridBag colorSection = new cGridBag().setVertical(true);
	1508	+
	1509	+ cGridBag color = new cGridBag();
	1510	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1511	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1512	+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1513	+ //colorField.preferredWidth = 200;
	1514	+ colorSection.add(color);
1486	1515
1487		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1488		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1489		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1490		- aConstraints.gridx += 1;
1491		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1492		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1493		- aConstraints.gridx = 0;
1494		- aConstraints.gridy += 1;
1495		- aConstraints.gridwidth = 1;
	1516	+ cGridBag modulation = new cGridBag();
	1517	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1518	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1519	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1520	+ colorSection.add(modulation);
1496	1521
1497		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1498		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1499		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1500		- aConstraints.gridx += 1;
1501		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1502		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1503		- aConstraints.gridx = 0;
1504		- aConstraints.gridy += 1;
1505		- aConstraints.gridwidth = 1;
	1522	+ cGridBag texture = new cGridBag();
	1523	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1524	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1525	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1526	+ colorSection.add(texture);
1506	1527
1507		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1508		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1509		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1510		- aConstraints.gridx += 1;
1511		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1512		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1513		- aConstraints.gridx = 0;
1514		- aConstraints.gridy += 1;
1515		- aConstraints.gridwidth = 1;
	1528	+ cGridBag anisoU = new cGridBag();
	1529	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1530	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1531	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1532	+ colorSection.add(anisoU);
1516	1533
1517		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1518		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1519		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1520		- aConstraints.gridx += 1;
1521		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1522		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1523		- aConstraints.gridx = 0;
1524		- aConstraints.gridy += 1;
1525		- aConstraints.gridwidth = 1;
	1534	+ cGridBag anisoV = new cGridBag();
	1535	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1536	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1537	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1538	+ colorSection.add(anisoV);
1526	1539
1527		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1528		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1529		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1530		- aConstraints.gridx += 1;
1531		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1532		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1533		- aConstraints.gridx = 0;
1534		- aConstraints.gridy += 1;
1535		- aConstraints.gridwidth = 1;
	1540	+ cGridBag shadowbias = new cGridBag();
	1541	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1542	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1543	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1544	+ colorSection.add(shadowbias);
1536	1545
1537		- //aConstraints.weighty = 1;
1538		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1539		- //aConstraints.gridx += 1;
1540		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1541		- aConstraints.weighty = 0;
1542		- aConstraints.gridx = 0;
1543		- aConstraints.gridy += 1;
1544		- aConstraints.gridwidth = 1;
	1546	+ panel.add(new JSeparator());
	1547	+
	1548	+ panel.add(colorSection);
	1549	+
	1550	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1551	+
	1552	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1553	+
	1554	+ cGridBag diffuse = new cGridBag();
	1555	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1556	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1557	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1558	+ diffuseSection.add(diffuse);
1545	1559
1546		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1547		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1548		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1549		- aConstraints.gridx += 1;
1550		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1551		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1552		- aConstraints.gridx = 0;
1553		- aConstraints.gridy += 1;
1554		- aConstraints.gridwidth = 1;
	1560	+ cGridBag diffuseness = new cGridBag();
	1561	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1562	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1563	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1564	+ diffuseSection.add(diffuseness);
1555	1565
1556		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1557		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1558		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1559		- aConstraints.gridx += 1;
1560		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1561		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1562		- aConstraints.gridx = 0;
1563		- aConstraints.gridy += 1;
1564		- aConstraints.gridwidth = 1;
	1566	+ cGridBag selfshadow = new cGridBag();
	1567	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1568	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1569	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1570	+ diffuseSection.add(selfshadow);
1565	1571
1566		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1567		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1568		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1569		- aConstraints.gridx += 1;
1570		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1571		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1572		- aConstraints.gridx = 0;
1573		- aConstraints.gridy += 1;
1574		- aConstraints.gridwidth = 1;
	1572	+ cGridBag sheen = new cGridBag();
	1573	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1574	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1575	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1576	+ diffuseSection.add(sheen);
1575	1577
1576		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1577		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1578		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1579		- aConstraints.gridx += 1;
1580		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1581		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1582		- aConstraints.gridx = 0;
1583		- aConstraints.gridy += 1;
1584		- aConstraints.gridwidth = 1;
	1578	+ cGridBag subsurface = new cGridBag();
	1579	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1580	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1581	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1582	+ diffuseSection.add(subsurface);
1585	1583
1586		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1587		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1588		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1589		- aConstraints.gridx += 1;
1590		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1591		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1592		- aConstraints.gridx = 0;
1593		- aConstraints.gridy += 1;
1594		- aConstraints.gridwidth = 1;
	1584	+ cGridBag shadow = new cGridBag();
	1585	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1586	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1587	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1588	+ diffuseSection.add(shadow);
1595	1589
1596		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1597		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1598		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1599		- aConstraints.gridx += 1;
1600		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1601		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1602		- aConstraints.gridx = 0;
1603		- aConstraints.gridy += 1;
1604		- aConstraints.gridwidth = 1;
	1590	+ cGridBag fakedepth = new cGridBag();
	1591	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1592	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1593	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1594	+ diffuseSection.add(fakedepth);
1605	1595
1606		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1607		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1608		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1609		- aConstraints.gridx += 1;
1610		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1611		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1612		- aConstraints.gridx = 0;
1613		- aConstraints.gridy += 1;
1614		- aConstraints.gridwidth = 1;
	1596	+ panel.add(new JSeparator());
	1597	+
	1598	+ panel.add(diffuseSection);
	1599	+
	1600	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1601	+
	1602	+ cGridBag specularSection = new cGridBag().setVertical(true);
1615	1603
1616		- //aConstraints.weighty = 1;
1617		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1618		- //aConstraints.gridx += 1;
1619		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1620		- aConstraints.weighty = 0;
1621		- aConstraints.gridx = 0;
1622		- aConstraints.gridy += 1;
1623		- aConstraints.gridwidth = 1;
	1604	+ cGridBag specular = new cGridBag();
	1605	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1606	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1607	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1608	+ specularSection.add(specular);
1624	1609
1625		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1626		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1627		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1628		- aConstraints.gridx += 1;
1629		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1630		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1631		- aConstraints.gridx = 0;
1632		- aConstraints.gridy += 1;
1633		- aConstraints.gridwidth = 1;
	1610	+ cGridBag lightarea = new cGridBag();
	1611	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1612	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1613	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1614	+ specularSection.add(lightarea);
1634	1615
1635		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1636		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1637		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1638		- aConstraints.gridx += 1;
1639		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1640		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1641		- aConstraints.gridx = 0;
1642		- aConstraints.gridy += 1;
1643		- aConstraints.gridwidth = 1;
	1616	+ cGridBag shininess = new cGridBag();
	1617	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1618	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1619	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1620	+ specularSection.add(shininess);
1644	1621
1645		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1646		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1647		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1648		- aConstraints.gridx += 1;
1649		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1650		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1651		- aConstraints.gridx = 0;
1652		- aConstraints.gridy += 1;
1653		- aConstraints.gridwidth = 1;
	1622	+ cGridBag metalness = new cGridBag();
	1623	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1624	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1625	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1626	+ specularSection.add(metalness);
1654	1627
1655		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1656		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1657		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1658		- aConstraints.gridx += 1;
1659		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1660		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1661		- aConstraints.gridx = 0;
1662		- aConstraints.gridy += 1;
1663		- aConstraints.gridwidth = 1;
	1628	+ cGridBag velvet = new cGridBag();
	1629	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1630	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1631	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1632	+ specularSection.add(velvet);
1664	1633
1665		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1666		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1667		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1668		- aConstraints.gridx += 1;
1669		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1670		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1671		- aConstraints.gridx = 0;
1672		- aConstraints.gridy += 1;
1673		- aConstraints.gridwidth = 1;
1674		-
1675		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1676		- Return();
	1634	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1635	+ //Return();
1677	1636	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1678	1637	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1679	1638	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1684,130 +1643,93 @@
1684	1643	// aConstraints.gridy += 1;
1685	1644	// aConstraints.gridwidth = 1;
1686	1645
1687		- //aConstraints.weighty = 1;
1688		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1689		- //aConstraints.gridx += 1;
1690		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1691		- aConstraints.weighty = 0;
1692		- aConstraints.gridx = 0;
1693		- aConstraints.gridy += 1;
1694		- aConstraints.gridwidth = 1;
1695	1646
1696		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1697		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1698		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1699		- aConstraints.gridx += 1;
1700		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1701		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1702		- aConstraints.gridx = 0;
1703		- aConstraints.gridy += 1;
1704		- aConstraints.gridwidth = 1;
	1647	+ panel.add(new JSeparator());
	1648	+
	1649	+ panel.add(specularSection);
	1650	+
	1651	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1652	+
	1653	+ cGridBag globalSection = new cGridBag().setVertical(true);
1705	1654
1706		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1707		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1708		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1709		- aConstraints.gridx += 1;
1710		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1711		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1712		- aConstraints.gridx = 0;
1713		- aConstraints.gridy += 1;
1714		- aConstraints.gridwidth = 1;
	1655	+ cGridBag camera = new cGridBag();
	1656	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1657	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1658	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1659	+ globalSection.add(camera);
1715	1660
1716		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1717		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1718		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1719		- aConstraints.gridx += 1;
1720		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1721		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1722		- aConstraints.gridx = 0;
1723		- aConstraints.gridy += 1;
1724		- aConstraints.gridwidth = 1;
	1661	+ cGridBag ambient = new cGridBag();
	1662	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1663	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1664	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1665	+ globalSection.add(ambient);
1725	1666
1726		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1727		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1728		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1729		- aConstraints.gridx += 1;
1730		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1731		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1732		- aConstraints.gridx = 0;
1733		- aConstraints.gridy += 1;
1734		- aConstraints.gridwidth = 1;
1735		- aConstraints.weighty = 0;
	1667	+ cGridBag backlit = new cGridBag();
	1668	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1669	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1670	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1671	+ globalSection.add(backlit);
1736	1672
1737		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1738		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1739		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1740		- aConstraints.gridx += 1;
1741		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1742		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1743		- aConstraints.gridx = 0;
1744		- aConstraints.gridy += 1;
1745		- aConstraints.gridwidth = 1;
	1673	+ cGridBag opacity = new cGridBag();
	1674	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1675	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1676	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1677	+ globalSection.add(opacity);
1746	1678
1747		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1748		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1749		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1750		- aConstraints.gridx += 1;
1751		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1752		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1753		- aConstraints.gridx = 0;
1754		- aConstraints.gridy += 1;
1755		- aConstraints.gridwidth = 1;
	1679	+ panel.add(new JSeparator());
	1680	+
	1681	+ panel.add(globalSection);
	1682	+
	1683	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1684	+
	1685	+ cGridBag textureSection = new cGridBag().setVertical(true);
1756	1686
1757		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1758		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1759		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1760		- aConstraints.gridx += 1;
1761		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1762		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1763		- aConstraints.gridx = 0;
1764		- aConstraints.gridy += 1;
1765		- aConstraints.gridwidth = 1;
	1687	+ cGridBag bump = new cGridBag();
	1688	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1689	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1690	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1691	+ textureSection.add(bump);
1766	1692
1767		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1768		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1769		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1770		- aConstraints.gridx += 1;
1771		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1772		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1773		- aConstraints.gridx = 0;
1774		- aConstraints.gridy += 1;
1775		- aConstraints.gridwidth = 1;
	1693	+ cGridBag noise = new cGridBag();
	1694	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1695	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1696	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1697	+ textureSection.add(noise);
1776	1698
1777		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1778		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1779		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1780		- aConstraints.gridx += 1;
1781		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1782		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1783		- aConstraints.gridx = 0;
1784		- aConstraints.gridy += 1;
1785		- aConstraints.gridwidth = 1;
	1699	+ cGridBag power = new cGridBag();
	1700	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1701	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1702	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1703	+ textureSection.add(power);
1786	1704
1787		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1788		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1789		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1790		- aConstraints.gridx += 1;
1791		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1792		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1793		- aConstraints.gridx = 0;
1794		- aConstraints.gridy += 1;
1795		- aConstraints.gridwidth = 1;
	1705	+ cGridBag borderfade = new cGridBag();
	1706	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1707	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1708	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1709	+ textureSection.add(borderfade);
1796	1710
1797		- //aConstraints.weighty = 1;
1798		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1799		- //aConstraints.gridx += 1;
1800		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1801		- aConstraints.weighty = 0;
	1711	+ cGridBag fog = new cGridBag();
	1712	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1713	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1714	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1715	+ textureSection.add(fog);
1802	1716
1803		- aConstraints.gridx = 0;
1804		- aConstraints.gridy = 0;
1805		- aConstraints.gridwidth = 1;
	1717	+ cGridBag opacityPower = new cGridBag();
	1718	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	1719	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1720	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	1721	+ textureSection.add(opacityPower);
	1722	+
	1723	+ panel.add(new JSeparator());
	1724	+
	1725	+ panel.add(textureSection);
	1726	+
	1727	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1806	1728
1807	1729	SetMaterial(copy); // .GetMaterial());
1808	1730
1809		- colorField.addChangeListener(this);
1810		- modulationField.addChangeListener(this);
	1731	+ //colorField.addChangeListener(this);
	1732	+// modulationField.addChangeListener(this);
1811	1733	metalnessField.addChangeListener(this);
1812	1734	diffuseField.addChangeListener(this);
1813	1735	specularField.addChangeListener(this);
..	..	@@ -1837,12 +1759,15 @@
1837	1759	opacityPowerField.addChangeListener(this);
1838	1760	/**/
1839	1761
1840		- resetSlidersButton.addActionListener(this);
1841	1762	clearMaterialButton.addActionListener(this);
1842	1763	createMaterialButton.addActionListener(this);
1843		-
1844		- propagateToggle.addItemListener(this);
1845		- multiplyToggle.addItemListener(this);
	1764	+
	1765	+ if (Globals.ADVANCED)
	1766	+ {
	1767	+ resetSlidersButton.addActionListener(this);
	1768	+ propagateToggle.addItemListener(this);
	1769	+ multiplyToggle.addItemListener(this);
	1770	+ }
1846	1771	}
1847	1772
1848	1773	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -2619,6 +2544,7 @@
2619	2544	}
2620	2545	if (input == null)
2621	2546	{
	2547	+ new Exception().printStackTrace();
2622	2548	System.exit(0);
2623	2549	}
2624	2550
..	..	@@ -2833,7 +2759,8 @@
2833	2759	return;
2834	2760	}
2835	2761
2836		- multiplyToggle.setSelected(mat.multiply);
	2762	+ if (multiplyToggle != null)
	2763	+ multiplyToggle.setSelected(mat.multiply);
2837	2764
2838	2765	assert (object.projectedVertices != null);
2839	2766
..	..	@@ -3048,7 +2975,7 @@
3048	2975	frame.validate();
3049	2976
3050	2977	return;
3051		- } else if (event.getSource() == toggleRandomItem)
	2978	+ } else if (event.getSource() == toggleSwitchItem)
3052	2979	{
3053	2980	cameraView.ToggleRandom();
3054	2981	cameraView.repaint();
..	..	@@ -3093,6 +3020,7 @@
3093	3020	if (event.getSource() == randomCB)
3094	3021	{
3095	3022	copy.random ^= true;
	3023	+ objEditor.refreshContents();
3096	3024	return;
3097	3025	}
3098	3026	if (event.getSource() == speedupCB)
..	..	@@ -3316,7 +3244,7 @@
3316	3244	if (!Globals.ANIMATION)
3317	3245	{
3318	3246	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3319		- browser.show();
	3247	+ browser.setVisible(true);
3320	3248	String filename = browser.getFile();
3321	3249	if (filename != null && filename.length() > 0)
3322	3250	{
..	..	@@ -3348,6 +3276,7 @@
3348	3276	callee.refreshContents();
3349	3277	} else
3350	3278	{
	3279	+ new Exception().printStackTrace();
3351	3280	System.exit(0);
3352	3281	}
3353	3282	}
..	..	@@ -3377,7 +3306,7 @@
3377	3306	void CreateMaterial()
3378	3307	{
3379	3308	//copy.ClearMaterial(); // PATCH
3380		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3309	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3381	3310	if (copy.selection.size() > 0)
3382	3311	//SetMaterial(copy);
3383	3312	{
..	..	@@ -3436,11 +3365,11 @@
3436	3365	{
3437	3366	copy.ResetBlockLoop(); // temporary problem
3438	3367
3439		- boolean random = CameraPane.RANDOM;
3440		- CameraPane.RANDOM = false; // parse everything
	3368	+ boolean random = CameraPane.SWITCH;
	3369	+ CameraPane.SWITCH = false; // parse everything
3441	3370	copy.ResetDisplayList();
3442	3371	copy.HardTouch();
3443		- CameraPane.RANDOM = random;
	3372	+ CameraPane.SWITCH = random;
3444	3373	}
3445	3374
3446	3375	// public void applySelf()
..	..	@@ -3510,7 +3439,7 @@
3510	3439	current.fakedepth = (float) fakedepthField.getFloat();
3511	3440	current.shadowbias = (float) shadowbiasField.getFloat();
3512	3441
3513		- if (!NumberSlider.frozen)
	3442	+ if (!cNumberSlider.frozen)
3514	3443	{
3515	3444	//System.out.println("Propagate = " + propagate);
3516	3445	copy.UpdateMaterial(anchor, current, propagate);
..	..	@@ -3558,6 +3487,7 @@
3558	3487	\|\| e.getSource() == apertureField
3559	3488	\|\| e.getSource() == shadowblurField)
3560	3489	{
	3490	+ new Exception().printStackTrace();
3561	3491	System.exit(0);
3562	3492	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3563	3493	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3883,7 +3813,7 @@
3883	3813
3884	3814	radioPanel.revalidate();
3885	3815	radioPanel.repaint();
3886		- ctrlPanel.revalidate(); // ? new
	3816	+ ctrlPanel.validate(); // ? new
3887	3817	ctrlPanel.repaint();
3888	3818	}
3889	3819	}
..	..	@@ -4529,8 +4459,8 @@
4529	4459	//MenuItem normalLensItem;
4530	4460	MenuItem editCameraItem;
4531	4461	MenuItem revertCameraItem;
4532		- CheckboxMenuItem toggleLiveItem;
4533	4462	MenuItem stepItem;
	4463	+ CheckboxMenuItem toggleLiveItem;
4534	4464	CheckboxMenuItem toggleFullScreenItem;
4535	4465	CheckboxMenuItem toggleTimelineItem;
4536	4466	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4539,7 +4469,7 @@
4539	4469	CheckboxMenuItem toggleFootContactItem;
4540	4470	CheckboxMenuItem toggleDLItem;
4541	4471	CheckboxMenuItem toggleTextureItem;
4542		- CheckboxMenuItem toggleRandomItem;
	4472	+ CheckboxMenuItem toggleSwitchItem;
4543	4473	CheckboxMenuItem toggleRootItem;
4544	4474	CheckboxMenuItem animationItem;
4545	4475	CheckboxMenuItem toggleHandleItem;
..	..	@@ -4547,20 +4477,20 @@
4547	4477	JSplitPane mainPanel;
4548	4478	JScrollPane scrollpane;
4549	4479	JPanel toolbarPanel;
4550		- JPanel treePanel;
	4480	+ cGridBag treePanel;
4551	4481	JPanel radioPanel;
4552	4482	ButtonGroup buttonGroup;
4553		- JPanel ctrlPanel;
4554		- JPanel materialPanel;
	4483	+ cGridBag ctrlPanel;
	4484	+ cGridBag materialPanel;
4555	4485	JScrollPane infoPanel;
4556		- JPanel optionsPanel;
	4486	+ cGridBag optionsPanel;
4557	4487	JTabbedPane objectPanel;
4558	4488	cGridBag XYZPanel;
4559	4489	JSplitPane gridPanel;
4560	4490	JSplitPane bigPanel;
4561	4491	cGridBag bigThree;
4562		- JTabbedPane scenePanel;
4563		- JPanel centralPanel;
	4492	+ cGridBag scenePanel;
	4493	+ cGridBag centralPanel;
4564	4494	JSplitPane cameraPanel;
4565	4495	JPanel timelinePanel;
4566	4496	JMenuBar timelineMenubar;
..	..	@@ -4613,67 +4543,67 @@
4613	4543	// MATERIAL
4614	4544	JLabel materialLabel;
4615	4545	JLabel colorLabel;
4616		- NumberSlider colorField;
	4546	+ cNumberSlider colorField;
4617	4547	JLabel modulationLabel;
4618		- NumberSlider modulationField;
	4548	+ cNumberSlider modulationField;
4619	4549	JLabel metalnessLabel;
4620		- NumberSlider metalnessField;
	4550	+ cNumberSlider metalnessField;
4621	4551	JLabel diffuseLabel;
4622		- NumberSlider diffuseField;
	4552	+ cNumberSlider diffuseField;
4623	4553	JLabel specularLabel;
4624		- NumberSlider specularField;
	4554	+ cNumberSlider specularField;
4625	4555	JLabel shininessLabel;
4626		- NumberSlider shininessField;
	4556	+ cNumberSlider shininessField;
4627	4557	JLabel shiftLabel;
4628		- NumberSlider shiftField;
	4558	+ cNumberSlider shiftField;
4629	4559	JLabel ambientLabel;
4630		- NumberSlider ambientField;
	4560	+ cNumberSlider ambientField;
4631	4561	JLabel lightareaLabel;
4632		- NumberSlider lightareaField;
	4562	+ cNumberSlider lightareaField;
4633	4563	JLabel diffusenessLabel;
4634		- NumberSlider diffusenessField;
	4564	+ cNumberSlider diffusenessField;
4635	4565	JLabel velvetLabel;
4636		- NumberSlider velvetField;
	4566	+ cNumberSlider velvetField;
4637	4567	JLabel sheenLabel;
4638		- NumberSlider sheenField;
	4568	+ cNumberSlider sheenField;
4639	4569	JLabel subsurfaceLabel;
4640		- NumberSlider subsurfaceField;
	4570	+ cNumberSlider subsurfaceField;
4641	4571	//JLabel bumpLabel;
4642	4572	//NumberSlider bumpField;
4643	4573	JLabel backlitLabel;
4644		- NumberSlider backlitField;
	4574	+ cNumberSlider backlitField;
4645	4575	JLabel anisoLabel;
4646		- NumberSlider anisoField;
	4576	+ cNumberSlider anisoField;
4647	4577	JLabel anisoVLabel;
4648		- NumberSlider anisoVField;
	4578	+ cNumberSlider anisoVField;
4649	4579	JLabel cameraLabel;
4650		- NumberSlider cameraField;
	4580	+ cNumberSlider cameraField;
4651	4581	JLabel selfshadowLabel;
4652		- NumberSlider selfshadowField;
	4582	+ cNumberSlider selfshadowField;
4653	4583	JLabel shadowLabel;
4654		- NumberSlider shadowField;
	4584	+ cNumberSlider shadowField;
4655	4585	JLabel textureLabel;
4656		- NumberSlider textureField;
	4586	+ cNumberSlider textureField;
4657	4587	JLabel opacityLabel;
4658		- NumberSlider opacityField;
	4588	+ cNumberSlider opacityField;
4659	4589	JLabel fakedepthLabel;
4660		- NumberSlider fakedepthField;
	4590	+ cNumberSlider fakedepthField;
4661	4591	JLabel shadowbiasLabel;
4662		- NumberSlider shadowbiasField;
	4592	+ cNumberSlider shadowbiasField;
4663	4593	JLabel bumpLabel;
4664		- NumberSlider bumpField;
	4594	+ cNumberSlider bumpField;
4665	4595	JLabel noiseLabel;
4666		- NumberSlider noiseField;
	4596	+ cNumberSlider noiseField;
4667	4597	JLabel powerLabel;
4668		- NumberSlider powerField;
	4598	+ cNumberSlider powerField;
4669	4599	JLabel borderfadeLabel;
4670		- NumberSlider borderfadeField;
	4600	+ cNumberSlider borderfadeField;
4671	4601	JLabel fogLabel;
4672		- NumberSlider fogField;
	4602	+ cNumberSlider fogField;
4673	4603	JLabel opacityPowerLabel;
4674		- NumberSlider opacityPowerField;
	4604	+ cNumberSlider opacityPowerField;
4675	4605	JTree jTree;
4676	4606	//ObjectUI parent;
4677	4607
4678		- NumberSlider normalpushField;
	4608	+ cNumberSlider normalpushField;
4679	4609	}