~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -138,34 +138,41 @@
138	138	public void closeUI()
139	139	{
140	140	//new Exception().printStackTrace();
141		- System.out.println("this = " + this);
142		- System.out.println("objEditor = " + objEditor);
	141	+// System.out.println("this = " + this);
	142	+// System.out.println("objEditor = " + objEditor);
143	143	//nameField.removeActionListener(this);
144		- objEditor.ctrlPanel.remove(nameField);
	144	+// objEditor.ctrlPanel.remove(nameField);
	145	+
	146	+ objEditor.ctrlPanel.remove(namePanel);
145	147
146	148	if (!GroupEditor.allparams)
147	149	return;
148	150
149		- objEditor.ctrlPanel.remove(liveCB);
150		- objEditor.ctrlPanel.remove(hideCB);
151		- objEditor.ctrlPanel.remove(markCB);
152		-
153		- objEditor.ctrlPanel.remove(randomCB);
154		- objEditor.ctrlPanel.remove(speedupCB);
155		- objEditor.ctrlPanel.remove(rewindCB);
156		-
157		- objEditor.ctrlPanel.remove(resetButton);
158		- objEditor.ctrlPanel.remove(stepButton);
159		-// objEditor.ctrlPanel.remove(stepAllButton);
160		-// objEditor.ctrlPanel.remove(resetAllButton);
161		- objEditor.ctrlPanel.remove(link2masterCB);
162		- //objEditor.ctrlPanel.remove(flipVCB);
163		- //objEditor.ctrlPanel.remove(texresMenu);
164		- objEditor.ctrlPanel.remove(slowerButton);
165		- objEditor.ctrlPanel.remove(fasterButton);
166		- 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);
167	169
168		- Remove(normalpushField);
	170	+ objEditor.ctrlPanel.remove(setupPanel);
	171	+ objEditor.ctrlPanel.remove(commandsPanel);
	172	+ objEditor.ctrlPanel.remove(pushPanel);
	173	+ //objEditor.ctrlPanel.remove(fillPanel);
	174	+
	175	+ //Remove(normalpushField);
169	176	}
170	177
171	178	public ObjEditor GetEditor()
..	..	@@ -269,24 +276,40 @@
269	276	void SetupMenu()
270	277	{
271	278	frame.setMenuBar(menuBar = new MenuBar());
272		- menuBar.add(windowMenu = new Menu("File"));
273		- windowMenu.add(loadItem = new MenuItem("Load..."));
274		- windowMenu.add("-");
275		- windowMenu.add(saveItem = new MenuItem("Save"));
276		- windowMenu.add(saveAsItem = new MenuItem("Save As..."));
	279	+ menuBar.add(fileMenu = new Menu("File"));
	280	+ fileMenu.add(newItem = new MenuItem("New"));
	281	+ fileMenu.add(loadItem = new MenuItem("Load..."));
	282	+
	283	+ //oe.menuBar.add(menu = new Menu("Include"));
	284	+ Menu menu = new Menu("Import");
	285	+ importOBJItem = menu.add(new MenuItem("OBJ file..."));
	286	+ importOBJItem.addActionListener(this);
	287	+ import3DSItem = menu.add(new MenuItem("3DS file..."));
	288	+ import3DSItem.addActionListener(this);
	289	+ importVRMLX3DItem = menu.add(new MenuItem("VRML/X3D file..."));
	290	+ importVRMLX3DItem.addActionListener(this);
	291	+ menu.add("-");
	292	+ importGFDItem = menu.add(new MenuItem("Grafreed file..."));
	293	+ importGFDItem.addActionListener(this);
	294	+ fileMenu.add(menu);
	295	+ fileMenu.add("-");
	296	+
	297	+ fileMenu.add(saveItem = new MenuItem("Save"));
	298	+ fileMenu.add(saveAsItem = new MenuItem("Save As..."));
277	299	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
278		- windowMenu.add("-");
279		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
280		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
281		- windowMenu.add("-");
	300	+ fileMenu.add("-");
	301	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	302	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	303	+ fileMenu.add("-");
282	304	if (client.parent != null)
283	305	{
284		- windowMenu.add(closeItem = new MenuItem("Close"));
	306	+ fileMenu.add(closeItem = new MenuItem("Close"));
285	307	} else
286	308	{
287		- windowMenu.add(closeItem = new MenuItem("Exit"));
	309	+ fileMenu.add(closeItem = new MenuItem("Exit"));
288	310	}
289	311
	312	+ newItem.addActionListener(this);
290	313	loadItem.addActionListener(this);
291	314	saveItem.addActionListener(this);
292	315	saveAsItem.addActionListener(this);
..	..	@@ -295,79 +318,26 @@
295	318	//povItem.addActionListener(this);
296	319	closeItem.addActionListener(this);
297	320
298		- menuBar.add(cameraMenu = new Menu("View"));
299		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
300		- //zBufferItem.addActionListener(this);
301		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
302		- //normalLensItem.addActionListener(this);
303		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
304		- revertCameraItem.addActionListener(this);
305		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
306		- toggleTimelineItem.addItemListener(this);
307		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
308		- toggleFullScreenItem.addItemListener(this);
309		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
310		- cameraMenu.add("-");
311		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
312		- toggleTextureItem.addItemListener(this);
313		- toggleTextureItem.setState(CameraPane.textureon);
314		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
315		- toggleLiveItem.addItemListener(this);
316		- toggleLiveItem.setState(Globals.isLIVE());
317		- cameraMenu.add(stepItem = new MenuItem("Step"));
318		- stepItem.addActionListener(this);
319		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
320		-// toggleDLItem.addItemListener(this);
321		-// toggleDLItem.setState(false);
322		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
323		- toggleRenderItem.addItemListener(this);
324		- toggleRenderItem.setState(!CameraPane.frozen);
325		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
326		- toggleDebugItem.addItemListener(this);
327		- toggleDebugItem.setState(CameraPane.DEBUG);
328		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
329		- toggleFrustumItem.addItemListener(this);
330		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
331		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
332		- toggleFootContactItem.addItemListener(this);
333		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
334		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
335		- toggleRandomItem.addItemListener(this);
336		- toggleRandomItem.setState(CameraPane.RANDOM);
337		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
338		- toggleHandleItem.addItemListener(this);
339		- toggleHandleItem.setState(CameraPane.HANDLES);
340		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
341		- togglePaintItem.addItemListener(this);
342		- togglePaintItem.setState(CameraPane.PAINTMODE);
343		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
344		-// toggleRootItem.addItemListener(this);
345		-// toggleRootItem.setState(false);
346		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
347		-// animationItem.addItemListener(this);
348		-// animationItem.setState(CameraPane.ANIMATION);
349		- cameraMenu.add("-");
350		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
351		- editCameraItem.addActionListener(this);
352		-
353	321	objectPanel = new JTabbedPane();
354	322	toolbarPanel = new JPanel();
355	323	toolbarPanel.setName("Toolbar");
356		- treePanel = new JPanel();
	324	+ treePanel = new cGridBag();
357	325	treePanel.setName("Tree");
358		- ctrlPanel = new JPanel(); // new GridBagLayout());
	326	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
359	327	ctrlPanel.setName("Edit");
360		- materialPanel = new JPanel();
	328	+ materialPanel = new cGridBag().setVertical(true);
361	329	materialPanel.setName("Material");
362	330	/JTextPane/
363	331	infoarea = createTextPane();
	332	+ doc = infoarea.getStyledDocument();
	333	+
364	334	infoarea.setEditable(true);
365	335	SetText();
366	336	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
367	337	// infoarea.setOpaque(false);
368	338	// //infoarea.setForeground(textcolor);
369		- infoarea.setLineWrap(true);
370		- infoarea.setWrapStyleWord(true);
	339	+// TEXTAREA infoarea.setLineWrap(true);
	340	+// TEXTAREA infoarea.setWrapStyleWord(true);
371	341	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
372	342	infoPanel.setPreferredSize(new Dimension(50, 200));
373	343	infoPanel.setName("Info");
..	..	@@ -378,16 +348,16 @@
378	348	mainPanel.setName("Main");
379	349	mainPanel.setContinuousLayout(true);
380	350	mainPanel.setOneTouchExpandable(true);
381		- mainPanel.setDividerLocation(1.0);
382	351	mainPanel.setDividerSize(9);
383		- mainPanel.setResizeWeight(0);
	352	+ mainPanel.setDividerLocation(0.5); //1.0);
	353	+ mainPanel.setResizeWeight(0.5);
384	354
385	355	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
386	356	//mainPanel.setLayout(new GridBagLayout());
387	357	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
388		- treePanel.setLayout(new GridBagLayout());
389		- ctrlPanel.setLayout(new GridBagLayout());
390		- materialPanel.setLayout(new GridBagLayout());
	358	+// treePanel.setLayout(new GridBagLayout());
	359	+ //ctrlPanel.setLayout(new GridBagLayout());
	360	+ //materialPanel.setLayout(new GridBagLayout());
391	361
392	362	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
393	363	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -426,7 +396,7 @@
426	396	static String newline = "\n";
427	397	protected static final String buttonString = "JButton";
428	398	StyledDocument doc;
429		- JTextArea infoarea;
	399	+ JTextPane infoarea;
430	400
431	401	void ClearInfo()
432	402	{
..	..	@@ -475,13 +445,13 @@
475	445	//SendInfo("Name:", "bold");
476	446	if (sel.GetTextures() != null \|\| debug)
477	447	{
478		- si.SendInfo(sel.toString(), "bold");
	448	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
479	449	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
480	450	if (sel.Size() > 0)
481	451	{
482	452	si.SendInfo("#children = " + sel.Size(), "regular");
483	453	}
484		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	454	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
485	455	if (debug)
486	456	{
487	457	try
..	..	@@ -493,7 +463,10 @@
493	463	}
494	464
495	465	if (full)
496		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	466	+ {
	467	+ si.SendInfo(" BBox min: " + minima, "regular");
	468	+ si.SendInfo(" BBox max: " + maxima, "regular");
	469	+ }
497	470
498	471	if (sel.bRep != null)
499	472	{
..	..	@@ -520,7 +493,7 @@
520	493	}
521	494	if (sel.support != null)
522	495	{
523		- si.SendInfo(" support: " + sel.support, "regular");
	496	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
524	497	}
525	498	if (sel.scriptnode != null)
526	499	{
..	..	@@ -591,6 +564,9 @@
591	564	{
592	565	CameraPane.pointflow = (PointFlow) sel;
593	566	}
	567	+
	568	+ si.SendInfo("_____________________", "regular");
	569	+ si.SendInfo("", "regular");
594	570	}
595	571	}
596	572
..	..	@@ -622,52 +598,52 @@
622	598	cameraView.ToggleFullScreen();
623	599	}
624	600
625		- private JTextArea createTextPane()
	601	+ private JTextPane createTextPane()
626	602	{
627		- String[] initString =
628		- {
629		- "This is an editable JTextPane, ", //regular
630		- "another ", //italic
631		- "styled ", //bold
632		- "text ", //small
633		- "component, ", //large
634		- "which supports embedded components..." + newline,//regular
635		- " " + newline, //button
636		- "...and embedded icons..." + newline, //regular
637		- " ", //icon
638		- newline + "JTextPane is a subclass of JEditorPane that "
639		- + "uses a StyledEditorKit and StyledDocument, and provides "
640		- + "cover methods for interacting with those objects."
641		- };
	603	+// TEXTAREA String[] initString =
	604	+// {
	605	+// "This is an editable JTextPane, ", //regular
	606	+// "another ", //italic
	607	+// "styled ", //bold
	608	+// "text ", //small
	609	+// "component, ", //large
	610	+// "which supports embedded components..." + newline,//regular
	611	+// " " + newline, //button
	612	+// "...and embedded icons..." + newline, //regular
	613	+// " ", //icon
	614	+// newline + "JTextPane is a subclass of JEditorPane that "
	615	+// + "uses a StyledEditorKit and StyledDocument, and provides "
	616	+// + "cover methods for interacting with those objects."
	617	+// };
	618	+//
	619	+// String[] initStyles =
	620	+// {
	621	+// "regular", "italic", "bold", "small", "large",
	622	+// "regular", "button", "regular", "icon",
	623	+// "regular"
	624	+// };
	625	+//
	626	+// JTextPane textPane = new JTextPane();
	627	+// textPane.setEditable(true);
	628	+// /StyledDocument/ doc = textPane.getStyledDocument();
	629	+// addStylesToDocument(doc);
	630	+//
	631	+// try
	632	+// {
	633	+// for (int j = 0; j < 2; j++)
	634	+// {
	635	+// for (int i = 0; i < initString.length; i++)
	636	+// {
	637	+// doc.insertString(doc.getLength(), initString[i],
	638	+// doc.getStyle(initStyles[i]));
	639	+// }
	640	+// }
	641	+// } catch (BadLocationException ble)
	642	+// {
	643	+// System.err.println("Couldn't insert initial text into text pane.");
	644	+// }
642	645
643		- String[] initStyles =
644		- {
645		- "regular", "italic", "bold", "small", "large",
646		- "regular", "button", "regular", "icon",
647		- "regular"
648		- };
649		-
650		- JTextPane textPane = new JTextPane();
651		- textPane.setEditable(true);
652		- /StyledDocument/ doc = textPane.getStyledDocument();
653		- addStylesToDocument(doc);
654		-
655		- try
656		- {
657		- for (int j = 0; j < 2; j++)
658		- {
659		- for (int i = 0; i < initString.length; i++)
660		- {
661		- doc.insertString(doc.getLength(), initString[i],
662		- doc.getStyle(initStyles[i]));
663		- }
664		- }
665		- } catch (BadLocationException ble)
666		- {
667		- System.err.println("Couldn't insert initial text into text pane.");
668		- }
669		-
670		- return new JTextArea(); // textPane;
	646	+ return new JTextPane(); // textPane;
671	647	}
672	648
673	649	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -720,7 +696,7 @@
720	696	protected static ImageIcon createImageIcon(String path,
721	697	String description)
722	698	{
723		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	699	+ java.net.URL imgURL = Grafreed.class.getResource(path);
724	700	if (imgURL != null)
725	701	{
726	702	return new ImageIcon(imgURL, description);
..	..	@@ -752,6 +728,7 @@
752	728	// NumberSlider vDivsField;
753	729	// JCheckBox endcaps;
754	730	JCheckBox liveCB;
	731	+ JCheckBox selectCB;
755	732	JCheckBox hideCB;
756	733	JCheckBox link2masterCB;
757	734	JCheckBox markCB;
..	..	@@ -767,115 +744,83 @@
767	744	JButton slowerButton;
768	745	JButton fasterButton;
769	746	JButton remarkButton;
	747	+
	748	+ cGridBag namePanel;
	749	+ cGridBag setupPanel;
	750	+ cGridBag commandsPanel;
	751	+ cGridBag pushPanel;
	752	+ cGridBag fillPanel;
770	753
771		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	754	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
772	755	{
773	756	JCheckBox cb;
774	757
775		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
776		- oe.aConstraints.gridwidth = 1; // 3;
777		-// oe.aConstraints.weightx = 1;
778		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
779		- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	758	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
780	759	cb.addItemListener(this);
781		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
782		- oe.aConstraints.gridwidth = 1;
783		- oe.aConstraints.gridx += 1;
784	760
785	761	return cb;
786	762	}
787	763
788		- cButton AddButton(ObjEditor oe, String label)
	764	+ cButton AddButton(cGridBag panel, String label)
789	765	{
790	766	cButton cb;
791	767
792		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
793		- oe.aConstraints.gridwidth = 1;
794		-// oe.aConstraints.weightx = 1;
795		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
796		- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
	768	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
797	769	cb.addActionListener(this);
798		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
799		- oe.aConstraints.gridwidth = 1;
800		- oe.aConstraints.gridx += 1;
801	770
802	771	return cb;
803	772	}
804	773
805		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	774	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
806	775	{
807	776	JComboBox combo;
808	777
809		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
810		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
811		- oe.aConstraints.gridx += 1;
	778	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
812	779	combo.addActionListener(this);
813	780
814	781	return combo;
815	782	}
816	783
817		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	784	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
818	785	{
819		- NumberSlider combo;
	786	+ cGridBag control = new cGridBag();
	787	+
	788	+ cNumberSlider combo;
820	789
821	790	JLabel jlabel = new JLabel(label);
822		-
823		- aConstraints.fill = GridBagConstraints.VERTICAL;
824	791	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
825		- aConstraints.gridwidth = 1;
826		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
827		- aConstraints.gridx += 1;
828		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
829		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
830		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
831		- aConstraints.gridx += 1;
832		- aConstraints.gridwidth = 1;
833		-
	792	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	793	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
834	794	combo.setFloat(current);
835		-
836		- combo.label = jlabel;
837		-
838		- combo.addChangeListener(this);
839		-
840		- return combo;
	795	+
	796	+ panel.add(control);
	797	+
	798	+ return control;
841	799	}
842	800
843		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	801	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
844	802	{
845		- NumberSlider combo;
	803	+ cGridBag control = new cGridBag();
	804	+
	805	+ cNumberSlider combo;
846	806
847	807	JLabel jlabel = new JLabel(label);
848		-
849		- aConstraints.fill = GridBagConstraints.VERTICAL;
850	808	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
851		- aConstraints.gridwidth = 2;
852		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
853		- aConstraints.gridx += 1;
854		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
855		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
856		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
857		- aConstraints.gridx += 1;
858		- aConstraints.gridwidth = 1;
859		-
	809	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	810	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
860	811	combo.setInteger(current);
861	812
862		- combo.label = jlabel;
863		-
864		- combo.addChangeListener(this);
865		-
866		- return combo;
	813	+ panel.add(control);
	814	+
	815	+ return control;
867	816	}
868	817
869		- JTextArea AddText(JPanel ctrlPanel, String name)
	818	+ JTextArea AddText(cGridBag ctrlPanel, String name)
870	819	{
871	820	JTextArea text;
872	821
873		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
874		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
875		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	822	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
876	823	text.addCaretListener(this);
877		- aConstraints.gridx += 1;
878		- aConstraints.gridwidth = 1;
879	824
880	825	return text;
881	826	}
..	..	@@ -905,9 +850,16 @@
905	850	objEditor.ctrlPanel.remove(j);
906	851	}
907	852
	853	+ void Remove(cNumberSlider j)
	854	+ {
	855	+ j.removeChangeListener(this);
	856	+ //objEditor.ctrlPanel.remove(j.label);
	857	+ objEditor.ctrlPanel.remove(j);
	858	+ }
	859	+
908	860	/*
909	861	*/
910		- void Return() // ObjEditor oe)
	862	+ void Return0() // ObjEditor oe)
911	863	{
912	864	aConstraints.gridy += 1;
913	865	aConstraints.gridx = 0;
..	..	@@ -962,37 +914,72 @@
962	914
963	915	void SetupUI2(ObjEditor oe)
964	916	{
965		-// oe.aConstraints.weightx = 0;
966		-// oe.aConstraints.weighty = 0;
967		-// oe.aConstraints.gridx = 0;
968		-// oe.aConstraints.gridy = 0;
969		- SetupName(oe);
	917	+ //SetupName(oe);
	918	+
	919	+ namePanel = new cGridBag();
	920	+
	921	+ nameField = AddText(namePanel, copy.GetName());
	922	+ namePanel.add(nameField);
	923	+ oe.ctrlPanel.add(namePanel);
	924	+
	925	+ oe.ctrlPanel.Return();
970	926
971	927	if (!GroupEditor.allparams)
972	928	return;
973	929
974		- liveCB = AddCheckBox(oe, "Live", copy.live);
975		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
976		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	930	+ setupPanel = new cGridBag().setVertical(false);
	931	+
	932	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	933	+ liveCB.setToolTipText("Animate object");
	934	+ selectCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
	935	+ selectCB.setToolTipText("Make object selectable");
977	936	// Return();
978		- markCB = AddCheckBox(oe, "Mark", copy.marked);
979		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
980		- randomCB = AddCheckBox(oe, "Rand", copy.random);
981		- Return();
982		- resetButton = AddButton(oe, "Reset");
983		- stepButton = AddButton(oe, "Step");
	937	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
	938	+ hideCB.setToolTipText("Hide object");
	939	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	940	+ markCB.setToolTipText("Set the animation target transform");
	941	+
	942	+ rewindCB = AddCheckBox(setupPanel, "Rewind", copy.rewind);
	943	+ rewindCB.setToolTipText("Rewind animation");
	944	+
	945	+ randomCB = AddCheckBox(setupPanel, "Random", copy.random);
	946	+ randomCB.setToolTipText("Option for switch node");
	947	+
	948	+ if (Globals.ADVANCED)
	949	+ {
	950	+ link2masterCB = AddCheckBox(setupPanel, "Support", copy.link2master);
	951	+ link2masterCB.setToolTipText("Attach to support");
	952	+ speedupCB = AddCheckBox(setupPanel, "Speed", copy.speedup);
	953	+ speedupCB.setToolTipText("Option motion capture");
	954	+ }
	955	+
	956	+ oe.ctrlPanel.add(setupPanel);
	957	+ oe.ctrlPanel.Return();
	958	+
	959	+ commandsPanel = new cGridBag().setVertical(false);
	960	+
	961	+ resetButton = AddButton(commandsPanel, "Reset");
	962	+ resetButton.setToolTipText("Jump to frame zero");
	963	+ stepButton = AddButton(commandsPanel, "Step");
	964	+ stepButton.setToolTipText("Step one frame");
984	965	// resetAllButton = AddButton(oe, "Reset All");
985	966	// stepAllButton = AddButton(oe, "Step All");
986		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
987	967	// Return();
988		- slowerButton = AddButton(oe, "Slow");
989		- fasterButton = AddButton(oe, "Fast");
990		- remarkButton = AddButton(oe, "Rem");
	968	+ slowerButton = AddButton(commandsPanel, "Slow");
	969	+ slowerButton.setToolTipText("Decrease animation speed");
	970	+ fasterButton = AddButton(commandsPanel, "Fast");
	971	+ fasterButton.setToolTipText("Increase animation speed");
	972	+ remarkButton = AddButton(commandsPanel, "Remark");
	973	+ remarkButton.setToolTipText("Set the current transform as the target");
991	974
992		- Return();
	975	+ oe.ctrlPanel.add(commandsPanel);
	976	+ oe.ctrlPanel.Return();
993	977
994		- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
995		- Return();
	978	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
	979	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	980	+ //Return();
	981	+
	982	+ oe.ctrlPanel.Return();
996	983
997	984	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
998	985	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1087,7 +1074,7 @@
1087	1074	oe.aConstraints.gridwidth = 1;
1088	1075	/**/
1089	1076	nameField = AddText(oe.ctrlPanel, copy.GetName());
1090		- Return();
	1077	+ oe.ctrlPanel.Return();
1091	1078
1092	1079	//ctrlPanel.add(textureButton = new Button("Texture..."));
1093	1080	//textureButton.setEnabled(false);
..	..	@@ -1264,10 +1251,11 @@
1264	1251	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1265	1252	//tmp.setName("Edit");
1266	1253	objectPanel.add(materialPanel);
1267		- JPanel north = new JPanel(new BorderLayout());
1268		- north.setName("Edit");
1269		- north.add(ctrlPanel, BorderLayout.NORTH);
1270		- objectPanel.add(north);
	1254	+// JPanel north = new JPanel(new BorderLayout());
	1255	+// north.setName("Edit");
	1256	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1257	+// objectPanel.add(north);
	1258	+ objectPanel.add(ctrlPanel);
1271	1259	objectPanel.add(infoPanel);
1272	1260
1273	1261	/*
..	..	@@ -1289,18 +1277,18 @@
1289	1277	scrollpane.addMouseWheelListener(this); // Default not fast enough
1290	1278
1291	1279	/JTabbedPane/ scenePanel = new cGridBag();
1292		- scenePanel.preferredWidth = 7;
	1280	+ scenePanel.preferredWidth = 6;
1293	1281
1294	1282	JTabbedPane tabbedPane = new JTabbedPane();
1295	1283	tabbedPane.add(scrollpane);
1296	1284
1297	1285	tabbedPane.add(FSPane = new cFileSystemPane(this));
1298	1286
1299		- optionsPanel = new JPanel(new GridBagLayout());
	1287	+ optionsPanel = new cGridBag().setVertical(true);
1300	1288
1301	1289	optionsPanel.setName("Options");
1302	1290
1303		- AddOptions(optionsPanel, aConstraints);
	1291	+ AddOptions(optionsPanel); //, aConstraints);
1304	1292
1305	1293	tabbedPane.add(optionsPanel);
1306	1294
..	..	@@ -1395,8 +1383,8 @@
1395	1383
1396	1384	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1397	1385
1398		- frame.setSize(1024, 768);
1399		- frame.show();
	1386	+ frame.setSize(1280, 860);
	1387	+ frame.setVisible(true);
1400	1388
1401	1389	gridPanel.setDividerLocation(1.0);
1402	1390
..	..	@@ -1411,7 +1399,7 @@
1411	1399	});
1412	1400	}
1413	1401
1414		- void AddOptions(JPanel panel, GridBagConstraints constraints)
	1402	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
1415	1403	{
1416	1404	}
1417	1405
..	..	@@ -1426,260 +1414,173 @@
1426	1414	ctrlPanel.removeAll();
1427	1415	}
1428	1416
1429		- void SetupMaterial(JPanel ctrlPanel)
	1417	+ void SetupMaterial(cGridBag panel)
1430	1418	{
1431		- aConstraints.weighty = 0;
1432		- //aConstraints.weightx = 1;
1433		- /*
	1419	+ /*
1434	1420	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1435	1421	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1436		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1437		- aConstraints.gridx += 1;
1438	1422	*/
1439	1423
1440		- aConstraints.gridwidth = 1;
1441		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1442		- aConstraints.gridx += 1;
1443		- aConstraints.weighty = 0;
1444		- aConstraints.gridwidth = 1;
	1424	+ cGridBag editBar = new cGridBag().setVertical(false);
	1425	+
	1426	+ editBar.add(createMaterialButton = new cButton("Create", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1427	+ createMaterialButton.setToolTipText("Create material");
1445	1428
1446	1429	/*
1447	1430	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1448		- aConstraints.gridx += 1;
1449		- aConstraints.weighty = 0;
1450		- aConstraints.gridwidth = 1;
1451	1431	*/
1452	1432
1453		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1454		- aConstraints.gridx += 1;
	1433	+ editBar.add(clearMaterialButton = new cButton("Clear", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1434	+ clearMaterialButton.setToolTipText("Clear material");
	1435	+
	1436	+ if (Globals.ADVANCED)
	1437	+ {
	1438	+ editBar.add(resetSlidersButton = new cButton("Reset", !Grafreed.NIMBUSLAF)); // , aConstraints);
	1439	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1440	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
	1441	+ }
1455	1442
1456		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1457		-
1458		- aConstraints.gridx += 1;
1459		-
1460		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1461		-
1462		- aConstraints.gridx += 1;
1463		-
1464		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1465		-
1466		- aConstraints.gridx = 0;
1467		- aConstraints.gridy += 1;
1468		- aConstraints.weighty = 0;
1469		- aConstraints.gridwidth = 1;
	1443	+ editBar.preferredHeight = 15;
	1444	+
	1445	+ panel.add(editBar);
	1446	+
1470	1447	/**/
1471	1448	//aConstraints.weighty = 0;
1472	1449	////aConstraints.weightx = 1;
1473	1450	//aConstraints.weighty = 1;
1474	1451	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1475	1452	//aConstraints.gridx += 1;
1476		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1477		- aConstraints.weighty = 0;
1478		- aConstraints.gridx = 0;
1479		- aConstraints.gridy += 1;
1480		- aConstraints.gridwidth = 1;
	1453	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1481	1454
1482		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1483		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1484		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1485		- aConstraints.gridx += 1;
1486		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1487		- //aConstraints.weightx = 0;
1488		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1489		- aConstraints.gridx = 0;
1490		- aConstraints.gridy += 1;
1491		- aConstraints.gridwidth = 1;
	1455	+ cGridBag colorSection = new cGridBag().setVertical(true);
	1456	+
	1457	+ cGridBag color = new cGridBag();
	1458	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1459	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1460	+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1461	+ //colorField.preferredWidth = 200;
	1462	+ colorSection.add(color);
1492	1463
1493		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1494		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1495		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1496		- aConstraints.gridx += 1;
1497		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1498		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1499		- aConstraints.gridx = 0;
1500		- aConstraints.gridy += 1;
1501		- aConstraints.gridwidth = 1;
	1464	+ cGridBag modulation = new cGridBag();
	1465	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1466	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1467	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1468	+ colorSection.add(modulation);
1502	1469
1503		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1504		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1505		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1506		- aConstraints.gridx += 1;
1507		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1508		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1509		- aConstraints.gridx = 0;
1510		- aConstraints.gridy += 1;
1511		- aConstraints.gridwidth = 1;
	1470	+ cGridBag texture = new cGridBag();
	1471	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1472	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1473	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1474	+ colorSection.add(texture);
1512	1475
1513		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1514		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1515		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1516		- aConstraints.gridx += 1;
1517		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1518		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1519		- aConstraints.gridx = 0;
1520		- aConstraints.gridy += 1;
1521		- aConstraints.gridwidth = 1;
	1476	+ cGridBag anisoU = new cGridBag();
	1477	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1478	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1479	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1480	+ colorSection.add(anisoU);
1522	1481
1523		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1524		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1525		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1526		- aConstraints.gridx += 1;
1527		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1528		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1529		- aConstraints.gridx = 0;
1530		- aConstraints.gridy += 1;
1531		- aConstraints.gridwidth = 1;
	1482	+ cGridBag anisoV = new cGridBag();
	1483	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1484	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1485	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1486	+ colorSection.add(anisoV);
1532	1487
1533		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1534		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1535		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1536		- aConstraints.gridx += 1;
1537		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1538		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1539		- aConstraints.gridx = 0;
1540		- aConstraints.gridy += 1;
1541		- aConstraints.gridwidth = 1;
	1488	+ cGridBag shadowbias = new cGridBag();
	1489	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1490	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1491	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1492	+ colorSection.add(shadowbias);
1542	1493
1543		- //aConstraints.weighty = 1;
1544		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1545		- //aConstraints.gridx += 1;
1546		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1547		- aConstraints.weighty = 0;
1548		- aConstraints.gridx = 0;
1549		- aConstraints.gridy += 1;
1550		- aConstraints.gridwidth = 1;
	1494	+ panel.add(new JSeparator());
	1495	+
	1496	+ panel.add(colorSection);
	1497	+
	1498	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1499	+
	1500	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1501	+
	1502	+ cGridBag diffuse = new cGridBag();
	1503	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1504	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1505	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1506	+ diffuseSection.add(diffuse);
1551	1507
1552		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1553		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1554		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1555		- aConstraints.gridx += 1;
1556		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1557		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1558		- aConstraints.gridx = 0;
1559		- aConstraints.gridy += 1;
1560		- aConstraints.gridwidth = 1;
	1508	+ cGridBag diffuseness = new cGridBag();
	1509	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1510	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1511	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1512	+ diffuseSection.add(diffuseness);
1561	1513
1562		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1563		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1564		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1565		- aConstraints.gridx += 1;
1566		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1567		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1568		- aConstraints.gridx = 0;
1569		- aConstraints.gridy += 1;
1570		- aConstraints.gridwidth = 1;
	1514	+ cGridBag selfshadow = new cGridBag();
	1515	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1516	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1517	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1518	+ diffuseSection.add(selfshadow);
1571	1519
1572		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1573		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1574		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1575		- aConstraints.gridx += 1;
1576		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1577		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1578		- aConstraints.gridx = 0;
1579		- aConstraints.gridy += 1;
1580		- aConstraints.gridwidth = 1;
	1520	+ cGridBag sheen = new cGridBag();
	1521	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1522	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1523	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1524	+ diffuseSection.add(sheen);
1581	1525
1582		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1583		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1584		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1585		- aConstraints.gridx += 1;
1586		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1587		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1588		- aConstraints.gridx = 0;
1589		- aConstraints.gridy += 1;
1590		- aConstraints.gridwidth = 1;
	1526	+ cGridBag subsurface = new cGridBag();
	1527	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1528	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1529	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1530	+ diffuseSection.add(subsurface);
1591	1531
1592		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1593		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1594		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1595		- aConstraints.gridx += 1;
1596		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1597		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1598		- aConstraints.gridx = 0;
1599		- aConstraints.gridy += 1;
1600		- aConstraints.gridwidth = 1;
	1532	+ cGridBag shadow = new cGridBag();
	1533	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1534	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1535	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1536	+ diffuseSection.add(shadow);
1601	1537
1602		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1603		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1604		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1605		- aConstraints.gridx += 1;
1606		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1607		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1608		- aConstraints.gridx = 0;
1609		- aConstraints.gridy += 1;
1610		- aConstraints.gridwidth = 1;
	1538	+ cGridBag fakedepth = new cGridBag();
	1539	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1540	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1541	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1542	+ diffuseSection.add(fakedepth);
1611	1543
1612		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1613		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1614		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1615		- aConstraints.gridx += 1;
1616		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1617		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1618		- aConstraints.gridx = 0;
1619		- aConstraints.gridy += 1;
1620		- aConstraints.gridwidth = 1;
	1544	+ panel.add(new JSeparator());
	1545	+
	1546	+ panel.add(diffuseSection);
	1547	+
	1548	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1549	+
	1550	+ cGridBag specularSection = new cGridBag().setVertical(true);
1621	1551
1622		- //aConstraints.weighty = 1;
1623		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1624		- //aConstraints.gridx += 1;
1625		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1626		- aConstraints.weighty = 0;
1627		- aConstraints.gridx = 0;
1628		- aConstraints.gridy += 1;
1629		- aConstraints.gridwidth = 1;
	1552	+ cGridBag specular = new cGridBag();
	1553	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1554	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1555	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1556	+ specularSection.add(specular);
1630	1557
1631		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1632		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1633		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1634		- aConstraints.gridx += 1;
1635		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1636		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1637		- aConstraints.gridx = 0;
1638		- aConstraints.gridy += 1;
1639		- aConstraints.gridwidth = 1;
	1558	+ cGridBag lightarea = new cGridBag();
	1559	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1560	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1561	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1562	+ specularSection.add(lightarea);
1640	1563
1641		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1642		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1643		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1644		- aConstraints.gridx += 1;
1645		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1646		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1647		- aConstraints.gridx = 0;
1648		- aConstraints.gridy += 1;
1649		- aConstraints.gridwidth = 1;
	1564	+ cGridBag shininess = new cGridBag();
	1565	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1566	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1567	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1568	+ specularSection.add(shininess);
1650	1569
1651		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1652		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1653		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1654		- aConstraints.gridx += 1;
1655		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1656		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1657		- aConstraints.gridx = 0;
1658		- aConstraints.gridy += 1;
1659		- aConstraints.gridwidth = 1;
	1570	+ cGridBag metalness = new cGridBag();
	1571	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1572	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1573	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1574	+ specularSection.add(metalness);
1660	1575
1661		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1662		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1663		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1664		- aConstraints.gridx += 1;
1665		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1666		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1667		- aConstraints.gridx = 0;
1668		- aConstraints.gridy += 1;
1669		- aConstraints.gridwidth = 1;
	1576	+ cGridBag velvet = new cGridBag();
	1577	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1578	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1579	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1580	+ specularSection.add(velvet);
1670	1581
1671		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1672		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1673		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1674		- aConstraints.gridx += 1;
1675		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1676		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1677		- aConstraints.gridx = 0;
1678		- aConstraints.gridy += 1;
1679		- aConstraints.gridwidth = 1;
1680		-
1681		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1682		- Return();
	1582	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1583	+ //Return();
1683	1584	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1684	1585	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1685	1586	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1690,130 +1591,93 @@
1690	1591	// aConstraints.gridy += 1;
1691	1592	// aConstraints.gridwidth = 1;
1692	1593
1693		- //aConstraints.weighty = 1;
1694		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1695		- //aConstraints.gridx += 1;
1696		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1697		- aConstraints.weighty = 0;
1698		- aConstraints.gridx = 0;
1699		- aConstraints.gridy += 1;
1700		- aConstraints.gridwidth = 1;
1701	1594
1702		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1703		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1704		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1705		- aConstraints.gridx += 1;
1706		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1707		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1708		- aConstraints.gridx = 0;
1709		- aConstraints.gridy += 1;
1710		- aConstraints.gridwidth = 1;
	1595	+ panel.add(new JSeparator());
	1596	+
	1597	+ panel.add(specularSection);
	1598	+
	1599	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1600	+
	1601	+ cGridBag globalSection = new cGridBag().setVertical(true);
1711	1602
1712		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1713		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1714		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1715		- aConstraints.gridx += 1;
1716		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1717		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1718		- aConstraints.gridx = 0;
1719		- aConstraints.gridy += 1;
1720		- aConstraints.gridwidth = 1;
	1603	+ cGridBag camera = new cGridBag();
	1604	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1605	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1606	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1607	+ globalSection.add(camera);
1721	1608
1722		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1723		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1724		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1725		- aConstraints.gridx += 1;
1726		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1727		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1728		- aConstraints.gridx = 0;
1729		- aConstraints.gridy += 1;
1730		- aConstraints.gridwidth = 1;
	1609	+ cGridBag ambient = new cGridBag();
	1610	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1611	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1612	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1613	+ globalSection.add(ambient);
1731	1614
1732		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1733		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1734		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1735		- aConstraints.gridx += 1;
1736		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1737		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1738		- aConstraints.gridx = 0;
1739		- aConstraints.gridy += 1;
1740		- aConstraints.gridwidth = 1;
1741		- aConstraints.weighty = 0;
	1615	+ cGridBag backlit = new cGridBag();
	1616	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1617	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1618	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1619	+ globalSection.add(backlit);
1742	1620
1743		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1744		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1745		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1746		- aConstraints.gridx += 1;
1747		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1748		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1749		- aConstraints.gridx = 0;
1750		- aConstraints.gridy += 1;
1751		- aConstraints.gridwidth = 1;
	1621	+ cGridBag opacity = new cGridBag();
	1622	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1623	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1624	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1625	+ globalSection.add(opacity);
1752	1626
1753		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1754		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1755		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1756		- aConstraints.gridx += 1;
1757		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1758		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1759		- aConstraints.gridx = 0;
1760		- aConstraints.gridy += 1;
1761		- aConstraints.gridwidth = 1;
	1627	+ panel.add(new JSeparator());
	1628	+
	1629	+ panel.add(globalSection);
	1630	+
	1631	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1632	+
	1633	+ cGridBag textureSection = new cGridBag().setVertical(true);
1762	1634
1763		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1764		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1765		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1766		- aConstraints.gridx += 1;
1767		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1768		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1769		- aConstraints.gridx = 0;
1770		- aConstraints.gridy += 1;
1771		- aConstraints.gridwidth = 1;
	1635	+ cGridBag bump = new cGridBag();
	1636	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1637	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1638	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1639	+ textureSection.add(bump);
1772	1640
1773		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1774		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1775		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1776		- aConstraints.gridx += 1;
1777		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1778		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1779		- aConstraints.gridx = 0;
1780		- aConstraints.gridy += 1;
1781		- aConstraints.gridwidth = 1;
	1641	+ cGridBag noise = new cGridBag();
	1642	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1643	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1644	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1645	+ textureSection.add(noise);
1782	1646
1783		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1784		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1785		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1786		- aConstraints.gridx += 1;
1787		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1788		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1789		- aConstraints.gridx = 0;
1790		- aConstraints.gridy += 1;
1791		- aConstraints.gridwidth = 1;
	1647	+ cGridBag power = new cGridBag();
	1648	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1649	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1650	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1651	+ textureSection.add(power);
1792	1652
1793		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1794		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1795		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1796		- aConstraints.gridx += 1;
1797		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1798		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1799		- aConstraints.gridx = 0;
1800		- aConstraints.gridy += 1;
1801		- aConstraints.gridwidth = 1;
	1653	+ cGridBag borderfade = new cGridBag();
	1654	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1655	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1656	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1657	+ textureSection.add(borderfade);
1802	1658
1803		- //aConstraints.weighty = 1;
1804		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1805		- //aConstraints.gridx += 1;
1806		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1807		- aConstraints.weighty = 0;
	1659	+ cGridBag fog = new cGridBag();
	1660	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1661	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1662	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1663	+ textureSection.add(fog);
1808	1664
1809		- aConstraints.gridx = 0;
1810		- aConstraints.gridy = 0;
1811		- aConstraints.gridwidth = 1;
	1665	+ cGridBag opacityPower = new cGridBag();
	1666	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	1667	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1668	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	1669	+ textureSection.add(opacityPower);
	1670	+
	1671	+ panel.add(new JSeparator());
	1672	+
	1673	+ panel.add(textureSection);
	1674	+
	1675	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1812	1676
1813	1677	SetMaterial(copy); // .GetMaterial());
1814	1678
1815		- colorField.addChangeListener(this);
1816		- modulationField.addChangeListener(this);
	1679	+ //colorField.addChangeListener(this);
	1680	+// modulationField.addChangeListener(this);
1817	1681	metalnessField.addChangeListener(this);
1818	1682	diffuseField.addChangeListener(this);
1819	1683	specularField.addChangeListener(this);
..	..	@@ -1843,12 +1707,15 @@
1843	1707	opacityPowerField.addChangeListener(this);
1844	1708	/**/
1845	1709
1846		- resetSlidersButton.addActionListener(this);
1847	1710	clearMaterialButton.addActionListener(this);
1848	1711	createMaterialButton.addActionListener(this);
1849		-
1850		- propagateToggle.addItemListener(this);
1851		- multiplyToggle.addItemListener(this);
	1712	+
	1713	+ if (Globals.ADVANCED)
	1714	+ {
	1715	+ resetSlidersButton.addActionListener(this);
	1716	+ propagateToggle.addItemListener(this);
	1717	+ multiplyToggle.addItemListener(this);
	1718	+ }
1852	1719	}
1853	1720
1854	1721	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -2019,7 +1886,7 @@
2019	1886
2020	1887	//? flashIt = false;
2021	1888	CameraPane pane = (CameraPane) cameraView;
2022		- pane.clickStart(location.x, location.y, 0);
	1889	+ pane.clickStart(location.x, location.y, 0, 0);
2023	1890	pane.clickEnd(location.x, location.y, 0, true);
2024	1891
2025	1892	if (group.selection.size() == 1)
..	..	@@ -2476,11 +2343,11 @@
2476	2343
2477	2344	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2478	2345	{
2479		- if (GrafreeD.standAlone)
	2346	+ if (Grafreed.standAlone)
2480	2347	{
2481	2348	/**/
2482	2349	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2483		- browser.show();
	2350	+ browser.setVisible(true);
2484	2351	String filename = browser.getFile();
2485	2352	if (filename != null && filename.length() > 0)
2486	2353	{
..	..	@@ -2625,6 +2492,7 @@
2625	2492	}
2626	2493	if (input == null)
2627	2494	{
	2495	+ new Exception().printStackTrace();
2628	2496	System.exit(0);
2629	2497	}
2630	2498
..	..	@@ -2839,7 +2707,8 @@
2839	2707	return;
2840	2708	}
2841	2709
2842		- multiplyToggle.setSelected(mat.multiply);
	2710	+ if (multiplyToggle != null)
	2711	+ multiplyToggle.setSelected(mat.multiply);
2843	2712
2844	2713	assert (object.projectedVertices != null);
2845	2714
..	..	@@ -3054,7 +2923,7 @@
3054	2923	frame.validate();
3055	2924
3056	2925	return;
3057		- } else if (event.getSource() == toggleRandomItem)
	2926	+ } else if (event.getSource() == toggleSwitchItem)
3058	2927	{
3059	2928	cameraView.ToggleRandom();
3060	2929	cameraView.repaint();
..	..	@@ -3085,6 +2954,10 @@
3085	2954	{
3086	2955	copy.live ^= true;
3087	2956	return;
	2957	+ } else if (event.getSource() == selectCB)
	2958	+ {
	2959	+ copy.dontselect ^= true;
	2960	+ return;
3088	2961	} else if (event.getSource() == hideCB)
3089	2962	{
3090	2963	copy.hide ^= true;
..	..	@@ -3099,6 +2972,7 @@
3099	2972	if (event.getSource() == randomCB)
3100	2973	{
3101	2974	copy.random ^= true;
	2975	+ objEditor.refreshContents();
3102	2976	return;
3103	2977	}
3104	2978	if (event.getSource() == speedupCB)
..	..	@@ -3122,8 +2996,9 @@
3122	2996
3123	2997	public void actionPerformed(ActionEvent event)
3124	2998	{
	2999	+ Object source = event.getSource();
3125	3000	// SCRIPT DIALOG
3126		- if (event.getSource() == okbutton)
	3001	+ if (source == okbutton)
3127	3002	{
3128	3003	textpanel.setVisible(false);
3129	3004	textpanel.remove(textarea);
..	..	@@ -3135,7 +3010,7 @@
3135	3010	textarea = null;
3136	3011	textpanel = null;
3137	3012	}
3138		- if (event.getSource() == cancelbutton)
	3013	+ if (source == cancelbutton)
3139	3014	{
3140	3015	textpanel.setVisible(false);
3141	3016	textpanel.remove(textarea);
..	..	@@ -3147,50 +3022,50 @@
3147	3022	//applySelf();
3148	3023	//client.refreshEditWindow();
3149	3024	//refreshContents();
3150		- if (event.getSource() == nameField)
	3025	+ if (source == nameField)
3151	3026	{
3152	3027	//System.out.println("ObjEditor " + event);
3153	3028	applySelf0(true);
3154	3029	//parent.applySelf();
3155	3030	objEditor.refreshContents();
3156		- } else if (event.getSource() == resetButton)
	3031	+ } else if (source == resetButton)
3157	3032	{
3158	3033	CameraPane.fullreset = true;
3159	3034	copy.Reset(); // ResetMeshes();
3160	3035	copy.Touch();
3161	3036	objEditor.refreshContents();
3162		- } else if (event.getSource() == stepItem)
	3037	+ } else if (source == stepItem)
3163	3038	{
3164	3039	//cameraView.ONESTEP = true;
3165	3040	Globals.ONESTEP = true;
3166	3041	cameraView.repaint();
3167	3042	return;
3168		- } else if (event.getSource() == stepButton)
	3043	+ } else if (source == stepButton)
3169	3044	{
3170	3045	copy.Step();
3171	3046	copy.Touch();
3172	3047	objEditor.refreshContents();
3173		- } else if (event.getSource() == slowerButton)
	3048	+ } else if (source == slowerButton)
3174	3049	{
3175	3050	copy.Slower();
3176	3051	copy.Touch();
3177	3052	objEditor.refreshContents();
3178		- } else if (event.getSource() == fasterButton)
	3053	+ } else if (source == fasterButton)
3179	3054	{
3180	3055	copy.Faster();
3181	3056	copy.Touch();
3182	3057	objEditor.refreshContents();
3183		- } else if (event.getSource() == remarkButton)
	3058	+ } else if (source == remarkButton)
3184	3059	{
3185	3060	copy.Remark();
3186	3061	copy.Touch();
3187	3062	objEditor.refreshContents();
3188		- } else if (event.getSource() == stepAllButton)
	3063	+ } else if (source == stepAllButton)
3189	3064	{
3190	3065	copy.StepAll();
3191	3066	copy.Touch();
3192	3067	objEditor.refreshContents();
3193		- } else if (event.getSource() == resetAllButton)
	3068	+ } else if (source == resetAllButton)
3194	3069	{
3195	3070	//CameraPane.fullreset = true;
3196	3071	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3223,53 +3098,75 @@
3223	3098	// Close();
3224	3099	// }
3225	3100	// else
3226		- if (event.getSource() == resetSlidersButton)
	3101	+ if (source == resetSlidersButton)
3227	3102	{
3228	3103	ResetSliders();
3229		- } else if (event.getSource() == clearMaterialButton)
	3104	+ } else if (source == clearMaterialButton)
3230	3105	{
3231	3106	ClearMaterial();
3232		- } else if (event.getSource() == createMaterialButton)
	3107	+ } else if (source == createMaterialButton)
3233	3108	{
3234	3109	CreateMaterial();
3235		- } else if (event.getSource() == clearPanelButton)
	3110	+ } else if (source == clearPanelButton)
3236	3111	{
3237	3112	copy.ClearUI();
3238	3113	refreshContents(true);
3239		- } /*
3240		- }
3241		-
3242		- public boolean action(Event event, Object arg)
3243		- {
3244		- */ else if (event.getSource() == closeItem)
	3114	+ } else if (source == importGFDItem)
	3115	+ {
	3116	+ ImportGFD();
	3117	+ } else
	3118	+ if (source == importVRMLX3DItem)
	3119	+ {
	3120	+ ImportVRMLX3D();
	3121	+ } else
	3122	+ if (source == import3DSItem)
	3123	+ {
	3124	+ objEditor.ImportJME(new com.jmex.model.converters.MaxToJme(), "3ds", "Import 3DS");
	3125	+ } else
	3126	+ if (source == importOBJItem)
	3127	+ {
	3128	+ //objEditor.ImportJME(new com.jmex.model.converters.ObjToJme(), "obj", "Import OBJ");
	3129	+ FileDialog browser = new FileDialog(frame, "Import OBJ", FileDialog.LOAD);
	3130	+ browser.setVisible(true);
	3131	+ String filename = browser.getFile();
	3132	+ if (filename != null && filename.length() > 0)
	3133	+ {
	3134	+ String fullname = browser.getDirectory() + filename;
	3135	+ makeSomething(ReadOBJ(fullname), true);
	3136	+ }
	3137	+ } else
	3138	+ if (source == closeItem)
3245	3139	{
3246	3140	Close();
3247	3141	//return true;
3248		- } else if (event.getSource() == loadItem)
	3142	+ } else if (source == loadItem)
3249	3143	{
3250	3144	load();
3251	3145	//return true;
3252		- } else if (event.getSource() == saveItem)
	3146	+ } else if (source == newItem)
	3147	+ {
	3148	+ New();
	3149	+ } else if (source == saveItem)
3253	3150	{
3254	3151	save();
3255	3152	//return true;
3256		- } else if (event.getSource() == saveAsItem)
	3153	+ } else if (source == saveAsItem)
3257	3154	{
3258	3155	saveAs();
3259	3156	//return true;
3260		- } else if (event.getSource() == reexportItem)
	3157	+ } else if (source == reexportItem)
3261	3158	{
3262	3159	reexport();
3263	3160	//return true;
3264		- } else if (event.getSource() == exportAsItem)
	3161	+ } else if (source == exportAsItem)
3265	3162	{
3266	3163	export();
3267	3164	//return true;
3268		- } else if (event.getSource() == povItem)
	3165	+ } else if (source == povItem)
3269	3166	{
3270	3167	generatePOV();
3271	3168	//return true;
3272		- } else if (event.getSource() == zBufferItem)
	3169	+ } else if (source == zBufferItem)
3273	3170	{
3274	3171	try
3275	3172	{
..	..	@@ -3291,21 +3188,8 @@
3291	3188	cameraView.repaint();
3292	3189	//return true;
3293	3190	}
3294		- */ else if (event.getSource() == editCameraItem)
3295		- {
3296		- cameraView.ProtectCamera();
3297		- cameraView.repaint();
3298		- return;
3299		- } else if (event.getSource() == revertCameraItem)
3300		- {
3301		- cameraView.RevertCamera();
3302		- cameraView.repaint();
3303		- return;
3304		-// } else if (event.getSource() == textureButton)
3305		-// {
3306		-// return; // true;
3307		- } else // combos...
3308		- if (event.getSource() == texresMenu)
	3191	+ */ else // combos...
	3192	+ if (source == texresMenu)
3309	3193	{
3310	3194	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3311	3195	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3317,12 +3201,54 @@
3317	3201	}
3318	3202	}
3319	3203
	3204	+ void New()
	3205	+ {
	3206	+ while (copy.Size() > 1)
	3207	+ {
	3208	+ copy.remove(1);
	3209	+ }
	3210	+ ResetModel();
	3211	+ objEditor.refreshContents();
	3212	+ }
	3213	+
	3214	+ void ImportGFD()
	3215	+ {
	3216	+ FileDialog browser = new FileDialog(objEditor.frame, "Import GrafreeD", FileDialog.LOAD);
	3217	+ browser.show();
	3218	+ String filename = browser.getFile();
	3219	+ if (filename != null && filename.length() > 0)
	3220	+ {
	3221	+ String fullname = browser.getDirectory() + filename;
	3222	+
	3223	+ //Object3D readobj =
	3224	+ objEditor.ReadGFD(fullname, objEditor);
	3225	+ //makeSomething(readobj);
	3226	+ }
	3227	+ }
	3228	+
	3229	+ void ImportVRMLX3D()
	3230	+ {
	3231	+ if (Grafreed.standAlone)
	3232	+ {
	3233	+ /**/
	3234	+ FileDialog browser = new FileDialog(objEditor.frame, "Import VRML/X3D", FileDialog.LOAD);
	3235	+ browser.show();
	3236	+ String filename = browser.getFile();
	3237	+ if (filename != null && filename.length() > 0)
	3238	+ {
	3239	+ String fullname = browser.getDirectory() + filename;
	3240	+ LoadVRMLX3D(fullname);
	3241	+ }
	3242	+ /**/
	3243	+ }
	3244	+ }
	3245	+
3320	3246	void ToggleAnimation()
3321	3247	{
3322	3248	if (!Globals.ANIMATION)
3323	3249	{
3324	3250	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3325		- browser.show();
	3251	+ browser.setVisible(true);
3326	3252	String filename = browser.getFile();
3327	3253	if (filename != null && filename.length() > 0)
3328	3254	{
..	..	@@ -3332,8 +3258,8 @@
3332	3258
3333	3259	Globals.ANIMATION ^= true;
3334	3260
3335		- GrafreeD.wav.cursor = 0;
3336		- GrafreeD.wav.loop = 0;
	3261	+ Grafreed.wav.cursor = 0;
	3262	+ Grafreed.wav.loop = 0;
3337	3263	}
3338	3264	} else
3339	3265	{
..	..	@@ -3383,7 +3309,7 @@
3383	3309	void CreateMaterial()
3384	3310	{
3385	3311	//copy.ClearMaterial(); // PATCH
3386		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3312	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3387	3313	if (copy.selection.size() > 0)
3388	3314	//SetMaterial(copy);
3389	3315	{
..	..	@@ -3442,11 +3368,11 @@
3442	3368	{
3443	3369	copy.ResetBlockLoop(); // temporary problem
3444	3370
3445		- boolean random = CameraPane.RANDOM;
3446		- CameraPane.RANDOM = false; // parse everything
	3371	+ boolean random = CameraPane.SWITCH;
	3372	+ CameraPane.SWITCH = false; // parse everything
3447	3373	copy.ResetDisplayList();
3448	3374	copy.HardTouch();
3449		- CameraPane.RANDOM = random;
	3375	+ CameraPane.SWITCH = random;
3450	3376	}
3451	3377
3452	3378	// public void applySelf()
..	..	@@ -3516,10 +3442,40 @@
3516	3442	current.fakedepth = (float) fakedepthField.getFloat();
3517	3443	current.shadowbias = (float) shadowbiasField.getFloat();
3518	3444
3519		- if (!NumberSlider.frozen)
	3445	+ if (!cNumberSlider.frozen)
3520	3446	{
3521	3447	//System.out.println("Propagate = " + propagate);
3522	3448	copy.UpdateMaterial(anchor, current, propagate);
	3449	+
	3450	+ if (copy.material != null)
	3451	+ {
	3452	+ cMaterial mat = copy.material;
	3453	+
	3454	+ colorField.SetToolTipValue((mat.color));
	3455	+ modulationField.SetToolTipValue((mat.modulation));
	3456	+ metalnessField.SetToolTipValue((mat.metalness));
	3457	+ diffuseField.SetToolTipValue((mat.diffuse));
	3458	+ specularField.SetToolTipValue((mat.specular));
	3459	+ shininessField.SetToolTipValue((mat.shininess));
	3460	+ shiftField.SetToolTipValue((mat.shift));
	3461	+ ambientField.SetToolTipValue((mat.ambient));
	3462	+ lightareaField.SetToolTipValue((mat.lightarea));
	3463	+ diffusenessField.SetToolTipValue((mat.factor));
	3464	+ velvetField.SetToolTipValue((mat.velvet));
	3465	+ sheenField.SetToolTipValue((mat.sheen));
	3466	+ subsurfaceField.SetToolTipValue((mat.subsurface));
	3467	+ backlitField.SetToolTipValue((mat.bump));
	3468	+ anisoField.SetToolTipValue((mat.aniso));
	3469	+ anisoVField.SetToolTipValue((mat.anisoV));
	3470	+ cameraField.SetToolTipValue((mat.cameralight));
	3471	+ selfshadowField.SetToolTipValue((mat.diffuseness));
	3472	+ shadowField.SetToolTipValue((mat.shadow));
	3473	+ textureField.SetToolTipValue((mat.texture));
	3474	+ opacityField.SetToolTipValue((mat.opacity));
	3475	+ fakedepthField.SetToolTipValue((mat.fakedepth));
	3476	+ shadowbiasField.SetToolTipValue((mat.shadowbias));
	3477	+ }
	3478	+
3523	3479	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3524	3480	{
3525	3481	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3564,6 +3520,7 @@
3564	3520	\|\| e.getSource() == apertureField
3565	3521	\|\| e.getSource() == shadowblurField)
3566	3522	{
	3523	+ new Exception().printStackTrace();
3567	3524	System.exit(0);
3568	3525	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3569	3526	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3634,7 +3591,7 @@
3634	3591	}
3635	3592
3636	3593	if (normalpushField != null)
3637		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	3594	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3638	3595	}
3639	3596
3640	3597	void SnapObject()
..	..	@@ -3889,7 +3846,7 @@
3889	3846
3890	3847	radioPanel.revalidate();
3891	3848	radioPanel.repaint();
3892		- ctrlPanel.revalidate(); // ? new
	3849	+ ctrlPanel.validate(); // ? new
3893	3850	ctrlPanel.repaint();
3894	3851	}
3895	3852	}
..	..	@@ -4101,6 +4058,7 @@
4101	4058	}
4102	4059	}
4103	4060	}
	4061	+
4104	4062	LoadGFDThread loadGFDThread;
4105	4063
4106	4064	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4121,7 +4079,8 @@
4121	4079	try
4122	4080	{
4123	4081	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4124		- java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4082	+ java.util.zip.GZIPInputStream zstream = new java.util.zip.GZIPInputStream(istream);
	4083	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(zstream);
4125	4084
4126	4085	readobj = (Object3D) p.readObject();
4127	4086	istream.close();
..	..	@@ -4129,7 +4088,20 @@
4129	4088	readobj.ResetDisplayList();
4130	4089	} catch (Exception e)
4131	4090	{
4132		- e.printStackTrace();
	4091	+ //e.printStackTrace();
	4092	+ try
	4093	+ {
	4094	+ java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
	4095	+ java.io.ObjectInputStream p = new java.io.ObjectInputStream(istream);
	4096	+
	4097	+ readobj = (Object3D) p.readObject();
	4098	+ istream.close();
	4099	+
	4100	+ readobj.ResetDisplayList();
	4101	+ } catch (Exception e2)
	4102	+ {
	4103	+ e2.printStackTrace();
	4104	+ }
4133	4105	}
4134	4106	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4135	4107	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4246,7 +4218,7 @@
4246	4218
4247	4219	void load() // throws ClassNotFoundException
4248	4220	{
4249		- if (GrafreeD.standAlone)
	4221	+ if (Grafreed.standAlone)
4250	4222	{
4251	4223	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4252	4224	browser.show();
..	..	@@ -4333,11 +4305,13 @@
4333	4305	try
4334	4306	{
4335	4307	FileOutputStream ostream = new FileOutputStream(lastname);
4336		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4308	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4309	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4337	4310
4338	4311	p.writeObject(copy);
4339	4312	p.flush();
4340	4313
	4314	+ zstream.close();
4341	4315	ostream.close();
4342	4316
4343	4317	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4347,11 +4321,12 @@
4347	4321	{
4348	4322	}
4349	4323	}
	4324	+
4350	4325	String lastname;
4351	4326
4352	4327	void saveAs()
4353	4328	{
4354		- if (GrafreeD.standAlone)
	4329	+ if (Grafreed.standAlone)
4355	4330	{
4356	4331	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4357	4332	browser.setVisible(true);
..	..	@@ -4456,13 +4431,13 @@
4456	4431	try
4457	4432	{
4458	4433	FileOutputStream ostream = new FileOutputStream(filename);
4459		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4460		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4434	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4435	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4461	4436
4462	4437	Object3D objectparent = obj.parent;
4463	4438	obj.parent = null;
4464	4439
4465		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4440	+ Object3D object = (Object3D) Grafreed.clone(obj);
4466	4441
4467	4442	obj.parent = objectparent;
4468	4443
..	..	@@ -4474,8 +4449,8 @@
4474	4449	p.writeObject(object);
4475	4450	p.flush();
4476	4451
	4452	+ zstream.close();
4477	4453	ostream.close();
4478		- // zstream.close();
4479	4454
4480	4455	// group.selection.get(0).parent = parent;
4481	4456	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4496,7 +4471,7 @@
4496	4471	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4497	4472	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4498	4473	copy.generatePOV(buffer);
4499		- if (GrafreeD.standAlone)
	4474	+ if (Grafreed.standAlone)
4500	4475	{
4501	4476	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4502	4477	browser.show();
..	..	@@ -4522,7 +4497,8 @@
4522	4497	Object3D client;
4523	4498	Object3D copy;
4524	4499	MenuBar menuBar;
4525		- Menu windowMenu;
	4500	+ Menu fileMenu;
	4501	+ MenuItem newItem;
4526	4502	MenuItem loadItem;
4527	4503	MenuItem saveItem;
4528	4504	MenuItem saveAsItem;
..	..	@@ -4530,13 +4506,11 @@
4530	4506	MenuItem reexportItem;
4531	4507	MenuItem povItem;
4532	4508	MenuItem closeItem;
4533		- Menu cameraMenu;
	4509	+
4534	4510	CheckboxMenuItem zBufferItem;
4535	4511	//MenuItem normalLensItem;
4536		- MenuItem editCameraItem;
4537		- MenuItem revertCameraItem;
4538		- CheckboxMenuItem toggleLiveItem;
4539	4512	MenuItem stepItem;
	4513	+ CheckboxMenuItem toggleLiveItem;
4540	4514	CheckboxMenuItem toggleFullScreenItem;
4541	4515	CheckboxMenuItem toggleTimelineItem;
4542	4516	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4545,7 +4519,7 @@
4545	4519	CheckboxMenuItem toggleFootContactItem;
4546	4520	CheckboxMenuItem toggleDLItem;
4547	4521	CheckboxMenuItem toggleTextureItem;
4548		- CheckboxMenuItem toggleRandomItem;
	4522	+ CheckboxMenuItem toggleSwitchItem;
4549	4523	CheckboxMenuItem toggleRootItem;
4550	4524	CheckboxMenuItem animationItem;
4551	4525	CheckboxMenuItem toggleHandleItem;
..	..	@@ -4553,13 +4527,13 @@
4553	4527	JSplitPane mainPanel;
4554	4528	JScrollPane scrollpane;
4555	4529	JPanel toolbarPanel;
4556		- JPanel treePanel;
	4530	+ cGridBag treePanel;
4557	4531	JPanel radioPanel;
4558	4532	ButtonGroup buttonGroup;
4559		- JPanel ctrlPanel;
4560		- JPanel materialPanel;
	4533	+ cGridBag ctrlPanel;
	4534	+ cGridBag materialPanel;
4561	4535	JScrollPane infoPanel;
4562		- JPanel optionsPanel;
	4536	+ cGridBag optionsPanel;
4563	4537	JTabbedPane objectPanel;
4564	4538	cGridBag XYZPanel;
4565	4539	JSplitPane gridPanel;
..	..	@@ -4619,67 +4593,72 @@
4619	4593	// MATERIAL
4620	4594	JLabel materialLabel;
4621	4595	JLabel colorLabel;
4622		- NumberSlider colorField;
	4596	+ cNumberSlider colorField;
4623	4597	JLabel modulationLabel;
4624		- NumberSlider modulationField;
	4598	+ cNumberSlider modulationField;
4625	4599	JLabel metalnessLabel;
4626		- NumberSlider metalnessField;
	4600	+ cNumberSlider metalnessField;
4627	4601	JLabel diffuseLabel;
4628		- NumberSlider diffuseField;
	4602	+ cNumberSlider diffuseField;
4629	4603	JLabel specularLabel;
4630		- NumberSlider specularField;
	4604	+ cNumberSlider specularField;
4631	4605	JLabel shininessLabel;
4632		- NumberSlider shininessField;
	4606	+ cNumberSlider shininessField;
4633	4607	JLabel shiftLabel;
4634		- NumberSlider shiftField;
	4608	+ cNumberSlider shiftField;
4635	4609	JLabel ambientLabel;
4636		- NumberSlider ambientField;
	4610	+ cNumberSlider ambientField;
4637	4611	JLabel lightareaLabel;
4638		- NumberSlider lightareaField;
	4612	+ cNumberSlider lightareaField;
4639	4613	JLabel diffusenessLabel;
4640		- NumberSlider diffusenessField;
	4614	+ cNumberSlider diffusenessField;
4641	4615	JLabel velvetLabel;
4642		- NumberSlider velvetField;
	4616	+ cNumberSlider velvetField;
4643	4617	JLabel sheenLabel;
4644		- NumberSlider sheenField;
	4618	+ cNumberSlider sheenField;
4645	4619	JLabel subsurfaceLabel;
4646		- NumberSlider subsurfaceField;
	4620	+ cNumberSlider subsurfaceField;
4647	4621	//JLabel bumpLabel;
4648	4622	//NumberSlider bumpField;
4649	4623	JLabel backlitLabel;
4650		- NumberSlider backlitField;
	4624	+ cNumberSlider backlitField;
4651	4625	JLabel anisoLabel;
4652		- NumberSlider anisoField;
	4626	+ cNumberSlider anisoField;
4653	4627	JLabel anisoVLabel;
4654		- NumberSlider anisoVField;
	4628	+ cNumberSlider anisoVField;
4655	4629	JLabel cameraLabel;
4656		- NumberSlider cameraField;
	4630	+ cNumberSlider cameraField;
4657	4631	JLabel selfshadowLabel;
4658		- NumberSlider selfshadowField;
	4632	+ cNumberSlider selfshadowField;
4659	4633	JLabel shadowLabel;
4660		- NumberSlider shadowField;
	4634	+ cNumberSlider shadowField;
4661	4635	JLabel textureLabel;
4662		- NumberSlider textureField;
	4636	+ cNumberSlider textureField;
4663	4637	JLabel opacityLabel;
4664		- NumberSlider opacityField;
	4638	+ cNumberSlider opacityField;
4665	4639	JLabel fakedepthLabel;
4666		- NumberSlider fakedepthField;
	4640	+ cNumberSlider fakedepthField;
4667	4641	JLabel shadowbiasLabel;
4668		- NumberSlider shadowbiasField;
	4642	+ cNumberSlider shadowbiasField;
4669	4643	JLabel bumpLabel;
4670		- NumberSlider bumpField;
	4644	+ cNumberSlider bumpField;
4671	4645	JLabel noiseLabel;
4672		- NumberSlider noiseField;
	4646	+ cNumberSlider noiseField;
4673	4647	JLabel powerLabel;
4674		- NumberSlider powerField;
	4648	+ cNumberSlider powerField;
4675	4649	JLabel borderfadeLabel;
4676		- NumberSlider borderfadeField;
	4650	+ cNumberSlider borderfadeField;
4677	4651	JLabel fogLabel;
4678		- NumberSlider fogField;
	4652	+ cNumberSlider fogField;
4679	4653	JLabel opacityPowerLabel;
4680		- NumberSlider opacityPowerField;
	4654	+ cNumberSlider opacityPowerField;
4681	4655	JTree jTree;
4682	4656	//ObjectUI parent;
4683	4657
4684		- NumberSlider normalpushField;
	4658	+ cNumberSlider normalpushField;
	4659	+
	4660	+ private MenuItem importGFDItem;
	4661	+ private MenuItem importVRMLX3DItem;
	4662	+ private MenuItem import3DSItem;
	4663	+ private MenuItem importOBJItem;
4685	4664	}