~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,47 +126,54 @@
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);
163	169
164		- Remove(normalpushField);
	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);
165	177	}
166	178
167	179	public ObjEditor GetEditor()
..	..	@@ -265,24 +277,40 @@
265	277	void SetupMenu()
266	278	{
267	279	frame.setMenuBar(menuBar = new MenuBar());
268		- menuBar.add(windowMenu = new Menu("File"));
269		- windowMenu.add(loadItem = new MenuItem("Load..."));
270		- windowMenu.add("-");
271		- windowMenu.add(saveItem = new MenuItem("Save"));
272		- 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..."));
273	300	//windowMenu.add(povItem = new MenuItem("Emit POV-Ray..."));
274		- windowMenu.add("-");
275		- windowMenu.add(exportAsItem = new MenuItem("Export Selection..."));
276		- windowMenu.add(reexportItem = new MenuItem("Re-export"));
277		- windowMenu.add("-");
	301	+ fileMenu.add("-");
	302	+ fileMenu.add(exportAsItem = new MenuItem("Export Selection..."));
	303	+ fileMenu.add(reexportItem = new MenuItem("Re-export"));
	304	+ fileMenu.add("-");
278	305	if (client.parent != null)
279	306	{
280		- windowMenu.add(closeItem = new MenuItem("Close"));
	307	+ fileMenu.add(closeItem = new MenuItem("Close"));
281	308	} else
282	309	{
283		- windowMenu.add(closeItem = new MenuItem("Exit"));
	310	+ fileMenu.add(closeItem = new MenuItem("Exit"));
284	311	}
285	312
	313	+ newItem.addActionListener(this);
286	314	loadItem.addActionListener(this);
287	315	saveItem.addActionListener(this);
288	316	saveAsItem.addActionListener(this);
..	..	@@ -291,79 +319,26 @@
291	319	//povItem.addActionListener(this);
292	320	closeItem.addActionListener(this);
293	321
294		- menuBar.add(cameraMenu = new Menu("View"));
295		- //cameraMenu.add(zBufferItem = new CheckboxMenuItem("Z Buffer"));
296		- //zBufferItem.addActionListener(this);
297		- //cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
298		- //normalLensItem.addActionListener(this);
299		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
300		- revertCameraItem.addActionListener(this);
301		- cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
302		- toggleTimelineItem.addItemListener(this);
303		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
304		- toggleFullScreenItem.addItemListener(this);
305		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
306		- cameraMenu.add("-");
307		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
308		- toggleTextureItem.addItemListener(this);
309		- toggleTextureItem.setState(CameraPane.textureon);
310		- cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
311		- toggleLiveItem.addItemListener(this);
312		- toggleLiveItem.setState(CameraPane.isLIVE());
313		- cameraMenu.add(stepItem = new MenuItem("Step"));
314		- stepItem.addActionListener(this);
315		-// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
316		-// toggleDLItem.addItemListener(this);
317		-// toggleDLItem.setState(false);
318		- cameraMenu.add(toggleRenderItem = new CheckboxMenuItem("Render"));
319		- toggleRenderItem.addItemListener(this);
320		- toggleRenderItem.setState(!CameraPane.frozen);
321		- cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
322		- toggleDebugItem.addItemListener(this);
323		- toggleDebugItem.setState(CameraPane.DEBUG);
324		- cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
325		- toggleFrustumItem.addItemListener(this);
326		- toggleFrustumItem.setState(CameraPane.FRUSTUM);
327		- cameraMenu.add(toggleFootContactItem = new CheckboxMenuItem("Foot contact"));
328		- toggleFootContactItem.addItemListener(this);
329		- toggleFootContactItem.setState(CameraPane.FOOTCONTACT);
330		- cameraMenu.add(toggleRandomItem = new CheckboxMenuItem("Random"));
331		- toggleRandomItem.addItemListener(this);
332		- toggleRandomItem.setState(CameraPane.RANDOM);
333		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
334		- toggleHandleItem.addItemListener(this);
335		- toggleHandleItem.setState(CameraPane.HANDLES);
336		- cameraMenu.add(togglePaintItem = new CheckboxMenuItem("Paint mode"));
337		- togglePaintItem.addItemListener(this);
338		- togglePaintItem.setState(CameraPane.PAINTMODE);
339		-// cameraMenu.add(toggleRootItem = new CheckboxMenuItem("Alternate Root"));
340		-// toggleRootItem.addItemListener(this);
341		-// toggleRootItem.setState(false);
342		-// cameraMenu.add(animationItem = new CheckboxMenuItem("Animation"));
343		-// animationItem.addItemListener(this);
344		-// animationItem.setState(CameraPane.ANIMATION);
345		- cameraMenu.add("-");
346		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
347		- editCameraItem.addActionListener(this);
348		-
349	322	objectPanel = new JTabbedPane();
350	323	toolbarPanel = new JPanel();
351	324	toolbarPanel.setName("Toolbar");
352		- treePanel = new JPanel();
	325	+ treePanel = new cGridBag();
353	326	treePanel.setName("Tree");
354		- ctrlPanel = new JPanel(); // new GridBagLayout());
	327	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
355	328	ctrlPanel.setName("Edit");
356		- materialPanel = new JPanel();
	329	+ materialPanel = new cGridBag().setVertical(true);
357	330	materialPanel.setName("Material");
358	331	/JTextPane/
359	332	infoarea = createTextPane();
	333	+ doc = infoarea.getStyledDocument();
	334	+
360	335	infoarea.setEditable(true);
361	336	SetText();
362	337	// infoarea.setFont(infoarea.getFont().deriveFont(10, 14f));
363	338	// infoarea.setOpaque(false);
364	339	// //infoarea.setForeground(textcolor);
365		- infoarea.setLineWrap(true);
366		- infoarea.setWrapStyleWord(true);
	340	+// TEXTAREA infoarea.setLineWrap(true);
	341	+// TEXTAREA infoarea.setWrapStyleWord(true);
367	342	infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
368	343	infoPanel.setPreferredSize(new Dimension(50, 200));
369	344	infoPanel.setName("Info");
..	..	@@ -374,16 +349,16 @@
374	349	mainPanel.setName("Main");
375	350	mainPanel.setContinuousLayout(true);
376	351	mainPanel.setOneTouchExpandable(true);
377		- mainPanel.setDividerLocation(1.0);
378	352	mainPanel.setDividerSize(9);
379		- mainPanel.setResizeWeight(0);
	353	+ mainPanel.setDividerLocation(0.5); //1.0);
	354	+ mainPanel.setResizeWeight(0.5);
380	355
381	356	//ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
382	357	//mainPanel.setLayout(new GridBagLayout());
383	358	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
384		- treePanel.setLayout(new GridBagLayout());
385		- ctrlPanel.setLayout(new GridBagLayout());
386		- materialPanel.setLayout(new GridBagLayout());
	359	+// treePanel.setLayout(new GridBagLayout());
	360	+ //ctrlPanel.setLayout(new GridBagLayout());
	361	+ //materialPanel.setLayout(new GridBagLayout());
387	362
388	363	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
389	364	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -422,7 +397,7 @@
422	397	static String newline = "\n";
423	398	protected static final String buttonString = "JButton";
424	399	StyledDocument doc;
425		- JTextArea infoarea;
	400	+ JTextPane infoarea;
426	401
427	402	void ClearInfo()
428	403	{
..	..	@@ -445,10 +420,10 @@
445	420	e.printStackTrace();
446	421	}
447	422
448		- String selection = infoarea.getText();
449		- java.awt.datatransfer.StringSelection data = new java.awt.datatransfer.StringSelection(selection);
450		- java.awt.datatransfer.Clipboard clipboard =
451		- 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();
452	427	//clipboard.setContents(data, data);
453	428	}
454	429
..	..	@@ -471,13 +446,13 @@
471	446	//SendInfo("Name:", "bold");
472	447	if (sel.GetTextures() != null \|\| debug)
473	448	{
474		- si.SendInfo(sel.toString(), "bold");
	449	+ si.SendInfo(sel.toString() + (Globals.ADVANCED?"":" " + System.identityHashCode(sel)), "bold");
475	450	//SendInfo("#children virtual = " + sel.size() + "; real = " + sel.Size() + newline, "regular");
476	451	if (sel.Size() > 0)
477	452	{
478	453	si.SendInfo("#children = " + sel.Size(), "regular");
479	454	}
480		- si.SendInfo((debug ? " Parent: " : " ") + sel.parent, "regular");
	455	+ si.SendInfo((debug ? " Parent: " : " ") + sel.parent + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.parent)), "regular");
481	456	if (debug)
482	457	{
483	458	try
..	..	@@ -489,7 +464,10 @@
489	464	}
490	465
491	466	if (full)
492		- si.SendInfo(" BBox: " + minima + " - " + maxima, "regular");
	467	+ {
	468	+ si.SendInfo(" BBox min: " + minima, "regular");
	469	+ si.SendInfo(" BBox max: " + maxima, "regular");
	470	+ }
493	471
494	472	if (sel.bRep != null)
495	473	{
..	..	@@ -516,7 +494,7 @@
516	494	}
517	495	if (sel.support != null)
518	496	{
519		- si.SendInfo(" support: " + sel.support, "regular");
	497	+ si.SendInfo(" support: " + sel.support + (Globals.ADVANCED?"":" " + System.identityHashCode(sel.support)), "regular");
520	498	}
521	499	if (sel.scriptnode != null)
522	500	{
..	..	@@ -587,6 +565,9 @@
587	565	{
588	566	CameraPane.pointflow = (PointFlow) sel;
589	567	}
	568	+
	569	+ si.SendInfo("_____________________", "regular");
	570	+ si.SendInfo("", "regular");
590	571	}
591	572	}
592	573
..	..	@@ -618,52 +599,52 @@
618	599	cameraView.ToggleFullScreen();
619	600	}
620	601
621		- private JTextArea createTextPane()
	602	+ private JTextPane createTextPane()
622	603	{
623		- String[] initString =
624		- {
625		- "This is an editable JTextPane, ", //regular
626		- "another ", //italic
627		- "styled ", //bold
628		- "text ", //small
629		- "component, ", //large
630		- "which supports embedded components..." + newline,//regular
631		- " " + newline, //button
632		- "...and embedded icons..." + newline, //regular
633		- " ", //icon
634		- newline + "JTextPane is a subclass of JEditorPane that "
635		- + "uses a StyledEditorKit and StyledDocument, and provides "
636		- + "cover methods for interacting with those objects."
637		- };
	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	+// }
638	646
639		- String[] initStyles =
640		- {
641		- "regular", "italic", "bold", "small", "large",
642		- "regular", "button", "regular", "icon",
643		- "regular"
644		- };
645		-
646		- JTextPane textPane = new JTextPane();
647		- textPane.setEditable(true);
648		- /StyledDocument/ doc = textPane.getStyledDocument();
649		- addStylesToDocument(doc);
650		-
651		- try
652		- {
653		- for (int j = 0; j < 2; j++)
654		- {
655		- for (int i = 0; i < initString.length; i++)
656		- {
657		- doc.insertString(doc.getLength(), initString[i],
658		- doc.getStyle(initStyles[i]));
659		- }
660		- }
661		- } catch (BadLocationException ble)
662		- {
663		- System.err.println("Couldn't insert initial text into text pane.");
664		- }
665		-
666		- return new JTextArea(); // textPane;
	647	+ return new JTextPane(); // textPane;
667	648	}
668	649
669	650	protected void addStylesToDocument(StyledDocument doc)
..	..	@@ -716,7 +697,7 @@
716	697	protected static ImageIcon createImageIcon(String path,
717	698	String description)
718	699	{
719		- java.net.URL imgURL = GrafreeD.class.getResource(path);
	700	+ java.net.URL imgURL = Grafreed.class.getResource(path);
720	701	if (imgURL != null)
721	702	{
722	703	return new ImageIcon(imgURL, description);
..	..	@@ -748,6 +729,7 @@
748	729	// NumberSlider vDivsField;
749	730	// JCheckBox endcaps;
750	731	JCheckBox liveCB;
	732	+ JCheckBox selectCB;
751	733	JCheckBox hideCB;
752	734	JCheckBox link2masterCB;
753	735	JCheckBox markCB;
..	..	@@ -763,115 +745,84 @@
763	745	JButton slowerButton;
764	746	JButton fasterButton;
765	747	JButton remarkButton;
	748	+
	749	+ cGridBag namePanel;
	750	+ cGridBag setupPanel;
	751	+ cGridBag setupPanel2;
	752	+ cGridBag commandsPanel;
	753	+ cGridBag pushPanel;
	754	+ cGridBag fillPanel;
766	755
767		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	756	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
768	757	{
769	758	JCheckBox cb;
770	759
771		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
772		- oe.aConstraints.gridwidth = 1; // 3;
773		-// oe.aConstraints.weightx = 1;
774		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
775		- 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);
776	761	cb.addItemListener(this);
777		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
778		- oe.aConstraints.gridwidth = 1;
779		- oe.aConstraints.gridx += 1;
780	762
781	763	return cb;
782	764	}
783	765
784		- cButton AddButton(ObjEditor oe, String label)
	766	+ cButton AddButton(cGridBag panel, String label)
785	767	{
786	768	cButton cb;
787	769
788		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
789		- oe.aConstraints.gridwidth = 1;
790		-// oe.aConstraints.weightx = 1;
791		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
792		- 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);
793	771	cb.addActionListener(this);
794		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
795		- oe.aConstraints.gridwidth = 1;
796		- oe.aConstraints.gridx += 1;
797	772
798	773	return cb;
799	774	}
800	775
801		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	776	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
802	777	{
803	778	JComboBox combo;
804	779
805		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
806		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
807		- oe.aConstraints.gridx += 1;
	780	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
808	781	combo.addActionListener(this);
809	782
810	783	return combo;
811	784	}
812	785
813		- 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)
814	787	{
815		- NumberSlider combo;
	788	+ cGridBag control = new cGridBag();
	789	+
	790	+ cNumberSlider combo;
816	791
817	792	JLabel jlabel = new JLabel(label);
818		-
819		- aConstraints.fill = GridBagConstraints.VERTICAL;
820	793	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
821		- aConstraints.gridwidth = 1;
822		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
823		- aConstraints.gridx += 1;
824		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
825		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
826		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
827		- aConstraints.gridx += 1;
828		- aConstraints.gridwidth = 1;
829		-
	794	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	795	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
830	796	combo.setFloat(current);
831		-
832		- combo.label = jlabel;
833		-
834		- combo.addChangeListener(this);
835		-
836		- return combo;
	797	+
	798	+ panel.add(control);
	799	+
	800	+ return control;
837	801	}
838	802
839		- 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)
840	804	{
841		- NumberSlider combo;
	805	+ cGridBag control = new cGridBag();
	806	+
	807	+ cNumberSlider combo;
842	808
843	809	JLabel jlabel = new JLabel(label);
844		-
845		- aConstraints.fill = GridBagConstraints.VERTICAL;
846	810	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
847		- aConstraints.gridwidth = 2;
848		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
849		- aConstraints.gridx += 1;
850		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
851		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
852		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
853		- aConstraints.gridx += 1;
854		- aConstraints.gridwidth = 1;
855		-
	811	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	812	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
856	813	combo.setInteger(current);
857	814
858		- combo.label = jlabel;
859		-
860		- combo.addChangeListener(this);
861		-
862		- return combo;
	815	+ panel.add(control);
	816	+
	817	+ return control;
863	818	}
864	819
865		- JTextArea AddText(JPanel ctrlPanel, String name)
	820	+ JTextArea AddText(cGridBag ctrlPanel, String name)
866	821	{
867	822	JTextArea text;
868	823
869		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
870		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
871		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	824	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
872	825	text.addCaretListener(this);
873		- aConstraints.gridx += 1;
874		- aConstraints.gridwidth = 1;
875	826
876	827	return text;
877	828	}
..	..	@@ -901,9 +852,16 @@
901	852	objEditor.ctrlPanel.remove(j);
902	853	}
903	854
	855	+ void Remove(cNumberSlider j)
	856	+ {
	857	+ j.removeChangeListener(this);
	858	+ //objEditor.ctrlPanel.remove(j.label);
	859	+ objEditor.ctrlPanel.remove(j);
	860	+ }
	861	+
904	862	/*
905	863	*/
906		- void Return() // ObjEditor oe)
	864	+ void Return0() // ObjEditor oe)
907	865	{
908	866	aConstraints.gridy += 1;
909	867	aConstraints.gridx = 0;
..	..	@@ -958,37 +916,76 @@
958	916
959	917	void SetupUI2(ObjEditor oe)
960	918	{
961		-// oe.aConstraints.weightx = 0;
962		-// oe.aConstraints.weighty = 0;
963		-// oe.aConstraints.gridx = 0;
964		-// oe.aConstraints.gridy = 0;
965		- 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();
966	928
967	929	if (!GroupEditor.allparams)
968	930	return;
969	931
970		- liveCB = AddCheckBox(oe, "Live", copy.live);
971		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
972		- 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");
973	938	// Return();
974		- markCB = AddCheckBox(oe, "Mark", copy.marked);
975		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
976		- randomCB = AddCheckBox(oe, "Rand", copy.random);
977		- Return();
978		- resetButton = AddButton(oe, "Reset");
979		- 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");
980	971	// resetAllButton = AddButton(oe, "Reset All");
981	972	// stepAllButton = AddButton(oe, "Step All");
982		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
983	973	// Return();
984		- slowerButton = AddButton(oe, "Slow");
985		- fasterButton = AddButton(oe, "Fast");
986		- 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");
987	980
988		- Return();
	981	+ oe.ctrlPanel.add(commandsPanel);
	982	+ oe.ctrlPanel.Return();
989	983
990		- normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
991		- Return();
	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();
992	989
993	990	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
994	991	// ObjEditor.aConstraints.gridx += 1;
..	..	@@ -1083,7 +1080,7 @@
1083	1080	oe.aConstraints.gridwidth = 1;
1084	1081	/**/
1085	1082	nameField = AddText(oe.ctrlPanel, copy.GetName());
1086		- Return();
	1083	+ oe.ctrlPanel.Return();
1087	1084
1088	1085	//ctrlPanel.add(textureButton = new Button("Texture..."));
1089	1086	//textureButton.setEnabled(false);
..	..	@@ -1185,10 +1182,18 @@
1185	1182	//JPanel worldPanel =
1186	1183	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1187	1184	//worldPanel.setName("World");
1188		- centralPanel = new JPanel(new BorderLayout());
	1185	+ centralPanel = new cGridBag();
	1186	+ centralPanel.preferredWidth = 20;
1189	1187	timelinePanel = new JPanel(new BorderLayout());
1190	1188	timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1191	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	+
1192	1197	centralPanel.add(cameraView);
1193	1198	//frame.setJMenuBar(timelineMenubar);
1194	1199	//centralPanel.add(timelinePanel);
..	..	@@ -1208,12 +1213,13 @@
1208	1213	//frontView.object = copy;
1209	1214	//sideView.object = copy;
1210	1215
1211		- XYZPanel = new JPanel();
1212		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1216	+ XYZPanel = new cGridBag().setVertical(true);
	1217	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1213	1218
1214		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1215		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1216		- 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);
1217	1223
1218	1224	/*
1219	1225	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1251,10 +1257,11 @@
1251	1257	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1252	1258	//tmp.setName("Edit");
1253	1259	objectPanel.add(materialPanel);
1254		- JPanel north = new JPanel(new BorderLayout());
1255		- north.setName("Edit");
1256		- north.add(ctrlPanel, BorderLayout.NORTH);
1257		- 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);
1258	1265	objectPanel.add(infoPanel);
1259	1266
1260	1267	/*
..	..	@@ -1275,16 +1282,23 @@
1275	1282	scrollpane.setWheelScrollingEnabled(true);
1276	1283	scrollpane.addMouseWheelListener(this); // Default not fast enough
1277	1284
1278		- /JTabbedPane/ scenePanel = new JTabbedPane();
1279		- scenePanel.add(scrollpane);
	1285	+ /JTabbedPane/ scenePanel = new cGridBag();
	1286	+ scenePanel.preferredWidth = 6;
	1287	+
	1288	+ JTabbedPane tabbedPane = new JTabbedPane();
	1289	+ tabbedPane.add(scrollpane);
1280	1290
1281		- scenePanel.add(FSPane = new cFileSystemPane(this));
	1291	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1282	1292
1283		- optionsPanel = new JPanel(new GridBagLayout());
	1293	+ optionsPanel = new cGridBag().setVertical(true);
1284	1294
1285	1295	optionsPanel.setName("Options");
1286		- scenePanel.add(optionsPanel);
1287		-
	1296	+
	1297	+ AddOptions(optionsPanel); //, aConstraints);
	1298	+
	1299	+ tabbedPane.add(optionsPanel);
	1300	+
	1301	+ scenePanel.add(tabbedPane);
1288	1302
1289	1303	/*
1290	1304	cTree jTree = new cTree(null);
..	..	@@ -1318,6 +1332,7 @@
1318	1332	//bigPanel.setSize(new Dimension(10,10));
1319	1333	//bigPanel.add(ctrlPanel);
1320	1334	//bigPanel.add(gridPanel);
	1335	+ /**
1321	1336	bigThree = new JPanel();
1322	1337	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1323	1338	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1341,7 +1356,13 @@
1341	1356	// aConstraints.gridheight = 3;
1342	1357	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1343	1358	bigThree.add(XYZPanel, aWindowConstraints);
	1359	+ /**/
1344	1360
	1361	+ bigThree = new cGridBag();
	1362	+ bigThree.addComponent(scenePanel);
	1363	+ bigThree.addComponent(centralPanel);
	1364	+ bigThree.addComponent(XYZPanel);
	1365	+
1345	1366	// // SIDE EFFECT!!!
1346	1367	// aConstraints.gridx = 0;
1347	1368	// aConstraints.gridy = 0;
..	..	@@ -1362,13 +1383,14 @@
1362	1383	//worldPane.add(bigPanel);
1363	1384	//worldPane.add(worldPanel);
1364	1385	/**/
1365		- frame.getContentPane().add(/"Center",/framePanel);
	1386	+ //frame.getContentPane().add(/"Center",/framePanel);
	1387	+ frame.add(/"Center",/framePanel);
1366	1388	//frame.getContentPane().add(/"Center",/ worldPane);
1367	1389
1368	1390	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
1369	1391
1370		- frame.setSize(1024, 768);
1371		- frame.show();
	1392	+ frame.setSize(1280, 860);
	1393	+ frame.setVisible(true);
1372	1394
1373	1395	gridPanel.setDividerLocation(1.0);
1374	1396
..	..	@@ -1383,6 +1405,10 @@
1383	1405	});
1384	1406	}
1385	1407
	1408	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1409	+ {
	1410	+ }
	1411	+
1386	1412	JTree GetTree()
1387	1413	{
1388	1414	return objEditor.jTree;
..	..	@@ -1394,260 +1420,173 @@
1394	1420	ctrlPanel.removeAll();
1395	1421	}
1396	1422
1397		- void SetupMaterial(JPanel ctrlPanel)
	1423	+ void SetupMaterial(cGridBag panel)
1398	1424	{
1399		- aConstraints.weighty = 0;
1400		- //aConstraints.weightx = 1;
1401		- /*
	1425	+ /*
1402	1426	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1403	1427	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1404		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1405		- aConstraints.gridx += 1;
1406	1428	*/
1407	1429
1408		- aConstraints.gridwidth = 1;
1409		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1410		- aConstraints.gridx += 1;
1411		- aConstraints.weighty = 0;
1412		- 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");
1413	1434
1414	1435	/*
1415	1436	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1416		- aConstraints.gridx += 1;
1417		- aConstraints.weighty = 0;
1418		- aConstraints.gridwidth = 1;
1419	1437	*/
1420	1438
1421		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1422		- 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	+ }
1423	1448
1424		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1425		-
1426		- aConstraints.gridx += 1;
1427		-
1428		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1429		-
1430		- aConstraints.gridx += 1;
1431		-
1432		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1433		-
1434		- aConstraints.gridx = 0;
1435		- aConstraints.gridy += 1;
1436		- aConstraints.weighty = 0;
1437		- aConstraints.gridwidth = 1;
	1449	+ editBar.preferredHeight = 15;
	1450	+
	1451	+ panel.add(editBar);
	1452	+
1438	1453	/**/
1439	1454	//aConstraints.weighty = 0;
1440	1455	////aConstraints.weightx = 1;
1441	1456	//aConstraints.weighty = 1;
1442	1457	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1443	1458	//aConstraints.gridx += 1;
1444		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1445		- aConstraints.weighty = 0;
1446		- aConstraints.gridx = 0;
1447		- aConstraints.gridy += 1;
1448		- aConstraints.gridwidth = 1;
	1459	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1449	1460
1450		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1451		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1452		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1453		- aConstraints.gridx += 1;
1454		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1455		- //aConstraints.weightx = 0;
1456		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1457		- aConstraints.gridx = 0;
1458		- aConstraints.gridy += 1;
1459		- 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);
1460	1469
1461		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1462		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1463		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1464		- aConstraints.gridx += 1;
1465		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1466		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1467		- aConstraints.gridx = 0;
1468		- aConstraints.gridy += 1;
1469		- 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);
1470	1475
1471		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1472		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1473		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1474		- aConstraints.gridx += 1;
1475		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1476		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1477		- aConstraints.gridx = 0;
1478		- aConstraints.gridy += 1;
1479		- 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);
1480	1481
1481		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1482		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1483		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1484		- aConstraints.gridx += 1;
1485		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1486		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1487		- aConstraints.gridx = 0;
1488		- aConstraints.gridy += 1;
1489		- 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);
1490	1487
1491		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1492		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1493		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1494		- aConstraints.gridx += 1;
1495		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1496		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1497		- aConstraints.gridx = 0;
1498		- aConstraints.gridy += 1;
1499		- 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);
1500	1493
1501		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1502		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1503		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1504		- aConstraints.gridx += 1;
1505		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1506		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1507		- aConstraints.gridx = 0;
1508		- aConstraints.gridy += 1;
1509		- 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);
1510	1499
1511		- //aConstraints.weighty = 1;
1512		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1513		- //aConstraints.gridx += 1;
1514		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1515		- aConstraints.weighty = 0;
1516		- aConstraints.gridx = 0;
1517		- aConstraints.gridy += 1;
1518		- 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);
1519	1513
1520		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1521		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1522		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1523		- aConstraints.gridx += 1;
1524		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1525		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1526		- aConstraints.gridx = 0;
1527		- aConstraints.gridy += 1;
1528		- 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);
1529	1519
1530		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1531		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1532		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1533		- aConstraints.gridx += 1;
1534		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1535		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1536		- aConstraints.gridx = 0;
1537		- aConstraints.gridy += 1;
1538		- 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);
1539	1525
1540		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1541		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1542		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1543		- aConstraints.gridx += 1;
1544		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1545		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1546		- aConstraints.gridx = 0;
1547		- aConstraints.gridy += 1;
1548		- 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);
1549	1531
1550		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1551		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1552		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1553		- aConstraints.gridx += 1;
1554		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1555		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1556		- aConstraints.gridx = 0;
1557		- aConstraints.gridy += 1;
1558		- 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);
1559	1537
1560		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1561		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1562		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1563		- aConstraints.gridx += 1;
1564		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1565		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1566		- aConstraints.gridx = 0;
1567		- aConstraints.gridy += 1;
1568		- 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);
1569	1543
1570		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1571		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1572		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1573		- aConstraints.gridx += 1;
1574		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1575		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1576		- aConstraints.gridx = 0;
1577		- aConstraints.gridy += 1;
1578		- 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);
1579	1549
1580		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1581		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1582		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1583		- aConstraints.gridx += 1;
1584		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1585		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1586		- aConstraints.gridx = 0;
1587		- aConstraints.gridy += 1;
1588		- 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);
1589	1557
1590		- //aConstraints.weighty = 1;
1591		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1592		- //aConstraints.gridx += 1;
1593		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1594		- aConstraints.weighty = 0;
1595		- aConstraints.gridx = 0;
1596		- aConstraints.gridy += 1;
1597		- 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);
1598	1563
1599		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1600		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1601		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1602		- aConstraints.gridx += 1;
1603		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1604		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1605		- aConstraints.gridx = 0;
1606		- aConstraints.gridy += 1;
1607		- 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);
1608	1569
1609		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1610		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1611		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1612		- aConstraints.gridx += 1;
1613		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1614		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1615		- aConstraints.gridx = 0;
1616		- aConstraints.gridy += 1;
1617		- 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);
1618	1575
1619		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1620		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1621		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1622		- aConstraints.gridx += 1;
1623		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1624		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1625		- aConstraints.gridx = 0;
1626		- aConstraints.gridy += 1;
1627		- 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);
1628	1581
1629		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1630		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1631		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1632		- aConstraints.gridx += 1;
1633		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1634		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1635		- aConstraints.gridx = 0;
1636		- aConstraints.gridy += 1;
1637		- 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);
1638	1587
1639		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1640		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1641		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1642		- aConstraints.gridx += 1;
1643		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1644		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1645		- aConstraints.gridx = 0;
1646		- aConstraints.gridy += 1;
1647		- aConstraints.gridwidth = 1;
1648		-
1649		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1650		- Return();
	1588	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1589	+ //Return();
1651	1590	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1652	1591	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1653	1592	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1658,130 +1597,93 @@
1658	1597	// aConstraints.gridy += 1;
1659	1598	// aConstraints.gridwidth = 1;
1660	1599
1661		- //aConstraints.weighty = 1;
1662		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1663		- //aConstraints.gridx += 1;
1664		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1665		- aConstraints.weighty = 0;
1666		- aConstraints.gridx = 0;
1667		- aConstraints.gridy += 1;
1668		- aConstraints.gridwidth = 1;
1669	1600
1670		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1671		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1672		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1673		- aConstraints.gridx += 1;
1674		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1675		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1676		- aConstraints.gridx = 0;
1677		- aConstraints.gridy += 1;
1678		- 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);
1679	1608
1680		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1681		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1682		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1683		- aConstraints.gridx += 1;
1684		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1685		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1686		- aConstraints.gridx = 0;
1687		- aConstraints.gridy += 1;
1688		- 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);
1689	1614
1690		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1691		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1692		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1693		- aConstraints.gridx += 1;
1694		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1695		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1696		- aConstraints.gridx = 0;
1697		- aConstraints.gridy += 1;
1698		- 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);
1699	1620
1700		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1701		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1702		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1703		- aConstraints.gridx += 1;
1704		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1705		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.5), aConstraints);
1706		- aConstraints.gridx = 0;
1707		- aConstraints.gridy += 1;
1708		- aConstraints.gridwidth = 1;
1709		- 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);
1710	1626
1711		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1712		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1713		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1714		- aConstraints.gridx += 1;
1715		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1716		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1717		- aConstraints.gridx = 0;
1718		- aConstraints.gridy += 1;
1719		- 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);
1720	1632
1721		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1722		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1723		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1724		- aConstraints.gridx += 1;
1725		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1726		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1727		- aConstraints.gridx = 0;
1728		- aConstraints.gridy += 1;
1729		- 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);
1730	1640
1731		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1732		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1733		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1734		- aConstraints.gridx += 1;
1735		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1736		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1737		- aConstraints.gridx = 0;
1738		- aConstraints.gridy += 1;
1739		- 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);
1740	1646
1741		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1742		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1743		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1744		- aConstraints.gridx += 1;
1745		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1746		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1747		- aConstraints.gridx = 0;
1748		- aConstraints.gridy += 1;
1749		- 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);
1750	1652
1751		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1752		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1753		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1754		- aConstraints.gridx += 1;
1755		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1756		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1757		- aConstraints.gridx = 0;
1758		- aConstraints.gridy += 1;
1759		- 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);
1760	1658
1761		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1762		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1763		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1764		- aConstraints.gridx += 1;
1765		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1766		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1767		- aConstraints.gridx = 0;
1768		- aConstraints.gridy += 1;
1769		- 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);
1770	1664
1771		- //aConstraints.weighty = 1;
1772		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1773		- //aConstraints.gridx += 1;
1774		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1775		- 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);
1776	1670
1777		- aConstraints.gridx = 0;
1778		- aConstraints.gridy = 0;
1779		- 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);
1780	1682
1781	1683	SetMaterial(copy); // .GetMaterial());
1782	1684
1783		- colorField.addChangeListener(this);
1784		- modulationField.addChangeListener(this);
	1685	+ //colorField.addChangeListener(this);
	1686	+// modulationField.addChangeListener(this);
1785	1687	metalnessField.addChangeListener(this);
1786	1688	diffuseField.addChangeListener(this);
1787	1689	specularField.addChangeListener(this);
..	..	@@ -1811,12 +1713,15 @@
1811	1713	opacityPowerField.addChangeListener(this);
1812	1714	/**/
1813	1715
1814		- resetSlidersButton.addActionListener(this);
1815	1716	clearMaterialButton.addActionListener(this);
1816	1717	createMaterialButton.addActionListener(this);
1817		-
1818		- propagateToggle.addItemListener(this);
1819		- multiplyToggle.addItemListener(this);
	1718	+
	1719	+ if (Globals.ADVANCED)
	1720	+ {
	1721	+ resetSlidersButton.addActionListener(this);
	1722	+ propagateToggle.addItemListener(this);
	1723	+ multiplyToggle.addItemListener(this);
	1724	+ }
1820	1725	}
1821	1726
1822	1727	void DropFile(java.io.File[] files, boolean textures)
..	..	@@ -1987,7 +1892,7 @@
1987	1892
1988	1893	//? flashIt = false;
1989	1894	CameraPane pane = (CameraPane) cameraView;
1990		- pane.clickStart(location.x, location.y, 0);
	1895	+ pane.clickStart(location.x, location.y, 0, 0);
1991	1896	pane.clickEnd(location.x, location.y, 0, true);
1992	1897
1993	1898	if (group.selection.size() == 1)
..	..	@@ -2036,6 +1941,7 @@
2036	1941	e2.printStackTrace();
2037	1942	}
2038	1943	}
	1944	+
2039	1945	LoadJMEThread loadThread;
2040	1946
2041	1947	class LoadJMEThread extends Thread
..	..	@@ -2093,6 +1999,7 @@
2093	1999	//LoadFile0(filename, converter);
2094	2000	}
2095	2001	}
	2002	+
2096	2003	LoadOBJThread loadObjThread;
2097	2004
2098	2005	class LoadOBJThread extends Thread
..	..	@@ -2171,19 +2078,19 @@
2171	2078
2172	2079	void LoadObjFile(String fullname)
2173	2080	{
2174		- /*
	2081	+ System.out.println("Loading " + fullname);
	2082	+ /**/
2175	2083	//lastFilename = fullname;
2176	2084	if(loadObjThread == null)
2177	2085	{
2178		- loadObjThread = new LoadOBJThread();
2179		- loadObjThread.start();
	2086	+ loadObjThread = new LoadOBJThread();
	2087	+ loadObjThread.start();
2180	2088	}
2181	2089
2182	2090	loadObjThread.add(fullname);
2183		- */
	2091	+ /**/
2184	2092
2185		- System.out.println("Loading " + fullname);
2186		- makeSomething(new FileObject(fullname, true), true);
	2093	+ //makeSomething(new FileObject(fullname, true), true);
2187	2094	}
2188	2095
2189	2096	void LoadGFDFile(String fullname)
..	..	@@ -2444,11 +2351,11 @@
2444	2351
2445	2352	void ImportJME(com.jmex.model.converters.FormatConverter converter, String ext, String dialogName)
2446	2353	{
2447		- if (GrafreeD.standAlone)
	2354	+ if (Grafreed.standAlone)
2448	2355	{
2449	2356	/**/
2450	2357	FileDialog browser = new FileDialog(frame, dialogName, FileDialog.LOAD);
2451		- browser.show();
	2358	+ browser.setVisible(true);
2452	2359	String filename = browser.getFile();
2453	2360	if (filename != null && filename.length() > 0)
2454	2361	{
..	..	@@ -2593,6 +2500,7 @@
2593	2500	}
2594	2501	if (input == null)
2595	2502	{
	2503	+ new Exception().printStackTrace();
2596	2504	System.exit(0);
2597	2505	}
2598	2506
..	..	@@ -2807,7 +2715,8 @@
2807	2715	return;
2808	2716	}
2809	2717
2810		- multiplyToggle.setSelected(mat.multiply);
	2718	+ if (multiplyToggle != null)
	2719	+ multiplyToggle.setSelected(mat.multiply);
2811	2720
2812	2721	assert (object.projectedVertices != null);
2813	2722
..	..	@@ -2996,7 +2905,8 @@
2996	2905	if (timeline)
2997	2906	{
2998	2907	centralPanel.remove(cameraView);
2999		- centralPanel.add(timelinePanel);
	2908	+ cameraPanel.add(cameraView);
	2909	+ centralPanel.add(cameraPanel);
3000	2910	frame.setJMenuBar(timelineMenubar);
3001	2911	wasFullScreen = CameraPane.FULLSCREEN;
3002	2912	if (!CameraPane.FULLSCREEN)
..	..	@@ -3005,7 +2915,7 @@
3005	2915	}
3006	2916	else
3007	2917	{
3008		- centralPanel.remove(timelinePanel);
	2918	+ centralPanel.remove(cameraPanel);
3009	2919	centralPanel.add(cameraView);
3010	2920	frame.setJMenuBar(null);
3011	2921	if (!wasFullScreen)
..	..	@@ -3021,9 +2931,9 @@
3021	2931	frame.validate();
3022	2932
3023	2933	return;
3024		- } else if (event.getSource() == toggleRandomItem)
	2934	+ } else if (event.getSource() == toggleSwitchItem)
3025	2935	{
3026		- cameraView.ToggleRandom();
	2936	+ cameraView.ToggleSwitch();
3027	2937	cameraView.repaint();
3028	2938	return;
3029	2939	} else if (event.getSource() == toggleHandleItem)
..	..	@@ -3052,6 +2962,10 @@
3052	2962	{
3053	2963	copy.live ^= true;
3054	2964	return;
	2965	+ } else if (event.getSource() == selectCB)
	2966	+ {
	2967	+ copy.dontselect ^= true;
	2968	+ return;
3055	2969	} else if (event.getSource() == hideCB)
3056	2970	{
3057	2971	copy.hide ^= true;
..	..	@@ -3066,6 +2980,7 @@
3066	2980	if (event.getSource() == randomCB)
3067	2981	{
3068	2982	copy.random ^= true;
	2983	+ objEditor.refreshContents();
3069	2984	return;
3070	2985	}
3071	2986	if (event.getSource() == speedupCB)
..	..	@@ -3089,8 +3004,9 @@
3089	3004
3090	3005	public void actionPerformed(ActionEvent event)
3091	3006	{
	3007	+ Object source = event.getSource();
3092	3008	// SCRIPT DIALOG
3093		- if (event.getSource() == okbutton)
	3009	+ if (source == okbutton)
3094	3010	{
3095	3011	textpanel.setVisible(false);
3096	3012	textpanel.remove(textarea);
..	..	@@ -3102,7 +3018,7 @@
3102	3018	textarea = null;
3103	3019	textpanel = null;
3104	3020	}
3105		- if (event.getSource() == cancelbutton)
	3021	+ if (source == cancelbutton)
3106	3022	{
3107	3023	textpanel.setVisible(false);
3108	3024	textpanel.remove(textarea);
..	..	@@ -3114,49 +3030,50 @@
3114	3030	//applySelf();
3115	3031	//client.refreshEditWindow();
3116	3032	//refreshContents();
3117		- if (event.getSource() == nameField)
	3033	+ if (source == nameField)
3118	3034	{
3119	3035	//System.out.println("ObjEditor " + event);
3120	3036	applySelf0(true);
3121	3037	//parent.applySelf();
3122	3038	objEditor.refreshContents();
3123		- } else if (event.getSource() == resetButton)
	3039	+ } else if (source == resetButton)
3124	3040	{
3125	3041	CameraPane.fullreset = true;
3126	3042	copy.Reset(); // ResetMeshes();
3127	3043	copy.Touch();
3128	3044	objEditor.refreshContents();
3129		- } else if (event.getSource() == stepItem)
	3045	+ } else if (source == stepItem)
3130	3046	{
3131		- cameraView.ONESTEP = true;
	3047	+ //cameraView.ONESTEP = true;
	3048	+ Globals.ONESTEP = true;
3132	3049	cameraView.repaint();
3133	3050	return;
3134		- } else if (event.getSource() == stepButton)
	3051	+ } else if (source == stepButton)
3135	3052	{
3136	3053	copy.Step();
3137	3054	copy.Touch();
3138	3055	objEditor.refreshContents();
3139		- } else if (event.getSource() == slowerButton)
	3056	+ } else if (source == slowerButton)
3140	3057	{
3141	3058	copy.Slower();
3142	3059	copy.Touch();
3143	3060	objEditor.refreshContents();
3144		- } else if (event.getSource() == fasterButton)
	3061	+ } else if (source == fasterButton)
3145	3062	{
3146	3063	copy.Faster();
3147	3064	copy.Touch();
3148	3065	objEditor.refreshContents();
3149		- } else if (event.getSource() == remarkButton)
	3066	+ } else if (source == remarkButton)
3150	3067	{
3151	3068	copy.Remark();
3152	3069	copy.Touch();
3153	3070	objEditor.refreshContents();
3154		- } else if (event.getSource() == stepAllButton)
	3071	+ } else if (source == stepAllButton)
3155	3072	{
3156	3073	copy.StepAll();
3157	3074	copy.Touch();
3158	3075	objEditor.refreshContents();
3159		- } else if (event.getSource() == resetAllButton)
	3076	+ } else if (source == resetAllButton)
3160	3077	{
3161	3078	//CameraPane.fullreset = true;
3162	3079	copy.ResetAll(); // ResetMeshes();
..	..	@@ -3189,53 +3106,75 @@
3189	3106	// Close();
3190	3107	// }
3191	3108	// else
3192		- if (event.getSource() == resetSlidersButton)
	3109	+ if (source == resetSlidersButton)
3193	3110	{
3194	3111	ResetSliders();
3195		- } else if (event.getSource() == clearMaterialButton)
	3112	+ } else if (source == clearMaterialButton)
3196	3113	{
3197	3114	ClearMaterial();
3198		- } else if (event.getSource() == createMaterialButton)
	3115	+ } else if (source == createMaterialButton)
3199	3116	{
3200	3117	CreateMaterial();
3201		- } else if (event.getSource() == clearPanelButton)
	3118	+ } else if (source == clearPanelButton)
3202	3119	{
3203	3120	copy.ClearUI();
3204	3121	refreshContents(true);
3205		- } /*
3206		- }
3207		-
3208		- public boolean action(Event event, Object arg)
3209		- {
3210		- */ 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)
3211	3147	{
3212	3148	Close();
3213	3149	//return true;
3214		- } else if (event.getSource() == loadItem)
	3150	+ } else if (source == loadItem)
3215	3151	{
3216	3152	load();
3217	3153	//return true;
3218		- } else if (event.getSource() == saveItem)
	3154	+ } else if (source == newItem)
	3155	+ {
	3156	+ New();
	3157	+ } else if (source == saveItem)
3219	3158	{
3220	3159	save();
3221	3160	//return true;
3222		- } else if (event.getSource() == saveAsItem)
	3161	+ } else if (source == saveAsItem)
3223	3162	{
3224	3163	saveAs();
3225	3164	//return true;
3226		- } else if (event.getSource() == reexportItem)
	3165	+ } else if (source == reexportItem)
3227	3166	{
3228	3167	reexport();
3229	3168	//return true;
3230		- } else if (event.getSource() == exportAsItem)
	3169	+ } else if (source == exportAsItem)
3231	3170	{
3232	3171	export();
3233	3172	//return true;
3234		- } else if (event.getSource() == povItem)
	3173	+ } else if (source == povItem)
3235	3174	{
3236	3175	generatePOV();
3237	3176	//return true;
3238		- } else if (event.getSource() == zBufferItem)
	3177	+ } else if (source == zBufferItem)
3239	3178	{
3240	3179	try
3241	3180	{
..	..	@@ -3257,21 +3196,8 @@
3257	3196	cameraView.repaint();
3258	3197	//return true;
3259	3198	}
3260		- */ else if (event.getSource() == editCameraItem)
3261		- {
3262		- cameraView.ProtectCamera();
3263		- cameraView.repaint();
3264		- return;
3265		- } else if (event.getSource() == revertCameraItem)
3266		- {
3267		- cameraView.RevertCamera();
3268		- cameraView.repaint();
3269		- return;
3270		-// } else if (event.getSource() == textureButton)
3271		-// {
3272		-// return; // true;
3273		- } else // combos...
3274		- if (event.getSource() == texresMenu)
	3199	+ */ else // combos...
	3200	+ if (source == texresMenu)
3275	3201	{
3276	3202	System.err.println("Object = " + copy + "; change value " + copy.texres + " to " + texresMenu.getSelectedIndex());
3277	3203	copy.texres = texresMenu.getSelectedIndex();
..	..	@@ -3283,27 +3209,283 @@
3283	3209	}
3284	3210	}
3285	3211
3286		- void ToggleAnimation()
	3212	+ void New()
3287	3213	{
3288		- if (!CameraPane.ANIMATION)
	3214	+ while (copy.Size() > 1)
3289	3215	{
3290		- 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);
3291	3439	browser.show();
3292	3440	String filename = browser.getFile();
3293	3441	if (filename != null && filename.length() > 0)
3294	3442	{
3295		- 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;
3296	3478	//CameraPane.framecount = 0;
3297		- CameraPane.imagecount = 0;
	3479	+ Globals.imagecount = 0;
3298	3480
3299		- CameraPane.ANIMATION ^= true;
	3481	+ Globals.ANIMATION ^= true;
3300	3482
3301		- GrafreeD.wav.cursor = 0;
3302		- GrafreeD.wav.loop = 0;
	3483	+ Grafreed.wav.cursor = 0;
	3484	+ Grafreed.wav.loop = 0;
3303	3485	}
3304	3486	} else
3305	3487	{
3306		- CameraPane.ANIMATION ^= true;
	3488	+ Globals.ANIMATION ^= true;
3307	3489	}
3308	3490	}
3309	3491
..	..	@@ -3349,7 +3531,7 @@
3349	3531	void CreateMaterial()
3350	3532	{
3351	3533	//copy.ClearMaterial(); // PATCH
3352		- copy.CreateMaterialS(multiplyToggle.isSelected());
	3534	+ copy.CreateMaterialS(multiplyToggle != null && multiplyToggle.isSelected());
3353	3535	if (copy.selection.size() > 0)
3354	3536	//SetMaterial(copy);
3355	3537	{
..	..	@@ -3408,11 +3590,11 @@
3408	3590	{
3409	3591	copy.ResetBlockLoop(); // temporary problem
3410	3592
3411		- boolean random = CameraPane.RANDOM;
3412		- CameraPane.RANDOM = false; // parse everything
	3593	+ boolean random = CameraPane.SWITCH;
	3594	+ CameraPane.SWITCH = false; // parse everything
3413	3595	copy.ResetDisplayList();
3414	3596	copy.HardTouch();
3415		- CameraPane.RANDOM = random;
	3597	+ CameraPane.SWITCH = random;
3416	3598	}
3417	3599
3418	3600	// public void applySelf()
..	..	@@ -3482,10 +3664,40 @@
3482	3664	current.fakedepth = (float) fakedepthField.getFloat();
3483	3665	current.shadowbias = (float) shadowbiasField.getFloat();
3484	3666
3485		- if (!NumberSlider.frozen)
	3667	+ if (!cNumberSlider.frozen)
3486	3668	{
3487	3669	//System.out.println("Propagate = " + propagate);
3488	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	+
3489	3701	if (copy.material != null && copy.projectedVertices.length > 0 && copy.projectedVertices[0] != null)
3490	3702	{
3491	3703	copy.projectedVertices[0].x = (int) (bumpField.getFloat() * 1000);
..	..	@@ -3530,6 +3742,7 @@
3530	3742	\|\| e.getSource() == apertureField
3531	3743	\|\| e.getSource() == shadowblurField)
3532	3744	{
	3745	+ new Exception().printStackTrace();
3533	3746	System.exit(0);
3534	3747	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3535	3748	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3600,7 +3813,7 @@
3600	3813	}
3601	3814
3602	3815	if (normalpushField != null)
3603		- copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
	3816	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/100;
3604	3817	}
3605	3818
3606	3819	void SnapObject()
..	..	@@ -3855,7 +4068,7 @@
3855	4068
3856	4069	radioPanel.revalidate();
3857	4070	radioPanel.repaint();
3858		- ctrlPanel.revalidate(); // ? new
	4071	+ ctrlPanel.validate(); // ? new
3859	4072	ctrlPanel.repaint();
3860	4073	}
3861	4074	}
..	..	@@ -3864,6 +4077,7 @@
3864	4077
3865	4078	void makeSomething(Object3D thing, boolean resetmodel) // deselect)
3866	4079	{
	4080	+ Save();
3867	4081	//Tween.set(thing, 0).target(1).start(tweenManager);
3868	4082	//Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
3869	4083	// if (thing instanceof GenericJointDemo)
..	..	@@ -4067,6 +4281,7 @@
4067	4281	}
4068	4282	}
4069	4283	}
	4284	+
4070	4285	LoadGFDThread loadGFDThread;
4071	4286
4072	4287	void ReadGFD(String fullname, iCallBack cb)
..	..	@@ -4086,8 +4301,10 @@
4086	4301
4087	4302	try
4088	4303	{
	4304	+ // Try compressed version first.
4089	4305	java.io.FileInputStream istream = new java.io.FileInputStream(fullname);
4090		- 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);
4091	4308
4092	4309	readobj = (Object3D) p.readObject();
4093	4310	istream.close();
..	..	@@ -4095,7 +4312,20 @@
4095	4312	readobj.ResetDisplayList();
4096	4313	} catch (Exception e)
4097	4314	{
4098		- 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	+ }
4099	4329	}
4100	4330	// catch(java.io.StreamCorruptedException e) { e.printStackTrace(); }
4101	4331	// catch(java.io.IOException e) { System.out.println("IOexception"); e.printStackTrace(); }
..	..	@@ -4141,6 +4371,12 @@
4141	4371
4142	4372	void LoadIt(Object obj)
4143	4373	{
	4374	+ if (obj == null)
	4375	+ {
	4376	+ // Invalid file
	4377	+ return;
	4378	+ }
	4379	+
4144	4380	System.out.println("Loaded " + obj);
4145	4381	//new Exception().printStackTrace();
4146	4382	Object3D readobj = (Object3D) obj;
..	..	@@ -4150,6 +4386,7 @@
4150	4386
4151	4387	if (readobj != null)
4152	4388	{
	4389	+ Save();
4153	4390	try
4154	4391	{
4155	4392	//readobj.deepCopySelf(copy);
..	..	@@ -4212,7 +4449,7 @@
4212	4449
4213	4450	void load() // throws ClassNotFoundException
4214	4451	{
4215		- if (GrafreeD.standAlone)
	4452	+ if (Grafreed.standAlone)
4216	4453	{
4217	4454	FileDialog browser = new FileDialog(frame, "Load", FileDialog.LOAD);
4218	4455	browser.show();
..	..	@@ -4299,11 +4536,13 @@
4299	4536	try
4300	4537	{
4301	4538	FileOutputStream ostream = new FileOutputStream(lastname);
4302		- ObjectOutputStream p = new ObjectOutputStream(ostream);
	4539	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4540	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4303	4541
4304	4542	p.writeObject(copy);
4305	4543	p.flush();
4306	4544
	4545	+ zstream.close();
4307	4546	ostream.close();
4308	4547
4309	4548	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4313,11 +4552,12 @@
4313	4552	{
4314	4553	}
4315	4554	}
	4555	+
4316	4556	String lastname;
4317	4557
4318	4558	void saveAs()
4319	4559	{
4320		- if (GrafreeD.standAlone)
	4560	+ if (Grafreed.standAlone)
4321	4561	{
4322	4562	FileDialog browser = new FileDialog(frame, "Save As", FileDialog.SAVE);
4323	4563	browser.setVisible(true);
..	..	@@ -4422,13 +4662,13 @@
4422	4662	try
4423	4663	{
4424	4664	FileOutputStream ostream = new FileOutputStream(filename);
4425		- // ?? java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
4426		- ObjectOutputStream p = new ObjectOutputStream(/z/ostream);
	4665	+ java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(ostream);
	4666	+ ObjectOutputStream p = new ObjectOutputStream(zstream);
4427	4667
4428	4668	Object3D objectparent = obj.parent;
4429	4669	obj.parent = null;
4430	4670
4431		- Object3D object = (Object3D) GrafreeD.clone(obj);
	4671	+ Object3D object = (Object3D) Grafreed.clone(obj);
4432	4672
4433	4673	obj.parent = objectparent;
4434	4674
..	..	@@ -4440,8 +4680,8 @@
4440	4680	p.writeObject(object);
4441	4681	p.flush();
4442	4682
	4683	+ zstream.close();
4443	4684	ostream.close();
4444		- // zstream.close();
4445	4685
4446	4686	// group.selection.get(0).parent = parent;
4447	4687	//FileOutputStream fos = new FileOutputStream(fullname);
..	..	@@ -4462,7 +4702,7 @@
4462	4702	buffer.append("background { color rgb <0.8,0.8,0.8> }\n\n");
4463	4703	cameraView.renderCamera.generatePOV(buffer, bnds.width, bnds.height);
4464	4704	copy.generatePOV(buffer);
4465		- if (GrafreeD.standAlone)
	4705	+ if (Grafreed.standAlone)
4466	4706	{
4467	4707	FileDialog browser = new FileDialog(frame, "Export POV", 1);
4468	4708	browser.show();
..	..	@@ -4488,7 +4728,8 @@
4488	4728	Object3D client;
4489	4729	Object3D copy;
4490	4730	MenuBar menuBar;
4491		- Menu windowMenu;
	4731	+ Menu fileMenu;
	4732	+ MenuItem newItem;
4492	4733	MenuItem loadItem;
4493	4734	MenuItem saveItem;
4494	4735	MenuItem saveAsItem;
..	..	@@ -4496,13 +4737,11 @@
4496	4737	MenuItem reexportItem;
4497	4738	MenuItem povItem;
4498	4739	MenuItem closeItem;
4499		- Menu cameraMenu;
	4740	+
4500	4741	CheckboxMenuItem zBufferItem;
4501	4742	//MenuItem normalLensItem;
4502		- MenuItem editCameraItem;
4503		- MenuItem revertCameraItem;
4504		- CheckboxMenuItem toggleLiveItem;
4505	4743	MenuItem stepItem;
	4744	+ CheckboxMenuItem toggleLiveItem;
4506	4745	CheckboxMenuItem toggleFullScreenItem;
4507	4746	CheckboxMenuItem toggleTimelineItem;
4508	4747	CheckboxMenuItem toggleRenderItem;
..	..	@@ -4511,7 +4750,7 @@
4511	4750	CheckboxMenuItem toggleFootContactItem;
4512	4751	CheckboxMenuItem toggleDLItem;
4513	4752	CheckboxMenuItem toggleTextureItem;
4514		- CheckboxMenuItem toggleRandomItem;
	4753	+ CheckboxMenuItem toggleSwitchItem;
4515	4754	CheckboxMenuItem toggleRootItem;
4516	4755	CheckboxMenuItem animationItem;
4517	4756	CheckboxMenuItem toggleHandleItem;
..	..	@@ -4519,20 +4758,21 @@
4519	4758	JSplitPane mainPanel;
4520	4759	JScrollPane scrollpane;
4521	4760	JPanel toolbarPanel;
4522		- JPanel treePanel;
	4761	+ cGridBag treePanel;
4523	4762	JPanel radioPanel;
4524	4763	ButtonGroup buttonGroup;
4525		- JPanel ctrlPanel;
4526		- JPanel materialPanel;
	4764	+ cGridBag ctrlPanel;
	4765	+ cGridBag materialPanel;
4527	4766	JScrollPane infoPanel;
4528		- JPanel optionsPanel;
	4767	+ cGridBag optionsPanel;
4529	4768	JTabbedPane objectPanel;
4530		- JPanel XYZPanel;
	4769	+ cGridBag XYZPanel;
4531	4770	JSplitPane gridPanel;
4532	4771	JSplitPane bigPanel;
4533		- JPanel bigThree;
4534		- JTabbedPane scenePanel;
4535		- JPanel centralPanel;
	4772	+ cGridBag bigThree;
	4773	+ cGridBag scenePanel;
	4774	+ cGridBag centralPanel;
	4775	+ JSplitPane cameraPanel;
4536	4776	JPanel timelinePanel;
4537	4777	JMenuBar timelineMenubar;
4538	4778	JSplitPane framePanel;
..	..	@@ -4584,67 +4824,72 @@
4584	4824	// MATERIAL
4585	4825	JLabel materialLabel;
4586	4826	JLabel colorLabel;
4587		- NumberSlider colorField;
	4827	+ cNumberSlider colorField;
4588	4828	JLabel modulationLabel;
4589		- NumberSlider modulationField;
	4829	+ cNumberSlider modulationField;
4590	4830	JLabel metalnessLabel;
4591		- NumberSlider metalnessField;
	4831	+ cNumberSlider metalnessField;
4592	4832	JLabel diffuseLabel;
4593		- NumberSlider diffuseField;
	4833	+ cNumberSlider diffuseField;
4594	4834	JLabel specularLabel;
4595		- NumberSlider specularField;
	4835	+ cNumberSlider specularField;
4596	4836	JLabel shininessLabel;
4597		- NumberSlider shininessField;
	4837	+ cNumberSlider shininessField;
4598	4838	JLabel shiftLabel;
4599		- NumberSlider shiftField;
	4839	+ cNumberSlider shiftField;
4600	4840	JLabel ambientLabel;
4601		- NumberSlider ambientField;
	4841	+ cNumberSlider ambientField;
4602	4842	JLabel lightareaLabel;
4603		- NumberSlider lightareaField;
	4843	+ cNumberSlider lightareaField;
4604	4844	JLabel diffusenessLabel;
4605		- NumberSlider diffusenessField;
	4845	+ cNumberSlider diffusenessField;
4606	4846	JLabel velvetLabel;
4607		- NumberSlider velvetField;
	4847	+ cNumberSlider velvetField;
4608	4848	JLabel sheenLabel;
4609		- NumberSlider sheenField;
	4849	+ cNumberSlider sheenField;
4610	4850	JLabel subsurfaceLabel;
4611		- NumberSlider subsurfaceField;
	4851	+ cNumberSlider subsurfaceField;
4612	4852	//JLabel bumpLabel;
4613	4853	//NumberSlider bumpField;
4614	4854	JLabel backlitLabel;
4615		- NumberSlider backlitField;
	4855	+ cNumberSlider backlitField;
4616	4856	JLabel anisoLabel;
4617		- NumberSlider anisoField;
	4857	+ cNumberSlider anisoField;
4618	4858	JLabel anisoVLabel;
4619		- NumberSlider anisoVField;
	4859	+ cNumberSlider anisoVField;
4620	4860	JLabel cameraLabel;
4621		- NumberSlider cameraField;
	4861	+ cNumberSlider cameraField;
4622	4862	JLabel selfshadowLabel;
4623		- NumberSlider selfshadowField;
	4863	+ cNumberSlider selfshadowField;
4624	4864	JLabel shadowLabel;
4625		- NumberSlider shadowField;
	4865	+ cNumberSlider shadowField;
4626	4866	JLabel textureLabel;
4627		- NumberSlider textureField;
	4867	+ cNumberSlider textureField;
4628	4868	JLabel opacityLabel;
4629		- NumberSlider opacityField;
	4869	+ cNumberSlider opacityField;
4630	4870	JLabel fakedepthLabel;
4631		- NumberSlider fakedepthField;
	4871	+ cNumberSlider fakedepthField;
4632	4872	JLabel shadowbiasLabel;
4633		- NumberSlider shadowbiasField;
	4873	+ cNumberSlider shadowbiasField;
4634	4874	JLabel bumpLabel;
4635		- NumberSlider bumpField;
	4875	+ cNumberSlider bumpField;
4636	4876	JLabel noiseLabel;
4637		- NumberSlider noiseField;
	4877	+ cNumberSlider noiseField;
4638	4878	JLabel powerLabel;
4639		- NumberSlider powerField;
	4879	+ cNumberSlider powerField;
4640	4880	JLabel borderfadeLabel;
4641		- NumberSlider borderfadeField;
	4881	+ cNumberSlider borderfadeField;
4642	4882	JLabel fogLabel;
4643		- NumberSlider fogField;
	4883	+ cNumberSlider fogField;
4644	4884	JLabel opacityPowerLabel;
4645		- NumberSlider opacityPowerField;
	4885	+ cNumberSlider opacityPowerField;
4646	4886	JTree jTree;
4647	4887	//ObjectUI parent;
4648	4888
4649		- NumberSlider normalpushField;
	4889	+ cNumberSlider normalpushField;
	4890	+
	4891	+ private MenuItem importGFDItem;
	4892	+ private MenuItem importVRMLX3DItem;
	4893	+ private MenuItem import3DSItem;
	4894	+ private MenuItem importOBJItem;
4650	4895	}