~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -19,6 +19,8 @@
19	19	import //weka.core.
20	20	matrix.Matrix;
21	21
	22	+import grafeme.ui.*;
	23	+
22	24	class ObjEditor /extends JFrame/ implements iCallBack, ObjectUI,
23	25	ActionListener, ChangeListener,
24	26	InputMethodListener,
..	..	@@ -28,7 +30,12 @@
28	30	iSendInfo
29	31	//KeyListener
30	32	{
	33	+ boolean timeline;
	34	+ boolean wasFullScreen;
31	35
	36	+ GroupEditor callee;
	37	+ JFrame frame;
	38	+
32	39	// SCRIPT
33	40
34	41	transient JFrame textpanel = null;
..	..	@@ -119,51 +126,61 @@
119	126	void keyPressed(int key, int modifiers)
120	127	{
121	128	System.out.println("KEY PRESSED");
122		- CameraPane.theRenderer.keyPressed(key, modifiers);
	129	+ Globals.theRenderer.keyPressed(key, modifiers);
123	130	}
124	131	*/
125	132
126	133	static GridBagConstraints aConstraints;
127	134	static GridBagConstraints aWindowConstraints;
128		- GroupEditor callee;
129		- JFrame frame;
	135	+
130	136	static int GRIDWIDTH = 100; // 4;
131	137
132	138	public void closeUI()
133	139	{
134	140	//new Exception().printStackTrace();
135		- System.out.println("this = " + this);
136		- System.out.println("objEditor = " + objEditor);
	141	+// System.out.println("this = " + this);
	142	+// System.out.println("objEditor = " + objEditor);
137	143	//nameField.removeActionListener(this);
138		- objEditor.ctrlPanel.remove(nameField);
	144	+// objEditor.ctrlPanel.remove(nameField);
	145	+
	146	+ objEditor.ctrlPanel.remove(namePanel);
139	147
140	148	if (!GroupEditor.allparams)
141	149	return;
142	150
143		- objEditor.ctrlPanel.remove(liveCB);
144		- objEditor.ctrlPanel.remove(hideCB);
145		- objEditor.ctrlPanel.remove(markCB);
146		-
147		- objEditor.ctrlPanel.remove(randomCB);
148		- objEditor.ctrlPanel.remove(speedupCB);
149		- objEditor.ctrlPanel.remove(rewindCB);
150		-
151		- objEditor.ctrlPanel.remove(resetButton);
152		- objEditor.ctrlPanel.remove(stepButton);
153		-// objEditor.ctrlPanel.remove(stepAllButton);
154		-// objEditor.ctrlPanel.remove(resetAllButton);
155		- objEditor.ctrlPanel.remove(link2masterCB);
156		- //objEditor.ctrlPanel.remove(flipVCB);
157		- //objEditor.ctrlPanel.remove(texresMenu);
158		- objEditor.ctrlPanel.remove(slowerButton);
159		- objEditor.ctrlPanel.remove(fasterButton);
160		- objEditor.ctrlPanel.remove(remarkButton);
	151	+// objEditor.ctrlPanel.remove(liveCB);
	152	+// objEditor.ctrlPanel.remove(hideCB);
	153	+// objEditor.ctrlPanel.remove(markCB);
	154	+//
	155	+// objEditor.ctrlPanel.remove(randomCB);
	156	+// objEditor.ctrlPanel.remove(speedupCB);
	157	+// objEditor.ctrlPanel.remove(rewindCB);
	158	+//
	159	+// objEditor.ctrlPanel.remove(resetButton);
	160	+// objEditor.ctrlPanel.remove(stepButton);
	161	+//// objEditor.ctrlPanel.remove(stepAllButton);
	162	+//// objEditor.ctrlPanel.remove(resetAllButton);
	163	+// objEditor.ctrlPanel.remove(link2masterCB);
	164	+// //objEditor.ctrlPanel.remove(flipVCB);
	165	+// //objEditor.ctrlPanel.remove(texresMenu);
	166	+// objEditor.ctrlPanel.remove(slowerButton);
	167	+// objEditor.ctrlPanel.remove(fasterButton);
	168	+// objEditor.ctrlPanel.remove(remarkButton);
	169	+
	170	+ objEditor.ctrlPanel.remove(setupPanel);
	171	+ objEditor.ctrlPanel.remove(commandsPanel);
	172	+ objEditor.ctrlPanel.remove(pushPanel);
	173	+ //objEditor.ctrlPanel.remove(fillPanel);
	174	+
	175	+ //Remove(normalpushField);
161	176	}
162	177
163	178	public ObjEditor GetEditor()
164	179	{
165	180	return objEditor; //.GetEditor();
166	181	}
	182	+
	183	+ // Sometimes myself, sometimes my callee's.
167	184	ObjEditor objEditor;
168	185
169	186	/*
..	..	@@ -238,7 +255,7 @@
238	255	//if (!isDisplayable())
239	256	//setUndecorated(true);
240	257
241		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	258	+ //System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
242	259	client = inClient;
243	260	copy = localCopy;
244	261	copy.editWindow = this;
..	..	@@ -292,42 +309,61 @@
292	309	//normalLensItem.addActionListener(this);
293	310	cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
294	311	revertCameraItem.addActionListener(this);
295		- cameraMenu.add(toggleFullItem = new CheckboxMenuItem("Full Screen"));
296		- toggleFullItem.addItemListener(this);
297		- toggleFullItem.setState(CameraPane.FULLSCREEN);
	312	+
	313	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	314	+ toggleFullScreenItem.addItemListener(this);
	315	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
298	316	cameraMenu.add("-");
	317	+
299	318	cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
300	319	toggleTextureItem.addItemListener(this);
301	320	toggleTextureItem.setState(CameraPane.textureon);
302		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
303		- toggleLiveItem.addItemListener(this);
304		- toggleLiveItem.setState(CameraPane.isLIVE());
305		- cameraMenu.add(stepItem = new MenuItem("Step"));
306		- stepItem.addActionListener(this);
307		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
308		-// toggleDLItem.addItemListener(this);
309		-// toggleDLItem.setState(false);
310		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
311		- toggleRenderItem.addItemListener(this);
312		- toggleRenderItem.setState(!CameraPane.frozen);
313		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
314		- toggleDebugItem.addItemListener(this);
315		- toggleDebugItem.setState(CameraPane.DEBUG);
316		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
317		- toggleFrustumItem.addItemListener(this);
318		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
319		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
320		- toggleFootContactItem.addItemListener(this);
321		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
322		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
323		- toggleRandomItem.addItemListener(this);
324		- toggleRandomItem.setState(CameraPane.RANDOM);
	321	+
	322	+ cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	323	+ toggleSwitchItem.addItemListener(this);
	324	+ toggleSwitchItem.setState(CameraPane.SWITCH);
	325	+
325	326	cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
326	327	toggleHandleItem.addItemListener(this);
327	328	toggleHandleItem.setState(CameraPane.HANDLES);
	329	+
328	330	cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
329	331	togglePaintItem.addItemListener(this);
330	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	+
331	367	// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
332	368	// toggleRootItem.addItemListener(this);
333	369	// toggleRootItem.setState(false);
..	..	@@ -341,21 +377,23 @@
341	377	objectPanel = new JTabbedPane();
342	378	toolbarPanel = new JPanel();
343	379	toolbarPanel.setName("Toolbar");
344		- treePanel = new JPanel();
	380	+ treePanel = new cGridBag();
345	381	treePanel.setName("Tree");
346		- ctrlPanel = new JPanel(); // new GridBagLayout());
	382	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
347	383	ctrlPanel.setName("Edit");
348		- materialPanel = new JPanel();
	384	+ materialPanel = new cGridBag().setVertical(true);
349	385	materialPanel.setName("Material");
350	386	/JTextPane/
351	387	infoarea = createTextPane();
	388	+ doc = infoarea.getStyledDocument();
	389	+
352	390	infoarea.setEditable(true);
353	391	SetText();
354	392	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
355	393	// infoarea.setOpaque(false);
356	394	// //infoarea.setForeground(textcolor);
357		- infoarea.setLineWrap(true);
358		- infoarea.setWrapStyleWord(true);
	395	+// TEXTAREA infoarea.setLineWrap(true);
	396	+// TEXTAREA infoarea.setWrapStyleWord(true);
359	397	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
360	398	infoPanel.setPreferredSize(new Dimension(50, 200));
361	399	infoPanel.setName("Info");
..	..	@@ -366,16 +404,16 @@
366	404	mainPanel.setName("Main");
367	405	mainPanel.setContinuousLayout(true);
368	406	mainPanel.setOneTouchExpandable(true);
369		- mainPanel.setDividerLocation(1.0);
370	407	mainPanel.setDividerSize(9);
371		- mainPanel.setResizeWeight(0);
	408	+ mainPanel.setDividerLocation(0.5); //1.0);
	409	+ mainPanel.setResizeWeight(0.5);
372	410
373	411	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
374	412	//mainPanel.setLayout(new GridBagLayout());
375	413	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
376		- treePanel.setLayout(new GridBagLayout());
377		- ctrlPanel.setLayout(new GridBagLayout());
378		- materialPanel.setLayout(new GridBagLayout());
	414	+// treePanel.setLayout(new GridBagLayout());
	415	+ //ctrlPanel.setLayout(new GridBagLayout());
	416	+ //materialPanel.setLayout(new GridBagLayout());
379	417
380	418	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
381	419	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -414,7 +452,7 @@
414	452	static String newline = "\n";
415	453	protected static final String buttonString = "JButton";
416	454	StyledDocument doc;
417		- JTextArea infoarea;
	455	+ JTextPane infoarea;
418	456
419	457	void ClearInfo()
420	458	{
..	..	@@ -481,7 +519,10 @@
481	519	}
482	520
483	521	if (full)
484		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	522	+ {
	523	+ si.SendInfo(" BBox min: " + minima, "regular");
	524	+ si.SendInfo(" BBox max: " + maxima, "regular");
	525	+ }
485	526
486	527	if (sel.bRep != null)
487	528	{
..	..	@@ -579,6 +620,9 @@
579	620	{
580	621	CameraPane.pointflow = (PointFlow) sel;
581	622	}
	623	+
	624	+ si.SendInfo("_____________________", "regular");
	625	+ si.SendInfo("", "regular");
582	626	}
583	627	}
584	628
..	..	@@ -594,52 +638,68 @@
594	638	}
595	639	}
596	640
597		- private JTextArea createTextPane()
598		- {
599		- String[] initString =
	641	+ void ToggleFullScreen()
600	642	{
601		- "This is an editable JTextPane, ", //regular
602		- "another ", //italic
603		- "styled ", //bold
604		- "text ", //small
605		- "component, ", //large
606		- "which supports embedded components..." + newline,//regular
607		- " " + newline, //button
608		- "...and embedded icons..." + newline, //regular
609		- " ", //icon
610		- newline + "JTextPane is a subclass of JEditorPane that "
611		- + "uses a StyledEditorKit and StyledDocument, and provides "
612		- + "cover methods for interacting with those objects."
613		- };
614		-
615		- String[] initStyles =
616		- {
617		- "regular", "italic", "bold", "small", "large",
618		- "regular", "button", "regular", "icon",
619		- "regular"
620		- };
621		-
622		- JTextPane textPane = new JTextPane();
623		- textPane.setEditable(true);
624		- /StyledDocument/ doc = textPane.getStyledDocument();
625		- addStylesToDocument(doc);
626		-
627		- try
628		- {
629		- for (int j = 0; j < 2; j++)
630		- {
631		- for (int i = 0; i < initString.length; i++)
	643	+ if (CameraPane.FULLSCREEN)
632	644	{
633		- doc.insertString(doc.getLength(), initString[i],
634		- doc.getStyle(initStyles[i]));
	645	+ frame.getContentPane().remove(/"Center",/bigThree);
	646	+ framePanel.add(bigThree);
	647	+ frame.getContentPane().add(/"Center",/framePanel);
	648	+ } else
	649	+ {
	650	+ frame.getContentPane().remove(/"Center",/framePanel);
	651	+ framePanel.remove(bigThree);
	652	+ frame.getContentPane().add(/"Center",/bigThree);
635	653	}
636		- }
637		- } catch (BadLocationException ble)
638		- {
639		- System.err.println("Couldn't insert initial text into text pane.");
	654	+ cameraView.ToggleFullScreen();
640	655	}
641	656
642		- return new JTextArea(); // textPane;
	657	+ private JTextPane createTextPane()
	658	+ {
	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	+// }
	701	+
	702	+ return new JTextPane(); // textPane;
643	703	}
644	704
645	705	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -739,115 +799,83 @@
739	799	JButton slowerButton;
740	800	JButton fasterButton;
741	801	JButton remarkButton;
	802	+
	803	+ cGridBag namePanel;
	804	+ cGridBag setupPanel;
	805	+ cGridBag commandsPanel;
	806	+ cGridBag pushPanel;
	807	+ cGridBag fillPanel;
742	808
743		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	809	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
744	810	{
745	811	JCheckBox cb;
746	812
747		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
748		- oe.aConstraints.gridwidth = 1; // 3;
749		-// oe.aConstraints.weightx = 1;
750		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
751		- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	813	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
752	814	cb.addItemListener(this);
753		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
754		- oe.aConstraints.gridwidth = 1;
755		- oe.aConstraints.gridx += 1;
756	815
757	816	return cb;
758	817	}
759	818
760		- cButton AddButton(ObjEditor oe, String label)
	819	+ cButton AddButton(cGridBag panel, String label)
761	820	{
762	821	cButton cb;
763	822
764		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
765		- oe.aConstraints.gridwidth = 1;
766		-// oe.aConstraints.weightx = 1;
767		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
768		- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
	823	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
769	824	cb.addActionListener(this);
770		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
771		- oe.aConstraints.gridwidth = 1;
772		- oe.aConstraints.gridx += 1;
773	825
774	826	return cb;
775	827	}
776	828
777		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	829	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
778	830	{
779	831	JComboBox combo;
780	832
781		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
782		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
783		- oe.aConstraints.gridx += 1;
	833	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
784	834	combo.addActionListener(this);
785	835
786	836	return combo;
787	837	}
788	838
789		- 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)
790	840	{
791		- NumberSlider combo;
	841	+ cGridBag control = new cGridBag();
	842	+
	843	+ cNumberSlider combo;
792	844
793	845	JLabel jlabel = new JLabel(label);
794		-
795		- aConstraints.fill = GridBagConstraints.VERTICAL;
796	846	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
797		- aConstraints.gridwidth = 2;
798		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
799		- aConstraints.gridx += 1;
800		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
801		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
802		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
803		- aConstraints.gridx += 1;
804		- aConstraints.gridwidth = 1;
805		-
	847	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	848	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
806	849	combo.setFloat(current);
807		-
808		- combo.label = jlabel;
809		-
810		- combo.addChangeListener(this);
811		-
812		- return combo;
	850	+
	851	+ panel.add(control);
	852	+
	853	+ return control;
813	854	}
814	855
815		- 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)
816	857	{
817		- NumberSlider combo;
	858	+ cGridBag control = new cGridBag();
	859	+
	860	+ cNumberSlider combo;
818	861
819	862	JLabel jlabel = new JLabel(label);
820		-
821		- aConstraints.fill = GridBagConstraints.VERTICAL;
822	863	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
823		- aConstraints.gridwidth = 2;
824		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
825		- aConstraints.gridx += 1;
826		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
827		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
828		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
829		- aConstraints.gridx += 1;
830		- aConstraints.gridwidth = 1;
831		-
	864	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	865	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
832	866	combo.setInteger(current);
833	867
834		- combo.label = jlabel;
835		-
836		- combo.addChangeListener(this);
837		-
838		- return combo;
	868	+ panel.add(control);
	869	+
	870	+ return control;
839	871	}
840	872
841		- JTextArea AddText(JPanel ctrlPanel, String name)
	873	+ JTextArea AddText(cGridBag ctrlPanel, String name)
842	874	{
843	875	JTextArea text;
844	876
845		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
846		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
847		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	877	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
848	878	text.addCaretListener(this);
849		- aConstraints.gridx += 1;
850		- aConstraints.gridwidth = 1;
851	879
852	880	return text;
853	881	}
..	..	@@ -877,9 +905,16 @@
877	905	objEditor.ctrlPanel.remove(j);
878	906	}
879	907
	908	+ void Remove(cNumberSlider j)
	909	+ {
	910	+ j.removeChangeListener(this);
	911	+ //objEditor.ctrlPanel.remove(j.label);
	912	+ objEditor.ctrlPanel.remove(j);
	913	+ }
	914	+
880	915	/*
881	916	*/
882		- void Return() // ObjEditor oe)
	917	+ void Return0() // ObjEditor oe)
883	918	{
884	919	aConstraints.gridy += 1;
885	920	aConstraints.gridx = 0;
..	..	@@ -934,35 +969,71 @@
934	969
935	970	void SetupUI2(ObjEditor oe)
936	971	{
937		-// oe.aConstraints.weightx = 0;
938		-// oe.aConstraints.weighty = 0;
939		-// oe.aConstraints.gridx = 0;
940		-// oe.aConstraints.gridy = 0;
941		- 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();
942	981
943	982	if (!GroupEditor.allparams)
944	983	return;
945	984
946		- liveCB = AddCheckBox(oe, "Live", copy.live);
947		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
948		- 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");
949	991	// Return();
950		- markCB = AddCheckBox(oe, "Mark", copy.marked);
951		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
952		- randomCB = AddCheckBox(oe, "Rand", copy.random);
953		- Return();
954		- resetButton = AddButton(oe, "Reset");
955		- stepButton = AddButton(oe, "Step");
	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");
956	1018	// resetAllButton = AddButton(oe, "Reset All");
957	1019	// stepAllButton = AddButton(oe, "Step All");
958		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
959	1020	// Return();
960		- slowerButton = AddButton(oe, "Slow");
961		- fasterButton = AddButton(oe, "Fast");
962		- 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");
963	1027
964		- Return();
	1028	+ oe.ctrlPanel.add(commandsPanel);
	1029	+ oe.ctrlPanel.Return();
965	1030
	1031	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	1032	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1033	+ //Return();
	1034	+
	1035	+ oe.ctrlPanel.Return();
	1036	+
966	1037	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
967	1038	// ObjEditor.aConstraints.gridx += 1;
968	1039
..	..	@@ -1056,7 +1127,7 @@
1056	1127	oe.aConstraints.gridwidth = 1;
1057	1128	/**/
1058	1129	nameField = AddText(oe.ctrlPanel, copy.GetName());
1059		- Return();
	1130	+ oe.ctrlPanel.Return();
1060	1131
1061	1132	//ctrlPanel.add(textureButton = new Button("Texture..."));
1062	1133	//textureButton.setEnabled(false);
..	..	@@ -1158,10 +1229,22 @@
1158	1229	//JPanel worldPanel =
1159	1230	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1160	1231	//worldPanel.setName("World");
1161		- /JPanel/ cameraPanel =
1162		- new JPanel(new BorderLayout());
1163		- cameraPanel.add(cameraView);
	1232	+ centralPanel = new cGridBag();
	1233	+ centralPanel.preferredWidth = 20;
	1234	+ timelinePanel = new JPanel(new BorderLayout());
	1235	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1164	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	+
	1244	+ centralPanel.add(cameraView);
	1245	+ //frame.setJMenuBar(timelineMenubar);
	1246	+ //centralPanel.add(timelinePanel);
	1247	+
1165	1248	//topView.camera = ;
1166	1249	//frontView.camera = new Camera(2);
1167	1250	//sideView.camera = new Camera(3);
..	..	@@ -1177,12 +1260,13 @@
1177	1260	//frontView.object = copy;
1178	1261	//sideView.object = copy;
1179	1262
1180		- XYZPanel = new JPanel();
1181		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1263	+ XYZPanel = new cGridBag().setVertical(true);
	1264	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1182	1265
1183		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1184		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1185		- 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);
1186	1270
1187	1271	/*
1188	1272	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1191,7 +1275,7 @@
1191	1275	gridPanel.add(cameraView);
1192	1276	gridPanel.add(XYZPanel);
1193	1277	*/
1194		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, cameraPanel, XYZPanel); //new BorderLayout());
	1278	+ gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1195	1279	gridPanel.setContinuousLayout(true);
1196	1280	gridPanel.setOneTouchExpandable(true);
1197	1281	gridPanel.setDividerLocation(1.0);
..	..	@@ -1220,10 +1304,11 @@
1220	1304	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1221	1305	//tmp.setName("Edit");
1222	1306	objectPanel.add(materialPanel);
1223		- JPanel north = new JPanel(new BorderLayout());
1224		- north.setName("Edit");
1225		- north.add(ctrlPanel, BorderLayout.NORTH);
1226		- 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);
1227	1312	objectPanel.add(infoPanel);
1228	1313
1229	1314	/*
..	..	@@ -1244,16 +1329,23 @@
1244	1329	scrollpane.setWheelScrollingEnabled(true);
1245	1330	scrollpane.addMouseWheelListener(this); // Default not fast enough
1246	1331
1247		- /JTabbedPane/ jtp = new JTabbedPane();
1248		- jtp.add(scrollpane);
	1332	+ /JTabbedPane/ scenePanel = new cGridBag();
	1333	+ scenePanel.preferredWidth = 6;
	1334	+
	1335	+ JTabbedPane tabbedPane = new JTabbedPane();
	1336	+ tabbedPane.add(scrollpane);
1249	1337
1250		- jtp.add(FSPane = new cFileSystemPane(this));
	1338	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1251	1339
1252		- optionsPanel = new JPanel(new GridBagLayout());
	1340	+ optionsPanel = new cGridBag().setVertical(true);
1253	1341
1254	1342	optionsPanel.setName("Options");
1255		- jtp.add(optionsPanel);
1256		-
	1343	+
	1344	+ AddOptions(optionsPanel); //, aConstraints);
	1345	+
	1346	+ tabbedPane.add(optionsPanel);
	1347	+
	1348	+ scenePanel.add(tabbedPane);
1257	1349
1258	1350	/*
1259	1351	cTree jTree = new cTree(null);
..	..	@@ -1275,7 +1367,7 @@
1275	1367	jtp.add(tree);
1276	1368	*/
1277	1369
1278		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, jtp, gridPanel);
	1370	+ bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1279	1371	bigPanel.setContinuousLayout(true);
1280	1372	bigPanel.setOneTouchExpandable(true);
1281	1373	bigPanel.setDividerLocation(0.8);
..	..	@@ -1287,6 +1379,7 @@
1287	1379	//bigPanel.setSize(new Dimension(10,10));
1288	1380	//bigPanel.add(ctrlPanel);
1289	1381	//bigPanel.add(gridPanel);
	1382	+ /**
1290	1383	bigThree = new JPanel();
1291	1384	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1292	1385	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1297,20 +1390,26 @@
1297	1390	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1298	1391	aWindowConstraints.weightx = 0;
1299	1392	aWindowConstraints.weighty = 1;
1300		- bigThree.add(jtp, aWindowConstraints);
	1393	+ bigThree.add(scenePanel, aWindowConstraints);
1301	1394	aWindowConstraints.weightx = 1;
1302	1395	aWindowConstraints.gridwidth = 3;
1303	1396	// aConstraints.gridheight = 3;
1304	1397	aWindowConstraints.gridx = 1;
1305	1398	aWindowConstraints.fill = GridBagConstraints.BOTH;
1306		- bigThree.add(cameraPanel, aWindowConstraints);
	1399	+ bigThree.add(centralPanel, aWindowConstraints);
1307	1400	aWindowConstraints.weightx = 0;
1308	1401	aWindowConstraints.gridx = 4;
1309	1402	aWindowConstraints.gridwidth = 1;
1310	1403	// aConstraints.gridheight = 3;
1311	1404	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1312	1405	bigThree.add(XYZPanel, aWindowConstraints);
	1406	+ /**/
1313	1407
	1408	+ bigThree = new cGridBag();
	1409	+ bigThree.addComponent(scenePanel);
	1410	+ bigThree.addComponent(centralPanel);
	1411	+ bigThree.addComponent(XYZPanel);
	1412	+
1314	1413	// // SIDE EFFECT!!!
1315	1414	// aConstraints.gridx = 0;
1316	1415	// aConstraints.gridy = 0;
..	..	@@ -1331,13 +1430,14 @@
1331	1430	//worldPane.add(bigPanel);
1332	1431	//worldPane.add(worldPanel);
1333	1432	/**/
1334		- frame.getContentPane().add(/"Center",/framePanel);
	1433	+ //frame.getContentPane().add(/"Center",/framePanel);
	1434	+ frame.add(/"Center",/framePanel);
1335	1435	//frame.getContentPane().add(/"Center",/ worldPane);
1336	1436
1337	1437	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1338	1438
1339		- frame.setSize(1024, 768);
1340		- frame.show();
	1439	+ frame.setSize(1280, 860);
	1440	+ frame.setVisible(true);
1341	1441
1342	1442	gridPanel.setDividerLocation(1.0);
1343	1443
..	..	@@ -1352,6 +1452,10 @@
1352	1452	});
1353	1453	}
1354	1454
	1455	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1456	+ {
	1457	+ }
	1458	+
1355	1459	JTree GetTree()
1356	1460	{
1357	1461	return objEditor.jTree;
..	..	@@ -1363,260 +1467,173 @@
1363	1467	ctrlPanel.removeAll();
1364	1468	}
1365	1469
1366		- void SetupMaterial(JPanel ctrlPanel)
	1470	+ void SetupMaterial(cGridBag panel)
1367	1471	{
1368		- aConstraints.weighty = 0;
1369		- //aConstraints.weightx = 1;
1370		- /*
	1472	+ /*
1371	1473	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1372	1474	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1373		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1374		- aConstraints.gridx += 1;
1375	1475	*/
1376	1476
1377		- aConstraints.gridwidth = 1;
1378		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1379		- aConstraints.gridx += 1;
1380		- aConstraints.weighty = 0;
1381		- 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");
1382	1481
1383	1482	/*
1384	1483	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1385		- aConstraints.gridx += 1;
1386		- aConstraints.weighty = 0;
1387		- aConstraints.gridwidth = 1;
1388	1484	*/
1389	1485
1390		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1391		- 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	+ }
1392	1495
1393		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1394		-
1395		- aConstraints.gridx += 1;
1396		-
1397		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1398		-
1399		- aConstraints.gridx += 1;
1400		-
1401		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1402		-
1403		- aConstraints.gridx = 0;
1404		- aConstraints.gridy += 1;
1405		- aConstraints.weighty = 0;
1406		- aConstraints.gridwidth = 1;
	1496	+ editBar.preferredHeight = 15;
	1497	+
	1498	+ panel.add(editBar);
	1499	+
1407	1500	/**/
1408	1501	//aConstraints.weighty = 0;
1409	1502	////aConstraints.weightx = 1;
1410	1503	//aConstraints.weighty = 1;
1411	1504	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1412	1505	//aConstraints.gridx += 1;
1413		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1414		- aConstraints.weighty = 0;
1415		- aConstraints.gridx = 0;
1416		- aConstraints.gridy += 1;
1417		- aConstraints.gridwidth = 1;
	1506	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1418	1507
1419		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1420		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1421		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1422		- aConstraints.gridx += 1;
1423		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1424		- //aConstraints.weightx = 0;
1425		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1426		- aConstraints.gridx = 0;
1427		- aConstraints.gridy += 1;
1428		- 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);
1429	1516
1430		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1431		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1432		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1433		- aConstraints.gridx += 1;
1434		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1435		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1436		- aConstraints.gridx = 0;
1437		- aConstraints.gridy += 1;
1438		- 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);
1439	1522
1440		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1441		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1442		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1443		- aConstraints.gridx += 1;
1444		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1445		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1446		- aConstraints.gridx = 0;
1447		- aConstraints.gridy += 1;
1448		- 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);
1449	1528
1450		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1451		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1452		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1453		- aConstraints.gridx += 1;
1454		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1455		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1456		- aConstraints.gridx = 0;
1457		- aConstraints.gridy += 1;
1458		- 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);
1459	1534
1460		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1461		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1462		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1463		- aConstraints.gridx += 1;
1464		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1465		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1466		- aConstraints.gridx = 0;
1467		- aConstraints.gridy += 1;
1468		- 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);
1469	1540
1470		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1471		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1472		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1473		- aConstraints.gridx += 1;
1474		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1475		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1476		- aConstraints.gridx = 0;
1477		- aConstraints.gridy += 1;
1478		- 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);
1479	1546
1480		- //aConstraints.weighty = 1;
1481		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1482		- //aConstraints.gridx += 1;
1483		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1484		- aConstraints.weighty = 0;
1485		- aConstraints.gridx = 0;
1486		- aConstraints.gridy += 1;
1487		- 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);
1488	1560
1489		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1490		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1491		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1492		- aConstraints.gridx += 1;
1493		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1494		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1495		- aConstraints.gridx = 0;
1496		- aConstraints.gridy += 1;
1497		- 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);
1498	1566
1499		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1500		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1501		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1502		- aConstraints.gridx += 1;
1503		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1504		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1505		- aConstraints.gridx = 0;
1506		- aConstraints.gridy += 1;
1507		- 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);
1508	1572
1509		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1510		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1511		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1512		- aConstraints.gridx += 1;
1513		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1514		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1515		- aConstraints.gridx = 0;
1516		- aConstraints.gridy += 1;
1517		- 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);
1518	1578
1519		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1520		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1521		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1522		- aConstraints.gridx += 1;
1523		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1524		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1525		- aConstraints.gridx = 0;
1526		- aConstraints.gridy += 1;
1527		- 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);
1528	1584
1529		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1530		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1531		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1532		- aConstraints.gridx += 1;
1533		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1534		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1535		- aConstraints.gridx = 0;
1536		- aConstraints.gridy += 1;
1537		- 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);
1538	1590
1539		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1540		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1541		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1542		- aConstraints.gridx += 1;
1543		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1544		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1545		- aConstraints.gridx = 0;
1546		- aConstraints.gridy += 1;
1547		- 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);
1548	1596
1549		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1550		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1551		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1552		- aConstraints.gridx += 1;
1553		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1554		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1555		- aConstraints.gridx = 0;
1556		- aConstraints.gridy += 1;
1557		- 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);
1558	1604
1559		- //aConstraints.weighty = 1;
1560		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1561		- //aConstraints.gridx += 1;
1562		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1563		- aConstraints.weighty = 0;
1564		- aConstraints.gridx = 0;
1565		- aConstraints.gridy += 1;
1566		- 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);
1567	1610
1568		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1569		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1570		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1571		- aConstraints.gridx += 1;
1572		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1573		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1574		- aConstraints.gridx = 0;
1575		- aConstraints.gridy += 1;
1576		- 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);
1577	1616
1578		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1579		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1580		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1581		- aConstraints.gridx += 1;
1582		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1583		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1584		- aConstraints.gridx = 0;
1585		- aConstraints.gridy += 1;
1586		- 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);
1587	1622
1588		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1589		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1590		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1591		- aConstraints.gridx += 1;
1592		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1593		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1594		- aConstraints.gridx = 0;
1595		- aConstraints.gridy += 1;
1596		- 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);
1597	1628
1598		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1599		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1600		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1601		- aConstraints.gridx += 1;
1602		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1603		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1604		- aConstraints.gridx = 0;
1605		- aConstraints.gridy += 1;
1606		- 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);
1607	1634
1608		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1609		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1610		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1611		- aConstraints.gridx += 1;
1612		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1613		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1614		- aConstraints.gridx = 0;
1615		- aConstraints.gridy += 1;
1616		- aConstraints.gridwidth = 1;
1617		-
1618		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1619		- Return();
	1635	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1636	+ //Return();
1620	1637	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1621	1638	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1622	1639	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1627,130 +1644,93 @@
1627	1644	// aConstraints.gridy += 1;
1628	1645	// aConstraints.gridwidth = 1;
1629	1646
1630		- //aConstraints.weighty = 1;
1631		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1632		- //aConstraints.gridx += 1;
1633		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1634		- aConstraints.weighty = 0;
1635		- aConstraints.gridx = 0;
1636		- aConstraints.gridy += 1;
1637		- aConstraints.gridwidth = 1;
1638	1647
1639		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1640		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1641		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1642		- aConstraints.gridx += 1;
1643		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1644		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1645		- aConstraints.gridx = 0;
1646		- aConstraints.gridy += 1;
1647		- 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);
1648	1655
1649		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1650		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1651		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1652		- aConstraints.gridx += 1;
1653		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1654		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1655		- aConstraints.gridx = 0;
1656		- aConstraints.gridy += 1;
1657		- 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);
1658	1661
1659		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1660		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1661		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1662		- aConstraints.gridx += 1;
1663		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1664		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1665		- aConstraints.gridx = 0;
1666		- aConstraints.gridy += 1;
1667		- 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);
1668	1667
1669		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1670		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1671		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1672		- aConstraints.gridx += 1;
1673		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1674		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1675		- aConstraints.gridx = 0;
1676		- aConstraints.gridy += 1;
1677		- aConstraints.gridwidth = 1;
1678		- 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);
1679	1673
1680		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1681		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1682		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1683		- aConstraints.gridx += 1;
1684		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1685		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1686		- aConstraints.gridx = 0;
1687		- aConstraints.gridy += 1;
1688		- 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);
1689	1679
1690		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1691		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1692		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1693		- aConstraints.gridx += 1;
1694		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1695		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1696		- aConstraints.gridx = 0;
1697		- aConstraints.gridy += 1;
1698		- 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);
1699	1687
1700		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1701		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1702		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1703		- aConstraints.gridx += 1;
1704		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1705		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1706		- aConstraints.gridx = 0;
1707		- aConstraints.gridy += 1;
1708		- 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);
1709	1693
1710		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1711		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1712		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1713		- aConstraints.gridx += 1;
1714		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1715		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1716		- aConstraints.gridx = 0;
1717		- aConstraints.gridy += 1;
1718		- 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);
1719	1699
1720		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1721		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1722		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1723		- aConstraints.gridx += 1;
1724		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1725		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1726		- aConstraints.gridx = 0;
1727		- aConstraints.gridy += 1;
1728		- 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);
1729	1705
1730		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1731		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1732		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1733		- aConstraints.gridx += 1;
1734		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1735		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1736		- aConstraints.gridx = 0;
1737		- aConstraints.gridy += 1;
1738		- 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);
1739	1711
1740		- //aConstraints.weighty = 1;
1741		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1742		- //aConstraints.gridx += 1;
1743		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1744		- 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);
1745	1717
1746		- aConstraints.gridx = 0;
1747		- aConstraints.gridy = 0;
1748		- 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);
1749	1729
1750	1730	SetMaterial(copy); // .GetMaterial());
1751	1731
1752		- colorField.addChangeListener(this);
1753		- modulationField.addChangeListener(this);
	1732	+ //colorField.addChangeListener(this);
	1733	+// modulationField.addChangeListener(this);
1754	1734	metalnessField.addChangeListener(this);
1755	1735	diffuseField.addChangeListener(this);
1756	1736	specularField.addChangeListener(this);
..	..	@@ -1780,12 +1760,15 @@
1780	1760	opacityPowerField.addChangeListener(this);
1781	1761	/**/
1782	1762
1783		- resetSlidersButton.addActionListener(this);
1784	1763	clearMaterialButton.addActionListener(this);
1785	1764	createMaterialButton.addActionListener(this);
1786		-
1787		- propagateToggle.addItemListener(this);
1788		- multiplyToggle.addItemListener(this);
	1765	+
	1766	+ if (Globals.ADVANCED)
	1767	+ {
	1768	+ resetSlidersButton.addActionListener(this);
	1769	+ propagateToggle.addItemListener(this);
	1770	+ multiplyToggle.addItemListener(this);
	1771	+ }
1789	1772	}
1790	1773
1791	1774	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1956,7 +1939,7 @@
1956	1939
1957	1940	//? flashIt = false;
1958	1941	CameraPane pane = (CameraPane) cameraView;
1959		- pane.clickStart(location.x, location.y, 0);
	1942	+ pane.clickStart(location.x, location.y, 0, 0);
1960	1943	pane.clickEnd(location.x, location.y, 0, true);
1961	1944
1962	1945	if (group.selection.size() == 1)
..	..	@@ -2417,7 +2400,7 @@
2417	2400	{
2418	2401	/**/
2419	2402	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2420		- browser.show();
	2403	+ browser.setVisible(true);
2421	2404	String filename = browser.getFile();
2422	2405	if (filename != null && filename.length() > 0)
2423	2406	{
..	..	@@ -2562,6 +2545,7 @@
2562	2545	}
2563	2546	if (input == null)
2564	2547	{
	2548	+ new Exception().printStackTrace();
2565	2549	System.exit(0);
2566	2550	}
2567	2551
..	..	@@ -2776,7 +2760,8 @@
2776	2760	return;
2777	2761	}
2778	2762
2779		- multiplyToggle.setSelected(mat.multiply);
	2763	+ if (multiplyToggle != null)
	2764	+ multiplyToggle.setSelected(mat.multiply);
2780	2765
2781	2766	assert (object.projectedVertices != null);
2782	2767
..	..	@@ -2958,23 +2943,40 @@
2958	2943	// june 2013 copy.HardTouch();
2959	2944	cameraView.repaint();
2960	2945	return;
2961		- } else if (event.getSource() == toggleFullItem)
	2946	+ } else if (event.getSource() == toggleTimelineItem)
2962	2947	{
2963		- if (CameraPane.FULLSCREEN)
	2948	+ timeline ^= true;
	2949	+
	2950	+ if (timeline)
2964	2951	{
2965		- frame.getContentPane().remove(/"Center",/bigThree);
2966		- framePanel.add(bigThree);
2967		- frame.getContentPane().add(/"Center",/framePanel);
2968		- } else
2969		- {
2970		- frame.getContentPane().remove(/"Center",/framePanel);
2971		- frame.getContentPane().add(/"Center",/bigThree);
	2952	+ centralPanel.remove(cameraView);
	2953	+ cameraPanel.add(cameraView);
	2954	+ centralPanel.add(cameraPanel);
	2955	+ frame.setJMenuBar(timelineMenubar);
	2956	+ wasFullScreen = CameraPane.FULLSCREEN;
	2957	+ if (!CameraPane.FULLSCREEN)
	2958	+ ToggleFullScreen();
	2959	+ toggleFullScreenItem.setEnabled(false);
2972	2960	}
	2961	+ else
	2962	+ {
	2963	+ centralPanel.remove(cameraPanel);
	2964	+ centralPanel.add(cameraView);
	2965	+ frame.setJMenuBar(null);
	2966	+ if (!wasFullScreen)
	2967	+ ToggleFullScreen();
	2968	+ toggleFullScreenItem.setEnabled(true);
	2969	+ }
	2970	+
2973	2971	frame.validate();
2974		- cameraView.ToggleFullScreen();
	2972	+ return;
	2973	+ } else if (event.getSource() == toggleFullScreenItem)
	2974	+ {
	2975	+ ToggleFullScreen();
	2976	+ frame.validate();
2975	2977
2976	2978	return;
2977		- } else if (event.getSource() == toggleRandomItem)
	2979	+ } else if (event.getSource() == toggleSwitchItem)
2978	2980	{
2979	2981	cameraView.ToggleRandom();
2980	2982	cameraView.repaint();
..	..	@@ -3019,6 +3021,7 @@
3019	3021	if (event.getSource() == randomCB)
3020	3022	{
3021	3023	copy.random ^= true;
	3024	+ objEditor.refreshContents();
3022	3025	return;
3023	3026	}
3024	3027	if (event.getSource() == speedupCB)
..	..	@@ -3081,7 +3084,8 @@
3081	3084	objEditor.refreshContents();
3082	3085	} else if (event.getSource() == stepItem)
3083	3086	{
3084		- cameraView.ONESTEP = true;
	3087	+ //cameraView.ONESTEP = true;
	3088	+ Globals.ONESTEP = true;
3085	3089	cameraView.repaint();
3086	3090	return;
3087	3091	} else if (event.getSource() == stepButton)
..	..	@@ -3220,9 +3224,9 @@
3220	3224	cameraView.RevertCamera();
3221	3225	cameraView.repaint();
3222	3226	return;
3223		- } else if (event.getSource() == textureButton)
3224		- {
3225		- return; // true;
	3227	+// } else if (event.getSource() == textureButton)
	3228	+// {
	3229	+// return; // true;
3226	3230	} else // combos...
3227	3231	if (event.getSource() == texresMenu)
3228	3232	{
..	..	@@ -3238,25 +3242,25 @@
3238	3242
3239	3243	void ToggleAnimation()
3240	3244	{
3241		- if (!CameraPane.ANIMATION)
	3245	+ if (!Globals.ANIMATION)
3242	3246	{
3243	3247	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3244		- browser.show();
	3248	+ browser.setVisible(true);
3245	3249	String filename = browser.getFile();
3246	3250	if (filename != null && filename.length() > 0)
3247	3251	{
3248		- CameraPane.filename = browser.getDirectory() + filename;
	3252	+ Globals.filename = browser.getDirectory() + filename;
3249	3253	//CameraPane.framecount = 0;
3250		- CameraPane.imagecount = 0;
	3254	+ Globals.imagecount = 0;
3251	3255
3252		- CameraPane.ANIMATION ^= true;
	3256	+ Globals.ANIMATION ^= true;
3253	3257
3254	3258	GrafreeD.wav.cursor = 0;
3255	3259	GrafreeD.wav.loop = 0;
3256	3260	}
3257	3261	} else
3258	3262	{
3259		- CameraPane.ANIMATION ^= true;
	3263	+ Globals.ANIMATION ^= true;
3260	3264	}
3261	3265	}
3262	3266
..	..	@@ -3302,7 +3306,7 @@
3302	3306	void CreateMaterial()
3303	3307	{
3304	3308	//copy.ClearMaterial(); // PATCH
3305		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3309	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3306	3310	if (copy.selection.size() > 0)
3307	3311	//SetMaterial(copy);
3308	3312	{
..	..	@@ -3361,11 +3365,11 @@
3361	3365	{
3362	3366	copy.ResetBlockLoop(); // temporary problem
3363	3367
3364		- boolean random = CameraPane.RANDOM;
3365		- CameraPane.RANDOM = false; // parse everything
	3368	+ boolean random = CameraPane.SWITCH;
	3369	+ CameraPane.SWITCH = false; // parse everything
3366	3370	copy.ResetDisplayList();
3367	3371	copy.HardTouch();
3368		- CameraPane.RANDOM = random;
	3372	+ CameraPane.SWITCH = random;
3369	3373	}
3370	3374
3371	3375	// public void applySelf()
..	..	@@ -3435,7 +3439,7 @@
3435	3439	current.fakedepth = (float) fakedepthField.getFloat();
3436	3440	current.shadowbias = (float) shadowbiasField.getFloat();
3437	3441
3438		- if (!NumberSlider.frozen)
	3442	+ if (!cNumberSlider.frozen)
3439	3443	{
3440	3444	//System.out.println("Propagate = " + propagate);
3441	3445	copy.UpdateMaterial(anchor, current, propagate);
..	..	@@ -3483,6 +3487,7 @@
3483	3487	\|\| e.getSource() == apertureField
3484	3488	\|\| e.getSource() == shadowblurField)
3485	3489	{
	3490	+ new Exception().printStackTrace();
3486	3491	System.exit(0);
3487	3492	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3488	3493	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3509,7 +3514,13 @@
3509	3514	//System.out.println("PARENT = " + parent);
3510	3515	//if (parent != null)
3511	3516	// parent.applySelf();
3512		- refreshContents();
	3517	+ if (e.getSource() == normalpushField)
	3518	+ {
	3519	+ objEditor.refreshContents();
	3520	+ //Refresh();
	3521	+ }
	3522	+ else
	3523	+ refreshContents();
3513	3524	// ??? client.refreshEditWindow();
3514	3525	}
3515	3526	//else
..	..	@@ -3521,7 +3532,7 @@
3521	3532	//group.name = nameField.getText();
3522	3533	//objEditor.applySelf();
3523	3534
3524		- assert (objEditor == this);
	3535	+ // OCT2018: assert (objEditor == this);
3525	3536	if (copy.selection == null \|\| copy.selection.size() == 0)
3526	3537	//super.applySelf()
3527	3538	; else
..	..	@@ -3545,12 +3556,18 @@
3545	3556	objEditor.copy = keep;
3546	3557	}
3547	3558	}
	3559	+
	3560	+ if (normalpushField != null)
	3561	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
3548	3562	}
3549	3563
3550	3564	void SnapObject()
3551	3565	{
3552		- Object3D obj = (Object3D)copy.selection.elementAt(0);
3553		- SnapObject(obj);
	3566	+ if (copy.selection.size() > 0)
	3567	+ {
	3568	+ Object3D obj = (Object3D)copy.selection.elementAt(0);
	3569	+ SnapObject(obj);
	3570	+ }
3554	3571	}
3555	3572
3556	3573	void SnapObject(Object3D obj)
..	..	@@ -3796,7 +3813,7 @@
3796	3813
3797	3814	radioPanel.revalidate();
3798	3815	radioPanel.repaint();
3799		- ctrlPanel.revalidate(); // ? new
	3816	+ ctrlPanel.validate(); // ? new
3800	3817	ctrlPanel.repaint();
3801	3818	}
3802	3819	}
..	..	@@ -4442,16 +4459,17 @@
4442	4459	//MenuItem normalLensItem;
4443	4460	MenuItem editCameraItem;
4444	4461	MenuItem revertCameraItem;
4445		- CheckboxMenuItem toggleLiveItem;
4446	4462	MenuItem stepItem;
4447		- CheckboxMenuItem toggleFullItem;
	4463	+ CheckboxMenuItem toggleLiveItem;
	4464	+ CheckboxMenuItem toggleFullScreenItem;
	4465	+ CheckboxMenuItem toggleTimelineItem;
4448	4466	CheckboxMenuItem toggleRenderItem;
4449	4467	CheckboxMenuItem toggleDebugItem;
4450	4468	CheckboxMenuItem toggleFrustumItem;
4451	4469	CheckboxMenuItem toggleFootContactItem;
4452	4470	CheckboxMenuItem toggleDLItem;
4453	4471	CheckboxMenuItem toggleTextureItem;
4454		- CheckboxMenuItem toggleRandomItem;
	4472	+ CheckboxMenuItem toggleSwitchItem;
4455	4473	CheckboxMenuItem toggleRootItem;
4456	4474	CheckboxMenuItem animationItem;
4457	4475	CheckboxMenuItem toggleHandleItem;
..	..	@@ -4459,23 +4477,26 @@
4459	4477	JSplitPane mainPanel;
4460	4478	JScrollPane scrollpane;
4461	4479	JPanel toolbarPanel;
4462		- JPanel treePanel;
	4480	+ cGridBag treePanel;
4463	4481	JPanel radioPanel;
4464	4482	ButtonGroup buttonGroup;
4465		- JPanel ctrlPanel;
4466		- JPanel materialPanel;
	4483	+ cGridBag ctrlPanel;
	4484	+ cGridBag materialPanel;
4467	4485	JScrollPane infoPanel;
4468		- JPanel optionsPanel;
	4486	+ cGridBag optionsPanel;
4469	4487	JTabbedPane objectPanel;
4470		- JPanel XYZPanel;
	4488	+ cGridBag XYZPanel;
4471	4489	JSplitPane gridPanel;
4472	4490	JSplitPane bigPanel;
4473		- JPanel bigThree;
4474		- JTabbedPane jtp;
4475		- JPanel cameraPanel;
	4491	+ cGridBag bigThree;
	4492	+ cGridBag scenePanel;
	4493	+ cGridBag centralPanel;
	4494	+ JSplitPane cameraPanel;
	4495	+ JPanel timelinePanel;
	4496	+ JMenuBar timelineMenubar;
4476	4497	JSplitPane framePanel;
4477	4498	JTextArea/Field/ nameField;
4478		- cButton textureButton;
	4499	+ //cButton textureButton;
4479	4500	cButton okButton;
4480	4501	cButton applyButton;
4481	4502	cButton cancelButton;
..	..	@@ -4522,65 +4543,67 @@
4522	4543	// MATERIAL
4523	4544	JLabel materialLabel;
4524	4545	JLabel colorLabel;
4525		- NumberSlider colorField;
	4546	+ cNumberSlider colorField;
4526	4547	JLabel modulationLabel;
4527		- NumberSlider modulationField;
	4548	+ cNumberSlider modulationField;
4528	4549	JLabel metalnessLabel;
4529		- NumberSlider metalnessField;
	4550	+ cNumberSlider metalnessField;
4530	4551	JLabel diffuseLabel;
4531		- NumberSlider diffuseField;
	4552	+ cNumberSlider diffuseField;
4532	4553	JLabel specularLabel;
4533		- NumberSlider specularField;
	4554	+ cNumberSlider specularField;
4534	4555	JLabel shininessLabel;
4535		- NumberSlider shininessField;
	4556	+ cNumberSlider shininessField;
4536	4557	JLabel shiftLabel;
4537		- NumberSlider shiftField;
	4558	+ cNumberSlider shiftField;
4538	4559	JLabel ambientLabel;
4539		- NumberSlider ambientField;
	4560	+ cNumberSlider ambientField;
4540	4561	JLabel lightareaLabel;
4541		- NumberSlider lightareaField;
	4562	+ cNumberSlider lightareaField;
4542	4563	JLabel diffusenessLabel;
4543		- NumberSlider diffusenessField;
	4564	+ cNumberSlider diffusenessField;
4544	4565	JLabel velvetLabel;
4545		- NumberSlider velvetField;
	4566	+ cNumberSlider velvetField;
4546	4567	JLabel sheenLabel;
4547		- NumberSlider sheenField;
	4568	+ cNumberSlider sheenField;
4548	4569	JLabel subsurfaceLabel;
4549		- NumberSlider subsurfaceField;
	4570	+ cNumberSlider subsurfaceField;
4550	4571	//JLabel bumpLabel;
4551	4572	//NumberSlider bumpField;
4552	4573	JLabel backlitLabel;
4553		- NumberSlider backlitField;
	4574	+ cNumberSlider backlitField;
4554	4575	JLabel anisoLabel;
4555		- NumberSlider anisoField;
	4576	+ cNumberSlider anisoField;
4556	4577	JLabel anisoVLabel;
4557		- NumberSlider anisoVField;
	4578	+ cNumberSlider anisoVField;
4558	4579	JLabel cameraLabel;
4559		- NumberSlider cameraField;
	4580	+ cNumberSlider cameraField;
4560	4581	JLabel selfshadowLabel;
4561		- NumberSlider selfshadowField;
	4582	+ cNumberSlider selfshadowField;
4562	4583	JLabel shadowLabel;
4563		- NumberSlider shadowField;
	4584	+ cNumberSlider shadowField;
4564	4585	JLabel textureLabel;
4565		- NumberSlider textureField;
	4586	+ cNumberSlider textureField;
4566	4587	JLabel opacityLabel;
4567		- NumberSlider opacityField;
	4588	+ cNumberSlider opacityField;
4568	4589	JLabel fakedepthLabel;
4569		- NumberSlider fakedepthField;
	4590	+ cNumberSlider fakedepthField;
4570	4591	JLabel shadowbiasLabel;
4571		- NumberSlider shadowbiasField;
	4592	+ cNumberSlider shadowbiasField;
4572	4593	JLabel bumpLabel;
4573		- NumberSlider bumpField;
	4594	+ cNumberSlider bumpField;
4574	4595	JLabel noiseLabel;
4575		- NumberSlider noiseField;
	4596	+ cNumberSlider noiseField;
4576	4597	JLabel powerLabel;
4577		- NumberSlider powerField;
	4598	+ cNumberSlider powerField;
4578	4599	JLabel borderfadeLabel;
4579		- NumberSlider borderfadeField;
	4600	+ cNumberSlider borderfadeField;
4580	4601	JLabel fogLabel;
4581		- NumberSlider fogField;
	4602	+ cNumberSlider fogField;
4582	4603	JLabel opacityPowerLabel;
4583		- NumberSlider opacityPowerField;
	4604	+ cNumberSlider opacityPowerField;
4584	4605	JTree jTree;
4585	4606	//ObjectUI parent;
	4607	+
	4608	+ cNumberSlider normalpushField;
4586	4609	}