~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -19,6 +19,8 @@
19	19	import //weka.core.
20	20	matrix.Matrix;
21	21
	22	+import grafeme.ui.*;
	23	+
22	24	class ObjEditor /extends JFrame/ implements iCallBack, ObjectUI,
23	25	ActionListener, ChangeListener,
24	26	InputMethodListener,
..	..	@@ -31,6 +33,9 @@
31	33	boolean timeline;
32	34	boolean wasFullScreen;
33	35
	36	+ GroupEditor callee;
	37	+ JFrame frame;
	38	+
34	39	// SCRIPT
35	40
36	41	transient JFrame textpanel = null;
..	..	@@ -121,47 +126,53 @@
121	126	void keyPressed(int key, int modifiers)
122	127	{
123	128	System.out.println("KEY PRESSED");
124		- CameraPane.theRenderer.keyPressed(key, modifiers);
	129	+ Globals.theRenderer.keyPressed(key, modifiers);
125	130	}
126	131	*/
127	132
128	133	static GridBagConstraints aConstraints;
129	134	static GridBagConstraints aWindowConstraints;
130		- GroupEditor callee;
131		- JFrame frame;
	135	+
132	136	static int GRIDWIDTH = 100; // 4;
133	137
134	138	public void closeUI()
135	139	{
136	140	//new Exception().printStackTrace();
137		- System.out.println("this = " + this);
138		- System.out.println("objEditor = " + objEditor);
	141	+// System.out.println("this = " + this);
	142	+// System.out.println("objEditor = " + objEditor);
139	143	//nameField.removeActionListener(this);
140		- objEditor.ctrlPanel.remove(nameField);
	144	+// objEditor.ctrlPanel.remove(nameField);
	145	+
	146	+ objEditor.ctrlPanel.remove(namePanel);
141	147
142	148	if (!GroupEditor.allparams)
143	149	return;
144	150
145		- objEditor.ctrlPanel.remove(liveCB);
146		- objEditor.ctrlPanel.remove(hideCB);
147		- objEditor.ctrlPanel.remove(markCB);
148		-
149		- objEditor.ctrlPanel.remove(randomCB);
150		- objEditor.ctrlPanel.remove(speedupCB);
151		- objEditor.ctrlPanel.remove(rewindCB);
152		-
153		- objEditor.ctrlPanel.remove(resetButton);
154		- objEditor.ctrlPanel.remove(stepButton);
155		-// objEditor.ctrlPanel.remove(stepAllButton);
156		-// objEditor.ctrlPanel.remove(resetAllButton);
157		- objEditor.ctrlPanel.remove(link2masterCB);
158		- //objEditor.ctrlPanel.remove(flipVCB);
159		- //objEditor.ctrlPanel.remove(texresMenu);
160		- objEditor.ctrlPanel.remove(slowerButton);
161		- objEditor.ctrlPanel.remove(fasterButton);
162		- 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);
163	169
164		- 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);
165	176	}
166	177
167	178	public ObjEditor GetEditor()
..	..	@@ -298,44 +309,61 @@
298	309	//normalLensItem.addActionListener(this);
299	310	cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
300	311	revertCameraItem.addActionListener(this);
301		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
302		- toggleTimelineItem.addItemListener(this);
	312	+
303	313	cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
304	314	toggleFullScreenItem.addItemListener(this);
305	315	toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
306	316	cameraMenu.add("-");
	317	+
307	318	cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
308	319	toggleTextureItem.addItemListener(this);
309	320	toggleTextureItem.setState(CameraPane.textureon);
310		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
311		- toggleLiveItem.addItemListener(this);
312		- toggleLiveItem.setState(CameraPane.isLIVE());
313		- cameraMenu.add(stepItem = new MenuItem("Step"));
314		- stepItem.addActionListener(this);
315		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
316		-// toggleDLItem.addItemListener(this);
317		-// toggleDLItem.setState(false);
318		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
319		- toggleRenderItem.addItemListener(this);
320		- toggleRenderItem.setState(!CameraPane.frozen);
321		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
322		- toggleDebugItem.addItemListener(this);
323		- toggleDebugItem.setState(CameraPane.DEBUG);
324		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
325		- toggleFrustumItem.addItemListener(this);
326		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
327		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
328		- toggleFootContactItem.addItemListener(this);
329		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
330		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
331		- toggleRandomItem.addItemListener(this);
332		- toggleRandomItem.setState(CameraPane.RANDOM);
	321	+
	322	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	323	+ toggleSwitchItem.addItemListener(this);
	324	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	325	+
333	326	cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
334	327	toggleHandleItem.addItemListener(this);
335	328	toggleHandleItem.setState(CameraPane.HANDLES);
	329	+
336	330	cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
337	331	togglePaintItem.addItemListener(this);
338	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	+
339	367	// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
340	368	// toggleRootItem.addItemListener(this);
341	369	// toggleRootItem.setState(false);
..	..	@@ -349,21 +377,23 @@
349	377	objectPanel = new JTabbedPane();
350	378	toolbarPanel = new JPanel();
351	379	toolbarPanel.setName("Toolbar");
352		- treePanel = new JPanel();
	380	+ treePanel = new cGridBag();
353	381	treePanel.setName("Tree");
354		- ctrlPanel = new JPanel(); // new GridBagLayout());
	382	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
355	383	ctrlPanel.setName("Edit");
356		- materialPanel = new JPanel();
	384	+ materialPanel = new cGridBag().setVertical(true);
357	385	materialPanel.setName("Material");
358	386	/JTextPane/
359	387	infoarea = createTextPane();
	388	+ doc = infoarea.getStyledDocument();
	389	+
360	390	infoarea.setEditable(true);
361	391	SetText();
362	392	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
363	393	// infoarea.setOpaque(false);
364	394	// //infoarea.setForeground(textcolor);
365		- infoarea.setLineWrap(true);
366		- infoarea.setWrapStyleWord(true);
	395	+// TEXTAREA infoarea.setLineWrap(true);
	396	+// TEXTAREA infoarea.setWrapStyleWord(true);
367	397	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
368	398	infoPanel.setPreferredSize(new Dimension(50, 200));
369	399	infoPanel.setName("Info");
..	..	@@ -374,16 +404,16 @@
374	404	mainPanel.setName("Main");
375	405	mainPanel.setContinuousLayout(true);
376	406	mainPanel.setOneTouchExpandable(true);
377		- mainPanel.setDividerLocation(1.0);
378	407	mainPanel.setDividerSize(9);
379		- mainPanel.setResizeWeight(0);
	408	+ mainPanel.setDividerLocation(0.5); //1.0);
	409	+ mainPanel.setResizeWeight(0.5);
380	410
381	411	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
382	412	//mainPanel.setLayout(new GridBagLayout());
383	413	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
384		- treePanel.setLayout(new GridBagLayout());
385		- ctrlPanel.setLayout(new GridBagLayout());
386		- materialPanel.setLayout(new GridBagLayout());
	414	+// treePanel.setLayout(new GridBagLayout());
	415	+ //ctrlPanel.setLayout(new GridBagLayout());
	416	+ //materialPanel.setLayout(new GridBagLayout());
387	417
388	418	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
389	419	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -422,7 +452,7 @@
422	452	static String newline = "\n";
423	453	protected static final String buttonString = "JButton";
424	454	StyledDocument doc;
425		- JTextArea infoarea;
	455	+ JTextPane infoarea;
426	456
427	457	void ClearInfo()
428	458	{
..	..	@@ -471,13 +501,13 @@
471	501	//SendInfo("Name:", "bold");
472	502	if (sel.GetTextures() != null \|\| debug)
473	503	{
474		- si.SendInfo(sel.toString(), "bold");
	504	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
475	505	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
476	506	if (sel.Size() > 0)
477	507	{
478	508	si.SendInfo("#children = " + sel.Size(), "regular");
479	509	}
480		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	510	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
481	511	if (debug)
482	512	{
483	513	try
..	..	@@ -489,7 +519,10 @@
489	519	}
490	520
491	521	if (full)
492		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	522	+ {
	523	+ si.SendInfo(" BBox min: " + minima, "regular");
	524	+ si.SendInfo(" BBox max: " + maxima, "regular");
	525	+ }
493	526
494	527	if (sel.bRep != null)
495	528	{
..	..	@@ -516,7 +549,7 @@
516	549	}
517	550	if (sel.support != null)
518	551	{
519		- si.SendInfo(" support: " + sel.support, "regular");
	552	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
520	553	}
521	554	if (sel.scriptnode != null)
522	555	{
..	..	@@ -587,6 +620,9 @@
587	620	{
588	621	CameraPane.pointflow = (PointFlow) sel;
589	622	}
	623	+
	624	+ si.SendInfo("_____________________", "regular");
	625	+ si.SendInfo("", "regular");
590	626	}
591	627	}
592	628
..	..	@@ -618,52 +654,52 @@
618	654	cameraView.ToggleFullScreen();
619	655	}
620	656
621		- private JTextArea createTextPane()
	657	+ private JTextPane createTextPane()
622	658	{
623		- String[] initString =
624		- {
625		- "This is an editable JTextPane, ", //regular
626		- "another ", //italic
627		- "styled ", //bold
628		- "text ", //small
629		- "component, ", //large
630		- "which supports embedded components..." + newline,//regular
631		- " " + newline, //button
632		- "...and embedded icons..." + newline, //regular
633		- " ", //icon
634		- newline + "JTextPane is a subclass of JEditorPane that "
635		- + "uses a StyledEditorKit and StyledDocument, and provides "
636		- + "cover methods for interacting with those objects."
637		- };
	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	+// }
638	701
639		- String[] initStyles =
640		- {
641		- "regular", "italic", "bold", "small", "large",
642		- "regular", "button", "regular", "icon",
643		- "regular"
644		- };
645		-
646		- JTextPane textPane = new JTextPane();
647		- textPane.setEditable(true);
648		- /StyledDocument/ doc = textPane.getStyledDocument();
649		- addStylesToDocument(doc);
650		-
651		- try
652		- {
653		- for (int j = 0; j < 2; j++)
654		- {
655		- for (int i = 0; i < initString.length; i++)
656		- {
657		- doc.insertString(doc.getLength(), initString[i],
658		- doc.getStyle(initStyles[i]));
659		- }
660		- }
661		- } catch (BadLocationException ble)
662		- {
663		- System.err.println("Couldn't insert initial text into text pane.");
664		- }
665		-
666		- return new JTextArea(); // textPane;
	702	+ return new JTextPane(); // textPane;
667	703	}
668	704
669	705	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -716,7 +752,7 @@
716	752	protected static ImageIcon createImageIcon(String path,
717	753	String description)
718	754	{
719		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	755	+ java.net.URL imgURL = Grafreed.class.getResource(path);
720	756	if (imgURL != null)
721	757	{
722	758	return new ImageIcon(imgURL, description);
..	..	@@ -763,115 +799,83 @@
763	799	JButton slowerButton;
764	800	JButton fasterButton;
765	801	JButton remarkButton;
	802	+
	803	+ cGridBag namePanel;
	804	+ cGridBag setupPanel;
	805	+ cGridBag commandsPanel;
	806	+ cGridBag pushPanel;
	807	+ cGridBag fillPanel;
766	808
767		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	809	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
768	810	{
769	811	JCheckBox cb;
770	812
771		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
772		- oe.aConstraints.gridwidth = 1; // 3;
773		-// oe.aConstraints.weightx = 1;
774		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
775		- 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);
776	814	cb.addItemListener(this);
777		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
778		- oe.aConstraints.gridwidth = 1;
779		- oe.aConstraints.gridx += 1;
780	815
781	816	return cb;
782	817	}
783	818
784		- cButton AddButton(ObjEditor oe, String label)
	819	+ cButton AddButton(cGridBag panel, String label)
785	820	{
786	821	cButton cb;
787	822
788		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
789		- oe.aConstraints.gridwidth = 1;
790		-// oe.aConstraints.weightx = 1;
791		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
792		- 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);
793	824	cb.addActionListener(this);
794		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
795		- oe.aConstraints.gridwidth = 1;
796		- oe.aConstraints.gridx += 1;
797	825
798	826	return cb;
799	827	}
800	828
801		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	829	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
802	830	{
803	831	JComboBox combo;
804	832
805		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
806		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
807		- oe.aConstraints.gridx += 1;
	833	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
808	834	combo.addActionListener(this);
809	835
810	836	return combo;
811	837	}
812	838
813		- 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)
814	840	{
815		- NumberSlider combo;
	841	+ cGridBag control = new cGridBag();
	842	+
	843	+ cNumberSlider combo;
816	844
817	845	JLabel jlabel = new JLabel(label);
818		-
819		- aConstraints.fill = GridBagConstraints.VERTICAL;
820	846	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
821		- aConstraints.gridwidth = 1;
822		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
823		- aConstraints.gridx += 1;
824		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
825		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
826		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
827		- aConstraints.gridx += 1;
828		- aConstraints.gridwidth = 1;
829		-
	847	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	848	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
830	849	combo.setFloat(current);
831		-
832		- combo.label = jlabel;
833		-
834		- combo.addChangeListener(this);
835		-
836		- return combo;
	850	+
	851	+ panel.add(control);
	852	+
	853	+ return control;
837	854	}
838	855
839		- 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)
840	857	{
841		- NumberSlider combo;
	858	+ cGridBag control = new cGridBag();
	859	+
	860	+ cNumberSlider combo;
842	861
843	862	JLabel jlabel = new JLabel(label);
844		-
845		- aConstraints.fill = GridBagConstraints.VERTICAL;
846	863	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
847		- aConstraints.gridwidth = 2;
848		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
849		- aConstraints.gridx += 1;
850		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
851		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
852		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
853		- aConstraints.gridx += 1;
854		- aConstraints.gridwidth = 1;
855		-
	864	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	865	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
856	866	combo.setInteger(current);
857	867
858		- combo.label = jlabel;
859		-
860		- combo.addChangeListener(this);
861		-
862		- return combo;
	868	+ panel.add(control);
	869	+
	870	+ return control;
863	871	}
864	872
865		- JTextArea AddText(JPanel ctrlPanel, String name)
	873	+ JTextArea AddText(cGridBag ctrlPanel, String name)
866	874	{
867	875	JTextArea text;
868	876
869		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
870		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
871		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	877	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
872	878	text.addCaretListener(this);
873		- aConstraints.gridx += 1;
874		- aConstraints.gridwidth = 1;
875	879
876	880	return text;
877	881	}
..	..	@@ -901,9 +905,16 @@
901	905	objEditor.ctrlPanel.remove(j);
902	906	}
903	907
	908	+ void Remove(cNumberSlider j)
	909	+ {
	910	+ j.removeChangeListener(this);
	911	+ //objEditor.ctrlPanel.remove(j.label);
	912	+ objEditor.ctrlPanel.remove(j);
	913	+ }
	914	+
904	915	/*
905	916	*/
906		- void Return() // ObjEditor oe)
	917	+ void Return0() // ObjEditor oe)
907	918	{
908	919	aConstraints.gridy += 1;
909	920	aConstraints.gridx = 0;
..	..	@@ -958,37 +969,70 @@
958	969
959	970	void SetupUI2(ObjEditor oe)
960	971	{
961		-// oe.aConstraints.weightx = 0;
962		-// oe.aConstraints.weighty = 0;
963		-// oe.aConstraints.gridx = 0;
964		-// oe.aConstraints.gridy = 0;
965		- 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();
966	981
967	982	if (!GroupEditor.allparams)
968	983	return;
969	984
970		- liveCB = AddCheckBox(oe, "Live", copy.live);
971		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
972		- 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");
973	991	// Return();
974		- markCB = AddCheckBox(oe, "Mark", copy.marked);
975		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
976		- randomCB = AddCheckBox(oe, "Rand", copy.random);
977		- Return();
978		- resetButton = AddButton(oe, "Reset");
979		- 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");
980	1018	// resetAllButton = AddButton(oe, "Reset All");
981	1019	// stepAllButton = AddButton(oe, "Step All");
982		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
983	1020	// Return();
984		- slowerButton = AddButton(oe, "Slow");
985		- fasterButton = AddButton(oe, "Fast");
986		- 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");
987	1027
988		- Return();
	1028	+ oe.ctrlPanel.add(commandsPanel);
	1029	+ oe.ctrlPanel.Return();
989	1030
990		- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
991		- Return();
	1031	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1032	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1033	+ //Return();
	1034	+
	1035	+ oe.ctrlPanel.Return();
992	1036
993	1037	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
994	1038	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1083,7 +1127,7 @@
1083	1127	oe.aConstraints.gridwidth = 1;
1084	1128	/**/
1085	1129	nameField = AddText(oe.ctrlPanel, copy.GetName());
1086		- Return();
	1130	+ oe.ctrlPanel.Return();
1087	1131
1088	1132	//ctrlPanel.add(textureButton = new Button("Texture..."));
1089	1133	//textureButton.setEnabled(false);
..	..	@@ -1185,10 +1229,18 @@
1185	1229	//JPanel worldPanel =
1186	1230	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1187	1231	//worldPanel.setName("World");
1188		- centralPanel = new JPanel(new BorderLayout());
	1232	+ centralPanel = new cGridBag();
	1233	+ centralPanel.preferredWidth = 20;
1189	1234	timelinePanel = new JPanel(new BorderLayout());
1190	1235	timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1191	1236
	1237	+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
	1238	+ cameraPanel.setContinuousLayout(true);
	1239	+ cameraPanel.setOneTouchExpandable(true);
	1240	+// cameraPanel.setDividerLocation(0.9);
	1241	+// cameraPanel.setDividerSize(9);
	1242	+ cameraPanel.setResizeWeight(1.0);
	1243	+
1192	1244	centralPanel.add(cameraView);
1193	1245	//frame.setJMenuBar(timelineMenubar);
1194	1246	//centralPanel.add(timelinePanel);
..	..	@@ -1208,12 +1260,13 @@
1208	1260	//frontView.object = copy;
1209	1261	//sideView.object = copy;
1210	1262
1211		- XYZPanel = new JPanel();
1212		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1263	+ XYZPanel = new cGridBag().setVertical(true);
	1264	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1213	1265
1214		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1215		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1216		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1266	+ XYZPanel.preferredWidth = 5;
	1267	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1268	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1269	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1217	1270
1218	1271	/*
1219	1272	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1251,10 +1304,11 @@
1251	1304	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1252	1305	//tmp.setName("Edit");
1253	1306	objectPanel.add(materialPanel);
1254		- JPanel north = new JPanel(new BorderLayout());
1255		- north.setName("Edit");
1256		- north.add(ctrlPanel, BorderLayout.NORTH);
1257		- 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);
1258	1312	objectPanel.add(infoPanel);
1259	1313
1260	1314	/*
..	..	@@ -1275,16 +1329,23 @@
1275	1329	scrollpane.setWheelScrollingEnabled(true);
1276	1330	scrollpane.addMouseWheelListener(this); // Default not fast enough
1277	1331
1278		- /JTabbedPane/ scenePanel = new JTabbedPane();
1279		- scenePanel.add(scrollpane);
	1332	+ /JTabbedPane/ scenePanel = new cGridBag();
	1333	+ scenePanel.preferredWidth = 6;
	1334	+
	1335	+ JTabbedPane tabbedPane = new JTabbedPane();
	1336	+ tabbedPane.add(scrollpane);
1280	1337
1281		- scenePanel.add(FSPane = new cFileSystemPane(this));
	1338	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1282	1339
1283		- optionsPanel = new JPanel(new GridBagLayout());
	1340	+ optionsPanel = new cGridBag().setVertical(true);
1284	1341
1285	1342	optionsPanel.setName("Options");
1286		- scenePanel.add(optionsPanel);
1287		-
	1343	+
	1344	+ AddOptions(optionsPanel); //, aConstraints);
	1345	+
	1346	+ tabbedPane.add(optionsPanel);
	1347	+
	1348	+ scenePanel.add(tabbedPane);
1288	1349
1289	1350	/*
1290	1351	cTree jTree = new cTree(null);
..	..	@@ -1318,6 +1379,7 @@
1318	1379	//bigPanel.setSize(new Dimension(10,10));
1319	1380	//bigPanel.add(ctrlPanel);
1320	1381	//bigPanel.add(gridPanel);
	1382	+ /**
1321	1383	bigThree = new JPanel();
1322	1384	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1323	1385	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1341,7 +1403,13 @@
1341	1403	// aConstraints.gridheight = 3;
1342	1404	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1343	1405	bigThree.add(XYZPanel, aWindowConstraints);
	1406	+ /**/
1344	1407
	1408	+ bigThree = new cGridBag();
	1409	+ bigThree.addComponent(scenePanel);
	1410	+ bigThree.addComponent(centralPanel);
	1411	+ bigThree.addComponent(XYZPanel);
	1412	+
1345	1413	// // SIDE EFFECT!!!
1346	1414	// aConstraints.gridx = 0;
1347	1415	// aConstraints.gridy = 0;
..	..	@@ -1362,13 +1430,14 @@
1362	1430	//worldPane.add(bigPanel);
1363	1431	//worldPane.add(worldPanel);
1364	1432	/**/
1365		- frame.getContentPane().add(/"Center",/framePanel);
	1433	+ //frame.getContentPane().add(/"Center",/framePanel);
	1434	+ frame.add(/"Center",/framePanel);
1366	1435	//frame.getContentPane().add(/"Center",/ worldPane);
1367	1436
1368	1437	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1369	1438
1370		- frame.setSize(1024, 768);
1371		- frame.show();
	1439	+ frame.setSize(1280, 860);
	1440	+ frame.setVisible(true);
1372	1441
1373	1442	gridPanel.setDividerLocation(1.0);
1374	1443
..	..	@@ -1383,6 +1452,10 @@
1383	1452	});
1384	1453	}
1385	1454
	1455	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1456	+ {
	1457	+ }
	1458	+
1386	1459	JTree GetTree()
1387	1460	{
1388	1461	return objEditor.jTree;
..	..	@@ -1394,260 +1467,173 @@
1394	1467	ctrlPanel.removeAll();
1395	1468	}
1396	1469
1397		- void SetupMaterial(JPanel ctrlPanel)
	1470	+ void SetupMaterial(cGridBag panel)
1398	1471	{
1399		- aConstraints.weighty = 0;
1400		- //aConstraints.weightx = 1;
1401		- /*
	1472	+ /*
1402	1473	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1403	1474	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1404		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1405		- aConstraints.gridx += 1;
1406	1475	*/
1407	1476
1408		- aConstraints.gridwidth = 1;
1409		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1410		- aConstraints.gridx += 1;
1411		- aConstraints.weighty = 0;
1412		- 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");
1413	1481
1414	1482	/*
1415	1483	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1416		- aConstraints.gridx += 1;
1417		- aConstraints.weighty = 0;
1418		- aConstraints.gridwidth = 1;
1419	1484	*/
1420	1485
1421		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1422		- 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	+ }
1423	1495
1424		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1425		-
1426		- aConstraints.gridx += 1;
1427		-
1428		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1429		-
1430		- aConstraints.gridx += 1;
1431		-
1432		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1433		-
1434		- aConstraints.gridx = 0;
1435		- aConstraints.gridy += 1;
1436		- aConstraints.weighty = 0;
1437		- aConstraints.gridwidth = 1;
	1496	+ editBar.preferredHeight = 15;
	1497	+
	1498	+ panel.add(editBar);
	1499	+
1438	1500	/**/
1439	1501	//aConstraints.weighty = 0;
1440	1502	////aConstraints.weightx = 1;
1441	1503	//aConstraints.weighty = 1;
1442	1504	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1443	1505	//aConstraints.gridx += 1;
1444		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1445		- aConstraints.weighty = 0;
1446		- aConstraints.gridx = 0;
1447		- aConstraints.gridy += 1;
1448		- aConstraints.gridwidth = 1;
	1506	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1449	1507
1450		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1451		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1452		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1453		- aConstraints.gridx += 1;
1454		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1455		- //aConstraints.weightx = 0;
1456		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1457		- aConstraints.gridx = 0;
1458		- aConstraints.gridy += 1;
1459		- 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);
1460	1516
1461		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1462		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1463		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1464		- aConstraints.gridx += 1;
1465		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1466		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1467		- aConstraints.gridx = 0;
1468		- aConstraints.gridy += 1;
1469		- 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);
1470	1522
1471		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1472		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1473		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1474		- aConstraints.gridx += 1;
1475		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1476		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1477		- aConstraints.gridx = 0;
1478		- aConstraints.gridy += 1;
1479		- 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);
1480	1528
1481		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1482		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1483		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1484		- aConstraints.gridx += 1;
1485		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1486		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1487		- aConstraints.gridx = 0;
1488		- aConstraints.gridy += 1;
1489		- 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);
1490	1534
1491		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1492		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1493		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1494		- aConstraints.gridx += 1;
1495		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1496		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1497		- aConstraints.gridx = 0;
1498		- aConstraints.gridy += 1;
1499		- 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);
1500	1540
1501		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1502		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1503		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1504		- aConstraints.gridx += 1;
1505		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1506		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1507		- aConstraints.gridx = 0;
1508		- aConstraints.gridy += 1;
1509		- 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);
1510	1546
1511		- //aConstraints.weighty = 1;
1512		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1513		- //aConstraints.gridx += 1;
1514		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1515		- aConstraints.weighty = 0;
1516		- aConstraints.gridx = 0;
1517		- aConstraints.gridy += 1;
1518		- 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);
1519	1560
1520		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1521		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1522		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1523		- aConstraints.gridx += 1;
1524		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1525		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1526		- aConstraints.gridx = 0;
1527		- aConstraints.gridy += 1;
1528		- 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);
1529	1566
1530		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1531		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1532		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1533		- aConstraints.gridx += 1;
1534		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1535		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1536		- aConstraints.gridx = 0;
1537		- aConstraints.gridy += 1;
1538		- 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);
1539	1572
1540		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1541		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1542		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1543		- aConstraints.gridx += 1;
1544		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1545		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1546		- aConstraints.gridx = 0;
1547		- aConstraints.gridy += 1;
1548		- 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);
1549	1578
1550		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1551		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1552		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1553		- aConstraints.gridx += 1;
1554		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1555		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1556		- aConstraints.gridx = 0;
1557		- aConstraints.gridy += 1;
1558		- 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);
1559	1584
1560		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1561		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1562		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1563		- aConstraints.gridx += 1;
1564		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1565		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1566		- aConstraints.gridx = 0;
1567		- aConstraints.gridy += 1;
1568		- 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);
1569	1590
1570		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1571		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1572		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1573		- aConstraints.gridx += 1;
1574		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1575		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1576		- aConstraints.gridx = 0;
1577		- aConstraints.gridy += 1;
1578		- 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);
1579	1596
1580		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1581		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1582		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1583		- aConstraints.gridx += 1;
1584		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1585		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1586		- aConstraints.gridx = 0;
1587		- aConstraints.gridy += 1;
1588		- 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);
1589	1604
1590		- //aConstraints.weighty = 1;
1591		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1592		- //aConstraints.gridx += 1;
1593		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1594		- aConstraints.weighty = 0;
1595		- aConstraints.gridx = 0;
1596		- aConstraints.gridy += 1;
1597		- 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);
1598	1610
1599		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1600		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1601		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1602		- aConstraints.gridx += 1;
1603		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1604		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1605		- aConstraints.gridx = 0;
1606		- aConstraints.gridy += 1;
1607		- 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);
1608	1616
1609		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1610		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1611		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1612		- aConstraints.gridx += 1;
1613		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1614		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1615		- aConstraints.gridx = 0;
1616		- aConstraints.gridy += 1;
1617		- 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);
1618	1622
1619		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1620		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1621		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1622		- aConstraints.gridx += 1;
1623		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1624		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1625		- aConstraints.gridx = 0;
1626		- aConstraints.gridy += 1;
1627		- 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);
1628	1628
1629		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1630		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1631		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1632		- aConstraints.gridx += 1;
1633		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1634		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1635		- aConstraints.gridx = 0;
1636		- aConstraints.gridy += 1;
1637		- 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);
1638	1634
1639		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1640		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1641		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1642		- aConstraints.gridx += 1;
1643		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1644		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1645		- aConstraints.gridx = 0;
1646		- aConstraints.gridy += 1;
1647		- aConstraints.gridwidth = 1;
1648		-
1649		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1650		- Return();
	1635	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1636	+ //Return();
1651	1637	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1652	1638	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1653	1639	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1658,130 +1644,93 @@
1658	1644	// aConstraints.gridy += 1;
1659	1645	// aConstraints.gridwidth = 1;
1660	1646
1661		- //aConstraints.weighty = 1;
1662		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1663		- //aConstraints.gridx += 1;
1664		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1665		- aConstraints.weighty = 0;
1666		- aConstraints.gridx = 0;
1667		- aConstraints.gridy += 1;
1668		- aConstraints.gridwidth = 1;
1669	1647
1670		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1671		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1672		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1673		- aConstraints.gridx += 1;
1674		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1675		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1676		- aConstraints.gridx = 0;
1677		- aConstraints.gridy += 1;
1678		- 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);
1679	1655
1680		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1681		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1682		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1683		- aConstraints.gridx += 1;
1684		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1685		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1686		- aConstraints.gridx = 0;
1687		- aConstraints.gridy += 1;
1688		- 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);
1689	1661
1690		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1691		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1692		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1693		- aConstraints.gridx += 1;
1694		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1695		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1696		- aConstraints.gridx = 0;
1697		- aConstraints.gridy += 1;
1698		- 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);
1699	1667
1700		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1701		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1702		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1703		- aConstraints.gridx += 1;
1704		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1705		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1706		- aConstraints.gridx = 0;
1707		- aConstraints.gridy += 1;
1708		- aConstraints.gridwidth = 1;
1709		- 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);
1710	1673
1711		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1712		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1713		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1714		- aConstraints.gridx += 1;
1715		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1716		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1717		- aConstraints.gridx = 0;
1718		- aConstraints.gridy += 1;
1719		- 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);
1720	1679
1721		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1722		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1723		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1724		- aConstraints.gridx += 1;
1725		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1726		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1727		- aConstraints.gridx = 0;
1728		- aConstraints.gridy += 1;
1729		- 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);
1730	1687
1731		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1732		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1733		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1734		- aConstraints.gridx += 1;
1735		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1736		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1737		- aConstraints.gridx = 0;
1738		- aConstraints.gridy += 1;
1739		- 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);
1740	1693
1741		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1742		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1743		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1744		- aConstraints.gridx += 1;
1745		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1746		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1747		- aConstraints.gridx = 0;
1748		- aConstraints.gridy += 1;
1749		- 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);
1750	1699
1751		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1752		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1753		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1754		- aConstraints.gridx += 1;
1755		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1756		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1757		- aConstraints.gridx = 0;
1758		- aConstraints.gridy += 1;
1759		- 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);
1760	1705
1761		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1762		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1763		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1764		- aConstraints.gridx += 1;
1765		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1766		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1767		- aConstraints.gridx = 0;
1768		- aConstraints.gridy += 1;
1769		- 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);
1770	1711
1771		- //aConstraints.weighty = 1;
1772		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1773		- //aConstraints.gridx += 1;
1774		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1775		- 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);
1776	1717
1777		- aConstraints.gridx = 0;
1778		- aConstraints.gridy = 0;
1779		- 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);
1780	1729
1781	1730	SetMaterial(copy); // .GetMaterial());
1782	1731
1783		- colorField.addChangeListener(this);
1784		- modulationField.addChangeListener(this);
	1732	+ //colorField.addChangeListener(this);
	1733	+// modulationField.addChangeListener(this);
1785	1734	metalnessField.addChangeListener(this);
1786	1735	diffuseField.addChangeListener(this);
1787	1736	specularField.addChangeListener(this);
..	..	@@ -1811,12 +1760,15 @@
1811	1760	opacityPowerField.addChangeListener(this);
1812	1761	/**/
1813	1762
1814		- resetSlidersButton.addActionListener(this);
1815	1763	clearMaterialButton.addActionListener(this);
1816	1764	createMaterialButton.addActionListener(this);
1817		-
1818		- propagateToggle.addItemListener(this);
1819		- multiplyToggle.addItemListener(this);
	1765	+
	1766	+ if (Globals.ADVANCED)
	1767	+ {
	1768	+ resetSlidersButton.addActionListener(this);
	1769	+ propagateToggle.addItemListener(this);
	1770	+ multiplyToggle.addItemListener(this);
	1771	+ }
1820	1772	}
1821	1773
1822	1774	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1987,7 +1939,7 @@
1987	1939
1988	1940	//? flashIt = false;
1989	1941	CameraPane pane = (CameraPane) cameraView;
1990		- pane.clickStart(location.x, location.y, 0);
	1942	+ pane.clickStart(location.x, location.y, 0, 0);
1991	1943	pane.clickEnd(location.x, location.y, 0, true);
1992	1944
1993	1945	if (group.selection.size() == 1)
..	..	@@ -2444,11 +2396,11 @@
2444	2396
2445	2397	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2446	2398	{
2447		- if (GrafreeD.standAlone)
	2399	+ if (Grafreed.standAlone)
2448	2400	{
2449	2401	/**/
2450	2402	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2451		- browser.show();
	2403	+ browser.setVisible(true);
2452	2404	String filename = browser.getFile();
2453	2405	if (filename != null && filename.length() > 0)
2454	2406	{
..	..	@@ -2593,6 +2545,7 @@
2593	2545	}
2594	2546	if (input == null)
2595	2547	{
	2548	+ new Exception().printStackTrace();
2596	2549	System.exit(0);
2597	2550	}
2598	2551
..	..	@@ -2807,7 +2760,8 @@
2807	2760	return;
2808	2761	}
2809	2762
2810		- multiplyToggle.setSelected(mat.multiply);
	2763	+ if (multiplyToggle != null)
	2764	+ multiplyToggle.setSelected(mat.multiply);
2811	2765
2812	2766	assert (object.projectedVertices != null);
2813	2767
..	..	@@ -2996,7 +2950,8 @@
2996	2950	if (timeline)
2997	2951	{
2998	2952	centralPanel.remove(cameraView);
2999		- centralPanel.add(timelinePanel);
	2953	+ cameraPanel.add(cameraView);
	2954	+ centralPanel.add(cameraPanel);
3000	2955	frame.setJMenuBar(timelineMenubar);
3001	2956	wasFullScreen = CameraPane.FULLSCREEN;
3002	2957	if (!CameraPane.FULLSCREEN)
..	..	@@ -3005,7 +2960,7 @@
3005	2960	}
3006	2961	else
3007	2962	{
3008		- centralPanel.remove(timelinePanel);
	2963	+ centralPanel.remove(cameraPanel);
3009	2964	centralPanel.add(cameraView);
3010	2965	frame.setJMenuBar(null);
3011	2966	if (!wasFullScreen)
..	..	@@ -3021,7 +2976,7 @@
3021	2976	frame.validate();
3022	2977
3023	2978	return;
3024		- } else if (event.getSource() == toggleRandomItem)
	2979	+ } else if (event.getSource() == toggleSwitchItem)
3025	2980	{
3026	2981	cameraView.ToggleRandom();
3027	2982	cameraView.repaint();
..	..	@@ -3066,6 +3021,7 @@
3066	3021	if (event.getSource() == randomCB)
3067	3022	{
3068	3023	copy.random ^= true;
	3024	+ objEditor.refreshContents();
3069	3025	return;
3070	3026	}
3071	3027	if (event.getSource() == speedupCB)
..	..	@@ -3128,7 +3084,8 @@
3128	3084	objEditor.refreshContents();
3129	3085	} else if (event.getSource() == stepItem)
3130	3086	{
3131		- cameraView.ONESTEP = true;
	3087	+ //cameraView.ONESTEP = true;
	3088	+ Globals.ONESTEP = true;
3132	3089	cameraView.repaint();
3133	3090	return;
3134	3091	} else if (event.getSource() == stepButton)
..	..	@@ -3285,25 +3242,25 @@
3285	3242
3286	3243	void ToggleAnimation()
3287	3244	{
3288		- if (!CameraPane.ANIMATION)
	3245	+ if (!Globals.ANIMATION)
3289	3246	{
3290	3247	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3291		- browser.show();
	3248	+ browser.setVisible(true);
3292	3249	String filename = browser.getFile();
3293	3250	if (filename != null && filename.length() > 0)
3294	3251	{
3295		- CameraPane.filename = browser.getDirectory() + filename;
	3252	+ Globals.filename = browser.getDirectory() + filename;
3296	3253	//CameraPane.framecount = 0;
3297		- CameraPane.imagecount = 0;
	3254	+ Globals.imagecount = 0;
3298	3255
3299		- CameraPane.ANIMATION ^= true;
	3256	+ Globals.ANIMATION ^= true;
3300	3257
3301		- GrafreeD.wav.cursor = 0;
3302		- GrafreeD.wav.loop = 0;
	3258	+ Grafreed.wav.cursor = 0;
	3259	+ Grafreed.wav.loop = 0;
3303	3260	}
3304	3261	} else
3305	3262	{
3306		- CameraPane.ANIMATION ^= true;
	3263	+ Globals.ANIMATION ^= true;
3307	3264	}
3308	3265	}
3309	3266
..	..	@@ -3349,7 +3306,7 @@
3349	3306	void CreateMaterial()
3350	3307	{
3351	3308	//copy.ClearMaterial(); // PATCH
3352		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3309	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3353	3310	if (copy.selection.size() > 0)
3354	3311	//SetMaterial(copy);
3355	3312	{
..	..	@@ -3408,11 +3365,11 @@
3408	3365	{
3409	3366	copy.ResetBlockLoop(); // temporary problem
3410	3367
3411		- boolean random = CameraPane.RANDOM;
3412		- CameraPane.RANDOM = false; // parse everything
	3368	+ boolean random = CameraPane.SWITCH;
	3369	+ CameraPane.SWITCH = false; // parse everything
3413	3370	copy.ResetDisplayList();
3414	3371	copy.HardTouch();
3415		- CameraPane.RANDOM = random;
	3372	+ CameraPane.SWITCH = random;
3416	3373	}
3417	3374
3418	3375	// public void applySelf()
..	..	@@ -3482,10 +3439,40 @@
3482	3439	current.fakedepth = (float) fakedepthField.getFloat();
3483	3440	current.shadowbias = (float) shadowbiasField.getFloat();
3484	3441
3485		- if (!NumberSlider.frozen)
	3442	+ if (!cNumberSlider.frozen)
3486	3443	{
3487	3444	//System.out.println("Propagate = " + propagate);
3488	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	+
3489	3476	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3490	3477	{
3491	3478	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3530,6 +3517,7 @@
3530	3517	\|\| e.getSource() == apertureField
3531	3518	\|\| e.getSource() == shadowblurField)
3532	3519	{
	3520	+ new Exception().printStackTrace();
3533	3521	System.exit(0);
3534	3522	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3535	3523	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3855,7 +3843,7 @@
3855	3843
3856	3844	radioPanel.revalidate();
3857	3845	radioPanel.repaint();
3858		- ctrlPanel.revalidate(); // ? new
	3846	+ ctrlPanel.validate(); // ? new
3859	3847	ctrlPanel.repaint();
3860	3848	}
3861	3849	}
..	..	@@ -4212,7 +4200,7 @@
4212	4200
4213	4201	void load() // throws ClassNotFoundException
4214	4202	{
4215		- if (GrafreeD.standAlone)
	4203	+ if (Grafreed.standAlone)
4216	4204	{
4217	4205	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4218	4206	browser.show();
..	..	@@ -4317,7 +4305,7 @@
4317	4305
4318	4306	void saveAs()
4319	4307	{
4320		- if (GrafreeD.standAlone)
	4308	+ if (Grafreed.standAlone)
4321	4309	{
4322	4310	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4323	4311	browser.setVisible(true);
..	..	@@ -4428,7 +4416,7 @@
4428	4416	Object3D objectparent = obj.parent;
4429	4417	obj.parent = null;
4430	4418
4431		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4419	+ Object3D object = (Object3D) Grafreed.clone(obj);
4432	4420
4433	4421	obj.parent = objectparent;
4434	4422
..	..	@@ -4462,7 +4450,7 @@
4462	4450	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4463	4451	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4464	4452	copy.generatePOV(buffer);
4465		- if (GrafreeD.standAlone)
	4453	+ if (Grafreed.standAlone)
4466	4454	{
4467	4455	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4468	4456	browser.show();
..	..	@@ -4501,8 +4489,8 @@
4501	4489	//MenuItem normalLensItem;
4502	4490	MenuItem editCameraItem;
4503	4491	MenuItem revertCameraItem;
4504		- CheckboxMenuItem toggleLiveItem;
4505	4492	MenuItem stepItem;
	4493	+ CheckboxMenuItem toggleLiveItem;
4506	4494	CheckboxMenuItem toggleFullScreenItem;
4507	4495	CheckboxMenuItem toggleTimelineItem;
4508	4496	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4511,7 +4499,7 @@
4511	4499	CheckboxMenuItem toggleFootContactItem;
4512	4500	CheckboxMenuItem toggleDLItem;
4513	4501	CheckboxMenuItem toggleTextureItem;
4514		- CheckboxMenuItem toggleRandomItem;
	4502	+ CheckboxMenuItem toggleSwitchItem;
4515	4503	CheckboxMenuItem toggleRootItem;
4516	4504	CheckboxMenuItem animationItem;
4517	4505	CheckboxMenuItem toggleHandleItem;
..	..	@@ -4519,20 +4507,21 @@
4519	4507	JSplitPane mainPanel;
4520	4508	JScrollPane scrollpane;
4521	4509	JPanel toolbarPanel;
4522		- JPanel treePanel;
	4510	+ cGridBag treePanel;
4523	4511	JPanel radioPanel;
4524	4512	ButtonGroup buttonGroup;
4525		- JPanel ctrlPanel;
4526		- JPanel materialPanel;
	4513	+ cGridBag ctrlPanel;
	4514	+ cGridBag materialPanel;
4527	4515	JScrollPane infoPanel;
4528		- JPanel optionsPanel;
	4516	+ cGridBag optionsPanel;
4529	4517	JTabbedPane objectPanel;
4530		- JPanel XYZPanel;
	4518	+ cGridBag XYZPanel;
4531	4519	JSplitPane gridPanel;
4532	4520	JSplitPane bigPanel;
4533		- JPanel bigThree;
4534		- JTabbedPane scenePanel;
4535		- JPanel centralPanel;
	4521	+ cGridBag bigThree;
	4522	+ cGridBag scenePanel;
	4523	+ cGridBag centralPanel;
	4524	+ JSplitPane cameraPanel;
4536	4525	JPanel timelinePanel;
4537	4526	JMenuBar timelineMenubar;
4538	4527	JSplitPane framePanel;
..	..	@@ -4584,67 +4573,67 @@
4584	4573	// MATERIAL
4585	4574	JLabel materialLabel;
4586	4575	JLabel colorLabel;
4587		- NumberSlider colorField;
	4576	+ cNumberSlider colorField;
4588	4577	JLabel modulationLabel;
4589		- NumberSlider modulationField;
	4578	+ cNumberSlider modulationField;
4590	4579	JLabel metalnessLabel;
4591		- NumberSlider metalnessField;
	4580	+ cNumberSlider metalnessField;
4592	4581	JLabel diffuseLabel;
4593		- NumberSlider diffuseField;
	4582	+ cNumberSlider diffuseField;
4594	4583	JLabel specularLabel;
4595		- NumberSlider specularField;
	4584	+ cNumberSlider specularField;
4596	4585	JLabel shininessLabel;
4597		- NumberSlider shininessField;
	4586	+ cNumberSlider shininessField;
4598	4587	JLabel shiftLabel;
4599		- NumberSlider shiftField;
	4588	+ cNumberSlider shiftField;
4600	4589	JLabel ambientLabel;
4601		- NumberSlider ambientField;
	4590	+ cNumberSlider ambientField;
4602	4591	JLabel lightareaLabel;
4603		- NumberSlider lightareaField;
	4592	+ cNumberSlider lightareaField;
4604	4593	JLabel diffusenessLabel;
4605		- NumberSlider diffusenessField;
	4594	+ cNumberSlider diffusenessField;
4606	4595	JLabel velvetLabel;
4607		- NumberSlider velvetField;
	4596	+ cNumberSlider velvetField;
4608	4597	JLabel sheenLabel;
4609		- NumberSlider sheenField;
	4598	+ cNumberSlider sheenField;
4610	4599	JLabel subsurfaceLabel;
4611		- NumberSlider subsurfaceField;
	4600	+ cNumberSlider subsurfaceField;
4612	4601	//JLabel bumpLabel;
4613	4602	//NumberSlider bumpField;
4614	4603	JLabel backlitLabel;
4615		- NumberSlider backlitField;
	4604	+ cNumberSlider backlitField;
4616	4605	JLabel anisoLabel;
4617		- NumberSlider anisoField;
	4606	+ cNumberSlider anisoField;
4618	4607	JLabel anisoVLabel;
4619		- NumberSlider anisoVField;
	4608	+ cNumberSlider anisoVField;
4620	4609	JLabel cameraLabel;
4621		- NumberSlider cameraField;
	4610	+ cNumberSlider cameraField;
4622	4611	JLabel selfshadowLabel;
4623		- NumberSlider selfshadowField;
	4612	+ cNumberSlider selfshadowField;
4624	4613	JLabel shadowLabel;
4625		- NumberSlider shadowField;
	4614	+ cNumberSlider shadowField;
4626	4615	JLabel textureLabel;
4627		- NumberSlider textureField;
	4616	+ cNumberSlider textureField;
4628	4617	JLabel opacityLabel;
4629		- NumberSlider opacityField;
	4618	+ cNumberSlider opacityField;
4630	4619	JLabel fakedepthLabel;
4631		- NumberSlider fakedepthField;
	4620	+ cNumberSlider fakedepthField;
4632	4621	JLabel shadowbiasLabel;
4633		- NumberSlider shadowbiasField;
	4622	+ cNumberSlider shadowbiasField;
4634	4623	JLabel bumpLabel;
4635		- NumberSlider bumpField;
	4624	+ cNumberSlider bumpField;
4636	4625	JLabel noiseLabel;
4637		- NumberSlider noiseField;
	4626	+ cNumberSlider noiseField;
4638	4627	JLabel powerLabel;
4639		- NumberSlider powerField;
	4628	+ cNumberSlider powerField;
4640	4629	JLabel borderfadeLabel;
4641		- NumberSlider borderfadeField;
	4630	+ cNumberSlider borderfadeField;
4642	4631	JLabel fogLabel;
4643		- NumberSlider fogField;
	4632	+ cNumberSlider fogField;
4644	4633	JLabel opacityPowerLabel;
4645		- NumberSlider opacityPowerField;
	4634	+ cNumberSlider opacityPowerField;
4646	4635	JTree jTree;
4647	4636	//ObjectUI parent;
4648	4637
4649		- NumberSlider normalpushField;
	4638	+ cNumberSlider normalpushField;
4650	4639	}