~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;
..	..	@@ -259,24 +276,40 @@
259	276	void SetupMenu()
260	277	{
261	278	frame.setMenuBar(menuBar = new MenuBar());
262		- menuBar.add(windowMenu = new Menu("File"));
263		- windowMenu.add(loadItem = new MenuItem("Load..."));
264		- windowMenu.add("-");
265		- windowMenu.add(saveItem = new MenuItem("Save"));
266		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	279	+ menuBar.add(fileMenu = new Menu("File"));
	280	+ fileMenu.add(newItem = new MenuItem("New"));
	281	+ fileMenu.add(loadItem = new MenuItem("Load..."));
	282	+
	283	+ //oe.menuBar.add(menu = new Menu("Include"));
	284	+ Menu menu = new Menu("Import");
	285	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	286	+ importOBJItem.addActionListener(this);
	287	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	288	+ import3DSItem.addActionListener(this);
	289	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	290	+ importVRMLX3DItem.addActionListener(this);
	291	+ menu.add("-");
	292	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	293	+ importGFDItem.addActionListener(this);
	294	+ fileMenu.add(menu);
	295	+ fileMenu.add("-");
	296	+
	297	+ fileMenu.add(saveItem = new MenuItem("Save"));
	298	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
267	299	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
268		- windowMenu.add("-");
269		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
270		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
271		- windowMenu.add("-");
	300	+ fileMenu.add("-");
	301	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	302	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	303	+ fileMenu.add("-");
272	304	if (client.parent != null)
273	305	{
274		- windowMenu.add(closeItem = new MenuItem("Close"));
	306	+ fileMenu.add(closeItem = new MenuItem("Close"));
275	307	} else
276	308	{
277		- windowMenu.add(closeItem = new MenuItem("Exit"));
	309	+ fileMenu.add(closeItem = new MenuItem("Exit"));
278	310	}
279	311
	312	+ newItem.addActionListener(this);
280	313	loadItem.addActionListener(this);
281	314	saveItem.addActionListener(this);
282	315	saveAsItem.addActionListener(this);
..	..	@@ -285,77 +318,26 @@
285	318	//povItem.addActionListener(this);
286	319	closeItem.addActionListener(this);
287	320
288		- menuBar.add(cameraMenu = new Menu("View"));
289		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
290		- //zBufferItem.addActionListener(this);
291		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
292		- //normalLensItem.addActionListener(this);
293		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
294		- revertCameraItem.addActionListener(this);
295		- cameraMenu.add(toggleFullItem = new CheckboxMenuItem("Full Screen"));
296		- toggleFullItem.addItemListener(this);
297		- toggleFullItem.setState(CameraPane.FULLSCREEN);
298		- cameraMenu.add("-");
299		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
300		- toggleTextureItem.addItemListener(this);
301		- 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);
325		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
326		- toggleHandleItem.addItemListener(this);
327		- toggleHandleItem.setState(CameraPane.HANDLES);
328		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
329		- togglePaintItem.addItemListener(this);
330		- togglePaintItem.setState(CameraPane.PAINTMODE);
331		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
332		-// toggleRootItem.addItemListener(this);
333		-// toggleRootItem.setState(false);
334		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
335		-// animationItem.addItemListener(this);
336		-// animationItem.setState(CameraPane.ANIMATION);
337		- cameraMenu.add("-");
338		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
339		- editCameraItem.addActionListener(this);
340		-
341	321	objectPanel = new JTabbedPane();
342	322	toolbarPanel = new JPanel();
343	323	toolbarPanel.setName("Toolbar");
344		- treePanel = new JPanel();
	324	+ treePanel = new cGridBag();
345	325	treePanel.setName("Tree");
346		- ctrlPanel = new JPanel(); // new GridBagLayout());
	326	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
347	327	ctrlPanel.setName("Edit");
348		- materialPanel = new JPanel();
	328	+ materialPanel = new cGridBag().setVertical(true);
349	329	materialPanel.setName("Material");
350	330	/JTextPane/
351	331	infoarea = createTextPane();
	332	+ doc = infoarea.getStyledDocument();
	333	+
352	334	infoarea.setEditable(true);
353	335	SetText();
354	336	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
355	337	// infoarea.setOpaque(false);
356	338	// //infoarea.setForeground(textcolor);
357		- infoarea.setLineWrap(true);
358		- infoarea.setWrapStyleWord(true);
	339	+// TEXTAREA infoarea.setLineWrap(true);
	340	+// TEXTAREA infoarea.setWrapStyleWord(true);
359	341	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
360	342	infoPanel.setPreferredSize(new Dimension(50, 200));
361	343	infoPanel.setName("Info");
..	..	@@ -366,16 +348,16 @@
366	348	mainPanel.setName("Main");
367	349	mainPanel.setContinuousLayout(true);
368	350	mainPanel.setOneTouchExpandable(true);
369		- mainPanel.setDividerLocation(1.0);
370	351	mainPanel.setDividerSize(9);
371		- mainPanel.setResizeWeight(0);
	352	+ mainPanel.setDividerLocation(0.5); //1.0);
	353	+ mainPanel.setResizeWeight(0.5);
372	354
373	355	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
374	356	//mainPanel.setLayout(new GridBagLayout());
375	357	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
376		- treePanel.setLayout(new GridBagLayout());
377		- ctrlPanel.setLayout(new GridBagLayout());
378		- materialPanel.setLayout(new GridBagLayout());
	358	+// treePanel.setLayout(new GridBagLayout());
	359	+ //ctrlPanel.setLayout(new GridBagLayout());
	360	+ //materialPanel.setLayout(new GridBagLayout());
379	361
380	362	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
381	363	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -414,7 +396,7 @@
414	396	static String newline = "\n";
415	397	protected static final String buttonString = "JButton";
416	398	StyledDocument doc;
417		- JTextArea infoarea;
	399	+ JTextPane infoarea;
418	400
419	401	void ClearInfo()
420	402	{
..	..	@@ -463,13 +445,13 @@
463	445	//SendInfo("Name:", "bold");
464	446	if (sel.GetTextures() != null \|\| debug)
465	447	{
466		- si.SendInfo(sel.toString(), "bold");
	448	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
467	449	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
468	450	if (sel.Size() > 0)
469	451	{
470	452	si.SendInfo("#children = " + sel.Size(), "regular");
471	453	}
472		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	454	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
473	455	if (debug)
474	456	{
475	457	try
..	..	@@ -481,7 +463,10 @@
481	463	}
482	464
483	465	if (full)
484		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	466	+ {
	467	+ si.SendInfo(" BBox min: " + minima, "regular");
	468	+ si.SendInfo(" BBox max: " + maxima, "regular");
	469	+ }
485	470
486	471	if (sel.bRep != null)
487	472	{
..	..	@@ -508,7 +493,7 @@
508	493	}
509	494	if (sel.support != null)
510	495	{
511		- si.SendInfo(" support: " + sel.support, "regular");
	496	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
512	497	}
513	498	if (sel.scriptnode != null)
514	499	{
..	..	@@ -579,6 +564,9 @@
579	564	{
580	565	CameraPane.pointflow = (PointFlow) sel;
581	566	}
	567	+
	568	+ si.SendInfo("_____________________", "regular");
	569	+ si.SendInfo("", "regular");
582	570	}
583	571	}
584	572
..	..	@@ -594,52 +582,68 @@
594	582	}
595	583	}
596	584
597		- private JTextArea createTextPane()
598		- {
599		- String[] initString =
	585	+ void ToggleFullScreen()
600	586	{
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++)
	587	+ if (CameraPane.FULLSCREEN)
632	588	{
633		- doc.insertString(doc.getLength(), initString[i],
634		- doc.getStyle(initStyles[i]));
	589	+ frame.getContentPane().remove(/"Center",/bigThree);
	590	+ framePanel.add(bigThree);
	591	+ frame.getContentPane().add(/"Center",/framePanel);
	592	+ } else
	593	+ {
	594	+ frame.getContentPane().remove(/"Center",/framePanel);
	595	+ framePanel.remove(bigThree);
	596	+ frame.getContentPane().add(/"Center",/bigThree);
635	597	}
636		- }
637		- } catch (BadLocationException ble)
638		- {
639		- System.err.println("Couldn't insert initial text into text pane.");
	598	+ cameraView.ToggleFullScreen();
640	599	}
641	600
642		- return new JTextArea(); // textPane;
	601	+ private JTextPane createTextPane()
	602	+ {
	603	+// TEXTAREA String[] initString =
	604	+// {
	605	+// "This is an editable JTextPane, ", //regular
	606	+// "another ", //italic
	607	+// "styled ", //bold
	608	+// "text ", //small
	609	+// "component, ", //large
	610	+// "which supports embedded components..." + newline,//regular
	611	+// " " + newline, //button
	612	+// "...and embedded icons..." + newline, //regular
	613	+// " ", //icon
	614	+// newline + "JTextPane is a subclass of JEditorPane that "
	615	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	616	+// + "cover methods for interacting with those objects."
	617	+// };
	618	+//
	619	+// String[] initStyles =
	620	+// {
	621	+// "regular", "italic", "bold", "small", "large",
	622	+// "regular", "button", "regular", "icon",
	623	+// "regular"
	624	+// };
	625	+//
	626	+// JTextPane textPane = new JTextPane();
	627	+// textPane.setEditable(true);
	628	+// /StyledDocument/ doc = textPane.getStyledDocument();
	629	+// addStylesToDocument(doc);
	630	+//
	631	+// try
	632	+// {
	633	+// for (int j = 0; j < 2; j++)
	634	+// {
	635	+// for (int i = 0; i < initString.length; i++)
	636	+// {
	637	+// doc.insertString(doc.getLength(), initString[i],
	638	+// doc.getStyle(initStyles[i]));
	639	+// }
	640	+// }
	641	+// } catch (BadLocationException ble)
	642	+// {
	643	+// System.err.println("Couldn't insert initial text into text pane.");
	644	+// }
	645	+
	646	+ return new JTextPane(); // textPane;
643	647	}
644	648
645	649	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -692,7 +696,7 @@
692	696	protected static ImageIcon createImageIcon(String path,
693	697	String description)
694	698	{
695		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	699	+ java.net.URL imgURL = Grafreed.class.getResource(path);
696	700	if (imgURL != null)
697	701	{
698	702	return new ImageIcon(imgURL, description);
..	..	@@ -724,6 +728,7 @@
724	728	// NumberSlider vDivsField;
725	729	// JCheckBox endcaps;
726	730	JCheckBox liveCB;
	731	+ JCheckBox selectCB;
727	732	JCheckBox hideCB;
728	733	JCheckBox link2masterCB;
729	734	JCheckBox markCB;
..	..	@@ -739,115 +744,83 @@
739	744	JButton slowerButton;
740	745	JButton fasterButton;
741	746	JButton remarkButton;
	747	+
	748	+ cGridBag namePanel;
	749	+ cGridBag setupPanel;
	750	+ cGridBag commandsPanel;
	751	+ cGridBag pushPanel;
	752	+ cGridBag fillPanel;
742	753
743		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	754	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
744	755	{
745	756	JCheckBox cb;
746	757
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);
	758	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
752	759	cb.addItemListener(this);
753		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
754		- oe.aConstraints.gridwidth = 1;
755		- oe.aConstraints.gridx += 1;
756	760
757	761	return cb;
758	762	}
759	763
760		- cButton AddButton(ObjEditor oe, String label)
	764	+ cButton AddButton(cGridBag panel, String label)
761	765	{
762	766	cButton cb;
763	767
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);
	768	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
769	769	cb.addActionListener(this);
770		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
771		- oe.aConstraints.gridwidth = 1;
772		- oe.aConstraints.gridx += 1;
773	770
774	771	return cb;
775	772	}
776	773
777		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	774	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
778	775	{
779	776	JComboBox combo;
780	777
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;
	778	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
784	779	combo.addActionListener(this);
785	780
786	781	return combo;
787	782	}
788	783
789		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	784	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
790	785	{
791		- NumberSlider combo;
	786	+ cGridBag control = new cGridBag();
	787	+
	788	+ cNumberSlider combo;
792	789
793	790	JLabel jlabel = new JLabel(label);
794		-
795		- aConstraints.fill = GridBagConstraints.VERTICAL;
796	791	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		-
	792	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	793	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
806	794	combo.setFloat(current);
807		-
808		- combo.label = jlabel;
809		-
810		- combo.addChangeListener(this);
811		-
812		- return combo;
	795	+
	796	+ panel.add(control);
	797	+
	798	+ return control;
813	799	}
814	800
815		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	801	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
816	802	{
817		- NumberSlider combo;
	803	+ cGridBag control = new cGridBag();
	804	+
	805	+ cNumberSlider combo;
818	806
819	807	JLabel jlabel = new JLabel(label);
820		-
821		- aConstraints.fill = GridBagConstraints.VERTICAL;
822	808	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		-
	809	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	810	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
832	811	combo.setInteger(current);
833	812
834		- combo.label = jlabel;
835		-
836		- combo.addChangeListener(this);
837		-
838		- return combo;
	813	+ panel.add(control);
	814	+
	815	+ return control;
839	816	}
840	817
841		- JTextArea AddText(JPanel ctrlPanel, String name)
	818	+ JTextArea AddText(cGridBag ctrlPanel, String name)
842	819	{
843	820	JTextArea text;
844	821
845		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
846		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
847		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	822	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
848	823	text.addCaretListener(this);
849		- aConstraints.gridx += 1;
850		- aConstraints.gridwidth = 1;
851	824
852	825	return text;
853	826	}
..	..	@@ -877,9 +850,16 @@
877	850	objEditor.ctrlPanel.remove(j);
878	851	}
879	852
	853	+ void Remove(cNumberSlider j)
	854	+ {
	855	+ j.removeChangeListener(this);
	856	+ //objEditor.ctrlPanel.remove(j.label);
	857	+ objEditor.ctrlPanel.remove(j);
	858	+ }
	859	+
880	860	/*
881	861	*/
882		- void Return() // ObjEditor oe)
	862	+ void Return0() // ObjEditor oe)
883	863	{
884	864	aConstraints.gridy += 1;
885	865	aConstraints.gridx = 0;
..	..	@@ -934,35 +914,73 @@
934	914
935	915	void SetupUI2(ObjEditor oe)
936	916	{
937		-// oe.aConstraints.weightx = 0;
938		-// oe.aConstraints.weighty = 0;
939		-// oe.aConstraints.gridx = 0;
940		-// oe.aConstraints.gridy = 0;
941		- SetupName(oe);
	917	+ //SetupName(oe);
	918	+
	919	+ namePanel = new cGridBag();
	920	+
	921	+ nameField = AddText(namePanel, copy.GetName());
	922	+ namePanel.add(nameField);
	923	+ oe.ctrlPanel.add(namePanel);
	924	+
	925	+ oe.ctrlPanel.Return();
942	926
943	927	if (!GroupEditor.allparams)
944	928	return;
945	929
946		- liveCB = AddCheckBox(oe, "Live", copy.live);
947		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
948		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	930	+ setupPanel = new cGridBag().setVertical(false);
	931	+
	932	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	933	+ liveCB.setToolTipText("Animate object");
	934	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	935	+ selectCB.setToolTipText("Make object selectable");
949	936	// 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");
	937	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	938	+ hideCB.setToolTipText("Hide object");
	939	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	940	+ markCB.setToolTipText("Set the animation target transform");
	941	+
	942	+ rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	943	+ rewindCB.setToolTipText("Rewind animation");
	944	+
	945	+ randomCB = AddCheckBox(setupPanel, "Random", copy.random);
	946	+ randomCB.setToolTipText("Option for switch node");
	947	+
	948	+ if (Globals.ADVANCED)
	949	+ {
	950	+ link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
	951	+ link2masterCB.setToolTipText("Attach to support");
	952	+ speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	953	+ speedupCB.setToolTipText("Option motion capture");
	954	+ }
	955	+
	956	+ oe.ctrlPanel.add(setupPanel);
	957	+ oe.ctrlPanel.Return();
	958	+
	959	+ commandsPanel = new cGridBag().setVertical(false);
	960	+
	961	+ resetButton = AddButton(commandsPanel, "Reset");
	962	+ resetButton.setToolTipText("Jump to frame zero");
	963	+ stepButton = AddButton(commandsPanel, "Step");
	964	+ stepButton.setToolTipText("Step one frame");
956	965	// resetAllButton = AddButton(oe, "Reset All");
957	966	// stepAllButton = AddButton(oe, "Step All");
958		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
959	967	// Return();
960		- slowerButton = AddButton(oe, "Slow");
961		- fasterButton = AddButton(oe, "Fast");
962		- remarkButton = AddButton(oe, "Rem");
	968	+ slowerButton = AddButton(commandsPanel, "Slow");
	969	+ slowerButton.setToolTipText("Decrease animation speed");
	970	+ fasterButton = AddButton(commandsPanel, "Fast");
	971	+ fasterButton.setToolTipText("Increase animation speed");
	972	+ remarkButton = AddButton(commandsPanel, "Remark");
	973	+ remarkButton.setToolTipText("Set the current transform as the target");
963	974
964		- Return();
	975	+ oe.ctrlPanel.add(commandsPanel);
	976	+ oe.ctrlPanel.Return();
965	977
	978	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	979	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	980	+ //Return();
	981	+
	982	+ oe.ctrlPanel.Return();
	983	+
966	984	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
967	985	// ObjEditor.aConstraints.gridx += 1;
968	986
..	..	@@ -1056,7 +1074,7 @@
1056	1074	oe.aConstraints.gridwidth = 1;
1057	1075	/**/
1058	1076	nameField = AddText(oe.ctrlPanel, copy.GetName());
1059		- Return();
	1077	+ oe.ctrlPanel.Return();
1060	1078
1061	1079	//ctrlPanel.add(textureButton = new Button("Texture..."));
1062	1080	//textureButton.setEnabled(false);
..	..	@@ -1158,10 +1176,22 @@
1158	1176	//JPanel worldPanel =
1159	1177	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1160	1178	//worldPanel.setName("World");
1161		- /JPanel/ cameraPanel =
1162		- new JPanel(new BorderLayout());
1163		- cameraPanel.add(cameraView);
	1179	+ centralPanel = new cGridBag();
	1180	+ centralPanel.preferredWidth = 20;
	1181	+ timelinePanel = new JPanel(new BorderLayout());
	1182	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1164	1183
	1184	+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
	1185	+ cameraPanel.setContinuousLayout(true);
	1186	+ cameraPanel.setOneTouchExpandable(true);
	1187	+// cameraPanel.setDividerLocation(0.9);
	1188	+// cameraPanel.setDividerSize(9);
	1189	+ cameraPanel.setResizeWeight(1.0);
	1190	+
	1191	+ centralPanel.add(cameraView);
	1192	+ //frame.setJMenuBar(timelineMenubar);
	1193	+ //centralPanel.add(timelinePanel);
	1194	+
1165	1195	//topView.camera = ;
1166	1196	//frontView.camera = new Camera(2);
1167	1197	//sideView.camera = new Camera(3);
..	..	@@ -1177,12 +1207,13 @@
1177	1207	//frontView.object = copy;
1178	1208	//sideView.object = copy;
1179	1209
1180		- XYZPanel = new JPanel();
1181		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1210	+ XYZPanel = new cGridBag().setVertical(true);
	1211	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1182	1212
1183		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1184		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1185		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1213	+ XYZPanel.preferredWidth = 5;
	1214	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1215	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1216	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1186	1217
1187	1218	/*
1188	1219	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1191,7 +1222,7 @@
1191	1222	gridPanel.add(cameraView);
1192	1223	gridPanel.add(XYZPanel);
1193	1224	*/
1194		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, cameraPanel, XYZPanel); //new BorderLayout());
	1225	+ gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1195	1226	gridPanel.setContinuousLayout(true);
1196	1227	gridPanel.setOneTouchExpandable(true);
1197	1228	gridPanel.setDividerLocation(1.0);
..	..	@@ -1220,10 +1251,11 @@
1220	1251	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1221	1252	//tmp.setName("Edit");
1222	1253	objectPanel.add(materialPanel);
1223		- JPanel north = new JPanel(new BorderLayout());
1224		- north.setName("Edit");
1225		- north.add(ctrlPanel, BorderLayout.NORTH);
1226		- objectPanel.add(north);
	1254	+// JPanel north = new JPanel(new BorderLayout());
	1255	+// north.setName("Edit");
	1256	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1257	+// objectPanel.add(north);
	1258	+ objectPanel.add(ctrlPanel);
1227	1259	objectPanel.add(infoPanel);
1228	1260
1229	1261	/*
..	..	@@ -1244,16 +1276,23 @@
1244	1276	scrollpane.setWheelScrollingEnabled(true);
1245	1277	scrollpane.addMouseWheelListener(this); // Default not fast enough
1246	1278
1247		- /JTabbedPane/ jtp = new JTabbedPane();
1248		- jtp.add(scrollpane);
	1279	+ /JTabbedPane/ scenePanel = new cGridBag();
	1280	+ scenePanel.preferredWidth = 6;
	1281	+
	1282	+ JTabbedPane tabbedPane = new JTabbedPane();
	1283	+ tabbedPane.add(scrollpane);
1249	1284
1250		- jtp.add(FSPane = new cFileSystemPane(this));
	1285	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1251	1286
1252		- optionsPanel = new JPanel(new GridBagLayout());
	1287	+ optionsPanel = new cGridBag().setVertical(true);
1253	1288
1254	1289	optionsPanel.setName("Options");
1255		- jtp.add(optionsPanel);
1256		-
	1290	+
	1291	+ AddOptions(optionsPanel); //, aConstraints);
	1292	+
	1293	+ tabbedPane.add(optionsPanel);
	1294	+
	1295	+ scenePanel.add(tabbedPane);
1257	1296
1258	1297	/*
1259	1298	cTree jTree = new cTree(null);
..	..	@@ -1275,7 +1314,7 @@
1275	1314	jtp.add(tree);
1276	1315	*/
1277	1316
1278		- bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, jtp, gridPanel);
	1317	+ bigPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, scenePanel, gridPanel);
1279	1318	bigPanel.setContinuousLayout(true);
1280	1319	bigPanel.setOneTouchExpandable(true);
1281	1320	bigPanel.setDividerLocation(0.8);
..	..	@@ -1287,6 +1326,7 @@
1287	1326	//bigPanel.setSize(new Dimension(10,10));
1288	1327	//bigPanel.add(ctrlPanel);
1289	1328	//bigPanel.add(gridPanel);
	1329	+ /**
1290	1330	bigThree = new JPanel();
1291	1331	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1292	1332	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1297,20 +1337,26 @@
1297	1337	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1298	1338	aWindowConstraints.weightx = 0;
1299	1339	aWindowConstraints.weighty = 1;
1300		- bigThree.add(jtp, aWindowConstraints);
	1340	+ bigThree.add(scenePanel, aWindowConstraints);
1301	1341	aWindowConstraints.weightx = 1;
1302	1342	aWindowConstraints.gridwidth = 3;
1303	1343	// aConstraints.gridheight = 3;
1304	1344	aWindowConstraints.gridx = 1;
1305	1345	aWindowConstraints.fill = GridBagConstraints.BOTH;
1306		- bigThree.add(cameraPanel, aWindowConstraints);
	1346	+ bigThree.add(centralPanel, aWindowConstraints);
1307	1347	aWindowConstraints.weightx = 0;
1308	1348	aWindowConstraints.gridx = 4;
1309	1349	aWindowConstraints.gridwidth = 1;
1310	1350	// aConstraints.gridheight = 3;
1311	1351	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1312	1352	bigThree.add(XYZPanel, aWindowConstraints);
	1353	+ /**/
1313	1354
	1355	+ bigThree = new cGridBag();
	1356	+ bigThree.addComponent(scenePanel);
	1357	+ bigThree.addComponent(centralPanel);
	1358	+ bigThree.addComponent(XYZPanel);
	1359	+
1314	1360	// // SIDE EFFECT!!!
1315	1361	// aConstraints.gridx = 0;
1316	1362	// aConstraints.gridy = 0;
..	..	@@ -1331,13 +1377,14 @@
1331	1377	//worldPane.add(bigPanel);
1332	1378	//worldPane.add(worldPanel);
1333	1379	/**/
1334		- frame.getContentPane().add(/"Center",/framePanel);
	1380	+ //frame.getContentPane().add(/"Center",/framePanel);
	1381	+ frame.add(/"Center",/framePanel);
1335	1382	//frame.getContentPane().add(/"Center",/ worldPane);
1336	1383
1337	1384	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1338	1385
1339		- frame.setSize(1024, 768);
1340		- frame.show();
	1386	+ frame.setSize(1280, 860);
	1387	+ frame.setVisible(true);
1341	1388
1342	1389	gridPanel.setDividerLocation(1.0);
1343	1390
..	..	@@ -1352,6 +1399,10 @@
1352	1399	});
1353	1400	}
1354	1401
	1402	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1403	+ {
	1404	+ }
	1405	+
1355	1406	JTree GetTree()
1356	1407	{
1357	1408	return objEditor.jTree;
..	..	@@ -1363,260 +1414,173 @@
1363	1414	ctrlPanel.removeAll();
1364	1415	}
1365	1416
1366		- void SetupMaterial(JPanel ctrlPanel)
	1417	+ void SetupMaterial(cGridBag panel)
1367	1418	{
1368		- aConstraints.weighty = 0;
1369		- //aConstraints.weightx = 1;
1370		- /*
	1419	+ /*
1371	1420	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1372	1421	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1373		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1374		- aConstraints.gridx += 1;
1375	1422	*/
1376	1423
1377		- aConstraints.gridwidth = 1;
1378		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1379		- aConstraints.gridx += 1;
1380		- aConstraints.weighty = 0;
1381		- aConstraints.gridwidth = 1;
	1424	+ cGridBag editBar = new cGridBag().setVertical(false);
	1425	+
	1426	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1427	+ createMaterialButton.setToolTipText("Create material");
1382	1428
1383	1429	/*
1384	1430	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1385		- aConstraints.gridx += 1;
1386		- aConstraints.weighty = 0;
1387		- aConstraints.gridwidth = 1;
1388	1431	*/
1389	1432
1390		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1391		- aConstraints.gridx += 1;
	1433	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1434	+ clearMaterialButton.setToolTipText("Clear material");
	1435	+
	1436	+ if (Globals.ADVANCED)
	1437	+ {
	1438	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1439	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1440	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1441	+ }
1392	1442
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;
	1443	+ editBar.preferredHeight = 15;
	1444	+
	1445	+ panel.add(editBar);
	1446	+
1407	1447	/**/
1408	1448	//aConstraints.weighty = 0;
1409	1449	////aConstraints.weightx = 1;
1410	1450	//aConstraints.weighty = 1;
1411	1451	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1412	1452	//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;
	1453	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1418	1454
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;
	1455	+ cGridBag colorSection = new cGridBag().setVertical(true);
	1456	+
	1457	+ cGridBag color = new cGridBag();
	1458	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1459	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1460	+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1461	+ //colorField.preferredWidth = 200;
	1462	+ colorSection.add(color);
1429	1463
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;
	1464	+ cGridBag modulation = new cGridBag();
	1465	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1466	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1467	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1468	+ colorSection.add(modulation);
1439	1469
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;
	1470	+ cGridBag texture = new cGridBag();
	1471	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1472	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1473	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1474	+ colorSection.add(texture);
1449	1475
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;
	1476	+ cGridBag anisoU = new cGridBag();
	1477	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1478	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1479	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1480	+ colorSection.add(anisoU);
1459	1481
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;
	1482	+ cGridBag anisoV = new cGridBag();
	1483	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1484	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1485	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1486	+ colorSection.add(anisoV);
1469	1487
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;
	1488	+ cGridBag shadowbias = new cGridBag();
	1489	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1490	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1491	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1492	+ colorSection.add(shadowbias);
1479	1493
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;
	1494	+ panel.add(new JSeparator());
	1495	+
	1496	+ panel.add(colorSection);
	1497	+
	1498	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1499	+
	1500	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1501	+
	1502	+ cGridBag diffuse = new cGridBag();
	1503	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1504	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1505	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1506	+ diffuseSection.add(diffuse);
1488	1507
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;
	1508	+ cGridBag diffuseness = new cGridBag();
	1509	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1510	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1511	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1512	+ diffuseSection.add(diffuseness);
1498	1513
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;
	1514	+ cGridBag selfshadow = new cGridBag();
	1515	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1516	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1517	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1518	+ diffuseSection.add(selfshadow);
1508	1519
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;
	1520	+ cGridBag sheen = new cGridBag();
	1521	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1522	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1523	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1524	+ diffuseSection.add(sheen);
1518	1525
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;
	1526	+ cGridBag subsurface = new cGridBag();
	1527	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1528	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1529	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1530	+ diffuseSection.add(subsurface);
1528	1531
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;
	1532	+ cGridBag shadow = new cGridBag();
	1533	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1534	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1535	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1536	+ diffuseSection.add(shadow);
1538	1537
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;
	1538	+ cGridBag fakedepth = new cGridBag();
	1539	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1540	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1541	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1542	+ diffuseSection.add(fakedepth);
1548	1543
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;
	1544	+ panel.add(new JSeparator());
	1545	+
	1546	+ panel.add(diffuseSection);
	1547	+
	1548	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1549	+
	1550	+ cGridBag specularSection = new cGridBag().setVertical(true);
1558	1551
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;
	1552	+ cGridBag specular = new cGridBag();
	1553	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1554	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1555	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1556	+ specularSection.add(specular);
1567	1557
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;
	1558	+ cGridBag lightarea = new cGridBag();
	1559	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1560	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1561	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1562	+ specularSection.add(lightarea);
1577	1563
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;
	1564	+ cGridBag shininess = new cGridBag();
	1565	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1566	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1567	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1568	+ specularSection.add(shininess);
1587	1569
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;
	1570	+ cGridBag metalness = new cGridBag();
	1571	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1572	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1573	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1574	+ specularSection.add(metalness);
1597	1575
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;
	1576	+ cGridBag velvet = new cGridBag();
	1577	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1578	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1579	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1580	+ specularSection.add(velvet);
1607	1581
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();
	1582	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1583	+ //Return();
1620	1584	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1621	1585	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1622	1586	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1627,130 +1591,93 @@
1627	1591	// aConstraints.gridy += 1;
1628	1592	// aConstraints.gridwidth = 1;
1629	1593
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	1594
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;
	1595	+ panel.add(new JSeparator());
	1596	+
	1597	+ panel.add(specularSection);
	1598	+
	1599	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1600	+
	1601	+ cGridBag globalSection = new cGridBag().setVertical(true);
1648	1602
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;
	1603	+ cGridBag camera = new cGridBag();
	1604	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1605	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1606	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1607	+ globalSection.add(camera);
1658	1608
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;
	1609	+ cGridBag ambient = new cGridBag();
	1610	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1611	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1612	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1613	+ globalSection.add(ambient);
1668	1614
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;
	1615	+ cGridBag backlit = new cGridBag();
	1616	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1617	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1618	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1619	+ globalSection.add(backlit);
1679	1620
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;
	1621	+ cGridBag opacity = new cGridBag();
	1622	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1623	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1624	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1625	+ globalSection.add(opacity);
1689	1626
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;
	1627	+ panel.add(new JSeparator());
	1628	+
	1629	+ panel.add(globalSection);
	1630	+
	1631	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1632	+
	1633	+ cGridBag textureSection = new cGridBag().setVertical(true);
1699	1634
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;
	1635	+ cGridBag bump = new cGridBag();
	1636	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1637	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1638	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1639	+ textureSection.add(bump);
1709	1640
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;
	1641	+ cGridBag noise = new cGridBag();
	1642	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1643	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1644	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1645	+ textureSection.add(noise);
1719	1646
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;
	1647	+ cGridBag power = new cGridBag();
	1648	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1649	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1650	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1651	+ textureSection.add(power);
1729	1652
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;
	1653	+ cGridBag borderfade = new cGridBag();
	1654	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1655	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1656	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1657	+ textureSection.add(borderfade);
1739	1658
1740		- //aConstraints.weighty = 1;
1741		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1742		- //aConstraints.gridx += 1;
1743		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1744		- aConstraints.weighty = 0;
	1659	+ cGridBag fog = new cGridBag();
	1660	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1661	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1662	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1663	+ textureSection.add(fog);
1745	1664
1746		- aConstraints.gridx = 0;
1747		- aConstraints.gridy = 0;
1748		- aConstraints.gridwidth = 1;
	1665	+ cGridBag opacityPower = new cGridBag();
	1666	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	1667	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1668	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	1669	+ textureSection.add(opacityPower);
	1670	+
	1671	+ panel.add(new JSeparator());
	1672	+
	1673	+ panel.add(textureSection);
	1674	+
	1675	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1749	1676
1750	1677	SetMaterial(copy); // .GetMaterial());
1751	1678
1752		- colorField.addChangeListener(this);
1753		- modulationField.addChangeListener(this);
	1679	+ //colorField.addChangeListener(this);
	1680	+// modulationField.addChangeListener(this);
1754	1681	metalnessField.addChangeListener(this);
1755	1682	diffuseField.addChangeListener(this);
1756	1683	specularField.addChangeListener(this);
..	..	@@ -1780,12 +1707,15 @@
1780	1707	opacityPowerField.addChangeListener(this);
1781	1708	/**/
1782	1709
1783		- resetSlidersButton.addActionListener(this);
1784	1710	clearMaterialButton.addActionListener(this);
1785	1711	createMaterialButton.addActionListener(this);
1786		-
1787		- propagateToggle.addItemListener(this);
1788		- multiplyToggle.addItemListener(this);
	1712	+
	1713	+ if (Globals.ADVANCED)
	1714	+ {
	1715	+ resetSlidersButton.addActionListener(this);
	1716	+ propagateToggle.addItemListener(this);
	1717	+ multiplyToggle.addItemListener(this);
	1718	+ }
1789	1719	}
1790	1720
1791	1721	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1956,7 +1886,7 @@
1956	1886
1957	1887	//? flashIt = false;
1958	1888	CameraPane pane = (CameraPane) cameraView;
1959		- pane.clickStart(location.x, location.y, 0);
	1889	+ pane.clickStart(location.x, location.y, 0, 0);
1960	1890	pane.clickEnd(location.x, location.y, 0, true);
1961	1891
1962	1892	if (group.selection.size() == 1)
..	..	@@ -2005,6 +1935,7 @@
2005	1935	e2.printStackTrace();
2006	1936	}
2007	1937	}
	1938	+
2008	1939	LoadJMEThread loadThread;
2009	1940
2010	1941	class LoadJMEThread extends Thread
..	..	@@ -2062,6 +1993,7 @@
2062	1993	//LoadFile0(filename, converter);
2063	1994	}
2064	1995	}
	1996	+
2065	1997	LoadOBJThread loadObjThread;
2066	1998
2067	1999	class LoadOBJThread extends Thread
..	..	@@ -2413,11 +2345,11 @@
2413	2345
2414	2346	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2415	2347	{
2416		- if (GrafreeD.standAlone)
	2348	+ if (Grafreed.standAlone)
2417	2349	{
2418	2350	/**/
2419	2351	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2420		- browser.show();
	2352	+ browser.setVisible(true);
2421	2353	String filename = browser.getFile();
2422	2354	if (filename != null && filename.length() > 0)
2423	2355	{
..	..	@@ -2562,6 +2494,7 @@
2562	2494	}
2563	2495	if (input == null)
2564	2496	{
	2497	+ new Exception().printStackTrace();
2565	2498	System.exit(0);
2566	2499	}
2567	2500
..	..	@@ -2776,7 +2709,8 @@
2776	2709	return;
2777	2710	}
2778	2711
2779		- multiplyToggle.setSelected(mat.multiply);
	2712	+ if (multiplyToggle != null)
	2713	+ multiplyToggle.setSelected(mat.multiply);
2780	2714
2781	2715	assert (object.projectedVertices != null);
2782	2716
..	..	@@ -2958,23 +2892,40 @@
2958	2892	// june 2013 copy.HardTouch();
2959	2893	cameraView.repaint();
2960	2894	return;
2961		- } else if (event.getSource() == toggleFullItem)
	2895	+ } else if (event.getSource() == toggleTimelineItem)
2962	2896	{
2963		- if (CameraPane.FULLSCREEN)
	2897	+ timeline ^= true;
	2898	+
	2899	+ if (timeline)
2964	2900	{
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);
	2901	+ centralPanel.remove(cameraView);
	2902	+ cameraPanel.add(cameraView);
	2903	+ centralPanel.add(cameraPanel);
	2904	+ frame.setJMenuBar(timelineMenubar);
	2905	+ wasFullScreen = CameraPane.FULLSCREEN;
	2906	+ if (!CameraPane.FULLSCREEN)
	2907	+ ToggleFullScreen();
	2908	+ toggleFullScreenItem.setEnabled(false);
2972	2909	}
	2910	+ else
	2911	+ {
	2912	+ centralPanel.remove(cameraPanel);
	2913	+ centralPanel.add(cameraView);
	2914	+ frame.setJMenuBar(null);
	2915	+ if (!wasFullScreen)
	2916	+ ToggleFullScreen();
	2917	+ toggleFullScreenItem.setEnabled(true);
	2918	+ }
	2919	+
2973	2920	frame.validate();
2974		- cameraView.ToggleFullScreen();
	2921	+ return;
	2922	+ } else if (event.getSource() == toggleFullScreenItem)
	2923	+ {
	2924	+ ToggleFullScreen();
	2925	+ frame.validate();
2975	2926
2976	2927	return;
2977		- } else if (event.getSource() == toggleRandomItem)
	2928	+ } else if (event.getSource() == toggleSwitchItem)
2978	2929	{
2979	2930	cameraView.ToggleRandom();
2980	2931	cameraView.repaint();
..	..	@@ -3005,6 +2956,10 @@
3005	2956	{
3006	2957	copy.live ^= true;
3007	2958	return;
	2959	+ } else if (event.getSource() == selectCB)
	2960	+ {
	2961	+ copy.dontselect ^= true;
	2962	+ return;
3008	2963	} else if (event.getSource() == hideCB)
3009	2964	{
3010	2965	copy.hide ^= true;
..	..	@@ -3019,6 +2974,7 @@
3019	2974	if (event.getSource() == randomCB)
3020	2975	{
3021	2976	copy.random ^= true;
	2977	+ objEditor.refreshContents();
3022	2978	return;
3023	2979	}
3024	2980	if (event.getSource() == speedupCB)
..	..	@@ -3042,8 +2998,9 @@
3042	2998
3043	2999	public void actionPerformed(ActionEvent event)
3044	3000	{
	3001	+ Object source = event.getSource();
3045	3002	// SCRIPT DIALOG
3046		- if (event.getSource() == okbutton)
	3003	+ if (source == okbutton)
3047	3004	{
3048	3005	textpanel.setVisible(false);
3049	3006	textpanel.remove(textarea);
..	..	@@ -3055,7 +3012,7 @@
3055	3012	textarea = null;
3056	3013	textpanel = null;
3057	3014	}
3058		- if (event.getSource() == cancelbutton)
	3015	+ if (source == cancelbutton)
3059	3016	{
3060	3017	textpanel.setVisible(false);
3061	3018	textpanel.remove(textarea);
..	..	@@ -3067,49 +3024,50 @@
3067	3024	//applySelf();
3068	3025	//client.refreshEditWindow();
3069	3026	//refreshContents();
3070		- if (event.getSource() == nameField)
	3027	+ if (source == nameField)
3071	3028	{
3072	3029	//System.out.println("ObjEditor " + event);
3073	3030	applySelf0(true);
3074	3031	//parent.applySelf();
3075	3032	objEditor.refreshContents();
3076		- } else if (event.getSource() == resetButton)
	3033	+ } else if (source == resetButton)
3077	3034	{
3078	3035	CameraPane.fullreset = true;
3079	3036	copy.Reset(); // ResetMeshes();
3080	3037	copy.Touch();
3081	3038	objEditor.refreshContents();
3082		- } else if (event.getSource() == stepItem)
	3039	+ } else if (source == stepItem)
3083	3040	{
3084		- cameraView.ONESTEP = true;
	3041	+ //cameraView.ONESTEP = true;
	3042	+ Globals.ONESTEP = true;
3085	3043	cameraView.repaint();
3086	3044	return;
3087		- } else if (event.getSource() == stepButton)
	3045	+ } else if (source == stepButton)
3088	3046	{
3089	3047	copy.Step();
3090	3048	copy.Touch();
3091	3049	objEditor.refreshContents();
3092		- } else if (event.getSource() == slowerButton)
	3050	+ } else if (source == slowerButton)
3093	3051	{
3094	3052	copy.Slower();
3095	3053	copy.Touch();
3096	3054	objEditor.refreshContents();
3097		- } else if (event.getSource() == fasterButton)
	3055	+ } else if (source == fasterButton)
3098	3056	{
3099	3057	copy.Faster();
3100	3058	copy.Touch();
3101	3059	objEditor.refreshContents();
3102		- } else if (event.getSource() == remarkButton)
	3060	+ } else if (source == remarkButton)
3103	3061	{
3104	3062	copy.Remark();
3105	3063	copy.Touch();
3106	3064	objEditor.refreshContents();
3107		- } else if (event.getSource() == stepAllButton)
	3065	+ } else if (source == stepAllButton)
3108	3066	{
3109	3067	copy.StepAll();
3110	3068	copy.Touch();
3111	3069	objEditor.refreshContents();
3112		- } else if (event.getSource() == resetAllButton)
	3070	+ } else if (source == resetAllButton)
3113	3071	{
3114	3072	//CameraPane.fullreset = true;
3115	3073	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3142,53 +3100,75 @@
3142	3100	// Close();
3143	3101	// }
3144	3102	// else
3145		- if (event.getSource() == resetSlidersButton)
	3103	+ if (source == resetSlidersButton)
3146	3104	{
3147	3105	ResetSliders();
3148		- } else if (event.getSource() == clearMaterialButton)
	3106	+ } else if (source == clearMaterialButton)
3149	3107	{
3150	3108	ClearMaterial();
3151		- } else if (event.getSource() == createMaterialButton)
	3109	+ } else if (source == createMaterialButton)
3152	3110	{
3153	3111	CreateMaterial();
3154		- } else if (event.getSource() == clearPanelButton)
	3112	+ } else if (source == clearPanelButton)
3155	3113	{
3156	3114	copy.ClearUI();
3157	3115	refreshContents(true);
3158		- } /*
3159		- }
3160		-
3161		- public boolean action(Event event, Object arg)
3162		- {
3163		- */ else if (event.getSource() == closeItem)
	3116	+ } else if (source == importGFDItem)
	3117	+ {
	3118	+ ImportGFD();
	3119	+ } else
	3120	+ if (source == importVRMLX3DItem)
	3121	+ {
	3122	+ ImportVRMLX3D();
	3123	+ } else
	3124	+ if (source == import3DSItem)
	3125	+ {
	3126	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3127	+ } else
	3128	+ if (source == importOBJItem)
	3129	+ {
	3130	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3131	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3132	+ browser.setVisible(true);
	3133	+ String filename = browser.getFile();
	3134	+ if (filename != null && filename.length() > 0)
	3135	+ {
	3136	+ String fullname = browser.getDirectory() + filename;
	3137	+ makeSomething(ReadOBJ(fullname), true);
	3138	+ }
	3139	+ } else
	3140	+ if (source == closeItem)
3164	3141	{
3165	3142	Close();
3166	3143	//return true;
3167		- } else if (event.getSource() == loadItem)
	3144	+ } else if (source == loadItem)
3168	3145	{
3169	3146	load();
3170	3147	//return true;
3171		- } else if (event.getSource() == saveItem)
	3148	+ } else if (source == newItem)
	3149	+ {
	3150	+ New();
	3151	+ } else if (source == saveItem)
3172	3152	{
3173	3153	save();
3174	3154	//return true;
3175		- } else if (event.getSource() == saveAsItem)
	3155	+ } else if (source == saveAsItem)
3176	3156	{
3177	3157	saveAs();
3178	3158	//return true;
3179		- } else if (event.getSource() == reexportItem)
	3159	+ } else if (source == reexportItem)
3180	3160	{
3181	3161	reexport();
3182	3162	//return true;
3183		- } else if (event.getSource() == exportAsItem)
	3163	+ } else if (source == exportAsItem)
3184	3164	{
3185	3165	export();
3186	3166	//return true;
3187		- } else if (event.getSource() == povItem)
	3167	+ } else if (source == povItem)
3188	3168	{
3189	3169	generatePOV();
3190	3170	//return true;
3191		- } else if (event.getSource() == zBufferItem)
	3171	+ } else if (source == zBufferItem)
3192	3172	{
3193	3173	try
3194	3174	{
..	..	@@ -3210,21 +3190,8 @@
3210	3190	cameraView.repaint();
3211	3191	//return true;
3212	3192	}
3213		- */ else if (event.getSource() == editCameraItem)
3214		- {
3215		- cameraView.ProtectCamera();
3216		- cameraView.repaint();
3217		- return;
3218		- } else if (event.getSource() == revertCameraItem)
3219		- {
3220		- cameraView.RevertCamera();
3221		- cameraView.repaint();
3222		- return;
3223		- } else if (event.getSource() == textureButton)
3224		- {
3225		- return; // true;
3226		- } else // combos...
3227		- if (event.getSource() == texresMenu)
	3193	+ */ else // combos...
	3194	+ if (source == texresMenu)
3228	3195	{
3229	3196	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3230	3197	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3236,27 +3203,205 @@
3236	3203	}
3237	3204	}
3238	3205
3239		- void ToggleAnimation()
	3206	+ void New()
3240	3207	{
3241		- if (!CameraPane.ANIMATION)
	3208	+ while (copy.Size() > 1)
3242	3209	{
3243		- FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3210	+ copy.remove(1);
	3211	+ }
	3212	+
	3213	+ ResetModel();
	3214	+ objEditor.refreshContents();
	3215	+ }
	3216	+
	3217	+ static public Object clone(Object o)
	3218	+ {
	3219	+ try
	3220	+ {
	3221	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3222	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3223	+
	3224	+ out.writeObject(o);
	3225	+
	3226	+ ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
	3227	+ ObjectInputStream in = new ObjectInputStream(bais);
	3228	+ Object obj = in.readObject();
	3229	+ in.close();
	3230	+ out.close();
	3231	+ return obj;
	3232	+ } catch (Exception e)
	3233	+ {
	3234	+ System.err.println(e);
	3235	+ return null;
	3236	+ }
	3237	+ }
	3238	+
	3239	+ cRadio GetCurrentTab()
	3240	+ {
	3241	+ cRadio ab;
	3242	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3243	+ {
	3244	+ ab = (cRadio)e.nextElement();
	3245	+ if(ab.GetObject() == copy)
	3246	+ {
	3247	+ return ab;
	3248	+ }
	3249	+ }
	3250	+
	3251	+ return null;
	3252	+ }
	3253	+
	3254	+ public void Save()
	3255	+ {
	3256	+ cRadio tab = GetCurrentTab();
	3257	+
	3258	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3259	+ tab.graphs[tab.undoindex++] = (Object3D)clone(copy);
	3260	+
	3261	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3262	+ {
	3263	+ tab.graphs[i] = null;
	3264	+ }
	3265	+
	3266	+ // test save
	3267	+ if (false)
	3268	+ {
	3269	+ try
	3270	+ {
	3271	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3272	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3273	+
	3274	+ p.writeObject(copy);
	3275	+
	3276	+ p.flush();
	3277	+
	3278	+ ostream.close();
	3279	+ } catch (Exception e)
	3280	+ {
	3281	+ e.printStackTrace();
	3282	+ }
	3283	+ }
	3284	+ }
	3285	+
	3286	+ void CopyChanged(Object3D obj)
	3287	+ {
	3288	+ copy.clear();
	3289	+
	3290	+ for (int i=0; i<obj.Size(); i++)
	3291	+ {
	3292	+ copy.add(obj.get(i));
	3293	+ }
	3294	+
	3295	+ copy.Touch();
	3296	+
	3297	+ ResetModel();
	3298	+ copy.HardTouch(); // recompile?
	3299	+
	3300	+ cRadio ab;
	3301	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3302	+ {
	3303	+ ab = (cRadio)e.nextElement();
	3304	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3305	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3306	+ if (test != null)
	3307	+ {
	3308	+ test.editWindow = ab.object.editWindow;
	3309	+ ab.object = test;
	3310	+ }
	3311	+ }
	3312	+
	3313	+ refreshContents();
	3314	+ }
	3315	+
	3316	+ public void Undo()
	3317	+ {
	3318	+ cRadio tab = GetCurrentTab();
	3319	+
	3320	+ if (tab.undoindex == 0)
	3321	+ {
	3322	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3323	+ return;
	3324	+ }
	3325	+
	3326	+ if (tab.graphs[tab.undoindex] == null)
	3327	+ {
	3328	+ Save();
	3329	+ tab.undoindex -= 1;
	3330	+ }
	3331	+
	3332	+ tab.undoindex -= 1;
	3333	+
	3334	+ CopyChanged(tab.graphs[tab.undoindex]);
	3335	+ }
	3336	+
	3337	+ public void Redo()
	3338	+ {
	3339	+ cRadio tab = GetCurrentTab();
	3340	+
	3341	+ if (tab.graphs[tab.undoindex + 1] == null)
	3342	+ {
	3343	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3344	+ return;
	3345	+ }
	3346	+
	3347	+ tab.undoindex += 1;
	3348	+
	3349	+ CopyChanged(tab.graphs[tab.undoindex]);
	3350	+ }
	3351	+
	3352	+ void ImportGFD()
	3353	+ {
	3354	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3244	3355	browser.show();
3245	3356	String filename = browser.getFile();
3246	3357	if (filename != null && filename.length() > 0)
3247	3358	{
3248		- CameraPane.filename = browser.getDirectory() + filename;
	3359	+ String fullname = browser.getDirectory() + filename;
	3360	+
	3361	+ //Object3D readobj =
	3362	+ objEditor.ReadGFD(fullname, objEditor);
	3363	+ //makeSomething(readobj);
	3364	+ }
	3365	+ }
	3366	+
	3367	+ void ImportVRMLX3D()
	3368	+ {
	3369	+ if (Grafreed.standAlone)
	3370	+ {
	3371	+ /**/
	3372	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3373	+ browser.show();
	3374	+ String filename = browser.getFile();
	3375	+ if (filename != null && filename.length() > 0)
	3376	+ {
	3377	+ String fullname = browser.getDirectory() + filename;
	3378	+ LoadVRMLX3D(fullname);
	3379	+ }
	3380	+ /**/
	3381	+ }
	3382	+ }
	3383	+
	3384	+ void ToggleAnimation()
	3385	+ {
	3386	+ if (!Globals.ANIMATION)
	3387	+ {
	3388	+ FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3389	+ browser.setVisible(true);
	3390	+ String filename = browser.getFile();
	3391	+ if (filename != null && filename.length() > 0)
	3392	+ {
	3393	+ Globals.filename = browser.getDirectory() + filename;
3249	3394	//CameraPane.framecount = 0;
3250		- CameraPane.imagecount = 0;
	3395	+ Globals.imagecount = 0;
3251	3396
3252		- CameraPane.ANIMATION ^= true;
	3397	+ Globals.ANIMATION ^= true;
3253	3398
3254		- GrafreeD.wav.cursor = 0;
3255		- GrafreeD.wav.loop = 0;
	3399	+ Grafreed.wav.cursor = 0;
	3400	+ Grafreed.wav.loop = 0;
3256	3401	}
3257	3402	} else
3258	3403	{
3259		- CameraPane.ANIMATION ^= true;
	3404	+ Globals.ANIMATION ^= true;
3260	3405	}
3261	3406	}
3262	3407
..	..	@@ -3302,7 +3447,7 @@
3302	3447	void CreateMaterial()
3303	3448	{
3304	3449	//copy.ClearMaterial(); // PATCH
3305		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3450	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3306	3451	if (copy.selection.size() > 0)
3307	3452	//SetMaterial(copy);
3308	3453	{
..	..	@@ -3361,11 +3506,11 @@
3361	3506	{
3362	3507	copy.ResetBlockLoop(); // temporary problem
3363	3508
3364		- boolean random = CameraPane.RANDOM;
3365		- CameraPane.RANDOM = false; // parse everything
	3509	+ boolean random = CameraPane.SWITCH;
	3510	+ CameraPane.SWITCH = false; // parse everything
3366	3511	copy.ResetDisplayList();
3367	3512	copy.HardTouch();
3368		- CameraPane.RANDOM = random;
	3513	+ CameraPane.SWITCH = random;
3369	3514	}
3370	3515
3371	3516	// public void applySelf()
..	..	@@ -3435,10 +3580,40 @@
3435	3580	current.fakedepth = (float) fakedepthField.getFloat();
3436	3581	current.shadowbias = (float) shadowbiasField.getFloat();
3437	3582
3438		- if (!NumberSlider.frozen)
	3583	+ if (!cNumberSlider.frozen)
3439	3584	{
3440	3585	//System.out.println("Propagate = " + propagate);
3441	3586	copy.UpdateMaterial(anchor, current, propagate);
	3587	+
	3588	+ if (copy.material != null)
	3589	+ {
	3590	+ cMaterial mat = copy.material;
	3591	+
	3592	+ colorField.SetToolTipValue((mat.color));
	3593	+ modulationField.SetToolTipValue((mat.modulation));
	3594	+ metalnessField.SetToolTipValue((mat.metalness));
	3595	+ diffuseField.SetToolTipValue((mat.diffuse));
	3596	+ specularField.SetToolTipValue((mat.specular));
	3597	+ shininessField.SetToolTipValue((mat.shininess));
	3598	+ shiftField.SetToolTipValue((mat.shift));
	3599	+ ambientField.SetToolTipValue((mat.ambient));
	3600	+ lightareaField.SetToolTipValue((mat.lightarea));
	3601	+ diffusenessField.SetToolTipValue((mat.factor));
	3602	+ velvetField.SetToolTipValue((mat.velvet));
	3603	+ sheenField.SetToolTipValue((mat.sheen));
	3604	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3605	+ backlitField.SetToolTipValue((mat.bump));
	3606	+ anisoField.SetToolTipValue((mat.aniso));
	3607	+ anisoVField.SetToolTipValue((mat.anisoV));
	3608	+ cameraField.SetToolTipValue((mat.cameralight));
	3609	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3610	+ shadowField.SetToolTipValue((mat.shadow));
	3611	+ textureField.SetToolTipValue((mat.texture));
	3612	+ opacityField.SetToolTipValue((mat.opacity));
	3613	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3614	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3615	+ }
	3616	+
3442	3617	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3443	3618	{
3444	3619	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3483,6 +3658,7 @@
3483	3658	\|\| e.getSource() == apertureField
3484	3659	\|\| e.getSource() == shadowblurField)
3485	3660	{
	3661	+ new Exception().printStackTrace();
3486	3662	System.exit(0);
3487	3663	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3488	3664	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3509,7 +3685,13 @@
3509	3685	//System.out.println("PARENT = " + parent);
3510	3686	//if (parent != null)
3511	3687	// parent.applySelf();
3512		- refreshContents();
	3688	+ if (e.getSource() == normalpushField)
	3689	+ {
	3690	+ objEditor.refreshContents();
	3691	+ //Refresh();
	3692	+ }
	3693	+ else
	3694	+ refreshContents();
3513	3695	// ??? client.refreshEditWindow();
3514	3696	}
3515	3697	//else
..	..	@@ -3521,7 +3703,7 @@
3521	3703	//group.name = nameField.getText();
3522	3704	//objEditor.applySelf();
3523	3705
3524		- assert (objEditor == this);
	3706	+ // OCT2018: assert (objEditor == this);
3525	3707	if (copy.selection == null \|\| copy.selection.size() == 0)
3526	3708	//super.applySelf()
3527	3709	; else
..	..	@@ -3545,12 +3727,18 @@
3545	3727	objEditor.copy = keep;
3546	3728	}
3547	3729	}
	3730	+
	3731	+ if (normalpushField != null)
	3732	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3548	3733	}
3549	3734
3550	3735	void SnapObject()
3551	3736	{
3552		- Object3D obj = (Object3D)copy.selection.elementAt(0);
3553		- SnapObject(obj);
	3737	+ if (copy.selection.size() > 0)
	3738	+ {
	3739	+ Object3D obj = (Object3D)copy.selection.elementAt(0);
	3740	+ SnapObject(obj);
	3741	+ }
3554	3742	}
3555	3743
3556	3744	void SnapObject(Object3D obj)
..	..	@@ -3664,7 +3852,7 @@
3664	3852
3665	3853	if (obj.parent != null)
3666	3854	{
3667		- obj.parent.TransformToWorld(interest);
	3855	+// obj.parent.TransformToWorld(interest);
3668	3856	}
3669	3857
3670	3858	if (!CameraPane.TRACK)
..	..	@@ -3796,7 +3984,7 @@
3796	3984
3797	3985	radioPanel.revalidate();
3798	3986	radioPanel.repaint();
3799		- ctrlPanel.revalidate(); // ? new
	3987	+ ctrlPanel.validate(); // ? new
3800	3988	ctrlPanel.repaint();
3801	3989	}
3802	3990	}
..	..	@@ -3805,6 +3993,7 @@
3805	3993
3806	3994	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3807	3995	{
	3996	+ Save();
3808	3997	//Tween.set(thing, 0).target(1).start(tweenManager);
3809	3998	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3810	3999	// if (thing instanceof GenericJointDemo)
..	..	@@ -4008,6 +4197,7 @@
4008	4197	}
4009	4198	}
4010	4199	}
	4200	+
4011	4201	LoadGFDThread loadGFDThread;
4012	4202
4013	4203	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4028,7 +4218,8 @@
4028	4218	try
4029	4219	{
4030	4220	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4031		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4221	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4222	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4032	4223
4033	4224	readobj = (Object3D) p.readObject();
4034	4225	istream.close();
..	..	@@ -4036,7 +4227,20 @@
4036	4227	readobj.ResetDisplayList();
4037	4228	} catch (Exception e)
4038	4229	{
4039		- e.printStackTrace();
	4230	+ //e.printStackTrace();
	4231	+ try
	4232	+ {
	4233	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4234	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4235	+
	4236	+ readobj = (Object3D) p.readObject();
	4237	+ istream.close();
	4238	+
	4239	+ readobj.ResetDisplayList();
	4240	+ } catch (Exception e2)
	4241	+ {
	4242	+ e2.printStackTrace();
	4243	+ }
4040	4244	}
4041	4245	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4042	4246	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4153,7 +4357,7 @@
4153	4357
4154	4358	void load() // throws ClassNotFoundException
4155	4359	{
4156		- if (GrafreeD.standAlone)
	4360	+ if (Grafreed.standAlone)
4157	4361	{
4158	4362	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4159	4363	browser.show();
..	..	@@ -4240,11 +4444,13 @@
4240	4444	try
4241	4445	{
4242	4446	FileOutputStream ostream = new FileOutputStream(lastname);
4243		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4447	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4448	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4244	4449
4245	4450	p.writeObject(copy);
4246	4451	p.flush();
4247	4452
	4453	+ zstream.close();
4248	4454	ostream.close();
4249	4455
4250	4456	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4254,11 +4460,12 @@
4254	4460	{
4255	4461	}
4256	4462	}
	4463	+
4257	4464	String lastname;
4258	4465
4259	4466	void saveAs()
4260	4467	{
4261		- if (GrafreeD.standAlone)
	4468	+ if (Grafreed.standAlone)
4262	4469	{
4263	4470	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4264	4471	browser.setVisible(true);
..	..	@@ -4363,13 +4570,13 @@
4363	4570	try
4364	4571	{
4365	4572	FileOutputStream ostream = new FileOutputStream(filename);
4366		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4367		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4573	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4574	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4368	4575
4369	4576	Object3D objectparent = obj.parent;
4370	4577	obj.parent = null;
4371	4578
4372		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4579	+ Object3D object = (Object3D) Grafreed.clone(obj);
4373	4580
4374	4581	obj.parent = objectparent;
4375	4582
..	..	@@ -4381,8 +4588,8 @@
4381	4588	p.writeObject(object);
4382	4589	p.flush();
4383	4590
	4591	+ zstream.close();
4384	4592	ostream.close();
4385		- // zstream.close();
4386	4593
4387	4594	// group.selection.get(0).parent = parent;
4388	4595	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4403,7 +4610,7 @@
4403	4610	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4404	4611	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4405	4612	copy.generatePOV(buffer);
4406		- if (GrafreeD.standAlone)
	4613	+ if (Grafreed.standAlone)
4407	4614	{
4408	4615	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4409	4616	browser.show();
..	..	@@ -4429,7 +4636,8 @@
4429	4636	Object3D client;
4430	4637	Object3D copy;
4431	4638	MenuBar menuBar;
4432		- Menu windowMenu;
	4639	+ Menu fileMenu;
	4640	+ MenuItem newItem;
4433	4641	MenuItem loadItem;
4434	4642	MenuItem saveItem;
4435	4643	MenuItem saveAsItem;
..	..	@@ -4437,21 +4645,20 @@
4437	4645	MenuItem reexportItem;
4438	4646	MenuItem povItem;
4439	4647	MenuItem closeItem;
4440		- Menu cameraMenu;
	4648	+
4441	4649	CheckboxMenuItem zBufferItem;
4442	4650	//MenuItem normalLensItem;
4443		- MenuItem editCameraItem;
4444		- MenuItem revertCameraItem;
4445		- CheckboxMenuItem toggleLiveItem;
4446	4651	MenuItem stepItem;
4447		- CheckboxMenuItem toggleFullItem;
	4652	+ CheckboxMenuItem toggleLiveItem;
	4653	+ CheckboxMenuItem toggleFullScreenItem;
	4654	+ CheckboxMenuItem toggleTimelineItem;
4448	4655	CheckboxMenuItem toggleRenderItem;
4449	4656	CheckboxMenuItem toggleDebugItem;
4450	4657	CheckboxMenuItem toggleFrustumItem;
4451	4658	CheckboxMenuItem toggleFootContactItem;
4452	4659	CheckboxMenuItem toggleDLItem;
4453	4660	CheckboxMenuItem toggleTextureItem;
4454		- CheckboxMenuItem toggleRandomItem;
	4661	+ CheckboxMenuItem toggleSwitchItem;
4455	4662	CheckboxMenuItem toggleRootItem;
4456	4663	CheckboxMenuItem animationItem;
4457	4664	CheckboxMenuItem toggleHandleItem;
..	..	@@ -4459,23 +4666,26 @@
4459	4666	JSplitPane mainPanel;
4460	4667	JScrollPane scrollpane;
4461	4668	JPanel toolbarPanel;
4462		- JPanel treePanel;
	4669	+ cGridBag treePanel;
4463	4670	JPanel radioPanel;
4464	4671	ButtonGroup buttonGroup;
4465		- JPanel ctrlPanel;
4466		- JPanel materialPanel;
	4672	+ cGridBag ctrlPanel;
	4673	+ cGridBag materialPanel;
4467	4674	JScrollPane infoPanel;
4468		- JPanel optionsPanel;
	4675	+ cGridBag optionsPanel;
4469	4676	JTabbedPane objectPanel;
4470		- JPanel XYZPanel;
	4677	+ cGridBag XYZPanel;
4471	4678	JSplitPane gridPanel;
4472	4679	JSplitPane bigPanel;
4473		- JPanel bigThree;
4474		- JTabbedPane jtp;
4475		- JPanel cameraPanel;
	4680	+ cGridBag bigThree;
	4681	+ cGridBag scenePanel;
	4682	+ cGridBag centralPanel;
	4683	+ JSplitPane cameraPanel;
	4684	+ JPanel timelinePanel;
	4685	+ JMenuBar timelineMenubar;
4476	4686	JSplitPane framePanel;
4477	4687	JTextArea/Field/ nameField;
4478		- cButton textureButton;
	4688	+ //cButton textureButton;
4479	4689	cButton okButton;
4480	4690	cButton applyButton;
4481	4691	cButton cancelButton;
..	..	@@ -4522,65 +4732,72 @@
4522	4732	// MATERIAL
4523	4733	JLabel materialLabel;
4524	4734	JLabel colorLabel;
4525		- NumberSlider colorField;
	4735	+ cNumberSlider colorField;
4526	4736	JLabel modulationLabel;
4527		- NumberSlider modulationField;
	4737	+ cNumberSlider modulationField;
4528	4738	JLabel metalnessLabel;
4529		- NumberSlider metalnessField;
	4739	+ cNumberSlider metalnessField;
4530	4740	JLabel diffuseLabel;
4531		- NumberSlider diffuseField;
	4741	+ cNumberSlider diffuseField;
4532	4742	JLabel specularLabel;
4533		- NumberSlider specularField;
	4743	+ cNumberSlider specularField;
4534	4744	JLabel shininessLabel;
4535		- NumberSlider shininessField;
	4745	+ cNumberSlider shininessField;
4536	4746	JLabel shiftLabel;
4537		- NumberSlider shiftField;
	4747	+ cNumberSlider shiftField;
4538	4748	JLabel ambientLabel;
4539		- NumberSlider ambientField;
	4749	+ cNumberSlider ambientField;
4540	4750	JLabel lightareaLabel;
4541		- NumberSlider lightareaField;
	4751	+ cNumberSlider lightareaField;
4542	4752	JLabel diffusenessLabel;
4543		- NumberSlider diffusenessField;
	4753	+ cNumberSlider diffusenessField;
4544	4754	JLabel velvetLabel;
4545		- NumberSlider velvetField;
	4755	+ cNumberSlider velvetField;
4546	4756	JLabel sheenLabel;
4547		- NumberSlider sheenField;
	4757	+ cNumberSlider sheenField;
4548	4758	JLabel subsurfaceLabel;
4549		- NumberSlider subsurfaceField;
	4759	+ cNumberSlider subsurfaceField;
4550	4760	//JLabel bumpLabel;
4551	4761	//NumberSlider bumpField;
4552	4762	JLabel backlitLabel;
4553		- NumberSlider backlitField;
	4763	+ cNumberSlider backlitField;
4554	4764	JLabel anisoLabel;
4555		- NumberSlider anisoField;
	4765	+ cNumberSlider anisoField;
4556	4766	JLabel anisoVLabel;
4557		- NumberSlider anisoVField;
	4767	+ cNumberSlider anisoVField;
4558	4768	JLabel cameraLabel;
4559		- NumberSlider cameraField;
	4769	+ cNumberSlider cameraField;
4560	4770	JLabel selfshadowLabel;
4561		- NumberSlider selfshadowField;
	4771	+ cNumberSlider selfshadowField;
4562	4772	JLabel shadowLabel;
4563		- NumberSlider shadowField;
	4773	+ cNumberSlider shadowField;
4564	4774	JLabel textureLabel;
4565		- NumberSlider textureField;
	4775	+ cNumberSlider textureField;
4566	4776	JLabel opacityLabel;
4567		- NumberSlider opacityField;
	4777	+ cNumberSlider opacityField;
4568	4778	JLabel fakedepthLabel;
4569		- NumberSlider fakedepthField;
	4779	+ cNumberSlider fakedepthField;
4570	4780	JLabel shadowbiasLabel;
4571		- NumberSlider shadowbiasField;
	4781	+ cNumberSlider shadowbiasField;
4572	4782	JLabel bumpLabel;
4573		- NumberSlider bumpField;
	4783	+ cNumberSlider bumpField;
4574	4784	JLabel noiseLabel;
4575		- NumberSlider noiseField;
	4785	+ cNumberSlider noiseField;
4576	4786	JLabel powerLabel;
4577		- NumberSlider powerField;
	4787	+ cNumberSlider powerField;
4578	4788	JLabel borderfadeLabel;
4579		- NumberSlider borderfadeField;
	4789	+ cNumberSlider borderfadeField;
4580	4790	JLabel fogLabel;
4581		- NumberSlider fogField;
	4791	+ cNumberSlider fogField;
4582	4792	JLabel opacityPowerLabel;
4583		- NumberSlider opacityPowerField;
	4793	+ cNumberSlider opacityPowerField;
4584	4794	JTree jTree;
4585	4795	//ObjectUI parent;
	4796	+
	4797	+ cNumberSlider normalpushField;
	4798	+
	4799	+ private MenuItem importGFDItem;
	4800	+ private MenuItem importVRMLX3DItem;
	4801	+ private MenuItem import3DSItem;
	4802	+ private MenuItem importOBJItem;
4586	4803	}