~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -19,6 +19,8 @@
19	19	import //weka.core.
20	20	matrix.Matrix;
21	21
	22	+import grafeme.ui.*;
	23	+
22	24	class ObjEditor /extends JFrame/ implements iCallBack, ObjectUI,
23	25	ActionListener, ChangeListener,
24	26	InputMethodListener,
..	..	@@ -28,7 +30,12 @@
28	30	iSendInfo
29	31	//KeyListener
30	32	{
	33	+ boolean timeline;
	34	+ boolean wasFullScreen;
31	35
	36	+ GroupEditor callee;
	37	+ JFrame frame;
	38	+
32	39	// SCRIPT
33	40
34	41	transient JFrame textpanel = null;
..	..	@@ -119,51 +126,60 @@
119	126	void keyPressed(int key, int modifiers)
120	127	{
121	128	System.out.println("KEY PRESSED");
122		- CameraPane.theRenderer.keyPressed(key, modifiers);
	129	+ Globals.theRenderer.keyPressed(key, modifiers);
123	130	}
124	131	*/
125	132
126	133	static GridBagConstraints aConstraints;
127	134	static GridBagConstraints aWindowConstraints;
128		- GroupEditor callee;
129		- JFrame frame;
	135	+
130	136	static int GRIDWIDTH = 100; // 4;
131	137
132	138	public void closeUI()
133	139	{
134	140	//new Exception().printStackTrace();
135		- System.out.println("this = " + this);
136		- System.out.println("objEditor = " + objEditor);
	141	+// System.out.println("this = " + this);
	142	+// System.out.println("objEditor = " + objEditor);
137	143	//nameField.removeActionListener(this);
138		- objEditor.ctrlPanel.remove(nameField);
	144	+// objEditor.ctrlPanel.remove(nameField);
139	145
140	146	if (!GroupEditor.allparams)
141	147	return;
142	148
143		- objEditor.ctrlPanel.remove(liveCB);
144		- objEditor.ctrlPanel.remove(hideCB);
145		- objEditor.ctrlPanel.remove(markCB);
146		-
147		- objEditor.ctrlPanel.remove(randomCB);
148		- objEditor.ctrlPanel.remove(speedupCB);
149		- objEditor.ctrlPanel.remove(rewindCB);
150		-
151		- objEditor.ctrlPanel.remove(resetButton);
152		- objEditor.ctrlPanel.remove(stepButton);
153		-// objEditor.ctrlPanel.remove(stepAllButton);
154		-// objEditor.ctrlPanel.remove(resetAllButton);
155		- objEditor.ctrlPanel.remove(link2masterCB);
156		- //objEditor.ctrlPanel.remove(flipVCB);
157		- //objEditor.ctrlPanel.remove(texresMenu);
158		- objEditor.ctrlPanel.remove(slowerButton);
159		- objEditor.ctrlPanel.remove(fasterButton);
160		- objEditor.ctrlPanel.remove(remarkButton);
	149	+// objEditor.ctrlPanel.remove(liveCB);
	150	+// objEditor.ctrlPanel.remove(hideCB);
	151	+// objEditor.ctrlPanel.remove(markCB);
	152	+//
	153	+// objEditor.ctrlPanel.remove(randomCB);
	154	+// objEditor.ctrlPanel.remove(speedupCB);
	155	+// objEditor.ctrlPanel.remove(rewindCB);
	156	+//
	157	+// objEditor.ctrlPanel.remove(resetButton);
	158	+// objEditor.ctrlPanel.remove(stepButton);
	159	+//// objEditor.ctrlPanel.remove(stepAllButton);
	160	+//// objEditor.ctrlPanel.remove(resetAllButton);
	161	+// objEditor.ctrlPanel.remove(link2masterCB);
	162	+// //objEditor.ctrlPanel.remove(flipVCB);
	163	+// //objEditor.ctrlPanel.remove(texresMenu);
	164	+// objEditor.ctrlPanel.remove(slowerButton);
	165	+// objEditor.ctrlPanel.remove(fasterButton);
	166	+// objEditor.ctrlPanel.remove(remarkButton);
	167	+
	168	+ objEditor.ctrlPanel.remove(namePanel);
	169	+ objEditor.ctrlPanel.remove(setupPanel);
	170	+ objEditor.ctrlPanel.remove(commandsPanel);
	171	+ objEditor.ctrlPanel.remove(pushPanel);
	172	+ //objEditor.ctrlPanel.remove(fillPanel);
	173	+
	174	+ //Remove(normalpushField);
161	175	}
162	176
163	177	public ObjEditor GetEditor()
164	178	{
165	179	return objEditor; //.GetEditor();
166	180	}
	181	+
	182	+ // Sometimes myself, sometimes my callee's.
167	183	ObjEditor objEditor;
168	184
169	185	/*
..	..	@@ -238,7 +254,7 @@
238	254	//if (!isDisplayable())
239	255	//setUndecorated(true);
240	256
241		- System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
	257	+ //System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
242	258	client = inClient;
243	259	copy = localCopy;
244	260	copy.editWindow = this;
..	..	@@ -292,16 +308,18 @@
292	308	//normalLensItem.addActionListener(this);
293	309	cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
294	310	revertCameraItem.addActionListener(this);
295		- cameraMenu.add(toggleFullItem = new CheckboxMenuItem("Full Screen"));
296		- toggleFullItem.addItemListener(this);
297		- toggleFullItem.setState(CameraPane.FULLSCREEN);
	311	+ cameraMenu.add(toggleTimelineItem = new CheckboxMenuItem("Timeline"));
	312	+ toggleTimelineItem.addItemListener(this);
	313	+ cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	314	+ toggleFullScreenItem.addItemListener(this);
	315	+ toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
298	316	cameraMenu.add("-");
299	317	cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
300	318	toggleTextureItem.addItemListener(this);
301	319	toggleTextureItem.setState(CameraPane.textureon);
302	320	cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
303	321	toggleLiveItem.addItemListener(this);
304		- toggleLiveItem.setState(CameraPane.isLIVE());
	322	+ toggleLiveItem.setState(Globals.isLIVE());
305	323	cameraMenu.add(stepItem = new MenuItem("Step"));
306	324	stepItem.addActionListener(this);
307	325	// cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
..	..	@@ -343,9 +361,9 @@
343	361	toolbarPanel.setName("Toolbar");
344	362	treePanel = new JPanel();
345	363	treePanel.setName("Tree");
346		- ctrlPanel = new JPanel(); // new GridBagLayout());
	364	+ ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
347	365	ctrlPanel.setName("Edit");
348		- materialPanel = new JPanel();
	366	+ materialPanel = new cGridBag().setVertical(true);
349	367	materialPanel.setName("Material");
350	368	/JTextPane/
351	369	infoarea = createTextPane();
..	..	@@ -374,8 +392,8 @@
374	392	//mainPanel.setLayout(new GridBagLayout());
375	393	toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
376	394	treePanel.setLayout(new GridBagLayout());
377		- ctrlPanel.setLayout(new GridBagLayout());
378		- materialPanel.setLayout(new GridBagLayout());
	395	+ //ctrlPanel.setLayout(new GridBagLayout());
	396	+ //materialPanel.setLayout(new GridBagLayout());
379	397
380	398	aConstraints = new GridBagConstraints(0, 0, 1, 1, 1.0, 1.0,
381	399	GridBagConstraints.NORTHEAST, GridBagConstraints.BOTH, new Insets(1, 1, 1, 1), 0, 0);
..	..	@@ -594,6 +612,22 @@
594	612	}
595	613	}
596	614
	615	+ void ToggleFullScreen()
	616	+ {
	617	+ if (CameraPane.FULLSCREEN)
	618	+ {
	619	+ frame.getContentPane().remove(/"Center",/bigThree);
	620	+ framePanel.add(bigThree);
	621	+ frame.getContentPane().add(/"Center",/framePanel);
	622	+ } else
	623	+ {
	624	+ frame.getContentPane().remove(/"Center",/framePanel);
	625	+ framePanel.remove(bigThree);
	626	+ frame.getContentPane().add(/"Center",/bigThree);
	627	+ }
	628	+ cameraView.ToggleFullScreen();
	629	+ }
	630	+
597	631	private JTextArea createTextPane()
598	632	{
599	633	String[] initString =
..	..	@@ -739,115 +773,83 @@
739	773	JButton slowerButton;
740	774	JButton fasterButton;
741	775	JButton remarkButton;
	776	+
	777	+ cGridBag namePanel;
	778	+ cGridBag setupPanel;
	779	+ cGridBag commandsPanel;
	780	+ cGridBag pushPanel;
	781	+ cGridBag fillPanel;
742	782
743		- JCheckBox AddCheckBox(ObjEditor oe, String label, boolean on)
	783	+ JCheckBox AddCheckBox(cGridBag panel, String label, boolean on)
744	784	{
745	785	JCheckBox cb;
746	786
747		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
748		- oe.aConstraints.gridwidth = 1; // 3;
749		-// oe.aConstraints.weightx = 1;
750		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
751		- oe.ctrlPanel.add(cb = new JCheckBox(label, on), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	787	+ panel.add(cb = new JCheckBox(label, on)); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
752	788	cb.addItemListener(this);
753		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
754		- oe.aConstraints.gridwidth = 1;
755		- oe.aConstraints.gridx += 1;
756	789
757	790	return cb;
758	791	}
759	792
760		- cButton AddButton(ObjEditor oe, String label)
	793	+ cButton AddButton(cGridBag panel, String label)
761	794	{
762	795	cButton cb;
763	796
764		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
765		- oe.aConstraints.gridwidth = 1;
766		-// oe.aConstraints.weightx = 1;
767		-// oe.aConstraints.anchor = GridBagConstraints.WEST;
768		- oe.ctrlPanel.add(cb = new cButton(label), oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
	797	+ panel.add(cb = new cButton(label)); //, oe.aConstraints, oe.ctrlPanel.getComponentCount() - 1);
769	798	cb.addActionListener(this);
770		-// oe.aConstraints.anchor = GridBagConstraints.EAST;
771		- oe.aConstraints.gridwidth = 1;
772		- oe.aConstraints.gridx += 1;
773	799
774	800	return cb;
775	801	}
776	802
777		- JComboBox AddCombo(ObjEditor oe, java.util.Vector list, int item)
	803	+ JComboBox AddCombo(cGridBag panel, java.util.Vector list, int item)
778	804	{
779	805	JComboBox combo;
780	806
781		- oe.aConstraints.fill = GridBagConstraints.HORIZONTAL;
782		- oe.ctrlPanel.add(combo = new JComboBox(new cListModel(list, item)), oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
783		- oe.aConstraints.gridx += 1;
	807	+ panel.add(combo = new JComboBox(new cListModel(list, item))); //, oe.aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
784	808	combo.addActionListener(this);
785	809
786	810	return combo;
787	811	}
788	812
789		- NumberSlider AddSlider(JPanel ctrlPanel, String label, double min, double max, double current, double pow)
	813	+ cGridBag AddSlider(cGridBag panel, String label, double min, double max, double current, double pow)
790	814	{
791		- NumberSlider combo;
	815	+ cGridBag control = new cGridBag();
	816	+
	817	+ cNumberSlider combo;
792	818
793	819	JLabel jlabel = new JLabel(label);
794		-
795		- aConstraints.fill = GridBagConstraints.VERTICAL;
796	820	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
797		- aConstraints.gridwidth = 2;
798		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
799		- aConstraints.gridx += 1;
800		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
801		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
802		- ctrlPanel.add(combo = new NumberSlider(min, max, pow), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
803		- aConstraints.gridx += 1;
804		- aConstraints.gridwidth = 1;
805		-
	821	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	822	+ control.add(combo = new cNumberSlider(this, min, max, pow)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
806	823	combo.setFloat(current);
807		-
808		- combo.label = jlabel;
809		-
810		- combo.addChangeListener(this);
811		-
812		- return combo;
	824	+
	825	+ panel.add(control);
	826	+
	827	+ return control;
813	828	}
814	829
815		- NumberSlider AddSlider(JPanel ctrlPanel, String label, int min, int max, int current)
	830	+ cGridBag AddSlider(cGridBag panel, String label, int min, int max, int current)
816	831	{
817		- NumberSlider combo;
	832	+ cGridBag control = new cGridBag();
	833	+
	834	+ cNumberSlider combo;
818	835
819	836	JLabel jlabel = new JLabel(label);
820		-
821		- aConstraints.fill = GridBagConstraints.VERTICAL;
822	837	jlabel.setHorizontalAlignment(SwingConstants.TRAILING);
823		- aConstraints.gridwidth = 2;
824		- ctrlPanel.add(jlabel, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
825		- aConstraints.gridx += 1;
826		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
827		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
828		- ctrlPanel.add(combo = new NumberSlider(min, max), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
829		- aConstraints.gridx += 1;
830		- aConstraints.gridwidth = 1;
831		-
	838	+ control.add(jlabel); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	839	+ control.add(combo = new cNumberSlider(this, min, max)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
832	840	combo.setInteger(current);
833	841
834		- combo.label = jlabel;
835		-
836		- combo.addChangeListener(this);
837		-
838		- return combo;
	842	+ panel.add(control);
	843	+
	844	+ return control;
839	845	}
840	846
841		- JTextArea AddText(JPanel ctrlPanel, String name)
	847	+ JTextArea AddText(cGridBag ctrlPanel, String name)
842	848	{
843	849	JTextArea text;
844	850
845		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
846		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
847		- ctrlPanel.add(text = new JTextArea(name), aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
	851	+ ctrlPanel.add(text = new JTextArea(name)); //, aConstraints); //, oe.ctrlPanel.getComponentCount()-1);
848	852	text.addCaretListener(this);
849		- aConstraints.gridx += 1;
850		- aConstraints.gridwidth = 1;
851	853
852	854	return text;
853	855	}
..	..	@@ -877,9 +879,16 @@
877	879	objEditor.ctrlPanel.remove(j);
878	880	}
879	881
	882	+ void Remove(cNumberSlider j)
	883	+ {
	884	+ j.removeChangeListener(this);
	885	+ //objEditor.ctrlPanel.remove(j.label);
	886	+ objEditor.ctrlPanel.remove(j);
	887	+ }
	888	+
880	889	/*
881	890	*/
882		- void Return() // ObjEditor oe)
	891	+ void Return0() // ObjEditor oe)
883	892	{
884	893	aConstraints.gridy += 1;
885	894	aConstraints.gridx = 0;
..	..	@@ -938,31 +947,53 @@
938	947	// oe.aConstraints.weighty = 0;
939	948	// oe.aConstraints.gridx = 0;
940	949	// oe.aConstraints.gridy = 0;
941		- SetupName(oe);
	950	+ //SetupName(oe);
	951	+
	952	+ namePanel = new cGridBag();
	953	+
	954	+ nameField = AddText(namePanel, copy.GetName());
	955	+ namePanel.add(nameField);
	956	+ oe.ctrlPanel.add(namePanel);
	957	+
	958	+ oe.ctrlPanel.Return();
942	959
943	960	if (!GroupEditor.allparams)
944	961	return;
945	962
946		- liveCB = AddCheckBox(oe, "Live", copy.live);
947		- link2masterCB = AddCheckBox(oe, "Supp", copy.link2master);
948		- hideCB = AddCheckBox(oe, "Hide", copy.hide);
	963	+ setupPanel = new cGridBag().setVertical(false);
	964	+
	965	+ liveCB = AddCheckBox(setupPanel, "Live", copy.live);
	966	+ link2masterCB = AddCheckBox(setupPanel, "Supp", copy.link2master);
	967	+ hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
949	968	// Return();
950		- markCB = AddCheckBox(oe, "Mark", copy.marked);
951		- rewindCB = AddCheckBox(oe, "Rew", copy.rewind);
952		- randomCB = AddCheckBox(oe, "Rand", copy.random);
953		- Return();
954		- resetButton = AddButton(oe, "Reset");
955		- stepButton = AddButton(oe, "Step");
	969	+ markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
	970	+ rewindCB = AddCheckBox(setupPanel, "Rew", copy.rewind);
	971	+ randomCB = AddCheckBox(setupPanel, "Rand", copy.random);
	972	+
	973	+ oe.ctrlPanel.add(setupPanel);
	974	+ oe.ctrlPanel.Return();
	975	+
	976	+ commandsPanel = new cGridBag().setVertical(false);
	977	+
	978	+ resetButton = AddButton(commandsPanel, "Reset");
	979	+ stepButton = AddButton(commandsPanel, "Step");
956	980	// resetAllButton = AddButton(oe, "Reset All");
957	981	// stepAllButton = AddButton(oe, "Step All");
958		- speedupCB = AddCheckBox(oe, "Speed", copy.speedup);
	982	+ speedupCB = AddCheckBox(commandsPanel, "Speed", copy.speedup);
959	983	// Return();
960		- slowerButton = AddButton(oe, "Slow");
961		- fasterButton = AddButton(oe, "Fast");
962		- remarkButton = AddButton(oe, "Rem");
	984	+ slowerButton = AddButton(commandsPanel, "Slow");
	985	+ fasterButton = AddButton(commandsPanel, "Fast");
	986	+ remarkButton = AddButton(commandsPanel, "Remark");
963	987
964		- Return();
	988	+ oe.ctrlPanel.add(commandsPanel);
	989	+ oe.ctrlPanel.Return();
965	990
	991	+ pushPanel = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, 1);
	992	+ normalpushField = (cNumberSlider)pushPanel.getComponent(1);
	993	+ //Return();
	994	+
	995	+ oe.ctrlPanel.Return();
	996	+
966	997	// oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
967	998	// ObjEditor.aConstraints.gridx += 1;
968	999
..	..	@@ -1056,7 +1087,7 @@
1056	1087	oe.aConstraints.gridwidth = 1;
1057	1088	/**/
1058	1089	nameField = AddText(oe.ctrlPanel, copy.GetName());
1059		- Return();
	1090	+ oe.ctrlPanel.Return();
1060	1091
1061	1092	//ctrlPanel.add(textureButton = new Button("Texture..."));
1062	1093	//textureButton.setEnabled(false);
..	..	@@ -1158,11 +1189,22 @@
1158	1189	//JPanel worldPanel =
1159	1190	// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
1160	1191	//worldPanel.setName("World");
1161		- /JPanel/ cameraPanel =
1162		- new JPanel(new BorderLayout());
1163		- cameraPanel.add(cameraView);
1164		- //new timeflow.app.TimeflowApp().TimeFlowWindow(cameraPanel, frame);
	1192	+ centralPanel = new cGridBag();
	1193	+ centralPanel.preferredWidth = 20;
	1194	+ timelinePanel = new JPanel(new BorderLayout());
	1195	+ timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1165	1196
	1197	+ cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
	1198	+ cameraPanel.setContinuousLayout(true);
	1199	+ cameraPanel.setOneTouchExpandable(true);
	1200	+// cameraPanel.setDividerLocation(0.9);
	1201	+// cameraPanel.setDividerSize(9);
	1202	+ cameraPanel.setResizeWeight(1.0);
	1203	+
	1204	+ centralPanel.add(cameraView);
	1205	+ //frame.setJMenuBar(timelineMenubar);
	1206	+ //centralPanel.add(timelinePanel);
	1207	+
1166	1208	//topView.camera = ;
1167	1209	//frontView.camera = new Camera(2);
1168	1210	//sideView.camera = new Camera(3);
..	..	@@ -1178,12 +1220,13 @@
1178	1220	//frontView.object = copy;
1179	1221	//sideView.object = copy;
1180	1222
1181		- XYZPanel = new JPanel();
1182		- XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
	1223	+ XYZPanel = new cGridBag().setVertical(true);
	1224	+ //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
1183	1225
1184		- XYZPanel.add(/BorderLayout.SOUTH,/sideView); // Scroll);
1185		- XYZPanel.add(/BorderLayout.CENTER,/frontView); // Scroll);
1186		- XYZPanel.add(/BorderLayout.NORTH,/topView); // Scroll);
	1226	+ XYZPanel.preferredWidth = 5;
	1227	+ XYZPanel.addComponent(/BorderLayout.SOUTH,/sideView); // Scroll);
	1228	+ XYZPanel.addComponent(/BorderLayout.CENTER,/frontView); // Scroll);
	1229	+ XYZPanel.addComponent(/BorderLayout.NORTH,/topView); // Scroll);
1187	1230
1188	1231	/*
1189	1232	gridPanel = new JPanel(); //new BorderLayout());
..	..	@@ -1192,7 +1235,7 @@
1192	1235	gridPanel.add(cameraView);
1193	1236	gridPanel.add(XYZPanel);
1194	1237	*/
1195		- gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, cameraPanel, XYZPanel); //new BorderLayout());
	1238	+ gridPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, centralPanel, XYZPanel); //new BorderLayout());
1196	1239	gridPanel.setContinuousLayout(true);
1197	1240	gridPanel.setOneTouchExpandable(true);
1198	1241	gridPanel.setDividerLocation(1.0);
..	..	@@ -1221,10 +1264,11 @@
1221	1264	//JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1222	1265	//tmp.setName("Edit");
1223	1266	objectPanel.add(materialPanel);
1224		- JPanel north = new JPanel(new BorderLayout());
1225		- north.setName("Edit");
1226		- north.add(ctrlPanel, BorderLayout.NORTH);
1227		- objectPanel.add(north);
	1267	+// JPanel north = new JPanel(new BorderLayout());
	1268	+// north.setName("Edit");
	1269	+// north.add(ctrlPanel, BorderLayout.NORTH);
	1270	+// objectPanel.add(north);
	1271	+ objectPanel.add(ctrlPanel);
1228	1272	objectPanel.add(infoPanel);
1229	1273
1230	1274	/*
..	..	@@ -1245,16 +1289,23 @@
1245	1289	scrollpane.setWheelScrollingEnabled(true);
1246	1290	scrollpane.addMouseWheelListener(this); // Default not fast enough
1247	1291
1248		- /JTabbedPane/ scenePanel = new JTabbedPane();
1249		- scenePanel.add(scrollpane);
	1292	+ /JTabbedPane/ scenePanel = new cGridBag();
	1293	+ scenePanel.preferredWidth = 7;
	1294	+
	1295	+ JTabbedPane tabbedPane = new JTabbedPane();
	1296	+ tabbedPane.add(scrollpane);
1250	1297
1251		- scenePanel.add(FSPane = new cFileSystemPane(this));
	1298	+ tabbedPane.add(FSPane = new cFileSystemPane(this));
1252	1299
1253		- optionsPanel = new JPanel(new GridBagLayout());
	1300	+ optionsPanel = new cGridBag().setVertical(true);
1254	1301
1255	1302	optionsPanel.setName("Options");
1256		- scenePanel.add(optionsPanel);
1257		-
	1303	+
	1304	+ AddOptions(optionsPanel); //, aConstraints);
	1305	+
	1306	+ tabbedPane.add(optionsPanel);
	1307	+
	1308	+ scenePanel.add(tabbedPane);
1258	1309
1259	1310	/*
1260	1311	cTree jTree = new cTree(null);
..	..	@@ -1288,6 +1339,7 @@
1288	1339	//bigPanel.setSize(new Dimension(10,10));
1289	1340	//bigPanel.add(ctrlPanel);
1290	1341	//bigPanel.add(gridPanel);
	1342	+ /**
1291	1343	bigThree = new JPanel();
1292	1344	//big.setLayout(new FlowLayout(FlowLayout.LEFT));
1293	1345	bigThree.setLayout(new GridBagLayout()); //1,3,5,5));
..	..	@@ -1304,14 +1356,20 @@
1304	1356	// aConstraints.gridheight = 3;
1305	1357	aWindowConstraints.gridx = 1;
1306	1358	aWindowConstraints.fill = GridBagConstraints.BOTH;
1307		- bigThree.add(cameraPanel, aWindowConstraints);
	1359	+ bigThree.add(centralPanel, aWindowConstraints);
1308	1360	aWindowConstraints.weightx = 0;
1309	1361	aWindowConstraints.gridx = 4;
1310	1362	aWindowConstraints.gridwidth = 1;
1311	1363	// aConstraints.gridheight = 3;
1312	1364	aWindowConstraints.fill = GridBagConstraints.VERTICAL;
1313	1365	bigThree.add(XYZPanel, aWindowConstraints);
	1366	+ /**/
1314	1367
	1368	+ bigThree = new cGridBag();
	1369	+ bigThree.addComponent(scenePanel);
	1370	+ bigThree.addComponent(centralPanel);
	1371	+ bigThree.addComponent(XYZPanel);
	1372	+
1315	1373	// // SIDE EFFECT!!!
1316	1374	// aConstraints.gridx = 0;
1317	1375	// aConstraints.gridy = 0;
..	..	@@ -1332,7 +1390,8 @@
1332	1390	//worldPane.add(bigPanel);
1333	1391	//worldPane.add(worldPanel);
1334	1392	/**/
1335		- frame.getContentPane().add(/"Center",/framePanel);
	1393	+ //frame.getContentPane().add(/"Center",/framePanel);
	1394	+ frame.add(/"Center",/framePanel);
1336	1395	//frame.getContentPane().add(/"Center",/ worldPane);
1337	1396
1338	1397	// aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
..	..	@@ -1353,6 +1412,10 @@
1353	1412	});
1354	1413	}
1355	1414
	1415	+ void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
	1416	+ {
	1417	+ }
	1418	+
1356	1419	JTree GetTree()
1357	1420	{
1358	1421	return objEditor.jTree;
..	..	@@ -1364,260 +1427,165 @@
1364	1427	ctrlPanel.removeAll();
1365	1428	}
1366	1429
1367		- void SetupMaterial(JPanel ctrlPanel)
	1430	+ void SetupMaterial(cGridBag panel)
1368	1431	{
1369		- aConstraints.weighty = 0;
1370		- //aConstraints.weightx = 1;
1371		- /*
	1432	+ /*
1372	1433	ctrlPanel.add(materialLabel = new JLabel("MATERIAL : "), aConstraints);
1373	1434	materialLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1374		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1375		- aConstraints.gridx += 1;
1376	1435	*/
1377	1436
1378		- aConstraints.gridwidth = 1;
1379		- ctrlPanel.add(createMaterialButton = new cButton("Create"), aConstraints);
1380		- aConstraints.gridx += 1;
1381		- aConstraints.weighty = 0;
1382		- aConstraints.gridwidth = 1;
	1437	+ cGridBag editBar = new cGridBag().setVertical(false);
	1438	+
	1439	+ editBar.add(createMaterialButton = new cButton("Create")); // , aConstraints);
1383	1440
1384	1441	/*
1385	1442	ctrlPanel.add(resetSlidersButton = new cButton("Reset All"), aConstraints);
1386		- aConstraints.gridx += 1;
1387		- aConstraints.weighty = 0;
1388		- aConstraints.gridwidth = 1;
1389	1443	*/
1390	1444
1391		- ctrlPanel.add(clearMaterialButton = new cButton("Clear"), aConstraints);
1392		- aConstraints.gridx += 1;
	1445	+ editBar.add(clearMaterialButton = new cButton("Clear")); // , aConstraints);
	1446	+ editBar.add(resetSlidersButton = new cButton("Reset")); // , aConstraints);
	1447	+ editBar.add(propagateToggle = new cCheckBox("Prop", propagate)); // , aConstraints);
	1448	+ editBar.add(multiplyToggle = new cCheckBox("Mult", false)); // , aConstraints);
1393	1449
1394		- ctrlPanel.add(resetSlidersButton = new cButton("Reset"), aConstraints);
1395		-
1396		- aConstraints.gridx += 1;
1397		-
1398		- ctrlPanel.add(propagateToggle = new cCheckBox("Prop", propagate), aConstraints);
1399		-
1400		- aConstraints.gridx += 1;
1401		-
1402		- ctrlPanel.add(multiplyToggle = new cCheckBox("Mult", false), aConstraints);
1403		-
1404		- aConstraints.gridx = 0;
1405		- aConstraints.gridy += 1;
1406		- aConstraints.weighty = 0;
1407		- aConstraints.gridwidth = 1;
	1450	+ panel.add(editBar);
	1451	+
1408	1452	/**/
1409	1453	//aConstraints.weighty = 0;
1410	1454	////aConstraints.weightx = 1;
1411	1455	//aConstraints.weighty = 1;
1412	1456	aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1413	1457	//aConstraints.gridx += 1;
1414		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1415		- aConstraints.weighty = 0;
1416		- aConstraints.gridx = 0;
1417		- aConstraints.gridy += 1;
1418		- aConstraints.gridwidth = 1;
	1458	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1419	1459
1420		- ctrlPanel.add(colorLabel = new JLabel("Color/hue"), aConstraints);
1421		- colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1422		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1423		- aConstraints.gridx += 1;
1424		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1425		- //aConstraints.weightx = 0;
1426		- ctrlPanel.add(colorField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1427		- aConstraints.gridx = 0;
1428		- aConstraints.gridy += 1;
1429		- aConstraints.gridwidth = 1;
	1460	+ cGridBag colorSection = new cGridBag().setVertical(true);
	1461	+
	1462	+ cGridBag color = new cGridBag();
	1463	+ color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
	1464	+ colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1465	+ color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1466	+ //colorField.preferredWidth = 200;
	1467	+ colorSection.add(color);
1430	1468
1431		- ctrlPanel.add(modulationLabel = new JLabel("Saturation"), aConstraints);
1432		- modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1433		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1434		- aConstraints.gridx += 1;
1435		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1436		- ctrlPanel.add(modulationField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1437		- aConstraints.gridx = 0;
1438		- aConstraints.gridy += 1;
1439		- aConstraints.gridwidth = 1;
	1469	+ cGridBag modulation = new cGridBag();
	1470	+ modulation.add(modulationLabel = new JLabel("Saturation")); // , aConstraints);
	1471	+ modulationLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1472	+ modulation.add(modulationField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1473	+ colorSection.add(modulation);
1440	1474
1441		- ctrlPanel.add(textureLabel = new JLabel("Texture"), aConstraints);
1442		- textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1443		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1444		- aConstraints.gridx += 1;
1445		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1446		- ctrlPanel.add(textureField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1447		- aConstraints.gridx = 0;
1448		- aConstraints.gridy += 1;
1449		- aConstraints.gridwidth = 1;
	1475	+ cGridBag texture = new cGridBag();
	1476	+ texture.add(textureLabel = new JLabel("Texture")); // , aConstraints);
	1477	+ textureLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1478	+ texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1479	+ colorSection.add(texture);
1450	1480
1451		- ctrlPanel.add(anisoLabel = new JLabel("AnisoU"), aConstraints);
1452		- anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1453		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1454		- aConstraints.gridx += 1;
1455		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1456		- ctrlPanel.add(anisoField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1457		- aConstraints.gridx = 0;
1458		- aConstraints.gridy += 1;
1459		- aConstraints.gridwidth = 1;
	1481	+ cGridBag anisoU = new cGridBag();
	1482	+ anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
	1483	+ anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1484	+ anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1485	+ colorSection.add(anisoU);
1460	1486
1461		- ctrlPanel.add(anisoVLabel = new JLabel("AnisoV"), aConstraints);
1462		- anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1463		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1464		- aConstraints.gridx += 1;
1465		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1466		- ctrlPanel.add(anisoVField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1467		- aConstraints.gridx = 0;
1468		- aConstraints.gridy += 1;
1469		- aConstraints.gridwidth = 1;
	1487	+ cGridBag anisoV = new cGridBag();
	1488	+ anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
	1489	+ anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1490	+ anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1491	+ colorSection.add(anisoV);
1470	1492
1471		- ctrlPanel.add(shadowbiasLabel = new JLabel("Shadowbias"), aConstraints);
1472		- shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1473		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1474		- aConstraints.gridx += 1;
1475		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1476		- ctrlPanel.add(shadowbiasField = new NumberSlider(0.001, 50, -1), aConstraints);
1477		- aConstraints.gridx = 0;
1478		- aConstraints.gridy += 1;
1479		- aConstraints.gridwidth = 1;
	1493	+ cGridBag shadowbias = new cGridBag();
	1494	+ shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
	1495	+ shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1496	+ shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1497	+ colorSection.add(shadowbias);
1480	1498
1481		- //aConstraints.weighty = 1;
1482		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1483		- //aConstraints.gridx += 1;
1484		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1485		- aConstraints.weighty = 0;
1486		- aConstraints.gridx = 0;
1487		- aConstraints.gridy += 1;
1488		- aConstraints.gridwidth = 1;
	1499	+ panel.add(new JSeparator());
	1500	+
	1501	+ panel.add(colorSection);
	1502	+
	1503	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1504	+
	1505	+ cGridBag diffuseSection = new cGridBag().setVertical(true);
	1506	+
	1507	+ cGridBag diffuse = new cGridBag();
	1508	+ diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
	1509	+ diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1510	+ diffuse.add(diffuseField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1511	+ diffuseSection.add(diffuse);
1489	1512
1490		- ctrlPanel.add(diffuseLabel = new JLabel("Diffuse"), aConstraints);
1491		- diffuseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1492		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1493		- aConstraints.gridx += 1;
1494		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1495		- ctrlPanel.add(diffuseField = new NumberSlider(0.001, 50, -1), aConstraints);
1496		- aConstraints.gridx = 0;
1497		- aConstraints.gridy += 1;
1498		- aConstraints.gridwidth = 1;
	1513	+ cGridBag diffuseness = new cGridBag();
	1514	+ diffuseness.add(diffusenessLabel = new JLabel("Diffusion")); // , aConstraints);
	1515	+ diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1516	+ diffuseness.add(diffusenessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1517	+ diffuseSection.add(diffuseness);
1499	1518
1500		- ctrlPanel.add(diffusenessLabel = new JLabel("Diffusion"), aConstraints);
1501		- diffusenessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1502		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1503		- aConstraints.gridx += 1;
1504		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1505		- ctrlPanel.add(diffusenessField = new NumberSlider(0.001, 50, -1), aConstraints);
1506		- aConstraints.gridx = 0;
1507		- aConstraints.gridy += 1;
1508		- aConstraints.gridwidth = 1;
	1519	+ cGridBag selfshadow = new cGridBag();
	1520	+ selfshadow.add(selfshadowLabel = new JLabel("Selfshadow")); // , aConstraints);
	1521	+ selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1522	+ selfshadow.add(selfshadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1523	+ diffuseSection.add(selfshadow);
1509	1524
1510		- ctrlPanel.add(selfshadowLabel = new JLabel("Selfshadow"), aConstraints);
1511		- selfshadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1512		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1513		- aConstraints.gridx += 1;
1514		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1515		- ctrlPanel.add(selfshadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1516		- aConstraints.gridx = 0;
1517		- aConstraints.gridy += 1;
1518		- aConstraints.gridwidth = 1;
	1525	+ cGridBag sheen = new cGridBag();
	1526	+ sheen.add(sheenLabel = new JLabel("Sheen")); // , aConstraints);
	1527	+ sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1528	+ sheen.add(sheenField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1529	+ diffuseSection.add(sheen);
1519	1530
1520		- ctrlPanel.add(sheenLabel = new JLabel("Sheen"), aConstraints);
1521		- sheenLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1522		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1523		- aConstraints.gridx += 1;
1524		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1525		- ctrlPanel.add(sheenField = new NumberSlider(0.001, 50, -1), aConstraints);
1526		- aConstraints.gridx = 0;
1527		- aConstraints.gridy += 1;
1528		- aConstraints.gridwidth = 1;
	1531	+ cGridBag subsurface = new cGridBag();
	1532	+ subsurface.add(subsurfaceLabel = new JLabel("Subsurface")); // , aConstraints);
	1533	+ subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1534	+ subsurface.add(subsurfaceField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1535	+ diffuseSection.add(subsurface);
1529	1536
1530		- ctrlPanel.add(subsurfaceLabel = new JLabel("Subsurface"), aConstraints);
1531		- subsurfaceLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1532		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1533		- aConstraints.gridx += 1;
1534		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1535		- ctrlPanel.add(subsurfaceField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1536		- aConstraints.gridx = 0;
1537		- aConstraints.gridy += 1;
1538		- aConstraints.gridwidth = 1;
	1537	+ cGridBag shadow = new cGridBag();
	1538	+ shadow.add(shadowLabel = new JLabel("Shadowing")); // , aConstraints);
	1539	+ shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1540	+ shadow.add(shadowField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1541	+ diffuseSection.add(shadow);
1539	1542
1540		- ctrlPanel.add(shadowLabel = new JLabel("Shadowing"), aConstraints);
1541		- shadowLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1542		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1543		- aConstraints.gridx += 1;
1544		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1545		- ctrlPanel.add(shadowField = new NumberSlider(0.001, 50, -1), aConstraints);
1546		- aConstraints.gridx = 0;
1547		- aConstraints.gridy += 1;
1548		- aConstraints.gridwidth = 1;
	1543	+ cGridBag fakedepth = new cGridBag();
	1544	+ fakedepth.add(fakedepthLabel = new JLabel("Fakedepth")); // , aConstraints);
	1545	+ fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1546	+ fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1547	+ diffuseSection.add(fakedepth);
1549	1548
1550		- ctrlPanel.add(fakedepthLabel = new JLabel("Fakedepth"), aConstraints);
1551		- fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1552		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1553		- aConstraints.gridx += 1;
1554		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1555		- ctrlPanel.add(fakedepthField = new NumberSlider(0.001, 50, -1), aConstraints);
1556		- aConstraints.gridx = 0;
1557		- aConstraints.gridy += 1;
1558		- aConstraints.gridwidth = 1;
	1549	+ panel.add(new JSeparator());
	1550	+
	1551	+ panel.add(diffuseSection);
	1552	+
	1553	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1554	+
	1555	+ cGridBag specularSection = new cGridBag().setVertical(true);
1559	1556
1560		- //aConstraints.weighty = 1;
1561		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1562		- //aConstraints.gridx += 1;
1563		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1564		- aConstraints.weighty = 0;
1565		- aConstraints.gridx = 0;
1566		- aConstraints.gridy += 1;
1567		- aConstraints.gridwidth = 1;
	1557	+ cGridBag specular = new cGridBag();
	1558	+ specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
	1559	+ specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1560	+ specular.add(specularField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1561	+ specularSection.add(specular);
1568	1562
1569		- ctrlPanel.add(specularLabel = new JLabel("Specular"), aConstraints);
1570		- specularLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1571		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1572		- aConstraints.gridx += 1;
1573		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1574		- ctrlPanel.add(specularField = new NumberSlider(0.001, 50, -1), aConstraints);
1575		- aConstraints.gridx = 0;
1576		- aConstraints.gridy += 1;
1577		- aConstraints.gridwidth = 1;
	1563	+ cGridBag lightarea = new cGridBag();
	1564	+ lightarea.add(lightareaLabel = new JLabel("Lightarea")); // , aConstraints);
	1565	+ lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1566	+ lightarea.add(lightareaField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1567	+ specularSection.add(lightarea);
1578	1568
1579		- ctrlPanel.add(lightareaLabel = new JLabel("Lightarea"), aConstraints);
1580		- lightareaLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1581		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1582		- aConstraints.gridx += 1;
1583		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1584		- ctrlPanel.add(lightareaField = new NumberSlider(0.001, 50, -1), aConstraints);
1585		- aConstraints.gridx = 0;
1586		- aConstraints.gridy += 1;
1587		- aConstraints.gridwidth = 1;
	1569	+ cGridBag shininess = new cGridBag();
	1570	+ shininess.add(shininessLabel = new JLabel("Roughness")); // , aConstraints);
	1571	+ shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1572	+ shininess.add(shininessField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1573	+ specularSection.add(shininess);
1588	1574
1589		- ctrlPanel.add(shininessLabel = new JLabel("Roughness"), aConstraints);
1590		- shininessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1591		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1592		- aConstraints.gridx += 1;
1593		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1594		- ctrlPanel.add(shininessField = new NumberSlider(0.001, 50, -1), aConstraints);
1595		- aConstraints.gridx = 0;
1596		- aConstraints.gridy += 1;
1597		- aConstraints.gridwidth = 1;
	1575	+ cGridBag metalness = new cGridBag();
	1576	+ metalness.add(metalnessLabel = new JLabel("Metalness")); // , aConstraints);
	1577	+ metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1578	+ metalness.add(metalnessField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1579	+ specularSection.add(metalness);
1598	1580
1599		- ctrlPanel.add(metalnessLabel = new JLabel("Metalness"), aConstraints);
1600		- metalnessLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1601		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1602		- aConstraints.gridx += 1;
1603		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1604		- ctrlPanel.add(metalnessField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1605		- aConstraints.gridx = 0;
1606		- aConstraints.gridy += 1;
1607		- aConstraints.gridwidth = 1;
	1581	+ cGridBag velvet = new cGridBag();
	1582	+ velvet.add(velvetLabel = new JLabel("Velvet")); // , aConstraints);
	1583	+ velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1584	+ velvet.add(velvetField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1585	+ specularSection.add(velvet);
1608	1586
1609		- ctrlPanel.add(velvetLabel = new JLabel("Velvet"), aConstraints);
1610		- velvetLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1611		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1612		- aConstraints.gridx += 1;
1613		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1614		- ctrlPanel.add(velvetField = new NumberSlider(0.001, 50, -1), aConstraints);
1615		- aConstraints.gridx = 0;
1616		- aConstraints.gridy += 1;
1617		- aConstraints.gridwidth = 1;
1618		-
1619		- shiftField = AddSlider(ctrlPanel, "Shift", 0.001, 50, copy.material.shift, -1);
1620		- Return();
	1587	+ shiftField = (cNumberSlider)AddSlider(specularSection, "Shift", 0.001, 50, copy.material.shift, -1).getComponent(1);
	1588	+ //Return();
1621	1589	// ctrlPanel.add(shiftLabel = new JLabel("Shift"), aConstraints);
1622	1590	// shiftLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1623	1591	// aConstraints.fill = GridBagConstraints.HORIZONTAL;
..	..	@@ -1628,130 +1596,93 @@
1628	1596	// aConstraints.gridy += 1;
1629	1597	// aConstraints.gridwidth = 1;
1630	1598
1631		- //aConstraints.weighty = 1;
1632		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1633		- //aConstraints.gridx += 1;
1634		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1635		- aConstraints.weighty = 0;
1636		- aConstraints.gridx = 0;
1637		- aConstraints.gridy += 1;
1638		- aConstraints.gridwidth = 1;
1639	1599
1640		- ctrlPanel.add(cameraLabel = new JLabel("GlobalLight"), aConstraints);
1641		- cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1642		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1643		- aConstraints.gridx += 1;
1644		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1645		- ctrlPanel.add(cameraField = new NumberSlider(0.001, 50, -1), aConstraints);
1646		- aConstraints.gridx = 0;
1647		- aConstraints.gridy += 1;
1648		- aConstraints.gridwidth = 1;
	1600	+ panel.add(new JSeparator());
	1601	+
	1602	+ panel.add(specularSection);
	1603	+
	1604	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1605	+
	1606	+ cGridBag globalSection = new cGridBag().setVertical(true);
1649	1607
1650		- ctrlPanel.add(ambientLabel = new JLabel("Ambient"), aConstraints);
1651		- ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1652		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1653		- aConstraints.gridx += 1;
1654		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1655		- ctrlPanel.add(ambientField = new NumberSlider(0.001, 50, -1), aConstraints);
1656		- aConstraints.gridx = 0;
1657		- aConstraints.gridy += 1;
1658		- aConstraints.gridwidth = 1;
	1608	+ cGridBag camera = new cGridBag();
	1609	+ camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
	1610	+ cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1611	+ camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1612	+ globalSection.add(camera);
1659	1613
1660		- ctrlPanel.add(backlitLabel = new JLabel("Backlit"), aConstraints);
1661		- backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1662		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1663		- aConstraints.gridx += 1;
1664		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1665		- ctrlPanel.add(backlitField = new NumberSlider(0.001, 50, -1), aConstraints);
1666		- aConstraints.gridx = 0;
1667		- aConstraints.gridy += 1;
1668		- aConstraints.gridwidth = 1;
	1614	+ cGridBag ambient = new cGridBag();
	1615	+ ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
	1616	+ ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1617	+ ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1618	+ globalSection.add(ambient);
1669	1619
1670		- ctrlPanel.add(opacityLabel = new JLabel("Opacity"), aConstraints);
1671		- opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1672		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1673		- aConstraints.gridx += 1;
1674		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1675		- ctrlPanel.add(opacityField = new NumberSlider(0.001, 1, -0.1), aConstraints);
1676		- aConstraints.gridx = 0;
1677		- aConstraints.gridy += 1;
1678		- aConstraints.gridwidth = 1;
1679		- aConstraints.weighty = 0;
	1620	+ cGridBag backlit = new cGridBag();
	1621	+ backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
	1622	+ backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1623	+ backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
	1624	+ globalSection.add(backlit);
1680	1625
1681		- ctrlPanel.add(bumpLabel = new JLabel("Bump"), aConstraints);
1682		- bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1683		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1684		- aConstraints.gridx += 1;
1685		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1686		- ctrlPanel.add(bumpField = new NumberSlider(0.0, 2), aConstraints);
1687		- aConstraints.gridx = 0;
1688		- aConstraints.gridy += 1;
1689		- aConstraints.gridwidth = 1;
	1626	+ cGridBag opacity = new cGridBag();
	1627	+ opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
	1628	+ opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1629	+ opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
	1630	+ globalSection.add(opacity);
1690	1631
1691		- ctrlPanel.add(noiseLabel = new JLabel("Noise"), aConstraints);
1692		- noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1693		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1694		- aConstraints.gridx += 1;
1695		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1696		- ctrlPanel.add(noiseField = new NumberSlider(0.0, 1/5/), aConstraints);
1697		- aConstraints.gridx = 0;
1698		- aConstraints.gridy += 1;
1699		- aConstraints.gridwidth = 1;
	1632	+ panel.add(new JSeparator());
	1633	+
	1634	+ panel.add(globalSection);
	1635	+
	1636	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
	1637	+
	1638	+ cGridBag textureSection = new cGridBag().setVertical(true);
1700	1639
1701		- ctrlPanel.add(powerLabel = new JLabel("Turbulance"), aConstraints);
1702		- powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1703		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1704		- aConstraints.gridx += 1;
1705		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1706		- ctrlPanel.add(powerField = new NumberSlider(0.0, 5), aConstraints);
1707		- aConstraints.gridx = 0;
1708		- aConstraints.gridy += 1;
1709		- aConstraints.gridwidth = 1;
	1640	+ cGridBag bump = new cGridBag();
	1641	+ bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
	1642	+ bumpLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1643	+ bump.add(bumpField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1644	+ textureSection.add(bump);
1710	1645
1711		- ctrlPanel.add(borderfadeLabel = new JLabel("Borderfade"), aConstraints);
1712		- borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1713		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1714		- aConstraints.gridx += 1;
1715		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1716		- ctrlPanel.add(borderfadeField = new NumberSlider(0.0, 2), aConstraints);
1717		- aConstraints.gridx = 0;
1718		- aConstraints.gridy += 1;
1719		- aConstraints.gridwidth = 1;
	1646	+ cGridBag noise = new cGridBag();
	1647	+ noise.add(noiseLabel = new JLabel("Noise")); // , aConstraints);
	1648	+ noiseLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1649	+ noise.add(noiseField = new cNumberSlider(this, 0.0, 1/5/)); // , aConstraints);
	1650	+ textureSection.add(noise);
1720	1651
1721		- ctrlPanel.add(fogLabel = new JLabel("Punch"), aConstraints);
1722		- fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1723		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1724		- aConstraints.gridx += 1;
1725		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1726		- ctrlPanel.add(fogField = new NumberSlider(0.0, 20), aConstraints);
1727		- aConstraints.gridx = 0;
1728		- aConstraints.gridy += 1;
1729		- aConstraints.gridwidth = 1;
	1652	+ cGridBag power = new cGridBag();
	1653	+ power.add(powerLabel = new JLabel("Turbulance")); // , aConstraints);
	1654	+ powerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1655	+ power.add(powerField = new cNumberSlider(this, 0.0, 5)); // , aConstraints);
	1656	+ textureSection.add(power);
1730	1657
1731		- ctrlPanel.add(opacityPowerLabel = new JLabel("Halo"), aConstraints);
1732		- opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1733		- aConstraints.fill = GridBagConstraints.HORIZONTAL;
1734		- aConstraints.gridx += 1;
1735		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH;
1736		- ctrlPanel.add(opacityPowerField = new NumberSlider(0.0, 10 /10 dec 2013/), aConstraints);
1737		- aConstraints.gridx = 0;
1738		- aConstraints.gridy += 1;
1739		- aConstraints.gridwidth = 1;
	1658	+ cGridBag borderfade = new cGridBag();
	1659	+ borderfade.add(borderfadeLabel = new JLabel("Borderfade")); // , aConstraints);
	1660	+ borderfadeLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1661	+ borderfade.add(borderfadeField = new cNumberSlider(this, 0.0, 2)); // , aConstraints);
	1662	+ textureSection.add(borderfade);
1740	1663
1741		- //aConstraints.weighty = 1;
1742		- aConstraints.gridwidth = ObjEditor.GRIDWIDTH; // 100;
1743		- //aConstraints.gridx += 1;
1744		- ctrlPanel.add(new JLabel("----------------------------------"), aConstraints);
1745		- aConstraints.weighty = 0;
	1664	+ cGridBag fog = new cGridBag();
	1665	+ fog.add(fogLabel = new JLabel("Punch")); // , aConstraints);
	1666	+ fogLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1667	+ fog.add(fogField = new cNumberSlider(this, 0.0, 20)); // , aConstraints);
	1668	+ textureSection.add(fog);
1746	1669
1747		- aConstraints.gridx = 0;
1748		- aConstraints.gridy = 0;
1749		- aConstraints.gridwidth = 1;
	1670	+ cGridBag opacityPower = new cGridBag();
	1671	+ opacityPower.add(opacityPowerLabel = new JLabel("Halo")); // , aConstraints);
	1672	+ opacityPowerLabel.setHorizontalAlignment(SwingConstants.TRAILING);
	1673	+ opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /10 dec 2013/)); // , aConstraints);
	1674	+ textureSection.add(opacityPower);
	1675	+
	1676	+ panel.add(new JSeparator());
	1677	+
	1678	+ panel.add(textureSection);
	1679	+
	1680	+ //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1750	1681
1751	1682	SetMaterial(copy); // .GetMaterial());
1752	1683
1753		- colorField.addChangeListener(this);
1754		- modulationField.addChangeListener(this);
	1684	+ //colorField.addChangeListener(this);
	1685	+// modulationField.addChangeListener(this);
1755	1686	metalnessField.addChangeListener(this);
1756	1687	diffuseField.addChangeListener(this);
1757	1688	specularField.addChangeListener(this);
..	..	@@ -2563,6 +2494,7 @@
2563	2494	}
2564	2495	if (input == null)
2565	2496	{
	2497	+ new Exception().printStackTrace();
2566	2498	System.exit(0);
2567	2499	}
2568	2500
..	..	@@ -2959,20 +2891,37 @@
2959	2891	// june 2013 copy.HardTouch();
2960	2892	cameraView.repaint();
2961	2893	return;
2962		- } else if (event.getSource() == toggleFullItem)
	2894	+ } else if (event.getSource() == toggleTimelineItem)
2963	2895	{
2964		- if (CameraPane.FULLSCREEN)
	2896	+ timeline ^= true;
	2897	+
	2898	+ if (timeline)
2965	2899	{
2966		- frame.getContentPane().remove(/"Center",/bigThree);
2967		- framePanel.add(bigThree);
2968		- frame.getContentPane().add(/"Center",/framePanel);
2969		- } else
2970		- {
2971		- frame.getContentPane().remove(/"Center",/framePanel);
2972		- frame.getContentPane().add(/"Center",/bigThree);
	2900	+ centralPanel.remove(cameraView);
	2901	+ cameraPanel.add(cameraView);
	2902	+ centralPanel.add(cameraPanel);
	2903	+ frame.setJMenuBar(timelineMenubar);
	2904	+ wasFullScreen = CameraPane.FULLSCREEN;
	2905	+ if (!CameraPane.FULLSCREEN)
	2906	+ ToggleFullScreen();
	2907	+ toggleFullScreenItem.setEnabled(false);
2973	2908	}
	2909	+ else
	2910	+ {
	2911	+ centralPanel.remove(cameraPanel);
	2912	+ centralPanel.add(cameraView);
	2913	+ frame.setJMenuBar(null);
	2914	+ if (!wasFullScreen)
	2915	+ ToggleFullScreen();
	2916	+ toggleFullScreenItem.setEnabled(true);
	2917	+ }
	2918	+
2974	2919	frame.validate();
2975		- cameraView.ToggleFullScreen();
	2920	+ return;
	2921	+ } else if (event.getSource() == toggleFullScreenItem)
	2922	+ {
	2923	+ ToggleFullScreen();
	2924	+ frame.validate();
2976	2925
2977	2926	return;
2978	2927	} else if (event.getSource() == toggleRandomItem)
..	..	@@ -3082,7 +3031,8 @@
3082	3031	objEditor.refreshContents();
3083	3032	} else if (event.getSource() == stepItem)
3084	3033	{
3085		- cameraView.ONESTEP = true;
	3034	+ //cameraView.ONESTEP = true;
	3035	+ Globals.ONESTEP = true;
3086	3036	cameraView.repaint();
3087	3037	return;
3088	3038	} else if (event.getSource() == stepButton)
..	..	@@ -3221,9 +3171,9 @@
3221	3171	cameraView.RevertCamera();
3222	3172	cameraView.repaint();
3223	3173	return;
3224		- } else if (event.getSource() == textureButton)
3225		- {
3226		- return; // true;
	3174	+// } else if (event.getSource() == textureButton)
	3175	+// {
	3176	+// return; // true;
3227	3177	} else // combos...
3228	3178	if (event.getSource() == texresMenu)
3229	3179	{
..	..	@@ -3239,25 +3189,25 @@
3239	3189
3240	3190	void ToggleAnimation()
3241	3191	{
3242		- if (!CameraPane.ANIMATION)
	3192	+ if (!Globals.ANIMATION)
3243	3193	{
3244	3194	FileDialog browser = new FileDialog(frame, "Save Animation As...", FileDialog.SAVE);
3245	3195	browser.show();
3246	3196	String filename = browser.getFile();
3247	3197	if (filename != null && filename.length() > 0)
3248	3198	{
3249		- CameraPane.filename = browser.getDirectory() + filename;
	3199	+ Globals.filename = browser.getDirectory() + filename;
3250	3200	//CameraPane.framecount = 0;
3251		- CameraPane.imagecount = 0;
	3201	+ Globals.imagecount = 0;
3252	3202
3253		- CameraPane.ANIMATION ^= true;
	3203	+ Globals.ANIMATION ^= true;
3254	3204
3255	3205	GrafreeD.wav.cursor = 0;
3256	3206	GrafreeD.wav.loop = 0;
3257	3207	}
3258	3208	} else
3259	3209	{
3260		- CameraPane.ANIMATION ^= true;
	3210	+ Globals.ANIMATION ^= true;
3261	3211	}
3262	3212	}
3263	3213
..	..	@@ -3274,6 +3224,7 @@
3274	3224	callee.refreshContents();
3275	3225	} else
3276	3226	{
	3227	+ new Exception().printStackTrace();
3277	3228	System.exit(0);
3278	3229	}
3279	3230	}
..	..	@@ -3436,7 +3387,7 @@
3436	3387	current.fakedepth = (float) fakedepthField.getFloat();
3437	3388	current.shadowbias = (float) shadowbiasField.getFloat();
3438	3389
3439		- if (!NumberSlider.frozen)
	3390	+ if (!cNumberSlider.frozen)
3440	3391	{
3441	3392	//System.out.println("Propagate = " + propagate);
3442	3393	copy.UpdateMaterial(anchor, current, propagate);
..	..	@@ -3484,6 +3435,7 @@
3484	3435	\|\| e.getSource() == apertureField
3485	3436	\|\| e.getSource() == shadowblurField)
3486	3437	{
	3438	+ new Exception().printStackTrace();
3487	3439	System.exit(0);
3488	3440	cameraView.options1[0] = (float) focusField.getFloat() * 10;
3489	3441	cameraView.options1[1] = (float) apertureField.getFloat() / 1000;
..	..	@@ -3510,7 +3462,13 @@
3510	3462	//System.out.println("PARENT = " + parent);
3511	3463	//if (parent != null)
3512	3464	// parent.applySelf();
3513		- refreshContents();
	3465	+ if (e.getSource() == normalpushField)
	3466	+ {
	3467	+ objEditor.refreshContents();
	3468	+ //Refresh();
	3469	+ }
	3470	+ else
	3471	+ refreshContents();
3514	3472	// ??? client.refreshEditWindow();
3515	3473	}
3516	3474	//else
..	..	@@ -3522,7 +3480,7 @@
3522	3480	//group.name = nameField.getText();
3523	3481	//objEditor.applySelf();
3524	3482
3525		- assert (objEditor == this);
	3483	+ // OCT2018: assert (objEditor == this);
3526	3484	if (copy.selection == null \|\| copy.selection.size() == 0)
3527	3485	//super.applySelf()
3528	3486	; else
..	..	@@ -3546,12 +3504,18 @@
3546	3504	objEditor.copy = keep;
3547	3505	}
3548	3506	}
	3507	+
	3508	+ if (normalpushField != null)
	3509	+ copy.NORMALPUSH = (float)normalpushField.getFloat()/1000;
3549	3510	}
3550	3511
3551	3512	void SnapObject()
3552	3513	{
3553		- Object3D obj = (Object3D)copy.selection.elementAt(0);
3554		- SnapObject(obj);
	3514	+ if (copy.selection.size() > 0)
	3515	+ {
	3516	+ Object3D obj = (Object3D)copy.selection.elementAt(0);
	3517	+ SnapObject(obj);
	3518	+ }
3555	3519	}
3556	3520
3557	3521	void SnapObject(Object3D obj)
..	..	@@ -3797,7 +3761,7 @@
3797	3761
3798	3762	radioPanel.revalidate();
3799	3763	radioPanel.repaint();
3800		- ctrlPanel.revalidate(); // ? new
	3764	+ ctrlPanel.validate(); // ? new
3801	3765	ctrlPanel.repaint();
3802	3766	}
3803	3767	}
..	..	@@ -4443,9 +4407,10 @@
4443	4407	//MenuItem normalLensItem;
4444	4408	MenuItem editCameraItem;
4445	4409	MenuItem revertCameraItem;
4446		- CheckboxMenuItem toggleLiveItem;
4447	4410	MenuItem stepItem;
4448		- CheckboxMenuItem toggleFullItem;
	4411	+ CheckboxMenuItem toggleLiveItem;
	4412	+ CheckboxMenuItem toggleFullScreenItem;
	4413	+ CheckboxMenuItem toggleTimelineItem;
4449	4414	CheckboxMenuItem toggleRenderItem;
4450	4415	CheckboxMenuItem toggleDebugItem;
4451	4416	CheckboxMenuItem toggleFrustumItem;
..	..	@@ -4463,20 +4428,23 @@
4463	4428	JPanel treePanel;
4464	4429	JPanel radioPanel;
4465	4430	ButtonGroup buttonGroup;
4466		- JPanel ctrlPanel;
4467		- JPanel materialPanel;
	4431	+ cGridBag ctrlPanel;
	4432	+ cGridBag materialPanel;
4468	4433	JScrollPane infoPanel;
4469		- JPanel optionsPanel;
	4434	+ cGridBag optionsPanel;
4470	4435	JTabbedPane objectPanel;
4471		- JPanel XYZPanel;
	4436	+ cGridBag XYZPanel;
4472	4437	JSplitPane gridPanel;
4473	4438	JSplitPane bigPanel;
4474		- JPanel bigThree;
4475		- JTabbedPane scenePanel;
4476		- JPanel cameraPanel;
	4439	+ cGridBag bigThree;
	4440	+ cGridBag scenePanel;
	4441	+ cGridBag centralPanel;
	4442	+ JSplitPane cameraPanel;
	4443	+ JPanel timelinePanel;
	4444	+ JMenuBar timelineMenubar;
4477	4445	JSplitPane framePanel;
4478	4446	JTextArea/Field/ nameField;
4479		- cButton textureButton;
	4447	+ //cButton textureButton;
4480	4448	cButton okButton;
4481	4449	cButton applyButton;
4482	4450	cButton cancelButton;
..	..	@@ -4523,65 +4491,67 @@
4523	4491	// MATERIAL
4524	4492	JLabel materialLabel;
4525	4493	JLabel colorLabel;
4526		- NumberSlider colorField;
	4494	+ cNumberSlider colorField;
4527	4495	JLabel modulationLabel;
4528		- NumberSlider modulationField;
	4496	+ cNumberSlider modulationField;
4529	4497	JLabel metalnessLabel;
4530		- NumberSlider metalnessField;
	4498	+ cNumberSlider metalnessField;
4531	4499	JLabel diffuseLabel;
4532		- NumberSlider diffuseField;
	4500	+ cNumberSlider diffuseField;
4533	4501	JLabel specularLabel;
4534		- NumberSlider specularField;
	4502	+ cNumberSlider specularField;
4535	4503	JLabel shininessLabel;
4536		- NumberSlider shininessField;
	4504	+ cNumberSlider shininessField;
4537	4505	JLabel shiftLabel;
4538		- NumberSlider shiftField;
	4506	+ cNumberSlider shiftField;
4539	4507	JLabel ambientLabel;
4540		- NumberSlider ambientField;
	4508	+ cNumberSlider ambientField;
4541	4509	JLabel lightareaLabel;
4542		- NumberSlider lightareaField;
	4510	+ cNumberSlider lightareaField;
4543	4511	JLabel diffusenessLabel;
4544		- NumberSlider diffusenessField;
	4512	+ cNumberSlider diffusenessField;
4545	4513	JLabel velvetLabel;
4546		- NumberSlider velvetField;
	4514	+ cNumberSlider velvetField;
4547	4515	JLabel sheenLabel;
4548		- NumberSlider sheenField;
	4516	+ cNumberSlider sheenField;
4549	4517	JLabel subsurfaceLabel;
4550		- NumberSlider subsurfaceField;
	4518	+ cNumberSlider subsurfaceField;
4551	4519	//JLabel bumpLabel;
4552	4520	//NumberSlider bumpField;
4553	4521	JLabel backlitLabel;
4554		- NumberSlider backlitField;
	4522	+ cNumberSlider backlitField;
4555	4523	JLabel anisoLabel;
4556		- NumberSlider anisoField;
	4524	+ cNumberSlider anisoField;
4557	4525	JLabel anisoVLabel;
4558		- NumberSlider anisoVField;
	4526	+ cNumberSlider anisoVField;
4559	4527	JLabel cameraLabel;
4560		- NumberSlider cameraField;
	4528	+ cNumberSlider cameraField;
4561	4529	JLabel selfshadowLabel;
4562		- NumberSlider selfshadowField;
	4530	+ cNumberSlider selfshadowField;
4563	4531	JLabel shadowLabel;
4564		- NumberSlider shadowField;
	4532	+ cNumberSlider shadowField;
4565	4533	JLabel textureLabel;
4566		- NumberSlider textureField;
	4534	+ cNumberSlider textureField;
4567	4535	JLabel opacityLabel;
4568		- NumberSlider opacityField;
	4536	+ cNumberSlider opacityField;
4569	4537	JLabel fakedepthLabel;
4570		- NumberSlider fakedepthField;
	4538	+ cNumberSlider fakedepthField;
4571	4539	JLabel shadowbiasLabel;
4572		- NumberSlider shadowbiasField;
	4540	+ cNumberSlider shadowbiasField;
4573	4541	JLabel bumpLabel;
4574		- NumberSlider bumpField;
	4542	+ cNumberSlider bumpField;
4575	4543	JLabel noiseLabel;
4576		- NumberSlider noiseField;
	4544	+ cNumberSlider noiseField;
4577	4545	JLabel powerLabel;
4578		- NumberSlider powerField;
	4546	+ cNumberSlider powerField;
4579	4547	JLabel borderfadeLabel;
4580		- NumberSlider borderfadeField;
	4548	+ cNumberSlider borderfadeField;
4581	4549	JLabel fogLabel;
4582		- NumberSlider fogField;
	4550	+ cNumberSlider fogField;
4583	4551	JLabel opacityPowerLabel;
4584		- NumberSlider opacityPowerField;
	4552	+ cNumberSlider opacityPowerField;
4585	4553	JTree jTree;
4586	4554	//ObjectUI parent;
	4555	+
	4556	+ cNumberSlider normalpushField;
4587	4557	}