~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,22 +365,20 @@
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);
377	383	if (Globals.ADVANCED)
378	384	{
..	..	@@ -469,6 +475,14 @@
469	475	markleavesItem.addActionListener(this);
470	476	unmarkleavesItem = menu.add(new MenuItem("Unmark Leaves"));
471	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);
472	486	menu.add("-");
473	487	flipVItem = menu.add(new MenuItem("Flip V"));
474	488	flipVItem.addActionListener(this);
..	..	@@ -526,6 +540,18 @@
526	540
527	541	void SetupUI2(ObjEditor oe)
528	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	+
529	555	//new Exception().printStackTrace();
530	556
531	557	oe.radioPanel = new JPanel(new GridBagLayout());
..	..	@@ -554,27 +580,63 @@
554	580	oe.radioPanel.add(dummyButton);
555	581	oe.buttonGroup.add(dummyButton);
556	582	*/
	583	+ cGridBag copyOptionsPanel = new cGridBag();
	584	+
	585	+ copyOptionsPanel.preferredHeight = 1;
	586	+
557	587	//this.AddOptions(oe.toolbarPanel, oe.aConstraints);
558	588
559		- 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	+ oe.toolbarPanel.add(maxButton = GetButton("icons/add-128.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	594	+ maxButton.setToolTipText("Maximize window");
	595	+ maxButton.addActionListener(this);
	596	+
	597	+ oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	598	+ fullButton.setToolTipText("Full-screen window");
	599	+ fullButton.addActionListener(this);
	600	+
	601	+ oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	602	+ restoreCameraButton.setToolTipText("Restore viewpoint");
	603	+ restoreCameraButton.addActionListener(this);
	604	+
	605	+ copyOptionsPanel.add(undoButton = GetButton("icons/undo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	606	+ undoButton.setToolTipText("Undo changes");
	607	+ undoButton.addActionListener(this);
	608	+ undoButton.setEnabled(false);
	609	+
	610	+ copyOptionsPanel.add(redoButton = GetButton("icons/redo.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	611	+ redoButton.setToolTipText("Redo changes");
	612	+ redoButton.addActionListener(this);
	613	+ redoButton.setEnabled(false);
	614	+
	615	+ copyOptionsPanel.add(saveButton = GetButton("icons/down_arrow.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	616	+ saveButton.setToolTipText("Save changes");
	617	+ saveButton.addActionListener(this);
	618	+
	619	+ copyOptionsPanel.add(liveCB = GetToggleButton("icons/run.png", Globals.isLIVE())); //, oe.aConstraints);
560	620	liveCB.setToolTipText("Enable animation");
561	621	liveCB.addItemListener(this);
562	622
563		- oe.toolbarPanel.add(oneStepButton = new cButton("Step", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	623	+ copyOptionsPanel.add(oneStepButton = GetButton("icons/step.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
564	624	oneStepButton.setToolTipText("Animate one step forward");
565	625	oneStepButton.addActionListener(this);
566	626
567		- oe.toolbarPanel.add(fastCB = new cCheckBox("Fast", CameraPane.FAST)); //, constraints);
	627	+ copyOptionsPanel.add(fastCB = GetToggleButton("icons/runfast.png", CameraPane.FAST)); //, constraints);
568	628	fastCB.setToolTipText("Fast mode");
569	629	fastCB.addItemListener(this);
570	630
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);
	631	+ //oe.toolboxPanel.Return();
	632	+
	633	+ copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
576	634	screenfitButton.setToolTipText("Screen fit");
577	635	screenfitButton.addActionListener(this);
	636	+
	637	+// copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
	638	+// trackCB.setToolTipText("Enable tracking");
	639	+// trackCB.addItemListener(this);
578	640
579	641	// oe.toolbarPanel.add(screenfitpointButton = new cButton(" @+ ")); //, oe.aConstraints);
580	642	// screenfitpointButton.addActionListener(this);
..	..	@@ -586,65 +648,145 @@
586	648	snapobjectButton.setToolTipText("Snap Object");
587	649	}
588	650
589		- oe.toolbarPanel.add(flashSelectionButton = new cButton("?", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
590		- flashSelectionButton.setToolTipText("Show selection");
591		- flashSelectionButton.addActionListener(this);
	651	+ //oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
592	652
593		- oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
594		-
595		- oe.toolbarPanel.add(twoButton = new cButton("\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	653	+ oe.toolbarPanel.add(twoButton = new cButton("\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
596	654	twoButton.setToolTipText("Show center view only");
597	655	twoButton.addActionListener(this);
598		- oe.toolbarPanel.add(fourButton = new cButton("+\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	656	+ this.fullscreenLayout = twoButton;
	657	+
	658	+ oe.toolbarPanel.add(fourButton = new cButton("-\|\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
599	659	fourButton.addActionListener(this);
600	660	fourButton.setToolTipText("Show left panel only");
601		- oe.toolbarPanel.add(sixButton = new cButton("+\|+\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	661	+ oe.toolbarPanel.add(sixButton = new cButton("-\|-\|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
602	662	sixButton.setToolTipText("2-column layout left");
603	663	sixButton.addActionListener(this);
604		- oe.toolbarPanel.add(threeButton = new cButton("\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	664	+ oe.toolbarPanel.add(threeButton = new cButton("\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
605	665	threeButton.setToolTipText("2-column layout right");
606	666	threeButton.addActionListener(this);
607		- oe.toolbarPanel.add(sevenButton = new cButton("+\|+\|+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	667	+ oe.toolbarPanel.add(sevenButton = new cButton("-\|-\|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
608	668	sevenButton.setToolTipText("3-column layout");
609	669	sevenButton.addActionListener(this);
610	670	//
611	671
612		- oe.toolbarPanel.add(rootButton = new cButton("o o o", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	672	+ oe.toolbarPanel.add(rootButton = GetButton("icons/write.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
613	673	rootButton.setToolTipText("Edit selection in new tab");
614	674	rootButton.addActionListener(this);
615	675
616		- oe.toolbarPanel.add(closeButton = new cButton("X", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	676	+ oe.toolbarPanel.add(closeButton = GetButton("icons/close-icon.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
617	677	closeButton.setToolTipText("Close tab");
618	678	closeButton.addActionListener(this);
619	679	//oe.treePanel.add(clearButton = new cButton("X"), oe.aConstraints);
620	680	//clearButton.addActionListener(this);
621		-
622		- cGridBag commandsPanel = new cGridBag();
	681	+
	682	+ // INSERT
	683	+ oe.toolboxPanel.add(gridButton = GetButton("icons/grid.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	684	+ gridButton.setToolTipText("Create grid");
	685	+ gridButton.addActionListener(this);
	686	+
	687	+ oe.toolboxPanel.add(boxButton = GetButton("icons/box.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	688	+ boxButton.setToolTipText("Create box");
	689	+ boxButton.addActionListener(this);
	690	+
	691	+ oe.toolboxPanel.add(sphereButton = GetButton("icons/sphere.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	692	+ sphereButton.setToolTipText("Create sphere");
	693	+ sphereButton.addActionListener(this);
	694	+
	695	+ oe.toolboxPanel.add(coneButton = GetButton("icons/cone.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	696	+ coneButton.setToolTipText("Create cone");
	697	+ coneButton.addActionListener(this);
	698	+
	699	+ oe.toolboxPanel.add(torusButton = GetButton("icons/torus.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	700	+ torusButton.setToolTipText("Create torus");
	701	+ torusButton.addActionListener(this);
	702	+
	703	+ oe.toolboxPanel.add(superButton = GetButton("icons/super.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	704	+ superButton.setToolTipText("Create superellipsoid");
	705	+ superButton.addActionListener(this);
	706	+
	707	+ if (Globals.ADVANCED)
	708	+ {
	709	+ oe.toolboxPanel.add(kleinButton = GetButton("icons/klein.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	710	+ kleinButton.setToolTipText("Create Klein bottle");
	711	+ kleinButton.addActionListener(this);
	712	+ }
623	713
624		- commandsPanel.add(editButton = new cButton("+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
625		- editButton.setToolTipText("Edit selection");
	714	+ oe.toolboxPanel.add(particlesButton = GetButton("icons/particles.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	715	+ particlesButton.setToolTipText("Create particle system");
	716	+ particlesButton.addActionListener(this);
	717	+
	718	+ oe.toolboxPanel.Return();
	719	+
	720	+ oe.toolboxPanel.add(groupButton = GetButton("icons/group.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	721	+ groupButton.setToolTipText("Create group");
	722	+ groupButton.addActionListener(this);
	723	+
	724	+ oe.toolboxPanel.add(compositeButton = GetButton("icons/composite.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	725	+ compositeButton.setToolTipText("Create composite");
	726	+ compositeButton.addActionListener(this);
	727	+
	728	+ oe.toolboxPanel.add(switchButton = GetButton("icons/switch.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	729	+ switchButton.setToolTipText("Create item switcher");
	730	+ switchButton.addActionListener(this);
	731	+
	732	+ oe.toolboxPanel.add(loopButton = GetButton("icons/loop.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	733	+ loopButton.setToolTipText("Create loop");
	734	+ loopButton.addActionListener(this);
	735	+
	736	+ oe.toolboxPanel.add(textureButton = GetButton("icons/texture.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	737	+ textureButton.setToolTipText("Create texture");
	738	+ textureButton.addActionListener(this);
	739	+
	740	+ oe.toolboxPanel.add(overlayButton = GetButton("icons/overlay.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	741	+ overlayButton.setToolTipText("Create overlay");
	742	+ overlayButton.addActionListener(this);
	743	+
	744	+ oe.toolboxPanel.add(lightButton = GetButton("icons/light-bulb.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	745	+ lightButton.setToolTipText("Create light");
	746	+ lightButton.addActionListener(this);
	747	+
	748	+ for (int i=6; --i>=0;)
	749	+ {
	750	+ oe.toolboxPanel.Return();
	751	+ oe.toolboxPanel.add(new cGridBag());
	752	+ oe.toolboxPanel.add(new cGridBag());
	753	+ oe.toolboxPanel.add(new cGridBag());
	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	+ }
	759	+
	760	+ // EDIT panel
	761	+ editCommandsPanel.add(editButton = GetButton("icons/controls.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	762	+ editButton.setToolTipText("Pin selection controls");
626	763	editButton.addActionListener(this);
627	764
628		- commandsPanel.add(uneditButton = new cButton("-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
629		- uneditButton.setToolTipText("Unedit selection");
	765	+ editCommandsPanel.add(uneditButton = GetButton("icons/remove.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	766	+ uneditButton.setToolTipText("Remove selection controls");
630	767	uneditButton.addActionListener(this);
631	768
632		- commandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
633		- allParamsButton.setToolTipText("Edit all params");
	769	+ editCommandsPanel.add(allParamsButton = new JCheckBox("All", allparams)); //, oe.aConstraints);
	770	+ allParamsButton.setToolTipText("Show all controle");
634	771	allParamsButton.addActionListener(this);
635	772
636		- commandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	773	+ editCommandsPanel.add(clearPanelButton = new cButton("C", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
637	774	clearPanelButton.setToolTipText("Clear edit panel");
638	775	clearPanelButton.addActionListener(this);
639	776
640		- commandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	777	+ editCommandsPanel.add(unselectButton = new cButton("U", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
641	778	unselectButton.setToolTipText("Unselect");
642	779	unselectButton.addActionListener(this);
643	780
644		- commandsPanel.preferredHeight = 1;
	781	+ editCommandsPanel.add(flashSelectionButton = GetButton("icons/flash-light.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
	782	+ flashSelectionButton.setToolTipText("Highlight selection");
	783	+ flashSelectionButton.addActionListener(this);
645	784
646		- oe.treePanel.add(commandsPanel);
647		- oe.treePanel.Return();
	785	+ editCommandsPanel.preferredHeight = 1;
	786	+
	787	+ SetPinStates(false);
	788	+// oe.treePanel.add(commandsPanel);
	789	+// oe.treePanel.Return();
648	790
649	791	// oe.aConstraints.gridx += 1;
650	792	// oe.aConstraints.weighty = 0;
..	..	@@ -661,27 +803,12 @@
661	803
662	804	JScrollPane jSP;
663	805	//ctrlPanel.add(new JScrollPane(jTree = new cTree(new cTreeModel(this))), aConstraints);
664		- jSPPanel.add(jSP = new JScrollPane(oe.jTree = new cTree(null))); //, oe.aConstraints);
	806	+ jSPPanel.add(jSP = new JScrollPane(oe.jTree)); //, oe.aConstraints);
665	807	ResetModel();
666	808
667	809	oe.treePanel.add(jSPPanel);
668	810	oe.treePanel.Return();
669	811
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	812	oe.treePanel.add(copyOptionsPanel);
686	813	oe.treePanel.Return();
687	814
..	..	@@ -712,23 +839,43 @@
712	839
713	840	void AddOptions(cGridBag panel) //, GridBagConstraints constraints)
714	841	{
	842	+ panel.add(colorCB = new cCheckBox("Color", (dropAttributes&Object3D.COLOR)!=0)); //, oe.aConstraints);
	843	+ colorCB.setToolTipText("Copy color when dropped");
	844	+ colorCB.addItemListener(this);
	845	+
	846	+ panel.add(materialCB = new cCheckBox("Material", (dropAttributes&Object3D.MATERIAL)!=0)); //, oe.aConstraints);
	847	+ materialCB.setToolTipText("Copy material when dropped");
	848	+ materialCB.addItemListener(this);
	849	+
	850	+ panel.add(textureCB = new cCheckBox("Texture", (dropAttributes&Object3D.TEXTURE)!=0)); //, oe.aConstraints);
	851	+ textureCB.setToolTipText("Copy texture when dropped");
	852	+ textureCB.addItemListener(this);
	853	+
	854	+ panel.Return();
	855	+
715	856	panel.add(boxCB = new cCheckBox("Box", CameraPane.BOXMODE)); //, constraints);
716	857	boxCB.setToolTipText("Display bounding boxes");
717	858	boxCB.addItemListener(this);
718	859
719	860	panel.add(zoomBoxCB = new cCheckBox("Zoom", CameraPane.ZOOMBOXMODE)); //, constraints);
720		- zoomBoxCB.setToolTipText("Display bounding boxes when moving the wheel");
	861	+ zoomBoxCB.setToolTipText("Display only for wheel");
721	862	zoomBoxCB.addItemListener(this);
722	863
723	864	if (true) // Globals.ADVANCED)
724	865	{
725		- panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
726		- supportCB.setToolTipText("Enable rigging");
727		- supportCB.addItemListener(this);
	866	+// panel.add(supportCB = new cCheckBox("Support", CameraPane.SUPPORT)); //, constraints);
	867	+// supportCB.setToolTipText("Enable rigging");
	868	+// supportCB.addItemListener(this);
	869	+
	870	+ panel.add(freezeCB = new cCheckBox("Freeze", Globals.FREEZEONMOVE)); //, constraints);
	871	+ freezeCB.setToolTipText("Fast moving camera");
	872	+ freezeCB.addItemListener(this);
728	873
729	874	// panel.add(localCB = new cCheckBox("Local", CameraPane.LOCALTRANSFORM), constraints);
730	875	// localCB.addItemListener(this);
731	876
	877	+ panel.Return();
	878	+
732	879	panel.add(crowdCB = new cCheckBox("Crowd", Globals.CROWD)); //, constraints);
733	880	crowdCB.setToolTipText("Used for crowds");
734	881	crowdCB.addItemListener(this);
..	..	@@ -745,6 +892,8 @@
745	892	// panel.add(speakerMocapCB = new cCheckBox("Mocap", CameraPane.SPEAKERMOCAP), constraints);
746	893	// speakerMocapCB.addItemListener(this);
747	894
	895	+ panel.Return();
	896	+
748	897	if (false)
749	898	{
750	899	// handled in scripts
..	..	@@ -759,32 +908,72 @@
759	908	//constraints.gridy += 1;
760	909	panel.add(smoothfocusCB = new cCheckBox("Smooth", CameraPane.SMOOTHFOCUS)); //, constraints);
761	910	smoothfocusCB.addItemListener(this);
	911	+ panel.Return();
762	912	}
763	913
764	914	//constraints.gridx += 1;
765	915	//panel.add(debugCB = new cCheckBox("Debug", CameraPane.DEBUG), constraints);
766	916	// debugCB.addItemListener(this);
767	917
	918	+ panel.add(trackCB = new cCheckBox("Track", CameraPane.TRACK)); //, oe.aConstraints);
	919	+ trackCB.setToolTipText("Enable tracking target");
	920	+ trackCB.addItemListener(this);
	921	+
768	922	panel.add(oeilCB = new cCheckBox("Eye", CameraPane.OEIL)); //, constraints);
	923	+ oeilCB.setToolTipText("Move camera when tracking");
769	924	oeilCB.addItemListener(this);
770	925
	926	+ panel.add(shadowCB = new cCheckBox("Shadow", Globals.COMPUTESHADOWWHENLIVE)); //, constraints);
	927	+ shadowCB.setToolTipText("When live compute shadows");
	928	+ shadowCB.addItemListener(this);
	929	+
	930	+ panel.Return();
	931	+ panel.add(toggleTextureCB = new cCheckBox("Textures", CameraPane.textureon)); //, constraints);
	932	+ toggleTextureCB.setToolTipText("Load textures");
	933	+ toggleTextureCB.addItemListener(this);
	934	+
	935	+ panel.add(toggleSwitchCB = new cCheckBox("Switch", CameraPane.SWITCH)); //, constraints);
	936	+ toggleSwitchCB.setToolTipText("Choose a single item");
	937	+ toggleSwitchCB.addItemListener(this);
	938	+
	939	+ panel.add(autosaveCB = new cCheckBox("Auto-save", Globals.SAVEONMAKE)); //, constraints);
	940	+ autosaveCB.setToolTipText("On structure change");
	941	+ autosaveCB.addItemListener(this);
	942	+
	943	+ panel.Return();
	944	+ if (Globals.ADVANCED)
	945	+ {
771	946	panel.add(lookAtCB = new cCheckBox("Target", CameraPane.LOOKAT)); //, constraints);
772	947	lookAtCB.setToolTipText("Look-at target");
773	948	lookAtCB.addItemListener(this);
	949	+ }
774	950
775	951	}
776	952
777	953	cGridBag fill = new cGridBag();
778		-
779	954	fill.preferredHeight = 200;
	955	+ cGridBag fill2 = new cGridBag();
	956	+ fill2.preferredHeight = 200;
	957	+ cGridBag fill3 = new cGridBag();
	958	+ fill3.preferredHeight = 200;
780	959
781	960	panel.add(fill);
	961	+ panel.add(fill2);
	962	+ panel.add(fill3);
782	963
783	964	}
784	965
785	966	void EditObject(Object3D obj)
786	967	{
787	968	cRadio radioButton = new cRadio(obj.name);
	969	+
	970	+ // Patch to avoid bug with transparency.
	971	+ radioButton.hadMaterial = obj.material != null;
	972	+ if (!radioButton.hadMaterial)
	973	+ {
	974	+ obj.material = new cMaterial();
	975	+ }
	976	+
788	977	radioButton.SetObject(obj);
789	978	radioButton.layout = sevenButton;
790	979	radioButton.SetCamera(cameraView.renderCamera, false);
..	..	@@ -796,6 +985,8 @@
796	985
797	986	void SetupViews(ObjEditor oe)
798	987	{
	988	+ theFrame = this;
	989	+
799	990	oe.SetupViews();
800	991
801	992	System.out.println("SetupViews");
..	..	@@ -804,23 +995,28 @@
804	995	/DropTarget dropTarget =/ new DropTarget(oe.cameraView, this);
805	996	}
806	997
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;
	998	+ cToggleButton liveCB;
	999	+ cCheckBox supportCB;
	1000	+ cCheckBox localCB;
	1001	+ cCheckBox crowdCB;
	1002	+ cCheckBox smoothCB;
	1003	+ cToggleButton fastCB;
	1004	+ cCheckBox slowCB;
	1005	+ cCheckBox boxCB;
	1006	+ cCheckBox zoomBoxCB;
	1007	+ cCheckBox freezeCB;
	1008	+ //cToggleButton trackCB;
	1009	+ cCheckBox trackCB;
	1010	+ cCheckBox smoothfocusCB;
818	1011	// JCheckBox speakerMocapCB;
819		- JCheckBox speakerCameraCB;
820		- JCheckBox speakerFocusCB;
821		- JCheckBox debugCB;
822		- JCheckBox oeilCB;
823		- JCheckBox lookAtCB;
	1012	+ cCheckBox speakerCameraCB;
	1013	+ cCheckBox speakerFocusCB;
	1014	+ cCheckBox debugCB;
	1015	+
	1016	+ cCheckBox oeilCB;
	1017	+ cCheckBox shadowCB;
	1018	+ cCheckBox autosaveCB;
	1019	+ cCheckBox lookAtCB;
824	1020
825	1021	// static int COLOR = 1;
826	1022	// static int MATERIAL = 2;
..	..	@@ -828,9 +1024,9 @@
828	1024
829	1025	int dropAttributes = Object3D.COLOR \| Object3D.MATERIAL;
830	1026
831		- JCheckBox colorCB;
832		- JCheckBox materialCB;
833		- JCheckBox textureCB;
	1027	+ cCheckBox colorCB;
	1028	+ cCheckBox materialCB;
	1029	+ cCheckBox textureCB;
834	1030
835	1031	public void itemStateChanged(ItemEvent e)
836	1032	{
..	..	@@ -858,6 +1054,7 @@
858	1054	} else if(e.getSource() == liveCB)
859	1055	{
860	1056	cameraView.ToggleLive();
	1057	+ refreshContents(false);
861	1058	}
862	1059	else if(e.getSource() == supportCB)
863	1060	{
..	..	@@ -922,6 +1119,18 @@
922	1119	{
923	1120	cameraView.ToggleOeil();
924	1121	}
	1122	+ else if(e.getSource() == shadowCB)
	1123	+ {
	1124	+ Globals.COMPUTESHADOWWHENLIVE ^= true;
	1125	+ }
	1126	+ else if(e.getSource() == freezeCB)
	1127	+ {
	1128	+ Globals.FREEZEONMOVE ^= true;
	1129	+ }
	1130	+ else if(e.getSource() == autosaveCB)
	1131	+ {
	1132	+ Globals.SAVEONMAKE ^= true;
	1133	+ }
925	1134	else if(e.getSource() == lookAtCB)
926	1135	{
927	1136	cameraView.ToggleLookAt();
..	..	@@ -938,7 +1147,8 @@
938	1147
939	1148	/**/
940	1149	//DragSource.getDefaultDragSource().startDrag(dge, DragSource.DefaultMoveNoDrop, new StringSelection("Allo"), this);
941		- TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1150	+ //TreePath path = new TreePath(objEditor.jTree.getSelectionPath().getLastPathComponent());
	1151	+ TreePath path = objEditor.jTree.getSelectionPath();
942	1152	if ((path == null) \|\| (path.getPathCount() <= 1)) {
943	1153	// We can't move the root node or an empty selection
944	1154	return;
..	..	@@ -1055,23 +1265,33 @@
1055	1265
1056	1266	assert target == objEditor.jTree;
1057	1267	TreePath destinationPath = objEditor.jTree.getPathForLocation(objEditor.location.x, objEditor.location.y);
	1268	+ Object3D destinationLeaf;
1058	1269	try {
1059		- Object3D dummy = (Composite) destinationPath.getLastPathComponent();
	1270	+ destinationLeaf = (Composite) destinationPath.getLastPathComponent();
1060	1271	} catch (Exception e) {
1061	1272	System.out.println("destinationPath : " + destinationPath);
1062	1273	return;
1063	1274	}
1064	1275
1065		- if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1276	+ for (int i=group.selection.size(); --i>=0;)
1066	1277	{
	1278	+ Object3D child = (Object3D)group.selection.elementAt(i);
	1279	+
	1280	+ // Cannot move into itself
	1281	+ if (child == destinationLeaf)
	1282	+ return;
	1283	+ }
	1284	+
	1285	+// june 2019 if (dtde.getDropAction() == DnDConstants.ACTION_MOVE) // ?? LINK)
	1286	+// {
1067	1287	loadClipboard(true);
1068	1288	objEditor.jTree.setSelectionPath(destinationPath);
1069	1289	pasteInto(false, false);
1070		- } else {
1071		- loadClipboard(false);
1072		- objEditor.jTree.setSelectionPath(destinationPath);
1073		- pasteInto(false, false); // true); // ???
1074		- }
	1290	+// } else {
	1291	+// loadClipboard(false);
	1292	+// objEditor.jTree.setSelectionPath(destinationPath);
	1293	+// pasteInto(false, false); // true); // ???
	1294	+// }
1075	1295	}
1076	1296	public void dropActionChanged(DropTargetDragEvent dtde)
1077	1297	// Called if the user has modified the current drop gesture
..	..	@@ -1176,22 +1396,30 @@
1176	1396	{
1177	1397	//heightFieldItem = menu.add(new MenuItem("Height Field"));
1178	1398	//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);
	1399	+// gridItem = menu.add(new MenuItem("Grid"));
	1400	+// gridItem.addActionListener(this);
	1401	+// rectoidItem = menu.add(new MenuItem("Box"));
	1402	+// rectoidItem.addActionListener(this);
	1403	+// ellipsoidItem = menu.add(new MenuItem("Sphere"));
	1404	+// ellipsoidItem.addActionListener(this);
	1405	+// coneItem = menu.add(new MenuItem("Cone"));
	1406	+// coneItem.addActionListener(this);
	1407	+// torusItem = menu.add(new MenuItem("Torus"));
	1408	+// torusItem.addActionListener(this);
	1409	+// superItem = menu.add(new MenuItem("Superellipsoid"));
	1410	+// superItem.addActionListener(this);
	1411	+
	1412	+ cameraItem = menu.add(new MenuItem("Camera"));
	1413	+ cameraItem.addActionListener(this);
	1414	+
	1415	+ if (!Globals.ADVANCED)
	1416	+ {
1191	1417	kleinItem = menu.add(new MenuItem("Klein Bottle"));
1192	1418	kleinItem.addActionListener(this);
1193		- particleItem = menu.add(new MenuItem("Particle system"));
1194		- particleItem.addActionListener(this);
	1419	+ }
	1420	+
	1421	+// particleItem = menu.add(new MenuItem("Particle system"));
	1422	+// particleItem.addActionListener(this);
1195	1423	if (Globals.ADVANCED)
1196	1424	{
1197	1425	ragdollItem = menu.add(new MenuItem("Rag Walk"));
..	..	@@ -1217,15 +1445,15 @@
1217	1445	}
1218	1446	bezierItem = menu.add(new MenuItem("Bezier Patch"));
1219	1447	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);
	1448	+// overlayItem = menu.add(new MenuItem("Overlay"));
	1449	+// overlayItem.addActionListener(this);
	1450	+// lightItem = menu.add(new MenuItem("Light"));
	1451	+// lightItem.addActionListener(this);
1224	1452	menu.add("-");
1225	1453	//superLoopItem = menu.add(new MenuItem("Super Loop"));
1226	1454	//superLoopItem.addActionListener(this);
1227		- loopItem = menu.add(new MenuItem("Loop"));
1228		- loopItem.addActionListener(this);
	1455	+// loopItem = menu.add(new MenuItem("Loop"));
	1456	+// loopItem.addActionListener(this);
1229	1457	doubleItem = menu.add(new MenuItem("Fork"));
1230	1458	doubleItem.addActionListener(this);
1231	1459	if (Globals.ADVANCED)
..	..	@@ -1265,7 +1493,7 @@
1265	1493	memoryItem.addActionListener(this);
1266	1494	menu.add(analyzeItem = new MenuItem("Analyze"));
1267	1495	analyzeItem.addActionListener(this);
1268		- menu.add(dumpItem = new MenuItem("Dump"));
	1496	+ menu.add(dumpItem = new MenuItem("Print"));
1269	1497	dumpItem.addActionListener(this);
1270	1498	// menu.add(pathItem = new MenuItem("From-to path"));
1271	1499	// pathItem.addActionListener(this);
..	..	@@ -1406,9 +1634,24 @@
1406	1634	shadow.material = new cMaterial(obj.material);
1407	1635	shadow.material.diffuse = 0.0001f;
1408	1636	shadow.material.specular = 0.0001f;
	1637	+ //shadow.projectedVertices[1].x = 300;
1409	1638
1410	1639	makeSomething(shadow);
1411	1640	}
	1641	+
	1642	+ private void ClearUnpinned()
	1643	+ {
	1644	+ //for (Object3D obj : listUI)
	1645	+ for (int i=listUI.size(); --i>=0;)
	1646	+ {
	1647	+ Object3D obj = listUI.elementAt(i);
	1648	+ if (!obj.pinned)
	1649	+ {
	1650	+ obj.CloseUI();
	1651	+ listUI.remove(i);
	1652	+ }
	1653	+ }
	1654	+ }
1412	1655
1413	1656	/**
1414	1657	* applyExample
..	..	@@ -1653,7 +1896,7 @@
1653	1896	{
1654	1897	ScreenFit();
1655	1898	} else
1656		- if (source == switchItem)
	1899	+ if (source == switchViewItem)
1657	1900	{
1658	1901	cVector v1 = new cVector();
1659	1902	cVector v2 = new cVector();
..	..	@@ -1662,11 +1905,11 @@
1662	1905	objEditor.cameraView.renderCamera.setAim(v2, v1);
1663	1906	objEditor.cameraView.repaint();
1664	1907	} else
1665		- if (source == rectoidItem)
	1908	+ if (source == rectoidItem \|\| source == boxButton)
1666	1909	{
1667	1910	makeSomething(new Box());
1668	1911	} else
1669		- if (source == particleItem)
	1912	+ if (source == particleItem \|\| source == particlesButton)
1670	1913	{
1671	1914	ParticleNode particleGeom = new ParticleNode("Particles", 1000); //, particleType);
1672	1915	ParticleController particleController = new ParticleController(particleGeom);
..	..	@@ -1745,27 +1988,27 @@
1745	1988
1746	1989	makeSomething(obj);
1747	1990	} else
1748		- if (source == gridItem)
	1991	+ if (source == gridItem \|\| source == gridButton)
1749	1992	{
1750	1993	makeSomething(new Grid());
1751	1994	} else
1752		- if (source == ellipsoidItem)
	1995	+ if (source == ellipsoidItem \|\| source == sphereButton)
1753	1996	{
1754	1997	makeSomething(new Sphere());
1755	1998	} else
1756		- if (source == coneItem)
	1999	+ if (source == coneItem \|\| source == coneButton)
1757	2000	{
1758	2001	makeSomething(new Cone());
1759	2002	} else
1760		- if (source == torusItem)
	2003	+ if (source == torusItem \|\| source == torusButton)
1761	2004	{
1762	2005	makeSomething(new Torus());
1763	2006	} else
1764		- if (source == superItem)
	2007	+ if (source == superItem \|\| source == superButton)
1765	2008	{
1766	2009	makeSomething(new Superellipsoid());
1767	2010	} else
1768		- if (source == kleinItem)
	2011	+ if (source == kleinItem \|\| source == kleinButton)
1769	2012	{
1770	2013	makeSomething(new Klein());
1771	2014	} else
..	..	@@ -1785,7 +2028,7 @@
1785	2028	{
1786	2029	makeSomething(new BezierSurface());
1787	2030	} else
1788		- if (source == overlayItem)
	2031	+ if (source == overlayItem \|\| source == overlayButton)
1789	2032	{
1790	2033	/*
1791	2034	Object3D obj = new BezierSurface(5,8);
..	..	@@ -1833,7 +2076,7 @@
1833	2076	s.setup();
1834	2077	makeSomething(s);
1835	2078	} else
1836		- if (source == lightItem)
	2079	+ if (source == lightItem \|\| source == lightButton)
1837	2080	{
1838	2081	makeSomething(new Light());
1839	2082	} else
..	..	@@ -1883,30 +2126,30 @@
1883	2126
1884	2127	group(g);
1885	2128	} else
1886		- if (source == loopItem)
	2129	+ if (source == loopItem \|\| source == loopButton)
1887	2130	{
1888	2131	Composite csg = new GroupLeaf();
1889	2132	csg.count = 5;
1890	2133	group(csg);
1891		- Composite child = new cGroup();
	2134	+ Composite child = new cGroup("Branch");
1892	2135	csg.addChild(child);
1893	2136	child.addChild(csg);
1894	2137	} else
1895	2138	if (source == doubleItem)
1896	2139	{
1897		- Composite csg = new GroupLeaf();
	2140	+ Composite csg = new GroupLeaf("Fork");
1898	2141	csg.count = 5;
1899	2142	group(csg);
1900		- Composite child = new cGroup();
	2143	+ Composite child = new cGroup("Branch A");
1901	2144	csg.addChild(child);
1902	2145	child.addChild(csg);
1903		- child = new cGroup();
	2146	+ child = new cGroup("Branch B");
1904	2147	csg.addChild(child);
1905	2148	child.addChild(csg);
1906	2149	} else
1907	2150	if (source == tripleItem)
1908	2151	{
1909		- Composite csg = new GroupLeaf();
	2152	+ Composite csg = new GroupLeaf("Trident");
1910	2153	csg.count = 4;
1911	2154	group(csg);
1912	2155	Composite child = new cGroup();
..	..	@@ -1955,6 +2198,30 @@
1955	2198	if (source == dumpItem)
1956	2199	{
1957	2200	DumpObject();
	2201	+ } else
	2202	+ if (source == minButton)
	2203	+ {
	2204	+ Minimize();
	2205	+ } else
	2206	+ if (source == maxButton)
	2207	+ {
	2208	+ Maximize();
	2209	+ } else
	2210	+ if (source == fullButton)
	2211	+ {
	2212	+ ToggleFullScreen();
	2213	+ } else
	2214	+ if (source == undoButton)
	2215	+ {
	2216	+ Undo();
	2217	+ } else
	2218	+ if (source == redoButton)
	2219	+ {
	2220	+ Redo();
	2221	+ } else
	2222	+ if (source == saveButton)
	2223	+ {
	2224	+ Save();
1958	2225	} else
1959	2226	if (source == oneStepButton)
1960	2227	{
..	..	@@ -2349,9 +2616,9 @@
2349	2616	{
2350	2617	ClearSelection(true);
2351	2618	} else
2352		- if (source == grabItem)
	2619	+ if (source == grabItem \|\| source == groupButton)
2353	2620	{
2354		- group(new cGroup(), true);
	2621	+ group(new cGroup(), false); // true);
2355	2622	} else
2356	2623	if (source == hideItem)
2357	2624	{
..	..	@@ -2369,11 +2636,11 @@
2369	2636	{
2370	2637	makeSomething(new Camera());
2371	2638	} else
2372		- if (source == compositeItem)
	2639	+ if (source == compositeItem \|\| source == compositeButton)
2373	2640	{
2374	2641	group(new Composite());
2375	2642	} else
2376		- if (source == randomItem)
	2643	+ if (source == switchItem \|\| source == switchButton)
2377	2644	{
2378	2645	RandomNode random = new RandomNode();
2379	2646	group(random);
..	..	@@ -2475,7 +2742,7 @@
2475	2742	{
2476	2743	group(new cLinker());
2477	2744	} else
2478		- if (source == textureItem)
	2745	+ if (source == textureItem \|\| source == textureButton)
2479	2746	{
2480	2747	group(new TextureNode());
2481	2748	} else
..	..	@@ -2495,17 +2762,30 @@
2495	2762	{
2496	2763	CastShadow(2);
2497	2764	} else
2498		- if (source == ungroupItem)
	2765	+ if (source == ungroupItem \|\| source == ungroupButton)
2499	2766	{
2500		- //ungroup();
	2767	+ boolean hasRoot = false;
	2768	+
2501	2769	for (int i=0; i<group.selection.size(); i++)
2502	2770	{
2503		- Ungroup(group.selection.get(i));
	2771	+ if (group.selection.get(i) == group)
	2772	+ {
	2773	+ hasRoot = true;
	2774	+ break;
	2775	+ }
2504	2776	}
2505	2777
2506		- ClearSelection(false);
2507		-
2508		- refreshContents();
	2778	+ if (!hasRoot)
	2779	+ {
	2780	+ for (int i=0; i<group.selection.size(); i++)
	2781	+ {
	2782	+ Ungroup(group.selection.get(i));
	2783	+ }
	2784	+
	2785	+ ClearSelection(false);
	2786	+
	2787	+ refreshContents();
	2788	+ }
2509	2789	} else
2510	2790	if (source == genUVItem)
2511	2791	{
..	..	@@ -2517,7 +2797,7 @@
2517	2797	} else
2518	2798	if (source == genNormalsMESHItem)
2519	2799	{
2520		- GenNormals(true); // TODO
	2800	+ GenNormalsMESH();
2521	2801	} else
2522	2802	if (source == genNormalsORGANItem)
2523	2803	{
..	..	@@ -2582,6 +2862,22 @@
2582	2862	if (source == unmarkleavesItem)
2583	2863	{
2584	2864	MarkLeaves(false);
	2865	+ } else
	2866	+ if (source == rewindleavesItem)
	2867	+ {
	2868	+ RewindLeaves(true);
	2869	+ } else
	2870	+ if (source == unrewindleavesItem)
	2871	+ {
	2872	+ RewindLeaves(false);
	2873	+ } else
	2874	+ if (source == randomleavesItem)
	2875	+ {
	2876	+ RandomLeaves(true);
	2877	+ } else
	2878	+ if (source == unrandomleavesItem)
	2879	+ {
	2880	+ RandomLeaves(false);
2585	2881	} else
2586	2882	if (source == flipVItem)
2587	2883	{
..	..	@@ -2817,6 +3113,10 @@
2817	3113	if (source == twoButton)
2818	3114	{
2819	3115	radio.layout = twoButton;
	3116	+
	3117	+ if (CameraPane.FULLSCREEN)
	3118	+ fullscreenLayout = radio.layout;
	3119	+
2820	3120	// bug
2821	3121	//gridPanel.setDividerLocation(1.0);
2822	3122	//bigPanel.setDividerLocation(0.0);
..	..	@@ -2849,10 +3149,31 @@
2849	3149	bigThree.ClearUI();
2850	3150	bigThree.add(centralPanel);
2851	3151	bigThree.FlushUI();
	3152	+
	3153	+ cameraView.requestFocusInWindow();
	3154	+
	3155	+// refreshContents(true);
	3156	+//
	3157	+// try
	3158	+// {
	3159	+// java.awt.Robot bot = new java.awt.Robot();
	3160	+// int mask = InputEvent.BUTTON1_MASK;
	3161	+// bot.mouseMove(100, 100);
	3162	+// bot.mousePress(mask);
	3163	+// bot.mouseRelease(mask);
	3164	+// }
	3165	+// catch (Exception e)
	3166	+// {
	3167	+//
	3168	+// }
	3169	+
2852	3170	} else
2853	3171	if (source == threeButton)
2854	3172	{
2855	3173	radio.layout = threeButton;
	3174	+
	3175	+ if (CameraPane.FULLSCREEN)
	3176	+ fullscreenLayout = radio.layout;
2856	3177
2857	3178	// bigThree.remove(scenePanel);
2858	3179	// bigThree.remove(centralPanel);
..	..	@@ -2885,10 +3206,15 @@
2885	3206	bigThree.add(centralPanel);
2886	3207	bigThree.add(XYZPanel);
2887	3208	bigThree.FlushUI();
	3209	+
	3210	+ cameraView.requestFocusInWindow();
2888	3211	} else
2889	3212	if (source == fourButton)
2890	3213	{
2891	3214	radio.layout = fourButton;
	3215	+
	3216	+ if (CameraPane.FULLSCREEN)
	3217	+ fullscreenLayout = radio.layout;
2892	3218
2893	3219	// bigThree.remove(scenePanel);
2894	3220	// bigThree.remove(centralPanel);
..	..	@@ -2920,10 +3246,15 @@
2920	3246	bigThree.ClearUI();
2921	3247	bigThree.add(scenePanel);
2922	3248	bigThree.FlushUI();
	3249	+
	3250	+ cameraView.requestFocusInWindow();
2923	3251	} else
2924	3252	if (source == sixButton)
2925	3253	{
2926	3254	radio.layout = sixButton;
	3255	+
	3256	+ if (CameraPane.FULLSCREEN)
	3257	+ fullscreenLayout = radio.layout;
2927	3258
2928	3259	// bigThree.remove(scenePanel);
2929	3260	// bigThree.remove(centralPanel);
..	..	@@ -2956,10 +3287,15 @@
2956	3287	bigThree.add(scenePanel);
2957	3288	bigThree.add(centralPanel);
2958	3289	bigThree.FlushUI();
	3290	+
	3291	+ cameraView.requestFocusInWindow();
2959	3292	} else
2960	3293	if (source == sevenButton)
2961	3294	{
2962	3295	radio.layout = sevenButton;
	3296	+
	3297	+ if (CameraPane.FULLSCREEN)
	3298	+ fullscreenLayout = radio.layout;
2963	3299
2964	3300	// bigThree.remove(scenePanel);
2965	3301	// bigThree.remove(centralPanel);
..	..	@@ -2993,6 +3329,8 @@
2993	3329	bigThree.add(centralPanel);
2994	3330	bigThree.add(XYZPanel);
2995	3331	bigThree.FlushUI();
	3332	+
	3333	+ cameraView.requestFocusInWindow();
2996	3334	} else
2997	3335	if (source == rootButton)
2998	3336	{
..	..	@@ -3004,6 +3342,7 @@
3004	3342	EditObject(obj);
3005	3343	}
3006	3344
	3345	+ cameraView.requestFocusInWindow();
3007	3346	refreshContents(true);
3008	3347	} else
3009	3348	if (source == closeButton)
..	..	@@ -3013,22 +3352,37 @@
3013	3352	for (Enumeration e = buttonGroup.getElements(); e.hasMoreElements();)
3014	3353	{
3015	3354	ab = (cRadio)e.nextElement();
3016		- if(ab.getModel().isSelected() && ab.GetObject() != client)
	3355	+ if (ab.getModel().isSelected() && ab.GetObject() != client)
3017	3356	{
	3357	+ // Patch to avoid bug with transparency.
	3358	+ if (!ab.hadMaterial)
	3359	+ {
	3360	+ ab.object.material = null;
	3361	+ }
	3362	+
3018	3363	buttonGroup.remove(ab);
3019	3364	radioPanel.remove(ab);
3020	3365
3021		- ab.GetObject().editWindow = null;
	3366	+ //ab.GetObject().editWindow = null;
	3367	+ ab.GetObject().manipWindow = null;
3022	3368	// ab.GetObject().objectUI = null; // ?????????
3023	3369
3024	3370	((cRadio)radioPanel.getComponent(radioPanel.getComponentCount() - 1)).doClick();
3025	3371	break;
3026	3372	}
3027	3373	}
	3374	+
	3375	+ cameraView.requestFocusInWindow();
3028	3376	refreshContents(true);
3029	3377	} else
3030	3378	if (source == editItem \|\| source == editButton)
3031	3379	{
	3380	+ for (Enumeration e = group.selection.elements(); e.hasMoreElements();)
	3381	+ {
	3382	+ Object3D child = (Object3D)e.nextElement();
	3383	+ child.pinned = true;
	3384	+ }
	3385	+
3032	3386	EditSelection(false);
3033	3387	} else
3034	3388	if (source == uneditButton)
..	..	@@ -3038,6 +3392,7 @@
3038	3392	Object3D child = (Object3D)e.nextElement();
3039	3393	if(child.editWindow != null)
3040	3394	objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3395	+ child.pinned = false;
3041	3396	child.CloseUI();
3042	3397	listUI.remove(child);
3043	3398
..	..	@@ -3054,6 +3409,7 @@
3054	3409	//copy.ClearUI();
3055	3410	for (Object3D obj : listUI)
3056	3411	{
	3412	+ obj.pinned = false;
3057	3413	obj.CloseUI();
3058	3414	}
3059	3415	listUI.clear();
..	..	@@ -3063,7 +3419,7 @@
3063	3419	{
3064	3420	assert(copy == group);
3065	3421
3066		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	3422	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
3067	3423
3068	3424	for (Object3D obj : listUI)
3069	3425	{
..	..	@@ -3128,7 +3484,9 @@
3128	3484	sideView.object = group;
3129	3485	}
3130	3486
3131		-// fix "+" issue group.editWindow = this;
	3487	+// fix "+" issue
	3488	+ //group.editWindow = this;
	3489	+ group.manipWindow = this;
3132	3490
3133	3491	/*
3134	3492	currentLayout = radio.layout;
..	..	@@ -3136,18 +3494,25 @@
3136	3494	currentLayout = sevenButton;
3137	3495	*/
3138	3496	radio.layout.doClick();
	3497	+
	3498	+ ClearUnpinned();
	3499	+ SetPinStates(group.selection.size() > 0);
	3500	+ if (group.selection.size() == 1)
	3501	+ EditSelection(false);
3139	3502	keepparent = group.parent;
3140	3503	// PARENT = NULL or not???
3141	3504	//group.parent = null; // ROOT
3142	3505	//group.attributes = -1;
3143	3506	ResetModel();
	3507	+
	3508	+ cameraView.requestFocusInWindow();
3144	3509	refreshContents(true);
3145	3510	} else if (event.getSource() == editCameraItem)
3146	3511	{
3147	3512	cameraView.ProtectCamera();
3148	3513	cameraView.repaint();
3149	3514	return;
3150		- } else if (event.getSource() == revertCameraItem)
	3515	+ } else if (event.getSource() == restoreCameraItem \|\| event.getSource() == restoreCameraButton)
3151	3516	{
3152	3517	cameraView.RevertCamera();
3153	3518	cameraView.repaint();
..	..	@@ -3164,7 +3529,6 @@
3164	3529	}
3165	3530
3166	3531	boolean useclient = false;
3167		- cRadio radio;
3168	3532
3169	3533	void ToggleRoot()
3170	3534	{
..	..	@@ -3403,7 +3767,8 @@
3403	3767
3404	3768	int size = obj.MemorySize();
3405	3769
3406		- System.err.println((size/1024) + " KB is the size of " + obj);
	3770	+ //System.err.println((size/1024) + " KB is the size of " + obj);
	3771	+ System.err.println("the size of " + obj + " is " + size + " (" + (size/1024) + "KB)");
3407	3772	}
3408	3773	}
3409	3774	catch (Exception e)
..	..	@@ -3484,6 +3849,13 @@
3484	3849	void GenNormals(boolean crease)
3485	3850	{
3486	3851	group.GenNormalsS(crease);
	3852	+
	3853	+ refreshContents();
	3854	+ }
	3855	+
	3856	+ void GenNormalsMESH()
	3857	+ {
	3858	+ group.GenNormalsMeshS();
3487	3859
3488	3860	refreshContents();
3489	3861	}
..	..	@@ -4111,6 +4483,18 @@
4111	4483	refreshContents();
4112	4484	}
4113	4485
	4486	+ void RewindLeaves(boolean hide)
	4487	+ {
	4488	+ group.selection.RewindLeaves(hide);
	4489	+ refreshContents();
	4490	+ }
	4491	+
	4492	+ void RandomLeaves(boolean hide)
	4493	+ {
	4494	+ group.selection.RandomLeaves(hide);
	4495	+ refreshContents();
	4496	+ }
	4497	+
4114	4498	void SetTexRes(int tr)
4115	4499	{
4116	4500	group.selection.SetTexRes(tr);
..	..	@@ -4182,10 +4566,6 @@
4182	4566	// }
4183	4567	// }
4184	4568
4185		- static boolean allparams = true;
4186		-
4187		- static Vector<Object3D> listUI = new Vector<Object3D>();
4188		-
4189	4569	void EditSelection(boolean newWindow)
4190	4570	{
4191	4571	// aConstraints.gridy = 0;
..	..	@@ -4193,7 +4573,7 @@
4193	4573	{
4194	4574	//System.out.println("edit : " + objectPanel.indexOfTab("Material"));
4195	4575	//objectPanel.setEnabledAt(objectPanel.indexOfTab("Material"), false);
4196		- objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
	4576	+ //objectPanel.setSelectedIndex(objectPanel.indexOfTab("Edit"));
4197	4577
4198	4578	Object3D elem = (Object3D)group.selection.elementAt(i);
4199	4579	if(elem != group \|\| !newWindow)
..	..	@@ -4278,7 +4658,8 @@
4278	4658	//new Exception().printStackTrace();
4279	4659
4280	4660	freezemodel = true;
4281		-
	4661	+ ClearUnpinned();
	4662	+
4282	4663	/**/
4283	4664	//switch (event.id)
4284	4665	{
..	..	@@ -4286,7 +4667,6 @@
4286	4667	//case 702: // Event.LIST_DESELECT
4287	4668	group.deselectAll();
4288	4669	TreePath tps[] = objEditor.jTree.getSelectionPaths();
4289		- objEditor.ClearInfo(); // .GetMaterial());
4290	4670	if (tps != null)
4291	4671	{
4292	4672	for (int i=0; i < tps.length; i++)
..	..	@@ -4295,10 +4675,8 @@
4295	4675
4296	4676	//if (child.parent != null)
4297	4677	//child.parent.addSelectee(child);
	4678	+ objEditor.SetMaterial(child);
4298	4679	group.addSelectee(child);
4299		- objEditor.SetMaterial(child); // .GetMaterial());
4300		- objEditor.AddInfo(child, this, true); // .GetMaterial());
4301		- System.err.println("info : " + child.GetPath());
4302	4680	}
4303	4681	}
4304	4682	// else
..	..	@@ -4308,15 +4686,13 @@
4308	4686	// System.err.println("info : " + group.GetPath());
4309	4687	// }
4310	4688
4311		- objEditor.SetText(); // jan 2014
4312		-
4313	4689	if (flashIt && !Globals.isLIVE() && tps != null && tps.length > 0 && !(tps[0].getLastPathComponent() instanceof Camera))
4314	4690	CameraPane.flash = true;
4315	4691
4316	4692	if (tps != null && tps.length > 0 && tps[0].getLastPathComponent() instanceof Camera)
4317	4693	// a camera
4318	4694	{
4319		- if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera())
	4695	+ if (tps[0].getLastPathComponent() != Globals.theRenderer.LightCamera()) // Crash the camera because of invalid lightspace
4320	4696	{
4321	4697	CameraPane.camerachangeframe = 0; // don't refuse it
4322	4698	Globals.theRenderer.SetCamera((Camera) tps[0].getLastPathComponent());
..	..	@@ -4325,6 +4701,13 @@
4325	4701	// Globals.theRenderer.eyeCamera = Globals.theRenderer.manipCamera;
4326	4702	}
4327	4703
	4704	+ if (tps != null && tps.length == 1)
	4705	+ {
	4706	+ EditSelection(false);
	4707	+ }
	4708	+
	4709	+ SetPinStates(tps != null && tps.length > 0);
	4710	+
4328	4711	refreshContents();
4329	4712	//return true;
4330	4713	}
..	..	@@ -4333,6 +4716,35 @@
4333	4716
4334	4717	freezemodel = false;
4335	4718	}
	4719	+
	4720	+ void SetPinStates(boolean enabled)
	4721	+ {
	4722	+ editButton.setEnabled(enabled);
	4723	+ uneditButton.setEnabled(enabled);
	4724	+ unselectButton.setEnabled(enabled);
	4725	+ flashSelectionButton.setEnabled(enabled);
	4726	+ }
	4727	+
	4728	+ void refreshContents(boolean cp)
	4729	+ {
	4730	+ if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
	4731	+ if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
	4732	+ {
	4733	+ objEditor.ClearInfo(); // .GetMaterial());
	4734	+
	4735	+ for (int i=0; i < group.selection.Size(); i++)
	4736	+ {
	4737	+ Object3D child = (Object3D) group.selection.get(i);
	4738	+
	4739	+ objEditor.AddInfo(child, this, true);
	4740	+ System.err.println("info : " + child.GetPath());
	4741	+ }
	4742	+
	4743	+ objEditor.SetText(); // jan 2014
	4744	+ }
	4745	+
	4746	+ super.refreshContents(cp);
	4747	+ }
4336	4748
4337	4749	void linkSomething(Object3D thing)
4338	4750	{
..	..	@@ -4404,6 +4816,7 @@
4404	4816	{
4405	4817	if (group.selection.isEmpty())
4406	4818	return;
	4819	+
4407	4820	Grafreed.clipboardIsTempGroup = false;
4408	4821	Composite tGroup = null;
4409	4822	if (group.selection.size() > 0) // 1)
..	..	@@ -4414,6 +4827,8 @@
4414	4827
4415	4828	if (cut)
4416	4829	{
	4830	+ if (Globals.SAVEONMAKE)
	4831	+ Save();
4417	4832	//int indices[] = jList.getSelectedIndices();
4418	4833	//for (int i = indices.length - 1; i >= 0; i--)
4419	4834	//jList.remove(indices[i]);
..	..	@@ -4503,8 +4918,10 @@
4503	4918	}
4504	4919
4505	4920	}
	4921	+
4506	4922	if (Grafreed.clipboardIsTempGroup)
4507	4923	Grafreed.clipboard = tGroup;
	4924	+
4508	4925	if (cut)
4509	4926	{
4510	4927	ResetModel();
..	..	@@ -5129,7 +5546,28 @@
5129	5546	cButton clearpanelButton;
5130	5547	cButton unselectButton;
5131	5548
	5549	+ cButton restoreCameraButton;
	5550	+
	5551	+ cButton saveButton;
5132	5552	cButton oneStepButton;
	5553	+
	5554	+ cButton groupButton;
	5555	+ cButton ungroupButton;
	5556	+ cButton compositeButton;
	5557	+ cButton switchButton;
	5558	+ cButton loopButton;
	5559	+ cButton textureButton;
	5560	+
	5561	+ cButton gridButton;
	5562	+ cButton boxButton;
	5563	+ cButton sphereButton;
	5564	+ cButton coneButton;
	5565	+ cButton torusButton;
	5566	+ cButton superButton;
	5567	+ cButton kleinButton;
	5568	+ cButton particlesButton;
	5569	+ cButton overlayButton;
	5570	+ cButton lightButton;
5133	5571
5134	5572	cButton screenfitButton;
5135	5573	cButton screenfitpointButton;
..	..	@@ -5142,14 +5580,6 @@
5142	5580
5143	5581	cButton setsupportButton;
5144	5582
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	5583	//
5154	5584	//Composite
5155	5585	Object3D // to do !!
..	..	@@ -5159,11 +5589,11 @@
5159	5589	//JTree jTree;
5160	5590	private MenuItem lookAtItem;
5161	5591	private MenuItem lookFromItem;
5162		- private MenuItem switchItem;
	5592	+ private MenuItem switchViewItem;
5163	5593	private MenuItem cutItem;
5164	5594	private MenuItem undoItem;
5165	5595	private MenuItem redoItem;
5166		- private MenuItem duplicateItem;
	5596	+ private JMenuItem duplicateItem;
5167	5597	private MenuItem cloneItem;
5168	5598	private MenuItem cloneSupportItem;
5169	5599	private MenuItem overwriteGeoItem;
..	..	@@ -5226,6 +5656,10 @@
5226	5656	private MenuItem showleavesItem;
5227	5657	private MenuItem markleavesItem;
5228	5658	private MenuItem unmarkleavesItem;
	5659	+ private MenuItem rewindleavesItem;
	5660	+ private MenuItem unrewindleavesItem;
	5661	+ private MenuItem randomleavesItem;
	5662	+ private MenuItem unrandomleavesItem;
5229	5663
5230	5664	private MenuItem flipVItem;
5231	5665	private MenuItem unflipVItem;
..	..	@@ -5247,7 +5681,7 @@
5247	5681	private MenuItem frontItem;
5248	5682	private MenuItem cameraItem;
5249	5683	private MenuItem compositeItem;
5250		- private MenuItem randomItem;
	5684	+ private MenuItem switchItem;
5251	5685	private MenuItem physicsItem;
5252	5686	private MenuItem frameselectorItem;
5253	5687	private MenuItem scriptNodeItem;
..	..	@@ -5321,5 +5755,5 @@
5321	5755
5322	5756	Menu cameraMenu;
5323	5757	MenuItem editCameraItem;
5324		- MenuItem revertCameraItem;
	5758	+ MenuItem restoreCameraItem;
5325	5759	}