~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	{
..	..	@@ -463,13 +501,13 @@
463	501	//SendInfo("Name:", "bold");
464	502	if (sel.GetTextures() != null \|\| debug)
465	503	{
466		- si.SendInfo(sel.toString(), "bold");
	504	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
467	505	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
468	506	if (sel.Size() > 0)
469	507	{
470	508	si.SendInfo("#children = " + sel.Size(), "regular");
471	509	}
472		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	510	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
473	511	if (debug)
474	512	{
475	513	try
..	..	@@ -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	{
..	..	@@ -508,7 +549,7 @@
508	549	}
509	550	if (sel.support != null)
510	551	{
511		- si.SendInfo(" support: " + sel.support, "regular");
	552	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
512	553	}
513	554	if (sel.scriptnode != null)
514	555	{
..	..	@@ -522,18 +563,18 @@
522	563	maxima.y = sel.toParent[3][1];
523	564	maxima.z = sel.toParent[3][2];
524	565	si.SendInfo(" Orig: " + maxima, "regular");
525		- maxima.x = sel.globalTransform[3][0];
526		- maxima.y = sel.globalTransform[3][1];
527		- maxima.z = sel.globalTransform[3][2];
528		- if (full)
529		- si.SendInfo(" Global Orig: " + maxima, "regular");
530	566	maxima.x = sel.toParent[0][0];
531	567	maxima.y = sel.toParent[1][1];
532	568	maxima.z = sel.toParent[2][2];
533	569	si.SendInfo(" Scale: " + maxima, "regular");
534		- maxima.x = sel.globalTransform[0][0];
535		- maxima.y = sel.globalTransform[1][1];
536		- maxima.z = sel.globalTransform[2][2];
	570	+ maxima.x = sel.globalTransform[3][0];
	571	+ maxima.y = sel.globalTransform[3][1];
	572	+ maxima.z = sel.globalTransform[3][2];
	573	+ if (full)
	574	+ si.SendInfo(" Global Orig: " + maxima, "regular");
	575	+ maxima.x = sel.globalTransform[0][0];
	576	+ maxima.y = sel.globalTransform[1][1];
	577	+ maxima.z = sel.globalTransform[2][2];
537	578	if (full)
538	579	si.SendInfo(" Global Scale: " + maxima, "regular");
539	580	}
..	..	@@ -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)
..	..	@@ -692,7 +752,7 @@
692	752	protected static ImageIcon createImageIcon(String path,
693	753	String description)
694	754	{
695		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	755	+ java.net.URL imgURL = Grafreed.class.getResource(path);
696	756	if (imgURL != null)
697	757	{
698	758	return new ImageIcon(imgURL, description);
..	..	@@ -724,6 +784,7 @@
724	784	// NumberSlider vDivsField;
725	785	// JCheckBox endcaps;
726	786	JCheckBox liveCB;
	787	+ JCheckBox selectCB;
727	788	JCheckBox hideCB;
728	789	JCheckBox link2masterCB;
729	790	JCheckBox markCB;
..	..	@@ -739,115 +800,83 @@
739	800	JButton slowerButton;
740	801	JButton fasterButton;
741	802	JButton remarkButton;
	803	+
	804	+ cGridBag namePanel;
	805	+ cGridBag setupPanel;
	806	+ cGridBag commandsPanel;
	807	+ cGridBag pushPanel;
	808	+ cGridBag fillPanel;
742	809
743		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	810	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
744	811	{
745	812	JCheckBox cb;
746	813
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);
	814	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
752	815	cb.addItemListener(this);
753		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
754		- oe.aConstraints.gridwidth = 1;
755		- oe.aConstraints.gridx += 1;
756	816
757	817	return cb;
758	818	}
759	819
760		- cButton AddButton(ObjEditor oe, String label)
	820	+ cButton AddButton(cGridBag panel, String label)
761	821	{
762	822	cButton cb;
763	823
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);
	824	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
769	825	cb.addActionListener(this);
770		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
771		- oe.aConstraints.gridwidth = 1;
772		- oe.aConstraints.gridx += 1;
773	826
774	827	return cb;
775	828	}
776	829
777		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	830	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
778	831	{
779	832	JComboBox combo;
780	833
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;
	834	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
784	835	combo.addActionListener(this);
785	836
786	837	return combo;
787	838	}
788	839
789		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	840	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
790	841	{
791		- NumberSlider combo;
	842	+ cGridBag control = new cGridBag();
	843	+
	844	+ cNumberSlider combo;
792	845
793	846	JLabel jlabel = new JLabel(label);
794		-
795		- aConstraints.fill = GridBagConstraints.VERTICAL;
796	847	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		-
	848	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	849	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
806	850	combo.setFloat(current);
807		-
808		- combo.label = jlabel;
809		-
810		- combo.addChangeListener(this);
811		-
812		- return combo;
	851	+
	852	+ panel.add(control);
	853	+
	854	+ return control;
813	855	}
814	856
815		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	857	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
816	858	{
817		- NumberSlider combo;
	859	+ cGridBag control = new cGridBag();
	860	+
	861	+ cNumberSlider combo;
818	862
819	863	JLabel jlabel = new JLabel(label);
820		-
821		- aConstraints.fill = GridBagConstraints.VERTICAL;
822	864	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		-
	865	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	866	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
832	867	combo.setInteger(current);
833	868
834		- combo.label = jlabel;
835		-
836		- combo.addChangeListener(this);
837		-
838		- return combo;
	869	+ panel.add(control);
	870	+
	871	+ return control;
839	872	}
840	873
841		- JTextArea AddText(JPanel ctrlPanel, String name)
	874	+ JTextArea AddText(cGridBag ctrlPanel, String name)
842	875	{
843	876	JTextArea text;
844	877
845		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
846		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
847		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	878	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
848	879	text.addCaretListener(this);
849		- aConstraints.gridx += 1;
850		- aConstraints.gridwidth = 1;
851	880
852	881	return text;
853	882	}
..	..	@@ -877,9 +906,16 @@
877	906	objEditor.ctrlPanel.remove(j);
878	907	}
879	908
	909	+ void Remove(cNumberSlider j)
	910	+ {
	911	+ j.removeChangeListener(this);
	912	+ //objEditor.ctrlPanel.remove(j.label);
	913	+ objEditor.ctrlPanel.remove(j);
	914	+ }
	915	+
880	916	/*
881	917	*/
882		- void Return() // ObjEditor oe)
	918	+ void Return0() // ObjEditor oe)
883	919	{
884	920	aConstraints.gridy += 1;
885	921	aConstraints.gridx = 0;
..	..	@@ -934,35 +970,73 @@
934	970
935	971	void SetupUI2(ObjEditor oe)
936	972	{
937		-// oe.aConstraints.weightx = 0;
938		-// oe.aConstraints.weighty = 0;
939		-// oe.aConstraints.gridx = 0;
940		-// oe.aConstraints.gridy = 0;
941		- SetupName(oe);
	973	+ //SetupName(oe);
	974	+
	975	+ namePanel = new cGridBag();
	976	+
	977	+ nameField = AddText(namePanel, copy.GetName());
	978	+ namePanel.add(nameField);
	979	+ oe.ctrlPanel.add(namePanel);
	980	+
	981	+ oe.ctrlPanel.Return();
942	982
943	983	if (!GroupEditor.allparams)
944	984	return;
945	985
946		- liveCB = AddCheckBox(oe, "Live", copy.live);
947		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
948		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	986	+ setupPanel = new cGridBag().setVertical(false);
	987	+
	988	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	989	+ liveCB.setToolTipText("Animate object");
	990	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	991	+ selectCB.setToolTipText("Make object selectable");
949	992	// 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");
	993	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	994	+ hideCB.setToolTipText("Hide object");
	995	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	996	+ markCB.setToolTipText("Set the animation target transform");
	997	+
	998	+ rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	999	+ rewindCB.setToolTipText("Rewind animation");
	1000	+
	1001	+ randomCB = AddCheckBox(setupPanel, "Random", copy.random);
	1002	+ randomCB.setToolTipText("Option for switch node");
	1003	+
	1004	+ if (Globals.ADVANCED)
	1005	+ {
	1006	+ link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
	1007	+ link2masterCB.setToolTipText("Attach to support");
	1008	+ speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	1009	+ speedupCB.setToolTipText("Option motion capture");
	1010	+ }
	1011	+
	1012	+ oe.ctrlPanel.add(setupPanel);
	1013	+ oe.ctrlPanel.Return();
	1014	+
	1015	+ commandsPanel = new cGridBag().setVertical(false);
	1016	+
	1017	+ resetButton = AddButton(commandsPanel, "Reset");
	1018	+ resetButton.setToolTipText("Jump to frame zero");
	1019	+ stepButton = AddButton(commandsPanel, "Step");
	1020	+ stepButton.setToolTipText("Step one frame");
956	1021	// resetAllButton = AddButton(oe, "Reset All");
957	1022	// stepAllButton = AddButton(oe, "Step All");
958		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
959	1023	// Return();
960		- slowerButton = AddButton(oe, "Slow");
961		- fasterButton = AddButton(oe, "Fast");
962		- remarkButton = AddButton(oe, "Rem");
	1024	+ slowerButton = AddButton(commandsPanel, "Slow");
	1025	+ slowerButton.setToolTipText("Decrease animation speed");
	1026	+ fasterButton = AddButton(commandsPanel, "Fast");
	1027	+ fasterButton.setToolTipText("Increase animation speed");
	1028	+ remarkButton = AddButton(commandsPanel, "Remark");
	1029	+ remarkButton.setToolTipText("Set the current transform as the target");
963	1030
964		- Return();
	1031	+ oe.ctrlPanel.add(commandsPanel);
	1032	+ oe.ctrlPanel.Return();
965	1033
	1034	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	1035	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	1036	+ //Return();
	1037	+
	1038	+ oe.ctrlPanel.Return();
	1039	+
966	1040	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
967	1041	// ObjEditor.aConstraints.gridx += 1;
968	1042
..	..	@@ -1056,7 +1130,7 @@
1056	1130	oe.aConstraints.gridwidth = 1;
1057	1131	/**/
1058	1132	nameField = AddText(oe.ctrlPanel, copy.GetName());
1059		- Return();
	1133	+ oe.ctrlPanel.Return();
1060	1134
1061	1135	//ctrlPanel.add(textureButton = new Button("Texture..."));
1062	1136	//textureButton.setEnabled(false);
..	..	@@ -1158,10 +1232,22 @@
1158	1232	//JPanel worldPanel =
1159	1233	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1160	1234	//worldPanel.setName("World");
1161		- /JPanel/ cameraPanel =
1162		- new JPanel(new BorderLayout());
1163		- cameraPanel.add(cameraView);
	1235	+ centralPanel = new cGridBag();
	1236	+ centralPanel.preferredWidth = 20;
	1237	+ timelinePanel = new JPanel(new BorderLayout());
	1238	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1164	1239
	1240	+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
	1241	+ cameraPanel.setContinuousLayout(true);
	1242	+ cameraPanel.setOneTouchExpandable(true);
	1243	+// cameraPanel.setDividerLocation(0.9);
	1244	+// cameraPanel.setDividerSize(9);
	1245	+ cameraPanel.setResizeWeight(1.0);
	1246	+
	1247	+ centralPanel.add(cameraView);
	1248	+ //frame.setJMenuBar(timelineMenubar);
	1249	+ //centralPanel.add(timelinePanel);
	1250	+
1165	1251	//topView.camera = ;
1166	1252	//frontView.camera = new Camera(2);
1167	1253	//sideView.camera = new Camera(3);
..	..	@@ -1177,12 +1263,13 @@
1177	1263	//frontView.object = copy;
1178	1264	//sideView.object = copy;
1179	1265
1180		- XYZPanel = new JPanel();
1181		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1266	+ XYZPanel = new cGridBag().setVertical(true);
	1267	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1182	1268
1183		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1184		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1185		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1269	+ XYZPanel.preferredWidth = 5;
	1270	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1271	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1272	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1186	1273
1187	1274	/*
1188	1275	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1191,7 +1278,7 @@
1191	1278	gridPanel.add(cameraView);
1192	1279	gridPanel.add(XYZPanel);
1193	1280	*/
1194		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, cameraPanel, XYZPanel); //new BorderLayout());
	1281	+ gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1195	1282	gridPanel.setContinuousLayout(true);
1196	1283	gridPanel.setOneTouchExpandable(true);
1197	1284	gridPanel.setDividerLocation(1.0);
..	..	@@ -1220,10 +1307,11 @@
1220	1307	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1221	1308	//tmp.setName("Edit");
1222	1309	objectPanel.add(materialPanel);
1223		- JPanel north = new JPanel(new BorderLayout());
1224		- north.setName("Edit");
1225		- north.add(ctrlPanel, BorderLayout.NORTH);
1226		- objectPanel.add(north);
	1310	+// JPanel north = new JPanel(new BorderLayout());
	1311	+// north.setName("Edit");
	1312	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1313	+// objectPanel.add(north);
	1314	+ objectPanel.add(ctrlPanel);
1227	1315	objectPanel.add(infoPanel);
1228	1316
1229	1317	/*
..	..	@@ -1244,16 +1332,23 @@
1244	1332	scrollpane.setWheelScrollingEnabled(true);
1245	1333	scrollpane.addMouseWheelListener(this); // Default not fast enough
1246	1334
1247		- /JTabbedPane/ jtp = new JTabbedPane();
1248		- jtp.add(scrollpane);
	1335	+ /JTabbedPane/ scenePanel = new cGridBag();
	1336	+ scenePanel.preferredWidth = 6;
	1337	+
	1338	+ JTabbedPane tabbedPane = new JTabbedPane();
	1339	+ tabbedPane.add(scrollpane);
1249	1340
1250		- jtp.add(FSPane = new cFileSystemPane(this));
	1341	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1251	1342
1252		- optionsPanel = new JPanel(new GridBagLayout());
	1343	+ optionsPanel = new cGridBag().setVertical(true);
1253	1344
1254	1345	optionsPanel.setName("Options");
1255		- jtp.add(optionsPanel);
1256		-
	1346	+
	1347	+ AddOptions(optionsPanel); //, aConstraints);
	1348	+
	1349	+ tabbedPane.add(optionsPanel);
	1350	+
	1351	+ scenePanel.add(tabbedPane);
1257	1352
1258	1353	/*
1259	1354	cTree jTree = new cTree(null);
..	..	@@ -1275,7 +1370,7 @@
1275	1370	jtp.add(tree);
1276	1371	*/
1277	1372
1278		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, jtp, gridPanel);
	1373	+ bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1279	1374	bigPanel.setContinuousLayout(true);
1280	1375	bigPanel.setOneTouchExpandable(true);
1281	1376	bigPanel.setDividerLocation(0.8);
..	..	@@ -1287,6 +1382,7 @@
1287	1382	//bigPanel.setSize(new Dimension(10,10));
1288	1383	//bigPanel.add(ctrlPanel);
1289	1384	//bigPanel.add(gridPanel);
	1385	+ /**
1290	1386	bigThree = new JPanel();
1291	1387	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1292	1388	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1297,20 +1393,26 @@
1297	1393	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1298	1394	aWindowConstraints.weightx = 0;
1299	1395	aWindowConstraints.weighty = 1;
1300		- bigThree.add(jtp, aWindowConstraints);
	1396	+ bigThree.add(scenePanel, aWindowConstraints);
1301	1397	aWindowConstraints.weightx = 1;
1302	1398	aWindowConstraints.gridwidth = 3;
1303	1399	// aConstraints.gridheight = 3;
1304	1400	aWindowConstraints.gridx = 1;
1305	1401	aWindowConstraints.fill = GridBagConstraints.BOTH;
1306		- bigThree.add(cameraPanel, aWindowConstraints);
	1402	+ bigThree.add(centralPanel, aWindowConstraints);
1307	1403	aWindowConstraints.weightx = 0;
1308	1404	aWindowConstraints.gridx = 4;
1309	1405	aWindowConstraints.gridwidth = 1;
1310	1406	// aConstraints.gridheight = 3;
1311	1407	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1312	1408	bigThree.add(XYZPanel, aWindowConstraints);
	1409	+ /**/
1313	1410
	1411	+ bigThree = new cGridBag();
	1412	+ bigThree.addComponent(scenePanel);
	1413	+ bigThree.addComponent(centralPanel);
	1414	+ bigThree.addComponent(XYZPanel);
	1415	+
1314	1416	// // SIDE EFFECT!!!
1315	1417	// aConstraints.gridx = 0;
1316	1418	// aConstraints.gridy = 0;
..	..	@@ -1331,13 +1433,14 @@
1331	1433	//worldPane.add(bigPanel);
1332	1434	//worldPane.add(worldPanel);
1333	1435	/**/
1334		- frame.getContentPane().add(/"Center",/framePanel);
	1436	+ //frame.getContentPane().add(/"Center",/framePanel);
	1437	+ frame.add(/"Center",/framePanel);
1335	1438	//frame.getContentPane().add(/"Center",/ worldPane);
1336	1439
1337	1440	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1338	1441
1339		- frame.setSize(1024, 768);
1340		- frame.show();
	1442	+ frame.setSize(1280, 860);
	1443	+ frame.setVisible(true);
1341	1444
1342	1445	gridPanel.setDividerLocation(1.0);
1343	1446
..	..	@@ -1352,6 +1455,10 @@
1352	1455	});
1353	1456	}
1354	1457
	1458	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1459	+ {
	1460	+ }
	1461	+
1355	1462	JTree GetTree()
1356	1463	{
1357	1464	return objEditor.jTree;
..	..	@@ -1363,260 +1470,173 @@
1363	1470	ctrlPanel.removeAll();
1364	1471	}
1365	1472
1366		- void SetupMaterial(JPanel ctrlPanel)
	1473	+ void SetupMaterial(cGridBag panel)
1367	1474	{
1368		- aConstraints.weighty = 0;
1369		- //aConstraints.weightx = 1;
1370		- /*
	1475	+ /*
1371	1476	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1372	1477	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1373		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1374		- aConstraints.gridx += 1;
1375	1478	*/
1376	1479
1377		- aConstraints.gridwidth = 1;
1378		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1379		- aConstraints.gridx += 1;
1380		- aConstraints.weighty = 0;
1381		- aConstraints.gridwidth = 1;
	1480	+ cGridBag editBar = new cGridBag().setVertical(false);
	1481	+
	1482	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1483	+ createMaterialButton.setToolTipText("Create material");
1382	1484
1383	1485	/*
1384	1486	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1385		- aConstraints.gridx += 1;
1386		- aConstraints.weighty = 0;
1387		- aConstraints.gridwidth = 1;
1388	1487	*/
1389	1488
1390		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1391		- aConstraints.gridx += 1;
	1489	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1490	+ clearMaterialButton.setToolTipText("Clear material");
	1491	+
	1492	+ if (Globals.ADVANCED)
	1493	+ {
	1494	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1495	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1496	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1497	+ }
1392	1498
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;
	1499	+ editBar.preferredHeight = 15;
	1500	+
	1501	+ panel.add(editBar);
	1502	+
1407	1503	/**/
1408	1504	//aConstraints.weighty = 0;
1409	1505	////aConstraints.weightx = 1;
1410	1506	//aConstraints.weighty = 1;
1411	1507	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1412	1508	//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;
	1509	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1418	1510
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;
	1511	+ cGridBag colorSection = new cGridBag().setVertical(true);
	1512	+
	1513	+ cGridBag color = new cGridBag();
	1514	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1515	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1516	+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1517	+ //colorField.preferredWidth = 200;
	1518	+ colorSection.add(color);
1429	1519
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;
	1520	+ cGridBag modulation = new cGridBag();
	1521	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1522	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1523	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1524	+ colorSection.add(modulation);
1439	1525
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;
	1526	+ cGridBag texture = new cGridBag();
	1527	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1528	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1529	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1530	+ colorSection.add(texture);
1449	1531
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;
	1532	+ cGridBag anisoU = new cGridBag();
	1533	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1534	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1535	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1536	+ colorSection.add(anisoU);
1459	1537
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;
	1538	+ cGridBag anisoV = new cGridBag();
	1539	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1540	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1541	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1542	+ colorSection.add(anisoV);
1469	1543
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;
	1544	+ cGridBag shadowbias = new cGridBag();
	1545	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1546	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1547	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1548	+ colorSection.add(shadowbias);
1479	1549
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;
	1550	+ panel.add(new JSeparator());
	1551	+
	1552	+ panel.add(colorSection);
	1553	+
	1554	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1555	+
	1556	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1557	+
	1558	+ cGridBag diffuse = new cGridBag();
	1559	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1560	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1561	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1562	+ diffuseSection.add(diffuse);
1488	1563
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;
	1564	+ cGridBag diffuseness = new cGridBag();
	1565	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1566	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1567	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1568	+ diffuseSection.add(diffuseness);
1498	1569
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;
	1570	+ cGridBag selfshadow = new cGridBag();
	1571	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1572	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1573	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1574	+ diffuseSection.add(selfshadow);
1508	1575
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;
	1576	+ cGridBag sheen = new cGridBag();
	1577	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1578	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1579	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1580	+ diffuseSection.add(sheen);
1518	1581
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;
	1582	+ cGridBag subsurface = new cGridBag();
	1583	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1584	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1585	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1586	+ diffuseSection.add(subsurface);
1528	1587
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;
	1588	+ cGridBag shadow = new cGridBag();
	1589	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1590	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1591	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1592	+ diffuseSection.add(shadow);
1538	1593
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;
	1594	+ cGridBag fakedepth = new cGridBag();
	1595	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1596	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1597	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1598	+ diffuseSection.add(fakedepth);
1548	1599
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;
	1600	+ panel.add(new JSeparator());
	1601	+
	1602	+ panel.add(diffuseSection);
	1603	+
	1604	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1605	+
	1606	+ cGridBag specularSection = new cGridBag().setVertical(true);
1558	1607
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;
	1608	+ cGridBag specular = new cGridBag();
	1609	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1610	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1611	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1612	+ specularSection.add(specular);
1567	1613
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;
	1614	+ cGridBag lightarea = new cGridBag();
	1615	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1616	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1617	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1618	+ specularSection.add(lightarea);
1577	1619
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;
	1620	+ cGridBag shininess = new cGridBag();
	1621	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1622	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1623	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1624	+ specularSection.add(shininess);
1587	1625
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;
	1626	+ cGridBag metalness = new cGridBag();
	1627	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1628	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1629	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1630	+ specularSection.add(metalness);
1597	1631
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;
	1632	+ cGridBag velvet = new cGridBag();
	1633	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1634	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1635	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1636	+ specularSection.add(velvet);
1607	1637
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();
	1638	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1639	+ //Return();
1620	1640	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1621	1641	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1622	1642	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1627,130 +1647,93 @@
1627	1647	// aConstraints.gridy += 1;
1628	1648	// aConstraints.gridwidth = 1;
1629	1649
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	1650
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;
	1651	+ panel.add(new JSeparator());
	1652	+
	1653	+ panel.add(specularSection);
	1654	+
	1655	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1656	+
	1657	+ cGridBag globalSection = new cGridBag().setVertical(true);
1648	1658
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;
	1659	+ cGridBag camera = new cGridBag();
	1660	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1661	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1662	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1663	+ globalSection.add(camera);
1658	1664
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;
	1665	+ cGridBag ambient = new cGridBag();
	1666	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1667	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1668	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1669	+ globalSection.add(ambient);
1668	1670
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;
	1671	+ cGridBag backlit = new cGridBag();
	1672	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1673	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1674	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1675	+ globalSection.add(backlit);
1679	1676
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;
	1677	+ cGridBag opacity = new cGridBag();
	1678	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1679	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1680	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1681	+ globalSection.add(opacity);
1689	1682
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;
	1683	+ panel.add(new JSeparator());
	1684	+
	1685	+ panel.add(globalSection);
	1686	+
	1687	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1688	+
	1689	+ cGridBag textureSection = new cGridBag().setVertical(true);
1699	1690
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;
	1691	+ cGridBag bump = new cGridBag();
	1692	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1693	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1694	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1695	+ textureSection.add(bump);
1709	1696
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;
	1697	+ cGridBag noise = new cGridBag();
	1698	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1699	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1700	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1701	+ textureSection.add(noise);
1719	1702
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;
	1703	+ cGridBag power = new cGridBag();
	1704	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1705	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1706	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1707	+ textureSection.add(power);
1729	1708
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;
	1709	+ cGridBag borderfade = new cGridBag();
	1710	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1711	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1712	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1713	+ textureSection.add(borderfade);
1739	1714
1740		- //aConstraints.weighty = 1;
1741		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1742		- //aConstraints.gridx += 1;
1743		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1744		- aConstraints.weighty = 0;
	1715	+ cGridBag fog = new cGridBag();
	1716	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1717	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1718	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1719	+ textureSection.add(fog);
1745	1720
1746		- aConstraints.gridx = 0;
1747		- aConstraints.gridy = 0;
1748		- aConstraints.gridwidth = 1;
	1721	+ cGridBag opacityPower = new cGridBag();
	1722	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	1723	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1724	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	1725	+ textureSection.add(opacityPower);
	1726	+
	1727	+ panel.add(new JSeparator());
	1728	+
	1729	+ panel.add(textureSection);
	1730	+
	1731	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1749	1732
1750	1733	SetMaterial(copy); // .GetMaterial());
1751	1734
1752		- colorField.addChangeListener(this);
1753		- modulationField.addChangeListener(this);
	1735	+ //colorField.addChangeListener(this);
	1736	+// modulationField.addChangeListener(this);
1754	1737	metalnessField.addChangeListener(this);
1755	1738	diffuseField.addChangeListener(this);
1756	1739	specularField.addChangeListener(this);
..	..	@@ -1780,12 +1763,15 @@
1780	1763	opacityPowerField.addChangeListener(this);
1781	1764	/**/
1782	1765
1783		- resetSlidersButton.addActionListener(this);
1784	1766	clearMaterialButton.addActionListener(this);
1785	1767	createMaterialButton.addActionListener(this);
1786		-
1787		- propagateToggle.addItemListener(this);
1788		- multiplyToggle.addItemListener(this);
	1768	+
	1769	+ if (Globals.ADVANCED)
	1770	+ {
	1771	+ resetSlidersButton.addActionListener(this);
	1772	+ propagateToggle.addItemListener(this);
	1773	+ multiplyToggle.addItemListener(this);
	1774	+ }
1789	1775	}
1790	1776
1791	1777	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1956,7 +1942,7 @@
1956	1942
1957	1943	//? flashIt = false;
1958	1944	CameraPane pane = (CameraPane) cameraView;
1959		- pane.clickStart(location.x, location.y, 0);
	1945	+ pane.clickStart(location.x, location.y, 0, 0);
1960	1946	pane.clickEnd(location.x, location.y, 0, true);
1961	1947
1962	1948	if (group.selection.size() == 1)
..	..	@@ -2194,6 +2180,8 @@
2194	2180	{
2195	2181	Mocap sel = (Mocap) copy.selection.get(0);
2196	2182
	2183	+ sel.SetCurrentBones(sel.frame);
	2184	+
2197	2185	sel.fullname = fullname;
2198	2186
2199	2187	if (changename)
..	..	@@ -2207,14 +2195,18 @@
2207	2195	sel.smoothed = false;
2208	2196
2209	2197	// if (!changename)
2210		- sel.SetPositionDelta(false, true, true, true/?/); // false
	2198	+ //sel.SetPositionDelta(false, true, true, true/?/); // false
	2199	+ sel.SetGlobalTransform();
	2200	+ sel.LoadData();
	2201	+ sel.Rewind();
	2202	+ sel.Fade();
2211	2203	// sel.setPose(0);
2212	2204	refreshContents();
2213	2205	} else
2214	2206	{
2215	2207	mocap.Reset();
2216	2208	// new skeleton
2217		- makeSomething(mocap, false); // true);
	2209	+ makeSomething(mocap, true); // true);
2218	2210	}
2219	2211	} catch (Exception e)
2220	2212	{
..	..	@@ -2241,6 +2233,8 @@
2241	2233	{
2242	2234	Mocap sel = (Mocap) select;
2243	2235
	2236	+ sel.SetCurrentBones(sel.frame);
	2237	+
2244	2238	File file = new File(fullname);
2245	2239
2246	2240	// Mocap mocap = new Mocap("Mocap" + file.getName());
..	..	@@ -2307,7 +2301,11 @@
2307	2301
2308	2302	if (!changename)
2309	2303	{
2310		- sel.SetPositionDelta(false, true, true, true/?/);
	2304	+ //sel.SetPositionDelta(false, true, true, true/?/);
	2305	+ sel.SetGlobalTransform();
	2306	+ sel.LoadData();
	2307	+ sel.Rewind();
	2308	+ sel.Fade();
2311	2309	}
2312	2310
2313	2311	// sel.setPose(0);
..	..	@@ -2401,11 +2399,11 @@
2401	2399
2402	2400	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2403	2401	{
2404		- if (GrafreeD.standAlone)
	2402	+ if (Grafreed.standAlone)
2405	2403	{
2406	2404	/**/
2407	2405	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2408		- browser.show();
	2406	+ browser.setVisible(true);
2409	2407	String filename = browser.getFile();
2410	2408	if (filename != null && filename.length() > 0)
2411	2409	{
..	..	@@ -2550,6 +2548,7 @@
2550	2548	}
2551	2549	if (input == null)
2552	2550	{
	2551	+ new Exception().printStackTrace();
2553	2552	System.exit(0);
2554	2553	}
2555	2554
..	..	@@ -2764,7 +2763,8 @@
2764	2763	return;
2765	2764	}
2766	2765
2767		- multiplyToggle.setSelected(mat.multiply);
	2766	+ if (multiplyToggle != null)
	2767	+ multiplyToggle.setSelected(mat.multiply);
2768	2768
2769	2769	assert (object.projectedVertices != null);
2770	2770
..	..	@@ -2946,23 +2946,40 @@
2946	2946	// june 2013 copy.HardTouch();
2947	2947	cameraView.repaint();
2948	2948	return;
2949		- } else if (event.getSource() == toggleFullItem)
	2949	+ } else if (event.getSource() == toggleTimelineItem)
2950	2950	{
2951		- if (CameraPane.FULLSCREEN)
	2951	+ timeline ^= true;
	2952	+
	2953	+ if (timeline)
2952	2954	{
2953		- frame.getContentPane().remove(/"Center",/bigThree);
2954		- framePanel.add(bigThree);
2955		- frame.getContentPane().add(/"Center",/framePanel);
2956		- } else
2957		- {
2958		- frame.getContentPane().remove(/"Center",/framePanel);
2959		- frame.getContentPane().add(/"Center",/bigThree);
	2955	+ centralPanel.remove(cameraView);
	2956	+ cameraPanel.add(cameraView);
	2957	+ centralPanel.add(cameraPanel);
	2958	+ frame.setJMenuBar(timelineMenubar);
	2959	+ wasFullScreen = CameraPane.FULLSCREEN;
	2960	+ if (!CameraPane.FULLSCREEN)
	2961	+ ToggleFullScreen();
	2962	+ toggleFullScreenItem.setEnabled(false);
2960	2963	}
	2964	+ else
	2965	+ {
	2966	+ centralPanel.remove(cameraPanel);
	2967	+ centralPanel.add(cameraView);
	2968	+ frame.setJMenuBar(null);
	2969	+ if (!wasFullScreen)
	2970	+ ToggleFullScreen();
	2971	+ toggleFullScreenItem.setEnabled(true);
	2972	+ }
	2973	+
2961	2974	frame.validate();
2962		- cameraView.ToggleFullScreen();
	2975	+ return;
	2976	+ } else if (event.getSource() == toggleFullScreenItem)
	2977	+ {
	2978	+ ToggleFullScreen();
	2979	+ frame.validate();
2963	2980
2964	2981	return;
2965		- } else if (event.getSource() == toggleRandomItem)
	2982	+ } else if (event.getSource() == toggleSwitchItem)
2966	2983	{
2967	2984	cameraView.ToggleRandom();
2968	2985	cameraView.repaint();
..	..	@@ -2993,6 +3010,10 @@
2993	3010	{
2994	3011	copy.live ^= true;
2995	3012	return;
	3013	+ } else if (event.getSource() == selectCB)
	3014	+ {
	3015	+ copy.dontselect ^= true;
	3016	+ return;
2996	3017	} else if (event.getSource() == hideCB)
2997	3018	{
2998	3019	copy.hide ^= true;
..	..	@@ -3007,6 +3028,7 @@
3007	3028	if (event.getSource() == randomCB)
3008	3029	{
3009	3030	copy.random ^= true;
	3031	+ objEditor.refreshContents();
3010	3032	return;
3011	3033	}
3012	3034	if (event.getSource() == speedupCB)
..	..	@@ -3069,7 +3091,8 @@
3069	3091	objEditor.refreshContents();
3070	3092	} else if (event.getSource() == stepItem)
3071	3093	{
3072		- cameraView.ONESTEP = true;
	3094	+ //cameraView.ONESTEP = true;
	3095	+ Globals.ONESTEP = true;
3073	3096	cameraView.repaint();
3074	3097	return;
3075	3098	} else if (event.getSource() == stepButton)
..	..	@@ -3208,9 +3231,9 @@
3208	3231	cameraView.RevertCamera();
3209	3232	cameraView.repaint();
3210	3233	return;
3211		- } else if (event.getSource() == textureButton)
3212		- {
3213		- return; // true;
	3234	+// } else if (event.getSource() == textureButton)
	3235	+// {
	3236	+// return; // true;
3214	3237	} else // combos...
3215	3238	if (event.getSource() == texresMenu)
3216	3239	{
..	..	@@ -3226,25 +3249,25 @@
3226	3249
3227	3250	void ToggleAnimation()
3228	3251	{
3229		- if (!CameraPane.ANIMATION)
	3252	+ if (!Globals.ANIMATION)
3230	3253	{
3231	3254	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3232		- browser.show();
	3255	+ browser.setVisible(true);
3233	3256	String filename = browser.getFile();
3234	3257	if (filename != null && filename.length() > 0)
3235	3258	{
3236		- CameraPane.filename = browser.getDirectory() + filename;
	3259	+ Globals.filename = browser.getDirectory() + filename;
3237	3260	//CameraPane.framecount = 0;
3238		- CameraPane.imagecount = 0;
	3261	+ Globals.imagecount = 0;
3239	3262
3240		- CameraPane.ANIMATION ^= true;
	3263	+ Globals.ANIMATION ^= true;
3241	3264
3242		- GrafreeD.wav.cursor = 0;
3243		- GrafreeD.wav.loop = 0;
	3265	+ Grafreed.wav.cursor = 0;
	3266	+ Grafreed.wav.loop = 0;
3244	3267	}
3245	3268	} else
3246	3269	{
3247		- CameraPane.ANIMATION ^= true;
	3270	+ Globals.ANIMATION ^= true;
3248	3271	}
3249	3272	}
3250	3273
..	..	@@ -3290,7 +3313,7 @@
3290	3313	void CreateMaterial()
3291	3314	{
3292	3315	//copy.ClearMaterial(); // PATCH
3293		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3316	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3294	3317	if (copy.selection.size() > 0)
3295	3318	//SetMaterial(copy);
3296	3319	{
..	..	@@ -3349,11 +3372,11 @@
3349	3372	{
3350	3373	copy.ResetBlockLoop(); // temporary problem
3351	3374
3352		- boolean random = CameraPane.RANDOM;
3353		- CameraPane.RANDOM = false; // parse everything
	3375	+ boolean random = CameraPane.SWITCH;
	3376	+ CameraPane.SWITCH = false; // parse everything
3354	3377	copy.ResetDisplayList();
3355	3378	copy.HardTouch();
3356		- CameraPane.RANDOM = random;
	3379	+ CameraPane.SWITCH = random;
3357	3380	}
3358	3381
3359	3382	// public void applySelf()
..	..	@@ -3423,10 +3446,40 @@
3423	3446	current.fakedepth = (float) fakedepthField.getFloat();
3424	3447	current.shadowbias = (float) shadowbiasField.getFloat();
3425	3448
3426		- if (!NumberSlider.frozen)
	3449	+ if (!cNumberSlider.frozen)
3427	3450	{
3428	3451	//System.out.println("Propagate = " + propagate);
3429	3452	copy.UpdateMaterial(anchor, current, propagate);
	3453	+
	3454	+ if (copy.material != null)
	3455	+ {
	3456	+ cMaterial mat = copy.material;
	3457	+
	3458	+ colorField.SetToolTipValue((mat.color));
	3459	+ modulationField.SetToolTipValue((mat.modulation));
	3460	+ metalnessField.SetToolTipValue((mat.metalness));
	3461	+ diffuseField.SetToolTipValue((mat.diffuse));
	3462	+ specularField.SetToolTipValue((mat.specular));
	3463	+ shininessField.SetToolTipValue((mat.shininess));
	3464	+ shiftField.SetToolTipValue((mat.shift));
	3465	+ ambientField.SetToolTipValue((mat.ambient));
	3466	+ lightareaField.SetToolTipValue((mat.lightarea));
	3467	+ diffusenessField.SetToolTipValue((mat.factor));
	3468	+ velvetField.SetToolTipValue((mat.velvet));
	3469	+ sheenField.SetToolTipValue((mat.sheen));
	3470	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3471	+ backlitField.SetToolTipValue((mat.bump));
	3472	+ anisoField.SetToolTipValue((mat.aniso));
	3473	+ anisoVField.SetToolTipValue((mat.anisoV));
	3474	+ cameraField.SetToolTipValue((mat.cameralight));
	3475	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3476	+ shadowField.SetToolTipValue((mat.shadow));
	3477	+ textureField.SetToolTipValue((mat.texture));
	3478	+ opacityField.SetToolTipValue((mat.opacity));
	3479	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3480	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3481	+ }
	3482	+
3430	3483	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3431	3484	{
3432	3485	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3471,6 +3524,7 @@
3471	3524	\|\| e.getSource() == apertureField
3472	3525	\|\| e.getSource() == shadowblurField)
3473	3526	{
	3527	+ new Exception().printStackTrace();
3474	3528	System.exit(0);
3475	3529	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3476	3530	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3497,7 +3551,13 @@
3497	3551	//System.out.println("PARENT = " + parent);
3498	3552	//if (parent != null)
3499	3553	// parent.applySelf();
3500		- refreshContents();
	3554	+ if (e.getSource() == normalpushField)
	3555	+ {
	3556	+ objEditor.refreshContents();
	3557	+ //Refresh();
	3558	+ }
	3559	+ else
	3560	+ refreshContents();
3501	3561	// ??? client.refreshEditWindow();
3502	3562	}
3503	3563	//else
..	..	@@ -3509,7 +3569,7 @@
3509	3569	//group.name = nameField.getText();
3510	3570	//objEditor.applySelf();
3511	3571
3512		- assert (objEditor == this);
	3572	+ // OCT2018: assert (objEditor == this);
3513	3573	if (copy.selection == null \|\| copy.selection.size() == 0)
3514	3574	//super.applySelf()
3515	3575	; else
..	..	@@ -3533,12 +3593,18 @@
3533	3593	objEditor.copy = keep;
3534	3594	}
3535	3595	}
	3596	+
	3597	+ if (normalpushField != null)
	3598	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3536	3599	}
3537	3600
3538	3601	void SnapObject()
3539	3602	{
3540		- Object3D obj = (Object3D)copy.selection.elementAt(0);
3541		- SnapObject(obj);
	3603	+ if (copy.selection.size() > 0)
	3604	+ {
	3605	+ Object3D obj = (Object3D)copy.selection.elementAt(0);
	3606	+ SnapObject(obj);
	3607	+ }
3542	3608	}
3543	3609
3544	3610	void SnapObject(Object3D obj)
..	..	@@ -3652,7 +3718,7 @@
3652	3718
3653	3719	if (obj.parent != null)
3654	3720	{
3655		- obj.parent.TransformToWorld(interest);
	3721	+// obj.parent.TransformToWorld(interest);
3656	3722	}
3657	3723
3658	3724	if (!CameraPane.TRACK)
..	..	@@ -3784,7 +3850,7 @@
3784	3850
3785	3851	radioPanel.revalidate();
3786	3852	radioPanel.repaint();
3787		- ctrlPanel.revalidate(); // ? new
	3853	+ ctrlPanel.validate(); // ? new
3788	3854	ctrlPanel.repaint();
3789	3855	}
3790	3856	}
..	..	@@ -3996,6 +4062,7 @@
3996	4062	}
3997	4063	}
3998	4064	}
	4065	+
3999	4066	LoadGFDThread loadGFDThread;
4000	4067
4001	4068	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4016,7 +4083,8 @@
4016	4083	try
4017	4084	{
4018	4085	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4019		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4086	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4087	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4020	4088
4021	4089	readobj = (Object3D) p.readObject();
4022	4090	istream.close();
..	..	@@ -4024,7 +4092,20 @@
4024	4092	readobj.ResetDisplayList();
4025	4093	} catch (Exception e)
4026	4094	{
4027		- e.printStackTrace();
	4095	+ //e.printStackTrace();
	4096	+ try
	4097	+ {
	4098	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4099	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4100	+
	4101	+ readobj = (Object3D) p.readObject();
	4102	+ istream.close();
	4103	+
	4104	+ readobj.ResetDisplayList();
	4105	+ } catch (Exception e2)
	4106	+ {
	4107	+ e2.printStackTrace();
	4108	+ }
4028	4109	}
4029	4110	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4030	4111	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4141,7 +4222,7 @@
4141	4222
4142	4223	void load() // throws ClassNotFoundException
4143	4224	{
4144		- if (GrafreeD.standAlone)
	4225	+ if (Grafreed.standAlone)
4145	4226	{
4146	4227	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4147	4228	browser.show();
..	..	@@ -4228,11 +4309,13 @@
4228	4309	try
4229	4310	{
4230	4311	FileOutputStream ostream = new FileOutputStream(lastname);
4231		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4312	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4313	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4232	4314
4233	4315	p.writeObject(copy);
4234	4316	p.flush();
4235	4317
	4318	+ zstream.close();
4236	4319	ostream.close();
4237	4320
4238	4321	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4242,11 +4325,12 @@
4242	4325	{
4243	4326	}
4244	4327	}
	4328	+
4245	4329	String lastname;
4246	4330
4247	4331	void saveAs()
4248	4332	{
4249		- if (GrafreeD.standAlone)
	4333	+ if (Grafreed.standAlone)
4250	4334	{
4251	4335	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4252	4336	browser.setVisible(true);
..	..	@@ -4351,13 +4435,13 @@
4351	4435	try
4352	4436	{
4353	4437	FileOutputStream ostream = new FileOutputStream(filename);
4354		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4355		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4438	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4439	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4356	4440
4357	4441	Object3D objectparent = obj.parent;
4358	4442	obj.parent = null;
4359	4443
4360		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4444	+ Object3D object = (Object3D) Grafreed.clone(obj);
4361	4445
4362	4446	obj.parent = objectparent;
4363	4447
..	..	@@ -4369,8 +4453,8 @@
4369	4453	p.writeObject(object);
4370	4454	p.flush();
4371	4455
	4456	+ zstream.close();
4372	4457	ostream.close();
4373		- // zstream.close();
4374	4458
4375	4459	// group.selection.get(0).parent = parent;
4376	4460	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4391,7 +4475,7 @@
4391	4475	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4392	4476	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4393	4477	copy.generatePOV(buffer);
4394		- if (GrafreeD.standAlone)
	4478	+ if (Grafreed.standAlone)
4395	4479	{
4396	4480	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4397	4481	browser.show();
..	..	@@ -4430,16 +4514,17 @@
4430	4514	//MenuItem normalLensItem;
4431	4515	MenuItem editCameraItem;
4432	4516	MenuItem revertCameraItem;
4433		- CheckboxMenuItem toggleLiveItem;
4434	4517	MenuItem stepItem;
4435		- CheckboxMenuItem toggleFullItem;
	4518	+ CheckboxMenuItem toggleLiveItem;
	4519	+ CheckboxMenuItem toggleFullScreenItem;
	4520	+ CheckboxMenuItem toggleTimelineItem;
4436	4521	CheckboxMenuItem toggleRenderItem;
4437	4522	CheckboxMenuItem toggleDebugItem;
4438	4523	CheckboxMenuItem toggleFrustumItem;
4439	4524	CheckboxMenuItem toggleFootContactItem;
4440	4525	CheckboxMenuItem toggleDLItem;
4441	4526	CheckboxMenuItem toggleTextureItem;
4442		- CheckboxMenuItem toggleRandomItem;
	4527	+ CheckboxMenuItem toggleSwitchItem;
4443	4528	CheckboxMenuItem toggleRootItem;
4444	4529	CheckboxMenuItem animationItem;
4445	4530	CheckboxMenuItem toggleHandleItem;
..	..	@@ -4447,23 +4532,26 @@
4447	4532	JSplitPane mainPanel;
4448	4533	JScrollPane scrollpane;
4449	4534	JPanel toolbarPanel;
4450		- JPanel treePanel;
	4535	+ cGridBag treePanel;
4451	4536	JPanel radioPanel;
4452	4537	ButtonGroup buttonGroup;
4453		- JPanel ctrlPanel;
4454		- JPanel materialPanel;
	4538	+ cGridBag ctrlPanel;
	4539	+ cGridBag materialPanel;
4455	4540	JScrollPane infoPanel;
4456		- JPanel optionsPanel;
	4541	+ cGridBag optionsPanel;
4457	4542	JTabbedPane objectPanel;
4458		- JPanel XYZPanel;
	4543	+ cGridBag XYZPanel;
4459	4544	JSplitPane gridPanel;
4460	4545	JSplitPane bigPanel;
4461		- JPanel bigThree;
4462		- JTabbedPane jtp;
4463		- JPanel cameraPanel;
	4546	+ cGridBag bigThree;
	4547	+ cGridBag scenePanel;
	4548	+ cGridBag centralPanel;
	4549	+ JSplitPane cameraPanel;
	4550	+ JPanel timelinePanel;
	4551	+ JMenuBar timelineMenubar;
4464	4552	JSplitPane framePanel;
4465	4553	JTextArea/Field/ nameField;
4466		- cButton textureButton;
	4554	+ //cButton textureButton;
4467	4555	cButton okButton;
4468	4556	cButton applyButton;
4469	4557	cButton cancelButton;
..	..	@@ -4510,65 +4598,67 @@
4510	4598	// MATERIAL
4511	4599	JLabel materialLabel;
4512	4600	JLabel colorLabel;
4513		- NumberSlider colorField;
	4601	+ cNumberSlider colorField;
4514	4602	JLabel modulationLabel;
4515		- NumberSlider modulationField;
	4603	+ cNumberSlider modulationField;
4516	4604	JLabel metalnessLabel;
4517		- NumberSlider metalnessField;
	4605	+ cNumberSlider metalnessField;
4518	4606	JLabel diffuseLabel;
4519		- NumberSlider diffuseField;
	4607	+ cNumberSlider diffuseField;
4520	4608	JLabel specularLabel;
4521		- NumberSlider specularField;
	4609	+ cNumberSlider specularField;
4522	4610	JLabel shininessLabel;
4523		- NumberSlider shininessField;
	4611	+ cNumberSlider shininessField;
4524	4612	JLabel shiftLabel;
4525		- NumberSlider shiftField;
	4613	+ cNumberSlider shiftField;
4526	4614	JLabel ambientLabel;
4527		- NumberSlider ambientField;
	4615	+ cNumberSlider ambientField;
4528	4616	JLabel lightareaLabel;
4529		- NumberSlider lightareaField;
	4617	+ cNumberSlider lightareaField;
4530	4618	JLabel diffusenessLabel;
4531		- NumberSlider diffusenessField;
	4619	+ cNumberSlider diffusenessField;
4532	4620	JLabel velvetLabel;
4533		- NumberSlider velvetField;
	4621	+ cNumberSlider velvetField;
4534	4622	JLabel sheenLabel;
4535		- NumberSlider sheenField;
	4623	+ cNumberSlider sheenField;
4536	4624	JLabel subsurfaceLabel;
4537		- NumberSlider subsurfaceField;
	4625	+ cNumberSlider subsurfaceField;
4538	4626	//JLabel bumpLabel;
4539	4627	//NumberSlider bumpField;
4540	4628	JLabel backlitLabel;
4541		- NumberSlider backlitField;
	4629	+ cNumberSlider backlitField;
4542	4630	JLabel anisoLabel;
4543		- NumberSlider anisoField;
	4631	+ cNumberSlider anisoField;
4544	4632	JLabel anisoVLabel;
4545		- NumberSlider anisoVField;
	4633	+ cNumberSlider anisoVField;
4546	4634	JLabel cameraLabel;
4547		- NumberSlider cameraField;
	4635	+ cNumberSlider cameraField;
4548	4636	JLabel selfshadowLabel;
4549		- NumberSlider selfshadowField;
	4637	+ cNumberSlider selfshadowField;
4550	4638	JLabel shadowLabel;
4551		- NumberSlider shadowField;
	4639	+ cNumberSlider shadowField;
4552	4640	JLabel textureLabel;
4553		- NumberSlider textureField;
	4641	+ cNumberSlider textureField;
4554	4642	JLabel opacityLabel;
4555		- NumberSlider opacityField;
	4643	+ cNumberSlider opacityField;
4556	4644	JLabel fakedepthLabel;
4557		- NumberSlider fakedepthField;
	4645	+ cNumberSlider fakedepthField;
4558	4646	JLabel shadowbiasLabel;
4559		- NumberSlider shadowbiasField;
	4647	+ cNumberSlider shadowbiasField;
4560	4648	JLabel bumpLabel;
4561		- NumberSlider bumpField;
	4649	+ cNumberSlider bumpField;
4562	4650	JLabel noiseLabel;
4563		- NumberSlider noiseField;
	4651	+ cNumberSlider noiseField;
4564	4652	JLabel powerLabel;
4565		- NumberSlider powerField;
	4653	+ cNumberSlider powerField;
4566	4654	JLabel borderfadeLabel;
4567		- NumberSlider borderfadeField;
	4655	+ cNumberSlider borderfadeField;
4568	4656	JLabel fogLabel;
4569		- NumberSlider fogField;
	4657	+ cNumberSlider fogField;
4570	4658	JLabel opacityPowerLabel;
4571		- NumberSlider opacityPowerField;
	4659	+ cNumberSlider opacityPowerField;
4572	4660	JTree jTree;
4573	4661	//ObjectUI parent;
	4662	+
	4663	+ cNumberSlider normalpushField;
4574	4664	}