~nbriere/GrafreeD.git - Noware Git Repository

..	..	@@ -150,11 +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		- 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"));
158	166	duplicateItem.addActionListener(this);
159	167	cloneItem = menu.add(new MenuItem("Clone"));
160	168	cloneItem.addActionListener(this);
..	..	@@ -170,7 +178,6 @@
170	178	copyItem.addActionListener(this);
171	179	pasteItem = menu.add(new MenuItem("Paste"));
172	180	pasteItem.addActionListener(this);
173		- menu.add("-");
174	181
175	182	menu.add("-");
176	183	pasteIntoItem = menu.add(new MenuItem("Paste into"));
..	..	@@ -197,23 +204,23 @@
197	204	//zBufferItem.addActionListener(this);
198	205	//cameraMenu.add(normalLensItem = new MenuItem("Normal Lens"));
199	206	//normalLensItem.addActionListener(this);
200		- cameraMenu.add(revertCameraItem = new MenuItem("Revert Camera"));
201		- revertCameraItem.addActionListener(this);
	207	+ cameraMenu.add(restoreCameraItem = new MenuItem("Restore Viewpoint"));
	208	+ restoreCameraItem.addActionListener(this);
202	209
203		- cameraMenu.add(toggleFullScreenItem = new CheckboxMenuItem("Full Screen"));
204		- toggleFullScreenItem.addItemListener(this);
205		- toggleFullScreenItem.setState(CameraPane.FULLSCREEN);
206		- 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);
207	222
208		- cameraMenu.add(toggleTextureItem = new CheckboxMenuItem("Texture"));
209		- toggleTextureItem.addItemListener(this);
210		- toggleTextureItem.setState(CameraPane.textureon);
211		-
212		- cameraMenu.add(toggleSwitchItem = new CheckboxMenuItem("Switch"));
213		- toggleSwitchItem.addItemListener(this);
214		- toggleSwitchItem.setState(CameraPane.SWITCH);
215		-
216		- cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Handles"));
	223	+ cameraMenu.add(toggleHandleItem = new CheckboxMenuItem("Show Handles"));
217	224	toggleHandleItem.addItemListener(this);
218	225	toggleHandleItem.setState(CameraPane.HANDLES);
219	226
..	..	@@ -240,7 +247,7 @@
240	247
241	248	cameraMenu.add(toggleDebugItem = new CheckboxMenuItem("Debug"));
242	249	toggleDebugItem.addItemListener(this);
243		- toggleDebugItem.setState(CameraPane.DEBUG);
	250	+ toggleDebugItem.setState(Globals.DEBUG);
244	251
245	252	cameraMenu.add(toggleFrustumItem = new CheckboxMenuItem("Frustum"));
246	253	toggleFrustumItem.addItemListener(this);
..	..	@@ -261,14 +268,14 @@
261	268	// animationItem.addItemListener(this);
262	269	// animationItem.setState(CameraPane.ANIMATION);
263	270	cameraMenu.add("-");
264		- cameraMenu.add(editCameraItem = new MenuItem("Freeze Camera"));
	271	+ cameraMenu.add(editCameraItem = new MenuItem("Save Viewpoint"));
265	272	editCameraItem.addActionListener(this);
266	273
267	274	if (Globals.ADVANCED)
268	275	{
269	276	oe.cameraMenu.add(lookAtItem = new MenuItem("Set Interest"));
270	277	//cameraMenu.add(lookFromItem = new MenuItem("Look From Selection"));
271		- //cameraMenu.add(switchItem = new MenuItem("Reverse View"));
	278	+ //cameraMenu.add(switchViewItem = new MenuItem("Reverse View"));
272	279	editLeafItem = oe.cameraMenu.add(new MenuItem("Edit Leaf"));
273	280	oe.cameraMenu.add("-");
274	281	openWindowItem = oe.cameraMenu.add(new MenuItem("Edit copy..."));
..	..	@@ -276,7 +283,7 @@
276	283	editLeafItem.addActionListener(this);
277	284	lookAtItem.addActionListener(this);
278	285	//lookFromItem.addActinoListener(this);
279		- //switchItem.addActionListener(this);
	286	+ //switchViewItem.addActionListener(this);
280	287	}
281	288
282	289	oe.menuBar.add(menu = new Menu("Setting"));
..	..	@@ -321,21 +328,29 @@
321	328	}
322	329
323	330	oe.menuBar.add(menu = new Menu("Group"));
324		- grabItem = menu.add(new MenuItem("Grab"));
325		- grabItem.addActionListener(this);
	331	+// grabItem = menu.add(new MenuItem("Grab"));
	332	+// grabItem.addActionListener(this);
326	333	backItem = menu.add(new MenuItem("Back"));
327	334	backItem.addActionListener(this);
328	335	frontItem = menu.add(new MenuItem("Front"));
329	336	frontItem.addActionListener(this);
330		- compositeItem = menu.add(new MenuItem("Composite"));
331		- compositeItem.addActionListener(this);
	337	+// compositeItem = menu.add(new MenuItem("Composite"));
	338	+// compositeItem.addActionListener(this);
	339	+
	340	+ if (Globals.ADVANCED)
	341	+ {
332	342	hideItem = menu.add(new MenuItem("Hidden Group"));
333	343	hideItem.addActionListener(this);
	344	+ }
334	345	ungroupItem = menu.add(new MenuItem("Ungroup"));
335	346	ungroupItem.addActionListener(this);
336		- menu.add("-");
337		- randomItem = menu.add(new MenuItem("Switch node"));
338		- 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	+ {
339	354	switchGeoItem = menu.add(new MenuItem("Switch Geometry"));
340	355	switchGeoItem.addActionListener(this);
341	356	switchTransfoItem = menu.add(new MenuItem("Switch Transform"));
..	..	@@ -343,8 +358,6 @@
343	358	morphItem = menu.add(new MenuItem("Morph Group"));
344	359	morphItem.addActionListener(this);
345	360
346		- if (Globals.ADVANCED)
347		- {
348	361	menu.add("-");
349	362	physicsItem = menu.add(new MenuItem("Physics"));
350	363	physicsItem.addActionListener(this);
..	..	@@ -352,22 +365,20 @@
352	365	frameselectorItem.addActionListener(this);
353	366	scriptNodeItem = menu.add(new MenuItem("Script Node"));
354	367	scriptNodeItem.addActionListener(this);
355		- cameraItem = menu.add(new MenuItem("Camera"));
356		- cameraItem.addActionListener(this);
357	368	}
358	369
359	370	oe.menuBar.add(menu = new Menu("Object"));
360		- textureItem = menu.add(new MenuItem("Texture"));
361		- textureItem.addActionListener(this);
	371	+// textureItem = menu.add(new MenuItem("Texture"));
	372	+// textureItem.addActionListener(this);
362	373	billboardItem = menu.add(new MenuItem("Billboard"));
363	374	billboardItem.addActionListener(this);
364	375	csgItem = menu.add(new MenuItem("CSG"));
365	376	csgItem.addActionListener(this);
366		- shadowXItem = menu.add(new MenuItem("Shadow X"));
	377	+ shadowXItem = menu.add(new MenuItem("Shadow Red"));
367	378	shadowXItem.addActionListener(this);
368		- shadowYItem = menu.add(new MenuItem("Shadow Y"));
	379	+ shadowYItem = menu.add(new MenuItem("Shadow Green"));
369	380	shadowYItem.addActionListener(this);
370		- shadowZItem = menu.add(new MenuItem("Shadow Z"));
	381	+ shadowZItem = menu.add(new MenuItem("Shadow Blue"));
371	382	shadowZItem.addActionListener(this);
372	383	if (Globals.ADVANCED)
373	384	{
..	..	@@ -464,6 +475,14 @@
464	475	markleavesItem.addActionListener(this);
465	476	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
466	477	unmarkleavesItem.addActionListener(this);
	478	+ rewindleavesItem = menu.add(new MenuItem("Rewind Leaves"));
	479	+ rewindleavesItem.addActionListener(this);
	480	+ unrewindleavesItem = menu.add(new MenuItem("Unrewind Leaves"));
	481	+ unrewindleavesItem.addActionListener(this);
	482	+ randomleavesItem = menu.add(new MenuItem("Random Leaves"));
	483	+ randomleavesItem.addActionListener(this);
	484	+ unrandomleavesItem = menu.add(new MenuItem("Unrandom Leaves"));
	485	+ unrandomleavesItem.addActionListener(this);
467	486	menu.add("-");
468	487	flipVItem = menu.add(new MenuItem("Flip V"));
469	488	flipVItem.addActionListener(this);
..	..	@@ -521,6 +540,18 @@
521	540
522	541	void SetupUI2(ObjEditor oe)
523	542	{
	543	+ // June 2019
	544	+ if (oe == null)
	545	+ {
	546	+ //super.SetupUI2(this);
	547	+ //return;
	548	+ }
	549	+
	550	+ if (copy != group)
	551	+ {
	552	+ //super.SetupUI2(this);
	553	+ }
	554	+
524	555	//new Exception().printStackTrace();
525	556
526	557	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -549,27 +580,66 @@
549	580	oe.radioPanel.add(dummyButton);
550	581	oe.buttonGroup.add(dummyButton);
551	582	*/
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 1;
	586	+
552	587	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
553	588
554		- oe.toolbarPanel.add(liveCB = new cCheckBox("Live", Globals.isLIVE())); //, oe.aConstraints);
	589	+ //oe.toolbarPanel.add(minButton = new cButton("Min", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	590	+ //minButton.setToolTipText("Minimize window");
	591	+ //minButton.addActionListener(this);
	592	+
	593	+ if (Globals.ADVANCED)
	594	+ {
	595	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	596	+ maxButton.setToolTipText("Maximize window");
	597	+ maxButton.addActionListener(this);
	598	+ }
	599	+
	600	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	601	+ fullButton.setToolTipText("Full-screen window");
	602	+ fullButton.addActionListener(this);
	603	+
	604	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	605	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	606	+ restoreCameraButton.addActionListener(this);
	607	+
	608	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	609	+ undoButton.setToolTipText("Undo changes");
	610	+ undoButton.addActionListener(this);
	611	+ undoButton.setEnabled(false);
	612	+
	613	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	614	+ redoButton.setToolTipText("Redo changes");
	615	+ redoButton.addActionListener(this);
	616	+ redoButton.setEnabled(false);
	617	+
	618	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	619	+ saveButton.setToolTipText("Save changes");
	620	+ saveButton.addActionListener(this);
	621	+
	622	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
555	623	liveCB.setToolTipText("Enable animation");
556	624	liveCB.addItemListener(this);
557	625
558		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	626	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
559	627	oneStepButton.setToolTipText("Animate one step forward");
560	628	oneStepButton.addActionListener(this);
561	629
562		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	630	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
563	631	fastCB.setToolTipText("Fast mode");
564	632	fastCB.addItemListener(this);
565	633
566		- oe.toolbarPanel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
567		- trackCB.setToolTipText("Enable tracking");
568		- trackCB.addItemListener(this);
569		-
570		- oe.toolbarPanel.add(screenfitButton = new cButton("@", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	634	+ //oe.toolboxPanel.Return();
	635	+
	636	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
571	637	screenfitButton.setToolTipText("Screen fit");
572	638	screenfitButton.addActionListener(this);
	639	+
	640	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	641	+// trackCB.setToolTipText("Enable tracking");
	642	+// trackCB.addItemListener(this);
573	643
574	644	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
575	645	// screenfitpointButton.addActionListener(this);
..	..	@@ -581,65 +651,145 @@
581	651	snapobjectButton.setToolTipText("Snap Object");
582	652	}
583	653
584		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
585		- flashSelectionButton.setToolTipText("Show selection");
586		- flashSelectionButton.addActionListener(this);
	654	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
587	655
588		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
589		-
590		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	656	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
591	657	twoButton.setToolTipText("Show center view only");
592	658	twoButton.addActionListener(this);
593		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	659	+ this.fullscreenLayout = twoButton;
	660	+
	661	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
594	662	fourButton.addActionListener(this);
595	663	fourButton.setToolTipText("Show left panel only");
596		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	664	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
597	665	sixButton.setToolTipText("2-column layout left");
598	666	sixButton.addActionListener(this);
599		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	667	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
600	668	threeButton.setToolTipText("2-column layout right");
601	669	threeButton.addActionListener(this);
602		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	670	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
603	671	sevenButton.setToolTipText("3-column layout");
604	672	sevenButton.addActionListener(this);
605	673	//
606	674
607		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	675	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608	676	rootButton.setToolTipText("Edit selection in new tab");
609	677	rootButton.addActionListener(this);
610	678
611		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	679	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
612	680	closeButton.setToolTipText("Close tab");
613	681	closeButton.addActionListener(this);
614	682	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
615	683	//clearButton.addActionListener(this);
616		-
617		- cGridBag commandsPanel = new cGridBag();
	684	+
	685	+ // INSERT
	686	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	687	+ gridButton.setToolTipText("Create grid");
	688	+ gridButton.addActionListener(this);
	689	+
	690	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	691	+ boxButton.setToolTipText("Create box");
	692	+ boxButton.addActionListener(this);
	693	+
	694	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	695	+ sphereButton.setToolTipText("Create sphere");
	696	+ sphereButton.addActionListener(this);
	697	+
	698	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	699	+ coneButton.setToolTipText("Create cone");
	700	+ coneButton.addActionListener(this);
	701	+
	702	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	703	+ torusButton.setToolTipText("Create torus");
	704	+ torusButton.addActionListener(this);
	705	+
	706	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	707	+ superButton.setToolTipText("Create superellipsoid");
	708	+ superButton.addActionListener(this);
	709	+
	710	+ if (Globals.ADVANCED)
	711	+ {
	712	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	713	+ kleinButton.setToolTipText("Create Klein bottle");
	714	+ kleinButton.addActionListener(this);
	715	+ }
618	716
619		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
620		- editButton.setToolTipText("Edit selection");
	717	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	718	+ particlesButton.setToolTipText("Create particle system");
	719	+ particlesButton.addActionListener(this);
	720	+
	721	+ oe.toolboxPanel.Return();
	722	+
	723	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	724	+ groupButton.setToolTipText("Create group");
	725	+ groupButton.addActionListener(this);
	726	+
	727	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	728	+ compositeButton.setToolTipText("Create composite");
	729	+ compositeButton.addActionListener(this);
	730	+
	731	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	732	+ switchButton.setToolTipText("Create item switcher");
	733	+ switchButton.addActionListener(this);
	734	+
	735	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	736	+ loopButton.setToolTipText("Create loop");
	737	+ loopButton.addActionListener(this);
	738	+
	739	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	740	+ textureButton.setToolTipText("Create texture");
	741	+ textureButton.addActionListener(this);
	742	+
	743	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	744	+ overlayButton.setToolTipText("Create overlay");
	745	+ overlayButton.addActionListener(this);
	746	+
	747	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	748	+ lightButton.setToolTipText("Create light");
	749	+ lightButton.addActionListener(this);
	750	+
	751	+ for (int i=6; --i>=0;)
	752	+ {
	753	+ oe.toolboxPanel.Return();
	754	+ oe.toolboxPanel.add(new cGridBag());
	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	+ }
	762	+
	763	+ // EDIT panel
	764	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	765	+ editButton.setToolTipText("Pin selection controls");
621	766	editButton.addActionListener(this);
622	767
623		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
624		- uneditButton.setToolTipText("Unedit selection");
	768	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	769	+ uneditButton.setToolTipText("Remove selection controls");
625	770	uneditButton.addActionListener(this);
626	771
627		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
628		- allParamsButton.setToolTipText("Edit all params");
	772	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	773	+ allParamsButton.setToolTipText("Show all controle");
629	774	allParamsButton.addActionListener(this);
630	775
631		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	776	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
632	777	clearPanelButton.setToolTipText("Clear edit panel");
633	778	clearPanelButton.addActionListener(this);
634	779
635		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	780	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
636	781	unselectButton.setToolTipText("Unselect");
637	782	unselectButton.addActionListener(this);
638	783
639		- commandsPanel.preferredHeight = 1;
	784	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	785	+ flashSelectionButton.setToolTipText("Highlight selection");
	786	+ flashSelectionButton.addActionListener(this);
640	787
641		- oe.treePanel.add(commandsPanel);
642		- oe.treePanel.Return();
	788	+ editCommandsPanel.preferredHeight = 1;
	789	+
	790	+ SetPinStates(false);
	791	+// oe.treePanel.add(commandsPanel);
	792	+// oe.treePanel.Return();
643	793
644	794	// oe.aConstraints.gridx += 1;
645	795	// oe.aConstraints.weighty = 0;
..	..	@@ -656,27 +806,12 @@
656	806
657	807	JScrollPane jSP;
658	808	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
659		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	809	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
660	810	ResetModel();
661	811
662	812	oe.treePanel.add(jSPPanel);
663	813	oe.treePanel.Return();
664	814
665		- cGridBag copyOptionsPanel = new cGridBag();
666		-
667		- copyOptionsPanel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
668		- colorCB.setToolTipText("Copy color when dropped");
669		- colorCB.addItemListener(this);
670		-
671		- copyOptionsPanel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
672		- materialCB.setToolTipText("Copy material when dropped");
673		- materialCB.addItemListener(this);
674		-
675		- copyOptionsPanel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
676		- textureCB.setToolTipText("Copy texture when dropped");
677		- textureCB.addItemListener(this);
678		-
679		- copyOptionsPanel.preferredHeight = 1;
680	815	oe.treePanel.add(copyOptionsPanel);
681	816	oe.treePanel.Return();
682	817
..	..	@@ -707,23 +842,43 @@
707	842
708	843	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
709	844	{
	845	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	846	+ colorCB.setToolTipText("Copy color when dropped");
	847	+ colorCB.addItemListener(this);
	848	+
	849	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	850	+ materialCB.setToolTipText("Copy material when dropped");
	851	+ materialCB.addItemListener(this);
	852	+
	853	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	854	+ textureCB.setToolTipText("Copy texture when dropped");
	855	+ textureCB.addItemListener(this);
	856	+
	857	+ panel.Return();
	858	+
710	859	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
711	860	boxCB.setToolTipText("Display bounding boxes");
712	861	boxCB.addItemListener(this);
713	862
714	863	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
715		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	864	+ zoomBoxCB.setToolTipText("Display only for wheel");
716	865	zoomBoxCB.addItemListener(this);
717	866
718	867	if (true) // Globals.ADVANCED)
719	868	{
720		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
721		- supportCB.setToolTipText("Enable rigging");
722		- supportCB.addItemListener(this);
	869	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	870	+// supportCB.setToolTipText("Enable rigging");
	871	+// supportCB.addItemListener(this);
	872	+
	873	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	874	+ freezeCB.setToolTipText("Fast moving camera");
	875	+ freezeCB.addItemListener(this);
723	876
724	877	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
725	878	// localCB.addItemListener(this);
726	879
	880	+ panel.Return();
	881	+
727	882	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
728	883	crowdCB.setToolTipText("Used for crowds");
729	884	crowdCB.addItemListener(this);
..	..	@@ -740,6 +895,8 @@
740	895	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
741	896	// speakerMocapCB.addItemListener(this);
742	897
	898	+ panel.Return();
	899	+
743	900	if (false)
744	901	{
745	902	// handled in scripts
..	..	@@ -754,32 +911,72 @@
754	911	//constraints.gridy += 1;
755	912	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
756	913	smoothfocusCB.addItemListener(this);
	914	+ panel.Return();
757	915	}
758	916
759	917	//constraints.gridx += 1;
760	918	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
761	919	// debugCB.addItemListener(this);
762	920
	921	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	922	+ trackCB.setToolTipText("Enable tracking target");
	923	+ trackCB.addItemListener(this);
	924	+
763	925	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	926	+ oeilCB.setToolTipText("Move camera when tracking");
764	927	oeilCB.addItemListener(this);
765	928
	929	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	930	+ shadowCB.setToolTipText("When live compute shadows");
	931	+ shadowCB.addItemListener(this);
	932	+
	933	+ panel.Return();
	934	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	935	+ toggleTextureCB.setToolTipText("Load textures");
	936	+ toggleTextureCB.addItemListener(this);
	937	+
	938	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	939	+ toggleSwitchCB.setToolTipText("Choose a single item");
	940	+ toggleSwitchCB.addItemListener(this);
	941	+
	942	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	943	+ autosaveCB.setToolTipText("On structure change");
	944	+ autosaveCB.addItemListener(this);
	945	+
	946	+ panel.Return();
	947	+ if (Globals.ADVANCED)
	948	+ {
766	949	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
767	950	lookAtCB.setToolTipText("Look-at target");
768	951	lookAtCB.addItemListener(this);
	952	+ }
769	953
770	954	}
771	955
772	956	cGridBag fill = new cGridBag();
773		-
774	957	fill.preferredHeight = 200;
	958	+ cGridBag fill2 = new cGridBag();
	959	+ fill2.preferredHeight = 200;
	960	+ cGridBag fill3 = new cGridBag();
	961	+ fill3.preferredHeight = 200;
775	962
776	963	panel.add(fill);
	964	+ panel.add(fill2);
	965	+ panel.add(fill3);
777	966
778	967	}
779	968
780	969	void EditObject(Object3D obj)
781	970	{
782	971	cRadio radioButton = new cRadio(obj.name);
	972	+
	973	+ // Patch to avoid bug with transparency.
	974	+ radioButton.hadMaterial = obj.material != null;
	975	+ if (!radioButton.hadMaterial)
	976	+ {
	977	+ obj.material = new cMaterial();
	978	+ }
	979	+
783	980	radioButton.SetObject(obj);
784	981	radioButton.layout = sevenButton;
785	982	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -791,6 +988,8 @@
791	988
792	989	void SetupViews(ObjEditor oe)
793	990	{
	991	+ theFrame = this;
	992	+
794	993	oe.SetupViews();
795	994
796	995	System.out.println("SetupViews");
..	..	@@ -799,23 +998,28 @@
799	998	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
800	999	}
801	1000
802		- JCheckBox liveCB;
803		- JCheckBox supportCB;
804		- JCheckBox localCB;
805		- JCheckBox crowdCB;
806		- JCheckBox smoothCB;
807		- JCheckBox fastCB;
808		- JCheckBox slowCB;
809		- JCheckBox boxCB;
810		- JCheckBox zoomBoxCB;
811		- JCheckBox trackCB;
812		- JCheckBox smoothfocusCB;
	1001	+ cToggleButton liveCB;
	1002	+ cCheckBox supportCB;
	1003	+ cCheckBox localCB;
	1004	+ cCheckBox crowdCB;
	1005	+ cCheckBox smoothCB;
	1006	+ cToggleButton fastCB;
	1007	+ cCheckBox slowCB;
	1008	+ cCheckBox boxCB;
	1009	+ cCheckBox zoomBoxCB;
	1010	+ cCheckBox freezeCB;
	1011	+ //cToggleButton trackCB;
	1012	+ cCheckBox trackCB;
	1013	+ cCheckBox smoothfocusCB;
813	1014	// JCheckBox speakerMocapCB;
814		- JCheckBox speakerCameraCB;
815		- JCheckBox speakerFocusCB;
816		- JCheckBox debugCB;
817		- JCheckBox oeilCB;
818		- JCheckBox lookAtCB;
	1015	+ cCheckBox speakerCameraCB;
	1016	+ cCheckBox speakerFocusCB;
	1017	+ cCheckBox debugCB;
	1018	+
	1019	+ cCheckBox oeilCB;
	1020	+ cCheckBox shadowCB;
	1021	+ cCheckBox autosaveCB;
	1022	+ cCheckBox lookAtCB;
819	1023
820	1024	// static int COLOR = 1;
821	1025	// static int MATERIAL = 2;
..	..	@@ -823,9 +1027,9 @@
823	1027
824	1028	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
825	1029
826		- JCheckBox colorCB;
827		- JCheckBox materialCB;
828		- JCheckBox textureCB;
	1030	+ cCheckBox colorCB;
	1031	+ cCheckBox materialCB;
	1032	+ cCheckBox textureCB;
829	1033
830	1034	public void itemStateChanged(ItemEvent e)
831	1035	{
..	..	@@ -853,6 +1057,7 @@
853	1057	} else if(e.getSource() == liveCB)
854	1058	{
855	1059	cameraView.ToggleLive();
	1060	+ refreshContents(false);
856	1061	}
857	1062	else if(e.getSource() == supportCB)
858	1063	{
..	..	@@ -917,6 +1122,18 @@
917	1122	{
918	1123	cameraView.ToggleOeil();
919	1124	}
	1125	+ else if(e.getSource() == shadowCB)
	1126	+ {
	1127	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1128	+ }
	1129	+ else if(e.getSource() == freezeCB)
	1130	+ {
	1131	+ Globals.FREEZEONMOVE ^= true;
	1132	+ }
	1133	+ else if(e.getSource() == autosaveCB)
	1134	+ {
	1135	+ Globals.SAVEONMAKE ^= true;
	1136	+ }
920	1137	else if(e.getSource() == lookAtCB)
921	1138	{
922	1139	cameraView.ToggleLookAt();
..	..	@@ -933,7 +1150,8 @@
933	1150
934	1151	/**/
935	1152	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
936		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1153	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1154	+ TreePath path = objEditor.jTree.getSelectionPath();
937	1155	if ((path == null) \|\| (path.getPathCount() <= 1)) {
938	1156	// We can't move the root node or an empty selection
939	1157	return;
..	..	@@ -1050,23 +1268,33 @@
1050	1268
1051	1269	assert target == objEditor.jTree;
1052	1270	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1271	+ Object3D destinationLeaf;
1053	1272	try {
1054		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1273	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1055	1274	} catch (Exception e) {
1056	1275	System.out.println("destinationPath : " + destinationPath);
1057	1276	return;
1058	1277	}
1059	1278
1060		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1279	+ for (int i=group.selection.size(); --i>=0;)
1061	1280	{
	1281	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1282	+
	1283	+ // Cannot move into itself
	1284	+ if (child == destinationLeaf)
	1285	+ return;
	1286	+ }
	1287	+
	1288	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1289	+// {
1062	1290	loadClipboard(true);
1063	1291	objEditor.jTree.setSelectionPath(destinationPath);
1064	1292	pasteInto(false, false);
1065		- } else {
1066		- loadClipboard(false);
1067		- objEditor.jTree.setSelectionPath(destinationPath);
1068		- pasteInto(false, false); // true); // ???
1069		- }
	1293	+// } else {
	1294	+// loadClipboard(false);
	1295	+// objEditor.jTree.setSelectionPath(destinationPath);
	1296	+// pasteInto(false, false); // true); // ???
	1297	+// }
1070	1298	}
1071	1299	public void dropActionChanged(DropTargetDragEvent dtde)
1072	1300	// Called if the user has modified the current drop gesture
..	..	@@ -1171,22 +1399,30 @@
1171	1399	{
1172	1400	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1173	1401	//heightFieldItem.addActionListener(this);
1174		- gridItem = menu.add(new MenuItem("Grid"));
1175		- gridItem.addActionListener(this);
1176		- rectoidItem = menu.add(new MenuItem("Box"));
1177		- rectoidItem.addActionListener(this);
1178		- ellipsoidItem = menu.add(new MenuItem("Sphere"));
1179		- ellipsoidItem.addActionListener(this);
1180		- coneItem = menu.add(new MenuItem("Cone"));
1181		- coneItem.addActionListener(this);
1182		- torusItem = menu.add(new MenuItem("Torus"));
1183		- torusItem.addActionListener(this);
1184		- superItem = menu.add(new MenuItem("Superellipsoid"));
1185		- superItem.addActionListener(this);
	1402	+// gridItem = menu.add(new MenuItem("Grid"));
	1403	+// gridItem.addActionListener(this);
	1404	+// rectoidItem = menu.add(new MenuItem("Box"));
	1405	+// rectoidItem.addActionListener(this);
	1406	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1407	+// ellipsoidItem.addActionListener(this);
	1408	+// coneItem = menu.add(new MenuItem("Cone"));
	1409	+// coneItem.addActionListener(this);
	1410	+// torusItem = menu.add(new MenuItem("Torus"));
	1411	+// torusItem.addActionListener(this);
	1412	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1413	+// superItem.addActionListener(this);
	1414	+
	1415	+ cameraItem = menu.add(new MenuItem("Camera"));
	1416	+ cameraItem.addActionListener(this);
	1417	+
	1418	+ if (!Globals.ADVANCED)
	1419	+ {
1186	1420	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1187	1421	kleinItem.addActionListener(this);
1188		- particleItem = menu.add(new MenuItem("Particle system"));
1189		- particleItem.addActionListener(this);
	1422	+ }
	1423	+
	1424	+// particleItem = menu.add(new MenuItem("Particle system"));
	1425	+// particleItem.addActionListener(this);
1190	1426	if (Globals.ADVANCED)
1191	1427	{
1192	1428	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1212,15 +1448,15 @@
1212	1448	}
1213	1449	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1214	1450	bezierItem.addActionListener(this);
1215		- overlayItem = menu.add(new MenuItem("Overlay"));
1216		- overlayItem.addActionListener(this);
1217		- lightItem = menu.add(new MenuItem("Light"));
1218		- lightItem.addActionListener(this);
	1451	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1452	+// overlayItem.addActionListener(this);
	1453	+// lightItem = menu.add(new MenuItem("Light"));
	1454	+// lightItem.addActionListener(this);
1219	1455	menu.add("-");
1220	1456	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1221	1457	//superLoopItem.addActionListener(this);
1222		- loopItem = menu.add(new MenuItem("Loop"));
1223		- loopItem.addActionListener(this);
	1458	+// loopItem = menu.add(new MenuItem("Loop"));
	1459	+// loopItem.addActionListener(this);
1224	1460	doubleItem = menu.add(new MenuItem("Fork"));
1225	1461	doubleItem.addActionListener(this);
1226	1462	if (Globals.ADVANCED)
..	..	@@ -1260,7 +1496,7 @@
1260	1496	memoryItem.addActionListener(this);
1261	1497	menu.add(analyzeItem = new MenuItem("Analyze"));
1262	1498	analyzeItem.addActionListener(this);
1263		- menu.add(dumpItem = new MenuItem("Dump"));
	1499	+ menu.add(dumpItem = new MenuItem("Print"));
1264	1500	dumpItem.addActionListener(this);
1265	1501	// menu.add(pathItem = new MenuItem("From-to path"));
1266	1502	// pathItem.addActionListener(this);
..	..	@@ -1401,9 +1637,24 @@
1401	1637	shadow.material = new cMaterial(obj.material);
1402	1638	shadow.material.diffuse = 0.0001f;
1403	1639	shadow.material.specular = 0.0001f;
	1640	+ //shadow.projectedVertices[1].x = 300;
1404	1641
1405	1642	makeSomething(shadow);
1406	1643	}
	1644	+
	1645	+ private void ClearUnpinned()
	1646	+ {
	1647	+ //for (Object3D obj : listUI)
	1648	+ for (int i=listUI.size(); --i>=0;)
	1649	+ {
	1650	+ Object3D obj = listUI.elementAt(i);
	1651	+ if (!obj.pinned)
	1652	+ {
	1653	+ obj.CloseUI();
	1654	+ listUI.remove(i);
	1655	+ }
	1656	+ }
	1657	+ }
1407	1658
1408	1659	/**
1409	1660	* applyExample
..	..	@@ -1648,7 +1899,7 @@
1648	1899	{
1649	1900	ScreenFit();
1650	1901	} else
1651		- if (source == switchItem)
	1902	+ if (source == switchViewItem)
1652	1903	{
1653	1904	cVector v1 = new cVector();
1654	1905	cVector v2 = new cVector();
..	..	@@ -1657,11 +1908,11 @@
1657	1908	objEditor.cameraView.renderCamera.setAim(v2, v1);
1658	1909	objEditor.cameraView.repaint();
1659	1910	} else
1660		- if (source == rectoidItem)
	1911	+ if (source == rectoidItem \|\| source == boxButton)
1661	1912	{
1662	1913	makeSomething(new Box());
1663	1914	} else
1664		- if (source == particleItem)
	1915	+ if (source == particleItem \|\| source == particlesButton)
1665	1916	{
1666	1917	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1667	1918	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1740,27 +1991,27 @@
1740	1991
1741	1992	makeSomething(obj);
1742	1993	} else
1743		- if (source == gridItem)
	1994	+ if (source == gridItem \|\| source == gridButton)
1744	1995	{
1745	1996	makeSomething(new Grid());
1746	1997	} else
1747		- if (source == ellipsoidItem)
	1998	+ if (source == ellipsoidItem \|\| source == sphereButton)
1748	1999	{
1749	2000	makeSomething(new Sphere());
1750	2001	} else
1751		- if (source == coneItem)
	2002	+ if (source == coneItem \|\| source == coneButton)
1752	2003	{
1753	2004	makeSomething(new Cone());
1754	2005	} else
1755		- if (source == torusItem)
	2006	+ if (source == torusItem \|\| source == torusButton)
1756	2007	{
1757	2008	makeSomething(new Torus());
1758	2009	} else
1759		- if (source == superItem)
	2010	+ if (source == superItem \|\| source == superButton)
1760	2011	{
1761	2012	makeSomething(new Superellipsoid());
1762	2013	} else
1763		- if (source == kleinItem)
	2014	+ if (source == kleinItem \|\| source == kleinButton)
1764	2015	{
1765	2016	makeSomething(new Klein());
1766	2017	} else
..	..	@@ -1780,7 +2031,7 @@
1780	2031	{
1781	2032	makeSomething(new BezierSurface());
1782	2033	} else
1783		- if (source == overlayItem)
	2034	+ if (source == overlayItem \|\| source == overlayButton)
1784	2035	{
1785	2036	/*
1786	2037	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1828,7 +2079,7 @@
1828	2079	s.setup();
1829	2080	makeSomething(s);
1830	2081	} else
1831		- if (source == lightItem)
	2082	+ if (source == lightItem \|\| source == lightButton)
1832	2083	{
1833	2084	makeSomething(new Light());
1834	2085	} else
..	..	@@ -1878,30 +2129,30 @@
1878	2129
1879	2130	group(g);
1880	2131	} else
1881		- if (source == loopItem)
	2132	+ if (source == loopItem \|\| source == loopButton)
1882	2133	{
1883	2134	Composite csg = new GroupLeaf();
1884	2135	csg.count = 5;
1885	2136	group(csg);
1886		- Composite child = new cGroup();
	2137	+ Composite child = new cGroup("Branch");
1887	2138	csg.addChild(child);
1888	2139	child.addChild(csg);
1889	2140	} else
1890	2141	if (source == doubleItem)
1891	2142	{
1892		- Composite csg = new GroupLeaf();
	2143	+ Composite csg = new GroupLeaf("Fork");
1893	2144	csg.count = 5;
1894	2145	group(csg);
1895		- Composite child = new cGroup();
	2146	+ Composite child = new cGroup("Branch A");
1896	2147	csg.addChild(child);
1897	2148	child.addChild(csg);
1898		- child = new cGroup();
	2149	+ child = new cGroup("Branch B");
1899	2150	csg.addChild(child);
1900	2151	child.addChild(csg);
1901	2152	} else
1902	2153	if (source == tripleItem)
1903	2154	{
1904		- Composite csg = new GroupLeaf();
	2155	+ Composite csg = new GroupLeaf("Trident");
1905	2156	csg.count = 4;
1906	2157	group(csg);
1907	2158	Composite child = new cGroup();
..	..	@@ -1950,6 +2201,30 @@
1950	2201	if (source == dumpItem)
1951	2202	{
1952	2203	DumpObject();
	2204	+ } else
	2205	+ if (source == minButton)
	2206	+ {
	2207	+ Minimize();
	2208	+ } else
	2209	+ if (source == maxButton)
	2210	+ {
	2211	+ Maximize();
	2212	+ } else
	2213	+ if (source == fullButton)
	2214	+ {
	2215	+ ToggleFullScreen();
	2216	+ } else
	2217	+ if (source == undoButton)
	2218	+ {
	2219	+ Undo();
	2220	+ } else
	2221	+ if (source == redoButton)
	2222	+ {
	2223	+ Redo();
	2224	+ } else
	2225	+ if (source == saveButton)
	2226	+ {
	2227	+ Save();
1953	2228	} else
1954	2229	if (source == oneStepButton)
1955	2230	{
..	..	@@ -2004,6 +2279,14 @@
2004	2279	if (source == cutItem \|\| source == clearButton)
2005	2280	{
2006	2281	loadClipboard(true);
	2282	+ } else
	2283	+ if (source == undoItem)
	2284	+ {
	2285	+ Undo();
	2286	+ } else
	2287	+ if (source == redoItem)
	2288	+ {
	2289	+ Redo();
2007	2290	} else
2008	2291	if (source == duplicateItem)
2009	2292	{
..	..	@@ -2336,9 +2619,9 @@
2336	2619	{
2337	2620	ClearSelection(true);
2338	2621	} else
2339		- if (source == grabItem)
	2622	+ if (source == grabItem \|\| source == groupButton)
2340	2623	{
2341		- group(new cGroup(), true);
	2624	+ group(new cGroup(), false); // true);
2342	2625	} else
2343	2626	if (source == hideItem)
2344	2627	{
..	..	@@ -2356,11 +2639,11 @@
2356	2639	{
2357	2640	makeSomething(new Camera());
2358	2641	} else
2359		- if (source == compositeItem)
	2642	+ if (source == compositeItem \|\| source == compositeButton)
2360	2643	{
2361	2644	group(new Composite());
2362	2645	} else
2363		- if (source == randomItem)
	2646	+ if (source == switchItem \|\| source == switchButton)
2364	2647	{
2365	2648	RandomNode random = new RandomNode();
2366	2649	group(random);
..	..	@@ -2462,7 +2745,7 @@
2462	2745	{
2463	2746	group(new cLinker());
2464	2747	} else
2465		- if (source == textureItem)
	2748	+ if (source == textureItem \|\| source == textureButton)
2466	2749	{
2467	2750	group(new TextureNode());
2468	2751	} else
..	..	@@ -2482,17 +2765,30 @@
2482	2765	{
2483	2766	CastShadow(2);
2484	2767	} else
2485		- if (source == ungroupItem)
	2768	+ if (source == ungroupItem \|\| source == ungroupButton)
2486	2769	{
2487		- //ungroup();
	2770	+ boolean hasRoot = false;
	2771	+
2488	2772	for (int i=0; i<group.selection.size(); i++)
2489	2773	{
2490		- Ungroup(group.selection.get(i));
	2774	+ if (group.selection.get(i) == group)
	2775	+ {
	2776	+ hasRoot = true;
	2777	+ break;
	2778	+ }
2491	2779	}
2492	2780
2493		- ClearSelection(false);
2494		-
2495		- refreshContents();
	2781	+ if (!hasRoot)
	2782	+ {
	2783	+ for (int i=0; i<group.selection.size(); i++)
	2784	+ {
	2785	+ Ungroup(group.selection.get(i));
	2786	+ }
	2787	+
	2788	+ ClearSelection(false);
	2789	+
	2790	+ refreshContents();
	2791	+ }
2496	2792	} else
2497	2793	if (source == genUVItem)
2498	2794	{
..	..	@@ -2504,7 +2800,7 @@
2504	2800	} else
2505	2801	if (source == genNormalsMESHItem)
2506	2802	{
2507		- GenNormals(true); // TODO
	2803	+ GenNormalsMESH();
2508	2804	} else
2509	2805	if (source == genNormalsORGANItem)
2510	2806	{
..	..	@@ -2569,6 +2865,22 @@
2569	2865	if (source == unmarkleavesItem)
2570	2866	{
2571	2867	MarkLeaves(false);
	2868	+ } else
	2869	+ if (source == rewindleavesItem)
	2870	+ {
	2871	+ RewindLeaves(true);
	2872	+ } else
	2873	+ if (source == unrewindleavesItem)
	2874	+ {
	2875	+ RewindLeaves(false);
	2876	+ } else
	2877	+ if (source == randomleavesItem)
	2878	+ {
	2879	+ RandomLeaves(true);
	2880	+ } else
	2881	+ if (source == unrandomleavesItem)
	2882	+ {
	2883	+ RandomLeaves(false);
2572	2884	} else
2573	2885	if (source == flipVItem)
2574	2886	{
..	..	@@ -2804,6 +3116,10 @@
2804	3116	if (source == twoButton)
2805	3117	{
2806	3118	radio.layout = twoButton;
	3119	+
	3120	+ if (CameraPane.FULLSCREEN)
	3121	+ fullscreenLayout = radio.layout;
	3122	+
2807	3123	// bug
2808	3124	//gridPanel.setDividerLocation(1.0);
2809	3125	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2836,10 +3152,31 @@
2836	3152	bigThree.ClearUI();
2837	3153	bigThree.add(centralPanel);
2838	3154	bigThree.FlushUI();
	3155	+
	3156	+ cameraView.requestFocusInWindow();
	3157	+
	3158	+// refreshContents(true);
	3159	+//
	3160	+// try
	3161	+// {
	3162	+// java.awt.Robot bot = new java.awt.Robot();
	3163	+// int mask = InputEvent.BUTTON1_MASK;
	3164	+// bot.mouseMove(100, 100);
	3165	+// bot.mousePress(mask);
	3166	+// bot.mouseRelease(mask);
	3167	+// }
	3168	+// catch (Exception e)
	3169	+// {
	3170	+//
	3171	+// }
	3172	+
2839	3173	} else
2840	3174	if (source == threeButton)
2841	3175	{
2842	3176	radio.layout = threeButton;
	3177	+
	3178	+ if (CameraPane.FULLSCREEN)
	3179	+ fullscreenLayout = radio.layout;
2843	3180
2844	3181	// bigThree.remove(scenePanel);
2845	3182	// bigThree.remove(centralPanel);
..	..	@@ -2872,10 +3209,15 @@
2872	3209	bigThree.add(centralPanel);
2873	3210	bigThree.add(XYZPanel);
2874	3211	bigThree.FlushUI();
	3212	+
	3213	+ cameraView.requestFocusInWindow();
2875	3214	} else
2876	3215	if (source == fourButton)
2877	3216	{
2878	3217	radio.layout = fourButton;
	3218	+
	3219	+ if (CameraPane.FULLSCREEN)
	3220	+ fullscreenLayout = radio.layout;
2879	3221
2880	3222	// bigThree.remove(scenePanel);
2881	3223	// bigThree.remove(centralPanel);
..	..	@@ -2907,10 +3249,15 @@
2907	3249	bigThree.ClearUI();
2908	3250	bigThree.add(scenePanel);
2909	3251	bigThree.FlushUI();
	3252	+
	3253	+ cameraView.requestFocusInWindow();
2910	3254	} else
2911	3255	if (source == sixButton)
2912	3256	{
2913	3257	radio.layout = sixButton;
	3258	+
	3259	+ if (CameraPane.FULLSCREEN)
	3260	+ fullscreenLayout = radio.layout;
2914	3261
2915	3262	// bigThree.remove(scenePanel);
2916	3263	// bigThree.remove(centralPanel);
..	..	@@ -2943,10 +3290,15 @@
2943	3290	bigThree.add(scenePanel);
2944	3291	bigThree.add(centralPanel);
2945	3292	bigThree.FlushUI();
	3293	+
	3294	+ cameraView.requestFocusInWindow();
2946	3295	} else
2947	3296	if (source == sevenButton)
2948	3297	{
2949	3298	radio.layout = sevenButton;
	3299	+
	3300	+ if (CameraPane.FULLSCREEN)
	3301	+ fullscreenLayout = radio.layout;
2950	3302
2951	3303	// bigThree.remove(scenePanel);
2952	3304	// bigThree.remove(centralPanel);
..	..	@@ -2980,6 +3332,8 @@
2980	3332	bigThree.add(centralPanel);
2981	3333	bigThree.add(XYZPanel);
2982	3334	bigThree.FlushUI();
	3335	+
	3336	+ cameraView.requestFocusInWindow();
2983	3337	} else
2984	3338	if (source == rootButton)
2985	3339	{
..	..	@@ -2991,6 +3345,7 @@
2991	3345	EditObject(obj);
2992	3346	}
2993	3347
	3348	+ cameraView.requestFocusInWindow();
2994	3349	refreshContents(true);
2995	3350	} else
2996	3351	if (source == closeButton)
..	..	@@ -3000,22 +3355,37 @@
3000	3355	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3001	3356	{
3002	3357	ab = (cRadio)e.nextElement();
3003		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3358	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3004	3359	{
	3360	+ // Patch to avoid bug with transparency.
	3361	+ if (!ab.hadMaterial)
	3362	+ {
	3363	+ ab.object.material = null;
	3364	+ }
	3365	+
3005	3366	buttonGroup.remove(ab);
3006	3367	radioPanel.remove(ab);
3007	3368
3008		- ab.GetObject().editWindow = null;
	3369	+ //ab.GetObject().editWindow = null;
	3370	+ ab.GetObject().manipWindow = null;
3009	3371	// ab.GetObject().objectUI = null; // ?????????
3010	3372
3011	3373	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3012	3374	break;
3013	3375	}
3014	3376	}
	3377	+
	3378	+ cameraView.requestFocusInWindow();
3015	3379	refreshContents(true);
3016	3380	} else
3017	3381	if (source == editItem \|\| source == editButton)
3018	3382	{
	3383	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3384	+ {
	3385	+ Object3D child = (Object3D)e.nextElement();
	3386	+ child.pinned = true;
	3387	+ }
	3388	+
3019	3389	EditSelection(false);
3020	3390	} else
3021	3391	if (source == uneditButton)
..	..	@@ -3025,10 +3395,11 @@
3025	3395	Object3D child = (Object3D)e.nextElement();
3026	3396	if(child.editWindow != null)
3027	3397	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3398	+ child.pinned = false;
3028	3399	child.CloseUI();
3029	3400	listUI.remove(child);
3030	3401
3031		- child.editWindow = null; // ???????????
	3402	+ //child.editWindow = null; // ???????????
3032	3403	}
3033	3404	objEditor.ctrlPanel.FlushUI();
3034	3405	//objEditor.jTree.clearSelection();
..	..	@@ -3041,6 +3412,7 @@
3041	3412	//copy.ClearUI();
3042	3413	for (Object3D obj : listUI)
3043	3414	{
	3415	+ obj.pinned = false;
3044	3416	obj.CloseUI();
3045	3417	}
3046	3418	listUI.clear();
..	..	@@ -3050,7 +3422,7 @@
3050	3422	{
3051	3423	assert(copy == group);
3052	3424
3053		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3425	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3054	3426
3055	3427	for (Object3D obj : listUI)
3056	3428	{
..	..	@@ -3115,7 +3487,9 @@
3115	3487	sideView.object = group;
3116	3488	}
3117	3489
3118		-// fix "+" issue group.editWindow = this;
	3490	+// fix "+" issue
	3491	+ //group.editWindow = this;
	3492	+ group.manipWindow = this;
3119	3493
3120	3494	/*
3121	3495	currentLayout = radio.layout;
..	..	@@ -3123,18 +3497,25 @@
3123	3497	currentLayout = sevenButton;
3124	3498	*/
3125	3499	radio.layout.doClick();
	3500	+
	3501	+ ClearUnpinned();
	3502	+ SetPinStates(group.selection.size() > 0);
	3503	+ if (group.selection.size() == 1)
	3504	+ EditSelection(false);
3126	3505	keepparent = group.parent;
3127	3506	// PARENT = NULL or not???
3128	3507	//group.parent = null; // ROOT
3129	3508	//group.attributes = -1;
3130	3509	ResetModel();
	3510	+
	3511	+ cameraView.requestFocusInWindow();
3131	3512	refreshContents(true);
3132	3513	} else if (event.getSource() == editCameraItem)
3133	3514	{
3134	3515	cameraView.ProtectCamera();
3135	3516	cameraView.repaint();
3136	3517	return;
3137		- } else if (event.getSource() == revertCameraItem)
	3518	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3138	3519	{
3139	3520	cameraView.RevertCamera();
3140	3521	cameraView.repaint();
..	..	@@ -3151,7 +3532,6 @@
3151	3532	}
3152	3533
3153	3534	boolean useclient = false;
3154		- cRadio radio;
3155	3535
3156	3536	void ToggleRoot()
3157	3537	{
..	..	@@ -3390,7 +3770,8 @@
3390	3770
3391	3771	int size = obj.MemorySize();
3392	3772
3393		- System.err.println((size/1024) + " KB is the size of " + obj);
	3773	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3774	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3394	3775	}
3395	3776	}
3396	3777	catch (Exception e)
..	..	@@ -3471,6 +3852,13 @@
3471	3852	void GenNormals(boolean crease)
3472	3853	{
3473	3854	group.GenNormalsS(crease);
	3855	+
	3856	+ refreshContents();
	3857	+ }
	3858	+
	3859	+ void GenNormalsMESH()
	3860	+ {
	3861	+ group.GenNormalsMeshS();
3474	3862
3475	3863	refreshContents();
3476	3864	}
..	..	@@ -4098,6 +4486,18 @@
4098	4486	refreshContents();
4099	4487	}
4100	4488
	4489	+ void RewindLeaves(boolean hide)
	4490	+ {
	4491	+ group.selection.RewindLeaves(hide);
	4492	+ refreshContents();
	4493	+ }
	4494	+
	4495	+ void RandomLeaves(boolean hide)
	4496	+ {
	4497	+ group.selection.RandomLeaves(hide);
	4498	+ refreshContents();
	4499	+ }
	4500	+
4101	4501	void SetTexRes(int tr)
4102	4502	{
4103	4503	group.selection.SetTexRes(tr);
..	..	@@ -4169,10 +4569,6 @@
4169	4569	// }
4170	4570	// }
4171	4571
4172		- static boolean allparams = true;
4173		-
4174		- static Vector<Object3D> listUI = new Vector<Object3D>();
4175		-
4176	4572	void EditSelection(boolean newWindow)
4177	4573	{
4178	4574	// aConstraints.gridy = 0;
..	..	@@ -4180,7 +4576,7 @@
4180	4576	{
4181	4577	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4182	4578	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4183		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4579	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4184	4580
4185	4581	Object3D elem = (Object3D)group.selection.elementAt(i);
4186	4582	if(elem != group \|\| !newWindow)
..	..	@@ -4265,7 +4661,8 @@
4265	4661	//new Exception().printStackTrace();
4266	4662
4267	4663	freezemodel = true;
4268		-
	4664	+ ClearUnpinned();
	4665	+
4269	4666	/**/
4270	4667	//switch (event.id)
4271	4668	{
..	..	@@ -4273,7 +4670,6 @@
4273	4670	//case 702: // Event.LIST_DESELECT
4274	4671	group.deselectAll();
4275	4672	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4276		- objEditor.ClearInfo(); // .GetMaterial());
4277	4673	if (tps != null)
4278	4674	{
4279	4675	for (int i=0; i < tps.length; i++)
..	..	@@ -4282,10 +4678,8 @@
4282	4678
4283	4679	//if (child.parent != null)
4284	4680	//child.parent.addSelectee(child);
	4681	+ objEditor.SetMaterial(child);
4285	4682	group.addSelectee(child);
4286		- objEditor.SetMaterial(child); // .GetMaterial());
4287		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4288		- System.err.println("info : " + child.GetPath());
4289	4683	}
4290	4684	}
4291	4685	// else
..	..	@@ -4295,20 +4689,28 @@
4295	4689	// System.err.println("info : " + group.GetPath());
4296	4690	// }
4297	4691
4298		- objEditor.SetText(); // jan 2014
4299		-
4300		- if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(((Object3D) tps[0].getLastPathComponent()) instanceof Camera))
	4692	+ if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4301	4693	CameraPane.flash = true;
4302	4694
4303		- if (tps != null && tps.length > 0 && ((Object3D) tps[0].getLastPathComponent()) instanceof Camera)
	4695	+ if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4304	4696	// a camera
4305	4697	{
4306		- CameraPane.camerachangeframe = 0; // don't refuse it
4307		- Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4698	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
	4699	+ {
	4700	+ CameraPane.camerachangeframe = 0; // don't refuse it
	4701	+ Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
	4702	+ }
4308	4703	// Globals.theRenderer.renderCamera = Globals.theRenderer.manipCamera;
4309	4704	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4310	4705	}
4311	4706
	4707	+ if (tps != null && tps.length == 1)
	4708	+ {
	4709	+ EditSelection(false);
	4710	+ }
	4711	+
	4712	+ SetPinStates(tps != null && tps.length > 0);
	4713	+
4312	4714	refreshContents();
4313	4715	//return true;
4314	4716	}
..	..	@@ -4317,6 +4719,35 @@
4317	4719
4318	4720	freezemodel = false;
4319	4721	}
	4722	+
	4723	+ void SetPinStates(boolean enabled)
	4724	+ {
	4725	+ editButton.setEnabled(enabled);
	4726	+ uneditButton.setEnabled(enabled);
	4727	+ unselectButton.setEnabled(enabled);
	4728	+ flashSelectionButton.setEnabled(enabled);
	4729	+ }
	4730	+
	4731	+ void refreshContents(boolean cp)
	4732	+ {
	4733	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4734	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4735	+ {
	4736	+ objEditor.ClearInfo(); // .GetMaterial());
	4737	+
	4738	+ for (int i=0; i < group.selection.Size(); i++)
	4739	+ {
	4740	+ Object3D child = (Object3D) group.selection.get(i);
	4741	+
	4742	+ objEditor.AddInfo(child, this, true);
	4743	+ System.err.println("info : " + child.GetPath());
	4744	+ }
	4745	+
	4746	+ objEditor.SetText(); // jan 2014
	4747	+ }
	4748	+
	4749	+ super.refreshContents(cp);
	4750	+ }
4320	4751
4321	4752	void linkSomething(Object3D thing)
4322	4753	{
..	..	@@ -4388,6 +4819,7 @@
4388	4819	{
4389	4820	if (group.selection.isEmpty())
4390	4821	return;
	4822	+
4391	4823	Grafreed.clipboardIsTempGroup = false;
4392	4824	Composite tGroup = null;
4393	4825	if (group.selection.size() > 0) // 1)
..	..	@@ -4398,6 +4830,8 @@
4398	4830
4399	4831	if (cut)
4400	4832	{
	4833	+ if (Globals.SAVEONMAKE)
	4834	+ Save();
4401	4835	//int indices[] = jList.getSelectedIndices();
4402	4836	//for (int i = indices.length - 1; i >= 0; i--)
4403	4837	//jList.remove(indices[i]);
..	..	@@ -4487,8 +4921,10 @@
4487	4921	}
4488	4922
4489	4923	}
	4924	+
4490	4925	if (Grafreed.clipboardIsTempGroup)
4491	4926	Grafreed.clipboard = tGroup;
	4927	+
4492	4928	if (cut)
4493	4929	{
4494	4930	ResetModel();
..	..	@@ -5113,7 +5549,28 @@
5113	5549	cButton clearpanelButton;
5114	5550	cButton unselectButton;
5115	5551
	5552	+ cButton restoreCameraButton;
	5553	+
	5554	+ cButton saveButton;
5116	5555	cButton oneStepButton;
	5556	+
	5557	+ cButton groupButton;
	5558	+ cButton ungroupButton;
	5559	+ cButton compositeButton;
	5560	+ cButton switchButton;
	5561	+ cButton loopButton;
	5562	+ cButton textureButton;
	5563	+
	5564	+ cButton gridButton;
	5565	+ cButton boxButton;
	5566	+ cButton sphereButton;
	5567	+ cButton coneButton;
	5568	+ cButton torusButton;
	5569	+ cButton superButton;
	5570	+ cButton kleinButton;
	5571	+ cButton particlesButton;
	5572	+ cButton overlayButton;
	5573	+ cButton lightButton;
5117	5574
5118	5575	cButton screenfitButton;
5119	5576	cButton screenfitpointButton;
..	..	@@ -5126,14 +5583,6 @@
5126	5583
5127	5584	cButton setsupportButton;
5128	5585
5129		- cButton twoButton;
5130		- cButton sixButton;
5131		- cButton threeButton;
5132		- cButton sevenButton;
5133		- cButton fourButton; // full panel
5134		- cButton oneButton; // full XYZ
5135		- //cButton currentLayout;
5136		-
5137	5586	//
5138	5587	//Composite
5139	5588	Object3D // to do !!
..	..	@@ -5143,9 +5592,11 @@
5143	5592	//JTree jTree;
5144	5593	private MenuItem lookAtItem;
5145	5594	private MenuItem lookFromItem;
5146		- private MenuItem switchItem;
	5595	+ private MenuItem switchViewItem;
5147	5596	private MenuItem cutItem;
5148		- private MenuItem duplicateItem;
	5597	+ private MenuItem undoItem;
	5598	+ private MenuItem redoItem;
	5599	+ private JMenuItem duplicateItem;
5149	5600	private MenuItem cloneItem;
5150	5601	private MenuItem cloneSupportItem;
5151	5602	private MenuItem overwriteGeoItem;
..	..	@@ -5208,6 +5659,10 @@
5208	5659	private MenuItem showleavesItem;
5209	5660	private MenuItem markleavesItem;
5210	5661	private MenuItem unmarkleavesItem;
	5662	+ private MenuItem rewindleavesItem;
	5663	+ private MenuItem unrewindleavesItem;
	5664	+ private MenuItem randomleavesItem;
	5665	+ private MenuItem unrandomleavesItem;
5211	5666
5212	5667	private MenuItem flipVItem;
5213	5668	private MenuItem unflipVItem;
..	..	@@ -5229,7 +5684,7 @@
5229	5684	private MenuItem frontItem;
5230	5685	private MenuItem cameraItem;
5231	5686	private MenuItem compositeItem;
5232		- private MenuItem randomItem;
	5687	+ private MenuItem switchItem;
5233	5688	private MenuItem physicsItem;
5234	5689	private MenuItem frameselectorItem;
5235	5690	private MenuItem scriptNodeItem;
..	..	@@ -5303,5 +5758,5 @@
5303	5758
5304	5759	Menu cameraMenu;
5305	5760	MenuItem editCameraItem;
5306		- MenuItem revertCameraItem;
	5761	+ MenuItem restoreCameraItem;
5307	5762	}