~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,61 @@
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	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	323	+ toggleSwitchItem.addItemListener(this);
	324	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	325	+
337	326	cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
338	327	toggleHandleItem.addItemListener(this);
339	328	toggleHandleItem.setState(CameraPane.HANDLES);
	329	+
340	330	cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
341	331	togglePaintItem.addItemListener(this);
342	332	togglePaintItem.setState(CameraPane.PAINTMODE);
	333	+
	334	+ if (Globals.ADVANCED)
	335	+ {
	336	+ cameraMenu.add("-");
	337	+ cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
	338	+ toggleLiveItem.addItemListener(this);
	339	+ toggleLiveItem.setState(Globals.isLIVE());
	340	+
	341	+ cameraMenu.add(stepItem = new MenuItem("Step"));
	342	+ stepItem.addActionListener(this);
	343	+ // cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
	344	+ // toggleDLItem.addItemListener(this);
	345	+ // toggleDLItem.setState(false);
	346	+
	347	+ cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
	348	+ toggleRenderItem.addItemListener(this);
	349	+ toggleRenderItem.setState(!CameraPane.frozen);
	350	+
	351	+ cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
	352	+ toggleDebugItem.addItemListener(this);
	353	+ toggleDebugItem.setState(CameraPane.DEBUG);
	354	+
	355	+ cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
	356	+ toggleFrustumItem.addItemListener(this);
	357	+ toggleFrustumItem.setState(CameraPane.FRUSTUM);
	358	+
	359	+ cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
	360	+ toggleFootContactItem.addItemListener(this);
	361	+ toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
	362	+
	363	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	364	+ toggleTimelineItem.addItemListener(this);
	365	+ }
	366	+
343	367	// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
344	368	// toggleRootItem.addItemListener(this);
345	369	// toggleRootItem.setState(false);
..	..	@@ -353,21 +377,23 @@
353	377	objectPanel = new JTabbedPane();
354	378	toolbarPanel = new JPanel();
355	379	toolbarPanel.setName("Toolbar");
356		- treePanel = new JPanel();
	380	+ treePanel = new cGridBag();
357	381	treePanel.setName("Tree");
358		- ctrlPanel = new JPanel(); // new GridBagLayout());
	382	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
359	383	ctrlPanel.setName("Edit");
360		- materialPanel = new JPanel();
	384	+ materialPanel = new cGridBag().setVertical(true);
361	385	materialPanel.setName("Material");
362	386	/JTextPane/
363	387	infoarea = createTextPane();
	388	+ doc = infoarea.getStyledDocument();
	389	+
364	390	infoarea.setEditable(true);
365	391	SetText();
366	392	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
367	393	// infoarea.setOpaque(false);
368	394	// //infoarea.setForeground(textcolor);
369		- infoarea.setLineWrap(true);
370		- infoarea.setWrapStyleWord(true);
	395	+// TEXTAREA infoarea.setLineWrap(true);
	396	+// TEXTAREA infoarea.setWrapStyleWord(true);
371	397	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
372	398	infoPanel.setPreferredSize(new Dimension(50, 200));
373	399	infoPanel.setName("Info");
..	..	@@ -378,16 +404,16 @@
378	404	mainPanel.setName("Main");
379	405	mainPanel.setContinuousLayout(true);
380	406	mainPanel.setOneTouchExpandable(true);
381		- mainPanel.setDividerLocation(1.0);
382	407	mainPanel.setDividerSize(9);
383		- mainPanel.setResizeWeight(0);
	408	+ mainPanel.setDividerLocation(0.5); //1.0);
	409	+ mainPanel.setResizeWeight(0.5);
384	410
385	411	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
386	412	//mainPanel.setLayout(new GridBagLayout());
387	413	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
388		- treePanel.setLayout(new GridBagLayout());
389		- ctrlPanel.setLayout(new GridBagLayout());
390		- materialPanel.setLayout(new GridBagLayout());
	414	+// treePanel.setLayout(new GridBagLayout());
	415	+ //ctrlPanel.setLayout(new GridBagLayout());
	416	+ //materialPanel.setLayout(new GridBagLayout());
391	417
392	418	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
393	419	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -426,7 +452,7 @@
426	452	static String newline = "\n";
427	453	protected static final String buttonString = "JButton";
428	454	StyledDocument doc;
429		- JTextArea infoarea;
	455	+ JTextPane infoarea;
430	456
431	457	void ClearInfo()
432	458	{
..	..	@@ -493,7 +519,10 @@
493	519	}
494	520
495	521	if (full)
496		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	522	+ {
	523	+ si.SendInfo(" BBox min: " + minima, "regular");
	524	+ si.SendInfo(" BBox max: " + maxima, "regular");
	525	+ }
497	526
498	527	if (sel.bRep != null)
499	528	{
..	..	@@ -591,6 +620,9 @@
591	620	{
592	621	CameraPane.pointflow = (PointFlow) sel;
593	622	}
	623	+
	624	+ si.SendInfo("_____________________", "regular");
	625	+ si.SendInfo("", "regular");
594	626	}
595	627	}
596	628
..	..	@@ -622,52 +654,52 @@
622	654	cameraView.ToggleFullScreen();
623	655	}
624	656
625		- private JTextArea createTextPane()
	657	+ private JTextPane createTextPane()
626	658	{
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		- };
	659	+// TEXTAREA String[] initString =
	660	+// {
	661	+// "This is an editable JTextPane, ", //regular
	662	+// "another ", //italic
	663	+// "styled ", //bold
	664	+// "text ", //small
	665	+// "component, ", //large
	666	+// "which supports embedded components..." + newline,//regular
	667	+// " " + newline, //button
	668	+// "...and embedded icons..." + newline, //regular
	669	+// " ", //icon
	670	+// newline + "JTextPane is a subclass of JEditorPane that "
	671	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	672	+// + "cover methods for interacting with those objects."
	673	+// };
	674	+//
	675	+// String[] initStyles =
	676	+// {
	677	+// "regular", "italic", "bold", "small", "large",
	678	+// "regular", "button", "regular", "icon",
	679	+// "regular"
	680	+// };
	681	+//
	682	+// JTextPane textPane = new JTextPane();
	683	+// textPane.setEditable(true);
	684	+// /StyledDocument/ doc = textPane.getStyledDocument();
	685	+// addStylesToDocument(doc);
	686	+//
	687	+// try
	688	+// {
	689	+// for (int j = 0; j < 2; j++)
	690	+// {
	691	+// for (int i = 0; i < initString.length; i++)
	692	+// {
	693	+// doc.insertString(doc.getLength(), initString[i],
	694	+// doc.getStyle(initStyles[i]));
	695	+// }
	696	+// }
	697	+// } catch (BadLocationException ble)
	698	+// {
	699	+// System.err.println("Couldn't insert initial text into text pane.");
	700	+// }
642	701
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;
	702	+ return new JTextPane(); // textPane;
671	703	}
672	704
673	705	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -720,7 +752,7 @@
720	752	protected static ImageIcon createImageIcon(String path,
721	753	String description)
722	754	{
723		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	755	+ java.net.URL imgURL = Grafreed.class.getResource(path);
724	756	if (imgURL != null)
725	757	{
726	758	return new ImageIcon(imgURL, description);
..	..	@@ -767,115 +799,83 @@
767	799	JButton slowerButton;
768	800	JButton fasterButton;
769	801	JButton remarkButton;
	802	+
	803	+ cGridBag namePanel;
	804	+ cGridBag setupPanel;
	805	+ cGridBag commandsPanel;
	806	+ cGridBag pushPanel;
	807	+ cGridBag fillPanel;
770	808
771		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	809	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
772	810	{
773	811	JCheckBox cb;
774	812
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);
	813	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
780	814	cb.addItemListener(this);
781		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
782		- oe.aConstraints.gridwidth = 1;
783		- oe.aConstraints.gridx += 1;
784	815
785	816	return cb;
786	817	}
787	818
788		- cButton AddButton(ObjEditor oe, String label)
	819	+ cButton AddButton(cGridBag panel, String label)
789	820	{
790	821	cButton cb;
791	822
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);
	823	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
797	824	cb.addActionListener(this);
798		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
799		- oe.aConstraints.gridwidth = 1;
800		- oe.aConstraints.gridx += 1;
801	825
802	826	return cb;
803	827	}
804	828
805		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	829	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
806	830	{
807	831	JComboBox combo;
808	832
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;
	833	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
812	834	combo.addActionListener(this);
813	835
814	836	return combo;
815	837	}
816	838
817		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	839	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
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 = 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		-
	847	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	848	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
834	849	combo.setFloat(current);
835		-
836		- combo.label = jlabel;
837		-
838		- combo.addChangeListener(this);
839		-
840		- return combo;
	850	+
	851	+ panel.add(control);
	852	+
	853	+ return control;
841	854	}
842	855
843		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	856	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
844	857	{
845		- NumberSlider combo;
	858	+ cGridBag control = new cGridBag();
	859	+
	860	+ cNumberSlider combo;
846	861
847	862	JLabel jlabel = new JLabel(label);
848		-
849		- aConstraints.fill = GridBagConstraints.VERTICAL;
850	863	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		-
	864	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	865	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
860	866	combo.setInteger(current);
861	867
862		- combo.label = jlabel;
863		-
864		- combo.addChangeListener(this);
865		-
866		- return combo;
	868	+ panel.add(control);
	869	+
	870	+ return control;
867	871	}
868	872
869		- JTextArea AddText(JPanel ctrlPanel, String name)
	873	+ JTextArea AddText(cGridBag ctrlPanel, String name)
870	874	{
871	875	JTextArea text;
872	876
873		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
874		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
875		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	877	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
876	878	text.addCaretListener(this);
877		- aConstraints.gridx += 1;
878		- aConstraints.gridwidth = 1;
879	879
880	880	return text;
881	881	}
..	..	@@ -905,9 +905,16 @@
905	905	objEditor.ctrlPanel.remove(j);
906	906	}
907	907
	908	+ void Remove(cNumberSlider j)
	909	+ {
	910	+ j.removeChangeListener(this);
	911	+ //objEditor.ctrlPanel.remove(j.label);
	912	+ objEditor.ctrlPanel.remove(j);
	913	+ }
	914	+
908	915	/*
909	916	*/
910		- void Return() // ObjEditor oe)
	917	+ void Return0() // ObjEditor oe)
911	918	{
912	919	aConstraints.gridy += 1;
913	920	aConstraints.gridx = 0;
..	..	@@ -962,37 +969,70 @@
962	969
963	970	void SetupUI2(ObjEditor oe)
964	971	{
965		-// oe.aConstraints.weightx = 0;
966		-// oe.aConstraints.weighty = 0;
967		-// oe.aConstraints.gridx = 0;
968		-// oe.aConstraints.gridy = 0;
969		- SetupName(oe);
	972	+ //SetupName(oe);
	973	+
	974	+ namePanel = new cGridBag();
	975	+
	976	+ nameField = AddText(namePanel, copy.GetName());
	977	+ namePanel.add(nameField);
	978	+ oe.ctrlPanel.add(namePanel);
	979	+
	980	+ oe.ctrlPanel.Return();
970	981
971	982	if (!GroupEditor.allparams)
972	983	return;
973	984
974		- liveCB = AddCheckBox(oe, "Live", copy.live);
975		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
976		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	985	+ setupPanel = new cGridBag().setVertical(false);
	986	+
	987	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	988	+ liveCB.setToolTipText("Animate object");
	989	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	990	+ hideCB.setToolTipText("Hide object");
977	991	// 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");
	992	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	993	+ markCB.setToolTipText("Set the animation target transform");
	994	+
	995	+ rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	996	+ rewindCB.setToolTipText("Rewind animation");
	997	+
	998	+ randomCB = AddCheckBox(setupPanel, "Random", copy.random);
	999	+ randomCB.setToolTipText("Option for switch node");
	1000	+
	1001	+ if (Globals.ADVANCED)
	1002	+ {
	1003	+ link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
	1004	+ link2masterCB.setToolTipText("Attach to support");
	1005	+ speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1006	+ speedupCB.setToolTipText("Option motion capture");
	1007	+ }
	1008	+
	1009	+ oe.ctrlPanel.add(setupPanel);
	1010	+ oe.ctrlPanel.Return();
	1011	+
	1012	+ commandsPanel = new cGridBag().setVertical(false);
	1013	+
	1014	+ resetButton = AddButton(commandsPanel, "Reset");
	1015	+ resetButton.setToolTipText("Jump to frame zero");
	1016	+ stepButton = AddButton(commandsPanel, "Step");
	1017	+ stepButton.setToolTipText("Step one frame");
984	1018	// resetAllButton = AddButton(oe, "Reset All");
985	1019	// stepAllButton = AddButton(oe, "Step All");
986		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
987	1020	// Return();
988		- slowerButton = AddButton(oe, "Slow");
989		- fasterButton = AddButton(oe, "Fast");
990		- remarkButton = AddButton(oe, "Rem");
	1021	+ slowerButton = AddButton(commandsPanel, "Slow");
	1022	+ slowerButton.setToolTipText("Decrease animation speed");
	1023	+ fasterButton = AddButton(commandsPanel, "Fast");
	1024	+ fasterButton.setToolTipText("Increase animation speed");
	1025	+ remarkButton = AddButton(commandsPanel, "Remark");
	1026	+ remarkButton.setToolTipText("Set the current transform as the target");
991	1027
992		- Return();
	1028	+ oe.ctrlPanel.add(commandsPanel);
	1029	+ oe.ctrlPanel.Return();
993	1030
994		- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
995		- Return();
	1031	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1032	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1033	+ //Return();
	1034	+
	1035	+ oe.ctrlPanel.Return();
996	1036
997	1037	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
998	1038	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1087,7 +1127,7 @@
1087	1127	oe.aConstraints.gridwidth = 1;
1088	1128	/**/
1089	1129	nameField = AddText(oe.ctrlPanel, copy.GetName());
1090		- Return();
	1130	+ oe.ctrlPanel.Return();
1091	1131
1092	1132	//ctrlPanel.add(textureButton = new Button("Texture..."));
1093	1133	//textureButton.setEnabled(false);
..	..	@@ -1189,7 +1229,8 @@
1189	1229	//JPanel worldPanel =
1190	1230	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1191	1231	//worldPanel.setName("World");
1192		- centralPanel = new JPanel(new BorderLayout());
	1232	+ centralPanel = new cGridBag();
	1233	+ centralPanel.preferredWidth = 20;
1193	1234	timelinePanel = new JPanel(new BorderLayout());
1194	1235	timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1195	1236
..	..	@@ -1222,6 +1263,7 @@
1222	1263	XYZPanel = new cGridBag().setVertical(true);
1223	1264	//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1224	1265
	1266	+ XYZPanel.preferredWidth = 5;
1225	1267	XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
1226	1268	XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
1227	1269	XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
..	..	@@ -1262,10 +1304,11 @@
1262	1304	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1263	1305	//tmp.setName("Edit");
1264	1306	objectPanel.add(materialPanel);
1265		- JPanel north = new JPanel(new BorderLayout());
1266		- north.setName("Edit");
1267		- north.add(ctrlPanel, BorderLayout.NORTH);
1268		- objectPanel.add(north);
	1307	+// JPanel north = new JPanel(new BorderLayout());
	1308	+// north.setName("Edit");
	1309	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1310	+// objectPanel.add(north);
	1311	+ objectPanel.add(ctrlPanel);
1269	1312	objectPanel.add(infoPanel);
1270	1313
1271	1314	/*
..	..	@@ -1286,19 +1329,23 @@
1286	1329	scrollpane.setWheelScrollingEnabled(true);
1287	1330	scrollpane.addMouseWheelListener(this); // Default not fast enough
1288	1331
1289		- /JTabbedPane/ scenePanel = new JTabbedPane();
1290		- scenePanel.add(scrollpane);
	1332	+ /JTabbedPane/ scenePanel = new cGridBag();
	1333	+ scenePanel.preferredWidth = 6;
	1334	+
	1335	+ JTabbedPane tabbedPane = new JTabbedPane();
	1336	+ tabbedPane.add(scrollpane);
1291	1337
1292		- scenePanel.add(FSPane = new cFileSystemPane(this));
	1338	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1293	1339
1294		- optionsPanel = new JPanel(new GridBagLayout());
	1340	+ optionsPanel = new cGridBag().setVertical(true);
1295	1341
1296	1342	optionsPanel.setName("Options");
1297	1343
1298		- AddOptions(optionsPanel, aConstraints);
	1344	+ AddOptions(optionsPanel); //, aConstraints);
1299	1345
1300		- scenePanel.add(optionsPanel);
1301		-
	1346	+ tabbedPane.add(optionsPanel);
	1347	+
	1348	+ scenePanel.add(tabbedPane);
1302	1349
1303	1350	/*
1304	1351	cTree jTree = new cTree(null);
..	..	@@ -1389,8 +1436,8 @@
1389	1436
1390	1437	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1391	1438
1392		- frame.setSize(1024, 768);
1393		- frame.show();
	1439	+ frame.setSize(1280, 860);
	1440	+ frame.setVisible(true);
1394	1441
1395	1442	gridPanel.setDividerLocation(1.0);
1396	1443
..	..	@@ -1405,7 +1452,7 @@
1405	1452	});
1406	1453	}
1407	1454
1408		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	1455	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
1409	1456	{
1410	1457	}
1411	1458
..	..	@@ -1420,260 +1467,173 @@
1420	1467	ctrlPanel.removeAll();
1421	1468	}
1422	1469
1423		- void SetupMaterial(JPanel ctrlPanel)
	1470	+ void SetupMaterial(cGridBag panel)
1424	1471	{
1425		- aConstraints.weighty = 0;
1426		- //aConstraints.weightx = 1;
1427		- /*
	1472	+ /*
1428	1473	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1429	1474	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1430		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1431		- aConstraints.gridx += 1;
1432	1475	*/
1433	1476
1434		- aConstraints.gridwidth = 1;
1435		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1436		- aConstraints.gridx += 1;
1437		- aConstraints.weighty = 0;
1438		- aConstraints.gridwidth = 1;
	1477	+ cGridBag editBar = new cGridBag().setVertical(false);
	1478	+
	1479	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1480	+ createMaterialButton.setToolTipText("Create material");
1439	1481
1440	1482	/*
1441	1483	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1442		- aConstraints.gridx += 1;
1443		- aConstraints.weighty = 0;
1444		- aConstraints.gridwidth = 1;
1445	1484	*/
1446	1485
1447		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1448		- aConstraints.gridx += 1;
	1486	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1487	+ clearMaterialButton.setToolTipText("Clear material");
	1488	+
	1489	+ if (Globals.ADVANCED)
	1490	+ {
	1491	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1492	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1493	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1494	+ }
1449	1495
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;
	1496	+ editBar.preferredHeight = 15;
	1497	+
	1498	+ panel.add(editBar);
	1499	+
1464	1500	/**/
1465	1501	//aConstraints.weighty = 0;
1466	1502	////aConstraints.weightx = 1;
1467	1503	//aConstraints.weighty = 1;
1468	1504	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1469	1505	//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;
	1506	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1475	1507
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;
	1508	+ cGridBag colorSection = new cGridBag().setVertical(true);
	1509	+
	1510	+ cGridBag color = new cGridBag();
	1511	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1512	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1513	+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1514	+ //colorField.preferredWidth = 200;
	1515	+ colorSection.add(color);
1486	1516
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;
	1517	+ cGridBag modulation = new cGridBag();
	1518	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1519	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1520	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1521	+ colorSection.add(modulation);
1496	1522
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;
	1523	+ cGridBag texture = new cGridBag();
	1524	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1525	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1526	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1527	+ colorSection.add(texture);
1506	1528
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;
	1529	+ cGridBag anisoU = new cGridBag();
	1530	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1531	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1532	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1533	+ colorSection.add(anisoU);
1516	1534
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;
	1535	+ cGridBag anisoV = new cGridBag();
	1536	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1537	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1538	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1539	+ colorSection.add(anisoV);
1526	1540
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;
	1541	+ cGridBag shadowbias = new cGridBag();
	1542	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1543	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1544	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1545	+ colorSection.add(shadowbias);
1536	1546
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;
	1547	+ panel.add(new JSeparator());
	1548	+
	1549	+ panel.add(colorSection);
	1550	+
	1551	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1552	+
	1553	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1554	+
	1555	+ cGridBag diffuse = new cGridBag();
	1556	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1557	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1558	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1559	+ diffuseSection.add(diffuse);
1545	1560
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;
	1561	+ cGridBag diffuseness = new cGridBag();
	1562	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1563	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1564	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1565	+ diffuseSection.add(diffuseness);
1555	1566
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;
	1567	+ cGridBag selfshadow = new cGridBag();
	1568	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1569	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1570	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1571	+ diffuseSection.add(selfshadow);
1565	1572
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;
	1573	+ cGridBag sheen = new cGridBag();
	1574	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1575	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1576	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1577	+ diffuseSection.add(sheen);
1575	1578
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;
	1579	+ cGridBag subsurface = new cGridBag();
	1580	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1581	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1582	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1583	+ diffuseSection.add(subsurface);
1585	1584
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;
	1585	+ cGridBag shadow = new cGridBag();
	1586	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1587	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1588	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1589	+ diffuseSection.add(shadow);
1595	1590
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;
	1591	+ cGridBag fakedepth = new cGridBag();
	1592	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1593	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1594	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1595	+ diffuseSection.add(fakedepth);
1605	1596
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;
	1597	+ panel.add(new JSeparator());
	1598	+
	1599	+ panel.add(diffuseSection);
	1600	+
	1601	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1602	+
	1603	+ cGridBag specularSection = new cGridBag().setVertical(true);
1615	1604
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;
	1605	+ cGridBag specular = new cGridBag();
	1606	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1607	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1608	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1609	+ specularSection.add(specular);
1624	1610
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;
	1611	+ cGridBag lightarea = new cGridBag();
	1612	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1613	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1614	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1615	+ specularSection.add(lightarea);
1634	1616
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;
	1617	+ cGridBag shininess = new cGridBag();
	1618	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1619	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1620	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1621	+ specularSection.add(shininess);
1644	1622
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;
	1623	+ cGridBag metalness = new cGridBag();
	1624	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1625	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1626	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1627	+ specularSection.add(metalness);
1654	1628
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;
	1629	+ cGridBag velvet = new cGridBag();
	1630	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1631	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1632	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1633	+ specularSection.add(velvet);
1664	1634
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();
	1635	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1636	+ //Return();
1677	1637	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1678	1638	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1679	1639	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1684,130 +1644,93 @@
1684	1644	// aConstraints.gridy += 1;
1685	1645	// aConstraints.gridwidth = 1;
1686	1646
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	1647
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;
	1648	+ panel.add(new JSeparator());
	1649	+
	1650	+ panel.add(specularSection);
	1651	+
	1652	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1653	+
	1654	+ cGridBag globalSection = new cGridBag().setVertical(true);
1705	1655
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;
	1656	+ cGridBag camera = new cGridBag();
	1657	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1658	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1659	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1660	+ globalSection.add(camera);
1715	1661
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;
	1662	+ cGridBag ambient = new cGridBag();
	1663	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1664	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1665	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1666	+ globalSection.add(ambient);
1725	1667
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;
	1668	+ cGridBag backlit = new cGridBag();
	1669	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1670	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1671	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1672	+ globalSection.add(backlit);
1736	1673
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;
	1674	+ cGridBag opacity = new cGridBag();
	1675	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1676	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1677	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1678	+ globalSection.add(opacity);
1746	1679
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;
	1680	+ panel.add(new JSeparator());
	1681	+
	1682	+ panel.add(globalSection);
	1683	+
	1684	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1685	+
	1686	+ cGridBag textureSection = new cGridBag().setVertical(true);
1756	1687
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;
	1688	+ cGridBag bump = new cGridBag();
	1689	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1690	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1691	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1692	+ textureSection.add(bump);
1766	1693
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;
	1694	+ cGridBag noise = new cGridBag();
	1695	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1696	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1697	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1698	+ textureSection.add(noise);
1776	1699
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;
	1700	+ cGridBag power = new cGridBag();
	1701	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1702	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1703	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1704	+ textureSection.add(power);
1786	1705
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;
	1706	+ cGridBag borderfade = new cGridBag();
	1707	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1708	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1709	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1710	+ textureSection.add(borderfade);
1796	1711
1797		- //aConstraints.weighty = 1;
1798		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1799		- //aConstraints.gridx += 1;
1800		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1801		- aConstraints.weighty = 0;
	1712	+ cGridBag fog = new cGridBag();
	1713	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1714	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1715	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1716	+ textureSection.add(fog);
1802	1717
1803		- aConstraints.gridx = 0;
1804		- aConstraints.gridy = 0;
1805		- aConstraints.gridwidth = 1;
	1718	+ cGridBag opacityPower = new cGridBag();
	1719	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	1720	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1721	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	1722	+ textureSection.add(opacityPower);
	1723	+
	1724	+ panel.add(new JSeparator());
	1725	+
	1726	+ panel.add(textureSection);
	1727	+
	1728	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1806	1729
1807	1730	SetMaterial(copy); // .GetMaterial());
1808	1731
1809		- colorField.addChangeListener(this);
1810		- modulationField.addChangeListener(this);
	1732	+ //colorField.addChangeListener(this);
	1733	+// modulationField.addChangeListener(this);
1811	1734	metalnessField.addChangeListener(this);
1812	1735	diffuseField.addChangeListener(this);
1813	1736	specularField.addChangeListener(this);
..	..	@@ -1837,12 +1760,15 @@
1837	1760	opacityPowerField.addChangeListener(this);
1838	1761	/**/
1839	1762
1840		- resetSlidersButton.addActionListener(this);
1841	1763	clearMaterialButton.addActionListener(this);
1842	1764	createMaterialButton.addActionListener(this);
1843		-
1844		- propagateToggle.addItemListener(this);
1845		- multiplyToggle.addItemListener(this);
	1765	+
	1766	+ if (Globals.ADVANCED)
	1767	+ {
	1768	+ resetSlidersButton.addActionListener(this);
	1769	+ propagateToggle.addItemListener(this);
	1770	+ multiplyToggle.addItemListener(this);
	1771	+ }
1846	1772	}
1847	1773
1848	1774	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -2013,7 +1939,7 @@
2013	1939
2014	1940	//? flashIt = false;
2015	1941	CameraPane pane = (CameraPane) cameraView;
2016		- pane.clickStart(location.x, location.y, 0);
	1942	+ pane.clickStart(location.x, location.y, 0, 0);
2017	1943	pane.clickEnd(location.x, location.y, 0, true);
2018	1944
2019	1945	if (group.selection.size() == 1)
..	..	@@ -2470,11 +2396,11 @@
2470	2396
2471	2397	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2472	2398	{
2473		- if (GrafreeD.standAlone)
	2399	+ if (Grafreed.standAlone)
2474	2400	{
2475	2401	/**/
2476	2402	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2477		- browser.show();
	2403	+ browser.setVisible(true);
2478	2404	String filename = browser.getFile();
2479	2405	if (filename != null && filename.length() > 0)
2480	2406	{
..	..	@@ -2619,6 +2545,7 @@
2619	2545	}
2620	2546	if (input == null)
2621	2547	{
	2548	+ new Exception().printStackTrace();
2622	2549	System.exit(0);
2623	2550	}
2624	2551
..	..	@@ -2833,7 +2760,8 @@
2833	2760	return;
2834	2761	}
2835	2762
2836		- multiplyToggle.setSelected(mat.multiply);
	2763	+ if (multiplyToggle != null)
	2764	+ multiplyToggle.setSelected(mat.multiply);
2837	2765
2838	2766	assert (object.projectedVertices != null);
2839	2767
..	..	@@ -3048,7 +2976,7 @@
3048	2976	frame.validate();
3049	2977
3050	2978	return;
3051		- } else if (event.getSource() == toggleRandomItem)
	2979	+ } else if (event.getSource() == toggleSwitchItem)
3052	2980	{
3053	2981	cameraView.ToggleRandom();
3054	2982	cameraView.repaint();
..	..	@@ -3093,6 +3021,7 @@
3093	3021	if (event.getSource() == randomCB)
3094	3022	{
3095	3023	copy.random ^= true;
	3024	+ objEditor.refreshContents();
3096	3025	return;
3097	3026	}
3098	3027	if (event.getSource() == speedupCB)
..	..	@@ -3316,7 +3245,7 @@
3316	3245	if (!Globals.ANIMATION)
3317	3246	{
3318	3247	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3319		- browser.show();
	3248	+ browser.setVisible(true);
3320	3249	String filename = browser.getFile();
3321	3250	if (filename != null && filename.length() > 0)
3322	3251	{
..	..	@@ -3326,8 +3255,8 @@
3326	3255
3327	3256	Globals.ANIMATION ^= true;
3328	3257
3329		- GrafreeD.wav.cursor = 0;
3330		- GrafreeD.wav.loop = 0;
	3258	+ Grafreed.wav.cursor = 0;
	3259	+ Grafreed.wav.loop = 0;
3331	3260	}
3332	3261	} else
3333	3262	{
..	..	@@ -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,10 +3439,40 @@
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);
	3446	+
	3447	+ if (copy.material != null)
	3448	+ {
	3449	+ cMaterial mat = copy.material;
	3450	+
	3451	+ colorField.SetToolTipValue((mat.color));
	3452	+ modulationField.SetToolTipValue((mat.modulation));
	3453	+ metalnessField.SetToolTipValue((mat.metalness));
	3454	+ diffuseField.SetToolTipValue((mat.diffuse));
	3455	+ specularField.SetToolTipValue((mat.specular));
	3456	+ shininessField.SetToolTipValue((mat.shininess));
	3457	+ shiftField.SetToolTipValue((mat.shift));
	3458	+ ambientField.SetToolTipValue((mat.ambient));
	3459	+ lightareaField.SetToolTipValue((mat.lightarea));
	3460	+ diffusenessField.SetToolTipValue((mat.factor));
	3461	+ velvetField.SetToolTipValue((mat.velvet));
	3462	+ sheenField.SetToolTipValue((mat.sheen));
	3463	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3464	+ backlitField.SetToolTipValue((mat.bump));
	3465	+ anisoField.SetToolTipValue((mat.aniso));
	3466	+ anisoVField.SetToolTipValue((mat.anisoV));
	3467	+ cameraField.SetToolTipValue((mat.cameralight));
	3468	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3469	+ shadowField.SetToolTipValue((mat.shadow));
	3470	+ textureField.SetToolTipValue((mat.texture));
	3471	+ opacityField.SetToolTipValue((mat.opacity));
	3472	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3473	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3474	+ }
	3475	+
3517	3476	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3518	3477	{
3519	3478	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3558,6 +3517,7 @@
3558	3517	\|\| e.getSource() == apertureField
3559	3518	\|\| e.getSource() == shadowblurField)
3560	3519	{
	3520	+ new Exception().printStackTrace();
3561	3521	System.exit(0);
3562	3522	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3563	3523	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3883,7 +3843,7 @@
3883	3843
3884	3844	radioPanel.revalidate();
3885	3845	radioPanel.repaint();
3886		- ctrlPanel.revalidate(); // ? new
	3846	+ ctrlPanel.validate(); // ? new
3887	3847	ctrlPanel.repaint();
3888	3848	}
3889	3849	}
..	..	@@ -4240,7 +4200,7 @@
4240	4200
4241	4201	void load() // throws ClassNotFoundException
4242	4202	{
4243		- if (GrafreeD.standAlone)
	4203	+ if (Grafreed.standAlone)
4244	4204	{
4245	4205	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4246	4206	browser.show();
..	..	@@ -4345,7 +4305,7 @@
4345	4305
4346	4306	void saveAs()
4347	4307	{
4348		- if (GrafreeD.standAlone)
	4308	+ if (Grafreed.standAlone)
4349	4309	{
4350	4310	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4351	4311	browser.setVisible(true);
..	..	@@ -4456,7 +4416,7 @@
4456	4416	Object3D objectparent = obj.parent;
4457	4417	obj.parent = null;
4458	4418
4459		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4419	+ Object3D object = (Object3D) Grafreed.clone(obj);
4460	4420
4461	4421	obj.parent = objectparent;
4462	4422
..	..	@@ -4490,7 +4450,7 @@
4490	4450	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4491	4451	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4492	4452	copy.generatePOV(buffer);
4493		- if (GrafreeD.standAlone)
	4453	+ if (Grafreed.standAlone)
4494	4454	{
4495	4455	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4496	4456	browser.show();
..	..	@@ -4529,8 +4489,8 @@
4529	4489	//MenuItem normalLensItem;
4530	4490	MenuItem editCameraItem;
4531	4491	MenuItem revertCameraItem;
4532		- CheckboxMenuItem toggleLiveItem;
4533	4492	MenuItem stepItem;
	4493	+ CheckboxMenuItem toggleLiveItem;
4534	4494	CheckboxMenuItem toggleFullScreenItem;
4535	4495	CheckboxMenuItem toggleTimelineItem;
4536	4496	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4539,7 +4499,7 @@
4539	4499	CheckboxMenuItem toggleFootContactItem;
4540	4500	CheckboxMenuItem toggleDLItem;
4541	4501	CheckboxMenuItem toggleTextureItem;
4542		- CheckboxMenuItem toggleRandomItem;
	4502	+ CheckboxMenuItem toggleSwitchItem;
4543	4503	CheckboxMenuItem toggleRootItem;
4544	4504	CheckboxMenuItem animationItem;
4545	4505	CheckboxMenuItem toggleHandleItem;
..	..	@@ -4547,20 +4507,20 @@
4547	4507	JSplitPane mainPanel;
4548	4508	JScrollPane scrollpane;
4549	4509	JPanel toolbarPanel;
4550		- JPanel treePanel;
	4510	+ cGridBag treePanel;
4551	4511	JPanel radioPanel;
4552	4512	ButtonGroup buttonGroup;
4553		- JPanel ctrlPanel;
4554		- JPanel materialPanel;
	4513	+ cGridBag ctrlPanel;
	4514	+ cGridBag materialPanel;
4555	4515	JScrollPane infoPanel;
4556		- JPanel optionsPanel;
	4516	+ cGridBag optionsPanel;
4557	4517	JTabbedPane objectPanel;
4558	4518	cGridBag XYZPanel;
4559	4519	JSplitPane gridPanel;
4560	4520	JSplitPane bigPanel;
4561	4521	cGridBag bigThree;
4562		- JTabbedPane scenePanel;
4563		- JPanel centralPanel;
	4522	+ cGridBag scenePanel;
	4523	+ cGridBag centralPanel;
4564	4524	JSplitPane cameraPanel;
4565	4525	JPanel timelinePanel;
4566	4526	JMenuBar timelineMenubar;
..	..	@@ -4613,67 +4573,67 @@
4613	4573	// MATERIAL
4614	4574	JLabel materialLabel;
4615	4575	JLabel colorLabel;
4616		- NumberSlider colorField;
	4576	+ cNumberSlider colorField;
4617	4577	JLabel modulationLabel;
4618		- NumberSlider modulationField;
	4578	+ cNumberSlider modulationField;
4619	4579	JLabel metalnessLabel;
4620		- NumberSlider metalnessField;
	4580	+ cNumberSlider metalnessField;
4621	4581	JLabel diffuseLabel;
4622		- NumberSlider diffuseField;
	4582	+ cNumberSlider diffuseField;
4623	4583	JLabel specularLabel;
4624		- NumberSlider specularField;
	4584	+ cNumberSlider specularField;
4625	4585	JLabel shininessLabel;
4626		- NumberSlider shininessField;
	4586	+ cNumberSlider shininessField;
4627	4587	JLabel shiftLabel;
4628		- NumberSlider shiftField;
	4588	+ cNumberSlider shiftField;
4629	4589	JLabel ambientLabel;
4630		- NumberSlider ambientField;
	4590	+ cNumberSlider ambientField;
4631	4591	JLabel lightareaLabel;
4632		- NumberSlider lightareaField;
	4592	+ cNumberSlider lightareaField;
4633	4593	JLabel diffusenessLabel;
4634		- NumberSlider diffusenessField;
	4594	+ cNumberSlider diffusenessField;
4635	4595	JLabel velvetLabel;
4636		- NumberSlider velvetField;
	4596	+ cNumberSlider velvetField;
4637	4597	JLabel sheenLabel;
4638		- NumberSlider sheenField;
	4598	+ cNumberSlider sheenField;
4639	4599	JLabel subsurfaceLabel;
4640		- NumberSlider subsurfaceField;
	4600	+ cNumberSlider subsurfaceField;
4641	4601	//JLabel bumpLabel;
4642	4602	//NumberSlider bumpField;
4643	4603	JLabel backlitLabel;
4644		- NumberSlider backlitField;
	4604	+ cNumberSlider backlitField;
4645	4605	JLabel anisoLabel;
4646		- NumberSlider anisoField;
	4606	+ cNumberSlider anisoField;
4647	4607	JLabel anisoVLabel;
4648		- NumberSlider anisoVField;
	4608	+ cNumberSlider anisoVField;
4649	4609	JLabel cameraLabel;
4650		- NumberSlider cameraField;
	4610	+ cNumberSlider cameraField;
4651	4611	JLabel selfshadowLabel;
4652		- NumberSlider selfshadowField;
	4612	+ cNumberSlider selfshadowField;
4653	4613	JLabel shadowLabel;
4654		- NumberSlider shadowField;
	4614	+ cNumberSlider shadowField;
4655	4615	JLabel textureLabel;
4656		- NumberSlider textureField;
	4616	+ cNumberSlider textureField;
4657	4617	JLabel opacityLabel;
4658		- NumberSlider opacityField;
	4618	+ cNumberSlider opacityField;
4659	4619	JLabel fakedepthLabel;
4660		- NumberSlider fakedepthField;
	4620	+ cNumberSlider fakedepthField;
4661	4621	JLabel shadowbiasLabel;
4662		- NumberSlider shadowbiasField;
	4622	+ cNumberSlider shadowbiasField;
4663	4623	JLabel bumpLabel;
4664		- NumberSlider bumpField;
	4624	+ cNumberSlider bumpField;
4665	4625	JLabel noiseLabel;
4666		- NumberSlider noiseField;
	4626	+ cNumberSlider noiseField;
4667	4627	JLabel powerLabel;
4668		- NumberSlider powerField;
	4628	+ cNumberSlider powerField;
4669	4629	JLabel borderfadeLabel;
4670		- NumberSlider borderfadeField;
	4630	+ cNumberSlider borderfadeField;
4671	4631	JLabel fogLabel;
4672		- NumberSlider fogField;
	4632	+ cNumberSlider fogField;
4673	4633	JLabel opacityPowerLabel;
4674		- NumberSlider opacityPowerField;
	4634	+ cNumberSlider opacityPowerField;
4675	4635	JTree jTree;
4676	4636	//ObjectUI parent;
4677	4637
4678		- NumberSlider normalpushField;
	4638	+ cNumberSlider normalpushField;
4679	4639	}