~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -19,6 +19,8 @@
19	19	import //weka.core.
20	20	matrix.Matrix;
21	21
	22	+import grafeme.ui.*;
	23	+
22	24	class ObjEditor /extends JFrame/ implements iCallBack, ObjectUI,
23	25	ActionListener, ChangeListener,
24	26	InputMethodListener,
..	..	@@ -31,6 +33,9 @@
31	33	boolean timeline;
32	34	boolean wasFullScreen;
33	35
	36	+ GroupEditor callee;
	37	+ JFrame frame;
	38	+
34	39	// SCRIPT
35	40
36	41	transient JFrame textpanel = null;
..	..	@@ -121,51 +126,62 @@
121	126	void keyPressed(int key, int modifiers)
122	127	{
123	128	System.out.println("KEY PRESSED");
124		- CameraPane.theRenderer.keyPressed(key, modifiers);
	129	+ Globals.theRenderer.keyPressed(key, modifiers);
125	130	}
126	131	*/
127	132
128	133	static GridBagConstraints aConstraints;
129	134	static GridBagConstraints aWindowConstraints;
130		- GroupEditor callee;
131		- JFrame frame;
	135	+
132	136	static int GRIDWIDTH = 100; // 4;
133	137
134	138	public void closeUI()
135	139	{
136	140	//new Exception().printStackTrace();
137		- System.out.println("this = " + this);
138		- System.out.println("objEditor = " + objEditor);
	141	+// System.out.println("this = " + this);
	142	+// System.out.println("objEditor = " + objEditor);
139	143	//nameField.removeActionListener(this);
140		- objEditor.ctrlPanel.remove(nameField);
	144	+// objEditor.ctrlPanel.remove(nameField);
	145	+
	146	+ objEditor.ctrlPanel.remove(namePanel);
141	147
142	148	if (!GroupEditor.allparams)
143	149	return;
144	150
145		- objEditor.ctrlPanel.remove(liveCB);
146		- objEditor.ctrlPanel.remove(hideCB);
147		- objEditor.ctrlPanel.remove(markCB);
148		-
149		- objEditor.ctrlPanel.remove(randomCB);
150		- objEditor.ctrlPanel.remove(speedupCB);
151		- objEditor.ctrlPanel.remove(rewindCB);
152		-
153		- objEditor.ctrlPanel.remove(resetButton);
154		- objEditor.ctrlPanel.remove(stepButton);
155		-// objEditor.ctrlPanel.remove(stepAllButton);
156		-// objEditor.ctrlPanel.remove(resetAllButton);
157		- objEditor.ctrlPanel.remove(link2masterCB);
158		- //objEditor.ctrlPanel.remove(flipVCB);
159		- //objEditor.ctrlPanel.remove(texresMenu);
160		- objEditor.ctrlPanel.remove(slowerButton);
161		- objEditor.ctrlPanel.remove(fasterButton);
162		- objEditor.ctrlPanel.remove(remarkButton);
	151	+// objEditor.ctrlPanel.remove(liveCB);
	152	+// objEditor.ctrlPanel.remove(hideCB);
	153	+// objEditor.ctrlPanel.remove(markCB);
	154	+//
	155	+// objEditor.ctrlPanel.remove(randomCB);
	156	+// objEditor.ctrlPanel.remove(speedupCB);
	157	+// objEditor.ctrlPanel.remove(rewindCB);
	158	+//
	159	+// objEditor.ctrlPanel.remove(resetButton);
	160	+// objEditor.ctrlPanel.remove(stepButton);
	161	+//// objEditor.ctrlPanel.remove(stepAllButton);
	162	+//// objEditor.ctrlPanel.remove(resetAllButton);
	163	+// objEditor.ctrlPanel.remove(link2masterCB);
	164	+// //objEditor.ctrlPanel.remove(flipVCB);
	165	+// //objEditor.ctrlPanel.remove(texresMenu);
	166	+// objEditor.ctrlPanel.remove(slowerButton);
	167	+// objEditor.ctrlPanel.remove(fasterButton);
	168	+// objEditor.ctrlPanel.remove(remarkButton);
	169	+
	170	+ objEditor.ctrlPanel.remove(setupPanel);
	171	+ objEditor.ctrlPanel.remove(setupPanel2);
	172	+ objEditor.ctrlPanel.remove(commandsPanel);
	173	+ objEditor.ctrlPanel.remove(pushPanel);
	174	+ //objEditor.ctrlPanel.remove(fillPanel);
	175	+
	176	+ //Remove(normalpushField);
163	177	}
164	178
165	179	public ObjEditor GetEditor()
166	180	{
167	181	return objEditor; //.GetEditor();
168	182	}
	183	+
	184	+ // Sometimes myself, sometimes my callee's.
169	185	ObjEditor objEditor;
170	186
171	187	/*
..	..	@@ -261,24 +277,40 @@
261	277	void SetupMenu()
262	278	{
263	279	frame.setMenuBar(menuBar = new MenuBar());
264		- menuBar.add(windowMenu = new Menu("File"));
265		- windowMenu.add(loadItem = new MenuItem("Load..."));
266		- windowMenu.add("-");
267		- windowMenu.add(saveItem = new MenuItem("Save"));
268		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	280	+ menuBar.add(fileMenu = new Menu("File"));
	281	+ fileMenu.add(newItem = new MenuItem("New"));
	282	+ fileMenu.add(loadItem = new MenuItem("Open..."));
	283	+
	284	+ //oe.menuBar.add(menu = new Menu("Include"));
	285	+ Menu menu = new Menu("Import");
	286	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	287	+ importOBJItem.addActionListener(this);
	288	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	289	+ import3DSItem.addActionListener(this);
	290	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	291	+ importVRMLX3DItem.addActionListener(this);
	292	+ menu.add("-");
	293	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	294	+ importGFDItem.addActionListener(this);
	295	+ fileMenu.add(menu);
	296	+ fileMenu.add("-");
	297	+
	298	+ fileMenu.add(saveItem = new MenuItem("Save"));
	299	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
269	300	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
270		- windowMenu.add("-");
271		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
272		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
273		- windowMenu.add("-");
	301	+ fileMenu.add("-");
	302	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	303	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	304	+ fileMenu.add("-");
274	305	if (client.parent != null)
275	306	{
276		- windowMenu.add(closeItem = new MenuItem("Close"));
	307	+ fileMenu.add(closeItem = new MenuItem("Close"));
277	308	} else
278	309	{
279		- windowMenu.add(closeItem = new MenuItem("Exit"));
	310	+ fileMenu.add(closeItem = new MenuItem("Exit"));
280	311	}
281	312
	313	+ newItem.addActionListener(this);
282	314	loadItem.addActionListener(this);
283	315	saveItem.addActionListener(this);
284	316	saveAsItem.addActionListener(this);
..	..	@@ -287,79 +319,26 @@
287	319	//povItem.addActionListener(this);
288	320	closeItem.addActionListener(this);
289	321
290		- menuBar.add(cameraMenu = new Menu("View"));
291		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
292		- //zBufferItem.addActionListener(this);
293		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
294		- //normalLensItem.addActionListener(this);
295		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
296		- revertCameraItem.addActionListener(this);
297		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
298		- toggleTimelineItem.addItemListener(this);
299		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
300		- toggleFullScreenItem.addItemListener(this);
301		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
302		- cameraMenu.add("-");
303		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
304		- toggleTextureItem.addItemListener(this);
305		- toggleTextureItem.setState(CameraPane.textureon);
306		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
307		- toggleLiveItem.addItemListener(this);
308		- toggleLiveItem.setState(CameraPane.isLIVE());
309		- cameraMenu.add(stepItem = new MenuItem("Step"));
310		- stepItem.addActionListener(this);
311		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
312		-// toggleDLItem.addItemListener(this);
313		-// toggleDLItem.setState(false);
314		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
315		- toggleRenderItem.addItemListener(this);
316		- toggleRenderItem.setState(!CameraPane.frozen);
317		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
318		- toggleDebugItem.addItemListener(this);
319		- toggleDebugItem.setState(CameraPane.DEBUG);
320		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
321		- toggleFrustumItem.addItemListener(this);
322		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
323		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
324		- toggleFootContactItem.addItemListener(this);
325		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
326		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
327		- toggleRandomItem.addItemListener(this);
328		- toggleRandomItem.setState(CameraPane.RANDOM);
329		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
330		- toggleHandleItem.addItemListener(this);
331		- toggleHandleItem.setState(CameraPane.HANDLES);
332		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
333		- togglePaintItem.addItemListener(this);
334		- togglePaintItem.setState(CameraPane.PAINTMODE);
335		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
336		-// toggleRootItem.addItemListener(this);
337		-// toggleRootItem.setState(false);
338		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
339		-// animationItem.addItemListener(this);
340		-// animationItem.setState(CameraPane.ANIMATION);
341		- cameraMenu.add("-");
342		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
343		- editCameraItem.addActionListener(this);
344		-
345	322	objectPanel = new JTabbedPane();
346	323	toolbarPanel = new JPanel();
347	324	toolbarPanel.setName("Toolbar");
348		- treePanel = new JPanel();
	325	+ treePanel = new cGridBag();
349	326	treePanel.setName("Tree");
350		- ctrlPanel = new JPanel(); // new GridBagLayout());
	327	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
351	328	ctrlPanel.setName("Edit");
352		- materialPanel = new JPanel();
	329	+ materialPanel = new cGridBag().setVertical(true);
353	330	materialPanel.setName("Material");
354	331	/JTextPane/
355	332	infoarea = createTextPane();
	333	+ doc = infoarea.getStyledDocument();
	334	+
356	335	infoarea.setEditable(true);
357	336	SetText();
358	337	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
359	338	// infoarea.setOpaque(false);
360	339	// //infoarea.setForeground(textcolor);
361		- infoarea.setLineWrap(true);
362		- infoarea.setWrapStyleWord(true);
	340	+// TEXTAREA infoarea.setLineWrap(true);
	341	+// TEXTAREA infoarea.setWrapStyleWord(true);
363	342	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
364	343	infoPanel.setPreferredSize(new Dimension(50, 200));
365	344	infoPanel.setName("Info");
..	..	@@ -370,16 +349,16 @@
370	349	mainPanel.setName("Main");
371	350	mainPanel.setContinuousLayout(true);
372	351	mainPanel.setOneTouchExpandable(true);
373		- mainPanel.setDividerLocation(1.0);
374	352	mainPanel.setDividerSize(9);
375		- mainPanel.setResizeWeight(0);
	353	+ mainPanel.setDividerLocation(0.5); //1.0);
	354	+ mainPanel.setResizeWeight(0.5);
376	355
377	356	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
378	357	//mainPanel.setLayout(new GridBagLayout());
379	358	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
380		- treePanel.setLayout(new GridBagLayout());
381		- ctrlPanel.setLayout(new GridBagLayout());
382		- materialPanel.setLayout(new GridBagLayout());
	359	+// treePanel.setLayout(new GridBagLayout());
	360	+ //ctrlPanel.setLayout(new GridBagLayout());
	361	+ //materialPanel.setLayout(new GridBagLayout());
383	362
384	363	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
385	364	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -418,7 +397,7 @@
418	397	static String newline = "\n";
419	398	protected static final String buttonString = "JButton";
420	399	StyledDocument doc;
421		- JTextArea infoarea;
	400	+ JTextPane infoarea;
422	401
423	402	void ClearInfo()
424	403	{
..	..	@@ -441,10 +420,10 @@
441	420	e.printStackTrace();
442	421	}
443	422
444		- String selection = infoarea.getText();
445		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
446		- java.awt.datatransfer.Clipboard clipboard =
447		- Toolkit.getDefaultToolkit().getSystemClipboard();
	423	+// String selection = infoarea.getText();
	424	+// java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
	425	+// java.awt.datatransfer.Clipboard clipboard =
	426	+// Toolkit.getDefaultToolkit().getSystemClipboard();
448	427	//clipboard.setContents(data, data);
449	428	}
450	429
..	..	@@ -467,13 +446,13 @@
467	446	//SendInfo("Name:", "bold");
468	447	if (sel.GetTextures() != null \|\| debug)
469	448	{
470		- si.SendInfo(sel.toString(), "bold");
	449	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
471	450	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
472	451	if (sel.Size() > 0)
473	452	{
474	453	si.SendInfo("#children = " + sel.Size(), "regular");
475	454	}
476		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	455	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
477	456	if (debug)
478	457	{
479	458	try
..	..	@@ -485,7 +464,10 @@
485	464	}
486	465
487	466	if (full)
488		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	467	+ {
	468	+ si.SendInfo(" BBox min: " + minima, "regular");
	469	+ si.SendInfo(" BBox max: " + maxima, "regular");
	470	+ }
489	471
490	472	if (sel.bRep != null)
491	473	{
..	..	@@ -512,7 +494,7 @@
512	494	}
513	495	if (sel.support != null)
514	496	{
515		- si.SendInfo(" support: " + sel.support, "regular");
	497	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
516	498	}
517	499	if (sel.scriptnode != null)
518	500	{
..	..	@@ -583,6 +565,9 @@
583	565	{
584	566	CameraPane.pointflow = (PointFlow) sel;
585	567	}
	568	+
	569	+ si.SendInfo("_____________________", "regular");
	570	+ si.SendInfo("", "regular");
586	571	}
587	572	}
588	573
..	..	@@ -614,52 +599,52 @@
614	599	cameraView.ToggleFullScreen();
615	600	}
616	601
617		- private JTextArea createTextPane()
	602	+ private JTextPane createTextPane()
618	603	{
619		- String[] initString =
620		- {
621		- "This is an editable JTextPane, ", //regular
622		- "another ", //italic
623		- "styled ", //bold
624		- "text ", //small
625		- "component, ", //large
626		- "which supports embedded components..." + newline,//regular
627		- " " + newline, //button
628		- "...and embedded icons..." + newline, //regular
629		- " ", //icon
630		- newline + "JTextPane is a subclass of JEditorPane that "
631		- + "uses a StyledEditorKit and StyledDocument, and provides "
632		- + "cover methods for interacting with those objects."
633		- };
	604	+// TEXTAREA String[] initString =
	605	+// {
	606	+// "This is an editable JTextPane, ", //regular
	607	+// "another ", //italic
	608	+// "styled ", //bold
	609	+// "text ", //small
	610	+// "component, ", //large
	611	+// "which supports embedded components..." + newline,//regular
	612	+// " " + newline, //button
	613	+// "...and embedded icons..." + newline, //regular
	614	+// " ", //icon
	615	+// newline + "JTextPane is a subclass of JEditorPane that "
	616	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	617	+// + "cover methods for interacting with those objects."
	618	+// };
	619	+//
	620	+// String[] initStyles =
	621	+// {
	622	+// "regular", "italic", "bold", "small", "large",
	623	+// "regular", "button", "regular", "icon",
	624	+// "regular"
	625	+// };
	626	+//
	627	+// JTextPane textPane = new JTextPane();
	628	+// textPane.setEditable(true);
	629	+// /StyledDocument/ doc = textPane.getStyledDocument();
	630	+// addStylesToDocument(doc);
	631	+//
	632	+// try
	633	+// {
	634	+// for (int j = 0; j < 2; j++)
	635	+// {
	636	+// for (int i = 0; i < initString.length; i++)
	637	+// {
	638	+// doc.insertString(doc.getLength(), initString[i],
	639	+// doc.getStyle(initStyles[i]));
	640	+// }
	641	+// }
	642	+// } catch (BadLocationException ble)
	643	+// {
	644	+// System.err.println("Couldn't insert initial text into text pane.");
	645	+// }
634	646
635		- String[] initStyles =
636		- {
637		- "regular", "italic", "bold", "small", "large",
638		- "regular", "button", "regular", "icon",
639		- "regular"
640		- };
641		-
642		- JTextPane textPane = new JTextPane();
643		- textPane.setEditable(true);
644		- /StyledDocument/ doc = textPane.getStyledDocument();
645		- addStylesToDocument(doc);
646		-
647		- try
648		- {
649		- for (int j = 0; j < 2; j++)
650		- {
651		- for (int i = 0; i < initString.length; i++)
652		- {
653		- doc.insertString(doc.getLength(), initString[i],
654		- doc.getStyle(initStyles[i]));
655		- }
656		- }
657		- } catch (BadLocationException ble)
658		- {
659		- System.err.println("Couldn't insert initial text into text pane.");
660		- }
661		-
662		- return new JTextArea(); // textPane;
	647	+ return new JTextPane(); // textPane;
663	648	}
664	649
665	650	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -712,7 +697,7 @@
712	697	protected static ImageIcon createImageIcon(String path,
713	698	String description)
714	699	{
715		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	700	+ java.net.URL imgURL = Grafreed.class.getResource(path);
716	701	if (imgURL != null)
717	702	{
718	703	return new ImageIcon(imgURL, description);
..	..	@@ -744,6 +729,7 @@
744	729	// NumberSlider vDivsField;
745	730	// JCheckBox endcaps;
746	731	JCheckBox liveCB;
	732	+ JCheckBox selectCB;
747	733	JCheckBox hideCB;
748	734	JCheckBox link2masterCB;
749	735	JCheckBox markCB;
..	..	@@ -759,115 +745,84 @@
759	745	JButton slowerButton;
760	746	JButton fasterButton;
761	747	JButton remarkButton;
	748	+
	749	+ cGridBag namePanel;
	750	+ cGridBag setupPanel;
	751	+ cGridBag setupPanel2;
	752	+ cGridBag commandsPanel;
	753	+ cGridBag pushPanel;
	754	+ cGridBag fillPanel;
762	755
763		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	756	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
764	757	{
765	758	JCheckBox cb;
766	759
767		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
768		- oe.aConstraints.gridwidth = 1; // 3;
769		-// oe.aConstraints.weightx = 1;
770		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
771		- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	760	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
772	761	cb.addItemListener(this);
773		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
774		- oe.aConstraints.gridwidth = 1;
775		- oe.aConstraints.gridx += 1;
776	762
777	763	return cb;
778	764	}
779	765
780		- cButton AddButton(ObjEditor oe, String label)
	766	+ cButton AddButton(cGridBag panel, String label)
781	767	{
782	768	cButton cb;
783	769
784		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
785		- oe.aConstraints.gridwidth = 1;
786		-// oe.aConstraints.weightx = 1;
787		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
788		- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
	770	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
789	771	cb.addActionListener(this);
790		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
791		- oe.aConstraints.gridwidth = 1;
792		- oe.aConstraints.gridx += 1;
793	772
794	773	return cb;
795	774	}
796	775
797		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	776	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
798	777	{
799	778	JComboBox combo;
800	779
801		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
802		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
803		- oe.aConstraints.gridx += 1;
	780	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
804	781	combo.addActionListener(this);
805	782
806	783	return combo;
807	784	}
808	785
809		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	786	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
810	787	{
811		- NumberSlider combo;
	788	+ cGridBag control = new cGridBag();
	789	+
	790	+ cNumberSlider combo;
812	791
813	792	JLabel jlabel = new JLabel(label);
814		-
815		- aConstraints.fill = GridBagConstraints.VERTICAL;
816	793	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
817		- aConstraints.gridwidth = 2;
818		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
819		- aConstraints.gridx += 1;
820		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
821		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
822		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
823		- aConstraints.gridx += 1;
824		- aConstraints.gridwidth = 1;
825		-
	794	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	795	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
826	796	combo.setFloat(current);
827		-
828		- combo.label = jlabel;
829		-
830		- combo.addChangeListener(this);
831		-
832		- return combo;
	797	+
	798	+ panel.add(control);
	799	+
	800	+ return control;
833	801	}
834	802
835		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	803	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
836	804	{
837		- NumberSlider combo;
	805	+ cGridBag control = new cGridBag();
	806	+
	807	+ cNumberSlider combo;
838	808
839	809	JLabel jlabel = new JLabel(label);
840		-
841		- aConstraints.fill = GridBagConstraints.VERTICAL;
842	810	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
843		- aConstraints.gridwidth = 2;
844		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
845		- aConstraints.gridx += 1;
846		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
847		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
848		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
849		- aConstraints.gridx += 1;
850		- aConstraints.gridwidth = 1;
851		-
	811	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	812	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
852	813	combo.setInteger(current);
853	814
854		- combo.label = jlabel;
855		-
856		- combo.addChangeListener(this);
857		-
858		- return combo;
	815	+ panel.add(control);
	816	+
	817	+ return control;
859	818	}
860	819
861		- JTextArea AddText(JPanel ctrlPanel, String name)
	820	+ JTextArea AddText(cGridBag ctrlPanel, String name)
862	821	{
863	822	JTextArea text;
864	823
865		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
866		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
867		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	824	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
868	825	text.addCaretListener(this);
869		- aConstraints.gridx += 1;
870		- aConstraints.gridwidth = 1;
871	826
872	827	return text;
873	828	}
..	..	@@ -897,9 +852,16 @@
897	852	objEditor.ctrlPanel.remove(j);
898	853	}
899	854
	855	+ void Remove(cNumberSlider j)
	856	+ {
	857	+ j.removeChangeListener(this);
	858	+ //objEditor.ctrlPanel.remove(j.label);
	859	+ objEditor.ctrlPanel.remove(j);
	860	+ }
	861	+
900	862	/*
901	863	*/
902		- void Return() // ObjEditor oe)
	864	+ void Return0() // ObjEditor oe)
903	865	{
904	866	aConstraints.gridy += 1;
905	867	aConstraints.gridx = 0;
..	..	@@ -954,35 +916,77 @@
954	916
955	917	void SetupUI2(ObjEditor oe)
956	918	{
957		-// oe.aConstraints.weightx = 0;
958		-// oe.aConstraints.weighty = 0;
959		-// oe.aConstraints.gridx = 0;
960		-// oe.aConstraints.gridy = 0;
961		- SetupName(oe);
	919	+ //SetupName(oe);
	920	+
	921	+ namePanel = new cGridBag();
	922	+
	923	+ nameField = AddText(namePanel, copy.GetName());
	924	+ namePanel.add(nameField);
	925	+ oe.ctrlPanel.add(namePanel);
	926	+
	927	+ oe.ctrlPanel.Return();
962	928
963	929	if (!GroupEditor.allparams)
964	930	return;
965	931
966		- liveCB = AddCheckBox(oe, "Live", copy.live);
967		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
968		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	932	+ setupPanel = new cGridBag().setVertical(false);
	933	+
	934	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	935	+ liveCB.setToolTipText("Animate object");
	936	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	937	+ selectCB.setToolTipText("Make object selectable");
969	938	// Return();
970		- markCB = AddCheckBox(oe, "Mark", copy.marked);
971		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
972		- randomCB = AddCheckBox(oe, "Rand", copy.random);
973		- Return();
974		- resetButton = AddButton(oe, "Reset");
975		- stepButton = AddButton(oe, "Step");
	939	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	940	+ hideCB.setToolTipText("Hide object");
	941	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	942	+ markCB.setToolTipText("Set the animation target transform");
	943	+
	944	+ setupPanel2 = new cGridBag().setVertical(false);
	945	+
	946	+ rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
	947	+ rewindCB.setToolTipText("Rewind animation");
	948	+
	949	+ randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
	950	+ randomCB.setToolTipText("Rewind or Go back and forth randomly");
	951	+
	952	+ if (Globals.ADVANCED)
	953	+ {
	954	+ link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
	955	+ link2masterCB.setToolTipText("Attach to support");
	956	+ speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
	957	+ speedupCB.setToolTipText("Option motion capture");
	958	+ }
	959	+
	960	+ oe.ctrlPanel.add(setupPanel);
	961	+ oe.ctrlPanel.Return();
	962	+ oe.ctrlPanel.add(setupPanel2);
	963	+ oe.ctrlPanel.Return();
	964	+
	965	+ commandsPanel = new cGridBag().setVertical(false);
	966	+
	967	+ resetButton = AddButton(commandsPanel, "Reset");
	968	+ resetButton.setToolTipText("Jump to frame zero");
	969	+ stepButton = AddButton(commandsPanel, "Step");
	970	+ stepButton.setToolTipText("Step one frame");
976	971	// resetAllButton = AddButton(oe, "Reset All");
977	972	// stepAllButton = AddButton(oe, "Step All");
978		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
979	973	// Return();
980		- slowerButton = AddButton(oe, "Slow");
981		- fasterButton = AddButton(oe, "Fast");
982		- remarkButton = AddButton(oe, "Rem");
	974	+ slowerButton = AddButton(commandsPanel, "Slow");
	975	+ slowerButton.setToolTipText("Decrease animation speed");
	976	+ fasterButton = AddButton(commandsPanel, "Fast");
	977	+ fasterButton.setToolTipText("Increase animation speed");
	978	+ remarkButton = AddButton(commandsPanel, "Remark");
	979	+ remarkButton.setToolTipText("Set the current transform as the target");
983	980
984		- Return();
	981	+ oe.ctrlPanel.add(commandsPanel);
	982	+ oe.ctrlPanel.Return();
985	983
	984	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	985	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	986	+ //Return();
	987	+
	988	+ oe.ctrlPanel.Return();
	989	+
986	990	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
987	991	// ObjEditor.aConstraints.gridx += 1;
988	992
..	..	@@ -1076,7 +1080,7 @@
1076	1080	oe.aConstraints.gridwidth = 1;
1077	1081	/**/
1078	1082	nameField = AddText(oe.ctrlPanel, copy.GetName());
1079		- Return();
	1083	+ oe.ctrlPanel.Return();
1080	1084
1081	1085	//ctrlPanel.add(textureButton = new Button("Texture..."));
1082	1086	//textureButton.setEnabled(false);
..	..	@@ -1178,10 +1182,18 @@
1178	1182	//JPanel worldPanel =
1179	1183	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1180	1184	//worldPanel.setName("World");
1181		- centralPanel = new JPanel(new BorderLayout());
	1185	+ centralPanel = new cGridBag();
	1186	+ centralPanel.preferredWidth = 20;
1182	1187	timelinePanel = new JPanel(new BorderLayout());
1183	1188	timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1184	1189
	1190	+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
	1191	+ cameraPanel.setContinuousLayout(true);
	1192	+ cameraPanel.setOneTouchExpandable(true);
	1193	+// cameraPanel.setDividerLocation(0.9);
	1194	+// cameraPanel.setDividerSize(9);
	1195	+ cameraPanel.setResizeWeight(1.0);
	1196	+
1185	1197	centralPanel.add(cameraView);
1186	1198	//frame.setJMenuBar(timelineMenubar);
1187	1199	//centralPanel.add(timelinePanel);
..	..	@@ -1201,12 +1213,13 @@
1201	1213	//frontView.object = copy;
1202	1214	//sideView.object = copy;
1203	1215
1204		- XYZPanel = new JPanel();
1205		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1216	+ XYZPanel = new cGridBag().setVertical(true);
	1217	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1206	1218
1207		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1208		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1209		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1219	+ XYZPanel.preferredWidth = 5;
	1220	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1221	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1222	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1210	1223
1211	1224	/*
1212	1225	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1244,10 +1257,11 @@
1244	1257	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1245	1258	//tmp.setName("Edit");
1246	1259	objectPanel.add(materialPanel);
1247		- JPanel north = new JPanel(new BorderLayout());
1248		- north.setName("Edit");
1249		- north.add(ctrlPanel, BorderLayout.NORTH);
1250		- objectPanel.add(north);
	1260	+// JPanel north = new JPanel(new BorderLayout());
	1261	+// north.setName("Edit");
	1262	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1263	+// objectPanel.add(north);
	1264	+ objectPanel.add(ctrlPanel);
1251	1265	objectPanel.add(infoPanel);
1252	1266
1253	1267	/*
..	..	@@ -1268,16 +1282,23 @@
1268	1282	scrollpane.setWheelScrollingEnabled(true);
1269	1283	scrollpane.addMouseWheelListener(this); // Default not fast enough
1270	1284
1271		- /JTabbedPane/ scenePanel = new JTabbedPane();
1272		- scenePanel.add(scrollpane);
	1285	+ /JTabbedPane/ scenePanel = new cGridBag();
	1286	+ scenePanel.preferredWidth = 6;
	1287	+
	1288	+ JTabbedPane tabbedPane = new JTabbedPane();
	1289	+ tabbedPane.add(scrollpane);
1273	1290
1274		- scenePanel.add(FSPane = new cFileSystemPane(this));
	1291	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1275	1292
1276		- optionsPanel = new JPanel(new GridBagLayout());
	1293	+ optionsPanel = new cGridBag().setVertical(true);
1277	1294
1278	1295	optionsPanel.setName("Options");
1279		- scenePanel.add(optionsPanel);
1280		-
	1296	+
	1297	+ AddOptions(optionsPanel); //, aConstraints);
	1298	+
	1299	+ tabbedPane.add(optionsPanel);
	1300	+
	1301	+ scenePanel.add(tabbedPane);
1281	1302
1282	1303	/*
1283	1304	cTree jTree = new cTree(null);
..	..	@@ -1311,6 +1332,7 @@
1311	1332	//bigPanel.setSize(new Dimension(10,10));
1312	1333	//bigPanel.add(ctrlPanel);
1313	1334	//bigPanel.add(gridPanel);
	1335	+ /**
1314	1336	bigThree = new JPanel();
1315	1337	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1316	1338	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1334,7 +1356,13 @@
1334	1356	// aConstraints.gridheight = 3;
1335	1357	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1336	1358	bigThree.add(XYZPanel, aWindowConstraints);
	1359	+ /**/
1337	1360
	1361	+ bigThree = new cGridBag();
	1362	+ bigThree.addComponent(scenePanel);
	1363	+ bigThree.addComponent(centralPanel);
	1364	+ bigThree.addComponent(XYZPanel);
	1365	+
1338	1366	// // SIDE EFFECT!!!
1339	1367	// aConstraints.gridx = 0;
1340	1368	// aConstraints.gridy = 0;
..	..	@@ -1355,13 +1383,14 @@
1355	1383	//worldPane.add(bigPanel);
1356	1384	//worldPane.add(worldPanel);
1357	1385	/**/
1358		- frame.getContentPane().add(/"Center",/framePanel);
	1386	+ //frame.getContentPane().add(/"Center",/framePanel);
	1387	+ frame.add(/"Center",/framePanel);
1359	1388	//frame.getContentPane().add(/"Center",/ worldPane);
1360	1389
1361	1390	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1362	1391
1363		- frame.setSize(1024, 768);
1364		- frame.show();
	1392	+ frame.setSize(1280, 860);
	1393	+ frame.setVisible(true);
1365	1394
1366	1395	gridPanel.setDividerLocation(1.0);
1367	1396
..	..	@@ -1376,6 +1405,10 @@
1376	1405	});
1377	1406	}
1378	1407
	1408	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1409	+ {
	1410	+ }
	1411	+
1379	1412	JTree GetTree()
1380	1413	{
1381	1414	return objEditor.jTree;
..	..	@@ -1387,260 +1420,173 @@
1387	1420	ctrlPanel.removeAll();
1388	1421	}
1389	1422
1390		- void SetupMaterial(JPanel ctrlPanel)
	1423	+ void SetupMaterial(cGridBag panel)
1391	1424	{
1392		- aConstraints.weighty = 0;
1393		- //aConstraints.weightx = 1;
1394		- /*
	1425	+ /*
1395	1426	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1396	1427	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1397		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1398		- aConstraints.gridx += 1;
1399	1428	*/
1400	1429
1401		- aConstraints.gridwidth = 1;
1402		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1403		- aConstraints.gridx += 1;
1404		- aConstraints.weighty = 0;
1405		- aConstraints.gridwidth = 1;
	1430	+ cGridBag editBar = new cGridBag().setVertical(false);
	1431	+
	1432	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1433	+ createMaterialButton.setToolTipText("Create material");
1406	1434
1407	1435	/*
1408	1436	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1409		- aConstraints.gridx += 1;
1410		- aConstraints.weighty = 0;
1411		- aConstraints.gridwidth = 1;
1412	1437	*/
1413	1438
1414		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1415		- aConstraints.gridx += 1;
	1439	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1440	+ clearMaterialButton.setToolTipText("Clear material");
	1441	+
	1442	+ if (Globals.ADVANCED)
	1443	+ {
	1444	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1445	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1446	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1447	+ }
1416	1448
1417		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1418		-
1419		- aConstraints.gridx += 1;
1420		-
1421		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1422		-
1423		- aConstraints.gridx += 1;
1424		-
1425		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1426		-
1427		- aConstraints.gridx = 0;
1428		- aConstraints.gridy += 1;
1429		- aConstraints.weighty = 0;
1430		- aConstraints.gridwidth = 1;
	1449	+ editBar.preferredHeight = 15;
	1450	+
	1451	+ panel.add(editBar);
	1452	+
1431	1453	/**/
1432	1454	//aConstraints.weighty = 0;
1433	1455	////aConstraints.weightx = 1;
1434	1456	//aConstraints.weighty = 1;
1435	1457	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1436	1458	//aConstraints.gridx += 1;
1437		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1438		- aConstraints.weighty = 0;
1439		- aConstraints.gridx = 0;
1440		- aConstraints.gridy += 1;
1441		- aConstraints.gridwidth = 1;
	1459	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1442	1460
1443		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1444		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1445		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1446		- aConstraints.gridx += 1;
1447		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1448		- //aConstraints.weightx = 0;
1449		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1450		- aConstraints.gridx = 0;
1451		- aConstraints.gridy += 1;
1452		- aConstraints.gridwidth = 1;
	1461	+ cGridBag colorSection = new cGridBag().setVertical(true);
	1462	+
	1463	+ cGridBag color = new cGridBag();
	1464	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1465	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1466	+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1467	+ //colorField.preferredWidth = 200;
	1468	+ colorSection.add(color);
1453	1469
1454		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1455		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1456		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1457		- aConstraints.gridx += 1;
1458		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1459		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1460		- aConstraints.gridx = 0;
1461		- aConstraints.gridy += 1;
1462		- aConstraints.gridwidth = 1;
	1470	+ cGridBag modulation = new cGridBag();
	1471	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1472	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1473	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1474	+ colorSection.add(modulation);
1463	1475
1464		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1465		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1466		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1467		- aConstraints.gridx += 1;
1468		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1469		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1470		- aConstraints.gridx = 0;
1471		- aConstraints.gridy += 1;
1472		- aConstraints.gridwidth = 1;
	1476	+ cGridBag texture = new cGridBag();
	1477	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1478	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1479	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1480	+ colorSection.add(texture);
1473	1481
1474		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1475		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1476		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1477		- aConstraints.gridx += 1;
1478		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1479		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1480		- aConstraints.gridx = 0;
1481		- aConstraints.gridy += 1;
1482		- aConstraints.gridwidth = 1;
	1482	+ cGridBag anisoU = new cGridBag();
	1483	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1484	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1485	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1486	+ colorSection.add(anisoU);
1483	1487
1484		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1485		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1486		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1487		- aConstraints.gridx += 1;
1488		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1489		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1490		- aConstraints.gridx = 0;
1491		- aConstraints.gridy += 1;
1492		- aConstraints.gridwidth = 1;
	1488	+ cGridBag anisoV = new cGridBag();
	1489	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1490	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1491	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1492	+ colorSection.add(anisoV);
1493	1493
1494		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1495		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1496		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1497		- aConstraints.gridx += 1;
1498		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1499		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1500		- aConstraints.gridx = 0;
1501		- aConstraints.gridy += 1;
1502		- aConstraints.gridwidth = 1;
	1494	+ cGridBag shadowbias = new cGridBag();
	1495	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1496	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1497	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1498	+ colorSection.add(shadowbias);
1503	1499
1504		- //aConstraints.weighty = 1;
1505		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1506		- //aConstraints.gridx += 1;
1507		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1508		- aConstraints.weighty = 0;
1509		- aConstraints.gridx = 0;
1510		- aConstraints.gridy += 1;
1511		- aConstraints.gridwidth = 1;
	1500	+ panel.add(new JSeparator());
	1501	+
	1502	+ panel.add(colorSection);
	1503	+
	1504	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1505	+
	1506	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1507	+
	1508	+ cGridBag diffuse = new cGridBag();
	1509	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1510	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1511	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1512	+ diffuseSection.add(diffuse);
1512	1513
1513		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1514		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1515		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1516		- aConstraints.gridx += 1;
1517		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1518		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1519		- aConstraints.gridx = 0;
1520		- aConstraints.gridy += 1;
1521		- aConstraints.gridwidth = 1;
	1514	+ cGridBag diffuseness = new cGridBag();
	1515	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1516	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1517	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1518	+ diffuseSection.add(diffuseness);
1522	1519
1523		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1524		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1525		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1526		- aConstraints.gridx += 1;
1527		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1528		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1529		- aConstraints.gridx = 0;
1530		- aConstraints.gridy += 1;
1531		- aConstraints.gridwidth = 1;
	1520	+ cGridBag selfshadow = new cGridBag();
	1521	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1522	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1523	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1524	+ diffuseSection.add(selfshadow);
1532	1525
1533		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1534		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1535		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1536		- aConstraints.gridx += 1;
1537		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1538		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1539		- aConstraints.gridx = 0;
1540		- aConstraints.gridy += 1;
1541		- aConstraints.gridwidth = 1;
	1526	+ cGridBag sheen = new cGridBag();
	1527	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1528	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1529	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1530	+ diffuseSection.add(sheen);
1542	1531
1543		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1544		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1545		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1546		- aConstraints.gridx += 1;
1547		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1548		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1549		- aConstraints.gridx = 0;
1550		- aConstraints.gridy += 1;
1551		- aConstraints.gridwidth = 1;
	1532	+ cGridBag subsurface = new cGridBag();
	1533	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1534	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1535	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1536	+ diffuseSection.add(subsurface);
1552	1537
1553		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1554		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1555		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1556		- aConstraints.gridx += 1;
1557		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1558		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1559		- aConstraints.gridx = 0;
1560		- aConstraints.gridy += 1;
1561		- aConstraints.gridwidth = 1;
	1538	+ cGridBag shadow = new cGridBag();
	1539	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1540	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1541	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1542	+ diffuseSection.add(shadow);
1562	1543
1563		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1564		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1565		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1566		- aConstraints.gridx += 1;
1567		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1568		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1569		- aConstraints.gridx = 0;
1570		- aConstraints.gridy += 1;
1571		- aConstraints.gridwidth = 1;
	1544	+ cGridBag fakedepth = new cGridBag();
	1545	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1546	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1547	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1548	+ diffuseSection.add(fakedepth);
1572	1549
1573		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1574		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1575		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1576		- aConstraints.gridx += 1;
1577		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1578		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1579		- aConstraints.gridx = 0;
1580		- aConstraints.gridy += 1;
1581		- aConstraints.gridwidth = 1;
	1550	+ panel.add(new JSeparator());
	1551	+
	1552	+ panel.add(diffuseSection);
	1553	+
	1554	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1555	+
	1556	+ cGridBag specularSection = new cGridBag().setVertical(true);
1582	1557
1583		- //aConstraints.weighty = 1;
1584		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1585		- //aConstraints.gridx += 1;
1586		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1587		- aConstraints.weighty = 0;
1588		- aConstraints.gridx = 0;
1589		- aConstraints.gridy += 1;
1590		- aConstraints.gridwidth = 1;
	1558	+ cGridBag specular = new cGridBag();
	1559	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1560	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1561	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1562	+ specularSection.add(specular);
1591	1563
1592		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1593		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1594		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1595		- aConstraints.gridx += 1;
1596		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1597		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1598		- aConstraints.gridx = 0;
1599		- aConstraints.gridy += 1;
1600		- aConstraints.gridwidth = 1;
	1564	+ cGridBag lightarea = new cGridBag();
	1565	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1566	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1567	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1568	+ specularSection.add(lightarea);
1601	1569
1602		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1603		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1604		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1605		- aConstraints.gridx += 1;
1606		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1607		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1608		- aConstraints.gridx = 0;
1609		- aConstraints.gridy += 1;
1610		- aConstraints.gridwidth = 1;
	1570	+ cGridBag shininess = new cGridBag();
	1571	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1572	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1573	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1574	+ specularSection.add(shininess);
1611	1575
1612		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1613		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1614		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1615		- aConstraints.gridx += 1;
1616		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1617		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1618		- aConstraints.gridx = 0;
1619		- aConstraints.gridy += 1;
1620		- aConstraints.gridwidth = 1;
	1576	+ cGridBag metalness = new cGridBag();
	1577	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1578	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1579	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1580	+ specularSection.add(metalness);
1621	1581
1622		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1623		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1624		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1625		- aConstraints.gridx += 1;
1626		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1627		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1628		- aConstraints.gridx = 0;
1629		- aConstraints.gridy += 1;
1630		- aConstraints.gridwidth = 1;
	1582	+ cGridBag velvet = new cGridBag();
	1583	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1584	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1585	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1586	+ specularSection.add(velvet);
1631	1587
1632		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1633		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1634		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1635		- aConstraints.gridx += 1;
1636		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1637		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1638		- aConstraints.gridx = 0;
1639		- aConstraints.gridy += 1;
1640		- aConstraints.gridwidth = 1;
1641		-
1642		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1643		- Return();
	1588	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1589	+ //Return();
1644	1590	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1645	1591	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1646	1592	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1651,130 +1597,93 @@
1651	1597	// aConstraints.gridy += 1;
1652	1598	// aConstraints.gridwidth = 1;
1653	1599
1654		- //aConstraints.weighty = 1;
1655		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1656		- //aConstraints.gridx += 1;
1657		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1658		- aConstraints.weighty = 0;
1659		- aConstraints.gridx = 0;
1660		- aConstraints.gridy += 1;
1661		- aConstraints.gridwidth = 1;
1662	1600
1663		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1664		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1665		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1666		- aConstraints.gridx += 1;
1667		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1668		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1669		- aConstraints.gridx = 0;
1670		- aConstraints.gridy += 1;
1671		- aConstraints.gridwidth = 1;
	1601	+ panel.add(new JSeparator());
	1602	+
	1603	+ panel.add(specularSection);
	1604	+
	1605	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1606	+
	1607	+ cGridBag globalSection = new cGridBag().setVertical(true);
1672	1608
1673		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1674		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1675		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1676		- aConstraints.gridx += 1;
1677		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1678		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1679		- aConstraints.gridx = 0;
1680		- aConstraints.gridy += 1;
1681		- aConstraints.gridwidth = 1;
	1609	+ cGridBag camera = new cGridBag();
	1610	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1611	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1612	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1613	+ globalSection.add(camera);
1682	1614
1683		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1684		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1685		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1686		- aConstraints.gridx += 1;
1687		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1688		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1689		- aConstraints.gridx = 0;
1690		- aConstraints.gridy += 1;
1691		- aConstraints.gridwidth = 1;
	1615	+ cGridBag ambient = new cGridBag();
	1616	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1617	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1618	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1619	+ globalSection.add(ambient);
1692	1620
1693		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1694		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1695		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1696		- aConstraints.gridx += 1;
1697		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1698		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1699		- aConstraints.gridx = 0;
1700		- aConstraints.gridy += 1;
1701		- aConstraints.gridwidth = 1;
1702		- aConstraints.weighty = 0;
	1621	+ cGridBag backlit = new cGridBag();
	1622	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1623	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1624	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1625	+ globalSection.add(backlit);
1703	1626
1704		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1705		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1706		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1707		- aConstraints.gridx += 1;
1708		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1709		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1710		- aConstraints.gridx = 0;
1711		- aConstraints.gridy += 1;
1712		- aConstraints.gridwidth = 1;
	1627	+ cGridBag opacity = new cGridBag();
	1628	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1629	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1630	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1631	+ globalSection.add(opacity);
1713	1632
1714		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1715		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1716		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1717		- aConstraints.gridx += 1;
1718		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1719		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1720		- aConstraints.gridx = 0;
1721		- aConstraints.gridy += 1;
1722		- aConstraints.gridwidth = 1;
	1633	+ panel.add(new JSeparator());
	1634	+
	1635	+ panel.add(globalSection);
	1636	+
	1637	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1638	+
	1639	+ cGridBag textureSection = new cGridBag().setVertical(true);
1723	1640
1724		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1725		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1726		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1727		- aConstraints.gridx += 1;
1728		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1729		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1730		- aConstraints.gridx = 0;
1731		- aConstraints.gridy += 1;
1732		- aConstraints.gridwidth = 1;
	1641	+ cGridBag bump = new cGridBag();
	1642	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1643	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1644	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1645	+ textureSection.add(bump);
1733	1646
1734		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1735		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1736		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1737		- aConstraints.gridx += 1;
1738		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1739		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1740		- aConstraints.gridx = 0;
1741		- aConstraints.gridy += 1;
1742		- aConstraints.gridwidth = 1;
	1647	+ cGridBag noise = new cGridBag();
	1648	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1649	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1650	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1651	+ textureSection.add(noise);
1743	1652
1744		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1745		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1746		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1747		- aConstraints.gridx += 1;
1748		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1749		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1750		- aConstraints.gridx = 0;
1751		- aConstraints.gridy += 1;
1752		- aConstraints.gridwidth = 1;
	1653	+ cGridBag power = new cGridBag();
	1654	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1655	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1656	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1657	+ textureSection.add(power);
1753	1658
1754		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1755		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1756		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1757		- aConstraints.gridx += 1;
1758		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1759		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1760		- aConstraints.gridx = 0;
1761		- aConstraints.gridy += 1;
1762		- aConstraints.gridwidth = 1;
	1659	+ cGridBag borderfade = new cGridBag();
	1660	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1661	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1662	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1663	+ textureSection.add(borderfade);
1763	1664
1764		- //aConstraints.weighty = 1;
1765		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1766		- //aConstraints.gridx += 1;
1767		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1768		- aConstraints.weighty = 0;
	1665	+ cGridBag fog = new cGridBag();
	1666	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1667	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1668	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1669	+ textureSection.add(fog);
1769	1670
1770		- aConstraints.gridx = 0;
1771		- aConstraints.gridy = 0;
1772		- aConstraints.gridwidth = 1;
	1671	+ cGridBag opacityPower = new cGridBag();
	1672	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	1673	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1674	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	1675	+ textureSection.add(opacityPower);
	1676	+
	1677	+ panel.add(new JSeparator());
	1678	+
	1679	+ panel.add(textureSection);
	1680	+
	1681	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1773	1682
1774	1683	SetMaterial(copy); // .GetMaterial());
1775	1684
1776		- colorField.addChangeListener(this);
1777		- modulationField.addChangeListener(this);
	1685	+ //colorField.addChangeListener(this);
	1686	+// modulationField.addChangeListener(this);
1778	1687	metalnessField.addChangeListener(this);
1779	1688	diffuseField.addChangeListener(this);
1780	1689	specularField.addChangeListener(this);
..	..	@@ -1804,12 +1713,15 @@
1804	1713	opacityPowerField.addChangeListener(this);
1805	1714	/**/
1806	1715
1807		- resetSlidersButton.addActionListener(this);
1808	1716	clearMaterialButton.addActionListener(this);
1809	1717	createMaterialButton.addActionListener(this);
1810		-
1811		- propagateToggle.addItemListener(this);
1812		- multiplyToggle.addItemListener(this);
	1718	+
	1719	+ if (Globals.ADVANCED)
	1720	+ {
	1721	+ resetSlidersButton.addActionListener(this);
	1722	+ propagateToggle.addItemListener(this);
	1723	+ multiplyToggle.addItemListener(this);
	1724	+ }
1813	1725	}
1814	1726
1815	1727	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1980,7 +1892,7 @@
1980	1892
1981	1893	//? flashIt = false;
1982	1894	CameraPane pane = (CameraPane) cameraView;
1983		- pane.clickStart(location.x, location.y, 0);
	1895	+ pane.clickStart(location.x, location.y, 0, 0);
1984	1896	pane.clickEnd(location.x, location.y, 0, true);
1985	1897
1986	1898	if (group.selection.size() == 1)
..	..	@@ -2029,6 +1941,7 @@
2029	1941	e2.printStackTrace();
2030	1942	}
2031	1943	}
	1944	+
2032	1945	LoadJMEThread loadThread;
2033	1946
2034	1947	class LoadJMEThread extends Thread
..	..	@@ -2086,6 +1999,7 @@
2086	1999	//LoadFile0(filename, converter);
2087	2000	}
2088	2001	}
	2002	+
2089	2003	LoadOBJThread loadObjThread;
2090	2004
2091	2005	class LoadOBJThread extends Thread
..	..	@@ -2164,19 +2078,19 @@
2164	2078
2165	2079	void LoadObjFile(String fullname)
2166	2080	{
2167		- /*
	2081	+ System.out.println("Loading " + fullname);
	2082	+ /**/
2168	2083	//lastFilename = fullname;
2169	2084	if(loadObjThread == null)
2170	2085	{
2171		- loadObjThread = new LoadOBJThread();
2172		- loadObjThread.start();
	2086	+ loadObjThread = new LoadOBJThread();
	2087	+ loadObjThread.start();
2173	2088	}
2174	2089
2175	2090	loadObjThread.add(fullname);
2176		- */
	2091	+ /**/
2177	2092
2178		- System.out.println("Loading " + fullname);
2179		- makeSomething(new FileObject(fullname, true), true);
	2093	+ //makeSomething(new FileObject(fullname, true), true);
2180	2094	}
2181	2095
2182	2096	void LoadGFDFile(String fullname)
..	..	@@ -2437,11 +2351,11 @@
2437	2351
2438	2352	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2439	2353	{
2440		- if (GrafreeD.standAlone)
	2354	+ if (Grafreed.standAlone)
2441	2355	{
2442	2356	/**/
2443	2357	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2444		- browser.show();
	2358	+ browser.setVisible(true);
2445	2359	String filename = browser.getFile();
2446	2360	if (filename != null && filename.length() > 0)
2447	2361	{
..	..	@@ -2586,6 +2500,7 @@
2586	2500	}
2587	2501	if (input == null)
2588	2502	{
	2503	+ new Exception().printStackTrace();
2589	2504	System.exit(0);
2590	2505	}
2591	2506
..	..	@@ -2800,7 +2715,8 @@
2800	2715	return;
2801	2716	}
2802	2717
2803		- multiplyToggle.setSelected(mat.multiply);
	2718	+ if (multiplyToggle != null)
	2719	+ multiplyToggle.setSelected(mat.multiply);
2804	2720
2805	2721	assert (object.projectedVertices != null);
2806	2722
..	..	@@ -2989,7 +2905,8 @@
2989	2905	if (timeline)
2990	2906	{
2991	2907	centralPanel.remove(cameraView);
2992		- centralPanel.add(timelinePanel);
	2908	+ cameraPanel.add(cameraView);
	2909	+ centralPanel.add(cameraPanel);
2993	2910	frame.setJMenuBar(timelineMenubar);
2994	2911	wasFullScreen = CameraPane.FULLSCREEN;
2995	2912	if (!CameraPane.FULLSCREEN)
..	..	@@ -2998,7 +2915,7 @@
2998	2915	}
2999	2916	else
3000	2917	{
3001		- centralPanel.remove(timelinePanel);
	2918	+ centralPanel.remove(cameraPanel);
3002	2919	centralPanel.add(cameraView);
3003	2920	frame.setJMenuBar(null);
3004	2921	if (!wasFullScreen)
..	..	@@ -3014,9 +2931,9 @@
3014	2931	frame.validate();
3015	2932
3016	2933	return;
3017		- } else if (event.getSource() == toggleRandomItem)
	2934	+ } else if (event.getSource() == toggleSwitchItem)
3018	2935	{
3019		- cameraView.ToggleRandom();
	2936	+ cameraView.ToggleSwitch();
3020	2937	cameraView.repaint();
3021	2938	return;
3022	2939	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3045,6 +2962,10 @@
3045	2962	{
3046	2963	copy.live ^= true;
3047	2964	return;
	2965	+ } else if (event.getSource() == selectCB)
	2966	+ {
	2967	+ copy.dontselect ^= true;
	2968	+ return;
3048	2969	} else if (event.getSource() == hideCB)
3049	2970	{
3050	2971	copy.hide ^= true;
..	..	@@ -3059,6 +2980,7 @@
3059	2980	if (event.getSource() == randomCB)
3060	2981	{
3061	2982	copy.random ^= true;
	2983	+ objEditor.refreshContents();
3062	2984	return;
3063	2985	}
3064	2986	if (event.getSource() == speedupCB)
..	..	@@ -3082,8 +3004,9 @@
3082	3004
3083	3005	public void actionPerformed(ActionEvent event)
3084	3006	{
	3007	+ Object source = event.getSource();
3085	3008	// SCRIPT DIALOG
3086		- if (event.getSource() == okbutton)
	3009	+ if (source == okbutton)
3087	3010	{
3088	3011	textpanel.setVisible(false);
3089	3012	textpanel.remove(textarea);
..	..	@@ -3095,7 +3018,7 @@
3095	3018	textarea = null;
3096	3019	textpanel = null;
3097	3020	}
3098		- if (event.getSource() == cancelbutton)
	3021	+ if (source == cancelbutton)
3099	3022	{
3100	3023	textpanel.setVisible(false);
3101	3024	textpanel.remove(textarea);
..	..	@@ -3107,49 +3030,50 @@
3107	3030	//applySelf();
3108	3031	//client.refreshEditWindow();
3109	3032	//refreshContents();
3110		- if (event.getSource() == nameField)
	3033	+ if (source == nameField)
3111	3034	{
3112	3035	//System.out.println("ObjEditor " + event);
3113	3036	applySelf0(true);
3114	3037	//parent.applySelf();
3115	3038	objEditor.refreshContents();
3116		- } else if (event.getSource() == resetButton)
	3039	+ } else if (source == resetButton)
3117	3040	{
3118	3041	CameraPane.fullreset = true;
3119	3042	copy.Reset(); // ResetMeshes();
3120	3043	copy.Touch();
3121	3044	objEditor.refreshContents();
3122		- } else if (event.getSource() == stepItem)
	3045	+ } else if (source == stepItem)
3123	3046	{
3124		- cameraView.ONESTEP = true;
	3047	+ //cameraView.ONESTEP = true;
	3048	+ Globals.ONESTEP = true;
3125	3049	cameraView.repaint();
3126	3050	return;
3127		- } else if (event.getSource() == stepButton)
	3051	+ } else if (source == stepButton)
3128	3052	{
3129	3053	copy.Step();
3130	3054	copy.Touch();
3131	3055	objEditor.refreshContents();
3132		- } else if (event.getSource() == slowerButton)
	3056	+ } else if (source == slowerButton)
3133	3057	{
3134	3058	copy.Slower();
3135	3059	copy.Touch();
3136	3060	objEditor.refreshContents();
3137		- } else if (event.getSource() == fasterButton)
	3061	+ } else if (source == fasterButton)
3138	3062	{
3139	3063	copy.Faster();
3140	3064	copy.Touch();
3141	3065	objEditor.refreshContents();
3142		- } else if (event.getSource() == remarkButton)
	3066	+ } else if (source == remarkButton)
3143	3067	{
3144	3068	copy.Remark();
3145	3069	copy.Touch();
3146	3070	objEditor.refreshContents();
3147		- } else if (event.getSource() == stepAllButton)
	3071	+ } else if (source == stepAllButton)
3148	3072	{
3149	3073	copy.StepAll();
3150	3074	copy.Touch();
3151	3075	objEditor.refreshContents();
3152		- } else if (event.getSource() == resetAllButton)
	3076	+ } else if (source == resetAllButton)
3153	3077	{
3154	3078	//CameraPane.fullreset = true;
3155	3079	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3182,53 +3106,75 @@
3182	3106	// Close();
3183	3107	// }
3184	3108	// else
3185		- if (event.getSource() == resetSlidersButton)
	3109	+ if (source == resetSlidersButton)
3186	3110	{
3187	3111	ResetSliders();
3188		- } else if (event.getSource() == clearMaterialButton)
	3112	+ } else if (source == clearMaterialButton)
3189	3113	{
3190	3114	ClearMaterial();
3191		- } else if (event.getSource() == createMaterialButton)
	3115	+ } else if (source == createMaterialButton)
3192	3116	{
3193	3117	CreateMaterial();
3194		- } else if (event.getSource() == clearPanelButton)
	3118	+ } else if (source == clearPanelButton)
3195	3119	{
3196	3120	copy.ClearUI();
3197	3121	refreshContents(true);
3198		- } /*
3199		- }
3200		-
3201		- public boolean action(Event event, Object arg)
3202		- {
3203		- */ else if (event.getSource() == closeItem)
	3122	+ } else if (source == importGFDItem)
	3123	+ {
	3124	+ ImportGFD();
	3125	+ } else
	3126	+ if (source == importVRMLX3DItem)
	3127	+ {
	3128	+ ImportVRMLX3D();
	3129	+ } else
	3130	+ if (source == import3DSItem)
	3131	+ {
	3132	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3133	+ } else
	3134	+ if (source == importOBJItem)
	3135	+ {
	3136	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3137	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3138	+ browser.setVisible(true);
	3139	+ String filename = browser.getFile();
	3140	+ if (filename != null && filename.length() > 0)
	3141	+ {
	3142	+ String fullname = browser.getDirectory() + filename;
	3143	+ makeSomething(ReadOBJ(fullname), true);
	3144	+ }
	3145	+ } else
	3146	+ if (source == closeItem)
3204	3147	{
3205	3148	Close();
3206	3149	//return true;
3207		- } else if (event.getSource() == loadItem)
	3150	+ } else if (source == loadItem)
3208	3151	{
3209	3152	load();
3210	3153	//return true;
3211		- } else if (event.getSource() == saveItem)
	3154	+ } else if (source == newItem)
	3155	+ {
	3156	+ New();
	3157	+ } else if (source == saveItem)
3212	3158	{
3213	3159	save();
3214	3160	//return true;
3215		- } else if (event.getSource() == saveAsItem)
	3161	+ } else if (source == saveAsItem)
3216	3162	{
3217	3163	saveAs();
3218	3164	//return true;
3219		- } else if (event.getSource() == reexportItem)
	3165	+ } else if (source == reexportItem)
3220	3166	{
3221	3167	reexport();
3222	3168	//return true;
3223		- } else if (event.getSource() == exportAsItem)
	3169	+ } else if (source == exportAsItem)
3224	3170	{
3225	3171	export();
3226	3172	//return true;
3227		- } else if (event.getSource() == povItem)
	3173	+ } else if (source == povItem)
3228	3174	{
3229	3175	generatePOV();
3230	3176	//return true;
3231		- } else if (event.getSource() == zBufferItem)
	3177	+ } else if (source == zBufferItem)
3232	3178	{
3233	3179	try
3234	3180	{
..	..	@@ -3250,21 +3196,8 @@
3250	3196	cameraView.repaint();
3251	3197	//return true;
3252	3198	}
3253		- */ else if (event.getSource() == editCameraItem)
3254		- {
3255		- cameraView.ProtectCamera();
3256		- cameraView.repaint();
3257		- return;
3258		- } else if (event.getSource() == revertCameraItem)
3259		- {
3260		- cameraView.RevertCamera();
3261		- cameraView.repaint();
3262		- return;
3263		-// } else if (event.getSource() == textureButton)
3264		-// {
3265		-// return; // true;
3266		- } else // combos...
3267		- if (event.getSource() == texresMenu)
	3199	+ */ else // combos...
	3200	+ if (source == texresMenu)
3268	3201	{
3269	3202	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3270	3203	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3276,27 +3209,283 @@
3276	3209	}
3277	3210	}
3278	3211
3279		- void ToggleAnimation()
	3212	+ void New()
3280	3213	{
3281		- if (!CameraPane.ANIMATION)
	3214	+ while (copy.Size() > 1)
3282	3215	{
3283		- FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3216	+ copy.remove(1);
	3217	+ }
	3218	+
	3219	+ ResetModel();
	3220	+ objEditor.refreshContents();
	3221	+ }
	3222	+
	3223	+ static public byte[] Compress(Object3D o)
	3224	+ {
	3225	+ try
	3226	+ {
	3227	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3228	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
	3229	+ ObjectOutputStream out = new ObjectOutputStream(zstream);
	3230	+
	3231	+ Object3D parent = o.parent;
	3232	+ o.parent = null;
	3233	+
	3234	+ out.writeObject(o);
	3235	+
	3236	+ o.parent = parent;
	3237	+
	3238	+ out.flush();
	3239	+
	3240	+ zstream.close();
	3241	+ out.close();
	3242	+
	3243	+ return baos.toByteArray();
	3244	+ } catch (Exception e)
	3245	+ {
	3246	+ System.err.println(e);
	3247	+ return null;
	3248	+ }
	3249	+ }
	3250	+
	3251	+ static public Object Uncompress(byte[] bytes)
	3252	+ {
	3253	+ System.out.println("#bytes = " + bytes.length);
	3254	+ try
	3255	+ {
	3256	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3257	+ java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
	3258	+ ObjectInputStream in = new ObjectInputStream(istream);
	3259	+ Object obj = in.readObject();
	3260	+ in.close();
	3261	+
	3262	+ return obj;
	3263	+ } catch (Exception e)
	3264	+ {
	3265	+ System.err.println(e);
	3266	+ return null;
	3267	+ }
	3268	+ }
	3269	+
	3270	+ static public Object clone(Object o)
	3271	+ {
	3272	+ try
	3273	+ {
	3274	+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
	3275	+ ObjectOutputStream out = new ObjectOutputStream(baos);
	3276	+
	3277	+ out.writeObject(o);
	3278	+
	3279	+ out.flush();
	3280	+ out.close();
	3281	+
	3282	+ byte[] bytes = baos.toByteArray();
	3283	+
	3284	+ System.out.println("clone = " + bytes.length);
	3285	+
	3286	+ ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
	3287	+ ObjectInputStream in = new ObjectInputStream(bais);
	3288	+ Object obj = in.readObject();
	3289	+ in.close();
	3290	+
	3291	+ return obj;
	3292	+ } catch (Exception e)
	3293	+ {
	3294	+ System.err.println(e);
	3295	+ return null;
	3296	+ }
	3297	+ }
	3298	+
	3299	+ cRadio GetCurrentTab()
	3300	+ {
	3301	+ cRadio ab;
	3302	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3303	+ {
	3304	+ ab = (cRadio)e.nextElement();
	3305	+ if(ab.GetObject() == copy)
	3306	+ {
	3307	+ return ab;
	3308	+ }
	3309	+ }
	3310	+
	3311	+ return null;
	3312	+ }
	3313	+
	3314	+ java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
	3315	+
	3316	+ public void Save()
	3317	+ {
	3318	+ cRadio tab = GetCurrentTab();
	3319	+
	3320	+ boolean temp = CameraPane.SWITCH;
	3321	+ CameraPane.SWITCH = false;
	3322	+
	3323	+ copy.ExtractBigData(hashtable);
	3324	+
	3325	+ //EditorFrame.m_MainFrame.requestFocusInWindow();
	3326	+ tab.graphs[tab.undoindex++] = Compress(copy);
	3327	+
	3328	+ copy.RestoreBigData(hashtable);
	3329	+
	3330	+ CameraPane.SWITCH = temp;
	3331	+
	3332	+ //assert(hashtable.isEmpty());
	3333	+
	3334	+ for (int i = tab.undoindex; i < tab.graphs.length; i++)
	3335	+ {
	3336	+ tab.graphs[i] = null;
	3337	+ }
	3338	+
	3339	+ // test save
	3340	+ if (false)
	3341	+ {
	3342	+ try
	3343	+ {
	3344	+ FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
	3345	+ ObjectOutputStream p = new ObjectOutputStream(ostream);
	3346	+
	3347	+ p.writeObject(copy);
	3348	+
	3349	+ p.flush();
	3350	+
	3351	+ ostream.close();
	3352	+ } catch (Exception e)
	3353	+ {
	3354	+ e.printStackTrace();
	3355	+ }
	3356	+ }
	3357	+ }
	3358	+
	3359	+ void CopyChanged(Object3D obj)
	3360	+ {
	3361	+ boolean temp = CameraPane.SWITCH;
	3362	+ CameraPane.SWITCH = false;
	3363	+
	3364	+ copy.ExtractBigData(hashtable);
	3365	+
	3366	+ copy.clear();
	3367	+
	3368	+ for (int i=0; i<obj.Size(); i++)
	3369	+ {
	3370	+ copy.add(obj.get(i));
	3371	+ }
	3372	+
	3373	+ copy.RestoreBigData(hashtable);
	3374	+
	3375	+ CameraPane.SWITCH = temp;
	3376	+
	3377	+ //assert(hashtable.isEmpty());
	3378	+
	3379	+ copy.Touch();
	3380	+
	3381	+ ResetModel();
	3382	+ copy.HardTouch(); // recompile?
	3383	+
	3384	+ cRadio ab;
	3385	+ for (java.util.Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
	3386	+ {
	3387	+ ab = (cRadio)e.nextElement();
	3388	+ Object3D test = copy.GetObject(ab.object.GetUUID());
	3389	+ //ab.camera = (Camera)copy.GetObject(ab.camera.GetUUID());
	3390	+ if (test != null)
	3391	+ {
	3392	+ test.editWindow = ab.object.editWindow;
	3393	+ ab.object = test;
	3394	+ }
	3395	+ }
	3396	+
	3397	+ refreshContents();
	3398	+ }
	3399	+
	3400	+ public void Undo()
	3401	+ {
	3402	+ cRadio tab = GetCurrentTab();
	3403	+
	3404	+ if (tab.undoindex == 0)
	3405	+ {
	3406	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3407	+ return;
	3408	+ }
	3409	+
	3410	+ if (tab.graphs[tab.undoindex] == null)
	3411	+ {
	3412	+ Save();
	3413	+ tab.undoindex -= 1;
	3414	+ }
	3415	+
	3416	+ tab.undoindex -= 1;
	3417	+
	3418	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3419	+ }
	3420	+
	3421	+ public void Redo()
	3422	+ {
	3423	+ cRadio tab = GetCurrentTab();
	3424	+
	3425	+ if (tab.graphs[tab.undoindex + 1] == null)
	3426	+ {
	3427	+ java.awt.Toolkit.getDefaultToolkit().beep();
	3428	+ return;
	3429	+ }
	3430	+
	3431	+ tab.undoindex += 1;
	3432	+
	3433	+ CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
	3434	+ }
	3435	+
	3436	+ void ImportGFD()
	3437	+ {
	3438	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
3284	3439	browser.show();
3285	3440	String filename = browser.getFile();
3286	3441	if (filename != null && filename.length() > 0)
3287	3442	{
3288		- CameraPane.filename = browser.getDirectory() + filename;
	3443	+ String fullname = browser.getDirectory() + filename;
	3444	+
	3445	+ //Object3D readobj =
	3446	+ objEditor.ReadGFD(fullname, objEditor);
	3447	+ //makeSomething(readobj);
	3448	+ }
	3449	+ }
	3450	+
	3451	+ void ImportVRMLX3D()
	3452	+ {
	3453	+ if (Grafreed.standAlone)
	3454	+ {
	3455	+ /**/
	3456	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3457	+ browser.show();
	3458	+ String filename = browser.getFile();
	3459	+ if (filename != null && filename.length() > 0)
	3460	+ {
	3461	+ String fullname = browser.getDirectory() + filename;
	3462	+ LoadVRMLX3D(fullname);
	3463	+ }
	3464	+ /**/
	3465	+ }
	3466	+ }
	3467	+
	3468	+ void ToggleAnimation()
	3469	+ {
	3470	+ if (!Globals.ANIMATION)
	3471	+ {
	3472	+ FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
	3473	+ browser.setVisible(true);
	3474	+ String filename = browser.getFile();
	3475	+ if (filename != null && filename.length() > 0)
	3476	+ {
	3477	+ Globals.filename = browser.getDirectory() + filename;
3289	3478	//CameraPane.framecount = 0;
3290		- CameraPane.imagecount = 0;
	3479	+ Globals.imagecount = 0;
3291	3480
3292		- CameraPane.ANIMATION ^= true;
	3481	+ Globals.ANIMATION ^= true;
3293	3482
3294		- GrafreeD.wav.cursor = 0;
3295		- GrafreeD.wav.loop = 0;
	3483	+ Grafreed.wav.cursor = 0;
	3484	+ Grafreed.wav.loop = 0;
3296	3485	}
3297	3486	} else
3298	3487	{
3299		- CameraPane.ANIMATION ^= true;
	3488	+ Globals.ANIMATION ^= true;
3300	3489	}
3301	3490	}
3302	3491
..	..	@@ -3342,7 +3531,7 @@
3342	3531	void CreateMaterial()
3343	3532	{
3344	3533	//copy.ClearMaterial(); // PATCH
3345		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3534	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3346	3535	if (copy.selection.size() > 0)
3347	3536	//SetMaterial(copy);
3348	3537	{
..	..	@@ -3401,11 +3590,11 @@
3401	3590	{
3402	3591	copy.ResetBlockLoop(); // temporary problem
3403	3592
3404		- boolean random = CameraPane.RANDOM;
3405		- CameraPane.RANDOM = false; // parse everything
	3593	+ boolean random = CameraPane.SWITCH;
	3594	+ CameraPane.SWITCH = false; // parse everything
3406	3595	copy.ResetDisplayList();
3407	3596	copy.HardTouch();
3408		- CameraPane.RANDOM = random;
	3597	+ CameraPane.SWITCH = random;
3409	3598	}
3410	3599
3411	3600	// public void applySelf()
..	..	@@ -3475,10 +3664,40 @@
3475	3664	current.fakedepth = (float) fakedepthField.getFloat();
3476	3665	current.shadowbias = (float) shadowbiasField.getFloat();
3477	3666
3478		- if (!NumberSlider.frozen)
	3667	+ if (!cNumberSlider.frozen)
3479	3668	{
3480	3669	//System.out.println("Propagate = " + propagate);
3481	3670	copy.UpdateMaterial(anchor, current, propagate);
	3671	+
	3672	+ if (copy.material != null)
	3673	+ {
	3674	+ cMaterial mat = copy.material;
	3675	+
	3676	+ colorField.SetToolTipValue((mat.color));
	3677	+ modulationField.SetToolTipValue((mat.modulation));
	3678	+ metalnessField.SetToolTipValue((mat.metalness));
	3679	+ diffuseField.SetToolTipValue((mat.diffuse));
	3680	+ specularField.SetToolTipValue((mat.specular));
	3681	+ shininessField.SetToolTipValue((mat.shininess));
	3682	+ shiftField.SetToolTipValue((mat.shift));
	3683	+ ambientField.SetToolTipValue((mat.ambient));
	3684	+ lightareaField.SetToolTipValue((mat.lightarea));
	3685	+ diffusenessField.SetToolTipValue((mat.factor));
	3686	+ velvetField.SetToolTipValue((mat.velvet));
	3687	+ sheenField.SetToolTipValue((mat.sheen));
	3688	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3689	+ backlitField.SetToolTipValue((mat.bump));
	3690	+ anisoField.SetToolTipValue((mat.aniso));
	3691	+ anisoVField.SetToolTipValue((mat.anisoV));
	3692	+ cameraField.SetToolTipValue((mat.cameralight));
	3693	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3694	+ shadowField.SetToolTipValue((mat.shadow));
	3695	+ textureField.SetToolTipValue((mat.texture));
	3696	+ opacityField.SetToolTipValue((mat.opacity));
	3697	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3698	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3699	+ }
	3700	+
3482	3701	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3483	3702	{
3484	3703	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3523,6 +3742,7 @@
3523	3742	\|\| e.getSource() == apertureField
3524	3743	\|\| e.getSource() == shadowblurField)
3525	3744	{
	3745	+ new Exception().printStackTrace();
3526	3746	System.exit(0);
3527	3747	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3528	3748	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3549,7 +3769,13 @@
3549	3769	//System.out.println("PARENT = " + parent);
3550	3770	//if (parent != null)
3551	3771	// parent.applySelf();
3552		- refreshContents();
	3772	+ if (e.getSource() == normalpushField)
	3773	+ {
	3774	+ objEditor.refreshContents();
	3775	+ //Refresh();
	3776	+ }
	3777	+ else
	3778	+ refreshContents();
3553	3779	// ??? client.refreshEditWindow();
3554	3780	}
3555	3781	//else
..	..	@@ -3561,7 +3787,7 @@
3561	3787	//group.name = nameField.getText();
3562	3788	//objEditor.applySelf();
3563	3789
3564		- assert (objEditor == this);
	3790	+ // OCT2018: assert (objEditor == this);
3565	3791	if (copy.selection == null \|\| copy.selection.size() == 0)
3566	3792	//super.applySelf()
3567	3793	; else
..	..	@@ -3585,6 +3811,9 @@
3585	3811	objEditor.copy = keep;
3586	3812	}
3587	3813	}
	3814	+
	3815	+ if (normalpushField != null)
	3816	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3588	3817	}
3589	3818
3590	3819	void SnapObject()
..	..	@@ -3839,7 +4068,7 @@
3839	4068
3840	4069	radioPanel.revalidate();
3841	4070	radioPanel.repaint();
3842		- ctrlPanel.revalidate(); // ? new
	4071	+ ctrlPanel.validate(); // ? new
3843	4072	ctrlPanel.repaint();
3844	4073	}
3845	4074	}
..	..	@@ -3848,6 +4077,7 @@
3848	4077
3849	4078	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3850	4079	{
	4080	+ Save();
3851	4081	//Tween.set(thing, 0).target(1).start(tweenManager);
3852	4082	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3853	4083	// if (thing instanceof GenericJointDemo)
..	..	@@ -4051,6 +4281,7 @@
4051	4281	}
4052	4282	}
4053	4283	}
	4284	+
4054	4285	LoadGFDThread loadGFDThread;
4055	4286
4056	4287	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4070,8 +4301,10 @@
4070	4301
4071	4302	try
4072	4303	{
	4304	+ // Try compressed version first.
4073	4305	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4074		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4306	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4307	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4075	4308
4076	4309	readobj = (Object3D) p.readObject();
4077	4310	istream.close();
..	..	@@ -4079,7 +4312,20 @@
4079	4312	readobj.ResetDisplayList();
4080	4313	} catch (Exception e)
4081	4314	{
4082		- e.printStackTrace();
	4315	+ //e.printStackTrace();
	4316	+ try
	4317	+ {
	4318	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4319	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4320	+
	4321	+ readobj = (Object3D) p.readObject();
	4322	+ istream.close();
	4323	+
	4324	+ readobj.ResetDisplayList();
	4325	+ } catch (Exception e2)
	4326	+ {
	4327	+ e2.printStackTrace();
	4328	+ }
4083	4329	}
4084	4330	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4085	4331	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4125,6 +4371,12 @@
4125	4371
4126	4372	void LoadIt(Object obj)
4127	4373	{
	4374	+ if (obj == null)
	4375	+ {
	4376	+ // Invalid file
	4377	+ return;
	4378	+ }
	4379	+
4128	4380	System.out.println("Loaded " + obj);
4129	4381	//new Exception().printStackTrace();
4130	4382	Object3D readobj = (Object3D) obj;
..	..	@@ -4134,6 +4386,7 @@
4134	4386
4135	4387	if (readobj != null)
4136	4388	{
	4389	+ Save();
4137	4390	try
4138	4391	{
4139	4392	//readobj.deepCopySelf(copy);
..	..	@@ -4196,7 +4449,7 @@
4196	4449
4197	4450	void load() // throws ClassNotFoundException
4198	4451	{
4199		- if (GrafreeD.standAlone)
	4452	+ if (Grafreed.standAlone)
4200	4453	{
4201	4454	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4202	4455	browser.show();
..	..	@@ -4283,11 +4536,13 @@
4283	4536	try
4284	4537	{
4285	4538	FileOutputStream ostream = new FileOutputStream(lastname);
4286		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4539	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4540	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4287	4541
4288	4542	p.writeObject(copy);
4289	4543	p.flush();
4290	4544
	4545	+ zstream.close();
4291	4546	ostream.close();
4292	4547
4293	4548	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4297,11 +4552,12 @@
4297	4552	{
4298	4553	}
4299	4554	}
	4555	+
4300	4556	String lastname;
4301	4557
4302	4558	void saveAs()
4303	4559	{
4304		- if (GrafreeD.standAlone)
	4560	+ if (Grafreed.standAlone)
4305	4561	{
4306	4562	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4307	4563	browser.setVisible(true);
..	..	@@ -4406,13 +4662,13 @@
4406	4662	try
4407	4663	{
4408	4664	FileOutputStream ostream = new FileOutputStream(filename);
4409		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4410		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4665	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4666	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4411	4667
4412	4668	Object3D objectparent = obj.parent;
4413	4669	obj.parent = null;
4414	4670
4415		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4671	+ Object3D object = (Object3D) Grafreed.clone(obj);
4416	4672
4417	4673	obj.parent = objectparent;
4418	4674
..	..	@@ -4424,8 +4680,8 @@
4424	4680	p.writeObject(object);
4425	4681	p.flush();
4426	4682
	4683	+ zstream.close();
4427	4684	ostream.close();
4428		- // zstream.close();
4429	4685
4430	4686	// group.selection.get(0).parent = parent;
4431	4687	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4446,7 +4702,7 @@
4446	4702	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4447	4703	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4448	4704	copy.generatePOV(buffer);
4449		- if (GrafreeD.standAlone)
	4705	+ if (Grafreed.standAlone)
4450	4706	{
4451	4707	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4452	4708	browser.show();
..	..	@@ -4472,7 +4728,8 @@
4472	4728	Object3D client;
4473	4729	Object3D copy;
4474	4730	MenuBar menuBar;
4475		- Menu windowMenu;
	4731	+ Menu fileMenu;
	4732	+ MenuItem newItem;
4476	4733	MenuItem loadItem;
4477	4734	MenuItem saveItem;
4478	4735	MenuItem saveAsItem;
..	..	@@ -4480,13 +4737,11 @@
4480	4737	MenuItem reexportItem;
4481	4738	MenuItem povItem;
4482	4739	MenuItem closeItem;
4483		- Menu cameraMenu;
	4740	+
4484	4741	CheckboxMenuItem zBufferItem;
4485	4742	//MenuItem normalLensItem;
4486		- MenuItem editCameraItem;
4487		- MenuItem revertCameraItem;
4488		- CheckboxMenuItem toggleLiveItem;
4489	4743	MenuItem stepItem;
	4744	+ CheckboxMenuItem toggleLiveItem;
4490	4745	CheckboxMenuItem toggleFullScreenItem;
4491	4746	CheckboxMenuItem toggleTimelineItem;
4492	4747	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4495,7 +4750,7 @@
4495	4750	CheckboxMenuItem toggleFootContactItem;
4496	4751	CheckboxMenuItem toggleDLItem;
4497	4752	CheckboxMenuItem toggleTextureItem;
4498		- CheckboxMenuItem toggleRandomItem;
	4753	+ CheckboxMenuItem toggleSwitchItem;
4499	4754	CheckboxMenuItem toggleRootItem;
4500	4755	CheckboxMenuItem animationItem;
4501	4756	CheckboxMenuItem toggleHandleItem;
..	..	@@ -4503,20 +4758,21 @@
4503	4758	JSplitPane mainPanel;
4504	4759	JScrollPane scrollpane;
4505	4760	JPanel toolbarPanel;
4506		- JPanel treePanel;
	4761	+ cGridBag treePanel;
4507	4762	JPanel radioPanel;
4508	4763	ButtonGroup buttonGroup;
4509		- JPanel ctrlPanel;
4510		- JPanel materialPanel;
	4764	+ cGridBag ctrlPanel;
	4765	+ cGridBag materialPanel;
4511	4766	JScrollPane infoPanel;
4512		- JPanel optionsPanel;
	4767	+ cGridBag optionsPanel;
4513	4768	JTabbedPane objectPanel;
4514		- JPanel XYZPanel;
	4769	+ cGridBag XYZPanel;
4515	4770	JSplitPane gridPanel;
4516	4771	JSplitPane bigPanel;
4517		- JPanel bigThree;
4518		- JTabbedPane scenePanel;
4519		- JPanel centralPanel;
	4772	+ cGridBag bigThree;
	4773	+ cGridBag scenePanel;
	4774	+ cGridBag centralPanel;
	4775	+ JSplitPane cameraPanel;
4520	4776	JPanel timelinePanel;
4521	4777	JMenuBar timelineMenubar;
4522	4778	JSplitPane framePanel;
..	..	@@ -4568,65 +4824,72 @@
4568	4824	// MATERIAL
4569	4825	JLabel materialLabel;
4570	4826	JLabel colorLabel;
4571		- NumberSlider colorField;
	4827	+ cNumberSlider colorField;
4572	4828	JLabel modulationLabel;
4573		- NumberSlider modulationField;
	4829	+ cNumberSlider modulationField;
4574	4830	JLabel metalnessLabel;
4575		- NumberSlider metalnessField;
	4831	+ cNumberSlider metalnessField;
4576	4832	JLabel diffuseLabel;
4577		- NumberSlider diffuseField;
	4833	+ cNumberSlider diffuseField;
4578	4834	JLabel specularLabel;
4579		- NumberSlider specularField;
	4835	+ cNumberSlider specularField;
4580	4836	JLabel shininessLabel;
4581		- NumberSlider shininessField;
	4837	+ cNumberSlider shininessField;
4582	4838	JLabel shiftLabel;
4583		- NumberSlider shiftField;
	4839	+ cNumberSlider shiftField;
4584	4840	JLabel ambientLabel;
4585		- NumberSlider ambientField;
	4841	+ cNumberSlider ambientField;
4586	4842	JLabel lightareaLabel;
4587		- NumberSlider lightareaField;
	4843	+ cNumberSlider lightareaField;
4588	4844	JLabel diffusenessLabel;
4589		- NumberSlider diffusenessField;
	4845	+ cNumberSlider diffusenessField;
4590	4846	JLabel velvetLabel;
4591		- NumberSlider velvetField;
	4847	+ cNumberSlider velvetField;
4592	4848	JLabel sheenLabel;
4593		- NumberSlider sheenField;
	4849	+ cNumberSlider sheenField;
4594	4850	JLabel subsurfaceLabel;
4595		- NumberSlider subsurfaceField;
	4851	+ cNumberSlider subsurfaceField;
4596	4852	//JLabel bumpLabel;
4597	4853	//NumberSlider bumpField;
4598	4854	JLabel backlitLabel;
4599		- NumberSlider backlitField;
	4855	+ cNumberSlider backlitField;
4600	4856	JLabel anisoLabel;
4601		- NumberSlider anisoField;
	4857	+ cNumberSlider anisoField;
4602	4858	JLabel anisoVLabel;
4603		- NumberSlider anisoVField;
	4859	+ cNumberSlider anisoVField;
4604	4860	JLabel cameraLabel;
4605		- NumberSlider cameraField;
	4861	+ cNumberSlider cameraField;
4606	4862	JLabel selfshadowLabel;
4607		- NumberSlider selfshadowField;
	4863	+ cNumberSlider selfshadowField;
4608	4864	JLabel shadowLabel;
4609		- NumberSlider shadowField;
	4865	+ cNumberSlider shadowField;
4610	4866	JLabel textureLabel;
4611		- NumberSlider textureField;
	4867	+ cNumberSlider textureField;
4612	4868	JLabel opacityLabel;
4613		- NumberSlider opacityField;
	4869	+ cNumberSlider opacityField;
4614	4870	JLabel fakedepthLabel;
4615		- NumberSlider fakedepthField;
	4871	+ cNumberSlider fakedepthField;
4616	4872	JLabel shadowbiasLabel;
4617		- NumberSlider shadowbiasField;
	4873	+ cNumberSlider shadowbiasField;
4618	4874	JLabel bumpLabel;
4619		- NumberSlider bumpField;
	4875	+ cNumberSlider bumpField;
4620	4876	JLabel noiseLabel;
4621		- NumberSlider noiseField;
	4877	+ cNumberSlider noiseField;
4622	4878	JLabel powerLabel;
4623		- NumberSlider powerField;
	4879	+ cNumberSlider powerField;
4624	4880	JLabel borderfadeLabel;
4625		- NumberSlider borderfadeField;
	4881	+ cNumberSlider borderfadeField;
4626	4882	JLabel fogLabel;
4627		- NumberSlider fogField;
	4883	+ cNumberSlider fogField;
4628	4884	JLabel opacityPowerLabel;
4629		- NumberSlider opacityPowerField;
	4885	+ cNumberSlider opacityPowerField;
4630	4886	JTree jTree;
4631	4887	//ObjectUI parent;
	4888	+
	4889	+ cNumberSlider normalpushField;
	4890	+
	4891	+ private MenuItem importGFDItem;
	4892	+ private MenuItem importVRMLX3DItem;
	4893	+ private MenuItem import3DSItem;
	4894	+ private MenuItem importOBJItem;
4632	4895	}