~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -150,16 +150,19 @@
150	150
151	151	void SetupMenu2(GroupEditor oe)
152	152	{
	153	+ oe.jTree = new cTree();
	154	+
153	155	Menu menu;
154	156	oe.menuBar.add(menu = new Menu("Edit"));
155	157	//editItem = menu.add(new MenuItem("Edit"));
156	158	//editItem.addActionListener(this);
157		- undoItem = menu.add(new MenuItem("Undo"));
158		- undoItem.addActionListener(this);
159		- redoItem = menu.add(new MenuItem("Redo"));
160		- redoItem.addActionListener(this);
161		- menu.add("-");
162		- duplicateItem = menu.add(new MenuItem("Duplicate"));
	159	+
	160	+// undoItem = menu.add(new MenuItem("Undo"));
	161	+// undoItem.addActionListener(this);
	162	+// redoItem = menu.add(new MenuItem("Redo"));
	163	+// redoItem.addActionListener(this);
	164	+// menu.add("-");
	165	+ duplicateItem = oe.jTree.popup.add(new JMenuItem("Duplicate"));
163	166	duplicateItem.addActionListener(this);
164	167	cloneItem = menu.add(new MenuItem("Clone"));
165	168	cloneItem.addActionListener(this);
..	..	@@ -175,7 +178,6 @@
175	178	copyItem.addActionListener(this);
176	179	pasteItem = menu.add(new MenuItem("Paste"));
177	180	pasteItem.addActionListener(this);
178		- menu.add("-");
179	181
180	182	menu.add("-");
181	183	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -202,23 +204,23 @@
202	204	//zBufferItem.addActionListener(this);
203	205	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
204	206	//normalLensItem.addActionListener(this);
205		- cameraMenu.add(revertCameraItem = new MenuItem("Restore Camera"));
206		- revertCameraItem.addActionListener(this);
	207	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	208	+ restoreCameraItem.addActionListener(this);
207	209
208		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
209		- toggleFullScreenItem.addItemListener(this);
210		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
211		- cameraMenu.add("-");
	210	+// cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
	211	+// toggleFullScreenItem.addItemListener(this);
	212	+// toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
	213	+// cameraMenu.add("-");
	214	+//
	215	+// cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
	216	+// toggleTextureItem.addItemListener(this);
	217	+// toggleTextureItem.setState(CameraPane.textureon);
	218	+//
	219	+// cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
	220	+// toggleSwitchItem.addItemListener(this);
	221	+// toggleSwitchItem.setState(CameraPane.SWITCH);
212	222
213		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
214		- toggleTextureItem.addItemListener(this);
215		- toggleTextureItem.setState(CameraPane.textureon);
216		-
217		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
218		- toggleSwitchItem.addItemListener(this);
219		- toggleSwitchItem.setState(CameraPane.SWITCH);
220		-
221		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	223	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
222	224	toggleHandleItem.addItemListener(this);
223	225	toggleHandleItem.setState(CameraPane.HANDLES);
224	226
..	..	@@ -245,7 +247,7 @@
245	247
246	248	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
247	249	toggleDebugItem.addItemListener(this);
248		- toggleDebugItem.setState(CameraPane.DEBUG);
	250	+ toggleDebugItem.setState(Globals.DEBUG);
249	251
250	252	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
251	253	toggleFrustumItem.addItemListener(this);
..	..	@@ -266,14 +268,14 @@
266	268	// animationItem.addItemListener(this);
267	269	// animationItem.setState(CameraPane.ANIMATION);
268	270	cameraMenu.add("-");
269		- cameraMenu.add(editCameraItem = new MenuItem("Save Camera"));
	271	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
270	272	editCameraItem.addActionListener(this);
271	273
272	274	if (Globals.ADVANCED)
273	275	{
274	276	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
275	277	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
276		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	278	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
277	279	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
278	280	oe.cameraMenu.add("-");
279	281	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -281,7 +283,7 @@
281	283	editLeafItem.addActionListener(this);
282	284	lookAtItem.addActionListener(this);
283	285	//lookFromItem.addActinoListener(this);
284		- //switchItem.addActionListener(this);
	286	+ //switchViewItem.addActionListener(this);
285	287	}
286	288
287	289	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -326,21 +328,29 @@
326	328	}
327	329
328	330	oe.menuBar.add(menu = new Menu("Group"));
329		- grabItem = menu.add(new MenuItem("Grab"));
330		- grabItem.addActionListener(this);
	331	+// grabItem = menu.add(new MenuItem("Grab"));
	332	+// grabItem.addActionListener(this);
331	333	backItem = menu.add(new MenuItem("Back"));
332	334	backItem.addActionListener(this);
333	335	frontItem = menu.add(new MenuItem("Front"));
334	336	frontItem.addActionListener(this);
335		- compositeItem = menu.add(new MenuItem("Composite"));
336		- compositeItem.addActionListener(this);
	337	+// compositeItem = menu.add(new MenuItem("Composite"));
	338	+// compositeItem.addActionListener(this);
	339	+
	340	+ if (Globals.ADVANCED)
	341	+ {
337	342	hideItem = menu.add(new MenuItem("Hidden Group"));
338	343	hideItem.addActionListener(this);
	344	+ }
339	345	ungroupItem = menu.add(new MenuItem("Ungroup"));
340	346	ungroupItem.addActionListener(this);
341		- menu.add("-");
342		- randomItem = menu.add(new MenuItem("Switch node"));
343		- randomItem.addActionListener(this);
	347	+
	348	+// menu.add("-");
	349	+//
	350	+// switchItem = menu.add(new MenuItem("Switch node"));
	351	+// switchItem.addActionListener(this);
	352	+ if (Globals.ADVANCED)
	353	+ {
344	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
345	355	switchGeoItem.addActionListener(this);
346	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -348,8 +358,6 @@
348	358	morphItem = menu.add(new MenuItem("Morph Group"));
349	359	morphItem.addActionListener(this);
350	360
351		- if (Globals.ADVANCED)
352		- {
353	361	menu.add("-");
354	362	physicsItem = menu.add(new MenuItem("Physics"));
355	363	physicsItem.addActionListener(this);
..	..	@@ -357,23 +365,22 @@
357	365	frameselectorItem.addActionListener(this);
358	366	scriptNodeItem = menu.add(new MenuItem("Script Node"));
359	367	scriptNodeItem.addActionListener(this);
360		- cameraItem = menu.add(new MenuItem("Camera"));
361		- cameraItem.addActionListener(this);
362	368	}
363	369
364	370	oe.menuBar.add(menu = new Menu("Object"));
365		- textureItem = menu.add(new MenuItem("Texture"));
366		- textureItem.addActionListener(this);
	371	+// textureItem = menu.add(new MenuItem("Texture"));
	372	+// textureItem.addActionListener(this);
367	373	billboardItem = menu.add(new MenuItem("Billboard"));
368	374	billboardItem.addActionListener(this);
369	375	csgItem = menu.add(new MenuItem("CSG"));
370	376	csgItem.addActionListener(this);
371		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	377	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
372	378	shadowXItem.addActionListener(this);
373		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	379	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
374	380	shadowYItem.addActionListener(this);
375		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	381	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
376	382	shadowZItem.addActionListener(this);
	383	+
377	384	if (Globals.ADVANCED)
378	385	{
379	386	menu.add("-");
..	..	@@ -469,6 +476,14 @@
469	476	markleavesItem.addActionListener(this);
470	477	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
471	478	unmarkleavesItem.addActionListener(this);
	479	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	480	+ rewindleavesItem.addActionListener(this);
	481	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	482	+ unrewindleavesItem.addActionListener(this);
	483	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	484	+ randomleavesItem.addActionListener(this);
	485	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	486	+ unrandomleavesItem.addActionListener(this);
472	487	menu.add("-");
473	488	flipVItem = menu.add(new MenuItem("Flip V"));
474	489	flipVItem.addActionListener(this);
..	..	@@ -526,6 +541,18 @@
526	541
527	542	void SetupUI2(ObjEditor oe)
528	543	{
	544	+ // June 2019
	545	+ if (oe == null)
	546	+ {
	547	+ //super.SetupUI2(this);
	548	+ //return;
	549	+ }
	550	+
	551	+ if (copy != group)
	552	+ {
	553	+ //super.SetupUI2(this);
	554	+ }
	555	+
529	556	//new Exception().printStackTrace();
530	557
531	558	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -554,27 +581,66 @@
554	581	oe.radioPanel.add(dummyButton);
555	582	oe.buttonGroup.add(dummyButton);
556	583	*/
	584	+ cGridBag copyOptionsPanel = new cGridBag();
	585	+
	586	+ copyOptionsPanel.preferredHeight = 1;
	587	+
557	588	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
558	589
559		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	590	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	591	+ //minButton.setToolTipText("Minimize window");
	592	+ //minButton.addActionListener(this);
	593	+
	594	+ if (Globals.ADVANCED)
	595	+ {
	596	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	597	+ maxButton.setToolTipText("Maximize window");
	598	+ maxButton.addActionListener(this);
	599	+ }
	600	+
	601	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	602	+ fullButton.setToolTipText("Full-screen window");
	603	+ fullButton.addActionListener(this);
	604	+
	605	+ oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	606	+ screenfitButton.setToolTipText("Screen fit");
	607	+ screenfitButton.addActionListener(this);
	608	+
	609	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	610	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	611	+ restoreCameraButton.addActionListener(this);
	612	+
	613	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	614	+ undoButton.setToolTipText("Undo changes");
	615	+ undoButton.addActionListener(this);
	616	+ undoButton.setEnabled(false);
	617	+
	618	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	619	+ redoButton.setToolTipText("Redo changes");
	620	+ redoButton.addActionListener(this);
	621	+ redoButton.setEnabled(false);
	622	+
	623	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	624	+ saveButton.setToolTipText("Save changes");
	625	+ saveButton.addActionListener(this);
	626	+
	627	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
560	628	liveCB.setToolTipText("Enable animation");
561	629	liveCB.addItemListener(this);
562	630
563		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	631	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
564	632	oneStepButton.setToolTipText("Animate one step forward");
565	633	oneStepButton.addActionListener(this);
566	634
567		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	635	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
568	636	fastCB.setToolTipText("Fast mode");
569	637	fastCB.addItemListener(this);
570	638
571		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
572		- trackCB.setToolTipText("Enable tracking");
573		- trackCB.addItemListener(this);
574		-
575		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
576		- screenfitButton.setToolTipText("Screen fit");
577		- screenfitButton.addActionListener(this);
	639	+ //oe.toolboxPanel.Return();
	640	+
	641	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	642	+// trackCB.setToolTipText("Enable tracking");
	643	+// trackCB.addItemListener(this);
578	644
579	645	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
580	646	// screenfitpointButton.addActionListener(this);
..	..	@@ -586,65 +652,145 @@
586	652	snapobjectButton.setToolTipText("Snap Object");
587	653	}
588	654
589		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
590		- flashSelectionButton.setToolTipText("Show selection");
591		- flashSelectionButton.addActionListener(this);
	655	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
592	656
593		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
594		-
595		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	657	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596	658	twoButton.setToolTipText("Show center view only");
597	659	twoButton.addActionListener(this);
598		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	660	+ this.fullscreenLayout = twoButton;
	661	+
	662	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
599	663	fourButton.addActionListener(this);
600	664	fourButton.setToolTipText("Show left panel only");
601		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	665	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602	666	sixButton.setToolTipText("2-column layout left");
603	667	sixButton.addActionListener(this);
604		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	668	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
605	669	threeButton.setToolTipText("2-column layout right");
606	670	threeButton.addActionListener(this);
607		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	671	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608	672	sevenButton.setToolTipText("3-column layout");
609	673	sevenButton.addActionListener(this);
610	674	//
611	675
612		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	676	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
613	677	rootButton.setToolTipText("Edit selection in new tab");
614	678	rootButton.addActionListener(this);
615	679
616		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	680	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
617	681	closeButton.setToolTipText("Close tab");
618	682	closeButton.addActionListener(this);
619	683	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
620	684	//clearButton.addActionListener(this);
621		-
622		- cGridBag commandsPanel = new cGridBag();
	685	+
	686	+ // INSERT
	687	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	688	+ gridButton.setToolTipText("Create grid");
	689	+ gridButton.addActionListener(this);
	690	+
	691	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	692	+ boxButton.setToolTipText("Create box");
	693	+ boxButton.addActionListener(this);
	694	+
	695	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	696	+ sphereButton.setToolTipText("Create sphere");
	697	+ sphereButton.addActionListener(this);
	698	+
	699	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	700	+ coneButton.setToolTipText("Create cone");
	701	+ coneButton.addActionListener(this);
	702	+
	703	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	704	+ torusButton.setToolTipText("Create torus");
	705	+ torusButton.addActionListener(this);
	706	+
	707	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	708	+ superButton.setToolTipText("Create superellipsoid");
	709	+ superButton.addActionListener(this);
	710	+
	711	+ if (Globals.ADVANCED)
	712	+ {
	713	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	714	+ kleinButton.setToolTipText("Create Klein bottle");
	715	+ kleinButton.addActionListener(this);
	716	+ }
623	717
624		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
625		- editButton.setToolTipText("Edit selection");
	718	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	719	+ particlesButton.setToolTipText("Create particle system");
	720	+ particlesButton.addActionListener(this);
	721	+
	722	+ oe.toolboxPanel.Return();
	723	+
	724	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	725	+ groupButton.setToolTipText("Create group");
	726	+ groupButton.addActionListener(this);
	727	+
	728	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	729	+ compositeButton.setToolTipText("Create composite");
	730	+ compositeButton.addActionListener(this);
	731	+
	732	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	733	+ switchButton.setToolTipText("Create item switcher");
	734	+ switchButton.addActionListener(this);
	735	+
	736	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	737	+ loopButton.setToolTipText("Create loop");
	738	+ loopButton.addActionListener(this);
	739	+
	740	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	741	+ textureButton.setToolTipText("Create texture");
	742	+ textureButton.addActionListener(this);
	743	+
	744	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	745	+ overlayButton.setToolTipText("Create overlay");
	746	+ overlayButton.addActionListener(this);
	747	+
	748	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	749	+ lightButton.setToolTipText("Create light");
	750	+ lightButton.addActionListener(this);
	751	+
	752	+ for (int i=6; --i>=0;)
	753	+ {
	754	+ oe.toolboxPanel.Return();
	755	+ oe.toolboxPanel.add(new cGridBag());
	756	+ oe.toolboxPanel.add(new cGridBag());
	757	+ oe.toolboxPanel.add(new cGridBag());
	758	+ oe.toolboxPanel.add(new cGridBag());
	759	+ oe.toolboxPanel.add(new cGridBag());
	760	+ oe.toolboxPanel.add(new cGridBag());
	761	+ oe.toolboxPanel.add(new cGridBag());
	762	+ }
	763	+
	764	+ // EDIT panel
	765	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	766	+ editButton.setToolTipText("Pin selection controls");
626	767	editButton.addActionListener(this);
627	768
628		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629		- uneditButton.setToolTipText("Unedit selection");
	769	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	770	+ uneditButton.setToolTipText("Remove selection controls");
630	771	uneditButton.addActionListener(this);
631	772
632		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
633		- allParamsButton.setToolTipText("Edit all params");
	773	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	774	+ allParamsButton.setToolTipText("Show all controle");
634	775	allParamsButton.addActionListener(this);
635	776
636		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	777	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
637	778	clearPanelButton.setToolTipText("Clear edit panel");
638	779	clearPanelButton.addActionListener(this);
639	780
640		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	781	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
641	782	unselectButton.setToolTipText("Unselect");
642	783	unselectButton.addActionListener(this);
643	784
644		- commandsPanel.preferredHeight = 1;
	785	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	786	+ flashSelectionButton.setToolTipText("Highlight selection");
	787	+ flashSelectionButton.addActionListener(this);
645	788
646		- oe.treePanel.add(commandsPanel);
647		- oe.treePanel.Return();
	789	+ editCommandsPanel.preferredHeight = 1;
	790	+
	791	+ SetPinStates(false);
	792	+// oe.treePanel.add(commandsPanel);
	793	+// oe.treePanel.Return();
648	794
649	795	// oe.aConstraints.gridx += 1;
650	796	// oe.aConstraints.weighty = 0;
..	..	@@ -661,27 +807,12 @@
661	807
662	808	JScrollPane jSP;
663	809	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
664		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	810	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
665	811	ResetModel();
666	812
667	813	oe.treePanel.add(jSPPanel);
668	814	oe.treePanel.Return();
669	815
670		- cGridBag copyOptionsPanel = new cGridBag();
671		-
672		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
673		- colorCB.setToolTipText("Copy color when dropped");
674		- colorCB.addItemListener(this);
675		-
676		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
677		- materialCB.setToolTipText("Copy material when dropped");
678		- materialCB.addItemListener(this);
679		-
680		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
681		- textureCB.setToolTipText("Copy texture when dropped");
682		- textureCB.addItemListener(this);
683		-
684		- copyOptionsPanel.preferredHeight = 1;
685	816	oe.treePanel.add(copyOptionsPanel);
686	817	oe.treePanel.Return();
687	818
..	..	@@ -712,23 +843,43 @@
712	843
713	844	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
714	845	{
	846	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	847	+ colorCB.setToolTipText("Copy color when dropped");
	848	+ colorCB.addItemListener(this);
	849	+
	850	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	851	+ materialCB.setToolTipText("Copy material when dropped");
	852	+ materialCB.addItemListener(this);
	853	+
	854	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	855	+ textureCB.setToolTipText("Copy texture when dropped");
	856	+ textureCB.addItemListener(this);
	857	+
	858	+ panel.Return();
	859	+
715	860	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
716	861	boxCB.setToolTipText("Display bounding boxes");
717	862	boxCB.addItemListener(this);
718	863
719	864	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
720		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	865	+ zoomBoxCB.setToolTipText("Display only for wheel");
721	866	zoomBoxCB.addItemListener(this);
722	867
723	868	if (true) // Globals.ADVANCED)
724	869	{
725		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
726		- supportCB.setToolTipText("Enable rigging");
727		- supportCB.addItemListener(this);
	870	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	871	+// supportCB.setToolTipText("Enable rigging");
	872	+// supportCB.addItemListener(this);
	873	+
	874	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	875	+ freezeCB.setToolTipText("Fast moving camera");
	876	+ freezeCB.addItemListener(this);
728	877
729	878	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
730	879	// localCB.addItemListener(this);
731	880
	881	+ panel.Return();
	882	+
732	883	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
733	884	crowdCB.setToolTipText("Used for crowds");
734	885	crowdCB.addItemListener(this);
..	..	@@ -745,6 +896,8 @@
745	896	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
746	897	// speakerMocapCB.addItemListener(this);
747	898
	899	+ panel.Return();
	900	+
748	901	if (false)
749	902	{
750	903	// handled in scripts
..	..	@@ -759,32 +912,72 @@
759	912	//constraints.gridy += 1;
760	913	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
761	914	smoothfocusCB.addItemListener(this);
	915	+ panel.Return();
762	916	}
763	917
764	918	//constraints.gridx += 1;
765	919	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
766	920	// debugCB.addItemListener(this);
767	921
	922	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	923	+ trackCB.setToolTipText("Enable tracking target");
	924	+ trackCB.addItemListener(this);
	925	+
768	926	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	927	+ oeilCB.setToolTipText("Move camera when tracking");
769	928	oeilCB.addItemListener(this);
770	929
	930	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	931	+ shadowCB.setToolTipText("When live compute shadows");
	932	+ shadowCB.addItemListener(this);
	933	+
	934	+ panel.Return();
	935	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	936	+ toggleTextureCB.setToolTipText("Load textures");
	937	+ toggleTextureCB.addItemListener(this);
	938	+
	939	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	940	+ toggleSwitchCB.setToolTipText("Choose a single item");
	941	+ toggleSwitchCB.addItemListener(this);
	942	+
	943	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	944	+ autosaveCB.setToolTipText("On structure change");
	945	+ autosaveCB.addItemListener(this);
	946	+
	947	+ panel.Return();
	948	+ if (Globals.ADVANCED)
	949	+ {
771	950	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
772	951	lookAtCB.setToolTipText("Look-at target");
773	952	lookAtCB.addItemListener(this);
	953	+ }
774	954
775	955	}
776	956
777	957	cGridBag fill = new cGridBag();
778		-
779	958	fill.preferredHeight = 200;
	959	+ cGridBag fill2 = new cGridBag();
	960	+ fill2.preferredHeight = 200;
	961	+ cGridBag fill3 = new cGridBag();
	962	+ fill3.preferredHeight = 200;
780	963
781	964	panel.add(fill);
	965	+ panel.add(fill2);
	966	+ panel.add(fill3);
782	967
783	968	}
784	969
785	970	void EditObject(Object3D obj)
786	971	{
787	972	cRadio radioButton = new cRadio(obj.name);
	973	+
	974	+ // Patch to avoid bug with transparency.
	975	+ radioButton.hadMaterial = obj.material != null;
	976	+ if (!radioButton.hadMaterial)
	977	+ {
	978	+ obj.material = new cMaterial();
	979	+ }
	980	+
788	981	radioButton.SetObject(obj);
789	982	radioButton.layout = sevenButton;
790	983	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -796,6 +989,8 @@
796	989
797	990	void SetupViews(ObjEditor oe)
798	991	{
	992	+ theFrame = this;
	993	+
799	994	oe.SetupViews();
800	995
801	996	System.out.println("SetupViews");
..	..	@@ -804,23 +999,28 @@
804	999	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
805	1000	}
806	1001
807		- JCheckBox liveCB;
808		- JCheckBox supportCB;
809		- JCheckBox localCB;
810		- JCheckBox crowdCB;
811		- JCheckBox smoothCB;
812		- JCheckBox fastCB;
813		- JCheckBox slowCB;
814		- JCheckBox boxCB;
815		- JCheckBox zoomBoxCB;
816		- JCheckBox trackCB;
817		- JCheckBox smoothfocusCB;
	1002	+ cToggleButton liveCB;
	1003	+ cCheckBox supportCB;
	1004	+ cCheckBox localCB;
	1005	+ cCheckBox crowdCB;
	1006	+ cCheckBox smoothCB;
	1007	+ cToggleButton fastCB;
	1008	+ cCheckBox slowCB;
	1009	+ cCheckBox boxCB;
	1010	+ cCheckBox zoomBoxCB;
	1011	+ cCheckBox freezeCB;
	1012	+ //cToggleButton trackCB;
	1013	+ cCheckBox trackCB;
	1014	+ cCheckBox smoothfocusCB;
818	1015	// JCheckBox speakerMocapCB;
819		- JCheckBox speakerCameraCB;
820		- JCheckBox speakerFocusCB;
821		- JCheckBox debugCB;
822		- JCheckBox oeilCB;
823		- JCheckBox lookAtCB;
	1016	+ cCheckBox speakerCameraCB;
	1017	+ cCheckBox speakerFocusCB;
	1018	+ cCheckBox debugCB;
	1019	+
	1020	+ cCheckBox oeilCB;
	1021	+ cCheckBox shadowCB;
	1022	+ cCheckBox autosaveCB;
	1023	+ cCheckBox lookAtCB;
824	1024
825	1025	// static int COLOR = 1;
826	1026	// static int MATERIAL = 2;
..	..	@@ -828,9 +1028,9 @@
828	1028
829	1029	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
830	1030
831		- JCheckBox colorCB;
832		- JCheckBox materialCB;
833		- JCheckBox textureCB;
	1031	+ cCheckBox colorCB;
	1032	+ cCheckBox materialCB;
	1033	+ cCheckBox textureCB;
834	1034
835	1035	public void itemStateChanged(ItemEvent e)
836	1036	{
..	..	@@ -858,6 +1058,7 @@
858	1058	} else if(e.getSource() == liveCB)
859	1059	{
860	1060	cameraView.ToggleLive();
	1061	+ refreshContents(false);
861	1062	}
862	1063	else if(e.getSource() == supportCB)
863	1064	{
..	..	@@ -922,6 +1123,18 @@
922	1123	{
923	1124	cameraView.ToggleOeil();
924	1125	}
	1126	+ else if(e.getSource() == shadowCB)
	1127	+ {
	1128	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1129	+ }
	1130	+ else if(e.getSource() == freezeCB)
	1131	+ {
	1132	+ Globals.FREEZEONMOVE ^= true;
	1133	+ }
	1134	+ else if(e.getSource() == autosaveCB)
	1135	+ {
	1136	+ Globals.SAVEONMAKE ^= true;
	1137	+ }
925	1138	else if(e.getSource() == lookAtCB)
926	1139	{
927	1140	cameraView.ToggleLookAt();
..	..	@@ -938,7 +1151,8 @@
938	1151
939	1152	/**/
940	1153	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
941		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1154	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1155	+ TreePath path = objEditor.jTree.getSelectionPath();
942	1156	if ((path == null) \|\| (path.getPathCount() <= 1)) {
943	1157	// We can't move the root node or an empty selection
944	1158	return;
..	..	@@ -1001,8 +1215,6 @@
1001	1215	}
1002	1216	}
1003	1217
1004		- String string = (String) object;
1005		-
1006	1218	System.out.println("Transfer = " + object + "; drop : " + target);
1007	1219	// if( object instanceof java.io.File[])
1008	1220	// {
..	..	@@ -1010,6 +1222,8 @@
1010	1222	// objEditor.DropFile((java.io.File[]) object, true);
1011	1223	// return;
1012	1224	// }
	1225	+
	1226	+ String string = (String) object;
1013	1227
1014	1228	// File path for Mac and Windows
1015	1229	if (string.charAt(0) == '/' \|\| string.charAt(1) == ':')
..	..	@@ -1055,23 +1269,33 @@
1055	1269
1056	1270	assert target == objEditor.jTree;
1057	1271	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1272	+ Object3D destinationLeaf;
1058	1273	try {
1059		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1274	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1060	1275	} catch (Exception e) {
1061	1276	System.out.println("destinationPath : " + destinationPath);
1062	1277	return;
1063	1278	}
1064	1279
1065		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1280	+ for (int i=group.selection.size(); --i>=0;)
1066	1281	{
	1282	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1283	+
	1284	+ // Cannot move into itself
	1285	+ if (child == destinationLeaf)
	1286	+ return;
	1287	+ }
	1288	+
	1289	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1290	+// {
1067	1291	loadClipboard(true);
1068	1292	objEditor.jTree.setSelectionPath(destinationPath);
1069	1293	pasteInto(false, false);
1070		- } else {
1071		- loadClipboard(false);
1072		- objEditor.jTree.setSelectionPath(destinationPath);
1073		- pasteInto(false, false); // true); // ???
1074		- }
	1294	+// } else {
	1295	+// loadClipboard(false);
	1296	+// objEditor.jTree.setSelectionPath(destinationPath);
	1297	+// pasteInto(false, false); // true); // ???
	1298	+// }
1075	1299	}
1076	1300	public void dropActionChanged(DropTargetDragEvent dtde)
1077	1301	// Called if the user has modified the current drop gesture
..	..	@@ -1176,22 +1400,30 @@
1176	1400	{
1177	1401	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1178	1402	//heightFieldItem.addActionListener(this);
1179		- gridItem = menu.add(new MenuItem("Grid"));
1180		- gridItem.addActionListener(this);
1181		- rectoidItem = menu.add(new MenuItem("Box"));
1182		- rectoidItem.addActionListener(this);
1183		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1184		- ellipsoidItem.addActionListener(this);
1185		- coneItem = menu.add(new MenuItem("Cone"));
1186		- coneItem.addActionListener(this);
1187		- torusItem = menu.add(new MenuItem("Torus"));
1188		- torusItem.addActionListener(this);
1189		- superItem = menu.add(new MenuItem("Superellipsoid"));
1190		- superItem.addActionListener(this);
	1403	+// gridItem = menu.add(new MenuItem("Grid"));
	1404	+// gridItem.addActionListener(this);
	1405	+// rectoidItem = menu.add(new MenuItem("Box"));
	1406	+// rectoidItem.addActionListener(this);
	1407	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1408	+// ellipsoidItem.addActionListener(this);
	1409	+// coneItem = menu.add(new MenuItem("Cone"));
	1410	+// coneItem.addActionListener(this);
	1411	+// torusItem = menu.add(new MenuItem("Torus"));
	1412	+// torusItem.addActionListener(this);
	1413	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1414	+// superItem.addActionListener(this);
	1415	+
	1416	+ cameraItem = menu.add(new MenuItem("Camera"));
	1417	+ cameraItem.addActionListener(this);
	1418	+
	1419	+ if (!Globals.ADVANCED)
	1420	+ {
1191	1421	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1192	1422	kleinItem.addActionListener(this);
1193		- particleItem = menu.add(new MenuItem("Particle system"));
1194		- particleItem.addActionListener(this);
	1423	+ }
	1424	+
	1425	+// particleItem = menu.add(new MenuItem("Particle system"));
	1426	+// particleItem.addActionListener(this);
1195	1427	if (Globals.ADVANCED)
1196	1428	{
1197	1429	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1217,15 +1449,15 @@
1217	1449	}
1218	1450	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1219	1451	bezierItem.addActionListener(this);
1220		- overlayItem = menu.add(new MenuItem("Overlay"));
1221		- overlayItem.addActionListener(this);
1222		- lightItem = menu.add(new MenuItem("Light"));
1223		- lightItem.addActionListener(this);
	1452	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1453	+// overlayItem.addActionListener(this);
	1454	+// lightItem = menu.add(new MenuItem("Light"));
	1455	+// lightItem.addActionListener(this);
1224	1456	menu.add("-");
1225	1457	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1226	1458	//superLoopItem.addActionListener(this);
1227		- loopItem = menu.add(new MenuItem("Loop"));
1228		- loopItem.addActionListener(this);
	1459	+// loopItem = menu.add(new MenuItem("Loop"));
	1460	+// loopItem.addActionListener(this);
1229	1461	doubleItem = menu.add(new MenuItem("Fork"));
1230	1462	doubleItem.addActionListener(this);
1231	1463	if (Globals.ADVANCED)
..	..	@@ -1240,6 +1472,9 @@
1240	1472	menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1241	1473	animationItem.addItemListener(this);
1242	1474	animationItem.setState(Globals.ANIMATION);
	1475	+
	1476	+ menu.add(archiveItem = new MenuItem("Archive3D..."));
	1477	+ archiveItem.addActionListener(this);
1243	1478
1244	1479	menu.add("-");
1245	1480	parseverticesItem = menu.add(new MenuItem("Multiplicity"));
..	..	@@ -1265,7 +1500,7 @@
1265	1500	memoryItem.addActionListener(this);
1266	1501	menu.add(analyzeItem = new MenuItem("Analyze"));
1267	1502	analyzeItem.addActionListener(this);
1268		- menu.add(dumpItem = new MenuItem("Dump"));
	1503	+ menu.add(dumpItem = new MenuItem("Print"));
1269	1504	dumpItem.addActionListener(this);
1270	1505	// menu.add(pathItem = new MenuItem("From-to path"));
1271	1506	// pathItem.addActionListener(this);
..	..	@@ -1406,9 +1641,24 @@
1406	1641	shadow.material = new cMaterial(obj.material);
1407	1642	shadow.material.diffuse = 0.0001f;
1408	1643	shadow.material.specular = 0.0001f;
	1644	+ //shadow.projectedVertices[1].x = 300;
1409	1645
1410	1646	makeSomething(shadow);
1411	1647	}
	1648	+
	1649	+ private void ClearUnpinned()
	1650	+ {
	1651	+ //for (Object3D obj : listUI)
	1652	+ for (int i=listUI.size(); --i>=0;)
	1653	+ {
	1654	+ Object3D obj = listUI.elementAt(i);
	1655	+ if (!obj.pinned)
	1656	+ {
	1657	+ obj.CloseUI();
	1658	+ listUI.remove(i);
	1659	+ }
	1660	+ }
	1661	+ }
1412	1662
1413	1663	/**
1414	1664	* applyExample
..	..	@@ -1653,7 +1903,7 @@
1653	1903	{
1654	1904	ScreenFit();
1655	1905	} else
1656		- if (source == switchItem)
	1906	+ if (source == switchViewItem)
1657	1907	{
1658	1908	cVector v1 = new cVector();
1659	1909	cVector v2 = new cVector();
..	..	@@ -1662,11 +1912,11 @@
1662	1912	objEditor.cameraView.renderCamera.setAim(v2, v1);
1663	1913	objEditor.cameraView.repaint();
1664	1914	} else
1665		- if (source == rectoidItem)
	1915	+ if (source == rectoidItem \|\| source == boxButton)
1666	1916	{
1667	1917	makeSomething(new Box());
1668	1918	} else
1669		- if (source == particleItem)
	1919	+ if (source == particleItem \|\| source == particlesButton)
1670	1920	{
1671	1921	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1672	1922	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1745,27 +1995,27 @@
1745	1995
1746	1996	makeSomething(obj);
1747	1997	} else
1748		- if (source == gridItem)
	1998	+ if (source == gridItem \|\| source == gridButton)
1749	1999	{
1750	2000	makeSomething(new Grid());
1751	2001	} else
1752		- if (source == ellipsoidItem)
	2002	+ if (source == ellipsoidItem \|\| source == sphereButton)
1753	2003	{
1754	2004	makeSomething(new Sphere());
1755	2005	} else
1756		- if (source == coneItem)
	2006	+ if (source == coneItem \|\| source == coneButton)
1757	2007	{
1758	2008	makeSomething(new Cone());
1759	2009	} else
1760		- if (source == torusItem)
	2010	+ if (source == torusItem \|\| source == torusButton)
1761	2011	{
1762	2012	makeSomething(new Torus());
1763	2013	} else
1764		- if (source == superItem)
	2014	+ if (source == superItem \|\| source == superButton)
1765	2015	{
1766	2016	makeSomething(new Superellipsoid());
1767	2017	} else
1768		- if (source == kleinItem)
	2018	+ if (source == kleinItem \|\| source == kleinButton)
1769	2019	{
1770	2020	makeSomething(new Klein());
1771	2021	} else
..	..	@@ -1785,7 +2035,7 @@
1785	2035	{
1786	2036	makeSomething(new BezierSurface());
1787	2037	} else
1788		- if (source == overlayItem)
	2038	+ if (source == overlayItem \|\| source == overlayButton)
1789	2039	{
1790	2040	/*
1791	2041	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1833,7 +2083,7 @@
1833	2083	s.setup();
1834	2084	makeSomething(s);
1835	2085	} else
1836		- if (source == lightItem)
	2086	+ if (source == lightItem \|\| source == lightButton)
1837	2087	{
1838	2088	makeSomething(new Light());
1839	2089	} else
..	..	@@ -1883,30 +2133,30 @@
1883	2133
1884	2134	group(g);
1885	2135	} else
1886		- if (source == loopItem)
	2136	+ if (source == loopItem \|\| source == loopButton)
1887	2137	{
1888	2138	Composite csg = new GroupLeaf();
1889	2139	csg.count = 5;
1890	2140	group(csg);
1891		- Composite child = new cGroup();
	2141	+ Composite child = new cGroup("Branch");
1892	2142	csg.addChild(child);
1893	2143	child.addChild(csg);
1894	2144	} else
1895	2145	if (source == doubleItem)
1896	2146	{
1897		- Composite csg = new GroupLeaf();
	2147	+ Composite csg = new GroupLeaf("Fork");
1898	2148	csg.count = 5;
1899	2149	group(csg);
1900		- Composite child = new cGroup();
	2150	+ Composite child = new cGroup("Branch A");
1901	2151	csg.addChild(child);
1902	2152	child.addChild(csg);
1903		- child = new cGroup();
	2153	+ child = new cGroup("Branch B");
1904	2154	csg.addChild(child);
1905	2155	child.addChild(csg);
1906	2156	} else
1907	2157	if (source == tripleItem)
1908	2158	{
1909		- Composite csg = new GroupLeaf();
	2159	+ Composite csg = new GroupLeaf("Trident");
1910	2160	csg.count = 4;
1911	2161	group(csg);
1912	2162	Composite child = new cGroup();
..	..	@@ -1956,6 +2206,32 @@
1956	2206	{
1957	2207	DumpObject();
1958	2208	} else
	2209	+ if (source == minButton)
	2210	+ {
	2211	+ Minimize();
	2212	+ } else
	2213	+ if (source == maxButton)
	2214	+ {
	2215	+ Maximize();
	2216	+ } else
	2217	+ if (source == fullButton)
	2218	+ {
	2219	+ ToggleFullScreen();
	2220	+ } else
	2221	+ if (source == undoButton)
	2222	+ {
	2223	+ if (!Undo())
	2224	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2225	+ } else
	2226	+ if (source == redoButton)
	2227	+ {
	2228	+ Redo();
	2229	+ } else
	2230	+ if (source == saveButton)
	2231	+ {
	2232	+ if (!Save(true))
	2233	+ java.awt.Toolkit.getDefaultToolkit().beep();
	2234	+ } else
1959	2235	if (source == oneStepButton)
1960	2236	{
1961	2237	Globals.ONESTEP = true;
..	..	@@ -1963,17 +2239,14 @@
1963	2239	} else
1964	2240	if (source == screenfitButton)
1965	2241	{
1966		- //Reload(lastConverter, lastFilename, true);
1967	2242	ScreenFit();
1968	2243	} else
1969	2244	if (source == screenfitpointButton)
1970	2245	{
1971		- //Reload(lastConverter, lastFilename, true);
1972	2246	ScreenFitPoint();
1973	2247	} else
1974	2248	if (source == snapobjectButton)
1975	2249	{
1976		- //Reload(lastConverter, lastFilename, true);
1977	2250	SnapObject();
1978	2251	} else
1979	2252	// if (event.getSource() == recompileButton)
..	..	@@ -2349,9 +2622,9 @@
2349	2622	{
2350	2623	ClearSelection(true);
2351	2624	} else
2352		- if (source == grabItem)
	2625	+ if (source == grabItem \|\| source == groupButton)
2353	2626	{
2354		- group(new cGroup(), true);
	2627	+ group(new cGroup(), false); // true);
2355	2628	} else
2356	2629	if (source == hideItem)
2357	2630	{
..	..	@@ -2369,11 +2642,11 @@
2369	2642	{
2370	2643	makeSomething(new Camera());
2371	2644	} else
2372		- if (source == compositeItem)
	2645	+ if (source == compositeItem \|\| source == compositeButton)
2373	2646	{
2374	2647	group(new Composite());
2375	2648	} else
2376		- if (source == randomItem)
	2649	+ if (source == switchItem \|\| source == switchButton)
2377	2650	{
2378	2651	RandomNode random = new RandomNode();
2379	2652	group(random);
..	..	@@ -2475,7 +2748,7 @@
2475	2748	{
2476	2749	group(new cLinker());
2477	2750	} else
2478		- if (source == textureItem)
	2751	+ if (source == textureItem \|\| source == textureButton)
2479	2752	{
2480	2753	group(new TextureNode());
2481	2754	} else
..	..	@@ -2495,17 +2768,30 @@
2495	2768	{
2496	2769	CastShadow(2);
2497	2770	} else
2498		- if (source == ungroupItem)
	2771	+ if (source == ungroupItem \|\| source == ungroupButton)
2499	2772	{
2500		- //ungroup();
	2773	+ boolean hasRoot = false;
	2774	+
2501	2775	for (int i=0; i<group.selection.size(); i++)
2502	2776	{
2503		- Ungroup(group.selection.get(i));
	2777	+ if (group.selection.get(i) == group)
	2778	+ {
	2779	+ hasRoot = true;
	2780	+ break;
	2781	+ }
2504	2782	}
2505	2783
2506		- ClearSelection(false);
2507		-
2508		- refreshContents();
	2784	+ if (!hasRoot)
	2785	+ {
	2786	+ for (int i=0; i<group.selection.size(); i++)
	2787	+ {
	2788	+ Ungroup(group.selection.get(i));
	2789	+ }
	2790	+
	2791	+ ClearSelection(false);
	2792	+
	2793	+ refreshContents();
	2794	+ }
2509	2795	} else
2510	2796	if (source == genUVItem)
2511	2797	{
..	..	@@ -2517,7 +2803,7 @@
2517	2803	} else
2518	2804	if (source == genNormalsMESHItem)
2519	2805	{
2520		- GenNormals(true); // TODO
	2806	+ GenNormalsMESH();
2521	2807	} else
2522	2808	if (source == genNormalsORGANItem)
2523	2809	{
..	..	@@ -2582,6 +2868,22 @@
2582	2868	if (source == unmarkleavesItem)
2583	2869	{
2584	2870	MarkLeaves(false);
	2871	+ } else
	2872	+ if (source == rewindleavesItem)
	2873	+ {
	2874	+ RewindLeaves(true);
	2875	+ } else
	2876	+ if (source == unrewindleavesItem)
	2877	+ {
	2878	+ RewindLeaves(false);
	2879	+ } else
	2880	+ if (source == randomleavesItem)
	2881	+ {
	2882	+ RandomLeaves(true);
	2883	+ } else
	2884	+ if (source == unrandomleavesItem)
	2885	+ {
	2886	+ RandomLeaves(false);
2585	2887	} else
2586	2888	if (source == flipVItem)
2587	2889	{
..	..	@@ -2817,6 +3119,10 @@
2817	3119	if (source == twoButton)
2818	3120	{
2819	3121	radio.layout = twoButton;
	3122	+
	3123	+ if (CameraPane.FULLSCREEN)
	3124	+ fullscreenLayout = radio.layout;
	3125	+
2820	3126	// bug
2821	3127	//gridPanel.setDividerLocation(1.0);
2822	3128	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2849,10 +3155,31 @@
2849	3155	bigThree.ClearUI();
2850	3156	bigThree.add(centralPanel);
2851	3157	bigThree.FlushUI();
	3158	+
	3159	+ cameraView.requestFocusInWindow();
	3160	+
	3161	+// refreshContents(true);
	3162	+//
	3163	+// try
	3164	+// {
	3165	+// java.awt.Robot bot = new java.awt.Robot();
	3166	+// int mask = InputEvent.BUTTON1_MASK;
	3167	+// bot.mouseMove(100, 100);
	3168	+// bot.mousePress(mask);
	3169	+// bot.mouseRelease(mask);
	3170	+// }
	3171	+// catch (Exception e)
	3172	+// {
	3173	+//
	3174	+// }
	3175	+
2852	3176	} else
2853	3177	if (source == threeButton)
2854	3178	{
2855	3179	radio.layout = threeButton;
	3180	+
	3181	+ if (CameraPane.FULLSCREEN)
	3182	+ fullscreenLayout = radio.layout;
2856	3183
2857	3184	// bigThree.remove(scenePanel);
2858	3185	// bigThree.remove(centralPanel);
..	..	@@ -2885,10 +3212,15 @@
2885	3212	bigThree.add(centralPanel);
2886	3213	bigThree.add(XYZPanel);
2887	3214	bigThree.FlushUI();
	3215	+
	3216	+ cameraView.requestFocusInWindow();
2888	3217	} else
2889	3218	if (source == fourButton)
2890	3219	{
2891	3220	radio.layout = fourButton;
	3221	+
	3222	+ if (CameraPane.FULLSCREEN)
	3223	+ fullscreenLayout = radio.layout;
2892	3224
2893	3225	// bigThree.remove(scenePanel);
2894	3226	// bigThree.remove(centralPanel);
..	..	@@ -2920,10 +3252,15 @@
2920	3252	bigThree.ClearUI();
2921	3253	bigThree.add(scenePanel);
2922	3254	bigThree.FlushUI();
	3255	+
	3256	+ cameraView.requestFocusInWindow();
2923	3257	} else
2924	3258	if (source == sixButton)
2925	3259	{
2926	3260	radio.layout = sixButton;
	3261	+
	3262	+ if (CameraPane.FULLSCREEN)
	3263	+ fullscreenLayout = radio.layout;
2927	3264
2928	3265	// bigThree.remove(scenePanel);
2929	3266	// bigThree.remove(centralPanel);
..	..	@@ -2956,10 +3293,15 @@
2956	3293	bigThree.add(scenePanel);
2957	3294	bigThree.add(centralPanel);
2958	3295	bigThree.FlushUI();
	3296	+
	3297	+ cameraView.requestFocusInWindow();
2959	3298	} else
2960	3299	if (source == sevenButton)
2961	3300	{
2962	3301	radio.layout = sevenButton;
	3302	+
	3303	+ if (CameraPane.FULLSCREEN)
	3304	+ fullscreenLayout = radio.layout;
2963	3305
2964	3306	// bigThree.remove(scenePanel);
2965	3307	// bigThree.remove(centralPanel);
..	..	@@ -2993,6 +3335,8 @@
2993	3335	bigThree.add(centralPanel);
2994	3336	bigThree.add(XYZPanel);
2995	3337	bigThree.FlushUI();
	3338	+
	3339	+ cameraView.requestFocusInWindow();
2996	3340	} else
2997	3341	if (source == rootButton)
2998	3342	{
..	..	@@ -3004,6 +3348,7 @@
3004	3348	EditObject(obj);
3005	3349	}
3006	3350
	3351	+ cameraView.requestFocusInWindow();
3007	3352	refreshContents(true);
3008	3353	} else
3009	3354	if (source == closeButton)
..	..	@@ -3013,22 +3358,37 @@
3013	3358	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3014	3359	{
3015	3360	ab = (cRadio)e.nextElement();
3016		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3361	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3017	3362	{
	3363	+ // Patch to avoid bug with transparency.
	3364	+ if (!ab.hadMaterial)
	3365	+ {
	3366	+ ab.object.material = null;
	3367	+ }
	3368	+
3018	3369	buttonGroup.remove(ab);
3019	3370	radioPanel.remove(ab);
3020	3371
3021		- ab.GetObject().editWindow = null;
	3372	+ //ab.GetObject().editWindow = null;
	3373	+ ab.GetObject().manipWindow = null;
3022	3374	// ab.GetObject().objectUI = null; // ?????????
3023	3375
3024	3376	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3025	3377	break;
3026	3378	}
3027	3379	}
	3380	+
	3381	+ cameraView.requestFocusInWindow();
3028	3382	refreshContents(true);
3029	3383	} else
3030	3384	if (source == editItem \|\| source == editButton)
3031	3385	{
	3386	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3387	+ {
	3388	+ Object3D child = (Object3D)e.nextElement();
	3389	+ child.pinned = true;
	3390	+ }
	3391	+
3032	3392	EditSelection(false);
3033	3393	} else
3034	3394	if (source == uneditButton)
..	..	@@ -3038,6 +3398,7 @@
3038	3398	Object3D child = (Object3D)e.nextElement();
3039	3399	if(child.editWindow != null)
3040	3400	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3401	+ child.pinned = false;
3041	3402	child.CloseUI();
3042	3403	listUI.remove(child);
3043	3404
..	..	@@ -3054,6 +3415,7 @@
3054	3415	//copy.ClearUI();
3055	3416	for (Object3D obj : listUI)
3056	3417	{
	3418	+ obj.pinned = false;
3057	3419	obj.CloseUI();
3058	3420	}
3059	3421	listUI.clear();
..	..	@@ -3063,7 +3425,7 @@
3063	3425	{
3064	3426	assert(copy == group);
3065	3427
3066		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3428	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3067	3429
3068	3430	for (Object3D obj : listUI)
3069	3431	{
..	..	@@ -3128,7 +3490,9 @@
3128	3490	sideView.object = group;
3129	3491	}
3130	3492
3131		-// fix "+" issue group.editWindow = this;
	3493	+// fix "+" issue
	3494	+ //group.editWindow = this;
	3495	+ group.manipWindow = this;
3132	3496
3133	3497	/*
3134	3498	currentLayout = radio.layout;
..	..	@@ -3136,18 +3500,25 @@
3136	3500	currentLayout = sevenButton;
3137	3501	*/
3138	3502	radio.layout.doClick();
	3503	+
	3504	+ ClearUnpinned();
	3505	+ SetPinStates(group.selection.size() > 0);
	3506	+ if (group.selection.size() == 1)
	3507	+ EditSelection(false);
3139	3508	keepparent = group.parent;
3140	3509	// PARENT = NULL or not???
3141	3510	//group.parent = null; // ROOT
3142	3511	//group.attributes = -1;
3143	3512	ResetModel();
	3513	+
	3514	+ cameraView.requestFocusInWindow();
3144	3515	refreshContents(true);
3145	3516	} else if (event.getSource() == editCameraItem)
3146	3517	{
3147	3518	cameraView.ProtectCamera();
3148	3519	cameraView.repaint();
3149	3520	return;
3150		- } else if (event.getSource() == revertCameraItem)
	3521	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3151	3522	{
3152	3523	cameraView.RevertCamera();
3153	3524	cameraView.repaint();
..	..	@@ -3164,7 +3535,6 @@
3164	3535	}
3165	3536
3166	3537	boolean useclient = false;
3167		- cRadio radio;
3168	3538
3169	3539	void ToggleRoot()
3170	3540	{
..	..	@@ -3403,7 +3773,8 @@
3403	3773
3404	3774	int size = obj.MemorySize();
3405	3775
3406		- System.err.println((size/1024) + " KB is the size of " + obj);
	3776	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3777	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3407	3778	}
3408	3779	}
3409	3780	catch (Exception e)
..	..	@@ -3484,6 +3855,13 @@
3484	3855	void GenNormals(boolean crease)
3485	3856	{
3486	3857	group.GenNormalsS(crease);
	3858	+
	3859	+ refreshContents();
	3860	+ }
	3861	+
	3862	+ void GenNormalsMESH()
	3863	+ {
	3864	+ group.GenNormalsMeshS();
3487	3865
3488	3866	refreshContents();
3489	3867	}
..	..	@@ -4111,6 +4489,18 @@
4111	4489	refreshContents();
4112	4490	}
4113	4491
	4492	+ void RewindLeaves(boolean hide)
	4493	+ {
	4494	+ group.selection.RewindLeaves(hide);
	4495	+ refreshContents();
	4496	+ }
	4497	+
	4498	+ void RandomLeaves(boolean hide)
	4499	+ {
	4500	+ group.selection.RandomLeaves(hide);
	4501	+ refreshContents();
	4502	+ }
	4503	+
4114	4504	void SetTexRes(int tr)
4115	4505	{
4116	4506	group.selection.SetTexRes(tr);
..	..	@@ -4182,10 +4572,6 @@
4182	4572	// }
4183	4573	// }
4184	4574
4185		- static boolean allparams = true;
4186		-
4187		- static Vector<Object3D> listUI = new Vector<Object3D>();
4188		-
4189	4575	void EditSelection(boolean newWindow)
4190	4576	{
4191	4577	// aConstraints.gridy = 0;
..	..	@@ -4193,7 +4579,7 @@
4193	4579	{
4194	4580	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4195	4581	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4196		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4582	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4197	4583
4198	4584	Object3D elem = (Object3D)group.selection.elementAt(i);
4199	4585	if(elem != group \|\| !newWindow)
..	..	@@ -4278,7 +4664,8 @@
4278	4664	//new Exception().printStackTrace();
4279	4665
4280	4666	freezemodel = true;
4281		-
	4667	+ ClearUnpinned();
	4668	+
4282	4669	/**/
4283	4670	//switch (event.id)
4284	4671	{
..	..	@@ -4286,7 +4673,6 @@
4286	4673	//case 702: // Event.LIST_DESELECT
4287	4674	group.deselectAll();
4288	4675	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4289		- objEditor.ClearInfo(); // .GetMaterial());
4290	4676	if (tps != null)
4291	4677	{
4292	4678	for (int i=0; i < tps.length; i++)
..	..	@@ -4295,10 +4681,8 @@
4295	4681
4296	4682	//if (child.parent != null)
4297	4683	//child.parent.addSelectee(child);
	4684	+ objEditor.SetMaterial(child);
4298	4685	group.addSelectee(child);
4299		- objEditor.SetMaterial(child); // .GetMaterial());
4300		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4301		- System.err.println("info : " + child.GetPath());
4302	4686	}
4303	4687	}
4304	4688	// else
..	..	@@ -4308,15 +4692,13 @@
4308	4692	// System.err.println("info : " + group.GetPath());
4309	4693	// }
4310	4694
4311		- objEditor.SetText(); // jan 2014
4312		-
4313	4695	if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4314	4696	CameraPane.flash = true;
4315	4697
4316	4698	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4317	4699	// a camera
4318	4700	{
4319		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4701	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4320	4702	{
4321	4703	CameraPane.camerachangeframe = 0; // don't refuse it
4322	4704	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4325,6 +4707,13 @@
4325	4707	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4326	4708	}
4327	4709
	4710	+ if (tps != null && tps.length == 1)
	4711	+ {
	4712	+ EditSelection(false);
	4713	+ }
	4714	+
	4715	+ SetPinStates(tps != null && tps.length > 0);
	4716	+
4328	4717	refreshContents();
4329	4718	//return true;
4330	4719	}
..	..	@@ -4333,6 +4722,35 @@
4333	4722
4334	4723	freezemodel = false;
4335	4724	}
	4725	+
	4726	+ void SetPinStates(boolean enabled)
	4727	+ {
	4728	+ editButton.setEnabled(enabled);
	4729	+ uneditButton.setEnabled(enabled);
	4730	+ unselectButton.setEnabled(enabled);
	4731	+ flashSelectionButton.setEnabled(enabled);
	4732	+ }
	4733	+
	4734	+ void refreshContents(boolean cp)
	4735	+ {
	4736	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4737	+ if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
	4738	+ {
	4739	+ objEditor.ClearInfo(); // .GetMaterial());
	4740	+
	4741	+ for (int i=0; i < group.selection.Size(); i++)
	4742	+ {
	4743	+ Object3D child = (Object3D) group.selection.get(i);
	4744	+
	4745	+ objEditor.AddInfo(child, this, true);
	4746	+ System.err.println("info : " + child.GetPath());
	4747	+ }
	4748	+
	4749	+ objEditor.SetText(); // jan 2014
	4750	+ }
	4751	+
	4752	+ super.refreshContents(cp);
	4753	+ }
4336	4754
4337	4755	void linkSomething(Object3D thing)
4338	4756	{
..	..	@@ -4404,6 +4822,7 @@
4404	4822	{
4405	4823	if (group.selection.isEmpty())
4406	4824	return;
	4825	+
4407	4826	Grafreed.clipboardIsTempGroup = false;
4408	4827	Composite tGroup = null;
4409	4828	if (group.selection.size() > 0) // 1)
..	..	@@ -4414,6 +4833,8 @@
4414	4833
4415	4834	if (cut)
4416	4835	{
	4836	+ if (Globals.SAVEONMAKE)
	4837	+ Save();
4417	4838	//int indices[] = jList.getSelectedIndices();
4418	4839	//for (int i = indices.length - 1; i >= 0; i--)
4419	4840	//jList.remove(indices[i]);
..	..	@@ -4503,8 +4924,10 @@
4503	4924	}
4504	4925
4505	4926	}
	4927	+
4506	4928	if (Grafreed.clipboardIsTempGroup)
4507	4929	Grafreed.clipboard = tGroup;
	4930	+
4508	4931	if (cut)
4509	4932	{
4510	4933	ResetModel();
..	..	@@ -5129,7 +5552,28 @@
5129	5552	cButton clearpanelButton;
5130	5553	cButton unselectButton;
5131	5554
	5555	+ cButton restoreCameraButton;
	5556	+
	5557	+ cButton saveButton;
5132	5558	cButton oneStepButton;
	5559	+
	5560	+ cButton groupButton;
	5561	+ cButton ungroupButton;
	5562	+ cButton compositeButton;
	5563	+ cButton switchButton;
	5564	+ cButton loopButton;
	5565	+ cButton textureButton;
	5566	+
	5567	+ cButton gridButton;
	5568	+ cButton boxButton;
	5569	+ cButton sphereButton;
	5570	+ cButton coneButton;
	5571	+ cButton torusButton;
	5572	+ cButton superButton;
	5573	+ cButton kleinButton;
	5574	+ cButton particlesButton;
	5575	+ cButton overlayButton;
	5576	+ cButton lightButton;
5133	5577
5134	5578	cButton screenfitButton;
5135	5579	cButton screenfitpointButton;
..	..	@@ -5142,14 +5586,6 @@
5142	5586
5143	5587	cButton setsupportButton;
5144	5588
5145		- cButton twoButton;
5146		- cButton sixButton;
5147		- cButton threeButton;
5148		- cButton sevenButton;
5149		- cButton fourButton; // full panel
5150		- cButton oneButton; // full XYZ
5151		- //cButton currentLayout;
5152		-
5153	5589	//
5154	5590	//Composite
5155	5591	Object3D // to do !!
..	..	@@ -5159,11 +5595,11 @@
5159	5595	//JTree jTree;
5160	5596	private MenuItem lookAtItem;
5161	5597	private MenuItem lookFromItem;
5162		- private MenuItem switchItem;
	5598	+ private MenuItem switchViewItem;
5163	5599	private MenuItem cutItem;
5164	5600	private MenuItem undoItem;
5165	5601	private MenuItem redoItem;
5166		- private MenuItem duplicateItem;
	5602	+ private JMenuItem duplicateItem;
5167	5603	private MenuItem cloneItem;
5168	5604	private MenuItem cloneSupportItem;
5169	5605	private MenuItem overwriteGeoItem;
..	..	@@ -5226,6 +5662,10 @@
5226	5662	private MenuItem showleavesItem;
5227	5663	private MenuItem markleavesItem;
5228	5664	private MenuItem unmarkleavesItem;
	5665	+ private MenuItem rewindleavesItem;
	5666	+ private MenuItem unrewindleavesItem;
	5667	+ private MenuItem randomleavesItem;
	5668	+ private MenuItem unrandomleavesItem;
5229	5669
5230	5670	private MenuItem flipVItem;
5231	5671	private MenuItem unflipVItem;
..	..	@@ -5247,7 +5687,7 @@
5247	5687	private MenuItem frontItem;
5248	5688	private MenuItem cameraItem;
5249	5689	private MenuItem compositeItem;
5250		- private MenuItem randomItem;
	5690	+ private MenuItem switchItem;
5251	5691	private MenuItem physicsItem;
5252	5692	private MenuItem frameselectorItem;
5253	5693	private MenuItem scriptNodeItem;
..	..	@@ -5321,5 +5761,5 @@
5321	5761
5322	5762	Menu cameraMenu;
5323	5763	MenuItem editCameraItem;
5324		- MenuItem revertCameraItem;
	5764	+ MenuItem restoreCameraItem;
5325	5765	}